From nobody Mon Nov 4 04:58:23 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XhfPC45J2z5c9FQ; Mon, 04 Nov 2024 04:58:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XhfPC3Z22z4fvZ; Mon, 4 Nov 2024 04:58:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730696303; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fBVMcQCU1RcyZXCJ7XttIhG0th+sh1To8Hf3EuSI3mE=; b=dCJ1oLPOz9+reyuXekc8U5JSuI2TcC9gLTYp6iY0ysszFT3chAFSyRaMMSrR/dBk5xFwyT p7I34IvNuewg0r90ct/dtLOQUoxCPWcb3eE/KuVnnMa859Fg33L/fUKSphUC9nsp8+cEgS p5ER61Vio2K07CwemkdxgJFEyogKybBDV8dokTFiUmxTflMoRj++VWtieOm8zyCpwjuw9V /b7gWaEGpXOtnwbJtoDsqln8LQEatsj34c5U73mmONTCW8NKrybTxLV7YEYACSdccNPXkd rgfsGtuo3S+tBksRv/N5+VOYlYPIie6nj/b8QxIafIZ1rmwi6ZOjHi1hj9GNfg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730696303; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fBVMcQCU1RcyZXCJ7XttIhG0th+sh1To8Hf3EuSI3mE=; b=q/4DCW58JrEVnfVUsxpomQ4MXNyQeN42/i2DDginLoPxloiSxK+p6Fxb1QPi9ASaeW9eUt HwZlScH7J2dR9XzInUwSEjgWv9u+IpVmi7PkP0c6Rcgfr5spvalgr3C2iXONOakBfcIk6U ZJGzDOUFd3SLan32DaVCoAPzxeDDHvDvqi03g0A+54OvbThF6hc6SlWmNjlmsBeb67nj6T HDBqydAHwlV51Dfkedrm9c0Sew3pEfuwwKkKxF4ruOBCfZ1ijy3w9k5Aqd3k8ZIdaEe3J6 V09AUlNX59pPtGScAM5BYY9Io6qKdJIesCeV8teRtw/+q6TCrcjM7Wdu6D3lPw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730696303; a=rsa-sha256; cv=none; b=t7TABmhT/iMaSfJO0HXLO/mzq9jAJ7uJ1U5Rp+etKTWVkt6oWU0mEh2Jsj5EuV+TWMjqX8 rhGrSnZPTNKrgAiM3DFJm7bLgy4t5I0uDc/mvY7m3CdBmFW6yO8m7eeFvwo3BZtHFM0ghX 0fnUvTDaWxErCObJBvD8m6Jg0ZVfuYbksIPvL9h4HApTpKKdB4wi66/Ify3aP36wHcLpxC N7nt3TIdvOGl49riAwZ1zMtqe0iH+nwaa91CXowlpDT2dYW3Sn9xYA9SO7WI/i8NG1JFUV l5schr0xNE4c4xJxCphk4o/h9jBzssStrRZFCMPu+LearUwt7qqbPOmV/pyjuA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XhfPC337ZzKR1; Mon, 4 Nov 2024 04:58:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A44wNmH049226; Mon, 4 Nov 2024 04:58:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A44wNFj049223; Mon, 4 Nov 2024 04:58:23 GMT (envelope-from git) Date: Mon, 4 Nov 2024 04:58:23 GMT Message-Id: <202411040458.4A44wNFj049223@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: f2103edaf522 - stable/14 - loader: Fix boot menu on BIOS List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f2103edaf5229271f3f6769844c0c747d8352228 Auto-Submitted: auto-generated The branch stable/14 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=f2103edaf5229271f3f6769844c0c747d8352228 commit f2103edaf5229271f3f6769844c0c747d8352228 Author: Warner Losh AuthorDate: 2024-11-02 22:02:44 +0000 Commit: Warner Losh CommitDate: 2024-11-04 00:51:24 +0000 loader: Fix boot menu on BIOS Only the gfx-enabled boot loader supports unicode. Otherwise, we have to use the old cons25 / ibmpc upper code page drawing characters. Check to see if we have the gfx.term_drawbox function. If we do, we support the unicode drawing characters. If we don't, then we have an older loader that doesn't support it *OR* we have the reduced function, text-only boot loader. In either of those cases, we need to use the old graphics characters. Abstract all those details into core.hasUnicode function. PR: 282465 MFC After: 2 day Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D47403 (cherry picked from commit c2ba66d4d01f23303352bfe3cbd50ff5d9a05947) --- stand/lua/core.lua | 9 +++++++++ stand/lua/drawer.lua | 32 +++++++++++++++++++++++++++----- 2 files changed, 36 insertions(+), 5 deletions(-) diff --git a/stand/lua/core.lua b/stand/lua/core.lua index 72b19462ae5c..3582720f2a81 100644 --- a/stand/lua/core.lua +++ b/stand/lua/core.lua @@ -543,6 +543,15 @@ function core.nextConsoleChoice() end end +-- The graphical-enabled loaders have unicode drawing character support. The +-- text-only ones do not. We check the old and new bindings for term_drawrect as +-- a proxy for unicode support, which will work on older boot loaders as well +-- as be future proof for when we remove the old binding. This also abstracts +-- out the test to one spot in case we start to export this notion more directly. +function core.hasUnicode() + return gfx.term_drawrect ~= nil or loader.term_drawrect ~= nil +end + -- Sanity check the boot loader revision -- Loaders with version 3.0 have everything that we need without backwards -- compatible hacks. Warn users that still have old versions to upgrade so diff --git a/stand/lua/drawer.lua b/stand/lua/drawer.lua index a009b78164df..612bd2f5317f 100644 --- a/stand/lua/drawer.lua +++ b/stand/lua/drawer.lua @@ -506,23 +506,45 @@ drawer.frame_styles = { top_right = "+", bottom_right = "+", }, - ["single"] = { +} + +if core.hasUnicode() then + -- unicode based framing characters + drawer.frame_styles["single"] = { horizontal = "\xE2\x94\x80", vertical = "\xE2\x94\x82", top_left = "\xE2\x94\x8C", bottom_left = "\xE2\x94\x94", top_right = "\xE2\x94\x90", bottom_right = "\xE2\x94\x98", - }, - ["double"] = { + } + drawer.frame_styles["double"] = { horizontal = "\xE2\x95\x90", vertical = "\xE2\x95\x91", top_left = "\xE2\x95\x94", bottom_left = "\xE2\x95\x9A", top_right = "\xE2\x95\x97", bottom_right = "\xE2\x95\x9D", - }, -} + } +else + -- non-unicode cons25-style framing characters + drawer.frame_styles["single"] = { + horizontal = "\xC4", + vertical = "\xB3", + top_left = "\xDA", + bottom_left = "\xC0", + top_right = "\xBF", + bottom_right = "\xD9", + } + drawer.frame_styles["double"] = { + horizontal = "\xCD", + vertical = "\xBA", + top_left = "\xC9", + bottom_left = "\xC8", + top_right = "\xBB", + bottom_right = "\xBC", + } +end function drawer.drawscreen(menudef) -- drawlogo() must go first. From nobody Mon Nov 4 04:58:24 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XhfPD6jsDz5c9MX; Mon, 04 Nov 2024 04:58: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XhfPD416Fz4fRc; Mon, 4 Nov 2024 04:58:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730696304; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fOfacUmnxGka7QG9vKw5MOpiL5wD3uehM9XEq4bVa6A=; b=VoBb9mQmbYOW3YERFYTX/xz2t2Bq9ms3VwuUBp1AOrJr24W9RIHV2eD67LJQ8rrBAwCv4x JYJ2J7ekkv5xVnJdBZDcpZp6NZd1ke+j616Y6FU1G5B+fb/yFeAWCAGD5w5aRbmNQyCbF1 td2K30WWR/2VBnDBN98E1c3y67iKXeDyhNZ2kbUHqwWUo7sbUmYPWzRxAsQnvZalfQjBSZ gPeVUTTuqbU2U9ehomQxJpbx+ENjkp4M+P6Qkz1Fnh31EFm9f3Z8UHkB4+ZhChZCv+oWHT XQBsnqfr/prGEXqUOOwcxhKD3vo2KIHwatM4acA2BM4Z8M45d+MUbqu8mGNE0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730696304; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fOfacUmnxGka7QG9vKw5MOpiL5wD3uehM9XEq4bVa6A=; b=g+CCjOVVVadAKP+qBh3WXxzrvxH6X8POobehglZF87K0Oz0LfECOWvRdiXq2kQLCz05Uq7 8fGBN2ogOhxp9vwMFT2h4m6qI6a87JbM8kaCnDiwaKd+bDybR6Y5zjiQ2LNNZ5MLwmhgQR w3vhRwydUpXQHpGglFyqH+F6WbL7HhBkHePbsGIYiGsaemzNeZXo/aXgFaagee0eUyMp7/ lHu6HVQyRS7KoBaI7ZH+vaEvuaCPXH06ubembXpSOlDWVmem8Ftt7HAm7jaElJIDibcmSM m23hzxiTrGfD4ovzOZNQYnfFix3SeqMch5Vh8XrZxHpS5VmoBUBLABDALp4U4w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730696304; a=rsa-sha256; cv=none; b=Efp4v9JfuaHvhwkiFWjpi04RsWb74404mfOFrl4swW7kVzuAQXKzAi8qSXJXFU69rkHJ8e mFKhJ4mYo+Skz6Zxh0b9GaRoIYv2SX5T9+SLEyDFmNepVrq/zg+ZDPUv3kmeoVLX9Nc3FP BsFxxwBNV6ToINQM+ownkejiuINHQk1fHmfI2dw+3LHnDrySYLCZBUOhaToO/4+V3NSL/4 VIpEmOwvk6KIGt3f3NIBsYsFHFLd2twB69tviEs2uJsky6mhMqTJj4vV0GEV2kiozNHZcW KkxqGziWMg/h717DHRlShlLu6nzGP/ncLx8P9aWV8XXgjCJ9Gom8vY++TSsxzw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XhfPD3cWczKR2; Mon, 4 Nov 2024 04:58:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A44wOPU049268; Mon, 4 Nov 2024 04:58:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A44wOFk049265; Mon, 4 Nov 2024 04:58:24 GMT (envelope-from git) Date: Mon, 4 Nov 2024 04:58:24 GMT Message-Id: <202411040458.4A44wOFk049265@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: adce5eaab9a9 - stable/14 - loader.efi: Fix LOADER_NET_SUPPORT=no builds List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: adce5eaab9a975655cd846c9841551ed8f89207a Auto-Submitted: auto-generated The branch stable/14 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=adce5eaab9a975655cd846c9841551ed8f89207a commit adce5eaab9a975655cd846c9841551ed8f89207a Author: Tatiana AuthorDate: 2024-11-02 22:13:58 +0000 Commit: Warner Losh CommitDate: 2024-11-04 00:51:25 +0000 loader.efi: Fix LOADER_NET_SUPPORT=no builds We include too many references to networking things in the non-networking build for loader.efi. Ifdef out netserver command when we are disabling network support to resolve. PR: 277528 MFC After: 2 days Reviewed by: imp (cherry picked from commit 47ef2a131091508e049ab10cad7f91a3c1342cd9) --- stand/efi/loader/main.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/stand/efi/loader/main.c b/stand/efi/loader/main.c index 324150f7c8c7..61bfe7a4d673 100644 --- a/stand/efi/loader/main.c +++ b/stand/efi/loader/main.c @@ -1755,6 +1755,7 @@ command_chain(int argc, char *argv[]) COMMAND_SET(chain, "chain", "chain load file", command_chain); +#if defined(LOADER_NET_SUPPORT) extern struct in_addr servip; static int command_netserver(int argc, char *argv[]) @@ -1785,3 +1786,4 @@ command_netserver(int argc, char *argv[]) COMMAND_SET(netserver, "netserver", "change or display netserver URI", command_netserver); +#endif From nobody Mon Nov 4 13:55:10 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XhtJZ54qlz5c6dW; Mon, 04 Nov 2024 13:55: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XhtJZ4CXzz4Qp8; Mon, 4 Nov 2024 13:55:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730728510; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bvq7EJN7CPZ9sL3ig+1fhW7T6EBtlYuhpSmYLAlZ90c=; b=bw1UYeJ6jAxglnei35qzSj7otI6EQeyET86bchj0vAfsG++aNgoNuHq+OwSIxomjfuLl3j XhKyI2HkNMNAy6uwN/ZV+GZQeoPohlarzN8PpLZPjuKo4SIl3bZ6trVmDzvZ5oziAiLQHG bLhJje/fSAFjwVXvybqWP7jQma59ar1SdaujEnAGC/IKsksQA7kPYUUcgefxBUIpp0xuRL C6sEJae1ZTuTHrqF/wrgmzr0oULvp1/KG8tdcWeB2TAUTASpqbxu1Hjd5JHF6A4u+IARJR BtBT9a9xyR7fV6/9RsFBwW8iAVl0l2IBQSFCvTGTX6NuEHKkLKV1SdZzzMkz/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730728510; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bvq7EJN7CPZ9sL3ig+1fhW7T6EBtlYuhpSmYLAlZ90c=; b=viue3JFeb8BvxJhbLHyJaYEaHH4pXdLo/lZFcvyLoVG6Ueu0+8V7eXM32qXtkQDMSbrEXP RCL+jllqSZqvGE4LxWgVLSH6OT1HbG/XZMdex6OnrS26DhccSMZPjZM0VMMPPB+rg8b8G0 6UDI4lPPHZzlAuO8iZcKnOgmopbNKrtqGOHn9B9lsvLR2fmkmV4adN6F363b2TNDcaB/0S et9MBR0zxge6/MGzQxKFj6uScEQq9TN+3RQrMaviRD5+leWCzPU+34R1Iei1vqSN1Q2UCo /PWkShPLO2D09DiFE1GE/oTTZf2V5OUnU0HvgCw/ibADk+QBoS3NcBDDlP59dQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730728510; a=rsa-sha256; cv=none; b=Lx60O27BUUUgvcyjkm29XkYLOou0V/ohnOmKNoFdqZt8YAyF1z9j49sl/+6lPgPndSadDP C8S+h6+03xqclpw7RK4CF490b9YkvXCgxSHGM2hNw3AoCc7qOfbWhDDzf/weVi7ZfZ0yG5 bTMBhaWLibBM02czN4yBFe6pnC2Bjqa82nno0O6ixaAR8AY+hA+xJE10hLS1DKG20Q1Xwc gZQcgYlf51/wIOwqvXULRD+9nad5gKsgaT10R449DdNqoegH3M75mPdEnR3KWK9s7Ul9gI G2r72OhFkpy//zB1v8FO1dximgwgoQqAhKyenbjyL6G3uTkEW2aH6Ih0F1YZ9Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XhtJZ3hWVzbwF; Mon, 4 Nov 2024 13:55:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A4DtARN046809; Mon, 4 Nov 2024 13:55:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A4DtAOr046806; Mon, 4 Nov 2024 13:55:10 GMT (envelope-from git) Date: Mon, 4 Nov 2024 13:55:10 GMT Message-Id: <202411041355.4A4DtAOr046806@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 8c922db4f3d9 - stable/14 - syscons: add deprecation notice List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 8c922db4f3d9dc41f228357d391f0a899292427e Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=8c922db4f3d9dc41f228357d391f0a899292427e commit 8c922db4f3d9dc41f228357d391f0a899292427e Author: Ed Maste AuthorDate: 2024-11-01 16:51:01 +0000 Commit: Ed Maste CommitDate: 2024-11-04 13:54:10 +0000 syscons: add deprecation notice syscons(4) is not compatible with UEFI, does not support UTF-8, and is Giant-locked. There is no specific timeline yet for removing it, but support for the Giant lock is expected to go away in one or two major release cycles. Add a deprecation notice to avoid surprises, and help ensure that any material deficiencies in vt(4) become known. Reviewed by: manu, markj, imp Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D47396 (cherry picked from commit fc2a3ec6fe6aa00d9be0c293c38e0ef9ac7e2b64) --- share/man/man4/syscons.4 | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/share/man/man4/syscons.4 b/share/man/man4/syscons.4 index 19ecd5e3746e..7e31680ced3f 100644 --- a/share/man/man4/syscons.4 +++ b/share/man/man4/syscons.4 @@ -24,7 +24,7 @@ .\" (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 25, 2022 +.Dd November 2, 2024 .Dt SYSCONS 4 .Os .Sh NAME @@ -69,6 +69,14 @@ In In .Pa /boot/loader.conf : .Cd kern.vty=sc +.Sh DEPRECATION NOTICE +The +.Nm +console is deprecated, and will be removed in a future version of +.Fx . +Users are advised to migrate to the +.Xr vt 4 +console instead. .Sh DESCRIPTION The .Nm From nobody Mon Nov 4 13:55:11 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XhtJb5M49z5c66C; Mon, 04 Nov 2024 13:55: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XhtJb4rY3z4R3N; Mon, 4 Nov 2024 13:55:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730728511; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QY0ljIjPSLzPRJfnDo1+dnafg1gH08WTdT21cUldpK4=; b=FCN3R16RzGJ0T5TiJYyCCKLDk0YSPjY1VfoFMxc5BiWy2iwQ1kBYZXr1+t7XeOzm5QgZ+T XUf/2sQckpw0G1w2MUsVe6uLL3ZMA0uhA5Vu1FXVJzk137TyNVw07LSkp8Bzufi2bOmYYd x8FSRDC/uSZEAdZtihklJAO4M1p26bhf0scQdyxbbcx9LOj3Z/7rSMSZTa+3iXWdbKSSaE +XdaGbwtC3YpYatILdKj8HZsvX5c0bgXkqIbSLlahkupvY6y6xF4r4mpTGmPEqKPvx9d32 zzHdZXoK+DC55p60tufMeyqdczZnUBodQNymZItEYaB7jUo7roF8WsOnjO0Cyg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730728511; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QY0ljIjPSLzPRJfnDo1+dnafg1gH08WTdT21cUldpK4=; b=gb4eEMZjN/RE5QCtxmd9Sl2zU17hEBIwrQJS5Lav6Lekw4jAJGrbEXt9ofVmoIQPlxAuRS o/wU3/K8myql+y7r8cRTLCTZ8nnyerXJqDjicrRT8cn3sytM+q7iW7cEr6Lycp8N36AQla 1N7/8hfJ3cOZTyH9iWSYKD87+UlUtxkR5zfoM93wzl79RL5LYU78lvfIfuXF7+hT+4SKbf yp6Bma9jEgLSxjeEpwbG2wLKpXG2ncv+4qVRm2Fso/dS+6FL2xxXW8LoahAno8dlNli3Gv TEKsgHVmm1AkJTm/otCMNoG441CglsAn3/XtArXz4kWSir1RvlP5Qhg6GhL4YA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730728511; a=rsa-sha256; cv=none; b=kmFYZE3PMziVHk52bW0dVtH2j/GlqoMODt0dKneeZ+x7+S3DXo1O/tRElDZ64RJM7pgqC7 Rw4qB/qfZcRqyCWs72RvLrz02kecy1GYbydsEx54KC/E6VXzToUFXZ3A95zWLyGAI9DH4A KQgMtyH9Cy06RViQaSWGqClT0iVW4wNPLOjv0WzxOsiBxF3T5c/OFyinQyVT3oFTJgt1Fl wnZZYHXSu2hXvntFQmpaofEwR9x4OCKx0VWMhkU3y2rSlL4jrguvF2dVB0yE5K9b/B27Ts TOl0T73RZHGaj+kkuP8IjkPx0L1z8BRnA+ab4Q6XaWguRpSiMDcztAgptMMgwg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XhtJb4S5szbwG; Mon, 4 Nov 2024 13:55:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A4DtB3N046869; Mon, 4 Nov 2024 13:55:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A4DtBHU046866; Mon, 4 Nov 2024 13:55:11 GMT (envelope-from git) Date: Mon, 4 Nov 2024 13:55:11 GMT Message-Id: <202411041355.4A4DtBHU046866@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 752c25c01c17 - stable/14 - vt: add comments for KDMKTONE ioctl implementation List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 752c25c01c171811bab622b558e97d611c228c7d Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=752c25c01c171811bab622b558e97d611c228c7d commit 752c25c01c171811bab622b558e97d611c228c7d Author: Ed Maste AuthorDate: 2024-11-01 16:29:32 +0000 Commit: Ed Maste CommitDate: 2024-11-04 13:54:10 +0000 vt: add comments for KDMKTONE ioctl implementation The KDMKTONE ioctl, introduced in commit 916347f77e6c, is used to beep the PC speaker. For historical reasons the frequency is specified as an 8254 PIT divisor for a 1.19MHz clock. Linux provides this same ioctl. Add a comment to vtterm_beep to avoid someone wanting to "fix" this in the future. Also add an XXX comment that the period unit is supposed to be "timer ticks." Note that nothing in the base system uses this ioctl. Reviewed by: imp Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D47395 (cherry picked from commit adba3c74209eb5d2197b9092002cc9d7505fd3c6) --- sys/dev/vt/vt_core.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sys/dev/vt/vt_core.c b/sys/dev/vt/vt_core.c index f3cc4e29cf07..50f12512a81c 100644 --- a/sys/dev/vt/vt_core.c +++ b/sys/dev/vt/vt_core.c @@ -1136,6 +1136,13 @@ vtterm_bell(struct terminal *tm) sysbeep(vw->vw_bell_pitch, vw->vw_bell_duration); } +/* + * Beep with user-provided frequency and duration as specified by a KDMKTONE + * ioctl (compatible with Linux). The frequency is specified as a 8254 PIT + * divisor for a 1.19MHz clock. + * + * See https://tldp.org/LDP/lpg/node83.html. + */ static void vtterm_beep(struct terminal *tm, u_int param) { @@ -1149,6 +1156,7 @@ vtterm_beep(struct terminal *tm, u_int param) return; } + /* XXX period unit is supposed to be "timer ticks." */ period = ((param >> 16) & 0xffff) * SBT_1MS; freq = 1193182 / (param & 0xffff); From nobody Mon Nov 4 14:55:57 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Xhvfj3nbHz5cB3r; Mon, 04 Nov 2024 14:55: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xhvfj37nfz4XVG; Mon, 4 Nov 2024 14:55:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730732157; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SjweT/vFy2IOyfVNhz1Jd1HCGhK1etP9+9PHAX2Dia4=; b=ulg2gLJO1DfC+Xj1SrJGuDd6qUvtcP2ltLfATkzC5kX36+3wLtfJvgsk1HvQcPNwkedrQY NeR1oWaCyzPiApG3a6mdjtysru5L8Md0r5Y4UkBuBgFHyUwxjLHBE2o2L+xWVte0XDEeJP hN1Snjppyv8WKmCrQryijTvE6EP7t+Rapxj/z2T8pnEckInMvSaLRkeLq8y8Y/jOdV2kTE Kj7xphvHRNqJRHBWlyydYs6M+CPiKITA28DhgYVR4AAUwzBKz1isF4LPOwkXJKmMXJ5aM+ dmBiE1XhK4pELMFNS8acNfFhUOC4xgygyDE5U5PDQNRs53sQn2FMwxP3led+WQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730732157; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SjweT/vFy2IOyfVNhz1Jd1HCGhK1etP9+9PHAX2Dia4=; b=OjB5X/1O1+1vbTVGIIHsrcPrkbnaPEzceGXaXzq6/fQF8MCfATGqFDZ6eFbyfFoSGVQ1HE WzK5SJl+mBwCedifKBCAe9ifH/ENRrgsN8mUa/mtY7SQs249oCXp2vMblpMEs2pT59QXzU fGPUdrRohQ+MfyK/99A+p5keJYf2O7YduLMJ6rrc3xoElBhVg823vn6kqIHyYtWfwEYY2Z rOzC1PlXsNAb4JaKbRr+af2cKhbsbXNXejQFiXZhdsr81e9Twm/lE2L2BeumMc0JjNng13 JxchxTCTfJF6+JlOe7MSf9ltqQLTv0Vqy3JAqW+08rSHsUR7sJns0akrAWTxBw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730732157; a=rsa-sha256; cv=none; b=pLCZ5AZ8MFkpl/YXEb82ATZzHRtzE+y1C2cLKG/CzUkIvOhnv+GY1X6AJhfkqWHjghwCYN X8Q0VPNrRQzF7hDu3DHnt+4Gjs7jb2CVjy6Oxws+zZpjbKwtdvikNNIOvQvrM4FSn99R6/ ZXWIGpnnBGn2GiY/mjS4qAACVLny9wYvX+xkKm6DBLM2wP99tIJ8rYXZ29IsX9f82/phb/ 2gUtgbHyBDKDHJbEHzrKbJnhqk6GaUg0NP/yG40lklBTB/0vc1rmzv3Y+8MwCovq55ed/r I2eCJuvd0NQMPCkJbzrUDCx7+Hk8NLZuHDdeTMZZZGClMqnDCQc+OkSVZjNZ3A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Xhvfj2J17zdZV; Mon, 4 Nov 2024 14:55:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A4EtvQC059154; Mon, 4 Nov 2024 14:55:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A4Etve0059151; Mon, 4 Nov 2024 14:55:57 GMT (envelope-from git) Date: Mon, 4 Nov 2024 14:55:57 GMT Message-Id: <202411041455.4A4Etve0059151@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 4ff71ffaa79b - stable/14 - rc.d/sendmail: Return non-zero if the daemon fails to start or is not running List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 4ff71ffaa79b4b609b70b60d716faffce768bb41 Auto-Submitted: auto-generated The branch stable/14 has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=4ff71ffaa79b4b609b70b60d716faffce768bb41 commit 4ff71ffaa79b4b609b70b60d716faffce768bb41 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2024-10-21 10:10:52 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2024-11-04 14:55:40 +0000 rc.d/sendmail: Return non-zero if the daemon fails to start or is not running If you have a mail server that is running sendmail daemon (sendmail_enable=YES) and sendmail queue runner (sendmail_msp_queue=YES) and the sendmail daemon dies, /etc/rc.d/sendmail status does see the daemon is not running but returns 0 as the exit code. This prevents other programs (like puppet) from restarting sendmail to fix the issue. Make sure that the exit code is propagated towards the end of the script if any of the sendmail services fail. This patch does not call exit directly but instead just sets the exit status code by calling exit in a subshell. This way we do not exit the current shell in case the service script is sourced (e.g., when rc_fast_and_loose is active). PR: 223132 MFC after: 2 weeks Reported by: pirzyk Discussed with: jilles, eugen Reviewed by: christos, gshapiro (previous version), markj Approved by: christos (mentor), markj (mentor) Differential Revision: https://reviews.freebsd.org/D46862 Co-authored-by: Jim Pirzyk (cherry picked from commit d2e7bb630b83848a774d8213014a9e0747775019) --- libexec/rc/rc.d/sendmail | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libexec/rc/rc.d/sendmail b/libexec/rc/rc.d/sendmail index ea97503890f9..28d6818eabac 100755 --- a/libexec/rc/rc.d/sendmail +++ b/libexec/rc/rc.d/sendmail @@ -204,6 +204,7 @@ sendmail_precmd() } run_rc_command "$1" +_ret=$? required_files= @@ -212,6 +213,7 @@ if checkyesno sendmail_submit_enable; then rcvar="sendmail_submit_enable" _rc_restart_done=false run_rc_command "$1" + _ret=$(( _ret > $? ? _ret : $? )) fi if checkyesno sendmail_outbound_enable; then @@ -219,6 +221,7 @@ if checkyesno sendmail_outbound_enable; then rcvar="sendmail_outbound_enable" _rc_restart_done=false run_rc_command "$1" + _ret=$(( _ret > $? ? _ret : $? )) fi name="sendmail_msp_queue" @@ -227,3 +230,6 @@ pidfile="${sendmail_msp_queue_pidfile:-/var/spool/clientmqueue/sm-client.pid}" required_files="/etc/mail/submit.cf" _rc_restart_done=false run_rc_command "$1" +_ret=$(( _ret > $? ? _ret : $? )) + +(exit "$_ret") From nobody Mon Nov 4 14:56:01 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Xhvfn617kz5cB3t; Mon, 04 Nov 2024 14:56: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xhvfn57Wbz4Y3q; Mon, 4 Nov 2024 14:56:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730732161; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NzpsV/OfIZGIuSmsqQ2G4X/+9pLbJI3qolZuyMcQzxc=; b=ZsFm82RobS9wdZHNh9X/+x003Kd2acycR6nSoHOO3ZGjpGbJ0Oo4ylx8chQJvjp3p0gfI8 +b2q/d+VlbwVXNTIB0NWbqi/NFNlbulAxZEqOeMYCpDEz+pCSdfRFt7v9WQ4BTMA7YRFot 6ZfEY4IoiylOMXWHFDXEnnj5dQeDH/PExmbrymzgSZqq83ejZObzxc+yIZT/L8K7v5T2E2 iYXAgdBW12dIp9zuIolWpwlJbyWtxNgZF5V6xpjY5Fr9JErKr+9TMgx1NKtvW4TM2XEm92 p/jEYPVHLR5x0G6s/OGaL1qxva2D6bGYZkZr6mkvlYmjeQe/R8foZqNYXoQNYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730732161; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NzpsV/OfIZGIuSmsqQ2G4X/+9pLbJI3qolZuyMcQzxc=; b=EVKcIFjODVL7Nh92J6yh6g9OcI3cMp2O61IAGIs5RAUJm79o3x8GA3Je6qSEg+QU3sAXff pAV3x5E40jjRYbjVwieKWtyr0Es6bEz8+GHMVjKEzb/HvNavlaQFGOozxeZMtr9dI3n+yh iee6bro+qv7kJHfyi+1ykwn6vsITHqlcoRWc0brqOqk/OC7bN04zrM0tBOVt7v0tMhCIrK PGcr2hlG7Y30tLFjel6lbBPHJ4EUH2XXgka5hTdgxiN7oXXsokV5MuFWYaMuqqqoTTJ7sv fKUbECeCbhCwIvAhQlLy/qqPs/UXRHb/7+3JSvrtGIUsk9fb6vhPaVPQXuQ0pg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730732161; a=rsa-sha256; cv=none; b=DxC/D1HveSuzVrwDL3vQoruY7zlj9aaK+z9SG27Z4MYS1whd1YJOBU4BetMlgfDyaZ2lQ3 fST+e3vZt/F+wdPRgyDBz8ERDytD5KpcehWcPPEfz6bkfkn+Ek6Ulg9alr5TymCjNPqM2i SJntLGs/M+qaHvllvqV+XXuKkjocbxEsSiz2cUesKO7pbIggPt+BaczPRiqv3ViWHdPGHM bWKRDqoVOLYxUOYxhZ/+SS0jKDVBrqFZpRcUUBW5/D/+2D2q7GkI3wuIaf9peouOYKwUIO ejMClFndPiXbsyDAm92u2pWrcYYjtMNRCz+dgy+NReyBLhgA+MLfvHbZag1R3w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Xhvfn4X9NzdDC; Mon, 4 Nov 2024 14:56:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A4Eu1Ar059334; Mon, 4 Nov 2024 14:56:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A4Eu1na059331; Mon, 4 Nov 2024 14:56:01 GMT (envelope-from git) Date: Mon, 4 Nov 2024 14:56:01 GMT Message-Id: <202411041456.4A4Eu1na059331@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: d36998a6cc68 - stable/13 - rc.d/sendmail: Return non-zero if the daemon fails to start or is not running List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: d36998a6cc6853e54066d476d146e1b510976418 Auto-Submitted: auto-generated The branch stable/13 has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=d36998a6cc6853e54066d476d146e1b510976418 commit d36998a6cc6853e54066d476d146e1b510976418 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2024-10-21 10:10:52 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2024-11-04 14:55:55 +0000 rc.d/sendmail: Return non-zero if the daemon fails to start or is not running If you have a mail server that is running sendmail daemon (sendmail_enable=YES) and sendmail queue runner (sendmail_msp_queue=YES) and the sendmail daemon dies, /etc/rc.d/sendmail status does see the daemon is not running but returns 0 as the exit code. This prevents other programs (like puppet) from restarting sendmail to fix the issue. Make sure that the exit code is propagated towards the end of the script if any of the sendmail services fail. This patch does not call exit directly but instead just sets the exit status code by calling exit in a subshell. This way we do not exit the current shell in case the service script is sourced (e.g., when rc_fast_and_loose is active). PR: 223132 MFC after: 2 weeks Reported by: pirzyk Discussed with: jilles, eugen Reviewed by: christos, gshapiro (previous version), markj Approved by: christos (mentor), markj (mentor) Differential Revision: https://reviews.freebsd.org/D46862 Co-authored-by: Jim Pirzyk (cherry picked from commit d2e7bb630b83848a774d8213014a9e0747775019) --- libexec/rc/rc.d/sendmail | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libexec/rc/rc.d/sendmail b/libexec/rc/rc.d/sendmail index ea97503890f9..28d6818eabac 100755 --- a/libexec/rc/rc.d/sendmail +++ b/libexec/rc/rc.d/sendmail @@ -204,6 +204,7 @@ sendmail_precmd() } run_rc_command "$1" +_ret=$? required_files= @@ -212,6 +213,7 @@ if checkyesno sendmail_submit_enable; then rcvar="sendmail_submit_enable" _rc_restart_done=false run_rc_command "$1" + _ret=$(( _ret > $? ? _ret : $? )) fi if checkyesno sendmail_outbound_enable; then @@ -219,6 +221,7 @@ if checkyesno sendmail_outbound_enable; then rcvar="sendmail_outbound_enable" _rc_restart_done=false run_rc_command "$1" + _ret=$(( _ret > $? ? _ret : $? )) fi name="sendmail_msp_queue" @@ -227,3 +230,6 @@ pidfile="${sendmail_msp_queue_pidfile:-/var/spool/clientmqueue/sm-client.pid}" required_files="/etc/mail/submit.cf" _rc_restart_done=false run_rc_command "$1" +_ret=$(( _ret > $? ? _ret : $? )) + +(exit "$_ret") From nobody Mon Nov 4 15:38:41 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Xhwc13JLqz5cDYD; Mon, 04 Nov 2024 15:38: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xhwc12mDHz4gby; Mon, 4 Nov 2024 15:38:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730734721; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OvNeC9SCDVmxAf2WMsWyi23QakCWaOl0ItqHQCHNzIs=; b=wGJuZ8PTnr6RGQmlG10t9KVlxe+ljFdCbsHQ7L5SQn0yNhn2Dj0CujXYk/Jdp1hgoiiHuw m1k8bQINtBEVjlO91NmvdtBlaHQUdUnNCSSQhRRvLdjSDMlyqknShaY4mGic4YUPzAgnom oA3BHUESa4npwGxUGAHTAvQZKqTNFDQsl3/vvnWNVkx9UsiYuS6iJ301zj2VG8sdk2MOHj 2nQ8PMCFxSL0CFwN92xUZRYatWlf+R8JL+C86RXQDk4oZb5q9UnvYmlhwOTeCUgg4mbale 2DOhhJt2yunMeU+D4JfyVOxKy88zMBie/2wD2M2VqIHs4nA3TOFfBJEhMfq3mA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730734721; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OvNeC9SCDVmxAf2WMsWyi23QakCWaOl0ItqHQCHNzIs=; b=cS5TT+sHtY40HfzNpaBhjUzUDOyXXhKfehI5+iRoFlW2T2TbG5WTvmdb/1XXy73dP/NxoQ 6NsivUSG+5VWiyBuPkZCm5h2RnCp5xh9E23tFT41P/z2R5VuY39KwK4+kqK7jncp0B0qHg 7C4ixjx5D8u+9PWP13NVJM6/x/go/lkXE4B7uKYuCJVj1Wy6ligw0DaU0gCnVsK5itq1pg NIlA3TLSgSB/6ouAoEIwe6JuA/gd0KuNO3Ov2XhkkJ30mnmRn4VYTEJKjXtw0E8Vn7DlKl HKlpK0dL95oArOwcr3ePGcHCCLXO5WHwW+ACorLLAHfwCXxSFGdvOpkeej/acA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730734721; a=rsa-sha256; cv=none; b=fCbqPZ18VGjSlYEzZGcZ3ijrtImdtV5QRDoxJIXXU0KnBol5/XFw3lQi5005GAaRGf/tVm 1ACmCMG+Kwk8+zhOZgv4+dLLykeMclVhAujiZfp3ZpKgKY4liYMZT0gHDz17m+lPZVH90g W/6/6h8P4ALjeD8+W7RHyRmc7wmcZmX3UTiJy0+DFTBjOFoRyC2zC1LoUu6ao61oXgJD/N VsY/GGQZIRj/wK0Jk/UNbOy3/cyjHGj4g/bBfs60bubmSxonW1otEQ2tFhe3jplLWSWERD MTC7gKmr6PIQfEcWk0QUDqiauqnG6em54HmJhZT/VPPztaz3sPck15SFVv1U0Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Xhwc12MlLzfM4; Mon, 4 Nov 2024 15:38:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A4Fcftd035924; Mon, 4 Nov 2024 15:38:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A4FcfIq035921; Mon, 4 Nov 2024 15:38:41 GMT (envelope-from git) Date: Mon, 4 Nov 2024 15:38:41 GMT Message-Id: <202411041538.4A4FcfIq035921@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 8635c1ad5127 - stable/14 - shm: Respect PROT_MAX when creating private mappings List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 8635c1ad51274872d01075c7f66aa252491b1de1 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=8635c1ad51274872d01075c7f66aa252491b1de1 commit 8635c1ad51274872d01075c7f66aa252491b1de1 Author: Mark Johnston AuthorDate: 2024-10-04 14:54:44 +0000 Commit: Mark Johnston CommitDate: 2024-11-04 15:38:35 +0000 shm: Respect PROT_MAX when creating private mappings We were previously unconditionally adding PROT_WRITE to the maxprot of private mapping (because a private mapping can be written even if the fd is read-only), but this might violate the user's PROT_MAX request. While here, rename cap_maxprot to max_maxprot. This is the intersection of the maximum protections imposed by capsicum rights on the fd (not really relevant for private mappings) and the user-required maximum protections (which were not being obeyed). In particular, cap_maxprot is a misnomer after the introduction of PROT_MAX. Add some regression test cases. mmap__maxprot_shm fails without this patch. Note: Capsicum's CAP_MMAP_W is a bit ambiguous. Should it be required in order to create writeable private mappings? Currently it is, even though such mappings don't permit writes to the object referenced by the fd. Reported by: brooks Reviewed by: brooks MFC after: 1 month Fixes: c7841c6b8e41 ("Relax restrictions on private mappings of POSIX shm objects.") Differential Revision: https://reviews.freebsd.org/D46741 (cherry picked from commit 33c2c58f0a3db0a6d3996fa14ac7967274678771) --- sys/kern/uipc_shm.c | 8 ++--- tests/sys/posixshm/posixshm_test.c | 29 +++++++++++++++- tests/sys/vm/mmap_test.c | 70 +++++++++++++++++++++++++++++++++++++- 3 files changed, 101 insertions(+), 6 deletions(-) diff --git a/sys/kern/uipc_shm.c b/sys/kern/uipc_shm.c index 8a533428790a..f51998d0ed00 100644 --- a/sys/kern/uipc_shm.c +++ b/sys/kern/uipc_shm.c @@ -1648,7 +1648,7 @@ fail: static int shm_mmap(struct file *fp, vm_map_t map, vm_offset_t *addr, vm_size_t objsize, - vm_prot_t prot, vm_prot_t cap_maxprot, int flags, + vm_prot_t prot, vm_prot_t max_maxprot, int flags, vm_ooffset_t foff, struct thread *td) { struct shmfd *shmfd; @@ -1671,8 +1671,8 @@ shm_mmap(struct file *fp, vm_map_t map, vm_offset_t *addr, vm_size_t objsize, * writeable. */ if ((flags & MAP_SHARED) == 0) { - cap_maxprot |= VM_PROT_WRITE; - maxprot |= VM_PROT_WRITE; + if ((max_maxprot & VM_PROT_WRITE) != 0) + maxprot |= VM_PROT_WRITE; writecnt = false; } else { if ((fp->f_flag & FWRITE) != 0 && @@ -1692,7 +1692,7 @@ shm_mmap(struct file *fp, vm_map_t map, vm_offset_t *addr, vm_size_t objsize, goto out; } } - maxprot &= cap_maxprot; + maxprot &= max_maxprot; /* See comment in vn_mmap(). */ if ( diff --git a/tests/sys/posixshm/posixshm_test.c b/tests/sys/posixshm/posixshm_test.c index c97a10bb0a86..a3ce18f855f5 100644 --- a/tests/sys/posixshm/posixshm_test.c +++ b/tests/sys/posixshm/posixshm_test.c @@ -1191,6 +1191,33 @@ ATF_TC_BODY(accounting, tc) ATF_REQUIRE(close(fd) == 0); } +ATF_TC_WITHOUT_HEAD(mmap_prot); +ATF_TC_BODY(mmap_prot, tc) +{ + void *p; + int fd, pagesize; + + ATF_REQUIRE((pagesize = getpagesize()) > 0); + + gen_test_path(); + fd = shm_open(test_path, O_RDONLY | O_CREAT, 0644); + ATF_REQUIRE(fd >= 0); + + p = mmap(NULL, pagesize, PROT_READ, MAP_SHARED, fd, 0); + ATF_REQUIRE(p != MAP_FAILED); + ATF_REQUIRE(munmap(p, pagesize) == 0); + p = mmap(NULL, pagesize, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0); + ATF_REQUIRE_ERRNO(EACCES, p == MAP_FAILED); + p = mmap(NULL, pagesize, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0); + ATF_REQUIRE(p != MAP_FAILED); + ATF_REQUIRE(munmap(p, pagesize) == 0); + + ATF_REQUIRE_MSG(shm_unlink(test_path) == 0, + "shm_unlink failed; errno=%d", errno); + ATF_REQUIRE_MSG(close(fd) == 0, + "close failed; errno=%d", errno); +} + static int shm_open_large(int psind, int policy, size_t sz) { @@ -1921,7 +1948,6 @@ ATF_TC_BODY(largepage_reopen, tc) ATF_TP_ADD_TCS(tp) { - ATF_TP_ADD_TC(tp, remap_object); ATF_TP_ADD_TC(tp, rename_from_anon); ATF_TP_ADD_TC(tp, rename_bad_path_pointer); @@ -1955,6 +1981,7 @@ ATF_TP_ADD_TCS(tp) ATF_TP_ADD_TC(tp, fallocate); ATF_TP_ADD_TC(tp, fspacectl); ATF_TP_ADD_TC(tp, accounting); + ATF_TP_ADD_TC(tp, mmap_prot); ATF_TP_ADD_TC(tp, largepage_basic); ATF_TP_ADD_TC(tp, largepage_config); ATF_TP_ADD_TC(tp, largepage_mmap); diff --git a/tests/sys/vm/mmap_test.c b/tests/sys/vm/mmap_test.c index e5f4a81a7858..6bc30f73ca95 100644 --- a/tests/sys/vm/mmap_test.c +++ b/tests/sys/vm/mmap_test.c @@ -295,14 +295,82 @@ ATF_TC_BODY(mmap__write_only, tc) munmap(p, pagesize); } -ATF_TP_ADD_TCS(tp) +ATF_TC_WITHOUT_HEAD(mmap__maxprot_basic); +ATF_TC_BODY(mmap__maxprot_basic, tc) +{ + void *p; + int error, pagesize; + + ATF_REQUIRE((pagesize = getpagesize()) > 0); + + p = mmap(NULL, pagesize, PROT_READ | PROT_MAX(PROT_READ), + MAP_ANON, -1, 0); + ATF_REQUIRE(p != MAP_FAILED); + + error = mprotect(p, pagesize, PROT_WRITE); + ATF_REQUIRE_ERRNO(EACCES, error == -1); + error = mprotect(p, pagesize, PROT_READ | PROT_WRITE); + ATF_REQUIRE_ERRNO(EACCES, error == -1); + error = mprotect(p, pagesize, PROT_READ | PROT_EXEC); + ATF_REQUIRE_ERRNO(EACCES, error == -1); + + ATF_REQUIRE(munmap(p, pagesize) == 0); +} + +/* Make sure that PROT_MAX applies as expected to mappings of shm objects */ +ATF_TC_WITHOUT_HEAD(mmap__maxprot_shm); +ATF_TC_BODY(mmap__maxprot_shm, tc) { + void *p; + int error, fd, pagesize; + + ATF_REQUIRE((pagesize = getpagesize()) > 0); + fd = shm_open(SHM_ANON, O_RDWR, 0644); + ATF_REQUIRE(fd >= 0); + + error = ftruncate(fd, pagesize); + ATF_REQUIRE(error == 0); + + p = mmap(NULL, pagesize, PROT_READ | PROT_MAX(PROT_READ), + MAP_PRIVATE, fd, 0); + ATF_REQUIRE(p != MAP_FAILED); + + error = mprotect(p, pagesize, PROT_WRITE); + ATF_REQUIRE_ERRNO(EACCES, error == -1); + error = mprotect(p, pagesize, PROT_READ | PROT_WRITE); + ATF_REQUIRE_ERRNO(EACCES, error == -1); + error = mprotect(p, pagesize, PROT_READ | PROT_EXEC); + ATF_REQUIRE_ERRNO(EACCES, error == -1); + + ATF_REQUIRE(munmap(p, pagesize) == 0); + + /* Again, this time with a shared mapping. */ + p = mmap(NULL, pagesize, PROT_READ | PROT_MAX(PROT_READ), + MAP_SHARED, fd, 0); + ATF_REQUIRE(p != MAP_FAILED); + + error = mprotect(p, pagesize, PROT_WRITE); + ATF_REQUIRE_ERRNO(EACCES, error == -1); + error = mprotect(p, pagesize, PROT_READ | PROT_WRITE); + ATF_REQUIRE_ERRNO(EACCES, error == -1); + error = mprotect(p, pagesize, PROT_READ | PROT_EXEC); + ATF_REQUIRE_ERRNO(EACCES, error == -1); + + ATF_REQUIRE(munmap(p, pagesize) == 0); + + ATF_REQUIRE(close(fd) == 0); +} + +ATF_TP_ADD_TCS(tp) +{ ATF_TP_ADD_TC(tp, mmap__map_at_zero); ATF_TP_ADD_TC(tp, mmap__bad_arguments); ATF_TP_ADD_TC(tp, mmap__dev_zero_private); ATF_TP_ADD_TC(tp, mmap__dev_zero_shared); ATF_TP_ADD_TC(tp, mmap__write_only); + ATF_TP_ADD_TC(tp, mmap__maxprot_basic); + ATF_TP_ADD_TC(tp, mmap__maxprot_shm); return (atf_no_error()); } From nobody Mon Nov 4 15:38:42 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Xhwc24YVlz5cDYF; Mon, 04 Nov 2024 15:38:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xhwc23NXZz4gf0; Mon, 4 Nov 2024 15:38:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730734722; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HIVusyVKdK/sdk2lJ9vhKLfU0GwYiMhHpFmGIlCwKkY=; b=B94/eWy+TV3XpRT/1lbYYToBPzUs8nOTG8XmYm0ePiN09rkRx93vK28xEwXXmKflBugm1H kKhMv9v+00lSOrGTtBacSGHd1N21na9zDodOZ+CWx7LbYblBf0Z60MqjyNAjgtvooXyMe2 41UmOH+SVRCCjWYl3l9KMjfqCQDsRfcCuAWVrQmWy47EU0b4+GnG1tzXUzEboimRmkzQ4L Xo3TPRtKczoRglbFAjNAlEAWeojGfGtj+qGtJzKVcSYLuMba6+5siZ/kKoXT8zTJYV9563 3XxXCYAIuBI9msKBtTy00ZgJsnxb3Iun+96fmxKnGHjmu0f47dSrl7GXeUVyLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730734722; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HIVusyVKdK/sdk2lJ9vhKLfU0GwYiMhHpFmGIlCwKkY=; b=WI8n6LVYk/Am5NNheU4jx8LK+kIPJt60Fk+9E9cxD5WYwGSx+qQg9TVi26mPtIEUhBhBxP kYhWExTVGiO401kW9BNEU/ImfLD8pWNaown3F6d2MJkUEWmrqniI293A9vxRm6yx+d00UH 5VdVD+040H5qDrcZoHgcJA15lMyQgR7YZaMfd0zumaKUqA0KNh/AIYF0kwKN72Sw55cJE8 maGBT3OJ6OdSC8EiNKTdZ4eU3YXojUY6z0AQ0vn93oEX6YSIskrmKtUfvt0uV1JbFclBhh 8BfIugVPJQqLxccEu7Px3Iq5VhG6BvZDaxEEevAAbmyCZyvCZmscw6vzMFuLxQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730734722; a=rsa-sha256; cv=none; b=BgTdPHu6x8yLdl3t6Br3MU5rpX0/7PdiGeuAkxI2cxY/YM4djGkfYnVmqXTtlBsnjZJLSS kistjBvzhVnjuH8JmNcWTt8g/qS/G1AvN+toh9LxawSXi2M2NqhnM+n3TInzes8ycHsozp O4OQShZhIdFQxu4GQmg+YFg5VOG3D2hxhcahJ3mVkwpCVL2sbqXAtNn4nMmcUPjFLpqTnW 3T7fnUBeQGd1Ia80EUwaFTySY6eoNUxNmK255UUMayjnLaN/w3qQEJvaymUhDs949D+vdf 6/f0Vhgipg/d/mxw1BonrkSoD6kZ+mlHa3h7GPsu1scO4aN45Xmp4sih4zkWpw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Xhwc2303bzfM5; Mon, 4 Nov 2024 15:38:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A4FcgDv035972; Mon, 4 Nov 2024 15:38:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A4Fcgle035969; Mon, 4 Nov 2024 15:38:42 GMT (envelope-from git) Date: Mon, 4 Nov 2024 15:38:42 GMT Message-Id: <202411041538.4A4Fcgle035969@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 5a07e99407ea - stable/14 - camcontrol: Plug a memory leak in getdevtree() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 5a07e99407eac4211de2d985b39b4c77e94beb09 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=5a07e99407eac4211de2d985b39b4c77e94beb09 commit 5a07e99407eac4211de2d985b39b4c77e94beb09 Author: Mark Johnston AuthorDate: 2024-10-28 13:52:32 +0000 Commit: Mark Johnston CommitDate: 2024-11-04 15:38:35 +0000 camcontrol: Plug a memory leak in getdevtree() PR: 275338 MFC after: 1 week (cherry picked from commit abfd031b482f92320e29a2c2ac80fcd23e134446) --- sbin/camcontrol/camcontrol.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sbin/camcontrol/camcontrol.c b/sbin/camcontrol/camcontrol.c index db26b45ac508..3348d759b913 100644 --- a/sbin/camcontrol/camcontrol.c +++ b/sbin/camcontrol/camcontrol.c @@ -652,6 +652,7 @@ getdevtree(int argc, char **argv, char *combinedopt) if (need_close) fprintf(stdout, ")\n"); + free(ccb.cdm.matches); close(fd); return (error); From nobody Mon Nov 4 15:39:00 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XhwcN5cQnz5cDcJ; Mon, 04 Nov 2024 15:39: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XhwcN53Qsz4h5Z; Mon, 4 Nov 2024 15:39:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730734740; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SMuTZMv4MfWZ9hW3RFS2PIUEbgK+85oVKzeALoWM734=; b=KE5iJbiBd1Z+nYUAJEjp/bD2sDNjwo8zZAQkJq+y8PNCV3YB8ig879sRED+2DxZuqxu1CX W3ollSoSzwp94nsPmD2vczz8dF1D9F12mvi40OEZYJQPd762vhKhph+4PML7B25Ih/VuTZ n72pygIVqiGI6Sz+eVnYq2S9xIXla9EKJ8/ZDVSGP3Mx7O0Idh3Nt6wJxhfa2mB3XPtTVl gKiWqlf33w/gK5UqaGg2Y/NNu/yU361jCR+AQUzRzscY0ROv87zbnOkNtCX5eh6eT3C6yl cNjrLNcjBB+hBD/dVjZfi/J73fM7WHXT+tuylTJF7myVaMY+l2/RijepY/o0Aw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730734740; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SMuTZMv4MfWZ9hW3RFS2PIUEbgK+85oVKzeALoWM734=; b=ysp3hdTtD0Mcv16kGfPhfqvs8VeDuJe9ljwolxKmVOfpTkOlSdeDWVxXsxszlL4e5j6SBY LX63wQSdKNtIxf2njbv5mzz7V6e9a8x+s4LaErTOG/Wc3XAT5Bo9nR9l3yb2lLbdHS06Ur 5pwM+204bM5Ap1XXlbkVceRgWVVHKa5Zymyd12gAHM3/2ddRNU7xkPXHavoI793bJAEjW4 56lLlXPzvFL+nNi+fn1MzPgnFLe/+iv/aJUxJWWVZ3FiFhlFUcn5Ot8kn1pwHonRlV/yM9 q2v8gxjj7y6iz7E/v5K4njD8hHWaN7NCp6vOkiLzHQPCvby4RGbW+xD+OB9x/w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730734740; a=rsa-sha256; cv=none; b=Se1OPq7tmpQUuMep80T8LHZfIPBLl3xDl1sA8ZGCH4tOrCApl5Vh0/KqHqFW57l8UcWike Y6Yu8zWvzQEJFvgh3RR/eg0G7T8cuRTdCwFXQhKcqetBMRxfwWnvEcZkWqiQPNKAqH0QS4 yLEbcbnBYY78K4ctOWF0d8kZ9C28W5ixALXqsPI7otnFHGQNAvkOJ+fHynxt0jiRD4gFLl XDJ/iQYv7xy/LNH1RFJQzNIO7KK0x+WEpayPOE1vd9wNgsL5E7M31s/m2HrfPDFgRFWu6d uFWcTzxokjaiYA31fGZyy+cQ8WcO9XzTCbtjihO+bKyMONzQyVbahgF3VVSnQw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XhwcN4ft7zdwG; Mon, 4 Nov 2024 15:39:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A4Fd0NM036221; Mon, 4 Nov 2024 15:39:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A4Fd09r036215; Mon, 4 Nov 2024 15:39:00 GMT (envelope-from git) Date: Mon, 4 Nov 2024 15:39:00 GMT Message-Id: <202411041539.4A4Fd09r036215@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 4f47e1d88f91 - stable/13 - camcontrol: Plug a memory leak in getdevtree() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 4f47e1d88f9107af16ffea5d36c505b1fcc44944 Auto-Submitted: auto-generated The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=4f47e1d88f9107af16ffea5d36c505b1fcc44944 commit 4f47e1d88f9107af16ffea5d36c505b1fcc44944 Author: Mark Johnston AuthorDate: 2024-10-28 13:52:32 +0000 Commit: Mark Johnston CommitDate: 2024-11-04 15:38:53 +0000 camcontrol: Plug a memory leak in getdevtree() PR: 275338 MFC after: 1 week (cherry picked from commit abfd031b482f92320e29a2c2ac80fcd23e134446) --- sbin/camcontrol/camcontrol.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sbin/camcontrol/camcontrol.c b/sbin/camcontrol/camcontrol.c index 71b2a318ccfe..4b192c48cafd 100644 --- a/sbin/camcontrol/camcontrol.c +++ b/sbin/camcontrol/camcontrol.c @@ -652,6 +652,7 @@ getdevtree(int argc, char **argv, char *combinedopt) if (need_close) fprintf(stdout, ")\n"); + free(ccb.cdm.matches); close(fd); return (error); From nobody Mon Nov 4 15:56:34 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Xhx0f3H44z5cFX4; Mon, 04 Nov 2024 15:56:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xhx0f2Y1Bz4kYC; Mon, 4 Nov 2024 15:56:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730735794; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lWDOX+OGu4pvEDwkvETW38ENGl05/y0lKIgbNEgqpxE=; b=GbXdpTyn97JjxNv0BwApfnz7oyBgTe1mQ8TzG7bHXLpSd00g9a/iJpY4N8Jayg04rPLeuN NWYtWTgtkrK9bwM0hbVdLl2HDxkDzo/koQRLrmLFahoOxP1PmqJXsJk8qwSDM9dmLsPpuL Mo5xHFcT2o6OwKqGPGtQEqyAk3uXjv6ERLehEMp6aQdWN6+1mDSiWvnNK7wP1oNldjobMh dfa1msRZJ9XUb35OxKnX/aCutNCB+eLjqfNtKu1cYxUdgtU5xbrqK7PyEDKGsKxEqu42Z4 xxwpHQR1c5effmPw2waHtEl1sNoP4y8f++di3aZTKIb6UbRu6372SqidbU5OmQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730735794; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lWDOX+OGu4pvEDwkvETW38ENGl05/y0lKIgbNEgqpxE=; b=gtRfX8mcfM2cpna0Z3qChJC1HPWTo/0VjaWjwOvabQ6Xmdv3ntAVFGlqVghjbso9lGoE0/ zT1HYsBc9H6LLwLJVuRWECrfVbMPJwbwgRT6xJi8MEA0aBVfne4EY9FA0U5OmG4asBplEp NxhabSBNsyrQg+HHVuKO5xoNzyRJO5ELWCjoO1aKxtMepLUxljc6MOM4+Zq4oBThUPWb++ SSVZqyYUu8rAFKZw7iHfkW8CmOUDEUlpDzCgTdP6VyxUoBO7wrr0CMXdxrBiNDfxbeTItI +9xUwUQoRWxjWEMkMUIJOmnFE7w/7K/pyzRkcYFAAS4TewZODdtlylxzMwfxYQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730735794; a=rsa-sha256; cv=none; b=H5Fm+21OQxeohLjGflrDCYMeSx5F7BRp8K6jTOL4frTI8/0ATL+wslx4mGDmAb2yjtXJL3 xjlAI/IGQkNBV35znhbYe5EEGnOl5jtzUXqDOIfIN6j15QMFNtNT9AZvZnaaguv50Hs5CC gg5A+My2W3wkJiHxDabWlsARiH0H/iOX+FSLiU2mccrdxIVb065LfRWG6BYRbWzFQCNrvz ECGwnnzpVM7UMtEiztzqjCgh+aJ1Iqr4wmoMGcqHzQjeVsjhJW7PK1EhQwSOP8vpNOyr6y nvwccaS8VLM2yYFxgjUOw4hq0rJBl//rzDEjU4zTkOg5pok4FO83CZ3AcWlIhg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Xhx0f28rJzfx0; Mon, 4 Nov 2024 15:56:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A4FuYUJ071908; Mon, 4 Nov 2024 15:56:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A4FuYdJ071905; Mon, 4 Nov 2024 15:56:34 GMT (envelope-from git) Date: Mon, 4 Nov 2024 15:56:34 GMT Message-Id: <202411041556.4A4FuYdJ071905@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 3609e56813b4 - stable/14 - manuals: Fix errors in .2 pages List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 3609e56813b4322660c9f4a882f7336d57b7d723 Auto-Submitted: auto-generated The branch stable/14 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=3609e56813b4322660c9f4a882f7336d57b7d723 commit 3609e56813b4322660c9f4a882f7336d57b7d723 Author: Graham Percival AuthorDate: 2024-09-20 01:54:39 +0000 Commit: Mitchell Horne CommitDate: 2024-11-04 15:56:24 +0000 manuals: Fix errors in .2 pages These were reported by `mandoc -T lint ...` as errors. fhlink.2, fhreadlink.2: remove unneeded block closing. getfh.2, procctl.2: add necessary block closing. ptrace.2: -width only takes one argument. swapon.2: and weren't being displayed, because .It is for a list item whereas .In is for included files. Also, we want a blank line between headers and the other one. Signed-off-by: Graham Percival PR: 281597 Reviewed by: mhorne Sponsored by: Tarsnap Backup Inc. (cherry picked from commit 650056363baddb83c61c85b0539ee536f3d4b56c) --- lib/libc/sys/fhlink.2 | 1 - lib/libc/sys/fhreadlink.2 | 2 -- lib/libc/sys/getfh.2 | 1 + lib/libc/sys/procctl.2 | 1 + lib/libc/sys/ptrace.2 | 2 +- lib/libc/sys/swapon.2 | 5 +++-- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/libc/sys/fhlink.2 b/lib/libc/sys/fhlink.2 index 332856630879..b7f7d02dd136 100644 --- a/lib/libc/sys/fhlink.2 +++ b/lib/libc/sys/fhlink.2 @@ -38,7 +38,6 @@ .Fn fhlink "fhandle_t *fhp" "const char *to" .Ft int .Fn fhlinkat "fhandle_t *fhp" "int tofd" "const char *to" -.Fc .Sh DESCRIPTION The .Fn fhlink diff --git a/lib/libc/sys/fhreadlink.2 b/lib/libc/sys/fhreadlink.2 index 23850c6a2117..222142de223e 100644 --- a/lib/libc/sys/fhreadlink.2 +++ b/lib/libc/sys/fhreadlink.2 @@ -36,7 +36,6 @@ .In sys/mount.h .Ft int .Fn fhreadlink "fhandle_t *fhp" "char *buf" "size_t bufsize" -.Fc .Sh DESCRIPTION The .Fn fhreadlink @@ -86,7 +85,6 @@ The file handle .Fa fhp is no longer valid .El -.El .Sh SEE ALSO .Xr fhstat 2 , .Xr fhlink 2 , diff --git a/lib/libc/sys/getfh.2 b/lib/libc/sys/getfh.2 index f5eaf4be7874..ae3b67edf1e8 100644 --- a/lib/libc/sys/getfh.2 +++ b/lib/libc/sys/getfh.2 @@ -214,6 +214,7 @@ argument is not an absolute path and is neither .Dv AT_FDCWD nor a file descriptor associated with a directory. +.El .Sh SEE ALSO .Xr fhopen 2 , .Xr open 2 , diff --git a/lib/libc/sys/procctl.2 b/lib/libc/sys/procctl.2 index cb5234b6e40c..b040116a8e60 100644 --- a/lib/libc/sys/procctl.2 +++ b/lib/libc/sys/procctl.2 @@ -712,6 +712,7 @@ following statuses: The status is or-ed with the .Va PROC_KPTI_STATUS_ACTIVE in case KPTI is active for the current address space of the process. +.El .Sh NOTES Disabling tracing on a process should not be considered a security feature, as it is bypassable both by the kernel and privileged processes, diff --git a/lib/libc/sys/ptrace.2 b/lib/libc/sys/ptrace.2 index ae1770315aa5..9b789a0e45b3 100644 --- a/lib/libc/sys/ptrace.2 +++ b/lib/libc/sys/ptrace.2 @@ -830,7 +830,7 @@ value. If the system call completed in an unusual fashion, .Va sr_error is set to a negative value: -.Bl -tag -width Dv EJUSTRETURN -compact +.Bl -tag -width EJUSTRETURN -compact .It Dv ERESTART System call will be restarted. .It Dv EJUSTRETURN diff --git a/lib/libc/sys/swapon.2 b/lib/libc/sys/swapon.2 index c0c12d9dde68..8cfac8ce1f64 100644 --- a/lib/libc/sys/swapon.2 +++ b/lib/libc/sys/swapon.2 @@ -36,8 +36,9 @@ .Sh LIBRARY .Lb libc .Sh SYNOPSIS -.It vm/vm_param.h -.It vm/swap_pager.h +.In vm/vm_param.h +.In vm/swap_pager.h +.Pp .In unistd.h .Ft int .Fn swapon "const char *special" From nobody Mon Nov 4 15:56:35 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Xhx0g4CBjz5cFX5; Mon, 04 Nov 2024 15:56:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xhx0g3XbCz4k8B; Mon, 4 Nov 2024 15:56:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730735795; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pXVrxJ8SuowBigRYQud7/4cR3G9Li+te6xNKLXrPOMQ=; b=Kc2uJbM7qOg8cXyeRg4Ih3tUdc57hk7okA7Sa4UzphVn2FXJ7e6RD5iBKAAONOTeJVQewo 22V5w8zSoFWeoYe2vnk6DbVsNr9k1haevN4/AIGbDcxxUKrwoJ5Pxl7GLHLgBwSsuAVoKV jTLgr6gAaIg5ex8jqj4Qgwf7Lw1T6tPUFnTbPw3Ffj5Y/c/f+GQWX+HjLuokNQ5ogmv3N6 nQiEG5UCtq5ulNV1oe5IVKBDFXJJTIUZXvqM+On7IY5vo+GCNP5SZVXgHwhp5y9ZCfO1gQ WVqsjt9WPRwErxQv9cAiMYt/LwpDvW6UYF8MyrT7yeCxtbSjPoHllV3DD2DZiw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730735795; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pXVrxJ8SuowBigRYQud7/4cR3G9Li+te6xNKLXrPOMQ=; b=t8B0CJTqQUX5aTA3OJQi8PdmCbFguNqmKAeQMZ+5CqXGGAiBJ3W8+gzv+iIQKXlY4ECikt ewDkBiJJ+mNhrLXPeny9Kc7nbiw0SWQHPSx4IqlBUwcf5TzTJjUG+Y+h85bOKg53sC4Jr3 EJfO0FVmRDUrLS+4h1bM/YnsxzamDGvwY+iRDRT4Hvhfa+oubDkCbcFDAO48uRUNzkqilX 7zrY2L9fD9Du49KjThKgQaVex2G2gOJSQB6csqipAY4OebwF1IccBzEfepd2heUonCxL+o U/Rv76+lhk2GwEHm9YbtRJz4dRP1Pcv2afOqrSoXtktPlp+3sg+5HWPck+Hjug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730735795; a=rsa-sha256; cv=none; b=yp3tBtFyOWniOgI14LyeokwjEwZAZW47vWhJb6RrnhWzRdFVYgag5JFX+eQ8lmDbXovPZk uKKb1FDH1m7U9IfQG6iNM7YfRG+HfrouDGxpITxRzwCOZ62O9niiMGHtvNSPiWLPvAjyPq xW0NcQqm/edyajtEPZ0+IOqMz+es4hXhE3IGiTLRuQbhOprYsmlS9ZvEBag+geNL19JQo7 flypGpp7csitTXRiIqUhfkvrGQO3nElZ4aZ1MROnTpdabRTGFdg2F1zEL2Cs4bodMyijgD 6k4PdHf9WEKtRw85wVGLdpS7UdBG/o7BwqYtgClyRxFojzj04SkQDCVw+Y3WLw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Xhx0g38J7zfx1; Mon, 4 Nov 2024 15:56:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A4FuZGc071962; Mon, 4 Nov 2024 15:56:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A4FuZET071959; Mon, 4 Nov 2024 15:56:35 GMT (envelope-from git) Date: Mon, 4 Nov 2024 15:56:35 GMT Message-Id: <202411041556.4A4FuZET071959@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 5b9e1a3ac18a - stable/14 - ipf.5: revert C style(9) applied to man page List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 5b9e1a3ac18a3868b7594d6bba455dea29a29e7d Auto-Submitted: auto-generated The branch stable/14 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=5b9e1a3ac18a3868b7594d6bba455dea29a29e7d commit 5b9e1a3ac18a3868b7594d6bba455dea29a29e7d Author: Graham Percival AuthorDate: 2024-09-24 17:11:33 +0000 Commit: Mitchell Horne CommitDate: 2024-11-04 15:56:24 +0000 ipf.5: revert C style(9) applied to man page These changes were made by accident in: ipfilter: Adjust userland returns to conform to style(9) 2582ae5740181e0d2bab10003d66ae91c9b56329 That commit made similar mistakes in other man pages, but those have already been fixed. Signed-off-by: Graham Percival Reviewed by: mhorne Sponsored by: Tarsnap Backup Inc. Pull Request: https://github.com/freebsd/freebsd-src/pull/1433 (cherry picked from commit ce251baf42f32317b4b4ef60203d6f47204c47e9) --- sbin/ipf/ipf/ipf.5 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sbin/ipf/ipf/ipf.5 b/sbin/ipf/ipf/ipf.5 index 79e6b2c45b05..8d2f6f58379b 100644 --- a/sbin/ipf/ipf/ipf.5 +++ b/sbin/ipf/ipf/ipf.5 @@ -223,7 +223,7 @@ To address this problem, a block rule can be qualified in two ways. The first of these is specific to TCP and instructs IPFilter to send back a reset (RST) packet. This packet indicates to the remote system that the packet it sent has been rejected and that it shouldn't make any further -attempts( to send packets to that port. Telling IPFilter to return a TCP); +attempts to send packets to that port. Telling IPFilter to return a TCP RST packet in response to something that has been received is achieved with the return-rst keyword like this: .PP @@ -239,18 +239,18 @@ For all of the other protocols handled by the IP protocol suite, to send back an error indicating that the received packet was dropped requires sending back an ICMP error packet. Whilst these can also be used for TCP, the sending host may not treat the received ICMP error as a hard error -in( the same way as it does the TCP RST packet. To return an ICMP error); +in the same way as it does the TCP RST packet. To return an ICMP error it is necessary to place return-icmp after the block keyword like this: .PP .nf block return-icmp in proto udp from any to 192.168.0.1/24 .fi .PP -When( electing to return an ICMP error packet, it is also possible to); +When electing to return an ICMP error packet, it is also possible to select what type of ICMP error is returned. Whilst the full compliment of ICMP unreachable codes can be used by specifying a number instead of the string below, only the following should be used in conjunction with -return-icmp.( Which return code to use is a choice to be made when); +return-icmp. Which return code to use is a choice to be made when weighing up the pro's and con's. Using some of the codes may make it more obvious that a firewall is being used rather than just the host not responding. From nobody Mon Nov 4 15:56:36 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Xhx0h6GFfz5cFX6; Mon, 04 Nov 2024 15:56: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xhx0h4PGRz4kVd; Mon, 4 Nov 2024 15:56:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730735796; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=A9Uxy7l0VSpoRgwFrzFX4upqLc/FCspdmZf/nH+R8hI=; b=Of6qNKr9EX/5QtM4g4GxgrE1z+picV9zhxbrMw4xWbIrSDJqekQw7+znapyRxyRJxjIR5y yzzyA/D+w+ioITb2ku0pHrBOeOULzTtTxZYrBD1HJC+MHaBEIzr6GZpA9g9syoru3u71fz Fw6tkAjHIL35Crrt7s6N7nphr4CuiulQZxzjHWqmxa7Z5aUFsTq17TUBkE6EjEEspMpvGO Iaz9+wk3SAnLNABdLe3I43ScRE0r7zJNN98XfspkmEQilAYpSVuwT85eZjtLEDlQwH6NOU HCU79Rkjn/aWAjgG83D442Ec13PE8ocjO4fkcllZ2T2y7x9am1ML22J4LSxWXQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730735796; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=A9Uxy7l0VSpoRgwFrzFX4upqLc/FCspdmZf/nH+R8hI=; b=cLrfqRIF92Rd6tA24zFWNqXjOVpk0jkqWOfCq0jYjMoSsdAU4lzRKpRPEufHzWb61ypGco 7yCQjYWIlvnDGKQ9zRGAUmvEYLjj3+kp8SS0ybeqmtiLxyMuRcutG4cZpM4WoO2qy6VzUa pyVW9D+8/hxs9NrIS08b+BfHmmt+nkgIEDk6QOGi7eDHhqbd5qRyzTjinChNR0idSmNWZy 84+czyYXNp9NyUfqpmdIffyBKipCkT+HX7IYqJXTpYn1Hm980XqmGCNkAzzYJ9DWTgJoCj /jsWFyXB23giFF+FSbflW/OJIffcpeieWbhA3IIEtLeIFqC/mvDpff6OfkAzYQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730735796; a=rsa-sha256; cv=none; b=xDeGewdkFyouN3grp4tIZMpXbday36njlBWbruLJdRGHiDqhLvz4VA7BHqCRpP9tAkux9f xrQZqFYqn3DyOnk/Ft4Ucy2v8p3bYx07ULPVMrd+GNIkUA7Nf7V7wUZLOZ76BZCIw8uy1G RYe+H42Qll0tTXM+Eg3q2v3cU6q5XuSfpFV6Z1+b6bBgMr84oSM0i73PJjlSZaawGxMEPW 6LLhCPWR3QfHrmiyDoBykCgEJ9bp9dHITTgpWqnoacgrGGIjmiXZUw0ZWu2v2iXlGqCYdp HHRui1NxZr0xk9eHK3+5E+AWmqMWDYbDI/Sqbc+ok42N36Zr/KYMVAA20wrI3w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Xhx0h3wQnzfn9; Mon, 4 Nov 2024 15:56:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A4FualY072013; Mon, 4 Nov 2024 15:56:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A4FuaTT072010; Mon, 4 Nov 2024 15:56:36 GMT (envelope-from git) Date: Mon, 4 Nov 2024 15:56:36 GMT Message-Id: <202411041556.4A4FuaTT072010@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 055d2819bbbc - stable/14 - stats.3: Fix "skipping end of block" syntax errors List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 055d2819bbbcd2fbff000b07f416cba3f2a83a06 Auto-Submitted: auto-generated The branch stable/14 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=055d2819bbbcd2fbff000b07f416cba3f2a83a06 commit 055d2819bbbcd2fbff000b07f416cba3f2a83a06 Author: Graham Percival AuthorDate: 2024-09-24 18:11:03 +0000 Commit: Mitchell Horne CommitDate: 2024-11-04 15:56:24 +0000 stats.3: Fix "skipping end of block" syntax errors These were reported by `mandoc -T lint ...` as errors. The rendered output (in ascii and html) is not affected by this commit. There was a small misunderstanding about the mdoc format: a 1-line enclosure does not need a closing tag. For example, Pc is for closing an Po; if a line uses Pq (enclose the remainder of this line), there's no need for Pc. Signed-off-by: Graham Percival Reviewed by: mhorne MFC after: 3 days Sponsored by: Tarsnap Backup Inc. Pull Request: https://github.com/freebsd/freebsd-src/pull/1434 (cherry picked from commit 2d69f02c5745a89c01bcd76389d53fd2a4189f02) --- share/man/man3/stats.3 | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/share/man/man3/stats.3 b/share/man/man3/stats.3 index 4dfb1dac63a2..7fe1fa613def 100644 --- a/share/man/man3/stats.3 +++ b/share/man/man3/stats.3 @@ -102,17 +102,17 @@ .Fc .Ft struct voistatspec .Fo "STATS_VSS_CRHIST<32|64>_USR" -.Fa Sy "HBKTS" Ns Pq Sy "CRBKT" Ns ( Em "lb" ) , "..." Pc , +.Fa Sy "HBKTS" Ns Pq Sy "CRBKT" Ns ( Em "lb" ) , "..." , .Fa "vsdflags" .Fc .Ft struct voistatspec .Fo "STATS_VSS_DRHIST<32|64>_USR" -.Fa Sy "HBKTS" Ns Pq Sy "DRBKT" Ns ( Em "lb" , "ub" ) , "..." Pc , +.Fa Sy "HBKTS" Ns Pq Sy "DRBKT" Ns ( Em "lb" , "ub" ) , "..." , .Fa "vsdflags" .Fc .Ft struct voistatspec .Fo "STATS_VSS_DVHIST<32|64>_USR" -.Fa Sy "HBKTS" Ns Pq Sy "DVBKT" Ns ( Em "val" ) , "..." Pc , +.Fa Sy "HBKTS" Ns Pq Sy "DVBKT" Ns ( Em "val" ) , "..." , .Fa "vsdflags" .Fc .Ft struct voistatspec @@ -316,16 +316,16 @@ The maximum VOI value. The minimum VOI value. .It Dv VS_STYPE_HIST A static bucket histogram of VOI values, including a count of -.Dq out-of-band/bucket Dc +.Dq out-of-band/bucket values which did not match any bucket. Histograms can be specified as -.Dq Em C Ns ontinuous Em R Ns ange Dc -.Pq CRHIST Pc , -.Dq Em D Ns iscrete Em R Ns ange Dc -.Pq DRHIST Pc +.Dq Em C Ns ontinuous Em R Ns ange +.Pq CRHIST , +.Dq Em D Ns iscrete Em R Ns ange +.Pq DRHIST or -.Dq Em D Ns iscrete Em V Ns alue Dc -.Pq DVHIST Pc , +.Dq Em D Ns iscrete Em V Ns alue +.Pq DVHIST , with 32 or 64 bit bucket counters, depending on the VOI semantics. .It Dv VS_STYPE_TDGST A dynamic bucket histogram of VOI values based on the t-digest method @@ -433,15 +433,15 @@ Where templates need to be referenced via textual means, for example via a MIB variable, the following string based template spec formats can be used: .Bl -enum .It -.Qq Qc Ns +.Qq Ns : .Ns , for example -.Qq TCP_DEFAULT Qc Ns +.Qq TCP_DEFAULT Ns :1731235399 .It -.Qq Qc +.Qq .Ns , for example -.Qq TCP_DEFAULT Qc +.Qq TCP_DEFAULT .It : .Ns , for example From nobody Mon Nov 4 15:56:37 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Xhx0j74NJz5cFf8; Mon, 04 Nov 2024 15:56: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xhx0j5gNsz4kbr; Mon, 4 Nov 2024 15:56:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730735797; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ehSM6EY3E73w5JJv//k7SRThUOai0iKO+I8k7l9q8g4=; b=NnhQkoRHzU6j0/qhWOQWh+ebtOojXrNuMDwQcjojhWJXJfBtgbC0PvHvo/oIny1vU1HYR9 rWvxOGz3MjC0nF2RDvTvGbq2NvU7NrVeyneFt7ixXFXujKIvYjvbQ3+/g9bTkhfLkeZxlK EM2xjCYpGKvhlntf9KU8TIUlx0yOdybeq3W7Uv2OSUo9/s1NKq/oyOPmZqZUD6wjXbSta6 X5Gzkd8LNOw1qmdZTj2b2YHQ8t3v7g8evWAMJUulaCA+/4fmrijtNElD6S+ydz4DK4/j1Y QbtwpbwOX4OdOvV2mN/gu4tg9lQDoh8LHVQtrf9yhaJmUOWKHdhGoIhMrHqmzA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730735797; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ehSM6EY3E73w5JJv//k7SRThUOai0iKO+I8k7l9q8g4=; b=hVHaozclMIweivDvchpyXxQGLdkeq/zcW/EjynpbCq3gioTYhZwPJJLSt50P7VXCNgPU3y v21ieV98h34/RqVkpyAD1yBchnd+b1mEav2hzye/Meydf4Fr/TXBMgXIExFUReAp1F7axB 5212p5cS15bnl5q/FwIpZdQpAntQrtOnUU1G9dzrnuGz25Gzze7liRMA9zX+R/kjWwi30g LUisanSwA2mnlUHM9Pu6A2rrivVC+GYPqPERQQygx9UHp27CJ40e1dPEHdbcXMT7bwvQRY QIHvt1HFqk65VDxqbaNuQK16xOJPsE1d+ze7uB29JTCn3NOy1RVIbXOQIpIe8A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730735797; a=rsa-sha256; cv=none; b=wH/v50cfpnxkacdutDqwe2umPOya0wU8dPmoDn8INMCGK/rV/qXEknLXbQhpZ9MERL3F2j PoXoFd61JyFUMEVM8PGdzYseQLWeF3ke2W0IhIy3CC9bPUma7uQQNeo9H71DxUEP33gQPo BEWNRBSjWh+440ErxZqnLvDok2m6tDCqNXB0M1LmuShhq7qJ7DGl/V06ZIyVI2Zi2qLWjF 4FwSPRegl7Bv3BkLIBOkSBps2/VyOej5YEMlDb2woB0ethX/NOxVXf1UU4npRJ1m2gGHs4 +1lc84Jg+F3S7JvcrqoJUOX0EOhfBLhaGFyJPa3jkG7XmrOExfr4jDp9R7Z+bg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Xhx0j4ryqzg9b; Mon, 4 Nov 2024 15:56:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A4FubR4072068; Mon, 4 Nov 2024 15:56:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A4Fubbw072065; Mon, 4 Nov 2024 15:56:37 GMT (envelope-from git) Date: Mon, 4 Nov 2024 15:56:37 GMT Message-Id: <202411041556.4A4Fubbw072065@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 3ee3a5a7681f - stable/14 - vale(4): refer to the valectl(8) management tool List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 3ee3a5a7681f0bc43ad7f357d600ada6e66935cf Auto-Submitted: auto-generated The branch stable/14 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=3ee3a5a7681f0bc43ad7f357d600ada6e66935cf commit 3ee3a5a7681f0bc43ad7f357d600ada6e66935cf Author: Tom Hukins AuthorDate: 2024-08-06 16:43:03 +0000 Commit: Mitchell Horne CommitDate: 2024-11-04 15:56:24 +0000 vale(4): refer to the valectl(8) management tool Signed-off-by: Tom Hukins Reviewed by: imp, mhorne MFC after: 3 days Pull Request: https://github.com/freebsd/freebsd-src/pull/1369 (cherry picked from commit 9a3fa77585e55e78004cdc9467b986968a77e8de) --- share/man/man4/vale.4 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/share/man/man4/vale.4 b/share/man/man4/vale.4 index 77e4433d2742..a9f172e11fba 100644 --- a/share/man/man4/vale.4 +++ b/share/man/man4/vale.4 @@ -26,7 +26,7 @@ .\" distributed with 4.3BSD Unix. .\" $Id: $ .\" -.Dd March 6, 2022 +.Dd August 30, 2024 .Dt VALE 4 .Os .Sh NAME @@ -100,7 +100,8 @@ qemu -net nic -net netmap,ifname=vale2:c ... & qemu -net nic -net netmap,ifname=vale2:d ... & .Ed .Sh SEE ALSO -.Xr netmap 4 +.Xr netmap 4 , +.Xr valectl 8 .Pp Luigi Rizzo, Giuseppe Lettieri: VALE, a switched ethernet for virtual machines, June 2012, http://info.iet.unipi.it/~luigi/vale/ From nobody Mon Nov 4 15:56:38 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Xhx0l17jmz5cF5s; Mon, 04 Nov 2024 15:56:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xhx0k6yr0z4kLV; Mon, 4 Nov 2024 15:56:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730735799; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JlYR5yXndFvIMy1BrV4fqd/+eMg2slhEImBo41rK4fM=; b=ryQynpnPKfE4aqjHw7GxwE1/1+McNfg8M7p4RLtBOkJKIESDSU1+itmyfQo+IQB++gomrJ aG+x891i+TE/iJikolPyXaqQQrBROYvZOXl8EP1lLb1v7yPZIZNtRUdIIUX4wCwTGXForh bOoC9f1+Pc/4BDODuJqj1Kz+60eItoCXsPASwSfXZRECh9KFK03tpmxhB4hGAhSwdata1a 2D5qe4s60Zyo4xX7eqpyjhkdPf+vJcxuzGSiXTbaKr4xZwHlOmSJVxhEL8qcOEIc2DEjCB dfQAMqg9IxZh60f1k0n3D3SLFVVQSvYOl5KqwWzA7Lc3FuCXShO/40boHpqIQQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730735799; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JlYR5yXndFvIMy1BrV4fqd/+eMg2slhEImBo41rK4fM=; b=pmkG0LD8tX1Up0MUd171WHpFybdAdBpj7L8hXLQKjxECVT353L0jrmxcEuoSgFxfdrxXeS Xzcf5hEhDZa6b8C3/eBlSzvLjdCSFH72pS3dla6f1XNr/vNlx+KQlMuyO8Q2INvRuVwk1M q5+S968uBQQWDCY79x7XxMxxpPPj2ahvWfAI8O9+iJwYlitwdpZEmAj9SiEHpAMLhGkPqc i2D/BnQroJwfUIE6WuhjsmsNa8spXqaaRiSXUjdZU824lC0A/WhDPX9iZFw7RT2nGgnXOO WyIAQs3M6hQshDbArj2nilNt2jAK8rfxfeFrFoOI9kLPtBCeRpcDWIrt9mmbaw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730735799; a=rsa-sha256; cv=none; b=opJ0KYiCn7JxNdlX69FIpZRtv8tO54Q9aC0irlxHMrnTkwQSq5q2EEQluVu9QDm7BD7AGN 38eVEV5WlRIgxmfPtnt5ME1tynIrtgCLNlgHfpq1ktlG0CXQmNYUFN8jwMboxumbu+3/qv 2crwYLd3YI8CUtLEfQhj2DhD8f8Ld5Xdmu5PLgfrCL3DZalOu/84mXFfzvJbZsYccHyWKx Iyl1unb3ZuTCymqyoCnZcoiLW+lNJNAsIWAAndI5Jjd+FNRIVraU2teW+NfJZXwpTrn3Vu jKHs7PdDTfZEiGDbCfeIbYyTIpYCIuU65BdItopC8FjPenpJvcQY3HZDQk88rw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Xhx0k69HTzftG; Mon, 4 Nov 2024 15:56:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A4FucT6072110; Mon, 4 Nov 2024 15:56:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A4Fuc0d072107; Mon, 4 Nov 2024 15:56:38 GMT (envelope-from git) Date: Mon, 4 Nov 2024 15:56:38 GMT Message-Id: <202411041556.4A4Fuc0d072107@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: fcfb9a7a0333 - stable/14 - valectl(8): explicitly mention network switches List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: fcfb9a7a033388d077c29e80db5fa3f6a9cf13f8 Auto-Submitted: auto-generated The branch stable/14 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=fcfb9a7a033388d077c29e80db5fa3f6a9cf13f8 commit fcfb9a7a033388d077c29e80db5fa3f6a9cf13f8 Author: Tom Hukins AuthorDate: 2024-08-06 16:44:00 +0000 Commit: Mitchell Horne CommitDate: 2024-11-04 15:56:24 +0000 valectl(8): explicitly mention network switches Use the term "network switch" instead of the ambiguous term "switch". Signed-off-by: Tom Hukins Reviewed by: imp, mhorne MFC after: 3 days Pull Request: https://github.com/freebsd/freebsd-src/pull/1369 (cherry picked from commit a2f53837f0a8934cfcf7ba3c1fdfc93f217d3703) --- usr.sbin/valectl/valectl.8 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/usr.sbin/valectl/valectl.8 b/usr.sbin/valectl/valectl.8 index deb660bb0e4a..805d785f52cf 100644 --- a/usr.sbin/valectl/valectl.8 +++ b/usr.sbin/valectl/valectl.8 @@ -22,12 +22,12 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd April 2, 2021 +.Dd August 30, 2024 .Dt VALECTL 8 .Os .Sh NAME .Nm valectl -.Nd manage VALE switches provided by netmap +.Nd manage VALE network switches provided by netmap .Sh SYNOPSIS .Bk -words .Bl -tag -width "valectl" @@ -50,7 +50,7 @@ .Nm manages and inspects .Xr vale 4 -switches, for instance attaching and detaching interfaces, creating +network switches, for instance attaching and detaching interfaces, creating and deleting persistent VALE ports, or listing the existing switches and their ports. In the following, From nobody Mon Nov 4 15:56:39 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Xhx0m2YmVz5cFfF; Mon, 04 Nov 2024 15:56: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xhx0m0V8tz4kSw; Mon, 4 Nov 2024 15:56:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730735800; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=r2R4YmHH2TVELzgAbmbkwEV28sHOVJto47JRyYBmAyk=; b=OCPwfELJGdYEVyeTyhXyOLlh2TPkNQYwzYd36p6qeTANrWwb+grqWJjcDVTDY0AIEhprvL G7ZLhdzQYGVQXAqIZ8AwdvkHUGLO3aKm2ze16NERmABeJJhlo4LQIFwzEdG/Q4giJHh+tK EN2EXhK2yT4nGDYsIn/zKZUHIpCnNSjY3Zg7TAhklmKFVrZg9gcXs4w/ltLz38Xt16eaDf aAdDYO3Hc+rc3mFTBh3KfIHzjWLpldtz1PI7csTCMmkkIuhach+rslmK1rGYP4PEPUCDgq 1VrBpC+H4CTbDPGX2hKBqIm7bz1se8Mzfc+DjqajLukYQUDfLXbo4f7X4/zxPQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730735800; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=r2R4YmHH2TVELzgAbmbkwEV28sHOVJto47JRyYBmAyk=; b=ldzv9AUvm0BIj+QsO4XsI6JW/l9mueIDkkEvlmvEccHxiAkEhUBTlXNOQVTU7ruAY7PoNP aGdnKClJCeAcvJNkDliVuKweqNHxWMSnvkwXbny8TIjirc2pN/mcSNrG4c/UpdW/866u9T JpVPg4FDGJiBuynwR2tcaYhpjsJmVUPBVTUt06su6jJoTcT2s4HBLR113oDFpzUvPK2FUR VAaN3JuplT49G+SxaHQEMoIQc0F9SWv0byJ2y6WhPh5bGVeKCAXLoe7AAwZjEnZ/8CU+30 Qw9DYDhYlIVfiT+gCWJbfZNfSFTb62g1bpqeSRsyLVaKorvWMxAb7QwLxqvNkg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730735800; a=rsa-sha256; cv=none; b=EK7nQC7tiubCbT982fyItK0Zs6DR6N/oPTHG9O/iz8hgFdk7EgNxx+AD4+qinsxRBdDMXV eyXKknhsd12LdkvIqwVqTIkcv7mYLtUfrTy6bOki0a+EaF5qk+KVEadZGVduHBhx1O7R/S Aaqozia8EUicLSV5yLybJzt2MaT1bwpgIWOEmF6Fx+HyKAhXX6DuTwJG4kZujFnSCptDrQ gKAP2ukPpeKRJ/LV1L5gTh9oNH42A3JjPwDdEVJduvCBCvUeYAVmDyEHyeAvazxcBGcwX6 MOi4ni+Upj5GJDOs4CsvYA6P2LkpQDIC1qt6K20nnNQM4j3/ArredjZVGKnPZQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Xhx0m04QMzfx2; Mon, 4 Nov 2024 15:56:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A4Fuddi072182; Mon, 4 Nov 2024 15:56:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A4Fudio072179; Mon, 4 Nov 2024 15:56:39 GMT (envelope-from git) Date: Mon, 4 Nov 2024 15:56:39 GMT Message-Id: <202411041556.4A4Fudio072179@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 34b80cbdafc8 - stable/14 - service(8): direct user to rc(8) for a list of valid commands List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 34b80cbdafc8a23243ff50c9c49fe30e4336001e Auto-Submitted: auto-generated The branch stable/14 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=34b80cbdafc8a23243ff50c9c49fe30e4336001e commit 34b80cbdafc8a23243ff50c9c49fe30e4336001e Author: Lexi Winter AuthorDate: 2024-01-13 23:34:46 +0000 Commit: Mitchell Horne CommitDate: 2024-11-04 15:56:24 +0000 service(8): direct user to rc(8) for a list of valid commands New users may refer to service(8) to discover how to manage services, but this manpage does not explain which commands are permitted besides start/stop (for example, 'enable'). Add a paragraph that directs the reader to rc(8) to discover this. While here, add a few examples of common use-cases. Reported by: Mina Galić Pull request: https://github.com/freebsd/freebsd-src/pull/1057 (cherry picked from commit a84e01f02b15dc1ec091feab6e532d5ba36ffbbb) --- usr.sbin/service/service.8 | 51 ++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 45 insertions(+), 6 deletions(-) diff --git a/usr.sbin/service/service.8 b/usr.sbin/service/service.8 index ada0e6361fb8..2c5dfa3f3a66 100644 --- a/usr.sbin/service/service.8 +++ b/usr.sbin/service/service.8 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd November 9, 2021 +.Dd January 29, 2024 .Dt SERVICE 8 .Os .Sh NAME @@ -64,6 +64,13 @@ see It can also be used to list the scripts using various criteria. .Pp +The set of permissible values for +.Ar command +depends on the particular rc.d script being invoked. +For a list of standard commands which are supported by most rc.d +scripts, see +.Xr rc 8 . +.Pp The options are as follows: .Bl -tag -width F1 .It Fl E Ar var=value @@ -129,13 +136,44 @@ option is used, the corresponding variable is set accordingly. .Sh EXIT STATUS .Ex -std .Sh EXAMPLES -The following are examples of typical usage of the -.Nm -command: +These are some examples of the most common service commands. +For a full list of commands available in most rc.d scripts, see +.Xr rc 8 . +.Pp +Enable a service, then start it: +.Bd -literal -offset -indent +service sshd enable +service sshd start +.Ed +.Pp +Stop a service, then disable it: +.Bd -literal -offset -indent +service sshd stop +service sshd disable +.Ed +.Pp +Start a service which is not enabled: +.Bd -literal -offset -indent +service sshd onestart +.Ed +.Pp +Report the status of a service: .Bd -literal -offset -ident service named status -service -j dns named status +.Ed +.Pp +Restart a service running in a jail: +.Bd -literal -offset -indent +service -j dns named restart +.Ed +.Pp +Start a service with a specific environment variable set: +.Bd -literal -offset -indent service -E LC_ALL=C.UTF-8 named start +.Ed +.Pp +Report a verbose listing of all available services: +.Bd -literal -offset -indent service -rv .Ed .Pp @@ -164,7 +202,8 @@ complete -F _service service .Xr bash 1 Pq Pa ports/shells/bash , .Xr rc.conf 5 , .Xr rc 8 , -.Xr rcorder 8 +.Xr rcorder 8 , +.Xr sysrc 8 .Sh HISTORY The .Nm From nobody Mon Nov 4 15:56:41 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Xhx0n5SP5z5cFYq; Mon, 04 Nov 2024 15:56: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xhx0n1WsMz4kZ6; Mon, 4 Nov 2024 15:56:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730735801; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Tt5rZoBvTrKPcjXktke9zi8rloFDIQPQh7LWEYoUJUc=; b=qpe5S/52BXqhx030nRqtAXr/huvH3JRFJr8B8WVesn/2qSCtb67rVSCayDpWrsVwXntdj/ 83RpDC/mzGPWxGQ+TkLiV3r+KtdPNksVfRZbtPYJBV9zSKlETdl2h14iXqCxoHPyQarPLU FopzVoW72Z8iS2zR9tPj6My3WlZUWOM6A1jIns+w7Hp3oiK1JaDuP8gMFUgvG2YslGvRtQ hhQhYsnAq6E8T24iIOq8a9ZfArSzSQ8B9T5RT7dOvU4hQhCXDzbIKbjClt+mjC/mzrsXux AN9Hdk92FYPPMDJNDpdLhXYjNZ+IhmeCCPwYh2h9PBFJ98sFMAOibFXW6mTTPg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730735801; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Tt5rZoBvTrKPcjXktke9zi8rloFDIQPQh7LWEYoUJUc=; b=sg5hG0MKknIbr11u2CSy5UvAEt+HPkZ67xFi5BIsLQzsrtvWHYjp+kpFBK2ckXtLI6kBX4 S8njgmPN1xKITRn+w3f5XXNCeG2wHE1gro91Rzh1vKvCLxbPFH5GmMgHUpenKq/hV5BRxN geuhwsriOHI2vHxv8dzZIn1Cm18Iiw8joDMR/qY4vqJD5ZvQcuODM+X6Eb9VPgVL/iIEzG qwKo2CfOC78PFVXjlkoOzPwml79ZDx/gfgExPn2X6IL6Ui41l7d3CGEXcj8AFX4gTtzFG2 SO0DqeR3lWRwKY4db2V26+Mqs1aBAf+qN2Wzv32jn6SgDDGc40LVHIrAypBOEA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730735801; a=rsa-sha256; cv=none; b=rehazGHAMxV92lZynQ4AEkMNKTfnCNWSPrw5+ZdnGSo4Qw21dVXqYoOGif0D5KRJuABdxV Jnk8LvPx5Kpm/nNC2k8VIxRM21pqqXLgzVWrstg1G2aQKow7w+/VMccfqwATpdsOCCPtJH HKWIT/k4CQT3xuOqTQULkoeZMze4Vcgb408IYmMjnN3NKqgmZ5xXubCOxmUghj3aeEIKJJ ayRMUp/EF3B/+BJMvrTHuLctElElSc3Q+0OaKdu+vLih0Mqx+F2P6erjBOvU3G1SO+bhSr Ny91VDEQWwMJ+pTqSZ4RQxhc9ghTpDYGnLOx347ZabcwpRvIzF4KP+XAuvQF3A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Xhx0n16j6zg8G; Mon, 4 Nov 2024 15:56:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A4Fuf6W072265; Mon, 4 Nov 2024 15:56:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A4FufMK072262; Mon, 4 Nov 2024 15:56:41 GMT (envelope-from git) Date: Mon, 4 Nov 2024 15:56:41 GMT Message-Id: <202411041556.4A4FufMK072262@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 7d7c17b7f638 - stable/14 - manuals: Fix typos in -offset for .Bd and .Bl List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 7d7c17b7f6389bc718389d0259543ec7cabffcf5 Auto-Submitted: auto-generated The branch stable/14 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=7d7c17b7f6389bc718389d0259543ec7cabffcf5 commit 7d7c17b7f6389bc718389d0259543ec7cabffcf5 Author: Graham Percival AuthorDate: 2024-09-24 18:34:26 +0000 Commit: Mitchell Horne CommitDate: 2024-11-04 15:56:24 +0000 manuals: Fix typos in -offset for .Bd and .Bl The intended value is: -offset indent If there's any typo such that the value doesn't match the pre-defined strings, then the offset is the same width as the value. So by chance, "-offset -ident" ended up being a standard-width indent (since the default indent is 6 chars, and "-ident" also has 6 chars), whereas "-offset -indent" had a longer indent, and "-offset ident" had a shorter one. Signed-off-by: Graham Percival Reviewed by: mhorne, Alexander Ziaee MFC after: 3 days Sponsored by: Tarsnap Backup Inc. Pull Request: https://github.com/freebsd/freebsd-src/pull/1436 (cherry picked from commit c013ca2cf772194de340aeb452a6ccfe7e1cecd8) --- bin/sh/sh.1 | 4 ++-- share/man/man4/efidev.4 | 2 +- share/man/man4/vmd.4 | 2 +- share/man/man5/motd.5 | 2 +- share/man/man7/arch.7 | 2 +- usr.bin/elfctl/elfctl.1 | 4 ++-- usr.sbin/binmiscctl/binmiscctl.8 | 4 ++-- usr.sbin/pwd_mkdb/pwd_mkdb.8 | 2 +- usr.sbin/service/service.8 | 16 ++++++++-------- 9 files changed, 19 insertions(+), 19 deletions(-) diff --git a/bin/sh/sh.1 b/bin/sh/sh.1 index fb3afc7d3d4d..03e8af70c9aa 100644 --- a/bin/sh/sh.1 +++ b/bin/sh/sh.1 @@ -1076,13 +1076,13 @@ command. Commands may be grouped by writing either .Pp .Sm off -.Bd -literal -offset -ident +.Bd -literal -offset indent .Po Ar list Pc .Ed .Sm on .Pp or -.Bd -literal -offset -ident +.Bd -literal -offset indent .No { Ar list ; } .Ed .Pp diff --git a/share/man/man4/efidev.4 b/share/man/man4/efidev.4 index 684a93340d7f..defae1f31bea 100644 --- a/share/man/man4/efidev.4 +++ b/share/man/man4/efidev.4 @@ -34,7 +34,7 @@ .Sh SYNOPSIS To compile this driver into the kernel, place the following lines in your kernel configuration file: -.Bd -ragged -offset -indent +.Bd -ragged -offset indent .Cd "options EFIRT" .Ed .Pp diff --git a/share/man/man4/vmd.4 b/share/man/man4/vmd.4 index 2d6a06bc10e3..590a368f006b 100644 --- a/share/man/man4/vmd.4 +++ b/share/man/man4/vmd.4 @@ -34,7 +34,7 @@ .Sh SYNOPSIS To compile this driver into the kernel, place the following lines in your kernel configuration file: -.Bd -ragged -offset -indent +.Bd -ragged -offset indent .Cd "device vmd" .Ed .Pp diff --git a/share/man/man5/motd.5 b/share/man/man5/motd.5 index 86cb8f723634..5dce1ccd52ae 100644 --- a/share/man/man5/motd.5 +++ b/share/man/man5/motd.5 @@ -25,7 +25,7 @@ and the contents are written to can be updated without a system reboot by manually restarting the motd service after updating .Pa /etc/motd.template : -.Bd -literal -offset -ident -compact +.Bd -literal -offset indent -compact service motd restart .Ed .Pp diff --git a/share/man/man7/arch.7 b/share/man/man7/arch.7 index 35a7b0246389..24979eb6b186 100644 --- a/share/man/man7/arch.7 +++ b/share/man/man7/arch.7 @@ -173,7 +173,7 @@ and binaries aren't supported. .Pp On all supported architectures: -.Bl -column -offset -indent "long long" "Size" +.Bl -column -offset indent "long long" "Size" .It Sy Type Ta Sy Size .It short Ta 2 .It int Ta 4 diff --git a/usr.bin/elfctl/elfctl.1 b/usr.bin/elfctl/elfctl.1 index 2dbe04ee0ed2..5ba016b664a3 100644 --- a/usr.bin/elfctl/elfctl.1 +++ b/usr.bin/elfctl/elfctl.1 @@ -87,12 +87,12 @@ elfctl -e +noaslr file .Ed .Pp Features may be specified as numerical values: -.Bd -literal -offset -indent +.Bd -literal -offset indent elfctl -e =0x0001,0x0004 file .Ed .Pp Features may also be specified as a single combined value: -.Bd -literal -offset -indent +.Bd -literal -offset indent elfctl -e =0x5 file .Ed .Sh SEE ALSO diff --git a/usr.sbin/binmiscctl/binmiscctl.8 b/usr.sbin/binmiscctl/binmiscctl.8 index 4a4890146b57..17bce41a3212 100644 --- a/usr.sbin/binmiscctl/binmiscctl.8 +++ b/usr.sbin/binmiscctl/binmiscctl.8 @@ -308,13 +308,13 @@ specified in the .Nm command. Using the example above: -.Bd -literal -offset -ident +.Bd -literal -offset indent mkdir $D/usr/local/bin cp /usr/local/bin/qemu-arm-static $D/usr/local/bin .Ed .Pp Now the user can chroot into the environment normally, as root: -.Bd -literal -offset -ident +.Bd -literal -offset indent chroot $D .Ed .Sh SEE ALSO diff --git a/usr.sbin/pwd_mkdb/pwd_mkdb.8 b/usr.sbin/pwd_mkdb/pwd_mkdb.8 index 68e4911144f0..56f3024fd62f 100644 --- a/usr.sbin/pwd_mkdb/pwd_mkdb.8 +++ b/usr.sbin/pwd_mkdb/pwd_mkdb.8 @@ -141,7 +141,7 @@ A Version 7 format password file. .Sh EXAMPLES Regenerate the password database after manually editing or replacing the password file: -.Bd -literal -offset -indent +.Bd -literal -offset indent /usr/sbin/pwd_mkdb -p /etc/master.passwd .Ed .Sh COMPATIBILITY diff --git a/usr.sbin/service/service.8 b/usr.sbin/service/service.8 index 2c5dfa3f3a66..380fbc8c1269 100644 --- a/usr.sbin/service/service.8 +++ b/usr.sbin/service/service.8 @@ -141,39 +141,39 @@ For a full list of commands available in most rc.d scripts, see .Xr rc 8 . .Pp Enable a service, then start it: -.Bd -literal -offset -indent +.Bd -literal -offset indent service sshd enable service sshd start .Ed .Pp Stop a service, then disable it: -.Bd -literal -offset -indent +.Bd -literal -offset indent service sshd stop service sshd disable .Ed .Pp Start a service which is not enabled: -.Bd -literal -offset -indent +.Bd -literal -offset indent service sshd onestart .Ed .Pp Report the status of a service: -.Bd -literal -offset -ident +.Bd -literal -offset indent service named status .Ed .Pp Restart a service running in a jail: -.Bd -literal -offset -indent +.Bd -literal -offset indent service -j dns named restart .Ed .Pp Start a service with a specific environment variable set: -.Bd -literal -offset -indent +.Bd -literal -offset indent service -E LC_ALL=C.UTF-8 named start .Ed .Pp Report a verbose listing of all available services: -.Bd -literal -offset -indent +.Bd -literal -offset indent service -rv .Ed .Pp @@ -189,7 +189,7 @@ complete service 'c/-/(e l r v)/' 'p/1/`service -l`/' \e The following programmable completion entry can be used in .Xr bash 1 for the names of the rc.d scripts: -.Bd -literal -offset -ident +.Bd -literal -offset indent _service () { local cur cur=${COMP_WORDS[COMP_CWORD]} From nobody Mon Nov 4 15:56:42 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Xhx0p440gz5cF61; Mon, 04 Nov 2024 15:56:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xhx0p2ZWyz4kWN; Mon, 4 Nov 2024 15:56:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730735802; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kd7NlK0z2cmCutZvFia5Xmt1HxARm8zP8ROnUwDDM+s=; b=NzObJ+0k1T9H9Y0Dr2wyfaao6b5KZTaC1kthg3eACAeJEWaE4d/T7eAkfq7cIh51rPtWBk LhS2NOxQ2WD5omBoHENUfHUwManelhn1DAjScaZ1xPKdSv17mvXuD3Hr4BDN56MHlrvLRG iDc4k1/GHZuFqBfTCb5TRdz1BKQ8baDmEo5G+5xj26y8z7KYwaxNSBkKHZuIQ6k44ImsAk q3eTlbrt8V6bhgTjJ6IC/M5cwge99vRUIYAclQvP6RLzcVPvyBcniQyUf7lNybNmeu4Kqr iGqi9/UDuj6o/lcx472S5QzbZBgtm47NRDCUbr3QLsM8vIJp2aXB6lmQsSbcsg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730735802; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kd7NlK0z2cmCutZvFia5Xmt1HxARm8zP8ROnUwDDM+s=; b=xlDt4dP7J+IIJ4FrMUO6d5rl3XMM3wYrxujqyBsHzl/q0PUjn2XCrPQ+RciTtywUSLB+0u ZzBlNYWTJyo8BMsBFueYgynL2bPqv1KxFGlbtC6wdH643+JF3wgp1m4B7tnarZLltqSdVA /WMHuuy63phQkszkQ4VxSXM/wlg+6WM8zKxF+mPdEnugxsMZ79UjJK9WxTsb7UO/9JzhZx vvA2i61kkBlC09rvtMsuTY/A18h2xGUbfLEBXiw8Q2EzGwuRV75ytXYrBOgcyeQaQMhZZy UNFMH5//SHhLPMvBSZAfje0DoBOZXfcsprx5hV4T3En0qPIkFFJLnLwgWjBYyQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730735802; a=rsa-sha256; cv=none; b=ubdzfCOaT/anmSHNm/7rX6v38EesAqpuxPhGuJV7NGXvsVfO2oXBvHIHBQe/EgHe2+0LBJ XhpCu8dq+beJDJj8xFpf2O51ZU/AIu22hpJL8JCHVCzY/j+tqQ6yVcF7wmaCijg+v3D4fv ETXiG4AQM+FKLI+gA3kElY8TrXMGkRRNhFbXoLljWZb+XKtqFsxGtPyhWLcxVg+myW30v6 pXN0bqRwI08u40THEr3YQnfR6WCGvO0fUKbPmI5Bhs9TJDbkcjER1m+774NwLuDWImsCk9 hHEkhnarJEBSfF+F7qd7cS1qZsHEWLuI5Eda990+hqBmVvhtS7Oy4VtJ4xlq1Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Xhx0p26RWzfnB; Mon, 4 Nov 2024 15:56:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A4Fugb8072316; Mon, 4 Nov 2024 15:56:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A4FugxN072313; Mon, 4 Nov 2024 15:56:42 GMT (envelope-from git) Date: Mon, 4 Nov 2024 15:56:42 GMT Message-Id: <202411041556.4A4FugxN072313@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: e2830c5d3545 - stable/14 - manuals: Fix "skipping end of block" .Ed errors List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e2830c5d35456d42187cd5f400111a3e5421133b Auto-Submitted: auto-generated The branch stable/14 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=e2830c5d35456d42187cd5f400111a3e5421133b commit e2830c5d35456d42187cd5f400111a3e5421133b Author: Graham Percival AuthorDate: 2024-09-24 18:28:20 +0000 Commit: Mitchell Horne CommitDate: 2024-11-04 15:56:24 +0000 manuals: Fix "skipping end of block" .Ed errors These were reported by `mandoc -T lint ...` as errors; this commit only handles unnecessary .Ed commands. The rendered output (in ascii and html) is not affected by this commit. Signed-off-by: Graham Percival Reviewed by: mhorne MFC after: 3 days Sponsored by: Tarsnap Backup Inc. Pull Request: https://github.com/freebsd/freebsd-src/pull/1435 (cherry picked from commit 4f2ef756a404df70272b79c16fa7b1689cb0118b) --- lib/libcapsicum/capsicum_helpers.3 | 1 - share/man/man7/networking.7 | 1 - share/man/man9/domain.9 | 1 - 3 files changed, 3 deletions(-) diff --git a/lib/libcapsicum/capsicum_helpers.3 b/lib/libcapsicum/capsicum_helpers.3 index 9c4c0bfa0229..fe25e3a460ab 100644 --- a/lib/libcapsicum/capsicum_helpers.3 +++ b/lib/libcapsicum/capsicum_helpers.3 @@ -150,7 +150,6 @@ NLS data is used for localized error printing by and .Xr err 3 , among others. -.Ed .Sh SEE ALSO .Xr cap_enter 2 , .Xr cap_rights_limit 2 , diff --git a/share/man/man7/networking.7 b/share/man/man7/networking.7 index 03e80793e98d..acd61f2864a7 100644 --- a/share/man/man7/networking.7 +++ b/share/man/man7/networking.7 @@ -43,7 +43,6 @@ Identify your Wi-Fi hardware: .Ed .Pp Configure your Wi-Fi hardware as wlan0 interface: -.Ed .Bd -literal -offset 2n .Ic # sysrc wlans_iwn0="wlan0" .Ed diff --git a/share/man/man9/domain.9 b/share/man/man9/domain.9 index eaa279cef996..dab8cff89e12 100644 --- a/share/man/man9/domain.9 +++ b/share/man/man9/domain.9 @@ -183,7 +183,6 @@ has an empty slot in its .Va dom_protosw . Dynamically added protocol can later be unloaded with .Fn protosw_unregister . -.Ed .Sh RETURN VALUES The .Fn domain_add From nobody Mon Nov 4 15:56:43 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Xhx0q4cBDz5cFYv; Mon, 04 Nov 2024 15:56: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xhx0q3Hx9z4kcj; Mon, 4 Nov 2024 15:56:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730735803; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DQtu3kyloAfdVQFv5Ax0XK5+pRjgwNYKH6qBBJIMJ/Y=; b=PUVNOQ5Zs1vrpdDQ0KdA+i9vdMEyFYsVaHe5/ly/pgCaigZ+NjidxMnQFntT3Z44lgpTSU gOdl99bhKan6CJV3IXhRJZ1UZbesHdAzpQrU/YXD2W6/b/i1JSsDfGHG4TmeIqteEoPbbV 4QDS1HXIsLrt9Y85mjzjuBn99AdZ5xLr16gIyV98HN9GrfLNwEpibR93X88M1ZgkdAiE6q cJd7bxi5PnkqUcu2SlgjtzHzcSMYjj1pQKQjilAzsro3ZGXPCmoV3mVyG67By+RQlVaQmK LkY0mhBu+3XXHpaDrAG5ION7G9OmYBB95f0v8SfE3nTt3yXfyKaU8Q7IbI/HLA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730735803; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DQtu3kyloAfdVQFv5Ax0XK5+pRjgwNYKH6qBBJIMJ/Y=; b=FaetJmoZzcfFMkF44YlyR+SlRdotqKJ7aul2jaPsFkALMDMEswGL6RbWdb4eu9vQLQU/o+ G3o6XiMprHdLQlry7uJ8cO0MaqyQ11FWxpEBYpsTgqAAj53FwArtoapSGN1dqGaW4IYCJE YDqRUysR472gZsxdGKhClwMT7KsKFDc/9RMrgJKRPdiusAqR0tLD4oxAqRCelurA6lNvuG S713cC3661yVh/8cZyfKpjjJJdfQ/De/D9XIgjBP5wTeqI3BBL28ghmhhrpRoCTNrM9P0G C9TIaMMK/hHQyyNNya5OoTZPmcQ3rEjuKqkStKMcoNwrHoDiSURQMCa/QacS7Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730735803; a=rsa-sha256; cv=none; b=Qj9zMQtG8vEtW8p2bmB69jghNH4Cyt7WvMXP9q7XkWOOkRpRXUQpD7JwWRbLtRnJqYutDF nL3kbgB7G5DcXLIl1oGbTztxf5GO9xHOLxFKmcw9NBwfZdn6Rv/9vpht7ZCgYdAvCwpgIp g3JzAJN2hs5QKkq27NyvWqK1K36oXfDN/Ah4DdBh7kt9UvpHNCp8Eb4S+xqMWUTUZWByaY yjJuvxtiX/T6S/Te7bhVN4SjDdg8Fl2+AUKv4M9HTJvlsEwSrkUCBrMkn31fAORIJNvL66 gh2V4CcMQ5mMtvsF3qOjEhDPI6bgAxtSPk8f+pcH8RivVqhKxxjxVq9sx2Z48w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Xhx0q2WJTzg8H; Mon, 4 Nov 2024 15:56:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A4FuhRN072362; Mon, 4 Nov 2024 15:56:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A4FuhdB072359; Mon, 4 Nov 2024 15:56:43 GMT (envelope-from git) Date: Mon, 4 Nov 2024 15:56:43 GMT Message-Id: <202411041556.4A4FuhdB072359@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 3a75b41bd93b - stable/14 - manuals: Misc syntax fixes List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 3a75b41bd93be05bab80f8c2ddcff25e8e345a2d Auto-Submitted: auto-generated The branch stable/14 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=3a75b41bd93be05bab80f8c2ddcff25e8e345a2d commit 3a75b41bd93be05bab80f8c2ddcff25e8e345a2d Author: Graham Percival AuthorDate: 2024-10-04 03:40:23 +0000 Commit: Mitchell Horne CommitDate: 2024-11-04 15:56:24 +0000 manuals: Misc syntax fixes These were reported by `mandoc -T lint ...` as errors. The rendered output (in ascii and html) is not affected by this commit. Additional clarification: there was a non-breaking space in lib/libcasper/services/cap_grp/cap_grp.3. Signed-off-by: Graham Percival Reviewed by: mhorne MFC after: 3 days Sponsored by: Tarsnap Backup Inc. Pull Request: https://github.com/freebsd/freebsd-src/pull/1449 (cherry picked from commit c8b31033c3971b2b7349804ffda0cea5e4835b40) --- lib/libc/gen/exec.3 | 1 - lib/libcasper/services/cap_grp/cap_grp.3 | 2 +- share/man/man4/iwlwififw.4 | 10 +++++----- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/lib/libc/gen/exec.3 b/lib/libc/gen/exec.3 index 8f866e5ab321..662e4f8e66f7 100644 --- a/lib/libc/gen/exec.3 +++ b/lib/libc/gen/exec.3 @@ -49,7 +49,6 @@ .Fn execlp "const char *file" "const char *arg" ... NULL .Ft int .Fn execle "const char *path" "const char *arg" ... NULL "char *const envp[]" -.Fc .Ft int .Fn exect "const char *path" "char *const argv[]" "char *const envp[]" .Ft int diff --git a/lib/libcasper/services/cap_grp/cap_grp.3 b/lib/libcasper/services/cap_grp/cap_grp.3 index 9647b1936b0c..578d8edffbfa 100644 --- a/lib/libcasper/services/cap_grp/cap_grp.3 +++ b/lib/libcasper/services/cap_grp/cap_grp.3 @@ -59,7 +59,7 @@ .Fn cap_getgrgid_r "cap_channel_t *chan" "gid_t gid" "struct group *grp" "char *buffer" "size_t bufsize" "struct group **result" .Ft int .Fn cap_setgroupent "cap_channel_t *chan" "int stayopen" -.Ft int +.Ft int .Fn cap_setgrent "cap_channel_t *chan" .Ft void .Fn cap_endgrent "cap_channel_t *chan" diff --git a/share/man/man4/iwlwififw.4 b/share/man/man4/iwlwififw.4 index a377f6b51f78..debd0cda36b5 100644 --- a/share/man/man4/iwlwififw.4 +++ b/share/man/man4/iwlwififw.4 @@ -46,10 +46,10 @@ driver. .Bl -column -compact "Vendor" "Device" "Subv. " "Subd. " "Firmware-Prefix" .It Ar Name .It Ar Vendor Ta Ar Device Ta Ar Subv. Ta Ar Subd. Ta Ar Firmware-Prefix -.% --------------------------------------------------------------------- -.% This list is manually generated from a sysctl and post-processing. -.% Edits will be overwritten on next update. -.% --------------------------------------------------------------------- +.\" --------------------------------------------------------------------- +.\" This list is manually generated from a sysctl and post-processing. +.\" Edits will be overwritten on next update. +.\" --------------------------------------------------------------------- .It "" .It Intel(R) Dual Band Wireless AC 7260 .It 0x8086 Ta 0x08b1 Ta any Ta 0x4070 Ta iwlwifi-7260 @@ -1340,7 +1340,7 @@ driver. .It "" .It Intel(R) TBD Sc device .It 0x8086 Ta any Ta any Ta any Ta (null) -.% --------------------------------------------------------------------- +.\" --------------------------------------------------------------------- .El .Pp .Em Note: From nobody Mon Nov 4 15:56:44 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Xhx0r5fSyz5cFKq; Mon, 04 Nov 2024 15:56:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xhx0r46Lrz4kj1; Mon, 4 Nov 2024 15:56:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730735804; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sk1wUu8VTFm1lnGTpnRIGFl9dOt/RG8Ef1ej55zc24Q=; b=uGBgf4tbfjjvjj6PmePnPOrxcZqUvH9ikhIJYUL9DQIZtfXEFL2/XfMTIsnDD/3nQTIjhZ mEdqU68KVilqQBuNDgeZP90oYGAy/SjpyfoUMzmch8ZvKI+9GV/YztsGvw9bXfLOAkr/ER OmMPqwOs3VM6+QmZn2OIkZPKF35Vnt6A83NB9e3qMeXCAHO5xGqps+w+tzLyaHcEUmP6E3 lYUg3Ap6NtcQHEfCPY9rIh6ws/CJo2fQA0Q3RRqrmiIr2imziyq6MERYLZUx2As+iqXcud q8+5Dv/Rdor1LFCIvnpqIgOCn/BB0J5EKZxN3/1loPb6QHqD7sBTsUual6X9tQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730735804; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sk1wUu8VTFm1lnGTpnRIGFl9dOt/RG8Ef1ej55zc24Q=; b=u3IwAmnExa6KFjkJAp6qKz1US14PlyzUHsJZgsjbl7DRbVm6aAKDnUqoI7D7QR6XefB30d Prpm+h4JCrtj1toWYZl4lomY8d6xlS1+uenYgK/o84uJxlddaS021WDl4YpEMUgWuoGcQR rhRNmfV1oeehwmnZbQkdhp1J9MvZTJ4usfJC1YCfJJtW01taLvbRoCYsbdSZ8BJSqHJUtH Tpu6qV0vqlIltnWvO64pqCdmmT/poMtynEEOTBb23VXfopcCYo/1wrAToZlSb3sVlKqexi ZuaZjwdu44FdjNsFaEpt9mY4xlsUNtYNAxEpFFzFqqH5zH3B6QaAByi+jMFh3Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730735804; a=rsa-sha256; cv=none; b=F2R/nLrejPx+aejkZxdK0oIxGku2yn1UNGt6b8MJDp1cJCWjD7Bvd1Da2UD05Hy5hpvZt6 mz0E6gh6SgEvUK+FMuuY5HQHVNOHDtthXCdFjPT5va+ovj58h75aooAE3lNgklOKtWP9Mf matbyCcC80WnJQ0961xOQmxThRBaSSgpF6r0W5WYDgAKDaLMQYxHVzpfdMot2Mtq/D8Xcj WL0FOPO3fQbpa5gzphLTHVs85ph52rbqSMny8zpoCe006b5mp9o/qN6kVL6G8RVRiV96eC b5IxlFCT+4Sn3PruKgFGEqQl+670uLFjudkO1Kmg8gXXyY0yvfFMIWWJb5EWUw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Xhx0r3cktzg8J; Mon, 4 Nov 2024 15:56:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A4FuitQ072408; Mon, 4 Nov 2024 15:56:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A4Fui0i072405; Mon, 4 Nov 2024 15:56:44 GMT (envelope-from git) Date: Mon, 4 Nov 2024 15:56:44 GMT Message-Id: <202411041556.4A4Fui0i072405@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 7624e1572614 - stable/14 - manuals: Misc syntax fixes List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 7624e15726147ee8b0d94468d020ece747aa9985 Auto-Submitted: auto-generated The branch stable/14 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=7624e15726147ee8b0d94468d020ece747aa9985 commit 7624e15726147ee8b0d94468d020ece747aa9985 Author: Graham Percival AuthorDate: 2024-10-07 21:17:31 +0000 Commit: Mitchell Horne CommitDate: 2024-11-04 15:56:24 +0000 manuals: Misc syntax fixes These were reported by `mandoc -T lint ...` as errors. Signed-off-by: Graham Percival Reviewed by: mhorne MFC after: 3 days Sponsored by: Tarsnap Backup Inc. Pull Request: https://github.com/freebsd/freebsd-src/pull/1453 (cherry picked from commit 8b92fa1ceb95bbe80b473fc35d4276146201e802) --- lib/librss/librss.3 | 4 ++-- share/man/man4/bpf.4 | 2 +- share/man/man7/orders.7 | 4 ++-- share/man/man9/zone.9 | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/librss/librss.3 b/lib/librss/librss.3 index 655e5ca17984..3964aa36891b 100644 --- a/lib/librss/librss.3 +++ b/lib/librss/librss.3 @@ -109,8 +109,8 @@ socket. The .Fn rss_sock_set_recvrss function enables or disables receiving RSS related information -as socket options in. -.2 recvmsg +as socket options in +.Xr recvmsg 2 calls. .Pp When enabled, UDP datagrams will have a message with the diff --git a/share/man/man4/bpf.4 b/share/man/man4/bpf.4 index 4a40f4947dfd..8082f6eac39a 100644 --- a/share/man/man4/bpf.4 +++ b/share/man/man4/bpf.4 @@ -665,7 +665,7 @@ Set the VLAN PCP bits to the supplied value. now supports several standard .Xr ioctl 2 Ns 's which allow the user to do async and/or non-blocking I/O to an open -.I bpf +.Em bpf file descriptor. .Bl -tag -width SIOCGIFADDR .It Dv FIONREAD diff --git a/share/man/man7/orders.7 b/share/man/man7/orders.7 index aef44adde125..c1c2c1200e42 100644 --- a/share/man/man7/orders.7 +++ b/share/man/man7/orders.7 @@ -47,8 +47,8 @@ The following table lists common multiples of bytes. .It Zettabyte Ta ZB Ta 2^70 Ta 10^21 .It Yottabyte Ta YB Ta 2^80 Ta 10^24 .It Ronnabyte Ta RB Ta 2^90 Ta 10^27 -.It Quettabyte Ta QB Ta 2^100 Ta 10^30. -El +.It Quettabyte Ta QB Ta 2^100 Ta 10^30 +.El .Pp The following table lists common bit rates as a power of ten. .Bl -column -offset 2n \ diff --git a/share/man/man9/zone.9 b/share/man/man9/zone.9 index a6b8d2dfedbe..9f13cf0e504a 100644 --- a/share/man/man9/zone.9 +++ b/share/man/man9/zone.9 @@ -341,7 +341,7 @@ Create a zone whose items will be synchronized using the .Xr smr 9 mechanism. Upon creation the zone will have an associated -.Dt smr_t +.Ft smr_t structure which can be fetched using .Fn uma_zone_get_smr . .El From nobody Mon Nov 4 15:56:45 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Xhx0t0dHlz5cFN4; Mon, 04 Nov 2024 15:56: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xhx0s5tvSz4kTk; Mon, 4 Nov 2024 15:56:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730735805; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=772VXoaXZwtgyYAX0ZEgThAq8CC5FmL3xq7Ak3huLRU=; b=Nz2XIvszAfcflovqNO33OIreXHhguFSLS6hBx38VwCysYs20dGlJRc6r/boeESuun/15CH zjWc4X3djSDQ/A6OSSyp8BjsP46hPayHMLkomv74fH3fEqNIxcZTiQRIhmpUFAXuhiVnSt zSA17DwFKn/TRODyv5pjL9Va8H8zpA2oyTRc/UH7eQQLVKa5RFvhzO6aCVPOXIKJ4p1CVs o0XvS07AIg6MxuXHykAJFLLmxWJJY2tP8je8gRksxd0nFY1z7qDjWMny6UsfD6K/nZC6zY V58ogBJmMvzb2RuKTt0NT0mq0KMBtKNyCozOvyz7oLTgvfP32cSYD4MRF3Yrsg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730735805; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=772VXoaXZwtgyYAX0ZEgThAq8CC5FmL3xq7Ak3huLRU=; b=SC92aP6YBgEScMtqEAPU8E+uowqdXPkGiNarAUD3jfhEy3hhcGiLEbq8ncTmkSEkOB9f6m nPf18+xeVnupLun6c2q/P/8IMLa5noYjUKvYYbPbuDQ1JCvQrMBFz3XWUQtiTq49IFxIM6 rX9A1Ut8veh+yDNI894tyNhBLn32dcwksnDXi8JLxexhJN+qXtc1FICPwdVwhWek61f5KC WirjPnU6mqCGCMPVgnlJ9bgojs4IAfIRzN4OP8y/KB6VVkLq9ca+imeWzqn4rveiqdWjHC jXaN9dQK7zS615J6Ya1hgp/I2ROn2VzW4EdPBPupxwCS7pCnQ//SfMX3SDEj4g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730735805; a=rsa-sha256; cv=none; b=kizZpx8U31LRuqC+f6Lq4VKmk590aIUT7NszTgbhi2NWUgmChDnhPm+y8NxS6CG4sYTzk5 GV/QMUQ+ryaVJXHH9LYZDGGlr3GtvrJ05ALFgPEFUAKPtLfqYwJ/PPGZKGrh8+S96lcH+H kgefmw6/rluBAM/+0JTJdcUdIhCxt5d/BVUoCfJcSL39K4Qcq6dLIs60wac2HE5Rb6PuAm EzheY/+a+flzzJc+4o/8+KeQX6K9VyMCz+K6IScwf1T5hXfwlHK7skxEloS3i7nYyYpoun tHXUVJazFGFY2RY2qrdvmMbr/T28FXRjd6AE73Hwi95xXfpds2Gc6SyRAW1AaQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Xhx0s4q7KzftH; Mon, 4 Nov 2024 15:56:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A4FujwQ072453; Mon, 4 Nov 2024 15:56:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A4FujNn072450; Mon, 4 Nov 2024 15:56:45 GMT (envelope-from git) Date: Mon, 4 Nov 2024 15:56:45 GMT Message-Id: <202411041556.4A4FujNn072450@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 62cb0f713779 - stable/14 - manuals: Fix syntax of list width List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 62cb0f71377927be918435fd15b0022a0890e457 Auto-Submitted: auto-generated The branch stable/14 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=62cb0f71377927be918435fd15b0022a0890e457 commit 62cb0f71377927be918435fd15b0022a0890e457 Author: Graham Percival AuthorDate: 2024-10-08 01:39:51 +0000 Commit: Mitchell Horne CommitDate: 2024-11-04 15:56:24 +0000 manuals: Fix syntax of list width Signed-off-by: Graham Percival Reviewed by: mhorne MFC after: 3 days Sponsored by: Tarsnap Backup Inc. Pull Request: https://github.com/freebsd/freebsd-src/pull/1455 (cherry picked from commit 9fd66e40cac02691d36386cf275d23367e34fc43) --- share/man/man9/mbuf.9 | 2 +- share/man/man9/vmem.9 | 2 +- usr.bin/bintrans/bintrans.1 | 8 ++++---- usr.bin/genl/genl.1 | 2 +- usr.sbin/dconschat/dconschat.8 | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/share/man/man9/mbuf.9 b/share/man/man9/mbuf.9 index 0b03d697b8bf..0262c598ed18 100644 --- a/share/man/man9/mbuf.9 +++ b/share/man/man9/mbuf.9 @@ -1212,7 +1212,7 @@ the following various failure/extreme cases for testing of network drivers and other parts of the kernel that rely on .Vt mbufs . -.Bl -tag -width ident +.Bl -tag -width indent .It Va net.inet.ip.mbuf_frag_size Causes .Fn ip_output diff --git a/share/man/man9/vmem.9 b/share/man/man9/vmem.9 index 1dc74e951cb2..31a82be88fd0 100644 --- a/share/man/man9/vmem.9 +++ b/share/man/man9/vmem.9 @@ -159,7 +159,7 @@ A bitwise OR of an allocation strategy and a .Xr malloc 9 wait flag. The allocation strategy is one of: -.Bl -tag width indent +.Bl -tag -width indent .It Dv M_FIRSTFIT Prefer allocation performance. .It Dv M_BESTFIT diff --git a/usr.bin/bintrans/bintrans.1 b/usr.bin/bintrans/bintrans.1 index 16ae66aa21d1..054f304d4c61 100644 --- a/usr.bin/bintrans/bintrans.1 +++ b/usr.bin/bintrans/bintrans.1 @@ -154,7 +154,7 @@ utility ignores any leading and trailing lines. .Pp The following options are available for .Nm uuencode : -.Bl -tag -width ident +.Bl -tag -width indent .It Fl m Use the Base64 method of encoding, rather than the traditional .Nm uuencode @@ -169,7 +169,7 @@ instead of standard output. .Pp The following options are available for .Nm uudecode : -.Bl -tag -width ident +.Bl -tag -width indent .It Fl c Decode more than one uuencoded file from .Ar file @@ -214,7 +214,7 @@ reasons. Additionally, .Nm b64encode accepts the following option: -.Bl -tag -width ident +.Bl -tag -width indent .It Fl w Ar column Wrap encoded output after .Ar column . @@ -229,7 +229,7 @@ through a dedicated program: .Nm qp is a quoted-printable converter and accepts the following options: -.Bl -tag -width ident +.Bl -tag -width indent .It Fl u Decode. .It Fl o Ar output_file diff --git a/usr.bin/genl/genl.1 b/usr.bin/genl/genl.1 index 9837744fa8e3..af0c6360ad83 100644 --- a/usr.bin/genl/genl.1 +++ b/usr.bin/genl/genl.1 @@ -44,7 +44,7 @@ utility is design to provide access to the user to generic netlink protocols. .Pp The following commands are available: -.Bl -tag -ident +.Bl -tag -width indent .It Cm list Po default Pc Lists all available generic netlink protocols, and presents its details: .Bl -tag -width "multicast groups" diff --git a/usr.sbin/dconschat/dconschat.8 b/usr.sbin/dconschat/dconschat.8 index 1f93e6d5a235..e2348410a04c 100644 --- a/usr.sbin/dconschat/dconschat.8 +++ b/usr.sbin/dconschat/dconschat.8 @@ -110,7 +110,7 @@ A escape character (the default is .Ql ~ ) appearing as the first character of a line is an escape signal; the following are recognized: -.Bl -tag -width ident +.Bl -tag -width indent .It Ic ~. Drop the connection and exit. .It Ic ~^G From nobody Mon Nov 4 15:56:46 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Xhx0v2Xqpz5cFN6; Mon, 04 Nov 2024 15:56: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xhx0t6YDWz4klK; Mon, 4 Nov 2024 15:56:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730735806; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=D+1SEwLvZXjJ9GZQQpYunTmDVgbxSEAKb8BkbgoAM8I=; b=e+UkwqIgNDn1HPFpLOdpuFF5Pj4LmnjE1NyRd4jKlA0X0mAxO6k+OTufZsxqY1N4l75r+A Ce+I3hKS1Fbw119px3jc6vk8mNq9z3XAbPTJCT55TEYkXsD18JhT3lyBJtS/KCLvNQGZ0E 1+531oUrRDpXJXY/vLd3io1C/FkNPSO0qmTUvDRnBNZYq5SSsHjpEYlXbZv3Hl7OQB/UkN 4kR3pyNsikw2M/Y1JS/mFGxeTSrJs7kOKPKCCOis1IPlWtmQkwyvmRKqWFyd3UsbVhhcoT wRFicGcFJ8mNcXE8kIPL2QtVdhd33nj2FjF9CRY4bkh/rnvTpTuXOyy77FubWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730735806; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=D+1SEwLvZXjJ9GZQQpYunTmDVgbxSEAKb8BkbgoAM8I=; b=WkzvJB30HPN0sGRpvg7YZQPPE6ed7Ot7fAKHn7GKfe/h7fNdQ/OaUYWFhtXwgVP8TM0ETv bWCHjCL5BKpFwyXWPje1NGfRJk+7OEgv2sk+tAKlboiAnYOT74tYWHiqzhDcfDr9OmlZtY SnX/hXvWvlTBhidS0VK0zXEFrjp8Nayyq1t7BIwgYmDxLUhw2YmpQ4pDEHxFdq4aOg0mSd 3a774kLzS+/aN1FAsO4wk2xIXvxVN6v0l4rCQd3G5dlN+wMe9XvD1m57gvAvwC0erg3WZY vA00Q/xgqRFc+Qs2DypaEcVMTpbvVooSEh2cMVSckXei5A6ToxwBbtfzdIgPag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730735806; a=rsa-sha256; cv=none; b=Mxi+aqqqHeAqY4fgTcaMzYcMvJ7xD41+uFmEiwJGLIZG9gPvFsFZLn4tGulMZ6FculdQFg mOt7olHpJv9wm4qrN7utTa+izqRqWc+OQMdZTpxIYDJ/vE7vulwA6Nc1SirCC+weCS2Q7F PlIfAQxdbspRZekiq5jOy1EOD9HLRmP5wd4TwFbwoknJYqJHUU8Sd0Fa+eh9rqdpOklL9d 2qyBdKn3oVgk8TmZswhZOlTHFTKzU5LKi7fOQIynmtNjoRiqyux+ydBZtaa89KalSFlg38 ujhmMeGDD7m4Rdxo4OH9l459ZJCHjHdhFT3teL5b5O09VZIVHz09t6+S0VhsFQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Xhx0t69s4zfnC; Mon, 4 Nov 2024 15:56:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A4FukIP072504; Mon, 4 Nov 2024 15:56:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A4FukFJ072501; Mon, 4 Nov 2024 15:56:46 GMT (envelope-from git) Date: Mon, 4 Nov 2024 15:56:46 GMT Message-Id: <202411041556.4A4FukFJ072501@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 64e531624f2a - stable/14 - vmem.9: align lists + tag spdx List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 64e531624f2a5b3c4f4ad1a23420a6340227c073 Auto-Submitted: auto-generated The branch stable/14 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=64e531624f2a5b3c4f4ad1a23420a6340227c073 commit 64e531624f2a5b3c4f4ad1a23420a6340227c073 Author: Alexander Ziaee AuthorDate: 2024-10-08 21:48:35 +0000 Commit: Mitchell Horne CommitDate: 2024-11-04 15:56:24 +0000 vmem.9: align lists + tag spdx Reviewed by: mhorne MFC after: 3 days Pull Request: https://github.com/freebsd/freebsd-src/pull/1456 (cherry picked from commit 5793008745115f9523f9de32cec3136cea2dd8d5) --- share/man/man9/vmem.9 | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/share/man/man9/vmem.9 b/share/man/man9/vmem.9 index 31a82be88fd0..053aec856a78 100644 --- a/share/man/man9/vmem.9 +++ b/share/man/man9/vmem.9 @@ -1,3 +1,6 @@ +.\"- +.\" SPDX-License-Identifier: BSD-2-Clause +.\" .\" $NetBSD: vmem.9,v 1.15 2013/01/29 22:02:17 wiz Exp $ .\" .\" Copyright (c)2006 YAMAMOTO Takashi, @@ -74,7 +77,7 @@ other than virtual memory. .\" - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - .Fn vmem_create creates a new vmem arena. -.Bl -tag -width qcache_max +.Bl -tag -offset indent -width "qcache_max" .It Fa name The string to describe the vmem. .It Fa base @@ -117,7 +120,7 @@ wait flag. .\" - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - .Fn vmem_xalloc allocates a resource from the arena. -.Bl -tag -width nocross +.Bl -tag -offset indent -width "qcache_max" .It Fa vm The arena which we allocate from. .It Fa size @@ -159,7 +162,7 @@ A bitwise OR of an allocation strategy and a .Xr malloc 9 wait flag. The allocation strategy is one of: -.Bl -tag -width indent +.Bl -tag -width "M_FIRSTFIT" .It Dv M_FIRSTFIT Prefer allocation performance. .It Dv M_BESTFIT @@ -182,7 +185,7 @@ overwrites it with the start address of the allocated span. frees resource allocated by .Fn vmem_xalloc to the arena. -.Bl -tag -width addr +.Bl -tag -offset indent -width "qcache_max" .It Fa vm The arena which we free to. .It Fa addr @@ -203,7 +206,7 @@ argument used for .\" - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - .Fn vmem_alloc allocates a resource from the arena. -.Bl -tag -width flags +.Bl -tag -offset indent -width "qcache_max" .It Fa vm The arena which we allocate from. .It Fa size @@ -228,7 +231,7 @@ overwrites it with the start address of the allocated span. frees resource allocated by .Fn vmem_alloc to the arena. -.Bl -tag -width addr +.Bl -tag -offset indent -width "qcache_max" .It Fa vm The arena which we free to. .It Fa addr @@ -249,7 +252,7 @@ argument used for .\" ------------------------------------------------------------ .Fn vmem_destroy destroys a vmem arena. -.Bl -tag -width vm +.Bl -tag -offset indent -width "qcache_max" .It Fa vm The vmem arena being destroyed. The caller should ensure that no one will use it anymore. From nobody Mon Nov 4 15:56:47 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Xhx0w5x1pz5cFc4; Mon, 04 Nov 2024 15:56: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xhx0w1rLHz4kqv; Mon, 4 Nov 2024 15:56:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730735808; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HNimGRjiUqNQ3drajlb3DBXwAc8w44d8oIsiuX8ecmQ=; b=F3N5sDHEXF8A0XecubjXg6sleu9A+PK3pXkVjZcH1NqjIN360zHbb/qLMRWm32m/JfIY8Z phOMYG+GUZTYYkeYDbfuy8x/hKgrog7ysUE5XgABEjNU3c7f21ba77udG4+JxJdJ1N53J/ Y6wuDnVtPLXj/hbnWIrjhnPcDiJ2ocfwUu5SjCGXyooSmijY5g5wJLMUjmr4SxoclqC5DZ 2sU1zDXcx2n1rFIkvTVYxfX5hl6dNddZ4ftQZhdzwisgBUN7UQRtdFHc5old2DCx5hz+YS OSOPY9h8fwEGltPx92L2VPtrhBzcKJSOoMxY8TWk8RIV1VBX485sVW6IUxAXbQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730735808; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HNimGRjiUqNQ3drajlb3DBXwAc8w44d8oIsiuX8ecmQ=; b=ZKTHXrI3OSIjbLTFMdd4BJ7VxWCoCbEnwy5cCyVvcDaACOOiFUnXBlgac26tShD793prM/ N1kZZxxhs/p/PPF6+rEIReMGyH7hgvnGGzgkF0uyR3QpdGtly1j9iYEhNyklXux/6tUnvx 8Qj9yH2HKoZ6tgRFbxAi3C+6d+4600Ya2nkEABMvKry55snm/COv5bMIUj96z6Ksm2MuHb jNf2QITGNur5xGfKofl9qSDTzrZqfFBfSDyWf+/xTT6aFlG2fLGZrNF4NEWAd+GZeGotpA pvKGqc7E/ta7xvpwufQBbz/uaxibNZZUs5byCagUx1teMX51NbaP9KF7LuBWcA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730735808; a=rsa-sha256; cv=none; b=FNCtrCmwSDnHctFhayHFkMj70GMK1GnMDeXn4L/JR8kzdmw3pEy11/g6/YrMWE+308pZQ0 Pvjt2vn5Nnm9XF2wOUbooXHzINFDybOyUALThKPHkVeVukT7H+oO+6Iw8WkxGVezTLUdwz dqnONH+8Z4h8dRVOxZNIXUz8d8UP0DP0W9HMePyEo9ENR3rB7aCLE9REkCqiGc4XFZxPiN tvlh1y8OhzEqokT6cq51p/OomIshAHN+PT4vLth8Cm+QZ6E1Ss/MOCiRtP1p6pKCoz0UCc lx4trBXPW9tngeHIC4aOZqlZf5EIMPkJJFxVzdfegx9IfHil8iQK8WX5V7ULQg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Xhx0v6qYlzftJ; Mon, 4 Nov 2024 15:56:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A4FulZH072560; Mon, 4 Nov 2024 15:56:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A4FulsN072557; Mon, 4 Nov 2024 15:56:47 GMT (envelope-from git) Date: Mon, 4 Nov 2024 15:56:47 GMT Message-Id: <202411041556.4A4FulsN072557@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: babcb8291085 - stable/14 - manpath.1: align lists + tag spdx List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: babcb8291085b81a1ea9a912a163c3ecd42de7d7 Auto-Submitted: auto-generated The branch stable/14 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=babcb8291085b81a1ea9a912a163c3ecd42de7d7 commit babcb8291085b81a1ea9a912a163c3ecd42de7d7 Author: Alexander Ziaee AuthorDate: 2024-10-09 11:49:01 +0000 Commit: Mitchell Horne CommitDate: 2024-11-04 15:56:24 +0000 manpath.1: align lists + tag spdx Reviewed by: mhorne MFC after: 3 days Pull Request: https://github.com/freebsd/freebsd-src/pull/1458 (cherry picked from commit d928328f8d2d25a4632401795e1c0ebbaeb7b10d) --- usr.bin/man/manpath.1 | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/usr.bin/man/manpath.1 b/usr.bin/man/manpath.1 index c964e028a244..ac9e3b2db5a7 100644 --- a/usr.bin/man/manpath.1 +++ b/usr.bin/man/manpath.1 @@ -1,4 +1,6 @@ .\"- +.\" SPDX-License-Identifer: BSD-2-Clause +.\" .\" Copyright (c) 2010 Gordon Tetlow .\" All rights reserved. .\" @@ -40,7 +42,7 @@ the user's .Ev PATH , and local configuration files. This result is echoed to the standard output. -.Bl -tag -width ".Fl d" +.Bl -tag -width "-L" .It Fl L Output manual locales list instead of the manual path. .It Fl d @@ -89,7 +91,7 @@ entries. .Sh ENVIRONMENT The following environment variables affect the execution of .Nm : -.Bl -tag -width ".Ev MANLOCALES" +.Bl -tag -width "MANLOCALES" .It Ev MANLOCALES If set with the .Fl L @@ -103,7 +105,7 @@ Influences the manual path as described in the .Sx IMPLEMENTATION NOTES . .El .Sh FILES -.Bl -tag -width indent -compact +.Bl -tag -width "/usr/local/etc/man.d/*.conf" -compact .It Pa /etc/man.conf System configuration file. .It Pa /usr/local/etc/man.d/*.conf From nobody Mon Nov 4 15:56:48 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Xhx0x5gNLz5cFfR; Mon, 04 Nov 2024 15:56: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xhx0x0r6tz4km1; Mon, 4 Nov 2024 15:56:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730735809; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BWMGpwiBDy1tP70ra0ChyJ3b1rA47OOgwI9Qdm7Ucec=; b=Ld1cWFT9yjK1E+DD6KUpj9JXjOU7EvK7vQIgGn+1NkvhvWSOhMzOiXRRczDwo8fDcQKLFn MpcuhTCTiGjWUX358L/Splh8BScVn2tB6zYox6f9izstmkKnqkRrfLcxqYA0sbZuiESpZx t7mzP35awHHilwBp2xXmxljsQXFlOx43+PHoHoC2+ag419ZmXyEAhr97EBSpcuyjhy7gnD YLDYwyWmpOHTMh2pb24GNsq8IariXqWC9muY0sH6wy2PgFjeTTvpBzv76kxYkrpcPepIRM aXt/BYPielONP4aj1CeApfWju59YCiH54/cebR/obVuxQpxVHqqlyEikDuPbUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730735809; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BWMGpwiBDy1tP70ra0ChyJ3b1rA47OOgwI9Qdm7Ucec=; b=g3SzKtA7HVMz5i/IHJh9NAFX4pFYRg5WEAwJnvv+X26KdHxf9lMJ6QKvwk0I8vuBK0FKYd doIhiobeNN5ktU1JwUvy7OY8vdRe0c1iq4MWn2XcxRp976lI997I5YZ/3TD6uLaY5B7fXm ldW488HRDbOJ5rpdrQdOPz72s2yrMBOCcOxy6iTO7Pi2vPB9ebDJV/OUxOBQDw1wzzjLcM VdriJ/9KsVIavGfvcLe9++PKo5uhWNM4ML70tlNpfGpuos/NJHdYvRZaf1Oj4Gaacln7KL 4ydorDYNOnRzCtftH6MZJcUN0OFuEc50XqrWeoVcUujZmP/WEVu5Lge9NeA2gA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730735809; a=rsa-sha256; cv=none; b=NitwCRNf/CrVIUQFTL0oP3CaoggXlWOeRkGcqrIqUpqdxbmRK2rCl3LaUDJcmgDHWvFqOl W0Bh5byYQGuyF5tDyDqrvA/HzqDC7VcWup4cB3Vz7WnJGJLt+/rwWK15qOZZCWu6EBpbwh WLx16+v6u1vBs0yS/d+ioJAcI3Wu5qMKdgGa2SgaIuym0hr0BDqWWyUPNZEVqMBNNQ1MLH ayhnvsRaILbyg0kqikSi8uHc2qMoxTjs0NPPnBgW/Gn432anN884YIWpYIQViqHn62F+1+ xh3bivnDevoEWZsublBFvNUq8WPqMZ5F0dxlqcIgoEAa+zSnsi4i7mSMGt80hA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Xhx0x0PxKzg8K; Mon, 4 Nov 2024 15:56:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A4FumDg072610; Mon, 4 Nov 2024 15:56:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A4FumET072605; Mon, 4 Nov 2024 15:56:48 GMT (envelope-from git) Date: Mon, 4 Nov 2024 15:56:48 GMT Message-Id: <202411041556.4A4FumET072605@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 7965dbfd5b70 - stable/14 - wpa_supplicant: xref relevant wpa_passphrase(8) List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 7965dbfd5b70ed787ad928cc3de44e19035b3e0b Auto-Submitted: auto-generated The branch stable/14 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=7965dbfd5b70ed787ad928cc3de44e19035b3e0b commit 7965dbfd5b70ed787ad928cc3de44e19035b3e0b Author: Alexander Ziaee AuthorDate: 2024-10-12 15:41:03 +0000 Commit: Mitchell Horne CommitDate: 2024-11-04 15:56:25 +0000 wpa_supplicant: xref relevant wpa_passphrase(8) Reviewed by: mhorne MFC after: 3 days Pull Request: https://github.com/freebsd/freebsd-src/pull/1461 (cherry picked from commit 5c59e40bc419870659946156b45a390cabd69c02) --- usr.sbin/wpa/wpa_supplicant/wpa_supplicant.8 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.8 b/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.8 index 9b51c3d8688c..cba5ce0228d6 100644 --- a/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.8 +++ b/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.8 @@ -160,7 +160,8 @@ Wait for a control interface monitor before starting. .Xr wpa_supplicant.conf 5 , .Xr devd 8 , .Xr ifconfig 8 , -.Xr wpa_cli 8 +.Xr wpa_cli 8 , +.Xr wpa_passphrase 8 .Sh HISTORY The .Nm From nobody Mon Nov 4 16:16:42 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XhxRt4gRqz5cGtP; Mon, 04 Nov 2024 16:16:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XhxRt2xsdz4qdW; Mon, 4 Nov 2024 16:16:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730737002; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Y81AWc1X4iDpue33sw5tCwaaxcqe1yOWoMTCkGjpWTE=; b=paNVMagm+iJogyU1QLHsklhDwHdAtGs79bh5tqh3ytw2oHUyH77bVC6JzjWimTlLhGP5zW IXBK63R9luMjmMFvJxiT3PjjdLUC6p2W4OuoOYwIiMV4XiCEKWdFhEZRiAvE/bWXgVha9h tks3ekpIExTnQz6SAAOvkiEPf1UjTfX/BN4alTmwNAOzgnv5kqG6eutjNqjm/meYxqbPXq Aymj+XLpKbpJG+TH6G74KeYqunHU6lkva14tAEujT+g57Dz2Eo/Eenw6TBn5Lh3+M6DAdZ YCTW5mchvFYd4T/VrtDioWuV1aGGq+Fusx2/rvYiXUAs13e8aojLdreo2f9/cw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730737002; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Y81AWc1X4iDpue33sw5tCwaaxcqe1yOWoMTCkGjpWTE=; b=SzPwcen8s/MVOLPCrt5juu6QX7lgjW3Ju1pUa1sPTsKY/sNVtFSQVKmrs83DHgaJeUgSu0 W8718arFypnef06tPL5eKF/3ptGnLh32RVW2DHF7codYLj9dxXVSo4n0ymt6pwkLt2i7kw lvk4TQx4+Wa+hrQ5JpC55QpCR9fvznN41ACPef2vJErmgbIp0iJ2c0DPKmH0bPQZmuIfTA Cun5nf2FovRo036r1LFfJuC2ZXT/oHcdEioT46xjLjnvejbrL6AOm21wXJCzajAKFgd+lB 8aYmcKOMR24RjiAN/yUW6skvusV8u10HOH9NPYADWT5N5NBi4z3a54LfkxFo+g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730737002; a=rsa-sha256; cv=none; b=LhfUlk3m7yeNGCVj6VuzKNxCwAaKX+ANRq9BCYGR7PGU1ccRMrxb38AJSslHR/YJLB6H3V ShfheeEZQ0rjMnOX/TgBaqj1+dKkiNmMEANbIUHhUd7sGml3gWOmHdOApE2h8luZyupqqN t9QyePmEU9o3En79llkQcxneZEUzajrssjn85nqpUheqFgrVWFmFGXeQorgkmCk+Kg1bKM 9PZBMDwdkhjdU9Z/EZjZNwGlJ4tTMAlOVNNyAH3Hd/wr5PN2gPiQ/6y6Z+xf+cvbQt56kB 3o7XkkR9+ly8CC8m9FYkYuQ3qBqo4tG/F1p7vVNQdxfT0lp/Fafr7RmFR6fjZw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XhxRt2G3Mzgfl; Mon, 4 Nov 2024 16:16:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A4GGgDu010444; Mon, 4 Nov 2024 16:16:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A4GGgMC010441; Mon, 4 Nov 2024 16:16:42 GMT (envelope-from git) Date: Mon, 4 Nov 2024 16:16:42 GMT Message-Id: <202411041616.4A4GGgMC010441@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 6136631124c0 - stable/14 - manuals: Fix "skipping end of block" .El errors List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 6136631124c08c24ff1d07c493fd07f1ff059ed5 Auto-Submitted: auto-generated The branch stable/14 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=6136631124c08c24ff1d07c493fd07f1ff059ed5 commit 6136631124c08c24ff1d07c493fd07f1ff059ed5 Author: Graham Percival AuthorDate: 2024-10-03 18:19:04 +0000 Commit: Mitchell Horne CommitDate: 2024-11-04 16:05:53 +0000 manuals: Fix "skipping end of block" .El errors These were reported by `mandoc -T lint ...` as errors; this commit only handles unnecessary .El commands. The rendered output (in ascii and html) is not affected by this commit. Signed-off-by: Graham Percival Reviewed by: mhorne MFC after: 3 days Sponsored by: Tarsnap Backup Inc. Pull Request: https://github.com/freebsd/freebsd-src/pull/1447 (cherry picked from commit c801836ff43deea3c86935abcad1069bfcd3989c) --- cddl/usr.sbin/zfsd/zfsd.8 | 1 - share/man/man4/gve.4 | 2 -- share/man/man4/mem.4 | 1 - usr.sbin/pnfsdskill/pnfsdskill.8 | 1 - 4 files changed, 5 deletions(-) diff --git a/cddl/usr.sbin/zfsd/zfsd.8 b/cddl/usr.sbin/zfsd/zfsd.8 index d6b0e1d4bd22..d668e0e8ee9e 100644 --- a/cddl/usr.sbin/zfsd/zfsd.8 +++ b/cddl/usr.sbin/zfsd/zfsd.8 @@ -154,7 +154,6 @@ will log interesting events and its actions to syslog with facility .Em daemon and identity .Op zfsd . -.El .Sh FILES .Bl -tag -width a -compact .It Pa /var/db/zfsd/cases diff --git a/share/man/man4/gve.4 b/share/man/man4/gve.4 index 9bb1be1b9a53..7dba99e68773 100644 --- a/share/man/man4/gve.4 +++ b/share/man/man4/gve.4 @@ -127,7 +127,6 @@ Tx queue-specific allocation failures: .It "Failed to alloc desc ring for tx ring %d" .It "Failed to vmap fifo, qpl_id = %d" .El -.El .Pp The following messages are recorded when the interface detach fails: .Bl -diag @@ -200,7 +199,6 @@ does not support the transmission of VLAN-tagged packets. All VLAN-tagged traffic is dropped. .Sh SUPPORT Please email gvnic-drivers@google.com with the specifics of the issue encountered. -.El .Sh SEE ALSO .Xr ifconfig 8 , .Xr netstat 8 diff --git a/share/man/man4/mem.4 b/share/man/man4/mem.4 index 5df074acc8f3..3132b7f3cf86 100644 --- a/share/man/man4/mem.4 +++ b/share/man/man4/mem.4 @@ -200,7 +200,6 @@ should be set to to update an existing or establish a new range, or to .Dv MEMRANGE_SET_REMOVE to remove a range. -.El .Ss Live Kernel Dumps .Pp The diff --git a/usr.sbin/pnfsdskill/pnfsdskill.8 b/usr.sbin/pnfsdskill/pnfsdskill.8 index a08492fdb966..97919bd65a83 100644 --- a/usr.sbin/pnfsdskill/pnfsdskill.8 +++ b/usr.sbin/pnfsdskill/pnfsdskill.8 @@ -62,7 +62,6 @@ by the MDS or reported to the MDS by a client. .Pp The pNFS service should continue to run normally so long as the number of operational DSs is at least as many as the level of mirroring. -.El .Sh SEE ALSO .Xr nfsv4 4 , .Xr pnfs 4 , From nobody Mon Nov 4 16:16:43 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XhxRv5WB3z5cGrH; Mon, 04 Nov 2024 16:16: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XhxRv3JhWz4qdX; Mon, 4 Nov 2024 16:16:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730737003; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ejvVyndv+2Fiy5U78t7Dc/WgxPK6BK6V4cjwcmPNNUQ=; b=hYe9+6dfmGyXkEXKH3yEZ17Dz/s9SRH7VK0QykIrSspB7rtHyqsg0T6/yYYWq+xF6uV3Z9 FAuwXvfIgEcGD0fgTg9GCUzrhEt+9svhOwsp2yjiaPeMO/jGHZAqDTnz843qY0GYh5XqE0 HCW+KB6rsUlwypORAwzwEjobhSkdScYFqq5vzCLrFgzAyzXYUL1H61Y2QT4v5CYHH1Wnbc jPTS4YvnDpRAfgTQuY5bkz6aXq7f2ru0TAQjn/b7ayJqHf78Z75YDgNsND6c0uA5LE36v0 m+U97x8PgBU7+g/Fg8S8MxRZq7+foz2YvsSB/fp9FP/7b/zC9dOp5yyhGNzKPg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730737003; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ejvVyndv+2Fiy5U78t7Dc/WgxPK6BK6V4cjwcmPNNUQ=; b=hPmCpEqL89Z6zJvLprFb8yuFHANHEbVsFo0CXajHmcUe3HHp5PomGFjMKIXaYHRTxOgOgU DOxNb3qbU5Ma7uzBmr9L5JoirDK1XjYW46iw3WOw0oMuGZtYIp8MYjhMC63MZf/TuaTfKl MEN/cgvXcezWJRYf+A0JDritTHFTFm6w9Q8BjB1X9BlV84qh8pyy/D3O08oT7P9xGRaQxO VJFaLlkcVrNCLMWoJyGViT8DYicfUrv5X1YD+qL0bFx2wTDdVOXA/qYI68zO2PS5BPTP/j /Kx9RXsnH3GZ6wAj1RHXz0NqmyAuwE5vZnf7c24pvKuCzMkBKi/c1GBQqWKfgQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730737003; a=rsa-sha256; cv=none; b=oVXl78RSZGGujrh8nP5y8pTmMRTlPBS3TO4oYFzuo4jZTua+4bUVqwJkIlv0tpMeFOm52X VwZj+UlKCGQbpP/ITHmB4Fcuhs7y1yazCRxetvel69vceT2E1dQBcTDvSTa2FDdtFWSbE1 zxj5mg4AAViL5AN5FtSyEWG9bIKjHXgDG3ekt4+0BmtifWRm/94OzW/0w4vdINimkf36mN gZn6/mWd6++6902p5EuyJmWx+y7i+DF5Yf3J+Qhg/EhW/UnhjNqnnuB358sKcVeYWLX4nC toEO3ed7SVxN67g5NlSn+7JFoIal0yZ1Rh7K79QPXKBIaVvwLXLs1gSShBNWGg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XhxRv2sFrzgZT; Mon, 4 Nov 2024 16:16:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A4GGhJh010493; Mon, 4 Nov 2024 16:16:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A4GGhEk010490; Mon, 4 Nov 2024 16:16:43 GMT (envelope-from git) Date: Mon, 4 Nov 2024 16:16:43 GMT Message-Id: <202411041616.4A4GGhEk010490@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: c0bd4ec70b19 - stable/14 - manuals: Fix "missing end of block" errors List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c0bd4ec70b196b919c09b04af71230596af23fcd Auto-Submitted: auto-generated The branch stable/14 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=c0bd4ec70b196b919c09b04af71230596af23fcd commit c0bd4ec70b196b919c09b04af71230596af23fcd Author: Graham Percival AuthorDate: 2024-10-03 18:43:13 +0000 Commit: Mitchell Horne CommitDate: 2024-11-04 16:07:50 +0000 manuals: Fix "missing end of block" errors These were reported by `mandoc -T lint ...` as errors. The rendered output (in ascii and html) is not affected by this commit. Signed-off-by: Graham Percival Reviewed by: mhorne MFC after: 3 days Sponsored by: Tarsnap Backup Inc. Pull Request: https://github.com/freebsd/freebsd-src/pull/1448 (cherry picked from commit d21e322d563e0fd1f92c22205c2ced4bcd22dc23) --- lib/libc/gen/makecontext.3 | 1 + lib/libc/posix1e/acl_cmp_np.3 | 1 + lib/libc/posix1e/acl_extended_file_np.3 | 1 + lib/libpathconv/abs2rel.3 | 1 + lib/libpathconv/rel2abs.3 | 1 + sbin/init/init.8 | 1 + share/man/man4/splash.4 | 1 + 7 files changed, 7 insertions(+) diff --git a/lib/libc/gen/makecontext.3 b/lib/libc/gen/makecontext.3 index bcf836979962..198c541d40a6 100644 --- a/lib/libc/gen/makecontext.3 +++ b/lib/libc/gen/makecontext.3 @@ -152,6 +152,7 @@ via .Fn makecontext ; portable applications should not rely on the implementation detail that it may be possible to pass pointer arguments to functions. +.Ef .Sh HISTORY The .Fn makecontext diff --git a/lib/libc/posix1e/acl_cmp_np.3 b/lib/libc/posix1e/acl_cmp_np.3 index a8dca4959d2e..5e47df833d0d 100644 --- a/lib/libc/posix1e/acl_cmp_np.3 +++ b/lib/libc/posix1e/acl_cmp_np.3 @@ -63,6 +63,7 @@ to the corresponding value: .Bl -tag -width Er .It Bq Er EINVAL Either first or second argument does not point to a valid ACL. +.El .Sh SEE ALSO .Xr acl 3 , .Xr posix1e 3 diff --git a/lib/libc/posix1e/acl_extended_file_np.3 b/lib/libc/posix1e/acl_extended_file_np.3 index 26572be9d2b3..4673e9c3e417 100644 --- a/lib/libc/posix1e/acl_extended_file_np.3 +++ b/lib/libc/posix1e/acl_extended_file_np.3 @@ -75,6 +75,7 @@ to the corresponding value: .Bl -tag -width Er .It Bq Er EACCES Search permission is denied for a component of the path prefix. +.El .Sh SEE ALSO .Xr extattr_get_file 2 , .Xr posix1e 3 diff --git a/lib/libpathconv/abs2rel.3 b/lib/libpathconv/abs2rel.3 index 634f294800e4..9240ef1662e2 100644 --- a/lib/libpathconv/abs2rel.3 +++ b/lib/libpathconv/abs2rel.3 @@ -93,6 +93,7 @@ The .Fa size argument is greater than zero but smaller than the length of the pathname plus 1. +.El .Sh SEE ALSO .Xr rel2abs 3 .Sh AUTHORS diff --git a/lib/libpathconv/rel2abs.3 b/lib/libpathconv/rel2abs.3 index f889f427450d..1f607fd739e1 100644 --- a/lib/libpathconv/rel2abs.3 +++ b/lib/libpathconv/rel2abs.3 @@ -90,6 +90,7 @@ argument is zero. The .Fa size argument is greater than zero but smaller than the length of the pathname plus 1 +.El .Sh SEE ALSO .Xr abs2rel 3 .Sh AUTHORS diff --git a/sbin/init/init.8 b/sbin/init/init.8 index 88d663a1afe8..b20860d59e35 100644 --- a/sbin/init/init.8 +++ b/sbin/init/init.8 @@ -398,6 +398,7 @@ back to the default, so that the .Pa /etc/rc script is executed with the standard shell .Pa /bin/sh . +.El .Sh FILES .Bl -tag -width /var/log/init.log -compact .It Pa /dev/console diff --git a/share/man/man4/splash.4 b/share/man/man4/splash.4 index af2ae2e4369a..d7123bf6efd9 100644 --- a/share/man/man4/splash.4 +++ b/share/man/man4/splash.4 @@ -253,6 +253,7 @@ and include the following lines: .Bd -literal -offset indent splash="/boot/images/freebsd-logo-rev.png" boot_mute="YES" +.Ed .\".Sh DIAGNOSTICS .Sh SEE ALSO .Xr vidcontrol 1 , From nobody Mon Nov 4 16:16:44 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XhxRw5pq7z5cGtQ; Mon, 04 Nov 2024 16:16:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XhxRw4Mv2z4qRw; Mon, 4 Nov 2024 16:16:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730737004; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PlcpUYip4a7M3KFyTihi8+eRXZG5YPJszFhsy+Dnu5w=; b=OdHrIgK2FCOra3JwkHsde42BYTGp5CKapRvR+UwKapEgd8h/+NRAtcoZ5yCVs2BCdgUeTk znQBZw8dVXHqyMDVyYf+XOBcMNgz5ELIWk0A7PgK+uXTejsM27vaw8SFFR9R8uQKUbElEf iVTIQHBKSdVzuK3BEbt+mDjb0DHdnrPMgTIK0IhtOfIeiHVcarcqqygTzAIUgjz9JiRteA hpIO4zzBJtBN+KjlSd9ATRpzZY2PwtNM/bVlgWbIFd0fPnqtX6Y74xJfB1CuA0bG/xzAuR pOF/hejSJcjff2VlwGpeisOAg9l91Q++4zQoFqEfTQ0AzPdBmQQizgdtDPkKQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730737004; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PlcpUYip4a7M3KFyTihi8+eRXZG5YPJszFhsy+Dnu5w=; b=K5NF0DN4CDttvO9cLkXbNa789aYt2O9YEBZqwrxa3DR42GfqTIP5Hd+JAqbE9ISUkbJ4TC Af8650jcqXz2VdQVrbh6K9Ex+d9Jf8qmY8viEQJddWoZTGA5KtmwGLo6uvrsDAcriQK0KO GOvsLN21w+1uYsKzzmHOPfhrJcQ4jruj37WI+uhbKMP3xRnyqj4Efm0F4MPdMEVe845YSS 6gqyN4Ks9307mso6UUEIyV27CScj+76jkkg274LuWOR/Dn+A9NaxxCqb66Bn63zl/QHHkG QEvcrE/jWVXGzkHeh+7ARcxWfgOVfATBluaUC2hC68kOAMQzU2IEPSCpideA1w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730737004; a=rsa-sha256; cv=none; b=IjVCWDT00XvUvIXCwD/rEQYb/kz3rccsJGAkt2z4++1rNjqwTvkSiH3PupYU6Cyi75LTiB oUAyk/ChgeQApLCSdO5RGlStpYgd6+l7MtX50qW0jUr2KqMAriGcEPWjG2GNQd3YrIVvda /6GmpxBhMhi7Cz7xXZrakDZDqqTsQNyYqvDBRHSuBkS38CK783BSpvDnp3ktz3o4IpPr9e HHlc36EuO74ldvmzUopmf5bO9TVr+MFNorMjuqTMhw8Z892H5mJuzeLAGaBwCcpeg2Ot/r qHu/7YsbUfPd62W9FxBbFgFFdNemskRpqBI2HfjGw7MHLaTipRztXRXnOVlFQw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XhxRw3SKwzfvX; Mon, 4 Nov 2024 16:16:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A4GGiNI010545; Mon, 4 Nov 2024 16:16:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A4GGirh010542; Mon, 4 Nov 2024 16:16:44 GMT (envelope-from git) Date: Mon, 4 Nov 2024 16:16:44 GMT Message-Id: <202411041616.4A4GGirh010542@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 6a65bb7ed867 - stable/14 - manuals: Fix "missing end of block" errors List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 6a65bb7ed867d734dbaa14ac4bdbba65072db2f2 Auto-Submitted: auto-generated The branch stable/14 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=6a65bb7ed867d734dbaa14ac4bdbba65072db2f2 commit 6a65bb7ed867d734dbaa14ac4bdbba65072db2f2 Author: Graham Percival AuthorDate: 2024-10-08 01:37:45 +0000 Commit: Mitchell Horne CommitDate: 2024-11-04 16:08:13 +0000 manuals: Fix "missing end of block" errors These were reported by `mandoc -T lint ...` as errors. The rendered output (in ascii and html) is not affected by this commit. Signed-off-by: Graham Percival Reviewed by: mhorne, Alexander Ziaee MFC after: 3 days Sponsored by: Tarsnap Backup Inc. Pull Request: https://github.com/freebsd/freebsd-src/pull/1454 (cherry picked from commit 643fc698203b9b0ed386b0583c2200c428135c9d) --- stand/man/loader_lua.8 | 1 + stand/man/loader_simp.8 | 2 ++ usr.bin/bintrans/bintrans.1 | 1 + 3 files changed, 4 insertions(+) diff --git a/stand/man/loader_lua.8 b/stand/man/loader_lua.8 index 1ba0939e60bd..0aa467237266 100644 --- a/stand/man/loader_lua.8 +++ b/stand/man/loader_lua.8 @@ -197,6 +197,7 @@ Loader init .Nm configuration files, as described in .Xr loader.conf 5 . +.El .Sh EXAMPLES Boot in single user mode: .Pp diff --git a/stand/man/loader_simp.8 b/stand/man/loader_simp.8 index 6eac6bf6a102..49214e78b494 100644 --- a/stand/man/loader_simp.8 +++ b/stand/man/loader_simp.8 @@ -659,6 +659,7 @@ command line by booting unconditionally in .Pa loader.rc . In order for this to be effective, one should also configure the firmware (BIOS or UEFI) to prevent booting from unauthorized devices. +.El .Sh FILES .Bl -tag -width /boot/loader_simp -compact .It Pa /boot/loader_simp @@ -668,6 +669,7 @@ itself. The script run by .Nm on startup. +.El .Sh EXAMPLES Boot in single user mode: .Pp diff --git a/usr.bin/bintrans/bintrans.1 b/usr.bin/bintrans/bintrans.1 index 054f304d4c61..3376ecd332ed 100644 --- a/usr.bin/bintrans/bintrans.1 +++ b/usr.bin/bintrans/bintrans.1 @@ -236,6 +236,7 @@ Decode. Output to .Ar output_file instead of standard output. +.El .Sh EXAMPLES The following example packages up a source tree, compresses it, uuencodes it and mails it to a user on another system. From nobody Mon Nov 4 16:16:45 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XhxRx6k4tz5cGtb; Mon, 04 Nov 2024 16:16: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XhxRx51v6z4qYH; Mon, 4 Nov 2024 16:16:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730737005; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jsB20fJdFL4TxHtQGVKDBRv+UnpVTnqui0rMxsZ7Gkg=; b=Q3eGTMOACt6Oaz446QApCJqkRViwBB8IDvEPxpSUnBvPMoTDKmfLiyGrNb8cSust6YKT4y 1SsG6qfHbJ53kSxJJl+sGpp6t1by2KBjNNB3BUTX5lbsjgCnnJVFXMUQ+knrmY3N1hehWB nNTpXEDB1x8GYb2D2/48PkSPZf7D4uh5CJlZpSDzAmi5DXe38yJlcxpRQOMgMrdz3CIAc0 Hmx6FrU7ZlGLLfWGBoq6kTbCGFy6mL+2VhJcvswSPVfTnw0KW8RWXmoJ3Ra9M6saFKsX6d h1U8/jslzcZWbFUO96ua0g8yR8D+OhNUhdyWDM00cxi+hvGHv8FEQANl4gn/bg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730737005; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jsB20fJdFL4TxHtQGVKDBRv+UnpVTnqui0rMxsZ7Gkg=; b=eXG/feD25i0X58dq6CjO5hvDp99Mvn9GAJ0zixlRUzY7N+Xw3M3/lJkYVNhkGv3UdFfYUr T6YOip00OUmdN93vWiOMKGrcafBxpzRpbwvyucJEciJbnmZQTwiLeRZbe8ARGXex5VEj9N 9Wm8NQC8ocWO9ZAGcYMaZAjth8wH55c2dsi7xsj8F+hp+TA2WXlU5Pv6T/J/SabHo0vYJH vSdeZzPKvRb+OHcrNa8D1vAT9JDdeJCGAfVgdzcdgqIAYVe8VKF/pExcrnS0bLo/Mhb6LY rJ3Mp4qjh+hfiFy8CMtmyFRO8rhVLxKvBkV6I3lR4Ie+FvbcibQjP+vp0Up4ig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730737005; a=rsa-sha256; cv=none; b=TOBTab4bagK9t9bXOhb1PzTcMKP3EZ7uxnaFA2/dMdoMjfku+7IMdvrN0kZI4zqBTf12QK /9cx8b/CnQleMi9yhJp7d05ILPS7OBm9mYOf/TJxbN0kTJ+IGFZ2iTD81CfHzBd/cw9PAw wUPalyNT6i4lCBe0wTFgTGnOrAGI8CKnuXc6ocnv/Kb78+Em4p05AN/3uQiRP8Ioo6B+qP q09LOpBW0EXD2H4HGcOuItnTvzd650Mvr3fYAr/Qki4QAR4Qty8kWfOCI/NUO/ce0npHWj XJMAghKj6b8m3LToj58ZIWiY/Y4SopANL1qqVtwHAbJnIixw/THoDWYfwOsDzg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XhxRx4SNlzfpM; Mon, 4 Nov 2024 16:16:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A4GGj32010590; Mon, 4 Nov 2024 16:16:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A4GGjGB010587; Mon, 4 Nov 2024 16:16:45 GMT (envelope-from git) Date: Mon, 4 Nov 2024 16:16:45 GMT Message-Id: <202411041616.4A4GGjGB010587@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 64e8a9679ead - stable/14 - mitigations.7: markup functions with Fn macro List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 64e8a9679ead6f7e2ab3617b50d5edc99f410e52 Auto-Submitted: auto-generated The branch stable/14 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=64e8a9679ead6f7e2ab3617b50d5edc99f410e52 commit 64e8a9679ead6f7e2ab3617b50d5edc99f410e52 Author: Alexander Ziaee AuthorDate: 2024-09-21 17:47:53 +0000 Commit: Mitchell Horne CommitDate: 2024-11-04 16:08:38 +0000 mitigations.7: markup functions with Fn macro + include this page in `apropos Fn=memcpy` Reviewed by: emaste MFC after: 3 days Pull Request: https://github.com/freebsd/freebsd-src/pull/1428 (cherry picked from commit 22fb46af90d62d8177bfa0f1a8e4d89efa0b1905) --- share/man/man7/mitigations.7 | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/share/man/man7/mitigations.7 b/share/man/man7/mitigations.7 index 7156327a7795..0667d58c309b 100644 --- a/share/man/man7/mitigations.7 +++ b/share/man/man7/mitigations.7 @@ -288,11 +288,11 @@ When enabled, enables extra bounds checking in various functions that accept buffers to be written into. These functions currently have extra bounds checking support: -.Bl -column -offset indent "snprintf" "memmove" "strncpy" "vsnprintf" "readlink" -.It bcopy Ta bzero Ta fgets Ta getcwd Ta gets -.It memcpy Ta memmove Ta memset Ta read Ta readlink -.It snprintf Ta sprintf Ta stpcpy Ta stpncpy Ta strcat -.It strcpy Ta strncat Ta strncpy Ta vsnprintf Ta vsprintf +.Bl -column -offset indent "snprintf()" "memmove()" "strncpy()" "vsnprintf()" "readlink()" +.It Fn bcopy Ta Fn bzero Ta Fn fgets Ta Fn getcwd Ta Fn gets +.It Fn memcpy Ta Fn memmove Ta Fn memset Ta Fn read Ta Fn readlink +.It Fn snprintf Ta Fn sprintf Ta Fn stpcpy Ta Fn stpncpy Ta Fn strcat +.It Fn strcpy Ta Fn strncat Ta Fn strncpy Ta Fn vsnprintf Ta Fn vsprintf .El .Pp .Dq FORTIFY_SOURCE From nobody Mon Nov 4 16:16:46 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XhxRz1zdVz5cGWW; Mon, 04 Nov 2024 16:16: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XhxRy6R1mz4qYT; Mon, 4 Nov 2024 16:16:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730737006; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Uj5UrR8ilIDlYDMt5k1Eol/xe1aW+owo29/oinrPpD0=; b=Ccpsvsp5FiSe0J+mw7FAn9g0Kf902HPXoDCx+Sx9tg2FN2m7nt71llBNZbNtzPzBOCBlK2 4r2WGz2/mBgVXBu5l/wLM/d9xpA87V129Di9h4CZyvJbA4RtMe2J7nF4NeTM1XnTXXOVTS W+7rFc+D4OxepOiLNLtN7l+EWaagGkDiwEmPV317/QbOyfBEOipiu2ryIwB/SGgk0DbiEn 5klgR9mlkDW3mUNZWyu4xS1jui7uQJ86tK4EeF97Eo2zI0XlWIaPxtRxHduPBTlQJy2JXl 2y0MO9fuQ7/IA4rTWtXbNgqCJ0WHcQ4C2wqy/zNOrzvCJscTR8uLri4gO1JVCA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730737006; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Uj5UrR8ilIDlYDMt5k1Eol/xe1aW+owo29/oinrPpD0=; b=HQGryvVOCLFgU6UiFwtcaNuqJ8wfuBkDpqAoCCVfRwhenAR9lco2LHVSDuidFfmCfgNKP1 i147F18r3b22QXW29raI193AsSwNUANQhdG0DyeG7hUlHMo0353AQrB8OtDfYGOQGRMdHZ 3xWHt74NNxlVwFZJToNidyzT98NyvJ5S8PC4ed78NNObRaAQUIRwXHFtsY4k37mlC5dNFA ZegwfCartEEFfq7BqWFXqy52dxNu/v3HGOMNXlDrx8PjwXaJsskA7e2qD6OYsKyrVttkpn k3wsa77cZwj2XXRCY9gnHEK+s0wvRtnu2K56W7TsUMGlVq1wtdP4dTaPBzZB3w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730737006; a=rsa-sha256; cv=none; b=pn/aBP1ObU/ROzPl69fzM04/sDvuaxKYGOpfDKHwlRYgW2+sT76MmbQXZaL3C1UDm0eHRa RF8ePAKkjD5Q4ItVB+7oNGK0f/eS8sSURK/r4pwrz6oSB7FtOe1XHkhXhcvOCg9MS4iKUW so4gWaCmF/BdLPi/+dJYPQV7VN2mQ9hdjJTEBgqViaElffKuNjEYMOFsP8wH+JRjMqaKJM yqZs9k+ydoH2gbyXxxAs5xrq06lXnjtj/9jm4GAngIDh9yG8UpGVGZ5dl19yenH+2RqJrT SE8zrsT2Fn5Hy0Adyoh5qH1QvaJABoIzeFzo7h8sc6wYRyiN5qvNwIXUrZe7XA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XhxRy5VgqzfpN; Mon, 4 Nov 2024 16:16:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A4GGkIA010635; Mon, 4 Nov 2024 16:16:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A4GGkiL010632; Mon, 4 Nov 2024 16:16:46 GMT (envelope-from git) Date: Mon, 4 Nov 2024 16:16:46 GMT Message-Id: <202411041616.4A4GGkiL010632@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 3dedfaa01a9c - stable/14 - mitigations.7: minor cleanup (linter errors) List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 3dedfaa01a9ce21bd22dafbb9b32f9d8d96b0f63 Auto-Submitted: auto-generated The branch stable/14 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=3dedfaa01a9ce21bd22dafbb9b32f9d8d96b0f63 commit 3dedfaa01a9ce21bd22dafbb9b32f9d8d96b0f63 Author: Alexander Ziaee AuthorDate: 2024-09-21 18:03:57 +0000 Commit: Mitchell Horne CommitDate: 2024-11-04 16:08:38 +0000 mitigations.7: minor cleanup (linter errors) Reviewed by: emaste MFC after: 3 days Pull Request: https://github.com/freebsd/freebsd-src/pull/1428 (cherry picked from commit c3294033e024620874ecfc219174347989378a3b) --- share/man/man7/mitigations.7 | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/share/man/man7/mitigations.7 b/share/man/man7/mitigations.7 index 0667d58c309b..7e3dc3078825 100644 --- a/share/man/man7/mitigations.7 +++ b/share/man/man7/mitigations.7 @@ -154,7 +154,7 @@ proccontrol .Ss Position Independent Executable (PIE) PIE binaries are executable files that do not have a fixed load address. They can be loaded at an arbitrary memory address by the -.Xr rtld +.Xr rtld 1 run-time linker. With ASLR they are loaded at a random address on each execution. .\" @@ -185,17 +185,19 @@ Allow 64-bit processes to map pages simultaneously writable and executable. .\" .Ss PROT_MAX .Dv PROT_MAX -is a FreeBSD-specific extension to +is a +.Fx Ns +-specific extension to .Xr mmap 2 . .Dv PROT_MAX provides the ability to set the maximum protection of a region allocated by -.Xr mmap +.Xr mmap 2 and later altered by -.Xr mprotect . +.Xr mprotect 2 . For example, memory allocated originally with an mmap prot argument of PROT_MAX(PROT_READ | PROT_WRITE) | PROT_READ may be made writable by a future -.Xr mprotect +.Xr mprotect 2 call, but may not be made executable. .\" .Ss Relocation Read-Only (RELRO) From nobody Mon Nov 4 16:16:47 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XhxS01Hjxz5cH25; Mon, 04 Nov 2024 16:16: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XhxRz6LPYz4qvV; Mon, 4 Nov 2024 16:16:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730737007; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gtn5XSumj6pv4fWweEBrmCjdx+I3mLce1LQou7LC+2A=; b=gXKC0KhBYl2KzP9Kd838BGfeYJuC+9WA3GnpKZAWHPe63NC8MRN5n17XuONDmSbwdh/VZa eggA+8PSYG8brxXnNXt7teSwHm0cCjKuwRUnYH9lrmB+9Ysc6OVpqcEBV1VfLoH/0rTlNV 5u8VMSuO/ca+cvphw3MdaXdh46Hx4MTlB+glLxXFgS31rO+SF033h+HNueP1o7N52VeBxB bS4Fz6II/XhmI2V/4Y9vLzpudUsGsPB9ValAakC7kBRbjDgsbLoBexdNzLxQCyPFeI5AUH NluelmGCkCX5D7qwqHiYdlpzIh9JEaLl5jFlsbKjFhOd5ZWv3bQuTkv2/umRdg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730737007; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gtn5XSumj6pv4fWweEBrmCjdx+I3mLce1LQou7LC+2A=; b=BxfyUUf9YFcfLjNNPvBfsSmdTzMO+a+fcG6LMPtN+v6qsqb6wMrxvxXiY1F1hYU9yZRXMt 7lNcPpgPQiVyL0G4gUrjFReXciKfjvnc0P0K+uSWnqyNsx2mAls2XrUGLt9Tzco0f0Seak yH1hkdeMYIPbYHuu2tmkwLGxThCijpG8EGyk4w25wPoQ+HekiR6AKemCB5vdpgPRfwo+oq xpmb7JxYdsscZUHyfDfKbDKXraEry1lla40h9zgFekNshSOAknbQmBijeES102nGOALdDV tdzRjWokbf+jHYcqEYPmyJ+xMpvtuICD2rkH5L7XLLEITSdxDfzycv6WQMJGHQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730737007; a=rsa-sha256; cv=none; b=CNAhJhQIzFHeAEzdbmFSuWLchBZB9VBFJZZ/VlsCVSwDzcgrm+Sfmvox3VeaAaW1a375fK MGKfxzRo2k8Kx0pAF4dH7wCu2uD0UZcRPcBnJy8edp7BZG8tH818PywVDKebjbuzpGu5Lt 76NNdxQ84zcrtQ5vh6DnSCUukb2LVtgz9QsR1MbrbgT5rvFQZcWbnzr/LDNrtor/gvuYJ0 am8v0YgOneZq5NaxI0pKhttHswDWyrhfcY5Ook3j2RaGnortPWFH+ADY+YiTEOHC3H3Llc MqW6zU6jFVWiObWx7n9axebb6NZ4+vT0g3CUSoni0hb+QsRzF0+sAVZICt6lrA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XhxRz5pKVzgZV; Mon, 4 Nov 2024 16:16:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A4GGloA010696; Mon, 4 Nov 2024 16:16:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A4GGleR010693; Mon, 4 Nov 2024 16:16:47 GMT (envelope-from git) Date: Mon, 4 Nov 2024 16:16:47 GMT Message-Id: <202411041616.4A4GGleR010693@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: ddf4df54a7d3 - stable/14 - manuals: Fix "unusual .Xr" warnings with a script List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: ddf4df54a7d3bf3df2cf929307e677acf86b06e2 Auto-Submitted: auto-generated The branch stable/14 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=ddf4df54a7d3bf3df2cf929307e677acf86b06e2 commit ddf4df54a7d3bf3df2cf929307e677acf86b06e2 Author: Graham Percival AuthorDate: 2024-10-15 15:44:42 +0000 Commit: Mitchell Horne CommitDate: 2024-11-04 16:13:13 +0000 manuals: Fix "unusual .Xr" warnings with a script These were reported by `mandoc -T lint ...` as warnings: - unusual Xr order - unusual Xr punctuation Fixes made by script in https://github.com/Tarsnap/freebsd-doc-scripts Signed-off-by: Graham Percival Reviewed by: mhorne, Alexander Ziaee Sponsored by: Tarsnap Backup Inc. Pull Request: https://github.com/freebsd/freebsd-src/pull/1464 (cherry picked from commit 6e1fc0118033f42b7c0d3623c8f67a89ebecabb2) --- lib/libc/gen/posix_spawn.3 | 4 ++-- lib/libc/gen/setproctitle.3 | 4 ++-- lib/libc/string/bstring.3 | 1 - lib/libc/sys/fhreadlink.2 | 2 +- lib/libc/sys/getrlimitusage.2 | 2 +- lib/libc/sys/socket.2 | 6 +++--- lib/libc/sys/thr_kill.2 | 2 +- lib/libc/x86/sys/pkru.3 | 2 +- lib/libjail/jail.3 | 2 +- lib/libpam/modules/pam_chroot/pam_chroot.8 | 4 ++-- lib/libpam/modules/pam_deny/pam_deny.8 | 4 ++-- lib/libpam/modules/pam_echo/pam_echo.8 | 4 ++-- lib/libpam/modules/pam_exec/pam_exec.8 | 6 +++--- lib/libpam/modules/pam_ftpusers/pam_ftpusers.8 | 4 ++-- lib/libpam/modules/pam_group/pam_group.8 | 4 ++-- lib/libpam/modules/pam_guest/pam_guest.8 | 4 ++-- lib/libpam/modules/pam_krb5/pam_krb5.8 | 4 ++-- lib/libpam/modules/pam_ksu/pam_ksu.8 | 4 ++-- lib/libpam/modules/pam_lastlog/pam_lastlog.8 | 4 ++-- lib/libpam/modules/pam_nologin/pam_nologin.8 | 4 ++-- lib/libpam/modules/pam_passwdqc/pam_passwdqc.8 | 4 ++-- lib/libpam/modules/pam_permit/pam_permit.8 | 4 ++-- lib/libpam/modules/pam_radius/pam_radius.8 | 4 ++-- lib/libpam/modules/pam_rhosts/pam_rhosts.8 | 4 ++-- lib/libpam/modules/pam_rootok/pam_rootok.8 | 4 ++-- lib/libpam/modules/pam_securetty/pam_securetty.8 | 4 ++-- lib/libpam/modules/pam_self/pam_self.8 | 4 ++-- lib/libpam/modules/pam_ssh/pam_ssh.8 | 4 ++-- lib/libpam/modules/pam_unix/pam_unix.8 | 2 +- lib/libsysdecode/sysdecode_sctp_sinfo_flags.3 | 2 +- lib/libthr/libthr.3 | 4 ++-- lib/libveriexec/veriexec.3 | 2 +- sbin/comcontrol/comcontrol.8 | 2 +- sbin/newfs/newfs.8 | 2 +- sbin/umount/umount.8 | 4 ++-- share/man/man4/atopcase.4 | 4 ++-- share/man/man4/cd.4 | 1 + share/man/man4/cdce.4 | 4 ++-- share/man/man4/dummynet.4 | 4 ++-- share/man/man4/ftgpio.4 | 2 +- share/man/man4/ipfirewall.4 | 2 +- share/man/man4/ipsec.4 | 2 +- share/man/man4/mac_do.4 | 4 ++-- share/man/man4/man4.aarch64/rk_gpio.4 | 2 +- share/man/man4/man4.aarch64/rk_i2c.4 | 2 +- share/man/man4/man4.aarch64/rk_pinctrl.4 | 2 +- share/man/man4/man4.arm/imx6_ahci.4 | 2 +- share/man/man4/mpi3mr.4 | 2 +- share/man/man4/netmap.4 | 4 ++-- share/man/man4/ng_nat.4 | 4 ++-- share/man/man4/ng_pppoe.4 | 4 ++-- share/man/man4/procdesc.4 | 2 +- share/man/man4/virtio_gpu.4 | 2 +- share/man/man5/lindebugfs.5 | 2 +- share/man/man5/pf.conf.5 | 2 +- share/man/man8/rc.subr.8 | 1 + share/man/man9/VOP_SETLABEL.9 | 8 ++++---- share/man/man9/cr_bsd_visible.9 | 8 ++++---- share/man/man9/cr_cansee.9 | 6 +++--- share/man/man9/cr_canseeothergids.9 | 4 ++-- share/man/man9/groupmember.9 | 2 +- share/man/man9/p_candebug.9 | 8 ++++---- share/man/man9/p_cansee.9 | 4 ++-- share/man/man9/rtentry.9 | 2 +- tools/tools/ether_reflect/ether_reflect.1 | 2 +- usr.bin/beep/beep.1 | 2 +- usr.bin/gzip/gzip.1 | 2 +- usr.bin/mdo/mdo.1 | 2 +- usr.bin/msgs/msgs.1 | 2 +- usr.bin/posixmqcontrol/posixmqcontrol.1 | 2 +- usr.sbin/i2c/i2c.8 | 2 +- usr.sbin/lastlogin/lastlogin.8 | 4 ++-- usr.sbin/mailwrapper/mailwrapper.8 | 2 +- usr.sbin/rpc.tlsclntd/rpc.tlsclntd.8 | 2 +- 74 files changed, 120 insertions(+), 119 deletions(-) diff --git a/lib/libc/gen/posix_spawn.3 b/lib/libc/gen/posix_spawn.3 index 55559ae7222b..278fee88463a 100644 --- a/lib/libc/gen/posix_spawn.3 +++ b/lib/libc/gen/posix_spawn.3 @@ -446,12 +446,12 @@ action. .Xr sched_setscheduler 2 , .Xr setpgid 2 , .Xr vfork 2 , +.Xr posix_spawn_file_actions_addchdir_np 3 , .Xr posix_spawn_file_actions_addclose 3 , .Xr posix_spawn_file_actions_addclosefrom_np 3 , .Xr posix_spawn_file_actions_adddup2 3 , -.Xr posix_spawn_file_actions_addopen 3 , -.Xr posix_spawn_file_actions_addchdir_np 3 , .Xr posix_spawn_file_actions_addfchdir_np 3 , +.Xr posix_spawn_file_actions_addopen 3 , .Xr posix_spawn_file_actions_destroy 3 , .Xr posix_spawn_file_actions_init 3 , .Xr posix_spawnattr_destroy 3 , diff --git a/lib/libc/gen/setproctitle.3 b/lib/libc/gen/setproctitle.3 index 15bafa23a982..087cbe4b84e9 100644 --- a/lib/libc/gen/setproctitle.3 +++ b/lib/libc/gen/setproctitle.3 @@ -74,10 +74,10 @@ setproctitle("talking to %s", inet_ntoa(addr)); .Sh SEE ALSO .Xr ps 1 , .Xr w 1 , -.Xr setprogname 3 , .Xr kvm 3 , .Xr kvm_getargv 3 , -.Xr printf 3 +.Xr printf 3 , +.Xr setprogname 3 .Sh STANDARDS The .Fn setproctitle diff --git a/lib/libc/string/bstring.3 b/lib/libc/string/bstring.3 index bb1a0505fafd..dc3034db1d6c 100644 --- a/lib/libc/string/bstring.3 +++ b/lib/libc/string/bstring.3 @@ -85,7 +85,6 @@ See the specific manual pages for more information. .Xr memccpy 3 , .Xr memchr 3 , .Xr memcmp 3 , -.Xr memccpy 3 , .Xr memcpy 3 , .Xr memmove 3 , .Xr memset 3 diff --git a/lib/libc/sys/fhreadlink.2 b/lib/libc/sys/fhreadlink.2 index 222142de223e..2d8db95685da 100644 --- a/lib/libc/sys/fhreadlink.2 +++ b/lib/libc/sys/fhreadlink.2 @@ -86,8 +86,8 @@ The file handle is no longer valid .El .Sh SEE ALSO -.Xr fhstat 2 , .Xr fhlink 2 , +.Xr fhstat 2 .Sh HISTORY The .Fn fhreadlink diff --git a/lib/libc/sys/getrlimitusage.2 b/lib/libc/sys/getrlimitusage.2 index 2e3dc744ab23..e82e7b4443fd 100644 --- a/lib/libc/sys/getrlimitusage.2 +++ b/lib/libc/sys/getrlimitusage.2 @@ -92,7 +92,7 @@ and .Sh SEE ALSO .Xr procstat 1 , .Xr getrlimit 2 , -.Xr setrlimit 2 . +.Xr setrlimit 2 .Sh HISTORY The .Fn getrlimitusage diff --git a/lib/libc/sys/socket.2 b/lib/libc/sys/socket.2 index 3e2206aefe72..9c2b2f8f925b 100644 --- a/lib/libc/sys/socket.2 +++ b/lib/libc/sys/socket.2 @@ -284,13 +284,10 @@ The socket type is not supported by the protocol. .Xr accept 2 , .Xr bind 2 , .Xr connect 2 , -.Xr divert 4 , .Xr getpeername 2 , .Xr getsockname 2 , .Xr getsockopt 2 , .Xr ioctl 2 , -.Xr ip 4 , -.Xr ip6 4 , .Xr listen 2 , .Xr read 2 , .Xr recv 2 , @@ -301,6 +298,9 @@ The socket type is not supported by the protocol. .Xr write 2 , .Xr CMSG_DATA 3 , .Xr getprotoent 3 , +.Xr divert 4 , +.Xr ip 4 , +.Xr ip6 4 , .Xr netgraph 4 , .Xr protocols 5 .Rs diff --git a/lib/libc/sys/thr_kill.2 b/lib/libc/sys/thr_kill.2 index a18e53e61008..3252de13ed8c 100644 --- a/lib/libc/sys/thr_kill.2 +++ b/lib/libc/sys/thr_kill.2 @@ -109,12 +109,12 @@ The current process does not have sufficient privilege to check existence or send a signal to the specified process. .El .Sh SEE ALSO +.Xr _umtx_op 2 , .Xr kill 2 , .Xr thr_exit 2 , .Xr thr_new 2 , .Xr thr_self 2 , .Xr thr_set_name 2 , -.Xr _umtx_op 2 , .Xr pthread_kill 3 , .Xr signal 3 .Sh STANDARDS diff --git a/lib/libc/x86/sys/pkru.3 b/lib/libc/x86/sys/pkru.3 index 2bcb6a64baaa..7b5ceb025d62 100644 --- a/lib/libc/x86/sys/pkru.3 +++ b/lib/libc/x86/sys/pkru.3 @@ -195,7 +195,7 @@ and the range already has defined protection keys. .Xr mmap 2 , .Xr mprotect 2 , .Xr munmap 2 , -.Xr sysarch 2 . +.Xr sysarch 2 .Sh STANDARDS The .Nm diff --git a/lib/libjail/jail.3 b/lib/libjail/jail.3 index 3c3c24d75dc4..820e378eb625 100644 --- a/lib/libjail/jail.3 +++ b/lib/libjail/jail.3 @@ -270,8 +270,8 @@ A parameter is of an unknown type. .El .Sh SEE ALSO .Xr jail 2 , -.Xr jail 3lua , .Xr sysctl 3 , +.Xr jail 3lua , .Xr jail 8 .Sh HISTORY The diff --git a/lib/libpam/modules/pam_chroot/pam_chroot.8 b/lib/libpam/modules/pam_chroot/pam_chroot.8 index e65c513b7b77..1f614264ba8e 100644 --- a/lib/libpam/modules/pam_chroot/pam_chroot.8 +++ b/lib/libpam/modules/pam_chroot/pam_chroot.8 @@ -78,8 +78,8 @@ Specify the chroot directory to use if one could not be derived from the user's home directory. .El .Sh SEE ALSO -.Xr pam.conf 5 , -.Xr pam 3 +.Xr pam 3 , +.Xr pam.conf 5 .Sh AUTHORS The .Nm diff --git a/lib/libpam/modules/pam_deny/pam_deny.8 b/lib/libpam/modules/pam_deny/pam_deny.8 index 530bae05c1f3..5d70bde200d9 100644 --- a/lib/libpam/modules/pam_deny/pam_deny.8 +++ b/lib/libpam/modules/pam_deny/pam_deny.8 @@ -73,6 +73,6 @@ reasons why the user's authentication attempt was declined. .El .Sh SEE ALSO +.Xr pam 3 , .Xr syslog 3 , -.Xr pam.conf 5 , -.Xr pam 3 +.Xr pam.conf 5 diff --git a/lib/libpam/modules/pam_echo/pam_echo.8 b/lib/libpam/modules/pam_echo/pam_echo.8 index c38d4d8cee55..19c083917bbf 100644 --- a/lib/libpam/modules/pam_echo/pam_echo.8 +++ b/lib/libpam/modules/pam_echo/pam_echo.8 @@ -77,8 +77,8 @@ expands to the character following the .Cm % character. .Sh SEE ALSO -.Xr pam.conf 5 , -.Xr pam 3 +.Xr pam 3 , +.Xr pam.conf 5 .Sh AUTHORS The .Nm diff --git a/lib/libpam/modules/pam_exec/pam_exec.8 b/lib/libpam/modules/pam_exec/pam_exec.8 index c77162955730..be5666003557 100644 --- a/lib/libpam/modules/pam_exec/pam_exec.8 +++ b/lib/libpam/modules/pam_exec/pam_exec.8 @@ -148,15 +148,15 @@ Each valid codes numerical value is available as an environment variable etc). This is useful in shell scripts for instance. .Sh SEE ALSO -.Xr pam_get_item 3 , -.Xr pam.conf 5 , .Xr pam 3 , +.Xr pam_get_item 3 , .Xr pam_sm_acct_mgmt 3 , .Xr pam_sm_authenticate 3 , .Xr pam_sm_chauthtok 3 , .Xr pam_sm_close_session 3 , .Xr pam_sm_open_session 3 , -.Xr pam_sm_setcred 3 +.Xr pam_sm_setcred 3 , +.Xr pam.conf 5 .Sh AUTHORS The .Nm diff --git a/lib/libpam/modules/pam_ftpusers/pam_ftpusers.8 b/lib/libpam/modules/pam_ftpusers/pam_ftpusers.8 index a5c810fd2de5..d5a0f0f1fd2e 100644 --- a/lib/libpam/modules/pam_ftpusers/pam_ftpusers.8 +++ b/lib/libpam/modules/pam_ftpusers/pam_ftpusers.8 @@ -82,9 +82,9 @@ will succeed if and only if the user is not listed in .Pa /etc/ftpusers . .El .Sh SEE ALSO +.Xr pam 3 , .Xr ftpusers 5 , -.Xr pam.conf 5 , -.Xr pam 3 +.Xr pam.conf 5 .Sh AUTHORS The .Nm diff --git a/lib/libpam/modules/pam_group/pam_group.8 b/lib/libpam/modules/pam_group/pam_group.8 index ed96d45db503..315aaa6cc267 100644 --- a/lib/libpam/modules/pam_group/pam_group.8 +++ b/lib/libpam/modules/pam_group/pam_group.8 @@ -86,8 +86,8 @@ options are mutually exclusive, and that .Nm will fail if both are specified. .Sh SEE ALSO -.Xr pam.conf 5 , -.Xr pam 3 +.Xr pam 3 , +.Xr pam.conf 5 .Sh AUTHORS The .Nm diff --git a/lib/libpam/modules/pam_guest/pam_guest.8 b/lib/libpam/modules/pam_guest/pam_guest.8 index 541fd299ba8b..c626187d5b19 100644 --- a/lib/libpam/modules/pam_guest/pam_guest.8 +++ b/lib/libpam/modules/pam_guest/pam_guest.8 @@ -80,10 +80,10 @@ password. Requires the guest user to type in the guest account name as password. .El .Sh SEE ALSO +.Xr pam 3 , .Xr pam_get_item 3 , .Xr pam_getenv 3 , -.Xr pam.conf 5 , -.Xr pam 3 +.Xr pam.conf 5 .Sh AUTHORS The .Nm diff --git a/lib/libpam/modules/pam_krb5/pam_krb5.8 b/lib/libpam/modules/pam_krb5/pam_krb5.8 index b59fdbdee9c4..7c1770961272 100644 --- a/lib/libpam/modules/pam_krb5/pam_krb5.8 +++ b/lib/libpam/modules/pam_krb5/pam_krb5.8 @@ -222,9 +222,9 @@ file containing Kerberos principals that are allowed access. .Sh SEE ALSO .Xr kdestroy 1 , .Xr passwd 1 , +.Xr pam 3 , .Xr syslog 3 , -.Xr pam.conf 5 , -.Xr pam 3 +.Xr pam.conf 5 .Sh NOTES Applications should not call .Fn pam_authenticate diff --git a/lib/libpam/modules/pam_ksu/pam_ksu.8 b/lib/libpam/modules/pam_ksu/pam_ksu.8 index 36d6936423b1..ace570ea5b5b 100644 --- a/lib/libpam/modules/pam_ksu/pam_ksu.8 +++ b/lib/libpam/modules/pam_ksu/pam_ksu.8 @@ -115,6 +115,6 @@ the user is prompted for another password. .El .Sh SEE ALSO .Xr su 1 , +.Xr pam 3 , .Xr syslog 3 , -.Xr pam.conf 5 , -.Xr pam 3 +.Xr pam.conf 5 diff --git a/lib/libpam/modules/pam_lastlog/pam_lastlog.8 b/lib/libpam/modules/pam_lastlog/pam_lastlog.8 index 6e5ba8770ada..e924016151fa 100644 --- a/lib/libpam/modules/pam_lastlog/pam_lastlog.8 +++ b/lib/libpam/modules/pam_lastlog/pam_lastlog.8 @@ -84,11 +84,11 @@ Ignore I/O failures. .Xr last 1 , .Xr w 1 , .Xr getutxent 3 , +.Xr pam 3 , .Xr ulog_login 3 , .Xr ulog_logout 3 , .Xr pam.conf 5 , -.Xr lastlogin 8 , -.Xr pam 3 +.Xr lastlogin 8 .Sh AUTHORS The .Nm diff --git a/lib/libpam/modules/pam_nologin/pam_nologin.8 b/lib/libpam/modules/pam_nologin/pam_nologin.8 index 30f87a65b63e..ff49749e50f1 100644 --- a/lib/libpam/modules/pam_nologin/pam_nologin.8 +++ b/lib/libpam/modules/pam_nologin/pam_nologin.8 @@ -81,8 +81,8 @@ reasons why the user's login attempt was declined. .El .Sh SEE ALSO +.Xr pam 3 , .Xr syslog 3 , .Xr login.conf 5 , .Xr nologin 5 , -.Xr pam.conf 5 , -.Xr pam 3 +.Xr pam.conf 5 diff --git a/lib/libpam/modules/pam_passwdqc/pam_passwdqc.8 b/lib/libpam/modules/pam_passwdqc/pam_passwdqc.8 index f2ec1747d1f8..755e93520427 100644 --- a/lib/libpam/modules/pam_passwdqc/pam_passwdqc.8 +++ b/lib/libpam/modules/pam_passwdqc/pam_passwdqc.8 @@ -248,8 +248,8 @@ is that the former is incompatible with .El .Sh SEE ALSO .Xr getpwnam 3 , -.Xr pam.conf 5 , -.Xr pam 3 +.Xr pam 3 , +.Xr pam.conf 5 .Sh AUTHORS The .Nm diff --git a/lib/libpam/modules/pam_permit/pam_permit.8 b/lib/libpam/modules/pam_permit/pam_permit.8 index f0b2f5527066..270eaee8361d 100644 --- a/lib/libpam/modules/pam_permit/pam_permit.8 +++ b/lib/libpam/modules/pam_permit/pam_permit.8 @@ -68,6 +68,6 @@ debugging information at level. .El .Sh SEE ALSO +.Xr pam 3 , .Xr syslog 3 , -.Xr pam.conf 5 , -.Xr pam 3 +.Xr pam.conf 5 diff --git a/lib/libpam/modules/pam_radius/pam_radius.8 b/lib/libpam/modules/pam_radius/pam_radius.8 index 6b2d1ef1fa55..abc916dcfff6 100644 --- a/lib/libpam/modules/pam_radius/pam_radius.8 +++ b/lib/libpam/modules/pam_radius/pam_radius.8 @@ -123,9 +123,9 @@ The standard RADIUS client configuration file for .Nm .El .Sh SEE ALSO +.Xr pam 3 , .Xr passwd 5 , -.Xr radius.conf 5 , -.Xr pam 3 +.Xr radius.conf 5 .Sh HISTORY The .Nm diff --git a/lib/libpam/modules/pam_rhosts/pam_rhosts.8 b/lib/libpam/modules/pam_rhosts/pam_rhosts.8 index ea005738840c..1f9716b9a0ca 100644 --- a/lib/libpam/modules/pam_rhosts/pam_rhosts.8 +++ b/lib/libpam/modules/pam_rhosts/pam_rhosts.8 @@ -78,9 +78,9 @@ was declined. do not automatically fail if the target user's UID is 0. .El .Sh SEE ALSO +.Xr pam 3 , .Xr hosts.equiv 5 , -.Xr pam.conf 5 , -.Xr pam 3 +.Xr pam.conf 5 .Sh AUTHORS The .Nm diff --git a/lib/libpam/modules/pam_rootok/pam_rootok.8 b/lib/libpam/modules/pam_rootok/pam_rootok.8 index d1ab8226e2ca..fd0a6dd3791f 100644 --- a/lib/libpam/modules/pam_rootok/pam_rootok.8 +++ b/lib/libpam/modules/pam_rootok/pam_rootok.8 @@ -69,5 +69,5 @@ authentication attempt was declined. .El .Sh SEE ALSO .Xr getuid 2 , -.Xr pam.conf 5 , -.Xr pam 3 +.Xr pam 3 , +.Xr pam.conf 5 diff --git a/lib/libpam/modules/pam_securetty/pam_securetty.8 b/lib/libpam/modules/pam_securetty/pam_securetty.8 index b19979000978..582389cf101d 100644 --- a/lib/libpam/modules/pam_securetty/pam_securetty.8 +++ b/lib/libpam/modules/pam_securetty/pam_securetty.8 @@ -84,7 +84,7 @@ authentication attempt was declined. .El .Sh SEE ALSO .Xr getttynam 3 , +.Xr pam 3 , .Xr syslog 3 , .Xr pam.conf 5 , -.Xr ttys 5 , -.Xr pam 3 +.Xr ttys 5 diff --git a/lib/libpam/modules/pam_self/pam_self.8 b/lib/libpam/modules/pam_self/pam_self.8 index c3623998f0be..f875d671286b 100644 --- a/lib/libpam/modules/pam_self/pam_self.8 +++ b/lib/libpam/modules/pam_self/pam_self.8 @@ -80,8 +80,8 @@ do not automatically fail if the current real user ID is 0. .El .Sh SEE ALSO .Xr getuid 2 , -.Xr pam.conf 5 , -.Xr pam 3 +.Xr pam 3 , +.Xr pam.conf 5 .Sh AUTHORS The .Nm diff --git a/lib/libpam/modules/pam_ssh/pam_ssh.8 b/lib/libpam/modules/pam_ssh/pam_ssh.8 index e63930eb5340..3ef44d8b687b 100644 --- a/lib/libpam/modules/pam_ssh/pam_ssh.8 +++ b/lib/libpam/modules/pam_ssh/pam_ssh.8 @@ -138,8 +138,8 @@ SSH2 Ed25519 key .El .Sh SEE ALSO .Xr ssh-agent 1 , -.Xr pam.conf 5 , -.Xr pam 3 +.Xr pam 3 , +.Xr pam.conf 5 .Sh AUTHORS The .Nm diff --git a/lib/libpam/modules/pam_unix/pam_unix.8 b/lib/libpam/modules/pam_unix/pam_unix.8 index 170cf65f34db..5c2ae5cf52e2 100644 --- a/lib/libpam/modules/pam_unix/pam_unix.8 +++ b/lib/libpam/modules/pam_unix/pam_unix.8 @@ -201,10 +201,10 @@ password database. .Xr getlogin 2 , .Xr crypt 3 , .Xr getpwent 3 , +.Xr pam 3 , .Xr syslog 3 , .Xr nsswitch.conf 5 , .Xr passwd 5 , -.Xr pam 3 , .Xr pw 8 , .Xr yp 8 .Sh BUGS diff --git a/lib/libsysdecode/sysdecode_sctp_sinfo_flags.3 b/lib/libsysdecode/sysdecode_sctp_sinfo_flags.3 index e5995bff8329..4eb25187f0d0 100644 --- a/lib/libsysdecode/sysdecode_sctp_sinfo_flags.3 +++ b/lib/libsysdecode/sysdecode_sctp_sinfo_flags.3 @@ -46,5 +46,5 @@ to the stream .Fa fp . In particular, the embedded PR-SCTP policies are handled. .Sh SEE ALSO -.Xr sysdecode 3 +.Xr sysdecode 3 , .Xr sysdecode_sctp_pr_policy 3 diff --git a/lib/libthr/libthr.3 b/lib/libthr/libthr.3 index 7d0c7669654a..6d33f4c378ce 100644 --- a/lib/libthr/libthr.3 +++ b/lib/libthr/libthr.3 @@ -325,15 +325,15 @@ anyway. .Sh SEE ALSO .Xr ktrace 1 , .Xr ld-elf.so.1 1 , -.Xr getrlimit 2 , +.Xr _umtx_op 2 , .Xr errno 2 , +.Xr getrlimit 2 , .Xr thr_exit 2 , .Xr thr_kill 2 , .Xr thr_kill2 2 , .Xr thr_new 2 , .Xr thr_self 2 , .Xr thr_set_name 2 , -.Xr _umtx_op 2 , .Xr dlclose 3 , .Xr dlopen 3 , .Xr getenv 3 , diff --git a/lib/libveriexec/veriexec.3 b/lib/libveriexec/veriexec.3 index 8fd5822c8067..b367fc5ea40f 100644 --- a/lib/libveriexec/veriexec.3 +++ b/lib/libveriexec/veriexec.3 @@ -59,5 +59,5 @@ If the signature does not match, .Va errno is set to the reason for the mismatch. .Sh SEE ALSO -.Xr mac_veriexec 4 +.Xr mac_veriexec 4 , .Xr veriexec 4 diff --git a/sbin/comcontrol/comcontrol.8 b/sbin/comcontrol/comcontrol.8 index 46c7f987d774..e050452498b9 100644 --- a/sbin/comcontrol/comcontrol.8 +++ b/sbin/comcontrol/comcontrol.8 @@ -52,7 +52,7 @@ dialin devices, hardwired terminals dialout devices .El .Sh SEE ALSO -.Xr stty 1 , +.Xr stty 1 .Sh HISTORY Originally part of cgd's com package patches, version 0.2.1, to .Bx 386 0.1 . diff --git a/sbin/newfs/newfs.8 b/sbin/newfs/newfs.8 index 0dc93cb8b78d..4ac6e56879b4 100644 --- a/sbin/newfs/newfs.8 +++ b/sbin/newfs/newfs.8 @@ -352,13 +352,13 @@ than the historical defaults This large fragment size may lead to much wasted space on file systems that contain many small files. .Sh SEE ALSO -.Xr fdformat 8 , .Xr geom 4 , .Xr disktab 5 , .Xr fs 5 , .Xr camcontrol 8 , .Xr dump 8 , .Xr dumpfs 8 , +.Xr fdformat 8 , .Xr fsck 8 , .Xr gjournal 8 , .Xr gpart 8 , diff --git a/sbin/umount/umount.8 b/sbin/umount/umount.8 index 086980151d60..2c26ca868dae 100644 --- a/sbin/umount/umount.8 +++ b/sbin/umount/umount.8 @@ -187,8 +187,8 @@ file system table .Xr unmount 2 , .Xr fstab 5 , .Xr autounmountd 8 , -.Xr mount 8 , -.Xr mdconfig 8 +.Xr mdconfig 8 , +.Xr mount 8 .Sh HISTORY A .Nm diff --git a/share/man/man4/atopcase.4 b/share/man/man4/atopcase.4 index fc93b7094466..830c67f872a4 100644 --- a/share/man/man4/atopcase.4 +++ b/share/man/man4/atopcase.4 @@ -101,9 +101,9 @@ device node. .El .Sh SEE ALSO .Xr acpi 4 , +.Xr loader.conf 5 , .Xr backlight 8 , -.Xr loader 8 , -.Xr loader.conf 5 . +.Xr loader 8 .Sh HISTORY The .Nm diff --git a/share/man/man4/cd.4 b/share/man/man4/cd.4 index 7c3fa6ed9850..0260d5ec5a8f 100644 --- a/share/man/man4/cd.4 +++ b/share/man/man4/cd.4 @@ -336,6 +336,7 @@ devices None. .Sh SEE ALSO .Xr cam 4 , +.Xr cd9660 4 , .Xr da 4 , .Xr cd9660 5 , .Xr disklabel 8 , diff --git a/share/man/man4/cdce.4 b/share/man/man4/cdce.4 index 9d842e475d85..87a6f5da4b08 100644 --- a/share/man/man4/cdce.4 +++ b/share/man/man4/cdce.4 @@ -140,10 +140,10 @@ is running low on mbufs. .Xr intro 4 , .Xr ipheth 4 , .Xr netintro 4 , +.Xr u3g 4 , +.Xr ucom 4 , .Xr urndis 4 , .Xr usb 4 , -.Xr ucom 4 , -.Xr u3g 4 , .Xr ifconfig 8 .Rs .%T "Universal Serial Bus Class Definitions for Communication Devices" diff --git a/share/man/man4/dummynet.4 b/share/man/man4/dummynet.4 index 81b1b33efb6e..ad82cb80011d 100644 --- a/share/man/man4/dummynet.4 +++ b/share/man/man4/dummynet.4 @@ -59,9 +59,9 @@ pipes. .Xr setsockopt 2 , .Xr if_bridge 4 , .Xr ip 4 , -.Xr ipfw 8 , -.Xr dnctl 8 , .Xr pf.conf 5 , +.Xr dnctl 8 , +.Xr ipfw 8 , .Xr sysctl 8 .Sh HISTORY The diff --git a/share/man/man4/ftgpio.4 b/share/man/man4/ftgpio.4 index e31457673fa5..7a5562841732 100644 --- a/share/man/man4/ftgpio.4 +++ b/share/man/man4/ftgpio.4 @@ -40,8 +40,8 @@ is a driver for the GPIO controller found on Fintek Super I/O chips. .Xr gpio 3 , .Xr gpio 4 , .Xr gpioled 4 , -.Xr gpioctl 8 .Xr superio 4 , +.Xr gpioctl 8 .Sh HISTORY The .Nm diff --git a/share/man/man4/ipfirewall.4 b/share/man/man4/ipfirewall.4 index bfc571bcb595..691ed3d331c0 100644 --- a/share/man/man4/ipfirewall.4 +++ b/share/man/man4/ipfirewall.4 @@ -149,11 +149,11 @@ man page for a complete description of the capabilities and how to use it. .Sh SEE ALSO .Xr setsockopt 2 , +.Xr libalias 3 , .Xr divert 4 , .Xr ip 4 , .Xr ip6 4 , .Xr ipfw 8 , -.Xr libalias 3 , .Xr natd 8 , .Xr sysctl 8 , .Xr syslogd 8 , diff --git a/share/man/man4/ipsec.4 b/share/man/man4/ipsec.4 index 952d7b925388..96a10dfb7700 100644 --- a/share/man/man4/ipsec.4 +++ b/share/man/man4/ipsec.4 @@ -333,8 +333,8 @@ routines from looking into the IP payload. .Xr ipsec_set_policy 3 , .Xr crypto 4 , .Xr enc 4 , -.Xr if_ipsec 4 , .Xr icmp6 4 , +.Xr if_ipsec 4 , .Xr intro 4 , .Xr ip6 4 , .Xr setkey 8 , diff --git a/share/man/man4/mac_do.4 b/share/man/man4/mac_do.4 index ce9f8cf25a4a..aa84a71b4953 100644 --- a/share/man/man4/mac_do.4 +++ b/share/man/man4/mac_do.4 @@ -74,5 +74,5 @@ The following rule: means the user with the uid 1001 can execute processes as user with uid 80, all the users which belongs to the group gid 0 can execute processes as any user. .Sh SEE ALSO -.Xr mac 4 , -.Xr mdo 1 +.Xr mdo 1 , +.Xr mac 4 diff --git a/share/man/man4/man4.aarch64/rk_gpio.4 b/share/man/man4/man4.aarch64/rk_gpio.4 index 69bcb1671f85..b5648662cf5e 100644 --- a/share/man/man4/man4.aarch64/rk_gpio.4 +++ b/share/man/man4/man4.aarch64/rk_gpio.4 @@ -47,7 +47,7 @@ rockchip,gpio-bank .El .Sh SEE ALSO .Xr gpiobus 4 , -.Xr gpioctl 8 , +.Xr gpioctl 8 .Sh HISTORY The .Nm diff --git a/share/man/man4/man4.aarch64/rk_i2c.4 b/share/man/man4/man4.aarch64/rk_i2c.4 index f30b510e7655..be1a0fab943e 100644 --- a/share/man/man4/man4.aarch64/rk_i2c.4 +++ b/share/man/man4/man4.aarch64/rk_i2c.4 @@ -49,7 +49,7 @@ rockchip,rk3328-i2c .El .Sh SEE ALSO .Xr iic 4 , -.Xr iicbus 4 , +.Xr iicbus 4 .Sh HISTORY The .Nm diff --git a/share/man/man4/man4.aarch64/rk_pinctrl.4 b/share/man/man4/man4.aarch64/rk_pinctrl.4 index c196c00d52b7..519b3e793cd1 100644 --- a/share/man/man4/man4.aarch64/rk_pinctrl.4 +++ b/share/man/man4/man4.aarch64/rk_pinctrl.4 @@ -46,7 +46,7 @@ compatible strings : rockchip,rk3328-pinctrl .El .Sh SEE ALSO -.Xr fdt_pinctrl 4 , +.Xr fdt_pinctrl 4 .Sh HISTORY The .Nm diff --git a/share/man/man4/man4.arm/imx6_ahci.4 b/share/man/man4/man4.arm/imx6_ahci.4 index cfe8a87deb6f..9979cef50d79 100644 --- a/share/man/man4/man4.arm/imx6_ahci.4 +++ b/share/man/man4/man4.arm/imx6_ahci.4 @@ -55,7 +55,7 @@ data and marshall resources for the standard driver. .Sh SEE ALSO .Xr ahci 4 , -.Xr fdt 4 , +.Xr fdt 4 .Sh HISTORY The .Nm diff --git a/share/man/man4/mpi3mr.4 b/share/man/man4/mpi3mr.4 index 981979e37187..f07ce13d2f23 100644 --- a/share/man/man4/mpi3mr.4 +++ b/share/man/man4/mpi3mr.4 @@ -64,7 +64,7 @@ Broadcom Ltd. 9600-8i8e 24G PCIe 4.0 Tri-Mode RAID Adapters .Xr mpr 4 , .Xr pci 4 , .Xr sa 4 , -.Xr scsi 4 . +.Xr scsi 4 .Sh HISTORY The .Nm diff --git a/share/man/man4/netmap.4 b/share/man/man4/netmap.4 index 5a12f8f32465..6be0c8662d59 100644 --- a/share/man/man4/netmap.4 +++ b/share/man/man4/netmap.4 @@ -1123,10 +1123,10 @@ with the network card or the host. .Sh SEE ALSO .Xr vale 4 , .Xr bridge 8 , -.Xr valectl 8 , .Xr lb 8 , .Xr nmreplay 8 , -.Xr pkt-gen 8 +.Xr pkt-gen 8 , +.Xr valectl 8 .Pp .Pa http://info.iet.unipi.it/~luigi/netmap/ .Pp diff --git a/share/man/man4/ng_nat.4 b/share/man/man4/ng_nat.4 index 10615b3b387d..53cd841a7392 100644 --- a/share/man/man4/ng_nat.4 +++ b/share/man/man4/ng_nat.4 @@ -396,8 +396,8 @@ SEQ .Xr libalias 3 , .Xr ng_ipfw 4 , .Xr natd 8 , -.Xr ngctl 8 , -.Xr ng_ether 8 +.Xr ng_ether 8 , +.Xr ngctl 8 .Sh HISTORY The .Nm diff --git a/share/man/man4/ng_pppoe.4 b/share/man/man4/ng_pppoe.4 index 346b2bfbe279..5b5f0dd64de2 100644 --- a/share/man/man4/ng_pppoe.4 +++ b/share/man/man4/ng_pppoe.4 @@ -565,9 +565,9 @@ setup(char *ethername, char *service, char *sessname, .Xr ng_ether 4 , .Xr ng_ppp 4 , .Xr ng_socket 4 , +.Xr vlan 4 , .Xr ngctl 8 , -.Xr ppp 8 , -.Xr vlan 4 +.Xr ppp 8 .Rs .%A L. Mamakos .%A K. Lidl diff --git a/share/man/man4/procdesc.4 b/share/man/man4/procdesc.4 index d0b99e5cbe07..f1f3757aa836 100644 --- a/share/man/man4/procdesc.4 +++ b/share/man/man4/procdesc.4 @@ -58,10 +58,10 @@ Given a process descriptor, it is possible to query its conventional PID using .Sh SEE ALSO .Xr fork 2 , .Xr kill 2 , +.Xr kqueue 2 , .Xr pdfork 2 , .Xr pdgetpid 2 , .Xr pdkill 2 , -.Xr kqueue 2 , .Xr wait4 2 , .Xr capsicum 4 .Sh HISTORY diff --git a/share/man/man4/virtio_gpu.4 b/share/man/man4/virtio_gpu.4 index bb34ec419df6..f8d48faa05f0 100644 --- a/share/man/man4/virtio_gpu.4 +++ b/share/man/man4/virtio_gpu.4 @@ -46,7 +46,7 @@ device driver provides support for VirtIO gpu devices to create a .Xr vt 4 console. .Sh SEE ALSO -.Xr virtio 4 +.Xr virtio 4 , .Xr vt 4 .Sh HISTORY The diff --git a/share/man/man5/lindebugfs.5 b/share/man/man5/lindebugfs.5 index 8e385be7d743..4e823baff132 100644 --- a/share/man/man5/lindebugfs.5 +++ b/share/man/man5/lindebugfs.5 @@ -81,7 +81,7 @@ file system on .Xr linsysfs 5 , .Xr pseudofs 9 , .Xr linux 4 , -.Xr mount 1 +.Xr pseudofs 9 .Sh HISTORY The .Nm diff --git a/share/man/man5/pf.conf.5 b/share/man/man5/pf.conf.5 index 3193c18760c8..7e2db95fd961 100644 --- a/share/man/man5/pf.conf.5 +++ b/share/man/man5/pf.conf.5 @@ -3407,8 +3407,8 @@ Service name database. .Xr ip6 4 , .Xr pf 4 , .Xr pfsync 4 , -.Xr tcp 4 , .Xr sctp 4 , +.Xr tcp 4 , .Xr udp 4 , .Xr hosts 5 , .Xr pf.os 5 , diff --git a/share/man/man8/rc.subr.8 b/share/man/man8/rc.subr.8 index 2dd46cf50c2b..844ba0356692 100644 --- a/share/man/man8/rc.subr.8 +++ b/share/man/man8/rc.subr.8 @@ -945,6 +945,7 @@ file resides in .El .Sh SEE ALSO .Xr rc.conf 5 , +.Xr debug.sh 8 , .Xr rc 8 .Sh HISTORY The diff --git a/share/man/man9/VOP_SETLABEL.9 b/share/man/man9/VOP_SETLABEL.9 index e5cf99bebd86..4ab7dd9beaba 100644 --- a/share/man/man9/VOP_SETLABEL.9 +++ b/share/man/man9/VOP_SETLABEL.9 @@ -113,13 +113,13 @@ Depending on the underlying implementation of .Fn VOP_SETLABEL , other errors may also be possible. .Sh SEE ALSO +.Xr mac 9 , +.Xr mount 9 , +.Xr vnode 9 , .Xr VOP_CLOSEEXTATTR 9 , .Xr VOP_OPENEXTATTR 9 , .Xr VOP_READEXTATTR 9 , -.Xr VOP_WRITEXTATTR 9 , -.Xr mac 9 , -.Xr mount 9 , -.Xr vnode 9 +.Xr VOP_WRITEXTATTR 9 .Sh AUTHORS This manual page was written by .An Robert Watson . diff --git a/share/man/man9/cr_bsd_visible.9 b/share/man/man9/cr_bsd_visible.9 index f2d42f3835dc..d16f4bb6dd8f 100644 --- a/share/man/man9/cr_bsd_visible.9 +++ b/share/man/man9/cr_bsd_visible.9 @@ -107,11 +107,11 @@ and are not in the same jail. .El .Sh SEE ALSO -.Xr cr_canseeotheruids 9 , -.Xr cr_canseeothergids 9 , +.Xr cr_cansee 9 , .Xr cr_canseejailproc 9 , -.Xr priv_check_cred 9 , -.Xr cr_cansee 9 +.Xr cr_canseeothergids 9 , +.Xr cr_canseeotheruids 9 , +.Xr priv_check_cred 9 *** 228 LINES SKIPPED *** From nobody Mon Nov 4 16:16:48 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XhxS121VVz5cGWX; Mon, 04 Nov 2024 16:16: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XhxS10MzYz4qfB; Mon, 4 Nov 2024 16:16:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730737009; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XKhe3xbxqAXO2HYgjkvD8L7hFcRM6Xdqgh8LohRN5Ow=; b=XSft5o5sf7+14XWG0/jTVecndU2cluNe6YGUE9bwZJf+AKYnQWgWcCeswN7jY4MhVv8+zO EjVx945C1AsTfNHd/7Qt3/W2P+uQJ5+37jax+6KFMpXyjYv5cglUX0Xy1IZo0z/75eG3jg sXkL/+ZUY9G9It3+uHxMOZ5KjUoChlE4rbw3IZzMvkJlg/7bdnerZhI4VRFjzrlCS/xkSG wmyKkTXFVMe1XGkUFadvvKaHO5FJxYrSEMBUvKgWbuaMTrCKKmDhzMeitrbkokE8PsMyrh JnuGGyz4nMKe44/tGOZGQY7jZ3QejRPihB1By7EP5P4Xiu4cjDRa0SAJ0OuPjg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730737009; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XKhe3xbxqAXO2HYgjkvD8L7hFcRM6Xdqgh8LohRN5Ow=; b=nEZ7MOYr9TN5yNtO8TfmNyv82zm+petU4dPgyayhdLOA7FfaS24NFmZ9ntH4ZNn/YJ+PhG EcJ9/Z2j//Ls+PR977nuGsTQg2alGeC4hkVW44zjNOMgOs4jeMndz2FEzqi6gQQq5hSNPY Afqi7k3ULKHFe7WnPkj1v75yaCh283VgV5D5yetDh8lv32CVO9oOo58AgfaK0ftbboYDfv IiRGMk+/Ro4WdTsg5QSYrm2qykUbgmyEs1zJOWVC3p5VWZoET7QiKHSbExISSARB+Udeg0 XqSR99kpT7yk5bfYS3wU5OnRsNDRlJ0LWhJA7ohCsyt6QN8mTo3whSiqN07nSw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730737009; a=rsa-sha256; cv=none; b=cF97EqPS+ZkixvKFjBKiOm8Ynabg4s0B4KXgap8FRn4Sq+NhOxqq39CjSZzfo/b9SrYOtk dXeeEsxuxhiEkcBzsAk3epS+J6Eg5ER1ytoIrzKMi6s2tw73vy5+L7gPvdsN7IcrykcBUH ELNiFOtOO6pAfEGfHV2uFWEvSTlq6bJ8znaLwwWfbSE9ScAzo2eh96XkpVK9uvJcykey8G k6J7LGONw7N5kgYRIz6/uBha91Ju3UZp9t8ABnCQsywGfrwbwVSx1iAQ82nvdfoA9oVmgM KwO2dvhOMrtSx5/K3HakEuCN3TSwI3gj3CZI8IPxH5cIG6z2E8glAzo+aPqNig== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XhxS06pgSzgfm; Mon, 4 Nov 2024 16:16:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A4GGmwf010739; Mon, 4 Nov 2024 16:16:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A4GGmuJ010736; Mon, 4 Nov 2024 16:16:48 GMT (envelope-from git) Date: Mon, 4 Nov 2024 16:16:48 GMT Message-Id: <202411041616.4A4GGmuJ010736@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 666d4c2bbdb2 - stable/14 - manuals: Misc syntax fixes List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 666d4c2bbdb2c56f824f2a91769f52f4f28d9692 Auto-Submitted: auto-generated The branch stable/14 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=666d4c2bbdb2c56f824f2a91769f52f4f28d9692 commit 666d4c2bbdb2c56f824f2a91769f52f4f28d9692 Author: Graham Percival AuthorDate: 2024-10-11 17:18:56 +0000 Commit: Mitchell Horne CommitDate: 2024-11-04 16:13:50 +0000 manuals: Misc syntax fixes These were reported by `mandoc -T lint ...` as errors. The rendered output (in ascii and html) is not affected by this commit. Signed-off-by: Graham Percival Reviewed by: mhorne MFC after: 3 days Sponsored by: Tarsnap Backup Inc. Pull Request: https://github.com/freebsd/freebsd-src/pull/1459 (cherry picked from commit 229381deb270e8e240d20b572c63234a61cbd977) --- share/man/man4/hidraw.4 | 2 +- share/man/man4/pfsync.4 | 2 -- stand/lua/menu.lua.8 | 1 + usr.sbin/bhyve/bhyve_config.5 | 4 ++-- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/share/man/man4/hidraw.4 b/share/man/man4/hidraw.4 index 4631e253c1ef..f8eb9a21e9d7 100644 --- a/share/man/man4/hidraw.4 +++ b/share/man/man4/hidraw.4 @@ -198,7 +198,7 @@ specified by .Va buf . .It Dv HIDIOCGRAWPHYS(len) Pq Vt "char[] buf" Get the newbus path to the device. -.\For Bluetooth devices, it returns the hardware (MAC) address of the device. +.\"For Bluetooth devices, it returns the hardware (MAC) address of the device. Copies a maximum of .Va len bytes of the newbus device path diff --git a/share/man/man4/pfsync.4 b/share/man/man4/pfsync.4 index b3603c48316e..b4b96ee133bf 100644 --- a/share/man/man4/pfsync.4 +++ b/share/man/man4/pfsync.4 @@ -147,7 +147,6 @@ E.g.: # ifconfig pfsync0 version 1301 .Ed .Pp -.Bd Currently the following versions are supported: .Bl -tag -width indent .It Cm 1301 @@ -156,7 +155,6 @@ Compatibility with FreeBSD 13.1 has been verified. .It Cm 1400 FreeBSD release 14.0. .El -.Ed .Pp .Nm has the following diff --git a/stand/lua/menu.lua.8 b/stand/lua/menu.lua.8 index 6faffbe64d2e..e2a0ff09ffd9 100644 --- a/stand/lua/menu.lua.8 +++ b/stand/lua/menu.lua.8 @@ -281,6 +281,7 @@ stock_options[#stock_options + 1] = { end, alias= {"l", "L"} } +.Ed .Sh SEE ALSO .Xr loader.conf 5 , .Xr core.lua 8 , diff --git a/usr.sbin/bhyve/bhyve_config.5 b/usr.sbin/bhyve/bhyve_config.5 index 469ae06f36f4..cb2de997e63e 100644 --- a/usr.sbin/bhyve/bhyve_config.5 +++ b/usr.sbin/bhyve/bhyve_config.5 @@ -261,7 +261,7 @@ All PCI device nodes must contain a configuration variable named .Dq device which specifies the device model to use. The following PCI device models are supported: -.Bl -tag -indent +.Bl -tag -width indent .It Li hostbridge Provide a simple PCI-Host bridge device. This is usually configured at pci0:0:0 and is required by most guest @@ -316,7 +316,7 @@ All USB device nodes must contain a configuration variable named .Dq device which specifies the device model to use. The following USB device models are supported: -.Bl -tag -indent +.Bl -tag -width indent .It Li tablet A USB tablet device which provides precise cursor synchronization when using VNC. From nobody Mon Nov 4 16:16:50 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XhxS25kMjz5cGp5; Mon, 04 Nov 2024 16:16: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XhxS22c5Vz4r42; Mon, 4 Nov 2024 16:16:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730737010; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TB/nPcRpeAVBSn82kA5oXQ/i3aFsjE1w5MDcr3O3keQ=; b=Uhen7amtdsYZB6QMkF2/2GDrrnpN8cy3KQv2bWn1YmBHW4wkr1sM6yW/fBdERSPxZ+HMHH qnBPogoriXdY1Ie6aQp3zGRP8bp03D3bZ6myVFxnRHh3gafz9MYE4/X+53TKghpYLsWdwD SHQaV25mBCvlwORF0UV7YL/qtNemNxiRAIHVo3gcMqLX4ml8qIMM9G4L4qyorY1vanV9js T5c/ZLTkYktpX/wd4UexUYkdpISnfoxNU+B1fJYbRmbIBkrxqzWME2YF0Ad9Brc1/81M2/ 6Hum0202LI8U6H9u7sekgNmJy2h7XfvPuvmTwIx/7vNkOv5wBR5QH5DOZ5K7eQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730737010; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TB/nPcRpeAVBSn82kA5oXQ/i3aFsjE1w5MDcr3O3keQ=; b=ykmu031XsNpzqJVaZ7TgbqtX7tV2aFC08J8AZ34uTHyakg6lBBQgCIpLtcrZM3T89pS6C1 1oHcsUy+avVRF19FjiFeRtutfC4HsdVVi+gfOa49umrDQvUoYW7vvrcJuZJ0Qc3o/dWbRL WnJi1HS+KaL5Mfle2ouApu0P8y9QUskndyyUfzG02DSCJY//LkdWX793w+DjqbJUIH6Cr9 8TQtJqc9mW4/O7GouybNtH6ZOpBGI43ctLoYQJU5jMwGxMKQuWQgjFYoBDRBNttQeN/zRk H8yhuhb71+w/3kS2FJ9hts9JdJuoCT6+kJ049kTOSNtXp2ZdyQrseRQXlh6g2g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730737010; a=rsa-sha256; cv=none; b=xO5m5mVXiEeIX+H+OmJiP2VW2goZmgSnEBGPSJuR51GnOuCqDmWX3YZ4ZsTgS2RmvW211H YN++Ce/w26CLn8rBON5fzrGis4wyhRbsQ4r0Uk1dvwqMRe/AUxYZrZ1haaneGVfoqPpObk 5Pp/2QDizfT7GnvSzlJwF9z6JbDf6NY5P06MAVEN29fUx0DfEci4hx/1DOJa57yscEVcsg gzXuxLGLiEcQVFXgjoaJE3dz9zwAVXdodoZ7ympKOsizWYscU4d9mVeWl4JQD0LtQsjesl ZEVmRr4+0VFcIL8XjtRRv0exXJAYZ+eJ1pktsG+UUK/lO2dFjRfbPv465L18Cg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XhxS211PKzgcL; Mon, 4 Nov 2024 16:16:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A4GGoW7010792; Mon, 4 Nov 2024 16:16:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A4GGoSN010789; Mon, 4 Nov 2024 16:16:50 GMT (envelope-from git) Date: Mon, 4 Nov 2024 16:16:50 GMT Message-Id: <202411041616.4A4GGoSN010789@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: e40097e01a08 - stable/14 - manuals: Fix some "missing section argument" List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e40097e01a08db646f409cec81d04e8c5b92293e Auto-Submitted: auto-generated The branch stable/14 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=e40097e01a08db646f409cec81d04e8c5b92293e commit e40097e01a08db646f409cec81d04e8c5b92293e Author: Graham Percival AuthorDate: 2024-10-14 02:24:00 +0000 Commit: Mitchell Horne CommitDate: 2024-11-04 16:15:01 +0000 manuals: Fix some "missing section argument" These were reported by `mandoc -T lint ...` as warnings. Signed-off-by: Graham Percival Reviewed by: mhorne, Alexander Ziaee Sponsored by: Tarsnap Backup Inc. Pull Request: https://github.com/freebsd/freebsd-src/pull/1467 (cherry picked from commit a51584a2d2fb3731a68eaf93b59e14227e572427) --- lib/libdevctl/devctl.3 | 2 +- lib/libthr/libthr.3 | 2 +- share/man/man4/disk.4 | 2 +- share/man/man4/ng_iface.4 | 4 ++-- share/man/man4/ng_nat.4 | 2 +- share/man/man4/qat.4 | 2 +- share/man/man4/watchdog.4 | 8 ++++---- share/man/man9/VOP_ADVISE.9 | 2 +- share/man/man9/VOP_ALLOCATE.9 | 2 +- share/man/man9/osd.9 | 2 +- 10 files changed, 14 insertions(+), 14 deletions(-) diff --git a/lib/libdevctl/devctl.3 b/lib/libdevctl/devctl.3 index a6823a0b3c6a..c8a4704825c2 100644 --- a/lib/libdevctl/devctl.3 +++ b/lib/libdevctl/devctl.3 @@ -209,7 +209,7 @@ method to construct the path. The .Fa buffer pointer is updated with an allocated buffer that must be freed with -.Xr free . +.Xr free 3 . .Pp The .Fn devctl_freeze diff --git a/lib/libthr/libthr.3 b/lib/libthr/libthr.3 index 6d33f4c378ce..35a7467eec14 100644 --- a/lib/libthr/libthr.3 +++ b/lib/libthr/libthr.3 @@ -217,7 +217,7 @@ recycle it at any moment, making this sysctl less useful than it sounds. .It Dv kern.ipc.umtx_max_robust The maximal number of robust mutexes allowed for one thread. The kernel will not unlock more mutexes than specified, see -.Xr _umtx_op +.Xr _umtx_op 2 for more details. The default value is large enough for most useful applications. .It Dv debug.umtx.robust_faults_verbose diff --git a/share/man/man4/disk.4 b/share/man/man4/disk.4 index 6451ff0e7370..dfe0059263ee 100644 --- a/share/man/man4/disk.4 +++ b/share/man/man4/disk.4 @@ -57,7 +57,7 @@ Operations to block devices such as .Xr lseek 2 , .Xr read 2 , and -.Xr write +.Xr write 2 may only be performed at file offsets that are integral multiple of this size. .It Dv DIOCGMEDIASIZE diff --git a/share/man/man4/ng_iface.4 b/share/man/man4/ng_iface.4 index 0579028b4c74..e2dee22b67b9 100644 --- a/share/man/man4/ng_iface.4 +++ b/share/man/man4/ng_iface.4 @@ -153,8 +153,8 @@ to the desired level of nesting. .Xr netgraph 4 , .Xr ng_cisco 4 , .Xr ifconfig 8 , -.Xr ngctl 8 -.Xr sysctl +.Xr ngctl 8 , +.Xr sysctl 8 .Sh HISTORY The .Nm iface diff --git a/share/man/man4/ng_nat.4 b/share/man/man4/ng_nat.4 index 53cd841a7392..bf9ec4052733 100644 --- a/share/man/man4/ng_nat.4 +++ b/share/man/man4/ng_nat.4 @@ -265,7 +265,7 @@ In case of .Nm failed to retrieve a certain counter from its -.Xr libalias +.Xr libalias 3 instance, the corresponding field is returned as .Va UINT32_MAX . .It Dv NGM_NAT_SET_DLT Pq Ic setdlt diff --git a/share/man/man4/qat.4 b/share/man/man4/qat.4 index b0fa0b0cbc92..03d1e6e956e7 100644 --- a/share/man/man4/qat.4 +++ b/share/man/man4/qat.4 @@ -105,7 +105,7 @@ Following variables may be used to reconfigure the QAT device.\& For configuration persistence those variables may be set before loading the driver, either via .Xr kenv 1 or -.Xr loader.conf(5). +.Xr loader.conf 5 . The device specific configuration options are prefixed with .Va dev.qat.X\&. where X is the device number. diff --git a/share/man/man4/watchdog.4 b/share/man/man4/watchdog.4 index f711d4d176d1..7663d4831464 100644 --- a/share/man/man4/watchdog.4 +++ b/share/man/man4/watchdog.4 @@ -42,7 +42,7 @@ supports several optional .Xr ioctl 2 calls for configuration, and responds to a single operational -.Xr ioctl +.Xr ioctl 2 call, .Dv WDIOCPATPAT . It takes a single argument which represents a timeout value specified as a @@ -84,7 +84,7 @@ The watchdog might still be armed! .Pp The optional configuration -.Xr ioctl +.Xr ioctl 2 commands are listed here, along with the type of the parameter used. Examples of their use can be found in .Xr watchdogd 8 . @@ -127,7 +127,7 @@ printf(9) .Sh RETURN VALUES The .Dv WDIOCPATPAT -.Xr ioctl +.Xr ioctl 2 returns zero on success and non-zero on failure. .Bl -tag -width Er .It Bq Er EOPNOTSUPP @@ -141,7 +141,7 @@ Invalid flag combination passed. .El .Pp The configuration -.Xr ioctl +.Xr ioctl 2 operations return zero on success and non-zero on failure. .Sh EXAMPLES .Bd -literal -offset indent diff --git a/share/man/man9/VOP_ADVISE.9 b/share/man/man9/VOP_ADVISE.9 index 3decc0c2eac8..c6e8791615ce 100644 --- a/share/man/man9/VOP_ADVISE.9 +++ b/share/man/man9/VOP_ADVISE.9 @@ -39,7 +39,7 @@ .Sh DESCRIPTION This call applies advice for a range of a file's data. It is used to implement the -.Xr posix_fadvise +.Xr posix_fadvise 2 system call. .Pp Its arguments are: diff --git a/share/man/man9/VOP_ALLOCATE.9 b/share/man/man9/VOP_ALLOCATE.9 index fce2ea183273..4fcbe773f236 100644 --- a/share/man/man9/VOP_ALLOCATE.9 +++ b/share/man/man9/VOP_ALLOCATE.9 @@ -45,7 +45,7 @@ .Sh DESCRIPTION This call allocates storage for a range of offsets in a file. It is used to implement the -.Xr posix_fallocate +.Xr posix_fallocate 2 system call. .Pp Its arguments are: diff --git a/share/man/man9/osd.9 b/share/man/man9/osd.9 index 82f279ef17f4..95547f5211c2 100644 --- a/share/man/man9/osd.9 +++ b/share/man/man9/osd.9 @@ -396,7 +396,7 @@ API. .Pp .Fn osd_get only acquires an -.Xr rmlock +.Xr rmlock 9 in read mode, therefore making it safe to use in the majority of contexts within the kernel including most fast paths. .Sh RETURN VALUES From nobody Mon Nov 4 16:16:51 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XhxS34lQ9z5cGpG; Mon, 04 Nov 2024 16:16: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XhxS32gw7z4qSm; Mon, 4 Nov 2024 16:16:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730737011; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Yj+TQOGTvVNtqf+QCFZtxebDzNpXZr6dYpJhDkYoEy0=; b=UX5tqS9T8i0R7zEZKWwAQh2UYTGeO/IOtPF59gMkTPBkoYowNVcEjY68oSmTT8PMR2LC89 XFod362rjHndf3n2tPhBl3kvmUzc3lHSs/P6vTH7aJxPfdrIdnwDNFiydSO8+KdRFT1JwI Avqsq0j0ZiugktCn1/+XQviPCXpqOTZ2yS2NH57JOH777FVrNUqwumnjEmGX360sLe32dr qznxw6z1NmB0iZlQ9YSJv2e9dFEQFx+cD80IZvUgsXNIGpJJ1ieRD3RkXElcbgpnhhmXOc a1bXewXbwqecj6jv9QsuZw82+8Gi94tYseAoqHPIsRGACS8vgvW0WHMdPl6XEw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730737011; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Yj+TQOGTvVNtqf+QCFZtxebDzNpXZr6dYpJhDkYoEy0=; b=rcJE+pPn2W/JnUCoBeIjizVJHF74K4B0fLe7QLAe8jC06pnkC7/atLsyXrAc/jKEpUaoUF iST9TB6vUr1I5bSUHQqXwkyrol6yPdLhRx4F0S7F4ee+11fpVmk3IIVBGVhhJO3IYdWFW3 f2MqaxtQ/PiWNDrEf9HvamVxJRFaeIYr0m6EsGgtnWyXG6zBllbr8kLl8Yb2N3BfoKDP9V TFHd8E8AvDcb33NR+wbxGSAZgaaV5gghzy5bF8ju18ZK1xLyU6weheOqDhVsO6cCJr0FkR QqdhRTw/6qguRvhYvLXyeHUNvTlRYnEYAPIHcrM67wppA0j/EQIIhgsy/L1MOQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730737011; a=rsa-sha256; cv=none; b=U/8rDFIwj0PI1XDC4Hv1gq9lAKjOjj7/Ss3reL+ulDCSepeUsK3etgP4H+0oNucxzoKoKO g9hyhvmMWZ1F/W2R608byk9qVnvxkvvnwZ7SerAexkY00VG7MPI6cyjdn7SxoPV+2THOVh uNjkn9d7haQgyS3CoaHlUTuX3KQzvO8m8UDl7WnSMugq6BS4VySW67CkJnjplB4nnYTJR1 kXJ2L4NmhXvwZLPk83BqQJDOoy+17SUDKPiUmpNI9w9e446yP+8Y56nPObNAeAwIbKEGhp +JtCgKfh16CUhGG7bJiJCM40cWS12r6jRZGHJIxQrUJxYjw3Um2GuCZhk+YtwA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XhxS31jf1zgfn; Mon, 4 Nov 2024 16:16:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A4GGpl2010837; Mon, 4 Nov 2024 16:16:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A4GGpZm010834; Mon, 4 Nov 2024 16:16:51 GMT (envelope-from git) Date: Mon, 4 Nov 2024 16:16:51 GMT Message-Id: <202411041616.4A4GGpZm010834@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: ba036fce2573 - stable/14 - thr_kill(2): fix title List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: ba036fce257399b328d8c829ad402234d18dd94f Auto-Submitted: auto-generated The branch stable/14 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=ba036fce257399b328d8c829ad402234d18dd94f commit ba036fce257399b328d8c829ad402234d18dd94f Author: Mitchell Horne AuthorDate: 2024-10-15 14:11:28 +0000 Commit: Mitchell Horne CommitDate: 2024-11-04 16:15:11 +0000 thr_kill(2): fix title Mandoc emits a STYLE warning due to the lowercase letters. (cherry picked from commit 23cb03d145292d7a3e6165b4ca74837d497bd3db) --- lib/libc/sys/thr_kill.2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libc/sys/thr_kill.2 b/lib/libc/sys/thr_kill.2 index 3252de13ed8c..63a6e40ef6fc 100644 --- a/lib/libc/sys/thr_kill.2 +++ b/lib/libc/sys/thr_kill.2 @@ -26,7 +26,7 @@ .\" SUCH DAMAGE. .\" .Dd May 5, 2020 -.Dt THR_kill 2 +.Dt THR_KILL 2 .Os .Sh NAME .Nm thr_kill From nobody Mon Nov 4 16:16:52 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XhxS45XqNz5cGpJ; Mon, 04 Nov 2024 16:16: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XhxS43mvDz4qwL; Mon, 4 Nov 2024 16:16:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730737012; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZnAztzACb5il+jbFRqSBdku9kJfGZ5RRLGcWoIxl6/E=; b=pHyS3rAPMJHpYIiSu1BwTfGY0ygxbSdcQ6sjKOx8xP0xGtW0uqO9W6aIuaxOwih6lWOvXx xX/OKZNKaimGIREPrlrk4Wz9ufbPrVeBEbKBMPikCw6fHJiUcpfOHi48/q0VMeCuW4QavI QKdLzS5AH1RjSJUoH0N4pCe6a1eiZo/CZOkyJklk5YXUWDvfPK8QDt7JQDD/UCG6B78IT5 uGmmCsplYIQQF4LsLsohobD5XAqw/lqNynnGUqY4w5P4h1O8YBw0vUXC59UkCUbNd1pzBH riZB3sQjc3ExG5+AOT1p5eePf9aCKHCuMgZUuvOBhrF00i4Wzlno81VmGGxj7w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730737012; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZnAztzACb5il+jbFRqSBdku9kJfGZ5RRLGcWoIxl6/E=; b=Y1EFpKP4n3tKfUMUR+mllZc+taWVJvbUldxJE890l1tCmLuUrnlfDMZbB9eShWVEbvcWEA 51ZguKM62jEInAuO/8gjiZ9o3QjUyWdTT7XwTpH7Fs7+a5QFgF6s9I3/8s3z5+nWGIfZqr /rkqrpbrCnP5D540hLN+NHBgOl5vY5Q8Z+F7dGxU0tBGEZXx9XVmzoM8/qfVVbfe31HlO+ Rrjrswf5JjQpLhXjKDdpDCP9d5p2FDEM6745JGiWC06AL1GBeG0vNAauDtagEuPmuWe+Qf dEOCN9hcDiAr16gjJOrO67PreejyephKdt0ScqrXRyJ/yno2hQVi4giR25H6cA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730737012; a=rsa-sha256; cv=none; b=MrAcEDwT3AS0MU5n0RK6SjXspjkx+R0DACscMTVDXG3SIKd8BkT0BPfB3KZ/xjfctRk//k /o2bUsSvFRVYtmcsacE85naXaMRBUiYm4mLpbRHcYfplm67518hhmh7ON4fgBk3GYUenuj beFUYTbv08qX6zxdloEx39LlAJaU5seG1Oo6LWrmVbrUb5Uq+SgnITB8vK+JY23g/C1aCL iK6e3CtwvoKuv1tUFVcbEn1FwPQQqQ5HKl3dmoTv9LrDjVAHThmJjO0WRokg9jhRqmXPpg xa2QhUhldLq84adZOvtWpx3kESr29NvpM1twlHpmxoW27akpe29mPxuWZ1NP4w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XhxS42zlPzgfp; Mon, 4 Nov 2024 16:16:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A4GGqM3010876; Mon, 4 Nov 2024 16:16:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A4GGq2s010873; Mon, 4 Nov 2024 16:16:52 GMT (envelope-from git) Date: Mon, 4 Nov 2024 16:16:52 GMT Message-Id: <202411041616.4A4GGq2s010873@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 260a43241737 - stable/14 - manuals: Misc syntax fixes List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 260a432417372b2348d66b40791c942ba5be4d75 Auto-Submitted: auto-generated The branch stable/14 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=260a432417372b2348d66b40791c942ba5be4d75 commit 260a432417372b2348d66b40791c942ba5be4d75 Author: Graham Percival AuthorDate: 2024-10-16 22:46:40 +0000 Commit: Mitchell Horne CommitDate: 2024-11-04 16:15:27 +0000 manuals: Misc syntax fixes These were reported by `mandoc -T lint ...` as errors. Signed-off-by: Graham Percival Reviewed by: mhorne, Alexander Ziaee Sponsored by: Tarsnap Backup Inc. Pull Request: https://github.com/freebsd/freebsd-src/pull/1472 (cherry picked from commit 759ddb4d246f5db5963369a82f1ab165d0dfccce) --- sbin/ipf/ipf/ipf.5 | 2 +- sbin/ipf/ipf/ipf.8 | 3 ++- sbin/nvmecontrol/nvmecontrol.8 | 4 ++-- stand/libsa/libsa.3 | 2 ++ stand/man/loader.efi.8 | 4 ++-- 5 files changed, 9 insertions(+), 6 deletions(-) diff --git a/sbin/ipf/ipf/ipf.5 b/sbin/ipf/ipf/ipf.5 index 8d2f6f58379b..be88c8c4c5ea 100644 --- a/sbin/ipf/ipf/ipf.5 +++ b/sbin/ipf/ipf/ipf.5 @@ -295,7 +295,7 @@ proto-unr (protocol unreachable) the IP protocol specified in the packet is not available to receive packets. -.DE +.RE .PP An example that shows how to send back a port unreachable packet for UDP packets to 192.168.1.0/24 is as follows: diff --git a/sbin/ipf/ipf/ipf.8 b/sbin/ipf/ipf/ipf.8 index b999f04e5d03..9ca75e47e47d 100644 --- a/sbin/ipf/ipf/ipf.8 +++ b/sbin/ipf/ipf/ipf.8 @@ -158,7 +158,8 @@ Zero global statistics held in the kernel for filtering only (this doesn't affect fragment or state statistics). .DT .SH ENVIRONMENT -.NM utilizes the following environment variable. +.B ipf +utilizes the following environment variable. .TP .B IPF_PREDEFINED ipfilter variables, see VARIABLES in ipf(5), can be specified in this diff --git a/sbin/nvmecontrol/nvmecontrol.8 b/sbin/nvmecontrol/nvmecontrol.8 index 1310184ac309..40a6400515cc 100644 --- a/sbin/nvmecontrol/nvmecontrol.8 +++ b/sbin/nvmecontrol/nvmecontrol.8 @@ -811,13 +811,13 @@ If the .Dq nvmecontrol identify -n 1 nvme2 command ended with .Pp -.Bl -verbatim +.Bd -literal LBA Format #00: Data Size: 512 Metadata Size: 0 Performance: Good LBA Format #01: Data Size: 512 Metadata Size: 8 Performance: Good LBA Format #02: Data Size: 4096 Metadata Size: 0 Performance: Good LBA Format #03: Data Size: 4096 Metadata Size: 8 Performance: Good LBA Format #04: Data Size: 4096 Metadata Size: 64 Performance: Good -.El +.Ed .Pp then this would give a 4k data format for at least namespace 1, with no metadata. diff --git a/stand/libsa/libsa.3 b/stand/libsa/libsa.3 index 7643423b342a..3e3f70610516 100644 --- a/stand/libsa/libsa.3 +++ b/stand/libsa/libsa.3 @@ -597,6 +597,8 @@ string after the device specification is written. .It Xo .Ft int .Fn devinit void +.Xc +.Pp Calls all the .Fa dv_init routines in the diff --git a/stand/man/loader.efi.8 b/stand/man/loader.efi.8 index 3527d8b66a99..616d08f81302 100644 --- a/stand/man/loader.efi.8 +++ b/stand/man/loader.efi.8 @@ -393,10 +393,10 @@ Boot to FW : false BootCurrent: 0001 Timeout : 2 seconds BootOrder : 0000, 0001, 0003, 0004, 0005, 0006, 0001, 0008, 000A, 000B, 000C, 000E, 0007 -... +\&... +Boot0001* FreeBSD ZPOOL HD(1,GPT,b5d0f86b-265d-1e1b-18aa-0ed55e1e73bd,0x28,0x96000)/File(\EFI\FREEBSD\LOADER.EFI) nda0p1:/EFI/FREEBSD/LOADER.EFI /boot/efi//EFI/FREEBSD/LOADER.EFI -... +\&... .Ed Often there are several options, depending on the BIOS. The entry that we booted with is marked with a From nobody Mon Nov 4 16:16:53 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XhxS56qjdz5cGwH; Mon, 04 Nov 2024 16:16: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XhxS55CvLz4r2g; Mon, 4 Nov 2024 16:16:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730737013; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OttHBAMw6T+3BWbox2d/bpiN6nOGASnBdaSJPtYfWZ4=; b=bu9xa4RsgaJ2R4kyewVteRHmA4X4lc+3LH/KqhSjCzSMI/0Y3Tn5SB6k0P3FcRu/iN3H3/ lZMqwM7JaITjtc5Fo65r+Iw+D5Ad3jrH2APArtitfcAGfh/zuLQLU0K4v/W8w9zr6rAGgP FzZrj7ojLSzB/CtrZeZ7TJYV57u+4+G6UxRph4lyIEPKz+Dmwocu5XvOuI45yqgo9+8asT P6g+Vzol4OcLn3icOxb9kpFwNFbF66ju/b56zc7M2d9V1JjlC+ozX4pXLmXAytNFSh6frD kpN0jn+PGU1VRodd5gH4IsbUIgkF8IkUh2YKeHFhxMJTYoAtEtvpxapDFM2egg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730737013; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OttHBAMw6T+3BWbox2d/bpiN6nOGASnBdaSJPtYfWZ4=; b=EWjfDLLA8mG3v8f16fy81JAspxPQRarQskg7FBG5biNhX36kwMA7r5umGI5JVIYtXrkITX Pw7ATmlDwBTYndzeL4KlXGaFGgiCFkQSyUH8zH6ixXqZ8D8R12F7S/Dq/emaxLg/XdeNjm orF1dxV11H2AbqkyJ1uc2nDOJ2cu1hU6mvci701m+yrFlXdS8a9L1awPhPSBSp24BezYk/ PlbfLdxVXxVSzJiP3PaioKHFSE/5XoApGxOJxF9TyJMZVn6Z5zDeGoIu8kGHrSpBF/tnNW F21XaHrnVDetkuk5petNrrkCuaba7u5oH6GKVY1vQ7FOGyNY70Xy1QbVgG4wMg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730737013; a=rsa-sha256; cv=none; b=HhQ9Wx9g7NXKA+cHVq1z+1zPwLsCqSkfG2UqTQKqLNcqAxiRhGY3WAmzd6F6iIEaRTv+fF Oav21yxSd7cBarVHXJGRthiaVDsKrAtZBeX5jg2qaSQJBDWBEh/nsLAJp7vkvCUfn/IQmq 6t8xExGzkjh+KN2r/NOwYMBW3YzCvkhp9WFs5dCw0Op438gJBM7swAKKXYHXhAwkMMYgwo fNpBOBq4znnEveulA9e/rpklpVBGxeT2u5vwD18WQVQ6U8Xo0QLZ3bb1cAp6O0F1whJaiM 0vakEs10lsMYmLawb4TyJPze4l24Z8VX+nPVJH/+MwECnHh0LpZ6O3dxEbmRAA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XhxS53yRczgfq; Mon, 4 Nov 2024 16:16:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A4GGrLp010918; Mon, 4 Nov 2024 16:16:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A4GGrfV010915; Mon, 4 Nov 2024 16:16:53 GMT (envelope-from git) Date: Mon, 4 Nov 2024 16:16:53 GMT Message-Id: <202411041616.4A4GGrfV010915@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: cdffbea57c0d - stable/14 - manuals: Fix dates List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: cdffbea57c0d4dc1e76cb1e2d170b7f174c53d24 Auto-Submitted: auto-generated The branch stable/14 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=cdffbea57c0d4dc1e76cb1e2d170b7f174c53d24 commit cdffbea57c0d4dc1e76cb1e2d170b7f174c53d24 Author: Graham Percival AuthorDate: 2024-10-16 23:03:49 +0000 Commit: Mitchell Horne CommitDate: 2024-11-04 16:16:22 +0000 manuals: Fix dates These were reported by `mandoc -T lint ...` as warnings. Signed-off-by: Graham Percival Reviewed by: mhorne MFC after: 3 days Sponsored by: Tarsnap Backup Inc. Pull Request: https://github.com/freebsd/freebsd-src/pull/1475 (cherry picked from commit b74aaa1a2199261f9078247d29481a994b6b5e42) --- lib/libusb/libusb.3 | 2 +- libexec/rtld-elf/rtld.1 | 2 +- share/man/man4/enic.4 | 2 +- usr.sbin/gssd/gssd.8 | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/libusb/libusb.3 b/lib/libusb/libusb.3 index 43afa55380a8..fe07e86623c8 100644 --- a/lib/libusb/libusb.3 +++ b/lib/libusb/libusb.3 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd January, 26, 2023 +.Dd January 26, 2023 .Dt LIBUSB 3 .Os .Sh NAME diff --git a/libexec/rtld-elf/rtld.1 b/libexec/rtld-elf/rtld.1 index 31e046a5cdc4..5631c28e1f84 100644 --- a/libexec/rtld-elf/rtld.1 +++ b/libexec/rtld-elf/rtld.1 @@ -26,7 +26,7 @@ .\" (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 July 24, 2025 +.Dd July 24, 2024 .Dt RTLD 1 .Os .Sh NAME diff --git a/share/man/man4/enic.4 b/share/man/man4/enic.4 index 257a95fa9d32..1783b05dfa12 100644 --- a/share/man/man4/enic.4 +++ b/share/man/man4/enic.4 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd Sept 7, 2022 +.Dd September 7, 2022 .Dt ENIC 4 .Os .Sh NAME diff --git a/usr.sbin/gssd/gssd.8 b/usr.sbin/gssd/gssd.8 index 4240bf28867d..8c330a134a6f 100644 --- a/usr.sbin/gssd/gssd.8 +++ b/usr.sbin/gssd/gssd.8 @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd April 10 2020 +.Dd April 10, 2020 .Dt GSSD 8 .Os .Sh NAME From nobody Tue Nov 5 04:20:29 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XjFW12KRVz5d01p; Tue, 05 Nov 2024 04:20: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XjFW11kqKz4GqW; Tue, 5 Nov 2024 04:20:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730780429; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vFZFRdUCbx8HrBBGMzqa82eiWiubausYjOTobmkMyfY=; b=xV+9yOpc+s0BsU+EqdtMd3KcopcRAStjvTZELWQwO69qB9Gb9og7T5VwXSWRBI7/nCGMbl sWEQCVeXnTXFQwhVr8YXuF6UPOSB+SbXFz8ScTLBRCPvKLEG2Bme2skdnjWGwQkbFwufGs E+QmRcF56AfaMa8t81oK9Tuwuf9a7Ulsg8ZJy6t7izYgbUW8ooiBVMG2rGGUFQTRMJu2Mf p7EynAmVYOu9Q5HxSb+IOYR/OQP7aB9+W3hZhtSVcxH+NWpl9a5Im584ZFTSNAWdGQEnQL AaGd6swT2fnbSlgiMkmkP8XyHHg3Ylleio0+S+hVPyh1ZEJf1rdMOgOvngqBbQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730780429; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vFZFRdUCbx8HrBBGMzqa82eiWiubausYjOTobmkMyfY=; b=FRTXCsTA5YbJrJBbYM9psRm+F93j8eHHOKVFkBY1aDwob2nGpGb2uHyfb71EovbjP49LhC 9BeG2BFQ3mJ7mhiOxaqcpY497C+czWyUww+4dBcP0KKy7E+YdTGQM9oLOLVmoy6uwtobod OPVqKzAOpqYaWREt1fk9Hy/zNdCAjPupbC2mZYMQJIJBYW+juqCMGVPPmlDe+lEIrns2X1 xH0kRXQFDVfmLJlLwkpodkIJdiGUX30BSOtV7EIatB8k0M+xRVIXNRN1VsWU3nOhyYGpbp d6G+j7QRwiTtX8/IvftVWKZnOd1P0bGuxsRM0iwmipuBWWt4JoAC3d4A1J+JPw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730780429; a=rsa-sha256; cv=none; b=Skseb5FrOBd3W/B0TzFu6LsGHUm0crOmyY8SzsjCVEz6nnt+SP12K0/r2LMorqEM5fTgRy 6yS6ec1fKbDXbfrRU1UHDQ6kw0yoKR70jWm62WehIxWRTx2fXl5t2cEK2n/drWtdJOPzXN 859l4LY7Ba68WghLIPIiS8PO4juM6fp/zgpDFZZ8moPjrkUTA2iLe1gwscHln3YZoBo1d1 lhpW4nRNyxp4WaOQcZj4WkcfssBdMIqyiY6+w6UTci3inQJR7MpIGcUsHFCdTwX/q5ZoLE maq7BSz+8ps80vumE9+ZqsO7twxPWRMENIvasTVzGXsayL3NZSvRYzSHDNKtNQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XjFW11Dbgz12gg; Tue, 5 Nov 2024 04:20:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A54KT7U057905; Tue, 5 Nov 2024 04:20:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A54KTWD057901; Tue, 5 Nov 2024 04:20:29 GMT (envelope-from git) Date: Tue, 5 Nov 2024 04:20:29 GMT Message-Id: <202411050420.4A54KTWD057901@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: a752de91d015 - releng/14.2 - kbdcontrol: correct bell frequency for vt(4) List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.2 X-Git-Reftype: branch X-Git-Commit: a752de91d015b8e377757a6337b85ebdf39fb7d6 Auto-Submitted: auto-generated The branch releng/14.2 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=a752de91d015b8e377757a6337b85ebdf39fb7d6 commit a752de91d015b8e377757a6337b85ebdf39fb7d6 Author: Ed Maste AuthorDate: 2024-09-26 23:55:33 +0000 Commit: Ed Maste CommitDate: 2024-11-05 04:19:13 +0000 kbdcontrol: correct bell frequency for vt(4) Do the `1193182 / pitch` hack only for sc(4). PR: 281713 Reported by: Rudolf Polzer Reviewed by: imp Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D46803 (cherry picked from commit f65c19a242de322930f6a1cd7d5e6bf3ce19ce42) (cherry picked from commit 2234362780854c426395a35403ed3dce42ccacc9) Approved by: re (cperciva) --- usr.sbin/kbdcontrol/kbdcontrol.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/usr.sbin/kbdcontrol/kbdcontrol.c b/usr.sbin/kbdcontrol/kbdcontrol.c index e55165fd0888..9f8593990542 100644 --- a/usr.sbin/kbdcontrol/kbdcontrol.c +++ b/usr.sbin/kbdcontrol/kbdcontrol.c @@ -1038,8 +1038,10 @@ badopt: warnx("argument to -b must be duration.pitch or [quiet.]visual|normal|off"); return; } - if (pitch != 0) - pitch = 1193182 / pitch; /* in Hz */ + if (!is_vt4()) { + if (pitch != 0) + pitch = 1193182 / pitch; /* in Hz */ + } duration /= 10; /* in 10 m sec */ } From nobody Tue Nov 5 04:20:30 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XjFW24RVbz5d0XG; Tue, 05 Nov 2024 04:20: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XjFW23756z4Gn8; Tue, 5 Nov 2024 04:20:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730780430; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=J4JsjkDKqM0owMNWayuvMQ++cUd8EQ/kPaRR7uUGvFA=; b=oyzE45xlpI1DxlOkqa1YVeTNKgPbb8WbX4FkkDVcm88gUtYeaVwS+uEjcnB05F6zJxd5PT PdoAi/LK87P47K6oVokvGMWhT51a3ETiSuAbKvQjEuaDpT0tYqDk8ANguATX8oJ8hgQ1mi 2Q5/5+mSzH3QK0KhWMNz5NgkRFtrhCRvcWWsm4s5hEHFMQ1zz4Wwx5RU5vIcV2X23Ovq5Y leZLsR4/rrECgfV2TnGz4z9Hcjiw1B7Hm9AHpiP1TDyt26k72HZmPfOYrjJ0kUopPfeiQS MNPp/CGVtEtj708/XHeYQFgcY0EA9UMYLEjHZsrffGBOlYanvE1NIoNFOpA98w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730780430; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=J4JsjkDKqM0owMNWayuvMQ++cUd8EQ/kPaRR7uUGvFA=; b=f24fVeZci7TWpjqRIF0v3YYHOsfPRty/AdFjCO1LlRl41/yGPmAgK+AHWQBk6G1akwHgVe yYT5R/TN0a+AFkB0CcYLjD+A4ONpnLwB9aE3XIG2mL9ilBhriU03Bve4EzE7C3yjx9cnRl sOM5R2XAfRFFmGQfP5s0eZHCMFDsCHNotBpLBwkFontEn2D9QnY1cGKECX7UPaPNFIrlc0 47GfTpd1FzLkyqfO1JtwIEecFmsk9jIiUdknt9n2W8XI91kf/N2TE8VdnXbXsz0hDSuybh u80KMzkkAR2/xmpeucWftymCQo/W4UK3kqvVYUQqrzoeqf01KSPQO9MvdPq96g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730780430; a=rsa-sha256; cv=none; b=gIzVe5lrmLQWveCa5f97ATlo1a3KS4NGinrYSfGkFZzMhh8cA2lPg1RipY1n+GUJSclv0O ivEExqkGxtJVS6OlJDGZICONMI5Chnp8i3YDot5vlzqQMPH64xmq598CGoXeCJO5UJQBnW xP7RcONcS5ueLhJuKRpKcAYCe1vgjvcKCk7uAaQ86NS4ZoWUBdniB9MUiOh9KIxps646RN a56NAANPDmsTW7OVZGyif29Z8hY4cky6YkEI8eq4wcFzSwURhXAJNpruvKCcQLQveE8qCq CaJvUCliNi6JG8APRFIVmrnHCsanURH56+W1JN+O2Ghsmibe9pBRi8tvKDGC7A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XjFW22WkXz12bJ; Tue, 5 Nov 2024 04:20:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A54KUSX057964; Tue, 5 Nov 2024 04:20:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A54KU0m057961; Tue, 5 Nov 2024 04:20:30 GMT (envelope-from git) Date: Tue, 5 Nov 2024 04:20:30 GMT Message-Id: <202411050420.4A54KU0m057961@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 0015947451ea - releng/14.2 - vt: Fix frequency calcuation for bell List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.2 X-Git-Reftype: branch X-Git-Commit: 0015947451ea0555e13f8e8af710eec81480b5ed Auto-Submitted: auto-generated The branch releng/14.2 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=0015947451ea0555e13f8e8af710eec81480b5ed commit 0015947451ea0555e13f8e8af710eec81480b5ed Author: Warner Losh AuthorDate: 2021-11-03 21:55:55 +0000 Commit: Ed Maste CommitDate: 2024-11-05 04:19:22 +0000 vt: Fix frequency calcuation for bell 386BSD provided a MD function sysbeep. This took two arguments (pitch and period). Pitch was jammed into the PIT's divisor directly (which means the argument was expected to sound a tone at '1193182 / pitch' Hz). FreeBSD inherited this interface. In commit e46598588587 (svn 177642, Mar 26 2008), phk changed this function to take a tone to sound in hz. He converted all in-tree instances of 1193182 / hz to just hz (and kept the few misguided folks that passed hz directly unchanged -- this was part of what motivated the change). He converted the places where we pre-computed the 8254 divisor from being pitch to 1193182 / pitch (since that converts the divisor to the frequency and the interfaces that were exposed to userland exposed it in these units in places, continuing the tradition inherited from SCO System V/386 Unix in spots). In 2009, Ed Shouten was contracted by the FreeBSD Foundation to write / finish newcons. This work was done in perforce and was imported into subversion in user/ed/newcons in revision 199072 (https://svnweb.freebsd.org/base?view=revision&revision=199072) which was later imported into FreeBSD by ray@ (Aleksandr Rybalko). From that earliest import into svn import to this date, we ring the bell with: sysbeep(1193182 / VT_BELLPITCH, VT_BELLDURATION); where VT_BELLPITCH was defined to be 800. This results in a bell frequency of 1491Hz, more or less today. This is similar to the frequency that syscons and pcvt used (1493Hz and 1500Hz respectively). This in turn was inherited from 386BSD, it seems, which used the hard coded value 0x31b which is 795 -> 1500Hz. This '800' was intended to be the bell tone (eg 800Hz) and this interface was one that wasn't converted. The most common terminal prior to the rise of PCs was the VT100, which had an approximately 800Hz bell. Ed Shouten has confirmed that the original intent was 800Hz and changing this was overlooked after the change to -current was made. This restors that original intent and makes the bell less obnoxious in the process. Reviewed by: des, adrian Differential Revision: https://reviews.freebsd.org/D32594 Sponsored by: Netflix (cherry picked from commit ba48d52ca6c867559156dd916631f9ac47abe80f) This change was accidentally reverted in 80f21bb039ce. (cherry picked from commit 2416be588ea113cc06b924ed85861ed3bc391fe0) (cherry picked from commit 1c9f1cb4f0a71bef37796a8ba139b86cc716ee88) Approved by: re (cperciva) --- sys/dev/vt/vt_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/vt/vt_core.c b/sys/dev/vt/vt_core.c index e27f74b03a0f..f3cc4e29cf07 100644 --- a/sys/dev/vt/vt_core.c +++ b/sys/dev/vt/vt_core.c @@ -120,7 +120,7 @@ static const struct terminal_class vt_termclass = { /* Bell pitch/duration. */ #define VT_BELLDURATION (SBT_1S / 20) -#define VT_BELLPITCH (1193182 / 800) /* Approx 1491Hz */ +#define VT_BELLPITCH 800 #define VT_UNIT(vw) ((vw)->vw_device->vd_unit * VT_MAXWINDOWS + \ (vw)->vw_number) From nobody Tue Nov 5 04:20:31 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XjFW36Jdxz5d0Tn; Tue, 05 Nov 2024 04:20: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XjFW34bzFz4Ghq; Tue, 5 Nov 2024 04:20:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730780431; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=p/vXFnKBaL+UXSbjEorOSuZc95LVx6nXoJCEN15ewE8=; b=PffxiMjMyxc8Aal/HdCvS+BC9iuBsqexDSUAhcGSQS4XXE4Kl4u9bHalm7HnxCwhAhYNr4 e7O/jRUu/Jl8Ao0KfhK/EYDI4zb2GXOKlHv95NLcGhWlHPlcdA8JRe3KgO7ljPQRi39O44 5j56I8TZs/elrSeHQc5GyYdfACScLTPnDSB27/huE9GJbErs0GfYYD/HJvdWdD7vkahQlo 50PXNJACcLXzB8ycgV/NU4lN+lxTPdmsX+lxYRJ2Fn0hxGmPO09ErV5FQoqON0SFEorVDQ g7QgOq04G+K4flnOEyjB+h8gbd0tVHMR8g5S+DrxqCwl/KKWQeqlGvHcA9DGpQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730780431; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=p/vXFnKBaL+UXSbjEorOSuZc95LVx6nXoJCEN15ewE8=; b=OH9uk8A7b5LiEkm1hNBEQPr7Oihi8TunAOumcDBgM9wpHKhCoP6KwX2ZPv4hTGrM6+Yaqh Ku2x2i6q/vEV/Qg2qinQLycAA5vUOm/2Ox5RZGRjZn9UV+7cq61GavxMxTjEsRX3sJsc6U PFaoflepHvHb4NhOhoDsaqJPpDv3pae5ICq9oKOHDO/W3X8ljMXIb5auL2AN0piJmPnprG wtnpJvmjDTsnnsjUpXd7Sui/ZhIn76GJ2/hCCb6lw8CE72OQyEWs3yDZO4MnIxhJBuSzEX dBYk7UPu6vwl4KuJgAZCnaUnq6Tzo+wrCt/JdGO2XFv4Y4EiamcXzFQU8QIH3g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730780431; a=rsa-sha256; cv=none; b=cHN2GceI3YW+/SVnzv22wmGl+BUcaU/XJocVGhoBUmROcAsy4139hyNuBr7yYfNDLD1bTy UT2XA5XaklT2M70gsujAbPoPQSucSbRYGhl/6TEzyg0WkVWRI0r3dSDfcUibHydQ3WH+db ++WCnsT/zkkLBw2QixTyg/uP/Ji+DjCO7ZSqc10lL9NZ2j5CdyQhskQ5zk2Z01HGzW8kHB 3quDJfxYrTdeVr/l5eKWY6ulWcuTYX6wkneq1nx1+lNVrg4RbOiklwUYMZ42++ynZT+16/ h3ZrdWU/XqRAgW25CvOBwDGZi8XGUluoF2mZTgeyI7o0f6cWvkeqysEjHyi/2g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XjFW32r0rz12r9; Tue, 5 Nov 2024 04:20:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A54KV24058003; Tue, 5 Nov 2024 04:20:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A54KVV4058000; Tue, 5 Nov 2024 04:20:31 GMT (envelope-from git) Date: Tue, 5 Nov 2024 04:20:31 GMT Message-Id: <202411050420.4A54KVV4058000@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 2bc5b1d60512 - releng/14.2 - syscons: add deprecation notice List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.2 X-Git-Reftype: branch X-Git-Commit: 2bc5b1d605125ee5dcd262339e3854678ff9acb7 Auto-Submitted: auto-generated The branch releng/14.2 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=2bc5b1d605125ee5dcd262339e3854678ff9acb7 commit 2bc5b1d605125ee5dcd262339e3854678ff9acb7 Author: Ed Maste AuthorDate: 2024-11-01 16:51:01 +0000 Commit: Ed Maste CommitDate: 2024-11-05 04:19:33 +0000 syscons: add deprecation notice syscons(4) is not compatible with UEFI, does not support UTF-8, and is Giant-locked. There is no specific timeline yet for removing it, but support for the Giant lock is expected to go away in one or two major release cycles. Add a deprecation notice to avoid surprises, and help ensure that any material deficiencies in vt(4) become known. Reviewed by: manu, markj, imp Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D47396 (cherry picked from commit fc2a3ec6fe6aa00d9be0c293c38e0ef9ac7e2b64) (cherry picked from commit 8c922db4f3d9dc41f228357d391f0a899292427e) Approved by: re (cperciva) --- share/man/man4/syscons.4 | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/share/man/man4/syscons.4 b/share/man/man4/syscons.4 index 19ecd5e3746e..7e31680ced3f 100644 --- a/share/man/man4/syscons.4 +++ b/share/man/man4/syscons.4 @@ -24,7 +24,7 @@ .\" (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 25, 2022 +.Dd November 2, 2024 .Dt SYSCONS 4 .Os .Sh NAME @@ -69,6 +69,14 @@ In In .Pa /boot/loader.conf : .Cd kern.vty=sc +.Sh DEPRECATION NOTICE +The +.Nm +console is deprecated, and will be removed in a future version of +.Fx . +Users are advised to migrate to the +.Xr vt 4 +console instead. .Sh DESCRIPTION The .Nm From nobody Tue Nov 5 04:20:32 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XjFW46VHwz5d0Zk; Tue, 05 Nov 2024 04:20: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XjFW45Vjnz4GgJ; Tue, 5 Nov 2024 04:20:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730780432; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3WFxtA/zs3uP23gRHS1t24S0+96cCeziJVYaOn6b2ro=; b=luqycW2uk8Ly1xtmaKQx/P0bYxxD6/v0oYIta1MszakLdbYNrmzUjLNuH25P9ZI6bDJq85 +DN6uU5YM3q56FDYhBOe2Rpe7GvxLt8QsoSYi6ew515K9U8f/K4g3hUhh9AHA4lbuck+ZE G51ZXkSrnuerr5Q1TyB5MCGHQwLqAk0f1Bxk7HMPdTzVNLjykXYA+bckcvxkoHighza7f+ L7nyJ+a3cmdW9tBW+e2j6sQxHmwUiqj2F/f4BYp82PscV8jJWcz2u41WgPdjdPlHEAzbjg UBxSTwwqyZ+X2Pag3DcjSvQiWTJ3BwepjPDuN94xI+VaHY+y4eTUdqI+huC+IQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730780432; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3WFxtA/zs3uP23gRHS1t24S0+96cCeziJVYaOn6b2ro=; b=IZ1sqUvg4yBv9GZkmAPmxyfA67Ngs8lUTH34tHoeQNmvbMF4GtRjnCdYgXt/jV2fFRs62i 0iP8mBrqhkwQPcptmxI8Un5H2OUnJx1bx1uNru3tk6E1KK59taJUo26XX7DPkrSpqmzvPM NfKINvfJL9ZUb8W2Bu7b3bZuzvRZ+JI44VJDfduc+rBIueDZ7X4CptWCP0TBqjgt2G1hGh YG9CNk8D20Rj/+cjKbTJYgOMPDmRaptRQ+ErOMfvv6PvwfvbgVJ+v81sTfRaTPzbpNk/2V 5JL/HH0quht8AlK+XLB5He1+0fgO1WQSXZ2RWs3YWkYS9Pk9GEJK1W97UhylHg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730780432; a=rsa-sha256; cv=none; b=EUSGH7TCgmU+V7vpG50KrFEzjaQBMhz4qS1atH92bgnhG6idGS5Tz/F5W7+Tb7o6WOevtK BVUsbOYgGV7/ynk99WbLP80JJihrZqpZftuT87zHpq2loq06e7R7UMdllpkzAWJoAXaS1+ rI/wzMosygIAhkUIJrOYb3wRX+RmZDd5F3P0hON9QpVPURYf/2v4TgzvosICWvJ1rrL4/t J9Kv+V3KmBMWhleqbPpvC34CbNpuCnLqDoYelmMYNeL+xd5Cqiq6mn5ApnsYBgI2kzKWEt 8ZUaY7VKJcL9pkoKIVD6lDjzc9gM0DWQ1g/dM0faZDyD5ZepPqGhGY0YUkgXaQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XjFW449ccz12YH; Tue, 5 Nov 2024 04:20:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A54KWSi058054; Tue, 5 Nov 2024 04:20:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A54KWVW058051; Tue, 5 Nov 2024 04:20:32 GMT (envelope-from git) Date: Tue, 5 Nov 2024 04:20:32 GMT Message-Id: <202411050420.4A54KWVW058051@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 58e70f39fdec - releng/14.2 - resolver.5: Fix example Google DNS server address List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.2 X-Git-Reftype: branch X-Git-Commit: 58e70f39fdec2b68c004b2d829fc2746f1721ff1 Auto-Submitted: auto-generated The branch releng/14.2 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=58e70f39fdec2b68c004b2d829fc2746f1721ff1 commit 58e70f39fdec2b68c004b2d829fc2746f1721ff1 Author: Paula Breton AuthorDate: 2024-10-31 07:11:04 +0000 Commit: Ed Maste CommitDate: 2024-11-05 04:19:40 +0000 resolver.5: Fix example Google DNS server address MFC after: 3 days Signed-off-by: Paula Breton (cherry picked from commit e7f0f4f9206e8b0f411847b293c7b79eb84f0e51) (cherry picked from commit 3e3e2c6328475ab8460f6f57aa2696c544d9ddec) Approved by: re (cperciva) --- share/man/man5/resolver.5 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/man/man5/resolver.5 b/share/man/man5/resolver.5 index 525a681cb564..c3ec226efa6d 100644 --- a/share/man/man5/resolver.5 +++ b/share/man/man5/resolver.5 @@ -238,7 +238,7 @@ nameserver 192.168.2.1 # Fallback nameservers, in this case these from Google. nameserver 8.8.8.8 -nameserver 4.4.4.4 +nameserver 8.8.4.4 # Attach an OPT pseudo-RR for the EDNS0 extension, # as specified in RFC 2671. From nobody Tue Nov 5 04:20:33 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XjFW614zHz5d0Zp; Tue, 05 Nov 2024 04:20:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XjFW55k2Lz4Gnl; Tue, 5 Nov 2024 04:20:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730780433; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iLm9gYlr7iAp8BzjsJWED+RaeMb9wgP6x+LyZmK/eRw=; b=qSwqIxEBotfbtpj4OlYXJOAttWQsYcRvaAeU1Le1c/Vjm8AlseJ1JT86bOsW8b2tBhaYfE yeD/XWuRHL8nwuZJnBrAKDxc3Jxu6EwvUDjzOXqcV95qhW0jJGYkBjMM8IiswYul3vV+7N NXQg/Hbsjbka35vai0esY1f1FF6EsjNlYnpbPa3F/MGDvDKe4hybQ88XJ03vqjAG28uhhI AlZy6lElYLoRgq+HKXfGrkoE2RtyCbsklyOoos4FpQL8akN2rQXK4GMAX8WxhGPf1gF797 fj2AwWi08tVBTvVekathjbF09V3jhG9RC5B//ehB9gnOoaTDol3GRzIAYoPkAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730780433; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iLm9gYlr7iAp8BzjsJWED+RaeMb9wgP6x+LyZmK/eRw=; b=U+4g5USvUiQWs3OMRF6Zn5CYWLO5wdRd2G9kaDcSvMAV+fmJuv4NQgVnYRURjlJVVevtk7 qv1VDMnUwXIhNfodHWBRPdi/stsevZFZlWKA5Q0DiXIm64JrnK6zYtbsi08eL8i46hOtYA TPkKHY5d40G5ko/wSFJ926tcFoqCc7jiT+GcDKLWoXm2u3ZRqUSmT0GY0fYI9Db7ry2l8l 8BnyK6SUC47ZMAyPcIkBcmFqHUod/g3Csts7oSdGs1qIYaIS8eEqqgn+AqtYHMrzuZvr0d QWXZ0KB/Kpv+3eT3sl6uGlBiqBzv71s9shfGU56ijt3r5Ekrbxkew68MVldXcg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730780433; a=rsa-sha256; cv=none; b=dE5CzKgAmC+MWg+vS6XCJ3rOWUrKMu72X1n+FXEB6uHF33MWN18xGdVmEgUJ+mzbPPedS8 KTM1SloZk1j4h/UPG6QURO/f51A07hs4t0v8Uxiyj4uRLcZYfmiKE9QuRsDInHKbmyTBHZ FqKFNqSan5rX/nOfYsPOrqaV8UvSKlLc8WrkIcexoFoniL/luR1gscP8ZWsvsdqWTEMlEh LeDTxeEor8gTmVisaL/B92aRxy9SzIc4hLqNnL70FFUSQy0P/2VET2TV+U/oi9IrqZuqil g/mpd4jD88CGcl2O9NHpJ8d13HtL2moxf/KAIX3dbJaSvhDuTQ2v85KnG4+ccQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XjFW556Nbz12rB; Tue, 5 Nov 2024 04:20:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A54KXps058096; Tue, 5 Nov 2024 04:20:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A54KXDk058093; Tue, 5 Nov 2024 04:20:33 GMT (envelope-from git) Date: Tue, 5 Nov 2024 04:20:33 GMT Message-Id: <202411050420.4A54KXDk058093@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: bc01ae40e45e - releng/14.2 - Cirrus-CI: switch to FreeBSD 13.3 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.2 X-Git-Reftype: branch X-Git-Commit: bc01ae40e45efca283ea7c2b5d5c8549adfb340f Auto-Submitted: auto-generated The branch releng/14.2 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=bc01ae40e45efca283ea7c2b5d5c8549adfb340f commit bc01ae40e45efca283ea7c2b5d5c8549adfb340f Author: Ed Maste AuthorDate: 2024-10-26 15:03:15 +0000 Commit: Ed Maste CommitDate: 2024-11-05 04:19:50 +0000 Cirrus-CI: switch to FreeBSD 13.3 Sponsored by: The FreeBSD Foundation (cherry picked from commit b15889d6d22a36333dec4362aea426521281c72c) (cherry picked from commit a1883e20bc784b8055d4349e4c3ff1e690efe17c) Approved by: re (cperciva) --- .cirrus.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index 13719a3e2058..45c31c9f07b2 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -4,7 +4,7 @@ compute_engine_instance: # gcloud compute images list --project freebsd-org-cloud-dev --no-standard-images platform: freebsd image_project: freebsd-org-cloud-dev - image: freebsd-13-2-release-amd64 + image: freebsd-13-3-release-amd64 cpu: 8 memory: 8G disk: 40 From nobody Tue Nov 5 04:20:34 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XjFW70hNTz5d0Ts; Tue, 05 Nov 2024 04:20:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XjFW66JHhz4GjT; Tue, 5 Nov 2024 04:20:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730780434; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3WZg9NTraYBNmx50VxF0xabAarMLj489S90y8g4r43c=; b=tt7o58rMrMPtsQrPLuSRegxV+XMm3RQuaHXRBwLUFW1R3lexiVXI/nxIP5DozN3LAWUyL3 51d1HGQOFPS7Y+2XpO/iY/C3PrsbGN1tqB3KrOBj7SzeTolu3gPEe7azrAh3eOJpPh3Adn vlP7G/M0ft4sl8WNoB/adziSJtpbC9xQVp59/KptwYGKnO3eDgBlYm0l1/c2UZXmehFZ2C HW2bPZPb+sIWKSRDPA6cR15NcOp0i6FANHxIMJ8rHCwac8AJhJOx75qGBuDnJnunh3xpqs pDkk2PPkRbPCxzx2qJj4zkizgy1mLLHNKkYdePl4NEeIdMsFk2dqEYcQ3/cAzQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730780434; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3WZg9NTraYBNmx50VxF0xabAarMLj489S90y8g4r43c=; b=pMfO1hqt6j6JZPoYQnDInAjk1Yf84uroqYgMFakVg893lD7aahHOXVb0iwSbxNWrDACoNm elj+UVZPgNASjZ/ALWwtrZcJt9PRIMYgY5O0H9wSXPyNwtD8pkq9cKKR5eMcL0hSyI96fT UiuaDNllGPK0RRKhyL8FAue2uhw+qow3C51xePHG1lUCO6q/YVTZ6nIikZPBWz1/EcvM18 q1XpCholgT+XvH+uHpFYcHeez94jLfdTqgGjTHD+r/JCrxYdFdA5g8xcK59UXsdD+MgoB3 6BdAOjJvmcLjmRXdIQgq9Qqkm6QwoK/jc0VvTNcKwH7wHfAePS+PAL8BXYTt9w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730780434; a=rsa-sha256; cv=none; b=gQZ+UcqRddnpHn2FZIMdRY8Wvbm5g9ukGJKZBh6GXsdjf9ek38pu5F9rXn31lLyfb7ajL9 2bAnKq58gWGFq6zKVvqZ6LAIJncxZynBP6im9Smc8ISPiW3AGaANsR3O1tWbYp2KjoZGez +FM9P6K4MoSjmdR7KP9/6UVycd2gnZZreLuZ9y63c5S6tA4mUlmnj5y9b+JuCRrPpv2O7m e9eTPGWcj8Rs0o1BNnVhqavq403MgvrK0DzU1gg+HXqYHzYHr35pyEKqkXFT2EOt///Jhm cy+/CCztEnfyD8s9MU/HIEklGiVTwcC6jYcCfJHsn1IF3obeRKqtFWU02okYtg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XjFW65kY0z12bK; Tue, 5 Nov 2024 04:20:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A54KY1M058152; Tue, 5 Nov 2024 04:20:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A54KYEp058149; Tue, 5 Nov 2024 04:20:34 GMT (envelope-from git) Date: Tue, 5 Nov 2024 04:20:34 GMT Message-Id: <202411050420.4A54KYEp058149@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: d0dcee46d971 - releng/14.2 - libcxxrt: Update to upstream 6f2fdfebcd62 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.2 X-Git-Reftype: branch X-Git-Commit: d0dcee46d971c79257be42b0e50cd9183c79fcbb Auto-Submitted: auto-generated The branch releng/14.2 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=d0dcee46d971c79257be42b0e50cd9183c79fcbb commit d0dcee46d971c79257be42b0e50cd9183c79fcbb Author: Ed Maste AuthorDate: 2024-10-31 15:51:29 +0000 Commit: Ed Maste CommitDate: 2024-11-05 04:19:58 +0000 libcxxrt: Update to upstream 6f2fdfebcd62 Interesting fixes: 3cbfe5a556fe Avoid noreturn warning on terminate() (cherry picked from commit 2dccd21949f26b1bdf5e7cf258b760fffd3bf259) (cherry picked from commit d9901a23bd2f4e6aeef7f628f946134c4698fc38) Approved by: re (cperciva) --- contrib/libcxxrt/exception.cc | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/contrib/libcxxrt/exception.cc b/contrib/libcxxrt/exception.cc index c87fe5ac4468..5034809a1380 100644 --- a/contrib/libcxxrt/exception.cc +++ b/contrib/libcxxrt/exception.cc @@ -237,7 +237,7 @@ static_assert(offsetof(__cxa_dependent_exception, unwindHeader) == namespace std { - void unexpected(); + [[noreturn]] void unexpected(); class exception { public: @@ -1530,28 +1530,34 @@ namespace std if (0 != info && 0 != info->terminateHandler) { info->terminateHandler(); - // Should not be reached - a terminate handler is not expected to - // return. - abort(); } - terminateHandler.load()(); + else + { + terminateHandler.load()(); + } + // Should not be reached - a terminate handler is not expected + // to return. + abort(); } /** * Called when an unexpected exception is encountered (i.e. an exception * violates an exception specification). This calls abort() unless a * custom handler has been set.. */ - void unexpected() + [[noreturn]] void unexpected() { static __cxa_thread_info *info = thread_info(); if (0 != info && 0 != info->unexpectedHandler) { info->unexpectedHandler(); - // Should not be reached - a terminate handler is not expected to - // return. - abort(); } - unexpectedHandler.load()(); + else + { + unexpectedHandler.load()(); + } + // Should not be reached - a unexpected handler is not expected + // to return. + abort(); } /** * Returns whether there are any exceptions currently being thrown that From nobody Tue Nov 5 14:29:55 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XjW2C5MzLz5c9s4; Tue, 05 Nov 2024 14:29: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XjW2C4Zhxz54lH; Tue, 5 Nov 2024 14:29:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730816995; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IN6TaZjW1Zo9/w/g4LKVeYf7V809Dsj+0qGozEJ7pHc=; b=lTwf7uDOB8WcttHFw924qxwE7gNh+9vu96hBbEDjjiZCAzU500/UJ3Hu01ITkyg8e4QNAG gPB2OaihVMKORjbD7cIgYMqRjyaIFIt5+4+5L/+bIWGtmdemds7bjVdVJl4cTdssg6pF63 npjqAZVLhuFx1knPhN4biEwmL8oHCAKyfER0p3dKWrxx2IqmBW+EXpQFWk0q1cCSTpo4Ew 0jcQh1sxWlJv1gxnNEYw6682O+pJh5Us6nRqnhCMSbJR2XlI1S8dNsHmKNXKtEXB2iR/Tl 1rijk9Hkj4XKyNoORRBfwjw9mNG8xyY+12nho0nOBItOnaNWsc9dHJ8G8OfFSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730816995; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IN6TaZjW1Zo9/w/g4LKVeYf7V809Dsj+0qGozEJ7pHc=; b=YwLcXGO6kEtPVe1Tx5dMLRQxdmdQoCmLS/HyKEHlbVCiCVznOK4dSNVe97fjF8Bjc/gAyz qpTnCjhUozXxu4toAc8CJIGB0PS9+TVeCM0SrlCGrN5A2d+kA8KVczr0wrs0dYn+tXDbu/ CmI+DT0iuus8r6XXxC9YrHxjz5Z7xw9boFQxztHpsBtCC6pJY1ZEfPRHZDC4gOzq2im3L/ 8THpD47Yv/SOtFVCD0LfmMF2EAP843EgkxnPyZmLIO53QMXiPUBJbpPcNFwXq1+d2Cuicc GCmkAEjAtVzulnp8fIasrWdgFyBvywCCM66NV+e4d3Ir6FceTEAETZoS222NFw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730816995; a=rsa-sha256; cv=none; b=HN+RXmRWJaoU3GEhF3eqdcjjGDhBv9FzmPWNb+kb6S4CqEBCTOoge2fKyH78x+pLK4jQto iPH04u3X0XvSxzvDGXTsT4XLwrGNo2ZoErxrN/ApYWVhTYxcZNLrH1EemcqE7OlsCm2vLa rYSX75r7VZisJVJOnOBR1kut0HAa8PvTl5HMGYpy7jX0tEnbko9uWTTHBiBXvUnVL8KEoJ +px3m+gAykwfqk6SaAUG07Jfg+R92N2+9vwVQa/KPkDNPtcyodQgSUGAOK5nrJQ9/GFyjn GtdMeDRVQU2Ay60tDl7ABYfjHWB4kQo1nBPJhcxdPTjiCOo12avkk0kpfXcG6w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XjW2C4BXVzLXW; Tue, 5 Nov 2024 14:29:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A5ETtU8080878; Tue, 5 Nov 2024 14:29:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A5ETtNn080875; Tue, 5 Nov 2024 14:29:55 GMT (envelope-from git) Date: Tue, 5 Nov 2024 14:29:55 GMT Message-Id: <202411051429.4A5ETtNn080875@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 26d85a5aba34 - stable/14 - geom_flashmap: Rename the kernel module List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 26d85a5aba3439092e73dfe33234a5687d5c70b9 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=26d85a5aba3439092e73dfe33234a5687d5c70b9 commit 26d85a5aba3439092e73dfe33234a5687d5c70b9 Author: Mark Johnston AuthorDate: 2024-10-29 15:11:12 +0000 Commit: Mark Johnston CommitDate: 2024-11-05 00:55:43 +0000 geom_flashmap: Rename the kernel module Absent a linker.hints, if a module dependency exists on disk, the loader will automatically load it. That is, if something depends on module foo, and foo.ko exists, we'll load foo.ko even though the linker hints file is missing. It's a bit of a hack but it's handy. This breaks with geom_flashmap though, since it's geom_flashmap.ko on disk but the module is called g_flashmap. However, pretty much every other GEOM module is given a "geom_" prefix, so for consistency's sake alone, it seems nice to rename the module. PR: 274388 Reviewed by: jhb MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D47311 (cherry picked from commit 2352336ad9b26fd21d9b0013e195e41d6d02b914) --- sys/dev/fdt/fdt_slicer.c | 2 +- sys/dev/mmc/mmcsd.c | 2 +- sys/geom/geom_flashmap.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/dev/fdt/fdt_slicer.c b/sys/dev/fdt/fdt_slicer.c index 70cad004b7b6..acc08fa84cbb 100644 --- a/sys/dev/fdt/fdt_slicer.c +++ b/sys/dev/fdt/fdt_slicer.c @@ -180,5 +180,5 @@ static moduledata_t fdt_slicer_mod = { }; DECLARE_MODULE(fdt_slicer, fdt_slicer_mod, SI_SUB_DRIVERS, SI_ORDER_THIRD); -MODULE_DEPEND(fdt_slicer, g_flashmap, 0, 0, 0); +MODULE_DEPEND(fdt_slicer, geom_flashmap, 0, 0, 0); MODULE_VERSION(fdt_slicer, 1); diff --git a/sys/dev/mmc/mmcsd.c b/sys/dev/mmc/mmcsd.c index 9bc50124592d..3e4059ae43a6 100644 --- a/sys/dev/mmc/mmcsd.c +++ b/sys/dev/mmc/mmcsd.c @@ -1564,5 +1564,5 @@ mmcsd_handler(module_t mod __unused, int what, void *arg __unused) } DRIVER_MODULE(mmcsd, mmc, mmcsd_driver, mmcsd_handler, NULL); -MODULE_DEPEND(mmcsd, g_flashmap, 0, 0, 0); +MODULE_DEPEND(mmcsd, geom_flashmap, 0, 0, 0); MMC_DEPEND(mmcsd); diff --git a/sys/geom/geom_flashmap.c b/sys/geom/geom_flashmap.c index 6dde6d271d33..c00d7d33c638 100644 --- a/sys/geom/geom_flashmap.c +++ b/sys/geom/geom_flashmap.c @@ -223,4 +223,4 @@ static struct g_class g_flashmap_class = { }; DECLARE_GEOM_CLASS(g_flashmap_class, g_flashmap); -MODULE_VERSION(g_flashmap, 0); +MODULE_VERSION(geom_flashmap, 0); From nobody Tue Nov 5 14:29:56 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XjW2D68djz5c9pv; Tue, 05 Nov 2024 14:29: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XjW2D5H7Rz54fr; Tue, 5 Nov 2024 14:29:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730816996; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KffNyqB/rJMYsSjaAflvdeq/5a5z0679W4v4bRZGPFU=; b=o62IpDeRkEt25cQtjmjO3FQkMCrF7AdtBiSdTkGEuC64DBt5F/9gbXLvySfoNJYgIZmhM8 14I3wzJ8zVv9XRUdPzQIAfJj2SxsPX1inBjcpUw37DwYIV6Q+agqNfj/M2cL+eqGStBuSe PpySLx1kOF/JBYeuOtAW4JPEK58vCBRG3HXjQwerSusWMFsigBCbtrI9ObEqhc9StQFaR4 bQcQE5r0QptCrSI/PhoBrktwaGaWTh+qtfMn6Mj+xPHrnJql7QTUlynan80JIomXaL8uDw 2zO7w5o+YCj6F0mQjELKUd9jXt6fZOCzTfQvbGduRKc/9Cy1IgAkxn0NFqI3Cw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730816996; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KffNyqB/rJMYsSjaAflvdeq/5a5z0679W4v4bRZGPFU=; b=Ull17JzF61La0Tv0hlvUbCqULoTw0XAPIoIrlLJGGDDdzu6os1tEpg8Smw+RjlUB5EX7dc K+CNkiGA79t/nd9Y66MBsfyz3thDREwWVXHqQIDX8xBkokXh1WkHtUOmLIVA/f2O0W4GmA 5o8ISrlRt3t2RPtnZ9nv57Um0KI2FZq4o5t/EQzKJOEfCYnAqPNm6zsdu8mT1GMB6LiTtU T3/Iq++3PuW1rjBtayytAm0JDK+lvWkdtQiE1HhOLhlhZddWK54VNgPSRwMDb4D+tlUEES Y4QFWHNQOyYVS98jI/7qvbKSFcMtn2wZjxXQLt8+PlqgZ0CGErE0o+75FE+Z+w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730816996; a=rsa-sha256; cv=none; b=spyVaHXYv6OLdhSFN+L6Zw+n5wXk5/4fC7ur7hQgoxxT8KPoUT9OXPVqdM0A7Z3rDeF+mn /VlZaqZbyH37jEV/B0bopyRWJX+/IFSmrJHmtl1GTJia6Lh+v0A00Bb8RZ34AOGUfLfFIf kdkw0LONIbLvTunMJ0yRhfr91gQZ5nVLHa0YQ/SV4D/sDTi12w0uySo5sN/N2bEx392Be6 0v3CcEx5isqGY75d8FJBYsd39T9p8KSFH3XKZOV4Ame7GTqxMbgPVbKiaaie+aENwRABmr J0ntrN1QP/Oj4BiwVE3i1rQAM420n3jQ+6BEex0vKIdNUV1O3yMIzKwuDwla5Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XjW2D4tNJzLh8; Tue, 5 Nov 2024 14:29:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A5ETuZv080943; Tue, 5 Nov 2024 14:29:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A5ETu5Q080940; Tue, 5 Nov 2024 14:29:56 GMT (envelope-from git) Date: Tue, 5 Nov 2024 14:29:56 GMT Message-Id: <202411051429.4A5ETu5Q080940@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 4c0effbb1ddf - stable/14 - libarchive tests: Re-enable a broken test List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 4c0effbb1ddf85fa8d7b94e8b3767acd11a38b76 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=4c0effbb1ddf85fa8d7b94e8b3767acd11a38b76 commit 4c0effbb1ddf85fa8d7b94e8b3767acd11a38b76 Author: Mark Johnston AuthorDate: 2024-10-29 15:11:28 +0000 Commit: Mark Johnston CommitDate: 2024-11-05 00:55:43 +0000 libarchive tests: Re-enable a broken test It passes and so appears to have been silently fixed at some point. PR: 240683 MFC after: 1 week (cherry picked from commit 218f80226b82763c3cbd48de560959ad546b5e26) --- lib/libarchive/tests/Makefile | 3 --- 1 file changed, 3 deletions(-) diff --git a/lib/libarchive/tests/Makefile b/lib/libarchive/tests/Makefile index 2684d1661e57..0562197e6936 100644 --- a/lib/libarchive/tests/Makefile +++ b/lib/libarchive/tests/Makefile @@ -335,9 +335,6 @@ ${PACKAGE}FILES+= test_fuzz_1.iso.Z.uu BROKEN_TESTS+= test_fuzz_rar .endif -# https://bugs.freebsd.org/240683 -BROKEN_TESTS+= test_write_filter_zstd - # Build the test program. SRCS.libarchive_test= \ ${TESTS_SRCS} \ From nobody Tue Nov 5 14:29:57 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XjW2G0dyDz5c9xt; Tue, 05 Nov 2024 14:29: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XjW2F6YTRz54sT; Tue, 5 Nov 2024 14:29:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730816997; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JcEfjVoVR1T0iXPV6zT1WZEs8RSeMe9nbGHsgeYiFqo=; b=ajCfsb++fDdXVV2n040c99uZtwm4Yox74Al3LuC5BI+DBF4YXuElRiWmIQt8jrg+KtLkxP fk8q/SHI5zH8AdYRslDC2C8/K8mvwgrXxEjhyCYvZJu3WBCWcCkax+1lbZ1vZ2Pma06p9q 5W8tkI8Ugf7WKKnBiJzCERDa4/LB+QbtzdIbsmh3e5s5gQBRYokLJEd6FTFTvSKdqWQFzG 4kc8HZ+Hz0VWSP7tRYMiQOxVN3gM+Fc7nJWiYEK4oyevsXX7cXOHNeJrBeQ5jVR9gl6dzR 54izBIUsvKnWYByBv+h3iNHHz9xBrcE+BGFwzyygUJh8t8mKZGimSyBj5tFn+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730816997; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JcEfjVoVR1T0iXPV6zT1WZEs8RSeMe9nbGHsgeYiFqo=; b=Wl5bqo97rhLlSugqJTY7xlfoL08BVfi1faF9qfik/F4MgfMQC0G7Z6rXvWGzTo4fjni/eC 3y+vYPX4hmOaql1imgBUzrn30gIVvw46CNU3DkjxWGpn2mWz4RdBB7RwPUtW1cao+GE0/e m7vUWRl0h206/KwMUN4RlSZgTI04sMC7odOkRPwstotVJz1FN7xn9JsyGJbdbeZ3cxoeje Ot49AaGa2B3ld3fvyngOdhnpNU+t04cvz88WPjTh5oDnFJ7f66pBCTcXeKKaObYd3udNFF 2OUJur0TZGmF4G/+dXdfkUA7JsgJ1oaaXRJzRTtjahUt0pp8d+2LbcB9HtpfIw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730816997; a=rsa-sha256; cv=none; b=qpL8/47ozWHU3u6X2+OPkjGEt5sJ38wjP7R/tVuN72bWUPz7oiB380FYZ7IOI5YN8SINcS mHwFTC8nqM3LLlfVNS7c88L64tgz6qh/QDVrJFbygw0D6vg3Fia8H7HzY+L7BrdKK1pA1x dg9ZEcGpBt4d9eyRsj2NuceExJz5m7jR+gfHvPRU74yKZie7CbqeKMxGRYoQs17vyB4L9I 6UKvQ5eJsf+ZmigmfHNRUYAGvcpUscXUeCnRpoCeO0Yw15iE5Z3rTQfWsO5Lacco2osRlN Fre74e4bA0mu2Kq8IkfW/+jVAf9XHrB8MBtKkU5i5chcN8AdUgQaNL9E76WOag== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XjW2F5tJBzKh7; Tue, 5 Nov 2024 14:29:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A5ETvrD081008; Tue, 5 Nov 2024 14:29:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A5ETvMX081005; Tue, 5 Nov 2024 14:29:57 GMT (envelope-from git) Date: Tue, 5 Nov 2024 14:29:57 GMT Message-Id: <202411051429.4A5ETvMX081005@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: ef89eefaa86f - stable/14 - makefs: Remove the warning printed when makefs -t zfs is used List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: ef89eefaa86f315feba6c44f2059582a077a78ed Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=ef89eefaa86f315feba6c44f2059582a077a78ed commit ef89eefaa86f315feba6c44f2059582a077a78ed Author: Mark Johnston AuthorDate: 2024-10-04 14:53:42 +0000 Commit: Mark Johnston CommitDate: 2024-11-05 00:56:50 +0000 makefs: Remove the warning printed when makefs -t zfs is used We haven't seen bug reports relating to this feature for a while, so stop printing a warning. Reviewed by: cperciva MFC after: 2 weeks (cherry picked from commit d9fe71828797508d1d28655e40780a5ae9078e66) --- usr.sbin/makefs/tests/makefs_zfs_tests.sh | 2 +- usr.sbin/makefs/zfs.c | 8 +------- usr.sbin/makefs/zfs/zfs.h | 2 +- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/usr.sbin/makefs/tests/makefs_zfs_tests.sh b/usr.sbin/makefs/tests/makefs_zfs_tests.sh index 9196232ed3b3..aeda889d9a5c 100644 --- a/usr.sbin/makefs/tests/makefs_zfs_tests.sh +++ b/usr.sbin/makefs/tests/makefs_zfs_tests.sh @@ -28,7 +28,7 @@ # SUCH DAMAGE. # -MAKEFS="makefs -t zfs -o verify-txgs=true -o nowarn=true" +MAKEFS="makefs -t zfs -o verify-txgs=true" ZFS_POOL_NAME="makefstest$$" TEST_ZFS_POOL_NAME="$TMPDIR/poolname" diff --git a/usr.sbin/makefs/zfs.c b/usr.sbin/makefs/zfs.c index 43469c2358be..66e7f8dafc9c 100644 --- a/usr.sbin/makefs/zfs.c +++ b/usr.sbin/makefs/zfs.c @@ -94,7 +94,7 @@ zfs_prep_opts(fsinfo_t *fsopts) { '\0', "verify-txgs", &zfs->verify_txgs, OPT_BOOL, 0, 0, "Make OpenZFS verify data upon import" }, { '\0', "nowarn", &zfs->nowarn, OPT_BOOL, - 0, 0, "Suppress warning about experimental ZFS support" }, + 0, 0, "Provided for backwards compatibility, ignored" }, { .name = NULL } }; @@ -792,12 +792,6 @@ zfs_makefs(const char *image, const char *dir, fsnode *root, fsinfo_t *fsopts) zfs_check_opts(fsopts); - if (!zfs->nowarn) { - fprintf(stderr, - "ZFS support is currently considered experimental. " - "Do not use it for anything critical.\n"); - } - dirfd = open(dir, O_DIRECTORY | O_RDONLY); if (dirfd < 0) err(1, "open(%s)", dir); diff --git a/usr.sbin/makefs/zfs/zfs.h b/usr.sbin/makefs/zfs/zfs.h index 924fad83f63e..33694e2bdbee 100644 --- a/usr.sbin/makefs/zfs/zfs.h +++ b/usr.sbin/makefs/zfs/zfs.h @@ -74,7 +74,7 @@ typedef struct { */ char filebuf[MAXBLOCKSIZE] __aligned(alignof(uint64_t)); - bool nowarn; + bool nowarn; /* ignored */ /* Pool parameters. */ const char *poolname; From nobody Tue Nov 5 14:29:58 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XjW2H2d0dz5c9ks; Tue, 05 Nov 2024 14:29: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XjW2H0R0Bz54wL; Tue, 5 Nov 2024 14:29:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730816999; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qRWhSu5/t+piYY0XRgoBQeZTrMwuXAn6jmEItHBQ/yQ=; b=yJpcCDcuOItWYJbRI9DQfTjhTEWKkAYsjomp+nnmHcxzFuMwhi4RJpwmBXxPyzSkVHa2+d nql+E8Vxf8cFW0IVksQ94asC2ecwnR0P1qzgG0FupQ+gAZsJQQgBG310GrEHresVLVLJ8P suF0yTmTGQTy7/lG+OtuQ7XRorEWf1GMN3kdcMDR8OFu+VbR1l4M9a25BSEoGxSy2qTs+H BYWbS2TwCqluCYjA3tQglufZfrDKBTXdbl6Hxj8IAuYTyU0GfLvpPaHiQg+F06zmycnFrS bQD32d3n1c8yf/nyC1Ea3GhAbSCGnjIxW+ez3754bST2p/meKZ8NWncMN+msNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730816999; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qRWhSu5/t+piYY0XRgoBQeZTrMwuXAn6jmEItHBQ/yQ=; b=iCVPdTsv7sJmRxt5XjdLDEu9V5w6nypl80fB+5GjyFoRLAk+RCkFkEpi9zl01mVXhSklx8 vBbdMLOQdIzJrY7f9VDkia7bG9fOSuMJO50t0LjMK4/NwtB/k5FiKW9y2YH5Ghn0q6M3qK ljdJqshmheQSNvW9SQweB/X5Vi7js2iukVTXy8c61dInrBiibkTXA/Q73HxCF+uYK0vpJ7 KX03UOzaQv/ap8XcsEHjlpHSNZcbfphrK0pY1ooCaM9poOZZ8QxWJI4MjJ4vXapk+PgAJy sEQUG10nfAiF4Bfu4kskCCoaUp/Zq2EC42EVdtqqyaxoYjIwmpZwyL9d84o4Cg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730816999; a=rsa-sha256; cv=none; b=HKkA+Rm/Wptqb4kJaTlINb04+/6pZ9ulBsW2V/3k94e2VFpQZ3petetyP/iAAuLmvPXHUs Bxtr8NJcbeBYaEOhHThJJS0RLN4GcoHY812ZT/JmHNtRkqFP8douEzr491cnsAOOVDS6Y1 3maKucaKk553YuuTwMBh0Km3D0rm28gv/mUC9X9Dqsi+9zrFnd8qnNbccz3QLPM1bzcGoJ SkQvfLCmgbymYfS23kPXwqlwD7OC+QzB+vvo2B/2R49iZeJ126FXpA4g+ZYFBz7favo0q5 UGsHPFDvS+PN8gvydnfYoTPvgaSPMiqZT9z4Cg4pTZFko5urYFY55f15vp46Rg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XjW2G6wBQzKws; Tue, 5 Nov 2024 14:29:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A5ETwmt081053; Tue, 5 Nov 2024 14:29:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A5ETwMK081050; Tue, 5 Nov 2024 14:29:58 GMT (envelope-from git) Date: Tue, 5 Nov 2024 14:29:58 GMT Message-Id: <202411051429.4A5ETwMK081050@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: b698c825f3b6 - stable/14 - rpc: Fix the definition of xdr_void() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b698c825f3b6699b278122da776bdfe5f360619f Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=b698c825f3b6699b278122da776bdfe5f360619f commit b698c825f3b6699b278122da776bdfe5f360619f Author: Mark Johnston AuthorDate: 2024-10-30 19:27:18 +0000 Commit: Mark Johnston CommitDate: 2024-11-05 01:05:26 +0000 rpc: Fix the definition of xdr_void() xdr_void() should have type xdrproc_t, make it so. PR: 280514 Reviewed by: brooks, dim MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D47340 (cherry picked from commit a5d1cf5e362a2e3c3ebdf6d8f2b86658a6d0b9d6) --- include/rpc/xdr.h | 2 +- lib/libc/xdr/xdr.c | 4 +--- sys/rpc/xdr.h | 2 +- sys/xdr/xdr.c | 3 +-- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/include/rpc/xdr.h b/include/rpc/xdr.h index 624a3c294650..58a26760cb77 100644 --- a/include/rpc/xdr.h +++ b/include/rpc/xdr.h @@ -281,7 +281,7 @@ struct xdr_discrim { * These are the "generic" xdr routines. */ __BEGIN_DECLS -extern bool_t xdr_void(void); +extern bool_t xdr_void(XDR *, void *); extern bool_t xdr_int(XDR *, int *); extern bool_t xdr_u_int(XDR *, u_int *); extern bool_t xdr_long(XDR *, long *); diff --git a/lib/libc/xdr/xdr.c b/lib/libc/xdr/xdr.c index 15f80502ea39..bc5e8c542498 100644 --- a/lib/libc/xdr/xdr.c +++ b/lib/libc/xdr/xdr.c @@ -88,13 +88,11 @@ xdr_free(xdrproc_t proc, void *objp) * XDR nothing */ bool_t -xdr_void(void) +xdr_void(XDR *xdrs __unused, void *ptr __unused) { - return (TRUE); } - /* * XDR integers */ diff --git a/sys/rpc/xdr.h b/sys/rpc/xdr.h index cd57b4069342..ac9130f65e36 100644 --- a/sys/rpc/xdr.h +++ b/sys/rpc/xdr.h @@ -288,7 +288,7 @@ struct xdr_discrim { * These are the "generic" xdr routines. */ __BEGIN_DECLS -extern bool_t xdr_void(void); +extern bool_t xdr_void(XDR *, void *); extern bool_t xdr_int(XDR *, int *); extern bool_t xdr_u_int(XDR *, u_int *); extern bool_t xdr_long(XDR *, long *); diff --git a/sys/xdr/xdr.c b/sys/xdr/xdr.c index af0d28bd65b7..605efd52e3a2 100644 --- a/sys/xdr/xdr.c +++ b/sys/xdr/xdr.c @@ -88,9 +88,8 @@ xdr_free(xdrproc_t proc, void *objp) * XDR nothing */ bool_t -xdr_void(void) +xdr_void(XDR *xrds __unused, void *ptr __unused) { - return (TRUE); } From nobody Tue Nov 5 14:30:11 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XjW2W4tcHz5c9s9; Tue, 05 Nov 2024 14:30: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XjW2W3z9vz55MG; Tue, 5 Nov 2024 14:30:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730817011; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KQXwnbe0A/gWd61RACcrwytvklJpfErIuDgujZK8qLA=; b=pywLGz4PneEZJEGUDNTukVwCnLQObMfcFH1IpGCIQJcIMImaWsDaqaZCO4eoXe8RrmYg4y Gtthvn90EhmJNpFR6EXlPk097MdbQWVEBjcNctrcg1mrffS6wcqNga79e2AkYU+1Pk2Hz8 hF4ZIR/hMRTrfI67TCzw9JKsV8fX9fPfhQE47SwCDTbTj4q2XjKnYgIlfiXTyL4WESX2Yh QuG83AH0+xWBRj1XZr8oBBgnofbFVyjfW40by2U7PNWsi5ej3j0PBUiMMmNkVG8O1K99pz 47cnrFTHAgtFXfNToYvInGC3jBYEuN5w4FM9aHSufWLrGmzaKO+1lxZzWmzSwg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730817011; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KQXwnbe0A/gWd61RACcrwytvklJpfErIuDgujZK8qLA=; b=isvUtniHrhqkMRTSfpZux6a1xRjkinyp6cXaj/OTWRxkZhDW6f1dvUdAuiM9+er7WVZMTT OLaDcFWtTXR7xJEN72rnSwd1/RoWgxLv0jGdKvknwtMN9JyUKPzgYvgFgzzpTordKRGmqO SDzF5SfU4cvNCXP9s8u9Vt0wDP3rHTDj8IHJVUave/LYdmpxWoeiU2Y4hBXfHtEEAHA00V 06WL9nPO9m9pjaM2V2MpHQVz/eae9uL4X4RPQOnaaxOYGhx5iWjRdvOrh7owHtxe54guAg GeVFQXoaLxFy90B6e/YKUZbwVJTLNCKb6e5cza1i9guL9pL2Aifs+GyuluR8eQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730817011; a=rsa-sha256; cv=none; b=lyhJB3P8tHth8A2PNBYvsLQ5eyDn5/Po4/lTcXoS5hF6JOseKDH+m/CuMdf0uh2Gi2mKt4 C2SAv5ykf2r+BWfbh7Sk0xPMgzQoq4y1KEj8XRAicGmqL5dhSLhzJyn+6jSTWweTKZKk1X zcQlm05RNrd/PsN2MLtnk28zzCzqUm3x/zvCFWP8fcXqqKoIn4AUxNmaGMTlmqZviMCwZO C2sR7pMTlNuJiNth401pkx9dSSIPA3ZwhRfrb99Qqi6+YtHpMrQA6QY6nM2IiWG6kvdRiV P8E6dRNADQlNxm9q7RlyRuJnQWoiweTUyx+TJ2dneewrX3nIemBZYJKNrTDzqg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XjW2W3WbHzLMJ; Tue, 5 Nov 2024 14:30:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A5EUBcn086245; Tue, 5 Nov 2024 14:30:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A5EUBq5086237; Tue, 5 Nov 2024 14:30:11 GMT (envelope-from git) Date: Tue, 5 Nov 2024 14:30:11 GMT Message-Id: <202411051430.4A5EUBq5086237@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: b59d57894580 - stable/13 - rpc: Fix the definition of xdr_void() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b59d578945807e487a2ed20ff6387f40c89db47d Auto-Submitted: auto-generated The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=b59d578945807e487a2ed20ff6387f40c89db47d commit b59d578945807e487a2ed20ff6387f40c89db47d Author: Mark Johnston AuthorDate: 2024-10-30 19:27:18 +0000 Commit: Mark Johnston CommitDate: 2024-11-05 01:05:31 +0000 rpc: Fix the definition of xdr_void() xdr_void() should have type xdrproc_t, make it so. PR: 280514 Reviewed by: brooks, dim MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D47340 (cherry picked from commit a5d1cf5e362a2e3c3ebdf6d8f2b86658a6d0b9d6) --- include/rpc/xdr.h | 2 +- lib/libc/xdr/xdr.c | 4 +--- sys/rpc/xdr.h | 2 +- sys/xdr/xdr.c | 3 +-- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/include/rpc/xdr.h b/include/rpc/xdr.h index 624a3c294650..58a26760cb77 100644 --- a/include/rpc/xdr.h +++ b/include/rpc/xdr.h @@ -281,7 +281,7 @@ struct xdr_discrim { * These are the "generic" xdr routines. */ __BEGIN_DECLS -extern bool_t xdr_void(void); +extern bool_t xdr_void(XDR *, void *); extern bool_t xdr_int(XDR *, int *); extern bool_t xdr_u_int(XDR *, u_int *); extern bool_t xdr_long(XDR *, long *); diff --git a/lib/libc/xdr/xdr.c b/lib/libc/xdr/xdr.c index 6d44a012443b..3dfe15f28b88 100644 --- a/lib/libc/xdr/xdr.c +++ b/lib/libc/xdr/xdr.c @@ -89,13 +89,11 @@ xdr_free(xdrproc_t proc, void *objp) * XDR nothing */ bool_t -xdr_void(void) +xdr_void(XDR *xdrs __unused, void *ptr __unused) { - return (TRUE); } - /* * XDR integers */ diff --git a/sys/rpc/xdr.h b/sys/rpc/xdr.h index cd57b4069342..ac9130f65e36 100644 --- a/sys/rpc/xdr.h +++ b/sys/rpc/xdr.h @@ -288,7 +288,7 @@ struct xdr_discrim { * These are the "generic" xdr routines. */ __BEGIN_DECLS -extern bool_t xdr_void(void); +extern bool_t xdr_void(XDR *, void *); extern bool_t xdr_int(XDR *, int *); extern bool_t xdr_u_int(XDR *, u_int *); extern bool_t xdr_long(XDR *, long *); diff --git a/sys/xdr/xdr.c b/sys/xdr/xdr.c index af0d28bd65b7..605efd52e3a2 100644 --- a/sys/xdr/xdr.c +++ b/sys/xdr/xdr.c @@ -88,9 +88,8 @@ xdr_free(xdrproc_t proc, void *objp) * XDR nothing */ bool_t -xdr_void(void) +xdr_void(XDR *xrds __unused, void *ptr __unused) { - return (TRUE); } From nobody Tue Nov 5 16:19:32 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XjYSj1w09z5cH0l; Tue, 05 Nov 2024 16:19: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XjYSj1J1Tz41n4; Tue, 5 Nov 2024 16:19:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730823573; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gn1YpFfB5uPK8jmc6ScBPVqdTXp+XqhwKirdwxmtWEA=; b=msM2/2BOat/cUGMI9kkEIn7BHVtdZD95wDV6LccKjgy7QGMXftoK4PUpKyZCPn5+6zZ8tW LkZCYCq1UJ2iuHeE4zt7s68cBDrRuMEQYymkLGVv4CK13+57TO9uwCzYBsCoRCBKHr+I/9 rj86qYY0+xS5fgdIm9sNpttUBKiI3Dp8dULL/v6m3GGwn7fKYiGfyO2l0/4xtg6u19EkQP NbqfmzmYD51RULrgdxmqyJ9C37d+nTMKzb8X9++kKg0eDGQVBR0p4g9kjCq6pP08NG2OGa m8NuORms0pSgMDz2nWUtPlskJIJ+OODDtUpLGUbHTnTpsfINesheLfJlT6T+6w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730823573; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gn1YpFfB5uPK8jmc6ScBPVqdTXp+XqhwKirdwxmtWEA=; b=uvn5MCSjjGGR5cGl3o+HTwmEBbO5+2NfdfWYxmyo4JzPvRnQuGPOv+ZEQAOZ/kDT5D/dVG jTBHe3ysI0jqwUxCtF5sOlyyG5c1PdHrFyVc3unwDJVKZFZTZ9E8eYjWUnUkVNkCWWbD7H NyPFVnIUFdgJ/lgMxkxP5CjUo1KuKosznypSKA8xifNlNywSOXkHC5cPSBa8Ul9+8RgGoU rCaLKWCSNcaK+UTSgx6HpoDnGlm6Dm1zqlJ/okE73ALIbMq7v5mngv2KqLtaOzdyxy0+YK Qfv84spwh23A+N4AMRAAgANu6VtYHgWMUnZAz+DIMvhn82Mm+hE4UJ07v/hdDQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730823573; a=rsa-sha256; cv=none; b=KVhQr2A95JHn1wJZsfNvsFqltzdWb6QXQUU7SYDbJkg0s9xtody/n3PifF+xmciHlHB5pF /fAp2rXGASW599YZY1pWwYcSfdPv2RQMzEzaFQDEZrPeWfV94i8K6KaI2PeB+iSTz6LDjv Mph/jPWkYd81D+v+0YyYXk0Ygmf+mrZdJ65tRQ5tOOkbxnVkH708jKx00JrbJi2YD0TsgH I1wSmOB3oTTEF6EuFkeuY5KuxqpSKZrp1RmvMo+vrIU6BzS/JMVsBveBvvnVfgcFaktqhn f20jnTxAzHMPdKSlwqV213bl9tmIqsJPXpsNDYMn/fTO+1fbN9QxY9cZ/LMzgg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XjYSj0nHtzNmV; Tue, 5 Nov 2024 16:19:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A5GJW6W084493; Tue, 5 Nov 2024 16:19:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A5GJWi1084490; Tue, 5 Nov 2024 16:19:32 GMT (envelope-from git) Date: Tue, 5 Nov 2024 16:19:32 GMT Message-Id: <202411051619.4A5GJWi1084490@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: a231e2990776 - releng/14.2 - rpc: Fix the definition of xdr_void() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.2 X-Git-Reftype: branch X-Git-Commit: a231e2990776a28f8c3b01b946e7774b3f6bb39b Auto-Submitted: auto-generated The branch releng/14.2 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=a231e2990776a28f8c3b01b946e7774b3f6bb39b commit a231e2990776a28f8c3b01b946e7774b3f6bb39b Author: Mark Johnston AuthorDate: 2024-10-30 19:27:18 +0000 Commit: Mark Johnston CommitDate: 2024-11-05 16:17:03 +0000 rpc: Fix the definition of xdr_void() xdr_void() should have type xdrproc_t, make it so. Approved by: re (kib) PR: 280514 Reviewed by: brooks, dim MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D47340 (cherry picked from commit a5d1cf5e362a2e3c3ebdf6d8f2b86658a6d0b9d6) (cherry picked from commit b698c825f3b6699b278122da776bdfe5f360619f) --- include/rpc/xdr.h | 2 +- lib/libc/xdr/xdr.c | 4 +--- sys/rpc/xdr.h | 2 +- sys/xdr/xdr.c | 3 +-- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/include/rpc/xdr.h b/include/rpc/xdr.h index 624a3c294650..58a26760cb77 100644 --- a/include/rpc/xdr.h +++ b/include/rpc/xdr.h @@ -281,7 +281,7 @@ struct xdr_discrim { * These are the "generic" xdr routines. */ __BEGIN_DECLS -extern bool_t xdr_void(void); +extern bool_t xdr_void(XDR *, void *); extern bool_t xdr_int(XDR *, int *); extern bool_t xdr_u_int(XDR *, u_int *); extern bool_t xdr_long(XDR *, long *); diff --git a/lib/libc/xdr/xdr.c b/lib/libc/xdr/xdr.c index 15f80502ea39..bc5e8c542498 100644 --- a/lib/libc/xdr/xdr.c +++ b/lib/libc/xdr/xdr.c @@ -88,13 +88,11 @@ xdr_free(xdrproc_t proc, void *objp) * XDR nothing */ bool_t -xdr_void(void) +xdr_void(XDR *xdrs __unused, void *ptr __unused) { - return (TRUE); } - /* * XDR integers */ diff --git a/sys/rpc/xdr.h b/sys/rpc/xdr.h index cd57b4069342..ac9130f65e36 100644 --- a/sys/rpc/xdr.h +++ b/sys/rpc/xdr.h @@ -288,7 +288,7 @@ struct xdr_discrim { * These are the "generic" xdr routines. */ __BEGIN_DECLS -extern bool_t xdr_void(void); +extern bool_t xdr_void(XDR *, void *); extern bool_t xdr_int(XDR *, int *); extern bool_t xdr_u_int(XDR *, u_int *); extern bool_t xdr_long(XDR *, long *); diff --git a/sys/xdr/xdr.c b/sys/xdr/xdr.c index af0d28bd65b7..605efd52e3a2 100644 --- a/sys/xdr/xdr.c +++ b/sys/xdr/xdr.c @@ -88,9 +88,8 @@ xdr_free(xdrproc_t proc, void *objp) * XDR nothing */ bool_t -xdr_void(void) +xdr_void(XDR *xrds __unused, void *ptr __unused) { - return (TRUE); } From nobody Tue Nov 5 16:19:34 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XjYSk357Zz5cHDN; Tue, 05 Nov 2024 16:19:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XjYSk2G3pz41hk; Tue, 5 Nov 2024 16:19:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730823574; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sA6nupOUeiGXHKXm9NU1UvCloT+vhNXnI7U+57RYMtw=; b=axXlEnqIhDRP364OX1RTJfmFcHdmxM3Z5eDKvdCwcV6I3/99sxgI7H3SFpLGU1RkQV8SpY HLzc5Cmnt11ytEu1IsNXjSVA/eWVeQ5pKvPXOwASLI9wJQBiXzg1Qb+zPrdq1C0r4IcdiE gIgnyfoFz0RtoD62bmnkVakaEoGJeHYfwKD01+pIloVUre149ifcopNUTVNdxtPqU35A3J klnwiQgG7i8USwswB0oxgZDrI92t8vgLtu1IRqbdRmBRMyMcJnuFbcDHIkQ9gG4bxbhDxk ndPGscUzjeQD278mund8WejOwvvjMg+RDpOFD/m8+BKJA4GhGqyIGBCdANv/JQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730823574; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sA6nupOUeiGXHKXm9NU1UvCloT+vhNXnI7U+57RYMtw=; b=L0fiI3Xgj5017qDGWyzNtgf6IRXIH1xemdS3FAkv/96mFNYeH5kZnHtq3RpKnz5Fv4KveR OOT2KtL48X558zx0lJ4b89JUTrabP/9iQ9n0QRLMYQo5WP/tXbN2T+DAlw3wJbqf68sNks rIrkJyjzVfasTzdP5iBDPUNw1WEqR5yzockDlZVnuSNL62+0bYzh/sdjQHbUJtuolG51M2 DQPEiSym/aiivZwHq2Us0bg8y2kqqx3sA2fjhB9dlynwnHeJW89w7jxFF8K0ZLf7OqGyyC cmnaGYUV3Ea/fJ9X283Ib/D+v8PvQqEODi1PC9GUGQMtEs3oWC/qC0Kvm6BSHg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730823574; a=rsa-sha256; cv=none; b=Ijsu6YsxIAUSyeBA6Y90nK4svy5EhefT4VELkF0LDzuxvH6boNNoKLUONOr/cFxbG0/T3e Aq02NDlGqcWROJ50B9Kb58+IN6g5mkAIGfWB2LJWGlOEwBqahuKmRoC+XIWM5markHsii1 Q1O38cfbUkmYV3UtAAdRUgZt9TInro3mU/fs/Kh5wg/3e28kUa/S8/ebl4ifWD4RaPUIMa +QFzA2Cyu8jc2f6fqEL0yXNwMJ927uJSaU1YXYTWY+rsv6a9utsxSMxanzUULW4EvcdAfy lwETOHE3VSaqCZ5P3vgAXYb6q4ekHASupZ0AsPywzejnxWptxyjk8wq2uYG2xg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XjYSk1YdJzP2G; Tue, 5 Nov 2024 16:19:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A5GJYNB084553; Tue, 5 Nov 2024 16:19:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A5GJYOG084550; Tue, 5 Nov 2024 16:19:34 GMT (envelope-from git) Date: Tue, 5 Nov 2024 16:19:34 GMT Message-Id: <202411051619.4A5GJYOG084550@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: f675d2bb3455 - releng/14.2 - makefs: Remove the warning printed when makefs -t zfs is used List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.2 X-Git-Reftype: branch X-Git-Commit: f675d2bb3455f174f1caaceb4130abc6a677aa82 Auto-Submitted: auto-generated The branch releng/14.2 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=f675d2bb3455f174f1caaceb4130abc6a677aa82 commit f675d2bb3455f174f1caaceb4130abc6a677aa82 Author: Mark Johnston AuthorDate: 2024-10-04 14:53:42 +0000 Commit: Mark Johnston CommitDate: 2024-11-05 16:19:13 +0000 makefs: Remove the warning printed when makefs -t zfs is used We haven't seen bug reports relating to this feature for a while, so stop printing a warning. Approved by: re (kib) Reviewed by: cperciva MFC after: 2 weeks (cherry picked from commit d9fe71828797508d1d28655e40780a5ae9078e66) (cherry picked from commit ef89eefaa86f315feba6c44f2059582a077a78ed) --- usr.sbin/makefs/tests/makefs_zfs_tests.sh | 2 +- usr.sbin/makefs/zfs.c | 8 +------- usr.sbin/makefs/zfs/zfs.h | 2 +- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/usr.sbin/makefs/tests/makefs_zfs_tests.sh b/usr.sbin/makefs/tests/makefs_zfs_tests.sh index 9196232ed3b3..aeda889d9a5c 100644 --- a/usr.sbin/makefs/tests/makefs_zfs_tests.sh +++ b/usr.sbin/makefs/tests/makefs_zfs_tests.sh @@ -28,7 +28,7 @@ # SUCH DAMAGE. # -MAKEFS="makefs -t zfs -o verify-txgs=true -o nowarn=true" +MAKEFS="makefs -t zfs -o verify-txgs=true" ZFS_POOL_NAME="makefstest$$" TEST_ZFS_POOL_NAME="$TMPDIR/poolname" diff --git a/usr.sbin/makefs/zfs.c b/usr.sbin/makefs/zfs.c index 43469c2358be..66e7f8dafc9c 100644 --- a/usr.sbin/makefs/zfs.c +++ b/usr.sbin/makefs/zfs.c @@ -94,7 +94,7 @@ zfs_prep_opts(fsinfo_t *fsopts) { '\0', "verify-txgs", &zfs->verify_txgs, OPT_BOOL, 0, 0, "Make OpenZFS verify data upon import" }, { '\0', "nowarn", &zfs->nowarn, OPT_BOOL, - 0, 0, "Suppress warning about experimental ZFS support" }, + 0, 0, "Provided for backwards compatibility, ignored" }, { .name = NULL } }; @@ -792,12 +792,6 @@ zfs_makefs(const char *image, const char *dir, fsnode *root, fsinfo_t *fsopts) zfs_check_opts(fsopts); - if (!zfs->nowarn) { - fprintf(stderr, - "ZFS support is currently considered experimental. " - "Do not use it for anything critical.\n"); - } - dirfd = open(dir, O_DIRECTORY | O_RDONLY); if (dirfd < 0) err(1, "open(%s)", dir); diff --git a/usr.sbin/makefs/zfs/zfs.h b/usr.sbin/makefs/zfs/zfs.h index 924fad83f63e..33694e2bdbee 100644 --- a/usr.sbin/makefs/zfs/zfs.h +++ b/usr.sbin/makefs/zfs/zfs.h @@ -74,7 +74,7 @@ typedef struct { */ char filebuf[MAXBLOCKSIZE] __aligned(alignof(uint64_t)); - bool nowarn; + bool nowarn; /* ignored */ /* Pool parameters. */ const char *poolname; From nobody Tue Nov 5 21:45:32 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Xjhhr1Tm3z5bfHw; Tue, 05 Nov 2024 21:45: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xjhhr11KVz4fT1; Tue, 5 Nov 2024 21:45:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730843132; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZGLEOX/jzXA8bWl3BXPIln0U0ZUCZkveZcejEC4x4Eo=; b=WpLmWYmm5Qk7x78NoiP8x1GDXuzAlz4izAmsddd3R1iIjJ9tmeHMNeOuzCkBL14mhz2Vy2 WSYJE2Hdd0kFfQsMxP3FojSxqQ8ygyVdZOKuKXxRtFPq1bTjBnab4+1EUIalNjr7duHqaT /I/3axmGffPpbH+iyvkIkJHvQj3Kr99QPjEeKclOGnIz8/C15Xf57DxLB2fqmYPyrDkhmJ e8Hnb+oHYAsoCkgt7meWonzP4Cvq3DtLcPAGRSPmO5TBK/F0HW4CXT0okENAL47QTa89Fi VZPJx3bTkoCVt8VJ5GgUOmeCSYFuhKpelc5pa1QWArha9M/LHOjkYPAg2pE05g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730843132; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZGLEOX/jzXA8bWl3BXPIln0U0ZUCZkveZcejEC4x4Eo=; b=d0Ym24m6Msz8OrKofTZLWldnjB2JDVzXv5IGR67PaB/wciDn8agDSjdOgHbGC+R3jhELNm Qkx0xkEdTMM5bKHyQRx5Yb84jwzQW7Z4fYtnspD6yFYKEL3Uh+R2Dvewgd4UzGn3YPAkDX ZT4qnR6lXcVc2yl+QjDYNdqu5b/fdHPdv3MAorE+H33ncAk20ArlugjEC2kFIZC65OtStK 2TISTZnnjcrSd6mpafZEAP5iCB918RX7PFFUXlzWUtj1InCI3igLLsb3bSU7QTWKQybbOG wqP5qQVW5O48kepQa13bhro9sgPNesTK8XgVjO3Ntz0OPsa1US3LBSSvutBXDQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730843132; a=rsa-sha256; cv=none; b=JAJDgLraH+Yjn/2AvYmTvOsq9ay2ruz9h127cBI5LIcK2jg0U0XdZuGL1jQwvVbkQR7ert pf+PaNosvGH/6N/fgMeXI1WcNpSQ320yTzy5rS5+s57XLCEWNFNHakhcPzZGSd78fDQZgV p0qIMBqkke7SR5ttyE3mRu6jnJf4OrcYSavQkxctdP6D3WgiSLyB7CdM7VOoj1upGwb4Re 4xLcfDs8vtRtvgsE1r+LDM1EaK/ke9+V64+ZFo4bqkDiL+cRtFgo3kSfV0FnbQjMul98Wi OG/qla/CPsrH+qmL55V6sJy57akyBVplofJRzVVtKxlLjzKO5/WTr4m7/ujNAA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Xjhhr0cVBzZK0; Tue, 5 Nov 2024 21:45:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A5LjWwN095393; Tue, 5 Nov 2024 21:45:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A5LjWp3095390; Tue, 5 Nov 2024 21:45:32 GMT (envelope-from git) Date: Tue, 5 Nov 2024 21:45:32 GMT Message-Id: <202411052145.4A5LjWp3095390@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 3dace161c237 - stable/14 - sound: Retire pcm_veto_load List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 3dace161c237069d954bda743e6c734df27ef274 Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=3dace161c237069d954bda743e6c734df27ef274 commit 3dace161c237069d954bda743e6c734df27ef274 Author: Christos Margiolis AuthorDate: 2024-11-03 19:02:17 +0000 Commit: Christos Margiolis CommitDate: 2024-11-05 21:44:41 +0000 sound: Retire pcm_veto_load pcm_veto_load is used to prevent pcm_register() from running if the root feeder has not been registered yet. However, feeder_register_root() is a SYSINIT. Sponsored by: The FreeBSD Foundation MFC after: 2 days Reviewed by: dev_submerge.ch, markj, emaste Differential Revision: https://reviews.freebsd.org/D47280 (cherry picked from commit 98cd27c8e13418fa517a02844641f390f9389987) --- sys/dev/sound/pcm/feeder.c | 7 ++++--- sys/dev/sound/pcm/sound.c | 8 -------- sys/dev/sound/pcm/sound.h | 1 - 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/sys/dev/sound/pcm/feeder.c b/sys/dev/sound/pcm/feeder.c index 2b9599859102..6a6d8c80a34a 100644 --- a/sys/dev/sound/pcm/feeder.c +++ b/sys/dev/sound/pcm/feeder.c @@ -68,9 +68,6 @@ feeder_register_root(void *p) fte->idx = feedercnt; SLIST_INSERT_HEAD(&feedertab, fte, link); feedercnt++; - - /* we've got our root feeder so don't veto pcm loading anymore */ - pcm_veto_load = 0; } void @@ -465,6 +462,10 @@ static struct feeder_class feeder_root_class = { .desc = NULL, .data = NULL, }; +/* + * Register the root feeder first so that pcm_addchan() and subsequent + * functions can use it. + */ SYSINIT(feeder_root, SI_SUB_DRIVERS, SI_ORDER_FIRST, feeder_register_root, &feeder_root_class); SYSUNINIT(feeder_root, SI_SUB_DRIVERS, SI_ORDER_FIRST, feeder_unregisterall, NULL); diff --git a/sys/dev/sound/pcm/sound.c b/sys/dev/sound/pcm/sound.c index e25cb359f793..948cbd0b8fb9 100644 --- a/sys/dev/sound/pcm/sound.c +++ b/sys/dev/sound/pcm/sound.c @@ -48,8 +48,6 @@ devclass_t pcm_devclass; -int pcm_veto_load = 1; - int snd_unit = -1; static int snd_unit_auto = -1; @@ -462,12 +460,6 @@ pcm_register(device_t dev, void *devinfo, int numplay, int numrec) struct snddev_info *d; int i; - if (pcm_veto_load) { - device_printf(dev, "disabled due to an error while initialising: %d\n", pcm_veto_load); - - return EINVAL; - } - d = device_get_softc(dev); d->dev = dev; d->lock = snd_mtxcreate(device_get_nameunit(dev), "sound cdev"); diff --git a/sys/dev/sound/pcm/sound.h b/sys/dev/sound/pcm/sound.h index 126b3411b035..c5013e76034a 100644 --- a/sys/dev/sound/pcm/sound.h +++ b/sys/dev/sound/pcm/sound.h @@ -229,7 +229,6 @@ enum { #define DSP_DEFAULT_SPEED 8000 -extern int pcm_veto_load; extern int snd_unit; extern int snd_verbose; extern devclass_t pcm_devclass; From nobody Tue Nov 5 21:45:33 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Xjhhs2v4bz5bdsj; Tue, 05 Nov 2024 21:45: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xjhhs24T3z4fT2; Tue, 5 Nov 2024 21:45:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730843133; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yX+ZOnfbpD0wEZuHH6Z/EWFRNdsghsTg+gRSWAS4eWw=; b=HDCU5R3iNXbVB0SwxjmFFPte6CYCPCbXLPfT1U0Y70300KJUrt4cGXrNlkg+lyE88gktZv xFEJqzTM3jSOIjnX+K3EERlQPkbkLidDbzN7z9h2s4rkPEbmcjoY4fZhM2nO2uZ0ntA6Vr 7KrlL8c2eaa7hKMWVwcYIIfGo62Ghf+CTe+x9UAS4H13p+OovAeTDw6enlbxggjK7CeinB iNitYngw0xxNsHkZPJa/O/4uUrATpmhi39DS8sZww8QGX9y2wxNG0oF+gFK6nKtLvGbjpA OYXMiw9+uk9Lut/LgsRapqcByk11/M9EVdZfymnN5j3pAH1Ij/HTkITb3RQc/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730843133; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yX+ZOnfbpD0wEZuHH6Z/EWFRNdsghsTg+gRSWAS4eWw=; b=ETMxui80tn9cB1Jz4niFnMeaUR3/aANrnw1uzapvjcteKqGNuap+ndZrp7UEtXaN/ESNoA NN2FG5p4j827egorTQ2qRUDkDAVvxTw1AqKlfchA7aXe0k56H549XziwAjNwYU7AMSYEDT FE1jX05udhy4qKsGND3ckz9mfbV64tmba52dgDimCUasS3lMEbT/8YmL9SO4SIYRS0leyH pDwpciDneJPSbwxoX1ms4A9qntJmVnZ5I90Y2eUH9L77feAsGADYyDHTgna8ymcTtnkAZA o4Rbxn5/jUfjjbaEVKg+oYbCk2Tpt5JXKlUmCxeZaO1lcA9dIuejXJtE8QXOdw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730843133; a=rsa-sha256; cv=none; b=ePwF/yBlj6NvJZcp1KofM2ARf7xGNJr1Hpkb4MwS+8kkXMilgUnNLtq/b8kzqsX3DdPHzo cqbSpt6KCev9hK7IciWGQpeW7yJckErqqZsmRsiK3zDsxelslrvr75oBvTNwRw/Btodo8R NgG2ijlaGTcvAYZ4zlSAOhU+x8nOJgyd7glzOXS32zJgw/mCIbfY1Ra/Ojo+Gihqce6uOt mMMIU3TeIGvlY6Bkxfd4KqC6gNCbDr5ucQPikIhv8N7JeGjPi8n+aPXQ0j+xplTfg6ouZj dt1XrSItG18zRQLKVwR+90+OW/lwSl04tOi2qSAb99cWTnkU+nwnZJ2UU35mbw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Xjhhs1ghczZf0; Tue, 5 Nov 2024 21:45:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A5LjXdJ095453; Tue, 5 Nov 2024 21:45:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A5LjX3K095450; Tue, 5 Nov 2024 21:45:33 GMT (envelope-from git) Date: Tue, 5 Nov 2024 21:45:33 GMT Message-Id: <202411052145.4A5LjX3K095450@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 00c066cd575d - stable/14 - sound: Move sysctl and /dev/dspX creation to pcm_setstatus() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 00c066cd575dedf34a1aa76ed29489604f4a9c9d Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=00c066cd575dedf34a1aa76ed29489604f4a9c9d commit 00c066cd575dedf34a1aa76ed29489604f4a9c9d Author: Christos Margiolis AuthorDate: 2024-11-03 19:02:31 +0000 Commit: Christos Margiolis CommitDate: 2024-11-05 21:44:41 +0000 sound: Move sysctl and /dev/dspX creation to pcm_setstatus() Create the sysctl and /dev/dsp* nodes in pcm_setstatus(), which is responsible for finalizing the device initialization, instead of doing this in the middle of the initialization. For the sysctl creation specifically, move them into pcm_sysinit(), since this is where we create the rest of the sysctl nodes anyway. A side effect of this change is, that we avoid the possibility of racing in between pcm_register() and pcm_setstatus() by accessing /dev/dspX or the sysctls within that window. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: dev_submerge.ch, markj Differential Revision: https://reviews.freebsd.org/D47322 (cherry picked from commit 66f3eb14e955d3917f817ff346d33d839679c2cf) --- sys/dev/sound/pcm/sound.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/sys/dev/sound/pcm/sound.c b/sys/dev/sound/pcm/sound.c index 948cbd0b8fb9..5ca38ca622c9 100644 --- a/sys/dev/sound/pcm/sound.c +++ b/sys/dev/sound/pcm/sound.c @@ -316,7 +316,7 @@ pcm_setstatus(device_t dev, char *str) else if (snd_unit_auto == 1) snd_unit = pcm_best_unit(snd_unit); - return (0); + return (dsp_make_dev(dev)); } uint32_t @@ -433,6 +433,15 @@ pcm_sysinit(device_t dev) mode = pcm_mode_init(d); + sysctl_ctx_init(&d->play_sysctl_ctx); + d->play_sysctl_tree = SYSCTL_ADD_NODE(&d->play_sysctl_ctx, + SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO, "play", + CTLFLAG_RD | CTLFLAG_MPSAFE, 0, "playback channels node"); + sysctl_ctx_init(&d->rec_sysctl_ctx); + d->rec_sysctl_tree = SYSCTL_ADD_NODE(&d->rec_sysctl_ctx, + SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO, "rec", + CTLFLAG_RD | CTLFLAG_MPSAFE, 0, "recording channels node"); + /* XXX: a user should be able to set this with a control tool, the sysadmin then needs min+max sysctls for this */ SYSCTL_ADD_UINT(device_get_sysctl_ctx(dev), @@ -497,21 +506,12 @@ pcm_register(device_t dev, void *devinfo, int numplay, int numrec) if ((numplay == 0 || numrec == 0) && numplay != numrec) d->flags |= SD_F_SIMPLEX; - sysctl_ctx_init(&d->play_sysctl_ctx); - d->play_sysctl_tree = SYSCTL_ADD_NODE(&d->play_sysctl_ctx, - SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO, "play", - CTLFLAG_RD | CTLFLAG_MPSAFE, 0, "playback channels node"); - sysctl_ctx_init(&d->rec_sysctl_ctx); - d->rec_sysctl_tree = SYSCTL_ADD_NODE(&d->rec_sysctl_ctx, - SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO, "rec", - CTLFLAG_RD | CTLFLAG_MPSAFE, 0, "recording channels node"); - if (numplay > 0 || numrec > 0) d->flags |= SD_F_AUTOVCHAN; sndstat_register(dev, d->status); - return (dsp_make_dev(dev)); + return (0); } int From nobody Tue Nov 5 21:45:34 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Xjhht68q1z5bfN8; Tue, 05 Nov 2024 21:45:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xjhht2srcz4fWQ; Tue, 5 Nov 2024 21:45:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730843134; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Yzk8HXV/f5f/LMlTXM9L8l4C4+Y5VnLFc9Z0f4GNH7w=; b=MuPDj586O+IlHoZ/4Eal6JoCx2b1Kxy/Wcd2kd/CxBqL3ATdLjaNqP+CSYX2ueAL1R0n1p Azn6uPyz99xtuOc4gu43orX5NKuym0iO0X3qJylunGo4+vWzlRaSJ1uGZ0MbGk5kMcJouQ cMbUKn/9elK/G6xc4KUP7pBU3nZgSNIWFB6xMk+Z6l5rNIbdlGhoU1dIAvYnF2g3QmWsiO la/Zhz22Rn1Syr8nXf4ejxyEcBd1ylHqHbClTEKovfCBPlSzTjdP3bFDH19fuenMK69EXR SZjIvDOUjFFplGgca83RBHY3jSzKZDmi5Z4e3h/Xd4TWvgfOoMPDRhT4Hj3wbQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730843134; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Yzk8HXV/f5f/LMlTXM9L8l4C4+Y5VnLFc9Z0f4GNH7w=; b=FwXoGBrrw1lNFyN0D+pCSrPR+7rYAw2Jf8P7eUxhIvRZOT/pZSTrrkXkymTkI3cFtKYxmG NvrWEa+tL/7/qH+rY7B4Th51g4Jn9Ehude4XYxWA3OVN4VKOLSXhdm4tXfe66bYPrkariC toLmTzMXYrHaMrrlvYDLwPCWAW16d0vlxFBceZrBvHUiArMWawQ8Wb9FaRkIxSaoN6LyxT ytCuEJUpTEQXTtij4+F/wfwNuT5C5e6JLiahVuq6ZyD6Yu2JivANJhL8vLuz6lnnMdzlv0 dYxsUZumHC6hqJzoH/zMf2k3wy6ckWdBfN1pzc7+m/rkKMDSjuqn03NoLRlNVg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730843134; a=rsa-sha256; cv=none; b=HuENLJZZxmU8WnvAc7bUwYYYNh5Md2r6Z3tz/43LEkfgQBe31u4a7aGrGZ6q/MK4EoTiwj SpvtMooI/sO2PqD8OJCGzqdifUSQJisPtzlKaiXeyKTpjm+7lC/xiMSTCksmnHFCtJFv0n qPirI8uU+lA1ffE24NzV+ljizjZZ3yNa2Chtu3DJZZuQhza0lo9r8DJ/Y5bCxYxb+ZB+yI 4R59Nmf2JpcDiMkFyyy/s84RWtBMUeQk6oRKZmgLlC59eXDmwamox+eUjZ833i0URhQ01J VuGYYi6SYxO7exj8DAUY+zVuEOWld802qHctady5eImdsol7egqx7t7JGf7PSQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Xjhht2VJhzZf1; Tue, 5 Nov 2024 21:45:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A5LjY1C095498; Tue, 5 Nov 2024 21:45:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A5LjYIs095495; Tue, 5 Nov 2024 21:45:34 GMT (envelope-from git) Date: Tue, 5 Nov 2024 21:45:34 GMT Message-Id: <202411052145.4A5LjYIs095495@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 9e36026dc3ea - stable/14 - sound: Move sndstat_register() call to pcm_setstatus() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 9e36026dc3eafe158d03c9371abd784e4115f4f0 Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=9e36026dc3eafe158d03c9371abd784e4115f4f0 commit 9e36026dc3eafe158d03c9371abd784e4115f4f0 Author: Christos Margiolis AuthorDate: 2024-11-03 19:02:37 +0000 Commit: Christos Margiolis CommitDate: 2024-11-05 21:44:41 +0000 sound: Move sndstat_register() call to pcm_setstatus() The d->status string is populated in pcm_setstatus() anyway, so call sndstat_register() after we populate it, and are closer to finalizing the device creation. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: dev_submerge.ch, markj Differential Revision: https://reviews.freebsd.org/D47323 (cherry picked from commit 181a31d8349088cbcead8dcbff8d62ee8af6c913) --- sys/dev/sound/pcm/sound.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/dev/sound/pcm/sound.c b/sys/dev/sound/pcm/sound.c index 5ca38ca622c9..3c4fb38fa4f5 100644 --- a/sys/dev/sound/pcm/sound.c +++ b/sys/dev/sound/pcm/sound.c @@ -293,6 +293,7 @@ pcm_setstatus(device_t dev, char *str) vchan_setmaxauto(d, snd_maxautovchans); strlcpy(d->status, str, SND_STATUSLEN); + sndstat_register(dev, d->status); PCM_LOCK(d); @@ -509,8 +510,6 @@ pcm_register(device_t dev, void *devinfo, int numplay, int numrec) if (numplay > 0 || numrec > 0) d->flags |= SD_F_AUTOVCHAN; - sndstat_register(dev, d->status); - return (0); } From nobody Tue Nov 5 21:45:35 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Xjhhv6KCdz5bfN9; Tue, 05 Nov 2024 21:45:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xjhhv4BQZz4fGD; Tue, 5 Nov 2024 21:45:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730843135; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LF9iqh/4JJ96sMLMABMREaBdEqyw2dSSO2Xpd/vbV/M=; b=t8Qk+ZT1VJ+t/qcT3fAw3yrLKT2kEzfUsJcOzfpRy695ku8A+y1wwLMAtQvOp7jvyovsdp W6NOlVv3S0mdwhSsPVIa+b6XMFmCYtYpQYMyiWGEom+9C2Gjr0Id6uw6cWxmAbCbYR972H cxE2gc93AeRtyt5/Kkmr8PushCJz/A2u97Avx+QxlLZ2YEjuwMve5rbc0GWjf1b6awLVXy r3/ZNkvQPxv9dtk7aF9jCSGq/03s5zFTy+Ok1/oGw/bdtqvn2FfisO/w+imEjzGvkusWrq TEjyc2ZcOG9Wma4f7k12eD7yfpnY099quLtbTwbQKgn11fY1TucCLrg2C3x+Fw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730843135; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LF9iqh/4JJ96sMLMABMREaBdEqyw2dSSO2Xpd/vbV/M=; b=tCX2dchYqTCdw6jOkTyIeDl9L+VxtJU16/Hc18zBLWffeduX1F1wWYAaD4zpWdlJYv792S 6+WOZvX6ROcKhgVN3xAALW+4HXv9jiUStPtzEAY50r38EspFhKdqENE4VchPYo/g59Ysnc A/bhKFxzmj4Rfo7uMk8+1QQfAnyTq+6EDBy6LXahd/fzcfU2WXuZYpo25z0VV+dgViMyfB n2hr8z4LV+pj3KpQKBQXZOeG49g4b4vKE+fCpR7gsdje6dGEnaDzN6+79EtcZsrGRd92as awBsxgftUaT0flxpAEXkIqY9Dq+5JadyardEUHaBt6nkWmroavCMil8bHB2KwQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730843135; a=rsa-sha256; cv=none; b=alqcz9oLTVPrnA0dnLqhw7J0JC2GPP6jD/ejtQ+WpzF+klHgt9TgszzheFxoXe9Bc1wSRg RCQGey2Emap8QHCD2pQS/YciJbwln9eU4aFfMyak4O98/xkLIatZ8dwpAdVx1QAEg1d/qR SZhe/mFZQbsT9VwqYJPfcdJgDz4eOPE63XhBSjIQRnRyhefdGmV62Z1AM70re1sI6xnOZC r2g2KSHiaFWtZfaMxJ7MlK44JLJskiCuuVbTw6OJbCWLnRN6cnupTn5tHUvQZv8nW/fwhP w+dWMx8BnemFtFT6jlpVoUv2ooK4285B4bAaZN6rmwWU2rDnviDl662JMSayXw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Xjhhv3XczzZcF; Tue, 5 Nov 2024 21:45:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A5LjZE6095548; Tue, 5 Nov 2024 21:45:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A5LjZ4R095545; Tue, 5 Nov 2024 21:45:35 GMT (envelope-from git) Date: Tue, 5 Nov 2024 21:45:35 GMT Message-Id: <202411052145.4A5LjZ4R095545@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: c874fcc4ca62 - stable/14 - sound: Remove early SD_F_SIMPLEX and SD_F_AUTOVCHAN assignments List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c874fcc4ca629548ded7ad7bdb71d92856759969 Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=c874fcc4ca629548ded7ad7bdb71d92856759969 commit c874fcc4ca629548ded7ad7bdb71d92856759969 Author: Christos Margiolis AuthorDate: 2024-11-03 19:02:43 +0000 Commit: Christos Margiolis CommitDate: 2024-11-05 21:44:41 +0000 sound: Remove early SD_F_SIMPLEX and SD_F_AUTOVCHAN assignments These flags are properly set in pcm_setstatus(), once the primary channels have been created. The existing comment already states that this is wrong. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: dev_submerge.ch, markj Differential Revision: https://reviews.freebsd.org/D47324 (cherry picked from commit 3a7d40c692622cc614a3839491c345d945f474fe) --- sys/dev/sound/pcm/sound.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/sys/dev/sound/pcm/sound.c b/sys/dev/sound/pcm/sound.c index 3c4fb38fa4f5..e03bcab6d8fc 100644 --- a/sys/dev/sound/pcm/sound.c +++ b/sys/dev/sound/pcm/sound.c @@ -465,7 +465,8 @@ pcm_sysinit(device_t dev) } int -pcm_register(device_t dev, void *devinfo, int numplay, int numrec) +pcm_register(device_t dev, void *devinfo, int numplay __unused, + int numrec __unused) { struct snddev_info *d; int i; @@ -503,13 +504,6 @@ pcm_register(device_t dev, void *devinfo, int numplay, int numrec) CHN_INIT(d, channels.pcm.busy); CHN_INIT(d, channels.pcm.opened); - /* XXX This is incorrect, but lets play along for now. */ - if ((numplay == 0 || numrec == 0) && numplay != numrec) - d->flags |= SD_F_SIMPLEX; - - if (numplay > 0 || numrec > 0) - d->flags |= SD_F_AUTOVCHAN; - return (0); } From nobody Tue Nov 5 21:45:36 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Xjhhw5SGXz5bfJ7; Tue, 05 Nov 2024 21:45:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xjhhw4tr9z4fWp; Tue, 5 Nov 2024 21:45:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730843136; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Sh27r7p/x9Z3m9NRL42AhIFFv36VVlRr3lVWHdkps+U=; b=Tmd4UpfPn2y5sQOIenu9lZTvJmaSBWxl0Pq0qLwHFHHHuvCAV6b0yplOI3C15bK+CZ95MD HSq3N0esNeb2Xi30F4s0r8YhU6Pq8pNfbbOXMfcHXp8ytDd+tb8MnmBmUqrLm4IQa891My AlEsJmhnZ+QL5cplxBxMsHt6knJ6JN/OSG6EPcytxZcdrsEIilmJTOTZRLqtD1tBaKEBF2 iQ4H0g2E6oXQtYFHLOZz5oC9HQBsvJuZ2s1MW2qD+BYOutlFuJvX9zjnmF048sRHnUsMVJ ri4PY72ZS44C8Rai2LwlgVtKiB90cqRi/gLgvq8Ljy34XgtcaUTCgJu761Q53w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730843136; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Sh27r7p/x9Z3m9NRL42AhIFFv36VVlRr3lVWHdkps+U=; b=SKTY/3radXfMct0os1fFg6CeT243Diypt7SeKfariCEkvuautVsWtXCK9HGvB6T8QMwJl9 bV5aU/yq8oDI+b3KtCEIfl06oD+wN1yH1sXIIRBw3IS649uhEQAbUgSdY7dYE+FdN9F9JH Kf8AjEhCYQ+oHipGRKgmMyEbS46UB07XDgpkNtNzmlZ6j3ha7Ev/AAO87pNHxPYoDUKshl leRQy91OLwXM44xRfHfq0fYqvNFn1MUMnz/8sL393FVkFe22YHF8VYwyiZuR2kDr+5XCVR 32FxKTZrNXYG7xyxSLOLSCVPeYD4h9AyouCx5J3utUtTYndyOVPfQwSzXc5y7w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730843136; a=rsa-sha256; cv=none; b=gJWhAZmBYtDnOQZRMKPh7wcavVlS/LoHyGPrXUjkSGi8tXimKmmBSeEGSgNEDM4YtEmvqt AMI0RCCGCMZYfCHHCHFt7X7FCkiMsbN8JSLWT98Vm4Yrhg4/di27AKi9Ak5dS8fw7B69Jw vWSHYFu+Ao7a2pW2BBLKSPBhRicrnCmbwMnTdxraOSCN5RUdF2n2jXT1JQ2+HFpUdsNu/z uOPcWJWPVmFOZJOiL7zKwYoD0YK3cKdDLs4X2dwFwJFfHDAwTuRhlVs/s1FYPro5ft7dSF QhpSHrfNfwmKs0W4DJf3a3s2ZKOs4jc9iSkk3AoKGv8Gtv45C3U2gNHpCOefXg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Xjhhw4VzZzZrd; Tue, 5 Nov 2024 21:45:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A5LjaBU095597; Tue, 5 Nov 2024 21:45:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A5LjaHf095594; Tue, 5 Nov 2024 21:45:36 GMT (envelope-from git) Date: Tue, 5 Nov 2024 21:45:36 GMT Message-Id: <202411052145.4A5LjaHf095594@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 5aece3be1c84 - stable/14 - sound: Make device registration more intuitive List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 5aece3be1c84f6786f89894efeca1219a282f3f3 Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=5aece3be1c84f6786f89894efeca1219a282f3f3 commit 5aece3be1c84f6786f89894efeca1219a282f3f3 Author: Christos Margiolis AuthorDate: 2024-11-03 19:02:49 +0000 Commit: Christos Margiolis CommitDate: 2024-11-05 21:45:01 +0000 sound: Make device registration more intuitive The way a sound driver currently registers to sound(4) is using the following sequence of function calls: 1. pcm_register() to initialize snddev_info. 2. pcm_addchan() calls to create the device's primary channels. 3. pcm_setstatus() to do the final setup. While using 3 different functions in a specific order might not be very elegant, this pattern cannot be easily avoided. However, pcm_register() and pcm_setstatus() are especially confusing, since one would intuitively expect: 1. pcm_register() to actually do the registration, as opposed to a basic initialization. 2. pcm_setstatus() to, as the name suggests, set some kind of status, as opposed to finalizing the registration. This patch renames pcm_register() to pcm_init(), and pcm_setstatus() to pcm_register(). Drivers are modified accordingly. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: dev_submerge.ch Differential Revision: https://reviews.freebsd.org/D47325 (cherry picked from commit 516a9c0212b003e1da0c6f4476dbe4f3f431606c) --- sys/arm/allwinner/a10_codec.c | 10 +-- sys/arm/broadcom/bcm2835/bcm2835_audio.c | 10 +-- sys/arm/freescale/imx/imx6_ssi.c | 12 ++-- sys/arm/freescale/vybrid/vf_sai.c | 12 ++-- sys/dev/sound/dummy.c | 6 +- sys/dev/sound/fdt/audio_soc.c | 10 +-- sys/dev/sound/macio/aoa.c | 6 +- sys/dev/sound/pci/als4000.c | 11 ++-- sys/dev/sound/pci/atiixp.c | 6 +- sys/dev/sound/pci/cmi.c | 6 +- sys/dev/sound/pci/cs4281.c | 6 +- sys/dev/sound/pci/csapcm.c | 8 +-- sys/dev/sound/pci/emu10k1.c | 5 +- sys/dev/sound/pci/emu10kx-pcm.c | 8 +-- sys/dev/sound/pci/envy24.c | 7 +-- sys/dev/sound/pci/envy24ht.c | 8 +-- sys/dev/sound/pci/es137x.c | 6 +- sys/dev/sound/pci/fm801.c | 5 +- sys/dev/sound/pci/hda/hdaa.c | 7 +-- sys/dev/sound/pci/hdspe-pcm.c | 13 ++-- sys/dev/sound/pci/ich.c | 5 +- sys/dev/sound/pci/maestro3.c | 9 +-- sys/dev/sound/pci/neomagic.c | 5 +- sys/dev/sound/pci/solo.c | 6 +- sys/dev/sound/pci/t4dwave.c | 6 +- sys/dev/sound/pci/via8233.c | 6 +- sys/dev/sound/pci/via82c686.c | 5 +- sys/dev/sound/pci/vibes.c | 11 ++-- sys/dev/sound/pcm/sound.c | 103 ++++++++++++++++--------------- sys/dev/sound/pcm/sound.h | 4 +- sys/dev/sound/usb/uaudio.c | 11 ++-- 31 files changed, 161 insertions(+), 172 deletions(-) diff --git a/sys/arm/allwinner/a10_codec.c b/sys/arm/allwinner/a10_codec.c index 036de684b788..a2ad58bab6fc 100644 --- a/sys/arm/allwinner/a10_codec.c +++ b/sys/arm/allwinner/a10_codec.c @@ -1166,16 +1166,16 @@ a10codec_attach(device_t dev) pcm_setflags(dev, pcm_getflags(dev) | SD_F_MPSAFE); - if (pcm_register(dev, sc, 1, 1)) { - device_printf(dev, "pcm_register failed\n"); - goto fail; - } + pcm_init(dev, sc); pcm_addchan(dev, PCMDIR_PLAY, &a10codec_chan_class, sc); pcm_addchan(dev, PCMDIR_REC, &a10codec_chan_class, sc); snprintf(status, SND_STATUSLEN, "at %s", ofw_bus_get_name(dev)); - pcm_setstatus(dev, status); + if (pcm_register(dev, status)) { + device_printf(dev, "pcm_register failed\n"); + goto fail; + } return (0); diff --git a/sys/arm/broadcom/bcm2835/bcm2835_audio.c b/sys/arm/broadcom/bcm2835/bcm2835_audio.c index 75a0c81f29a1..13f309dd3f11 100644 --- a/sys/arm/broadcom/bcm2835/bcm2835_audio.c +++ b/sys/arm/broadcom/bcm2835/bcm2835_audio.c @@ -867,14 +867,14 @@ bcm2835_audio_delayed_init(void *xsc) goto no; } - if (pcm_register(sc->dev, sc, 1, 0)) { - device_printf(sc->dev, "pcm_register failed\n"); - goto no; - } + pcm_init(sc->dev, sc); pcm_addchan(sc->dev, PCMDIR_PLAY, &bcmchan_class, sc); snprintf(status, SND_STATUSLEN, "at VCHIQ"); - pcm_setstatus(sc->dev, status); + if (pcm_register(sc->dev, status)) { + device_printf(sc->dev, "pcm_register failed\n"); + goto no; + } bcm2835_audio_reset_channel(&sc->pch); bcm2835_audio_create_worker(sc); diff --git a/sys/arm/freescale/imx/imx6_ssi.c b/sys/arm/freescale/imx/imx6_ssi.c index 6b23334a4e97..779c41553734 100644 --- a/sys/arm/freescale/imx/imx6_ssi.c +++ b/sys/arm/freescale/imx/imx6_ssi.c @@ -811,18 +811,18 @@ ssi_attach(device_t dev) pcm_setflags(dev, pcm_getflags(dev) | SD_F_MPSAFE); - err = pcm_register(dev, scp, 1, 0); - if (err) { - device_printf(dev, "Can't register pcm.\n"); - return (ENXIO); - } + pcm_init(dev, scp); scp->chnum = 0; pcm_addchan(dev, PCMDIR_PLAY, &ssichan_class, scp); scp->chnum++; snprintf(status, SND_STATUSLEN, "at simplebus"); - pcm_setstatus(dev, status); + err = pcm_register(dev, status); + if (err) { + device_printf(dev, "Can't register pcm.\n"); + return (ENXIO); + } mixer_init(dev, &ssimixer_class, scp); setup_ssi(sc); diff --git a/sys/arm/freescale/vybrid/vf_sai.c b/sys/arm/freescale/vybrid/vf_sai.c index 3b3a120df4e1..92dc185c13eb 100644 --- a/sys/arm/freescale/vybrid/vf_sai.c +++ b/sys/arm/freescale/vybrid/vf_sai.c @@ -763,18 +763,18 @@ sai_attach(device_t dev) pcm_setflags(dev, pcm_getflags(dev) | SD_F_MPSAFE); - err = pcm_register(dev, scp, 1, 0); - if (err) { - device_printf(dev, "Can't register pcm.\n"); - return (ENXIO); - } + pcm_init(dev, scp); scp->chnum = 0; pcm_addchan(dev, PCMDIR_PLAY, &saichan_class, scp); scp->chnum++; snprintf(status, SND_STATUSLEN, "at simplebus"); - pcm_setstatus(dev, status); + err = pcm_register(dev, status); + if (err) { + device_printf(dev, "Can't register pcm.\n"); + return (ENXIO); + } mixer_init(dev, &saimixer_class, scp); diff --git a/sys/dev/sound/dummy.c b/sys/dev/sound/dummy.c index c1cd4dff15f9..9013fd023a7e 100644 --- a/sys/dev/sound/dummy.c +++ b/sys/dev/sound/dummy.c @@ -305,8 +305,7 @@ dummy_attach(device_t dev) }; pcm_setflags(dev, pcm_getflags(dev) | SD_F_MPSAFE); - if (pcm_register(dev, sc, DUMMY_NPCHAN, DUMMY_NRCHAN)) - return (ENXIO); + pcm_init(dev, sc); for (i = 0; i < DUMMY_NPCHAN; i++) pcm_addchan(dev, PCMDIR_PLAY, &dummy_chan_class, sc); for (i = 0; i < DUMMY_NRCHAN; i++) @@ -314,7 +313,8 @@ dummy_attach(device_t dev) snprintf(status, SND_STATUSLEN, "on %s", device_get_nameunit(device_get_parent(dev))); - pcm_setstatus(dev, status); + if (pcm_register(dev, status)) + return (ENXIO); mixer_init(dev, &dummy_mixer_class, sc); callout_init(&sc->callout, 1); diff --git a/sys/dev/sound/fdt/audio_soc.c b/sys/dev/sound/fdt/audio_soc.c index 92813a3079d8..c2bdea399364 100644 --- a/sys/dev/sound/fdt/audio_soc.c +++ b/sys/dev/sound/fdt/audio_soc.c @@ -397,10 +397,7 @@ audio_soc_init(void *arg) } } - if (pcm_register(sc->dev, sc, 1, 1)) { - device_printf(sc->dev, "failed to register PCM\n"); - return; - } + pcm_init(sc->dev, sc); sc->play_channel.sc = sc; sc->rec_channel.sc = sc; @@ -408,7 +405,10 @@ audio_soc_init(void *arg) pcm_addchan(sc->dev, PCMDIR_PLAY, &audio_soc_chan_class, &sc->play_channel); pcm_addchan(sc->dev, PCMDIR_REC, &audio_soc_chan_class, &sc->rec_channel); - pcm_setstatus(sc->dev, "at simplebus"); + if (pcm_register(sc->dev, "at simplebus")) { + device_printf(sc->dev, "failed to register PCM\n"); + return; + } AUDIO_DAI_SETUP_INTR(sc->cpu_dev, audio_soc_intr, sc); AUDIO_DAI_SETUP_MIXER(sc->codec_dev, sc->dev); diff --git a/sys/dev/sound/macio/aoa.c b/sys/dev/sound/macio/aoa.c index 27626b3d570a..9861bbd92a0c 100644 --- a/sys/dev/sound/macio/aoa.c +++ b/sys/dev/sound/macio/aoa.c @@ -372,8 +372,7 @@ aoa_attach(void *xsc) sc = xsc; self = sc->sc_dev; - if (pcm_register(self, sc, 1, 0)) - return (ENXIO); + pcm_init(self, sc); err = pcm_getbuffersize(self, AOA_BUFFER_SIZE, AOA_BUFFER_SIZE, AOA_BUFFER_SIZE); @@ -382,7 +381,6 @@ aoa_attach(void *xsc) pcm_addchan(self, PCMDIR_PLAY, &aoa_chan_class, sc); snprintf(status, sizeof(status), "at %s", ofw_bus_get_name(self)); - pcm_setstatus(self, status); - return (0); + return (pcm_register(self, status)); } diff --git a/sys/dev/sound/pci/als4000.c b/sys/dev/sound/pci/als4000.c index b1376d2b6e5a..9d86713b379e 100644 --- a/sys/dev/sound/pci/als4000.c +++ b/sys/dev/sound/pci/als4000.c @@ -839,10 +839,7 @@ als_pci_attach(device_t dev) goto bad_attach; } - if (pcm_register(dev, sc, 1, 1)) { - device_printf(dev, "failed to register pcm entries\n"); - goto bad_attach; - } + pcm_init(dev, sc); pcm_addchan(dev, PCMDIR_PLAY, &alspchan_class, sc); pcm_addchan(dev, PCMDIR_REC, &alsrchan_class, sc); @@ -850,7 +847,11 @@ als_pci_attach(device_t dev) snprintf(status, SND_STATUSLEN, "port 0x%jx irq %jd on %s", rman_get_start(sc->reg), rman_get_start(sc->irq), device_get_nameunit(device_get_parent(dev))); - pcm_setstatus(dev, status); + if (pcm_register(dev, status)) { + device_printf(dev, "failed to register pcm entries\n"); + goto bad_attach; + } + return 0; bad_attach: diff --git a/sys/dev/sound/pci/atiixp.c b/sys/dev/sound/pci/atiixp.c index eeb28bb08276..90e5742e6523 100644 --- a/sys/dev/sound/pci/atiixp.c +++ b/sys/dev/sound/pci/atiixp.c @@ -1084,8 +1084,7 @@ atiixp_chip_post_init(void *arg) mixer_init(sc->dev, ac97_getmixerclass(), sc->codec); - if (pcm_register(sc->dev, sc, ATI_IXP_NPCHAN, ATI_IXP_NRCHAN)) - goto postinitbad; + pcm_init(sc->dev, sc); for (i = 0; i < ATI_IXP_NPCHAN; i++) pcm_addchan(sc->dev, PCMDIR_PLAY, &atiixp_chan_class, sc); @@ -1101,7 +1100,8 @@ atiixp_chip_post_init(void *arg) rman_get_start(sc->reg), rman_get_start(sc->irq), device_get_nameunit(device_get_parent(sc->dev))); - pcm_setstatus(sc->dev, status); + if (pcm_register(sc->dev, status)) + goto postinitbad; atiixp_lock(sc); if (sc->polling == 0) diff --git a/sys/dev/sound/pci/cmi.c b/sys/dev/sound/pci/cmi.c index 9a92066c51a4..22f1e76a4d1f 100644 --- a/sys/dev/sound/pci/cmi.c +++ b/sys/dev/sound/pci/cmi.c @@ -982,8 +982,7 @@ cmi_attach(device_t dev) if (mixer_init(dev, &cmi_mixer_class, sc)) goto bad; - if (pcm_register(dev, sc, 1, 1)) - goto bad; + pcm_init(dev, sc); cmi_initsys(sc); @@ -993,7 +992,8 @@ cmi_attach(device_t dev) snprintf(status, SND_STATUSLEN, "port 0x%jx irq %jd on %s", rman_get_start(sc->reg), rman_get_start(sc->irq), device_get_nameunit(device_get_parent(dev))); - pcm_setstatus(dev, status); + if (pcm_register(dev, status)) + goto bad; DEB(printf("cmi_attach: succeeded\n")); return 0; diff --git a/sys/dev/sound/pci/cs4281.c b/sys/dev/sound/pci/cs4281.c index 972b83efff8f..7a25f7f4c08d 100644 --- a/sys/dev/sound/pci/cs4281.c +++ b/sys/dev/sound/pci/cs4281.c @@ -839,8 +839,7 @@ cs4281_pci_attach(device_t dev) mixer_init(dev, ac97_getmixerclass(), codec); - if (pcm_register(dev, sc, 1, 1)) - goto bad; + pcm_init(dev, sc); pcm_addchan(dev, PCMDIR_PLAY, &cs4281chan_class, sc); pcm_addchan(dev, PCMDIR_REC, &cs4281chan_class, sc); @@ -849,7 +848,8 @@ cs4281_pci_attach(device_t dev) (sc->regtype == SYS_RES_IOPORT)? "port" : "mem", rman_get_start(sc->reg), rman_get_start(sc->irq), device_get_nameunit(device_get_parent(dev))); - pcm_setstatus(dev, status); + if (pcm_register(dev, status)) + goto bad; return 0; diff --git a/sys/dev/sound/pci/csapcm.c b/sys/dev/sound/pci/csapcm.c index c8424dd3e433..a966a2e66402 100644 --- a/sys/dev/sound/pci/csapcm.c +++ b/sys/dev/sound/pci/csapcm.c @@ -832,14 +832,14 @@ pcmcsa_attach(device_t dev) csa_writemem(resp, BA1_CIE, (csa_readmem(resp, BA1_CIE) & ~0x0000003f) | 0x00000001); csa_active(csa, -1); - if (pcm_register(dev, csa, 1, 1)) { + pcm_init(dev, csa); + pcm_addchan(dev, PCMDIR_REC, &csachan_class, csa); + pcm_addchan(dev, PCMDIR_PLAY, &csachan_class, csa); + if (pcm_register(dev, status)) { ac97_destroy(codec); csa_releaseres(csa, dev); return (ENXIO); } - pcm_addchan(dev, PCMDIR_REC, &csachan_class, csa); - pcm_addchan(dev, PCMDIR_PLAY, &csachan_class, csa); - pcm_setstatus(dev, status); return (0); } diff --git a/sys/dev/sound/pci/emu10k1.c b/sys/dev/sound/pci/emu10k1.c index 0813f89c87b8..e4b2c22f4f07 100644 --- a/sys/dev/sound/pci/emu10k1.c +++ b/sys/dev/sound/pci/emu10k1.c @@ -2130,13 +2130,14 @@ emu_pci_attach(device_t dev) rman_get_start(sc->reg), rman_get_start(sc->irq), device_get_nameunit(device_get_parent(dev))); - if (pcm_register(dev, sc, sc->nchans, gotmic ? 3 : 2)) goto bad; + pcm_init(dev, sc); for (i = 0; i < sc->nchans; i++) pcm_addchan(dev, PCMDIR_PLAY, &emupchan_class, sc); for (i = 0; i < (gotmic ? 3 : 2); i++) pcm_addchan(dev, PCMDIR_REC, &emurchan_class, sc); - pcm_setstatus(dev, status); + if (pcm_register(dev, status)) + goto bad; return 0; diff --git a/sys/dev/sound/pci/emu10kx-pcm.c b/sys/dev/sound/pci/emu10kx-pcm.c index bef6b596646e..c280b64892f6 100644 --- a/sys/dev/sound/pci/emu10kx-pcm.c +++ b/sys/dev/sound/pci/emu10kx-pcm.c @@ -1459,10 +1459,7 @@ emu_pcm_attach(device_t dev) pcm_setflags(dev, pcm_getflags(dev) | SD_F_MPSAFE); /* XXX we should better get number of available channels from parent */ - if (pcm_register(dev, sc, (route == RT_FRONT) ? MAX_CHANNELS : 1, (route == RT_FRONT) ? 1 : 0)) { - device_printf(dev, "can't register PCM channels!\n"); - goto bad; - } + pcm_init(dev, sc); sc->pnum = 0; if (route != RT_MCHRECORD) pcm_addchan(dev, PCMDIR_PLAY, &emupchan_class, sc); @@ -1476,7 +1473,8 @@ emu_pcm_attach(device_t dev) snprintf(status, SND_STATUSLEN, "on %s", device_get_nameunit(device_get_parent(dev))); - pcm_setstatus(dev, status); + if (pcm_register(dev, status)) + goto bad; return (0); diff --git a/sys/dev/sound/pci/envy24.c b/sys/dev/sound/pci/envy24.c index f7cc7ff5724d..51842bfdb480 100644 --- a/sys/dev/sound/pci/envy24.c +++ b/sys/dev/sound/pci/envy24.c @@ -2575,9 +2575,7 @@ envy24_pci_attach(device_t dev) mixer_init(dev, &envy24mixer_class, sc); /* set channel information */ - err = pcm_register(dev, sc, 5, 2 + sc->adcn); - if (err) - goto bad; + pcm_init(dev, sc); sc->chnum = 0; for (i = 0; i < 5; i++) { pcm_addchan(dev, PCMDIR_PLAY, &envy24chan_class, sc); @@ -2601,7 +2599,8 @@ envy24_pci_attach(device_t dev) rman_get_end(sc->mt) - rman_get_start(sc->mt) + 1, rman_get_start(sc->irq), device_get_nameunit(device_get_parent(dev))); - pcm_setstatus(dev, status); + if (pcm_register(dev, status)) + goto bad; return 0; diff --git a/sys/dev/sound/pci/envy24ht.c b/sys/dev/sound/pci/envy24ht.c index 65c67b84ce53..b8202a9fa7cd 100644 --- a/sys/dev/sound/pci/envy24ht.c +++ b/sys/dev/sound/pci/envy24ht.c @@ -2480,10 +2480,7 @@ envy24ht_pci_attach(device_t dev) mixer_init(dev, &envy24htmixer_class, sc); /* set channel information */ - /* err = pcm_register(dev, sc, 5, 2 + sc->adcn); */ - err = pcm_register(dev, sc, 1, 2 + sc->adcn); - if (err) - goto bad; + pcm_init(dev, sc); sc->chnum = 0; /* for (i = 0; i < 5; i++) { */ pcm_addchan(dev, PCMDIR_PLAY, &envy24htchan_class, sc); @@ -2503,7 +2500,8 @@ envy24ht_pci_attach(device_t dev) rman_get_end(sc->mt) - rman_get_start(sc->mt) + 1, rman_get_start(sc->irq), device_get_nameunit(device_get_parent(dev))); - pcm_setstatus(dev, status); + if (pcm_register(dev, status)) + goto bad; return 0; diff --git a/sys/dev/sound/pci/es137x.c b/sys/dev/sound/pci/es137x.c index 8f832d899dd3..3c1bea09b5d1 100644 --- a/sys/dev/sound/pci/es137x.c +++ b/sys/dev/sound/pci/es137x.c @@ -1861,13 +1861,13 @@ es_pci_attach(device_t dev) rman_get_start(es->reg), rman_get_start(es->irq), device_get_nameunit(device_get_parent(dev))); - if (pcm_register(dev, es, numplay, 1)) - goto bad; + pcm_init(dev, es); for (i = 0; i < numplay; i++) pcm_addchan(dev, PCMDIR_PLAY, ct, es); pcm_addchan(dev, PCMDIR_REC, ct, es); es_init_sysctls(dev); - pcm_setstatus(dev, status); + if (pcm_register(dev, status)) + goto bad; es->escfg = ES_SET_GP(es->escfg, 0); if (numplay == 1) device_printf(dev, "\n", diff --git a/sys/dev/sound/pci/fm801.c b/sys/dev/sound/pci/fm801.c index fbde14f37afe..ca6a2271096c 100644 --- a/sys/dev/sound/pci/fm801.c +++ b/sys/dev/sound/pci/fm801.c @@ -642,10 +642,11 @@ fm801_pci_attach(device_t dev) device_get_nameunit(device_get_parent(dev))); #define FM801_MAXPLAYCH 1 - if (pcm_register(dev, fm801, FM801_MAXPLAYCH, 1)) goto oops; + pcm_init(dev, fm801); pcm_addchan(dev, PCMDIR_PLAY, &fm801ch_class, fm801); pcm_addchan(dev, PCMDIR_REC, &fm801ch_class, fm801); - pcm_setstatus(dev, status); + if (pcm_register(dev, status)) + goto oops; fm801->radio = device_add_child(dev, "radio", -1); bus_generic_attach(dev); diff --git a/sys/dev/sound/pci/hda/hdaa.c b/sys/dev/sound/pci/hda/hdaa.c index c0eb1864f145..d6aa24125c7b 100644 --- a/sys/dev/sound/pci/hda/hdaa.c +++ b/sys/dev/sound/pci/hda/hdaa.c @@ -7053,9 +7053,7 @@ hdaa_pcm_attach(device_t dev) HDA_BOOTHVERBOSE( device_printf(dev, "Registering PCM channels...\n"); ); - if (pcm_register(dev, pdevinfo, (pdevinfo->playas >= 0)?1:0, - (pdevinfo->recas >= 0)?1:0) != 0) - device_printf(dev, "Can't register PCM\n"); + pcm_init(dev, pdevinfo); pdevinfo->registered++; @@ -7108,9 +7106,8 @@ hdaa_pcm_attach(device_t dev) snprintf(status, SND_STATUSLEN, "on %s", device_get_nameunit(device_get_parent(dev))); - pcm_setstatus(dev, status); - return (0); + return (pcm_register(dev, status)); } static int diff --git a/sys/dev/sound/pci/hdspe-pcm.c b/sys/dev/sound/pci/hdspe-pcm.c index 4bea6c65e087..d58353685663 100644 --- a/sys/dev/sound/pci/hdspe-pcm.c +++ b/sys/dev/sound/pci/hdspe-pcm.c @@ -1020,13 +1020,10 @@ hdspe_pcm_attach(device_t dev) */ pcm_setflags(dev, pcm_getflags(dev) | SD_F_MPSAFE); + pcm_init(dev, scp); + play = (hdspe_channel_play_ports(scp->hc)) ? 1 : 0; rec = (hdspe_channel_rec_ports(scp->hc)) ? 1 : 0; - err = pcm_register(dev, scp, play, rec); - if (err) { - device_printf(dev, "Can't register pcm.\n"); - return (ENXIO); - } scp->chnum = 0; if (play) { @@ -1043,7 +1040,11 @@ hdspe_pcm_attach(device_t dev) rman_get_start(scp->sc->cs), rman_get_start(scp->sc->irq), device_get_nameunit(device_get_parent(dev))); - pcm_setstatus(dev, status); + err = pcm_register(dev, status); + if (err) { + device_printf(dev, "Can't register pcm.\n"); + return (ENXIO); + } mixer_init(dev, &hdspemixer_class, scp); diff --git a/sys/dev/sound/pci/ich.c b/sys/dev/sound/pci/ich.c index 910a371c6653..500d6d95daac 100644 --- a/sys/dev/sound/pci/ich.c +++ b/sys/dev/sound/pci/ich.c @@ -695,7 +695,7 @@ ich_setstatus(struct sc_info *sc) device_printf(sc->dev, "PCI Master abort workaround enabled\n"); - pcm_setstatus(sc->dev, status); + pcm_register(sc->dev, status); } /* -------------------------------------------------------------------- */ @@ -1066,8 +1066,7 @@ ich_pci_attach(device_t dev) ich_setmap, sc, 0)) goto bad; - if (pcm_register(dev, sc, 1, (sc->hasmic) ? 2 : 1)) - goto bad; + pcm_init(dev, sc); pcm_addchan(dev, PCMDIR_PLAY, &ichchan_class, sc); /* play */ pcm_addchan(dev, PCMDIR_REC, &ichchan_class, sc); /* record */ diff --git a/sys/dev/sound/pci/maestro3.c b/sys/dev/sound/pci/maestro3.c index f922aa5cec3f..2d102fcd6dbe 100644 --- a/sys/dev/sound/pci/maestro3.c +++ b/sys/dev/sound/pci/maestro3.c @@ -1423,10 +1423,7 @@ m3_pci_attach(device_t dev) m3_enable_ints(sc); - if (pcm_register(dev, sc, dacn, adcn)) { - device_printf(dev, "pcm_register error\n"); - goto bad; - } + pcm_init(dev, sc); for (i=0 ; iregtype == SYS_RES_IOPORT)? "port" : "mem", rman_get_start(sc->reg), rman_get_start(sc->irq), device_get_nameunit(device_get_parent(dev))); - if (pcm_setstatus(dev, status)) { - device_printf(dev, "attach: pcm_setstatus error\n"); + if (pcm_register(dev, status)) { + device_printf(dev, "pcm_register error\n"); goto bad; } diff --git a/sys/dev/sound/pci/neomagic.c b/sys/dev/sound/pci/neomagic.c index 25273633ff18..d7824c990a52 100644 --- a/sys/dev/sound/pci/neomagic.c +++ b/sys/dev/sound/pci/neomagic.c @@ -707,10 +707,11 @@ nm_pci_attach(device_t dev) rman_get_start(sc->irq), device_get_nameunit(device_get_parent(dev))); - if (pcm_register(dev, sc, 1, 1)) goto bad; + pcm_init(dev, sc); pcm_addchan(dev, PCMDIR_REC, &nmchan_class, sc); pcm_addchan(dev, PCMDIR_PLAY, &nmchan_class, sc); - pcm_setstatus(dev, status); + if (pcm_register(dev, status)) + goto bad; return 0; diff --git a/sys/dev/sound/pci/solo.c b/sys/dev/sound/pci/solo.c index 82eabf3a4884..90dd2e26ad41 100644 --- a/sys/dev/sound/pci/solo.c +++ b/sys/dev/sound/pci/solo.c @@ -1026,11 +1026,11 @@ ess_attach(device_t dev) rman_get_start(sc->irq), device_get_nameunit(device_get_parent(dev))); - if (pcm_register(dev, sc, 1, 1)) - goto no; + pcm_init(dev, sc); pcm_addchan(dev, PCMDIR_REC, &esschan_class, sc); pcm_addchan(dev, PCMDIR_PLAY, &esschan_class, sc); - pcm_setstatus(dev, status); + if (pcm_register(dev, status)) + goto no; return 0; diff --git a/sys/dev/sound/pci/t4dwave.c b/sys/dev/sound/pci/t4dwave.c index 653e610febbe..07b9e1004573 100644 --- a/sys/dev/sound/pci/t4dwave.c +++ b/sys/dev/sound/pci/t4dwave.c @@ -921,12 +921,12 @@ tr_pci_attach(device_t dev) rman_get_start(tr->reg), rman_get_start(tr->irq), device_get_nameunit(device_get_parent(dev))); - if (pcm_register(dev, tr, dacn, 1)) - goto bad; + pcm_init(dev, tr); pcm_addchan(dev, PCMDIR_REC, &trrchan_class, tr); for (i = 0; i < dacn; i++) pcm_addchan(dev, PCMDIR_PLAY, &trpchan_class, tr); - pcm_setstatus(dev, status); + if (pcm_register(dev, status)) + goto bad; return 0; diff --git a/sys/dev/sound/pci/via8233.c b/sys/dev/sound/pci/via8233.c index 9f3b312e4365..243353805b94 100644 --- a/sys/dev/sound/pci/via8233.c +++ b/sys/dev/sound/pci/via8233.c @@ -1352,8 +1352,7 @@ via_attach(device_t dev) device_get_nameunit(device_get_parent(dev))); /* Register */ - if (pcm_register(dev, via, via_dxs_chnum + via_sgd_chnum, NWRCHANS)) - goto bad; + pcm_init(dev, via); for (i = 0; i < via_dxs_chnum; i++) pcm_addchan(dev, PCMDIR_PLAY, &via8233dxs_class, via); for (i = 0; i < via_sgd_chnum; i++) @@ -1366,7 +1365,8 @@ via_attach(device_t dev) (via_dxs_chnum > 0) ? "En" : "Dis", (via->dxs_src) ? "(SRC)" : "", via_dxs_chnum, via_sgd_chnum, NWRCHANS); - pcm_setstatus(dev, status); + if (pcm_register(dev, status)) + goto bad; return (0); bad: diff --git a/sys/dev/sound/pci/via82c686.c b/sys/dev/sound/pci/via82c686.c index 44f846b684d7..40f3521a57a2 100644 --- a/sys/dev/sound/pci/via82c686.c +++ b/sys/dev/sound/pci/via82c686.c @@ -585,10 +585,11 @@ via_attach(device_t dev) device_get_nameunit(device_get_parent(dev))); /* Register */ - if (pcm_register(dev, via, 1, 1)) goto bad; + pcm_init(dev, via); pcm_addchan(dev, PCMDIR_PLAY, &viachan_class, via); pcm_addchan(dev, PCMDIR_REC, &viachan_class, via); - pcm_setstatus(dev, status); + if (pcm_register(dev, status)) + goto bad; return 0; bad: if (via->codec) ac97_destroy(via->codec); diff --git a/sys/dev/sound/pci/vibes.c b/sys/dev/sound/pci/vibes.c index e587f0113b5d..7e908f188614 100644 --- a/sys/dev/sound/pci/vibes.c +++ b/sys/dev/sound/pci/vibes.c @@ -866,18 +866,17 @@ sv_attach(device_t dev) { if (bootverbose) printf("Sonicvibes: revision %d.\n", sc->rev); - if (pcm_register(dev, sc, 1, 1)) { - device_printf(dev, "sv_attach: pcm_register fail\n"); - goto fail; - } - + pcm_init(dev, sc); pcm_addchan(dev, PCMDIR_PLAY, &svpchan_class, sc); pcm_addchan(dev, PCMDIR_REC, &svrchan_class, sc); snprintf(status, SND_STATUSLEN, "port 0x%jx irq %jd on %s", rman_get_start(sc->enh_reg), rman_get_start(sc->irq), device_get_nameunit(device_get_parent(dev))); - pcm_setstatus(dev, status); + if (pcm_register(dev, status)) { + device_printf(dev, "sv_attach: pcm_register fail\n"); + goto fail; + } DEB(printf("sv_attach: succeeded\n")); diff --git a/sys/dev/sound/pcm/sound.c b/sys/dev/sound/pcm/sound.c index e03bcab6d8fc..fc9d13593b9e 100644 --- a/sys/dev/sound/pcm/sound.c +++ b/sys/dev/sound/pcm/sound.c @@ -273,53 +273,6 @@ pcm_best_unit(int old) return (best); } -int -pcm_setstatus(device_t dev, char *str) -{ - struct snddev_info *d = device_get_softc(dev); - - /* should only be called once */ - if (d->flags & SD_F_REGISTERED) - return (EINVAL); - - PCM_BUSYASSERT(d); - - if (d->playcount == 0 || d->reccount == 0) - d->flags |= SD_F_SIMPLEX; - - if (d->playcount > 0 || d->reccount > 0) - d->flags |= SD_F_AUTOVCHAN; - - vchan_setmaxauto(d, snd_maxautovchans); - - strlcpy(d->status, str, SND_STATUSLEN); - sndstat_register(dev, d->status); - - PCM_LOCK(d); - - /* Done, we're ready.. */ - d->flags |= SD_F_REGISTERED; - - PCM_RELEASE(d); - - PCM_UNLOCK(d); - - /* - * Create all sysctls once SD_F_REGISTERED is set else - * tunable sysctls won't work: - */ - pcm_sysinit(dev); - - if (snd_unit_auto < 0) - snd_unit_auto = (snd_unit < 0) ? 1 : 0; - if (snd_unit < 0 || snd_unit_auto > 1) - snd_unit = device_get_unit(dev); - else if (snd_unit_auto == 1) - snd_unit = pcm_best_unit(snd_unit); - - return (dsp_make_dev(dev)); -} - uint32_t pcm_getflags(device_t dev) { @@ -464,9 +417,12 @@ pcm_sysinit(device_t dev) feeder_eq_initsys(dev); } -int -pcm_register(device_t dev, void *devinfo, int numplay __unused, - int numrec __unused) +/* + * Basic initialization so that drivers can use pcm_addchan() before + * pcm_register(). + */ +void +pcm_init(device_t dev, void *devinfo) { struct snddev_info *d; int i; @@ -503,8 +459,53 @@ pcm_register(device_t dev, void *devinfo, int numplay __unused, CHN_INIT(d, channels.pcm); CHN_INIT(d, channels.pcm.busy); CHN_INIT(d, channels.pcm.opened); +} - return (0); +int +pcm_register(device_t dev, char *str) +{ + struct snddev_info *d = device_get_softc(dev); + + /* should only be called once */ + if (d->flags & SD_F_REGISTERED) + return (EINVAL); + + PCM_BUSYASSERT(d); + + if (d->playcount == 0 || d->reccount == 0) + d->flags |= SD_F_SIMPLEX; + + if (d->playcount > 0 || d->reccount > 0) + d->flags |= SD_F_AUTOVCHAN; + + vchan_setmaxauto(d, snd_maxautovchans); + + strlcpy(d->status, str, SND_STATUSLEN); + sndstat_register(dev, d->status); + + PCM_LOCK(d); + + /* Done, we're ready.. */ + d->flags |= SD_F_REGISTERED; + + PCM_RELEASE(d); + + PCM_UNLOCK(d); + + /* + * Create all sysctls once SD_F_REGISTERED is set else + * tunable sysctls won't work: + */ + pcm_sysinit(dev); + + if (snd_unit_auto < 0) + snd_unit_auto = (snd_unit < 0) ? 1 : 0; + if (snd_unit < 0 || snd_unit_auto > 1) + snd_unit = device_get_unit(dev); + else if (snd_unit_auto == 1) + snd_unit = pcm_best_unit(snd_unit); + + return (dsp_make_dev(dev)); } int diff --git a/sys/dev/sound/pcm/sound.h b/sys/dev/sound/pcm/sound.h index c5013e76034a..1d09c48fc06b 100644 --- a/sys/dev/sound/pcm/sound.h +++ b/sys/dev/sound/pcm/sound.h @@ -245,9 +245,9 @@ int pcm_chnalloc(struct snddev_info *d, struct pcm_channel **ch, int direction, int pcm_addchan(device_t dev, int dir, kobj_class_t cls, void *devinfo); unsigned int pcm_getbuffersize(device_t dev, unsigned int minbufsz, unsigned int deflt, unsigned int maxbufsz); -int pcm_register(device_t dev, void *devinfo, int numplay, int numrec); +void pcm_init(device_t dev, void *devinfo); +int pcm_register(device_t dev, char *str); int pcm_unregister(device_t dev); -int pcm_setstatus(device_t dev, char *str); u_int32_t pcm_getflags(device_t dev); void pcm_setflags(device_t dev, u_int32_t val); void *pcm_getdevinfo(device_t dev); diff --git a/sys/dev/sound/usb/uaudio.c b/sys/dev/sound/usb/uaudio.c index 8238629a2a51..b1dbc81c6b6f 100644 --- a/sys/dev/sound/usb/uaudio.c +++ b/sys/dev/sound/usb/uaudio.c @@ -1209,14 +1209,9 @@ uaudio_attach_sub(device_t dev, kobj_class_t mixer_class, kobj_class_t chan_clas snprintf(status, sizeof(status), "on %s", device_get_nameunit(device_get_parent(dev))); - if (pcm_register(dev, sc, - (sc->sc_play_chan[i].num_alt > 0) ? 1 : 0, - (sc->sc_rec_chan[i].num_alt > 0) ? 1 : 0)) { - goto detach; - } + pcm_init(dev, sc); uaudio_pcm_setflags(dev, SD_F_MPSAFE); - sc->sc_child[i].pcm_registered = 1; if (sc->sc_play_chan[i].num_alt > 0) { sc->sc_play_chan[i].priv_sc = sc; @@ -1229,7 +1224,9 @@ uaudio_attach_sub(device_t dev, kobj_class_t mixer_class, kobj_class_t chan_clas pcm_addchan(dev, PCMDIR_REC, chan_class, &sc->sc_rec_chan[i]); } - pcm_setstatus(dev, status); + if (pcm_register(dev, status)) + goto detach; + sc->sc_child[i].pcm_registered = 1; uaudio_mixer_register_sysctl(sc, dev, i); From nobody Tue Nov 5 21:45:37 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Xjhhy1YQLz5bf6J; Tue, 05 Nov 2024 21:45:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xjhhy08hGz4fVH; Tue, 5 Nov 2024 21:45:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730843138; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fZ9f0BIebm+g+gRD6N8qdscpCuK0zJH+BBzhefWpU+Y=; b=cX6b64vMuiXjSD3R9ah9vLb9q1uibb1TDks3e2XSmhPlVyzEu3QBQI4WvOuBkluPxi+2tm 8Mpm8XG45sBQ2cd0LHNHXPtN6kN2Z1o/RXbiooSU5TJXMSqRp8s4F3HJbS7BbBnyYalczN xx1Sir3zD58U/4JUqX+I0ItyJJbQBIg3oTqf83TU6cBXaACx0LsTffDJPcBIdRXxWxdaTl 58CrxqIdI5C5yDz7Rs8DB1+UhqHD67GpDXruLoEYCheXGlzDqABFbjwTm7EoIjsCxAFbps Rbk/atcKjEaWhtwRNyqeSNV4/DK8VeDHQUnXzfW8DMlK+Bcuh5mb3UKJ9OEMAA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730843138; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fZ9f0BIebm+g+gRD6N8qdscpCuK0zJH+BBzhefWpU+Y=; b=TErwadPrPUMd421M4Sem724NHBFF3uxzZIcXV+salHkd4N8Dv7PvJAfQsH+itR41oM+Td4 T2xfMJABa3kVCQpUK2DQ4xHQTYUrpd65SRECGR/ZGEW2YUfySZ/8uWOwKwQyP/Ru/980Oo AuIDf5062O2yj4hJIWlHUPT9BrYLYRq2WFlNk+Bz8UPBGdQ4d5GfUCuRdQMq+LhoLiEJoe H/+SGNk0KgRnwGulyejzJcbH9wuL5y5FOLAVrD4umiPmMTdjbFXXreeArMNHm8lt0R6Pfw 3U/nFxdDAoBI0Ko8hcguRa1utunMS88zVIFSdZXqqegQD9CLLG/+f3OUunZHmg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730843138; a=rsa-sha256; cv=none; b=p4/nQqKeWs2xlytIgTOXgiYBjOsiQgv16RwbIkwavU2135NOuuv+WnLmmMN0ITfoNrA+Zw XZHVOn5TMWdthV/kU4Q4ZDxWr5v9l43ST2PZYqEXNro7eQclddJp+a37UnWm7e6keWkT1I E1ooZafsv3avFST2QhXZFa6B0Ji7xsZ0zOvIgDPZBD37gxe5obpn1HPveZ4fDyDi1SLP49 J9ksJPv0LLX2SyogYp6M1lVOaDj1LEZisHS3jfejbQlgGqCtWB991h7KGllu5kugTPpqIW N/xcnCij0wnUAGsLlcPlqtQ4Oyty2qd0CUr/izP2Pkx/n6oVB5ulJYNEwD5JGw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Xjhhx5BGczZW9; Tue, 5 Nov 2024 21:45:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A5LjbEn095640; Tue, 5 Nov 2024 21:45:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A5LjbO0095637; Tue, 5 Nov 2024 21:45:37 GMT (envelope-from git) Date: Tue, 5 Nov 2024 21:45:37 GMT Message-Id: <202411052145.4A5LjbO0095637@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 136c2b5a8e7c - stable/14 - sound: Remove unused pcm_channel->data fields List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 136c2b5a8e7cf88f712f93453b7168094d15429b Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=136c2b5a8e7cf88f712f93453b7168094d15429b commit 136c2b5a8e7cf88f712f93453b7168094d15429b Author: Christos Margiolis AuthorDate: 2024-11-03 19:03:53 +0000 Commit: Christos Margiolis CommitDate: 2024-11-05 21:45:07 +0000 sound: Remove unused pcm_channel->data fields No functional change intended. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: dev_submerge.ch Differential Revision: https://reviews.freebsd.org/D47360 (cherry picked from commit 829951f857b73faaf28cbfcf09e861668692d8a1) --- sys/dev/sound/pcm/channel.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys/dev/sound/pcm/channel.h b/sys/dev/sound/pcm/channel.h index 0788fbe42a5a..79a8d35b22f7 100644 --- a/sys/dev/sound/pcm/channel.h +++ b/sys/dev/sound/pcm/channel.h @@ -166,8 +166,6 @@ struct pcm_channel { int16_t volume[SND_VOL_C_MAX][SND_CHN_T_VOL_MAX]; int8_t muted[SND_VOL_C_MAX][SND_CHN_T_VOL_MAX]; - - void *data1, *data2; }; #define CHN_HEAD(x, y) &(x)->y.head From nobody Wed Nov 6 08:36:17 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Xjz7j2yR8z5cJc0; Wed, 06 Nov 2024 08:36: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xjz7j2Fkfz4TDl; Wed, 6 Nov 2024 08:36:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730882177; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KlpjzgPbIL3ZqC/jNmRhJ3i6sNVX7/1/gxauDj2FTs0=; b=u++/xlG84nejFZmR/l8ycf6bxrTIYhLemD0tJ93vYGrUQXsvW8Fj+ES8VGmxrE7gMnFFJ/ nZqpo6f0CIrKPDCsCkv0PDWhM/PeFZIqQc8tandd5m0EsAqqprdQeCZ1jlgWimLVVtESfr 8A7QGXIBMO2WJmcJcM9uwW1nEOKCKNHSEOf604XLamK3mD+UhpygEuQiebDIRutKHbJ1R/ yMOfYODOC6H5AnkXB4+evit0mKFO3ZtpuJvBFkYGHmYrJL1DDo5ykdFGM4pufypkLXddUc IbgCy4wy1be1NHT76Uttbjuvwn0Y8tvDEUpsCXk6zGDN1Gp2nC6+/64kWRQE4g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730882177; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KlpjzgPbIL3ZqC/jNmRhJ3i6sNVX7/1/gxauDj2FTs0=; b=jYW8sjre1QpTr0NQRNpRevC1A2z/CMYwjacax/1MtcaA+mrJMJCAlK2nIxgXUTNcptWL7r FcepntG899NbQjjVnQUeK2VzGg85Gulwv1jhTPzTtReCrCLFGDAj8g0xdl7z/PQm5i/9s2 bTndyJe0nh2oaXsS6RBgCzpqC3BKG/rX4hcBAvV3BtD2oIiNqrzzTzuIwHML/Fjg7M0xmL wozBxUZ2vIGPbD5cjrzVTZo2lISiskYn7j5EfakqZ+TkoKMMygacYVazlJNV4saj3xVR0g J89KhsAMIVuCSbBId/cqPkwGLzA8LxGemDZOeUw3QJS5qpdyco3/fRBgavw3yw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730882177; a=rsa-sha256; cv=none; b=iLGZh025ftmCHawXFEyEwwRfidnH5hLTWxz0RlDxdvXEQxHf+8j+a4MCH3C2N51DmVX/ka Fiz2wt2ywwFA6zxsnD2bhWaoEf/6AWza3iFXd+Ad2CQViSd0sXyLyourVfNLDYoQ1f+1e0 7s58hO4ASeOg24gMu8t+z6a5lxnZjyZwMjhGkI7Th3QG5+HLNEn3AuCGC0Ws9K6f+cSkfN PSM6qNbKywHQVbhjc8LT9nSGJ+5Sw1+X9PpAXt8cymYFAGolBUh8cL2dLCOeI7YCN/I3aA yWd/QjpK3lBo5WfBcaaIXZwAkf7lY8LLWMrPO4XnEyNx37qk7jbXOkktigKObQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Xjz7j1s39ztmV; Wed, 6 Nov 2024 08:36:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A68aH4Z098397; Wed, 6 Nov 2024 08:36:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A68aHbY098394; Wed, 6 Nov 2024 08:36:17 GMT (envelope-from git) Date: Wed, 6 Nov 2024 08:36:17 GMT Message-Id: <202411060836.4A68aHbY098394@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 6c682f5c3860 - stable/14 - nuageinit: add support for OpenStack network config List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 6c682f5c3860a49cd0440599fffe1106c00ff830 Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=6c682f5c3860a49cd0440599fffe1106c00ff830 commit 6c682f5c3860a49cd0440599fffe1106c00ff830 Author: Baptiste Daroussin AuthorDate: 2024-10-29 13:17:39 +0000 Commit: Baptiste Daroussin CommitDate: 2024-11-06 08:36:12 +0000 nuageinit: add support for OpenStack network config Add naive support for openstack network config. if no config driver have been found, try to detect that we are running a VM on openstack via the smbios information, use the first iface available and temporary activate dhcp on it, to be able to fetch the necessary informations for cloudinit. While here make the rc script execute after devmatch, some ethernet device might be attached via devmatch and may be needed for cloudinit. Tested on OVHCloud Public Cloud. MFC after: 3 weeks Sponsored by: OVHCloud (cherry picked from commit 2775b9b0bcc278dd4183b57784953c26a3fcdc89) --- libexec/rc/rc.d/nuageinit | 45 +++++++++++++++++++++++++++++++++++++-------- 1 file changed, 37 insertions(+), 8 deletions(-) diff --git a/libexec/rc/rc.d/nuageinit b/libexec/rc/rc.d/nuageinit index a44761ea1d9e..54e5b1fbec07 100755 --- a/libexec/rc/rc.d/nuageinit +++ b/libexec/rc/rc.d/nuageinit @@ -2,7 +2,7 @@ # # PROVIDE: nuageinit -# REQUIRE: mountcritlocal zfs +# REQUIRE: mountcritlocal zfs devmatch # BEFORE: NETWORKING # KEYWORD: firstboot @@ -14,6 +14,18 @@ start_cmd="nuageinit_start" stop_cmd=":" rcvar="nuageinit_enable" +fetch_openstack() +{ + cd /media/nuageinit/openstack/latest + for file in meta_data.json network_data.json user_data; do + fetch http://169.254.169.254/openstack/latest/$file || : + done + if [ -f user_data ]; then + chmod 755 user_data + fi + cd - +} + nuageinit_start() { local citype @@ -34,13 +46,28 @@ nuageinit_start() fi unset drive done - if [ -z "$drive" ]; then - # try to detect networked based instance - err 1 "Impossible to find a cloud init provider" + if [ -n "$drive" ]; then + mkdir -p /media/nuageinit + fs=$(fstyp $drive 2> /dev/null) + mount -t $fs $drive /media/nuageinit + else + product=$(kenv smbios.system.product) + case "$product" in + OpenStack*) + mkdir -p /media/nuageinit/openstack/latest + ifaces=$(ifconfig -l ether) + set -- $ifaces + dhclient -p /tmp/ephemeraldhcp.pid $1 + fetch_openstack + pkill -F /tmp/ephemeraldhcp.pid + citype=config-2 + ;; + *) + # try to detect networked based instance + err 1 "Impossible to find a cloud init provider" + ;; + esac fi - mkdir -p /media/nuageinit - fs=$(fstyp $drive 2> /dev/null) - mount -t $fs $drive /media/nuageinit # according to the specification, the content is either # in the openstack or ec2 directory case "$citype" in @@ -59,8 +86,10 @@ nuageinit_start() esac if [ -n "$drive" ]; then umount /media/nuageinit + rmdir /media/nuageinit + else + rm -rf /media/nuageinit fi - rmdir /media/nuageinit } load_rc_config $name From nobody Wed Nov 6 10:10:37 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Xk1DY72n7z5cP5Z; Wed, 06 Nov 2024 10:10: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xk1DY6VjPz4cLg; Wed, 6 Nov 2024 10:10:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730887837; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=I4/Z8vdXgoYKnLReBxzqeegX6QMuMc2Og8KdQ3qYaSk=; b=o4juUT5tPUhLeTGd2Y1I9tuYarBvCSY6R+Pu/b3q3iplU3Y52kXGbxayn0eDXX5keU+cOA ErRJKU84EdZUlCriotpwtBIrxixiiLXYqU2zLJRWJYQakXpE36bE/WY0PHTEp+j+FO9FC8 acNVYa5AaYJba3YtBdBbbo8PFhvopCnrPc5ENfYhojDVj5KWPPPEiwbnq+kPyhRndx/d5a LDwEjiaxWnyvUdjeOGoanRweqAO4Y4UXWRySrZ1d0AOEd4Nxa1g83tBru1gtROzXJt/ikL TejCf3oeSsBX0neK/7BozBHFwbpClLdOi/93DDkiGhBIEhRsZNTJNiNSrpyzrA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730887837; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=I4/Z8vdXgoYKnLReBxzqeegX6QMuMc2Og8KdQ3qYaSk=; b=cOzUwp3zG87NTT+Nj9VdmSovOGHHYXq5aE4GE38Td1TWO2B2rjW+u81xCdXFHPMZc23sRT 5pfQsB8fsBSndNREjKissMY4mqdj0x/l54pzMZCOyqPlxU6rZDHi1lrL+ZO7BLzwongD3G zFWRpu4dUFiqP5F5nv4c76/NQ6nx35ATu4PMMIZ28MBPmwvVgHyVpwWuRhmglTCmYb6PvS WzUcYyEs1zoML3wD2xfuP4ag8UD9FY9XS0o9jlFFQSb/ztq+3+2I6B7XspcCWZ3fBNkaVp Dkgk3A24krACxxv9TBwMdF4yWB2lHXELvMbQbBWPOgUIg1A573PJrAavxdZ73Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730887837; a=rsa-sha256; cv=none; b=WELyAhf0TcgFnH4iOw77l1IJlMu51X8nwwKkTPlctCRe95DfxfkmLsgD2HoJjhHTIO4PfE wXf/XmKUSpWBGQsos3Qur4zIYXrGah/fh/M7bUp31PlhrVoXRwkQR4bU+lQD5njePztRog 5sCHQ4R9upyfvSZS/GW1iOkPix3CLMuULH+NUJo3jGyA+wHzyH8PWSQphg4iukdsZTyuY5 iLPxbHPeWMvFUroFpDiHy3SMe6fk3EB17nSfryZ1fdm2hbFdlVLcJqPDYJPS5Wcuuwwtpo 4fPLUn/O3TS0CNYhs2E3Es4QGCKCjNCjt7BolU5ujmDAoauMwQonQRZvTR4fkA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Xk1DY66MLzwdt; Wed, 6 Nov 2024 10:10:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A6AAbKY075152; Wed, 6 Nov 2024 10:10:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A6AAbd7075149; Wed, 6 Nov 2024 10:10:37 GMT (envelope-from git) Date: Wed, 6 Nov 2024 10:10:37 GMT Message-Id: <202411061010.4A6AAbd7075149@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 107704217b57 - stable/14 - sctp: editorial cleanup List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 107704217b5733a2cae4e0fa1940f7ac66780f84 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=107704217b5733a2cae4e0fa1940f7ac66780f84 commit 107704217b5733a2cae4e0fa1940f7ac66780f84 Author: Michael Tuexen AuthorDate: 2024-11-02 15:00:59 +0000 Commit: Michael Tuexen CommitDate: 2024-11-06 09:09:04 +0000 sctp: editorial cleanup Improve consistency, no functional change intended. (cherry picked from commit d839cf2fbb47c52d5153fb366c51bd6f6a3dd0fd) --- sys/netinet/sctp_pcb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/netinet/sctp_pcb.c b/sys/netinet/sctp_pcb.c index 0030c5385390..b7b531ab33ab 100644 --- a/sys/netinet/sctp_pcb.c +++ b/sys/netinet/sctp_pcb.c @@ -312,7 +312,7 @@ sctp_mark_ifa_addr_down(uint32_t vrf_id, struct sockaddr *addr, } } - sctp_ifap->localifa_flags &= (~SCTP_ADDR_VALID); + sctp_ifap->localifa_flags &= ~SCTP_ADDR_VALID; sctp_ifap->localifa_flags |= SCTP_ADDR_IFA_UNUSEABLE; out: SCTP_IPI_ADDR_RUNLOCK(); @@ -354,7 +354,7 @@ sctp_mark_ifa_addr_up(uint32_t vrf_id, struct sockaddr *addr, } } - sctp_ifap->localifa_flags &= (~SCTP_ADDR_IFA_UNUSEABLE); + sctp_ifap->localifa_flags &= ~SCTP_ADDR_IFA_UNUSEABLE; sctp_ifap->localifa_flags |= SCTP_ADDR_VALID; out: SCTP_IPI_ADDR_RUNLOCK(); From nobody Wed Nov 6 10:11:09 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Xk1F920xdz5cP3Z; Wed, 06 Nov 2024 10:11: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xk1F91Swyz4cQv; Wed, 6 Nov 2024 10:11:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730887869; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aP35qmTVlLVBZPunjNIb19/MtByX42RIjLPuHR80mRE=; b=ohEoR2kdQqdcCo2j9JYwm+uakb7STjLpaTRJv4Mj8uZxsrTSiBz/hhIta1tw3mcAt34W+j lfL9Tn7d5474/LEFHaxWhV3g+KyIoBg7Dy2A321taIdFLf9ctbGOmu2RyE5bPszviFIG3B IkrPqC8uB0JByua6KoTKNGANHo2lj7yoS/yOv9YrdZegXuVcVAdJmQZ4pW3A49xmB3T6Od bQInEdU4rWSDxXDF6PUTYNMAsAuX/0X7kXBUwfz+DMbLmtzqnxBljAwp4YOFFeQ0sKHuTp /Njsd37Q7DGFsdkilDCUcgNq2Ug681x/NBxpSzrZhJqcjPb+44JsT1lAS6lh1g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730887869; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aP35qmTVlLVBZPunjNIb19/MtByX42RIjLPuHR80mRE=; b=Q/OKxIrMcBmPRG//Z59u4a73xquCDyXwhJ3KqGdthyRVEsxkPriXLXRIWXr4FQaML8zQFG Ay7qV9nfi4tA5AUt6fZ935LxuRLjoDarwyerNWQfqaryjw8ss8Usvp6mCSKSq69l7sIPiQ uAkIZH/XRPMtccHNj2rRBdKSkt8RXBEkJcUY6qX1VZGURPLM5ps9eyjsXL35U+kV6uYL71 75DHooJXs77eoRCIVeB3P+S5N0g5NWfbZ4bRm5wq+d23T+YvQJq6rlp6on6lOIkiyzW9Rd /0ltJTmTZCkA1YAg5ZdmFNvpjxxWYnOWJ6QnGRAmp3G27dXYHM6gCLl21wSYSg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730887869; a=rsa-sha256; cv=none; b=IdINSVAUglMlI8QlDZwzDTGfjX3EjwwTPpmJ+ev0anzCrgHt8i2UJfv1/QNFxG4M76bQI+ m4duZhtymbPU8FA6G1UpDo1fVCABTCbg65niz7dA83fCbQIKe4HK28OTqctoSwhH285oIs NsLQ6K8w0O7+msggwn/26wz9kPyVzc/6Tb56XSrEZvSiIZidCeWXbYAgb9XuQcnEZRYfGr BJO2GLuC0icEvCRNKu1fFYO+L85P6lr+KJQsVMSgha4M6yZPqy82pZ2N0dY1DbK2g0cX5E nD8P9B6X+2RUu1fsLA/+9Xps5S6v0ezp5V01m32pvRnlEP9OOJbzKxKy+UlTpg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Xk1F90rtNzxTx; Wed, 6 Nov 2024 10:11:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A6AB9U1075477; Wed, 6 Nov 2024 10:11:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A6AB9DK075474; Wed, 6 Nov 2024 10:11:09 GMT (envelope-from git) Date: Wed, 6 Nov 2024 10:11:09 GMT Message-Id: <202411061011.4A6AB9DK075474@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 7fe14d4bb8c0 - stable/14 - sctp: don't consider the interface name when removing an address List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 7fe14d4bb8c01c9d5f25cd476a3354053569a221 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=7fe14d4bb8c01c9d5f25cd476a3354053569a221 commit 7fe14d4bb8c01c9d5f25cd476a3354053569a221 Author: Michael Tuexen AuthorDate: 2024-11-02 15:33:02 +0000 Commit: Michael Tuexen CommitDate: 2024-11-06 09:10:56 +0000 sctp: don't consider the interface name when removing an address Checking the interface name can not be done consistently, so don't do it. (cherry picked from commit bf11fdaf0d095fecca61fa8b457d06e27fae5946) --- sys/netinet/sctp_bsd_addr.c | 3 +-- sys/netinet/sctp_pcb.c | 27 +++------------------------ sys/netinet/sctp_pcb.h | 2 +- 3 files changed, 5 insertions(+), 27 deletions(-) diff --git a/sys/netinet/sctp_bsd_addr.c b/sys/netinet/sctp_bsd_addr.c index a91b0dde5967..3c6952ab6f3c 100644 --- a/sys/netinet/sctp_bsd_addr.c +++ b/sys/netinet/sctp_bsd_addr.c @@ -338,8 +338,7 @@ sctp_addr_change(struct ifaddr *ifa, int cmd) (void *)ifa, ifa->ifa_addr, ifa_flags, 1); } else { sctp_del_addr_from_vrf(SCTP_DEFAULT_VRFID, ifa->ifa_addr, - ifa->ifa_ifp->if_index, - ifa->ifa_ifp->if_xname); + ifa->ifa_ifp->if_index); /* * We don't bump refcount here so when it completes the diff --git a/sys/netinet/sctp_pcb.c b/sys/netinet/sctp_pcb.c index b7b531ab33ab..cd5479c11e6a 100644 --- a/sys/netinet/sctp_pcb.c +++ b/sys/netinet/sctp_pcb.c @@ -662,8 +662,7 @@ sctp_add_addr_to_vrf(uint32_t vrf_id, void *ifn, uint32_t ifn_index, */ SCTPDBG(SCTP_DEBUG_PCB4, "Lost an address change?\n"); /* Opps, must decrement the count */ - sctp_del_addr_from_vrf(vrf_id, addr, ifn_index, - if_name); + sctp_del_addr_from_vrf(vrf_id, addr, ifn_index); return (NULL); } SCTP_INCR_LADDR_COUNT(); @@ -688,7 +687,7 @@ sctp_add_addr_to_vrf(uint32_t vrf_id, void *ifn, uint32_t ifn_index, void sctp_del_addr_from_vrf(uint32_t vrf_id, struct sockaddr *addr, - uint32_t ifn_index, const char *if_name) + uint32_t ifn_index) { struct sctp_vrf *vrf; struct sctp_ifa *sctp_ifap; @@ -709,27 +708,7 @@ sctp_del_addr_from_vrf(uint32_t vrf_id, struct sockaddr *addr, if (sctp_ifap != NULL) { /* Validate the delete */ if (sctp_ifap->ifn_p) { - bool valid = false; - - /*- - * The name has priority over the ifn_index - * if its given. - */ - if (if_name) { - if (strncmp(if_name, sctp_ifap->ifn_p->ifn_name, SCTP_IFNAMSIZ) == 0) { - /* They match its a correct delete */ - valid = true; - } - } - if (!valid) { - /* last ditch check ifn_index */ - if (ifn_index == sctp_ifap->ifn_p->ifn_index) { - valid = true; - } - } - if (!valid) { - SCTPDBG(SCTP_DEBUG_PCB4, "ifn:%d ifname:%s does not match addresses\n", - ifn_index, ((if_name == NULL) ? "NULL" : if_name)); + if (ifn_index != sctp_ifap->ifn_p->ifn_index) { SCTPDBG(SCTP_DEBUG_PCB4, "ifn:%d ifname:%s - ignoring delete\n", sctp_ifap->ifn_p->ifn_index, sctp_ifap->ifn_p->ifn_name); SCTP_IPI_ADDR_WUNLOCK(); diff --git a/sys/netinet/sctp_pcb.h b/sys/netinet/sctp_pcb.h index 86c244c71544..1249c2233c63 100644 --- a/sys/netinet/sctp_pcb.h +++ b/sys/netinet/sctp_pcb.h @@ -510,7 +510,7 @@ void sctp_free_ifa(struct sctp_ifa *sctp_ifap); void sctp_del_addr_from_vrf(uint32_t vrfid, struct sockaddr *addr, - uint32_t ifn_index, const char *if_name); + uint32_t ifn_index); struct sctp_nets *sctp_findnet(struct sctp_tcb *, struct sockaddr *); From nobody Wed Nov 6 10:12:02 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Xk1GB6NbCz5cPW3; Wed, 06 Nov 2024 10:12: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xk1GB5wnKz4cdT; Wed, 6 Nov 2024 10:12:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730887922; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=u7Uo2xAU8UcgI03hN3N7FWpcyHsQ3tLKrj7ATSm1mqg=; b=csIBMi2NqcKH4zX4GIi+5+38eYZGhxsOMquOjVCfBlp4BfGLwMoECuW0wspGoWVRp1/FpG 2n0TDvxHEMtSqJI8ty4S5SUwhgviMitAzRdz9FaEd5ehqNAy7g9L8ixjx5JjGYALb9TDbh 8QJNfs9XpSL5MomDvRudlSabkmSxojU5o1u1OTlDBGH5bFt0oDBk18jMB9KclqCMkNzlKA RWZdvWPRrNal1ZwJU8d1OWwTBlO4ZY8uw8yJUCCOsOBnOXV7jRiEvWVksxMPQPKXfE2R2X xjfvNTRuQzVSmIHsmVHiwEyznggO3xwdhhK52YW6oHC1Hsw4hN5rhJhHirCxVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730887922; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=u7Uo2xAU8UcgI03hN3N7FWpcyHsQ3tLKrj7ATSm1mqg=; b=gdloGEWXJP2o1ks4STjf/KeusOEFkoPCnwpf8A0NwI2TCIF/ch9Ba/YbdoPfmkjZlTLiAk 0ZvEeG/nbR5tD/f0xe6LKYKcqRIR9KGIObA8LQVxNclaId6Dntg6TLis280HzEMdPRdeWh 7Qedk4ZyMGimE3ixNVNWB5EPrSQAKBuRTPNO9wpxUsY3vmaHWg/hnOqfEYYaqFjPSshKT4 44IdcZDK/yvCZILAxgysoz01Bn0xw3HGq4SF9JRy22VaLKH2H8xlelG5jxB/w0bnyVkQ4Q M8aSrX+wRNGt2CA5G7K784ODj7P8BHes45rvxmToamYS6j75Uu2z5Oj1Hx/d8Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730887922; a=rsa-sha256; cv=none; b=KZEUXaD56FEzUmFp6XySZZyq6JurdeqSkh4Tpnh7KeaHJz76BigbAVkCHhcjdmnht8PNNa GgErRws11hbXTsDOmrl5KDCcZvrHGiamdhKULB6RbceaMoHouRnxYlXcT4aT/BqSLifaOI yDA0jQAbS208OSGsH/Vxumad+qoz8sqm5EaOmLklaxg5YVogRLvsb6I9eciabDo3RNChSw Vzt8MDEkzfgYWJ2FbIEWA+en7EX4k+6+2AuyzJb2ep42tEgcDr2vJBMCh2+DCaXwYel4eh oKTKZcXfiqnr6e9A4BYCp4FqeTPWT1l3eAm24OHg//sa3vkvJenJ2RxuwwWLrg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Xk1GB5XdLzx6d; Wed, 6 Nov 2024 10:12:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A6AC2dk080580; Wed, 6 Nov 2024 10:12:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A6AC2Kr080577; Wed, 6 Nov 2024 10:12:02 GMT (envelope-from git) Date: Wed, 6 Nov 2024 10:12:02 GMT Message-Id: <202411061012.4A6AC2Kr080577@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 1550ba066216 - stable/14 - sctp: garbage collect two unused functions List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 1550ba066216ba91ac92185bc5c23a571b028403 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=1550ba066216ba91ac92185bc5c23a571b028403 commit 1550ba066216ba91ac92185bc5c23a571b028403 Author: Michael Tuexen AuthorDate: 2024-11-02 16:58:09 +0000 Commit: Michael Tuexen CommitDate: 2024-11-06 09:11:34 +0000 sctp: garbage collect two unused functions (cherry picked from commit 470a63cde4285ea4a317b0bba966514c11f4ed5b) --- sys/netinet/sctp_pcb.c | 84 -------------------------------------------------- sys/netinet/sctp_pcb.h | 12 -------- 2 files changed, 96 deletions(-) diff --git a/sys/netinet/sctp_pcb.c b/sys/netinet/sctp_pcb.c index cd5479c11e6a..5f21b2b3d0e4 100644 --- a/sys/netinet/sctp_pcb.c +++ b/sys/netinet/sctp_pcb.c @@ -276,90 +276,6 @@ sctp_delete_ifn(struct sctp_ifn *sctp_ifnp) sctp_free_ifn(sctp_ifnp); } -void -sctp_mark_ifa_addr_down(uint32_t vrf_id, struct sockaddr *addr, - const char *if_name, uint32_t ifn_index) -{ - struct sctp_vrf *vrf; - struct sctp_ifa *sctp_ifap; - - SCTP_IPI_ADDR_RLOCK(); - vrf = sctp_find_vrf(vrf_id); - if (vrf == NULL) { - SCTPDBG(SCTP_DEBUG_PCB4, "Can't find vrf_id 0x%x\n", vrf_id); - goto out; - } - sctp_ifap = sctp_find_ifa_by_addr(addr, vrf->vrf_id, SCTP_ADDR_LOCKED); - if (sctp_ifap == NULL) { - SCTPDBG(SCTP_DEBUG_PCB4, "Can't find sctp_ifap for address\n"); - goto out; - } - if (sctp_ifap->ifn_p == NULL) { - SCTPDBG(SCTP_DEBUG_PCB4, "IFA has no IFN - can't mark unusable\n"); - goto out; - } - if (if_name) { - if (strncmp(if_name, sctp_ifap->ifn_p->ifn_name, SCTP_IFNAMSIZ) != 0) { - SCTPDBG(SCTP_DEBUG_PCB4, "IFN %s of IFA not the same as %s\n", - sctp_ifap->ifn_p->ifn_name, if_name); - goto out; - } - } else { - if (sctp_ifap->ifn_p->ifn_index != ifn_index) { - SCTPDBG(SCTP_DEBUG_PCB4, "IFA owned by ifn_index:%d down command for ifn_index:%d - ignored\n", - sctp_ifap->ifn_p->ifn_index, ifn_index); - goto out; - } - } - - sctp_ifap->localifa_flags &= ~SCTP_ADDR_VALID; - sctp_ifap->localifa_flags |= SCTP_ADDR_IFA_UNUSEABLE; -out: - SCTP_IPI_ADDR_RUNLOCK(); -} - -void -sctp_mark_ifa_addr_up(uint32_t vrf_id, struct sockaddr *addr, - const char *if_name, uint32_t ifn_index) -{ - struct sctp_vrf *vrf; - struct sctp_ifa *sctp_ifap; - - SCTP_IPI_ADDR_RLOCK(); - vrf = sctp_find_vrf(vrf_id); - if (vrf == NULL) { - SCTPDBG(SCTP_DEBUG_PCB4, "Can't find vrf_id 0x%x\n", vrf_id); - goto out; - } - sctp_ifap = sctp_find_ifa_by_addr(addr, vrf->vrf_id, SCTP_ADDR_LOCKED); - if (sctp_ifap == NULL) { - SCTPDBG(SCTP_DEBUG_PCB4, "Can't find sctp_ifap for address\n"); - goto out; - } - if (sctp_ifap->ifn_p == NULL) { - SCTPDBG(SCTP_DEBUG_PCB4, "IFA has no IFN - can't mark unusable\n"); - goto out; - } - if (if_name) { - if (strncmp(if_name, sctp_ifap->ifn_p->ifn_name, SCTP_IFNAMSIZ) != 0) { - SCTPDBG(SCTP_DEBUG_PCB4, "IFN %s of IFA not the same as %s\n", - sctp_ifap->ifn_p->ifn_name, if_name); - goto out; - } - } else { - if (sctp_ifap->ifn_p->ifn_index != ifn_index) { - SCTPDBG(SCTP_DEBUG_PCB4, "IFA owned by ifn_index:%d down command for ifn_index:%d - ignored\n", - sctp_ifap->ifn_p->ifn_index, ifn_index); - goto out; - } - } - - sctp_ifap->localifa_flags &= ~SCTP_ADDR_IFA_UNUSEABLE; - sctp_ifap->localifa_flags |= SCTP_ADDR_VALID; -out: - SCTP_IPI_ADDR_RUNLOCK(); -} - /*- * Add an ifa to an ifn. * Register the interface as necessary. diff --git a/sys/netinet/sctp_pcb.h b/sys/netinet/sctp_pcb.h index 1249c2233c63..736972c007d8 100644 --- a/sys/netinet/sctp_pcb.h +++ b/sys/netinet/sctp_pcb.h @@ -487,18 +487,6 @@ struct sctp_vrf *sctp_allocate_vrf(int vrfid); struct sctp_vrf *sctp_find_vrf(uint32_t vrfid); void sctp_free_vrf(struct sctp_vrf *vrf); -/*- - * Change address state, can be used if - * O/S supports telling transports about - * changes to IFA/IFN's (link layer triggers). - * If a ifn goes down, we will do src-addr-selection - * and NOT use that, as a source address. This does - * not stop the routing system from routing out - * that interface, but we won't put it as a source. - */ -void sctp_mark_ifa_addr_down(uint32_t vrf_id, struct sockaddr *addr, const char *if_name, uint32_t ifn_index); -void sctp_mark_ifa_addr_up(uint32_t vrf_id, struct sockaddr *addr, const char *if_name, uint32_t ifn_index); - struct sctp_ifa * sctp_add_addr_to_vrf(uint32_t vrfid, void *ifn, uint32_t ifn_index, uint32_t ifn_type, From nobody Wed Nov 6 10:13:44 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Xk1J91jkTz5cPLL; Wed, 06 Nov 2024 10:13: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xk1J90jpNz4d1h; Wed, 6 Nov 2024 10:13:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730888025; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=G3t7bTQrKyHuiUy38dFsdRJ8+HdME4u78mDiAm+kDvQ=; b=iQXVJHIntlLUYMFMNiZPeW97wvNye/LbaV0pOXQPCxbelu7Q99u6thV7/v3cUp2WWjQ9nT hutQ6dRox+w5HVrS+mEq68JOfxbqt8eQlICF5iOHEKoDaqevMnyV5KWFC8m0qgxJIsXtzd //4VrKztovd3TpUoahj/jpKCzfZMxJNncV63Afp5PVQmMMKR7BWZviNJiIs2X+Nm3OJu/n gv9nCT0XS9Dr4RHeoeRy/LuaHGkNnbbFFyfEmPzUWFWFfX2sm0c+6TdQPrivGrgHO2ERVg eqdeIwsBk2UuJS7xTRd+KoJMNCcId2mT/qZUbP93547WO9IjyW4MXZM+Kf1aEw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730888025; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=G3t7bTQrKyHuiUy38dFsdRJ8+HdME4u78mDiAm+kDvQ=; b=TTonnWzNCcBpssotm1sHkIRLpQxOyIeBUbOtq9TUFXtq4rIeYJ4wB2sbIiY/B1wiAndcjw o748I9oOThuoXi+YykeqkhJUa1wO8NLdE9TvHPUIKVeq+KZnyArFn2BvNyRRXF/FgGdBTC AuhfAU/yV2yNotuVqPKQXIt1k1t8BR11rs8C3Q+tuGQep2j83BMma3fQbRFKUbCsARQRPM V3JHbdrlrRMDHtpqf7CttLilUSV7QqnVGVdjOHC9ZOHlmMXJi+DHQ/EhTf9GmySLY929lj KS6N5EmpMYoW1FUjgv3qOR4F4A8ZS/+Z8kgGD9q1SrbtRNnTvFIYYpY9jm0LlA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730888025; a=rsa-sha256; cv=none; b=OBNL/a0Ab/O8Wzf3a7B30bf1+kgmeHDPOwXPXCr7fNmvvEl6B0XPUrDM1jakCKC+8lmPXw NveBFF+EhUiDg2r1X9ghiovStkbNTYxP3wuze+potAuHYQytxXgdZnGa5RVl7qqjOn8pJh WgzVTpPaAVcim1diDurGn51XoHGwHsssunSlLaTInuJl3/ddlMi+p26E7espPvjoNUPtRS F5BVgojxC4B/qnK1Y3WFQDhxXRbcKwmzHbFgF/N/r7H1nQX268bAuLQcg1mKGRKmG7xbg9 g07tDRj23+N+JepWIW7ZLsU5y/2XnlSwpcI6kX8ligYLnwY+vuRtb92EH6ywyQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Xk1J90KGJzwwh; Wed, 6 Nov 2024 10:13:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A6ADiou083199; Wed, 6 Nov 2024 10:13:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A6ADiNi083196; Wed, 6 Nov 2024 10:13:44 GMT (envelope-from git) Date: Wed, 6 Nov 2024 10:13:44 GMT Message-Id: <202411061013.4A6ADiNi083196@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 5616189419f8 - stable/14 - sctp: improve handling of address changes List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 5616189419f82067dcd350675cbc7d27a2299580 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=5616189419f82067dcd350675cbc7d27a2299580 commit 5616189419f82067dcd350675cbc7d27a2299580 Author: Michael Tuexen AuthorDate: 2024-11-03 09:20:08 +0000 Commit: Michael Tuexen CommitDate: 2024-11-06 09:12:28 +0000 sctp: improve handling of address changes Identify interfaces consistenly by the pair of the ifn pointer and the index. This avoids a use after free when the ifn and or index was reused. Reported by: bz, pho, and others (cherry picked from commit 523913c94371ab50a8129cbab820394d25f7a269) --- sys/netinet/sctp_bsd_addr.c | 1 + sys/netinet/sctp_pcb.c | 23 +++++++++++++---------- sys/netinet/sctp_pcb.h | 2 +- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/sys/netinet/sctp_bsd_addr.c b/sys/netinet/sctp_bsd_addr.c index 3c6952ab6f3c..a10fbcc5ca40 100644 --- a/sys/netinet/sctp_bsd_addr.c +++ b/sys/netinet/sctp_bsd_addr.c @@ -338,6 +338,7 @@ sctp_addr_change(struct ifaddr *ifa, int cmd) (void *)ifa, ifa->ifa_addr, ifa_flags, 1); } else { sctp_del_addr_from_vrf(SCTP_DEFAULT_VRFID, ifa->ifa_addr, + (void *)ifa->ifa_ifp, ifa->ifa_ifp->if_index); /* diff --git a/sys/netinet/sctp_pcb.c b/sys/netinet/sctp_pcb.c index 5f21b2b3d0e4..ab120fc951b1 100644 --- a/sys/netinet/sctp_pcb.c +++ b/sys/netinet/sctp_pcb.c @@ -193,12 +193,11 @@ sctp_find_ifn(void *ifn, uint32_t ifn_index) struct sctp_ifnlist *hash_ifn_head; SCTP_IPI_ADDR_LOCK_ASSERT(); + KASSERT(ifn != NULL, ("sctp_find_ifn(NULL, %u) called", ifn_index)); hash_ifn_head = &SCTP_BASE_INFO(vrf_ifn_hash)[(ifn_index & SCTP_BASE_INFO(vrf_ifn_hashmark))]; LIST_FOREACH(sctp_ifnp, hash_ifn_head, next_bucket) { - if (sctp_ifnp->ifn_index == ifn_index) { - break; - } - if (ifn != NULL && sctp_ifnp->ifn_p == ifn) { + if (sctp_ifnp->ifn_index == ifn_index && + sctp_ifnp->ifn_p == ifn) { break; } } @@ -439,7 +438,8 @@ sctp_add_addr_to_vrf(uint32_t vrf_id, void *ifn, uint32_t ifn_index, if (sctp_ifap != NULL) { /* The address being added is already or still known. */ if (sctp_ifap->ifn_p != NULL) { - if (sctp_ifap->ifn_p->ifn_index == ifn_index) { + if (sctp_ifap->ifn_p->ifn_index == ifn_index && + sctp_ifap->ifn_p->ifn_p == ifn) { SCTPDBG(SCTP_DEBUG_PCB4, "Using existing ifn %s (0x%x) for ifa %p\n", sctp_ifap->ifn_p->ifn_name, ifn_index, @@ -578,7 +578,7 @@ sctp_add_addr_to_vrf(uint32_t vrf_id, void *ifn, uint32_t ifn_index, */ SCTPDBG(SCTP_DEBUG_PCB4, "Lost an address change?\n"); /* Opps, must decrement the count */ - sctp_del_addr_from_vrf(vrf_id, addr, ifn_index); + sctp_del_addr_from_vrf(vrf_id, addr, ifn, ifn_index); return (NULL); } SCTP_INCR_LADDR_COUNT(); @@ -603,7 +603,7 @@ sctp_add_addr_to_vrf(uint32_t vrf_id, void *ifn, uint32_t ifn_index, void sctp_del_addr_from_vrf(uint32_t vrf_id, struct sockaddr *addr, - uint32_t ifn_index) + void *ifn, uint32_t ifn_index) { struct sctp_vrf *vrf; struct sctp_ifa *sctp_ifap; @@ -624,9 +624,12 @@ sctp_del_addr_from_vrf(uint32_t vrf_id, struct sockaddr *addr, if (sctp_ifap != NULL) { /* Validate the delete */ if (sctp_ifap->ifn_p) { - if (ifn_index != sctp_ifap->ifn_p->ifn_index) { - SCTPDBG(SCTP_DEBUG_PCB4, "ifn:%d ifname:%s - ignoring delete\n", - sctp_ifap->ifn_p->ifn_index, sctp_ifap->ifn_p->ifn_name); + if (ifn_index != sctp_ifap->ifn_p->ifn_index || + ifn != sctp_ifap->ifn_p->ifn_p) { + SCTPDBG(SCTP_DEBUG_PCB4, "ifn:%d (p) ifname:%s - ignoring delete\n", + sctp_ifap->ifn_p->ifn_index, + sctp_ifap->ifn_p->ifn_p, + sctp_ifap->ifn_p->ifn_name); SCTP_IPI_ADDR_WUNLOCK(); return; } diff --git a/sys/netinet/sctp_pcb.h b/sys/netinet/sctp_pcb.h index 736972c007d8..2bec2bc32d4e 100644 --- a/sys/netinet/sctp_pcb.h +++ b/sys/netinet/sctp_pcb.h @@ -498,7 +498,7 @@ void sctp_free_ifa(struct sctp_ifa *sctp_ifap); void sctp_del_addr_from_vrf(uint32_t vrfid, struct sockaddr *addr, - uint32_t ifn_index); + void *ifn, uint32_t ifn_index); struct sctp_nets *sctp_findnet(struct sctp_tcb *, struct sockaddr *); From nobody Wed Nov 6 10:13:46 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Xk1JB2hB0z5cP8d; Wed, 06 Nov 2024 10:13: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xk1JB1xK6z4cyg; Wed, 6 Nov 2024 10:13:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730888026; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eVHpsCyKYOyTunrxfdbBXhfICW5NiMDggw4RkJiL5bU=; b=yp6+9qe9F/HrqR92Pi0Aqi4kDZvhfSCPzIIloTPEwnokNCTpZIH7YTQiQ0+9bJegVidIrv b6tc7XULsK6NEi8SdH0zs1cp+HjWvLwogP+KpIuWk5LY8nVdE7YXErYjv0LYVqI1HVbmgd YwUk5EH1nu9OqQbslBN0mN+2orIDjVYQk9VuDQCfZ2fPhKCER1qxgBqOIbChy0OW4+BAsC qRhXyp+hroE/VynIyX2TSabDddaXgnOjgIzk9F/A4RhT3bFpyOtzg0I3vB7XmPNrsAoP3m VFI2HMK08TWDzwMfQtL6xaVOpVj6VqGUMwS0HPmFBdGJznKTfp1MiXAYHHNW9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730888026; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eVHpsCyKYOyTunrxfdbBXhfICW5NiMDggw4RkJiL5bU=; b=Wis3d2ey62htZSp4tnFZRzK5l90KTJQMYITjMXDbG5tUyjxsGxwV42iKTszZBVC9jlvJkW A+rXygazBHRBk4Fju5wKVG5nC8WgyCp8n/VXGUVWWbJsw7YML1uSAUxayZ7iTwYgiioXxe QI27QfDQrMtOEhNgTcSAOxwR8qd05zJh9alqw4AHOJv2gcION1rvOn0clXW30nSRHnAuGs zz9JbppNYZlK0GKJqg6nKMnJdoXe5NlNoz1UVrHdxAp5bz6Ksskq8ul13UowRHmFm88mPO u79vKW5gJcJpjCUXK2E7YlJiOX4fSLwYdjPa6omHfJiHPj1eb8XESpjXiWdgIQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730888026; a=rsa-sha256; cv=none; b=WoZeQ6VuXjkEkEdZNdTOMu1jGmDZivdRrk0H3ee5kb9uqsET3tmI43lHVyaVmvJ7YBwcCR PvxN5DuhPKTSY4bgVn9PIFxwBsRHOwzoKF+DcSodOeHpO5rJ+GsYAK0t0G9aWNjCRG/D5C 3JWVOCQROzwXeGqsnkd5k8ZRiok9PebyzraqA+gU4i99haj4yJk16aXbPt3TkYoT/1l7wM g/JNA3pzwAkPxerVB2DeDaeY5hAjaTyam94jsxoge25TrgLrkCHGXwUvKQcYu6Xuyk7Ekd Azxli5yGbbPvAHa2vghKr7R/H0wjR+MaxckHhwuIswVShZH1F+jLe8clt9Zkvw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Xk1JB1KLmzx6m; Wed, 6 Nov 2024 10:13:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A6ADkaN083257; Wed, 6 Nov 2024 10:13:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A6ADksg083254; Wed, 6 Nov 2024 10:13:46 GMT (envelope-from git) Date: Wed, 6 Nov 2024 10:13:46 GMT Message-Id: <202411061013.4A6ADksg083254@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 69a31343a464 - stable/14 - sctp: fix debug message List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 69a31343a464be7e0e360c31448ada37611019b7 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=69a31343a464be7e0e360c31448ada37611019b7 commit 69a31343a464be7e0e360c31448ada37611019b7 Author: Michael Tuexen AuthorDate: 2024-11-03 10:20:54 +0000 Commit: Michael Tuexen CommitDate: 2024-11-06 09:13:14 +0000 sctp: fix debug message (cherry picked from commit 518a1163d0aa73b26da1dd1a4bb186042ea3c66e) --- sys/netinet/sctp_pcb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/sctp_pcb.c b/sys/netinet/sctp_pcb.c index ab120fc951b1..7f10784ce433 100644 --- a/sys/netinet/sctp_pcb.c +++ b/sys/netinet/sctp_pcb.c @@ -626,7 +626,7 @@ sctp_del_addr_from_vrf(uint32_t vrf_id, struct sockaddr *addr, if (sctp_ifap->ifn_p) { if (ifn_index != sctp_ifap->ifn_p->ifn_index || ifn != sctp_ifap->ifn_p->ifn_p) { - SCTPDBG(SCTP_DEBUG_PCB4, "ifn:%d (p) ifname:%s - ignoring delete\n", + SCTPDBG(SCTP_DEBUG_PCB4, "ifn:%d (%p) ifname:%s - ignoring delete\n", sctp_ifap->ifn_p->ifn_index, sctp_ifap->ifn_p->ifn_p, sctp_ifap->ifn_p->ifn_name); From nobody Wed Nov 6 12:32:11 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Xk4Mw0WGMz5cX9R; Wed, 06 Nov 2024 12:32:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xk4Mw00DNz3wm1; Wed, 6 Nov 2024 12:32:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730896332; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GyF1KGv20bn19ysUNOcYwEHOL0sc3eBaiyfBP7HH28k=; b=E2awCgO1BHI1TtknPJAM8jfED1FRezrJolwIoY1Uj72CTTEP3cve1ZojYZwsJYURQnDmBA P3ubWUDdvXvsoAc1+C2O2HW561ldf0Sjpf6rjuusWTzjses45bLtohsx74e+cZH7sTNCgS SJ3ie8H4u7vMf0ViLhm24+XFrbPdjxik9PEglzV6OrIg3vm9c9ViMaqwiwZHPaflfZPs4a OYcTmasUvO2Q0pVmKDQxISar5ttEDnR8Gw8aYOKgjh49+p/M9vrqLgriA89nas7e1dPJcI kleoeAxde+TR0e2R2iEcwzAUDJzy32Bs5XElAAJlYTwSD47upFbofwTlGxwqwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730896332; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GyF1KGv20bn19ysUNOcYwEHOL0sc3eBaiyfBP7HH28k=; b=h7m7hpJoaaXT4+9spTSFG2ukAnQyzzK/2CZjFnvu1pDLUmBw+KR//avoBKDQbRS/jDRcbb hmX6npJd6VZcCzPJsr9VmQ4WI8FcRXLCIg8oTojNRSXfFGuiE7nMqc8pRCHtLKwGHrSaJN CmXurb47wBFO5/GScHDlu0LL8zjpBD/QY08ucPQturRbSUmiNjnMZujGlcfAWbhTYrjMWG Syd9MZ+gqgoOadMglNJDx7AA+tT+S2Y8o/4fdVKCXpLHH1gQWX6iWIh+YxszMnOaXxNNE1 boqmbrKzliVAwupepB3jsy+UHKOUMG9IYECHJheSqFV0Y0Kyj8sIbOxl+Tsm9g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730896332; a=rsa-sha256; cv=none; b=KQoqpfrYiPbtzcjtsJpCci/dWF3t41XqkRTu5v3cbvV8pOjo122tJ4CP4Sv+0kUNwXzFdg hxNKVn8s+8nn/SX5g8t6wgO/Cn01HKziSto7DgaBN2XGnSj/8kftVekF0MVgvt+lG0HWHm 61iEi5mS7NScMsjmNChB+wbKxyxY7QWk6cIFWKsXxGYwL8y5hTaEghORt8E7a6TniCOB8e jmCNxI+ewMF1hIcYr0HmD3QR2zgmw/m0nmnoZarZ6D7ghOagQdWRtXjwSnx9Iek72u6U/8 EEw1QUsyeEQDfBbMlHEPYkIt0U+60fbVObBWpCWmkD6zoJmJoDKXBmsarWn00w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Xk4Mv6jTZz10r0; Wed, 6 Nov 2024 12:32:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A6CWBas042341; Wed, 6 Nov 2024 12:32:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A6CWBFu042338; Wed, 6 Nov 2024 12:32:11 GMT (envelope-from git) Date: Wed, 6 Nov 2024 12:32:11 GMT Message-Id: <202411061232.4A6CWBFu042338@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 651772e2219d - stable/13 - sctp: editorial cleanup List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 651772e2219d0bfbf7d78e88db294b34c19aa675 Auto-Submitted: auto-generated The branch stable/13 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=651772e2219d0bfbf7d78e88db294b34c19aa675 commit 651772e2219d0bfbf7d78e88db294b34c19aa675 Author: Michael Tuexen AuthorDate: 2024-11-02 15:00:59 +0000 Commit: Michael Tuexen CommitDate: 2024-11-06 12:31:37 +0000 sctp: editorial cleanup Improve consistency, no functional change intended. MFC after: 3 days (cherry picked from commit d839cf2fbb47c52d5153fb366c51bd6f6a3dd0fd) --- sys/netinet/sctp_pcb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/netinet/sctp_pcb.c b/sys/netinet/sctp_pcb.c index 39b7d58c8892..653edd066596 100644 --- a/sys/netinet/sctp_pcb.c +++ b/sys/netinet/sctp_pcb.c @@ -312,7 +312,7 @@ sctp_mark_ifa_addr_down(uint32_t vrf_id, struct sockaddr *addr, } } - sctp_ifap->localifa_flags &= (~SCTP_ADDR_VALID); + sctp_ifap->localifa_flags &= ~SCTP_ADDR_VALID; sctp_ifap->localifa_flags |= SCTP_ADDR_IFA_UNUSEABLE; out: SCTP_IPI_ADDR_RUNLOCK(); @@ -354,7 +354,7 @@ sctp_mark_ifa_addr_up(uint32_t vrf_id, struct sockaddr *addr, } } - sctp_ifap->localifa_flags &= (~SCTP_ADDR_IFA_UNUSEABLE); + sctp_ifap->localifa_flags &= ~SCTP_ADDR_IFA_UNUSEABLE; sctp_ifap->localifa_flags |= SCTP_ADDR_VALID; out: SCTP_IPI_ADDR_RUNLOCK(); From nobody Wed Nov 6 12:32:57 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Xk4Nn5Qs0z5cWxV; Wed, 06 Nov 2024 12:32:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xk4Nn4hywz3x5s; Wed, 6 Nov 2024 12:32:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730896377; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VveccJzYf0Gha6xYrac9QHyLyBnkbLmrrq0IoxbmhEY=; b=Enuy2MFORSS9Z1G9Dtb+jFacFX1SfhgIj46VsSWbBZiyeMdQBad9AmsV4WGabcLtoAcZ8e U4s5Wda4L6JsAt/ZSeKFLn+tmTmStBkySeMypU9L2ll1OvpZK+dCMlCxGe4cTyPEok6HSa QylcMS2XoId3BZ93zI8xu33WHRndy8RjaL+Ojx1Wlmk1YT9XwUrFEN5Uqqm1d/TsgdskCr gCBzRL6dXiwMt9CBDOpqfXOC2MGgX0wZvNAy1eu2PSyY7hrD41ATA0UIx3uUGkL5P6GkyW JpShZSKUWCUS5KUC0aG7KpJyAJLVXjWSAVIHMHNE1S87Dp/UR6swwOW0Xo/66Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730896377; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VveccJzYf0Gha6xYrac9QHyLyBnkbLmrrq0IoxbmhEY=; b=A86D/cnSlYhyooatqlz2WtvWcaYA+Hk4qBt+Pzys+rhVZ10t0mw+PaMMiYoEA2ZejP/cFL So6GEkX6jPruSJ/YcPTapY1anetBAlgYH1co/wObHtCHSOG8YlXeZfBY1YkqLiZomMdBx0 6V62RUBCpt08zVA1lnASQaYSZsqaN4R8DuB/oMRQ8QllXugBSXgp/MX2Zy2Ty2axaNTHrK Ot9trBtZRVJ2G1TrLZ62LUFrDSjQXlkB6kcDIUJDoFj+OCOYm5lKnhvRdZTjyyhw+Ji6ST pHTngU92ByhiU4fbW16FKfs2hlReTMUGsTo+09FcKJSXoVvKvcazzbTBoBwXsQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730896377; a=rsa-sha256; cv=none; b=drmO/CzAySgKmOA2V6J7j1NlNMClzZWdT8WVtB/jiD9X2SfIk1hbmiSokaVip43s2POjCH 4zjKZUn7mkXOK8pUv5cxW49hPIWtoCFoIwgDUDS4kxyktLGn90ndz2lRbjbCsV5qF6Iy0L 9vYeHMIHCAe5c+TjxMN9AWkl9PEPCHmcPyt5Um+dbxNjKKFaaguszQr+DT5p7+tsLUoCc9 gmDEyGLJmKwRMwszg7PGEMBR2slXC1b3cIMmI/vzeafomnt53sKYZESwP3GKi1u1ukjDiT 6k2b+XdvEyXaYZA05DLmOgOKCthaJSu1m5AJDsDM9ZFPi4PNRMLp+oEmF49jUQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Xk4Nn4J7tz11X1; Wed, 6 Nov 2024 12:32:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A6CWvKX042673; Wed, 6 Nov 2024 12:32:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A6CWv4C042670; Wed, 6 Nov 2024 12:32:57 GMT (envelope-from git) Date: Wed, 6 Nov 2024 12:32:57 GMT Message-Id: <202411061232.4A6CWv4C042670@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 66628552a387 - stable/13 - sctp: don't consider the interface name when removing an address List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 66628552a38751ed5c395858d1754660557674cd Auto-Submitted: auto-generated The branch stable/13 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=66628552a38751ed5c395858d1754660557674cd commit 66628552a38751ed5c395858d1754660557674cd Author: Michael Tuexen AuthorDate: 2024-11-02 15:33:02 +0000 Commit: Michael Tuexen CommitDate: 2024-11-06 12:32:33 +0000 sctp: don't consider the interface name when removing an address Checking the interface name can not be done consistently, so don't do it. (cherry picked from commit bf11fdaf0d095fecca61fa8b457d06e27fae5946) --- sys/netinet/sctp_bsd_addr.c | 3 +-- sys/netinet/sctp_pcb.c | 27 +++------------------------ sys/netinet/sctp_pcb.h | 2 +- 3 files changed, 5 insertions(+), 27 deletions(-) diff --git a/sys/netinet/sctp_bsd_addr.c b/sys/netinet/sctp_bsd_addr.c index 83ff0e1e3cc6..d190be1948ba 100644 --- a/sys/netinet/sctp_bsd_addr.c +++ b/sys/netinet/sctp_bsd_addr.c @@ -338,8 +338,7 @@ sctp_addr_change(struct ifaddr *ifa, int cmd) (void *)ifa, ifa->ifa_addr, ifa_flags, 1); } else { sctp_del_addr_from_vrf(SCTP_DEFAULT_VRFID, ifa->ifa_addr, - ifa->ifa_ifp->if_index, - ifa->ifa_ifp->if_xname); + ifa->ifa_ifp->if_index); /* * We don't bump refcount here so when it completes the diff --git a/sys/netinet/sctp_pcb.c b/sys/netinet/sctp_pcb.c index 653edd066596..1196dca8f8d4 100644 --- a/sys/netinet/sctp_pcb.c +++ b/sys/netinet/sctp_pcb.c @@ -662,8 +662,7 @@ sctp_add_addr_to_vrf(uint32_t vrf_id, void *ifn, uint32_t ifn_index, */ SCTPDBG(SCTP_DEBUG_PCB4, "Lost an address change?\n"); /* Opps, must decrement the count */ - sctp_del_addr_from_vrf(vrf_id, addr, ifn_index, - if_name); + sctp_del_addr_from_vrf(vrf_id, addr, ifn_index); return (NULL); } SCTP_INCR_LADDR_COUNT(); @@ -688,7 +687,7 @@ sctp_add_addr_to_vrf(uint32_t vrf_id, void *ifn, uint32_t ifn_index, void sctp_del_addr_from_vrf(uint32_t vrf_id, struct sockaddr *addr, - uint32_t ifn_index, const char *if_name) + uint32_t ifn_index) { struct sctp_vrf *vrf; struct sctp_ifa *sctp_ifap; @@ -709,27 +708,7 @@ sctp_del_addr_from_vrf(uint32_t vrf_id, struct sockaddr *addr, if (sctp_ifap != NULL) { /* Validate the delete */ if (sctp_ifap->ifn_p) { - bool valid = false; - - /*- - * The name has priority over the ifn_index - * if its given. - */ - if (if_name) { - if (strncmp(if_name, sctp_ifap->ifn_p->ifn_name, SCTP_IFNAMSIZ) == 0) { - /* They match its a correct delete */ - valid = true; - } - } - if (!valid) { - /* last ditch check ifn_index */ - if (ifn_index == sctp_ifap->ifn_p->ifn_index) { - valid = true; - } - } - if (!valid) { - SCTPDBG(SCTP_DEBUG_PCB4, "ifn:%d ifname:%s does not match addresses\n", - ifn_index, ((if_name == NULL) ? "NULL" : if_name)); + if (ifn_index != sctp_ifap->ifn_p->ifn_index) { SCTPDBG(SCTP_DEBUG_PCB4, "ifn:%d ifname:%s - ignoring delete\n", sctp_ifap->ifn_p->ifn_index, sctp_ifap->ifn_p->ifn_name); SCTP_IPI_ADDR_WUNLOCK(); diff --git a/sys/netinet/sctp_pcb.h b/sys/netinet/sctp_pcb.h index d349519e4ce1..9dbaf5fcde71 100644 --- a/sys/netinet/sctp_pcb.h +++ b/sys/netinet/sctp_pcb.h @@ -509,7 +509,7 @@ void sctp_free_ifa(struct sctp_ifa *sctp_ifap); void sctp_del_addr_from_vrf(uint32_t vrfid, struct sockaddr *addr, - uint32_t ifn_index, const char *if_name); + uint32_t ifn_index); struct sctp_nets *sctp_findnet(struct sctp_tcb *, struct sockaddr *); From nobody Wed Nov 6 12:33:42 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Xk4Pg06Tvz5cXMM; Wed, 06 Nov 2024 12:33:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xk4Pf6fG0z3xCb; Wed, 6 Nov 2024 12:33:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730896422; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Z89m44Lh1Ek5RGnGk5/xLCCxc9Kfvvuk8b7IPitve5Y=; b=sDPB4mWHe05uLpVgflFpaqOT5+xpeTBxenn2VUXDeArqYQc6LwQMV6+d4F/3Y5UUKeXqu2 Vtz2lHe7xmW9fGQJSE3LQTMKDW5PUbnsBVktQBWYDDa89t7HRvMaSs5laK0EGKBKw56eeL mDNbh1Oa+UtMPCh15giTlNrFFFwpYxbtdrlpzgWoh2M8yX2UIW5M0Ik2f0wpn8Sll4Ecgj kEMVJaezTAPbWSSzWhY8ZD+KrgrBJ0m6pxMmuMkDGzsrDq6QHHfacVXPr4ig9kXVhAebu3 1uLrpSDLls0MLgKMkqXrXEVFg9Ic+sPZh7efGlvxlaalZ3PZxlGkGdoklUf/SA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730896422; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Z89m44Lh1Ek5RGnGk5/xLCCxc9Kfvvuk8b7IPitve5Y=; b=r3TFxZ9C6c+WvOBpEGX/vqeu1Ke7MzC1LG77v3Cd0J/ryakjfBxmzjHoyyZ0iypedEb5dX fzl1zysZwAX2DLJMVwqGLNOH2eGZZG9Syn8/+3WYZy27TouyITcVbH6R+TYdwnHbc1Is5u X3DH8nwuClnlgjoSMZsQZ7VMns5jnxE/745SYlJ4DOWAvLWGK0s2OPWRynHtbp2OXfGHfq Ca8cQEzzOOYAj2lBWBYRkhpFk7Q+GJTA1qVYFs+7vagFihvwA+s/2xNpX6vGvjTbTADKMc DkLHuqYyU/5wzwFqcZrQVS2FdoPbWI5K9BuKfpGwPLVamAOl0Gx/MEmf5xEcug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730896422; a=rsa-sha256; cv=none; b=qGzXpw6E6cXtUdVo455m1B/n6qD7dUtVla/iNM0/i4UiBkULvpbTM7rbZqM1samGpr6UL1 tjNeCdHaV8mFNLmtMrxRI8SW/byk+GKDvq1lRuwNK2kbP4ZQvqwQ/gAzdO3opcngwJUTIs dFKfpKrMO5XCHzbCAiTWUOHEnherSeOfYMPPuJJ7OFG3RM2VdwgQuRYCySIX68ij1Usgna BPW5yBYRyw7lkpf5rVJeT1lWkv6YMwGS9cTVqTfIL/tyGrQVtRg8zYLKDY/esCQjkI40cc 3mS5+tp/yTjlfS8IOpa00zODctBa2em2tD1vuVKsoAjVmzVUhHty4zLO0RHI2A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Xk4Pf685kz11TX; Wed, 6 Nov 2024 12:33:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A6CXg4c043080; Wed, 6 Nov 2024 12:33:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A6CXgPC043077; Wed, 6 Nov 2024 12:33:42 GMT (envelope-from git) Date: Wed, 6 Nov 2024 12:33:42 GMT Message-Id: <202411061233.4A6CXgPC043077@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: e3f26ce52b71 - stable/13 - sctp: garbage collect two unused functions List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: e3f26ce52b71d4005e666ced22c0855dbc70b28e Auto-Submitted: auto-generated The branch stable/13 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=e3f26ce52b71d4005e666ced22c0855dbc70b28e commit e3f26ce52b71d4005e666ced22c0855dbc70b28e Author: Michael Tuexen AuthorDate: 2024-11-02 16:58:09 +0000 Commit: Michael Tuexen CommitDate: 2024-11-06 12:33:13 +0000 sctp: garbage collect two unused functions (cherry picked from commit 470a63cde4285ea4a317b0bba966514c11f4ed5b) --- sys/netinet/sctp_pcb.c | 84 -------------------------------------------------- sys/netinet/sctp_pcb.h | 12 -------- 2 files changed, 96 deletions(-) diff --git a/sys/netinet/sctp_pcb.c b/sys/netinet/sctp_pcb.c index 1196dca8f8d4..469c401978ac 100644 --- a/sys/netinet/sctp_pcb.c +++ b/sys/netinet/sctp_pcb.c @@ -276,90 +276,6 @@ sctp_delete_ifn(struct sctp_ifn *sctp_ifnp) sctp_free_ifn(sctp_ifnp); } -void -sctp_mark_ifa_addr_down(uint32_t vrf_id, struct sockaddr *addr, - const char *if_name, uint32_t ifn_index) -{ - struct sctp_vrf *vrf; - struct sctp_ifa *sctp_ifap; - - SCTP_IPI_ADDR_RLOCK(); - vrf = sctp_find_vrf(vrf_id); - if (vrf == NULL) { - SCTPDBG(SCTP_DEBUG_PCB4, "Can't find vrf_id 0x%x\n", vrf_id); - goto out; - } - sctp_ifap = sctp_find_ifa_by_addr(addr, vrf->vrf_id, SCTP_ADDR_LOCKED); - if (sctp_ifap == NULL) { - SCTPDBG(SCTP_DEBUG_PCB4, "Can't find sctp_ifap for address\n"); - goto out; - } - if (sctp_ifap->ifn_p == NULL) { - SCTPDBG(SCTP_DEBUG_PCB4, "IFA has no IFN - can't mark unusable\n"); - goto out; - } - if (if_name) { - if (strncmp(if_name, sctp_ifap->ifn_p->ifn_name, SCTP_IFNAMSIZ) != 0) { - SCTPDBG(SCTP_DEBUG_PCB4, "IFN %s of IFA not the same as %s\n", - sctp_ifap->ifn_p->ifn_name, if_name); - goto out; - } - } else { - if (sctp_ifap->ifn_p->ifn_index != ifn_index) { - SCTPDBG(SCTP_DEBUG_PCB4, "IFA owned by ifn_index:%d down command for ifn_index:%d - ignored\n", - sctp_ifap->ifn_p->ifn_index, ifn_index); - goto out; - } - } - - sctp_ifap->localifa_flags &= ~SCTP_ADDR_VALID; - sctp_ifap->localifa_flags |= SCTP_ADDR_IFA_UNUSEABLE; -out: - SCTP_IPI_ADDR_RUNLOCK(); -} - -void -sctp_mark_ifa_addr_up(uint32_t vrf_id, struct sockaddr *addr, - const char *if_name, uint32_t ifn_index) -{ - struct sctp_vrf *vrf; - struct sctp_ifa *sctp_ifap; - - SCTP_IPI_ADDR_RLOCK(); - vrf = sctp_find_vrf(vrf_id); - if (vrf == NULL) { - SCTPDBG(SCTP_DEBUG_PCB4, "Can't find vrf_id 0x%x\n", vrf_id); - goto out; - } - sctp_ifap = sctp_find_ifa_by_addr(addr, vrf->vrf_id, SCTP_ADDR_LOCKED); - if (sctp_ifap == NULL) { - SCTPDBG(SCTP_DEBUG_PCB4, "Can't find sctp_ifap for address\n"); - goto out; - } - if (sctp_ifap->ifn_p == NULL) { - SCTPDBG(SCTP_DEBUG_PCB4, "IFA has no IFN - can't mark unusable\n"); - goto out; - } - if (if_name) { - if (strncmp(if_name, sctp_ifap->ifn_p->ifn_name, SCTP_IFNAMSIZ) != 0) { - SCTPDBG(SCTP_DEBUG_PCB4, "IFN %s of IFA not the same as %s\n", - sctp_ifap->ifn_p->ifn_name, if_name); - goto out; - } - } else { - if (sctp_ifap->ifn_p->ifn_index != ifn_index) { - SCTPDBG(SCTP_DEBUG_PCB4, "IFA owned by ifn_index:%d down command for ifn_index:%d - ignored\n", - sctp_ifap->ifn_p->ifn_index, ifn_index); - goto out; - } - } - - sctp_ifap->localifa_flags &= ~SCTP_ADDR_IFA_UNUSEABLE; - sctp_ifap->localifa_flags |= SCTP_ADDR_VALID; -out: - SCTP_IPI_ADDR_RUNLOCK(); -} - /*- * Add an ifa to an ifn. * Register the interface as necessary. diff --git a/sys/netinet/sctp_pcb.h b/sys/netinet/sctp_pcb.h index 9dbaf5fcde71..7ef6feee9c01 100644 --- a/sys/netinet/sctp_pcb.h +++ b/sys/netinet/sctp_pcb.h @@ -486,18 +486,6 @@ struct sctp_vrf *sctp_allocate_vrf(int vrfid); struct sctp_vrf *sctp_find_vrf(uint32_t vrfid); void sctp_free_vrf(struct sctp_vrf *vrf); -/*- - * Change address state, can be used if - * O/S supports telling transports about - * changes to IFA/IFN's (link layer triggers). - * If a ifn goes down, we will do src-addr-selection - * and NOT use that, as a source address. This does - * not stop the routing system from routing out - * that interface, but we won't put it as a source. - */ -void sctp_mark_ifa_addr_down(uint32_t vrf_id, struct sockaddr *addr, const char *if_name, uint32_t ifn_index); -void sctp_mark_ifa_addr_up(uint32_t vrf_id, struct sockaddr *addr, const char *if_name, uint32_t ifn_index); - struct sctp_ifa * sctp_add_addr_to_vrf(uint32_t vrfid, void *ifn, uint32_t ifn_index, uint32_t ifn_type, From nobody Wed Nov 6 12:34:43 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Xk4Qr41jZz5cX2H; Wed, 06 Nov 2024 12:34:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xk4Qr0pQJz3xVZ; Wed, 6 Nov 2024 12:34:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730896484; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MY6GLMf/r0jFRRAXMsrp4Fcrqz3lWPb8S+mNhTakMNQ=; b=Pz5KNzSqqkt6D4P6C6znZ266/mxLG5wYy97OeCd5nHuzF6jnr02stnBlaSp9Dg5ZEhO6eM mevQHUquN6/yBDoe0nesj+bcUoRk/1MsA32oLk0SpHu/lLDzv4//MIYJ+/giDKr/EyLbyh rv//Fpwly8+vyuRdXx6Bnhwyl/EH9PpOjOcXD5WZIoOVYJjN6rFTeWzkNhfSOkoxnhkbSm 5hrKSZkW2QIMJ6FbZOQCtttiDpiRtIJEJfGiZGd3J+rUTO5lv6HAgKNOpLs8C/XA4u47n1 FQJaBNCxAW8TZ/N0bv4aQieJkPuuI15x7o336j8QUM7Rn4Ho07oebHOjP48Lvw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730896484; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MY6GLMf/r0jFRRAXMsrp4Fcrqz3lWPb8S+mNhTakMNQ=; b=fP0YicE6I8vLFvE11+lzpUcKHBW0eV/jkDXyZHVJljAxicKB+vV1FY021j/2Zt/nP6l5bL NjlcVNI8bR7lRvx7HXz1eBicWPOOn/bqYYWfuvFxwmYUXCSYl+L5b4zB9KpEgoHJRNnh+7 Rqfq+mzrjK2wGsiHOfwLW0mn1CdmZYNgbsKaCmfZ5Gc1tB1m6/1FZwWLuOW0VnzwWhYVf+ KEKuaCNpSA3QF/nd7EjAEE46COGGe34gfgjqoUt8hv20hnl7SdCqY3dxdITt6qzhcq0Thg H7kmmNVqtJ2OUWNQM6/Lxb3fVjZVdNwfkuQUptS8GFzmn3Ncn+ex82jh1U745g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730896484; a=rsa-sha256; cv=none; b=gRX/MdIhPl/iLg+A/98rvjiWD8TR+4VuuBsuSBdvPHjcFNHyGyMhA9P3bA1cIVzpFrsMCC 7XfSzzoRvU/esTi97w5Xw0IyseQf5fbE9+OXjsHv/DVNw0w6RRiq3hf9CVP417Rq6GiOLD Y6SckOb2y24FYZ/oM7EAOX/GQK9iEEJ00K1QsbfkCKOjrvo03Dq1rtEo38Cf41DhSmG791 YJfGOR6HXpvbAVRNV/WEn0yuMVxXXKme/z4r7Os2fgbjqNSuYxQsgo4xF2eZMwNeYjnrD9 VQiHvAAYpa1z8T/V/hwKPM58ICspffV4E8CKrar/YAa1wPnx0enXAUIy0prHBQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Xk4Qr0Mydz11X3; Wed, 6 Nov 2024 12:34:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A6CYhql043496; Wed, 6 Nov 2024 12:34:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A6CYhXB043493; Wed, 6 Nov 2024 12:34:43 GMT (envelope-from git) Date: Wed, 6 Nov 2024 12:34:43 GMT Message-Id: <202411061234.4A6CYhXB043493@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 331db93815af - stable/13 - sctp: improve handling of address changes List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 331db93815afb49b01f269aeff0fe899acd47455 Auto-Submitted: auto-generated The branch stable/13 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=331db93815afb49b01f269aeff0fe899acd47455 commit 331db93815afb49b01f269aeff0fe899acd47455 Author: Michael Tuexen AuthorDate: 2024-11-03 09:20:08 +0000 Commit: Michael Tuexen CommitDate: 2024-11-06 12:33:58 +0000 sctp: improve handling of address changes Identify interfaces consistenly by the pair of the ifn pointer and the index. This avoids a use after free when the ifn and or index was reused. Reported by: bz, pho, and others (cherry picked from commit 523913c94371ab50a8129cbab820394d25f7a269) --- sys/netinet/sctp_bsd_addr.c | 1 + sys/netinet/sctp_pcb.c | 23 +++++++++++++---------- sys/netinet/sctp_pcb.h | 2 +- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/sys/netinet/sctp_bsd_addr.c b/sys/netinet/sctp_bsd_addr.c index d190be1948ba..5381898ab0ef 100644 --- a/sys/netinet/sctp_bsd_addr.c +++ b/sys/netinet/sctp_bsd_addr.c @@ -338,6 +338,7 @@ sctp_addr_change(struct ifaddr *ifa, int cmd) (void *)ifa, ifa->ifa_addr, ifa_flags, 1); } else { sctp_del_addr_from_vrf(SCTP_DEFAULT_VRFID, ifa->ifa_addr, + (void *)ifa->ifa_ifp, ifa->ifa_ifp->if_index); /* diff --git a/sys/netinet/sctp_pcb.c b/sys/netinet/sctp_pcb.c index 469c401978ac..0ad898c6df69 100644 --- a/sys/netinet/sctp_pcb.c +++ b/sys/netinet/sctp_pcb.c @@ -193,12 +193,11 @@ sctp_find_ifn(void *ifn, uint32_t ifn_index) struct sctp_ifnlist *hash_ifn_head; SCTP_IPI_ADDR_LOCK_ASSERT(); + KASSERT(ifn != NULL, ("sctp_find_ifn(NULL, %u) called", ifn_index)); hash_ifn_head = &SCTP_BASE_INFO(vrf_ifn_hash)[(ifn_index & SCTP_BASE_INFO(vrf_ifn_hashmark))]; LIST_FOREACH(sctp_ifnp, hash_ifn_head, next_bucket) { - if (sctp_ifnp->ifn_index == ifn_index) { - break; - } - if (ifn != NULL && sctp_ifnp->ifn_p == ifn) { + if (sctp_ifnp->ifn_index == ifn_index && + sctp_ifnp->ifn_p == ifn) { break; } } @@ -439,7 +438,8 @@ sctp_add_addr_to_vrf(uint32_t vrf_id, void *ifn, uint32_t ifn_index, if (sctp_ifap != NULL) { /* The address being added is already or still known. */ if (sctp_ifap->ifn_p != NULL) { - if (sctp_ifap->ifn_p->ifn_index == ifn_index) { + if (sctp_ifap->ifn_p->ifn_index == ifn_index && + sctp_ifap->ifn_p->ifn_p == ifn) { SCTPDBG(SCTP_DEBUG_PCB4, "Using existing ifn %s (0x%x) for ifa %p\n", sctp_ifap->ifn_p->ifn_name, ifn_index, @@ -578,7 +578,7 @@ sctp_add_addr_to_vrf(uint32_t vrf_id, void *ifn, uint32_t ifn_index, */ SCTPDBG(SCTP_DEBUG_PCB4, "Lost an address change?\n"); /* Opps, must decrement the count */ - sctp_del_addr_from_vrf(vrf_id, addr, ifn_index); + sctp_del_addr_from_vrf(vrf_id, addr, ifn, ifn_index); return (NULL); } SCTP_INCR_LADDR_COUNT(); @@ -603,7 +603,7 @@ sctp_add_addr_to_vrf(uint32_t vrf_id, void *ifn, uint32_t ifn_index, void sctp_del_addr_from_vrf(uint32_t vrf_id, struct sockaddr *addr, - uint32_t ifn_index) + void *ifn, uint32_t ifn_index) { struct sctp_vrf *vrf; struct sctp_ifa *sctp_ifap; @@ -624,9 +624,12 @@ sctp_del_addr_from_vrf(uint32_t vrf_id, struct sockaddr *addr, if (sctp_ifap != NULL) { /* Validate the delete */ if (sctp_ifap->ifn_p) { - if (ifn_index != sctp_ifap->ifn_p->ifn_index) { - SCTPDBG(SCTP_DEBUG_PCB4, "ifn:%d ifname:%s - ignoring delete\n", - sctp_ifap->ifn_p->ifn_index, sctp_ifap->ifn_p->ifn_name); + if (ifn_index != sctp_ifap->ifn_p->ifn_index || + ifn != sctp_ifap->ifn_p->ifn_p) { + SCTPDBG(SCTP_DEBUG_PCB4, "ifn:%d (p) ifname:%s - ignoring delete\n", + sctp_ifap->ifn_p->ifn_index, + sctp_ifap->ifn_p->ifn_p, + sctp_ifap->ifn_p->ifn_name); SCTP_IPI_ADDR_WUNLOCK(); return; } diff --git a/sys/netinet/sctp_pcb.h b/sys/netinet/sctp_pcb.h index 7ef6feee9c01..ce38e7cede2d 100644 --- a/sys/netinet/sctp_pcb.h +++ b/sys/netinet/sctp_pcb.h @@ -497,7 +497,7 @@ void sctp_free_ifa(struct sctp_ifa *sctp_ifap); void sctp_del_addr_from_vrf(uint32_t vrfid, struct sockaddr *addr, - uint32_t ifn_index); + void *ifn, uint32_t ifn_index); struct sctp_nets *sctp_findnet(struct sctp_tcb *, struct sockaddr *); From nobody Wed Nov 6 12:34:45 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Xk4Qs3PJlz5cXQ8; Wed, 06 Nov 2024 12:34: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xk4Qs1W1Lz3xMt; Wed, 6 Nov 2024 12:34:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730896485; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=i23EbL71a50agSpflRQWX2cMKradk7hfHTrPJ2TXx/8=; b=D8lRQVi03CxIavV10C4F6VYZLxYOoQYgTI64vdWXUkSdCuwJkwc+cxypc7FbgQZo9QIJXp GV1SkNv9e+nYZDtnzmDd2ZOipPZUal/C8GuGt0/JOdz0iG802bwh8VrwLTT31gFUyEHW4A i/pwiRurA8HYPYe41BpKq4pKpgWjExi5TZvVfaBBitYX6dh8Ue2L1cg+cWg2OwiR5PHDTV 2WGbRtM6sHF2cKHY9Ghv2QxJ+xvGtYGAMEegrhGO7MwdHqeBrLIVQHRkJcvVqPrJbVECC1 Ki1I4mfFxSg4VylmHISeuYCa2pDJI+J6QpkrbUatTzyAqwIoWT6IINsHJtnmUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730896485; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=i23EbL71a50agSpflRQWX2cMKradk7hfHTrPJ2TXx/8=; b=iHwkZizt8KpW1Rc4TFphSd4eROFO4tJD1kbmWMPZQ6TTyRYitQ91lNMlP7XDbAH5RJqlc3 tRhcd18HY0wnIDqeTsAg4rhyWyAL7HaQueLg0MASjBiJU5rlWnUHsLdfyNnZ6sMflTiTYO ZtoQfiG29BaokpISzHXBRIwXvIjD8wv5lkKtPSigZcKdd9WB8zRu8bUpMPP4SXp/2vD5qd WajtHN+7ekGVElAC5f32o614QzvLmP13UEasjzY2Y/Z2rU4x+zp3al33Cl9ss8RS7RyJAf laRq0MonUOUnrbuYSBuq/jrMrqroeiE0eEzniBxnOjpbx8FqFyRgI9ffBIKjcQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730896485; a=rsa-sha256; cv=none; b=GfPnLUX6PiyOpM+v1/i4+si3KK0FXKZCZlc9olwJcE7xnhdD3axCOEAororC+NFQ4WqC45 obh5XBU5UjvuqGOUAbozECX38Faf236RQwsR1Yk2RZbof7ADSAfeF6LRd2W51bBf7IUTGT H++PKx8mZCKNLvi4dQd8iSOsdFr4pYrFiDTiVttvilkjiXVHmytxC8CToN/aIKzHOLdmmi HbKgAEJxpI9naX05GXB35ZBhTG9gBl0H5lQB/G+l+r4EvoKtXAOTdQFbDZR6z0ksqVv3LG hrcI1AFM2AbFmBafphkdhnVJ+CPp6XwFvS6YKny2JaMmPg2f6sI3A/0eVzDyHg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Xk4Qs16FPz11Hc; Wed, 6 Nov 2024 12:34:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A6CYjhu043541; Wed, 6 Nov 2024 12:34:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A6CYjvB043538; Wed, 6 Nov 2024 12:34:45 GMT (envelope-from git) Date: Wed, 6 Nov 2024 12:34:45 GMT Message-Id: <202411061234.4A6CYjvB043538@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 0e8faabc270f - stable/13 - sctp: fix debug message List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 0e8faabc270f89fbc54bbc118b2ebe2a38364375 Auto-Submitted: auto-generated The branch stable/13 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=0e8faabc270f89fbc54bbc118b2ebe2a38364375 commit 0e8faabc270f89fbc54bbc118b2ebe2a38364375 Author: Michael Tuexen AuthorDate: 2024-11-03 10:20:54 +0000 Commit: Michael Tuexen CommitDate: 2024-11-06 12:34:21 +0000 sctp: fix debug message (cherry picked from commit 518a1163d0aa73b26da1dd1a4bb186042ea3c66e) --- sys/netinet/sctp_pcb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/sctp_pcb.c b/sys/netinet/sctp_pcb.c index 0ad898c6df69..ddcf0c4bc7b0 100644 --- a/sys/netinet/sctp_pcb.c +++ b/sys/netinet/sctp_pcb.c @@ -626,7 +626,7 @@ sctp_del_addr_from_vrf(uint32_t vrf_id, struct sockaddr *addr, if (sctp_ifap->ifn_p) { if (ifn_index != sctp_ifap->ifn_p->ifn_index || ifn != sctp_ifap->ifn_p->ifn_p) { - SCTPDBG(SCTP_DEBUG_PCB4, "ifn:%d (p) ifname:%s - ignoring delete\n", + SCTPDBG(SCTP_DEBUG_PCB4, "ifn:%d (%p) ifname:%s - ignoring delete\n", sctp_ifap->ifn_p->ifn_index, sctp_ifap->ifn_p->ifn_p, sctp_ifap->ifn_p->ifn_name); From nobody Wed Nov 6 20:21:54 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XkGnt4hKpz5bn06; Wed, 06 Nov 2024 20:21: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XkGnt4D7gz41Dp; Wed, 6 Nov 2024 20:21:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730924514; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hILWpYEBnU09bTatA6p227oG+NEhJpEz/BxrHd3Eawk=; b=GQjcWUpbX9JrBmIUte7irC6frBnozIlZ3+mbmJzbj04uGPM1cc3Bjpl0Qx8o9oLnosr1wV 1/gmJMpBDNED+pTAQzZGiXhvbsr6cqV9iLepuMNJu+cyPbZhLNikWalGomcRtpzXaAw5BF b7QdCIOBsAfp8XV1rcEXKm+fmIb71/Mqvb2yVxMso1tcIZR+h58Z2sXrrzW2n1UAWpDqcb /ZmszzmbI3eXvcbiMyb/aIiGR9aBHbBgLjDCWga1spEIq4SxmeD9zYxDL0EkXMEHe5obTl 99FZV4GaT+jrP4gT1fK0KQqk9BAGByS2sOmKLGL6//1gtve9ho9ztz/ByZjGaw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730924514; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hILWpYEBnU09bTatA6p227oG+NEhJpEz/BxrHd3Eawk=; b=bFi7UTEh3rluNLN+dpJi53p1vVjvplNxZFyKK97owEH+v1T2aYNOuVtay8BAgW1wIsEKcr 96jAvbbnbpU0o9RwqgEuk1UVPuKWVd3XdkBzRmVliAsOD25okxI+ucQBZe1Coq7ouiXRym XF0RnXk8eZh9S1FmdKHv/+AAkebxfBGHt5vAdfuNLQ4x76D2RkVLdwu2biwCo7RGrI2OMK Z3tL8q9Q7qu0pCFmMCMBnP65tb8gI91GeSEjl4AFOYrlmsXKI1lYoEMkcx581Fe9V2oR+Q 7F+9IVNzDaMNYrtNP5gPHXABYheQpgmmsPCJnmeUxP0++b9fjY34t3vLSyn1iA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730924514; a=rsa-sha256; cv=none; b=ZhHctR982b7eW/dnwq6GaV1aDmktG4c4yR8hEsOxtG01D1GbIO+qRggpIf0I43cBXm/ub5 LkR7twWjHHM7AQ2mb+oUaxOpeobBLh4zp33GmgycvcODKKqtjKVO+mFezzOaXentNe4C+P fACDyKkwudszvub/YnFQzGoRRLsdrR1cFVPq9azj/ixtKm6EEBtxRUSQKRTHLDROoQ7M7e mTIAozjh+JOKK4hBksBxoGIe57pfMayF5GeSLznY6F4cWQTP/VfIBLCzPX3myW3zLEzJPb cstxBPm3g5ezAQF28zec8p7K03eLiYwhaslMk32x/pKbkUpZWgDGU/Yv4yB1ww== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XkGnt3hLkzFS8; Wed, 6 Nov 2024 20:21:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A6KLsAQ017998; Wed, 6 Nov 2024 20:21:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A6KLsf1017995; Wed, 6 Nov 2024 20:21:54 GMT (envelope-from git) Date: Wed, 6 Nov 2024 20:21:54 GMT Message-Id: <202411062021.4A6KLsf1017995@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: de45d36ffb60 - stable/14 - bsd.sys.mk: for clang >= 19, similar to gcc >= 8.1, turn off -Werror for -Wcast-function-type-mismatch. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: de45d36ffb604798c22f7ee556d774490902c1e1 Auto-Submitted: auto-generated The branch stable/14 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=de45d36ffb604798c22f7ee556d774490902c1e1 commit de45d36ffb604798c22f7ee556d774490902c1e1 Author: Dimitry Andric AuthorDate: 2024-07-30 18:28:51 +0000 Commit: Dimitry Andric CommitDate: 2024-11-06 18:52:10 +0000 bsd.sys.mk: for clang >= 19, similar to gcc >= 8.1, turn off -Werror for -Wcast-function-type-mismatch. PR: 280562 MFC after: 1 month (cherry picked from commit d575077527d448ee45b923fa8c6b0cb7216ca5c5) --- share/mk/bsd.sys.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk index a1be8a8a2225..061c6b36f84d 100644 --- a/share/mk/bsd.sys.mk +++ b/share/mk/bsd.sys.mk @@ -88,6 +88,10 @@ CWARNFLAGS.clang+= -Wno-unused-const-variable .if ${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} >= 150000 CWARNFLAGS.clang+= -Wno-error=unused-but-set-parameter .endif +.if ${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} >= 190000 +# Similar to gcc >= 8.1 -Wno-error=cast-function-type below +CWARNFLAGS.clang+= -Wno-error=cast-function-type-mismatch +.endif .endif # WARNS <= 6 .if ${WARNS} <= 3 CWARNFLAGS.clang+= -Wno-tautological-compare -Wno-unused-value\ From nobody Wed Nov 6 20:22:10 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XkGpB2wVZz5bnHZ; Wed, 06 Nov 2024 20:22: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XkGpB2TdFz41v3; Wed, 6 Nov 2024 20:22:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730924530; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/HAIIRdMWmnPJzHATpx2MPcFL1fSLCwxNGiiXfSLGPo=; b=eVNByzcw1v8tDe+bL/Kb+PGoHh/rT9TEIdlV8x0X9fr9LrdJbAuCXlpdvhuigkWRuIfo48 8Fd9DolwaPu9QfK3sPECwBEwNFBgGVU2IiWpVjVFAvUYY3iEktqHWtMLk2Zwk52mWKLxim gq7d5KPjyr+3DnJwoJQ1XpwYQTYYTZJjbGXyKDliGgVLYnevvGTDIMd0jKwkRr9mD49Ui2 9DiGvo3bG5UwRuR7lSycTLFFi6Np747kcJeDDTr966SYRnfyQK59ShFNQ5tL7155mIZoeV C8k9rws/Pc9bfIlfNC5aPwhFxGmO5g9ZovGyaWcv3pIrzzvy3nr7jLxr906mNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730924530; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/HAIIRdMWmnPJzHATpx2MPcFL1fSLCwxNGiiXfSLGPo=; b=BDmMpSCtErGddxlqwwW3ujRt9SZyFhgxkQq6xPuOjmXRcSf4VwXQ2zeyv8uznHFwF92uHX /F9kmElmdsUncrRZ5KR7kcdeCX+iefmyxMz19kPs5JtQG/jglDKmMrSkn7nRjdgrTnAh7z 9zLAwZT6fYHbMaJQWS+ZjvwGgrpXa9U5bCYGSoG/ZsZ+RruogvhU4Ht1UQNpNB5ZD47q3X Tff1O81Vz+ySRIy25LSpAdBtjFzSekX7vUoXmvRzJvD0lke1H0+HgK7z/szL2sMOPx1RZi ApMwVP+kX8BjWle/AYFhlfBOMR5OLeHxRpyPBGH/i7VrpxTkfPaSxtpicFouyw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730924530; a=rsa-sha256; cv=none; b=RGQoeYtzHXHwlNrmIZl+oC6VRFhHUpiAoGHSC6He8N7zcJEqZL6BqruST180j9YNsHz+OH a6IpVzjGx4mBx61ZmmWVp17GSAHc1rai/m8brH1INqxMkRjFu9g8a8cuyFb4pG/9eWg1LL cmsdsd/s/65dH4ZfpDZYOO+6HIbJaxQ35X+m9x3hBXmcmUlXIlI2R1kLOcvDH769N+mcvI 1zq6sP4+xjFdW1FdBgOj1hd07tA3rZDOvH8BOgRnMdIdQdBUf1JJhl3LquMBP+rFYkAGfJ uipYI+CRLBytsqDPQKcYA4KDmqeHjQraATFTuiXg4PcSGjCYtWZ9BF4ao+4mbg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XkGpB24h3zGJd; Wed, 6 Nov 2024 20:22:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A6KMAs0018270; Wed, 6 Nov 2024 20:22:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A6KMAOr018267; Wed, 6 Nov 2024 20:22:10 GMT (envelope-from git) Date: Wed, 6 Nov 2024 20:22:10 GMT Message-Id: <202411062022.4A6KMAOr018267@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 5221ce15aa9e - stable/13 - bsd.sys.mk: for clang >= 19, similar to gcc >= 8.1, turn off -Werror for -Wcast-function-type-mismatch. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 5221ce15aa9e0097b365b305c20d05154b67571c Auto-Submitted: auto-generated The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=5221ce15aa9e0097b365b305c20d05154b67571c commit 5221ce15aa9e0097b365b305c20d05154b67571c Author: Dimitry Andric AuthorDate: 2024-07-30 18:28:51 +0000 Commit: Dimitry Andric CommitDate: 2024-11-06 18:52:15 +0000 bsd.sys.mk: for clang >= 19, similar to gcc >= 8.1, turn off -Werror for -Wcast-function-type-mismatch. PR: 280562 MFC after: 1 month (cherry picked from commit d575077527d448ee45b923fa8c6b0cb7216ca5c5) --- share/mk/bsd.sys.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk index 83d3004adf90..d28bf09f2cb2 100644 --- a/share/mk/bsd.sys.mk +++ b/share/mk/bsd.sys.mk @@ -95,6 +95,10 @@ CWARNFLAGS.clang+= -Wno-error=array-parameter CWARNFLAGS.clang+= -Wno-error=deprecated-non-prototype CWARNFLAGS.clang+= -Wno-error=unused-but-set-parameter .endif +.if ${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} >= 190000 +# Similar to gcc >= 8.1 -Wno-error=cast-function-type below +CWARNFLAGS.clang+= -Wno-error=cast-function-type-mismatch +.endif .endif # WARNS <= 6 .if ${WARNS} <= 3 CWARNFLAGS.clang+= -Wno-tautological-compare -Wno-unused-value\ From nobody Wed Nov 6 21:52:23 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XkJpH35qLz5btNw; Wed, 06 Nov 2024 21:52:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XkJpH2cmyz4Cps; Wed, 6 Nov 2024 21:52:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730929943; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4uyC6wWzfQx02RWN8SnJzClvkrQjJuncIeiX4YkIlzg=; b=knxOHBROpFrXIA82QFy44J4GIwG+GGhT8vyaV7GjYqeG4AeU01AOzJk+ytc79o4kNE4sWw qYm7fv8y4xFfA5fBUoZ8nH0EDKlUJODVPZXrStTFT/c67bC06AO+p3VOz/pCtEZ52ZVUbC 28N80A59a8j+y5XD90iDjzQ6FshVPuP+EE9zoU0G+osBRSgrmwvwhKuiuIsrRAcxm+uQPp RChgqnLvFJXfmk338v1SKbl276KzdVLSy7Egu99yy/X+lUnft2jMNj3bVXP5H7JHkpYjQJ eu+vupu73sae08igU094mynTT4Dt4Rz1myLAV0NIdwWakS/v7WIzP1dBgscInw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730929943; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4uyC6wWzfQx02RWN8SnJzClvkrQjJuncIeiX4YkIlzg=; b=I/zY3lUwzIAjVMtbLl9u449bsljnHGD+CHKifbduAEOlojiriz8WOBHyBQszF+dl6SIyR+ Fv/MF76/wXQ5HzR7P1AoCUXvSa27OvYTSoKzVpJ2+fYBjDPIOcBEtD51PBnGctCQpbaxZU 2gXYUjyJ2BLbRBfCI7y06C3czhowwjpRj4avsVLxkyHLoFBFSz0u0aSROFW7gyPuMRhMVG jElpp476x0aK7UFbNpdha9URib09NxrVLxqj2qTxmj4+rMB954Qtq3HBQbKT0knFkZRFuM 4Ei2bwQroVdagbUPhA1RS4Iod/fSi3opjk/v7NthlTPI8TQsMxC/d9zN77VbYA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730929943; a=rsa-sha256; cv=none; b=fcPi0eGYcEvlG0GDc0wN2pQODsXqpDDouQkvb+iaw0D6f86EQLqdRSW8X+QG8v0rlZbB6U Nx3v3UNRQUJMEGhXRlne7yvieJDkaY2B3BYt/FDhMleAVf/DhTGFHGMR3hk2W/FxttmoZT x7hBx1OTaaDAeIdmt/1JASuFuhxGca+IkA5HV/JuoqQhjlZEa68V7s2zfGtD1rfgPGBIYk P3BPw3jAeVb+z+6+kpQayx+ZXjodBCPxTeEsa4JyK/PUcFaeaimSSi2Mju4AYAr75dhpo0 j6Wn3FmMyCnZmDSHBmluNA0Ht21NZW7qwB3YrYrOu+T3aTtKJncxQyKqwj3pqA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XkJpH2CcczJRp; Wed, 6 Nov 2024 21:52:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A6LqNBx082323; Wed, 6 Nov 2024 21:52:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A6LqNdl082320; Wed, 6 Nov 2024 21:52:23 GMT (envelope-from git) Date: Wed, 6 Nov 2024 21:52:23 GMT Message-Id: <202411062152.4A6LqNdl082320@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: a4c23ad43007 - releng/14.2 - bsd.sys.mk: for clang >= 19, similar to gcc >= 8.1, turn off -Werror for -Wcast-function-type-mismatch. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.2 X-Git-Reftype: branch X-Git-Commit: a4c23ad430077234207d13e7f6341aad442a67ce Auto-Submitted: auto-generated The branch releng/14.2 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=a4c23ad430077234207d13e7f6341aad442a67ce commit a4c23ad430077234207d13e7f6341aad442a67ce Author: Dimitry Andric AuthorDate: 2024-07-30 18:28:51 +0000 Commit: Dimitry Andric CommitDate: 2024-11-06 21:51:39 +0000 bsd.sys.mk: for clang >= 19, similar to gcc >= 8.1, turn off -Werror for -Wcast-function-type-mismatch. PR: 280562 Approved by: re (kib) MFC after: 1 month (cherry picked from commit d575077527d448ee45b923fa8c6b0cb7216ca5c5) (cherry picked from commit de45d36ffb604798c22f7ee556d774490902c1e1) --- share/mk/bsd.sys.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk index a1be8a8a2225..061c6b36f84d 100644 --- a/share/mk/bsd.sys.mk +++ b/share/mk/bsd.sys.mk @@ -88,6 +88,10 @@ CWARNFLAGS.clang+= -Wno-unused-const-variable .if ${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} >= 150000 CWARNFLAGS.clang+= -Wno-error=unused-but-set-parameter .endif +.if ${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} >= 190000 +# Similar to gcc >= 8.1 -Wno-error=cast-function-type below +CWARNFLAGS.clang+= -Wno-error=cast-function-type-mismatch +.endif .endif # WARNS <= 6 .if ${WARNS} <= 3 CWARNFLAGS.clang+= -Wno-tautological-compare -Wno-unused-value\ From nobody Wed Nov 6 22:46:38 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XkL0v0t3cz5bxTs; Wed, 06 Nov 2024 22:46:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XkL0v0Lrqz4J3T; Wed, 6 Nov 2024 22:46:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730933199; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8BtkITJEYb7rgXSDsexpeHtK2e7/1+q/10leS9yNGC4=; b=yiaW/1wKYQGaRmvB9D3QMO8tzcdx6zuuhUbFzgjvpwxZpx5yAL4KN/P9QbotB2L6J/Gbjp dOU8Z8J8Z9VrgRWhsjDF3ht/Jjk8PjKIxZg/EPj4C4netE457zzKMoNMc/QAw1JILroj4a CB4KW17pavkEBwEk/rgntqpsgA/FJSBpKyz1N4ZJil2cSUITJP2kK9+a4C5duNkPI9EgkY m5xqazWqURd2o5tdNn/49jk/Eb5knwZS5tKI9bfvHGE/5n4DKyCcOvtU1+TVHElhU6AhpJ LKQxCzC2Gd8/AcuAsVIMlsaPzeMhWlwQQJwzL5sYuBn6Y4oEtt9DgH+H4UVCpg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730933199; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8BtkITJEYb7rgXSDsexpeHtK2e7/1+q/10leS9yNGC4=; b=gjuzPEQjaA3mxcxXWtSaGXIviaerGPQT4kTDw2hspjn4OTGOe4RwRH0h3ibi4DyRBv0xpG zsjNxRdbTi5fmb1YxagS15xqhsD9Pw5IzocLsfWsVJMv7odv1hbQh29ptkTLNBbmBxcCqC CMfwIt/GUCFX+OFbrF7YoBTRcCKTzZ0ZgssokRVZN7KFFY4mXmpwH7PWTEDjS/32IycJs3 dMJfZTIq9emCmaeQ4YfsNuLH791cFMxoZgfbTa/rM4DRO3p9rmsK3iB+d3+e4nbAchrPTt /n6+AavxPc7jIM4KZVOj18sk7QO3nJy2I0Op4ocUrwO1ZcWzaHs89yToomVGwA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730933199; a=rsa-sha256; cv=none; b=qtlABDPci+mCrALa98t23nSPx1HPZSR8l4FwnWDpgCx+zZhfetdaemUgI4NFm6gqoSQIzX hUzyedW4GHQPnmDW0U9Eh0kmv51qAaP5nUhm9/RAlE5LjtIOMQU+OIaC8+byNt7PkYzE0P iuRKP/wPPGdQ2aZ7uYWS1MTukdNL3RlCJRGc3SAeyzWgsW5l3/FFi7fo6zAHFtXiX4MwHt GJ+86JjagnFcCR5Fk/J/xJyvjC8fHXR4DvGkREbahcEaHpKGWgVhOHRq7g+ur+7DNyfEC1 gUBQNPoQ1aoWXT7V6yc1Ou8jjkHmF74WIgyzR0eiuz13a2RXYQNJXrZZHCo+7g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XkL0t73pPzKND; Wed, 6 Nov 2024 22:46:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A6Mkcwi078555; Wed, 6 Nov 2024 22:46:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A6Mkc4H078552; Wed, 6 Nov 2024 22:46:38 GMT (envelope-from git) Date: Wed, 6 Nov 2024 22:46:38 GMT Message-Id: <202411062246.4A6Mkc4H078552@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: ba7844e4c915 - stable/14 - release: Include -dbg files in dvd image List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: ba7844e4c91505e397396ab981a0032699b0cd70 Auto-Submitted: auto-generated The branch stable/14 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=ba7844e4c91505e397396ab981a0032699b0cd70 commit ba7844e4c91505e397396ab981a0032699b0cd70 Author: Colin Percival AuthorDate: 2024-11-05 21:35:17 +0000 Commit: Colin Percival CommitDate: 2024-11-06 22:46:28 +0000 release: Include -dbg files in dvd image In 2016, commit 8834318685bc reworked the code for excluding -dbg files from install media, and in the process accidentally broke it for dvd images ('grep -v' should have been 'grep -vE'). FreeBSD Update builds later began to depend on this, and in any case since DVD images are intended as "include everything" images there's no point excluding those; so remove the (broken) filtering from DVD image builds. Sponsored by: Amazon MFC after: 2 days (cherry picked from commit cdfd0600dc8882f0a0d0e6d9a1cdcf926edba6d6) --- release/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/release/Makefile b/release/Makefile index 9ca32e168fe7..3ae3a28a1104 100644 --- a/release/Makefile +++ b/release/Makefile @@ -245,12 +245,12 @@ dvd: packagesystem -DDB_FROM_SRC ) # Copy distfiles mkdir -p ${.TARGET}/usr/freebsd-dist - for dist in MANIFEST $$(ls *.txz | grep -v -- '(${base ${_ALL_libcompats}:L:ts|})-dbg'); \ + for dist in MANIFEST $$(ls *.txz); \ do cp $${dist} ${.TARGET}/usr/freebsd-dist; \ done .if defined(NO_ROOT) echo "./usr/freebsd-dist type=dir uname=root gname=wheel mode=0755" >> ${.TARGET}/METALOG - for dist in MANIFEST $$(ls *.txz | grep -vE -- '(${base ${_ALL_libcompats}:L:ts|})-dbg'); \ + for dist in MANIFEST $$(ls *.txz); \ do echo "./usr/freebsd-dist/$${dist} type=file uname=root gname=wheel mode=0644" >> ${.TARGET}/METALOG; \ done .endif From nobody Wed Nov 6 22:46:40 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XkL0w21YRz5bxTw; Wed, 06 Nov 2024 22:46: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XkL0w1KJdz4HsK; Wed, 6 Nov 2024 22:46:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730933200; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Bsht9pzBn6KQTUAoZ8605LsO7J9aLc7axmClaun4/KU=; b=UShWEX0hJwl9ConKVtj/O7t9P++sU/pllaY4CP2hCBkk8DAnULMeCUtMQxyySA7UOhaLfh B3ZomcOygqmg9t8GcEw2vZyWJ43cHnek4r8qKBUcP7tyimmQBxK37pso1rYM/403QIbLL6 Eg1114FVeftpBKzgHWUhBYPpp6cqja9PvHH2gcx4hErDhCHPUYYq3ym0EXhrHiZr2/q2uO hs1Kvvq+froA6im+8AjnuzRNUo0YPCgTatnhAkF6xkjsxqwIYPzkXRksZpnGWBK8+Xskj7 9xVaonCT2nQxDVd+ju4ilL6YlYX2sx0z9C17sDOvJOAOYLYSWvZ9/G/4FZZiuw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730933200; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Bsht9pzBn6KQTUAoZ8605LsO7J9aLc7axmClaun4/KU=; b=c4ZtujTJXg8OMMG7urKXhgWlbcewny9pw4HBILSOsgYgH4GLBMG7nXaGUqEhiGif6wF9U3 5F1ypeNm17FOcSAadLLk2N1kgE3Ka6DK8vHha8/sgqCQ6IGeoh0Y/u8f9xrbIAedBGedIP r7WW8tC292fwJsQjl2EfKxN9umcqT+j+QHYl686WzFjB65i19RXP2xIjbiwyiA3EdkzFCS 9pPWKJJ/5W0peLS3eJvSnDCqdWdODqYrOJxExXdYgmgbPkBBOdimKAFqTxQrXsnrAEZYu/ WyqnBhbfHGg4mBkh6q/AEv2wTQbT0Zaobv0g8TR4SV84KZPfjHVc9Ldw80U7eA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730933200; a=rsa-sha256; cv=none; b=S1IUKoZ4TFWXc+b8gssWUAMH62mbCe98YRH5IL2U8Gh4IdR2w147KlLwj2RYbC/ep6wXKx TRkF7uHI2GPpVISQGbjDHmtykg/kPGmu5LobgaN/3YlHixuMMzCJ3+GM+M7awVzLtf6HJO 9cu7jCdKhCAOVo7BM3Osw4TF6xILBRMzI9LTyXkvlHgkPLRreZ9lcxGoeaaUTYId0TTP0l jGUIIknnCnA1JQiDcAKHGvwtCn7ka6bcvf4vvPwmOqUa+dxe1wKmSAanti7tPuSM6hwD/J dGfc8nKmTJQWWi4wchhiP1wAhsrz/oADKRjYAENh7RzrPrXPvXZUfmxNrON4Xw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XkL0w0v6JzKjY; Wed, 6 Nov 2024 22:46:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A6MkeNS078607; Wed, 6 Nov 2024 22:46:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A6MkexP078604; Wed, 6 Nov 2024 22:46:40 GMT (envelope-from git) Date: Wed, 6 Nov 2024 22:46:40 GMT Message-Id: <202411062246.4A6MkexP078604@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: ce988aa3e800 - stable/14 - release: Remove useless ls List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: ce988aa3e80019566bf5df4cfd73f7b7195756f2 Auto-Submitted: auto-generated The branch stable/14 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=ce988aa3e80019566bf5df4cfd73f7b7195756f2 commit ce988aa3e80019566bf5df4cfd73f7b7195756f2 Author: Colin Percival AuthorDate: 2024-11-06 22:24:34 +0000 Commit: Colin Percival CommitDate: 2024-11-06 22:46:28 +0000 release: Remove useless ls Replace "$((ls *.txz))" with "*.txz" Reported by: jrtc27 (cherry picked from commit e166fea685da4ac6a6891f10b07f98d0e9fcfce3) --- release/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/release/Makefile b/release/Makefile index 3ae3a28a1104..be0abf84de23 100644 --- a/release/Makefile +++ b/release/Makefile @@ -245,12 +245,12 @@ dvd: packagesystem -DDB_FROM_SRC ) # Copy distfiles mkdir -p ${.TARGET}/usr/freebsd-dist - for dist in MANIFEST $$(ls *.txz); \ + for dist in MANIFEST *.txz; \ do cp $${dist} ${.TARGET}/usr/freebsd-dist; \ done .if defined(NO_ROOT) echo "./usr/freebsd-dist type=dir uname=root gname=wheel mode=0755" >> ${.TARGET}/METALOG - for dist in MANIFEST $$(ls *.txz); \ + for dist in MANIFEST *.txz; \ do echo "./usr/freebsd-dist/$${dist} type=file uname=root gname=wheel mode=0644" >> ${.TARGET}/METALOG; \ done .endif From nobody Wed Nov 6 23:29:11 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XkLxz2537z5c0Qs; Wed, 06 Nov 2024 23:29: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XkLxz1Zmpz4LBy; Wed, 6 Nov 2024 23:29:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730935751; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OJB3wuRKsQvtf/gigU7/xmwGFTXna4myec5qAZeQsic=; b=VUqu3mz+9Gwxmdmc5QIklawaY0JtP3Blb2ULzgWPU72Hlv+kEBWy0ygQuHYWI3n/6xZhFs L4w/sd6ZPgknav1hgL/V4xLougnBGKSZpiyJyXFPzA3pwBKLDi8AochFIUbD/dJ9/QD6NU mQBM6/FPYtTLARjyMBeVYZmR3mum7m4nuo6JrfkHJsq9Eeet/grLszrKZwKZQLD9gI3diO PO8hORjDxuOw23FcfByvQXAfK8fbqLWmAEiMksyMA+DBUV1IpA8zHEVfsN1SsfW6tLLAtI zwa7TJTZSioxndC8gTWOPDMy4vI+X9UCUHHXwdSLYWe2Zkv+nhJdPUYyzJHKwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730935751; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OJB3wuRKsQvtf/gigU7/xmwGFTXna4myec5qAZeQsic=; b=EegN/5Ntu6rzV7gfS+W0WzGGO4WpIOf25P/rAWRUNvdBlJ6fbqJ764AQiXXrzK44ONLZxw TCjM4jS1RpvfA1UhMc2oR56b9LVmAiSQ8jVonQklap5DAcBoyxp0Eq4sU/yRvj9HoCeA+e qeHjfFOvkhKV1LVof6TcF/r2qiXosdFKTfLMMWwCOuow8qSY4LpJ6GrYA+qGVMvzmg7k5h 3DCo6682ijRvFgYiHHFBr7xoihFnGHJhBbeXZtxRhCXUsXm1At+nhEVyl/onWIE59CsvWm lCRHgZW04Xxs6WiasQoqjl8UT36XzaIiJRJAko6iDh6mzz64Ke30EU9gA8Go5w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730935751; a=rsa-sha256; cv=none; b=ADVteo2Ej8lH7By0oQ8GZjrV8y3IUod98PwUZDiWBCOGkAE/RVVG1smKC1XtyvA4o0gdRk C9G77i0hoY7MXPU7sesulsR4RHuzGclOHDFRifAlz0lHZp81N6rUy7MNLh7sX3BWqJrwKt omzaq+k5OhnXc5Gu98LtR02VFJWTcetIFZ9OJQomEJv0nGzrNwnVwWzddddk8DQZV+RgjZ P/BkPxxnynLfKcv/fnd+zquaZb5HsGnsQ5+VJk2duY7wwYjfea11cLfrPssJ84OawToH6y iFeFEbreNQwRolzj3Y2u9w03c6RJXHlHn3JUZFwsPZUSfIlX0O4uSgGAZhSH1Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XkLxz19trzLml; Wed, 6 Nov 2024 23:29:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A6NTBIU053785; Wed, 6 Nov 2024 23:29:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A6NTBbr053782; Wed, 6 Nov 2024 23:29:11 GMT (envelope-from git) Date: Wed, 6 Nov 2024 23:29:11 GMT Message-Id: <202411062329.4A6NTBbr053782@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: d4cfad2d0391 - stable/13 - amd64: do not pass -z rodynamic to ld.bfd when building vdso List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: d4cfad2d0391d0bb306d24d1fbcb4ba72078b328 Auto-Submitted: auto-generated The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=d4cfad2d0391d0bb306d24d1fbcb4ba72078b328 commit d4cfad2d0391d0bb306d24d1fbcb4ba72078b328 Author: Konstantin Belousov AuthorDate: 2024-10-18 14:09:26 +0000 Commit: Dimitry Andric CommitDate: 2024-11-06 23:24:38 +0000 amd64: do not pass -z rodynamic to ld.bfd when building vdso (cherry picked from commit 3b2cf9381ef86847603c3c94811f638660c417ae) --- sys/tools/amd64_ia32_vdso.sh | 7 ++++++- sys/tools/amd64_vdso.sh | 9 +++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/sys/tools/amd64_ia32_vdso.sh b/sys/tools/amd64_ia32_vdso.sh index e64c964219c3..09e08dc05dd2 100644 --- a/sys/tools/amd64_ia32_vdso.sh +++ b/sys/tools/amd64_ia32_vdso.sh @@ -34,9 +34,14 @@ ${CC} -x assembler-with-cpp -DLOCORE -fPIC -nostdinc -c -m32 \ -o ia32_sigtramp.pico -I. -I"${S}" -include opt_global.h \ "${S}"/amd64/ia32/ia32_sigtramp.S +if ${LD} --version | ${AWK} '/^GNU ld/{exit 1}' ; then + RODYNAMIC="-z rodynamic" +else + RODYNAMIC="" +fi ${LD} --shared -Bsymbolic -soname="elf-vdso32.so.1" \ -T "${S}"/conf/vdso_amd64_ia32.ldscript \ - --eh-frame-hdr --no-undefined -z rodynamic -z norelro -nmagic \ + --eh-frame-hdr --no-undefined ${RODYNAMIC} -z norelro -nmagic \ --hash-style=sysv --fatal-warnings --strip-all \ -o elf-vdso32.so.1 ia32_sigtramp.pico diff --git a/sys/tools/amd64_vdso.sh b/sys/tools/amd64_vdso.sh index 1a0203e3e0a4..295b16c87c2d 100644 --- a/sys/tools/amd64_vdso.sh +++ b/sys/tools/amd64_vdso.sh @@ -40,12 +40,17 @@ ${CC} -x assembler-with-cpp -DLOCORE -fPIC -nostdinc -c \ # # -z rodynamic is undocumented lld-specific option, seemingly required # for lld to avoid putting dynamic into dedicated writeable segment, -# despite ldscript placement. It is ignored by ld.bfd but ldscript +# despite ldscript placement. It is omitted for ld.bfd, but ldscript # alone is enough there. # +if ${LD} --version | ${AWK} '/^GNU ld/{exit 1}' ; then + RODYNAMIC="-z rodynamic" +else + RODYNAMIC="" +fi ${LD} --shared -Bsymbolic -soname="elf-vdso.so.1" \ -T "${S}"/conf/vdso_amd64.ldscript \ - --eh-frame-hdr --no-undefined -z rodynamic -z norelro -nmagic \ + --eh-frame-hdr --no-undefined ${RODYNAMIC} -z norelro -nmagic \ --hash-style=sysv --fatal-warnings --strip-all \ -o elf-vdso.so.1 sigtramp.pico From nobody Thu Nov 7 00:50:35 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XkNlv2lNCz5c4YZ; Thu, 07 Nov 2024 00:50:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XkNlv2FSyz4WGM; Thu, 7 Nov 2024 00:50:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730940635; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=99VUfuXu8onszxJvJN7lFRcmhdwmIn02dXLlkE4Hnto=; b=vygczTQka3EWxMPQUiLdToCpHIsRGofNaVKuGeFUaZgnhx37YMElPSX3btOTvV9+iXX5CL wCaOiMJCn38AypIJr9SQPaVYT0P7/MMSJMwq2l+l8UqgwThSO8XQ4+OjBf/gMjn/niqtXt Q8mlmP4aDlWfz10AXxB8+ZNO16eED0PIQkb3Rd67uUSNQpRLHTJaOyr70sfX8QsiK4Jk7x Ii6vKj+0M7PEruH6f864IHkt201/exUC3RVHQfjeXAUoehdRGbAe2/UWYk1MIov14wxXiD YxkDS0dhoJip+5jC6zpUzwrR2ZADHoy6zMHCQf6qBtLWjnVNjov3Bow58j6OvQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730940635; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=99VUfuXu8onszxJvJN7lFRcmhdwmIn02dXLlkE4Hnto=; b=s59ykMvRFz8gzKeP8jgJKWj4kyS09LibZaZireE/oabfOEIl411hKkFkOiLFw5IYJK9pSj 3sswTgqBXb04E6aUwOkxnoiaf9boUb0djQ8xU8+4X0uVjjsDFpVvXgsHAN7ku1PRKJPKTN rBND+VbqdKQg//kdcy6EqcqlZyOLu21hsqY40xsDLojoa4ZoOHftQkJBuPtOER36j86wBy 1iUUrCkDRWRRcy2G2mZzeu//A+m33JgfQFDG0h1RvXdez6AxEfQfT34DnX80WpeXAaIj3q mdY0mO+kS0LNiabmftVlWprrWuQ8hFqx3ac7y4uXmuoWZdlgfiveYuKrTOL19A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730940635; a=rsa-sha256; cv=none; b=F0q4ltD5k6Izmm0kW4CKmiZsnZao44RsPXSQkUuVExZ1j339tYHA17mRb8NHwBV9o66bt+ ujopX8KOW3w5l9RZgrsUPYBU6lha6SNYYZkXZY2BlvH7zfig+otXWumabztWlP4IHLYcX1 EhOHjx0VW7SDRoAgLycHx0ZRehW9Bj7548BIrMAFGA2shNCGkNaalOgzE1sDBXctim4nbD g7YDckf4V2XlckeROcWQjZUTvSkswV6Vk65qFI7b4WWczfQQL3a9gxbQ9E2jncpPGWo08Z grziF2me6rkVyKnEIhD+LbGxEJxqDsE1Z7akQnLONo56xeRkYINqmQM0RXqTVA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XkNlv1rrTzNmy; Thu, 7 Nov 2024 00:50:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A70oZtY010412; Thu, 7 Nov 2024 00:50:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A70oZs1010409; Thu, 7 Nov 2024 00:50:35 GMT (envelope-from git) Date: Thu, 7 Nov 2024 00:50:35 GMT Message-Id: <202411070050.4A70oZs1010409@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 0d2b7892cd3a - releng/14.2 - loader: Fix boot menu on BIOS List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.2 X-Git-Reftype: branch X-Git-Commit: 0d2b7892cd3aa4666dee7211a76a3a4d99c4c18b Auto-Submitted: auto-generated The branch releng/14.2 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=0d2b7892cd3aa4666dee7211a76a3a4d99c4c18b commit 0d2b7892cd3aa4666dee7211a76a3a4d99c4c18b Author: Warner Losh AuthorDate: 2024-11-02 22:02:44 +0000 Commit: Warner Losh CommitDate: 2024-11-06 23:13:14 +0000 loader: Fix boot menu on BIOS Only the gfx-enabled boot loader supports unicode. Otherwise, we have to use the old cons25 / ibmpc upper code page drawing characters. Check to see if we have the gfx.term_drawbox function. If we do, we support the unicode drawing characters. If we don't, then we have an older loader that doesn't support it *OR* we have the reduced function, text-only boot loader. In either of those cases, we need to use the old graphics characters. Abstract all those details into core.hasUnicode function. PR: 282465 MFC After: 2 day Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D47403 (cherry picked from commit c2ba66d4d01f23303352bfe3cbd50ff5d9a05947) (cherry picked from commit f2103edaf5229271f3f6769844c0c747d8352228) Approved-by: re (cperciva) --- stand/lua/core.lua | 9 +++++++++ stand/lua/drawer.lua | 32 +++++++++++++++++++++++++++----- 2 files changed, 36 insertions(+), 5 deletions(-) diff --git a/stand/lua/core.lua b/stand/lua/core.lua index 72b19462ae5c..3582720f2a81 100644 --- a/stand/lua/core.lua +++ b/stand/lua/core.lua @@ -543,6 +543,15 @@ function core.nextConsoleChoice() end end +-- The graphical-enabled loaders have unicode drawing character support. The +-- text-only ones do not. We check the old and new bindings for term_drawrect as +-- a proxy for unicode support, which will work on older boot loaders as well +-- as be future proof for when we remove the old binding. This also abstracts +-- out the test to one spot in case we start to export this notion more directly. +function core.hasUnicode() + return gfx.term_drawrect ~= nil or loader.term_drawrect ~= nil +end + -- Sanity check the boot loader revision -- Loaders with version 3.0 have everything that we need without backwards -- compatible hacks. Warn users that still have old versions to upgrade so diff --git a/stand/lua/drawer.lua b/stand/lua/drawer.lua index a009b78164df..612bd2f5317f 100644 --- a/stand/lua/drawer.lua +++ b/stand/lua/drawer.lua @@ -506,23 +506,45 @@ drawer.frame_styles = { top_right = "+", bottom_right = "+", }, - ["single"] = { +} + +if core.hasUnicode() then + -- unicode based framing characters + drawer.frame_styles["single"] = { horizontal = "\xE2\x94\x80", vertical = "\xE2\x94\x82", top_left = "\xE2\x94\x8C", bottom_left = "\xE2\x94\x94", top_right = "\xE2\x94\x90", bottom_right = "\xE2\x94\x98", - }, - ["double"] = { + } + drawer.frame_styles["double"] = { horizontal = "\xE2\x95\x90", vertical = "\xE2\x95\x91", top_left = "\xE2\x95\x94", bottom_left = "\xE2\x95\x9A", top_right = "\xE2\x95\x97", bottom_right = "\xE2\x95\x9D", - }, -} + } +else + -- non-unicode cons25-style framing characters + drawer.frame_styles["single"] = { + horizontal = "\xC4", + vertical = "\xB3", + top_left = "\xDA", + bottom_left = "\xC0", + top_right = "\xBF", + bottom_right = "\xD9", + } + drawer.frame_styles["double"] = { + horizontal = "\xCD", + vertical = "\xBA", + top_left = "\xC9", + bottom_left = "\xC8", + top_right = "\xBB", + bottom_right = "\xBC", + } +end function drawer.drawscreen(menudef) -- drawlogo() must go first. From nobody Thu Nov 7 02:54:21 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XkRVk1HT8z5cDRc; Thu, 07 Nov 2024 02:54: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XkRVk0SqSz4nnb; Thu, 7 Nov 2024 02:54:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730948062; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MPZn8jPwMGS3jRsvsEFAnkW1s/xwAFe69RsU3hmYPfw=; b=iVllwIpLJuZeVOJUKI18wQITkJwF/wy7osZ0BM085ncv3TpOq7yGUaE9EKQOOKfmI6ozv5 8kCb1FT05BUcqXc45vmfowVsgRihSx6EJzupDXuedxi2nDxyxsT9gaZEaUemzrvs1N9b7w 0BbPm4yQ5faP6EGawTYwMuaU5RKWlAkqzqjvTfPRS25H/RilAugBpvE65X/XSSM5TSfrPd ybz+wDbvYcygL935GvYvVy90VhlyPNGSO+4YugWA7N9I2tTWRFzUIuWHByFonnvDXidoOi D/UazTlyl2xU+vGca8nlsiUMbjVyEP33jitcmYBWJ1RFPdWJkwqx1DBsmPPLTA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730948062; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MPZn8jPwMGS3jRsvsEFAnkW1s/xwAFe69RsU3hmYPfw=; b=YzGpu7DV3cycgjpcYNGvFXQ0+BMjPCB6aAEPO3HQdMFZNhS7pe5cTIFkvVK7q9C8PCOsMo ytCy0U0YYKR/PWw1N76ruaxdDOuxYweMl3jt5td1rNM87wUkPVx2Dc0hZ1xlbfjt7UvJWb Ra2jfUlT+5CA7oTHlhPC4vkPcawLmotZxlp2jEnwOMiEAaL4wbVYXEZD0MiCTXbrcfkJjc Ee+SsbrwhpQvEnMFWuQ5gJJPKRMSMWuWD4gsoTa4eq5e8dzOErS+okgZ8zhjZ//HanGSe7 ABVkdgsl7pYogAoOq8VUk9pPrENOMqD3G2e0T61lp88npys3eFk8v1C3KMx1vg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730948062; a=rsa-sha256; cv=none; b=bVwoiVcrLqni5MSXDBETv8Z8CAZ0vIg/Jo9KHUcREnz3cRLIDyqSW6nLwgsumjAmYjS6NO 3frteqKP0xrJFKL5Y2BKdhwSYFGtb3OYK5/EOg0pGBeKQEQkWac0vXk5M06fv/o1NJF6Lv /2btCldO1I1Glm4hsW0YzsdUYTkk0kEtieYLYqcIZoOwia+LjfW4+VTeAL5ILh0PMSQbg+ 4Y7nKaEyysnyrczf+jLqmiVH62mlvyPa0y3IrG8WW3ZMav4iNqEmkE+Xb4/Hj74nTEQ8eS 22IeUY77b7kSFPNgNVum3wgMET4vID5r3aWoAK4WFBmDzO9MG2GmhRZKLi4Jjw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XkRVj70gDzRdS; Thu, 7 Nov 2024 02:54:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A72sLvO041045; Thu, 7 Nov 2024 02:54:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A72sLsS041042; Thu, 7 Nov 2024 02:54:21 GMT (envelope-from git) Date: Thu, 7 Nov 2024 02:54:21 GMT Message-Id: <202411070254.4A72sLsS041042@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: c5fc8587ab14 - releng/14.2 - release: Include -dbg files in dvd image List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.2 X-Git-Reftype: branch X-Git-Commit: c5fc8587ab142dcb90324b83d25eaab68b410c58 Auto-Submitted: auto-generated The branch releng/14.2 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=c5fc8587ab142dcb90324b83d25eaab68b410c58 commit c5fc8587ab142dcb90324b83d25eaab68b410c58 Author: Colin Percival AuthorDate: 2024-11-05 21:35:17 +0000 Commit: Colin Percival CommitDate: 2024-11-07 02:53:58 +0000 release: Include -dbg files in dvd image In 2016, commit 8834318685bc reworked the code for excluding -dbg files from install media, and in the process accidentally broke it for dvd images ('grep -v' should have been 'grep -vE'). FreeBSD Update builds later began to depend on this, and in any case since DVD images are intended as "include everything" images there's no point excluding those; so remove the (broken) filtering from DVD image builds. Approved by: re (implicit, release build fixes) Sponsored by: Amazon MFC after: 2 days (cherry picked from commit cdfd0600dc8882f0a0d0e6d9a1cdcf926edba6d6) (cherry picked from commit ba7844e4c91505e397396ab981a0032699b0cd70) --- release/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/release/Makefile b/release/Makefile index 9ca32e168fe7..3ae3a28a1104 100644 --- a/release/Makefile +++ b/release/Makefile @@ -245,12 +245,12 @@ dvd: packagesystem -DDB_FROM_SRC ) # Copy distfiles mkdir -p ${.TARGET}/usr/freebsd-dist - for dist in MANIFEST $$(ls *.txz | grep -v -- '(${base ${_ALL_libcompats}:L:ts|})-dbg'); \ + for dist in MANIFEST $$(ls *.txz); \ do cp $${dist} ${.TARGET}/usr/freebsd-dist; \ done .if defined(NO_ROOT) echo "./usr/freebsd-dist type=dir uname=root gname=wheel mode=0755" >> ${.TARGET}/METALOG - for dist in MANIFEST $$(ls *.txz | grep -vE -- '(${base ${_ALL_libcompats}:L:ts|})-dbg'); \ + for dist in MANIFEST $$(ls *.txz); \ do echo "./usr/freebsd-dist/$${dist} type=file uname=root gname=wheel mode=0644" >> ${.TARGET}/METALOG; \ done .endif From nobody Thu Nov 7 02:54:22 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XkRVl3HWRz5cDpG; Thu, 07 Nov 2024 02:54:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XkRVl11mVz4nnc; Thu, 7 Nov 2024 02:54:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730948063; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5PdgxwjQBbX/v7MD57+aTVqNTYeKesfXcjwOcmKyVvQ=; b=Dxul+E+9R+Ogol4+fpOEpbJ25LBF9bXojTkVppPtKWVOAk8a0VSICPoVVrXjSH8mm+f3/G pb1SnJoGArKCRgbrrMQLgmXHiDFFFsYg0dJPxmLIOauUYJdtfCUcTdE+jH/y8IK0FLUhuI MRxLoCM6GlPqcW/KKatGMpW7LyvX7GQ4K4Rq4s2gqgKDIqurhHVc5sbAwPk/JNOgQQozDv O9R/+cGdCPiMocmEqDnYmCoZ/pTSdSX3NDF1FCJGgyCu9vns97xTGblezrkUT0rMDYCSXU oXgOPyirg2l6qYn6klbJTQJvpoNyAEr/pbE1XZg2GkOiMDSKiOKQDxtMF9P21w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730948063; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5PdgxwjQBbX/v7MD57+aTVqNTYeKesfXcjwOcmKyVvQ=; b=AYNeLKaQT5sKXmL4tgA2usniACfQlwsl4AFv4nfngttTRarIbMMdsg8m4KU5mqafG+oZ7s lmjrjGXy8E0sfJJPS4V/6x79jP7Hl2F+2RXgDXnJ0ZYvRlEy4ljuqDx8UyMRlY/fYYXbec +SCdJAG/4XPz/a04KddA3KfW+1/L5tfXA66iQ+EQZaax7vVytObXntgDhhyA/aJk/j5rcl jkT5txxezAuN2qHpyzbwySLmKFr9OH4jJlKxgKyxw+MfvEVV+kFBV6Y922o8B2pQiwmNIT o5lk8BndADMnAAtNZiPSxnysDnoHV+rIMPWnaq5Fpj+rgnz8alhZGgaAB041ew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730948063; a=rsa-sha256; cv=none; b=oeRtNV283aB43CPCmNnzm/zj76GwkihVGTfW2PK2cXuvvZuxgxe4xNLdRFx2QMnq/si7Rk 29MMCseOMujrlAMLc0DqyepzEC4EG+52XyMzj7bDaiBKpDs09PZLUHM5r2aX7XBfc1hAql OQXo78SqYCa21KNvXNT5NrLAzrzWBwjiOXury/j1COce28udZeTHNlUqmn+HNIBlnfm3T2 9bltj1DZXtKxdlQWuBdSndKKoaAxGGOkgjQlaO8SDRY+JkRpL2hXGbSnCLBmdIoTw8CNXT jWovz/h0w4TobM+wqMJq5OPVZwJvu8+myY1FUr0ohhTI+nfE6HhI+EeGWg0iNg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XkRVl0Q4CzRst; Thu, 7 Nov 2024 02:54:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A72sMC1041086; Thu, 7 Nov 2024 02:54:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A72sMfn041083; Thu, 7 Nov 2024 02:54:22 GMT (envelope-from git) Date: Thu, 7 Nov 2024 02:54:22 GMT Message-Id: <202411070254.4A72sMfn041083@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: b658d3ea493f - releng/14.2 - release: Remove useless ls List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.2 X-Git-Reftype: branch X-Git-Commit: b658d3ea493fb3a9f89756be34f972bb3b9d19ed Auto-Submitted: auto-generated The branch releng/14.2 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=b658d3ea493fb3a9f89756be34f972bb3b9d19ed commit b658d3ea493fb3a9f89756be34f972bb3b9d19ed Author: Colin Percival AuthorDate: 2024-11-06 22:24:34 +0000 Commit: Colin Percival CommitDate: 2024-11-07 02:53:59 +0000 release: Remove useless ls Replace "$((ls *.txz))" with "*.txz" Approved by: re (implicit, release build fixes) Reported by: jrtc27 Sponsored by: Amazon (cherry picked from commit e166fea685da4ac6a6891f10b07f98d0e9fcfce3) (cherry picked from commit ce988aa3e80019566bf5df4cfd73f7b7195756f2) --- release/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/release/Makefile b/release/Makefile index 3ae3a28a1104..be0abf84de23 100644 --- a/release/Makefile +++ b/release/Makefile @@ -245,12 +245,12 @@ dvd: packagesystem -DDB_FROM_SRC ) # Copy distfiles mkdir -p ${.TARGET}/usr/freebsd-dist - for dist in MANIFEST $$(ls *.txz); \ + for dist in MANIFEST *.txz; \ do cp $${dist} ${.TARGET}/usr/freebsd-dist; \ done .if defined(NO_ROOT) echo "./usr/freebsd-dist type=dir uname=root gname=wheel mode=0755" >> ${.TARGET}/METALOG - for dist in MANIFEST $$(ls *.txz); \ + for dist in MANIFEST *.txz; \ do echo "./usr/freebsd-dist/$${dist} type=file uname=root gname=wheel mode=0644" >> ${.TARGET}/METALOG; \ done .endif From nobody Thu Nov 7 03:54:42 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XkSrL4pNqz5cHY0; Thu, 07 Nov 2024 03:54:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XkSrL48Hxz4tYf; Thu, 7 Nov 2024 03:54:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730951682; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NuCvlxC0Mwd2GrfCTsTR2tOclUpKLuNeKhFZfRvlaPE=; b=dmj/exf4M5nubqoFdHFWM7we20L+BWPhQ+Zo7bDXkB3n3UC0WoXl3Mg1L/KrI40pg/DxO9 HZcChpRpyItwFhFkm86v/xIVo+ARzZ79+wAaO9IgVHEzk3gvAh+1f/2axyjD18C0Dw/e5r mw7IbhybKURAeNvAE/3FKd1ChD+KjUue/RVk07VygOLLMFUtUiCCnFxCs4CnyUcyG8ynaY kXKy7E3WWsyQITsLH4Paqqu0aJHRIVIkvIrH7M69as2gUtlcQXaLwsY8ArHt7pks738jGC OfQ4L6lKv8SzhHnHE0j/5zPJguPMLFTbUynZkT/cd/7NilAah31gWrLFCZob+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730951682; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NuCvlxC0Mwd2GrfCTsTR2tOclUpKLuNeKhFZfRvlaPE=; b=hesaS4PLtpeypcemQoIAnZGZJwfCrtXhrk5Fb1SMfuLGGEPnk6DkZiYK+VfqdXINuhWVqj YBd3lNl1XfI3AmYOj5as/xIlsdW8/irTwOMDk0I+cuV8jYOxYhbBBWpCUn1XbYnDZwmkna OpTucsDwvecro0V8T7ZOZTlPuzVCJkvvixy/CVlmotJY5vClK6IbX3S0o5HN8rSGEuhnwY 8XDu34ibJSOAEO1pnT//yhbr6aWa3JTHXPkYiVIx8Q48NckNVT6U0N3QqQRPRUfeGFbmr0 KIAAB6SpCQoJTEHllfxnEBzJImO9DXHibxRgJ8ZTJlCVNr1jVpw9aYV2yUs7ow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730951682; a=rsa-sha256; cv=none; b=vt/NmX6HA4dtyL3QDvubzVgAS0PsR600BdowSCXLBLvLzx7vCYWmwBovjJa4vtPhU9mbnp aGX5j1XK6YEhuGcR6/bMp6N4pogTX6zeM43P9BOH9ayVLY5bT2IdOK9Yg6/yyx1G1lYQhQ y5V+L70ZVX+IRbezPDMACiv9Tye/g+ujeqs0IRZX0cT8j6G1OiJ9znPFXfX9IAFxfRTtfs kZutR/2B0hita0oFpxz6kpY32uPYacbc/0gBNOwr13nWRdjRviLuQtstPE5U44HF/iDzak pHYwKdAJeYaytNMQqcjpf4JJmVIKuTVkbBWz1RVpRx55rjKOTv3qQH+0erHXZg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XkSrL3cNrzVW6; Thu, 7 Nov 2024 03:54:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A73sgbg054178; Thu, 7 Nov 2024 03:54:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A73sgaZ054175; Thu, 7 Nov 2024 03:54:42 GMT (envelope-from git) Date: Thu, 7 Nov 2024 03:54:42 GMT Message-Id: <202411070354.4A73sgaZ054175@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: c374566c3ffb - stable/14 - vt.4: align tables + 80 character line limit List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c374566c3ffbbc8070c256a46111f23d499ada56 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=c374566c3ffbbc8070c256a46111f23d499ada56 commit c374566c3ffbbc8070c256a46111f23d499ada56 Author: Alexander Ziaee AuthorDate: 2024-11-04 04:48:20 +0000 Commit: Ed Maste CommitDate: 2024-11-07 03:54:10 +0000 vt.4: align tables + 80 character line limit Reviewed by: emaste MFC after: 3 days Pull request: https://github.com/freebsd/freebsd-src/pull/1514 (cherry picked from commit 4026b17bac6b343acc8d3163282749384eb35e26) --- share/man/man4/vt.4 | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/share/man/man4/vt.4 b/share/man/man4/vt.4 index 0523f990f57e..3416ce0cca78 100644 --- a/share/man/man4/vt.4 +++ b/share/man/man4/vt.4 @@ -306,7 +306,7 @@ or changed at runtime with Enable the terminal bell. .El .Sh FILES -.Bl -tag -width /usr/share/vt/keymaps/* -compact +.Bl -tag -width "/usr/share/vt/keymaps/*.kbd" -compact .It Pa /dev/console .It Pa /dev/consolectl .It Pa /dev/ttyv* @@ -319,13 +319,12 @@ console fonts keyboard layouts .El .Sh DEVCTL MESSAGES -.Bl -column "System" "Subsystem" "1234567" -compact +.Bl -column "System" "Subsystem" "Type" "Description" .Sy "System" Ta Sy "Subsystem" Ta Sy "Type" Ta Sy "Description" .It Li VT Ta BELL Ta RING Ta Notification that the console bell has rung. .El -.Pp -.Bl -column "Variable" "Meaning" -compact +.Bl -column "duration_ms" "Meaning" .Sy "Variable" Ta Sy "Meaning" .It Li duration_ms Ta Length of time the bell was requested to ring in milliseconds. .It Li enabled Ta true or false indicating whether or not the bell was administratively enabled when rung. @@ -351,7 +350,8 @@ To set a 1024x768 mode on all output connectors, put the following line in .Pp .Dl kern.vt.fb.default_mode="1024x768" .Pp -To set a 800x600 only on a laptop builtin screen, use the following line instead: +To set a 800x600 only on a laptop builtin screen, +use the following line instead: .Pp .Dl kern.vt.fb.modes.LVDS-1="800x600" .Pp From nobody Thu Nov 7 03:55:42 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XkSsW15M8z5cHgZ; Thu, 07 Nov 2024 03:55: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XkSsW0WGLz4v3C; Thu, 7 Nov 2024 03:55:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730951743; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mVfGLzoa/EF3vcnBcnA3g5JRMOER9u+QuSnSJ3VXFDc=; b=Haq3gV5YairxvIxY+2X8X6fVoVzVn6P4THUL796HeBugINdZmv2Wn4ffJvNH8yjwyAeQXE Loupr747lS3/z8U965+uRv+hdwS5sjImHd8MBFcKQWlixq3oUjV8GtWTqouhUIMSnCR0mt 4XGJG+ZyzeWb/x+6EFgkUWp/N2UWmsomQQXCF6V6t/fYAAefhDOhHYykdiU+mbjKktoPSk +mzYfIkFa7KYxUSDRSZx1Ga/Qrb2wXKE9W5gZCVfjmOMjLBTYcuh+aZHn2oZbUf+hrtPxv ZXcQaMWsAFpvlXmzhLD/PNvYaqE8cMlvAeW03LmYo5X5Xx+K8No59IcaX2hcTg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730951743; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mVfGLzoa/EF3vcnBcnA3g5JRMOER9u+QuSnSJ3VXFDc=; b=mgPpI4Jecji1Qo3K5LCiC9e+Ri115g+9EMFgTWXRONJAXpitKHhKMWaFk4K6Binqme1lXN SaWxomY0RayqJ0WlsTDG9VRqkeiXIiy5yEFVaZgGVXL2OktHT2QBgYtqG5baA3rAfwsywF M+C2FoUzGZyHXT3PTQkEKCIquHU3zckf+gRdJgyRaO7VRpk+YqeEYlg8/LpqHEmDvmmzAA D43GMV3chb8ByvFb13+PTyclI8p9PGBnJfKDLolumeeUJaCIhVkJTrSaqy+1mmqwIm5Kuo jibdAKpWkV+vj/SX4lsok4AshKuq2DFqw2L42NMtgJbblEDH/uPsfV0TZg2xjQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730951743; a=rsa-sha256; cv=none; b=OjOmcJxDlC5lng2wJbOFIje1JAY2ubR//K7TDipNutQh84B6vpgt78u/x5f8MZqLgoEB3x HDdiK2x5QMnH2o4b8r670D0b6Ix4dXbUzRUYLmQea8d+4+7DwQqNNGZpC8Fc8BKeNczqpk xyWYx26R4X/m91SZffhlaIENedcaPhKV2QfyAY1X3XUTyKgPvRbOn33E6LxrDVrcvHjd3K rVXB77ru9+DhQ8jMl5C4VDx3UpAD2G8DlbGs0sQj4dzjKzKXR1DPbV7ZFrwU7Fhxukr3vV AAndk+55Mx4fX1wMWCf2C+IgdLL92i2HJgy7C9p15smskxPUbwnvpiQOQeD29Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XkSsV73JzzV3l; Thu, 7 Nov 2024 03:55:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A73tghY054628; Thu, 7 Nov 2024 03:55:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A73tgSV054625; Thu, 7 Nov 2024 03:55:42 GMT (envelope-from git) Date: Thu, 7 Nov 2024 03:55:42 GMT Message-Id: <202411070355.4A73tgSV054625@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 1bdf189b9048 - stable/13 - vt.4: align tables + 80 character line limit List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 1bdf189b9048173e1bbb648a12e9e1159ceebaee Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=1bdf189b9048173e1bbb648a12e9e1159ceebaee commit 1bdf189b9048173e1bbb648a12e9e1159ceebaee Author: Alexander Ziaee AuthorDate: 2024-11-04 04:48:20 +0000 Commit: Ed Maste CommitDate: 2024-11-07 03:55:22 +0000 vt.4: align tables + 80 character line limit Reviewed by: emaste MFC after: 3 days Pull request: https://github.com/freebsd/freebsd-src/pull/1514 (cherry picked from commit 4026b17bac6b343acc8d3163282749384eb35e26) (cherry picked from commit c374566c3ffbbc8070c256a46111f23d499ada56) --- share/man/man4/vt.4 | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/share/man/man4/vt.4 b/share/man/man4/vt.4 index 3a8c64746882..420f416c727a 100644 --- a/share/man/man4/vt.4 +++ b/share/man/man4/vt.4 @@ -300,7 +300,7 @@ or changed at runtime with Enable the terminal bell. .El .Sh FILES -.Bl -tag -width /usr/share/vt/keymaps/* -compact +.Bl -tag -width "/usr/share/vt/keymaps/*.kbd" -compact .It Pa /dev/console .It Pa /dev/consolectl .It Pa /dev/ttyv* @@ -313,13 +313,12 @@ console fonts keyboard layouts .El .Sh DEVCTL MESSAGES -.Bl -column "System" "Subsystem" "1234567" -compact +.Bl -column "System" "Subsystem" "Type" "Description" .Sy "System" Ta Sy "Subsystem" Ta Sy "Type" Ta Sy "Description" .It Li VT Ta BELL Ta RING Ta Notification that the console bell has rung. .El -.Pp -.Bl -column "Variable" "Meaning" -compact +.Bl -column "duration_ms" "Meaning" .Sy "Variable" Ta Sy "Meaning" .It Li duration_ms Ta Length of time the bell was requested to ring in milliseconds. .It Li enabled Ta true or false indicating whether or not the bell was administratively enabled when rung. @@ -346,7 +345,8 @@ To set a 1024x768 mode on all output connectors, put the following line in .Pp .Dl kern.vt.fb.default_mode="1024x768" .Pp -To set a 800x600 only on a laptop builtin screen, use the following line instead: +To set a 800x600 only on a laptop builtin screen, +use the following line instead: .Pp .Dl kern.vt.fb.modes.LVDS-1="800x600" .Pp From nobody Thu Nov 7 04:08:49 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XkT8f5jpCz5cJL3; Thu, 07 Nov 2024 04:08: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XkT8d5vTQz4wjt; Thu, 7 Nov 2024 04:08:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730952529; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=f6pl/P1IV055wkoTgzPB28/+/6mEZgJ3J3ilnLisFZw=; b=RzlSjL1CT3NRH2jd1yYHcQDdwyo24u/UK8cLjs6qGlC+t4cL73/15cNUeQ2XZ3vPJ3JWeQ 64u9/aFQcstarUvUyp/LefmrsAACaQCSR/30EwA3S8bguI++sVH3D3rzWVyPYpIsBkwzoi /Gcdlw5ViJUzMyzip7ZThwvbGKs3UA6z4sMbuP2Aee/lqhouR+GRbZYesmyBf3aaqG3s3p 5axo6+yQvL28eR+IBIvQ5gm8Wny+c4CftFWGXl73E4tBcXXnsKWL+02329WDYyi3Qq9jsG y5PK9LKSVyJGnbselQyL2YXj+5vbeh/lpHX6qhvKpbr4aqLIfzIauiTOFKDO2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730952529; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=f6pl/P1IV055wkoTgzPB28/+/6mEZgJ3J3ilnLisFZw=; b=OhaCiGhBAEGjMNBoTcfbEvC8XhoxnhdsUGubgXF2JhDL8BbmLmSlFWmDWsVWpoc+7hEHlJ l86N4Uuw8DmH4AAMRynxL0SHF1joXiXr/3VL/BBwlf/tNHqmZOXuREhRr+EIb64GifsKzg Tov0JRObBAOcv46a3aTWgL4yuldull461HSQt/Wk48Azhd+8pMBHj4jX7mRkbjx/HdVdmc evlriDKEjOXb9hifX26ZRFyHpFZWh1hPPhFUERLaL/BbSjG/XhttHygRUPxzhIb/4O0lQ/ XDbRx8JUfWXPTwsFqHJQt4tsd76g7mRNFlj37S1k8BqFHZF9b67z66kVjpENHg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730952529; a=rsa-sha256; cv=none; b=x14KAWB2awdzsKRQl0z7m+Yt0466ds3iYwuoPpvg1UNPlUtH23ZCvO3KcjZ9Tm5V01hjsK gEvFMpKfZ6Ra5ds/H1CSy4mUoL94ZBRGxsBc8jrcQwYzarij4ODMP8jMCxIaMNfvKLlGLM sWrOWNGQbHeIi1RtdXffDp3r/11fffpnsyFWNl7h7pwnOvBpumMRlOzd2CxINay72bJAtN feEYB/aEjol54I9b8atrD9QRR3mtYDCKpaivC/jQVuYGf/75YXHWoxGi7YX7mSykOx96ZP TnE6ri4HZdCzCFRAYzxR//kKnz24I6G8woNAMXQHMEUagoYsSMoKEE5F9TYHpQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XkT8d586xzVf5; Thu, 7 Nov 2024 04:08:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A748nfA075727; Thu, 7 Nov 2024 04:08:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A748nHx075724; Thu, 7 Nov 2024 04:08:49 GMT (envelope-from git) Date: Thu, 7 Nov 2024 04:08:49 GMT Message-Id: <202411070408.4A748nHx075724@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 54514cfa5a84 - stable/14 - ndp: Move the global variable repeat into struct ndp_opts List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 54514cfa5a84a5d4406bbd5ba34f8950cf1a2b89 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=54514cfa5a84a5d4406bbd5ba34f8950cf1a2b89 commit 54514cfa5a84a5d4406bbd5ba34f8950cf1a2b89 Author: Zhenlei Huang AuthorDate: 2024-10-31 16:32:13 +0000 Commit: Zhenlei Huang CommitDate: 2024-11-07 04:08:09 +0000 ndp: Move the global variable repeat into struct ndp_opts An upcoming fix for the netlink based implementation requires this refactoring. No functional change intended. Reviewed by: kp MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D47233 (cherry picked from commit 12c04071cf18d1b00ffcc7058fb01f4393163ede) --- usr.sbin/ndp/ndp.c | 9 ++++----- usr.sbin/ndp/ndp.h | 1 + 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/usr.sbin/ndp/ndp.c b/usr.sbin/ndp/ndp.c index e98e506ee482..89666f7eb633 100644 --- a/usr.sbin/ndp/ndp.c +++ b/usr.sbin/ndp/ndp.c @@ -125,7 +125,6 @@ static pid_t pid; static int32_t thiszone; /* time difference with gmt */ static int s = -1; -static int repeat = 0; static char host_buf[NI_MAXHOST]; /* getnameinfo() */ static char ifix_buf[IFNAMSIZ]; /* if_indextoname() */ @@ -252,8 +251,8 @@ main(int argc, char **argv) /*NOTREACHED*/ } mode = 'a'; - repeat = atoi(optarg); - if (repeat < 0) { + opts.repeat = atoi(optarg); + if (opts.repeat < 0) { usage(); /*NOTREACHED*/ } @@ -823,10 +822,10 @@ again: if (buf != NULL) free(buf); - if (repeat) { + if (opts.repeat) { xo_emit("\n"); xo_flush(); - sleep(repeat); + sleep(opts.repeat); goto again; } diff --git a/usr.sbin/ndp/ndp.h b/usr.sbin/ndp/ndp.h index 5b2558982e86..6e7aef2e416e 100644 --- a/usr.sbin/ndp/ndp.h +++ b/usr.sbin/ndp/ndp.h @@ -10,6 +10,7 @@ struct ndp_opts { bool tflag; int flags; time_t expire_time; + int repeat; }; extern struct ndp_opts opts; From nobody Thu Nov 7 04:08:50 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XkT8g69N3z5cJbQ; Thu, 07 Nov 2024 04:08: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XkT8g19Znz4wp5; Thu, 7 Nov 2024 04:08:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730952531; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FMmAj520sf2H/GSkySS34SPqXYNF787lPxABrsHgT7g=; b=dApJy7ffsUV0CuJQ9FiMIDg6jGoUJCakBSUZ/yntfLYJdPVAs+1HWRxZO6Yu5Y74OHvHAX OpEhdgVoqSQrYtsRaz2HsRgx+Rvl0X+TnZIKwA+yFs6lxoVDRKiXrLF0bqWJIbgK5w0/5z 1YgJlrTElygErevJ7jaHGu8JYqKjH93VYD65++1Zo8qySqu2txJBERNNtssDFbGIiNTBl4 KWKA8HEEpkdr9LwYz175MoY80EgyFHtfpb5EHGjN6VT9CuMJtT/e9GW3/28mkSdku7JEFA fb3SkXID9+jQZA34fvMHHTSwyJsLKbTP6cq5grlXu9GHNBgIgYyuy16xoCoZKw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730952531; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FMmAj520sf2H/GSkySS34SPqXYNF787lPxABrsHgT7g=; b=fZ8zZ8rzoiGGFPg+yptxb8AKZfr/eAKYLQ9zCtkjgLwAgAS5VWNiEVZu6Z07ZIguRJU/mg eotgD5AxTo6ivS7wyKluIDxO1Fv3gzI3A3CDSjZSsbZDpbya9cqy+unZ8j59nVTiFZAbl0 vC3wU/7B3xrYmRqMU0aJ3wpH35XbU94JTZ42HLp/K6NMkMm9QRxVOMb6JxBxZtGde6dIGi mr+/NSS1pJkE5CAI1w2ftReDChYTzwyhK4bSkE/cS5Zn50c6DAc9pHnRDpghTY8sHsCQIk 29TeVjTiUFBL8O1U0e1U5vt6NwNk11h0nyk6bzp54FRvUYYip6QNrJkXrqLDQA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730952531; a=rsa-sha256; cv=none; b=aKjw3BciPOPbQApahR3jIuBkyJm4xmR/h8vihj3FFyCQ83HwPn+++UB8M3OyTIFC+Zb0KY CIA8VAaVV1bIxo4ctOVHMSAo52zSoPQQZ9hE+XFbpm8nj8hE5TctO7mZavsaHfFqo1+kXN sf0GRJJR+H6NemoUYHAPlyB8hxdS15Bv/vwcnrGiW2ghHezi8J0u9Qp23Z36Ihd8oEU7aY 2q5/rfIkl3lnuLxW/RmFNx4yZoMCn1yQkjSp+Y8waMP55gzdzZa0qvSzIpTtchawb+xaKF KRqWj3lx8vMcNPoh/mPJsawYCRngYIOWokk9pwBx2exDmth8DYSaJWlIlajYtg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XkT8f6BMZzW02; Thu, 7 Nov 2024 04:08:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A748oCH075784; Thu, 7 Nov 2024 04:08:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A748orG075781; Thu, 7 Nov 2024 04:08:50 GMT (envelope-from git) Date: Thu, 7 Nov 2024 04:08:50 GMT Message-Id: <202411070408.4A748orG075781@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 0de672a59481 - stable/14 - ndp: Bring back the -A option for the netlink implementation List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 0de672a59481d48dd5e4667c597d66e1b042a683 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=0de672a59481d48dd5e4667c597d66e1b042a683 commit 0de672a59481d48dd5e4667c597d66e1b042a683 Author: Zhenlei Huang AuthorDate: 2024-10-31 16:32:14 +0000 Commit: Zhenlei Huang CommitDate: 2024-11-07 04:08:09 +0000 ndp: Bring back the -A option for the netlink implementation This was lost during the conversion to netlink. Reviewed by: kp Fixes: 91fbe0819bb9 ndp: convert ndp(8) to netlink MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D47234 (cherry picked from commit b6d4e3bee350b881b5efea03068c1247985b12fe) --- usr.sbin/ndp/ndp_netlink.c | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/usr.sbin/ndp/ndp_netlink.c b/usr.sbin/ndp/ndp_netlink.c index 179d715c8ded..94dca0f9d4a4 100644 --- a/usr.sbin/ndp/ndp_netlink.c +++ b/usr.sbin/ndp/ndp_netlink.c @@ -316,12 +316,24 @@ print_entries_nl(uint32_t ifindex, struct sockaddr_in6 *addr, bool cflag) struct snl_state ss_req = {}, ss_cmd = {}; struct snl_parsed_link_simple link = {}; struct snl_writer nw; + struct nlmsghdr *hdr; + struct ndmsg *ndmsg; nl_init_socket(&ss_req); snl_init_writer(&ss_req, &nw); - struct nlmsghdr *hdr = snl_create_msg_request(&nw, RTM_GETNEIGH); - struct ndmsg *ndmsg = snl_reserve_msg_object(&nw, struct ndmsg); + /* Print header */ + if (!opts.tflag && !cflag) { + char xobuf[200]; + snprintf(xobuf, sizeof(xobuf), + "{T:/%%-%d.%ds} {T:/%%-%d.%ds} {T:/%%%d.%ds} {T:/%%-9.9s} {T:/%%1s} {T:/%%5s}\n", + W_ADDR, W_ADDR, W_LL, W_LL, W_IF, W_IF); + xo_emit(xobuf, "Neighbor", "Linklayer Address", "Netif", "Expire", "S", "Flags"); + } + +again: + hdr = snl_create_msg_request(&nw, RTM_GETNEIGH); + ndmsg = snl_reserve_msg_object(&nw, struct ndmsg); if (ndmsg != NULL) { ndmsg->ndm_family = AF_INET6; ndmsg->ndm_ifindex = ifindex; @@ -337,14 +349,6 @@ print_entries_nl(uint32_t ifindex, struct sockaddr_in6 *addr, bool cflag) int count = 0; nl_init_socket(&ss_cmd); - /* Print header */ - if (!opts.tflag && !cflag) { - char xobuf[200]; - snprintf(xobuf, sizeof(xobuf), - "{T:/%%-%d.%ds} {T:/%%-%d.%ds} {T:/%%%d.%ds} {T:/%%-9.9s} {T:/%%1s} {T:/%%5s}\n", - W_ADDR, W_ADDR, W_LL, W_LL, W_IF, W_IF); - xo_emit(xobuf, "Neighbor", "Linklayer Address", "Netif", "Expire", "S", "Flags"); - } xo_open_list("neighbor-cache"); while ((hdr = snl_read_reply_multi(&ss_req, nlmsg_seq, &e)) != NULL) { @@ -382,6 +386,12 @@ print_entries_nl(uint32_t ifindex, struct sockaddr_in6 *addr, bool cflag) count++; snl_clear_lb(&ss_req); } + if (opts.repeat) { + xo_emit("\n"); + xo_flush(); + sleep(opts.repeat); + goto again; + } xo_close_list("neighbor-cache"); snl_free(&ss_req); From nobody Thu Nov 7 08:10:12 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XkZW83Gl4z5cXvD; Thu, 07 Nov 2024 08:10: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XkZW82jSrz466x; Thu, 7 Nov 2024 08:10:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730967012; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PYnINq8LZ7qc1H5rRuDUCRyYSD2DYkfMsgXtZCF5O74=; b=BaBvSy1s+hCF3/euAlDQvTRgNdrlTeTipSFa1iiFkRaDmJS7WLcXzHF6vH+91mhoeQ4ZBL tGzIL5OUmq6jr3ths8Yv7aJk8X/Zrfpr209J1ZgXPhQbNDjciMmGP1Cz7eKBKejFbwPMXh AtdU8tQvnWG6sv3h2DanROJbUz715vbkW7eX2/Yy8LaAUhp0cJVeKNLVSyW4/3y0zcMHBt Cdq6VsmjTjuRA5o+uqQBY7lgXhrx/HmoioN63TF1xd7Vgr5eKMEIiUNoTtW1Ig261RlpTD Qm4zW9nF2MPIzPlGTIEDEFdXq1VmlKmr1Rfptxo2I+VUWQjo2jMv0R6Q4FYHvg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730967012; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PYnINq8LZ7qc1H5rRuDUCRyYSD2DYkfMsgXtZCF5O74=; b=cNQq7bNDVuSJp+qwZRF6tXwql5h5jELlSxx2CuO4lH6s+6tABsRx4uJF/vGhYRaPcIAYhe 1277kndaI4K+DdTE2gOCaNU7w5ScdlYrLFMzG1Mh7BE3op180bXgA+kc1kj1NnA67hA0k0 LWmpkDJiXGiCssD1z4TYXzgdOrxUS0+sqQzZU3ylmkWckTFtm7XsCOtkpKlkAYosSTPYGq CmZ7hNLMsews88wgwh7lAHsmTl+XUPD7/iD5fpzLzGNhmLtnJf9AyOK8W7JJKprbLTSBzu hWMFsBJQGBYiP4eyWJ5MiGbhzUzPlXbpC2v5gfwYHcjab5iiARCqyxnF5BKsdg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730967012; a=rsa-sha256; cv=none; b=ckiP2VAax5guEbUkw6sz14d5TcC9KB96RYIieqfBkEhAxbyTkbGnDNYE+neG638UuSgBP0 KzDaEGLi1dEt0v/0CyUphiQySjrtayObn1GhCE9XyyE4ZpOSkhmEYBINzVAhqpyAJuUG54 wVWaZ6u3WbY7jJfy43VGGV+Ox1faGJUAH7lMWvFrH6lf3gYQ1s2fD1XYeiPkylpFGH3yP+ i6R8nr3Te5yPHEdWgY/z26Yk2KAnwv/Xf9nhlTvlAaGbfDspx3HwWJz96d6usqTHx5543O 1O1DXej7r2S3OG/IOH8IUhl4iYv1/mrFVSc4kAJNodY2Zlsd31atXogvak7EBw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XkZW82Jv5zdN8; Thu, 7 Nov 2024 08:10:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A78ACB5027229; Thu, 7 Nov 2024 08:10:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A78ACXj027217; Thu, 7 Nov 2024 08:10:12 GMT (envelope-from git) Date: Thu, 7 Nov 2024 08:10:12 GMT Message-Id: <202411070810.4A78ACXj027217@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: ea310d18b222 - releng/14.2 - nuageinit: add support for OpenStack network config List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.2 X-Git-Reftype: branch X-Git-Commit: ea310d18b222047caf6cb07f6bdc37020dc672b6 Auto-Submitted: auto-generated The branch releng/14.2 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=ea310d18b222047caf6cb07f6bdc37020dc672b6 commit ea310d18b222047caf6cb07f6bdc37020dc672b6 Author: Baptiste Daroussin AuthorDate: 2024-10-29 13:17:39 +0000 Commit: Baptiste Daroussin CommitDate: 2024-11-07 08:09:54 +0000 nuageinit: add support for OpenStack network config Add naive support for openstack network config. if no config driver have been found, try to detect that we are running a VM on openstack via the smbios information, use the first iface available and temporary activate dhcp on it, to be able to fetch the necessary informations for cloudinit. While here make the rc script execute after devmatch, some ethernet device might be attached via devmatch and may be needed for cloudinit. Tested on OVHCloud Public Cloud. Approved by: re (cperviva) MFC after: 3 weeks Sponsored by: OVHCloud (cherry picked from commit 2775b9b0bcc278dd4183b57784953c26a3fcdc89) (cherry picked from commit 6c682f5c3860a49cd0440599fffe1106c00ff830) --- libexec/rc/rc.d/nuageinit | 45 +++++++++++++++++++++++++++++++++++++-------- 1 file changed, 37 insertions(+), 8 deletions(-) diff --git a/libexec/rc/rc.d/nuageinit b/libexec/rc/rc.d/nuageinit index a44761ea1d9e..54e5b1fbec07 100755 --- a/libexec/rc/rc.d/nuageinit +++ b/libexec/rc/rc.d/nuageinit @@ -2,7 +2,7 @@ # # PROVIDE: nuageinit -# REQUIRE: mountcritlocal zfs +# REQUIRE: mountcritlocal zfs devmatch # BEFORE: NETWORKING # KEYWORD: firstboot @@ -14,6 +14,18 @@ start_cmd="nuageinit_start" stop_cmd=":" rcvar="nuageinit_enable" +fetch_openstack() +{ + cd /media/nuageinit/openstack/latest + for file in meta_data.json network_data.json user_data; do + fetch http://169.254.169.254/openstack/latest/$file || : + done + if [ -f user_data ]; then + chmod 755 user_data + fi + cd - +} + nuageinit_start() { local citype @@ -34,13 +46,28 @@ nuageinit_start() fi unset drive done - if [ -z "$drive" ]; then - # try to detect networked based instance - err 1 "Impossible to find a cloud init provider" + if [ -n "$drive" ]; then + mkdir -p /media/nuageinit + fs=$(fstyp $drive 2> /dev/null) + mount -t $fs $drive /media/nuageinit + else + product=$(kenv smbios.system.product) + case "$product" in + OpenStack*) + mkdir -p /media/nuageinit/openstack/latest + ifaces=$(ifconfig -l ether) + set -- $ifaces + dhclient -p /tmp/ephemeraldhcp.pid $1 + fetch_openstack + pkill -F /tmp/ephemeraldhcp.pid + citype=config-2 + ;; + *) + # try to detect networked based instance + err 1 "Impossible to find a cloud init provider" + ;; + esac fi - mkdir -p /media/nuageinit - fs=$(fstyp $drive 2> /dev/null) - mount -t $fs $drive /media/nuageinit # according to the specification, the content is either # in the openstack or ec2 directory case "$citype" in @@ -59,8 +86,10 @@ nuageinit_start() esac if [ -n "$drive" ]; then umount /media/nuageinit + rmdir /media/nuageinit + else + rm -rf /media/nuageinit fi - rmdir /media/nuageinit } load_rc_config $name From nobody Thu Nov 7 09:47:17 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Xkcg94MCRz5cdYF; Thu, 07 Nov 2024 09:47: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xkcg93vSTz4HYb; Thu, 7 Nov 2024 09:47:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730972837; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FMcgeOFIPFRGi/YpjcaVPAQvtIdEQC1O9Ew34qEHueo=; b=b3h+ptKju/2NXHn9zAH1/iHvtcWGzvCjZrVCnUbXQ0MkluBjC/cWbCIdKbJ+2MuAHPvRfI ZHT6fAR21HYxlTUg2sHI+rXzP1fw6eS9lE27ztij8ZUlEwR7tHE8VNFy5J3P3AbxlhH87/ UchGqJHRQDPZzp+iugrIgHWFDTNsw72KP7zrETt8ypGfQ0FczjUe61bmgMwc3MmXJekbIe sQz5DVpsLYgejqCBurYJChJ4g9IbUwy5XEMcXX33dK+4u7yydyxGj4iu10fOd6AvMr/tX7 S+ATQSozzbu5R7MNFMRx5DelYlqzm6iAInJqSYY8r76PdKBJWzlinyATxN4/Ow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730972837; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FMcgeOFIPFRGi/YpjcaVPAQvtIdEQC1O9Ew34qEHueo=; b=kDTz7HfsBrpNsVDhQ7RaUt5WeJMnE1NNog+kxd0Sk4ylnu2LX2q/eGjTOC83QDBh6Q0GZ3 5K1Mtzg78RDTIR0/bwrgcls4deWNmFYNO+SUOMAfWyOL8fXwVpFD+Uftnf4WsUM2C9xX9S fF2EnkATHeKjEtCjTlkL1rp44o9FbKUuR4S3Tbem575MpuXHo6biVhS8TKxCaeiC6FmL/5 TdXnPPvlaSHGbq1tMVZ1UByG6/Zb8FRXdTeNJ/QfNb2CoFbauMqjKMzAAyS2QTt8CqJTTQ /Oyq/tsGOxLrKDW/u/+KCyN50oM59KcG7z8737b1zDBuV6AQkwfJMq68hlQJhw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730972837; a=rsa-sha256; cv=none; b=G90k2L+EwpfuLvvD+Z05bP2J4M0Ip7aAjBSDyfrs90ig+XJjVoqDSIGm8iFPTE7nCsYd6x zYMDGwG2DhGoY+HtiTjGJ7iX4lr9sV1bPjoE8HlZDNdjg2ezuug7+XY9mPnf6yaC0u/1o4 aKtWgzhzALE1fW98FBqGt3NV2tYUNl7D69vmMd7oSZpBY8ptjYTngoIjG9ktk9gGsxT5DT sPHqYn64UL6QUlAtVhfwzmC5l5V0FMnfLIfuihKfFubDLjteklPlNX/BJu7jubpcPL1CcO 3a8VkuqQX/VnIXhRvNX0Oq0DigAdzmJQHkr5M7XxRVbDD3m+VGREmSPxiu3bEw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Xkcg93WDyzgtt; Thu, 7 Nov 2024 09:47:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A79lHch010057; Thu, 7 Nov 2024 09:47:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A79lH9u010054; Thu, 7 Nov 2024 09:47:17 GMT (envelope-from git) Date: Thu, 7 Nov 2024 09:47:17 GMT Message-Id: <202411070947.4A79lH9u010054@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 33197f22b5c5 - releng/14.2 - sctp: editorial cleanup List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.2 X-Git-Reftype: branch X-Git-Commit: 33197f22b5c5b220d7849993f56afa96fdd98b18 Auto-Submitted: auto-generated The branch releng/14.2 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=33197f22b5c5b220d7849993f56afa96fdd98b18 commit 33197f22b5c5b220d7849993f56afa96fdd98b18 Author: Michael Tuexen AuthorDate: 2024-11-02 15:00:59 +0000 Commit: Michael Tuexen CommitDate: 2024-11-07 00:01:23 +0000 sctp: editorial cleanup Improve consistency, no functional change intended. (cherry picked from commit d839cf2fbb47c52d5153fb366c51bd6f6a3dd0fd) (cherry picked from commit 107704217b5733a2cae4e0fa1940f7ac66780f84) Approved by: re (cperviva) --- sys/netinet/sctp_pcb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/netinet/sctp_pcb.c b/sys/netinet/sctp_pcb.c index 0030c5385390..b7b531ab33ab 100644 --- a/sys/netinet/sctp_pcb.c +++ b/sys/netinet/sctp_pcb.c @@ -312,7 +312,7 @@ sctp_mark_ifa_addr_down(uint32_t vrf_id, struct sockaddr *addr, } } - sctp_ifap->localifa_flags &= (~SCTP_ADDR_VALID); + sctp_ifap->localifa_flags &= ~SCTP_ADDR_VALID; sctp_ifap->localifa_flags |= SCTP_ADDR_IFA_UNUSEABLE; out: SCTP_IPI_ADDR_RUNLOCK(); @@ -354,7 +354,7 @@ sctp_mark_ifa_addr_up(uint32_t vrf_id, struct sockaddr *addr, } } - sctp_ifap->localifa_flags &= (~SCTP_ADDR_IFA_UNUSEABLE); + sctp_ifap->localifa_flags &= ~SCTP_ADDR_IFA_UNUSEABLE; sctp_ifap->localifa_flags |= SCTP_ADDR_VALID; out: SCTP_IPI_ADDR_RUNLOCK(); From nobody Thu Nov 7 09:47:18 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XkcgB5JvNz5cdMQ; Thu, 07 Nov 2024 09:47: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XkcgB4Yr1z4HYc; Thu, 7 Nov 2024 09:47:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730972838; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6Exen8PFiR/N/pwzHERJOG20ZwtRVR7v5hE/gB88SHU=; b=BztM/GOTqWPtvlXNURQvnX8uskRAht49NlMp5vR99n6U58KDYLCNliIV6scV7w/jcAOc65 izNhCldVYyF7PX4ELR8JUuPBB1jhbDI61zmVcQrGyYePZU5EHMR3LYjaLA6oVLt8nqyosj aM9bP+VfWjtaVWCYFc57fo9xNbiZrA2t/EELxLJVTnXVGlxFNBLmKBsl4l4eoJg9M1B6jy /tQfJg0Hd9XRkbWBtWMSgxRyV52FqXjjSv/MR+Sa4bihyDg/pq0AE6hjoW7Ym0Aric2whP prEofValJ23iwoXXTqianJm+WbewT3M19FBlCKDcc3i/cxJPnTkiJRZejChYnA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730972838; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6Exen8PFiR/N/pwzHERJOG20ZwtRVR7v5hE/gB88SHU=; b=jqkZe8fup4PzhgE+EpJ9cPoP2zDnD6eugbNUuOl0mmBq0TyeGlY0XQANiaXJMPJdL7xH12 RHQBSGBPKWf2BpSNGQoTAENb4AmX2sVE/YbBlKhPvndY23sLI4Ji+rlaKhhKuPqOca5i+e OtYhje9qEVClRJ6fkI1SPysXSJUJkuMW8o1wrW/UzCoLQB+5V+0+Tl8O8Z+Ghe3uazoZao DY4NTQYscn0/ihpyy2kk2fNIHcv/vlTASPpzaSJaJJrP7Fr8ENpo3vLgPuLXkjdmR/IJHF sjg8g3r3kZJDVaX0/tdRM9N0OZ/DsmmVMwNx1zZIXEv5LE1cGC7V3yiOCkh9qw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730972838; a=rsa-sha256; cv=none; b=O7L5xE7ZXrufgSv6XGsq7eLj5dsrMHVYJSabxvxiJ8J90si1gtGayfJg4/Hha9CJFgUdGX baPu7ge0Nyhj7sdYILH108ySKe03zSlJKmWiwbX5iGOYDBqgARwaucU31iF1W/U5LiXww4 VSf0TACqpttyZc4uuwKP8vTvJtAoCaaH/H1IgPD3FhILWpRulRx8T6E0Zheqypg+F0fHVK I8O0o4b4dotCqQcPR2pF+Ml9tAAFAT/gha4WXN27/rYQvQWSBhvsFNKJtnKVE8mJoU0hx4 azIKoKD8tGPhixthp+2bBEMtbbW45uF2SxmonygsfnEMvfsFN2kOgUrIddigdQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XkcgB49J9zgSJ; Thu, 7 Nov 2024 09:47:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A79lICp010134; Thu, 7 Nov 2024 09:47:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A79lIAj010128; Thu, 7 Nov 2024 09:47:18 GMT (envelope-from git) Date: Thu, 7 Nov 2024 09:47:18 GMT Message-Id: <202411070947.4A79lIAj010128@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: bb6af83fe47b - releng/14.2 - sctp: don't consider the interface name when removing an address List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.2 X-Git-Reftype: branch X-Git-Commit: bb6af83fe47b88a60926bda73e87e4d40dfe19a9 Auto-Submitted: auto-generated The branch releng/14.2 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=bb6af83fe47b88a60926bda73e87e4d40dfe19a9 commit bb6af83fe47b88a60926bda73e87e4d40dfe19a9 Author: Michael Tuexen AuthorDate: 2024-11-02 15:33:02 +0000 Commit: Michael Tuexen CommitDate: 2024-11-07 00:02:12 +0000 sctp: don't consider the interface name when removing an address Checking the interface name can not be done consistently, so don't do it. (cherry picked from commit bf11fdaf0d095fecca61fa8b457d06e27fae5946) (cherry picked from commit 66628552a38751ed5c395858d1754660557674cd) Approved by: re (cperviva) --- sys/netinet/sctp_bsd_addr.c | 3 +-- sys/netinet/sctp_pcb.c | 27 +++------------------------ sys/netinet/sctp_pcb.h | 2 +- 3 files changed, 5 insertions(+), 27 deletions(-) diff --git a/sys/netinet/sctp_bsd_addr.c b/sys/netinet/sctp_bsd_addr.c index a91b0dde5967..3c6952ab6f3c 100644 --- a/sys/netinet/sctp_bsd_addr.c +++ b/sys/netinet/sctp_bsd_addr.c @@ -338,8 +338,7 @@ sctp_addr_change(struct ifaddr *ifa, int cmd) (void *)ifa, ifa->ifa_addr, ifa_flags, 1); } else { sctp_del_addr_from_vrf(SCTP_DEFAULT_VRFID, ifa->ifa_addr, - ifa->ifa_ifp->if_index, - ifa->ifa_ifp->if_xname); + ifa->ifa_ifp->if_index); /* * We don't bump refcount here so when it completes the diff --git a/sys/netinet/sctp_pcb.c b/sys/netinet/sctp_pcb.c index b7b531ab33ab..cd5479c11e6a 100644 --- a/sys/netinet/sctp_pcb.c +++ b/sys/netinet/sctp_pcb.c @@ -662,8 +662,7 @@ sctp_add_addr_to_vrf(uint32_t vrf_id, void *ifn, uint32_t ifn_index, */ SCTPDBG(SCTP_DEBUG_PCB4, "Lost an address change?\n"); /* Opps, must decrement the count */ - sctp_del_addr_from_vrf(vrf_id, addr, ifn_index, - if_name); + sctp_del_addr_from_vrf(vrf_id, addr, ifn_index); return (NULL); } SCTP_INCR_LADDR_COUNT(); @@ -688,7 +687,7 @@ sctp_add_addr_to_vrf(uint32_t vrf_id, void *ifn, uint32_t ifn_index, void sctp_del_addr_from_vrf(uint32_t vrf_id, struct sockaddr *addr, - uint32_t ifn_index, const char *if_name) + uint32_t ifn_index) { struct sctp_vrf *vrf; struct sctp_ifa *sctp_ifap; @@ -709,27 +708,7 @@ sctp_del_addr_from_vrf(uint32_t vrf_id, struct sockaddr *addr, if (sctp_ifap != NULL) { /* Validate the delete */ if (sctp_ifap->ifn_p) { - bool valid = false; - - /*- - * The name has priority over the ifn_index - * if its given. - */ - if (if_name) { - if (strncmp(if_name, sctp_ifap->ifn_p->ifn_name, SCTP_IFNAMSIZ) == 0) { - /* They match its a correct delete */ - valid = true; - } - } - if (!valid) { - /* last ditch check ifn_index */ - if (ifn_index == sctp_ifap->ifn_p->ifn_index) { - valid = true; - } - } - if (!valid) { - SCTPDBG(SCTP_DEBUG_PCB4, "ifn:%d ifname:%s does not match addresses\n", - ifn_index, ((if_name == NULL) ? "NULL" : if_name)); + if (ifn_index != sctp_ifap->ifn_p->ifn_index) { SCTPDBG(SCTP_DEBUG_PCB4, "ifn:%d ifname:%s - ignoring delete\n", sctp_ifap->ifn_p->ifn_index, sctp_ifap->ifn_p->ifn_name); SCTP_IPI_ADDR_WUNLOCK(); diff --git a/sys/netinet/sctp_pcb.h b/sys/netinet/sctp_pcb.h index 86c244c71544..1249c2233c63 100644 --- a/sys/netinet/sctp_pcb.h +++ b/sys/netinet/sctp_pcb.h @@ -510,7 +510,7 @@ void sctp_free_ifa(struct sctp_ifa *sctp_ifap); void sctp_del_addr_from_vrf(uint32_t vrfid, struct sockaddr *addr, - uint32_t ifn_index, const char *if_name); + uint32_t ifn_index); struct sctp_nets *sctp_findnet(struct sctp_tcb *, struct sockaddr *); From nobody Thu Nov 7 09:47:19 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XkcgC67Ywz5cdqc; Thu, 07 Nov 2024 09:47: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XkcgC55bRz4HbN; Thu, 7 Nov 2024 09:47:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730972839; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6axVbbtfSeV7k/1qK8DQsCTcD9Jf7FZicMPAXxBVw3Y=; b=Uuu4QqDdHoFa926585QIVHsBIjdlqjOclvUgTL/cPoMuQQ8qoBPAFxM2Kr+wS41f0uSlud OAt3QjKqVV8PCK55H+3wNsE4QhXu7SIJcBqa9FNBm0nlc8PgmB2qhDr55rVtw4MBlaIw5e SfAM7nteS/QiNCT6egTH0l0+wJnQF0S6C/AQ2aSE3u9AxCzMNTN/hzgYPRoPuhmC/7TqWL Nk2RlG/NsUgoUcYbVGSYAVoD8U1eGua64LHvydXuzGN7bu4YgvKzYyM9OCUK3hu0nzzWwB g15L2gNzOUlYIvA8sebRhkYrHaR42oJDw7bLY3U5Y0Hj/KosxMc3HB0xHvK0Jg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730972839; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6axVbbtfSeV7k/1qK8DQsCTcD9Jf7FZicMPAXxBVw3Y=; b=Hpkph+ZvB8w8WFypyBWRYcdQLtRDnHTLKASQyWDYQa9fzyQEuJGalZMbg29l1Un2q1mOz4 YQ/UNlNzCk0K2ksm3BKElwkwbjxpgR0VFZc2b+oiauwlDVeLtA5e26/aGXeg0r2gS/lSY/ YaCDeQ9hVceu68Xa29z3YJDEKOEvP2jYhLg0k6/vlDZgFHfU3ZJYtLZ3rNAAkEm7NRSdkk TGSxpO3Y54JJJdicf3o8S7lNdqagPCMxxbPzQHKTGNJRjc3nu6+yJ9GEcYfT1Ja365XZVT a82Ccsz1kCTM9mTC/9GdmPVFksbLdF7qUBR6NKXYNNhADO13XqA8kbIVz1FwYw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730972839; a=rsa-sha256; cv=none; b=ZxGFraUcOoq7kPZxosGYZmdLMw7EWmEfpTgxSvuulp4hQRA5Dh2J4tDLHysEkO/lzRWUR9 YzNMghAPZfj+d3vXLiIbHNjf7xmGyjAiD1YXi9GWeSTGBMz2SfP6rMRGI0lwgletjfGTIJ NmqyIThRdQpYLkfT/qM+9Luh/OcfssMusLMPLHFtDXwLPGraHBS3x0IpDgD/r7LrMFZLSU aU4FjyMmhkG4wFgcAcwwjaQr+x+1aQmjTtQaCJMZY6TlJXvCSPDaG1kW0T+ShvrjudyG3c bph0zOjrmVwZmuM0N19e81R8OK/BYRCd6G3c4nRgW+b1hO8YZQ1JSWDdg40G6A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XkcgC4gYyzgk0; Thu, 7 Nov 2024 09:47:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A79lJL5010185; Thu, 7 Nov 2024 09:47:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A79lJFs010182; Thu, 7 Nov 2024 09:47:19 GMT (envelope-from git) Date: Thu, 7 Nov 2024 09:47:19 GMT Message-Id: <202411070947.4A79lJFs010182@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 2a6bd6e37b47 - releng/14.2 - sctp: garbage collect two unused functions List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.2 X-Git-Reftype: branch X-Git-Commit: 2a6bd6e37b472cee98873014ce58cddd947db148 Auto-Submitted: auto-generated The branch releng/14.2 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=2a6bd6e37b472cee98873014ce58cddd947db148 commit 2a6bd6e37b472cee98873014ce58cddd947db148 Author: Michael Tuexen AuthorDate: 2024-11-02 16:58:09 +0000 Commit: Michael Tuexen CommitDate: 2024-11-07 00:02:33 +0000 sctp: garbage collect two unused functions (cherry picked from commit 470a63cde4285ea4a317b0bba966514c11f4ed5b) (cherry picked from commit e3f26ce52b71d4005e666ced22c0855dbc70b28e) Approved by: re (cperviva) --- sys/netinet/sctp_pcb.c | 84 -------------------------------------------------- sys/netinet/sctp_pcb.h | 12 -------- 2 files changed, 96 deletions(-) diff --git a/sys/netinet/sctp_pcb.c b/sys/netinet/sctp_pcb.c index cd5479c11e6a..5f21b2b3d0e4 100644 --- a/sys/netinet/sctp_pcb.c +++ b/sys/netinet/sctp_pcb.c @@ -276,90 +276,6 @@ sctp_delete_ifn(struct sctp_ifn *sctp_ifnp) sctp_free_ifn(sctp_ifnp); } -void -sctp_mark_ifa_addr_down(uint32_t vrf_id, struct sockaddr *addr, - const char *if_name, uint32_t ifn_index) -{ - struct sctp_vrf *vrf; - struct sctp_ifa *sctp_ifap; - - SCTP_IPI_ADDR_RLOCK(); - vrf = sctp_find_vrf(vrf_id); - if (vrf == NULL) { - SCTPDBG(SCTP_DEBUG_PCB4, "Can't find vrf_id 0x%x\n", vrf_id); - goto out; - } - sctp_ifap = sctp_find_ifa_by_addr(addr, vrf->vrf_id, SCTP_ADDR_LOCKED); - if (sctp_ifap == NULL) { - SCTPDBG(SCTP_DEBUG_PCB4, "Can't find sctp_ifap for address\n"); - goto out; - } - if (sctp_ifap->ifn_p == NULL) { - SCTPDBG(SCTP_DEBUG_PCB4, "IFA has no IFN - can't mark unusable\n"); - goto out; - } - if (if_name) { - if (strncmp(if_name, sctp_ifap->ifn_p->ifn_name, SCTP_IFNAMSIZ) != 0) { - SCTPDBG(SCTP_DEBUG_PCB4, "IFN %s of IFA not the same as %s\n", - sctp_ifap->ifn_p->ifn_name, if_name); - goto out; - } - } else { - if (sctp_ifap->ifn_p->ifn_index != ifn_index) { - SCTPDBG(SCTP_DEBUG_PCB4, "IFA owned by ifn_index:%d down command for ifn_index:%d - ignored\n", - sctp_ifap->ifn_p->ifn_index, ifn_index); - goto out; - } - } - - sctp_ifap->localifa_flags &= ~SCTP_ADDR_VALID; - sctp_ifap->localifa_flags |= SCTP_ADDR_IFA_UNUSEABLE; -out: - SCTP_IPI_ADDR_RUNLOCK(); -} - -void -sctp_mark_ifa_addr_up(uint32_t vrf_id, struct sockaddr *addr, - const char *if_name, uint32_t ifn_index) -{ - struct sctp_vrf *vrf; - struct sctp_ifa *sctp_ifap; - - SCTP_IPI_ADDR_RLOCK(); - vrf = sctp_find_vrf(vrf_id); - if (vrf == NULL) { - SCTPDBG(SCTP_DEBUG_PCB4, "Can't find vrf_id 0x%x\n", vrf_id); - goto out; - } - sctp_ifap = sctp_find_ifa_by_addr(addr, vrf->vrf_id, SCTP_ADDR_LOCKED); - if (sctp_ifap == NULL) { - SCTPDBG(SCTP_DEBUG_PCB4, "Can't find sctp_ifap for address\n"); - goto out; - } - if (sctp_ifap->ifn_p == NULL) { - SCTPDBG(SCTP_DEBUG_PCB4, "IFA has no IFN - can't mark unusable\n"); - goto out; - } - if (if_name) { - if (strncmp(if_name, sctp_ifap->ifn_p->ifn_name, SCTP_IFNAMSIZ) != 0) { - SCTPDBG(SCTP_DEBUG_PCB4, "IFN %s of IFA not the same as %s\n", - sctp_ifap->ifn_p->ifn_name, if_name); - goto out; - } - } else { - if (sctp_ifap->ifn_p->ifn_index != ifn_index) { - SCTPDBG(SCTP_DEBUG_PCB4, "IFA owned by ifn_index:%d down command for ifn_index:%d - ignored\n", - sctp_ifap->ifn_p->ifn_index, ifn_index); - goto out; - } - } - - sctp_ifap->localifa_flags &= ~SCTP_ADDR_IFA_UNUSEABLE; - sctp_ifap->localifa_flags |= SCTP_ADDR_VALID; -out: - SCTP_IPI_ADDR_RUNLOCK(); -} - /*- * Add an ifa to an ifn. * Register the interface as necessary. diff --git a/sys/netinet/sctp_pcb.h b/sys/netinet/sctp_pcb.h index 1249c2233c63..736972c007d8 100644 --- a/sys/netinet/sctp_pcb.h +++ b/sys/netinet/sctp_pcb.h @@ -487,18 +487,6 @@ struct sctp_vrf *sctp_allocate_vrf(int vrfid); struct sctp_vrf *sctp_find_vrf(uint32_t vrfid); void sctp_free_vrf(struct sctp_vrf *vrf); -/*- - * Change address state, can be used if - * O/S supports telling transports about - * changes to IFA/IFN's (link layer triggers). - * If a ifn goes down, we will do src-addr-selection - * and NOT use that, as a source address. This does - * not stop the routing system from routing out - * that interface, but we won't put it as a source. - */ -void sctp_mark_ifa_addr_down(uint32_t vrf_id, struct sockaddr *addr, const char *if_name, uint32_t ifn_index); -void sctp_mark_ifa_addr_up(uint32_t vrf_id, struct sockaddr *addr, const char *if_name, uint32_t ifn_index); - struct sctp_ifa * sctp_add_addr_to_vrf(uint32_t vrfid, void *ifn, uint32_t ifn_index, uint32_t ifn_type, From nobody Thu Nov 7 09:47:20 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XkcgF0kJXz5cdMS; Thu, 07 Nov 2024 09:47: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XkcgD6QMBz4Hs1; Thu, 7 Nov 2024 09:47:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730972840; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oHSA/43WMjQLx4v6XaInbW9q7TpcGOoFQYY0SPWpkPM=; b=fk6nW+SASpanvrNT0DFcXX6nkIC5IlYxHqK3egVM8ZalZo1URHoZf++TFez2s/2W3xUyZN as0vuktYxu3R2YXJ1MO9M1FNqhmiKDsZRTE0jLWHl0oxdA5a2CEPNyJ/2baQIAE9KbzdQn PLhr3H/W4o5zQlloTXYn3FfyaZTTQZMltQCOVNQ/XfwO3zSu2+VnuytqiHXqI08r0gc+eC N6Bsv5RJ9eIF/2Q49oC4q7yaCw/LNX5/LPWsIBnPB2SHo8yYF8AeSMQH3d8XtCPjLYGUQB CeNI8YY7F2KjHbTiNY0jiDRmJ81THRSrILfN6k6y51OWXrV3sov11E1DBUbS1Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730972840; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oHSA/43WMjQLx4v6XaInbW9q7TpcGOoFQYY0SPWpkPM=; b=lhK9SBpFWM8mZHTw3u82eJAiv00FraaFOaAWvTz493+CS1ErFJD9/wp/BmJ/CgXQHpKD27 1X0lL286Rq+V3Yw1iaL49u/FnvEY45WnTPnMggoPCaq3pMJZdRWuoyosD6531pz3gEjU1h evkDsGC1C3L0dyU1lhqs0hGpcRmKQyJlrsnvuGgY41zCj0r0gFDhFyFnnXqW6OmfPRDlA0 49AEIvWXrk236MNniyaQI1sau+2uXSerhOHcoVdjBfdfN6r8N2L4qOgECA8p1phOZbRCQr rJlIZakCvUL8+Uwf0QpKc9tqTC4GPimCWVDidRRsU6urKpze7MSnweLpLtGb1A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730972840; a=rsa-sha256; cv=none; b=wE4gbRTupbq2DxC/bo0+KX/R6kk4fH2bwCRnHP3dKU0v9zwTjj/cvczEqEGLO3cqBkLOhu duWhmL496Ma06Tl6k8bglcs29JB2drlq3a68MkLguIMZHB2D7V1hjRAHOcDK9rrgeQVNPF jhMuTh2nL2zXaUzS0+LFo29b+m8n/eaxWrRRReGll5bzCdtPdOx1qU9ORe1wyEcChv4wUB nmR/HocsbN7HHy7IshxkSLg0uVT9wZdiVBOdr8FzF54ugrN9eXMLZuSzD2HuJxqH6kcaRz ojX77hU9F/PPAfum0WdrzKTBYgLyV17tJ4JXpDVcdOPur5EnRPVe27sPtVTL+w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XkcgD61Wlzgk1; Thu, 7 Nov 2024 09:47:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A79lKUG010232; Thu, 7 Nov 2024 09:47:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A79lKqY010229; Thu, 7 Nov 2024 09:47:20 GMT (envelope-from git) Date: Thu, 7 Nov 2024 09:47:20 GMT Message-Id: <202411070947.4A79lKqY010229@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: a0bc4ec08bef - releng/14.2 - sctp: improve handling of address changes List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.2 X-Git-Reftype: branch X-Git-Commit: a0bc4ec08bef381dc5005338d77caf301e585bf3 Auto-Submitted: auto-generated The branch releng/14.2 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=a0bc4ec08bef381dc5005338d77caf301e585bf3 commit a0bc4ec08bef381dc5005338d77caf301e585bf3 Author: Michael Tuexen AuthorDate: 2024-11-03 09:20:08 +0000 Commit: Michael Tuexen CommitDate: 2024-11-07 00:02:52 +0000 sctp: improve handling of address changes Identify interfaces consistenly by the pair of the ifn pointer and the index. This avoids a use after free when the ifn and or index was reused. Reported by: bz, pho, and others (cherry picked from commit 523913c94371ab50a8129cbab820394d25f7a269) (cherry picked from commit 331db93815afb49b01f269aeff0fe899acd47455) Approved by: re (cperviva) --- sys/netinet/sctp_bsd_addr.c | 1 + sys/netinet/sctp_pcb.c | 23 +++++++++++++---------- sys/netinet/sctp_pcb.h | 2 +- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/sys/netinet/sctp_bsd_addr.c b/sys/netinet/sctp_bsd_addr.c index 3c6952ab6f3c..a10fbcc5ca40 100644 --- a/sys/netinet/sctp_bsd_addr.c +++ b/sys/netinet/sctp_bsd_addr.c @@ -338,6 +338,7 @@ sctp_addr_change(struct ifaddr *ifa, int cmd) (void *)ifa, ifa->ifa_addr, ifa_flags, 1); } else { sctp_del_addr_from_vrf(SCTP_DEFAULT_VRFID, ifa->ifa_addr, + (void *)ifa->ifa_ifp, ifa->ifa_ifp->if_index); /* diff --git a/sys/netinet/sctp_pcb.c b/sys/netinet/sctp_pcb.c index 5f21b2b3d0e4..ab120fc951b1 100644 --- a/sys/netinet/sctp_pcb.c +++ b/sys/netinet/sctp_pcb.c @@ -193,12 +193,11 @@ sctp_find_ifn(void *ifn, uint32_t ifn_index) struct sctp_ifnlist *hash_ifn_head; SCTP_IPI_ADDR_LOCK_ASSERT(); + KASSERT(ifn != NULL, ("sctp_find_ifn(NULL, %u) called", ifn_index)); hash_ifn_head = &SCTP_BASE_INFO(vrf_ifn_hash)[(ifn_index & SCTP_BASE_INFO(vrf_ifn_hashmark))]; LIST_FOREACH(sctp_ifnp, hash_ifn_head, next_bucket) { - if (sctp_ifnp->ifn_index == ifn_index) { - break; - } - if (ifn != NULL && sctp_ifnp->ifn_p == ifn) { + if (sctp_ifnp->ifn_index == ifn_index && + sctp_ifnp->ifn_p == ifn) { break; } } @@ -439,7 +438,8 @@ sctp_add_addr_to_vrf(uint32_t vrf_id, void *ifn, uint32_t ifn_index, if (sctp_ifap != NULL) { /* The address being added is already or still known. */ if (sctp_ifap->ifn_p != NULL) { - if (sctp_ifap->ifn_p->ifn_index == ifn_index) { + if (sctp_ifap->ifn_p->ifn_index == ifn_index && + sctp_ifap->ifn_p->ifn_p == ifn) { SCTPDBG(SCTP_DEBUG_PCB4, "Using existing ifn %s (0x%x) for ifa %p\n", sctp_ifap->ifn_p->ifn_name, ifn_index, @@ -578,7 +578,7 @@ sctp_add_addr_to_vrf(uint32_t vrf_id, void *ifn, uint32_t ifn_index, */ SCTPDBG(SCTP_DEBUG_PCB4, "Lost an address change?\n"); /* Opps, must decrement the count */ - sctp_del_addr_from_vrf(vrf_id, addr, ifn_index); + sctp_del_addr_from_vrf(vrf_id, addr, ifn, ifn_index); return (NULL); } SCTP_INCR_LADDR_COUNT(); @@ -603,7 +603,7 @@ sctp_add_addr_to_vrf(uint32_t vrf_id, void *ifn, uint32_t ifn_index, void sctp_del_addr_from_vrf(uint32_t vrf_id, struct sockaddr *addr, - uint32_t ifn_index) + void *ifn, uint32_t ifn_index) { struct sctp_vrf *vrf; struct sctp_ifa *sctp_ifap; @@ -624,9 +624,12 @@ sctp_del_addr_from_vrf(uint32_t vrf_id, struct sockaddr *addr, if (sctp_ifap != NULL) { /* Validate the delete */ if (sctp_ifap->ifn_p) { - if (ifn_index != sctp_ifap->ifn_p->ifn_index) { - SCTPDBG(SCTP_DEBUG_PCB4, "ifn:%d ifname:%s - ignoring delete\n", - sctp_ifap->ifn_p->ifn_index, sctp_ifap->ifn_p->ifn_name); + if (ifn_index != sctp_ifap->ifn_p->ifn_index || + ifn != sctp_ifap->ifn_p->ifn_p) { + SCTPDBG(SCTP_DEBUG_PCB4, "ifn:%d (p) ifname:%s - ignoring delete\n", + sctp_ifap->ifn_p->ifn_index, + sctp_ifap->ifn_p->ifn_p, + sctp_ifap->ifn_p->ifn_name); SCTP_IPI_ADDR_WUNLOCK(); return; } diff --git a/sys/netinet/sctp_pcb.h b/sys/netinet/sctp_pcb.h index 736972c007d8..2bec2bc32d4e 100644 --- a/sys/netinet/sctp_pcb.h +++ b/sys/netinet/sctp_pcb.h @@ -498,7 +498,7 @@ void sctp_free_ifa(struct sctp_ifa *sctp_ifap); void sctp_del_addr_from_vrf(uint32_t vrfid, struct sockaddr *addr, - uint32_t ifn_index); + void *ifn, uint32_t ifn_index); struct sctp_nets *sctp_findnet(struct sctp_tcb *, struct sockaddr *); From nobody Thu Nov 7 09:47:21 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XkcgG22WRz5cdsP; Thu, 07 Nov 2024 09:47: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XkcgG00VFz4Hhx; Thu, 7 Nov 2024 09:47:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730972842; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=d/l16th8ylfK3iZ0xPXtWkanFeyY1rf1bqXHGDqmR60=; b=Ci73FWb+y7ZhxELiDT4qr2zYra6K7hUfHhdY4XgO102lNYTIWW//miCvEFnkVr5eA1Ot6Q ZjVElFVNitY1j2EgOJUYTF26NVb803Q6WceXhqIKcPkGTe19J8gf1uFGZi7ct2bBG0QX3j dY2pfzdPITpEiWam1KhzaY2xYM6W1FJ2tXUUlserj486JKlaOLInEvFFE/PF19EoNF6hae t20K//EpbxbZM0FFM7T+xfPadhWB0LmPo9N7dEBoNJFRx7TiL5OJpgUoIUGb/fUhkyjP87 RsdQkxjSXX+ERuBt9l4c4UCfy+5iREkMmxLn5edM4ANfuRwy9FxxkmxSNa0hmQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730972842; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=d/l16th8ylfK3iZ0xPXtWkanFeyY1rf1bqXHGDqmR60=; b=dueT3OGT0QsaP8yJHpYDueBKyOHrORilg875BLd6gYQKzX0H3V+NPkuF7sELTxCl4F6rKh bamqglR63RWxl8MDI8CoTJCHodZLtja+I2d2Na50+GpXGGuVzI9z10JPKqTtsZwH6fpmIV ZhEQZEXrwns0jAf5P1FJI9YPM+E6JNYhvjy581YaFllbv7Ou4w+wW3wsTeRP0qhzRNaKLS xN+H0YTnU9x1XE3/I/CF+Iad5sM6AElpQzsrtMg7Jt+5ONTifcLze6BrpWhUr8Ls6CVZ7L hTBScWnfrFI5svR6nqGkh8Ukf6NKNXL9hgDDkrOpSxnI/UN1hBBgAIj2lYnt1w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730972842; a=rsa-sha256; cv=none; b=fTAG3oEJbgvXXa1ryaXXxrHP8pQElU59g2S0bBNq0kzBPYLidYC4XmM2ph94VP2WVpvvmR 26CT7p7JCYgdATmemfiTGu2y9ciqQ5aqokbPo2IFZKZlbXVUWhehBFtKlznJTv676T+9T3 RKPTpllHy+WLFu4aTNSrEgays1oKs6UYCVp1MYkvJqapxyeA4+KzpU1jbb4UOx8awdQN7H zyLMz5IE8ohlpRqSTYDaD5S2n7ns+OqU0Uxto3NfVdQSL3knO4YSb0tcassSYWmfFsWJCW ePbDwBmtERGaieOcMhSSE5dKvJHVrcsXcc9x7vvhI2ELy8UDn37Gx0LXXkcNwQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XkcgF6kXwzgd8; Thu, 7 Nov 2024 09:47:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A79lLDl010271; Thu, 7 Nov 2024 09:47:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A79lLNB010268; Thu, 7 Nov 2024 09:47:21 GMT (envelope-from git) Date: Thu, 7 Nov 2024 09:47:21 GMT Message-Id: <202411070947.4A79lLNB010268@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 35874d28c839 - releng/14.2 - sctp: fix debug message List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.2 X-Git-Reftype: branch X-Git-Commit: 35874d28c8391fa3583e7a2b008c5f84d0a3e3f7 Auto-Submitted: auto-generated The branch releng/14.2 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=35874d28c8391fa3583e7a2b008c5f84d0a3e3f7 commit 35874d28c8391fa3583e7a2b008c5f84d0a3e3f7 Author: Michael Tuexen AuthorDate: 2024-11-03 10:20:54 +0000 Commit: Michael Tuexen CommitDate: 2024-11-07 00:03:09 +0000 sctp: fix debug message (cherry picked from commit 518a1163d0aa73b26da1dd1a4bb186042ea3c66e) (cherry picked from commit 0e8faabc270f89fbc54bbc118b2ebe2a38364375) Approved by: re (cperviva) --- sys/netinet/sctp_pcb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/sctp_pcb.c b/sys/netinet/sctp_pcb.c index ab120fc951b1..7f10784ce433 100644 --- a/sys/netinet/sctp_pcb.c +++ b/sys/netinet/sctp_pcb.c @@ -626,7 +626,7 @@ sctp_del_addr_from_vrf(uint32_t vrf_id, struct sockaddr *addr, if (sctp_ifap->ifn_p) { if (ifn_index != sctp_ifap->ifn_p->ifn_index || ifn != sctp_ifap->ifn_p->ifn_p) { - SCTPDBG(SCTP_DEBUG_PCB4, "ifn:%d (p) ifname:%s - ignoring delete\n", + SCTPDBG(SCTP_DEBUG_PCB4, "ifn:%d (%p) ifname:%s - ignoring delete\n", sctp_ifap->ifn_p->ifn_index, sctp_ifap->ifn_p->ifn_p, sctp_ifap->ifn_p->ifn_name); From nobody Thu Nov 7 14:28:10 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XkkvH1XvTz5bwPV; Thu, 07 Nov 2024 14: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XkkvH0mFjz4r3G; Thu, 7 Nov 2024 14: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=1730989691; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ROBsfNikJS9mWZRfVYMqIXhJLXATZIN1nEeXR3hbs0M=; b=xi6OABrc2SAsLdTCP9RS1MFydJQexx/gytrCmY34++qlcST/q9LiJgleqdLSqPgiKPOJB7 0K16Ufl17qITBwElCrqTAohMAmFAPqg6ZXVqlNw3D8RrKs4lLabOWfGi5LkPHhh4MkK3FP pLXCSmEW1ioPpUboXKUqM0JpGNFPv6VL8SdFstgZwZYFPW1mSO4i+3e/pgLwuKJI1qRPQg ZL4geYqiwJHDa2Kgdy1nwW/14UXa82KqnWV/Ps8ZLp0sBoudM43mqmymPDT4C4Kf19jtAW wyXAT1X1GHLo4i6asOxbvTOZgnVqkoo1ULXC/YC5eycPn3o/xlge2wwuv139Fw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730989691; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ROBsfNikJS9mWZRfVYMqIXhJLXATZIN1nEeXR3hbs0M=; b=F7KY5W1B+CRQg9HboaN6rTbOmCccbo9MKDH+8+6fVwO2eI8sBN0t/kVUETwNB6G3T/dSPJ xXRXnRH2bew1qc6x2hfrKsfd/fRTVxc8hE3Hb2clGh0hYnFQrCs0W8yNy7XtyOjscnzelU dVDVZgcY5rIQWUruTS5j7y2gCouOM5uVaiK1ig/Iwn/Q/eX2EWrw0zZpf+esUHeM2IW6KL Eg416e4D6SAQrpe3i/tB/hgxxn896CGz0J2L5dIB8fNXKfYF9PdfguZsu2cpyoOFZt+wAa N2VnaWg7fw8QshfsScpP8FotLzzK+9ZRTYrIxgCqn3r9AEymulc7wxK/PrwQnA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730989691; a=rsa-sha256; cv=none; b=LCHPjyWpH0yZUPfwQ/zhMXOHspwi2ZP9D+CwEi9qeFZyOcKHx26I0c+kvOAjyY27XMfd49 TPoqNLKRicbcdaR+OMIQZ/q4Cp5LAeSATm0u6FfjElc7fKBs835IOPg6GPziBX2F8jfR/J ZpNaSpgVlAEkYmDzW9XNfzufOStxfCZSiJWzvxKIVHchxlQsA6ip8DAnAkjzSPdQbK4ILC UZGI+VDAExvSRgySafqkU6jKf0mapzcnrdqJHyljoXyBIQA4XlLOEiAaUDLd/CBu5xbQkf 6gyYnEcckgUpWh8yOKCy1Z7iY0TC8RRklUYjydBfKoU6DDJGEJ279SFlOzEZOQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XkkvG72zxzplN; Thu, 7 Nov 2024 14:28:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A7ESAKp031734; Thu, 7 Nov 2024 14:28:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A7ESAsn031731; Thu, 7 Nov 2024 14:28:10 GMT (envelope-from git) Date: Thu, 7 Nov 2024 14:28:10 GMT Message-Id: <202411071428.4A7ESAsn031731@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 48c59140bd7d - stable/13 - bus: Set the current VNET in device_attach() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 48c59140bd7d82de26966bbc9723a49de95abd94 Auto-Submitted: auto-generated The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=48c59140bd7d82de26966bbc9723a49de95abd94 commit 48c59140bd7d82de26966bbc9723a49de95abd94 Author: Mark Johnston AuthorDate: 2024-10-19 13:03:56 +0000 Commit: Mark Johnston CommitDate: 2024-11-07 14:26:34 +0000 bus: Set the current VNET in device_attach() Some drivers, in particular anything which creates an ifnet during attach, need to have the current VNET set, as if_attach_internal() and its callees access VNET-global variables. device_probe_and_attach() handles this, but this is not the only way to arrive in DEVICE_ATTACH. In particular, bus drivers may invoke device_attach() directly, as does devctl2's DEV_ENABLE ioctl handler. So, set the current VNET in device_attach() instead. I believe it is always safe to use vnet0, as devctl2 ioctls are not permitted within a jail. PR: 282168 Reviewed by: zlei, kevans, bz, imp, glebius MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D47174 (cherry picked from commit f4e35c044c8988b7452cefbdcc417f5fd723e021) (cherry picked from commit 2e80ea70b98ef75f8bea9155944e6f093c0fa828) --- sys/kern/subr_bus.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/sys/kern/subr_bus.c b/sys/kern/subr_bus.c index 06c64ef28fba..9b4a4c65190a 100644 --- a/sys/kern/subr_bus.c +++ b/sys/kern/subr_bus.c @@ -35,6 +35,7 @@ #include #include #include +#include #include #include #include @@ -2984,10 +2985,7 @@ device_probe_and_attach(device_t dev) else if (error != 0) return (error); - CURVNET_SET_QUIET(vnet0); - error = device_attach(dev); - CURVNET_RESTORE(); - return error; + return (device_attach(dev)); } /** @@ -3023,6 +3021,10 @@ device_attach(device_t dev) return (ENXIO); } + KASSERT(IS_DEFAULT_VNET(TD_TO_VNET(curthread)), + ("device_attach: curthread is not in default vnet")); + CURVNET_SET_QUIET(TD_TO_VNET(curthread)); + device_sysctl_init(dev); if (!device_is_quiet(dev)) device_print_child(dev->parent, dev); @@ -3037,8 +3039,10 @@ device_attach(device_t dev) device_sysctl_fini(dev); KASSERT(dev->busy == 0, ("attach failed but busy")); dev->state = DS_NOTPRESENT; + CURVNET_RESTORE(); return (error); } + CURVNET_RESTORE(); dev->flags |= DF_ATTACHED_ONCE; /* We only need the low bits of this time, but ranges from tens to thousands * have been seen, so keep 2 bytes' worth. From nobody Thu Nov 7 16:14:28 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XknFx0f8Gz5c4dg; Thu, 07 Nov 2024 16:14: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XknFx0BbPz4FNG; Thu, 7 Nov 2024 16:14:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730996069; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=f5pwykaoAV8M2PyZnlwqeDrVsA/HDNRHeHe6exqknAc=; b=iIscHZAtsRLVZhJ57eRHPxrdKNEVBBMeOhq2p7gaD+riQoY41930zV0WZyUmG6KF4pYqHB quPGk/J2GqUHAj0jyDTEz+MorQAbyVZE2MRz1/pdHIkbxGjQwagU/Q1lwOdOAxnDGBtcRq nIpEYW+KHpyin01Q3OAl3ekPqEA72/OEbrOKmydPczbRFwoIhLDOUJ7MqiM81BQw0Tq1n5 F5YEOXYVJMHQLauFW6z849J9frx9eoanSdpw3Vz5wc0AFzywGxKaxqhYAtzV3aO8BgvhMf Ci+O7tKMPzsdFsMIGcQ9Z0p+JnW2sE/EFXxumg4QqbXhI/WCl/HnzpHaqTyhfg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730996069; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=f5pwykaoAV8M2PyZnlwqeDrVsA/HDNRHeHe6exqknAc=; b=JptQXb7ASUAf1cD9p2iXcjSiAt+u8NemChxuHfUI2BcofH0ZH880WMhC4zQtpU/jAAUEb5 ImaT3X0mVP9xMYHdd02MqyDaiNCCVop/SMkkS/T9mcmRBjwwWFgphwS2ELsxpDq9lpEsp5 ZIpM99pyXjVO+QjnbLU+0DG3Rt6MeZySNHR61sunJfzXDaJ3UZx4I1DjBLsfczbUbx/MIU mzDl6/ZIHGQGTo9zi2ulB0ZVygoxWy30SDxSe/8iWwzfjNjg80j93dstcK70+MHvRSrNd0 DVip6BcPCRazfpq3zwdWgd8Kfk/SmtefKiHNL0afy+B3VerBCo0rVyIjPFuyhg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730996069; a=rsa-sha256; cv=none; b=m8Ov2DeWFbSPVloDp1ZnPpakec+xabL3Ap5kwpuHfulNgfFKvCIr4ARb3OlM8TUcMmZm9Z lbXXI9ThUJpvbM19m0GpQP8amATDWh6/zLGSI1g+ro/RwFUTrn8A+fcpJMFfqLnCqRAD3o 0T3J5bLdJX8vhi67e8SO2rPc/mry8LlnRDscBGI2W1JP0qo0t54Gvu7lXdUQfmkQ8tsbF6 1s4umrcKAj5fODbpjLC8aT3A1Xvdm12fK0EqS9ipUnbI52xS48DFPaJk4BNgEdruQwnuHY WtjM/NVSYa1QlvhGZr4RPiDtq0eUd74Z0abPHKP2wouHH9AJV2RpZgz74UU2vg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XknFw6vZWzsQq; Thu, 7 Nov 2024 16:14:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A7GESrm035675; Thu, 7 Nov 2024 16:14:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A7GESjA035672; Thu, 7 Nov 2024 16:14:28 GMT (envelope-from git) Date: Thu, 7 Nov 2024 16:14:28 GMT Message-Id: <202411071614.4A7GESjA035672@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 4f1754bccef1 - stable/14 - Merge commit d0b9c2c56476 from llvm git (by David CARLIER): List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 4f1754bccef155c0fd24547ab3c872bd0f182224 Auto-Submitted: auto-generated The branch stable/14 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=4f1754bccef155c0fd24547ab3c872bd0f182224 commit 4f1754bccef155c0fd24547ab3c872bd0f182224 Author: Dimitry Andric AuthorDate: 2024-11-07 16:12:12 +0000 Commit: Dimitry Andric CommitDate: 2024-11-07 16:13:43 +0000 Merge commit d0b9c2c56476 from llvm git (by David CARLIER): [compiler-rt] Remove SHA2 interceptions for NetBSD/FreeBSD. (#110246) To Fix #110215 Interceptors introduced with 18a7ebda99044473fdbce6376993714ff54e6690 This fixes undesirable runtime failures when using -fsanitize=-address in combination with -lcrypto. Direct commit to stable/14, because main already got this change as part of the llvm-19 import. Reported by: Theo Buehler PR: 281685 --- .../sanitizer_common_interceptors.inc | 180 --------------------- .../sanitizer_platform_interceptors.h | 2 - 2 files changed, 182 deletions(-) diff --git a/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.inc b/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.inc index 3ecdb55cdbf7..2cf21f2e3361 100644 --- a/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.inc +++ b/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.inc @@ -8809,83 +8809,6 @@ INTERCEPTOR(char *, RMD160Data, u8 *data, SIZE_T len, char *buf) { #define INIT_RMD160 #endif -#if SANITIZER_INTERCEPT_MD5 -INTERCEPTOR(void, MD5Init, void *context) { - void *ctx; - COMMON_INTERCEPTOR_ENTER(ctx, MD5Init, context); - REAL(MD5Init)(context); - if (context) - COMMON_INTERCEPTOR_WRITE_RANGE(ctx, context, MD5_CTX_sz); -} - -INTERCEPTOR(void, MD5Update, void *context, const unsigned char *data, - unsigned int len) { - void *ctx; - COMMON_INTERCEPTOR_ENTER(ctx, MD5Update, context, data, len); - if (data && len > 0) - COMMON_INTERCEPTOR_READ_RANGE(ctx, data, len); - if (context) - COMMON_INTERCEPTOR_READ_RANGE(ctx, context, MD5_CTX_sz); - REAL(MD5Update)(context, data, len); - if (context) - COMMON_INTERCEPTOR_WRITE_RANGE(ctx, context, MD5_CTX_sz); -} - -INTERCEPTOR(void, MD5Final, unsigned char digest[16], void *context) { - void *ctx; - COMMON_INTERCEPTOR_ENTER(ctx, MD5Final, digest, context); - if (context) - COMMON_INTERCEPTOR_READ_RANGE(ctx, context, MD5_CTX_sz); - REAL(MD5Final)(digest, context); - if (digest) - COMMON_INTERCEPTOR_WRITE_RANGE(ctx, digest, sizeof(unsigned char) * 16); -} - -INTERCEPTOR(char *, MD5End, void *context, char *buf) { - void *ctx; - COMMON_INTERCEPTOR_ENTER(ctx, MD5End, context, buf); - if (context) - COMMON_INTERCEPTOR_READ_RANGE(ctx, context, MD5_CTX_sz); - char *ret = REAL(MD5End)(context, buf); - if (ret) - COMMON_INTERCEPTOR_WRITE_RANGE(ctx, ret, MD5_return_length); - return ret; -} - -INTERCEPTOR(char *, MD5File, const char *filename, char *buf) { - void *ctx; - COMMON_INTERCEPTOR_ENTER(ctx, MD5File, filename, buf); - if (filename) - COMMON_INTERCEPTOR_READ_RANGE(ctx, filename, internal_strlen(filename) + 1); - char *ret = REAL(MD5File)(filename, buf); - if (ret) - COMMON_INTERCEPTOR_WRITE_RANGE(ctx, ret, MD5_return_length); - return ret; -} - -INTERCEPTOR(char *, MD5Data, const unsigned char *data, unsigned int len, - char *buf) { - void *ctx; - COMMON_INTERCEPTOR_ENTER(ctx, MD5Data, data, len, buf); - if (data && len > 0) - COMMON_INTERCEPTOR_READ_RANGE(ctx, data, len); - char *ret = REAL(MD5Data)(data, len, buf); - if (ret) - COMMON_INTERCEPTOR_WRITE_RANGE(ctx, ret, MD5_return_length); - return ret; -} - -#define INIT_MD5 \ - COMMON_INTERCEPT_FUNCTION(MD5Init); \ - COMMON_INTERCEPT_FUNCTION(MD5Update); \ - COMMON_INTERCEPT_FUNCTION(MD5Final); \ - COMMON_INTERCEPT_FUNCTION(MD5End); \ - COMMON_INTERCEPT_FUNCTION(MD5File); \ - COMMON_INTERCEPT_FUNCTION(MD5Data) -#else -#define INIT_MD5 -#endif - #if SANITIZER_INTERCEPT_FSEEK INTERCEPTOR(int, fseek, __sanitizer_FILE *stream, long int offset, int whence) { void *ctx; @@ -9016,107 +8939,6 @@ INTERCEPTOR(char *, MD2Data, const unsigned char *data, unsigned int len, #define INIT_MD2 #endif -#if SANITIZER_INTERCEPT_SHA2 -#define SHA2_INTERCEPTORS(LEN, SHA2_STATE_T) \ - INTERCEPTOR(void, SHA##LEN##_Init, void *context) { \ - void *ctx; \ - COMMON_INTERCEPTOR_ENTER(ctx, SHA##LEN##_Init, context); \ - REAL(SHA##LEN##_Init)(context); \ - if (context) \ - COMMON_INTERCEPTOR_WRITE_RANGE(ctx, context, SHA##LEN##_CTX_sz); \ - } \ - INTERCEPTOR(void, SHA##LEN##_Update, void *context, \ - const u8 *data, SIZE_T len) { \ - void *ctx; \ - COMMON_INTERCEPTOR_ENTER(ctx, SHA##LEN##_Update, context, data, len); \ - if (data && len > 0) \ - COMMON_INTERCEPTOR_READ_RANGE(ctx, data, len); \ - if (context) \ - COMMON_INTERCEPTOR_READ_RANGE(ctx, context, SHA##LEN##_CTX_sz); \ - REAL(SHA##LEN##_Update)(context, data, len); \ - if (context) \ - COMMON_INTERCEPTOR_WRITE_RANGE(ctx, context, SHA##LEN##_CTX_sz); \ - } \ - INTERCEPTOR(void, SHA##LEN##_Final, u8 digest[LEN/8], \ - void *context) { \ - void *ctx; \ - CHECK_EQ(SHA##LEN##_digest_length, LEN/8); \ - COMMON_INTERCEPTOR_ENTER(ctx, SHA##LEN##_Final, digest, context); \ - if (context) \ - COMMON_INTERCEPTOR_READ_RANGE(ctx, context, SHA##LEN##_CTX_sz); \ - REAL(SHA##LEN##_Final)(digest, context); \ - if (digest) \ - COMMON_INTERCEPTOR_WRITE_RANGE(ctx, digest, \ - sizeof(digest[0]) * \ - SHA##LEN##_digest_length); \ - } \ - INTERCEPTOR(char *, SHA##LEN##_End, void *context, char *buf) { \ - void *ctx; \ - COMMON_INTERCEPTOR_ENTER(ctx, SHA##LEN##_End, context, buf); \ - if (context) \ - COMMON_INTERCEPTOR_READ_RANGE(ctx, context, SHA##LEN##_CTX_sz); \ - char *ret = REAL(SHA##LEN##_End)(context, buf); \ - if (ret) \ - COMMON_INTERCEPTOR_WRITE_RANGE(ctx, ret, SHA##LEN##_return_length); \ - return ret; \ - } \ - INTERCEPTOR(char *, SHA##LEN##_File, const char *filename, char *buf) { \ - void *ctx; \ - COMMON_INTERCEPTOR_ENTER(ctx, SHA##LEN##_File, filename, buf); \ - if (filename) \ - COMMON_INTERCEPTOR_READ_RANGE(ctx, filename, internal_strlen(filename) + 1);\ - char *ret = REAL(SHA##LEN##_File)(filename, buf); \ - if (ret) \ - COMMON_INTERCEPTOR_WRITE_RANGE(ctx, ret, SHA##LEN##_return_length); \ - return ret; \ - } \ - INTERCEPTOR(char *, SHA##LEN##_FileChunk, const char *filename, char *buf, \ - OFF_T offset, OFF_T length) { \ - void *ctx; \ - COMMON_INTERCEPTOR_ENTER(ctx, SHA##LEN##_FileChunk, filename, buf, offset, \ - length); \ - if (filename) \ - COMMON_INTERCEPTOR_READ_RANGE(ctx, filename, internal_strlen(filename) + 1);\ - char *ret = REAL(SHA##LEN##_FileChunk)(filename, buf, offset, length); \ - if (ret) \ - COMMON_INTERCEPTOR_WRITE_RANGE(ctx, ret, SHA##LEN##_return_length); \ - return ret; \ - } \ - INTERCEPTOR(char *, SHA##LEN##_Data, u8 *data, SIZE_T len, char *buf) { \ - void *ctx; \ - COMMON_INTERCEPTOR_ENTER(ctx, SHA##LEN##_Data, data, len, buf); \ - if (data && len > 0) \ - COMMON_INTERCEPTOR_READ_RANGE(ctx, data, len); \ - char *ret = REAL(SHA##LEN##_Data)(data, len, buf); \ - if (ret) \ - COMMON_INTERCEPTOR_WRITE_RANGE(ctx, ret, SHA##LEN##_return_length); \ - return ret; \ - } - -SHA2_INTERCEPTORS(224, u32) -SHA2_INTERCEPTORS(256, u32) -SHA2_INTERCEPTORS(384, u64) -SHA2_INTERCEPTORS(512, u64) - -#define INIT_SHA2_INTECEPTORS(LEN) \ - COMMON_INTERCEPT_FUNCTION(SHA##LEN##_Init); \ - COMMON_INTERCEPT_FUNCTION(SHA##LEN##_Update); \ - COMMON_INTERCEPT_FUNCTION(SHA##LEN##_Final); \ - COMMON_INTERCEPT_FUNCTION(SHA##LEN##_End); \ - COMMON_INTERCEPT_FUNCTION(SHA##LEN##_File); \ - COMMON_INTERCEPT_FUNCTION(SHA##LEN##_FileChunk); \ - COMMON_INTERCEPT_FUNCTION(SHA##LEN##_Data) - -#define INIT_SHA2 \ - INIT_SHA2_INTECEPTORS(224); \ - INIT_SHA2_INTECEPTORS(256); \ - INIT_SHA2_INTECEPTORS(384); \ - INIT_SHA2_INTECEPTORS(512) -#undef SHA2_INTERCEPTORS -#else -#define INIT_SHA2 -#endif - #if SANITIZER_INTERCEPT_VIS INTERCEPTOR(char *, vis, char *dst, int c, int flag, int nextc) { void *ctx; @@ -10542,10 +10364,8 @@ static void InitializeCommonInterceptors() { INIT_SHA1; INIT_MD4; INIT_RMD160; - INIT_MD5; INIT_FSEEK; INIT_MD2; - INIT_SHA2; INIT_VIS; INIT_CDB; INIT_GETFSENT; diff --git a/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_platform_interceptors.h b/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_platform_interceptors.h index de55c736d0e1..d78f942b3dd4 100644 --- a/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_platform_interceptors.h +++ b/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_platform_interceptors.h @@ -559,10 +559,8 @@ #define SANITIZER_INTERCEPT_SHA1 SI_NETBSD #define SANITIZER_INTERCEPT_MD4 SI_NETBSD #define SANITIZER_INTERCEPT_RMD160 SI_NETBSD -#define SANITIZER_INTERCEPT_MD5 (SI_NETBSD || SI_FREEBSD) #define SANITIZER_INTERCEPT_FSEEK (SI_NETBSD || SI_FREEBSD) #define SANITIZER_INTERCEPT_MD2 SI_NETBSD -#define SANITIZER_INTERCEPT_SHA2 (SI_NETBSD || SI_FREEBSD) #define SANITIZER_INTERCEPT_CDB SI_NETBSD #define SANITIZER_INTERCEPT_VIS (SI_NETBSD || SI_FREEBSD) #define SANITIZER_INTERCEPT_POPEN SI_POSIX From nobody Thu Nov 7 16:14:48 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XknGJ2PnPz5c4kh; Thu, 07 Nov 2024 16:14: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XknGJ1YC1z4G0t; Thu, 7 Nov 2024 16:14:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730996088; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=weAsQaygPUfO1IWhovCRllLkqUMHdZPPnAldAyByAnk=; b=StS5D6ovKQ6xawim5dZyK+ShvXK6TRnetsVd5jGYTZH3HZLzkuPbJ04csJrj8CBDhao1KL lCqkQqlGinJEvdtk4Om6P7JJtiom498EPdyIMzkK3musAerjKGHelnMI4Kf8l0bEYp2wg0 FWotfVzCaOufx5eFLsoAyb3DitW4EQPjKdszh+QZTM1YWUFYtLRKrE1EBCGLDmkv7VhP8j NLW4gjJZPe6fPRtBiXWfhs2HyA49FQMqEQScijG0dDkw9GSAWhuj/wF2KlHh8Mh1YmbMQU qFYlU6UPfsQPNe6Z4p3fBhriM9JBrlGh6tKIo/4mOJYQaBwsHFj7JxFlNT9yxA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730996088; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=weAsQaygPUfO1IWhovCRllLkqUMHdZPPnAldAyByAnk=; b=NM4VI8p5LMRnDtQs1WJ49vKvJGJxPWKC40H72I7zIJPT99KBx+0TS30EfBqJEvArtiUkX5 GDL5eBbT0HbiXUCB9Fm3c97qw4/kB5PmESBYuIotA6W3Ea0fmQuw3H/WvrYEEH7O5ncqyo 8jtNf1Zrv6ByPHYTWGOjzQtnTurN216UNOV7EwGnQ+yAOnKI8A9BFjdsDuPzZsMbjU4nRq XAfRpAP8em0tckCJaD4pP2kxd00/XIIeutVnVLQBYYQeI48HCK9w66XSua588FkRF7RAol XT/Ti0LhC3gLQSy9pZY6xxP8QlgVLgwjEcrtmnfkHmD6qW2/i8MWZojDYRVXOg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730996088; a=rsa-sha256; cv=none; b=D1zmD1gbA5B34/6sYtwIzGjaMdWi61EfuvL67f7ptf9FB6djQz9nJ16/s7nPNgAkVFZL71 B8qrqjM8jomawqz3x0Qu9DSgn2bN8X+KEsXr60hqXGzY4GbembkLcZj/MnTVQh3UEb8wK0 JgLjPS3e5RV2IRA2uYtpnkcfEytHfi2FLFdhH/V2k+JdztPg211M/IxSTcIhN75SxJ4CZE ePipfSqfBnjmS+IRRdDf0PUevMPooWGrvtjIMdGrJGGBPWQC3kw12yrTWU7g8t+nAa7fvb hwGLwr3qMR75VHaDHcaqiQ5/2iSAIVPHz5dqahtIZm3wkMpDvbDF5gM6HAc97g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XknGJ18RhzsQr; Thu, 7 Nov 2024 16:14:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A7GEmUi035911; Thu, 7 Nov 2024 16:14:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A7GEmxj035908; Thu, 7 Nov 2024 16:14:48 GMT (envelope-from git) Date: Thu, 7 Nov 2024 16:14:48 GMT Message-Id: <202411071614.4A7GEmxj035908@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 56d38dda6b90 - stable/13 - Merge commit d0b9c2c56476 from llvm git (by David CARLIER): List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 56d38dda6b909031995bac73d166efa1b6cccb26 Auto-Submitted: auto-generated The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=56d38dda6b909031995bac73d166efa1b6cccb26 commit 56d38dda6b909031995bac73d166efa1b6cccb26 Author: Dimitry Andric AuthorDate: 2024-11-07 16:12:50 +0000 Commit: Dimitry Andric CommitDate: 2024-11-07 16:12:50 +0000 Merge commit d0b9c2c56476 from llvm git (by David CARLIER): [compiler-rt] Remove SHA2 interceptions for NetBSD/FreeBSD. (#110246) To Fix #110215 Interceptors introduced with 18a7ebda99044473fdbce6376993714ff54e6690 This fixes undesirable runtime failures when using -fsanitize=-address in combination with -lcrypto. Direct commit to stable/13, because main already got this change as part of the llvm-19 import. Reported by: Theo Buehler PR: 281685 --- .../sanitizer_common_interceptors.inc | 180 --------------------- .../sanitizer_platform_interceptors.h | 2 - 2 files changed, 182 deletions(-) diff --git a/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.inc b/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.inc index 3ecdb55cdbf7..2cf21f2e3361 100644 --- a/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.inc +++ b/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.inc @@ -8809,83 +8809,6 @@ INTERCEPTOR(char *, RMD160Data, u8 *data, SIZE_T len, char *buf) { #define INIT_RMD160 #endif -#if SANITIZER_INTERCEPT_MD5 -INTERCEPTOR(void, MD5Init, void *context) { - void *ctx; - COMMON_INTERCEPTOR_ENTER(ctx, MD5Init, context); - REAL(MD5Init)(context); - if (context) - COMMON_INTERCEPTOR_WRITE_RANGE(ctx, context, MD5_CTX_sz); -} - -INTERCEPTOR(void, MD5Update, void *context, const unsigned char *data, - unsigned int len) { - void *ctx; - COMMON_INTERCEPTOR_ENTER(ctx, MD5Update, context, data, len); - if (data && len > 0) - COMMON_INTERCEPTOR_READ_RANGE(ctx, data, len); - if (context) - COMMON_INTERCEPTOR_READ_RANGE(ctx, context, MD5_CTX_sz); - REAL(MD5Update)(context, data, len); - if (context) - COMMON_INTERCEPTOR_WRITE_RANGE(ctx, context, MD5_CTX_sz); -} - -INTERCEPTOR(void, MD5Final, unsigned char digest[16], void *context) { - void *ctx; - COMMON_INTERCEPTOR_ENTER(ctx, MD5Final, digest, context); - if (context) - COMMON_INTERCEPTOR_READ_RANGE(ctx, context, MD5_CTX_sz); - REAL(MD5Final)(digest, context); - if (digest) - COMMON_INTERCEPTOR_WRITE_RANGE(ctx, digest, sizeof(unsigned char) * 16); -} - -INTERCEPTOR(char *, MD5End, void *context, char *buf) { - void *ctx; - COMMON_INTERCEPTOR_ENTER(ctx, MD5End, context, buf); - if (context) - COMMON_INTERCEPTOR_READ_RANGE(ctx, context, MD5_CTX_sz); - char *ret = REAL(MD5End)(context, buf); - if (ret) - COMMON_INTERCEPTOR_WRITE_RANGE(ctx, ret, MD5_return_length); - return ret; -} - -INTERCEPTOR(char *, MD5File, const char *filename, char *buf) { - void *ctx; - COMMON_INTERCEPTOR_ENTER(ctx, MD5File, filename, buf); - if (filename) - COMMON_INTERCEPTOR_READ_RANGE(ctx, filename, internal_strlen(filename) + 1); - char *ret = REAL(MD5File)(filename, buf); - if (ret) - COMMON_INTERCEPTOR_WRITE_RANGE(ctx, ret, MD5_return_length); - return ret; -} - -INTERCEPTOR(char *, MD5Data, const unsigned char *data, unsigned int len, - char *buf) { - void *ctx; - COMMON_INTERCEPTOR_ENTER(ctx, MD5Data, data, len, buf); - if (data && len > 0) - COMMON_INTERCEPTOR_READ_RANGE(ctx, data, len); - char *ret = REAL(MD5Data)(data, len, buf); - if (ret) - COMMON_INTERCEPTOR_WRITE_RANGE(ctx, ret, MD5_return_length); - return ret; -} - -#define INIT_MD5 \ - COMMON_INTERCEPT_FUNCTION(MD5Init); \ - COMMON_INTERCEPT_FUNCTION(MD5Update); \ - COMMON_INTERCEPT_FUNCTION(MD5Final); \ - COMMON_INTERCEPT_FUNCTION(MD5End); \ - COMMON_INTERCEPT_FUNCTION(MD5File); \ - COMMON_INTERCEPT_FUNCTION(MD5Data) -#else -#define INIT_MD5 -#endif - #if SANITIZER_INTERCEPT_FSEEK INTERCEPTOR(int, fseek, __sanitizer_FILE *stream, long int offset, int whence) { void *ctx; @@ -9016,107 +8939,6 @@ INTERCEPTOR(char *, MD2Data, const unsigned char *data, unsigned int len, #define INIT_MD2 #endif -#if SANITIZER_INTERCEPT_SHA2 -#define SHA2_INTERCEPTORS(LEN, SHA2_STATE_T) \ - INTERCEPTOR(void, SHA##LEN##_Init, void *context) { \ - void *ctx; \ - COMMON_INTERCEPTOR_ENTER(ctx, SHA##LEN##_Init, context); \ - REAL(SHA##LEN##_Init)(context); \ - if (context) \ - COMMON_INTERCEPTOR_WRITE_RANGE(ctx, context, SHA##LEN##_CTX_sz); \ - } \ - INTERCEPTOR(void, SHA##LEN##_Update, void *context, \ - const u8 *data, SIZE_T len) { \ - void *ctx; \ - COMMON_INTERCEPTOR_ENTER(ctx, SHA##LEN##_Update, context, data, len); \ - if (data && len > 0) \ - COMMON_INTERCEPTOR_READ_RANGE(ctx, data, len); \ - if (context) \ - COMMON_INTERCEPTOR_READ_RANGE(ctx, context, SHA##LEN##_CTX_sz); \ - REAL(SHA##LEN##_Update)(context, data, len); \ - if (context) \ - COMMON_INTERCEPTOR_WRITE_RANGE(ctx, context, SHA##LEN##_CTX_sz); \ - } \ - INTERCEPTOR(void, SHA##LEN##_Final, u8 digest[LEN/8], \ - void *context) { \ - void *ctx; \ - CHECK_EQ(SHA##LEN##_digest_length, LEN/8); \ - COMMON_INTERCEPTOR_ENTER(ctx, SHA##LEN##_Final, digest, context); \ - if (context) \ - COMMON_INTERCEPTOR_READ_RANGE(ctx, context, SHA##LEN##_CTX_sz); \ - REAL(SHA##LEN##_Final)(digest, context); \ - if (digest) \ - COMMON_INTERCEPTOR_WRITE_RANGE(ctx, digest, \ - sizeof(digest[0]) * \ - SHA##LEN##_digest_length); \ - } \ - INTERCEPTOR(char *, SHA##LEN##_End, void *context, char *buf) { \ - void *ctx; \ - COMMON_INTERCEPTOR_ENTER(ctx, SHA##LEN##_End, context, buf); \ - if (context) \ - COMMON_INTERCEPTOR_READ_RANGE(ctx, context, SHA##LEN##_CTX_sz); \ - char *ret = REAL(SHA##LEN##_End)(context, buf); \ - if (ret) \ - COMMON_INTERCEPTOR_WRITE_RANGE(ctx, ret, SHA##LEN##_return_length); \ - return ret; \ - } \ - INTERCEPTOR(char *, SHA##LEN##_File, const char *filename, char *buf) { \ - void *ctx; \ - COMMON_INTERCEPTOR_ENTER(ctx, SHA##LEN##_File, filename, buf); \ - if (filename) \ - COMMON_INTERCEPTOR_READ_RANGE(ctx, filename, internal_strlen(filename) + 1);\ - char *ret = REAL(SHA##LEN##_File)(filename, buf); \ - if (ret) \ - COMMON_INTERCEPTOR_WRITE_RANGE(ctx, ret, SHA##LEN##_return_length); \ - return ret; \ - } \ - INTERCEPTOR(char *, SHA##LEN##_FileChunk, const char *filename, char *buf, \ - OFF_T offset, OFF_T length) { \ - void *ctx; \ - COMMON_INTERCEPTOR_ENTER(ctx, SHA##LEN##_FileChunk, filename, buf, offset, \ - length); \ - if (filename) \ - COMMON_INTERCEPTOR_READ_RANGE(ctx, filename, internal_strlen(filename) + 1);\ - char *ret = REAL(SHA##LEN##_FileChunk)(filename, buf, offset, length); \ - if (ret) \ - COMMON_INTERCEPTOR_WRITE_RANGE(ctx, ret, SHA##LEN##_return_length); \ - return ret; \ - } \ - INTERCEPTOR(char *, SHA##LEN##_Data, u8 *data, SIZE_T len, char *buf) { \ - void *ctx; \ - COMMON_INTERCEPTOR_ENTER(ctx, SHA##LEN##_Data, data, len, buf); \ - if (data && len > 0) \ - COMMON_INTERCEPTOR_READ_RANGE(ctx, data, len); \ - char *ret = REAL(SHA##LEN##_Data)(data, len, buf); \ - if (ret) \ - COMMON_INTERCEPTOR_WRITE_RANGE(ctx, ret, SHA##LEN##_return_length); \ - return ret; \ - } - -SHA2_INTERCEPTORS(224, u32) -SHA2_INTERCEPTORS(256, u32) -SHA2_INTERCEPTORS(384, u64) -SHA2_INTERCEPTORS(512, u64) - -#define INIT_SHA2_INTECEPTORS(LEN) \ - COMMON_INTERCEPT_FUNCTION(SHA##LEN##_Init); \ - COMMON_INTERCEPT_FUNCTION(SHA##LEN##_Update); \ - COMMON_INTERCEPT_FUNCTION(SHA##LEN##_Final); \ - COMMON_INTERCEPT_FUNCTION(SHA##LEN##_End); \ - COMMON_INTERCEPT_FUNCTION(SHA##LEN##_File); \ - COMMON_INTERCEPT_FUNCTION(SHA##LEN##_FileChunk); \ - COMMON_INTERCEPT_FUNCTION(SHA##LEN##_Data) - -#define INIT_SHA2 \ - INIT_SHA2_INTECEPTORS(224); \ - INIT_SHA2_INTECEPTORS(256); \ - INIT_SHA2_INTECEPTORS(384); \ - INIT_SHA2_INTECEPTORS(512) -#undef SHA2_INTERCEPTORS -#else -#define INIT_SHA2 -#endif - #if SANITIZER_INTERCEPT_VIS INTERCEPTOR(char *, vis, char *dst, int c, int flag, int nextc) { void *ctx; @@ -10542,10 +10364,8 @@ static void InitializeCommonInterceptors() { INIT_SHA1; INIT_MD4; INIT_RMD160; - INIT_MD5; INIT_FSEEK; INIT_MD2; - INIT_SHA2; INIT_VIS; INIT_CDB; INIT_GETFSENT; diff --git a/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_platform_interceptors.h b/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_platform_interceptors.h index de55c736d0e1..d78f942b3dd4 100644 --- a/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_platform_interceptors.h +++ b/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_platform_interceptors.h @@ -559,10 +559,8 @@ #define SANITIZER_INTERCEPT_SHA1 SI_NETBSD #define SANITIZER_INTERCEPT_MD4 SI_NETBSD #define SANITIZER_INTERCEPT_RMD160 SI_NETBSD -#define SANITIZER_INTERCEPT_MD5 (SI_NETBSD || SI_FREEBSD) #define SANITIZER_INTERCEPT_FSEEK (SI_NETBSD || SI_FREEBSD) #define SANITIZER_INTERCEPT_MD2 SI_NETBSD -#define SANITIZER_INTERCEPT_SHA2 (SI_NETBSD || SI_FREEBSD) #define SANITIZER_INTERCEPT_CDB SI_NETBSD #define SANITIZER_INTERCEPT_VIS (SI_NETBSD || SI_FREEBSD) #define SANITIZER_INTERCEPT_POPEN SI_POSIX From nobody Thu Nov 7 16:33:19 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Xkngg6Bk9z5c6vJ; Thu, 07 Nov 2024 16:33: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xkngg5SnDz4HyB; Thu, 7 Nov 2024 16:33:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730997199; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qdu0LH9+eg9QGDvB7rS99ikZl5rUhge3bm7b3szY0aY=; b=CSjPViRWNR/bFksF3bW3RwNwN6WAb+YRV90caoGiUlzpiWXpqhnEPJuz/pXF84e3pCuiBb RfaCAWhl85bHNbGrMdn7l0UbA7kn7DX1TYRa3WAj/B6WUMMUXH8anMj+xqPjZtt7Ok3f3w nM7qG2jvbulGj67RW0N5Q7mECCorARMkj5SAmAauDrK+FvjNaoiStViJLjtNI0T+Ur85Ui /BjvoXW97xCaRfSTOAYuMZQuioA39Qu4EjFAt7G4eT0OuoiEjHtTW/gAuyRjMMIoRQ/0oc LrfuDPkp56GM/ab+Y8+GKVTYbDOs/pzZkK4qYQAq2vWpu1x6qUyNtmQv+TMC3g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730997199; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qdu0LH9+eg9QGDvB7rS99ikZl5rUhge3bm7b3szY0aY=; b=DNvQAdhlOpiM4lk/ckUAoIg21EM/afsiQ0QavLeC9jwSI09WWFiU6XjFqTG2SKNjHZst+6 r1Ci0ITDK/t05gTs5Y2Y+mwLif5IuaIFcBmzTmQi1971zg4oL/qc721HSchpDlcnXdJumJ wACuRKfD02KEifEs96lHIw5ZCYuiIYHhVfnLYdQpkQ2BG7oPqLm1jLeLFSomkV5StXbarA eshVMtf5RHrpvuGP3P3NvWIo40otLuAXhDDXsaXh1NRb7QlLVdPxJq2p9zMOYGd55HKoga +e7b5c9e+/anoelilyMAkbafr4hsMsne6dFmn/c/eW6/i+Feu2NbfPXSYzWhEQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730997199; a=rsa-sha256; cv=none; b=RM/BRGwTkn0YXE+q/bGu8SpveZsMzmVP17fCavsGTS30FeH7qlk0cRKSfTAlA8btwrGVUO dv+itqHTj3ZM2r2s6YIfmqnmPMh2ciXiDHLaqJVq4Bm/D6Yo5pWUbExaOjlsuNZs8ysD4W mKi2YcJRuh24BBzyysDl0C1wqNVK9KLvr+m1OU6WyrneWSFMW4gYBfgJN62Z+X4awFQiUJ Yvw5hJ9eLfA0/lsQBBwMpAV9Rciuh1VNrZ2gRpGyhTwGFW/+gOX7iXt55vOn2AcaF1KR1G CDO35J3ZqDgyCosspccfaXD/rUOdER9xn/NtPtQ6zbREiaB1xWdctXKCmqjZBA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Xkngg5487zt8L; Thu, 7 Nov 2024 16:33:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A7GXJu3072495; Thu, 7 Nov 2024 16:33:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A7GXJVg072491; Thu, 7 Nov 2024 16:33:19 GMT (envelope-from git) Date: Thu, 7 Nov 2024 16:33:19 GMT Message-Id: <202411071633.4A7GXJVg072491@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 5b8e4b1c123e - stable/13 - ifnet: Assert that we are assigning network stack correctly List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 5b8e4b1c123ec3cb779a5563d672b62be1c94065 Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=5b8e4b1c123ec3cb779a5563d672b62be1c94065 commit 5b8e4b1c123ec3cb779a5563d672b62be1c94065 Author: Zhenlei Huang AuthorDate: 2024-10-22 04:32:24 +0000 Commit: Zhenlei Huang CommitDate: 2024-11-07 16:32:16 +0000 ifnet: Assert that we are assigning network stack correctly It makes no sense to assign NULL vnet to an interface when the kernel option VIMAGE is enabled. Add an assertion to catch that. This will also help diagnosing problem report [1] and [2]. 1. https://bugs.freebsd.org/275381 2. https://bugs.freebsd.org/282168 Reviewed by: kp MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D46982 (cherry picked from commit d1d839d0b593541174ca48c675c9eff4ddb4715e) (cherry picked from commit 2f3c87296cc727fc21fbb4d549deaed7dfa2fef1) --- sys/net/if.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/net/if.c b/sys/net/if.c index 8a870bb4e1bc..107ff67d547a 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -864,6 +864,7 @@ if_attach_internal(struct ifnet *ifp, bool vmove) ifp->if_xname); #ifdef VIMAGE + CURVNET_ASSERT_SET(); ifp->if_vnet = curvnet; if (ifp->if_home_vnet == NULL) ifp->if_home_vnet = curvnet; From nobody Thu Nov 7 16:33:20 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Xkngh70frz5c6n5; Thu, 07 Nov 2024 16:33: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xkngh6TF2z4Hn3; Thu, 7 Nov 2024 16:33:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730997200; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Q58/WZ7xVQ+T4osFYgSjv/vTEZcwMSiGr62KaEUYVr8=; b=tZ9sHlgRpYFbNK4tNc0351hTIG3nEXeTp5oICR1cCfOWfLF1YVxfww5pW6eAuZrNTR7ujw 202GY682TGb578/BoXLYVUq783L04KGp8mHLjxgNPRbtjTY4WH4+IrEC0IzI8FU5jF5otZ v//T3X3/K9OXeGWPbld0Fp0INHFyOeJmEGPU/rtKJvsCh21DKEYxVwBhgL0VOWn1H0/BOK PfmLa6ocHIGsy1IlUm3pjaxDLKPneg3pHQRebUa6ALXA+eeJGR/d4UkvdfaEMCxa0JAEN7 ewk0b5C1sMMY2NG8+k5Nng7pHyvjHosf80x0BWjQxiD2a8dV+eynchvkQiAGGA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730997200; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Q58/WZ7xVQ+T4osFYgSjv/vTEZcwMSiGr62KaEUYVr8=; b=PQ4TXcMnlcDiRqfjrkQMCmQ+9tg0AerZUe1gBmVxpYQvPCzCiLm0gg6Vj3F7mMgnBEIGt4 E2GpNabKGoo6QdQkO2oQ63mMOCDiifwtKKvC9xQ5rZsDq6OE4HbVcSX2SG+bkDZMImaU0p RMvLRG86b/3gpjJ3/HtFtKKj+Q+uJ8Ml55d5GGD0ksx0ejMF+r76igqzewa5LKNJ7vwolM +UAvWy5a46X7H6syWS40L3lkyuyoO635m3y0kbMwNprhb20q0b5gHvhHbWSIMLHisURwuP S1vUOo+zjr97Bv79Ny1vTXGLnj0tDKrMYWUzbWV7YU82envNp6EqWQuhKPleHg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730997200; a=rsa-sha256; cv=none; b=d45ulmwUgWiwHW+MVtincOc4X0fbkJuPTaTvNJ88/17KRRiK4XrSVE0935s0jrdeItsZNX CUSC1lzJF8jZFcN++xpnDPuv9Lrk5uTLiY9fqwhyTv/qXpnA4RmWCd0KDAAPk/jopd+ive uQ+lf8j3lj8mMYWLhcV0hccM5qlC3HWHNtT/Cx5HgEG+9kOaPz6SCbWd0R8wd1ChiPE4Ag uKUWhnoI2lQhjtpiDkWk3mMp6iQTj4sXk7JLGRPqt89kh9E5XeOaSCDO97/wWihqIPOHD7 8VWP3sBJePnIG+zJWkGCdKS09VLxV5Wmhk3Oui4P6vY0sIis4A2DptimhLg/jw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Xkngh64Y0zskV; Thu, 7 Nov 2024 16:33:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A7GXKD6072541; Thu, 7 Nov 2024 16:33:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A7GXKq9072537; Thu, 7 Nov 2024 16:33:20 GMT (envelope-from git) Date: Thu, 7 Nov 2024 16:33:20 GMT Message-Id: <202411071633.4A7GXKq9072537@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 13774c9a98c9 - stable/13 - ndp: Remove a stray semicolon List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 13774c9a98c9abd90f573ed91c572c2b68e5e2e7 Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=13774c9a98c9abd90f573ed91c572c2b68e5e2e7 commit 13774c9a98c9abd90f573ed91c572c2b68e5e2e7 Author: Zhenlei Huang AuthorDate: 2024-10-17 13:05:29 +0000 Commit: Zhenlei Huang CommitDate: 2024-11-07 16:32:16 +0000 ndp: Remove a stray semicolon MFC after: 1 week (cherry picked from commit 17120e4bc3e61557816ca0558a60ab969b3df404) (cherry picked from commit 00fa80275f34586775e744d83ff94f8f42eaa696) --- usr.sbin/ndp/ndp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/ndp/ndp.c b/usr.sbin/ndp/ndp.c index c826fb8d241f..f744c35dd94f 100644 --- a/usr.sbin/ndp/ndp.c +++ b/usr.sbin/ndp/ndp.c @@ -603,7 +603,7 @@ dump(struct sockaddr_in6 *addr, int cflag) xo_emit(xobuf, "Neighbor", "Linklayer Address", "Netif", "Expire", "S", "Flags"); } xo_open_list("neighbor-cache"); -again:; +again: mib[0] = CTL_NET; mib[1] = PF_ROUTE; mib[2] = 0; From nobody Thu Nov 7 16:33:21 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Xkngk1tFXz5c6r5; Thu, 07 Nov 2024 16:33: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xkngj70c8z4HtB; Thu, 7 Nov 2024 16:33:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730997202; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aERtwmrrCzDfzKxP7nTawrJcfyR9RLV0e4VRi8vTwPE=; b=kP40VXBTCZbh0ai0QJc5XQKM1V5aUHX1z437plSg4zvIL/g3IU00H0vxjCg8i11iLfxHRA ODhqAMYEm/m/KOll/Yw6lQszq2IGuTW3hl0wc4u47Q0HXlbsP7XEoZNIvzayuo8ryfL//f nwOFN5vubMTl4ua0QzCJKQH1LWmG+3eUWVXIJSdWjtZd+zdcE7gkM7Ckc9hBAPLkiRnO/Y /HIOR4UPrxXz4JzOMxbCXF0z8pVn6U4rdcuiP+bHnbAwoW9ofaB+grKXWm6AcEdKdqdZAW J69lDX8uxJSwB0V6KODIZiA61qvYli8kdV1WmsJIyQW4iQbyt3RCCdFlLqzTnQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730997202; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aERtwmrrCzDfzKxP7nTawrJcfyR9RLV0e4VRi8vTwPE=; b=ovgQzi87gYAFSETpffFGNpS+X058X2pIZid4Fo7s70qtl5Agib1ssNB/J6p66CN8Zq4htv LdP2u1n/INW6flMoGnr5E+0gucHU8g920q37lXeO3UpbstsyPItfw0bjpNH0PmqP0sHmA+ lagNhCtNenYQT7V62kZzvjNHaW/oBDBMastqFmdxOqJwq+Esf+D6cLatEUlHKn9gl7vNIi nA5uB7ztJIWk5A2HIUf90Z1tFGARuAmSY5M+MLEsQH6yBEuPn82CVfHmHx8qqZCoH+ClUJ eHX5EfQqdCCe55sJB26eOgSzNfUgG1uoASTo6j/EHBjkJQ6F+dvVmgrcYtH19Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730997202; a=rsa-sha256; cv=none; b=GxvWyACo7ncXkPr3PMj33hjI0tDqPc8lJRYdyBB2o4nenRbk3hXrIyHULrbWS3lU3B9L+d tG3ArWVOh54sistH6F8Zxa5IoJWBLb+pnbkVWLR6xmFzl5cjJMpRCGQDHZHTqQWELYbTIF KUhOkRMlOkJLEhGOFiJtBXjYI8F/Ii98KNlzrrHECYcTspBmYBBs9BOV2QunIHHd5Y2wF1 H5T7iK+CnOtxzRqCj/2Qb1k+4qFui1Nfb8TLqkH7xzQQN02TFnkwMifXBuHGzVeSH343m3 UEZtcc+cYOTjKauB5eCfMisLu8tfZxtbGs7HbFlMa8lqk6SpiRX8s3Bv78kH2A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Xkngj6cy5zt17; Thu, 7 Nov 2024 16:33:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A7GXL8L072598; Thu, 7 Nov 2024 16:33:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A7GXLxv072593; Thu, 7 Nov 2024 16:33:21 GMT (envelope-from git) Date: Thu, 7 Nov 2024 16:33:21 GMT Message-Id: <202411071633.4A7GXLxv072593@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 5bf5b3f42761 - stable/13 - config: Remove a stray semicolon List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 5bf5b3f4276141bcfc4f3bcb43ad8d0611b8e696 Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=5bf5b3f4276141bcfc4f3bcb43ad8d0611b8e696 commit 5bf5b3f4276141bcfc4f3bcb43ad8d0611b8e696 Author: Zhenlei Huang AuthorDate: 2024-10-24 15:04:48 +0000 Commit: Zhenlei Huang CommitDate: 2024-11-07 16:32:17 +0000 config: Remove a stray semicolon MFC after: 1 week (cherry picked from commit d96ba5a6236566afba05ce542296c589503a8b17) (cherry picked from commit 57af3009cb2911de5c8b3e09425d764d61c80792) --- usr.sbin/config/mkmakefile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/config/mkmakefile.c b/usr.sbin/config/mkmakefile.c index b4a00e29707d..24b8a65c59cd 100644 --- a/usr.sbin/config/mkmakefile.c +++ b/usr.sbin/config/mkmakefile.c @@ -575,7 +575,7 @@ next: goto nextparam; } match &= not; -nextparam:; +nextparam: not = 0; } compile += match; From nobody Thu Nov 7 16:33:24 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Xkngm5Y6Xz5c6r8; Thu, 07 Nov 2024 16:33: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xkngm3xFZz4J1g; Thu, 7 Nov 2024 16:33:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730997204; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dLLdTDw1fCfIE5JWNAWnk4W8HCnDNSicjd6dhoyyRs0=; b=tzejOe8pm8vegFSLCSs4zlpoWphe7sEWxB9fB3zOU2m2+JURBv59sFFvr8c18uSW/UBjA+ 0+8/L9hQjGZlAIK97qD+slpHbzRNTD+auA8oUw/LYR+7ogSz70BrjcO/Q9TL6m+e6Y2Wz5 TJhivjjAD9uk/Wpr69pAA2vfJPmbQxopIWmrdWREgdzU1R/EWB8Gv5KzajJzzKeQ0Jg0Nb 10PHBXGAx6QI3MIxl2JuUF3lwxHLhLbaJZe4QKKPVgWvWBd+XOsUmbsWD8CT8Z5xRTJNhJ DQ8keaZY2cyzBVAGZJHw2Fs+9ricBEia5D+DzzME2UvW4RaxmMJ2wLSlekIrGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730997204; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dLLdTDw1fCfIE5JWNAWnk4W8HCnDNSicjd6dhoyyRs0=; b=G8gQT/YwiYKvpkdeqDY84a0Cpr4p+ofJ4G7+3a/BdxyM4GjxsJ7/YdUGcexSC87eAkla2E qf87/SrZ0JTSf08ABkCMCfKNUElhI6COK9snnotVJCcy+o5c2rwbmlsQ+cphoVrbMLmU/y LY+1/VMFnIUe0tzmsUiqqCfjmy5CfoOpniN+Ec8sGo6oy31L3MWsFqo3UTlMHJkz+gvgs0 aGBYQjGCOQiG96ueacmuCbsbxW8zrMcD627VUVHuzX1OGwoW+6HZ5qNLOmB+ymKDY8qo17 uVhcYEXHTQWCBv8nxyG83+RrvPJ0+HdF+bTyyWqd29SsLpa/c3BI86oZHNtDEg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730997204; a=rsa-sha256; cv=none; b=FnXpqdr+QlMidDugLgklagCJRUUS8C+sCWfB67UWM9ka1I8RBsqn50Gy447xo4J2gDvCYn Hwv+rBiN0Yvcgr+pOJqjDorn7bgYRo0mbBawGGkL8icrRpLbwSlStcLQeIXxtdti8F1VxW dmJ2MuLBV2pVMDE5qnZm35YjCK0VmaX83doRNKJ9ruQ3KRpjIfgvzw33+eqk7lKign7FW1 EOKfmDwR6/0NUfdWq1q7osXjfhEfDHjgGT4d5z+9ELvGbz/aZDl3Ao0b4dbr1fREdwborh Z7wAmBYtz91TNUZRgstDIXKzIV78yyOj1adtbMKSy2oXaINDe9EfyN2ths/pZg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Xkngm1Rvyzt8M; Thu, 7 Nov 2024 16:33:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A7GXO9I072693; Thu, 7 Nov 2024 16:33:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A7GXOtu072690; Thu, 7 Nov 2024 16:33:24 GMT (envelope-from git) Date: Thu, 7 Nov 2024 16:33:24 GMT Message-Id: <202411071633.4A7GXOtu072690@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: ed01695d05b9 - stable/13 - LinuxKPI: Remove stray semicolons List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: ed01695d05b93a577d1ea838b443af2dfb76dd3a Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=ed01695d05b93a577d1ea838b443af2dfb76dd3a commit ed01695d05b93a577d1ea838b443af2dfb76dd3a Author: Zhenlei Huang AuthorDate: 2024-10-24 15:04:48 +0000 Commit: Zhenlei Huang CommitDate: 2024-11-07 16:32:17 +0000 LinuxKPI: Remove stray semicolons MFC after: 1 week (cherry picked from commit b4856b8e9d872ca6ee0c4ef43e7047693ef7645b) (cherry picked from commit 5942658cf3573bc3df9c378b688beb7549754773) --- sys/compat/linuxkpi/common/include/linux/kernel.h | 2 +- sys/compat/linuxkpi/common/include/linux/skbuff.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/kernel.h b/sys/compat/linuxkpi/common/include/linux/kernel.h index f6d3216e3b0f..0e248db760a4 100644 --- a/sys/compat/linuxkpi/common/include/linux/kernel.h +++ b/sys/compat/linuxkpi/common/include/linux/kernel.h @@ -718,7 +718,7 @@ static inline bool mac_pton(const char *macin, uint8_t *macout) { const char *s, *d; - uint8_t mac[6], hx, lx;; + uint8_t mac[6], hx, lx; int i; if (strlen(macin) < (3 * 6 - 1)) diff --git a/sys/compat/linuxkpi/common/include/linux/skbuff.h b/sys/compat/linuxkpi/common/include/linux/skbuff.h index ee3f427aa6e9..73ad1404b194 100644 --- a/sys/compat/linuxkpi/common/include/linux/skbuff.h +++ b/sys/compat/linuxkpi/common/include/linux/skbuff.h @@ -606,7 +606,7 @@ static inline void __skb_unlink(struct sk_buff *skb, struct sk_buff_head *head) { SKB_TRACE2(skb, head); - struct sk_buff *p, *n;; + struct sk_buff *p, *n; head->qlen--; p = skb->prev; From nobody Thu Nov 7 16:33:22 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Xkngl3phpz5c6rr; Thu, 07 Nov 2024 16:33:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xkngl14gvz4HtQ; Thu, 7 Nov 2024 16:33:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730997203; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fxp7C2goPpgalLo8Mc/mEqEuMLRZbYCclarrWNoHlIE=; b=itvOBTYD1ZVWi5LpQZ/i7gZaY6GzbA1wYq5YnBMx0wQcz2S9cZgpmq9UiHgJ3kEB4g5eOr +G18NPpyYyg3t2Hsv4M7Ieuei4t9XgwElWgv8gkbihCG4hz3EaPA20606ly8UqkWb08cgH jdl2HN19ZZCycETUXm0f3uV6D8MT3dWTlPEaVnckwHJjhQrQXI7mey+cITM9ZmX1eno+uH mFXHAB7E51XbfRP2L977/cF/nGEXdJEOw+y7kKt+k9X6yk+63kvRgFAERCgYfj64HXcvWo wgmki4ePJbOpT3UTIfMJ6uyIWvPabLKQhLpamRxD0qtkrbNCHlmYCBE/E9TMPQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730997203; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fxp7C2goPpgalLo8Mc/mEqEuMLRZbYCclarrWNoHlIE=; b=MejpD5mMVkBE027gfYOsrAiRpNEMK0D4C0efcv4Cx+AyCKksg+3KWOAUUsQS3Bwk4fG6Zk ie5io7Rr3hEnMku2WqCInt1OSYsBkMpC1Sg4VXaX6GLc0d7Wb0+/qqbXRs4ERoHdCaTfE4 zsZ7yvxAOsQ1mzHXRAd0CyUgVQb7oFyxcrCk7fcqcK1ujocrl1LZXpHOuEPAej6a2iULOw RXVsQy8Zdzh3EMEYvvGN2zCQZp7Jpy6w9E8zRRWHv6TPoiEkKEKjMfIwnN32+2dz7ZxR4b jbYOxp7OWPPup1IvmY0YKpDlm7MM/zTkvq/pC6eXj5OeNMxAIbJiR+B9L7Uy2Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730997203; a=rsa-sha256; cv=none; b=g6XMOK75N0l/mRfuQZ0k2ks5w1weERiUBUnQ6teLK4kpLwPDLxJ6SoUGBiSTyqvyaQ8xQh o8qJFugVyJ1Qic0b78WdZ4C3WrOS8Gccl4b6kLrXIfpSi7H8BSW7aEEyJ2Te42sDiV1Yza BEfMzc2cM0NMz9pfKUyYS9mmUm3CHbeFZ32kNrhylwoHv0uHXfqOcWwhRgQSnsXoAH69me kkY8pCTg7eQ+IxP3v27Vtga/YVfdUBY6nfSmgTPbU6LyuzliG7TDHeOTLQB0orWtlG//bM gc8VZPWczWVMfR+91HdP3LdbHzWT35XW8cKmtN6yIVXu09pkb2MB2hts1Qu0jg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Xkngl0Xr1ztFL; Thu, 7 Nov 2024 16:33:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A7GXMYS072645; Thu, 7 Nov 2024 16:33:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A7GXMPp072642; Thu, 7 Nov 2024 16:33:22 GMT (envelope-from git) Date: Thu, 7 Nov 2024 16:33:22 GMT Message-Id: <202411071633.4A7GXMPp072642@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 0a196c47ce95 - stable/13 - makefs: Remove a stray semicolon List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 0a196c47ce959c9bcf4f2e9903b83f6f195744e0 Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=0a196c47ce959c9bcf4f2e9903b83f6f195744e0 commit 0a196c47ce959c9bcf4f2e9903b83f6f195744e0 Author: Zhenlei Huang AuthorDate: 2024-10-24 15:04:48 +0000 Commit: Zhenlei Huang CommitDate: 2024-11-07 16:32:17 +0000 makefs: Remove a stray semicolon MFC after: 1 week (cherry picked from commit 56b17de1e8360fe131d425de20b5e75ff3ea897c) (cherry picked from commit 30e256e1faf4da7b89399340520d175fb6f2371d) --- usr.sbin/makefs/msdos/msdosfs_fat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/makefs/msdos/msdosfs_fat.c b/usr.sbin/makefs/msdos/msdosfs_fat.c index bb5eea457516..e09ba0755397 100644 --- a/usr.sbin/makefs/msdos/msdosfs_fat.c +++ b/usr.sbin/makefs/msdos/msdosfs_fat.c @@ -247,7 +247,7 @@ pcbmap(struct denode *dep, u_long findcn, daddr_t *bnp, u_long *cnp, int *sp) return (0); } -hiteof:; +hiteof: if (cnp) *cnp = i; if (bp) From nobody Thu Nov 7 16:33:25 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Xkngn5LPsz5c6vK; Thu, 07 Nov 2024 16:33: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xkngn2t0Hz4HrF; Thu, 7 Nov 2024 16:33:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730997205; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hcSKa+ZhDMhEPe9tbmddhQKykDxycmfaPGDqZb2jNmU=; b=abdbB6sa6xQ65Lb9Yp6K26V+PaIOuRW749bPGwF3DyxbLiAnWBxHjpyFl65pvr2o5S4lxr Y6Khg3W/IVrheshGHaucGH0Q5ZPWkWvcO1Y/KINNTQ8Q5kRirpLTikh7amsIDXUu/ZL8A4 lNB9byurXbiRl0KvSBbKHn83fzlKPkbiOveF8VqVCJ34rEHZrsFt5qwn5QPomN9Lam2sGV dnY4JuQHUylIMLdghzsMwkTYMu2aGiQRvXKFDbGCDZog6VofXT/LehbQAi9mdWM0ZpUw0K YUMZm5RkxPo99E6Hs61c97Pw0mWjMl9YdElDeKvY2f92gthCWN5l+s7ALrS/Nw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730997205; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hcSKa+ZhDMhEPe9tbmddhQKykDxycmfaPGDqZb2jNmU=; b=R+/pw2waRPuZs1OQiANsg17kbwRBeyFyKynyS05vg5wqRS1m7Em3WQM/Y0corktGB6sXDy Og1JRk6msBpE9As15RKipqwuzM6dxmghyxbaGCpX9Mqva23Sb6LAGsqodb5VnEg/KmNkoR ojpmG+M7xyxeqXpo7skrQovyToIe9tdGNC6MH+ges3wDx3Nz+eEOHWCOtNdvLo48Uje1Vx I2V1vP28WxDv0bheMLY39xXErGcajwjrHlS/z3QH2kNboBYqGLBqP7osgl5YvuYixc/Jli Am6jPzcZXNanuGrlAE+V+PMoeX+tojYEkIi7934LjgXq5Ht/MrTk5x17walS4Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730997205; a=rsa-sha256; cv=none; b=EkCx6GLWxO6fx7tmpM4XZsn1AYwRMj+ZEnJuiyPdoKS92v4dNvpDflIVZ2QE742K3P9TaA hLgacAQqYuJNot5X3fN5pdx1lib6+7EcEQya3bX0l9uKy0rFlbqZ874Q3vTpgBy/OKoMSR zVG1QQbtRh0OzhZ2f4R+sfAchYp8p5krTUZYBL+KFY208irFu4iwXMZxfnM//QSyHS8O1y t55YS532Sa88G97955++ZTdl2Lz4OQLLZxBx7SGNV9w0mhQY8fp5luD5/Qvv+UAsD1S+R+ 8IdK7GWDxFLch5mFpMhp+6CI7Q41PssFziDqudRqYk0IRsvei/EQMCtWKjgvSQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Xkngn2V01ztFM; Thu, 7 Nov 2024 16:33:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A7GXPE4072735; Thu, 7 Nov 2024 16:33:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A7GXPtO072732; Thu, 7 Nov 2024 16:33:25 GMT (envelope-from git) Date: Thu, 7 Nov 2024 16:33:25 GMT Message-Id: <202411071633.4A7GXPtO072732@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 69d334e3bf2a - stable/13 - ocs_fc: Remove a stray semicolon List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 69d334e3bf2aece6683ffff0fd5928c8c2dddc59 Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=69d334e3bf2aece6683ffff0fd5928c8c2dddc59 commit 69d334e3bf2aece6683ffff0fd5928c8c2dddc59 Author: Zhenlei Huang AuthorDate: 2024-10-24 15:04:50 +0000 Commit: Zhenlei Huang CommitDate: 2024-11-07 16:32:17 +0000 ocs_fc: Remove a stray semicolon MFC after: 1 week (cherry picked from commit 36756195a342dbfb8fcfc7561b1d656fc6310d05) (cherry picked from commit 02e61e1d9e02cb76706d4e82b5f56df20f9802aa) --- sys/dev/ocs_fc/ocs_hw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/ocs_fc/ocs_hw.c b/sys/dev/ocs_fc/ocs_hw.c index 9b368e32ce32..a437342bd0d0 100644 --- a/sys/dev/ocs_fc/ocs_hw.c +++ b/sys/dev/ocs_fc/ocs_hw.c @@ -12192,7 +12192,7 @@ ocs_hw_set_persistent_topology(ocs_hw_t *hw, uint32_t topology, uint32_t opts) param.persistent_topo = SLI4_INIT_LINK_F_P2P_FAIL_OVER; param.topo_failover = 1; } else { - param.persistent_topo = SLI4_INIT_LINK_F_P2P_ONLY;; + param.persistent_topo = SLI4_INIT_LINK_F_P2P_ONLY; param.topo_failover = 0; } break; From nobody Thu Nov 7 23:26:40 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Xkyrc3qTfz5cqbG; Thu, 07 Nov 2024 23:26: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xkyrc3Dmpz4Mq5; Thu, 7 Nov 2024 23:26:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731022000; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DCGhsBnfSr0PE/R9eTpFQQ5bL10mDxIRUBKFhP5mIrM=; b=Pgj2KCCpVPyUPk0UX3X6+LGwYpt5mEW6GkAfepz8ZgY8ySNiPkZmxhvNfW5kjj9lgvhsWB DT0T28TlpxJG81KC3bn2zCl/AOmvi+E+LC4tOZWkiqiHNUsiOPhb2+81mVgitjsTKoM4N8 CCa4uVoQZ/oCa9MQqdHuaZB5bxBUMjMSJ6Mq/c3ZBGmOZ+UVTVqvmsXFIkrJTwW5/Pm3lK HCQSxH3XGr7SrlNDyBLqAHWHJdxKGLHsVrDflBt9sgdijQZtAG1LImmnRCBZrgSSWW+0MW eeUJoocyJyggy2VPBHMKNQRlR+AGDYjSsEWVtjMArMuuyOewH3LVSFvzwktmfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731022000; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DCGhsBnfSr0PE/R9eTpFQQ5bL10mDxIRUBKFhP5mIrM=; b=cr4BOnlGyBOo86Sf++fNz//rlfH+ZULYDlHlsyB/cCn5IworS5nYzIfh1Rat5jn7A5dYme yY2OXlKHF211JMmU7ymY9+KQq7QJUgCXXkRmrGilG4F4jld6vDnuE5ZVjmjzhHKThnvYOR l2qvZBgAROo5UwtO5xUlJv1QYDRaQCZYzZjq1qMHYLA4T8hoc9Ms0YHoDIVRuz5WF3snsh oozsoo7CnND4OvvzDQUiiZJqec+e87JQ6SYPx+fQrQSQO860XXS6wsO2ybRBwFeouZXCMM VhZMljFHj7JqA22Lq1EAzMZihaI3i2SkX3gTMfZVpL13vOMkiBf5t+qS0eNvWQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731022000; a=rsa-sha256; cv=none; b=NN+Bs6b2icLW1vQLudJG7Q+i1Pe+1n63uKA2mldq95ydIfxpHiUcUy8evp0sWeTttDZXn7 xKuNb6ZEA8wQGyoMfoHHIPQ3uPH8WtezwfQ8Dz1DJ5DrlgZK2I7fAqod2eyQD7i4GcxFuq gPED606a5CQB3/RaXkyDYi/+EljGhCoDAhjFMIYUpLN0Po94RTeXvX3z9hJdhyRXXe1+3r SZUKMc22NSzVv5O255TkMwvb4VOiHC89TriqSvNlxQq8c/xPVvH1A3uBtcL0SSJ7Cn/OcA 5ZXsRKlMq+LW8WNBuTmqFH2KO5TS24QHCdIzf94ZvjGTCmBryr+ZAFr2mwts2g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Xkyrc2jrcz14pp; Thu, 7 Nov 2024 23:26:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A7NQeWE033676; Thu, 7 Nov 2024 23:26:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A7NQefe033673; Thu, 7 Nov 2024 23:26:40 GMT (envelope-from git) Date: Thu, 7 Nov 2024 23:26:40 GMT Message-Id: <202411072326.4A7NQefe033673@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 0be04cb5cb98 - releng/14.2 - ndp: Move the global variable repeat into struct ndp_opts List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.2 X-Git-Reftype: branch X-Git-Commit: 0be04cb5cb9854d71cd98b10a35111b289cd21a5 Auto-Submitted: auto-generated The branch releng/14.2 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=0be04cb5cb9854d71cd98b10a35111b289cd21a5 commit 0be04cb5cb9854d71cd98b10a35111b289cd21a5 Author: Zhenlei Huang AuthorDate: 2024-10-31 16:32:13 +0000 Commit: Zhenlei Huang CommitDate: 2024-11-07 23:26:09 +0000 ndp: Move the global variable repeat into struct ndp_opts An upcoming fix for the netlink based implementation requires this refactoring. No functional change intended. Reviewed by: kp Approved by: re (cperciva) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D47233 (cherry picked from commit 12c04071cf18d1b00ffcc7058fb01f4393163ede) (cherry picked from commit 54514cfa5a84a5d4406bbd5ba34f8950cf1a2b89) --- usr.sbin/ndp/ndp.c | 9 ++++----- usr.sbin/ndp/ndp.h | 1 + 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/usr.sbin/ndp/ndp.c b/usr.sbin/ndp/ndp.c index e98e506ee482..89666f7eb633 100644 --- a/usr.sbin/ndp/ndp.c +++ b/usr.sbin/ndp/ndp.c @@ -125,7 +125,6 @@ static pid_t pid; static int32_t thiszone; /* time difference with gmt */ static int s = -1; -static int repeat = 0; static char host_buf[NI_MAXHOST]; /* getnameinfo() */ static char ifix_buf[IFNAMSIZ]; /* if_indextoname() */ @@ -252,8 +251,8 @@ main(int argc, char **argv) /*NOTREACHED*/ } mode = 'a'; - repeat = atoi(optarg); - if (repeat < 0) { + opts.repeat = atoi(optarg); + if (opts.repeat < 0) { usage(); /*NOTREACHED*/ } @@ -823,10 +822,10 @@ again: if (buf != NULL) free(buf); - if (repeat) { + if (opts.repeat) { xo_emit("\n"); xo_flush(); - sleep(repeat); + sleep(opts.repeat); goto again; } diff --git a/usr.sbin/ndp/ndp.h b/usr.sbin/ndp/ndp.h index 5b2558982e86..6e7aef2e416e 100644 --- a/usr.sbin/ndp/ndp.h +++ b/usr.sbin/ndp/ndp.h @@ -10,6 +10,7 @@ struct ndp_opts { bool tflag; int flags; time_t expire_time; + int repeat; }; extern struct ndp_opts opts; From nobody Thu Nov 7 23:26:41 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Xkyrd561Dz5cqJy; Thu, 07 Nov 2024 23:26: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xkyrd3rb8z4N3D; Thu, 7 Nov 2024 23:26:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731022001; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3TCd3Vfj80NmYmhPfrVp0QchY/vYJKOG3XDlW/ypZYc=; b=nGJ/rgiQ0qPKdPyZY0lmjachoQRCpm8pb23FfpWt3WBuu5viTt5qIbUAMBNqaAnBfIQV+v 4c5i8mnN1X66zcHAgESwHwZnttgViE3N8GxRFM8WTSZclKXV8U2yXhOBTOrrF9vyuy+BxM SAmvFaWbTWVmwpOPg+KFcqNi95VpEajxfmpsj33q4lHNnNx2oakXv3kVfcmAJvjG/IMJR3 jajXlbLZK301r9oGVLywZGHuSXS+/VdbeEN9e1glv81u45Mh61mzK20GaOy8uczhL4eaHg l/FGe3S6nDQcuwyWix5p7ReKNEifE9Q8dDICoLDxbECtT0bPI0347yg5pIIRdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731022001; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3TCd3Vfj80NmYmhPfrVp0QchY/vYJKOG3XDlW/ypZYc=; b=ouXEXClxVRKYfD9EoCnxb+Lzablr1rvECHMEw6kfbfvq3VhhBEaNBPtKpr3qEYBguzO6vH AuNs0skRMnX0NDjb1xg8LSrcSg4QJ9HwEamT8u2qARhCCXaqt3SrCO9w2zFV0K11OW09B/ oDyOxrpDikI05TouUFTizvFepyncRWtSuRci+fDxWjCWy1lZsdU1mFJ9m9a3cwwQDp0UX9 EDAdo+Xw3cYDGDTevujEcoekMA/ms6OK1C9yit8NGgoPNlXS1YHrQ26k4MsQVXCbKVxWxG T5irh+wVA6J4BstwjfuV5Ej7ruKh1VdHIWKXk1lSeZKu5Y0LYxHUfpBV+KaH4Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731022001; a=rsa-sha256; cv=none; b=UPBGTTDXSK9OoCHPUdI0pA5zEgbo/TuDKS37XVrVR7lS9gMkcRyX/1oq0uQrYAN94qSz7t +CDFagzf33tTwyKnBaZUx2eCP8ARbeXFPJBMtg+WEk7iQPuGikHqcKA/yphE0BimjJVkcr Bo4JsZWleF7dmQWKQRYjFf8rN3q/J13JXTQAmRSyQXfshP2wPezh7jnjlInUSKhNHqqDUM yacFwiZ81b3+kiJuUht8mmjXTE/RkPKoSCaF1VFNDVB0onKeMXVLRN0lH5DPZAI8ixyGrq wLOstOVFoOLEn/jl+PZ2AGgG+s3esDtnWz3Z/3rtcFYiqCCvZ7tRwr3n0o8W9Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Xkyrd3STTz15Cx; Thu, 7 Nov 2024 23:26:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A7NQf2D033742; Thu, 7 Nov 2024 23:26:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A7NQfTi033739; Thu, 7 Nov 2024 23:26:41 GMT (envelope-from git) Date: Thu, 7 Nov 2024 23:26:41 GMT Message-Id: <202411072326.4A7NQfTi033739@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: a30127914a3d - releng/14.2 - ndp: Bring back the -A option for the netlink implementation List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.2 X-Git-Reftype: branch X-Git-Commit: a30127914a3dc0c0f4c24274ee9d31aff79faca1 Auto-Submitted: auto-generated The branch releng/14.2 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=a30127914a3dc0c0f4c24274ee9d31aff79faca1 commit a30127914a3dc0c0f4c24274ee9d31aff79faca1 Author: Zhenlei Huang AuthorDate: 2024-10-31 16:32:14 +0000 Commit: Zhenlei Huang CommitDate: 2024-11-07 23:26:09 +0000 ndp: Bring back the -A option for the netlink implementation This was lost during the conversion to netlink. Reviewed by: kp Approved by: re (cperciva) Fixes: 91fbe0819bb9 ndp: convert ndp(8) to netlink MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D47234 (cherry picked from commit b6d4e3bee350b881b5efea03068c1247985b12fe) (cherry picked from commit 0de672a59481d48dd5e4667c597d66e1b042a683) --- usr.sbin/ndp/ndp_netlink.c | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/usr.sbin/ndp/ndp_netlink.c b/usr.sbin/ndp/ndp_netlink.c index 179d715c8ded..94dca0f9d4a4 100644 --- a/usr.sbin/ndp/ndp_netlink.c +++ b/usr.sbin/ndp/ndp_netlink.c @@ -316,12 +316,24 @@ print_entries_nl(uint32_t ifindex, struct sockaddr_in6 *addr, bool cflag) struct snl_state ss_req = {}, ss_cmd = {}; struct snl_parsed_link_simple link = {}; struct snl_writer nw; + struct nlmsghdr *hdr; + struct ndmsg *ndmsg; nl_init_socket(&ss_req); snl_init_writer(&ss_req, &nw); - struct nlmsghdr *hdr = snl_create_msg_request(&nw, RTM_GETNEIGH); - struct ndmsg *ndmsg = snl_reserve_msg_object(&nw, struct ndmsg); + /* Print header */ + if (!opts.tflag && !cflag) { + char xobuf[200]; + snprintf(xobuf, sizeof(xobuf), + "{T:/%%-%d.%ds} {T:/%%-%d.%ds} {T:/%%%d.%ds} {T:/%%-9.9s} {T:/%%1s} {T:/%%5s}\n", + W_ADDR, W_ADDR, W_LL, W_LL, W_IF, W_IF); + xo_emit(xobuf, "Neighbor", "Linklayer Address", "Netif", "Expire", "S", "Flags"); + } + +again: + hdr = snl_create_msg_request(&nw, RTM_GETNEIGH); + ndmsg = snl_reserve_msg_object(&nw, struct ndmsg); if (ndmsg != NULL) { ndmsg->ndm_family = AF_INET6; ndmsg->ndm_ifindex = ifindex; @@ -337,14 +349,6 @@ print_entries_nl(uint32_t ifindex, struct sockaddr_in6 *addr, bool cflag) int count = 0; nl_init_socket(&ss_cmd); - /* Print header */ - if (!opts.tflag && !cflag) { - char xobuf[200]; - snprintf(xobuf, sizeof(xobuf), - "{T:/%%-%d.%ds} {T:/%%-%d.%ds} {T:/%%%d.%ds} {T:/%%-9.9s} {T:/%%1s} {T:/%%5s}\n", - W_ADDR, W_ADDR, W_LL, W_LL, W_IF, W_IF); - xo_emit(xobuf, "Neighbor", "Linklayer Address", "Netif", "Expire", "S", "Flags"); - } xo_open_list("neighbor-cache"); while ((hdr = snl_read_reply_multi(&ss_req, nlmsg_seq, &e)) != NULL) { @@ -382,6 +386,12 @@ print_entries_nl(uint32_t ifindex, struct sockaddr_in6 *addr, bool cflag) count++; snl_clear_lb(&ss_req); } + if (opts.repeat) { + xo_emit("\n"); + xo_flush(); + sleep(opts.repeat); + goto again; + } xo_close_list("neighbor-cache"); snl_free(&ss_req); From nobody Fri Nov 8 00:00:20 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XkzbS5m7nz5ct5h; Fri, 08 Nov 2024 00:00:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XkzbS5DTCz4QNk; Fri, 8 Nov 2024 00:00:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731024020; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=F2we4UblaVe78dvL2wGbRPSS9WPfN8RpkokMwG+F2EE=; b=iVYVyBbltsGMIQrQXIP8y3OtgWzzXeX9odE7e841QIQowKOb/6cUeonwo4u0sl2omlU0sa Jn+rClWe4mjHxmPtPP2bLCAFpy1U8NfTCA67Dk17O6QEcQU8AbqH/dxQv/UyXRknGgl9b8 dhnJKZM0mSkLSPwewCFAozse7NyXh+HD8A5/2cRH/pT7TyDamnLMsSoEQQ8lK+iI/i7QTT KVpWLKkUPkc1XXdp001a9uDXiPkZwc758ad6Zp8EqnLUKUXJkVX097eril+ADSGGxWtGSf G//H+aefEy7fIvcp/nS28At9TEJdzrzp/rgJ5FUv4lJCxyF0qIr2yD0UnGX/fA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731024020; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=F2we4UblaVe78dvL2wGbRPSS9WPfN8RpkokMwG+F2EE=; b=DwGeejAo+/YPP/PSfn8QYCaX42dHbpeRZFiqJu+q8hs85SPNsb9edt+S9KA8KxEwa9QNIy Yg+Tw3ELCRNSOMyLbGRJ/vnwLr0OAHsPv4d/5SD/UP2crOWuTtISqhiKCnMq5jgCNW/KhI luaUaQF2echNwLHkCFPvwFifAmuAPVJOWgFVogvg0uWJGZj24IV9MmIu8AblOTtu8ANRCW R1ZC5hNk/gvdhAh1Z+6Sa7PfUEKMn08RCkFgIGfsM9ik+REhYX8SnFHoWk3bZ0mnJtE27H DtTWN8zg+18zs4uxqM9YjuXSQ1xRWDHrY4r1gcjnWBmfmbdWRvPc92v33zuHcA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731024020; a=rsa-sha256; cv=none; b=N6wZW22WRiXglo8VXFbkRJQRDr9qiR58m982kKJYjg2aANYKcnglRj3+4j0RvcnP8cqzK5 egDgR7NMoLu3XJd3JOExAB3sG9VyafBvOAK9IxtiYwy9qyD8nltQ8YLDxTyBr70C8lkTsF YSV8FVO5reklFuJ/vwMGaWiPF1PnZJq21cYZvm/2hivjOWifXmQiUQnKxmkTzlGjvdPFaz U7YOVvix/YkeEwIr+8qsczq4LEotYCDDxaM53nEANvmS6aVXJEFKbY6dqPg8Dvyd1te04c 4lxQMoItR++IEGHjbpEWR55PcC/uyCB9uJ9hNDLx3LKVOozde3R14nhREQgoIQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XkzbS4mS6z15p6; Fri, 8 Nov 2024 00:00:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A800KM6099667; Fri, 8 Nov 2024 00:00:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A800Kqg099664; Fri, 8 Nov 2024 00:00:20 GMT (envelope-from git) Date: Fri, 8 Nov 2024 00:00:20 GMT Message-Id: <202411080000.4A800Kqg099664@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 0ff73c7796d6 - releng/14.2 - 14.2: Update to BETA2 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.2 X-Git-Reftype: branch X-Git-Commit: 0ff73c7796d646decf3399f9827a7a540600287f Auto-Submitted: auto-generated The branch releng/14.2 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=0ff73c7796d646decf3399f9827a7a540600287f commit 0ff73c7796d646decf3399f9827a7a540600287f Author: Colin Percival AuthorDate: 2024-11-08 00:00:01 +0000 Commit: Colin Percival CommitDate: 2024-11-08 00:00:01 +0000 14.2: Update to BETA2 Approved by: re (implicit) Sponsored by: Amazon --- sys/conf/newvers.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index 385b47891a43..60a042f04d04 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -53,7 +53,7 @@ TYPE="FreeBSD" REVISION="14.2" -BRANCH="BETA1" +BRANCH="BETA2" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi From nobody Sat Nov 9 01:10:43 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Xld6C6MGCz5d3vC; Sat, 09 Nov 2024 01:10: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xld6C5vHnz4gtd; Sat, 9 Nov 2024 01:10:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731114643; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=415X78FpzsI6osPBYZINaPCDRuzJ9l4k0JhRnmPn684=; b=kuYY4+NLcQUUt74xIUtNRBgQejGB5e74/noSz3wFU/18i9u6TF9ff6bm2q50D2PWQ8w1jc mkVwR10U/8qvxYdl+yTnau6n7KxBWhcCjSW2kTwziLnopqTzqqam4BjXcqHKHoqHN+YQNx Chw1HCTLUlAfFhdQGL3jhEM/l0vPSrNZgBYxcKh47akT75iZMz30vSJb8smE5vlstPbbHe PfwlkR0JgOxKwp1AKYm53oeagQQ0P2iGYaMGRfC5mbvkZHloNohap4tFa6+DchSLWb2sAk Px2qpf03Kij+ZDasf8gKkm+AqN/qc/T/4vgbr7AvA5Z4UU/9biCtM0H2H5eN3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731114643; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=415X78FpzsI6osPBYZINaPCDRuzJ9l4k0JhRnmPn684=; b=D4mnzdNLezcAuFCVGsy/Flq62Hh0rCDrAo54xQQn6VmwlO4kh3iXlYo0GMaE4OCa6lViSF W9EztgVzrQi9gMLj1FNlnKzo8hbhLbbDW0NsH2MMVAQVHWUw9qyMyQkmfFbDvc/PzLT2J+ 3ij3JohwHJxs0JDQLaYjUJkiRascKuYgwrNHRdCW9+qzdsJ1n7e9nECQhcGc2zoXgiWt8U v960jmhjsRupNtgyVhSakRBavucpFhQUdymL1BvPo0PoDYq0XR3oW2RTRXy33LjA/BCOLB 7mn/z+BPMOvXL4izfUb+NCUI7HSywpIJmJKqgoks2zkXV5LNQG7AHeOSXreRTw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731114643; a=rsa-sha256; cv=none; b=N8BWJ+/hPhh/vKm1m0MqBFzvBOymmQRdIlG9SSX5bIy9a6MJ4EklqfcBNMb6ifZJf+SItP UHGMlGlkqIiCbVoOrpL3PVH1rkCnQq66pACvF+V2AmaD5wu3SuHzmuI/EIWmHXqpSs6eul BBt6AKc3FRdx4FzEb728iFayEEw/CDn7e9oYH447LT+cTemJaFYtEr+OekD/Ia0EjwB9/i YIRNSa9qhh+AjKXneZFwA4uLBAd556w2drCEB1YodrybU2zAxsnjnIbv/di4WBImzjXEEp qTpSifSVkOUHje804Q8xtl6QwvexFHfaVYhgkVYYec+RjPGB1+Iicr1C9u0ziQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Xld6C5VSFzscJ; Sat, 9 Nov 2024 01:10:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A91AhLK007789; Sat, 9 Nov 2024 01:10:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A91AhVt007786; Sat, 9 Nov 2024 01:10:43 GMT (envelope-from git) Date: Sat, 9 Nov 2024 01:10:43 GMT Message-Id: <202411090110.4A91AhVt007786@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: bba8c461b995 - stable/14 - rc.d/kld: Print the kernel modules being loaded List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: bba8c461b995de8b13ec724fc6f82457280b4dd6 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=bba8c461b995de8b13ec724fc6f82457280b4dd6 commit bba8c461b995de8b13ec724fc6f82457280b4dd6 Author: Mark Felder AuthorDate: 2024-10-26 18:43:46 +0000 Commit: Mark Johnston CommitDate: 2024-11-09 01:09:29 +0000 rc.d/kld: Print the kernel modules being loaded PR: 282269 MFC after: 2 weeks (cherry picked from commit 152382e6613d7998fe6f5233767df54d3fdec329) --- libexec/rc/rc.d/kld | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libexec/rc/rc.d/kld b/libexec/rc/rc.d/kld index 510884a117d0..4cfc94cb07fc 100755 --- a/libexec/rc/rc.d/kld +++ b/libexec/rc/rc.d/kld @@ -44,10 +44,12 @@ kld_start() local _kld - echo 'Loading kernel modules:' + echo -n 'Loading kernel modules: ' for _kld in $kld_list ; do load_kld -e ${_kld}.ko $_kld + echo -n "${_kld} " done + echo } load_rc_config $name From nobody Sat Nov 9 01:10:44 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Xld6D723pz5d3vD; Sat, 09 Nov 2024 01:10:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xld6D6Y9hz4gd7; Sat, 9 Nov 2024 01:10:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731114644; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0Svs6KX0E573uf6Rn3yGIurXiLPIQOPmg5AWoSLkAik=; b=VwQB5Ov1zAVpacOVBwC62NzJRg3tzIMXUHRO6mQ2oiRl/OEp6siHOOjPY+Sc75/DmcbKur eTxySPQZoIggOdBzyK2/vyLqR2mbXUTtJ6zOFxyDZ1Jhb/ifchMMpW2vMcazgOt2/VxuOA K2gZNc8l2g3ptX0V4QK6+6BtB/9McWagZ/lgLl8I3aHsZhzw/WDddVMxfbdq/QXdpVfM8z nbN+zOvGzlDJXg7fb/Rp798s6Sgx7WzDfbBYFLD0xRCXYyQM+LaDVf6CUnE9kK8PVHmMwP fEVZ+/PdAOuoMhFwSkCuXDUhVl7nee038SkJBIQ0Ifhmsrb8WZpsnqJ6f03Mmg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731114644; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0Svs6KX0E573uf6Rn3yGIurXiLPIQOPmg5AWoSLkAik=; b=Vz32r4TOSjBEf0levdcmxWDT1R8JczQ7F6GjG+eagNC6uVLtv15mdwRXfzbSKZ7F/HGq/u 1mVljKui4zY9Skjz7KLTYE4rJKtBfKLm8VMWO/yo4OXOBircyNYpEutlz2JsT541gdSxwv hm9pkozinc0qvvOzRja8z/oEYMX/bJeWvgGJCrjRleXbcbrYHxAedf19E3s14TRKkWBzXX wa4Etex178hLPC6Qm4Fgcy1PKdfkhX3lTDsgZb7sjNWmYXLp/tPVH6EwWZIxDjk3Uc8WXJ 0phKa6xYbvuu5lFXSE18Mk31UHNTO+oYekY3emJ/0ZtIp1wR6uwfjNCsQQsZdg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731114644; a=rsa-sha256; cv=none; b=HIk5gZFRSkBS1iatG0gbbXzcRMe8K8p7u5sWU+EK2D7F9etjmzHDwh0qsS5cXbfVnCQvXz ZOzCu2Zfc3YDPvqePivRuaJpBbdwBHNpIf+0sKCGEV6co4W8awaaQS99L9pctLcFcIcvBA Vzaye2zJPhhoIQmxU+FXgjvYkv2fwnOLQb3iCBruAKSNO7zbdMDqBxfy5GTFeb5AHbt2rv nz4Z89EKsSdOeofng0y9HAbFKPkwc/5G1uVEMCofvlxGnR86N29mZ3+BqLyDaKelkRiLBz 2FTuEyrEMiCdAmD7VSiqwQCLVaFT9iHhVEjaXC5Zqyv4KcZ4GdvCLDVTrnVeAw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Xld6D69H9zsSf; Sat, 9 Nov 2024 01:10:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A91Airi007841; Sat, 9 Nov 2024 01:10:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A91AiKF007838; Sat, 9 Nov 2024 01:10:44 GMT (envelope-from git) Date: Sat, 9 Nov 2024 01:10:44 GMT Message-Id: <202411090110.4A91AiKF007838@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 2cb615d01514 - stable/14 - rc.d/kld: Avoid printing a trailing space List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 2cb615d01514835f8c9459a80d4ce4babce275cd Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=2cb615d01514835f8c9459a80d4ce4babce275cd commit 2cb615d01514835f8c9459a80d4ce4babce275cd Author: Mark Johnston AuthorDate: 2024-10-26 19:07:22 +0000 Commit: Mark Johnston CommitDate: 2024-11-09 01:09:47 +0000 rc.d/kld: Avoid printing a trailing space Fixes: 152382e6613d ("rc.d/kld: Print the kernel modules being loaded") Reported by: jrtc27 (cherry picked from commit cdb3cda6fd53b89c2bba0308d21aa8edf782dc34) --- libexec/rc/rc.d/kld | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libexec/rc/rc.d/kld b/libexec/rc/rc.d/kld index 4cfc94cb07fc..81a751503e51 100755 --- a/libexec/rc/rc.d/kld +++ b/libexec/rc/rc.d/kld @@ -44,12 +44,11 @@ kld_start() local _kld - echo -n 'Loading kernel modules: ' + echo -n 'Loading kernel modules:' for _kld in $kld_list ; do load_kld -e ${_kld}.ko $_kld - echo -n "${_kld} " + echo -n " ${_kld}" done - echo } load_rc_config $name From nobody Sat Nov 9 01:10:45 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Xld6G2BRYz5d40f; Sat, 09 Nov 2024 01:10: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xld6G0MsWz4gmS; Sat, 9 Nov 2024 01:10:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731114646; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xeHlkxuZJtAFgA2B9uHN8xX9h751WKRgLNixA1gmfGk=; b=dzNA/9uwxHda0jbPmiXy8kgnu/H9OoNugM7/JaNU8U+1vScWQS2Dl6v5rl0f/ufBTtoUG7 fnaHoe+o3bUl02yYd1MPGe1HBvzSZZ6q4fk9A2gwXsAdYMai2oS2fSfnmEKjGYy+p3fOl/ Z1efKAmmfHaC1DIbMWpratzteHQac6X9QHNgzYDam/TyBmd6WCkzkjdPfxmCYodHaNHwmB fgCKJ2hX1WJH7mxCpHp0U++ORC/1goKUOYwKLo+r8jglEfoe6glXYCovRYZWjjerCRitkw sPurJhbBNsleoxWk8bDkxiwFDa+BHDa+kqeJ0j6kWw6jRgj0eh+bv8TGHl3ATg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731114646; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xeHlkxuZJtAFgA2B9uHN8xX9h751WKRgLNixA1gmfGk=; b=PH3G676AgBspyPh5923j3a0HebEvgY6gRbtmMU5M9PXwrEsUsW1AKQ88SAbQPbb1/eH5AM kOcd8MT9cC44sqVvtu3gqUaDHwD1oa9it6yl8PUkkSPN6MctlipB9IKQCBx0MGfYWVnuoN nubSDL4i9yW7BcqzjoUfviarKK1WH7dtw9ft73pKpPY9OagbCtGqe33DlVosgxx27aBg9m VsfESzvLSpmJKnhdzuUSWShtd/hhUDkf7xaMEdQtlo7BnnUC8C4C1Yb5nbZFopx7NdNMvd Fe453u+bz/leDUtzg4w1FMS2mBmfpcg/1syRGUag0qU2DPNjOg1SlOTD2OZhRQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731114646; a=rsa-sha256; cv=none; b=td1aZ5XzjCHJgqdA4F1NEJUxDHh14LXUB24OQns+KO1ABfx6dXCGeh18MQ3uwyvL+jVBbj EcUicFHwNKuFXxuooocmK/pV+QVY8F0WubzToqGj3e/Q7mL5Yk3K9GzfL4HydbZeh2jBGl xwE+rNdH4GQYdM4e08PwwjE9//QGQsWiVBpeqzOPgmG8Alo7+NWhtyiOBi1AeXZ7IS3WMR 5VbQgq2aHrMyPE+hrdlf0bl0OwwBKRpgN4syuemZZxhBNp06ClMtZQOTYhfDE3U3Z4uQ7v E+1l/8vLJOR0oUBbStbDLRZXPv1/744pXEpe8w/uKeK2Z4y4Web507opaiwhRQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Xld6F73HHzsQF; Sat, 9 Nov 2024 01:10:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A91AjYN007890; Sat, 9 Nov 2024 01:10:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A91AjdG007887; Sat, 9 Nov 2024 01:10:45 GMT (envelope-from git) Date: Sat, 9 Nov 2024 01:10:45 GMT Message-Id: <202411090110.4A91AjdG007887@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: fc3c731bbf9c - stable/14 - rc.d/kld: Print modules being loaded, take three List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: fc3c731bbf9cc51a002e3109b2b97754b6c7e06c Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=fc3c731bbf9cc51a002e3109b2b97754b6c7e06c commit fc3c731bbf9cc51a002e3109b2b97754b6c7e06c Author: Mark Johnston AuthorDate: 2024-10-26 19:18:50 +0000 Commit: Mark Johnston CommitDate: 2024-11-09 01:09:50 +0000 rc.d/kld: Print modules being loaded, take three Some kernel modules will print informative messages when they are loaded, making the output confusing. Print everything up front instead. Fixes: 152382e6613d ("rc.d/kld: Print the kernel modules being loaded") (cherry picked from commit 3e55170e0fa2695f6d662e3ab67201138a6f8698) --- libexec/rc/rc.d/kld | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libexec/rc/rc.d/kld b/libexec/rc/rc.d/kld index 81a751503e51..ccfffe3091a6 100755 --- a/libexec/rc/rc.d/kld +++ b/libexec/rc/rc.d/kld @@ -44,10 +44,9 @@ kld_start() local _kld - echo -n 'Loading kernel modules:' + echo 'Loading kernel modules:' $kld_list for _kld in $kld_list ; do load_kld -e ${_kld}.ko $_kld - echo -n " ${_kld}" done } From nobody Sat Nov 9 01:10:47 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Xld6H3PcMz5d4BH; Sat, 09 Nov 2024 01:10: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xld6H1D0fz4gmj; Sat, 9 Nov 2024 01:10:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731114647; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pDqJ1y8Et6j9Jd4/zzsDKcC3SRrHt1aewCPuXrokoHk=; b=uQj9rL48CDymlz6vkM2ZpLnv6tJ+OKImmb6uJaT1vI/2sfWnjHlhEVY7GaGGmvdOo1VzwC lHRsIl8W+8gzc8aVwC3ZswDVwWZqH2waJvuxR0bgNJhhiYO79PFFC2m0Ub7qystM958wV2 5yYoQgwx2lSV/HzAE8cjDIsiqLkPHisSOT6aN0jtIxb6irG7c+qeFbSD2CONu1vUE/fIBa tOtCb17R81dEXGI1Wbj4mC/J61Vjo4RhrShuf1ekTB2/Ycx3VOaXyKIVe4eU+IyVUdA5nY fCGBDq7syK4gk0yi3mjLiQB53KDzGiXvNhOXyjaF3/0YJtuxsmpRAP0cD5WEqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731114647; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pDqJ1y8Et6j9Jd4/zzsDKcC3SRrHt1aewCPuXrokoHk=; b=gprrOpisRUSkE2EIM5mgbr/j4exO6dkMrAKOEPq0EI7nXrbvETJDm17skhjWX2Oi6wQ5Sq q483lxzpJP4VcjXxaSahgzaijiNwMc9HROXoILmHAaA+oUdCjLjVcyZwMdywrCCRvCFucX l/vwZD+sNOJTav8RcDEyv6PND2dXupSUcCmhp76Uvx9CD9G3L+IJjzifRI9+iNF9iUhXVE q3pLnHGwe8/BJBy26/9otLZ0F87DrBJmhXhUn1xnRtJ7kk0wCFG3gV5/7P0YJvPHfr4ZGl QcEDaCdvGuQliWJegr1pkdaK2Tn7pnfRVGRuNNrs2oapRxlA0PEACBt4jmEBxA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731114647; a=rsa-sha256; cv=none; b=VWQGYe1jUdlZXVso3QRA9HxVth9rCpSSXeVmz2qp5OeY9LfyAimvp95uasmBBXGVSFh3ng AP4Se1Kwn4pVesGhns9LCzVAg18pleuhOhY1H02+0Y7/Tbxj1mSriguSDg1Q/bY9xvcCI+ XaK5axo09tJOx7tz772Hn8g37Qo+r9HIRU6WLxaxiDgnZ39yebmLuHuhtniq3xjFObKUX+ BwFd6YqVKTgIpRes3B/LSXswYlKTC0em0wKMOyCJJGTxvQdoA2qRZXwfIGtpgb3sqoHUE7 sG9wkUOlmV+i2WIjwW52oOHgr52MXnRv7vKOy9AhBEoE9dXcEPV6MSHm5qO3vQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Xld6H0r4PzsMn; Sat, 9 Nov 2024 01:10:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A91AlGw007950; Sat, 9 Nov 2024 01:10:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A91Alix007947; Sat, 9 Nov 2024 01:10:47 GMT (envelope-from git) Date: Sat, 9 Nov 2024 01:10:47 GMT Message-Id: <202411090110.4A91Alix007947@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: da80e62f965c - stable/14 - linker: Make linker.h more self-contained List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: da80e62f965c56d4f3d2b91be2b33960ada46854 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=da80e62f965c56d4f3d2b91be2b33960ada46854 commit da80e62f965c56d4f3d2b91be2b33960ada46854 Author: Mark Johnston AuthorDate: 2024-10-26 14:05:56 +0000 Commit: Mark Johnston CommitDate: 2024-11-09 01:10:14 +0000 linker: Make linker.h more self-contained struct kld_file_stat embeds a reference to MAXPATHLEN, defined in param.h. PR: 280432 MFC after: 2 weeks (cherry picked from commit f44029e322446469f116bbd26d51ba857083bacb) --- lib/libc/sys/kldfind.2 | 1 - lib/libc/sys/kldfirstmod.2 | 1 - lib/libc/sys/kldload.2 | 1 - lib/libc/sys/kldnext.2 | 1 - lib/libc/sys/kldstat.2 | 1 - lib/libc/sys/kldsym.2 | 1 - lib/libc/sys/kldunload.2 | 1 - sys/sys/linker.h | 2 ++ 8 files changed, 2 insertions(+), 7 deletions(-) diff --git a/lib/libc/sys/kldfind.2 b/lib/libc/sys/kldfind.2 index a7e147af55f1..5ede0d1e1464 100644 --- a/lib/libc/sys/kldfind.2 +++ b/lib/libc/sys/kldfind.2 @@ -32,7 +32,6 @@ .Sh LIBRARY .Lb libc .Sh SYNOPSIS -.In sys/param.h .In sys/linker.h .Ft int .Fn kldfind "const char *file" diff --git a/lib/libc/sys/kldfirstmod.2 b/lib/libc/sys/kldfirstmod.2 index 8e69b366c8aa..b6dbab2c94b7 100644 --- a/lib/libc/sys/kldfirstmod.2 +++ b/lib/libc/sys/kldfirstmod.2 @@ -32,7 +32,6 @@ .Sh LIBRARY .Lb libc .Sh SYNOPSIS -.In sys/param.h .In sys/linker.h .Ft int .Fn kldfirstmod "int fileid" diff --git a/lib/libc/sys/kldload.2 b/lib/libc/sys/kldload.2 index 20bf3778c1ae..63a13c328d58 100644 --- a/lib/libc/sys/kldload.2 +++ b/lib/libc/sys/kldload.2 @@ -32,7 +32,6 @@ .Sh LIBRARY .Lb libc .Sh SYNOPSIS -.In sys/param.h .In sys/linker.h .Ft int .Fn kldload "const char *file" diff --git a/lib/libc/sys/kldnext.2 b/lib/libc/sys/kldnext.2 index 8d8102711494..28b14dfc3035 100644 --- a/lib/libc/sys/kldnext.2 +++ b/lib/libc/sys/kldnext.2 @@ -32,7 +32,6 @@ .Sh LIBRARY .Lb libc .Sh SYNOPSIS -.In sys/param.h .In sys/linker.h .Ft int .Fn kldnext "int fileid" diff --git a/lib/libc/sys/kldstat.2 b/lib/libc/sys/kldstat.2 index f0ab26ac2608..111323a0da8d 100644 --- a/lib/libc/sys/kldstat.2 +++ b/lib/libc/sys/kldstat.2 @@ -32,7 +32,6 @@ .Sh LIBRARY .Lb libc .Sh SYNOPSIS -.In sys/param.h .In sys/linker.h .Ft int .Fn kldstat "int fileid" "struct kld_file_stat *stat" diff --git a/lib/libc/sys/kldsym.2 b/lib/libc/sys/kldsym.2 index d3025ca536f8..641fc26c38ec 100644 --- a/lib/libc/sys/kldsym.2 +++ b/lib/libc/sys/kldsym.2 @@ -31,7 +31,6 @@ .Sh LIBRARY .Lb libc .Sh SYNOPSIS -.In sys/param.h .In sys/linker.h .Ft int .Fn kldsym "int fileid" "int cmd" "void *data" diff --git a/lib/libc/sys/kldunload.2 b/lib/libc/sys/kldunload.2 index 2d33aabb3f33..c89f869e9eeb 100644 --- a/lib/libc/sys/kldunload.2 +++ b/lib/libc/sys/kldunload.2 @@ -32,7 +32,6 @@ .Sh LIBRARY .Lb libc .Sh SYNOPSIS -.In sys/param.h .In sys/linker.h .Ft int .Fn kldunload "int fileid" diff --git a/sys/sys/linker.h b/sys/sys/linker.h index be127e6ded48..e9073dab236c 100644 --- a/sys/sys/linker.h +++ b/sys/sys/linker.h @@ -29,6 +29,8 @@ #ifndef _SYS_LINKER_H_ #define _SYS_LINKER_H_ +#include + #ifdef _KERNEL #include From nobody Sat Nov 9 16:51:38 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Xm1zt6n8cz5cP3T; Sat, 09 Nov 2024 16:51:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xm1zt5vdqz4JlC; Sat, 9 Nov 2024 16:51:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731171098; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=utTaJb9O73mjzugvSawCGtrWlpeCKCvXBzmBxgxCCe4=; b=LBpRHnpHXnr/nCKNKpmYceGdTnO+iStefyL8nJ1uh1yx4qXhuhCOr+SttW4IiPDJSvq8Az M+sf+0+7H/5M/PY9gr7TTNbhw4XVbgbrc6xGqIGeaY/r+9VKzNbn9JD0mCZXYNg5CVI5ig xCVlH80XweK+oeG4RgUKkr4Ak2VMsCIpEyU0TMtefXn405X8mpcwyKgio6Biubl1wTF+hr D8X0e3UjzcWBF5K5yNng+K2Eu5cK7+DHGXBHr2WrRbr9sTjWLN4nDf46+0kt6dC/KwKkWg 9cVT3VNGoMCMNvFwhNvJkgE2inEhFKMMb7kKsfEedR9vwqWxYCLkJ+sXFGC78g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731171098; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=utTaJb9O73mjzugvSawCGtrWlpeCKCvXBzmBxgxCCe4=; b=SWx+DiwpHnfRGMpNNNPOSQIQWNyfB3766RNT36SeCcqweFh15F7OHn1dBhHlBttG664Hau 2r/Ml4gTGAbwvfdF6qwAM2TZ5SUcpZM+dbfmg14u4L/Ef301ywB3XaUfV+nxvDny/+HlUk DwFQyzc3OhPHiSaeQ6gn1Z4FS5CWtLDA6x/O7eTbrELe8sOz+9YAo8g188Aytbg+q8GkCe IkzQ7K6nJKuTGVIg+vx1c8KBB/u3u53gevcwBYmTNgkx3eG0elamsfFP3GZzuB8GzM461d 2GEUYsF9gx3RHtg3IbfCBMsZfdrMVIeSQGtotXNhuDHI0yPORsHnqWgCoqhUfw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731171098; a=rsa-sha256; cv=none; b=BRPN5PViLpy425Att7SP6+GE86L4hW9BgUY4A4MYrgxyOWMw/Q5p751HvkRydGcOl7qzr/ RCaGosDfSiCye9BQyuxMOjJ4TSd1uLPhvYbA72mpWumWw8A4+8LVWoQo5AIrYTKSkHp3Md 1/Se9INT0qVCnIaRWtYIKgp1+b+RvE8wrZbXYyaG8YM2KsqoyIMS0mQcl9IdGEK8JgUbeM OXNxw8NPNOmJtY5U/8ylvBW/jSSsbdNXWLQMbLSukX733BUzA+/DjYg4bJzlvhoK+uBxFk SOlJ6ao6S8FtcuGmbMILfzCLr/UyGxEI4Wz1KGBL5e4p/atQfR4B1J6OP7aEqg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Xm1zt5W9sz1LZK; Sat, 9 Nov 2024 16:51:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A9GpcHj055461; Sat, 9 Nov 2024 16:51:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A9Gpcjj055458; Sat, 9 Nov 2024 16:51:38 GMT (envelope-from git) Date: Sat, 9 Nov 2024 16:51:38 GMT Message-Id: <202411091651.4A9Gpcjj055458@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 57921ae825dc - releng/14.2 - Merge commit d0b9c2c56476 from llvm git (by David CARLIER): List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.2 X-Git-Reftype: branch X-Git-Commit: 57921ae825dcf690b06b63db2e38613ee32d1b8e Auto-Submitted: auto-generated The branch releng/14.2 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=57921ae825dcf690b06b63db2e38613ee32d1b8e commit 57921ae825dcf690b06b63db2e38613ee32d1b8e Author: Dimitry Andric AuthorDate: 2024-11-07 16:12:12 +0000 Commit: Mark Johnston CommitDate: 2024-11-09 16:49:52 +0000 Merge commit d0b9c2c56476 from llvm git (by David CARLIER): [compiler-rt] Remove SHA2 interceptions for NetBSD/FreeBSD. (#110246) To Fix #110215 Interceptors introduced with 18a7ebda99044473fdbce6376993714ff54e6690 This fixes undesirable runtime failures when using -fsanitize=-address in combination with -lcrypto. Direct commit to stable/14, because main already got this change as part of the llvm-19 import. Approved by: re (cperciva) Reported by: Theo Buehler PR: 281685 (cherry picked from commit 4f1754bccef155c0fd24547ab3c872bd0f182224) --- .../sanitizer_common_interceptors.inc | 180 --------------------- .../sanitizer_platform_interceptors.h | 2 - 2 files changed, 182 deletions(-) diff --git a/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.inc b/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.inc index 3ecdb55cdbf7..2cf21f2e3361 100644 --- a/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.inc +++ b/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.inc @@ -8809,83 +8809,6 @@ INTERCEPTOR(char *, RMD160Data, u8 *data, SIZE_T len, char *buf) { #define INIT_RMD160 #endif -#if SANITIZER_INTERCEPT_MD5 -INTERCEPTOR(void, MD5Init, void *context) { - void *ctx; - COMMON_INTERCEPTOR_ENTER(ctx, MD5Init, context); - REAL(MD5Init)(context); - if (context) - COMMON_INTERCEPTOR_WRITE_RANGE(ctx, context, MD5_CTX_sz); -} - -INTERCEPTOR(void, MD5Update, void *context, const unsigned char *data, - unsigned int len) { - void *ctx; - COMMON_INTERCEPTOR_ENTER(ctx, MD5Update, context, data, len); - if (data && len > 0) - COMMON_INTERCEPTOR_READ_RANGE(ctx, data, len); - if (context) - COMMON_INTERCEPTOR_READ_RANGE(ctx, context, MD5_CTX_sz); - REAL(MD5Update)(context, data, len); - if (context) - COMMON_INTERCEPTOR_WRITE_RANGE(ctx, context, MD5_CTX_sz); -} - -INTERCEPTOR(void, MD5Final, unsigned char digest[16], void *context) { - void *ctx; - COMMON_INTERCEPTOR_ENTER(ctx, MD5Final, digest, context); - if (context) - COMMON_INTERCEPTOR_READ_RANGE(ctx, context, MD5_CTX_sz); - REAL(MD5Final)(digest, context); - if (digest) - COMMON_INTERCEPTOR_WRITE_RANGE(ctx, digest, sizeof(unsigned char) * 16); -} - -INTERCEPTOR(char *, MD5End, void *context, char *buf) { - void *ctx; - COMMON_INTERCEPTOR_ENTER(ctx, MD5End, context, buf); - if (context) - COMMON_INTERCEPTOR_READ_RANGE(ctx, context, MD5_CTX_sz); - char *ret = REAL(MD5End)(context, buf); - if (ret) - COMMON_INTERCEPTOR_WRITE_RANGE(ctx, ret, MD5_return_length); - return ret; -} - -INTERCEPTOR(char *, MD5File, const char *filename, char *buf) { - void *ctx; - COMMON_INTERCEPTOR_ENTER(ctx, MD5File, filename, buf); - if (filename) - COMMON_INTERCEPTOR_READ_RANGE(ctx, filename, internal_strlen(filename) + 1); - char *ret = REAL(MD5File)(filename, buf); - if (ret) - COMMON_INTERCEPTOR_WRITE_RANGE(ctx, ret, MD5_return_length); - return ret; -} - -INTERCEPTOR(char *, MD5Data, const unsigned char *data, unsigned int len, - char *buf) { - void *ctx; - COMMON_INTERCEPTOR_ENTER(ctx, MD5Data, data, len, buf); - if (data && len > 0) - COMMON_INTERCEPTOR_READ_RANGE(ctx, data, len); - char *ret = REAL(MD5Data)(data, len, buf); - if (ret) - COMMON_INTERCEPTOR_WRITE_RANGE(ctx, ret, MD5_return_length); - return ret; -} - -#define INIT_MD5 \ - COMMON_INTERCEPT_FUNCTION(MD5Init); \ - COMMON_INTERCEPT_FUNCTION(MD5Update); \ - COMMON_INTERCEPT_FUNCTION(MD5Final); \ - COMMON_INTERCEPT_FUNCTION(MD5End); \ - COMMON_INTERCEPT_FUNCTION(MD5File); \ - COMMON_INTERCEPT_FUNCTION(MD5Data) -#else -#define INIT_MD5 -#endif - #if SANITIZER_INTERCEPT_FSEEK INTERCEPTOR(int, fseek, __sanitizer_FILE *stream, long int offset, int whence) { void *ctx; @@ -9016,107 +8939,6 @@ INTERCEPTOR(char *, MD2Data, const unsigned char *data, unsigned int len, #define INIT_MD2 #endif -#if SANITIZER_INTERCEPT_SHA2 -#define SHA2_INTERCEPTORS(LEN, SHA2_STATE_T) \ - INTERCEPTOR(void, SHA##LEN##_Init, void *context) { \ - void *ctx; \ - COMMON_INTERCEPTOR_ENTER(ctx, SHA##LEN##_Init, context); \ - REAL(SHA##LEN##_Init)(context); \ - if (context) \ - COMMON_INTERCEPTOR_WRITE_RANGE(ctx, context, SHA##LEN##_CTX_sz); \ - } \ - INTERCEPTOR(void, SHA##LEN##_Update, void *context, \ - const u8 *data, SIZE_T len) { \ - void *ctx; \ - COMMON_INTERCEPTOR_ENTER(ctx, SHA##LEN##_Update, context, data, len); \ - if (data && len > 0) \ - COMMON_INTERCEPTOR_READ_RANGE(ctx, data, len); \ - if (context) \ - COMMON_INTERCEPTOR_READ_RANGE(ctx, context, SHA##LEN##_CTX_sz); \ - REAL(SHA##LEN##_Update)(context, data, len); \ - if (context) \ - COMMON_INTERCEPTOR_WRITE_RANGE(ctx, context, SHA##LEN##_CTX_sz); \ - } \ - INTERCEPTOR(void, SHA##LEN##_Final, u8 digest[LEN/8], \ - void *context) { \ - void *ctx; \ - CHECK_EQ(SHA##LEN##_digest_length, LEN/8); \ - COMMON_INTERCEPTOR_ENTER(ctx, SHA##LEN##_Final, digest, context); \ - if (context) \ - COMMON_INTERCEPTOR_READ_RANGE(ctx, context, SHA##LEN##_CTX_sz); \ - REAL(SHA##LEN##_Final)(digest, context); \ - if (digest) \ - COMMON_INTERCEPTOR_WRITE_RANGE(ctx, digest, \ - sizeof(digest[0]) * \ - SHA##LEN##_digest_length); \ - } \ - INTERCEPTOR(char *, SHA##LEN##_End, void *context, char *buf) { \ - void *ctx; \ - COMMON_INTERCEPTOR_ENTER(ctx, SHA##LEN##_End, context, buf); \ - if (context) \ - COMMON_INTERCEPTOR_READ_RANGE(ctx, context, SHA##LEN##_CTX_sz); \ - char *ret = REAL(SHA##LEN##_End)(context, buf); \ - if (ret) \ - COMMON_INTERCEPTOR_WRITE_RANGE(ctx, ret, SHA##LEN##_return_length); \ - return ret; \ - } \ - INTERCEPTOR(char *, SHA##LEN##_File, const char *filename, char *buf) { \ - void *ctx; \ - COMMON_INTERCEPTOR_ENTER(ctx, SHA##LEN##_File, filename, buf); \ - if (filename) \ - COMMON_INTERCEPTOR_READ_RANGE(ctx, filename, internal_strlen(filename) + 1);\ - char *ret = REAL(SHA##LEN##_File)(filename, buf); \ - if (ret) \ - COMMON_INTERCEPTOR_WRITE_RANGE(ctx, ret, SHA##LEN##_return_length); \ - return ret; \ - } \ - INTERCEPTOR(char *, SHA##LEN##_FileChunk, const char *filename, char *buf, \ - OFF_T offset, OFF_T length) { \ - void *ctx; \ - COMMON_INTERCEPTOR_ENTER(ctx, SHA##LEN##_FileChunk, filename, buf, offset, \ - length); \ - if (filename) \ - COMMON_INTERCEPTOR_READ_RANGE(ctx, filename, internal_strlen(filename) + 1);\ - char *ret = REAL(SHA##LEN##_FileChunk)(filename, buf, offset, length); \ - if (ret) \ - COMMON_INTERCEPTOR_WRITE_RANGE(ctx, ret, SHA##LEN##_return_length); \ - return ret; \ - } \ - INTERCEPTOR(char *, SHA##LEN##_Data, u8 *data, SIZE_T len, char *buf) { \ - void *ctx; \ - COMMON_INTERCEPTOR_ENTER(ctx, SHA##LEN##_Data, data, len, buf); \ - if (data && len > 0) \ - COMMON_INTERCEPTOR_READ_RANGE(ctx, data, len); \ - char *ret = REAL(SHA##LEN##_Data)(data, len, buf); \ - if (ret) \ - COMMON_INTERCEPTOR_WRITE_RANGE(ctx, ret, SHA##LEN##_return_length); \ - return ret; \ - } - -SHA2_INTERCEPTORS(224, u32) -SHA2_INTERCEPTORS(256, u32) -SHA2_INTERCEPTORS(384, u64) -SHA2_INTERCEPTORS(512, u64) - -#define INIT_SHA2_INTECEPTORS(LEN) \ - COMMON_INTERCEPT_FUNCTION(SHA##LEN##_Init); \ - COMMON_INTERCEPT_FUNCTION(SHA##LEN##_Update); \ - COMMON_INTERCEPT_FUNCTION(SHA##LEN##_Final); \ - COMMON_INTERCEPT_FUNCTION(SHA##LEN##_End); \ - COMMON_INTERCEPT_FUNCTION(SHA##LEN##_File); \ - COMMON_INTERCEPT_FUNCTION(SHA##LEN##_FileChunk); \ - COMMON_INTERCEPT_FUNCTION(SHA##LEN##_Data) - -#define INIT_SHA2 \ - INIT_SHA2_INTECEPTORS(224); \ - INIT_SHA2_INTECEPTORS(256); \ - INIT_SHA2_INTECEPTORS(384); \ - INIT_SHA2_INTECEPTORS(512) -#undef SHA2_INTERCEPTORS -#else -#define INIT_SHA2 -#endif - #if SANITIZER_INTERCEPT_VIS INTERCEPTOR(char *, vis, char *dst, int c, int flag, int nextc) { void *ctx; @@ -10542,10 +10364,8 @@ static void InitializeCommonInterceptors() { INIT_SHA1; INIT_MD4; INIT_RMD160; - INIT_MD5; INIT_FSEEK; INIT_MD2; - INIT_SHA2; INIT_VIS; INIT_CDB; INIT_GETFSENT; diff --git a/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_platform_interceptors.h b/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_platform_interceptors.h index de55c736d0e1..d78f942b3dd4 100644 --- a/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_platform_interceptors.h +++ b/contrib/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_platform_interceptors.h @@ -559,10 +559,8 @@ #define SANITIZER_INTERCEPT_SHA1 SI_NETBSD #define SANITIZER_INTERCEPT_MD4 SI_NETBSD #define SANITIZER_INTERCEPT_RMD160 SI_NETBSD -#define SANITIZER_INTERCEPT_MD5 (SI_NETBSD || SI_FREEBSD) #define SANITIZER_INTERCEPT_FSEEK (SI_NETBSD || SI_FREEBSD) #define SANITIZER_INTERCEPT_MD2 SI_NETBSD -#define SANITIZER_INTERCEPT_SHA2 (SI_NETBSD || SI_FREEBSD) #define SANITIZER_INTERCEPT_CDB SI_NETBSD #define SANITIZER_INTERCEPT_VIS (SI_NETBSD || SI_FREEBSD) #define SANITIZER_INTERCEPT_POPEN SI_POSIX From nobody Sat Nov 9 20:19:13 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Xm6bP4hTBz5ccfx; Sat, 09 Nov 2024 20:19: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xm6bP4Gkzz4f7m; Sat, 9 Nov 2024 20:19:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731183553; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Te/bOnpSNmcvJqeTokQW3oQVWxkfNO/EFY7PF6gdwmY=; b=m1QfCvwKirTWVbxzftCHUMKlZ86g29d8gVLdoUdYPYbTcvKUUsafowPDZBtjBJFGeezn3o Dp7I5HrV5ejLhzqznXmurCy/TCuOd/y9gT+vV94YgxRQEaRtbQ2vJugKxS7X6omOxthEAH Sybxoead+msstI9biR5k04yR8OUXq/ChBLz1+7xSogfgIjhYBrilPWEuwkPUARJ5VBOm5w n83ad1we1X/lSfDqzqVyQZJURMjNYHYRQZ1E3Ny5gAX9apEiWgce+rln4wufHtoST6tlJE QxzxRMdeU7fX/7slrmn3nNoRCO7vJuGeGXviTjcaWjTEyBCln9tC3ULUmwqHIA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731183553; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Te/bOnpSNmcvJqeTokQW3oQVWxkfNO/EFY7PF6gdwmY=; b=kOTwn6N0wBcPxbhrpeGKcxtUZGVi4DOfF7eD0bRHOhiP3VcAqtRsLYKJqBVI2bKy/YTmRC gcGARpwZJsKCldDfrt1ZTXdMFKydKHH/2swJZoYThV9rng+d8Q8LG3J5Hr/VbQDiOfSCO5 vIQqWDPErvMyUTodVBwDkHvPYXH3XDfM5FeYB7NgWqPi33LAZrUTmImQLL0OlW/NVJ3nb3 Vi/wKWdIT8rLZLQ30S4pGptEQMaNLIF3Ix2krgVKDww/4G4/1538lvs6XGkJf/J7HbNjYt bXl7w2tbWKjLrfpmiWOB3OMrXoQR+jeJTjAaavWpWmdNtFhiPzn8ri4XpDWLew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731183553; a=rsa-sha256; cv=none; b=pBWCkukMJAab9XxicR/SeEeWPkgoTv3at8oFA/+bqljCCPK+lisT6c0hsLo0Ia+CILMoas WRJ4nY7VuJANLBFT8tHxG8HCwzhaBeUjgi1AdH3NTz/ZhcabHLdoNOMi1UXxMLKSKGiZqe dV7GVVCGBEFvd/yHqMPC2yQ2Ia22RVDEJfG256wf272Lq5u1cPqI11Hg+s3gHsgIXd/u9K LyOBWwKQLmxrQ8E8/PkBG0DBwBtJVMTWD2eEsDS/KHzjBjn6VHR+lfmZxuIYnsliTGn9OI yVxPJ6bwrLkfGB/nSq3pNlw35ReYjm61E/+9n8TloHC7gm6Izt05aL4eQ3nnYg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Xm6bP3sspz1RbQ; Sat, 9 Nov 2024 20:19:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A9KJDR7033396; Sat, 9 Nov 2024 20:19:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A9KJDll033393; Sat, 9 Nov 2024 20:19:13 GMT (envelope-from git) Date: Sat, 9 Nov 2024 20:19:13 GMT Message-Id: <202411092019.4A9KJDll033393@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: d4e318edeccc - stable/14 - x86/iommu/amd_reg.h: AMD IOMMU registers definitions List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d4e318edeccc81f36855a30b26a3569b7490ff2c Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=d4e318edeccc81f36855a30b26a3569b7490ff2c commit d4e318edeccc81f36855a30b26a3569b7490ff2c Author: Konstantin Belousov AuthorDate: 2024-04-12 04:23:13 +0000 Commit: Konstantin Belousov CommitDate: 2024-11-09 19:04:18 +0000 x86/iommu/amd_reg.h: AMD IOMMU registers definitions (cherry picked from commit 0a9bec17447c1256b046a03dbf5cd40ced437b56) --- sys/x86/iommu/amd_reg.h | 746 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 746 insertions(+) diff --git a/sys/x86/iommu/amd_reg.h b/sys/x86/iommu/amd_reg.h new file mode 100644 index 000000000000..33f744c65cc6 --- /dev/null +++ b/sys/x86/iommu/amd_reg.h @@ -0,0 +1,746 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2024 The FreeBSD Foundation + * + * This software was developed by Konstantin Belousov + * under sponsorship from the FreeBSD Foundation. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#ifndef __X86_IOMMU_AMD_REG_H +#define __X86_IOMMU_AMD_REG_H + +/* + * MMIO Registers. Offsets and bits definitions. + */ + +#define AMDIOMMU_DEVTAB_BASE 0x0000 +#define AMDIOMMU_CMDBUF_BASE 0x0008 +#define AMDIOMMU_EVNTLOG_BASE 0x0010 +#define AMDIOMMU_CTRL 0x0018 +#define AMDIOMMU_EXCL_BASE 0x0020 +#define AMDIOMMU_EXCL_RANGE 0x0028 +#define AMDIOMMU_EFR 0x0030 +#define AMDIOMMU_PPRLOG_BASE 0x0038 +#define AMDIOMMU_HWEV_UPPER 0x0040 +#define AMDIOMMU_HWEV_LOWER 0x0048 +#define AMDIOMMU_HWEV_STATUS 0x0050 + +#define AMDIOMMU_SMIF_0 0x0060 +#define AMDIOMMU_SMIF_1 0x0068 +#define AMDIOMMU_SMIF_2 0x0070 +#define AMDIOMMU_SMIF_3 0x0078 +#define AMDIOMMU_SMIF_4 0x0080 +#define AMDIOMMU_SMIF_5 0x0088 +#define AMDIOMMU_SMIF_6 0x0090 +#define AMDIOMMU_SMIF_7 0x0098 +#define AMDIOMMU_SMIF_8 0x00a0 +#define AMDIOMMU_SMIF_9 0x00a8 +#define AMDIOMMU_SMIF_10 0x00b0 +#define AMDIOMMU_SMIF_11 0x00b8 +#define AMDIOMMU_SMIF_12 0x00c0 +#define AMDIOMMU_SMIF_13 0x00c8 +#define AMDIOMMU_SMIF_14 0x00d0 +#define AMDIOMMU_SMIF_15 0x00d8 + +#define AMDIOMMU_VAPIC_LOG_BASE 0x00e0 +#define AMDIOMMU_VAPIC_LOG_TAIL 0x00e8 +#define AMDIOMMU_PPRLOGB_BASE 0x00f0 +#define AMDIOMMU_EVNTLOGB_BASE 0x00f0 + +#define AMDIOMMU_DEVTAB_S1_BASE 0x0100 +#define AMDIOMMU_DEVTAB_S2_BASE 0x0108 +#define AMDIOMMU_DEVTAB_S3_BASE 0x0110 +#define AMDIOMMU_DEVTAB_S4_BASE 0x0118 +#define AMDIOMMU_DEVTAB_S5_BASE 0x0120 +#define AMDIOMMU_DEVTAB_S6_BASE 0x0128 +#define AMDIOMMU_DEVTAB_S7_BASE 0x0130 + +#define AMDIOMMU_DSFX 0x0138 +#define AMDIOMMU_DSCX 0x0140 +#define AMDIOMMU_DSSX 0x0148 + +#define AMDIOMMU_MSI_VEC0 0x0150 +#define AMDIOMMU_MSI_VEC1 0x0154 +#define AMDIOMMU_MSI_CAP_H 0x0158 +#define AMDIOMMU_MSI_ADDR_LOW 0x015c +#define AMDIOMMU_MSI_ADDR_HIGH 0x0160 +#define AMDIOMMU_MSI_DATA 0x0164 +#define AMDIOMMU_MSI_MAPCAP 0x0168 + +#define AMDIOMMU_PERFOPT 0x016c + +#define AMDIOMMU_x2APIC_CTRL 0x0170 +#define AMDIOMMU_PPRI_CTRL 0x0178 +#define AMDIOMMU_GALOGI_CTRL 0x0180 + +#define AMDIOMMU_vIOMMU_STATUS 0x0190 + +#define AMDIOMMU_MARC0_BASE 0x0200 +#define AMDIOMMU_MARC0_RELOC 0x0208 +#define AMDIOMMU_MARC0_LEN 0x0210 +#define AMDIOMMU_MARC1_BASE 0x0218 +#define AMDIOMMU_MARC1_RELOC 0x0220 +#define AMDIOMMU_MARC1_LEN 0x0228 +#define AMDIOMMU_MARC2_BASE 0x0230 +#define AMDIOMMU_MARC2_RELOC 0x0238 +#define AMDIOMMU_MARC2_LEN 0x0240 +#define AMDIOMMU_MARC3_BASE 0x0248 +#define AMDIOMMU_MARC3_RELOC 0x0250 +#define AMDIOMMU_MARC3_LEN 0x0258 + +#define AMDIOMMU_EFR2 0x01a0 + +#define AMDIOMMU_CMDBUF_HEAD 0x2000 +#define AMDIOMMU_CMDBUF_TAIL 0x2008 +#define AMDIOMMU_EVNTLOG_HEAD 0x2010 +#define AMDIOMMU_EVNTLOG_TAIL 0x2018 +#define AMDIOMMU_CMDEV_STATUS 0x2020 +#define AMDIOMMU_PPRLOG_HEAD 0x2030 +#define AMDIOMMU_PPRLOG_TAIL 0x2038 +#define AMDIOMMU_vAPICLOG_HEAD 0x2040 +#define AMDIOMMU_vAPICLOG_TAIL 0x2048 +#define AMDIOMMU_PPRLOGB_HEAD 0x2050 +#define AMDIOMMU_PPRLOGB_TAIL 0x2058 +#define AMDIOMMU_EVNTLOGB_HEAD 0x2070 +#define AMDIOMMU_EVNTLOGB_TAIL 0x2078 +#define AMDIOMMU_PPRLOG_AUR 0x2080 +#define AMDIOMMU_PPRLOG_EAI 0x2088 +#define AMDIOMMU_PPRLOGB_AUR 0x2090 + +/* + * IOMMU Control Register AMDIOMMU_CTRL fields + */ +#define AMDIOMMU_CTRL_EN 0x0000000000000001ull /* IOMMU En */ +#define AMDIOMMU_CTRL_HTTUN_EN 0x0000000000000002ull /* HT Tun Trans En */ +#define AMDIOMMU_CTRL_EVNTLOG_EN 0x0000000000000004ull /* Event Log En */ +#define AMDIOMMU_CTRL_EVENTINT_EN 0x0000000000000008ull /* Event Log Intr En */ +#define AMDIOMMU_CTRL_COMWINT_EN 0x0000000000000010ull /* Compl Wait Intr En */ +#define AMDIOMMU_CTRL_INVTOUT_MASK 0x00000000000000e0ull /* IOTLB Inv Timeout*/ +#define AMDIOMMU_CTRL_INVTOUT_NO 0x0000000000000000ull +#define AMDIOMMU_CTRL_INVTOUT_1MS 0x0000000000000020ull +#define AMDIOMMU_CTRL_INVTOUT_10MS 0x0000000000000040ull +#define AMDIOMMU_CTRL_INVTOUT_100MS 0x0000000000000060ull +#define AMDIOMMU_CTRL_INVTOUT_1S 0x0000000000000080ull +#define AMDIOMMU_CTRL_INVTOUT_10S 0x00000000000000a0ull +#define AMDIOMMU_CTRL_INVTOUT_100S 0x00000000000000b0ull +#define AMDIOMMU_CTRL_INVTOUT_RSRV 0x00000000000000e0ull +#define AMDIOMMU_CTRL_PASSPW 0x0000000000000100ull /* HT Pass Posted Wr */ +#define AMDIOMMU_CTRL_REPASSPW 0x0000000000000200ull /* HT Resp Pass Posted Wr */ +#define AMDIOMMU_CTRL_COHERENT 0x0000000000000400ull /* HT Coherent Reads */ +#define AMDIOMMU_CTRL_ISOC 0x0000000000000800ull /* HT Isoc Reads */ +#define AMDIOMMU_CTRL_CMDBUF_EN 0x0000000000001000ull /* Start CMD proc En */ +#define AMDIOMMU_CTRL_PPRLOG_EN 0x0000000000002000ull /* Periph Page Req Log En */ +#define AMDIOMMU_CTRL_PPRINT_EN 0x0000000000004000ull /* Periph Page Req Intr En */ +#define AMDIOMMU_CTRL_PPR_EN 0x0000000000008000ull /* Periph Page Req En */ +#define AMDIOMMU_CTRL_GT_EN 0x0000000000010000ull /* Guest En */ +#define AMDIOMMU_CTRL_GA_EN 0x0000000000020000ull /* Guest vAPIC En */ +#define AMDIOMMU_CTRL_SMIF_EN 0x0000000000400000ull /* SMI Filter En */ +#define AMDIOMMU_CTRL_SLFWB_DIS 0x0000000000800000ull /* Self WriteBack Dis */ +#define AMDIOMMU_CTRL_SMIFLOG_EN 0x0000000001000000ull /* SMI Filter Log En */ +#define AMDIOMMU_CTRL_GAM_EN_MASK 0x000000000e000000ull /* Guest vAPIC Mode En */ +#define AMDIOMMU_CTRL_GAM_EN_vAPIC_GM0 0x0000000000000000ull /* IRTE.GM = 0 */ +#define AMDIOMMU_CTRL_GAM_EN_vAPIC_GM1 0x0000000002000000ull /* IRTE.GM = 1 */ +#define AMDIOMMU_CTRL_GALOG_EN 0x0000000010000000ull /* Guest vAPIC GA Log En */ +#define AMDIOMMU_CTRL_GAINT_EN 0x0000000020000000ull /* Guest vAPIC GA Intr En */ +#define AMDIOMMU_CTRL_DUALPPRLOG_MASK 0x00000000c0000000ull /* Dual Periph Page Req Log En */ +#define AMDIOMMU_CTRL_DUALPPRLOG_A 0x0000000000000000ull /* Use Log A */ +#define AMDIOMMU_CTRL_DUALPPRLOG_B 0x0000000040000000ull /* Use Log B */ +#define AMDIOMMU_CTRL_DUALPPRLOG_SWAP 0x0000000080000000ull /* Auto-swap on full */ +#define AMDIOMMU_CTRL_DUALPPRLOG_RSRV 0x00000000c0000000ull +#define AMDIOMMU_CTRL_DUALEVNTLOG_MASK 0x0000000300000000ull /* Dual Event Log En */ +#define AMDIOMMU_CTRL_DUALEVNTLOG_A 0x0000000000000000ull /* Use Log A Buf */ +#define AMDIOMMU_CTRL_DUALEVNTLOG_B 0x0000000100000000ull /* Use Log B Buf */ +#define AMDIOMMU_CTRL_DUALEVNTLOG_SWAP 0x0000000200000000ull /* Auto-swap on full */ +#define AMDIOMMU_CTRL_DUALEVNTLOG_RSRV 0x0000000300000000ull +#define AMDIOMMU_CTRL_DEVTABSEG_MASK 0x0000001c00000000ull /* Dev Table Segm */ +#define AMDIOMMU_CTRL_DEVTABSEG_1 0x0000000000000000ull /* 1 Segment */ +#define AMDIOMMU_CTRL_DEVTABSEG_2 0x0000000400000000ull /* 2 Segments */ +#define AMDIOMMU_CTRL_DEVTABSEG_4 0x0000000800000000ull /* 4 Segments */ +#define AMDIOMMU_CTRL_DEVTABSEG_8 0x0000000c00000000ull /* 8 Segments */ +#define AMDIOMMU_CTRL_PRIVABRT_MASK 0x0000006000000000ull /* Privilege Abort En */ +#define AMDIOMMU_CTRL_PRIVABRT_USR 0x0000000000000000ull /* Privilege Abort User */ +#define AMDIOMMU_CTRL_PRIVABRT_ALL 0x0000002000000000ull /* Privilege Abort Always */ +#define AMDIOMMU_CTRL_PPRAUTORSP_EN 0x0000008000000000ull /* PPR Auto Resp En */ +#define AMDIOMMU_CTRL_MARC_EN 0x0000010000000000ull /* Memory Addr Routing En */ +#define AMDIOMMU_CTRL_BLKSTOPMRK_EN 0x0000020000000000ull /* Block StopMark En */ +#define AMDIOMMU_CTRL_PPRAUTORESPA_EN 0x0000040000000000ull /* PPR Auto Resp Always En */ +#define AMDIOMMU_CTRL_EPH_EN 0x0000200000000000ull /* Enh PPR Handling En */ +#define AMDIOMMU_CTRL_HADUP_MASK 0x0000c00000000000ull /* Access and Dirty in host PT */ +#define AMDIOMMU_CTRL_GDUP_DIS 0x0001000000000000ull /* Dis Dirty in guest PT */ +#define AMDIOMMU_CTRL_XT_EN 0x0004000000000000ull /* x2APIC mode */ +#define AMDIOMMU_CTRL_INTCAPXT_EN 0x0008000000000000ull /* x2APIC mode for IOMMU intrs */ +#define AMDIOMMU_CTRL_vCMD_EN 0x0010000000000000ull /* vCMD buffer proc En */ +#define AMDIOMMU_CTRL_vIOMMU_EN 0x0020000000000000ull /* vIOMMU En */ +#define AMDIOMMU_CTRL_GAUP_DIS 0x0040000000000000ull /* Dis Access in guest PT */ +#define AMDIOMMU_CTRL_GAPPI_EN 0x0080000000000000ull /* Guest APIC phys proc intr En */ +#define AMDIOMMU_CTRL_TMPM_EN 0x0100000000000000ull /* Tiered Mem Page Migration En */ +#define AMDIOMMU_CTRL_GGCR3TRP_PHYS 0x0400000000000000ull /* GCR3 is GPA (otherwise SPA) */ +#define AMDIOMMU_CTRL_IRTCACHE_DIS 0x0800000000000000ull /* IRT Caching Dis */ +#define AMDIOMMU_CTRL_GSTBUFTRP_MODE 0x1000000000000000ull /* See spec */ +#define AMDIOMMU_CTRL_SNPAVIC_MASK 0xe000000000000000ull /* MBZ */ + +/* + * IOMMU Extended Feature Register AMDIOMMU_EFR fields + */ +#define AMDIOMMU_EFR_XT_SUP 0x0000000000000004ull /* x2APIC */ +#define AMDIOMMU_EFR_HWEV_SUP 0x0000000000000100ull /* HW Event regs */ +#define AMDIOMMU_EFR_PC_SUP 0x0000000000000200ull /* Perf counters */ +#define AMDIOMMU_EFR_HATS_MASK 0x0000000000000c00ull /* Host Addr Trans Size */ +#define AMDIOMMU_EFR_HATS_4LVL 0x0000000000000000ull +#define AMDIOMMU_EFR_HATS_5LVL 0x0000000000000400ull +#define AMDIOMMU_EFR_HATS_6LVL 0x0000000000000800ull +#define AMDIOMMU_EFR_DEVTBLSEG_MASK 0x000000c000000000ull /* DevTbl segmentation */ +#define AMDIOMMU_EFR_DEVTBLSEG_SHIFT 38 + +/* IOMMU Command Pointers (Head/Tail) registers fields */ +#define AMDIOMMU_CMDPTR_MASK 0x000000000007fff0ull + +/* IOMMU Command Buffer Base fields */ +#define AMDIOMMU_CMDBUF_BASE_SZSHIFT 56 /* Shift for size */ +#define AMDIOMMU_CMDBUF_MAX (512 * 1024) + +/* IOMMU Event Log Base register fields */ +#define AMDIOMMU_EVNTLOG_BASE_SZSHIFT 56 /* Shift for size */ +#define AMDIOMMU_EVNTLOG_MIN 256 +#define AMDIOMMU_EVNTLOG_MAX 32768 + +/* IOMMU Hardware Event Status register fields */ +#define AMDIOMMU_HWEVS_HEV 0x00000001 /* HW Ev Valid */ +#define AMDIOMMU_HWEVS_HEO 0x00000002 /* HW Ev Overfl */ + +/* + * IOMMU Command and Event Status register fields. + * From the spec, all defined bits are either RO or RW1C. As a consequence, + * single bit can be safely written to the register to clean a specific + * condition. + */ +#define AMDIOMMU_CMDEVS_EVOVRFLW 0x00000001 +#define AMDIOMMU_CMDEVS_EVLOGINT 0x00000002 +#define AMDIOMMU_CMDEVS_COMWAITINT 0x00000004 +#define AMDIOMMU_CMDEVS_EVLOGRUN 0x00000008 +#define AMDIOMMU_CMDEVS_CMDBUFRUN 0x00000010 +#define AMDIOMMU_CMDEVS_PPROVRFLW 0x00000020 +#define AMDIOMMU_CMDEVS_PPRINT 0x00000040 +#define AMDIOMMU_CMDEVS_PPRLOGRUN 0x00000080 +#define AMDIOMMU_CMDEVS_GALOGRUN 0x00000100 +#define AMDIOMMU_CMDEVS_GALOVRFLW 0x00000200 +#define AMDIOMMU_CMDEVS_GAINT 0x00000400 +#define AMDIOMMU_CMDEVS_PPROVRFLWB 0x00000800 +#define AMDIOMMU_CMDEVS_PPRLOGACTIVE 0x00001000 +#define AMDIOMMU_CMDEVS_RESV1 0x00002000 +#define AMDIOMMU_CMDEVS_RESV2 0x00004000 +#define AMDIOMMU_CMDEVS_EVOVRFLWB 0x00008000 +#define AMDIOMMU_CMDEVS_EVLOGACTIVE 0x00010000 +#define AMDIOMMU_CMDEVS_PPROVRFLWEB 0x00020000 +#define AMDIOMMU_CMDEVS_PPROVRFLWE 0x00040000 + +/* + * Device Table Entry (DTE) + */ +struct amdiommu_dte { + u_int v:1; /* Valid */ + u_int tv:1; /* Translation Valid */ + u_int rsrv0:5; + u_int had:2; /* Host Access Dirty */ + u_int pgmode:3; /* Paging Mode */ + uint64_t ptroot:40; /* Page Table Root */ + u_int ppr:1; /* PPR En */ + u_int gprp:1; /* Guest PPR Resp with PASID */ + u_int giov:1; /* Guest IO Prot Valid */ + u_int gv:1; /* Guest Translation Valid */ + u_int glx:2; /* Guest Levels Translated */ + u_int gcr3root0:3; /* GCR3 root pointer part */ + u_int ir:1; /* Read Perm */ + u_int iw:1; /* Write Perm */ + u_int rsrv1:1; + u_int domainid:16; /* domain tag */ + u_int gcr3root1:16; /* GCR3 root pointer part */ + u_int i:1; /* IOTLB En */ + u_int se:1; /* Suppress IO Fault Events */ + u_int sa:1; /* Suppress All IO Fault Events */ + u_int pioctl:2; /* Port IO Control */ + u_int cache:1; /* IOTLB Cache Hint */ + u_int sd:1; /* Snoop Disable */ + u_int ex:1; /* Allow Exclusion */ + u_int sysmgt:2; /* System Management Msg Handling */ + u_int sats:1; /* Secure/Non-secure ATS */ + u_int gcr3root2:21; /* GCR3 root pointer part */ + u_int iv:1; /* Intr Map Valid */ + u_int inttablen:4; /* log2 Intr Table Len */ + u_int ig:1; /* Ignore Unmapped Interrupts */ + uint64_t intrroot:46; /* Interrupt Table Root (-low 6bits) */ + u_int rsrv2:2; + u_int gpm:2; /* Guest Paging Mode */ + u_int initpass:1; /* INIT pass-through */ + u_int eintpass:1; /* ExtInt pass-through */ + u_int nmipass:1; /* NMI pass-through */ + u_int hptmode:1; /* Host Page Table Mode Hint */ + u_int intctl:2; /* Interrupt Control */ + u_int lint0pass:1; /* LINT0 pass-through */ + u_int lint1pass:1; /* LINT1 pass-through */ + u_int rsrv3:15; + u_int vimu:1; /* Virtualize IOMMU En */ + u_int gdevid:16; /* Guest Dev Id */ + u_int gid:16; /* Guest Id */ + u_int rsrv4:5; + u_int rsrv5:1; /* Not Checked, sw avail */ + u_int attrv:1; /* Attr Override Valid */ + u_int mode0fc:1; /* Replace for PTE.FC */ + u_int snoopattr:8; /* GuestPTE.PAT -> ATS.N xlat */ +} __packed; +_Static_assert(sizeof(struct amdiommu_dte) == 8 * sizeof(uint32_t), "DTE"); + +#define AMDIOMMU_DTE_HAD_NAND 0x0 /* No Access, No Dirty */ +#define AMDIOMMU_DTE_HAD_AND 0x1 /* Access, No Dirty */ +#define AMDIOMMU_DTE_HAD_RSRV 0x2 +#define AMDIOMMU_DTE_HAD_AD 0x3 /* Access, Dirty */ + +#define AMDIOMMU_DTE_PGMODE_1T1 0x0 /* SPA = GPA */ +#define AMDIOMMU_DTE_PGMODE_1LV 0x1 /* 1 Level PT */ +#define AMDIOMMU_DTE_PGMODE_2LV 0x2 /* 2 Level PT */ +#define AMDIOMMU_DTE_PGMODE_3LV 0x3 /* 3 Level PT */ +#define AMDIOMMU_DTE_PGMODE_4LV 0x4 /* 4 Level PT */ +#define AMDIOMMU_DTE_PGMODE_5LV 0x5 /* 5 Level PT */ +#define AMDIOMMU_DTE_PGMODE_6LV 0x6 /* 6 Level PT */ +#define AMDIOMMU_DTE_PGMODE_RSRV 0x7 + +#define AMDIOMMU_DTE_GLX_1LV 0x0 /* 1 Level GCR3 */ +#define AMDIOMMU_DTE_GLX_2LV 0x1 /* 2 Level GCR3 */ +#define AMDIOMMU_DTE_GLX_3LV 0x2 /* 3 Level GCR3 */ +#define AMDIOMMU_DTE_GLX_RSRV 0x3 + +#define AMDIOMMU_DTE_PIOCTL_DIS 0x0 +#define AMDIOMMU_DTE_PIOCTL_EN 0x1 +#define AMDIOMMU_DTE_PIOCTL_MAP 0x2 +#define AMDIOMMU_DTE_PIOCTL_RSRV 0x3 + +#define AMDIOMMU_DTE_SYSMGT_DIS 0x0 /* Target Abort */ +#define AMDIOMMU_DTE_SYSMGT_FW 0x0 /* Forwarded All */ +#define AMDIOMMU_DTE_SYSMGT_FWI 0x0 /* Forwarded INT */ +#define AMDIOMMU_DTE_SYSMGT_T 0x0 /* Translated */ + +#define AMDIOMMU_DTE_GPM_4LV 0x0 /* 4 Level */ +#define AMDIOMMU_DTE_GPM_5LV 0x1 /* 4 Level */ +#define AMDIOMMU_DTE_GPM_RSRV1 0x2 +#define AMDIOMMU_DTE_GPM_RSRV2 0x3 + +#define AMDIOMMU_DTE_INTCTL_DIS 0x0 /* Target Abort */ +#define AMDIOMMU_DTE_INTCTL_FW 0x1 /* Forward Unmapped */ +#define AMDIOMMU_DTE_INTCTL_MAP 0x2 /* Forward Remapped */ +#define AMDIOMMU_DTE_INTCTL_RSRV 0x3 + +#define AMDIOMMU_PGTBL_MAXLVL 6 + +/* + * Page Table Entry (PTE/PDE) + */ +#define AMDIOMMU_PTE_PR 0x0001 /* Present, AKA V */ +#define AMDIOMMU_IGN1 0x0002 +#define AMDIOMMU_IGN2 0x0004 +#define AMDIOMMU_IGN3 0x0008 +#define AMDIOMMU_IGN4 0x0010 +#define AMDIOMMU_PTE_A 0x0020 /* Accessed */ +#define AMDIOMMU_PTE_D 0x0040 /* Dirty */ +#define AMDIOMMU_IGN5 0x0080 +#define AMDIOMMU_IGN6 0x0100 +#define AMDIOMMU_PTE_NLVL_MASK 0x0e00 /* Next Level */ +#define AMDIOMMU_PTE_NLVL_SHIFT 9 +#define AMDIOMMU_PTE_NLVL_7h 0x0e00 /* Magic Next Level */ +#define AMDIOMMU_PTE_PA_MASK 0x000ffffffffff000ull +#define AMDIOMMU_PTE_PA_SHIFT 12 +#define AMDIOMMU_PTE_PMC_MASK 0x0600000000000000ull /* Page Migr */ +#define AMDIOMMU_PTE_U 0x0800000000000000ull /* ATS.U */ +#define AMDIOMMU_PTE_FC 0x1000000000000000ull /* Force Coh */ +#define AMDIOMMU_PTE_IR 0x2000000000000000ull /* Read Perm */ +#define AMDIOMMU_PTE_IW 0x4000000000000000ull /* Write Perm */ +#define AMDIOMMU_PTE_IGN7 0x8000000000000000ull + +/* + * IRTEs + */ + +/* vAPIC is not enabled, guestmode = 0 */ +struct amdiommu_irte_basic_novapic { + u_int remapen:1; /* 0 - Target Abort */ + u_int supiopf:1; /* Supress IO_PAGE_FAULT events */ + u_int inttype:3; + u_int rqeoi:1; /* Request EOI */ + u_int dm:1; /* Dest Mode */ + u_int guestmode:1; /* MBZ */ + u_int dest:8; /* Destination APIC */ + u_int vector:8; + u_int rsrv:8; +} __packed; +_Static_assert(sizeof(struct amdiommu_irte_basic_novapic) == + 1 * sizeof(uint32_t), "IRTE 1"); + +/* vAPIC is enabled, guestmode = 0 */ +struct amdiommu_irte_basic_vapic { + u_int remapen:1; /* 0 - Target Abort */ + u_int supiopf:1; /* Supress IO_PAGE_FAULT events */ + u_int inttype:3; + u_int rqeoi:1; /* Request EOI */ + u_int dm:1; /* Dest Mode */ + u_int guestmode:1; /* MBZ */ + u_int dest:8; /* Destination APIC */ + u_int rsrv0:16; + u_int rsrv1:32; + u_int vector:8; + u_int rsrv2:24; + u_int rsrv3:32; +} __packed; +_Static_assert(sizeof(struct amdiommu_irte_basic_vapic) == + 4 * sizeof(uint32_t), "IRTE 2"); + +/* vAPIC is enabled, guestmode = 1 */ +struct amdiommu_irte_guest_vapic { + u_int remapen:1; /* 0 - Target Abort */ + u_int supiopf:1; /* Supress IO_PAGE_FAULT events */ + u_int galogintr:1; + u_int rsrv0:2; + u_int gappidis:1; /* supress GAPPI */ + u_int isrun:1; /* Guest Running hint */ + u_int guestmode:1; /* MB1 */ + u_int dest:8; /* Destination APIC for dorbell */ + u_int rsrv1:16; + u_int gatag:32; + u_int vector:8; + u_int rsrv2:4; + uint64_t vapicrp:40; /* 51:12 bits of SPA for APIC backing page */ + u_int rsrv3:12; +} __packed; +_Static_assert(sizeof(struct amdiommu_irte_guest_vapic) == + 4 * sizeof(uint32_t), "IRTE 3"); + +/* vAPIC is enabled, guestmode = 0, x2APIC */ +struct amdiommu_irte_basic_vapic_x2 { + u_int remapen:1; /* 0 - Target Abort */ + u_int supiopf:1; /* Supress IO_PAGE_FAULT events */ + u_int inttype:3; + u_int rqeoi:1; /* Request EOI */ + u_int dm:1; /* Dest Mode */ + u_int guestmode:1; /* MBZ */ + u_int dest0:24; /* Destination APIC 23:0 */ + u_int rsrv0:32; + u_int vector:8; + u_int rsrv1:24; + u_int rsrv2:24; + u_int dest1:8; /* Destination APIC 31:24 */ +} __packed; +_Static_assert(sizeof(struct amdiommu_irte_basic_vapic_x2) == + 4 * sizeof(uint32_t), "IRTE 4"); + +/* vAPIC is enabled, guestmode = 1, x2APIC */ +struct amdiommu_irte_guest_vapic_x2 { + u_int remapen:1; /* 0 - Target Abort */ + u_int supiopf:1; /* Supress IO_PAGE_FAULT events */ + u_int galogintr:1; + u_int rsrv0:2; + u_int gappidis:1; /* supress GAPPI */ + u_int isrun:1; /* Guest Running hint */ + u_int guestmode:1; /* MB1 */ + u_int dest0:24; /* Destination APIC for dorbell 23:0 */ + u_int gatag:32; + u_int vector:8; + u_int rsrv2:4; + uint64_t vapicrp:40; /* 51:12 bits of SPA for APIC backing page */ + u_int rsrv3:4; + u_int dest1:8; /* Destination APIC 31:24 */ +} __packed; +_Static_assert(sizeof(struct amdiommu_irte_guest_vapic_x2) == + 4 * sizeof(uint32_t), "IRTE 5"); + +#define AMDIOMMU_IRTE_INTTYPE_FIXED 0 +#define AMDIOMMU_IRTE_INTTYPE_ARBITR 1 + +#define AMDIOMMU_IRTE_DM_LOGICAL 1 +#define AMDIOMMU_IRTE_DM_PHYSICAL 1 + +/* + * Commands + */ + +struct amdiommu_cmd_generic { + u_int w0:32; + union { + u_int ww1:32; + struct { + u_int w1:28; + u_int op:4; + }; + }; + u_int w2:32; + u_int w3:32; +} __packed; +_Static_assert(sizeof(struct amdiommu_cmd_generic) == + 4 * sizeof(uint32_t), "CMD_GENERIC"); + +#define AMDIOMMU_CMD_SZ_SHIFT 4 /* Shift for cmd count + to ring offset */ +#define AMDIOMMU_CMD_SZ sizeof(struct amdiommu_cmd_generic) + /* Command size */ +_Static_assert((1 << AMDIOMMU_CMD_SZ_SHIFT) == AMDIOMMU_CMD_SZ, + "CMD size shift"); + +struct amdiommu_cmd_completion_wait { + u_int s:1; + u_int i:1; + u_int f:1; + u_int address0:29; /* Store Address 31:3 */ + u_int address1:20; /* Store Address 51:32 */ + u_int rsrv:8; + u_int op:4; + u_int data0:32; + u_int data1:32; +} __packed; +_Static_assert(sizeof(struct amdiommu_cmd_completion_wait) == + 4 * sizeof(uint32_t), "CMD_COMPLETION_WAIT"); + +struct amdiommu_cmd_invalidate_devtab_entry { + u_int devid:16; + u_int rsrv0:16; + u_int rsrv1:28; + u_int op:4; + u_int rsrv2:32; + u_int rsrv3:32; +} __packed; +_Static_assert(sizeof(struct amdiommu_cmd_invalidate_devtab_entry) == + 4 * sizeof(uint32_t), "CMD_INVALIDATE_DEVTAB_ENTRY"); + +struct amdiommu_cmd_invalidate_iommu_pages { + u_int pasid:20; + u_int rsrv0:12; + u_int domainid:16; + u_int rsrv1:12; + u_int op:4; + u_int s:1; + u_int pde:1; + u_int gn:1; + u_int rsrv2:9; + uint64_t address:52; /* Address 63:12 */ +} __packed; +_Static_assert(sizeof(struct amdiommu_cmd_invalidate_iommu_pages) == + 4 * sizeof(uint32_t), "CMD_INVALIDATE_IOMMU_PAGES"); + +struct amdiommu_cmd_invalidate_iotlb_pages { + u_int devid:16; + u_int pasid1:8; + u_int maxpend0:8; + u_int queueid:16; + u_int pasid0:8; + u_int pasid2:4; + u_int op:4; + u_int s:1; + u_int rsrv0:1; + u_int gn:1; + u_int rsrv1:1; + u_int type:2; + u_int rsrv2:6; + uint64_t address:52; /* Address 63:12 */ +} __packed; +_Static_assert(sizeof(struct amdiommu_cmd_invalidate_iotlb_pages) == + 4 * sizeof(uint32_t), "CMD_INVALIDATE_IOTLB_PAGES"); + +struct amdiommu_cmd_invalidate_interrupt_table { + u_int devid:16; + u_int rsrv0:16; + u_int rsrv1:28; + u_int op:4; + u_int rsrv2:32; + u_int rsrv3:32; +} __packed; +_Static_assert(sizeof(struct amdiommu_cmd_invalidate_interrupt_table) == + 4 * sizeof(uint32_t), "CMD_INVALIDATE_INTERRUPT_TABLE"); + +struct amdiommu_cmd_prefetch_iommu_pages { + u_int devid:16; + u_int rsrv0:8; + u_int pfcount:8; + u_int pasid:20; + u_int rsrv1:8; + u_int op:4; + u_int s:1; + u_int rsrv2:1; + u_int gn:1; + u_int rsrv3:1; + u_int inval:1; /* Invalidate First */ + u_int rsrv4:7; + uint64_t address:52; /* Address 63:12 */ +} __packed; +_Static_assert(sizeof(struct amdiommu_cmd_prefetch_iommu_pages) == + 4 * sizeof(uint32_t), "CMD_PREFETCH_IOMMU_PAGES"); + +struct amdiommu_cmd_complete_ppr_request { + u_int devid:16; + u_int rsrv0:16; + u_int pasid:20; + u_int rsrv1:8; + u_int op:4; + u_int rsrv2:2; + u_int gn:1; + u_int rsrv3:29; + u_int compltag:16; + u_int rsrv4:16; +} __packed; +_Static_assert(sizeof(struct amdiommu_cmd_complete_ppr_request) == + 4 * sizeof(uint32_t), "CMD_COMPLETE_PPR_REQUEST"); + +struct amdiommu_cmd_invalidate_iommu_all { + u_int rsrv0:32; + u_int op:4; + u_int rsrv1:28; + u_int rsrv2:32; + u_int rsrv3:32; +} __packed; +_Static_assert(sizeof(struct amdiommu_cmd_invalidate_iommu_all) == + 4 * sizeof(uint32_t), "CMD_INVALIDATE_IOMMU_ALL"); + +struct amdiommu_cmd_insert_guest_event { + u_int rsrv0:32; + u_int guestid:16; + u_int rsrv1:12; + u_int op:4; + u_int rsrv2:32; + u_int rsrv3:32; +} __packed; +_Static_assert(sizeof(struct amdiommu_cmd_insert_guest_event) == + 4 * sizeof(uint32_t), "CMD_INSERT_GUEST_EVENT"); + +struct amdiommu_cmd_reset_vmmio { + u_int guestid:16; + u_int rsrv0:11; + u_int all:1; + u_int rsrv1:3; + u_int vcmd:1; + u_int rsrv2:27; + u_int op:4; + u_int rsrv3:32; + u_int rsrv4:32; +} __packed; +_Static_assert(sizeof(struct amdiommu_cmd_reset_vmmio) == + 4 * sizeof(uint32_t), "CMD_RESET_VMMIO"); + +#define AMDIOMMU_CMD_COMPLETION_WAIT 0x1 +#define AMDIOMMU_CMD_INVALIDATE_DEVTAB_ENTRY 0x2 +#define AMDIOMMU_CMD_INVALIDATE_IOMMU_PAGES 0x3 +#define AMDIOMMU_CMD_INVALIDATE_IOTLB_PAGES 0x4 +#define AMDIOMMU_CMD_INVALIDATE_INTERRUPT_TABLE 0x5 +#define AMDIOMMU_CMD_PREFETCH_IOMMU_PAGES 0x6 +#define AMDIOMMU_CMD_COMPLETE_PPR_REQUEST 0x7 +#define AMDIOMMU_CMD_INVALIDATE_IOMMU_ALL 0x8 +#define AMDIOMMU_CMD_INSERT_GUEST_EVENT 0x9 +#define AMDIOMMU_CMD_RESET_VMMIO 0xa + +/* + * Logging + */ +struct amdiommu_event_generic { + u_int w0:32; + union { + u_int ww1:32; + struct { + u_int w1:28; + u_int code:4; + }; + }; + u_int w2:32; + u_int w3:32; +} __packed; +_Static_assert(sizeof(struct amdiommu_event_generic) == + 4 * sizeof(uint32_t), "EVENT_GENERIC"); + +#define AMDIOMMU_EV_SZ_SHIFT 4 /* Shift for event count + to ring offset */ +#define AMDIOMMU_EV_SZ sizeof(struct amdiommu_event_generic) + /* Event size */ +_Static_assert((1 << AMDIOMMU_EV_SZ_SHIFT) == AMDIOMMU_EV_SZ, + "Event size shift"); + +struct amdiommu_event_ill_dev_table_entry { + u_int devid:16; + u_int pasid1:4; + u_int rsrv0:7; + u_int vnr:1; + u_int rsrv1:1; + u_int vevent:1; + u_int vptr:1; + u_int vcmd:1; + u_int pasid:16; + u_int gn:1; + u_int rsrv2:2; + u_int i:1; + u_int rsrv3:1; + u_int rw:1; + u_int rsrv4:1; + u_int rz:1; + u_int tr:1; + u_int rsrv5:3; + u_int code:4; + u_int rsrv6:2; + u_int addr1:30; + u_int addr2:32; +} __packed; +_Static_assert(sizeof(struct amdiommu_event_ill_dev_table_entry) == + 4 * sizeof(uint32_t), "EVENT_ILLEGAL_DEV_TABLE_ENTRY"); + +struct amdiommu_event_io_page_fault_entry { + u_int devid:16; + u_int pasid1:4; + u_int rsrv0:7; + u_int vnr:1; + u_int rsrv1:1; + u_int vevent:1; + u_int vptr:1; + u_int vcmd:1; + u_int pasid:16; /* also domain id */ + u_int gn:1; + u_int nx:1; + u_int us:1; + u_int i:1; + u_int pr:1; + u_int rw:1; + u_int pe:1; + u_int rz:1; + u_int tr:1; + u_int rsrv2:3; + u_int code:4; + u_int addr1:32; + u_int addr2:32; +} __packed; +_Static_assert(sizeof(struct amdiommu_event_io_page_fault_entry) == + 4 * sizeof(uint32_t), "EVENT_IO_PAGE_FAULT_ENTRY"); + +#define AMDIOMMU_EV_ILL_DEV_TABLE_ENTRY 0x1 +#define AMDIOMMU_EV_IO_PAGE_FAULT 0x2 +#define AMDIOMMU_EV_DEV_TAB_HW_ERROR 0x3 +#define AMDIOMMU_EV_PAGE_TAB_HW_ERROR 0x4 +#define AMDIOMMU_EV_ILL_CMD_ERROR 0x5 +#define AMDIOMMU_EV_CMD_HW_ERROR 0x6 +#define AMDIOMMU_EV_IOTLB_INV_TIMEOUT 0x7 +#define AMDIOMMU_EV_INVALID_DEV_REQ 0x8 +#define AMDIOMMU_EV_INVALID_PPR_REQ 0x9 +#define AMDIOMMU_EV_COUNTER_ZERO 0xa /* Typo in table 42? */ + +#endif /* __X86_IOMMU_AMD_REG_H */ From nobody Sat Nov 9 20:19:14 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Xm6bQ6BNYz5cccR; Sat, 09 Nov 2024 20:19: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xm6bQ5KgSz4f9g; Sat, 9 Nov 2024 20:19:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731183554; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=G4aPdh5y3gd1Sl7LZbJlafnkG5iGdUNyMafaWwfUT2A=; b=KJQLdbXD5Fc0Bnlh9mb23SwnSONGa4mIMzzhcp/qVum1srlUXj42QMLB0D0X8Tn6yKedom AzwxppGJF7LxcHizlPObZ/rqWoK69sa5SAFPAPCJlTmAW2+XyoKXr/Y56RgpyWLBCGJxPr yNGMCKbQ+3M0UJD4o6K7AZEci5uFOpOK1LyJqfQWUE5d5FZsjU+0WVm4TRay57TanN09+z Do6wJSzrZOsnqXR6Eiodq9geQzyqcZ/X7Cxip/qMXQsQbijohTX71kyDBydFH9Ge6MZbr5 1jqVk0qE7pM1fagJyxnpN1LR2fjQkuxTT0HDx2i8lxBrRm6pCheVJI1O7iKMzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731183554; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=G4aPdh5y3gd1Sl7LZbJlafnkG5iGdUNyMafaWwfUT2A=; b=ShNE1hFe6DdoD0Lv4U/ZHWV9OPpqZPCu6RwKnw/vGw/g5KNVZq6gHATbL3ZyG1gltG9uWL aHLsjCstU78gFBa9Ab2Sl4LB0M+K1fYfhRS1o46zSknN9Isjjpt0/kxhdI3DXH54Ej225q VvHkBS882TVvoWkI9Pnpcd5LFtUQHDgA2F4Fug6eFiSNXHTiX7D5wge/k8rb6xk5k/1kmF nEfHp0qikO8Gak3Ljr9Vt5sZyNDKIfHr27kkPOXw9nLE7iyH447756K/c0Bkt059BGHebY aHFBFQ7X7KHVrThpJNb4uU3e8yfUjfhpEOnGdJfpNstrwVVRounhgZycvK2agQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731183554; a=rsa-sha256; cv=none; b=s66LMEcE2TlQsG207wNXEm96l4dGqxELKIEIk4R1b6V91yH9ran4dYChGXXKWZn2HBHYOi 4yRjZUFAdleJ3RJlGRLVd2wUi1MPLZqBRu5JXjlWxBYVfXE/evXgTNunQbwBRBKsmAvZ2z JPPBn7HTDHStffUn7Yjj+sTV9MmKOyWUMQhNmRgtEZxoOYrhnASQB3GGLZhD9tReGpgy/R RFUGxgHAnHNpCCKU9bz0GO8jK2OiAj6ZycZA30aUOSrQzKH+L9ejrLxAtEN1RE2/5esL7v IcVJVB3zdw+xGAUfm9EZfBTm0i8xAB73NtYnZWC9xRVtwzUF8H2PD03IOoe8ew== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Xm6bQ4q08z1RY7; Sat, 9 Nov 2024 20:19:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A9KJEpA033443; Sat, 9 Nov 2024 20:19:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A9KJE4I033439; Sat, 9 Nov 2024 20:19:14 GMT (envelope-from git) Date: Sat, 9 Nov 2024 20:19:14 GMT Message-Id: <202411092019.4A9KJE4I033439@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: dd40825e613d - stable/14 - x86/iommu/amd_reg.h: fix typo in comment List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: dd40825e613d341be7d77b6e85ef76a5ae93f640 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=dd40825e613d341be7d77b6e85ef76a5ae93f640 commit dd40825e613d341be7d77b6e85ef76a5ae93f640 Author: Konstantin Belousov AuthorDate: 2024-11-03 00:19:39 +0000 Commit: Konstantin Belousov CommitDate: 2024-11-09 19:04:18 +0000 x86/iommu/amd_reg.h: fix typo in comment (cherry picked from commit 57aebec4f767db3b3b8c7af813e5f1080d0e08ec) --- sys/x86/iommu/amd_reg.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/x86/iommu/amd_reg.h b/sys/x86/iommu/amd_reg.h index 33f744c65cc6..37375b3fa7b5 100644 --- a/sys/x86/iommu/amd_reg.h +++ b/sys/x86/iommu/amd_reg.h @@ -342,7 +342,7 @@ _Static_assert(sizeof(struct amdiommu_dte) == 8 * sizeof(uint32_t), "DTE"); #define AMDIOMMU_DTE_SYSMGT_T 0x0 /* Translated */ #define AMDIOMMU_DTE_GPM_4LV 0x0 /* 4 Level */ -#define AMDIOMMU_DTE_GPM_5LV 0x1 /* 4 Level */ +#define AMDIOMMU_DTE_GPM_5LV 0x1 /* 5 Level */ #define AMDIOMMU_DTE_GPM_RSRV1 0x2 #define AMDIOMMU_DTE_GPM_RSRV2 0x3 From nobody Sat Nov 9 20:19:15 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Xm6bS34chz5ccLL; Sat, 09 Nov 2024 20:19: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xm6bR6TxMz4f14; Sat, 9 Nov 2024 20:19:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731183555; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hp8dRlM6YRIXVjzQaZ73GZ7tZiS8ANnJ/NEqhceB5sU=; b=lsMGr+hmEeR8rvOL7GH4DaAxj07aLAn7cWE7XkNU7F3PhRq3O5ogdvf3De2PEIiEVw7kcu KpvxUEBBJ17wViWQWLWfZylZiMykA3hsk5JzKSh1OPN3RqI1CVo0KXXGdNcXbaq1FSyn5B N0vbgK7QJYTe+TlH52DYxCkl1vaGD33BWHvGxMO8DVH3iftswplaViY+6uw1QBqkGbvl2w unFW3T8hEa1zf0pmKc82WYLqAA7QAD6X9tcDJef6ypOlVEyLsleEBoM41bZ5iZJiz2FitU T9PyDrWqL6yScgQD9aTKp2A+hmDlUolY1JPZcuUAJhB3dJctS1yvwvoH4Igbpg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731183555; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hp8dRlM6YRIXVjzQaZ73GZ7tZiS8ANnJ/NEqhceB5sU=; b=JTJQFjzKN0rY2Mg1jAbVVbTgnnGu+PMENWL5noK4THMUrLjPBNxgP+LauZ83gp8srr5Z0L 3P67q/fUkgx++7jnHWRw2beR+xzDqv92AR4l3oYsrJUjU6/HQPkpdS3wCPgp6uTZt9+mKJ njk6ARg9KtIdN79syJOvlHHYPtQkNFWl8Ucp3X3poHFJk0hucXf5JnG+L6MXCAniVtwIE4 CMfvVoWuCoF2Up+nlhvIDfekJRoyS6bvLIMBOhv+jk9Ny8ty+fAUtHjBJv5gqzjzb1p4qi fbMSjWjYayjeCys7RYjVcbykDGok3UtzbXrNxZ1m5g37EsD989ad/5a3kkxiqw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731183555; a=rsa-sha256; cv=none; b=q4HNTheIIO48K10W25m4gUQp2PGGyrKm1w2ZzvFjICMLKXZbl4ITK1jJqFjQfz1twBWaII mzUw1rciPCjZEJ9ruB4K/PnH4CtjcnAiq6liFKdm8pcHp7lPPp1UVCYPeZUa4S99hxAHXb CErWkKCYhhGsWtdMLxgVq/m8zqJdI9QyDTEdYYLNLRNNMdOY6e/wnZi6FPMWTnD/OSz1mW kAld8AbhMDxcGkVxT+RYvXoKe7ViySKcOSvc/zm3UDIOs7BS9S6rt2j/NzarqVIuz3T/Bo BWc7whtRpPNoKfazY7CAvrdwk9wcRoh4iUZnWymfzLKRF+r6+jg4QRjFZkgjjA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Xm6bR5htvz1Rqk; Sat, 9 Nov 2024 20:19:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A9KJFj9033492; Sat, 9 Nov 2024 20:19:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A9KJFgD033481; Sat, 9 Nov 2024 20:19:15 GMT (envelope-from git) Date: Sat, 9 Nov 2024 20:19:15 GMT Message-Id: <202411092019.4A9KJFgD033481@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: fa6787221742 - stable/14 - AMD IOMMU driver List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: fa6787221742a00d410920a4a917bf2f9b1ed192 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=fa6787221742a00d410920a4a917bf2f9b1ed192 commit fa6787221742a00d410920a4a917bf2f9b1ed192 Author: Konstantin Belousov AuthorDate: 2024-05-12 10:20:11 +0000 Commit: Konstantin Belousov CommitDate: 2024-11-09 19:04:18 +0000 AMD IOMMU driver (cherry picked from commit 0f5116d7efe33c81f0b24b56eec78af37898f500) --- sys/conf/files.x86 | 6 + sys/x86/iommu/amd_cmd.c | 360 +++++++++++++ sys/x86/iommu/amd_ctx.c | 639 +++++++++++++++++++++++ sys/x86/iommu/amd_drv.c | 1205 +++++++++++++++++++++++++++++++++++++++++++ sys/x86/iommu/amd_event.c | 323 ++++++++++++ sys/x86/iommu/amd_idpgtbl.c | 396 ++++++++++++++ sys/x86/iommu/amd_intrmap.c | 391 ++++++++++++++ sys/x86/iommu/amd_iommu.h | 243 +++++++++ 8 files changed, 3563 insertions(+) diff --git a/sys/conf/files.x86 b/sys/conf/files.x86 index c6d705e9715d..33da95a65ba4 100644 --- a/sys/conf/files.x86 +++ b/sys/conf/files.x86 @@ -344,6 +344,12 @@ x86/cpufreq/hwpstate_amd.c optional cpufreq x86/cpufreq/hwpstate_intel.c optional cpufreq x86/cpufreq/p4tcc.c optional cpufreq x86/cpufreq/powernow.c optional cpufreq +x86/iommu/amd_cmd.c optional acpi iommu pci +x86/iommu/amd_ctx.c optional acpi iommu pci +x86/iommu/amd_drv.c optional acpi iommu pci +x86/iommu/amd_event.c optional acpi iommu pci +x86/iommu/amd_idpgtbl.c optional acpi iommu pci +x86/iommu/amd_intrmap.c optional acpi iommu pci x86/iommu/intel_ctx.c optional acpi iommu pci x86/iommu/intel_drv.c optional acpi iommu pci x86/iommu/intel_fault.c optional acpi iommu pci diff --git a/sys/x86/iommu/amd_cmd.c b/sys/x86/iommu/amd_cmd.c new file mode 100644 index 000000000000..bbc2a8e0ad9f --- /dev/null +++ b/sys/x86/iommu/amd_cmd.c @@ -0,0 +1,360 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2024 The FreeBSD Foundation + * + * This software was developed by Konstantin Belousov + * under sponsorship from the FreeBSD Foundation. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include "opt_acpi.h" + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +static void +amdiommu_enable_cmdbuf(struct amdiommu_unit *unit) +{ + AMDIOMMU_ASSERT_LOCKED(unit); + + unit->hw_ctrl |= AMDIOMMU_CTRL_CMDBUF_EN; + amdiommu_write8(unit, AMDIOMMU_CTRL, unit->hw_ctrl); +} + +static void +amdiommu_disable_cmdbuf(struct amdiommu_unit *unit) +{ + AMDIOMMU_ASSERT_LOCKED(unit); + + unit->hw_ctrl &= ~AMDIOMMU_CTRL_CMDBUF_EN; + amdiommu_write8(unit, AMDIOMMU_CTRL, unit->hw_ctrl); +} + + +static void +amdiommu_enable_qi_intr(struct iommu_unit *iommu) +{ + struct amdiommu_unit *unit; + + unit = IOMMU2AMD(iommu); + AMDIOMMU_ASSERT_LOCKED(unit); + unit->hw_ctrl |= AMDIOMMU_CTRL_COMWINT_EN; + amdiommu_write8(unit, AMDIOMMU_CTRL, unit->hw_ctrl); + amdiommu_write8(unit, AMDIOMMU_CMDEV_STATUS, + AMDIOMMU_CMDEVS_COMWAITINT); +} + +static void +amdiommu_disable_qi_intr(struct iommu_unit *iommu) +{ + struct amdiommu_unit *unit; + + unit = IOMMU2AMD(iommu); + AMDIOMMU_ASSERT_LOCKED(unit); + unit->hw_ctrl &= ~AMDIOMMU_CTRL_COMWINT_EN; + amdiommu_write8(unit, AMDIOMMU_CTRL, unit->hw_ctrl); +} + +static void +amdiommu_cmd_advance_tail(struct iommu_unit *iommu) +{ + struct amdiommu_unit *unit; + + unit = IOMMU2AMD(iommu); + AMDIOMMU_ASSERT_LOCKED(unit); + amdiommu_write8(unit, AMDIOMMU_CMDBUF_TAIL, unit->x86c.inv_queue_tail); +} + +static void +amdiommu_cmd_ensure(struct iommu_unit *iommu, int descr_count) +{ + struct amdiommu_unit *unit; + uint64_t head; + int bytes; + + unit = IOMMU2AMD(iommu); + AMDIOMMU_ASSERT_LOCKED(unit); + bytes = descr_count << AMDIOMMU_CMD_SZ_SHIFT; + for (;;) { + if (bytes <= unit->x86c.inv_queue_avail) + break; + /* refill */ + head = amdiommu_read8(unit, AMDIOMMU_CMDBUF_HEAD); + head &= AMDIOMMU_CMDPTR_MASK; + unit->x86c.inv_queue_avail = head - unit->x86c.inv_queue_tail - + AMDIOMMU_CMD_SZ; + if (head <= unit->x86c.inv_queue_tail) + unit->x86c.inv_queue_avail += unit->x86c.inv_queue_size; + if (bytes <= unit->x86c.inv_queue_avail) + break; + + /* + * No space in the queue, do busy wait. Hardware must + * make a progress. But first advance the tail to + * inform the descriptor streamer about entries we + * might have already filled, otherwise they could + * clog the whole queue.. + * + * See dmar_qi_invalidate_locked() for a discussion + * about data race prevention. + */ + amdiommu_cmd_advance_tail(iommu); + unit->x86c.inv_queue_full++; + cpu_spinwait(); + } + unit->x86c.inv_queue_avail -= bytes; +} + +static void +amdiommu_cmd_emit(struct amdiommu_unit *unit, const struct + amdiommu_cmd_generic *cmd) +{ + AMDIOMMU_ASSERT_LOCKED(unit); + + memcpy(unit->x86c.inv_queue + unit->x86c.inv_queue_tail, cmd, + sizeof(*cmd)); + unit->x86c.inv_queue_tail += AMDIOMMU_CMD_SZ; + KASSERT(unit->x86c.inv_queue_tail <= unit->x86c.inv_queue_size, + ("tail overflow 0x%x 0x%jx", unit->x86c.inv_queue_tail, + (uintmax_t)unit->x86c.inv_queue_size)); + unit->x86c.inv_queue_tail &= unit->x86c.inv_queue_size - 1; +} + +static void +amdiommu_cmd_emit_wait_descr(struct iommu_unit *iommu, uint32_t seq, + bool intr, bool memw, bool fence) +{ + struct amdiommu_unit *unit; + struct amdiommu_cmd_completion_wait c; + + unit = IOMMU2AMD(iommu); + AMDIOMMU_ASSERT_LOCKED(unit); + + bzero(&c, sizeof(c)); + c.op = AMDIOMMU_CMD_COMPLETION_WAIT; + if (memw) { + uint32_t x; + + c.s = 1; + x = unit->x86c.inv_waitd_seq_hw_phys; + x >>= 3; + c.address0 = x; + x = unit->x86c.inv_waitd_seq_hw_phys >> 32; + c.address1 = x; + c.data0 = seq; + } + if (fence) + c.f = 1; + if (intr) + c.i = 1; + amdiommu_cmd_emit(unit, (struct amdiommu_cmd_generic *)&c); +} + +static void +amdiommu_qi_invalidate_emit(struct iommu_domain *adomain, iommu_gaddr_t base, + iommu_gaddr_t size, struct iommu_qi_genseq *pseq, bool emit_wait) +{ + struct amdiommu_domain *domain; + struct amdiommu_unit *unit; + struct amdiommu_cmd_invalidate_iommu_pages c; + u_int isize; + + domain = IODOM2DOM(adomain); + unit = domain->unit; + AMDIOMMU_ASSERT_LOCKED(unit); + bzero(&c, sizeof(c)); + c.op = AMDIOMMU_CMD_INVALIDATE_IOMMU_PAGES; + c.domainid = domain->domain; + isize = IOMMU_PAGE_SIZE; /* XXXKIB handle superpages */ + + for (; size > 0; base += isize, size -= isize) { + amdiommu_cmd_ensure(AMD2IOMMU(unit), 1); + c.s = 0; + c.pde = 1; + c.address = base >> IOMMU_PAGE_SHIFT; + amdiommu_cmd_emit(unit, (struct amdiommu_cmd_generic *)&c); + } + iommu_qi_emit_wait_seq(AMD2IOMMU(unit), pseq, emit_wait); +} + +void +amdiommu_qi_invalidate_all_pages_locked_nowait(struct amdiommu_domain *domain) +{ + struct amdiommu_unit *unit; + struct amdiommu_cmd_invalidate_iommu_pages c; + + unit = domain->unit; + AMDIOMMU_ASSERT_LOCKED(unit); + bzero(&c, sizeof(c)); + c.op = AMDIOMMU_CMD_INVALIDATE_IOMMU_PAGES; + c.domainid = domain->domain; + + /* + * The magic specified in the note for INVALIDATE_IOMMU_PAGES + * description. + */ + c.s = 1; + c.pde = 1; + c.address = 0x7ffffffffffff; + + amdiommu_cmd_ensure(AMD2IOMMU(unit), 1); + amdiommu_cmd_emit(unit, (struct amdiommu_cmd_generic *)&c); +} + +void +amdiommu_qi_invalidate_wait_sync(struct iommu_unit *iommu) +{ + struct iommu_qi_genseq gseq; + + amdiommu_cmd_ensure(iommu, 1); + iommu_qi_emit_wait_seq(iommu, &gseq, true); + IOMMU2AMD(iommu)->x86c.inv_seq_waiters++; + amdiommu_cmd_advance_tail(iommu); + iommu_qi_wait_for_seq(iommu, &gseq, true); +} + +void +amdiommu_qi_invalidate_ctx_locked_nowait(struct amdiommu_ctx *ctx) +{ + struct amdiommu_cmd_invalidate_devtab_entry c; + + amdiommu_cmd_ensure(AMD2IOMMU(CTX2AMD(ctx)), 1); + bzero(&c, sizeof(c)); + c.op = AMDIOMMU_CMD_INVALIDATE_DEVTAB_ENTRY; + c.devid = ctx->context.rid; + amdiommu_cmd_emit(CTX2AMD(ctx), (struct amdiommu_cmd_generic *)&c); +} + + +void +amdiommu_qi_invalidate_ctx_locked(struct amdiommu_ctx *ctx) +{ + amdiommu_qi_invalidate_ctx_locked_nowait(ctx); + amdiommu_qi_invalidate_wait_sync(AMD2IOMMU(CTX2AMD(ctx))); +} + +void +amdiommu_qi_invalidate_ir_locked_nowait(struct amdiommu_unit *unit, + uint16_t devid) +{ + struct amdiommu_cmd_invalidate_interrupt_table c; + + AMDIOMMU_ASSERT_LOCKED(unit); + + amdiommu_cmd_ensure(AMD2IOMMU(unit), 1); + bzero(&c, sizeof(c)); + c.op = AMDIOMMU_CMD_INVALIDATE_INTERRUPT_TABLE; + c.devid = devid; + amdiommu_cmd_emit(unit, (struct amdiommu_cmd_generic *)&c); +} + +void +amdiommu_qi_invalidate_ir_locked(struct amdiommu_unit *unit, uint16_t devid) +{ + amdiommu_qi_invalidate_ir_locked_nowait(unit, devid); + amdiommu_qi_invalidate_wait_sync(AMD2IOMMU(unit)); +} + +static void +amdiommu_qi_task(void *arg, int pending __unused) +{ + struct amdiommu_unit *unit; + + unit = IOMMU2AMD(arg); + iommu_qi_drain_tlb_flush(AMD2IOMMU(unit)); + + AMDIOMMU_LOCK(unit); + if (unit->x86c.inv_seq_waiters > 0) + wakeup(&unit->x86c.inv_seq_waiters); + AMDIOMMU_UNLOCK(unit); +} + +int +amdiommu_init_cmd(struct amdiommu_unit *unit) +{ + uint64_t qi_sz, rv; + + unit->x86c.qi_buf_maxsz = ilog2(AMDIOMMU_CMDBUF_MAX / PAGE_SIZE); + unit->x86c.qi_cmd_sz = AMDIOMMU_CMD_SZ; + iommu_qi_common_init(AMD2IOMMU(unit), amdiommu_qi_task); + get_x86_iommu()->qi_ensure = amdiommu_cmd_ensure; + get_x86_iommu()->qi_emit_wait_descr = amdiommu_cmd_emit_wait_descr; + get_x86_iommu()->qi_advance_tail = amdiommu_cmd_advance_tail; + get_x86_iommu()->qi_invalidate_emit = amdiommu_qi_invalidate_emit; + + rv = pmap_kextract((uintptr_t)unit->x86c.inv_queue); + + /* + * See the description of the ComLen encoding for Command + * buffer Base Address Register. + */ + qi_sz = ilog2(unit->x86c.inv_queue_size / PAGE_SIZE) + 8; + rv |= qi_sz << AMDIOMMU_CMDBUF_BASE_SZSHIFT; + + AMDIOMMU_LOCK(unit); + amdiommu_write8(unit, AMDIOMMU_CMDBUF_BASE, rv); + amdiommu_enable_cmdbuf(unit); + amdiommu_enable_qi_intr(AMD2IOMMU(unit)); + AMDIOMMU_UNLOCK(unit); + + return (0); +} + +static void +amdiommu_fini_cmd_helper(struct iommu_unit *iommu) +{ + amdiommu_disable_cmdbuf(IOMMU2AMD(iommu)); + amdiommu_disable_qi_intr(iommu); +} + +void +amdiommu_fini_cmd(struct amdiommu_unit *unit) +{ + iommu_qi_common_fini(AMD2IOMMU(unit), amdiommu_fini_cmd_helper); +} diff --git a/sys/x86/iommu/amd_ctx.c b/sys/x86/iommu/amd_ctx.c new file mode 100644 index 000000000000..b3e85350a995 --- /dev/null +++ b/sys/x86/iommu/amd_ctx.c @@ -0,0 +1,639 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2024 The FreeBSD Foundation + * + * This software was developed by Konstantin Belousov + * under sponsorship from the FreeBSD Foundation. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +static MALLOC_DEFINE(M_AMDIOMMU_CTX, "amdiommu_ctx", "AMD IOMMU Context"); +static MALLOC_DEFINE(M_AMDIOMMU_DOMAIN, "amdiommu_dom", "AMD IOMMU Domain"); + +static void amdiommu_unref_domain_locked(struct amdiommu_unit *unit, + struct amdiommu_domain *domain); + +static struct amdiommu_dte * +amdiommu_get_dtep(struct amdiommu_ctx *ctx) +{ + return (&CTX2AMD(ctx)->dev_tbl[ctx->context.rid]); +} + +void +amdiommu_domain_unload_entry(struct iommu_map_entry *entry, bool free, + bool cansleep) +{ + struct amdiommu_domain *domain; + struct amdiommu_unit *unit; + + domain = IODOM2DOM(entry->domain); + unit = DOM2AMD(domain); + + /* + * If "free" is false, then the IOTLB invalidation must be performed + * synchronously. Otherwise, the caller might free the entry before + * dmar_qi_task() is finished processing it. + */ + if (free) { + AMDIOMMU_LOCK(unit); + iommu_qi_invalidate_locked(&domain->iodom, entry, true); + AMDIOMMU_UNLOCK(unit); + } else { + iommu_qi_invalidate_sync(&domain->iodom, entry->start, + entry->end - entry->start, cansleep); + iommu_domain_free_entry(entry, false); + } +} + +static bool +amdiommu_domain_unload_emit_wait(struct amdiommu_domain *domain, + struct iommu_map_entry *entry) +{ + return (true); /* XXXKIB */ +} + +void +amdiommu_domain_unload(struct iommu_domain *iodom, + struct iommu_map_entries_tailq *entries, bool cansleep) +{ + struct amdiommu_domain *domain; + struct amdiommu_unit *unit; + struct iommu_map_entry *entry, *entry1; + int error __diagused; + + domain = IODOM2DOM(iodom); + unit = DOM2AMD(domain); + + TAILQ_FOREACH_SAFE(entry, entries, dmamap_link, entry1) { + KASSERT((entry->flags & IOMMU_MAP_ENTRY_MAP) != 0, + ("not mapped entry %p %p", domain, entry)); + error = iodom->ops->unmap(iodom, entry, + cansleep ? IOMMU_PGF_WAITOK : 0); + KASSERT(error == 0, ("unmap %p error %d", domain, error)); + } + if (TAILQ_EMPTY(entries)) + return; + + AMDIOMMU_LOCK(unit); + while ((entry = TAILQ_FIRST(entries)) != NULL) { + TAILQ_REMOVE(entries, entry, dmamap_link); + iommu_qi_invalidate_locked(&domain->iodom, entry, + amdiommu_domain_unload_emit_wait(domain, entry)); + } + AMDIOMMU_UNLOCK(unit); +} + +static void +amdiommu_domain_destroy(struct amdiommu_domain *domain) +{ + struct iommu_domain *iodom; + struct amdiommu_unit *unit; + + iodom = DOM2IODOM(domain); + + KASSERT(TAILQ_EMPTY(&domain->iodom.unload_entries), + ("unfinished unloads %p", domain)); + KASSERT(LIST_EMPTY(&iodom->contexts), + ("destroying dom %p with contexts", domain)); + KASSERT(domain->ctx_cnt == 0, + ("destroying dom %p with ctx_cnt %d", domain, domain->ctx_cnt)); + KASSERT(domain->refs == 0, + ("destroying dom %p with refs %d", domain, domain->refs)); + + if ((domain->iodom.flags & IOMMU_DOMAIN_GAS_INITED) != 0) { + AMDIOMMU_DOMAIN_LOCK(domain); + iommu_gas_fini_domain(iodom); + AMDIOMMU_DOMAIN_UNLOCK(domain); + } + if ((domain->iodom.flags & IOMMU_DOMAIN_PGTBL_INITED) != 0) { + if (domain->pgtbl_obj != NULL) + AMDIOMMU_DOMAIN_PGLOCK(domain); + amdiommu_domain_free_pgtbl(domain); + } + iommu_domain_fini(iodom); + unit = DOM2AMD(domain); + free_unr(unit->domids, domain->domain); + free(domain, M_AMDIOMMU_DOMAIN); +} + +static iommu_gaddr_t +lvl2addr(int lvl) +{ + int x; + + x = IOMMU_PAGE_SHIFT + IOMMU_NPTEPGSHIFT * lvl; + /* Level 6 has only 8 bits for page table index */ + if (x >= NBBY * sizeof(uint64_t)) + return (-1ull); + return (1ull < (1ull << x)); +} + +static void +amdiommu_domain_init_pglvl(struct amdiommu_unit *unit, + struct amdiommu_domain *domain) +{ + iommu_gaddr_t end; + int hats, i; + uint64_t efr_hats; + + end = DOM2IODOM(domain)->end; + for (i = AMDIOMMU_PGTBL_MAXLVL; i > 1; i--) { + if (lvl2addr(i) >= end && lvl2addr(i - 1) < end) + break; + } + domain->pglvl = i; + + efr_hats = unit->efr & AMDIOMMU_EFR_HATS_MASK; + switch (efr_hats) { + case AMDIOMMU_EFR_HATS_6LVL: + hats = 6; + break; + case AMDIOMMU_EFR_HATS_5LVL: + hats = 5; + break; + case AMDIOMMU_EFR_HATS_4LVL: + hats = 4; + break; + default: + printf("amdiommu%d: HATS %#jx (reserved) ignoring\n", + unit->iommu.unit, (uintmax_t)efr_hats); + return; + } + if (hats >= domain->pglvl) + return; + + printf("amdiommu%d: domain %d HATS %d pglvl %d reducing to HATS\n", + unit->iommu.unit, domain->domain, hats, domain->pglvl); + domain->pglvl = hats; + domain->iodom.end = lvl2addr(hats); +} + +static struct amdiommu_domain * +amdiommu_domain_alloc(struct amdiommu_unit *unit, bool id_mapped) +{ + struct amdiommu_domain *domain; + struct iommu_domain *iodom; + int error, id; + + id = alloc_unr(unit->domids); + if (id == -1) + return (NULL); + domain = malloc(sizeof(*domain), M_AMDIOMMU_DOMAIN, M_WAITOK | M_ZERO); + iodom = DOM2IODOM(domain); + domain->domain = id; + LIST_INIT(&iodom->contexts); + iommu_domain_init(AMD2IOMMU(unit), iodom, &amdiommu_domain_map_ops); + + domain->unit = unit; + + domain->iodom.end = id_mapped ? ptoa(Maxmem) : BUS_SPACE_MAXADDR; + amdiommu_domain_init_pglvl(unit, domain); + iommu_gas_init_domain(DOM2IODOM(domain)); + + if (id_mapped) { + domain->iodom.flags |= IOMMU_DOMAIN_IDMAP; + } else { + error = amdiommu_domain_alloc_pgtbl(domain); + if (error != 0) + goto fail; + /* Disable local apic region access */ + error = iommu_gas_reserve_region(iodom, 0xfee00000, + 0xfeefffff + 1, &iodom->msi_entry); + if (error != 0) + goto fail; + } + + return (domain); + +fail: + amdiommu_domain_destroy(domain); + return (NULL); +} + +static struct amdiommu_ctx * +amdiommu_ctx_alloc(struct amdiommu_domain *domain, uint16_t rid) +{ + struct amdiommu_ctx *ctx; + + ctx = malloc(sizeof(*ctx), M_AMDIOMMU_CTX, M_WAITOK | M_ZERO); + ctx->context.domain = DOM2IODOM(domain); + ctx->context.tag = malloc(sizeof(struct bus_dma_tag_iommu), + M_AMDIOMMU_CTX, M_WAITOK | M_ZERO); + ctx->context.rid = rid; + ctx->context.refs = 1; + return (ctx); +} + +static void +amdiommu_ctx_link(struct amdiommu_ctx *ctx) +{ + struct amdiommu_domain *domain; + + domain = CTX2DOM(ctx); + IOMMU_ASSERT_LOCKED(domain->iodom.iommu); + KASSERT(domain->refs >= domain->ctx_cnt, + ("dom %p ref underflow %d %d", domain, domain->refs, + domain->ctx_cnt)); + domain->refs++; + domain->ctx_cnt++; + LIST_INSERT_HEAD(&domain->iodom.contexts, &ctx->context, link); +} + +static void +amdiommu_ctx_unlink(struct amdiommu_ctx *ctx) +{ + struct amdiommu_domain *domain; + + domain = CTX2DOM(ctx); + IOMMU_ASSERT_LOCKED(domain->iodom.iommu); + KASSERT(domain->refs > 0, + ("domain %p ctx dtr refs %d", domain, domain->refs)); + KASSERT(domain->ctx_cnt >= domain->refs, + ("domain %p ctx dtr refs %d ctx_cnt %d", domain, + domain->refs, domain->ctx_cnt)); + domain->refs--; + domain->ctx_cnt--; + LIST_REMOVE(&ctx->context, link); +} + +struct amdiommu_ctx * +amdiommu_find_ctx_locked(struct amdiommu_unit *unit, uint16_t rid) +{ + struct amdiommu_domain *domain; + struct iommu_ctx *ctx; + + AMDIOMMU_ASSERT_LOCKED(unit); + + LIST_FOREACH(domain, &unit->domains, link) { + LIST_FOREACH(ctx, &domain->iodom.contexts, link) { + if (ctx->rid == rid) + return (IOCTX2CTX(ctx)); + } + } + return (NULL); +} + +struct amdiommu_domain * +amdiommu_find_domain(struct amdiommu_unit *unit, uint16_t rid) +{ + struct amdiommu_domain *domain; + struct iommu_ctx *ctx; + + AMDIOMMU_LOCK(unit); + LIST_FOREACH(domain, &unit->domains, link) { + LIST_FOREACH(ctx, &domain->iodom.contexts, link) { + if (ctx->rid == rid) + break; + } + } + AMDIOMMU_UNLOCK(unit); + return (domain); +} + +static void +amdiommu_free_ctx_locked(struct amdiommu_unit *unit, struct amdiommu_ctx *ctx) +{ + struct amdiommu_dte *dtep; + struct amdiommu_domain *domain; + + AMDIOMMU_ASSERT_LOCKED(unit); + KASSERT(ctx->context.refs >= 1, + ("amdiommu %p ctx %p refs %u", unit, ctx, ctx->context.refs)); + + /* + * If our reference is not last, only the dereference should + * be performed. + */ + if (ctx->context.refs > 1) { + ctx->context.refs--; + AMDIOMMU_UNLOCK(unit); + return; + } + + KASSERT((ctx->context.flags & IOMMU_CTX_DISABLED) == 0, + ("lost ref on disabled ctx %p", ctx)); + + /* + * Otherwise, the device table entry must be cleared before + * the page table is destroyed. + */ + dtep = amdiommu_get_dtep(ctx); + dtep->v = 0; + atomic_thread_fence_rel(); + memset(dtep, 0, sizeof(*dtep)); + + domain = CTX2DOM(ctx); + amdiommu_qi_invalidate_ctx_locked_nowait(ctx); + amdiommu_qi_invalidate_ir_locked_nowait(unit, ctx->context.rid); + amdiommu_qi_invalidate_all_pages_locked_nowait(domain); + amdiommu_qi_invalidate_wait_sync(AMD2IOMMU(CTX2AMD(ctx))); + + if (unit->irte_enabled) + amdiommu_ctx_fini_irte(ctx); + + amdiommu_ctx_unlink(ctx); + free(ctx->context.tag, M_AMDIOMMU_CTX); + free(ctx, M_AMDIOMMU_CTX); + amdiommu_unref_domain_locked(unit, domain); +} + +static void +amdiommu_free_ctx(struct amdiommu_ctx *ctx) +{ + struct amdiommu_unit *unit; + + unit = CTX2AMD(ctx); + AMDIOMMU_LOCK(unit); + amdiommu_free_ctx_locked(unit, ctx); +} + +static void +amdiommu_unref_domain_locked(struct amdiommu_unit *unit, + struct amdiommu_domain *domain) +{ + AMDIOMMU_ASSERT_LOCKED(unit); + KASSERT(domain->refs >= 1, + ("amdiommu%d domain %p refs %u", unit->iommu.unit, domain, + domain->refs)); + KASSERT(domain->refs > domain->ctx_cnt, + ("amdiommu%d domain %p refs %d ctx_cnt %d", unit->iommu.unit, + domain, domain->refs, domain->ctx_cnt)); + + if (domain->refs > 1) { + domain->refs--; + AMDIOMMU_UNLOCK(unit); + return; + } + + LIST_REMOVE(domain, link); + AMDIOMMU_UNLOCK(unit); + + taskqueue_drain(unit->iommu.delayed_taskqueue, + &domain->iodom.unload_task); + amdiommu_domain_destroy(domain); +} + +static void +dte_entry_init_one(struct amdiommu_dte *dtep, struct amdiommu_ctx *ctx, + vm_page_t pgtblr, uint8_t dte, uint32_t edte) +{ + struct amdiommu_domain *domain; + struct amdiommu_unit *unit; + + domain = CTX2DOM(ctx); + unit = DOM2AMD(domain); + + dtep->tv = 1; + /* dtep->had not used for now */ + dtep->ir = 1; + dtep->iw = 1; + dtep->domainid = domain->domain; + dtep->pioctl = AMDIOMMU_DTE_PIOCTL_DIS; + + /* fill device interrupt passing hints from IVHD. */ + dtep->initpass = (dte & ACPI_IVHD_INIT_PASS) != 0; + dtep->eintpass = (dte & ACPI_IVHD_EINT_PASS) != 0; + dtep->nmipass = (dte & ACPI_IVHD_NMI_PASS) != 0; + dtep->sysmgt = (dte & ACPI_IVHD_SYSTEM_MGMT) >> 4; + dtep->lint0pass = (dte & ACPI_IVHD_LINT0_PASS) != 0; + dtep->lint1pass = (dte & ACPI_IVHD_LINT1_PASS) != 0; + + if (unit->irte_enabled) { + dtep->iv = 1; + dtep->i = 0; + dtep->inttablen = ilog2(unit->irte_nentries); + dtep->intrroot = pmap_kextract(unit->irte_x2apic ? + (vm_offset_t)ctx->irtx2 : + (vm_offset_t)ctx->irtb) >> 6; + + dtep->intctl = AMDIOMMU_DTE_INTCTL_MAP; + } + + if ((DOM2IODOM(domain)->flags & IOMMU_DOMAIN_IDMAP) != 0) { + dtep->pgmode = AMDIOMMU_DTE_PGMODE_1T1; + } else { + MPASS(domain->pglvl > 0 && domain->pglvl <= + AMDIOMMU_PGTBL_MAXLVL); + dtep->pgmode = domain->pglvl; + dtep->ptroot = VM_PAGE_TO_PHYS(pgtblr) >> 12; + } + + atomic_thread_fence_rel(); + dtep->v = 1; +} + +static void +dte_entry_init(struct amdiommu_ctx *ctx, bool move, uint8_t dte, uint32_t edte) +{ + struct amdiommu_dte *dtep; + struct amdiommu_unit *unit; + struct amdiommu_domain *domain; + int i; + + domain = CTX2DOM(ctx); + unit = DOM2AMD(domain); + + dtep = amdiommu_get_dtep(ctx); + KASSERT(dtep->v == 0, + ("amdiommu%d initializing valid dte @%p %#jx", + CTX2AMD(ctx)->iommu.unit, dtep, (uintmax_t)(*(uint64_t *)dtep))); + + if (iommu_is_buswide_ctx(AMD2IOMMU(unit), + PCI_RID2BUS(ctx->context.rid))) { + MPASS(!move); + for (i = 0; i <= PCI_BUSMAX; i++) { + dte_entry_init_one(&dtep[i], ctx, domain->pgtblr, + dte, edte); + } + } else { + dte_entry_init_one(dtep, ctx, domain->pgtblr, dte, edte); + } +} + +struct amdiommu_ctx * +amdiommu_get_ctx_for_dev(struct amdiommu_unit *unit, device_t dev, uint16_t rid, + int dev_domain, bool id_mapped, bool rmrr_init, uint8_t dte, uint32_t edte) +{ + struct amdiommu_domain *domain, *domain1; + struct amdiommu_ctx *ctx, *ctx1; + int bus, slot, func; + + if (dev != NULL) { + bus = pci_get_bus(dev); + slot = pci_get_slot(dev); + func = pci_get_function(dev); + } else { + bus = PCI_RID2BUS(rid); + slot = PCI_RID2SLOT(rid); + func = PCI_RID2FUNC(rid); + } + AMDIOMMU_LOCK(unit); + KASSERT(!iommu_is_buswide_ctx(AMD2IOMMU(unit), bus) || + (slot == 0 && func == 0), + ("iommu%d pci%d:%d:%d get_ctx for buswide", AMD2IOMMU(unit)->unit, + bus, slot, func)); + ctx = amdiommu_find_ctx_locked(unit, rid); + if (ctx == NULL) { + /* + * Perform the allocations which require sleep or have + * higher chance to succeed if the sleep is allowed. + */ + AMDIOMMU_UNLOCK(unit); + domain1 = amdiommu_domain_alloc(unit, id_mapped); + if (domain1 == NULL) + return (NULL); + if (!id_mapped) { + /* + * XXXKIB IVMD seems to be less significant + * and less used on AMD than RMRR on Intel. + * Not implemented for now. + */ + } + ctx1 = amdiommu_ctx_alloc(domain1, rid); + amdiommu_ctx_init_irte(ctx1); + AMDIOMMU_LOCK(unit); + + /* + * Recheck the contexts, other thread might have + * already allocated needed one. + */ + ctx = amdiommu_find_ctx_locked(unit, rid); + if (ctx == NULL) { + domain = domain1; + ctx = ctx1; + amdiommu_ctx_link(ctx); + ctx->context.tag->owner = dev; + iommu_device_tag_init(CTX2IOCTX(ctx), dev); + + LIST_INSERT_HEAD(&unit->domains, domain, link); + dte_entry_init(ctx, false, dte, edte); + amdiommu_qi_invalidate_ctx_locked(ctx); + if (dev != NULL) { + device_printf(dev, + "amdiommu%d pci%d:%d:%d:%d rid %x domain %d " *** 2653 LINES SKIPPED *** From nobody Sat Nov 9 20:19:16 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Xm6bT2Xc8z5ccqV; Sat, 09 Nov 2024 20:19: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xm6bT14R6z4fDb; Sat, 9 Nov 2024 20:19:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731183557; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=anIVAgU6NpIrHor5cyZcDV7IN2feHJsfix6CoIBH4e8=; b=qE5Pd9r1C1y7pOLSOc/DePTv5Y3XktI/je82hbFfsipBvFRC6GUGZ2rPL7vskK6zKU0Q/B +mck4hKSF15WG+egnNBJIspKtNp1ooSNmrwL3FuOhUIQ0zRtZEJFnL22xs4TbSHyfE4aZ2 Qk5/+h06LY2YwL0YZPAazElnoJELRGkr0aOORB6wbWjZhCcNscd0LO1w1RIBhmbhpHBFA+ 3FUuSERdqlyLiGPWhpMuxAfJ+LF6UI0HMw/Nlw6/49C6rJKmp75PAZK58oeBWXP9tLAp+4 NgfqO4KdmuUAbsBQk8NO/Omh9C+A3QjxrcwIWksEUy993lisALhaw/aCBo4Dzg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731183557; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=anIVAgU6NpIrHor5cyZcDV7IN2feHJsfix6CoIBH4e8=; b=lV6vzq8F5pHWHjjF8Ido/wGSNrcyy1br9ed0z9fGywy2l3LEL7KHTCuHbF9JcEOgQ/Qxfi Cfq/neDUCrOEDDOfD+rQc7zoP4kuLlMIs0wdw2yW2S45WTLlpejaqd3ntlBlimumdtHYyH vzD1K2pSJRz7UXSfv8wilU+er98//Cl4Taq8kseoi6HPcnGSfA8SmaGr4Z9UIsHRQXd0OF YzscCHTCrVSnfG8cFAsslqES3PhBH3fYjEUq11keS4PwSk4bF2ZN1LU+tkbsn6t5DqetfA k+iWFLoGRhrzX0d3c2R4kJe7ERH6gqBP5G6HSQRkl6JybYp20BZY2xSs8TJ8fA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731183557; a=rsa-sha256; cv=none; b=r+LG8B4o79kHxqSc96ELpZe0iOwvLZfLbfS360G8CPqH+bu+huF1ul4FONyFAh5b7we3Q+ ZSVdkYSOKEbM4el503f3c+sK4I0y46a09BVycqJWbMKUtHqfmtTpsMx61h3BDmufWecSyQ O8srluCyVjpfm1UPEBGBxPvzZls/1ZFuNQXiiQCmMs5CyQd4jUkDKhUFYdrt4H4wbr3YnR V4D+ZUKyNuyEbgWtzAmvGvzkYRt33I9zSalD3H2S7hCAMGzCnyxie6v3fDpr9WpNjfn9dl GvSOC/A95hYLVk9u9q8WK2AcxcojXZj4eXqXMHDwlehRZ+qqXoV5jXVVhVxheg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Xm6bS6hcyz1RBX; Sat, 9 Nov 2024 20:19:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A9KJG3j033564; Sat, 9 Nov 2024 20:19:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A9KJGZB033561; Sat, 9 Nov 2024 20:19:16 GMT (envelope-from git) Date: Sat, 9 Nov 2024 20:19:16 GMT Message-Id: <202411092019.4A9KJGZB033561@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 83217f087be7 - stable/14 - amdiommu: changes for stable/14 merge List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 83217f087be7de6e250039ca757e5d37facff72a Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=83217f087be7de6e250039ca757e5d37facff72a commit 83217f087be7de6e250039ca757e5d37facff72a Author: Konstantin Belousov AuthorDate: 2024-11-09 19:29:26 +0000 Commit: Konstantin Belousov CommitDate: 2024-11-09 19:31:25 +0000 amdiommu: changes for stable/14 merge to accomodate lack of ilog2() on stable/14. Done as separate commit to ease future cherry-picks. Sponsored by: Advanced Micro Devices (AMD) Sponsored by: The FreeBSD Foundation --- sys/x86/iommu/amd_cmd.c | 4 ++-- sys/x86/iommu/amd_ctx.c | 2 +- sys/x86/iommu/amd_drv.c | 2 +- sys/x86/iommu/amd_event.c | 2 +- sys/x86/iommu/amd_intrmap.c | 2 +- sys/x86/iommu/x86_iommu.h | 10 ++++++++++ 6 files changed, 16 insertions(+), 6 deletions(-) diff --git a/sys/x86/iommu/amd_cmd.c b/sys/x86/iommu/amd_cmd.c index bbc2a8e0ad9f..384d92066e36 100644 --- a/sys/x86/iommu/amd_cmd.c +++ b/sys/x86/iommu/amd_cmd.c @@ -320,7 +320,7 @@ amdiommu_init_cmd(struct amdiommu_unit *unit) { uint64_t qi_sz, rv; - unit->x86c.qi_buf_maxsz = ilog2(AMDIOMMU_CMDBUF_MAX / PAGE_SIZE); + unit->x86c.qi_buf_maxsz = ilog2_local(AMDIOMMU_CMDBUF_MAX / PAGE_SIZE); unit->x86c.qi_cmd_sz = AMDIOMMU_CMD_SZ; iommu_qi_common_init(AMD2IOMMU(unit), amdiommu_qi_task); get_x86_iommu()->qi_ensure = amdiommu_cmd_ensure; @@ -334,7 +334,7 @@ amdiommu_init_cmd(struct amdiommu_unit *unit) * See the description of the ComLen encoding for Command * buffer Base Address Register. */ - qi_sz = ilog2(unit->x86c.inv_queue_size / PAGE_SIZE) + 8; + qi_sz = ilog2_local(unit->x86c.inv_queue_size / PAGE_SIZE) + 8; rv |= qi_sz << AMDIOMMU_CMDBUF_BASE_SZSHIFT; AMDIOMMU_LOCK(unit); diff --git a/sys/x86/iommu/amd_ctx.c b/sys/x86/iommu/amd_ctx.c index b3e85350a995..81e284373fc8 100644 --- a/sys/x86/iommu/amd_ctx.c +++ b/sys/x86/iommu/amd_ctx.c @@ -462,7 +462,7 @@ dte_entry_init_one(struct amdiommu_dte *dtep, struct amdiommu_ctx *ctx, if (unit->irte_enabled) { dtep->iv = 1; dtep->i = 0; - dtep->inttablen = ilog2(unit->irte_nentries); + dtep->inttablen = ilog2_local(unit->irte_nentries); dtep->intrroot = pmap_kextract(unit->irte_x2apic ? (vm_offset_t)ctx->irtx2 : (vm_offset_t)ctx->irtb) >> 6; diff --git a/sys/x86/iommu/amd_drv.c b/sys/x86/iommu/amd_drv.c index 395cefc65caa..5db7a5225538 100644 --- a/sys/x86/iommu/amd_drv.c +++ b/sys/x86/iommu/amd_drv.c @@ -236,7 +236,7 @@ amdiommu_create_dev_tbl(struct amdiommu_unit *sc) sc->devtbl_obj->domain.dr_policy = DOMAINSET_PREF(dom); sc->hw_ctrl &= ~AMDIOMMU_CTRL_DEVTABSEG_MASK; - sc->hw_ctrl |= (uint64_t)segnum_log << ilog2(AMDIOMMU_CTRL_DEVTABSEG_2); + sc->hw_ctrl |= (uint64_t)segnum_log << 34; /* ilog2(AMDIOMMU_CTRL_DEVTABSEG_2) */ sc->hw_ctrl |= AMDIOMMU_CTRL_COHERENT; amdiommu_write8(sc, AMDIOMMU_CTRL, sc->hw_ctrl); diff --git a/sys/x86/iommu/amd_event.c b/sys/x86/iommu/amd_event.c index 4a52e42260c2..d4be79474c6a 100644 --- a/sys/x86/iommu/amd_event.c +++ b/sys/x86/iommu/amd_event.c @@ -285,7 +285,7 @@ amdiommu_init_event(struct amdiommu_unit *unit) "amdiommu%d event taskq", unit->iommu.unit); base_reg = pmap_kextract((vm_offset_t)unit->event_log) | - (((uint64_t)0x8 + ilog2(unit->event_log_size / + (((uint64_t)0x8 + ilog2_local(unit->event_log_size / AMDIOMMU_EVNTLOG_MIN)) << AMDIOMMU_EVNTLOG_BASE_SZSHIFT); AMDIOMMU_LOCK(unit); /* diff --git a/sys/x86/iommu/amd_intrmap.c b/sys/x86/iommu/amd_intrmap.c index a4c1a7836268..c5c1706f1f3e 100644 --- a/sys/x86/iommu/amd_intrmap.c +++ b/sys/x86/iommu/amd_intrmap.c @@ -374,7 +374,7 @@ amdiommu_init_irt(struct amdiommu_unit *unit) nentries = 32; TUNABLE_INT_FETCH("hw.iommu.amd.ir_num", &nentries); - nentries = roundup_pow_of_two(nentries); + nentries = roundup_pow_of_two_local(nentries); if (nentries < 1) nentries = 1; if (nentries > 2048) diff --git a/sys/x86/iommu/x86_iommu.h b/sys/x86/iommu/x86_iommu.h index eb4a9907a5d6..835a4623a95e 100644 --- a/sys/x86/iommu/x86_iommu.h +++ b/sys/x86/iommu/x86_iommu.h @@ -200,4 +200,14 @@ void iommu_db_print_ctx(struct iommu_ctx *ctx); void iommu_db_domain_print_contexts(struct iommu_domain *iodom); void iommu_db_domain_print_mappings(struct iommu_domain *iodom); +static __inline __pure2 int +ilog2_local(int n) +{ + KASSERT(n != 0, ("ilog argument must be nonzero")); + return (8 * sizeof(n) - 1 - __builtin_clz((u_int)n)); +} + +#define order_base_2_local(n) ilog2_local(2*(n)-1) +#define roundup_pow_of_two_local(n) ((__typeof(n))1 << order_base_2_local(n)) + #endif From nobody Sat Nov 9 20:19:17 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Xm6bV3Dbrz5ccWp; Sat, 09 Nov 2024 20:19: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xm6bV14rhz4fH4; Sat, 9 Nov 2024 20:19:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731183558; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XgwCYZgy99cVa1nFkbO9u8avyvA2basJ29h/8k25d3A=; b=WZcYIYJBKG9aNmhIsOXS18/xrYtrvjzOO4vNNLSDsEQ6N2zYJYbhiI+eaSHQBuFZzTSC7T wn7v6wNrEXQxzQTSzU4CzEHZYj5woW5uEVMJpAv1Nyf4Lg6Vm0gmCOhpQhEpEIw9EkJI2Z JYwUZRx/b/6ZcpiKhGoWRuXHG64Xdi7hPKtX+7tUahs3g+SUIH+OEOy59n4jKnciJeHRjL DFxk9WIHYnv5qb+ynI/EAHtmBjIdUZutiFRw180V/akalozAE0wPgjLZxPDsh7mZ9Iyi74 xz80ZixiGkpQTnx4AiyfTB/2v5DjjnOpTLJPCShmFE1YK4tEFQG6dx9McdY4ug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731183558; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XgwCYZgy99cVa1nFkbO9u8avyvA2basJ29h/8k25d3A=; b=kVe/mlA4xDH12IPN34/LPuriguFrvVCIzhDjvLi4lolHq9szJ9U8sCK/Pkcglnn7PTtyk0 kHy6XqaLDfEds+SZHb7tJHhRJgVG7UCYaCmwlkbF9tagvYhZwtJanXZ/qu9x/ru8R05Mre PElAwlY0WoYRar9ud7o/F0vip2jeheAoCWf4QBrrYoD1B6zUQQZw9FRRGkrILNeG2UD+EM WPVm9piPTwpO7SFigH0KEZ2bml/LwUOyR+QwscMGNKHA1zyb3NKPHaXPE/83sJlyM8zaiC fEqbPy6SkCR6mNbMyt0PLzqnVQ6HYhxRg3lUjOEC21dbIQg8XihYso9UI7Qd+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731183558; a=rsa-sha256; cv=none; b=pTDu+yZGLKBnfyPlZPlCPXkBDOoXQ3Pl0aNv4M1L8ZIlqu/IDZfcNI9XKdG0/TpFHB3dzS XEYClFowSw/fnNMP9mAhNf3VmdkS2wqbN1VrOcnoDh3pkloyZISu5zmj/c0MiTPJqNM9l7 xo4hoxS67YryB6uX9OULEOAsCPqNMil4Ggvs8hdJzre/Ni8DkUlrtCOd1OszuhtJ6e6OYu 5VI1YYyTDV0v1bYnKjpIrxv7Yz7SXJtu5Px95dCdqHKWN3nSewUC5G/4RyjzGCIWUoyXPL vDp2Y61EH/Ylp5OlrZS4rgmrL4aMCFAQIr/4QQjqvJ2AvBVTT7z5zJ+OD15cdQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Xm6bV0Thnz1RBY; Sat, 9 Nov 2024 20:19:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A9KJHm8033619; Sat, 9 Nov 2024 20:19:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A9KJHE7033616; Sat, 9 Nov 2024 20:19:17 GMT (envelope-from git) Date: Sat, 9 Nov 2024 20:19:17 GMT Message-Id: <202411092019.4A9KJHE7033616@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: f5f29d3c1303 - stable/14 - vmm: Rename the amdiommu driver to amdviiommu List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f5f29d3c1303a5558a2bc0c135d4877dba8f7dbf Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=f5f29d3c1303a5558a2bc0c135d4877dba8f7dbf commit f5f29d3c1303a5558a2bc0c135d4877dba8f7dbf Author: Mark Johnston AuthorDate: 2024-11-04 14:44:19 +0000 Commit: Konstantin Belousov CommitDate: 2024-11-09 19:31:28 +0000 vmm: Rename the amdiommu driver to amdviiommu (cherry picked from commit f95acbd89d594b5932197679d94d2ba23c1d0331) --- sys/amd64/vmm/amd/{amdiommu.c => amdviiommu.c} | 38 +++++++++++++------------- sys/modules/vmm/Makefile | 2 +- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/sys/amd64/vmm/amd/amdiommu.c b/sys/amd64/vmm/amd/amdviiommu.c similarity index 85% rename from sys/amd64/vmm/amd/amdiommu.c rename to sys/amd64/vmm/amd/amdviiommu.c index 559a7bc7d953..e9b2dfc3dcbd 100644 --- a/sys/amd64/vmm/amd/amdiommu.c +++ b/sys/amd64/vmm/amd/amdviiommu.c @@ -41,36 +41,36 @@ #include "amdvi_priv.h" #include "ivhd_if.h" -struct amdiommu_softc { +struct amdviiommu_softc { struct resource *event_res; /* Event interrupt resource. */ void *event_tag; /* Event interrupt tag. */ int event_rid; }; -static int amdiommu_probe(device_t); -static int amdiommu_attach(device_t); -static int amdiommu_detach(device_t); +static int amdviiommu_probe(device_t); +static int amdviiommu_attach(device_t); +static int amdviiommu_detach(device_t); static int ivhd_setup_intr(device_t, driver_intr_t, void *, const char *); static int ivhd_teardown_intr(device_t); -static device_method_t amdiommu_methods[] = { +static device_method_t amdviiommu_methods[] = { /* device interface */ - DEVMETHOD(device_probe, amdiommu_probe), - DEVMETHOD(device_attach, amdiommu_attach), - DEVMETHOD(device_detach, amdiommu_detach), + DEVMETHOD(device_probe, amdviiommu_probe), + DEVMETHOD(device_attach, amdviiommu_attach), + DEVMETHOD(device_detach, amdviiommu_detach), DEVMETHOD(ivhd_setup_intr, ivhd_setup_intr), DEVMETHOD(ivhd_teardown_intr, ivhd_teardown_intr), DEVMETHOD_END }; -static driver_t amdiommu_driver = { - "amdiommu", - amdiommu_methods, - sizeof(struct amdiommu_softc), +static driver_t amdviiommu_driver = { + "amdviiommu", + amdviiommu_methods, + sizeof(struct amdviiommu_softc), }; static int -amdiommu_probe(device_t dev) +amdviiommu_probe(device_t dev) { int error; int capoff; @@ -100,7 +100,7 @@ amdiommu_probe(device_t dev) } static int -amdiommu_attach(device_t dev) +amdviiommu_attach(device_t dev) { device_set_desc(dev, "AMD-Vi/IOMMU PCI function"); @@ -108,7 +108,7 @@ amdiommu_attach(device_t dev) } static int -amdiommu_detach(device_t dev) +amdviiommu_detach(device_t dev) { return (0); @@ -118,7 +118,7 @@ static int ivhd_setup_intr(device_t dev, driver_intr_t handler, void *arg, const char *desc) { - struct amdiommu_softc *sc; + struct amdviiommu_softc *sc; int error, msicnt; sc = device_get_softc(dev); @@ -159,7 +159,7 @@ fail: static int ivhd_teardown_intr(device_t dev) { - struct amdiommu_softc *sc; + struct amdviiommu_softc *sc; sc = device_get_softc(dev); @@ -177,5 +177,5 @@ ivhd_teardown_intr(device_t dev) } /* This driver has to be loaded before ivhd */ -DRIVER_MODULE(amdiommu, pci, amdiommu_driver, 0, 0); -MODULE_DEPEND(amdiommu, pci, 1, 1, 1); +DRIVER_MODULE(amdviiommu, pci, amdviiommu_driver, 0, 0); +MODULE_DEPEND(amdviiommu, pci, 1, 1, 1); diff --git a/sys/modules/vmm/Makefile b/sys/modules/vmm/Makefile index 6bb78d055580..48a7dd851032 100644 --- a/sys/modules/vmm/Makefile +++ b/sys/modules/vmm/Makefile @@ -50,7 +50,7 @@ SRCS+= ept.c \ # amd-specific files .PATH: ${SRCTOP}/sys/amd64/vmm/amd SRCS+= vmcb.c \ - amdiommu.c \ + amdviiommu.c \ ivhd_if.c \ ivhd_if.h \ svm.c \ From nobody Sat Nov 9 20:19:19 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Xm6bW31D2z5ccqY; Sat, 09 Nov 2024 20:19: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xm6bW1xBQz4fHG; Sat, 9 Nov 2024 20:19:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731183559; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mQoD4tysn682eFbnR5kNQECEGKDZxmGKvV4BIsxcUiM=; b=WGD3LqTA89kDOABjqw4FJSHq7+O8ltC9qSOeLMERGh5ZTyycNMJhEYgv8qhXklDSfmMS0W PL2/BvZaKuuYpEBTwwvJgZZUKn8XUkIdTpVcz6DqQ6wwmizqDr+Iipg95E/4BkFVXplXLb yYkaWlRC16HanSEXGIiDLkovmJTT3GVKUasE91ZFY4mTocc1FTzmT0eobpVqyrE/HC5ekx yWZ3y9kVFZLr0qZYq1K7fMArWdcP76tLJsl+gZsY0USvR9qbeo9CYDyZj5IquhPXjAufjl JA3PdSr1L3vs1eh7qeVK+Mk2+FYLa5PHJhtDquxC4C1x7D4mCssN9ax2RQ9nng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731183559; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mQoD4tysn682eFbnR5kNQECEGKDZxmGKvV4BIsxcUiM=; b=qqZ7AU3zUGoKJ5Yux/DYys9028dM4RmR16VogVLpkriJybvmKBxmr3I9nWXeA0jSTF7GPC F5xZuvQFbEohus7dDE8wcduAm5EJEoKdHqKy7QO+LFX6C5cU5fWLjmbnEOKHXSk2L5aKCx R0JfJZ+ZTxZHrwlNBBzpklhK0KoDfegRUYhXKs6w92XXB93Qc8qWePuUB9PMKugmlMokYZ 4aeU8NY+ea70N+4+Cliup+Q78E03V1Ep0irWPUYsKYQ4ts9tS0DJpykoIl+OEPM0ueUkbR kKCYW8hPhCvi8/pKrE9CCYtcERWWRlN4CO8aKft7SrJvZl1MSZsGbNkUsd2rnA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731183559; a=rsa-sha256; cv=none; b=SW8QBBgVae9n0uOtoW6WLKPT6OtrujtWcSpubOsTGqeU5lzhEw7v23Jm0Geh1J30Q34b2r heihWB8lursOoFRQrmg30+F/vsFmSG6Ytw6H70sHGLE4y23SyAi/OKnM3QnViLcln5Jiir EpovATJe68oeIyHL28x45Y+B9BMqOK4KzKl1TTGS8PI9K8k2qU29msl/1gkaT2Le471+BJ Ot9oOeAH/8F5804wnBWCIjieDPAUrfgnUlP9XOjqcg6mHwPQ4ArRuGdVFn2fQxnwixZRa4 xm15e/9rIVuA8zs1D6tFRjdUgVzKtAoZiRIObdHDqOCEvdi4OQ6+S2VbKhM/BA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Xm6bW1WQFz1RY8; Sat, 9 Nov 2024 20:19:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A9KJJIZ033681; Sat, 9 Nov 2024 20:19:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A9KJJqv033678; Sat, 9 Nov 2024 20:19:19 GMT (envelope-from git) Date: Sat, 9 Nov 2024 20:19:19 GMT Message-Id: <202411092019.4A9KJJqv033678@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: aebd6c32dfae - stable/14 - amdiommu: print more domain information from ddb show List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: aebd6c32dfae9716210aa3195900fbacb63ff2db Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=aebd6c32dfae9716210aa3195900fbacb63ff2db commit aebd6c32dfae9716210aa3195900fbacb63ff2db Author: Konstantin Belousov AuthorDate: 2024-11-03 15:14:54 +0000 Commit: Konstantin Belousov CommitDate: 2024-11-09 19:31:28 +0000 amdiommu: print more domain information from ddb show (cherry picked from commit 43bfb4e71483ecb5666e5142b5108999ca888b22) --- sys/x86/iommu/amd_drv.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/sys/x86/iommu/amd_drv.c b/sys/x86/iommu/amd_drv.c index 5db7a5225538..513463f21292 100644 --- a/sys/x86/iommu/amd_drv.c +++ b/sys/x86/iommu/amd_drv.c @@ -1100,14 +1100,12 @@ amdiommu_print_domain(struct amdiommu_domain *domain, bool show_mappings) iodom = DOM2IODOM(domain); -#if 0 db_printf( - " @%p dom %d mgaw %d agaw %d pglvl %d end %jx refs %d\n" + " @%p dom %d pglvl %d end %jx refs %d\n" " ctx_cnt %d flags %x pgobj %p map_ents %u\n", - domain, domain->domain, domain->mgaw, domain->agaw, domain->pglvl, + domain, domain->domain, domain->pglvl, (uintmax_t)domain->iodom.end, domain->refs, domain->ctx_cnt, domain->iodom.flags, domain->pgtbl_obj, domain->iodom.entries_cnt); -#endif iommu_db_domain_print_contexts(iodom); From nobody Sat Nov 9 20:19:20 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Xm6bX5b9mz5ccl9; Sat, 09 Nov 2024 20:19: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xm6bX4VVTz4fMW; Sat, 9 Nov 2024 20:19:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731183560; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ptPGWG/BFNoDXzCTtDvUhE2rUQpXT9yK+S3RchObdtE=; b=EHLWs4eT/094QXxGQ5Fx3zq0kb0EFKYQ+mZASvCcYjL98Q2xG5seB4MLKGbYb8KP/06t3H OsCpNT1owjzA7UXsgmhR6X+BFs8Rv4VjbO7LLiFjp0YxPaaXcHWN3eimSPiwY0lADJvE+7 p2DlkM6bwaqLZ0mNrwOZiLqQoAlqBhKmvAP3zw4Fr3r9d60xZIkbg7VC6HGDisGYHTdOvC Dg8JiO6G/iY5AV6DDKq+c37QQKeJ99WU/FkR9f+CYxcHXjuZ4JOH18N9D6x4irOb+bMITb 96rovODc8e0C6LY/8eOsrJtGm7GQcRxG+V1BPV+RMxa3W9zYGfz2ya1lM4nU8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731183560; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ptPGWG/BFNoDXzCTtDvUhE2rUQpXT9yK+S3RchObdtE=; b=pWy724KwytKQIURlNFLDqB8jEu58vuod/rph2SQsFllVXq+6ATxH8FcwLuMRLLmFxS+xyg zjqjlSyDg6OxEYPixN4XB1/nggyjbtSNnDfLEI+Ama8QTCVWLSCmG6JixYt6Jjphawlay5 d56NuQm1mJHnUi84Lx9PiySuVb6Rf3W10pdCTx+wbjklri0puwh8jOItq9fIOIcupJ4pYv dT/eHo98AIIz4sBwj/jw1uGZFcg6e13qMtAhP48NX+rmEMjnnBWTAdFRCdGizalIMmXRbu 90IJP7CYUCoWGtURjV8zq9qJIJDHNTs7MWlGXDITheQsHv2DXay1ywg4tpmASw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731183560; a=rsa-sha256; cv=none; b=Y3a6rjAZiibI/SZcpTMcypjFDAIY9d163kxztiNMkA4PbrmSNaGs+/bPunjWLHiLK57S1N lXMfzGo20jQ5es2h3sjxSMaHTlRlBs82t3lsaRcd2eEt26QHlqUvQYpkBNl8cByG7Neze5 EFs1+M2MGc55fGVQ2o0pj7YJ+lWMVweC1t8naf37QgWQk5yTNIGQID0KQMdPLQgLZjEOWi lfCUdevL2QJzYOZ8yCktQrlRB8QchrLSulKesm5CSNN+b6tCjQTT5MMDzVCMVmRhy0Rajs Er3lv5QjOzZWr43CWyTfMrBv0ycwmR4LapxismBmYdNdfOaAjClGV0LlrSFtgg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Xm6bX2ZZ2z1RBZ; Sat, 9 Nov 2024 20:19:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A9KJKdp033720; Sat, 9 Nov 2024 20:19:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A9KJKvt033716; Sat, 9 Nov 2024 20:19:20 GMT (envelope-from git) Date: Sat, 9 Nov 2024 20:19:20 GMT Message-Id: <202411092019.4A9KJKvt033716@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: ae81fb2db3df - stable/14 - iommu: eliminate iommu_free_ctx() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: ae81fb2db3df71e96fc154c72a1327dd3675f1a6 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=ae81fb2db3df71e96fc154c72a1327dd3675f1a6 commit ae81fb2db3df71e96fc154c72a1327dd3675f1a6 Author: Konstantin Belousov AuthorDate: 2024-11-03 14:50:01 +0000 Commit: Konstantin Belousov CommitDate: 2024-11-09 19:31:28 +0000 iommu: eliminate iommu_free_ctx() iommu_free_ctx_locked() alone is enough Sponsored by: Advanced Micro Devices (AMD) Sponsored by: The FreeBSD Foundation MFC after: 1 week (cherry picked from commit d97838b7c2a605932b6edf36f87abe7ccce74314) --- sys/arm64/iommu/iommu.c | 19 +++---------------- sys/dev/iommu/busdma_iommu.c | 10 ++++++++-- sys/x86/iommu/amd_ctx.c | 19 ------------------- sys/x86/iommu/amd_drv.c | 1 - sys/x86/iommu/amd_iommu.h | 1 - sys/x86/iommu/intel_ctx.c | 19 ------------------- sys/x86/iommu/intel_dmar.h | 1 - sys/x86/iommu/intel_drv.c | 1 - sys/x86/iommu/iommu_utils.c | 6 ------ sys/x86/iommu/x86_iommu.h | 1 - 10 files changed, 11 insertions(+), 67 deletions(-) diff --git a/sys/arm64/iommu/iommu.c b/sys/arm64/iommu/iommu.c index eb682a4a623f..afb5c7c5e152 100644 --- a/sys/arm64/iommu/iommu.c +++ b/sys/arm64/iommu/iommu.c @@ -375,32 +375,19 @@ void iommu_free_ctx_locked(struct iommu_unit *iommu, struct iommu_ctx *ioctx) { struct bus_dma_tag_iommu *tag; + int error; IOMMU_ASSERT_LOCKED(iommu); tag = ioctx->tag; IOMMU_CTX_FREE(iommu->dev, ioctx); + IOMMU_UNLOCK(iommu); free(tag, M_IOMMU); -} - -void -iommu_free_ctx(struct iommu_ctx *ioctx) -{ - struct iommu_unit *iommu; - struct iommu_domain *iodom; - int error; - - iodom = ioctx->domain; - iommu = iodom->iommu; - - IOMMU_LOCK(iommu); - iommu_free_ctx_locked(iommu, ioctx); - IOMMU_UNLOCK(iommu); /* Since we have a domain per each ctx, remove the domain too. */ - error = iommu_domain_free(iodom); + error = iommu_domain_free(ioctx->domain); if (error) device_printf(iommu->dev, "Could not free a domain\n"); } diff --git a/sys/dev/iommu/busdma_iommu.c b/sys/dev/iommu/busdma_iommu.c index dbd4ee0ef0f1..8c97965bcdf1 100644 --- a/sys/dev/iommu/busdma_iommu.c +++ b/sys/dev/iommu/busdma_iommu.c @@ -400,6 +400,8 @@ iommu_bus_dma_tag_destroy(bus_dma_tag_t dmat1) { struct bus_dma_tag_iommu *dmat, *parent; struct bus_dma_tag_iommu *dmat_copy __unused; + struct iommu_unit *iommu; + struct iommu_ctx *ctx; int error; error = 0; @@ -414,8 +416,12 @@ iommu_bus_dma_tag_destroy(bus_dma_tag_t dmat1) parent = (struct bus_dma_tag_iommu *)dmat->common.parent; if (atomic_fetchadd_int(&dmat->common.ref_count, -1) == 1) { - if (dmat == dmat->ctx->tag) - iommu_free_ctx(dmat->ctx); + ctx = dmat->ctx; + if (dmat == ctx->tag) { + iommu = ctx->domain->iommu; + IOMMU_LOCK(iommu); + iommu_free_ctx_locked(iommu, dmat->ctx); + } free(dmat->segments, M_IOMMU_DMAMAP); free(dmat, M_DEVBUF); dmat = parent; diff --git a/sys/x86/iommu/amd_ctx.c b/sys/x86/iommu/amd_ctx.c index 81e284373fc8..7f0e67f37eef 100644 --- a/sys/x86/iommu/amd_ctx.c +++ b/sys/x86/iommu/amd_ctx.c @@ -398,16 +398,6 @@ amdiommu_free_ctx_locked(struct amdiommu_unit *unit, struct amdiommu_ctx *ctx) amdiommu_unref_domain_locked(unit, domain); } -static void -amdiommu_free_ctx(struct amdiommu_ctx *ctx) -{ - struct amdiommu_unit *unit; - - unit = CTX2AMD(ctx); - AMDIOMMU_LOCK(unit); - amdiommu_free_ctx_locked(unit, ctx); -} - static void amdiommu_unref_domain_locked(struct amdiommu_unit *unit, struct amdiommu_domain *domain) @@ -628,12 +618,3 @@ amdiommu_free_ctx_locked_method(struct iommu_unit *iommu, ctx = IOCTX2CTX(context); amdiommu_free_ctx_locked(unit, ctx); } - -void -amdiommu_free_ctx_method(struct iommu_ctx *context) -{ - struct amdiommu_ctx *ctx; - - ctx = IOCTX2CTX(context); - amdiommu_free_ctx(ctx); -} diff --git a/sys/x86/iommu/amd_drv.c b/sys/x86/iommu/amd_drv.c index 513463f21292..2c544dfb60a6 100644 --- a/sys/x86/iommu/amd_drv.c +++ b/sys/x86/iommu/amd_drv.c @@ -1072,7 +1072,6 @@ static struct x86_iommu amd_x86_iommu = { .domain_unload = amdiommu_domain_unload, .get_ctx = amdiommu_get_ctx, .free_ctx_locked = amdiommu_free_ctx_locked_method, - .free_ctx = amdiommu_free_ctx_method, .alloc_msi_intr = amdiommu_alloc_msi_intr, .map_msi_intr = amdiommu_map_msi_intr, .unmap_msi_intr = amdiommu_unmap_msi_intr, diff --git a/sys/x86/iommu/amd_iommu.h b/sys/x86/iommu/amd_iommu.h index 2b0db4f8fe6d..64dd13db9745 100644 --- a/sys/x86/iommu/amd_iommu.h +++ b/sys/x86/iommu/amd_iommu.h @@ -222,7 +222,6 @@ struct amdiommu_ctx *amdiommu_find_ctx_locked(struct amdiommu_unit *unit, uint16_t rid); void amdiommu_free_ctx_locked_method(struct iommu_unit *iommu, struct iommu_ctx *context); -void amdiommu_free_ctx_method(struct iommu_ctx *context); struct amdiommu_domain *amdiommu_find_domain(struct amdiommu_unit *unit, uint16_t rid); diff --git a/sys/x86/iommu/intel_ctx.c b/sys/x86/iommu/intel_ctx.c index c7c7012e94ea..ae74d0456b25 100644 --- a/sys/x86/iommu/intel_ctx.c +++ b/sys/x86/iommu/intel_ctx.c @@ -804,16 +804,6 @@ dmar_free_ctx_locked(struct dmar_unit *dmar, struct dmar_ctx *ctx) TD_PINNED_ASSERT; } -static void -dmar_free_ctx(struct dmar_ctx *ctx) -{ - struct dmar_unit *dmar; - - dmar = CTX2DMAR(ctx); - DMAR_LOCK(dmar); - dmar_free_ctx_locked(dmar, ctx); -} - /* * Returns with the domain locked. */ @@ -942,12 +932,3 @@ dmar_free_ctx_locked_method(struct iommu_unit *iommu, ctx = IOCTX2CTX(context); dmar_free_ctx_locked(dmar, ctx); } - -void -dmar_free_ctx_method(struct iommu_ctx *context) -{ - struct dmar_ctx *ctx; - - ctx = IOCTX2CTX(context); - dmar_free_ctx(ctx); -} diff --git a/sys/x86/iommu/intel_dmar.h b/sys/x86/iommu/intel_dmar.h index 1a9b5041975c..57a66aae69b2 100644 --- a/sys/x86/iommu/intel_dmar.h +++ b/sys/x86/iommu/intel_dmar.h @@ -237,7 +237,6 @@ struct dmar_ctx *dmar_get_ctx_for_devpath(struct dmar_unit *dmar, uint16_t rid, int dmar_move_ctx_to_domain(struct dmar_domain *domain, struct dmar_ctx *ctx); void dmar_free_ctx_locked_method(struct iommu_unit *dmar, struct iommu_ctx *ctx); -void dmar_free_ctx_method(struct iommu_ctx *ctx); struct dmar_ctx *dmar_find_ctx_locked(struct dmar_unit *dmar, uint16_t rid); struct iommu_ctx *dmar_get_ctx(struct iommu_unit *iommu, device_t dev, uint16_t rid, bool id_mapped, bool rmrr_init); diff --git a/sys/x86/iommu/intel_drv.c b/sys/x86/iommu/intel_drv.c index 22d04029f9ae..b21c8460e830 100644 --- a/sys/x86/iommu/intel_drv.c +++ b/sys/x86/iommu/intel_drv.c @@ -1317,7 +1317,6 @@ static struct x86_iommu dmar_x86_iommu = { .domain_unload = dmar_domain_unload, .get_ctx = dmar_get_ctx, .free_ctx_locked = dmar_free_ctx_locked_method, - .free_ctx = dmar_free_ctx_method, .find = dmar_find_method, .alloc_msi_intr = dmar_alloc_msi_intr, .map_msi_intr = dmar_map_msi_intr, diff --git a/sys/x86/iommu/iommu_utils.c b/sys/x86/iommu/iommu_utils.c index 479e8637ee8e..2db02a98ca91 100644 --- a/sys/x86/iommu/iommu_utils.c +++ b/sys/x86/iommu/iommu_utils.c @@ -288,12 +288,6 @@ iommu_free_ctx_locked(struct iommu_unit *iommu, struct iommu_ctx *context) x86_iommu->free_ctx_locked(iommu, context); } -void -iommu_free_ctx(struct iommu_ctx *context) -{ - x86_iommu->free_ctx(context); -} - struct iommu_unit * iommu_find(device_t dev, bool verbose) { diff --git a/sys/x86/iommu/x86_iommu.h b/sys/x86/iommu/x86_iommu.h index 835a4623a95e..1c9ad6529d47 100644 --- a/sys/x86/iommu/x86_iommu.h +++ b/sys/x86/iommu/x86_iommu.h @@ -81,7 +81,6 @@ struct x86_iommu { device_t dev, uint16_t rid, bool id_mapped, bool rmrr_init); void (*free_ctx_locked)(struct iommu_unit *iommu, struct iommu_ctx *context); - void (*free_ctx)(struct iommu_ctx *context); struct iommu_unit *(*find)(device_t dev, bool verbose); int (*alloc_msi_intr)(device_t src, u_int *cookies, u_int count); int (*map_msi_intr)(device_t src, u_int cpu, u_int vector, From nobody Sat Nov 9 20:19:21 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Xm6bY5Zrlz5ccqd; Sat, 09 Nov 2024 20:19: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xm6bY4mDpz4fFJ; Sat, 9 Nov 2024 20:19:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731183561; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Xz6161b2jCdMB9icPa5c9o+iezpriAHeyTcanlDHs+4=; b=omX94g0VQhuDARbxD7Ws/Krs+Lp6lw0lWQ1o6yfZ+8m8pRuoFbHOfLq9+HMBLF458vbkhG 7sdK3n8HvMDHEMlDun9usgBTr5N7nLBszzBHR4mDJ+FfMvUTFM5sLKULzsUPgfrbDdVY7L eoeCydnvissr1RLSnK2dDOi/9Re/NzfsVVbejaHxVUhhO4DtihVuJIGbqZfM7sziOe8rxl k4v9vT7DjxcfUUhwSr04tDfVlYEgqK7dV/3M8Jqv/WSyq2dKJ9jYEk7cNcXRis0zbGzBbf 4HWQMt945sdACHfT11tHOTFXIdlHGAn+4BWQbmJIbuk0Np4qkxD2GSprg2bZYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731183561; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Xz6161b2jCdMB9icPa5c9o+iezpriAHeyTcanlDHs+4=; b=HeE0Ja6FEOjY/DCDX1j01ikfgycYjCitVXQNo+28xOzoz/y711MI51jh/Go3jPMNnkE6Bn bc/u0dkQG++BUtzhrPqRyOwpVwDO0L/rO/WKrfgUeIX/3Tbqyr4oBoERUDCJ3pnuig0+70 0O5rGN2JUTUhBanSSM78nGFewVftJIADCxSJ7q4+m69uknjJjDpS9RrFzRQ9nzmTz3a05c irMqsf46nCXGL+YsFUfDUKYIyCEivEcO+i3yHzxgDvm+R6B2vv7qKOVdDfoneOU6yXiQW+ Dbc9/a3zRr/pf4M+8AoerYCW5dyeUc3bF8HjvAlOU/o+gRuQip0qrqtmlsgWcA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731183561; a=rsa-sha256; cv=none; b=DBWLaPVwIBhqbZU+jroMEC7JaAXx9WONLB5MBDbrrNo4QGwopy3Jf/aknhG2CmleIhqbAm zT/64q0Cx0b0mZU66D1Sr3FeX2IuzjrPYNYd0y5JBJQmGomvIwH5EcllUc+fQN62ifP7ev tisfbTdY17vwEdrUr0u0GtO+XrKEIQ0pWM6icl6kdQ28z6TnSNo5xak/YBULr6Eod8TXNf OzrfPKDWBbM9C7ZXBPOH0X2ETweewICvJPExAdSiebDHBH3jnLtb6+/NRINyxer4RUZiwc +iwbibD8/tDKpyf6c1HEiQoIC/dOCQ/nGq2QO8fVmP8iBaz/dX9EY7LdI9S77w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Xm6bY34Qjz1RBb; Sat, 9 Nov 2024 20:19:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A9KJL1B033774; Sat, 9 Nov 2024 20:19:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A9KJLPS033771; Sat, 9 Nov 2024 20:19:21 GMT (envelope-from git) Date: Sat, 9 Nov 2024 20:19:21 GMT Message-Id: <202411092019.4A9KJLPS033771@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 0a500beeb03b - stable/14 - iommu: Clean up a lingering function prototype List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 0a500beeb03b7a4e39258b402eccf96cff34ead1 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=0a500beeb03b7a4e39258b402eccf96cff34ead1 commit 0a500beeb03b7a4e39258b402eccf96cff34ead1 Author: Mark Johnston AuthorDate: 2024-11-04 19:38:22 +0000 Commit: Konstantin Belousov CommitDate: 2024-11-09 19:31:28 +0000 iommu: Clean up a lingering function prototype (cherry picked from commit ff84f8b536ceaa9a16b4dca94a1856300be0216b) --- sys/x86/iommu/intel_ctx.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sys/x86/iommu/intel_ctx.c b/sys/x86/iommu/intel_ctx.c index ae74d0456b25..79ab907136e3 100644 --- a/sys/x86/iommu/intel_ctx.c +++ b/sys/x86/iommu/intel_ctx.c @@ -77,7 +77,6 @@ static void dmar_unref_domain_locked(struct dmar_unit *dmar, static void dmar_domain_destroy(struct dmar_domain *domain); static void dmar_free_ctx_locked(struct dmar_unit *dmar, struct dmar_ctx *ctx); -static void dmar_free_ctx(struct dmar_ctx *ctx); static void dmar_ensure_ctx_page(struct dmar_unit *dmar, int bus) From nobody Sun Nov 10 01:42:17 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XmFmB0Wl3z5c0qg; Sun, 10 Nov 2024 01:42: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XmFm96gHBz3xHt; Sun, 10 Nov 2024 01:42:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731202937; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cGiUGs/jDVLMyf7ZqStbZ2z9fqYrsNk0hnbCzl9YfdY=; b=cJAdFV1Oc+9805Cg1/hIKS3VB9tGNj6LXvcJcNxXuA+eSvpQvoLVSVc0tfHsKF0Agzs2OQ lSWRMdeafQTMWj4xkxlztwJhOsYrTf7ViCh5NGKa7INYuIxHmSn2gYiokRYZZeTgzJxCrZ S0HkCbZyYCW7i4rT1PPQesURhW3RuL1BMmFbsobUaRWVeiunfdK7KTuKYP33xcZwzS1pWP seiOpcUCN0mFojJLBjnMlDKxegbZ6qfb/a/JSi4Hf5SSyDz3Sjqx6kSwIMh7iSP5MQM5yV drJhIRv83+Yo6kP95og+idh+6YfYmRJZnPhoq7c90J6uD/YED+7iFbuTJHk0yw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731202937; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cGiUGs/jDVLMyf7ZqStbZ2z9fqYrsNk0hnbCzl9YfdY=; b=JoulLEi3r01VD2Bqjn29t/DNiKuVDg7dIs1/JD6ReJy662ZGekGn+aJ01qMQrXQAIB5vDj vHZ/9jLJciPFc4S6QnwOXfMyIuPzYQjInfM+bf8vepN4Ud43Lh1+mZlUhxOVZqQ4JlWeF/ Fp956wXMxop1HTDygnoPVXtPlvaUxblgFdNiZSadhCXPrFjc9PtOx3P4GwdCGDpxc5NAxb WdMxsRp6o3CTg46ZCsk90ES4tsyu88Vj1Mngb9srTcFP/qEvecmdIvfgzp7r/f/7Pib/42 iNcsMdZ/+PXXn5cep8If2fBfaXmagdXVZtVLYXJpPBywCBZ03nWMg8UAcLvy2g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731202937; a=rsa-sha256; cv=none; b=WcdPlmRNAIm3uF4ZbjhRR+vWAbPu99CJsDbqx0TSO9jyFbMRsjGQ0Ks2Ur3yVvhk3ky9+Q QJYuTRskoUhE+tkqPIFWhSSEPZAVZiKemIDdamValKl8jDBoTqbbsyKFn/njVzw/lo/DXG kd3iJ+Trk9XJE4BI6Ngvt7EZ3/peLj7stYOUQz62stHJTM1rFJfU3fniFa0jCsUUHBZ/VU 1BD7fDu/IhhbWZIufW3SeAS4rPzJ+7MwcMhXD52oUBdlI0HCon5s0YO5fc3HK0NAV9yupZ 9rOdVHfv2hjYaScUOMYhTZ36lf4ph+az4CR3YGClh2WUSjidgCgh/KIvisSL8w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XmFm96GyhzMPh; Sun, 10 Nov 2024 01:42:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4AA1gHjg042267; Sun, 10 Nov 2024 01:42:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AA1gHbG042264; Sun, 10 Nov 2024 01:42:17 GMT (envelope-from git) Date: Sun, 10 Nov 2024 01:42:17 GMT Message-Id: <202411100142.4AA1gHbG042264@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: d43c3ae472ad - stable/14 - catopen(3): align returned errors with IEEE Std =?utf-8?Q?1003.1=E2=84=A2-2024?= List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d43c3ae472ad2a05bedfe10baf14741570d85c72 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=d43c3ae472ad2a05bedfe10baf14741570d85c72 commit d43c3ae472ad2a05bedfe10baf14741570d85c72 Author: Konstantin Belousov AuthorDate: 2024-11-03 12:50:32 +0000 Commit: Konstantin Belousov CommitDate: 2024-11-09 19:31:28 +0000 catopen(3): align returned errors with IEEE Std 1003.1™-2024 PR: 172805 (cherry picked from commit 1176390d2d2bbb1e207c840d1f7a66a6ac1096ff) --- lib/libc/nls/catopen.3 | 13 +++++++------ lib/libc/nls/msgcat.c | 30 +++++++++++++++++++----------- 2 files changed, 26 insertions(+), 17 deletions(-) diff --git a/lib/libc/nls/catopen.3 b/lib/libc/nls/catopen.3 index 6fd50956be1f..6fb2e2522e85 100644 --- a/lib/libc/nls/catopen.3 +++ b/lib/libc/nls/catopen.3 @@ -130,16 +130,17 @@ Otherwise, (nl_catd) -1 is returned and is set to indicate the error. .Sh ERRORS .Bl -tag -width Er -.It Bq Er EINVAL -Argument -.Fa name -does not point to a valid message catalog, or catalog is corrupt. .It Bq Er ENAMETOOLONG An entire path to the message catalog exceeded 1024 characters. .It Bq Er ENOENT -The named message catalog does not exists, or the +Argument .Fa name -argument points to an empty string. +does not point to a valid message catalog name, +or it points to an empty string. +.It Bq Er ENOENT +The named message catalog does not exist. +.It Bq Er ENOENT +The named message catalog file is in wrong format. .It Bq Er ENOMEM Insufficient memory is available. .El diff --git a/lib/libc/nls/msgcat.c b/lib/libc/nls/msgcat.c index 32fa191c4c67..61c09b65f434 100644 --- a/lib/libc/nls/msgcat.c +++ b/lib/libc/nls/msgcat.c @@ -136,7 +136,7 @@ __catopen_l(const char *name, int type, locale_t locale) /* sanity checking */ if (name == NULL || *name == '\0') - NLRETERR(EINVAL); + NLRETERR(ENOENT); if (strchr(name, '/') != NULL) /* have a pathname */ @@ -390,7 +390,7 @@ load_msgcat(const char *path, const char *name, const char *lang) struct catentry *np; void *data; char *copy_path, *copy_name, *copy_lang; - int fd; + int fd, saved_errno; /* path/name will never be NULL here */ @@ -414,9 +414,17 @@ load_msgcat(const char *path, const char *name, const char *lang) } if (_fstat(fd, &st) != 0) { + saved_errno = errno; _close(fd); - SAVEFAIL(name, lang, EFTYPE); - NLRETERR(EFTYPE); + SAVEFAIL(name, lang, saved_errno); + NLRETERR(saved_errno); + } + + /* The file is too small to contain a _NLS_MAGIC. */ + if (st.st_size < sizeof(u_int32_t)) { + _close(fd); + SAVEFAIL(name, lang, ENOENT); + NLRETERR(ENOENT); } /* @@ -426,13 +434,13 @@ load_msgcat(const char *path, const char *name, const char *lang) */ if (st.st_size > SIZE_T_MAX) { _close(fd); - SAVEFAIL(name, lang, EFBIG); - NLRETERR(EFBIG); + SAVEFAIL(name, lang, ENOENT); + NLRETERR(ENOENT); } - if ((data = mmap(0, (size_t)st.st_size, PROT_READ, - MAP_FILE|MAP_SHARED, fd, (off_t)0)) == MAP_FAILED) { - int saved_errno = errno; + data = mmap(0, st.st_size, PROT_READ, MAP_SHARED, fd, 0); + if (data == MAP_FAILED) { + saved_errno = errno; _close(fd); SAVEFAIL(name, lang, saved_errno); NLRETERR(saved_errno); @@ -442,8 +450,8 @@ load_msgcat(const char *path, const char *name, const char *lang) if (ntohl((u_int32_t)((struct _nls_cat_hdr *)data)->__magic) != _NLS_MAGIC) { munmap(data, (size_t)st.st_size); - SAVEFAIL(name, lang, EFTYPE); - NLRETERR(EFTYPE); + SAVEFAIL(name, lang, ENOENT); + NLRETERR(ENOENT); } copy_name = strdup(name); From nobody Sun Nov 10 01:42:18 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XmFmC2ck1z5c1GF; Sun, 10 Nov 2024 01:42: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XmFmC0nFWz3wnY; Sun, 10 Nov 2024 01:42:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731202939; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=af2rlac4WFAirUHsmY52FcSkXERvO9eEOypCXIDLZog=; b=vVTSGHACzQNnxu36ftb9c1DEiQNEhH4Y3HUBpK2zjSJ7SIAi08q+92xzTfzmGUYt3UH9hl vkWhtQZP4ZPPIriEtGB2qKKivQR9kF+rro1GgHkrd2ebYdx9tep56apBUd2clRdM8PhEXP VurEpjyi7mIYhFHEf4oJ4Aw4GCst2aClA8emlHShoxJglGAvkwZKLICWSeShIP5WwXbSQC nti9ehwXgyQtaSCUkKw1DdWXKplUasY4hSY94rJ87qcOYnWToKxnOrEZehLxguqEbd2JnQ EH1KBX3Oge3gDG22ibiNZrXE7akNRUENR3WOi1iums8xnXCX4zWw6mQLl0h43Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731202939; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=af2rlac4WFAirUHsmY52FcSkXERvO9eEOypCXIDLZog=; b=eMzgOd1Q8hbNBF+s3DsRDn4L5c6ydwzbDBZMSfXfVHDcvKvLKxHV4bXrvoAeYVbjwrPjSS sZ9Syz2WaR4jpZiXI+XeTZopOE7PUovW+wYVIdoxxfCIk3zeLgzHW3FosgPYEdHucKlePH EcH6lucSs/XCDGMnpgNX5XifBMbEvavif2h/Isr9i+LRb0nI17+nytr3JLJkmexLrf2H9e GRA0TePMjm4CQbaIxWhm2tw3merNNE7TLHYG05CqJPeQ4ozMXHZM4L1WHAy+2GPxJVsLYI tDmkxxsvM9MFaIQTkLuo8wNHXqz3nmIjM7RmwUH22ocJr9v3/rJOVV9IjEVLQw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731202939; a=rsa-sha256; cv=none; b=m7xCr4lT9h1yIiZhcFO9bVCsIM6zWAy5UBxdwSK3vUTy3RtiDiMxk65pD3SNUGa7GZZtAo mMj1zw7JwJr/tk0ODwVG/O9nxwwje7a/Cq4lLYHUlKCG0eczI6nGzy/RAAMbxpgn3CP83Q 9WJyUY+TsxuArxw29VWWK8mdiztwBDPsYNwwh3q5MEZP7T2M+fVpHPlA4f2apbWAF0koYy e/mQCUQ6ElGGwSp7EtlAPUI1mD3Z2GMmlAziVdwdYoFHKi9SICJoBvcYckMAa3HFSCnfyW ZxndxGoNJPP3Bd8R+Vk5qI917SYrEhIHOHYU6hmWjbCbYSES1gHprfT6b1pmzQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XmFmB6ywMzMyn; Sun, 10 Nov 2024 01:42:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4AA1gIx9042330; Sun, 10 Nov 2024 01:42:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AA1gIjm042327; Sun, 10 Nov 2024 01:42:18 GMT (envelope-from git) Date: Sun, 10 Nov 2024 01:42:18 GMT Message-Id: <202411100142.4AA1gIjm042327@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 27f51b8c5111 - stable/14 - libc: mechanically convert ru_RU msg catalog from KOI8-R to UTF-8 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 27f51b8c5111975bbf1421dbb1ca25e09053450f Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=27f51b8c5111975bbf1421dbb1ca25e09053450f commit 27f51b8c5111975bbf1421dbb1ca25e09053450f Author: Konstantin Belousov AuthorDate: 2024-11-03 14:12:13 +0000 Commit: Konstantin Belousov CommitDate: 2024-11-09 19:31:29 +0000 libc: mechanically convert ru_RU msg catalog from KOI8-R to UTF-8 (cherry picked from commit e2864e7189781d742b6899d110b565c9744bb948) --- lib/libc/nls/Makefile.inc | 1 + lib/libc/nls/ru_RU.UTF-8.msg | 265 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 266 insertions(+) diff --git a/lib/libc/nls/Makefile.inc b/lib/libc/nls/Makefile.inc index 0d4c245c6911..f26e04c187a5 100644 --- a/lib/libc/nls/Makefile.inc +++ b/lib/libc/nls/Makefile.inc @@ -32,6 +32,7 @@ NLS+= no_NO.ISO8859-1 NLS+= pl_PL.ISO8859-2 NLS+= pt_BR.ISO8859-1 NLS+= ru_RU.KOI8-R +NLS+= ru_RU.UTF-8 NLS+= sk_SK.ISO8859-2 NLS+= sv_SE.ISO8859-1 NLS+= uk_UA.UTF-8 diff --git a/lib/libc/nls/ru_RU.UTF-8.msg b/lib/libc/nls/ru_RU.UTF-8.msg new file mode 100644 index 000000000000..cda0909aa76c --- /dev/null +++ b/lib/libc/nls/ru_RU.UTF-8.msg @@ -0,0 +1,265 @@ +$ +$ Message catalog for ru_RU.KOI8-R locale +$ +$ strerror() support catalog +$ +$set 1 +$ EPERM +1 Операция не разрешена +$ ENOENT +2 Нет такого файла или каталога +$ ESRCH +3 Нет такого процесса +$ EINTR +4 Прерванный системный вызов +$ EIO +5 Ошибка ввода/вывода +$ ENXIO +6 Устройство не сконфигурировано +$ E2BIG +7 Слишком длинный список аргументов +$ ENOEXEC +8 Ошибка формата выполняемого файла +$ EBADF +9 Некорректный дескриптор файла +$ ECHILD +10 Нет порожденных процессов +$ EDEADLK +11 Предотвращена взаимная блокировка при доступе к ресурсу +$ ENOMEM +12 Невозможно выделить память +$ EACCES +13 Недостаточно привилегий +$ EFAULT +14 Некорректный адрес +$ ENOTBLK +15 Необходимо указать блочное устройство +$ EBUSY +16 Устройство занято +$ EEXIST +17 Файл существует +$ EXDEV +18 Ссылка на другое устройство +$ ENODEV +19 Операция не поддерживается устройством +$ ENOTDIR +20 Указанный файл не является каталогом +$ EISDIR +21 Указанный файл является каталогом +$ EINVAL +22 Недопустимый аргумент +$ ENFILE +23 Слишком много открытых файлов в системе +$ EMFILE +24 Слишком много открытых файлов +$ ENOTTY +25 Вызов ioctl не поддерживается устройством +$ ETXTBSY +26 Текстовый файл занят +$ EFBIG +27 Слишком большой файл +$ ENOSPC +28 На устройстве не осталось места +$ ESPIPE +29 Недопустимое смещение +$ EROFS +30 Файловая система только для чтения +$ EMLINK +31 Слишком много ссылок +$ EPIPE +$ XXX??? +32 Канал разрушен +$ EDOM +33 Недопустимое значение числового аргумента +$ ERANGE +34 Слишком большой результат +$ EAGAIN, EWOULDBLOCK +35 Ресурс временно недоступен +$ EINPROGRESS +36 Операция в процессе выполнения +$ EALREADY +$ XXX??? +37 Операция уже выполняется +$ ENOTSOCK +38 Операция с сокетом применена не к сокету +$ EDESTADDRREQ +39 Требуется целевой адрес +$ EMSGSIZE +40 Слишком длинное сообщение +$ EPROTOTYPE +41 Неверный тип протокола для сокета +$ ENOPROTOOPT +42 Протокол недоступен +$ EPROTONOSUPPORT +43 Протокол не поддерживается +$ ESOCKTNOSUPPORT +44 Этот тип сокета не поддерживается +$ EOPNOTSUPP +45 Операция не поддерживается +$ EPFNOSUPPORT +46 Семейство протоколов не поддерживается +$ EAFNOSUPPORT +47 Семейство адресов не поддерживается семейством протоколов +$ EADDRINUSE +48 Адрес уже используется +$ EADDRNOTAVAIL +49 Не могу назначить указанный адрес +$ ENETDOWN +50 Сеть не работает +$ ENETUNREACH +51 Сеть недостижима +$ ENETRESET +52 Сеть закрыла подключение при сбросе +$ ECONNABORTED +53 Программа вызвала аварийное прекращение подключения +$ ECONNRESET +54 Подключение сброшено противоположной стороной +$ ENOBUFS +55 Не осталось места под буфер +$ EISCONN +56 Сокет уже подключен +$ ENOTCONN +57 Сокет не подключен +$ ESHUTDOWN +58 Не могу послать после закрытия сокета +$ ETOOMANYREFS +59 Слишком много ссылок: не могу соединить +$ ETIMEDOUT +60 Операция превысила лимит времени +$ ECONNREFUSED +61 Подключение отвергнуто +$ ELOOP +62 Слишком много уровней символьных ссылок +$ ENAMETOOLONG +63 Слишком длинное имя файла +$ EHOSTDOWN +64 Хост не работает +$ EHOSTUNREACH +65 Нет маршрута к хосту +$ ENOTEMPTY +66 Каталог не пуст +$ EPROCLIM +67 Слишком много процессов +$ EUSERS +68 Слишком много пользователей +$ EDQUOT +69 Превзойдена дисковая квота +$ ESTALE +70 Устаревший дескриптор файла NFS +$ EREMOTE +71 Слишком много дистанционных переходов в пути +$ EBADRPC +72 Некорректная структура RPC +$ ERPCMISMATCH +73 Неверная версия RPC +$ EPROGUNAVAIL +74 Программа RPC недоступна +$ EPROGMISMATCH +75 Неверная версия программы +$ EPROCUNAVAIL +76 Некорректная процедура для программы +$ ENOLCK +77 Блокировки недоступны +$ ENOSYS +78 Функция не реализована +$ EFTYPE +79 Неподходящий тип или формат файла +$ EAUTH +80 Ошибка аутентификации +$ ENEEDAUTH +81 Необходимо удостоверение +$ EIDRM +82 Идентификатор удален +$ ENOMSG +83 Нет сообщения требуемого типа +$ EOVERFLOW +84 Слишком большое значение для хранения в указанном типе данных +$ ECANCELED +85 Операция отменена +$ EILSEQ +86 Недопустимая последовательность байтов +$ ENOATTR +87 Атрибут не найден +$ EDOOFUS +88 Ошибка программирования +$ EBADMSG +89 Плохой формат сообщения +$ EMULTIHOP +90 Попытка мультихопа +$ ENOLINK +91 Канал разорван +$ EPROTO +92 Ошибка протокола +$ ENOTCAPABLE +93 Недостаточно возможностей +$ +$ strsignal() support catalog +$ +$set 2 +$ SIGHUP +$ XXX: Отключение? +1 Разрыв связи +$ SIGINT +2 Прерывание по сигналу +$ SIGQUIT +3 Выход +$ SIGILL +4 Недопустимая инструкция +$ SIGTRAP +5 Ловушка трассировки/точки останова +$ SIGABRT +$ XXX: Аварийное завершение +6 Ловушка аварийного прекращения +$ SIGEMT +7 Ловушка EMT +$ SIGFPE +$ XXX: Ошибка операции с плавающей точкой? +8 Ошибка при работе с вещественным числом +$ SIGKILL +$ XXX: Убит +9 Принудительно прекращен +$ SIGBUS +$ XXX: Ошибка адресации на шине +10 Ошибка шины +$ SIGSEGV +11 Ошибка сегментации +$ SIGSYS +12 Недопустимый системный вызов +$ SIGPIPE +13 Канал разрушен +$ SIGALRM +14 Сработал таймер +$ SIGTERM +15 Завершен +$ SIGURG +16 Необходим срочный ввод-вывод +$ SIGSTOP +17 Приостановка (сигнал) +$ SIGTSTP +18 Приостановка +$ SIGCONT +19 Продолжение работы +$ SIGCHLD +20 Завершена работа порожденного процесса +$ SIGTTIN +21 Остановлен (ввод с терминала) +$ SIGTTOU +22 Остановлен (вывод на терминал) +$ SIGIO +23 Ввод-вывод возможен +$ SIGXCPU +24 Превышено ограничение процессорного времени +$ SIGXFSZ +25 Превышен максимальный размер файла +$ SIGVTALRM +26 Истек виртуальный таймер +$ SIGPROF +27 Истек таймер профилирования +$ SIGWINCH +28 Изменение размера окна +$ SIGINFO +29 Запрос информации +$ SIGUSR1 +30 Пользовательский сигнал 1 +$ SIGUSR2 +31 Пользовательский сигнал 2 From nobody Sun Nov 10 01:42:20 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XmFmD3Nk5z5c106; Sun, 10 Nov 2024 01:42: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XmFmD1bDPz3ww4; Sun, 10 Nov 2024 01:42:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731202940; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dMrpaEKXEl7jGwW4AAOcFzBfTNrV9fPjVKHMTRiPvzM=; b=LrCQHjr7juywoY0oW8i3F5M83HsUtKZ2KTKq/xWFTyMOzght9hlXWB1pT979Grd0Qj99vw BtpmxLVKmUnED/RjD1COQjOO2Rkxg3j06Bn7Y5QtvLYb7E1Y/q0stRKlLu2n/+pAGI1alU WqIudRAgeY5X+9wjYtUzPlCc0+wqSXcvECFVetL7dzmqki51GE4s8pihOJsCOaTM+6/Mdd ylDnWgZretRr2F2Wwt12hqJJJzw34qze9512FnXyswj2cKnNg5bSme7v+lduCo2kaVaFVz KoZTZr95VgjPV64FbMpP8w9guEyyctU065MWf16/cuU/CJw0igpOhSO4c3SsnA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731202940; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dMrpaEKXEl7jGwW4AAOcFzBfTNrV9fPjVKHMTRiPvzM=; b=nH6oVFzSFEtm/zLdkl/53NbGAvZum6kKQHAhLLQdUDA/M35B0mODPVec9m5AF58cRleBer ryhCYXRQcJUD3PNeUcRtjkB56PTQ97V6gq+HIUqlmgLVZWGped5UjLhAWMIoHkxPjgPrki H8vxljhFbZ+WNqvZwtF/dn/ZSc2mhdtA1mxoifVDYGncmhd/lL0U0XxZdNtnO3tjFDL3Sc uHZb35tMS9itMlw6diN7b1eAOiU5IBqdM6fBZg/aMeuMHWb0u+19OmDwkQzlqwf6GZtQhf ANX0Z39WuNIA8HZ28sKjTq8vGY82wZRR7QwRf117pqgImFYA/0z2LaPGwTWPJQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731202940; a=rsa-sha256; cv=none; b=RZ1DTmCSAVPTSSPq/vlwbzAxvSR+K4uF9u7LzMVIuuXXQPaWpp0hWiCvdqfICTX02Ubr26 B7rnRHuP5n6YtMyHnECLztrJGpswPCXNLQtn/d+YZuk2JFDMK0NrFWsL+zeIryzF50HQI7 XaEat90jidX1ZxStRLRA1x3AIWiNpyns4iuWSiGmd+DXLrvl3dOoka7pegxjW6HrB8wJXN f6sAhC1tNBaRzLJVcZ54lRhC0ssy6r9C4dnOCIyVLcEVQZ9m3qDBQLGP7MN3EoqRAXEpFR nf4agUDDeTQM2ztWw6E75eFDUfj+SgT8jLJIC4FjVUibl7wqTFUPWHt5JFcMuA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XmFmD1BQPzMMG; Sun, 10 Nov 2024 01:42:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4AA1gKop042396; Sun, 10 Nov 2024 01:42:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AA1gKPv042393; Sun, 10 Nov 2024 01:42:20 GMT (envelope-from git) Date: Sun, 10 Nov 2024 01:42:20 GMT Message-Id: <202411100142.4AA1gKPv042393@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 37095a500dc1 - stable/14 - libc: remove some XXX for russian translations of errnos List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 37095a500dc179cc0c623f3be64d60fe6f28122c Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=37095a500dc179cc0c623f3be64d60fe6f28122c commit 37095a500dc179cc0c623f3be64d60fe6f28122c Author: Konstantin Belousov AuthorDate: 2024-11-03 16:44:20 +0000 Commit: Konstantin Belousov CommitDate: 2024-11-09 19:31:29 +0000 libc: remove some XXX for russian translations of errnos (cherry picked from commit 3b65da5b65a6bfaf1150075e1dab3c627cb32f92) --- lib/libc/nls/ru_RU.KOI8-R.msg | 2 -- lib/libc/nls/ru_RU.UTF-8.msg | 2 -- 2 files changed, 4 deletions(-) diff --git a/lib/libc/nls/ru_RU.KOI8-R.msg b/lib/libc/nls/ru_RU.KOI8-R.msg index 0fcd0e9b1225..7b5cd288ed60 100644 --- a/lib/libc/nls/ru_RU.KOI8-R.msg +++ b/lib/libc/nls/ru_RU.KOI8-R.msg @@ -67,7 +67,6 @@ $ EROFS $ EMLINK 31 $ EPIPE -$ XXX??? 32 $ EDOM 33 @@ -78,7 +77,6 @@ $ EAGAIN, EWOULDBLOCK $ EINPROGRESS 36 $ EALREADY -$ XXX??? 37 $ ENOTSOCK 38 diff --git a/lib/libc/nls/ru_RU.UTF-8.msg b/lib/libc/nls/ru_RU.UTF-8.msg index cda0909aa76c..1bd2179dfe81 100644 --- a/lib/libc/nls/ru_RU.UTF-8.msg +++ b/lib/libc/nls/ru_RU.UTF-8.msg @@ -67,7 +67,6 @@ $ EROFS $ EMLINK 31 Слишком много ссылок $ EPIPE -$ XXX??? 32 Канал разрушен $ EDOM 33 Недопустимое значение числового аргумента @@ -78,7 +77,6 @@ $ EAGAIN, EWOULDBLOCK $ EINPROGRESS 36 Операция в процессе выполнения $ EALREADY -$ XXX??? 37 Операция уже выполняется $ ENOTSOCK 38 Операция с сокетом применена не к сокету From nobody Sun Nov 10 02:58:03 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XmHRc1ktRz5c5Zp; Sun, 10 Nov 2024 02:58: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XmHRc165dz44hC; Sun, 10 Nov 2024 02:58:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731207484; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LgGS69XN18ZP5ZsgmxCi3c8SKsOIQZSkBHsKB7ZWUmA=; b=MItzO+4mXphrdEVldj0GBFd3B9AOkpjk6lgWRWWQGy6uUoHePXgViXCp4nm7Nb9oKT3CN5 Ztp56xf1Md28B6g8BfVf4ybUu7fXbgf/CfnePrQIPlwzzURRDCIWt2mFvViO0SZ4t9luGg Lq/egb7jxnoAK8qip43CwuuGi5+RV3aGjjtqe1mwoPjVFrf+U5dSo+02o1rwDjrpxc3mzL 5p+MRppplLbe4FH31Bq2FjE4dMAwkeByk38PjAjEDexlExhjHCeZUN01HPd7aZkDRjPf4E mqO85jbJb56Rh71naF0x1UpvIHlpR2QzLfJrQ83jQPnK56h6/kMnU3/pix60tQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731207484; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LgGS69XN18ZP5ZsgmxCi3c8SKsOIQZSkBHsKB7ZWUmA=; b=aff0hx9XAfBKye1RxUJDT7BjBHvxkYSwCmZQjueLnleE30CdV+R9Mvo5XnZIQG+e4z066l qZFiZ5HFhQ9EWQMIxogcLHFBhb1YvT0E7V/Ha62RUD8GFnvWaxtqbwS6vvOhiRWGGXZUVG tibCudXu3PnTB/2WU18b+a0pjWdlFMvpR+Yv18v4Gc1+r8ZRObXMGppUdHWYdLpAtSukEV 8v/9s2Zlc1YTOCOm9ylfaogafS4h1rVaPYHtoTSw79lm04I5n3cgdEULa8Ez0OvpY2rzol bKup1blsChV9SMekphtJJflUHH9U7hZEtmNjUXLmGiph11EvTmfmuoHzAYwTww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731207484; a=rsa-sha256; cv=none; b=LX0JuMep6SOk5FmjuD0QP7mDtg69JB8RQd3BlCk8u6TnPiVNFTpS+Tr2sHbfM/n6Ix3SRH rhChsMMKhugJk7JzbOp/PPi1Rgcys2shhhvktQkdcydNLy5XNhBpdfGZFI04cybty6TYQg cio3p1dYFxpyrs88qZgHRFHX/XzRnKvDSTh+C7CUWPSDOQCL8pH4tE85D5wS1CNKqCbF1B 8TpRDkzQaRGRHL2D/GqmF5MeSEU9v57nAOpGPPflQ9RRIJdIzXBsUOA9yZijeybILowXZS +BayAs9Id3LcMp00XqJphu4wOVTSUOg2ml6cTKCurk+nRJ/Hc3JzpAEovDrp9w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XmHRc0QJTzQ0Z; Sun, 10 Nov 2024 02:58:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4AA2w30d073776; Sun, 10 Nov 2024 02:58:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AA2w3hs073773; Sun, 10 Nov 2024 02:58:03 GMT (envelope-from git) Date: Sun, 10 Nov 2024 02:58:03 GMT Message-Id: <202411100258.4AA2w3hs073773@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jose Luis Duran Subject: git: 221461661a94 - stable/14 - release: Remove binutils List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 221461661a94d1d4f83e43b6b5cbd150f127c070 Auto-Submitted: auto-generated The branch stable/14 has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=221461661a94d1d4f83e43b6b5cbd150f127c070 commit 221461661a94d1d4f83e43b6b5cbd150f127c070 Author: Jose Luis Duran AuthorDate: 2024-10-18 03:17:57 +0000 Commit: Jose Luis Duran CommitDate: 2024-11-10 02:57:38 +0000 release: Remove binutils Reviewed by: mhorne, emaste Approved by: emaste (mentor) Fixes: 74e8d41e0ac8 MFC after: 1 week Pull Request: https://github.com/freebsd/freebsd-src/pull/1485 (cherry picked from commit 6baae68d7f311f4ee0e844782dbaf4f3c9b223ed) --- release/packages/Makefile.package | 2 -- 1 file changed, 2 deletions(-) diff --git a/release/packages/Makefile.package b/release/packages/Makefile.package index ed3da78665be..0f7cec0fb5a1 100644 --- a/release/packages/Makefile.package +++ b/release/packages/Makefile.package @@ -15,8 +15,6 @@ autofs_COMMENT= Autofs Utilities autofs_DESC= Autofs Utilities bhyve_COMMENT= Bhyve Utilities bhyve_DESC= Bhyve Utilities -binutils_COMMENT= Binutils -binutils_DESC= Binutils blocklist_COMMENT= Blocklist Utilities blocklist_DESC= Blocklist Utilities bluetooth_COMMENT= Bluetooth Utilities