From nobody Mon Oct 27 06:27:40 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cw3TS3bSTz6FZ19; Mon, 27 Oct 2025 06:27: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cw3TS2nvcz3QxG; Mon, 27 Oct 2025 06:27:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761546460; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=E5fAjQ+UwTWvRMDypq92hbQLgxRwlUn7SrLCmkuxBvE=; b=GVtQ1YX7eNMmr9D5atirOmdu4X7b3uKqf04GUThyE1BmZBff4lCzz/R+zpMqhbOpawn7oI GtX/b4qfQMJU+3wRaMopDbyTru/YNC/U0phSHmJ8dJTRPesR8KKslQIwfoI/ERc8myFUxD xGgbhUYnrb7FsKViu2yjxY73GGP8aJiH3Ku4TZ3rvtRQziChtXUJo7gUKFTo+gLxG5Barf mxiCnhjT9/TCjhVyn1AyGbkSzEfVQyvD7B9yTOC60KuCGN7/XSYY4A2rAu6EMhgwsKilFq yT7zNY7Gzr1QmvG1WXJG2kewylb57wiNsV4lHH02Rz8IUIgqqHrlHdx3jHTQ+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761546460; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=E5fAjQ+UwTWvRMDypq92hbQLgxRwlUn7SrLCmkuxBvE=; b=lzZakQyESfVt/wrqs1AKcWzTdRfCbm70CosEYfaK0Vl8NfclsWxmD+uEdzbXjjn4jLglxi qJAY4YNN2XNhEwTaXbtkTW0vkR6P5bExMxeUZ+JEGLKXOgbvWXqZq/v2VHl2/DrIAl+ZsH JVau8c/Ui5SNPyyKZ27rH9BhCGCVoeGwkopzq4eLljmtv8yCKQoyTQGz+dbZPWm+pxL8WK 6j+OTiBSZqo5VEXJBl5hM2oiVN9P3BufHq6SamAVFASEMiJCnJo5pyRyDBdDZXOyT2cnxB SG+yJFVZ0PfuWP2XwO9F89WD4QMVF/AbKP4sEDPMQW2hHEd6sSomTqOaHPzMDA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761546460; a=rsa-sha256; cv=none; b=bd1FxR6SZQAw1Dz2DlhbUPfWjrn/mP5JsHbSzngPHU8XZ4tlfVrcSzJsg1lO3Hjoey00i+ g+fEUyGePG2f5Nu9rW3PUfHr8O4p06mjKLghMwW8iyms99zw5Plp7pzxoe8J02eJjeey9Z xTnwuZm8lDvl+5b1wAMY3eTHyYNIlRg7fk/uiD+zmj6hX8HkObOpBTE7OYWPYcUm8HZbhK V3i8MiyMPuvGQGv4MECIqKiXgeVyCQu53kj80r5ze9jkHPfHCIAJfsR7g6clwCgv/h+oFX GGqBmbpWu4ajtbT//OzrCYDnaBXtf5gx3KzyMvQu1DL1ePo5wf9BYkwCkHfCZw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cw3TS23xgz16hL; Mon, 27 Oct 2025 06:27: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 59R6RedG038789; Mon, 27 Oct 2025 06:27:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59R6ReaU038786; Mon, 27 Oct 2025 06:27:40 GMT (envelope-from git) Date: Mon, 27 Oct 2025 06:27:40 GMT Message-Id: <202510270627.59R6ReaU038786@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: d81fe0b20632 - main - PCI_IOV_ADD_VF.9: Fix a typo in the manual page List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d81fe0b206325b40e13625f5684ec8d19fdccf04 Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=d81fe0b206325b40e13625f5684ec8d19fdccf04 commit d81fe0b206325b40e13625f5684ec8d19fdccf04 Author: Gordon Bergling AuthorDate: 2025-10-26 15:34:56 +0000 Commit: Gordon Bergling CommitDate: 2025-10-27 06:27:26 +0000 PCI_IOV_ADD_VF.9: Fix a typo in the manual page - s/initializating/initializing/ MFC after: 5 days --- share/man/man9/PCI_IOV_ADD_VF.9 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/man/man9/PCI_IOV_ADD_VF.9 b/share/man/man9/PCI_IOV_ADD_VF.9 index 512b0b8668cc..95bf5a218e8e 100644 --- a/share/man/man9/PCI_IOV_ADD_VF.9 +++ b/share/man/man9/PCI_IOV_ADD_VF.9 @@ -41,7 +41,7 @@ The .Fn PCI_IOV_ADD_VF method is called by the PCI Single-Root I/O Virtualization .Pq SR-IOV -infrastructure when it is initializating a new Virtual Function (VF) as a child +infrastructure when it is initializing a new Virtual Function (VF) as a child of the given Physical Function (PF) device. This method will not be called until a successful call to .Xr PCI_IOV_INIT 9 From nobody Mon Oct 27 06:27:41 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cw3TT5D0qz6FZ1B; Mon, 27 Oct 2025 06:27: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cw3TT2rV0z3Qtp; Mon, 27 Oct 2025 06:27:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761546461; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HAP7PUwQ5wl8t5IDqFS8I98zt9XUI7av0ElhMdgC6Pc=; b=a1ruzUMPVgDfOe3LN5kJ3AvBV5c6rzHdSW5GhYvXlWFam7tsnWM7Jlp9B6nvoRUQguS+TB C2pPrYyxNM3rcu1c4r/aGH5+hqY3MDeQJh8UeUXsDYjMyTDQiY3ptznmN5Bmpt3pVy9QZK v8Ben79uGopnkizP6gfsLxHlHBItbPJIRu4DW0Sq7CXfxfkUaUyckn5rOquhU0ibdvKIWD unKIOmVQxvPnvOnQcJOYDStfQj1yCs+LuMOv09+WuBbAKBlBXfg+8DQB9Q+sHx1aCKCjUQ G3dWoqxa0Vi/cFuMCQ6HK31tzMRE//sHa9Gq4x+5/KXB7awXilrG1NHdeIArhg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761546461; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HAP7PUwQ5wl8t5IDqFS8I98zt9XUI7av0ElhMdgC6Pc=; b=EQz4L7amBRI/2FM13zuxjs6rwlDN0V828ngci4pn3+eZgxniuUwWjjZtDIuBU1WOGoEImZ DQW3Kdt72U1XXvjYdviXSRfVSwo1EeHR8iAzUT9iWV10WV1zjaGzQGW8VrKYmYY8rEYxMs IMQPN1CZVil3UZmvF+YNWR8eoDniSDZZTqOcYQMYzRtvUaY6qDaKO5TFV7gaFzI+yGhSJe UoDZbT50wXCHRaK4TUMRX5mqGvWJjbXkL0QoOo802hZz0GBiBRbR+AVZQ8UzpdSpu+CkOq +Sfg/XrOTAOf7cLiITxaf8rduJvBMx/b/6iAWIm0XqvNvNw2zqXM1ITaX1TSYQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761546461; a=rsa-sha256; cv=none; b=RpL+NC4T/IfG4aeBL2TqgtenJgMXVMBnWdgF0Vr822lXcyJlv5WO8uYyYr2KS0RCaV+oCk S11Zceih3v4lBFAMVzV8Y9oWYga3jUpMojc3v1sASbM1LjmfURBeTY3yof+o0sShAjhFhA KXvRnyFOj+UjGa4gxvdoBj1M3oo43u/oMBS0Jhe7q9zHzPDWgsiSSyc1fNUG04FCz88/NJ t3Xm2qYgD8fZIe2vRnSECB6ySd27SHI/S7AmZkw2YIOK5gKmDFmP1xZEBwjcJpIOf/G5C4 4MLaAgJNPEjitcHmzVOE+Q2GgRmRnEKKffbJy/jTRWKRayRqA1y61disCSPd+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cw3TT2Mpzz16hM; Mon, 27 Oct 2025 06:27: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 59R6RfKb038827; Mon, 27 Oct 2025 06:27:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59R6RfWo038824; Mon, 27 Oct 2025 06:27:41 GMT (envelope-from git) Date: Mon, 27 Oct 2025 06:27:41 GMT Message-Id: <202510270627.59R6RfWo038824@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: 2f263badccf8 - main - atomic.9: Fix a typo in the manual page List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2f263badccf842470323b64613eccb0c0b9a12c1 Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=2f263badccf842470323b64613eccb0c0b9a12c1 commit 2f263badccf842470323b64613eccb0c0b9a12c1 Author: Gordon Bergling AuthorDate: 2025-10-26 15:35:50 +0000 Commit: Gordon Bergling CommitDate: 2025-10-27 06:27:26 +0000 atomic.9: Fix a typo in the manual page - s/constrast/contrast/ MFC after: 5 days --- share/man/man9/atomic.9 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/man/man9/atomic.9 b/share/man/man9/atomic.9 index df24cd4a4d2b..c9133c6311a5 100644 --- a/share/man/man9/atomic.9 +++ b/share/man/man9/atomic.9 @@ -272,7 +272,7 @@ In C11, a release fence by one thread synchronizes with an acquire fence by another thread when an atomic load that is prior to the acquire fence (by program order) reads the value written by an atomic store that is subsequent to the release fence. -In constrast, in +In contrast, in .Fx , because of the atomicity of ordinary, naturally aligned loads and stores, fences can also be synchronized by ordinary loads From nobody Mon Oct 27 06:27:42 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cw3TV6Ylhz6FZ1D; Mon, 27 Oct 2025 06:27: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cw3TV3pkXz3R0T; Mon, 27 Oct 2025 06:27:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761546462; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Y5wi469KQyOkd303gm/ybb8po2WuyTyupls6rkGWrFY=; b=ptiC4MQOUdCUdB+2YsmTJGqqEShxnv2oOYhtYljO4eS9QE5KD8e+pUKdUGwZypiMoobUFi JyYrY7hvB0xRm2nLmcJZPH7YE0YF4Z3I8d2i3v62riQSL1Oq9mACumpSEnpAKc3p3OFs81 v2OwkWUsZm9aB9EkWmMG8drUIUO2QBT3ZjhjlFBIxSBfnWD3lzV6RkwMemcrUWVZbLV+wl L+i5Gea7h0arakIqxlxT9YLhLe/U+J0ilAw5EiZ1/ssZYMmoOyb4qh5OkvcQoPNa2CbGku LMzckzRQUbrpFoYmjkvRMKe9Z4PhdBr29VQoz4n3ubixQ/6tHTjeDxK1c0QTMw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761546462; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Y5wi469KQyOkd303gm/ybb8po2WuyTyupls6rkGWrFY=; b=uT7XL6oaHRvxm9jr+85rm4tv/7ETXhASbes8LWs5Er5UstURAdBSBNGlPQFlvYevynLQWF HApeCjbyatRGtM3KYFwsoUZQlSbSlT9UKT7HNtEmQ0Mtfk84kT6N1J/4GCV1erD5hsBY9i V6S2HAOqaEUzzhTe+N789odVd+RbaiIQvG4b81C9rkdjILEWaCP64zKML2z/8x1+sb35+5 eO7UhZdf4QVj/+kGUt5WqADK3fH+YXzEVFXje69C5X0entcUdnK9vyyl3y2RO3KQJUgJiu 9HDfA5n1uvxIZeSqo2wMoQ68cMkLzjtI1ePpNIYhePKQ27ulhrZJ+uxAQG4j8w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761546462; a=rsa-sha256; cv=none; b=o5AMRDEdNqegPcsz0Fe/G448gBfc901Z4cwM6bx4j1tszdx49fXDcv8FyBg96Xlp+IvJag M9QPSQklnM07L3eneRgfTaHfqautX2oXWoZo9X1n2Oc5+1IzGTq8rCJ2t1Vx68Bx076aPp mMZRiw5RL+J959Z3Xt3fxY2pOzfhz0VYKuWuMhVn7WAWZCxwI4q6uId6Dac8N16HFTb77l fumMaB5SG6QEErJNixzMFyTDLdompRjBvadZYVDKlbE8jifhASF7dlZka1SAoAeQSYaWnS 9CHWeGYFsWh7NDgGkZBf5rdwsLEoWBEx2L8v3uzZcFB/ZHHNhatTdlANH1hJiA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cw3TV3Jz9z16Xg; Mon, 27 Oct 2025 06:27: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 59R6RgbP038864; Mon, 27 Oct 2025 06:27:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59R6RgrK038862; Mon, 27 Oct 2025 06:27:42 GMT (envelope-from git) Date: Mon, 27 Oct 2025 06:27:42 GMT Message-Id: <202510270627.59R6RgrK038862@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: 3ceaf4d80401 - main - bhnd.9: Fix a typo in the manual page List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3ceaf4d80401fab49895a5ac3bb1fe602f588da8 Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=3ceaf4d80401fab49895a5ac3bb1fe602f588da8 commit 3ceaf4d80401fab49895a5ac3bb1fe602f588da8 Author: Gordon Bergling AuthorDate: 2025-10-26 15:36:51 +0000 Commit: Gordon Bergling CommitDate: 2025-10-27 06:27:26 +0000 bhnd.9: Fix a typo in the manual page - s/devce/device/ MFC after: 5 days --- share/man/man9/bhnd.9 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/man/man9/bhnd.9 b/share/man/man9/bhnd.9 index 722ae6b6a393..ed3007ea748d 100644 --- a/share/man/man9/bhnd.9 +++ b/share/man/man9/bhnd.9 @@ -2350,7 +2350,7 @@ function retains and returns a reference to the provider registered for .Fa service with the parent .Xr bhnd 4 -bus of devce +bus of device .Fa dev , if available. On success, the caller is responsible for releasing this provider reference From nobody Mon Oct 27 06:27:43 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cw3TX09Bnz6FZ3l; Mon, 27 Oct 2025 06:27: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cw3TW4nnWz3Qrw; Mon, 27 Oct 2025 06:27:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761546463; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RLRqJAw+EngIMNDZFv5XOEzdY2+M9DcG/vsONV7f7F0=; b=ElXu8iRGHo/f6pDq05eZnHknnUaJ8oqTnOclditvJhssxJdgAU+wSS/pxvk8/vPlAbvaxs Brpy1CTcKuvIbqQTYccQp7vnEXjN8TjA/aJ1I9evpiswscCAD/TQiFwJ8cnI3R+ya6mZww YyREKF1gQMiYFIuRmPVLnfrTlqPoLKU7cetwsyhgzYVyWRvRj20Mzv6lCqDrJYPx46xCGj aum6NokgcCZHvaQ1jZ+qGrgYjE4h1LVaAggdGHI6hPjJ8pa0Ir+HvSAUGBrVTqo2ZhvaKF cOinjTX1RhXt5KbSfm1ZaRbVwwdyvwe9i0cLJSJ/ODaUkryhmn9Pi/XMtxEeag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761546463; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RLRqJAw+EngIMNDZFv5XOEzdY2+M9DcG/vsONV7f7F0=; b=FyWpys7mROcahTrDdSmGqgikEqgfRKpVIQX2PajbQNZ/ik9vvIJXl+o1JTkMq6S7o5Uelc 3P5Sxoz8rAlvKlQ1/bo1lTs05vgxVoXntHGkfa78XFbgGcvXdytR8fkQ+tvOZEAZO6lg2G 37ofWHDayySKy2fZWuz15vLe2/q5jLdUYu1/t0JDz99Z3LFyBlizYigy3/PH942X9Nnss/ Tbg78bFqWAPfISnfT+f92St/+0hfjIDcs6xrlQejah8/nxTwbI/gWi59C4tldpZxyqYG7v 1Fklx7mmnMuhzzBcpx6IPUJ6fDf/iIkGitJpAPLGlzr5t/4NvtDDbJpMDswAhQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761546463; a=rsa-sha256; cv=none; b=aNd+q8Y4H7xeuGQAeR67iM8mMiZXaPUKTFq4WZOQiRbgg7511+wVsDnAXlRz62Iz+xZ1ZP cwQ5K5V4tZ0WCKHp6sdOSllVHo0byfv6/i3ysJ20VUH+nmJQmXFpVIvBQmm16oZ7NvTOJt cQEczuRoVXUVFCVgcTYYCtYLz1vxXAEL+APqLX6/M43/281J2Tj7FN6kkhS/p7WrhJz0a0 FD8wk7FyfS/zcnm0iyel0B/l8OVtEXrpxROdYSwcimfr2zzEXwF3EhgM0eXyZO5sKdN4Of 0ID/2ErmOgboFttFFRKznhZgo2aTVtO2iJYH708zRwCfyVslV+ZO8MFmysKsTQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cw3TW4JkNz16S6; Mon, 27 Oct 2025 06:27: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 59R6Rh84038897; Mon, 27 Oct 2025 06:27:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59R6RhvE038894; Mon, 27 Oct 2025 06:27:43 GMT (envelope-from git) Date: Mon, 27 Oct 2025 06:27:43 GMT Message-Id: <202510270627.59R6RhvE038894@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: 5215760811a5 - main - bus_dma.9: Fix two typos in the manual page List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5215760811a5ce75d77f9017e392445014e6b1bb Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=5215760811a5ce75d77f9017e392445014e6b1bb commit 5215760811a5ce75d77f9017e392445014e6b1bb Author: Gordon Bergling AuthorDate: 2025-10-26 15:38:29 +0000 Commit: Gordon Bergling CommitDate: 2025-10-27 06:27:26 +0000 bus_dma.9: Fix two typos in the manual page - s/decribes/describes/ - s/Muliple/Multiple/ MFC after: 5 days --- share/man/man9/bus_dma.9 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/man/man9/bus_dma.9 b/share/man/man9/bus_dma.9 index b644eeb2a476..0bf27eb5eb22 100644 --- a/share/man/man9/bus_dma.9 +++ b/share/man/man9/bus_dma.9 @@ -197,7 +197,7 @@ in addition to restrictions that differ between unrelated groups of transactions, the driver can first create a .Dq parent -tag that decribes the common restrictions. +tag that describes the common restrictions. The per-group tags can then inherit these restrictions from this .Dq parent tag rather than having to list them explicitly when creating the per-group tags. @@ -733,7 +733,7 @@ Fills in the selected fields of the template with a variable number of key-value parameters. The macros listed below take an argument of the specified type and encapsulate it into a key-value structure that is directly usable as a parameter argument. -Muliple parameters may be provided at once. +Multiple parameters may be provided at once. .Bd -literal BD_PARENT() void * BD_ALIGNMENT() uintmax_t From nobody Mon Oct 27 06:27:44 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cw3TX6mllz6FYvX; Mon, 27 Oct 2025 06:27: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cw3TX5CZ2z3Qxk; Mon, 27 Oct 2025 06:27:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761546464; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nzJxm11DL9v8o0D92e7LzPWzb95vXcqpnNJlfCVZKRU=; b=F8vrqgbeI8e0sEpFcqmCdg5E5aI+2Fbj92jOeC9t8m0WkNlNwtQxpNYlZw9BS6QNP0Z7An SvTwLWxcI/PMwwVNn6xm2lWU2YD9FUzdzoZkD/ScZ6Z28RPBx47wPEhxmrFhPY+qOI057l YOS2OnGgjoyI9C6HczTmivBo1ODfO1EvvJqRHVKSL35qkpdV6M3DVp/o+dQ6NS4WNHgidi M61/lWNi5CQ6hGWCgUmYqHxjgY7W3cvlosl+omTX05RefiPJWU2hWajgkrl70I6DEVCHCU TPvegqeUXMEPORITP75UKkmL6OF41qFEayKjO3CO2AhLkPUJjzh5vy8eYQzQWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761546464; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nzJxm11DL9v8o0D92e7LzPWzb95vXcqpnNJlfCVZKRU=; b=SMGuIDdWqd+hyUxW38qC8X9AFYK0alH85IW3mhyAy69xxXXbq3GzlCJQf8Ssf7R9R95lDL BZ+MVpt8TLUsUzoO8Dg4hlzk0RdAqX/YPKT8hIJM/opqoxDJN/zvSAFKsGTwN84rPjpWvg Y0TI8q/gJHNZN96Y2Wz7wGYo6f1EL0y7XlcHC7zPnT8NXm4aHhn+NglkC10TCbXg9TlZNa xFvMgQBwtR5hBTJo3kGktMwaC4bL8sS+MEvV5N6reN8A+cgvcxPcADvyC5VEpMV3OqsxdS wH4CquoQmT8UzRrLXGK3z42UITMfxh8btiI7DFEayJXx/Vp+iPzjdx0557rPow== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761546464; a=rsa-sha256; cv=none; b=y0+AxtoYcAFAqTWPbmmkLhmTRUa11pvvGgW2ZB7F2LzG6YI5NPIdKBJHADk8EjJjjixrQP N+dPz5PmNnpn92Om2g54bitZvWQHMbgRNZOJVk8Kpvu93zMo12QVNtk/uu0bD7ta3MY/Vc dnquRRXrdWhhNLx4t+OZ4XR5kqmr5ykmnhM4I+OjUhnqarDRhkZ9AqSXnwl5j9XZMdXhFy J/aM1oT7CCmeuSbCrhOvkiGRwjFRj030UIkLguQPj7sC7S6GzIrMqDq1gBNCgN3wFpYtuj LHtNMbSCBXaJ6G8RRPpyhNsrHwmOymsWFKrUocXazKGyA1+OJoNNxetEBdMOLA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cw3TX4jwWz16hN; Mon, 27 Oct 2025 06:27: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 59R6RiAT038930; Mon, 27 Oct 2025 06:27:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59R6RiB2038927; Mon, 27 Oct 2025 06:27:44 GMT (envelope-from git) Date: Mon, 27 Oct 2025 06:27:44 GMT Message-Id: <202510270627.59R6RiB2038927@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: ad7bbe691b45 - main - copy.9: Fix a typo in the manual page List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ad7bbe691b453039980df729f32fffaf02ffd21c Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=ad7bbe691b453039980df729f32fffaf02ffd21c commit ad7bbe691b453039980df729f32fffaf02ffd21c Author: Gordon Bergling AuthorDate: 2025-10-26 15:39:32 +0000 Commit: Gordon Bergling CommitDate: 2025-10-27 06:27:26 +0000 copy.9: Fix a typo in the manual page - s/heterogenous/heterogeneous/ MFC after: 5 days --- share/man/man9/copy.9 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/man/man9/copy.9 b/share/man/man9/copy.9 index 8b2d0dc67727..3a3105ddf644 100644 --- a/share/man/man9/copy.9 +++ b/share/man/man9/copy.9 @@ -43,7 +43,7 @@ .Nm copyout_nofault , .Nm copystr , .Nm copyinstr -.Nd heterogenous address space copy functions +.Nd heterogeneous address space copy functions .Sh SYNOPSIS .In sys/types.h .In sys/systm.h From nobody Mon Oct 27 06:27:45 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cw3TZ1SqCz6FZ5y; Mon, 27 Oct 2025 06:27:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cw3TY6cVNz3RGL; Mon, 27 Oct 2025 06:27:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761546466; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QU4Ca4rt5YybCdP2tE22kNPQETyLkwiGRSTTywp3FaU=; b=NlVdZMxcKEGly37L2JfczWgLFRX0aK9wGRZ6RS/+cLupgxd94yKO2AuMWnyyNSTVSxkaDD Gifr6Qp2Wq07MKzyHB/ykRl6PPrYAWXaHMpjMy8QI8s1mKeOx65Ei2cvHE8Gswn98ppz2W WKYraWixG7IOUmV86MpqzsFZqLkQrg5c4tUwjMX+tN9x1PJ2unyTIrQpuJ7b/5Y7GdM5aF GIAGatWn2ck3cOjCwOgfn6rP9s7JR/T+uefqhQQpAGp1B77fcYxYvHuUuG4BR/jPpRsJyy VtUfKKamKTsbQjvc6eM1C6hmpr0fqakCcvPJRG07oUE9JwwzO7dhM/IQ7tLYjA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761546466; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QU4Ca4rt5YybCdP2tE22kNPQETyLkwiGRSTTywp3FaU=; b=pKkBG7ABSnPr8nXBxjtG0WGnY/AW3uzGMueZ/YCrLal4ammvQhIjPp+HCko+AQegbI3zWA jQqTQurPyfINAJcQkxtJYGBvo0kQECQEe0iV6LjmcKgtWD63sNeyIJ+fH/jWjaE659ppbj brVfCRGMh+wEBnkLiABL7xTSNyXTLf8+owPp7sdymlSV0nShQJGuD34neF3xbZT3CyqRAa qnUJfezoJDwXj5EGz/KW4RYyN061XRYELl7mQM8QM7s7QWtgLJZbMOTV0uq+dPc+kFw6Yr LZ+4hnJ5m6ajA12RW2+S1CcKY5KFDMto5Fdj62e7f5MwTKif/b/KBOBbPhnDmw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761546466; a=rsa-sha256; cv=none; b=k044CkPDJpZyAUWdHUiiX1pdCanCMPyBVu3iQxk/qNiDjyymx3tpvOwK4uTYtMJvSH+Bwo FxR4QFe8sTbCM0UKVs/ilxYIwT7m6S3enTwsrXrW6Hvp2jssAxObuXFzDHtqcyMp7fMj16 qmyoUnmh7oj/ZiaOATLzbWlRtX5r53dy5VwP7xVqA/QOTqFy4YjB0OgxqVSYeCU3987RWn MS6NDXmSoh2/C8ULfR34q2tacnZKfyiYd+4DndlVDkEYplWitlPQkC+qcerd+8V9fbyKf7 q2k2EI4RptPZaymeVPWGdDJ6IOEK8mM2CTnB4gOkht+/6yNZxQg5uYA+vUCU2A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cw3TY5x9pz16Xh; Mon, 27 Oct 2025 06:27: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 59R6RjUF038967; Mon, 27 Oct 2025 06:27:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59R6Rjn2038964; Mon, 27 Oct 2025 06:27:45 GMT (envelope-from git) Date: Mon, 27 Oct 2025 06:27:45 GMT Message-Id: <202510270627.59R6Rjn2038964@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: a1e76a3af8d6 - main - crypto_request.9: Fix a typo in the manual page List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a1e76a3af8d64b400100d8ab595eeb32cd79d358 Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=a1e76a3af8d64b400100d8ab595eeb32cd79d358 commit a1e76a3af8d64b400100d8ab595eeb32cd79d358 Author: Gordon Bergling AuthorDate: 2025-10-26 15:40:47 +0000 Commit: Gordon Bergling CommitDate: 2025-10-27 06:27:27 +0000 crypto_request.9: Fix a typo in the manual page - s/througput/throughput/ MFC after: 5 days --- share/man/man9/crypto_request.9 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/man/man9/crypto_request.9 b/share/man/man9/crypto_request.9 index af62b9089561..77e6a60b46de 100644 --- a/share/man/man9/crypto_request.9 +++ b/share/man/man9/crypto_request.9 @@ -383,7 +383,7 @@ depending on whether the driver is implemented by software or hardware. dispatches the request asynchronously. If the driver is inherently synchronous, the request is queued to a taskqueue backed by a pool of worker threads. -This can increase througput by allowing requests from a single producer to be +This can increase throughput by allowing requests from a single producer to be processed in parallel. By default the pool is sized to provide one thread for each CPU. Worker threads dequeue requests and pass them to the driver asynchronously. From nobody Mon Oct 27 06:27:46 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cw3Tb3FR4z6FYsT; Mon, 27 Oct 2025 06:27: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cw3Tb0Dgxz3R7p; Mon, 27 Oct 2025 06:27:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761546467; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NbZyfh+0Dg5do9INq7IP5KD5i60ewu2qF/a9vwcQQAE=; b=PYOc/b04oi/gTUppJYgoPz9a2gZXLIVCzDZLtLuSuE3O4LMkH9VFMYynQlpz/6Pi1mFMKX Mnn57/D+4/PsoX5wAk4dD16ozLIlPcJiQet9UX+gYNs0Xic+jCCjMHmcnlYoU6iLy7pFOz yGJvUrVwKh367T7w4DSLVSyvpHpU7wxAoYzo5qgODMGlyLfM3spCSTZzU7FdPu7RzdY31e Ax1Jk3nqgQhtME0aVdByOCxaCY8BFN8g5fMf71f3iRoAYm6jXqDKYqSkTqwE/cgyzYjuBC Uhbvx7O6LQ3DLr7Vs0zKzpWX+sNmb9XFE/ri9U3LFRXcxEYzZkzxdLohJNw49w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761546467; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NbZyfh+0Dg5do9INq7IP5KD5i60ewu2qF/a9vwcQQAE=; b=ECrCvwrlb5MAawecTZThF+crqfz/LbHE3b9BgQQhBPaISeeHT/Z+uYg+wmRMCdQ7qdk2vB jUKHLnFkIOq/7drxu4d8xs0We2gIoOHZZiwR4yqIQ8lcPSTa70rRuiRXouuG7Q4bndMSmI mLk1gjimWRM4korwUSvF2zw4rgB6ARgBm1BDeiSNhwoWhZzfCBPuUXen69V5j9DT6VFhqH PuwO7LYRpWb5mU/isSex7EYMrnX/fajW7rna9ZGxQMubF9GihRPI3RTtyXAMSpdf6gmF6I M3/P11oawE2KHsnncrr+235jim9LHWPtW0Q+IUenT+DmEMqyQ7RHMnp+0eXMCQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761546467; a=rsa-sha256; cv=none; b=odU7I76UMPvfdQrPKnIwoDZXLuCkw+BR0HGb4K+WxgHQddtgYS2g2/B+7WuRWbxleTFnkM cD6lH2yIrctAZkezm3T4DP8V1GTgPxDDzf7GMiApWqQIUNKminT9BcPa9XKLw/rpLdUS4p KlyjJFKQOxouz0LFTmkngjCoSW3TXG08RWXNJAPu22ZeQbUL0yhTl1GWh+foJg5k+t5o4j jcia2dZgh2IwbOerwiLC3tjhd7+hl4MN8sMg8KnGslhy/1KUTK3buTL8E/YzXXxAjcBIzy NPrMaAXhC4JqK2n4Wr1g4AE5PZcyFaPn7iRP08VQB7Q7KG72/3AxWMPf9d6LQQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cw3TZ6tc2z16hP; Mon, 27 Oct 2025 06:27: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 59R6Rkmv039000; Mon, 27 Oct 2025 06:27:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59R6RkWm038997; Mon, 27 Oct 2025 06:27:46 GMT (envelope-from git) Date: Mon, 27 Oct 2025 06:27:46 GMT Message-Id: <202510270627.59R6RkWm038997@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: e17c87d4a275 - main - domain.9: Fix a typo in the manual page List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e17c87d4a27509ed8324e69056b06dec878db064 Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=e17c87d4a27509ed8324e69056b06dec878db064 commit e17c87d4a27509ed8324e69056b06dec878db064 Author: Gordon Bergling AuthorDate: 2025-10-26 15:41:37 +0000 Commit: Gordon Bergling CommitDate: 2025-10-27 06:27:27 +0000 domain.9: Fix a typo in the manual page - s/exprimental/experimental/ MFC after: 5 days --- share/man/man9/domain.9 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/man/man9/domain.9 b/share/man/man9/domain.9 index dab8cff89e12..d7e743eaf247 100644 --- a/share/man/man9/domain.9 +++ b/share/man/man9/domain.9 @@ -173,7 +173,7 @@ Once a domain is added it cannot be completely unloaded. This is because there is no reference counting system in place to determine if there are any active references from sockets within that domain. -However, the exprimental +However, the experimental .Fn domain_remove exists, and unloadable domains may be supported in the future. .Pp From nobody Mon Oct 27 06:27:48 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cw3Tc43WVz6FYyS; Mon, 27 Oct 2025 06:27: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cw3Tc1J7Hz3RK1; Mon, 27 Oct 2025 06:27:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761546468; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+RhcsdUNVIwYHwGBeA5I3u+LGmKlTTAVJ4Yp5lI1P8g=; b=Mc2EZpRlnaHHhdU+oMdOthjNInN/XzcR/ZZYSZKgO0lJDzBDpyt+cNkxCt4h/3oAoXZijj QCKP8QtBBQvFvp5gm8NcDA57wyMVflOIWMQWY/hi2XDOEdbbc6S4rNrR3NTBq4RTZV/OzU /xUtkjlIahJFiQSWlJx2eNdGvzTZIhWhs1mjHPhjX5mhLD1nHTv2TOZ01rqa6jPYNybX6b ENz26LsDLnSusRH3ntecxeu1qrHayzGBnHSlB1CSEuQKCO03QqPpeRfb0Y4K+AB8gihvNP kYMrwi4BFSiTenIP2CWFGDcGj9bs3JAxQDGXezWduIUO6kKRxOVVByHbm3WyfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761546468; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+RhcsdUNVIwYHwGBeA5I3u+LGmKlTTAVJ4Yp5lI1P8g=; b=UQNwzqiL4n2Ihy8D9JCZX04F+dQW3fnSq1xKX1Z01cRw0sqcqJQAWAKanjNrDUEUrx240/ 4JclWEMk1Xp+pxpUJdyJFv1WmHAM/LU8qL7Ji95zM4z5+xkNgyEhLEKJXXrCXv8LXpMNFA whyQaiXJbFCibHxyVY5vefJElKgn878mRkICXHtgtmN+nIUpqXyD3ZqbC4loIFDSQQntbo xcRSkH1y7VatfEgCD4NcxnR2md7mjeEGUK7hgPvX7B7+/SNmdL2YzwR5Gr0Z/U5USetqWd 4Tvk07CoktB9qWXBiie566w2aZ4CAbSl8Rg0u+8aPEBE4bfrJX9+utDYK+2VBA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761546468; a=rsa-sha256; cv=none; b=q9nEEUHGs37oTl0qN2UJ2WIl/EguRMRcuLrQ1NhHxrI6XWDa565Hc1NwBtNvq/SjjvxHgn /IETUHnALYG5xPMPhVNxU7NGu4eeSNr5iZB4DdNktIyJZa2hNi/JrZ6cEtksdzaikqgXuH 0Gg+sTDK5psyoNMy9bMp1q4DN7JAOsDaL+2r3NMmnKHabo771IDX5HssL366AYCBD9pBRP ru36WeojfOIOcQcDjePtciLJD1KOL5oOnb7sozgYsK6Xxx54L4W2rmHzL0/h91b8B6Fdjh LFkrDrVY4wh3mL3BFaTkZYNWsYifjKf/0aKaJemNEFwjt2rNxpopB2G9t66vKQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cw3Tc0pPlz16mV; Mon, 27 Oct 2025 06:27: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 59R6RmdX039039; Mon, 27 Oct 2025 06:27:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59R6Rmkf039036; Mon, 27 Oct 2025 06:27:48 GMT (envelope-from git) Date: Mon, 27 Oct 2025 06:27:48 GMT Message-Id: <202510270627.59R6Rmkf039036@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: 1a28455cb5f5 - main - efirt.9: Fix a typo in the manual page List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1a28455cb5f59de98cd6085fce500b457eb80847 Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=1a28455cb5f59de98cd6085fce500b457eb80847 commit 1a28455cb5f59de98cd6085fce500b457eb80847 Author: Gordon Bergling AuthorDate: 2025-10-26 15:42:42 +0000 Commit: Gordon Bergling CommitDate: 2025-10-27 06:27:27 +0000 efirt.9: Fix a typo in the manual page - s/retireved/retrieved/ MFC after: 5 days --- share/man/man9/efirt.9 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/man/man9/efirt.9 b/share/man/man9/efirt.9 index c31f52bf2245..e085916801d5 100644 --- a/share/man/man9/efirt.9 +++ b/share/man/man9/efirt.9 @@ -183,7 +183,7 @@ is NULL. .It Dv EIO The variable could not be retrieved due to a hardware error. .It Dv EDOOFUS -The variable could not be retireved due to an authentication failure. +The variable could not be retrieved due to an authentication failure. .El .Pp The From nobody Mon Oct 27 06:27:49 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cw3Td5zgmz6FZ1L; Mon, 27 Oct 2025 06:27: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cw3Td2JsQz3R3l; Mon, 27 Oct 2025 06:27:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761546469; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MKZ6wTkYrjn5Hbx/UFtGJtTk0VBRHn05HfGhhKSTzIM=; b=vpA7qOORY6eSbpJN9wlOh9ZdQ0oXZDC0aI8nnIzA+c0LSqkZXA1InroB/KP17c6e4TJU8q qHShY42rC1RaDYCZsgDN+C7rWU9uumGKeOCYRdWQOp5yGRiA5oeKyPZLSuDJDJGXKNI6p1 CNDb8+sAX4lQ+hFpLj0Smpe+taV3R38PWhC5OUWPzCI5t/clEeRh4ejRQHoEi9k0mtaCMC vdfJiXDcw7Cnj8BkylduEJcRX5TEAEk7oYBRVuZCwdfEwPutTb6Crs+XkwOO9igtqSnUBG jtuTWoC8rJ5yY4lvHXibFvMgPcKpr2nyaJaMvqh+PHN7WeoCPkOna+GT01eIvg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761546469; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MKZ6wTkYrjn5Hbx/UFtGJtTk0VBRHn05HfGhhKSTzIM=; b=GiIiNxwoyupkLQy4AwtTMVU79lwU/W2C2ZOySZK2k8BXHyCH2Y93pHYoBzf5AfEF/ld23s Iif/Dh1ciM0J/ShiTo+/Ct4OhJM2O3ZIh8Uv1Yzs5t7NwfxH3J2IkaguniAEYyKfH/yS2V +fz9tuwE0bwiRfxmxUQfXXu/8swg42wn5mNR2RitykDNcl7SIFCGCPmF6h3ZrZ/pUB0ENa OPMcXqO+Si20Nzc6/bSm/ZRn0vCuR09yJyko+K/RAWnrA/yUt0Sq3leoa/dzMcu+Zrl6EM o6VZ+09bo7j3+YPEFTMdPUfgoCzOD7zTXdsLueMTbChH672MJHOXdjKj1WagYQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761546469; a=rsa-sha256; cv=none; b=cMvryzGUky+oNuLahoRUYAVySjGaXFTEqt2nENBC8u6jnh30lZwW6v5U1H2C60+mQ0xcFA 1YChqeBJZCjARugDifY4rrw22t4apiFmR+PrGWQs1ew/DnMg7NumOaBMcGPPU/XNss+u5h 428vPQ++j5BDvEM6T4+88MGDu5Y90c0nTjY7KmczxPMSxDt1lQIwAi/prbl/mB5cqUA/gH H7s2xAP6gECbEXS/qAh5EUMqRnFF+xHCYmGUBWa7ZlYsHMWeXZ6m2XzvzDT9BAKW8gF8Z1 EbV450mc3dCMzklOFArFtP6rFvCzAiinUFtRQpHwIXTqylN0wUMu7HDtG81vpw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cw3Td1pJYz16hQ; Mon, 27 Oct 2025 06:27: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 59R6Rnjw039072; Mon, 27 Oct 2025 06:27:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59R6RnNU039069; Mon, 27 Oct 2025 06:27:49 GMT (envelope-from git) Date: Mon, 27 Oct 2025 06:27:49 GMT Message-Id: <202510270627.59R6RnNU039069@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: 187a0a85e153 - main - g_geom.9: Fix a typo in the manual page List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 187a0a85e15377405068663af743b78481e5564f Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=187a0a85e15377405068663af743b78481e5564f commit 187a0a85e15377405068663af743b78481e5564f Author: Gordon Bergling AuthorDate: 2025-10-26 15:43:35 +0000 Commit: Gordon Bergling CommitDate: 2025-10-27 06:27:27 +0000 g_geom.9: Fix a typo in the manual page - s/strng/string/ MFC after: 5 days --- share/man/man9/g_geom.9 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/man/man9/g_geom.9 b/share/man/man9/g_geom.9 index c5b0c0aded2d..99d0ba074e89 100644 --- a/share/man/man9/g_geom.9 +++ b/share/man/man9/g_geom.9 @@ -66,7 +66,7 @@ function is very similar to .Fn g_new_geomf except that it accepts a regular string instead of a .Xr printf 3 Ns --like format strng as the geom's name. +-like format string as the geom's name. .Pp The .Fn g_destroy_geom From nobody Mon Oct 27 06:27:50 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cw3Tf5P0nz6FZ1P; Mon, 27 Oct 2025 06:27: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cw3Tf2t0Jz3RHP; Mon, 27 Oct 2025 06:27:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761546470; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=u2zThzij+H5MPwaw2Txd9pIGMRGiZpalx/D84LoSU3I=; b=rm9utL9NX0dp5rPgaZIoJrN3ZJVPOSXMP5eznSzZwm4F4oAPwcszfZhlI2OOOp6hGXaPc8 zbclwBLTxNejhEVHygxJJflKA3IL+BXHblDWZxLC5sxe98chrEXsOqVNM+epRuaueqWTfx D8Xga9zBi/AcDKO+JbgVZS7sD+J+Bz59+Wa2+PQilnps5m59Gr6dfRDS5OYhQgesuVcq7M c4MjY1IzeYn7PNOwwYXwReGR6wgG1DmD+IdPjnGYzHAXTqSXWoCjFHE0GCCOulrv9k+6sy G03X1CiGAeWBtPW5jG6dgQBFhgqHxF/bqfg6MgLfceCH3yoD21qo9LIZ3Tu4eQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761546470; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=u2zThzij+H5MPwaw2Txd9pIGMRGiZpalx/D84LoSU3I=; b=U3aX7lg0PH2urqIfeoTufFuH84lz14A9h+hxS4qQx0sHGVjECcNsNFoxiF+Ss/0Uz21OxT YN73MZZ+mq5kvg2Ersk5t/IOWm8WnsQ8ytWhPEWs+YgmdVbHUsbcxQH2wR3a58FDI1HPre PNi8kKZDPqOcLvLqO4U94hiaHyS2IAaQNdqzpGmRaj+CYiQKJiotgH7wKSbFQnlYvXKC1W e6b6XIswSXoMvvNZ2F6zcsPlJyoCTB2O454/f5pzZAYukUv2wYaNMmF5lBUHc4ifDhmHkV IhlOiqgAZz1Wuo+ptk96tamkK3vmlaL92whuD8SUqrEtOZKIapsz43ueGOgPtQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761546470; a=rsa-sha256; cv=none; b=qXTXKg66ZQ6216N6sxycl3ufVzZ151eJjwGXfhZALgYBAFePeNMMMJnv78wEil9pvBjKi5 XdABxOuv2znbPl+V23NUvfBfxIsXMfpKi5tcc6FoBlSgNQwS6ehoyRV3WQsJh3B09aSMT+ 0OOUkEwKIyI/Xd1lbDmxtBhjfKhpDOsWu6GAGKGDd7cTf9hdo2rmZvIl0fxJOXHQzS0SCP IcTu7974AtFOO+o+M+mnNfzCPqMd9ZF3fjllb/1w0dOXyntbsACR4ADi11mkIXK6Zjanwn TxpatFV7ieFZCi9GnYWRsR8FO6TKlHfNfwlIctj/rdjiwSvK0jtwwCcO2xsLoQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cw3Tf2RvVz16hR; Mon, 27 Oct 2025 06:27: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 59R6RomH039110; Mon, 27 Oct 2025 06:27:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59R6RoBA039106; Mon, 27 Oct 2025 06:27:50 GMT (envelope-from git) Date: Mon, 27 Oct 2025 06:27:50 GMT Message-Id: <202510270627.59R6RoBA039106@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: 576e735efb85 - main - gone_in.9: Fix a typo in the manual page List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 576e735efb85cae5213621981ed33ced8878a352 Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=576e735efb85cae5213621981ed33ced8878a352 commit 576e735efb85cae5213621981ed33ced8878a352 Author: Gordon Bergling AuthorDate: 2025-10-26 15:44:30 +0000 Commit: Gordon Bergling CommitDate: 2025-10-27 06:27:27 +0000 gone_in.9: Fix a typo in the manual page - s/Initializaiton/Initialization/ MFC after: 5 days --- share/man/man9/gone_in.9 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/man/man9/gone_in.9 b/share/man/man9/gone_in.9 index 7521adfda204..ebdc1ab19bfa 100644 --- a/share/man/man9/gone_in.9 +++ b/share/man/man9/gone_in.9 @@ -1,6 +1,6 @@ .\" Copyright (c) 2021 The FreeBSD Foundation .\" -.\" This document was written by Ed Maste under sponsorhip from +.\" This document was written by Ed Maste under sponsorship from .\" The FreeBSD Foundation. .\" .\" Redistribution and use in source and binary forms, with or without @@ -72,7 +72,7 @@ Obsolete code will be removed soon: void sample_init(void) { - /* Initializaiton code omitted. */ + /* Initialization code omitted. */ gone_in(14, "Giant-locked filesystem"); } From nobody Mon Oct 27 06:27:51 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cw3Th0MRmz6FZ8D; Mon, 27 Oct 2025 06:27: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cw3Tg4358z3R6X; Mon, 27 Oct 2025 06:27:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761546471; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0XDGmKiqYwas1jybMGO0Ph2eZlU6O4d3QZFfoA5TgjY=; b=j97WnCEPZoDluLfhP2hFs9QUtWYSsBhuiW/LoKmBdNoxYMxfJ1axk9Gu0pGg1fp6YXh3W8 k/SGn+5CBLdizbF4t8Fv1L7sIerLKdbuw/vry/X0Au6yle6Sqpk3NdKhf8tgwidZ4Yhw4u vRfeBYtNuESFmZZkaB8QyasPmmVBiLORGAGS95e6y12QrHB4wPJR1rxMGmGi2U0cQELcbR 4fWwnsZXc8amhktUr28+DeuVHH+Zv3WZKkdr67NyHi+NrJkK16QD85Jk6ZfIMlTeJ3552L 64zPa0mFShhQnGMvYl3BBWrQL2p3DWz3DS7XvtoRFc7Lk4JrD4ubhhrcXUt8pw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761546471; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0XDGmKiqYwas1jybMGO0Ph2eZlU6O4d3QZFfoA5TgjY=; b=nPMdiPOTruWhbJ5ZUVJjrsR95NzkOUL5nFc4VvRJ7+THH9TNRLBhLbgjtYAPRrKVmOGOjG ljd6gO3MX1ECD65KTaoMiUruTo9XHkJ1P2heoZ9740ZdvfrmTyscv/PLJHMNqrA9ZK8aMT PLpiWDXzKUv36DSpjin2nTesqxTDvhf4b+Zn8D1ZY1ys5g4QguMAp7yZrwiLCK4TmSfR3P /yR3Vp1h6vIXGLsCzRT1v1aMMSmaxjRAIWALz0aSaORJf1ew+YURPLFhWTD8Mf0YQsza2l EGBM2AZ/BJ+uu2+TrEYWQwBnp+NzkJHSIR4STNwsL2RrxMqpR0FLlzK6ZGsPDA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761546471; a=rsa-sha256; cv=none; b=GX36qg9QDOGbZEYNapQoZ6MFA3xi1aosZFzxqbEpWdx5yPU666ZZNNAJ/5eGKyRRHulBHh gZ8CVVXrYLtfQLazh4OfFjfPFlnUkuITC3dSZ72iN+vyb+m8TNRc5/FZ6YTSd+MyjHLoRS qLngMoDz7IKKW5sBHcXO1Y/rb4iSZT5/HIa8aDE6d3Pykvxth5+CoYEhdAYMWtqAm7gImn Hj2kGRu5eVudjxCuguP3aQG4K4M+JzoiBlyxB2ub0INnSezaI1pj1Wc4/uFqKopK0/C5JH Ve8SS/FScnor+LVPPQVzz/w9WDcHtTj7PAy/eLPrriYpE7NAtCS1iGNb9PRZSw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cw3Tg3NG3z16S7; Mon, 27 Oct 2025 06:27: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 59R6RpjJ039145; Mon, 27 Oct 2025 06:27:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59R6RpHZ039142; Mon, 27 Oct 2025 06:27:51 GMT (envelope-from git) Date: Mon, 27 Oct 2025 06:27:51 GMT Message-Id: <202510270627.59R6RpHZ039142@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: 73a78c2dc99a - main - ifnet.9: Fix a typo in the manual page List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 73a78c2dc99a3942d8e503c62537d2f3838a6954 Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=73a78c2dc99a3942d8e503c62537d2f3838a6954 commit 73a78c2dc99a3942d8e503c62537d2f3838a6954 Author: Gordon Bergling AuthorDate: 2025-10-26 15:45:28 +0000 Commit: Gordon Bergling CommitDate: 2025-10-27 06:27:27 +0000 ifnet.9: Fix a typo in the manual page - s/addess/address/ MFC after: 5 days --- share/man/man9/ifnet.9 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/man/man9/ifnet.9 b/share/man/man9/ifnet.9 index 3c45e4f29e2d..e81c2990c13c 100644 --- a/share/man/man9/ifnet.9 +++ b/share/man/man9/ifnet.9 @@ -482,7 +482,7 @@ This is initialized by driver at attach. .It Fn if_getaddrlen .It Fn if_gethwaddr .It Fn if_getbroadcastaddr Fn if_setbroadcastaddr -Access the interface broadcast addess. +Access the interface broadcast address. .It Fn if_setmtu .It Fn if_getmtu Access the interface MTU. From nobody Mon Oct 27 06:27:52 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cw3Tj02xgz6FZ1X; Mon, 27 Oct 2025 06:27: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cw3Th53bxz3RDt; Mon, 27 Oct 2025 06:27:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761546472; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qZ+jQQxjnS9oLpX7Vd1oI23qT2jaXl+f1nLingjMMOQ=; b=y0MySYwbrUIVlbXUMIeCJyFVBLjZl2y8Iviyv9ICfDd95m5g9nQu5DLavlznzJuz1z8FUT nX7mWUKnba6lG30A4ZfQR/ICjx/AmyOP9LaM6wMxc/XfIjMlI4QGfMPMWoU8nFDuoHzprO R8DFqyOAH68H+hR+eHjab80peAIkhvidinLJdGJvwUj8Avtos6AvICVtUnO/B8uQCPu9mD 2InbHz64KU8ft8xBKcHjo0i9ZRTCoU8GANqsbLip/ONR8Z8lQSGdUPFQ+z75PXg6mevdln 4IkyG3z7YAUXLgM5Y8K+aB8v2tqc0MAmfaalrbbCdtDr/7EOZVamGfviEYhoSA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761546472; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qZ+jQQxjnS9oLpX7Vd1oI23qT2jaXl+f1nLingjMMOQ=; b=rlKxjrRlvyF/UAGu+DBKFvdxGqe6j4m/XlNkUAX8UuwOlHedQ8riMUMOPpiVqQ8Oqlc6Ky ThZSqmKdt0ssmPi6UABlrdCCNjCidzdPtAfN8QrND1qa+wuJkdqP8zMly1t/WY2Q8JriSY 1THAkNDwm7V3enWi24E5tWW1j+0HrBQ4AB6VG8t6cjAxaHcI7iCup1+pKs721DUjvl58Cp QaQYTuJbe9q1fI8ZQcdxBufHSk2aVdVSS5y+NJ17PDQNxziArXxUOjmL+OS68lFUCxaAex PYRdVP5SzP5vkuUit4qw6zMe+BK7FqkDcTaM7T1p2cwjb0mWBOsEQ0kOgjSxCA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761546472; a=rsa-sha256; cv=none; b=O+meB7YnnWGDVoPtJy5fUbf2uGGCVC08ZcIvXjXxggED01T37D5pKPdUtZn4UqoaCF5Sbv aY+5Sx+PYHBlmw7cPbb7BZQ7oNv6K4nx/GD1qFsm2QuetuYh7oSAzK8CzUXK8RVSLiZzEP AC5TjRZN9xxoS/0ldyNz3ZmlVGgomeWR4u3IayQYr6X2o863Dln3nZOeEQXO/W5LBDDzGe zdVpQY7pRLsM3SnJx5f1jehZv2Z1fnS9x/GISRdokFU+f0NrR10t8QIXvANrFEAWZOIRrb O9Bp7HbMfBi1G36wVJYo4c/ENaDgFa4I2iiXINnQx4xrJjQdQU+IFAe9fgTtPw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cw3Th4NHLz16Xj; Mon, 27 Oct 2025 06:27: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 59R6RqEh039180; Mon, 27 Oct 2025 06:27:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59R6Rqtp039177; Mon, 27 Oct 2025 06:27:52 GMT (envelope-from git) Date: Mon, 27 Oct 2025 06:27:52 GMT Message-Id: <202510270627.59R6Rqtp039177@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: 005603cd3dee - main - nvmem.9: Fix multiple typos in the manual page List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 005603cd3dee7610587f1193f9529eb2a42781d7 Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=005603cd3dee7610587f1193f9529eb2a42781d7 commit 005603cd3dee7610587f1193f9529eb2a42781d7 Author: Gordon Bergling AuthorDate: 2025-10-26 15:46:26 +0000 Commit: Gordon Bergling CommitDate: 2025-10-27 06:27:27 +0000 nvmem.9: Fix multiple typos in the manual page - s/sucess/success/ MFC after: 5 days --- share/man/man9/nvmem.9 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/share/man/man9/nvmem.9 b/share/man/man9/nvmem.9 index 812cd09a5e35..fa88cbb91854 100644 --- a/share/man/man9/nvmem.9 +++ b/share/man/man9/nvmem.9 @@ -59,19 +59,19 @@ Get the size of the cell base on the reg property on the node. Return the size or ENOENT if the cell name wasn't found .It Fn nvmem_read_cell_by_name "phandle_t node" "const char *name" "void *cell" "size_t buflen" Get the cell content based on the name. -Return 0 on sucess or ENOENT if the cell doesn't exists, ENXIO if no provider device was found, +Return 0 on success or ENOENT if the cell doesn't exists, ENXIO if no provider device was found, EINVAL if the size isn't correct. .It Fn nvmem_read_cell_by_idx "phandle_t node" "int idx" "void *cell" "size_t buflen" Get the cell content based on the id. -Return 0 on sucess or ENOENT if the cell doesn't exists, ENXIO if no provider device was found, +Return 0 on success or ENOENT if the cell doesn't exists, ENXIO if no provider device was found, EINVAL if the size isn't correct. .It Fn nvmem_write_cell_by_name "phandle_t node" "const char *name" "void *cell" "size_t buflen" Write the cell content based on the name. -Return 0 on sucess or ENOENT if the cell doesn't exists, ENXIO if no provider device was found, +Return 0 on success or ENOENT if the cell doesn't exists, ENXIO if no provider device was found, EINVAL if the size isn't correct. .It Fn nvmem_write_cell_by_idx "phandle_t node" "int idx" "void *cell" "size_t buflen" Write the cell content based on the id. -Return 0 on sucess or ENOENT if the cell doesn't exists, ENXIO if no provider device was found, +Return 0 on success or ENOENT if the cell doesn't exists, ENXIO if no provider device was found, EINVAL if the size isn't correct. .El .Sh DEVICE METHODS From nobody Mon Oct 27 06:27:53 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cw3Tk0VF3z6FYsj; Mon, 27 Oct 2025 06:27:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cw3Tj5S4gz3RLD; Mon, 27 Oct 2025 06:27:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761546473; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3TSJzkdPGeiR0g57lBzOQCq+btf/CEr6t6XCqPfc8k4=; b=mmamOi8E6oCIlDsgz0ju1AbdkACAbwmGTHW56Jh+NCA1Mb9n0Arfbkvq0EDTZtoPeBkMiG CU18Ze6tK0+blbtU/QQNRVMfRDlF5aGIj6Hqf0U3VJhrTiXBRjC92IW+BAXYxaFhYDOaYa pVl4qql7UCKAWzjEpIUoFAsGnDpsuu0hkeUP4Vdz6G2xvSLpH0SxIx3/MJHAhIfpyHytoQ V9nn3DYWDfsJpEO3Dd1ViVPIdIzkrQdRFxlvhBK9pNZNpC+GL5lXB7YFldrpP9QNvIlY9i 5NOnOm0y4qdvBWCh33k5BySYor0Ymf7cYoOPEI21D+cVtkgIWm4lDiponJKxiw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761546473; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3TSJzkdPGeiR0g57lBzOQCq+btf/CEr6t6XCqPfc8k4=; b=qfhp97Y7V5XuF56KRIWIthHoegMv56E7Ltt6eEKr8qpYCLvuMx3lE08lalo3lFJGB1z/ez fa9V27SBiZtBq0bUIqYZP4tV0DJgLcT0oskTwQ5/ug8VpmuH87rtubESSShkLe5w5F0jDZ 2JdYKgDGY+MnUCsJuKmeB7/5rlkah7S0YrGZytBWmRdzP/SM0UKCJxuLGAjmRVOXR3z9hv ZoXZ8E/2Qh7BzISz3uq5uxj5j/5+VFVdgR53LUu/YvuEjsWjI8syBeYC+pmSH+NOzotLPU S53DdbteHlan4dJhX7ChcLQVKPX6+5yFRCE9/YYDfBqSZgvdiu1D9UVEyIVg2A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761546473; a=rsa-sha256; cv=none; b=XeO8csActNMRg5hL1Ieru7zPn8H1Rx+04lvsx1dSm8/EHZUHd961Yyis3NS2q6Cj3BVdSM +To6fjwsM0xBynj0fhXpBbdtatm7e+848ZOqrK2R9k6EtfZHJ+XpItbEAxWEfwvWarZo1H TCi1+JzHjYDhrYM7eegJYehgCFeAkx342ueWbTy6wvxQEcQsrjgL5KZOYLc407dHAM6ykL zI3Ps5gE6Qa6N67+I0V+eoyM2pEvBYhLP24xSmfKLDSLdRS09QUtVe17wEf51Il+Rtleyc AcHVwiJ1dVImjduR3ktiUXEpkE5qh3UKN9PstVNFJB2+ZX6QbuoOb9m7/m0kbw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cw3Tj50rbz16Xk; Mon, 27 Oct 2025 06:27: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 59R6RrXJ039219; Mon, 27 Oct 2025 06:27:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59R6RrFw039216; Mon, 27 Oct 2025 06:27:53 GMT (envelope-from git) Date: Mon, 27 Oct 2025 06:27:53 GMT Message-Id: <202510270627.59R6RrFw039216@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: b1f96b1c4c95 - main - ofw_bus_is_compatible.9: Fix a typo in the manual page List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b1f96b1c4c95df5c04e067c638e52c9652f86721 Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=b1f96b1c4c95df5c04e067c638e52c9652f86721 commit b1f96b1c4c95df5c04e067c638e52c9652f86721 Author: Gordon Bergling AuthorDate: 2025-10-26 15:47:44 +0000 Commit: Gordon Bergling CommitDate: 2025-10-27 06:27:27 +0000 ofw_bus_is_compatible.9: Fix a typo in the manual page - s/compatibile/compatible/ MFC after: 5 days --- share/man/man9/ofw_bus_is_compatible.9 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/man/man9/ofw_bus_is_compatible.9 b/share/man/man9/ofw_bus_is_compatible.9 index 1b44807e84e8..fcfe8755cf86 100644 --- a/share/man/man9/ofw_bus_is_compatible.9 +++ b/share/man/man9/ofw_bus_is_compatible.9 @@ -61,7 +61,7 @@ older revisions of the driver. If hardware revision B is backward compatible with revision A device tree node can signal this compatibility by providing both "vndr,hrdwrA" and "vndr,hrdwrB" strings in -the "compatibile" property value. +the "compatible" property value. This way older driver can use features available only in revision A, and the new version of the driver can take advantage of revision B feature set. From nobody Mon Oct 27 06:27:54 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cw3Tl4yLnz6FYym; Mon, 27 Oct 2025 06:27:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cw3Tk6sZnz3RSr; Mon, 27 Oct 2025 06:27:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761546475; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=l0qFjDHPn8l9Meg0gYykpWZkOKTwNUm3i6t62xmtG4E=; b=b6DA17mn/rKY9I8r3/zfipq69+ZOVffZxg3cHHwQuj4eOEe373Ru9zwMlA/nlBgoFOme2p OSxkTahar/VJNKDvuOuVgy5Xj7aotl+yld63GyiyMf+ky71sqh6/At6bzBFoH01LZV0vgL rL2TLQr8SjJX9PdV8OAIdnH/+BtAvOhxwIzX+yDHDH6RffUm3UYFafECCOpmRuNdlanAms 0ie2KqAyRAc26i9AbkfdBMIgIXrG6jkbKYJIfooA+HvuHGIjRnhVdCxmezFA9LxlIFHevn 6Ha02GbJXGgKcc+f8fUJPAEvVdw0xQas0l3oMsghZrqdu1rkRzCNdPahOSDg9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761546475; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=l0qFjDHPn8l9Meg0gYykpWZkOKTwNUm3i6t62xmtG4E=; b=Hs+31F7ENKYVAFOndmyh7cinJlf8/c1EGIcW0cXNS9DtwQMkAULG5rZqSFhv0WUnGHKpSP ztKAY4D/1WGtFgtkHFsgVul3uEuLQwyYzmmgrFiLK44o6QC9wnj+kUknOe4fO+w1hYZd9y EzD/6C1inf5feVY396rWN7rzXtcz7ZFZ1k6q21GgaiJ+NmwYxvTwBdULOd39l5Xz5eNBHy z8xm1Ok7HEX/QVIOjgMWOZo0GrmLoFlQl6iPRNgpfzHWrX+Nvb5kc7ugmjQMXZK//cxVFA 35nYEnaKXj4kZ/+RXcWB58UOzYkg43vI7W9F2bhwgGlY/e30aONzqb62VcA68w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761546475; a=rsa-sha256; cv=none; b=DYedEWYM4PzismsjqDHEPHHCpDxBcwgW1oxppiqRnCjMdc20Vp9v6EL5wG6omhKODROyau ZqSiFVa1VIk7ZIRLQ/EzztrdaCACaI8pYJZDOLONuY04q0QDpqyPspjESWJR2D9qdTavjD wq6F0HLVvTPd4E3m/gN/Atxi1/S2QIrcBYhTAvF1T7c6djiKB1pdQprowMQOZvFIHFHF+z 0QVWeAXgPJ8C5H8//LiOGfm2i2qIjTecd/++CfjWGX+FVVyG7lKI0s1B6S2F3q/1PxsdRq bHiKzfZqssD0FO90VLvdK112/KMsAnypjylWKC1FhDv30f0R1d/r9MGP9QiNjQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cw3Tk6JPkz16hS; Mon, 27 Oct 2025 06:27: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 59R6Rs5O039255; Mon, 27 Oct 2025 06:27:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59R6Rs2U039252; Mon, 27 Oct 2025 06:27:54 GMT (envelope-from git) Date: Mon, 27 Oct 2025 06:27:54 GMT Message-Id: <202510270627.59R6Rs2U039252@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: a859a5c6978d - main - pci.9: Fix a typo in the manual page List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a859a5c6978de121efc7771351d32550ee430b7c Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=a859a5c6978de121efc7771351d32550ee430b7c commit a859a5c6978de121efc7771351d32550ee430b7c Author: Gordon Bergling AuthorDate: 2025-10-26 15:48:36 +0000 Commit: Gordon Bergling CommitDate: 2025-10-27 06:27:27 +0000 pci.9: Fix a typo in the manual page - s/maxmimum/maximum/ MFC after: 5 days --- share/man/man9/pci.9 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/man/man9/pci.9 b/share/man/man9/pci.9 index eeb62a63a2bd..871f69f887a6 100644 --- a/share/man/man9/pci.9 +++ b/share/man/man9/pci.9 @@ -523,7 +523,7 @@ device is not a PCI-express device, returns zero. When completion timeouts are disabled for .Fa dev , -this function returns the maxmimum timeout that would be used if timeouts +this function returns the maximum timeout that would be used if timeouts were enabled. .Pp The From nobody Mon Oct 27 06:27:55 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cw3Tm49qWz6FZ6Z; Mon, 27 Oct 2025 06:27: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cw3Tm0N8tz3RT1; Mon, 27 Oct 2025 06:27:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761546476; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=q2Q3o1Fsu2nG3y9PQHptxApEviYdNVDqQtODJHigc+k=; b=i+hbw/VE7uI5qJ3FUW+wHllQG2giwM+FeibMwVxGS74EiUX5H8YC9uDIPXcugFkXs40ye2 Y62p3axICiIaV254EPcV2rONmbMBpBTgouIqDy1R/Tl+I2ZwSDGMiveqP/ESORkRqvVQ2B yf+s7w5ic+IL48qGM1mOr6iNNbcc0c5FOsQs2tL6j+mAIIErD9Nej4J0TbLqVklAK5/Pgg yWEY9fWdzOBWPk3n45vqOEITX/Ro+ekdPFAlj8uvhq5ehWq3ug52EUQaTpO4Cf2Qj+o48/ BhSzACtWESKN5nQP4JkPwllgesnh6eNQswYsGH28D3Kmd8TNYAeS8UycB6ayeA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761546476; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=q2Q3o1Fsu2nG3y9PQHptxApEviYdNVDqQtODJHigc+k=; b=qGkymzgMF4P6QPJ0OO6D3+jv/Ts9pCeKcc5bwHrw51tHlPHDV7FyJx86Td+pKAzhdJzEyB AlQkLZrPNFDPMjHNzb3NnKJ3DqaEyGezPcCRixHuqp3QqhFDSucC5TPS+/DLhkl0rlQigc aeuE4SljLskbzRh5fDyZ3/9nE226TimPCp7YitTpj3cIwhjsbcbFKsPqLzehoh4svnRe+g HBRYdPqHamM6A9phpnA7jEDpTT5+M1NNbKL64i1jmaA7ddyESsi2E7D/pmFHo1mvKu1/n9 JglZ2rsf06CA6tUF/YxCsxNqKdY/ACbyyt61JDH612Jar+KPYZOrFz62s0wGOg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761546476; a=rsa-sha256; cv=none; b=wOIuCi5MzYOFz8yWkthYVm5ZdUeeWWqFoW6/CU/yly76MCVSHL+DvTNc60dJk2hRBYWqZ0 gXBkLpS4j4osxq/dsq7uNyL8cW0dc085sny9SpiGFlS01jya8SXflrDDSXKKpKa6CtAhID X8oUMe32Tc2qj7kxSkwjVUC4CWxw0Ivc650OMyEwUW1T94mvqrsFWvcRO2SplbCDI5BBCx HzDJxxzSIF2YRp8Oi+AMrjzrs2fRdVCG2p5xexBbMiJIf+DuWy9aKT+02Xm+ZzDTSotd39 OtM1kCs/u81/Q/OvIAGJ/P1Q4XEax5UY/ImDw5qRCYlHDk0Jh5WW0CzUmClhKg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cw3Tl73v0z16xd; Mon, 27 Oct 2025 06:27: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 59R6RtfG039290; Mon, 27 Oct 2025 06:27:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59R6RtU8039287; Mon, 27 Oct 2025 06:27:55 GMT (envelope-from git) Date: Mon, 27 Oct 2025 06:27:55 GMT Message-Id: <202510270627.59R6RtU8039287@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: 40fae644ba9a - main - refcount.9: Fix a typo in the manual page List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 40fae644ba9a27227ca6f7c290e54fcef462b341 Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=40fae644ba9a27227ca6f7c290e54fcef462b341 commit 40fae644ba9a27227ca6f7c290e54fcef462b341 Author: Gordon Bergling AuthorDate: 2025-10-26 15:49:28 +0000 Commit: Gordon Bergling CommitDate: 2025-10-27 06:27:28 +0000 refcount.9: Fix a typo in the manual page - s/sucessfully/successfully/ MFC after: 5 days --- share/man/man9/refcount.9 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/man/man9/refcount.9 b/share/man/man9/refcount.9 index 78631f9a865a..7375f429a607 100644 --- a/share/man/man9/refcount.9 +++ b/share/man/man9/refcount.9 @@ -106,7 +106,7 @@ but additionally checks that the value does not overflow as result of the operation. It returns .Dv true -if the reference was sucessfully obtained, and +if the reference was successfully obtained, and .Dv false if it was not, due to the overflow. .Pp From nobody Mon Oct 27 06:27:57 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cw3Tn4rH3z6FYyn; Mon, 27 Oct 2025 06:27:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cw3Tn147gz3RNt; Mon, 27 Oct 2025 06:27:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761546477; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PvnG3ip1wSeyk5zPr7vGD9NmRjMO5RTQah+QCfh5FeM=; b=bOzxwzT5kWIGWP+4DFv3w2A9ncuFeMxOcEcaZVBDVF/RsQ7UF43yhSwXROs4qBJkRxVRPo N+IPw4nFs8lg9MAJb4ws2bm8Nf2yMxSuYh0TCnj5usD4/2rHhXoYlkNjw7NP8hRmc12Aph GLxo0geo51L7hINckQqZ+ESw8KgHVcxFxSiS66uvVKEplDkyYTO2zR8vpwsWYjFzKmVEyE d5VxsVI4v/F4R0QGs6/aKchkx3LBspmVSaJLEQK32PhOgZxwLbguR6cn3jHl3G7x751UQe SFVAOU0cWeSLeH5FRYHu0p+OZUaDNLB0urPS8UPOuQWjRnXOc/LiBWtywjzpaQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761546477; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PvnG3ip1wSeyk5zPr7vGD9NmRjMO5RTQah+QCfh5FeM=; b=cELbfP0gC1nce5NHnH4fhEh6Ds+rHIIhz+/B2Y1AuhSeKIWPrumMfEvFnazSAwidH/t1C/ XMeB44s4Q+fFrV32kPIyqPxiOaumEfm4XU52PD6QIRj3C33eiXjchUgMufGVSJqpNkiUYJ sypxbQkterNKTznKWzQCpNYn9GCfSpaMybHslPo6BJR53bZ52bq85JhXXOpGkcNJRBSY6+ 6uHlsi+zA37erYA7swy9D8xk4HnZGvFrmNdWXesFj4dkb+2MClUS8KXamfqK8s7shOZXpd P1h49Yms4gMQr9pi3TOTQnXbExSAWGb5lRNFvF1tqul7UN2hOUF5hdb3kqAVfw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761546477; a=rsa-sha256; cv=none; b=YAP6jIgK+BBZThx95AtiQpij/aTPdRwG2Uf0lR6qLJzSjVLisZDOlxpBYUlLqtBS4Sk7sb OiNg8tuTKiB/SoDFHhCSY6gi1pw+KsnK4tR014gtI/jFb/OoEGRFqnDETOYDXnzEhp8eWA wkaRwV0dMaIDM/fc6okysioAXRtampgSKKFmSJ5KwfX4D2VezvtlBeHicMks2tLMWucX2v CqPfcHwqN1D4uyTGdD7KbO7grksknzmYwwSECB/mCHAgMwJEiIBnXzsLnj3LASaySdhlyW 297CQ2oMbcwjtpz8iK5ozO8XpA5IT7my/BEZ5/ZfVzU0aO9DyVicJnFqZI39RA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cw3Tn0c5Lz16Xl; Mon, 27 Oct 2025 06:27: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 59R6RvrO039325; Mon, 27 Oct 2025 06:27:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59R6Rv1J039322; Mon, 27 Oct 2025 06:27:57 GMT (envelope-from git) Date: Mon, 27 Oct 2025 06:27:57 GMT Message-Id: <202510270627.59R6Rv1J039322@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: fe45f7ddb53f - main - seqc.9: Fix a typo in the manual page List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fe45f7ddb53f16198a60cd015c20f5fc524aed89 Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=fe45f7ddb53f16198a60cd015c20f5fc524aed89 commit fe45f7ddb53f16198a60cd015c20f5fc524aed89 Author: Gordon Bergling AuthorDate: 2025-10-26 15:50:26 +0000 Commit: Gordon Bergling CommitDate: 2025-10-27 06:27:28 +0000 seqc.9: Fix a typo in the manual page - s/changees/changes/ MFC after: 5 days --- share/man/man9/seqc.9 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/man/man9/seqc.9 b/share/man/man9/seqc.9 index e13d73ecb5d7..b1e59b6b7af1 100644 --- a/share/man/man9/seqc.9 +++ b/share/man/man9/seqc.9 @@ -81,7 +81,7 @@ repeated. In case when sequence number is odd the object change is in progress and the reader will wait until the write will the sequence number will become even. .Sh EXAMPLES -The following example for a writer changees the +The following example for a writer changes the .Va var1 and .Va var2 From nobody Mon Oct 27 06:27:58 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cw3Tp4BcPz6FZ1d; Mon, 27 Oct 2025 06:27:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cw3Tp26s6z3RR0; Mon, 27 Oct 2025 06:27:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761546478; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yza627sZ/tQsftcWJ9gde9mgTEmU+BPFp1Uw4Xnt/2I=; b=rbu+F8CXzzJ0xx20D/s8O2XlBo6E0d8MVRArgFBiVrenuu7o6zA8tNzBBC1VAyflJ2TAB3 H7SJbxdJzxEmw/cX2pBhn1I8ZxdrUcrzHTSD5isJbMYHBdCA8EhZzdb2Lm1xK60UKnroV6 S6aytgzB7r1/cuj6f1VlC9pnwv9uBa74P0s3TnLf3JZauMie70EUZTWy8UQ3TBkYF3eNfR fu4gu0bbv0qlE/f4xfX1TR2h8jsKjSJ3F5/gIrVSlkdStOGjGNtbhV6Qm51Uh+ivKTee2y tEf8NzC9V+y5bKB07QEE+B90VXEX39BbRxiSbmMftAGGOuEFN5MMhNSCx5QH3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761546478; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yza627sZ/tQsftcWJ9gde9mgTEmU+BPFp1Uw4Xnt/2I=; b=R18P16Y4XrAyXF78oE+h//+dYXwuhOzOrpia2//wJNcQ7Ofx9UI5jAqIIrs1gIz9O2ZS/K EtE26ZdTeGExui2QXjiOpfD6Ou7t1UTY0gH8gxYsJ/X/jN3TKlFig9TiM4MuKZlBPdvivL DuKaf03pJ0WV3S4kvCrjrHrv4ZbgKH0VOrTPV1RkjJ5l30AIoRZXR07SWcJvolC3XpvRRq drUWH95BkS9B2gjJ8oYUyjWavGMk539d0W+PMzBuQN9RfbQnOIdZYtg27ZRt4OicYXB4aM brD1KKgriBcEOs+i6LQAGxX+775uFU9fmSa2XoSPRZVdkkDQSRsqZ84we7dcLA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761546478; a=rsa-sha256; cv=none; b=pN4302yIFotX72dHOPNoJ0+vIqizQA76ErAvUOSi0X4Rlh6Can104e3LqxlXY+z5sxRNw7 Hnf6PHYwWGUazP8QoI7V4pQ0hBu+gl+R1Gp5kdLSSDsw+MjVBP0zKk2JyypAAeSYZs3eCq NvjqSVUAzuaRK11QVbhmU8OE0RDKXV8ppD70bem1Tnp3d9x4E1i3hYSzpevkODy/pzLAq4 pd0U4HT9NiyBmfx4TnSYoxiexxkPM4jancCHsYgvGysUTeAgU77jM0rMWIdRx0Om0C6Ua9 sdd92ajvnxCeCrAHcAvUCMRTzJR4oFZdlngDDQFui7Cq8QbOkDoV28dSYctDug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cw3Tp1fVPz16Xm; Mon, 27 Oct 2025 06:27: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 59R6RwUm039359; Mon, 27 Oct 2025 06:27:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59R6RwRI039356; Mon, 27 Oct 2025 06:27:58 GMT (envelope-from git) Date: Mon, 27 Oct 2025 06:27:58 GMT Message-Id: <202510270627.59R6RwRI039356@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: 8eedabfe9ac8 - main - style.9: Fix two typos in the manual page List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8eedabfe9ac8b5841662d342c5ba8cbb0ac6e0c5 Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=8eedabfe9ac8b5841662d342c5ba8cbb0ac6e0c5 commit 8eedabfe9ac8b5841662d342c5ba8cbb0ac6e0c5 Author: Gordon Bergling AuthorDate: 2025-10-26 15:52:11 +0000 Commit: Gordon Bergling CommitDate: 2025-10-27 06:27:28 +0000 style.9: Fix two typos in the manual page - s/signficant/significant/ - s/protoypes/prototypes/ MFC after: 5 days --- share/man/man9/style.9 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/man/man9/style.9 b/share/man/man9/style.9 index 26c7a3b2aa64..c9c3af23864a 100644 --- a/share/man/man9/style.9 +++ b/share/man/man9/style.9 @@ -816,7 +816,7 @@ If no local variables are declared, the first line should be a statement. Older versions of this .Nm document required a blank line before code. -Such lines should be removed when signficant changes are made to the code. +Such lines should be removed when significant changes are made to the code. .Pp Use .Xr printf 3 , @@ -947,7 +947,7 @@ namespace foo::bar { .Ed .Pp Member function declarations should follow the same style used for standalone -function protoypes except that a space should be used between a function's +function prototypes except that a space should be used between a function's return type and name. .Pp Function definitions at the top level should use a newline after the function From nobody Mon Oct 27 06:27:59 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cw3Tq6nPSz6FYt0; Mon, 27 Oct 2025 06:27: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cw3Tq3MF1z3RcJ; Mon, 27 Oct 2025 06:27:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761546479; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cHUybsiLnzYago7pGoNHMa8a0I6qm16UiedtuMTOQzU=; b=DZaNxH9/qxzIYt13RGCnKuMFSJ9Hw28JhZxvSQr7X0W0Uph/3Q4fvSoq8nvxd1DAph6Ubq h4TzJXNYKIOjLNB97v/3cBIiq1H+z58QD6zqv70tbyBlMK2tuDq/G8yny18lgLieULi8J0 yd9fscj1/8vXLPYhNPk4wRH70iZqJGFuaUGk1abmu3PZUTYLCSPfi8XE2AXhM1LoZSp2oS iOcPx8v5BSbq//AYHxYh7yxAVNGt8GcEGexEV3/+41RWbmRpcG81WIKz4XTRwL/XbocizE NGm0kLJeUjKtkj/i8Pe41ycUckZIloeDb5HU5ZU4SUDBNFebFaCTL9iU0Vj1/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761546479; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cHUybsiLnzYago7pGoNHMa8a0I6qm16UiedtuMTOQzU=; b=ZLGALgjN8Pg28ccUpHl5JgaknRQttJtrZq8wNg/nCrkSQCwhVniboGxV1tS4DdiRYbvrkm GOevYbE4ngRrtrAAmNFJ653nVpy8pdiImLa4xMfFLDQOlbycgN4CliLdM8O05UMI6aDjPw 179Hdl6p8vJ4oaqcZb7auksb13U7zKIm+Va88wAOM7PtsSgpjqE2qTdamP+XrndH02sX2Q ABze6UDjxmoboFuCcvn5AGenB8ZiABorw75mMG94Z3e4xWjZr2LLaHwiytAEXWJhVIVXIu CV4jeGZ5PaWGgn2wGttH3n3THKSUyGFSfCG8nRm1/y/D3htosVLM3ajHEwj8WQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761546479; a=rsa-sha256; cv=none; b=Kk0TBH4JfrJXYq5LRKBX5709Ef28Oj2lvbmsDIIJXKrNKALtB/Ttra/Z/ZBMZnXWrdp5WX Ki/L6i6XztBeqneU94GicvIgXN+QbfQkhOnD21pQDm7QJMOelukcuxLNToEfgy+j0YyluT INnyf0oULv2l5F1a5Ic8ygcxAxywNQlxuRk6OvLtQKMnhe8RfJSKE3iAzTZVpfWRk6q5j5 e3CFTby4OcUpzrMXhESdz0f+uevLBLrcBeENbaneeCYYMHchbzl1IVlzjZ/5hYStDof9O+ 6koTVJ8k6Zfwuk2dWY6CnDkta423ffX1gVpY1dkHda+aO5FPP6YL5IOnySvQ0w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cw3Tq2jfdz16qw; Mon, 27 Oct 2025 06:27:59 +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 59R6Rxh2039393; Mon, 27 Oct 2025 06:27:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59R6Rx2X039390; Mon, 27 Oct 2025 06:27:59 GMT (envelope-from git) Date: Mon, 27 Oct 2025 06:27:59 GMT Message-Id: <202510270627.59R6Rx2X039390@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: 3b79697040a7 - main - vn_fullpath.9: Fix two typos in the manual page List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3b79697040a7d3f9a4a21fb2e66d9031feb6af84 Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=3b79697040a7d3f9a4a21fb2e66d9031feb6af84 commit 3b79697040a7d3f9a4a21fb2e66d9031feb6af84 Author: Gordon Bergling AuthorDate: 2025-10-26 15:53:22 +0000 Commit: Gordon Bergling CommitDate: 2025-10-27 06:27:28 +0000 vn_fullpath.9: Fix two typos in the manual page - s/resulting/resulting/ - s/initally/initially/ MFC after: 5 days --- share/man/man9/vn_fullpath.9 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/man/man9/vn_fullpath.9 b/share/man/man9/vn_fullpath.9 index 9815abc3c86c..af459ed281c0 100644 --- a/share/man/man9/vn_fullpath.9 +++ b/share/man/man9/vn_fullpath.9 @@ -107,7 +107,7 @@ than one name (hard links), not all file systems use the name cache be used for more than one file (in the context of file systems covering other file systems); a file may have no name (if deleted but still open or referenced). -However, the resulting string may still be more useable to a user than +However, the resulting string may still be more usable to a user than a vnode pointer value, or a device number and inode number. Code consuming the results of this function should anticipate (and properly handle) failure. @@ -187,7 +187,7 @@ otherwise, an error number is returned. .Xr free 9 .Sh AUTHORS .An -nosplit -This manual page was initally written by +This manual page was initially written by .An Robert Watson Aq Mt rwatson@FreeBSD.org to describe the .Fn vn_fullpath From nobody Mon Oct 27 11:31:05 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cwBCY4Cscz6DPRm; Mon, 27 Oct 2025 11:31:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cwBCY2gy1z46sJ; Mon, 27 Oct 2025 11:31:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761564665; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yR4aCPW8hefXyAnk8JoEl9ImB9+DabUHo0kDjppRY6g=; b=iDTc00ykFFWPpG8dS/2Csfx1aS9osEgU/RHg0+pvAT6SUF1GPwl7kq3mEdt5VwDQ2PC9WY JSJaS3CCpjHbgWhPohsh/prcwJwOefCjQjjlLKlm91bSHNwGc1eo2+rNSgyjAb3Yes7/ha jLv+Vbad9YZgot/86AKY+PUEJSfkQUVtJSqFaUxmlAMi9ohvrIOXB4t9fy6Kha2QSvOWld vMlzvwvnmg8usinRy2M354ehqUUFAk9VCmAC5p8Nou8IkeNYDsHTw14UqWeh+3afVDo6XE ekoNuBBqmHwdNzu5XfsohK97gQrWow4EJvRZkLtjmiC5XgbYW+fys/NMKoSYDA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761564665; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yR4aCPW8hefXyAnk8JoEl9ImB9+DabUHo0kDjppRY6g=; b=w1oHsb1gBKiyflpoJiteh/qsGAAU/qe36gqIMmEAd2VoSBsMYXDGMtudyx+9OaEWaRhL5h eATamJsJTBuAUy/z6jvl1dJLU7kYAR35Vj+lyZdD9A7NqqffzecyH+TzLBufMtfDR5RRTr yC3Owp4/fFcd/9OJuW7IGz9FP/VQW5qLCbec5A4CcXtKkivoKI9HQv0L2jWv082QSsNgiu RmuUp6fB7tOTXf+4QfX7I4dMRGKNF2VmIX38tq5iRifPL9NR9w42i8S9TIrTRQKHiYVgnk 68VVHezr3RFRQUFUfy7wTdq4l5MqBmrQomEMca6hx/gQPpquI35SBzmDSwZYKQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761564665; a=rsa-sha256; cv=none; b=y3/YnzRaf2nTm/pPH1w7DbnYWqZg3B8qZ79/ITY/eGA/16sunTYnZaXvUMg1KWeuZTQNIQ 2DaBPMHCKJ9vNZBhBuF288DNJ95auUIz4DTI2UWtRLJZ7BjAKbRCA/I8OenZIXMZUee5YH HPP1g7BjM/WTDPbwZY7ZMTelG/zdJT5E3pTnO7nkwiAVuXQLuZH3d0iTg+/WP+OMYy1Fdl 0lqe0HivsBiCFuYDbWpENK3PZifLRwts7cZzVboJHaoBA7mEhx07GmwEqBMBwKCiFK31jW v21uHXCDm7ugsc8vl7HA4L+9D0KZAlBElHpWtI5G+aESqMao2MK3vCBAq2gTfA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cwBCY2GcDz1Gd8; Mon, 27 Oct 2025 11:31:05 +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 59RBV5IL018643; Mon, 27 Oct 2025 11:31:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59RBV5Hb018640; Mon, 27 Oct 2025 11:31:05 GMT (envelope-from git) Date: Mon, 27 Oct 2025 11:31:05 GMT Message-Id: <202510271131.59RBV5Hb018640@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: 364864ea91ab - main - snd_dummy: Round channel pointer after each write List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 364864ea91abbd8a9a79578168fa5d34e05200a7 Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=364864ea91abbd8a9a79578168fa5d34e05200a7 commit 364864ea91abbd8a9a79578168fa5d34e05200a7 Author: Christos Margiolis AuthorDate: 2025-10-27 11:30:29 +0000 Commit: Christos Margiolis CommitDate: 2025-10-27 11:30:29 +0000 snd_dummy: Round channel pointer after each write Otherwise we go out of bounds and keep incrementing endlessly. Sponsored by: The FreeBSD Foundation MFC after: 4 days Differential Revision: https://reviews.freebsd.org/D53337 --- sys/dev/sound/dummy.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/dev/sound/dummy.c b/sys/dev/sound/dummy.c index 1f2d69708eec..39214a141bf9 100644 --- a/sys/dev/sound/dummy.c +++ b/sys/dev/sound/dummy.c @@ -104,9 +104,10 @@ dummy_chan_io(void *arg) ch = &sc->chans[i]; if (!ch->run) continue; - if (ch->dir == PCMDIR_PLAY) + if (ch->dir == PCMDIR_PLAY) { ch->ptr += sndbuf_getblksz(ch->buf); - else + ch->ptr %= sndbuf_getsize(ch->buf); + } else sndbuf_fillsilence(ch->buf); snd_mtxunlock(sc->lock); chn_intr(ch->chan); From nobody Mon Oct 27 12:02:23 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cwBvg6hdmz6DSD1; Mon, 27 Oct 2025 12:02:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cwBvg6DHtz3C7V; Mon, 27 Oct 2025 12:02:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761566543; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xSKjFwkSdPOzbV0DaFbzawjnvtfglCHMDPu78YKDGVM=; b=AXw/qxC9hN4UQk3k80iMXflYaUbcoxeaR+MPXk936JVH5sRu528sDJrZdnf40kXoaC3n4E hOQcXOlTnCbFjhLkTqBl7tQt8cHXkQM6vvMU67N8G9PpIK1/Y4JwN0HCoZP0T/glz3n7he v38w+6Cdu+70+B9FH5ySK0kRaPFmm2JKiaDU5LtDaQka5n0enrkqw9K8Rb1aC4F4jVxyJ1 SFxz6MwgLiWZ/AjLHw3xCgmUwsf3wPIXNbJllOrhb3sXsaV7FDDmGEIo3JI/WGwW1xfBpJ qYpCYUI1fffolgGR1tlDUuTAwikblxIVBJTLPouPXtFEBvHYV/tUEn9SlolQtQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761566543; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xSKjFwkSdPOzbV0DaFbzawjnvtfglCHMDPu78YKDGVM=; b=hsjklC0/DjKaPSyylBt5REQww9NlAFAcZBwbef4Bj7ZaEyKX1pValI0p9x0IhbBdpam101 FB5Ea6fcEo27i42EqU/gZGOvB7RBYFM3/SRXuSDWWiNCnMAcRvhx/bSaRB0Kr0Lo92VgFZ npjnrpq0u6DqDLF7CCyOv0j6SZqk8qrpjv0n2NibWCSI7OkaUlOAEo/pCgbEDRfb5htWwC IBczJJIBSr7ztKD7cuG0FmkgkORcdLp5ELGIcSYlnzobTP11fnDFowbk0Kkc4Y5XEdM+pn SrPayVIoEjhYZvQ7Ctw25dUH93UTKtaY9V7xKneVWEqRvrCVJJVIkzapj5kg2w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761566543; a=rsa-sha256; cv=none; b=NRizBi1oBFtOnO0eG677XF4jcF7Nnl5hQWeOw/EUY4QQ760fFWgPwYHwpcbfL8OWOwHrpe Jkrw600qSoFPxZNgaif98TwHaY1auaWb0/fVy47qrxzxhDVjT2J+Rh+Uf8aJ552nrqTe6u Gg8cyELfH+vs227EH84VHuxTjP9Cjii0CHagpsUGzJvSmPQLguap7DL4cGVvL2oxdzwRSy BZ/aYsf3ulsuSST/x9s7xJNigG647zBloeTqdLPdvnUn2HdkAYqENTCG+vqT1c0Y+04byX +oGPM+i0pUVxEUVmXkC+AaXAfMY8VIIicDg4caAd49Y6ELLtfXEqqjhW6jMXig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cwBvg5nPNz1Hfw; Mon, 27 Oct 2025 12:02: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 59RC2NDJ077365; Mon, 27 Oct 2025 12:02:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59RC2Nik077362; Mon, 27 Oct 2025 12:02:23 GMT (envelope-from git) Date: Mon, 27 Oct 2025 12:02:23 GMT Message-Id: <202510271202.59RC2Nik077362@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: fddf48eb012c - main - arm64/vmm: Remove armreg.h when not needed List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fddf48eb012c8c7dd640c1fea5c0766f8d85f0c4 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=fddf48eb012c8c7dd640c1fea5c0766f8d85f0c4 commit fddf48eb012c8c7dd640c1fea5c0766f8d85f0c4 Author: Andrew Turner AuthorDate: 2025-10-27 10:55:10 +0000 Commit: Andrew Turner CommitDate: 2025-10-27 11:36:17 +0000 arm64/vmm: Remove armreg.h when not needed Reviewed by: imp Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D53321 --- sys/arm64/vmm/io/vgic_v3.c | 1 - sys/arm64/vmm/io/vtimer.c | 1 - sys/arm64/vmm/vmm.c | 1 - sys/arm64/vmm/vmm_arm64.c | 1 - sys/arm64/vmm/vmm_hyp.c | 1 - sys/arm64/vmm/vmm_reset.c | 1 - 6 files changed, 6 deletions(-) diff --git a/sys/arm64/vmm/io/vgic_v3.c b/sys/arm64/vmm/io/vgic_v3.c index 67afb3374815..023406c64182 100644 --- a/sys/arm64/vmm/io/vgic_v3.c +++ b/sys/arm64/vmm/io/vgic_v3.c @@ -47,7 +47,6 @@ #include -#include #include #include #include diff --git a/sys/arm64/vmm/io/vtimer.c b/sys/arm64/vmm/io/vtimer.c index da0f0d96c431..7c7fbb49e691 100644 --- a/sys/arm64/vmm/io/vtimer.c +++ b/sys/arm64/vmm/io/vtimer.c @@ -44,7 +44,6 @@ #include #include #include -#include #include diff --git a/sys/arm64/vmm/vmm.c b/sys/arm64/vmm/vmm.c index 14ea26c3668c..e7b2b5d8c360 100644 --- a/sys/arm64/vmm/vmm.c +++ b/sys/arm64/vmm/vmm.c @@ -51,7 +51,6 @@ #include #include -#include #include #include #include diff --git a/sys/arm64/vmm/vmm_arm64.c b/sys/arm64/vmm/vmm_arm64.c index 618f4afaf8ee..006239431f29 100644 --- a/sys/arm64/vmm/vmm_arm64.c +++ b/sys/arm64/vmm/vmm_arm64.c @@ -47,7 +47,6 @@ #include #include -#include #include #include #include diff --git a/sys/arm64/vmm/vmm_hyp.c b/sys/arm64/vmm/vmm_hyp.c index b8c6d2ab7a9a..0ad7930e9a87 100644 --- a/sys/arm64/vmm/vmm_hyp.c +++ b/sys/arm64/vmm/vmm_hyp.c @@ -32,7 +32,6 @@ #include #include -#include #include "arm64.h" #include "hyp.h" diff --git a/sys/arm64/vmm/vmm_reset.c b/sys/arm64/vmm/vmm_reset.c index 1240c3ed16ec..0e4910ea87b4 100644 --- a/sys/arm64/vmm/vmm_reset.c +++ b/sys/arm64/vmm/vmm_reset.c @@ -31,7 +31,6 @@ #include #include -#include #include #include From nobody Mon Oct 27 12:02:24 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cwBvj256Tz6DSSY; Mon, 27 Oct 2025 12:02: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cwBvj0ZvVz3C7Z; Mon, 27 Oct 2025 12:02:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761566545; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4mEyFe4ufBFH8teRxz6C8vfA0k0vKonzZqVhEPlEXsU=; b=vxHR8U8DWUSw3ZUPDrM0lGT4fWxvwkioyM1qiZ1yPhcletNe89PS7e0Pu6VLdfni3WGSLi DkWmaEUguS5A2WtngQsC/YmtHqN2FQl4NPAQ+OUJMUzkPf6ygN358YZ5W+wk8H5K9lhEl/ ncRDLGTOVmpBN0Qtucvocbl+WKjzCv5XlRj6p5IK5txOutoAAYm+7ETY6gxlYAJcOBINwR CUxVsWewnGgdfAUcY3vcS5tk94OwHjhDLxr2IpRHtjT8Oym8PMcnudFT41/Az9kK3q0GHU bpdT07nEJO6baJyzaBWG/gbwmdI7ab+k2xGsTn55TkbsNYCZkhrWbpAq6f+MUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761566545; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4mEyFe4ufBFH8teRxz6C8vfA0k0vKonzZqVhEPlEXsU=; b=x520ugYfHw/c878FODHVy/j9CqS1lN2URpE6iXVvulh1+ILpND5wk33QmPKs0lVr/YB6LC wEs9UlO6sp94rSHBEltM69xn1sILEZ03ZN41Nb54L0sBBjBKKyj6A+WDP9N5V33HtTFJ9A PZ3Jygzh5ukyaecPKkdRmZJcmw/w8x3w8h1YO1eSI9qwu98CMR584U6Nid6QAxb7PF16B5 IN2gdjpP5cy2WxXzMiXCGgMWxi3A4QaiMNDcixSOHWI3ferh3pE6PMm/pIj+kFbCdf0NYw wV3tIcoS3IyDrtQw1ZG0Vs92mx/KuMVLvXUVxj85vM9E9LEH+877BdixhxVFGw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761566545; a=rsa-sha256; cv=none; b=iBEO95uV0gRHUeGroTtAf2Ew2G6h838dvHEgzI6XMF+IrTHDIxAukDePneb3h1vYNgpQ/s 3VqcnunN1sx20GYB7gGzMjZuhBmtQbOdpNRNnt3Hc5g2u6pWx3CSqLAT0W9JryeVwSgsFY Xxcck/PMW/oHzi2scllIr1nPxU5h6C86J4/fCwUf8Y0wxXa8JwKpjvgBTQfGaw3b/xoh1a S3MFrqkPRf0bCl9ueC9TRuFVQYnW7Lh1LG6AY2IRhP3004ERzcKZRJdJRDnZeIT4ECyW6J GiazkbL5HZ/9vnxA/v9XIckSjzv1Rdmw6QCBTEYxpF9KXnLWN2dMxudQqPJ5ow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cwBvj08H5z1HQt; Mon, 27 Oct 2025 12:02: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 59RC2Ouq077398; Mon, 27 Oct 2025 12:02:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59RC2OYl077395; Mon, 27 Oct 2025 12:02:24 GMT (envelope-from git) Date: Mon, 27 Oct 2025 12:02:24 GMT Message-Id: <202510271202.59RC2OYl077395@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: aa22b68ec766 - main - arm64: Include armreg.h in db_disasm.c List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: aa22b68ec76699527de04c99425716ab45c9b8c2 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=aa22b68ec76699527de04c99425716ab45c9b8c2 commit aa22b68ec76699527de04c99425716ab45c9b8c2 Author: Andrew Turner AuthorDate: 2025-10-27 10:55:57 +0000 Commit: Andrew Turner CommitDate: 2025-10-27 11:36:17 +0000 arm64: Include armreg.h in db_disasm.c It is needed for INSN_SIZE. Include it directly rather than depending on header pollution. Reviewed by: imp Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D53322 --- sys/arm64/arm64/db_disasm.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/arm64/arm64/db_disasm.c b/sys/arm64/arm64/db_disasm.c index ab1002560b20..14ae2acc2ce6 100644 --- a/sys/arm64/arm64/db_disasm.c +++ b/sys/arm64/arm64/db_disasm.c @@ -31,6 +31,7 @@ #include #include +#include #include static u_int db_disasm_read_word(vm_offset_t); From nobody Mon Oct 27 12:02:25 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cwBvl2JgKz6DS2v; Mon, 27 Oct 2025 12:02:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cwBvk1fhlz3C5k; Mon, 27 Oct 2025 12:02:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761566546; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=z9ng3hlMwMeakvnlmEmtqglH2alppNwOlpVIipHRb+U=; b=ruo7Hn4IseStNT34fHwc4nh59BdgZvf3oj0wIPndmDF25URyUDvSx3O+nFlGh2UGqN1dZG TaYRulfqmsJ/lSD695QZXbPPKOSrc4ZxKXgommDWbBTHVL5t2+qSXywoLjoLnlWjOzTiDP 8KRNA8Mh2nT/MXLcxg9bv6kTw9evGiRnt8LDwTH/pMSNIaXUV/y+ZBsEwXxT6UoxZDn2X2 mXtBW78Ef23uHs+QfNB0IVaxe2vAioje5EG5Gqgb7vGi3Ds/uivF8kLKfkIw+/mhn3Fb/W UFrOAtoXaUz/4SrfnD/v4jBYB0lloIOfiIxTivOAOKgj5uUyBmgNcyXO2wdFXw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761566546; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=z9ng3hlMwMeakvnlmEmtqglH2alppNwOlpVIipHRb+U=; b=S3Sl2FzIfvIGg3pfR9DwFP8mBanQEF20CWmNrv9xOovgdtU6s/FWiYlvAL28sdeIRlSK2w RRLPaVRrq7KiTI9savWQhCgpVTNPQGVV/WNKnTxCtuTaxFZERF32iy95OVt4Ac+5zwKwWK 0MRqDf3FmjEjLvoRNGEGtcR7jSSD23nyRXAGJIOr+1Za0T0XnxZng8rRkq3ekyoKn9bHCp yjzgbW97R+l5mm7WOLRKY15PLrmYLdcaHIa143N7/BSMFYRnxMzFZjj3f8U19hfPiPswoR us0ayzLMT4lxA5J3qGtYq87AjR6IjAYxnj9vVQ/mKCWdiF/WVlc2K48h4Pt+Hg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761566546; a=rsa-sha256; cv=none; b=e3l+r149n0NLB/up4jcHMND1QkVg9098wB2D+d84VzC6ZJ2+DsSsQyX5zoAGAkEsuO3IGW UeuwAdKf+eMLgZ8XOXQs49Xssr2rJgblO6zTgEchQ0vO1g1bI3WLsqXjY1Q3oTGaCRzcpI o7S2N5MnzpCMR6p69PpLG2qMgOc98pUteHvIdFlAu+a7UusrgQv8pE/xZJob6UeLMcbivy CnQnLj8t10DzLNNWSC97f3zsv1z7IfCPHaCGE8nbL5nvR5caYDE+KscCkCXgUuTRGZLLZP F38oeDIWOKz0voqAdzhWpD6mtwu1h6TnLLE69F2g0KpLyz31OmGc7MHkribVWw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cwBvk0Mc9z1HQw; Mon, 27 Oct 2025 12:02:26 +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 59RC2PYA077436; Mon, 27 Oct 2025 12:02:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59RC2PR2077433; Mon, 27 Oct 2025 12:02:25 GMT (envelope-from git) Date: Mon, 27 Oct 2025 12:02:25 GMT Message-Id: <202510271202.59RC2PR2077433@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: f3ee178be2b2 - main - arm64: Remove armreg.h from db_machdep.h List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f3ee178be2b2b4205a42d514db1142d6bf162601 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=f3ee178be2b2b4205a42d514db1142d6bf162601 commit f3ee178be2b2b4205a42d514db1142d6bf162601 Author: Andrew Turner AuthorDate: 2025-10-27 10:56:06 +0000 Commit: Andrew Turner CommitDate: 2025-10-27 11:36:17 +0000 arm64: Remove armreg.h from db_machdep.h There is nothing in this file that needs armreg.h Reviewed by: imp Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D53323 --- sys/arm64/include/db_machdep.h | 1 - 1 file changed, 1 deletion(-) diff --git a/sys/arm64/include/db_machdep.h b/sys/arm64/include/db_machdep.h index 5dc496ca851d..3ef95f7802ea 100644 --- a/sys/arm64/include/db_machdep.h +++ b/sys/arm64/include/db_machdep.h @@ -31,7 +31,6 @@ #ifndef _MACHINE_DB_MACHDEP_H_ #define _MACHINE_DB_MACHDEP_H_ -#include #include #include From nobody Mon Oct 27 12:02:27 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cwBvl4QGmz6DS2w; Mon, 27 Oct 2025 12:02:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cwBvl2RCjz3CMp; Mon, 27 Oct 2025 12:02:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761566547; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PTSmBUT+NSU0Pf3UvTw6VzFlnJ/x+0CdayRPcxXKwSA=; b=ZFMGwZG77KGZTKcCWU5BdW9fCre3SV4CmUNbgsYOCXYBi9pAnBJUsehnC//WZvAGu34PeP COxzS2n4NJVdaQwrxRRxc+Q7urdAEe2OvSX3a3sfgBZh+CSGB6iWcrNhZeKBj2DaLDq4Vm 0OD3j1yN1/4sUFg4D79R2hppAyWeSzrJIvlRkS+sDVheIxATpNrwahEgt4YISCVBhDY4Jl J27t6ty4NjswpOvTlh/PyHXFl1rlHrTON7jv+U9MPRooeZ3KKMThqh/GpuK7h8x4cqaErx q3YsuXVumvv884BGJFN3P0DZWP/15ztRiqXmvrevGE6C6TFfpxXM9v1tQ8Q9yA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761566547; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PTSmBUT+NSU0Pf3UvTw6VzFlnJ/x+0CdayRPcxXKwSA=; b=MeOHNcw7TzIiuGD3wOrWsD/l+GyueqjgbN1ud+kBSadmyLfiiuJHqTtErnDRQUF/mA1+hG qwIKJmroMpHgW50CanlzOsIy/m5tzjPT0DIYZWoi70ma2lGITO6ouJX40UJTXw0JysL2iy 1MbBJK8epl0KPlTLUYaz6Y1nuSA3IotUVYuLECEoTHD3wT4f78XL9t5VHQNeeXd3Ony2te EhN+H34ryfjiPBjb0TPLbUpavV+7jqXET6Q42Q3wUtAHy+gSczYnBLVdIACXuCqkDKJE+f f68Xl46nEyE02mOoD/LKLWtxMR3q1JfGhC4gcEj8lsd1zA+XfrFFlpBxaHA2Xw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761566547; a=rsa-sha256; cv=none; b=X8Pvq+bpOOtpi4qN38zIyHCsYRhVLhD3V2VldgamKfomwXRz7HwOragEQl0oQG2RbOE0p3 rofmsgpwGtVShCk4fDjS+KlT392qPoM+khowb55cX2N0aJeqhI9iYli5kdH1wZRHgv+aYW WKXeG23S/eVsTt/840SdXiXDpYYmD25TDo92vR5aHGqn1KBQcD+YYwjjvrAfEH1T5qBhA3 GpI7VU+N5JhKRrqzv/zzxpCaKtExmVLBDFEdH+JDqfUMMoCdwqW1CIpI4vnxbXPyGDxrRJ pkyIran603NmFwkYQBRCDqN4fSqpsVFxu91vQqwtciCZ8sPbK1FdUK21wQF3HQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cwBvl1mvRz1HQy; Mon, 27 Oct 2025 12:02:27 +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 59RC2RG6077473; Mon, 27 Oct 2025 12:02:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59RC2RBZ077470; Mon, 27 Oct 2025 12:02:27 GMT (envelope-from git) Date: Mon, 27 Oct 2025 12:02:27 GMT Message-Id: <202510271202.59RC2RBZ077470@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: b57a571a0019 - main - arm64: Split out accessing special registers List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b57a571a001958febec042e15c571c5074ce44ce Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=b57a571a001958febec042e15c571c5074ce44ce commit b57a571a001958febec042e15c571c5074ce44ce Author: Andrew Turner AuthorDate: 2025-10-27 10:56:17 +0000 Commit: Andrew Turner CommitDate: 2025-10-27 11:36:17 +0000 arm64: Split out accessing special registers We shouldn't need to include armreg.h just to access special registers that are not defined in this file. Split out the parts that should be common with arm64.h and hypervisor.h. Reviewed by: emaste Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D53324 --- sys/arm64/include/_armreg.h | 56 ++++++++++++++++++++++++++++++++++++++++++ sys/arm64/include/armreg.h | 20 ++------------- sys/arm64/include/hypervisor.h | 2 ++ 3 files changed, 60 insertions(+), 18 deletions(-) diff --git a/sys/arm64/include/_armreg.h b/sys/arm64/include/_armreg.h new file mode 100644 index 000000000000..7aa3c358b327 --- /dev/null +++ b/sys/arm64/include/_armreg.h @@ -0,0 +1,56 @@ +/*- + * Copyright (c) 2013, 2014 Andrew Turner + * Copyright (c) 2015,2021 The FreeBSD Foundation + * + * Portions of this software were developed by Andrew Turner + * under sponsorship from the FreeBSD Foundation. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#if !defined(_MACHINE_ARMREG_H_) && \ + !defined(_MACHINE_HYPERVISOR_H_) +#error Do not include this file directly +#endif + +#ifndef _MACHINE__ARMREG_H_ +#define _MACHINE__ARMREG_H_ + +#define __MRS_REG_ALT_NAME(op0, op1, crn, crm, op2) \ + S##op0##_##op1##_C##crn##_C##crm##_##op2 +#define _MRS_REG_ALT_NAME(op0, op1, crn, crm, op2) \ + __MRS_REG_ALT_NAME(op0, op1, crn, crm, op2) +#define MRS_REG_ALT_NAME(reg) \ + _MRS_REG_ALT_NAME(reg##_op0, reg##_op1, reg##_CRn, reg##_CRm, reg##_op2) + + +#define READ_SPECIALREG(reg) \ +({ uint64_t _val; \ + __asm __volatile("mrs %0, " __STRING(reg) : "=&r" (_val)); \ + _val; \ +}) +#define WRITE_SPECIALREG(reg, _val) \ + __asm __volatile("msr " __STRING(reg) ", %0" : : "r"((uint64_t)_val)) + +#define UL(x) UINT64_C(x) + +#endif /* !_MACHINE__ARMREG_H_ */ diff --git a/sys/arm64/include/armreg.h b/sys/arm64/include/armreg.h index aca3d4c07450..aa9b672ad85a 100644 --- a/sys/arm64/include/armreg.h +++ b/sys/arm64/include/armreg.h @@ -34,25 +34,9 @@ #ifndef _MACHINE_ARMREG_H_ #define _MACHINE_ARMREG_H_ -#define INSN_SIZE 4 - -#define __MRS_REG_ALT_NAME(op0, op1, crn, crm, op2) \ - S##op0##_##op1##_C##crn##_C##crm##_##op2 -#define _MRS_REG_ALT_NAME(op0, op1, crn, crm, op2) \ - __MRS_REG_ALT_NAME(op0, op1, crn, crm, op2) -#define MRS_REG_ALT_NAME(reg) \ - _MRS_REG_ALT_NAME(reg##_op0, reg##_op1, reg##_CRn, reg##_CRm, reg##_op2) - +#include -#define READ_SPECIALREG(reg) \ -({ uint64_t _val; \ - __asm __volatile("mrs %0, " __STRING(reg) : "=&r" (_val)); \ - _val; \ -}) -#define WRITE_SPECIALREG(reg, _val) \ - __asm __volatile("msr " __STRING(reg) ", %0" : : "r"((uint64_t)_val)) - -#define UL(x) UINT64_C(x) +#define INSN_SIZE 4 /* AFSR0_EL1 - Auxiliary Fault Status Register 0 */ #define AFSR0_EL1_REG MRS_REG_ALT_NAME(AFSR0_EL1) diff --git a/sys/arm64/include/hypervisor.h b/sys/arm64/include/hypervisor.h index 8feabd2b981b..7d405e63cd8d 100644 --- a/sys/arm64/include/hypervisor.h +++ b/sys/arm64/include/hypervisor.h @@ -30,6 +30,8 @@ #ifndef _MACHINE_HYPERVISOR_H_ #define _MACHINE_HYPERVISOR_H_ +#include + /* * These registers are only useful when in hypervisor context, * e.g. specific to EL2, or controlling the hypervisor. From nobody Mon Oct 27 12:02:28 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cwBvn0Jnwz6DS9p; Mon, 27 Oct 2025 12:02: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cwBvm2sHtz3CSy; Mon, 27 Oct 2025 12:02:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761566548; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/H0kAc/1CDDjFjYO31dNCn4OiL1lVcYFpJxRgelBBXY=; b=DNaqaeeiIPFfYKmvTV+F8vMgeyk8Gk0ase23EKV2BsgSYdDhR41JD15rXCfeZ1gP0gjLCj mZ9KlGsgn3Mv1qAQuCULhrP20ji7EzAM6XO6Xo/Lww4hmGuQwAFV9mD64MV017bcQuy1oY /2hp+vxQOtk/bz5s997JqdlYLkyzVkj+8BHkbufQ7RyE7Uwfp4T7WLakvK/ifSTZ0U4A3u YZ7P+TXzGWKpQIFjDvirhm97e5WjzZ7pALBAHxYApwYDJV07PpOx8VdrgNiAvlllTf9QVP eKvj8+vGn8AHJRvzYOUVU8DHqfT4O4RGCvfrIFRRBXXb9z2ToN1EV7xSrcS5iA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761566548; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/H0kAc/1CDDjFjYO31dNCn4OiL1lVcYFpJxRgelBBXY=; b=r8B9RbiekD9rbsXzgNIypRwmZNv+vD9+V08sRUEElzBtaHgvyJBdvaff49GdAvenIKDtMK sjcSlAyfzZ3OKyauPMfsvEzg5RPYJQkrB5m9x9YhGsps4aiyj/C9tdavW4aojY2QVfReeK csks9CXbsMEDr2fcYhoOMPkmXTuvm1/PTT1SSOrBZyZh3nH4WIK0Lvxt7vNDHKD2+QDltA Wi0tYTNiR4ERT70kMeY3EzqHfYb6MNKFHu9mITxkROMCpDJi1BGxLVa60IZ/bkjTfz8te0 Wi+71s0n/Qi3O1I6vg9qhKImYIsx1ZWQhjnFKqeMUYCcxuxMISP51gcye9pvSw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761566548; a=rsa-sha256; cv=none; b=h2VUEsr+sBZrArzKs4Ic1iPsC52VQQc+Ke7L1MO+Lc7oEsRljBuRU427gsNgOcB88pxdLB liO4XnDhe4Vm9ULIfa9DHzBHvxbZC1TV7do0dmbAZaSkY4I6Nu9Gc7mwFSJFl3AFCXtIcd pmIJUi4i9s2hW1+7kEyI8eq1d6W4cjdohRHaZcp7DBHUvRnVfX/MJP5A2+sQIlA4WgmXjx i6WSoauV+tQzcuJsC2QDarZNHb0JVnE2XM/TwfOQYwDzST03IRtv+4pcPUY0jldDU8BP0c ISmvmDKcied2rvBu7mZeRRrROCun82ZMSwaJ1Zq3RSPWwhXwoRQc+V2+FojM1Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cwBvm29F7z1HTJ; Mon, 27 Oct 2025 12:02: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 59RC2SZe077517; Mon, 27 Oct 2025 12:02:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59RC2SXE077515; Mon, 27 Oct 2025 12:02:28 GMT (envelope-from git) Date: Mon, 27 Oct 2025 12:02:28 GMT Message-Id: <202510271202.59RC2SXE077515@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 95a5bfcee07c - main - arm64: Use _armreg.h in cpu.h List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 95a5bfcee07cf522edab72388decc4d6e27d341d Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=95a5bfcee07cf522edab72388decc4d6e27d341d commit 95a5bfcee07cf522edab72388decc4d6e27d341d Author: Andrew Turner AuthorDate: 2025-10-27 10:56:25 +0000 Commit: Andrew Turner CommitDate: 2025-10-27 11:36:17 +0000 arm64: Use _armreg.h in cpu.h We only needed armreg.h for the *_SPECIALREG macros. Use the new _armreg.h directly. Reviewed by: emaste Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D53325 --- sys/arm64/include/_armreg.h | 1 + sys/arm64/include/cpu.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/arm64/include/_armreg.h b/sys/arm64/include/_armreg.h index 7aa3c358b327..0f5134e5a978 100644 --- a/sys/arm64/include/_armreg.h +++ b/sys/arm64/include/_armreg.h @@ -28,6 +28,7 @@ */ #if !defined(_MACHINE_ARMREG_H_) && \ + !defined(_MACHINE_CPU_H_) && \ !defined(_MACHINE_HYPERVISOR_H_) #error Do not include this file directly #endif diff --git a/sys/arm64/include/cpu.h b/sys/arm64/include/cpu.h index 124da8c215ed..b15210633d37 100644 --- a/sys/arm64/include/cpu.h +++ b/sys/arm64/include/cpu.h @@ -43,10 +43,10 @@ #define _MACHINE_CPU_H_ #if !defined(__ASSEMBLER__) +#include #include #include #endif -#include #define TRAPF_PC(tfp) ((tfp)->tf_elr) #define TRAPF_USERMODE(tfp) (((tfp)->tf_spsr & PSR_M_MASK) == PSR_M_EL0t) From nobody Mon Oct 27 12:02:29 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cwBvp3X7Qz6DSXt; Mon, 27 Oct 2025 12:02: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cwBvn5F3wz3CWG; Mon, 27 Oct 2025 12:02:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761566549; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QderzDdGpq/b0qzlJucTv5SCpxxddomj0mw+ynM4M60=; b=BIl9NuLS/3NQijic6S7XE9Ud+0myEuvzBYJqwNdarDC21g3IA4dUuEzLZbr6GMHxKUwqrL jKaxfdkM93QiHOleD7nuTFEoCO9XMjxD50xr8NJjtn6d2HHPBoiSIkEnhv7SaOLa6/3Awd iiyZG12kyLuDVNzxZ3z/a0r/Eab8MdhQ9rXBjiv+svpRuGlHqI9DOf6ZaTJ9ubXp1y/6y3 /WCcJ7UIkm/CvboSb4lVecF2xHw7OUd2dMGQjiiSKn/Cg+H18FQaLqWGxL3LVuN9dilAXB 4RQj2+xDn0nnKNAfJep1CvrxOalv3NQ3aKMtn3qStApRxpmKfUoBM5mJIYSQEw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761566549; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QderzDdGpq/b0qzlJucTv5SCpxxddomj0mw+ynM4M60=; b=NW6FZ4QvcFWmCGdtGXxI1kOIuBSpr2X775Op/T0GvzJZu1lXDEgq1oN8GOOwoKnrKEfXAB yTI/sFP4bW5JlNMvs7Vu9KWLEgnRYoZB4fhfFBxquUk3cVGFefCmn6ikQeM10buSjyY2Bn 640+f89aVWJcnXd5l8jKazsAKyhAlcwa2gTPJmk8OewLIrlcMqCKB8ZDZLDMrHD2RCVWoP c8w5foHmswIxJkuvlsQ3iB3LyyxoYE7LRMuqIomsCa3OWwdTHAetjiTCzT1FESIqX0oVkR dsw8alV22msnvi97shKwoRysmBuLg54R2X8WNt8d0pYwviG/yH70++dmovZbDQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761566549; a=rsa-sha256; cv=none; b=MGoZn1Cp5dLuznyxPTymFfFBmvGJY2C0kl9bfAb8S7rzT8peTkyx7BI4eL4EF4nFhAD5/Q C8tku//HYXPW4h7RmcoKakSk+/6WvKnQDiBx8q6n2FYW5FXHviZB48XmB0QtpDEAhnBJJp 77ssMgL7x+O9cCP5wyg8iqi5uGR3N/zCx/R+WvLeCkgI/T4/i9DY+C3K6yePI8hCPmK5xS XnOHg7Hi57PnUz2eCgu6NW/9MQxTJRlFr1hwjIo34jVqcUopnZFrjOp/OI5DSIK+GjU+sZ gVkpMzlbIKLcARStHBK1YiZcQwaVKlInqmUHlY/u7kLzU9QSKfsJUR54o72zLQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cwBvn4VmLz1HTL; Mon, 27 Oct 2025 12:02: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 59RC2T91077553; Mon, 27 Oct 2025 12:02:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59RC2TPX077550; Mon, 27 Oct 2025 12:02:29 GMT (envelope-from git) Date: Mon, 27 Oct 2025 12:02:29 GMT Message-Id: <202510271202.59RC2TPX077550@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 87cea227e194 - main - dev/ofw: Move ofw_cpu earlier List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 87cea227e1945a8aa808b72d210f9a391be9b234 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=87cea227e1945a8aa808b72d210f9a391be9b234 commit 87cea227e1945a8aa808b72d210f9a391be9b234 Author: Andrew Turner AuthorDate: 2025-10-27 10:57:44 +0000 Commit: Andrew Turner CommitDate: 2025-10-27 11:36:18 +0000 dev/ofw: Move ofw_cpu earlier Move ofw_cpu to BUS_PASS_CPU + BUS_PASS_ORDER_MIDDLE so it can be used by other devices. Reviewed by: jhibbits Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D53328 --- sys/dev/ofw/ofw_cpu.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/dev/ofw/ofw_cpu.c b/sys/dev/ofw/ofw_cpu.c index 888af0440746..da66737b6da8 100644 --- a/sys/dev/ofw/ofw_cpu.c +++ b/sys/dev/ofw/ofw_cpu.c @@ -85,7 +85,8 @@ static driver_t ofw_cpulist_driver = { sizeof(struct ofw_cpulist_softc) }; -DRIVER_MODULE(ofw_cpulist, ofwbus, ofw_cpulist_driver, 0, 0); +EARLY_DRIVER_MODULE(ofw_cpulist, ofwbus, ofw_cpulist_driver, 0, 0, + BUS_PASS_CPU + BUS_PASS_ORDER_MIDDLE); static int ofw_cpulist_probe(device_t dev) @@ -180,7 +181,8 @@ static driver_t ofw_cpu_driver = { sizeof(struct ofw_cpu_softc) }; -DRIVER_MODULE(ofw_cpu, cpulist, ofw_cpu_driver, 0, 0); +EARLY_DRIVER_MODULE(ofw_cpu, cpulist, ofw_cpu_driver, 0, 0, + BUS_PASS_CPU + BUS_PASS_ORDER_MIDDLE); static bool ofw_cpu_is_runnable(phandle_t node) From nobody Mon Oct 27 12:02:30 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cwBvq0G02z6DS30; Mon, 27 Oct 2025 12:02: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cwBvp5MPKz3CRS; Mon, 27 Oct 2025 12:02:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761566550; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=weVlpBmYlDS5ZPni+LP473pA7m9u+v9rp4qkrLHgsq4=; b=eqFLzcYe3uU0qkH5Bg8fNIW1pEJ8bzz5TmYih+e6GM/TexpLkt1foeSVjd6FYsG49NY1jJ PGdgmpWamzcd8ImPskw7pjCPjAf9y+Hax8NkSOn62ZpN4dO8hZ7wDLe9S5OjTeWuRxmK7l KDGekJrIYat91TYsEX49yT5KA5ALYkbi8X0kB4yv6sN+P5s9NEhJ3cKiIEuRJJBWn6ysL6 FVndMlLNvFPKnlRQIlQJ/z8dlnHpDdfTy0MZXh69+cBih6KXFTOx5eQbXMFSltCaZvMDGE BVMvjB7LI1l6K3EKG/Pn7KmLIhg+DjtjfNpJOnPVewCZpV6FKepTz5JayDEFoQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761566550; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=weVlpBmYlDS5ZPni+LP473pA7m9u+v9rp4qkrLHgsq4=; b=EOjZlo5tNPThYGPyU/HAbhXyVLrpU7uQc3ThMmCJ1QiyXCi13AdtLnLxUHJ4suKpFr2OIU cgsy4a8tw2SC4HCqqhakRYx0oL16iBKriPREFcYBOImWFXHimC1WUIK+XCD+wJtthPd9nK gZjMM2MysHHPlwoASVOjPt9LF7FMdk+6NvMC1gOods7n1eweT/UoV5WVujZbCnYvH4DMvP j3gC20zKcvonqfeLrRvfmOREMHKvIyvujMqUcNVPz6+0Kp3smCUi3wueWiNrdL+C4a01Jj QZupGETkl1t8FFSuQ5kbG1bMhgXL1TwcMUcu7jU6YR3oVJquW7ClaTQgQxOgcA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761566550; a=rsa-sha256; cv=none; b=o8OW4Ax760pvit1RyOAfupn8MdsKQpn1LhMUHXQTFZZc0UCITRdAZn0C0EKc0G84eopX2e gWJy0DOFrc8T+GR1RWSC3u1i/gibAwOK8/yz5nXLuaP4kMIi8czuYvRmizYz6Fdm+SHAx4 658lmeEM4bdglQRbnh+7rFa5KQZCIHx5f2luSV39DhM4gI6dSHmfWJ7d+vFP20h08Q2zhT avScjsnZyqEDOdXo23i1Ls1TyB2ms1HxOo4JOR0seJ/0yna8Yp1DD/fz+j38BxRkWTogxk XVwc9z4fn5kRxjb2KhRe93yJmpXvXFpiWzayq/6CuSJZ4vqVVCmDLjzgA/5ONg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cwBvp4lJdz1HL1; Mon, 27 Oct 2025 12:02: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 59RC2UvS077586; Mon, 27 Oct 2025 12:02:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59RC2Ui8077583; Mon, 27 Oct 2025 12:02:30 GMT (envelope-from git) Date: Mon, 27 Oct 2025 12:02:30 GMT Message-Id: <202510271202.59RC2Ui8077583@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: d539f2d9d2ce - main - dev/ofw: Register the ofw_cpu xref List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d539f2d9d2ce88f295567578d0e7a3b49d45544b Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=d539f2d9d2ce88f295567578d0e7a3b49d45544b commit d539f2d9d2ce88f295567578d0e7a3b49d45544b Author: Andrew Turner AuthorDate: 2025-10-27 10:57:54 +0000 Commit: Andrew Turner CommitDate: 2025-10-27 11:36:18 +0000 dev/ofw: Register the ofw_cpu xref This allows it to be referenced by other devices. Reviewed by: jhibbits Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D53329 --- sys/dev/ofw/ofw_cpu.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/dev/ofw/ofw_cpu.c b/sys/dev/ofw/ofw_cpu.c index da66737b6da8..4b12f2e994e3 100644 --- a/sys/dev/ofw/ofw_cpu.c +++ b/sys/dev/ofw/ofw_cpu.c @@ -332,6 +332,7 @@ ofw_cpu_attach(device_t dev) device_printf(dev, "Nominal frequency %dMhz\n", sc->sc_nominal_mhz); + OF_device_register_xref(OF_xref_from_node(node), dev); bus_identify_children(dev); bus_attach_children(dev); return (0); From nobody Mon Oct 27 12:48:12 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cwCwY0bW8z6DY9n; Mon, 27 Oct 2025 12:48: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cwCwX6zvVz3MBZ; Mon, 27 Oct 2025 12:48:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761569293; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WBfK9Xhu921qXwi0H7pkpDbtC6wQKh47DMq8syd0p4A=; b=lM1OcyfStw6pOymXaprfqJC1TxUNgdGBxxhfjlXN7auScdQRaCz8sYIXx398ha6nhfiTTl 7KRIp9OFvoKhSwG3fbWcwWXQ2hy+KetT21wThCSUCUubY/HY+2gU+60y4hF1lJREGmaBBj e+MzZOt7Yw33adb/jbkre+L4VAaDYqdPWNCg6lOt60eM6/lkiSZOk3W+QkXcMTIcV+A0a6 1lJWKAtPu2ntYBz6XFLnGrp+do6Rs8H6f9ng2nryfWp2xg291CN5NBGCwHMLoQPO0ys2uh SKn2/0p3f5+NmC6Ac3W3HAw1dhKj3IELD5CNZOfM1gb0so1zplQMEkgDFgC2ug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761569293; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WBfK9Xhu921qXwi0H7pkpDbtC6wQKh47DMq8syd0p4A=; b=aK0IDwwkLTVHjzu8+rxfGH2i/5KJUwkiQXF+PfSWnT4DvkkoRkCD7CTWH8mLTnR2OUck8O vXjv2wsOiHaFzTh2XkIIZS/3THUrpox5tPVdnRdlT8yCLNdvq+pct0jKBtpUJk8/fARfNu ytyI/NWYgp1bgwaqtcPlTep/LPkzJoQRJhP71RGNxB9/+O94JNLWazAflb8NeSS6ADaunt FgMCvkXR7WuwkgfnPQ+ON7/RxiCK4x8BMBHPHkf1gDYy4OriCUXjbgG/6g6VKFTJs/e0eL AM4MorIhaTG7m6nWoXRHCffTKcXOj9Qvpx1h7SWOhZkTwJRyWxw8J7pXk4Bdmw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761569293; a=rsa-sha256; cv=none; b=qnG8h2kBFD0a+sSmlXFX+jeWywWzfE4nO+gJli7K7otWIcsC8732ZTzEu7JpmjiMM5C09h JvM1CNpzitOxzC+qBySyy1IaVcLhigYX9tfOBi1x+Fl4fKkg0XdloKTqzxBd3SOZlNrVQ9 2PzvrhxxucQeeay6ucz+3qgAo1Icj3Ls7a78XYDU3GOP96A/nvn9zVb0vt2CFOYzVJMyK7 eJFjS9CCXCIMeFgqxKShTitWins/XvZbEYz6aRUOJif1DEM7fFukalTaTBOQaGuYkmUtYn DUSNKCf6ULDexo1LJZ54n3Yio0UNjcPKqhKF2taN2S2WguSFTNGuLh9cFbtmXA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cwCwX6SlJz1JWG; Mon, 27 Oct 2025 12:48: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 59RCmCdE054302; Mon, 27 Oct 2025 12:48:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59RCmCOD054299; Mon, 27 Oct 2025 12:48:12 GMT (envelope-from git) Date: Mon, 27 Oct 2025 12:48:12 GMT Message-Id: <202510271248.59RCmCOD054299@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: a505b80b2f03 - main - ng_device: add kqueue support List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a505b80b2f038409300cd05e2ea95822942404e2 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=a505b80b2f038409300cd05e2ea95822942404e2 commit a505b80b2f038409300cd05e2ea95822942404e2 Author: Quentin Thébault AuthorDate: 2025-09-09 03:48:46 +0000 Commit: Mark Johnston CommitDate: 2025-10-27 12:45:30 +0000 ng_device: add kqueue support Signed-off-by: Quentin Thébault Sponsored by: Defenso Reviewed by: markj MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D52541 Pull Request: https://github.com/freebsd/freebsd-src/pull/1880 --- sys/netgraph/ng_device.c | 126 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 123 insertions(+), 3 deletions(-) diff --git a/sys/netgraph/ng_device.c b/sys/netgraph/ng_device.c index 582f877ff3ed..066e3be29694 100644 --- a/sys/netgraph/ng_device.c +++ b/sys/netgraph/ng_device.c @@ -3,6 +3,7 @@ * * Copyright (c) 2002 Mark Santcroos * Copyright (c) 2004-2005 Gleb Smirnoff + * Copyright (c) 2025 Quentin Thébault * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -50,6 +51,7 @@ #include #include #include +#include #include #include #include @@ -117,12 +119,15 @@ struct ngd_private { struct ng_node *node; struct ng_hook *hook; struct cdev *ngddev; + struct selinfo rsel; + struct selinfo wsel; struct mtx ngd_mtx; int unit; int ether_align; uint16_t flags; #define NGDF_OPEN 0x0001 #define NGDF_RWAIT 0x0002 +#define NGDF_DYING 0x0004 }; typedef struct ngd_private *priv_p; @@ -138,6 +143,24 @@ static d_read_t ngdread; static d_write_t ngdwrite; static d_ioctl_t ngdioctl; static d_poll_t ngdpoll; +static d_kqfilter_t ngdkqfilter; + +static int ngd_kqread_event(struct knote *, long); +static int ngd_kqwrite_event(struct knote *, long); +static void ngd_kqread_detach(struct knote *); +static void ngd_kqwrite_detach(struct knote *); + +static const struct filterops ngd_read_filterops = { + .f_isfd = 1, + .f_detach = ngd_kqread_detach, + .f_event = ngd_kqread_event +}; + +static const struct filterops ngd_write_filterops = { + .f_isfd = 1, + .f_detach = ngd_kqwrite_detach, + .f_event = ngd_kqwrite_event +}; static struct cdevsw ngd_cdevsw = { .d_version = D_VERSION, @@ -146,6 +169,7 @@ static struct cdevsw ngd_cdevsw = { .d_read = ngdread, .d_write = ngdwrite, .d_ioctl = ngdioctl, + .d_kqfilter = ngdkqfilter, .d_poll = ngdpoll, .d_name = NG_DEVICE_DEVNAME, }; @@ -198,6 +222,9 @@ ng_device_constructor(node_p node) mtx_init(&priv->readq.ifq_mtx, "ng_device queue", NULL, MTX_DEF); IFQ_SET_MAXLEN(&priv->readq, ifqmaxlen); + knlist_init_mtx(&priv->rsel.si_note, &priv->ngd_mtx); + knlist_init_mtx(&priv->wsel.si_note, &priv->ngd_mtx); + /* Link everything together */ NG_NODE_SET_PRIVATE(node, priv); priv->node = node; @@ -206,6 +233,8 @@ ng_device_constructor(node_p node) GID_WHEEL, 0600, NG_DEVICE_DEVNAME "%d", priv->unit); if (priv->ngddev == NULL) { printf("%s(): make_dev() failed\n", __func__); + knlist_destroy(&priv->rsel.si_note); + knlist_destroy(&priv->wsel.si_note); mtx_destroy(&priv->ngd_mtx); mtx_destroy(&priv->readq.ifq_mtx); free_unr(ngd_unit, priv->unit); @@ -319,6 +348,8 @@ ng_device_rcvdata(hook_p hook, item_p item) priv->flags &= ~NGDF_RWAIT; wakeup(priv); } + selwakeup(&priv->rsel); + KNOTE_LOCKED(&priv->rsel.si_note, 0); mtx_unlock(&priv->ngd_mtx); return (0); @@ -334,9 +365,22 @@ ng_device_disconnect(hook_p hook) DBG; + mtx_lock(&priv->ngd_mtx); + priv->flags |= NGDF_DYING; + wakeup(priv); + mtx_unlock(&priv->ngd_mtx); + destroy_dev(priv->ngddev); + + knlist_clear(&priv->rsel.si_note, 0); + knlist_clear(&priv->wsel.si_note, 0); + knlist_destroy(&priv->rsel.si_note); + knlist_destroy(&priv->wsel.si_note); mtx_destroy(&priv->ngd_mtx); + seldrain(&priv->rsel); + seldrain(&priv->wsel); + IF_DRAIN(&priv->readq); mtx_destroy(&(priv)->readq.ifq_mtx); @@ -493,9 +537,13 @@ ngdread(struct cdev *dev, struct uio *uio, int flag) return (EWOULDBLOCK); mtx_lock(&priv->ngd_mtx); priv->flags |= NGDF_RWAIT; - if ((error = msleep(priv, &priv->ngd_mtx, - PDROP | PCATCH | PZERO, - "ngdread", 0)) != 0) + if (priv->flags & NGDF_DYING) { + mtx_unlock(&priv->ngd_mtx); + error = ENXIO; + } else + error = mtx_sleep(priv, &priv->ngd_mtx, + PDROP | PCATCH, "ngdread", 0); + if (error != 0) return (error); } } while (m == NULL); @@ -538,9 +586,12 @@ ngdwrite(struct cdev *dev, struct uio *uio, int flag) if (m == NULL) return (ENOBUFS); + /* Setting VNET is required if connecting to a ng_bridge. */ + CURVNET_SET(priv->node->nd_vnet); NET_EPOCH_ENTER(et); NG_SEND_DATA_ONLY(error, priv->hook, m); NET_EPOCH_EXIT(et); + CURVNET_RESTORE(); return (error); } @@ -561,3 +612,72 @@ ngdpoll(struct cdev *dev, int events, struct thread *td) return (revents); } + +static void +ngd_kqread_detach(struct knote *kn) +{ + priv_p priv = (priv_p)kn->kn_hook; + + knlist_remove(&priv->rsel.si_note, kn, 0); +} + +static int +ngd_kqread_event(struct knote *kn, long hint) +{ + priv_p priv = (priv_p)kn->kn_hook; + struct mbuf *m; + + IFQ_LOCK(&priv->readq); + if (IFQ_IS_EMPTY(&priv->readq)) { + kn->kn_data = 0; + } else { + /* + * Since the queue does not store the total number of bytes that + * could be read across all packets and we do not want to + * traverse the whole queue, we only report the number of bytes + * for the first packet in the queue. + */ + IF_POLL(&priv->readq, m); + kn->kn_data = m->m_len; + } + IFQ_UNLOCK(&priv->readq); + + return (kn->kn_data > 0); +} + +static void +ngd_kqwrite_detach(struct knote *kn) +{ + priv_p priv = (priv_p)kn->kn_hook; + + knlist_remove(&priv->wsel.si_note, kn, 0); +} + +static int +ngd_kqwrite_event(struct knote *kn, long hint) +{ + kn->kn_data = IP_MAXPACKET; + + return (1); +} + +static int +ngdkqfilter(struct cdev *dev, struct knote *kn) +{ + priv_p priv = (priv_p)dev->si_drv1; + + switch (kn->kn_filter) { + case EVFILT_READ: + kn->kn_fop = &ngd_read_filterops; + kn->kn_hook = priv; + knlist_add(&priv->rsel.si_note, kn, 0); + return (0); + case EVFILT_WRITE: + kn->kn_fop = &ngd_write_filterops; + kn->kn_hook = priv; + knlist_add(&priv->wsel.si_note, kn, 0); + return (0); + default: + return (EINVAL); + } +} From nobody Mon Oct 27 12:48:13 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cwCwZ1Blrz6DXyZ; Mon, 27 Oct 2025 12:48: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cwCwZ0fwbz3M85; Mon, 27 Oct 2025 12:48:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761569294; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WKMnlFH/0oyEtAsyK10WHfwYsJd04zaEBIHLUS012Dc=; b=aw63yYuMPyWMaSmvmva5PrDu1I5b9QBFdzrDKeUyZdGmuZg+t2MXJ8m3prn7qxvDdZ4+Eb T2RIzMNt+e/QnVphq+thGOw2L1CplgEXjurIW58/xHtttYHYhIUCifHpB/PaMPP93SMlRv FXRlFaYiiLRDnfqDxBGvVK7h0TOn51wWZmzvH1WgKHS8ZX2rNHR7ltn+DvL4yXd7lLVr3B MjPZlByK4iwaPfVrC03rFoMe099l8AO0BW34a0GoHw6NPpyDSkbuSbks1hCzW6nm7RqXvg UfAWuf+YggcNxaFjzOU0Od0IDe9QLebfxvXOjs5R7yLG/krIhuOM+8ta/mNwbA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761569294; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WKMnlFH/0oyEtAsyK10WHfwYsJd04zaEBIHLUS012Dc=; b=LkvOoMBnjUuc1YFLEAS1Sa08loXPcWYI8Npae4mRd/swvzqEsgKZTGmEeQSLLrl8JoyACh PmrvhNwbcAGFonhjT1CftZpi/fZw9V5tGHtZeNTFGWgHKfcOiOsE8RO8ciV7/uHK1rOC5A i8WFevQGLbQFMWTVEFLfIkTh65hfGNPBGzSjnBC/m247y+N5QXSN7YCxOAlfhvhdxBeEID CbPhcL78wD+kSmviuY7FttBIDSMBqFPmH3aCYHmnZ05aMv2rIVhk+S9dqK3Xq0oS04TMgO cSYjFawMQMuHFcUDRtJKkme+n4dPRS/D35p8ORvXrAvYMZUiZ+86yp/5gcTzcw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761569294; a=rsa-sha256; cv=none; b=Aav/SUZFxgozxMf3dRrjTwP8KlroJ5SNudqZG7TB/MYQXu8y1MfiBgRxqNReG38s5wa0+/ IY6GihRZKmoiPHuQKei7ohvGXl63Q646bUMarxK7DQJNm5EZE/ak06InPys+cdJKtlRiwe qn1EJsCH03TzBWHkR7HjFpMeLYi7APJX3ox1KYFQv4ibAVBhCHjorKqVDk+M0wzP2u6jS6 hi+mjlyJzf68cTCX56v/a+ykYRsZje+v8bSdGpVoxFuCtMYUpPPjrxeJQqLlyoQ8a0CRHg msv8BoFn2KYhV9tkkBBBHVKJVpqE2qhEsgMwSxLGxWSKlFtZr1QzVJOuexa5+A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cwCwZ0D5Sz1JWH; Mon, 27 Oct 2025 12:48: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 59RCmDJc054334; Mon, 27 Oct 2025 12:48:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59RCmDUj054331; Mon, 27 Oct 2025 12:48:13 GMT (envelope-from git) Date: Mon, 27 Oct 2025 12:48:13 GMT Message-Id: <202510271248.59RCmDUj054331@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 1aad95345237 - main - bhyve: add support for ng_device network backend List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1aad95345237424918e5f6b18464df4dbc2aa1d8 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=1aad95345237424918e5f6b18464df4dbc2aa1d8 commit 1aad95345237424918e5f6b18464df4dbc2aa1d8 Author: Quentin Thébault AuthorDate: 2025-09-12 08:39:55 +0000 Commit: Mark Johnston CommitDate: 2025-10-27 12:46:47 +0000 bhyve: add support for ng_device network backend Signed-off-by: Quentin Thébault Reviewed by: markj MFC after: 1 month Sponsored by: Defenso Differential Revision: https://reviews.freebsd.org/D52542 Pull Request: https://github.com/freebsd/freebsd-src/pull/1880 --- usr.sbin/bhyve/bhyve.8 | 21 +++++++++++++++++++-- usr.sbin/bhyve/net_backends.c | 19 ++++++++++++++++++- 2 files changed, 37 insertions(+), 3 deletions(-) diff --git a/usr.sbin/bhyve/bhyve.8 b/usr.sbin/bhyve/bhyve.8 index c902c265da9e..3df9f79c3b2c 100644 --- a/usr.sbin/bhyve/bhyve.8 +++ b/usr.sbin/bhyve/bhyve.8 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd August 21, 2024 +.Dd September 16, 2025 .Dt BHYVE 8 .Os .Sh NAME @@ -518,6 +518,8 @@ considered unconnected. .Op Cm \&,mtu= Ar N .Xc .It +.Cm ngd Ar N +.It .Xo .Cm netgraph,path= Ar ADDRESS Cm \&,peerhook= Ar HOOK .Op Cm \&,socket= Ar NAME @@ -542,6 +544,19 @@ The MAC address is an ASCII string in .Xr ethers 5 format. .Pp +A +.Cm ngd +device can be used to connect a guest to a +.Xr netgraph 4 +through a +.Xr ng_device 4 +node. +This can be used to run bhyve in a +.Xr VNET 9 +jail, and give it access to the host's netgraph, that cannot be reached +directly, by exposing the ng_device through +.Xr devfs 8 . +.Pp With .Cm virtio-net devices, the @@ -572,7 +587,9 @@ must comply with .Xr netgraph 4 addressing rules. .Pp -The slirp backend can be used to provide a NATed network to the guest. +The +.Cm slirp +backend can be used to provide a NATed network to the guest. This backend has poor performance but does not require any network configuration on the host system. It depends on the diff --git a/usr.sbin/bhyve/net_backends.c b/usr.sbin/bhyve/net_backends.c index 2d11c45f217a..95909d1f8ea2 100644 --- a/usr.sbin/bhyve/net_backends.c +++ b/usr.sbin/bhyve/net_backends.c @@ -119,7 +119,8 @@ tap_init(struct net_backend *be, const char *devname, goto error; } - if (ioctl(be->fd, VMIO_SIOCSIFFLAGS, up)) { + if (strncmp("ngd", be->prefix, 3) && + ioctl(be->fd, VMIO_SIOCSIFFLAGS, up)) { EPRINTLN("tap device link up failed"); goto error; } @@ -273,8 +274,24 @@ static struct net_backend vmnet_backend = { .set_cap = tap_set_cap, }; +/* A clone of the tap backend, with a different prefix. */ +static struct net_backend ngd_backend = { + .prefix = "ngd", + .priv_size = sizeof(struct tap_priv), + .init = tap_init, + .cleanup = tap_cleanup, + .send = tap_send, + .peek_recvlen = tap_peek_recvlen, + .recv = tap_recv, + .recv_enable = tap_recv_enable, + .recv_disable = tap_recv_disable, + .get_cap = tap_get_cap, + .set_cap = tap_set_cap, +}; + DATA_SET(net_backend_set, tap_backend); DATA_SET(net_backend_set, vmnet_backend); +DATA_SET(net_backend_set, ngd_backend); int netbe_legacy_config(nvlist_t *nvl, const char *opts) From nobody Mon Oct 27 12:51:39 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cwD0W6llyz6DY9g; Mon, 27 Oct 2025 12:51: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cwD0W6GhBz3Nf9; Mon, 27 Oct 2025 12:51:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761569499; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Dc5bcKyIIcO8A92K8E9vXrEm+DAAdmfcCNWsfux4RR8=; b=XA+ONvUk1jwJcKjyspXMR9YUVE1i0ISef1jiAlIKGJCBd0/Z3vysAB0+0P0FOAiv0UcZEz OFZziwG8ohD3LQsSBqGGKjXrpUhd+tWKT8AYWQWLo0Jm0C76BVmoRzYhfppKPRVJxx+cVy a3ZF1GtmJ3jM+K++bZRZkl+tdoiDSaPLUk5bXqmhbwkqX6GI9hCCCzDU9tvln/cbO7kGG+ 4G3/KjLKokXizSybmqwnuVMEwf18sL4uzBf91MdB0PfczkVEwuaT/SKNHyzRryl/6yI1v4 cb0Q58l6ZlOFVsmU3HYLN+9SSsfcJ4mTvmFvc4Q3ZMIPHpEuQ1EEITzPGMlTvg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761569499; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Dc5bcKyIIcO8A92K8E9vXrEm+DAAdmfcCNWsfux4RR8=; b=XUSjhsbXDkDQmSV2I1FRidLddcjlJfoAXjRE2IRAFfJiVwFk75wdW8UG/FqYPfnn2To83u iRYDhvbbwVTUAOjt3PkYW5cCEM8/LFNb3cpswJGXsPENwJmoE+B6rrYsMDaX4sAbuDwzzs hDYOy5VDy806I7HAZ2MULIBlGazZYyNB3YReEA5GCLnqh89mfSw7t995YMU4mC7R9vp863 Duhai950qOe+I0Jk6NYL0rriV05kE1XcNiaeUVNgz3/x1kBuZLoyZLRdj+39+2QrKaXqan AMAzmGXBYy3DL6PNa8pZfcDE2uf5JY8r2YjikVhZ6DpO+RislKEsd5FebxYkLQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761569499; a=rsa-sha256; cv=none; b=XtR7uMitb0jtgviXCxlNsNASze2McsnHI2N9vlg/U4fchdN3M7Dx6i41yXJLMvT5Dp9Vff RCyX3Qgovfe7M6hlP4AU5wiNdQ4R4Yr00Y0U0ZMJc0yhhQcpsVAETdRL6hHP/vW2i4PEeh RB3uykUm+CyBeFNoSzUF9IY4e5m8IHmvNDKJgdcZTeaFqGuf/t7PT74AhI03DEGlCTsjIN IVf9XlhdQfe5vz2rlmfsH7WwNGeNCstSsVu1iXoiGTXZLylEwsOng4hl2QMFTC0CN+6lS/ STRNOU7f7BFpEHQOoeBrf/NDVolcBxFkKux7uEnhnRMmKvX/sRrirNsFRqioUg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cwD0W5qX7z1JWX; Mon, 27 Oct 2025 12:51:39 +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 59RCpdeU067416; Mon, 27 Oct 2025 12:51:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59RCpdxH067413; Mon, 27 Oct 2025 12:51:39 GMT (envelope-from git) Date: Mon, 27 Oct 2025 12:51:39 GMT Message-Id: <202510271251.59RCpdxH067413@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: ce6792d3cd79 - main - isa: Use gone_in_dev(9) for deprecation message List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ce6792d3cd798079f0c9ba244faba4ea666bb6f4 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=ce6792d3cd798079f0c9ba244faba4ea666bb6f4 commit ce6792d3cd798079f0c9ba244faba4ea666bb6f4 Author: Ed Maste AuthorDate: 2025-10-26 17:06:57 +0000 Commit: Ed Maste CommitDate: 2025-10-27 12:51:12 +0000 isa: Use gone_in_dev(9) for deprecation message Reviewed by: bz, imp Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D53366 --- sys/isa/isa_common.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/isa/isa_common.c b/sys/isa/isa_common.c index 41a63a3c676c..91a0ee1f2f3d 100644 --- a/sys/isa/isa_common.c +++ b/sys/isa/isa_common.c @@ -569,8 +569,8 @@ isa_probe_children(device_t dev) if (err == 0 && idev->id_vendorid == 0 && strcmp(kern_ident, "GENERIC") == 0 && device_is_attached(child)) - device_printf(child, - "non-PNP ISA device will be removed from GENERIC in FreeBSD 16.\n"); + gone_in_dev(child, 16, + "WARNING: non-PNP ISA device will be removed from GENERIC\n"); } /* From nobody Mon Oct 27 12:55:10 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cwD4Z33fvz6DYZB; Mon, 27 Oct 2025 12: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cwD4Z2RfDz3P43; Mon, 27 Oct 2025 12: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=1761569710; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TWE85Nonpakt3yht8+LMa3AEldQnfzeIxeCGPt2Eqy4=; b=ownDq0VhxV7HyZ8Qe9lhEhJGczoMGRsLr+sehqKpzrTkpVte7/9ArZezD11jrwqzB23iBv r7SjnRNNhdlFkOB3gOKX6eaatB0fIX1jR93z59AjXdCDgGiBd4eOqAoecRyfgk0zi9b26T hQkpmpQLLCKYAgLX51fI/CXiM/NOYR8ZSZdhELwG0xL/iHR97/8q6o8xEGWzJ3QUGgKuNN JH6RKWXATSuKDkOP1Wq6bA/kWQ/WnQPnnIToBpLZbf9ZjcbsWmGDmV80R7UmNbEaFno1ap 0V+2Q00KNSgtl7mOQXvFzr42LFzWsLQCWtHnjqfJ+ZO3q0omxNbnRGU3OfFwIA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761569710; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TWE85Nonpakt3yht8+LMa3AEldQnfzeIxeCGPt2Eqy4=; b=whmvzKT9RCJkUrhoQ11ZfOTBesVxVkNkjZ9S14Apo3PLHWhqAbRq+guYp7MuWkxOhpSHG6 jVkGQTrHFJTtpoCYwpYMqmytm9jU8E/PxHiC5tPbmHhQuYgDfudgTS4wWB67IUdCGKUvKN F1hJleeksJlpZQivYsxylJ/19OSeC2QCT9mJ+CouAAxsE3DAcznGKa4sKkUc1sDC8Cpquj yQHJgGQrBdGxpoRyntgRsfLj7mWmO+5RnOjZoiXCK9bAL2nO4DeIznkoZzZie/QztA3wRb 4MdHh8IBioPwylU/noD89WXDrkomdX29FSrf1M5+Cha/czF/N8Sg6xVZdduaDA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761569710; a=rsa-sha256; cv=none; b=LXQVxjnndv/oy9eVg92s5/1qWpAkIwI0oNQkdGB3L4onOJ/C2FfUaeXW+6W27q8yzCUbQB wZPbq/mC8sDJ4VrTM6YiNVhg985fPj1sOC4bIQeEREif7kJyDAXPiATAG+0po3/+kFn9JL E2Vdy4tYu3KIU/w14mlFm6AX/AD/oaprTqA5S+xJ3pJqDoJ7JVs4+elt1yeFWAvlxpPQY+ x6t8J4qFPz+ex4y6wJ7S5/074UwzvcjDV4tmc9mfLxX2Tku10EoMPmsEak1HysaH3gIuGp gTelGdOqKRNZP7hxydJt7aNVfAUKdes3l4V/uL/28cD74xYYTtsPCIMp4uju5g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cwD4Z1vxdz1Jg9; Mon, 27 Oct 2025 12: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 59RCtAg2072495; Mon, 27 Oct 2025 12: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 59RCtAsv072492; Mon, 27 Oct 2025 12:55:10 GMT (envelope-from git) Date: Mon, 27 Oct 2025 12:55:10 GMT Message-Id: <202510271255.59RCtAsv072492@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 498e56142660 - main - ipfw: Correct error message List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 498e56142660c8dd864c878e820252358c9a15cf Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=498e56142660c8dd864c878e820252358c9a15cf commit 498e56142660c8dd864c878e820252358c9a15cf Author: Ed Maste AuthorDate: 2025-10-25 22:31:38 +0000 Commit: Ed Maste CommitDate: 2025-10-27 12:54:49 +0000 ipfw: Correct error message The failed allocation in the error pertains to IP_FW_XADD, not IP_FW_ADD. Reviewed by: ae Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D53359 --- sbin/ipfw/ipfw2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/ipfw/ipfw2.c b/sbin/ipfw/ipfw2.c index eed390ba5bec..a2b3e121e5df 100644 --- a/sbin/ipfw/ipfw2.c +++ b/sbin/ipfw/ipfw2.c @@ -5802,7 +5802,7 @@ ipfw_add(char *av[]) sz = default_off + sizeof(ipfw_obj_ctlv) + tlen + rlen; if ((tbuf = calloc(1, sz)) == NULL) - err(EX_UNAVAILABLE, "malloc() failed for IP_FW_ADD"); + err(EX_UNAVAILABLE, "malloc() failed for IP_FW_XADD"); op3 = (ip_fw3_opheader *)tbuf; /* Tables first */ ctlv = (ipfw_obj_ctlv *)(op3 + 1); From nobody Mon Oct 27 12:59:37 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cwD9q3Rdfz6DZGG; Mon, 27 Oct 2025 12:59: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cwD9q2m10z3PvN; Mon, 27 Oct 2025 12:59:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761569983; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7hfjhxz5n6bsLCGCPFCmDEeSwVUEcJl8t/63tmBmORE=; b=GiRuPw6popWpEfExoxld0FZA18f5twpMSHEKYmMR35GZoT6ukc9ZzWc45tuDqE8CSEXTjl b4mgAT/gXAvlWtmtYlFqErySeq6lxLtLegQq7YsOK/0kDdMbZzI1JwFCQuMQjMi1ygDhDp yeQJsrJOHnPmy+LHnHJEGn96KGsX1GXAwzKJ10v+Pj/LCzqFNV05X0Hi5HVgBeyZ4Haqg0 EtB+CSjxMUN0QgrtBqUUglnozL02YiulQGuQ94GJqHEJzMqOXNRno+2EzRT9Ws6WtZPPep cGF7lPuC9MHHFVJFvndrteOVe6fea2RRHHIveY604DGoWklfMIuTp/bmsCnhdg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761569983; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7hfjhxz5n6bsLCGCPFCmDEeSwVUEcJl8t/63tmBmORE=; b=TXE9a5zK4M0o+lBTrtIcQ7bobhWZ2MhvoInEEpdWDKAjjNI5Vy1MCCVN8uN5x/nBi7IYrQ A2XDHmyadLiIhGHXvW6RaYpwWueVuRio/Aw1s07dHNjlixADpQCGDy7sVd/TYVMCrSzWps wvCQ5ilE0najy21yTlVskIL4ToYZQPsK8+9camPClJui9cljGPUPrRC3OAlE/XvHr2h9wt 9252K84xTeqijTV7b6sdmoHQW6Drw+D4z21RWi//MisAQ3OIDNrKoZjkU5cPFDk7VtxBjW MMQM3u5IgZr6mqgVqYuCB5V6bVbNI7ER3n03iQCYhX0PFhB2y5Ndf8D0oR2UaA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761569983; a=rsa-sha256; cv=none; b=i+IWJP7FDV+kmozjOSqyGXtvO01632SwEzkpxyeph+CuDJ7vN+lieRBLlX0C3su9IE2MXd K7img7F8udQ8a8Ihv7VRnuxo4TgP44mEPWtH6xxKG58e9jsZOKpiSrB1DuR3dGxr4Hj+yC Qr13/pzegEUbqeQN/mpmqyS3TTg8icEUIG2j4mn6uFmKCOv4yNdjKZjoMblN7NFfn1BwsZ PVAR18XQ4sQbNLR9tlAD0grphFS0S1mx2CJA4CGAAvLBeFBBsBbab1xKethjo09GwKEHiy umlFCPxh7cnVFDCufn1K4CwtjKfAhW3QVaKKZgPL2ZNdYsK3IeTkbexcTkiFmw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cwD9q23vCz1Jps; Mon, 27 Oct 2025 12:59: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 59RCxhDw073898; Mon, 27 Oct 2025 12:59:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59RCxbVN073865; Mon, 27 Oct 2025 12:59:37 GMT (envelope-from git) Date: Mon, 27 Oct 2025 12:59:37 GMT Message-Id: <202510271259.59RCxbVN073865@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jose Luis Duran Subject: git: 34ffc7073f17 - main - MFV: Import blocklist 2025-10-26 (ff13526) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 34ffc7073f1786bae5e77593abd423ed31c10024 Auto-Submitted: auto-generated The branch main has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=34ffc7073f1786bae5e77593abd423ed31c10024 commit 34ffc7073f1786bae5e77593abd423ed31c10024 Merge: 498e56142660 df549a804256 Author: Jose Luis Duran AuthorDate: 2025-10-27 12:57:37 +0000 Commit: Jose Luis Duran CommitDate: 2025-10-27 12:57:37 +0000 MFV: Import blocklist 2025-10-26 (ff13526) Merge commit 'df549a80425635d98419f7f742309d66d367e65f' Changes: https://github.com/zoulasc/blocklist/compare/156df4f...ff13526 MFC after: 2 days contrib/blocklist/bin/blocklistctl.8 | 2 +- contrib/blocklist/bin/blocklistd.c | 8 ++++---- contrib/blocklist/bin/state.c | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) From nobody Mon Oct 27 14:12:40 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cwFp03FD2z6Dj3h; Mon, 27 Oct 2025 14:12:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cwFp02h00z3cTG; Mon, 27 Oct 2025 14:12:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761574360; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QuqvdDxt1Yade264rNgnl6VDmfOokSajdwiyKOEaz0s=; b=Q/9mpJP33n3siIwPs4S8A/O5gxV+RZmqlMMKH9o/ZUNmRzLUJxSJjm+yRmQ96djwis7Cik 6a9bNkx4a71QK9phHdnMc6uNj8kAC3k3sjefIjsT9YSUcqe8p/pXTyDcWsmgeSZUTGO5Ue hPQIuJSLzGtcCtUZA38uzO+CxGaddz4KT7Mt5Et2m5+u27XdOyLmXFzDFgrVNNN+dYXhrE F0tMMFhb++NnySURvNFaESgGBvF66HUijybcuB+7eeN+4vKHexQMZE280CEOX7QySNnSQj L8/EUVvsLCk6LNmMWSWGY7DZ8zIBusQCQkDVLVTmzgW/pRGSKGyPXWm/eFDkXw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761574360; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QuqvdDxt1Yade264rNgnl6VDmfOokSajdwiyKOEaz0s=; b=rOPwmySpUGkn7oM2yYvZEtWAaKEaMMaaokN3DaUO64zzh2D5mbRRSq/5rcxIoNnYnq2dMO 9PVsqhA7FROHSPxlE+6s8U4Aj1j7c0wGbPKTbMXlcM36CHOBUbAIsM+sNuB6/+UjEVQv9C iRglEN4JJsIutNYMwbTq9cWPpFplzChUDNN9EkwJnT6Kz0aC+2e2ocLZg68gIPXvDl6j7A bdCLmApIp80NtN9k9eTClwLFpCOCtiZeZJVOrsiMiOBvQ5DmhG/voECT7Ji2YsK6VsKhG+ qHOnsxXW2E5564q9QW3+2v4ioF8CExj4uBVR4j1TALKhbgmvfQhMxKxXUQGP3g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761574360; a=rsa-sha256; cv=none; b=irxUoyVvf2u2waOoxZGI0JbApDE32GkbqLsPYzGBKcHGMD9xwWLCSTl83UNmWVcwTW7qYs nyHRNynIcHG9stx7aKqAi+MRQJNwIMurvw+jDK1ajiQGggOBBWdNRWIlvHCfseCeFeJLG6 QeQKJUML+ob9vN5Zew8l/ha3BGgJIo2chu2mucHRSj0Bt9N4XQ9uWtI5w6bEPd27fDASv1 4it2sCLt56ZRHy8WEuGzE30YpJWpT4TQWeu5ZOESkE1iu+dPbmI/IF2yFCicI51+10RgU/ sn58PxOMPMRNoqkIOcPv5Gdzv4ykMwoDQvE5HdvGQUDK+z1Xz8zJY8zaaA5lVQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cwFp02CStz1Lsy; Mon, 27 Oct 2025 14:12: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 59RECeUB024053; Mon, 27 Oct 2025 14:12:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59RECeqb024050; Mon, 27 Oct 2025 14:12:40 GMT (envelope-from git) Date: Mon, 27 Oct 2025 14:12:40 GMT Message-Id: <202510271412.59RECeqb024050@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Krzysztof Galazka Subject: git: 09b48f811b4b - main - ice(4): Add support for E835-XXV-4 adapter List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kgalazka X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 09b48f811b4bf3a17485680b4720d1c0a81bbe07 Auto-Submitted: auto-generated The branch main has been updated by kgalazka: URL: https://cgit.FreeBSD.org/src/commit/?id=09b48f811b4bf3a17485680b4720d1c0a81bbe07 commit 09b48f811b4bf3a17485680b4720d1c0a81bbe07 Author: Krzysztof Galazka AuthorDate: 2025-10-27 14:10:26 +0000 Commit: Krzysztof Galazka CommitDate: 2025-10-27 14:10:31 +0000 ice(4): Add support for E835-XXV-4 adapter Add subdevice ID and branding string for E835-XXV-4 adapter. Signed-off-by: Krzysztof Galazka Approved by: kbowling (mentor), erj (mentor) Sponsored by: Intel Corporation MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D53319 --- sys/dev/ice/ice_drv_info.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/dev/ice/ice_drv_info.h b/sys/dev/ice/ice_drv_info.h index 46965f4124bc..abb11bdb5fd9 100644 --- a/sys/dev/ice/ice_drv_info.h +++ b/sys/dev/ice/ice_drv_info.h @@ -237,6 +237,9 @@ static const pci_vendor_info_t ice_vendor_info_array[] = { PVIDV_OEM(ICE_INTEL_VENDOR_ID, ICE_DEV_ID_E835CC_SFP, ICE_INTEL_VENDOR_ID, 0x0001, 0, "Intel(R) Ethernet Network Adapter E835-XXV-2 for OCP 3.0"), + PVIDV_OEM(ICE_INTEL_VENDOR_ID, ICE_DEV_ID_E835CC_SFP, + ICE_INTEL_VENDOR_ID, 0x0002, 0, + "Intel(R) Ethernet Network Adapter E835-XXV-4"), PVIDV_OEM(ICE_INTEL_VENDOR_ID, ICE_DEV_ID_E835CC_SFP, ICE_INTEL_VENDOR_ID, 0x0003, 0, "Intel(R) Ethernet Network Adapter E835-XXV-2"), From nobody Mon Oct 27 14:15:09 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cwFrs5Yqqz6DjQL; Mon, 27 Oct 2025 14:15: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cwFrs53pZz3cbw; Mon, 27 Oct 2025 14:15:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761574509; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uuMO7RK/bYzQeZhv/QbWe+Lw3lJYQxEgSHHygbCaFMw=; b=pmyT8LMVDE1eWezC6dNRsiUpncZ18xNaDExST+r7V3SNVkuL4aHqXokcV0EAxLRuZfP48z QqD/W5lRJ59aFvCd6LxCZqhkG6azHXIYmjKl7IdDun+pn7RMAqDzfoS8l28eBNezkipOE1 oNl99++iRsge93BD6BulAWZYQq+6PfHBZ5ztGUl6teceyoq9NvLjIyRSsWikfcTMxMI4vG xpljQpZoSk6RSK8ZK/wvCIcnL89FkvYvFrdqseRo0A+4dLU0ILYh1r6hGtUmBDn5K80DkN sww9Twf0KdBlK77WVdu7Nv41VR5R3bhLKMDRhtmbJ+FgedxOJycR8UkILFsMJg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761574509; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uuMO7RK/bYzQeZhv/QbWe+Lw3lJYQxEgSHHygbCaFMw=; b=LZ1qMyebHQ20a3aOTI62YNo2RWOd3ao9L5DTr0G0gdqlWKCsoQQOHWs4vEzeajlF8DvywA JnC7loQ8gQeszYDA6BqKOGkSPUmcUf9dQkPzw8Xcwpr5AkcTOasOvZSuug92FJcile+796 F3zWTzKvHyTb/cM2sb3mrR+JqrtVFCbQL/xbGCqVaLZ9A7dOqnMugm+KroSdhVoAcyr3wM gcux5+VT2oDFhp0UStCfJvOUSNDJdHdWpKa6gLgnLc5ad4a4xzBLoS9e/2VeJuY+PFnKu1 DY1J+vNAeR5xJ9BM52w9we4L7Gdd9Ac/yryCGGxQivIliBmJ07ba5WdswinWIQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761574509; a=rsa-sha256; cv=none; b=TRKXy0yAbvcfZNJpsGx1tlOoUmJhzWn7L98gAlA0jhcL2nVrhKyvI+WJOE1JIfQPk1Lndc PKLgTYbUhXtg4yN2KzZX1ZlAaOHXI3CDJ1sjQDu0R6vwT/QRck24P72yXAwCnZEUApm/hh eTwN/vtYJ9rejC9IZqCchPjXla/5Hig4M1OoRa3H+EmK0jHEGIt4LOfTcb7h+mK+RHcOQ2 lT1mHGXG2aDNas7OOFgU3x2Z614uy77bgE9qXYazGFNrrs2/bMInqHNENh4o3EEVMi2lQH et9Yf28DfcBznSnq0SCOyptJrbabSFSw27a9+1+MMaWCVTV/58TyDNqbb+0QjQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cwFrs4cT1z1LNw; Mon, 27 Oct 2025 14:15: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 59REF9xw024900; Mon, 27 Oct 2025 14:15:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59REF9kg024897; Mon, 27 Oct 2025 14:15:09 GMT (envelope-from git) Date: Mon, 27 Oct 2025 14:15:09 GMT Message-Id: <202510271415.59REF9kg024897@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Gallatin Subject: git: 23b46b2bbf0a - main - audit: convert audit event class lookup to lockless List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gallatin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 23b46b2bbf0a8f3a740b6e5baf0767816afc339e Auto-Submitted: auto-generated The branch main has been updated by gallatin: URL: https://cgit.FreeBSD.org/src/commit/?id=23b46b2bbf0a8f3a740b6e5baf0767816afc339e commit 23b46b2bbf0a8f3a740b6e5baf0767816afc339e Author: Andrew Gallatin AuthorDate: 2025-10-27 14:05:49 +0000 Commit: Andrew Gallatin CommitDate: 2025-10-27 14:15:01 +0000 audit: convert audit event class lookup to lockless When system call auditing is enabled, every audited call does a lookup in the evclass hash table. This table appears to be insert only (eg, nothing can be removed) and protecting it with an rwlock is overkill. Using an rwlock causes just the atomic operations to maintain uncontended rwlock state to be responsible for measurable overhead on high core count servers making lots of system calls. Given that the evclass hash table can never have items removed, only added, using a mutex to serialize additions and converting to ck_list allows sufficient protection for lockless lookups. In a contrived example of 64 cores, all reading 1 byte from their own file, this change increases performance from 5M reads/sec to 70M reads/sec on an AMD 7502P. Reviewed by: markj, mjg, glebius (privately) Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D53176 --- sys/security/audit/audit_bsm_db.c | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/sys/security/audit/audit_bsm_db.c b/sys/security/audit/audit_bsm_db.c index c9f3d5c8a549..358162544287 100644 --- a/sys/security/audit/audit_bsm_db.c +++ b/sys/security/audit/audit_bsm_db.c @@ -56,6 +56,8 @@ #include #include +#include + /* * Hash table functions for the audit event number to event class mask * mapping. @@ -64,21 +66,21 @@ struct evclass_elem { au_event_t event; au_class_t class; - LIST_ENTRY(evclass_elem) entry; + CK_LIST_ENTRY(evclass_elem) entry; }; struct evclass_list { - LIST_HEAD(, evclass_elem) head; + CK_LIST_HEAD(, evclass_elem) head; }; static MALLOC_DEFINE(M_AUDITEVCLASS, "audit_evclass", "Audit event class"); -static struct rwlock evclass_lock; static struct evclass_list evclass_hash[EVCLASSMAP_HASH_TABLE_SIZE]; - -#define EVCLASS_LOCK_INIT() rw_init(&evclass_lock, "evclass_lock") -#define EVCLASS_RLOCK() rw_rlock(&evclass_lock) -#define EVCLASS_RUNLOCK() rw_runlock(&evclass_lock) -#define EVCLASS_WLOCK() rw_wlock(&evclass_lock) -#define EVCLASS_WUNLOCK() rw_wunlock(&evclass_lock) +static struct mtx evclass_mtx; +#define EVCLASS_LOCK_INIT() mtx_init(&evclass_mtx, "evclass_lock", NULL, MTX_DEF) +#define EVCLASS_WLOCK() mtx_lock(&evclass_mtx); +#define EVCLASS_WUNLOCK() mtx_unlock(&evclass_mtx); +/* make these do something if we ever remove entries from the hash */ +#define EVCLASS_RLOCK() {} +#define EVCLASS_RUNLOCK() {} /* * Hash table maintaining a mapping from audit event numbers to audit event @@ -118,7 +120,7 @@ au_event_class(au_event_t event) EVCLASS_RLOCK(); evcl = &evclass_hash[event % EVCLASSMAP_HASH_TABLE_SIZE]; class = 0; - LIST_FOREACH(evc, &evcl->head, entry) { + CK_LIST_FOREACH(evc, &evcl->head, entry) { if (evc->event == event) { class = evc->class; goto out; @@ -150,7 +152,7 @@ au_evclassmap_insert(au_event_t event, au_class_t class) EVCLASS_WLOCK(); evcl = &evclass_hash[event % EVCLASSMAP_HASH_TABLE_SIZE]; - LIST_FOREACH(evc, &evcl->head, entry) { + CK_LIST_FOREACH(evc, &evcl->head, entry) { if (evc->event == event) { evc->class = class; EVCLASS_WUNLOCK(); @@ -161,7 +163,7 @@ au_evclassmap_insert(au_event_t event, au_class_t class) evc = evc_new; evc->event = event; evc->class = class; - LIST_INSERT_HEAD(&evcl->head, evc, entry); + CK_LIST_INSERT_HEAD(&evcl->head, evc, entry); EVCLASS_WUNLOCK(); } @@ -172,7 +174,7 @@ au_evclassmap_init(void) EVCLASS_LOCK_INIT(); for (i = 0; i < EVCLASSMAP_HASH_TABLE_SIZE; i++) - LIST_INIT(&evclass_hash[i].head); + CK_LIST_INIT(&evclass_hash[i].head); /* * Set up the initial event to class mapping for system calls. From nobody Mon Oct 27 14:27:55 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cwG7b3kdTz6DkNK; Mon, 27 Oct 2025 14:27:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cwG7b2vZXz3f5v; Mon, 27 Oct 2025 14:27:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761575275; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=v2ADnp/qyjgkXmT2pqjTJ/3k64nQOBwZC+WJlitpqVM=; b=oWfyt/Y+xsvQyj+eYEB+GXsfKKKRKhFYAvudC/sJuiz0GtXyA4UJd3v9OYfJHg2e/f/bq4 R3Wl2059tafp0mt1abh27fj5uUT1X8Cizi8Z731H4P951mDPjZNUFwPyLMZyLEWqyFsu/8 ly/w1JPzzdeub1VnGfzSX/uENPv38YbO4DACNUsTu6GUNtmlzo2slCjANKOd5LIFujOiT8 ainSwUv+ftPRsfLXKmGwZkwu6LexFgh3TT16bz7ex5JxtHmAGTb+nMZqK5SNDN9qa+1OCP 37Y+IMXeGDpddYw7MOegY8aTZbfjRArb7jbXbU9jJ0u+M3iVKnyGEbXB302K/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761575275; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=v2ADnp/qyjgkXmT2pqjTJ/3k64nQOBwZC+WJlitpqVM=; b=ijAcmxPDld0bTDhqQYIZtio60GF1Dmu67R7dk09r5q7XWLLIq6oWTqGAcA3lYQX2Jp2Cz1 g4AwMZx+VjvheCiu2D5+cve8WrVYvxoItBVEA13OSyz8iiK8MsDmUGrAq21KXhh2uE7OGA /pvfvboSPfE4jrjhOJFR3AN6c1nxA18NhY4rpJW3GC13IkbsSITCHHXByJCXwd0sU1I12b 16tCr1nAbrI/dsOASHGC6tVDDgm+4vTcIvTJIB9vOHDG3YuF54AxaJpleivKZStaca+REO 97tUbugI1Sh7H6VaHpikyE7DI/IeGmIf6sQTFO5cbeZBQCZGFP+lpn6/3d547Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761575275; a=rsa-sha256; cv=none; b=MgF56Uo89EptUCKnXcLDlDEzELuAKH0d4vKgVmOJnmtADT17K2XbsNzJQ2i2cLRM9Y4LN6 qI5SuvRQTdTrYGh16NckJK8BHoLkJtcsu+bAKJBSt0Jf34zz+DNBVRT+1dzG3DN8onVYXN xFl+EQ4PfGzSZVT7/v7RIS6A6aTh/a+G829j67csxCOgM4OBkwxExIk2GJYrEX9S30pjwc DeYeuaBwi7xCXWivECROyjmVFdUEysfj49wd6JE8kg523f2L/tgAGo9YWvYGwlmSZQPn4r rhGRQx1Rwm4FqESZ0C3+UvR1T1LXk2pEtWv6TREjhN1dTkSW9nrWxokSZfw1Gw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cwG7b2VMlz1Ltp; Mon, 27 Oct 2025 14:27: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 59RERtfk044212; Mon, 27 Oct 2025 14:27:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59RERtaZ044209; Mon, 27 Oct 2025 14:27:55 GMT (envelope-from git) Date: Mon, 27 Oct 2025 14:27:55 GMT Message-Id: <202510271427.59RERtaZ044209@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: 1a679fb90796 - main - nfs_nfsdserv.c: Add a sanity check for layout commit cnt List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1a679fb907962843f01b103ec672136a8f8d8edb Auto-Submitted: auto-generated The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=1a679fb907962843f01b103ec672136a8f8d8edb commit 1a679fb907962843f01b103ec672136a8f8d8edb Author: Rick Macklem AuthorDate: 2025-10-27 14:24:47 +0000 Commit: Rick Macklem CommitDate: 2025-10-27 14:24:47 +0000 nfs_nfsdserv.c: Add a sanity check for layout commit cnt If a client were to send a LayoutCommit (seldom used and only for a pNFS server) with a bogus cnt, there could be problems with a malloc() call that uses it. This patch adds a sanity check for the cnt. Note that RFC8881 does not specify any upper bound on the cnt. Reported by: Ilja Van Sprundel Reviewed by: markj MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D53354 --- sys/fs/nfsserver/nfs_nfsdserv.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sys/fs/nfsserver/nfs_nfsdserv.c b/sys/fs/nfsserver/nfs_nfsdserv.c index 6f3447f26620..67af0cf71175 100644 --- a/sys/fs/nfsserver/nfs_nfsdserv.c +++ b/sys/fs/nfsserver/nfs_nfsdserv.c @@ -5138,6 +5138,11 @@ nfsrvd_layoutcommit(struct nfsrv_descript *nd, __unused int isdgram, NFSM_DISSECT(tl, uint32_t *, 2 * NFSX_UNSIGNED); layouttype = fxdr_unsigned(int, *tl++); maxcnt = fxdr_unsigned(int, *tl); + /* There is no limit in the RFC, so use 1000 as a sanity limit. */ + if (maxcnt < 0 || maxcnt > 1000) { + error = NFSERR_BADXDR; + goto nfsmout; + } if (maxcnt > 0) { layp = malloc(maxcnt + 1, M_TEMP, M_WAITOK); error = nfsrv_mtostr(nd, layp, maxcnt); From nobody Mon Oct 27 14:34:33 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cwGHF74Rnz6Dlh2; Mon, 27 Oct 2025 14:34:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cwGHF6cV8z3jKS; Mon, 27 Oct 2025 14:34:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761575673; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KZ0KCMyZ4oClmyKf/GhTMYiDGiMuFntDXz2Vxa0FRt4=; b=H/DEgk9Bpve98GneTQv/IqaGIEFZMMUJdxReG93fKevQOSI+rcmv7iryb/Bxmj6FhrbYUg 5NgpUZqFUME28hfLC91vcxNpJCoytatkWwwPuAtRlmmEgzTmz4D2Gtbs+hE7zzqjgb0/eF dn6xIWCs0zTRXA5FlRo4RBKmtQt1mBfSIG4F+qnXIRXoAxTOLAIU5wFZKwV/YCBPI2UQCd +hJSicIRnTPoSxv9UsBwVxhiuCFAJTg/6Yrlk8wULK058dCwK8FAlTZ+RObER6PsjUZeDV pQwglXHhpDvq52XfSJgkY361jQtkIOldRNcn5HFuJ2uqyWlPmoPyLGiMDms1og== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761575673; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KZ0KCMyZ4oClmyKf/GhTMYiDGiMuFntDXz2Vxa0FRt4=; b=r7gp93++WddTqCUyxLx1W1+Ym/rY+B+rusryB3BHszTxfnMB7ICVHGSNLSspsUF6jeXYEv Gdtg3uFVZzlkdc5WqAJnYw2xmdkGnAieBavna2G9SZTSxT/7QOBCp7eo5vruAnlZuWVHzM ywtUqJXvBjXkJjSUY9z4gLlpZCx2DgASzyg1N74DtZSBIRjyntLpoKyZzSrjpkuYWZmtMn eh593MbVqno4Im7BX0uMBRjsabGsGoOljm/sqlZcbPGqJkESZfLAb7qej/peGkbc3v4YMj jWao4cANexeom9YnV3KLrdz1PGfbjQxtuJcVk+qeMzP4iRsyyyiHpbNBpzjrtw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761575673; a=rsa-sha256; cv=none; b=A55h73olbldgfH+vNDz6TeSFbDOiL6yIlucyj/EKWvg/MT5yHcScvSXRYoXr0YuFWYhGIX zY9StQsNBwialWUGPf4SNEf2UdZ9z9RH8rhnWiwmFhTD3ZwYiz5M6qg6dDrF5eu/NisyoR PGjn0wmNn7TR952mpYcKmZ+a3cWV3HYG2dQMEYT4NKjR+MOwRTwHO3pOAxmBS4rI4e1Vku V+aYv1tKSAJaAo2Vxn75VVsUY86MOodi3n7crx96x45QABG29ixod7SH7VPozh/iFArSFc hI0y7es3F7A/2leUH1Vxmaz9kwq6yh3i+CGPDiM829G4WvbL/03JtZgmKT+9Pg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cwGHF6B3Zz1MPn; Mon, 27 Oct 2025 14:34: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 59REYXcS063366; Mon, 27 Oct 2025 14:34:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59REYXI3063363; Mon, 27 Oct 2025 14:34:33 GMT (envelope-from git) Date: Mon, 27 Oct 2025 14:34:33 GMT Message-Id: <202510271434.59REYXI3063363@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Justin Hibbits Subject: git: cb3849930362 - main - x86/intr: Handle case of disabling MSI after release List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhibbits X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cb38499303621553c977fd7dd7f18d12731fcd9c Auto-Submitted: auto-generated The branch main has been updated by jhibbits: URL: https://cgit.FreeBSD.org/src/commit/?id=cb38499303621553c977fd7dd7f18d12731fcd9c commit cb38499303621553c977fd7dd7f18d12731fcd9c Author: Justin Hibbits AuthorDate: 2025-10-26 02:45:26 +0000 Commit: Justin Hibbits CommitDate: 2025-10-27 14:33:49 +0000 x86/intr: Handle case of disabling MSI after release Once an interrupt source is registered it's never deregistered. However, when an MSI is released the pointer for it becomes NULLed out, resulting in a NULL pointer dereference when attempting to disable the now-released MSI source. Add NULL check to avoid this. Reviewed by: kib Sponsored by: Juniper Networks, Inc. Differential Revision: https://reviews.freebsd.org/D51624 --- sys/x86/x86/msi.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sys/x86/x86/msi.c b/sys/x86/x86/msi.c index 9d5a51f9753c..b38247bf6e45 100644 --- a/sys/x86/x86/msi.c +++ b/sys/x86/x86/msi.c @@ -219,6 +219,14 @@ msi_disable_intr(struct intsrc *isrc) struct msi_intsrc *msi = (struct msi_intsrc *)isrc; msi = msi->msi_first; + + /* + * Interrupt sources are always registered, but never unregistered. + * Handle the case where MSIs have all been unregistered. + */ + if (msi == NULL) + return; + msi->msi_enabled--; if (msi->msi_enabled == 0) { for (u_int i = 0; i < msi->msi_count; i++) From nobody Mon Oct 27 14:34:34 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cwGHH1Wvrz6Dlmb; Mon, 27 Oct 2025 14:34: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cwGHH0WxDz3j98; Mon, 27 Oct 2025 14:34:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761575675; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=w0krS1yo+Z2rut5zw9jih17r1Ii02RaobxyeqGlICMc=; b=Q9bM4X5Hpl+uJ/0zZNlXm8OkRmKTGx9vvv59GDbTwS/s/V2gy/qfNHtsP9h9+2yuhIyW5X xjXL499mOqp352w6ZLUqZgUAFUuVHfKhMuyoqS5JTXYpF346ZxfXToss9aFi6kq6glkjSr h60alu0SOZ3LmlNPxmqkCezpZWfw5LlwBzLYhZfhw2/25t+B11RzPb/Rx/Hrv4dOMuSYwU aGo0MmvLPugljoCYjj7dd7A9rajdGx1oWdsg8yBBvSUn96DICT9FTkF77KR9Oysvns3CYn hB9ZXAaLSiSoBYJoDI1NYP/gUj2kbRGuQ55G9r0SqXOwWV0f3S73aVN9cwu8Eg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761575675; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=w0krS1yo+Z2rut5zw9jih17r1Ii02RaobxyeqGlICMc=; b=PZucL3yiSuQTpO2yhM5wxgX4xPVtKDMPZTQiObdjg4qHvsKqEWj0guvEMsIfZwfZv4dy/8 QJtyt4hSlscJlkoFAtTgQOG6Cz/DIQVFtCsFEoD7C8pYjTBbdbqhPnMhTTQbqhgsoFtUq+ 8xuRPZ1urWjU7fsyHMkkunGX8etDYnRSZzm1FdaW7Ysko+tzH5o+pw3Wy81uER6Ew9MPvI F4kD118em2GqJD9M/BURTWIA9OrEx4eNos91kdAJQSZvLwTeBE4r9xn/JGL+Ba3Q6VY+gQ VrjdwGUqtEjXRBIZEOdc1jQfF1PUtjxq6Oy9jT0TsIE90z+2ifYC8kRI0Vys3g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761575675; a=rsa-sha256; cv=none; b=PPf+df7Nvn+7Nfv4bA4T11aSNvkdrVy9hEolMVQTyJayo9K5U7FszOidMuPfg4ulI+KZ18 +pce6+QwTHwdjOEbSkg2jIoOCbYlj1PRXzPBvS4mkjE0UQmXaJODtvfyq4HeyON1Jyr+j4 lPxIY90CgeoBRZ4AylrJ9xOerxdRZAB9X54m54jgdMqlFGDdC1jTFi0GJkJPz6zz6Rzr2b dlIjrP4Ym4m8zRYZHVUMD5nAg8G9MZq3qzqxR74Av6r4YPLr0jnKuvK17ZQyn6BXh3sake ETkrH7uXyOIJngDeBu8ke0A4lxicezi/k3ySmv46+5izN1NXVKPuc1F2g8C2uA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cwGHH00Xhz1LhK; Mon, 27 Oct 2025 14:34: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 59REYYpY063400; Mon, 27 Oct 2025 14:34:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59REYY0U063397; Mon, 27 Oct 2025 14:34:34 GMT (envelope-from git) Date: Mon, 27 Oct 2025 14:34:34 GMT Message-Id: <202510271434.59REYY0U063397@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Justin Hibbits Subject: git: 190d0a96cf56 - main - amd64: Add cpu_stop() support to go UP after SMP List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhibbits X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 190d0a96cf5672c6cf0ce86eb91dd1f19d35baac Auto-Submitted: auto-generated The branch main has been updated by jhibbits: URL: https://cgit.FreeBSD.org/src/commit/?id=190d0a96cf5672c6cf0ce86eb91dd1f19d35baac commit 190d0a96cf5672c6cf0ce86eb91dd1f19d35baac Author: Justin Hibbits AuthorDate: 2025-10-26 02:45:08 +0000 Commit: Justin Hibbits CommitDate: 2025-10-27 14:33:49 +0000 amd64: Add cpu_stop() support to go UP after SMP Reviewed by: kib Sponsored by: Juniper Networks, Inc. Differential Revision: https://reviews.freebsd.org/D51622 --- sys/amd64/amd64/apic_vector.S | 11 +++++++++++ sys/amd64/amd64/mp_machdep.c | 13 +++++++++++++ sys/amd64/include/smp.h | 1 + sys/kern/subr_smp.c | 15 +++++++++++---- sys/sys/smp.h | 1 + sys/x86/include/apicvar.h | 3 ++- sys/x86/include/x86_smp.h | 2 ++ sys/x86/x86/mp_x86.c | 22 ++++++++++++++++++++++ 8 files changed, 63 insertions(+), 5 deletions(-) diff --git a/sys/amd64/amd64/apic_vector.S b/sys/amd64/amd64/apic_vector.S index e98bae9eb6c5..8691387a5a8e 100644 --- a/sys/amd64/amd64/apic_vector.S +++ b/sys/amd64/amd64/apic_vector.S @@ -203,6 +203,17 @@ IDTVEC(spuriousint) KMSAN_LEAVE jmp doreti +/* + * Executed by a CPU when it receives an IPI_OFF from another CPU. + * Should never return + */ + INTR_HANDLER cpuoff + KMSAN_ENTER + call cpuoff_handler + call as_lapic_eoi + KMSAN_LEAVE + jmp doreti + /* * Executed by a CPU when it receives an IPI_SWI. */ diff --git a/sys/amd64/amd64/mp_machdep.c b/sys/amd64/amd64/mp_machdep.c index 00e99f9df192..96ed0a2cc3ba 100644 --- a/sys/amd64/amd64/mp_machdep.c +++ b/sys/amd64/amd64/mp_machdep.c @@ -140,6 +140,10 @@ cpu_mp_start(void) setidt(IPI_STOP, pti ? IDTVEC(cpustop_pti) : IDTVEC(cpustop), SDT_SYSIGT, SEL_KPL, 0); + /* Install an inter-CPU IPI for CPU offline */ + setidt(IPI_OFF, pti ? IDTVEC(cpuoff_pti) : IDTVEC(cpuoff), + SDT_SYSIGT, SEL_KPL, 0); + /* Install an inter-CPU IPI for CPU suspend/resume */ setidt(IPI_SUSPEND, pti ? IDTVEC(cpususpend_pti) : IDTVEC(cpususpend), SDT_SYSIGT, SEL_KPL, 0); @@ -176,6 +180,15 @@ cpu_mp_start(void) #endif } +void +cpu_mp_stop(void) +{ + cpuset_t other_cpus = all_cpus; + + CPU_CLR(PCPU_GET(cpuid), &other_cpus); + offline_cpus(other_cpus); +} + /* * AP CPU's call this to initialize themselves. */ diff --git a/sys/amd64/include/smp.h b/sys/amd64/include/smp.h index bff92570ff82..28c372a2e556 100644 --- a/sys/amd64/include/smp.h +++ b/sys/amd64/include/smp.h @@ -30,6 +30,7 @@ inthand_t IDTVEC(ipi_intr_bitmap_handler_pti), IDTVEC(ipi_swi_pti), IDTVEC(cpustop_pti), + IDTVEC(cpuoff_pti), IDTVEC(cpususpend_pti), IDTVEC(rendezvous_pti); diff --git a/sys/kern/subr_smp.c b/sys/kern/subr_smp.c index 1f9577fddf9c..9f5106316018 100644 --- a/sys/kern/subr_smp.c +++ b/sys/kern/subr_smp.c @@ -242,7 +242,7 @@ generic_stop_cpus(cpuset_t map, u_int type) KASSERT( type == IPI_STOP || type == IPI_STOP_HARD #if X86 - || type == IPI_SUSPEND + || type == IPI_SUSPEND || type == IPI_OFF #endif , ("%s: invalid stop type", __func__)); @@ -260,7 +260,7 @@ generic_stop_cpus(cpuset_t map, u_int type) * will be lost, violating FreeBSD's assumption of reliable * IPI delivery. */ - if (type == IPI_SUSPEND) + if (type == IPI_SUSPEND || type == IPI_OFF) mtx_lock_spin(&smp_ipi_mtx); #endif @@ -280,7 +280,7 @@ generic_stop_cpus(cpuset_t map, u_int type) #endif #if X86 - if (type == IPI_SUSPEND) + if (type == IPI_SUSPEND || type == IPI_OFF) cpus = &suspended_cpus; else #endif @@ -298,7 +298,7 @@ generic_stop_cpus(cpuset_t map, u_int type) } #if X86 - if (type == IPI_SUSPEND) + if (type == IPI_SUSPEND || type == IPI_OFF) mtx_unlock_spin(&smp_ipi_mtx); #endif @@ -327,6 +327,13 @@ suspend_cpus(cpuset_t map) return (generic_stop_cpus(map, IPI_SUSPEND)); } + +int +offline_cpus(cpuset_t map) +{ + + return (generic_stop_cpus(map, IPI_OFF)); +} #endif /* diff --git a/sys/sys/smp.h b/sys/sys/smp.h index 252dc9dc1cae..5b968aa69791 100644 --- a/sys/sys/smp.h +++ b/sys/sys/smp.h @@ -259,6 +259,7 @@ int stop_cpus_hard(cpuset_t); #if defined(__amd64__) || defined(__i386__) int suspend_cpus(cpuset_t); int resume_cpus(cpuset_t); +int offline_cpus(cpuset_t); #endif void smp_rendezvous_action(void); diff --git a/sys/x86/include/apicvar.h b/sys/x86/include/apicvar.h index c537d0ee0cdd..551f5527ac00 100644 --- a/sys/x86/include/apicvar.h +++ b/sys/x86/include/apicvar.h @@ -134,7 +134,8 @@ #define IPI_STOP (APIC_IPI_INTS + 6) /* Stop CPU until restarted. */ #define IPI_SUSPEND (APIC_IPI_INTS + 7) /* Suspend CPU until restarted. */ #define IPI_SWI (APIC_IPI_INTS + 8) /* Run clk_intr_event. */ -#define IPI_DYN_FIRST (APIC_IPI_INTS + 9) +#define IPI_OFF (APIC_IPI_INTS + 9) /* Stop CPU forever */ +#define IPI_DYN_FIRST (APIC_IPI_INTS + 10) #define IPI_DYN_LAST (254) /* IPIs allocated at runtime */ /* diff --git a/sys/x86/include/x86_smp.h b/sys/x86/include/x86_smp.h index 8b9eb2ec9b66..f5015e9d8a24 100644 --- a/sys/x86/include/x86_smp.h +++ b/sys/x86/include/x86_smp.h @@ -77,6 +77,7 @@ extern u_long *ipi_rendezvous_counts[MAXCPU]; inthand_t IDTVEC(ipi_intr_bitmap_handler), /* Bitmap based IPIs */ IDTVEC(ipi_swi), /* Runs delayed SWI */ + IDTVEC(cpuoff), /* CPU goes offline until hard reset */ IDTVEC(cpustop), /* CPU stops & waits to be restarted */ IDTVEC(cpususpend), /* CPU suspends & waits to be resumed */ IDTVEC(rendezvous); /* handle CPU rendezvous */ @@ -93,6 +94,7 @@ void assign_cpu_ids(void); void cpu_add(u_int apic_id, char boot_cpu); void cpustop_handler(void); void cpususpend_handler(void); +void cpuoff_handler(void); void init_secondary_tail(void); void init_secondary(void); void ipi_startup(int apic_id, int vector); diff --git a/sys/x86/x86/mp_x86.c b/sys/x86/x86/mp_x86.c index c0da41a4d222..6b1715853763 100644 --- a/sys/x86/x86/mp_x86.c +++ b/sys/x86/x86/mp_x86.c @@ -1696,6 +1696,28 @@ cpususpend_handler(void) CPU_CLR_ATOMIC(cpu, &toresume_cpus); } +void +cpuoff_handler(void) +{ + u_int cpu; + + cpu = PCPU_GET(cpuid); + + /* Time to go catatonic. A reset will be required to leave. */ + disable_intr(); + lapic_disable(); + CPU_SET_ATOMIC(cpu, &suspended_cpus); + + /* + * There technically should be no need for the `while` here, since it + * cannot be interrupted (interrupts are disabled). Be safe anyway. + * Any interrupt at this point will likely be fatal, as the page tables + * are likely going away shortly. + */ + while (1) + halt(); +} + /* * Handle an IPI_SWI by waking delayed SWI thread. */ From nobody Mon Oct 27 14:34:36 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cwGHJ5C7rz6Dlh5; Mon, 27 Oct 2025 14:34: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cwGHJ16yYz3jS6; Mon, 27 Oct 2025 14:34:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761575676; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FN9XSsrAAOwBQ2HKqiaNq/xNdlc6i4K9jSQ/jwEIlCk=; b=yxbt9jesTJgu85dBFC+fcJrdBLYKxq+JNduRpUBnVC8U/WVvQBiCMqnO9T2u7NGsXpkGvw xrqCF1mlV9CdxHVLaSz5aS8QSQEgGE/y0Vexr9GYTpPTfk5KWe15lEEcqsYqC3OiG33s4l D9enyMW+6HdRwMM1i1QDr4KXUun201xAkJmZl0N4JwE3IvWAIHum/kqpfL0Yx4cZnYUFXE 0NjwkKI6Ic1zfKTFt+0uPEO793wHQ7/tdo4WLrwdF36UMt5vNmidpETBv6gHXQ1X3rLd3Z hK+mgBUVG4j6Vpkgh51EkWj9gc6KkNUOxBrCiM0BAHBl6JlNkbwOdWKH/LS4oA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761575676; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FN9XSsrAAOwBQ2HKqiaNq/xNdlc6i4K9jSQ/jwEIlCk=; b=WAjXahiwfKEOLOE1DpT5+cKErE4bKEdBRh42X7Ysc6t2VCoATty9AUvj5/stcNpfCGCqOk krsE6w9IPrdMuSWVUwx6AR3GDKed6lN6U3Zs7XcD0DZXuuhnWTXO89B5Fk9tD5D3jMCgzo NHVfJNnNh74zkWV4cPc1l8lQyhmY24vrtT2T6S8qKIJmmHLj/HKjnT4/5nk6ny1U7ZdNvQ V7Pty9Qg+qjoMGUmG8Mb9nGgRQI8zZpMLmrEnaUZGJ44sb8hZ5cnYDWmq8qK5bMISE/RtQ hzn08oBHiicVUkR1uobTbXO1GHZzG1xifxDiS0GOowZWs/Ab1tqLmuP7trsSwg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761575676; a=rsa-sha256; cv=none; b=uHEe6E/CixaDqk8/hVjDZCnisQSDDbOzsTmmFNUmzKC9Han9mNYPUqBRskxXbQ28piDClU yGvUuv0L9ihfkS8Rvn59SqLepMLd+bS0rF9UQY9b+e85eODiWo2mCY6IwhR01vHjONdmGQ MikhMfJf+94VVwlSFqTT2Y+PUf3ZS+Gnmi2u4AXyrXAa5Lp/0PmadAc9B6UUflK0/MOl5+ qsdOc57i3DlkDDBPAL1W1DKWTfn7cB1a2B4clYIAdnW9mc9+e6/iQz4M2Ze3z+yrMYCqlP sgsTOB977BeGd5pzVE8UJmyz2biXtHnkZYVVk9BZpsgVVbd9iJ5yA/HX/Wnk5A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cwGHJ0kKqz1LGh; Mon, 27 Oct 2025 14:34: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 59REYaKr063437; Mon, 27 Oct 2025 14:34:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59REYaKD063434; Mon, 27 Oct 2025 14:34:36 GMT (envelope-from git) Date: Mon, 27 Oct 2025 14:34:36 GMT Message-Id: <202510271434.59REYaKD063434@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Justin Hibbits Subject: git: e02c57ff374e - main - kern: Introduce kexec system feature (MI) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhibbits X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e02c57ff374ea3eed69e5f43f19a41fa559b7e2d Auto-Submitted: auto-generated The branch main has been updated by jhibbits: URL: https://cgit.FreeBSD.org/src/commit/?id=e02c57ff374ea3eed69e5f43f19a41fa559b7e2d commit e02c57ff374ea3eed69e5f43f19a41fa559b7e2d Author: Justin Hibbits AuthorDate: 2025-10-26 02:44:45 +0000 Commit: Justin Hibbits CommitDate: 2025-10-27 14:33:50 +0000 kern: Introduce kexec system feature (MI) Introduce a new system call and reboot method to support booting a new kernel directly from FreeBSD. Linux has included a system call, kexec_load(), since 2005, which permits booting a new kernel at reboot instead of requiring a full reboot cycle through the BIOS/firmware. This change brings that same system call to FreeBSD. Other changesets will add the MD components for some of our architectures, with stubs for the rest until the MD components have been written. kexec_load() supports loading up to an arbitrary limit of 16 memory segments. These segments must be contained inside memory bounded in vm_phys_segs (vm.phys_segs sysctl), and a segment must be contained within a single vm.phys_segs segment, cannot cross adjacent segments. Reviewed by: imp, kib Sponsored by: Juniper Networks, Inc. Differential Revision: https://reviews.freebsd.org/D51619 --- sys/compat/freebsd32/syscalls.conf | 3 +- sys/conf/files | 1 + sys/kern/kern_kexec.c | 350 +++++++++++++++++++++++++++++++++++++ sys/kern/syscalls.master | 8 + sys/sys/kexec.h | 81 +++++++++ sys/sys/reboot.h | 1 + sys/sys/smp.h | 1 + sys/sys/syscallsubr.h | 3 + 8 files changed, 447 insertions(+), 1 deletion(-) diff --git a/sys/compat/freebsd32/syscalls.conf b/sys/compat/freebsd32/syscalls.conf index 72006631c89e..9308d1529c63 100644 --- a/sys/compat/freebsd32/syscalls.conf +++ b/sys/compat/freebsd32/syscalls.conf @@ -48,10 +48,11 @@ obsol="getkerninfo" # Syscalls without implementations: # __mac_* - should be implemented # afs3_syscall - requires significant porting, probably doesn't make sense +# kexec_load - makes little sense on 64-bit hardware # kldsym - can't be implemented (kernel virtual addresses can't fit in 32-bits) # lgetfh - should be implemented # nlm_syscall - requires significant porting, probably doesn't make sense # nnpfs_syscall - requires significant porting, probably doesn't make sense # ntp_gettime - should be implemented # thr_create - was unimplemented and appears to be unnecessary -unimpl="afs3_syscall kldsym __mac_get_proc __mac_set_proc __mac_get_fd __mac_get_file __mac_set_fd __mac_set_file __mac_get_pid __mac_get_link __mac_set_link __mac_execve nfssvc nlm_syscall ntp_gettime lgetfh nnpfs_syscall thr_create" +unimpl="afs3_syscall kexec_load kldsym __mac_get_proc __mac_set_proc __mac_get_fd __mac_get_file __mac_set_fd __mac_set_file __mac_get_pid __mac_get_link __mac_set_link __mac_execve nfssvc nlm_syscall ntp_gettime lgetfh nnpfs_syscall thr_create" diff --git a/sys/conf/files b/sys/conf/files index c17451324324..13b74e2fc44f 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -3842,6 +3842,7 @@ kern/kern_jaildesc.c standard kern/kern_jailmeta.c standard kern/kern_kcov.c optional kcov \ compile-with "${NOSAN_C} ${MSAN_CFLAGS}" +kern/kern_kexec.c standard kern/kern_khelp.c standard kern/kern_kthread.c standard kern/kern_ktr.c optional ktr diff --git a/sys/kern/kern_kexec.c b/sys/kern/kern_kexec.c new file mode 100644 index 000000000000..2efea7dcf9a7 --- /dev/null +++ b/sys/kern/kern_kexec.c @@ -0,0 +1,350 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2025 Juniper Networks, Inc. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include +#include +#include +#include +#ifdef INTRNG +#include +#endif +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +#ifndef KEXEC_MD_PAGES +/* + * Number of MD pages for extra bookkeeping. + * This is a macro because it can be a constant (some architectures make it 0). + * It accepts an argument, which is an array of + * kexec_segment[KEXEC_SEGMENT_MAX]. + */ +#define KEXEC_MD_PAGES(x) 0 +#endif + +/* + * Basic design: + * + * Given an array of "segment descriptors" stage an image to be loaded and + * jumped to at reboot, instead of rebooting via firmware. + * + * Constraints: + * - The segment descriptors' "mem" and "memsz" must each fit within a + * vm_phys_seg segment, which can be obtained via the `vm.phys_segs` sysctl. + * A single segment cannot span multiple vm_phys_seg segments, even if the + * vm_phys_seg segments are adjacent. + * + * Technical details: + * + * Take advantage of the VM subsystem and create a vm_object to hold the staged + * image. When grabbing pages for the object, sort the pages so that if a page + * in the object is located in the physical range of any of the kexec segment + * targets then it gets placed at the pindex corresponding to that physical + * address. This avoids the chance of corruption by writing over the page in + * the final copy, or the need for a copy buffer page. + */ + +static struct kexec_image staged_image; +static vm_offset_t stage_addr; +static vm_object_t kexec_obj; + +static eventhandler_tag kexec_reboot_handler; +static struct mtx kexec_mutex; + +static MALLOC_DEFINE(M_KEXEC, "kexec", "Kexec segments"); + + +static void +kexec_reboot(void *junk __unused, int howto) +{ + if ((howto & RB_KEXEC) == 0 || kexec_obj == NULL) + return; + +#ifdef SMP + cpu_mp_stop(); +#endif /* SMP */ + intr_disable(); + printf("Starting kexec reboot\n"); + + scheduler_stopped = true; + kexec_reboot_md(&staged_image); +} + +MTX_SYSINIT(kexec_mutex, &kexec_mutex, "kexec", MTX_DEF); + +/* Sort the segment list once copied in */ +static int +seg_cmp(const void *seg1, const void *seg2) +{ + const struct kexec_segment *s1, *s2; + + s1 = seg1; + s2 = seg2; + + return ((uintptr_t)s1->mem - (uintptr_t)s2->mem); +} + +static bool +segment_fits(struct kexec_segment *seg) +{ + vm_paddr_t v = (vm_paddr_t)(uintptr_t)seg->mem; + + for (int i = 0; i < vm_phys_nsegs; i++) { + if (v >= vm_phys_segs[i].start && + (v + seg->memsz - 1) <= vm_phys_segs[i].end) + return (true); + } + + return (false); +} + +static vm_paddr_t +pa_for_pindex(struct kexec_segment_stage *segs, int count, vm_pindex_t pind) +{ + for (int i = count; i > 0; --i) { + if (pind >= segs[i - 1].pindex) + return (ptoa(pind - segs[i-1].pindex) + segs[i - 1].target); + } + + panic("No segment for pindex %ju\n", (uintmax_t)pind); +} + +/* + * For now still tied to the system call, so assumes all memory is userspace. + */ +int +kern_kexec_load(struct thread *td, u_long entry, u_long nseg, + struct kexec_segment *seg, u_long flags) +{ + static int kexec_loading; + struct kexec_segment segtmp[KEXEC_SEGMENT_MAX]; + struct kexec_image *new_image_stage = 0; + vm_object_t new_segments = NULL; + uint8_t *buf; + int err = 0; + int i; + const size_t segsize = nseg * sizeof(struct kexec_segment); + vm_page_t *page_list = 0; + vm_size_t image_count, md_pages, page_count, tmpsize; + vm_offset_t segment_va = 0; + /* + * - Do any sanity checking + * - Load the new segments to temporary + * - Remove the old segments + * - Install the new segments + */ + + if (nseg > KEXEC_SEGMENT_MAX) + return (EINVAL); + + if (atomic_cmpset_acq_int(&kexec_loading, false, true) == 0) + return (EBUSY); + + /* Only do error checking if we're installing new segments. */ + if (nseg > 0) { + /* Create the new kexec object before destroying the old one. */ + bzero(&segtmp, sizeof(segtmp)); + err = copyin(seg, segtmp, segsize); + if (err != 0) + goto out; + qsort(segtmp, nseg, sizeof(*segtmp), seg_cmp); + new_image_stage = malloc(sizeof(*new_image_stage), M_TEMP, M_WAITOK | M_ZERO); + /* + * Sanity checking: + * - All segments must not overlap the kernel, so must be fully enclosed + * in a vm_phys_seg (each kexec segment must be in a single + * vm_phys_seg segment, cannot cross even adjacent segments). + */ + image_count = 0; + for (i = 0; i < nseg; i++) { + if (!segment_fits(&segtmp[i]) || + segtmp[i].bufsz > segtmp[i].memsz) { + err = EINVAL; + goto out; + } + new_image_stage->segments[i].pindex = image_count; + new_image_stage->segments[i].target = (vm_offset_t)segtmp[i].mem; + new_image_stage->segments[i].size = segtmp[i].memsz; + image_count += atop(segtmp[i].memsz); + } + md_pages = KEXEC_MD_PAGES(segtmp); + page_count = image_count + md_pages; + new_segments = vm_object_allocate(OBJT_PHYS, page_count); + page_list = malloc(page_count * sizeof(vm_page_t), M_TEMP, M_WAITOK); + + /* + * - Grab all pages for all segments (use pindex to slice it) + * - Walk the list (once) + * - At each pindex, check if the target PA that corresponds + * to that index is in the object. If so, swap the pages. + * - At the end of this the list will be "best" sorted. + */ + vm_page_grab_pages_unlocked(new_segments, 0, + VM_ALLOC_NORMAL | VM_ALLOC_WAITOK | VM_ALLOC_WIRED | VM_ALLOC_NOBUSY | VM_ALLOC_ZERO, + page_list, page_count); + + /* Sort the pages to best match the PA */ + VM_OBJECT_WLOCK(new_segments); + for (i = 0; i < image_count; i++) { + vm_page_t curpg, otherpg, tmp; + vm_pindex_t otheridx; + + curpg = page_list[i]; + otherpg = PHYS_TO_VM_PAGE(pa_for_pindex(new_image_stage->segments, + nseg, curpg->pindex)); + otheridx = otherpg->pindex; + + if (otherpg->object == new_segments) { + /* + * Swap 'curpg' and 'otherpg', since 'otherpg' + * is at the PA 'curpg' covers. + */ + vm_radix_remove(&new_segments->rtree, otheridx); + vm_radix_remove(&new_segments->rtree, i); + otherpg->pindex = i; + curpg->pindex = otheridx; + vm_radix_insert(&new_segments->rtree, curpg); + vm_radix_insert(&new_segments->rtree, otherpg); + tmp = curpg; + page_list[i] = otherpg; + page_list[otheridx] = tmp; + } + } + for (i = 0; i < nseg; i++) { + new_image_stage->segments[i].first_page = + vm_radix_lookup(&new_segments->rtree, + new_image_stage->segments[i].pindex); + } + if (md_pages > 0) + new_image_stage->first_md_page = + vm_radix_lookup(&new_segments->rtree, + page_count - md_pages); + else + new_image_stage->first_md_page = NULL; + VM_OBJECT_WUNLOCK(new_segments); + + /* Map the object to do the copies */ + err = vm_map_find(kernel_map, new_segments, 0, &segment_va, + ptoa(page_count), 0, VMFS_ANY_SPACE, + VM_PROT_RW, VM_PROT_RW, MAP_PREFAULT); + if (err != 0) + goto out; + buf = (void *)segment_va; + new_image_stage->map_addr = segment_va; + new_image_stage->map_size = ptoa(new_segments->size); + new_image_stage->entry = entry; + new_image_stage->map_obj = new_segments; + for (i = 0; i < nseg; i++) { + err = copyin(segtmp[i].buf, buf, segtmp[i].bufsz); + if (err != 0) { + goto out; + } + new_image_stage->segments[i].map_buf = buf; + buf += segtmp[i].bufsz; + tmpsize = segtmp[i].memsz - segtmp[i].bufsz; + if (tmpsize > 0) + memset(buf, 0, tmpsize); + buf += tmpsize; + } + /* What's left are the MD pages, so zero them all out. */ + if (md_pages > 0) + bzero(buf, ptoa(md_pages)); + + cpu_flush_dcache((void *)segment_va, ptoa(page_count)); + if ((err = kexec_load_md(new_image_stage)) != 0) + goto out; + } + if (kexec_obj != NULL) { + vm_object_unwire(kexec_obj, 0, kexec_obj->size, 0); + KASSERT(stage_addr != 0, ("Mapped kexec_obj without address")); + vm_map_remove(kernel_map, stage_addr, stage_addr + kexec_obj->size); + } + kexec_obj = new_segments; + bzero(&staged_image, sizeof(staged_image)); + if (nseg > 0) + memcpy(&staged_image, new_image_stage, sizeof(*new_image_stage)); + + printf("trampoline at %#jx\n", (uintmax_t)staged_image.entry); + if (nseg > 0) { + if (kexec_reboot_handler == NULL) + kexec_reboot_handler = + EVENTHANDLER_REGISTER(shutdown_final, kexec_reboot, NULL, + SHUTDOWN_PRI_DEFAULT - 150); + } else { + if (kexec_reboot_handler != NULL) + EVENTHANDLER_DEREGISTER(shutdown_final, kexec_reboot_handler); + } +out: + /* Clean up the mess if we've gotten far. */ + if (err != 0 && new_segments != NULL) { + vm_object_unwire(new_segments, 0, new_segments->size, 0); + if (segment_va != 0) + vm_map_remove(kernel_map, segment_va, segment_va + kexec_obj->size); + else + vm_object_deallocate(new_segments); + } + atomic_store_rel_int(&kexec_loading, false); + if (new_image_stage != NULL) + free(new_image_stage, M_TEMP); + if (page_list != 0) + free(page_list, M_TEMP); + + return (err); +} + +int +sys_kexec_load(struct thread *td, struct kexec_load_args *uap) +{ + int error; + + // FIXME: Do w need a better privilege check than PRIV_REBOOT here? + error = priv_check(td, PRIV_REBOOT); + if (error != 0) + return (error); + return (kern_kexec_load(td, uap->entry, uap->nseg, uap->segments, uap->flags)); +} diff --git a/sys/kern/syscalls.master b/sys/kern/syscalls.master index 967af1f5313c..ea6d2b5aa1ef 100644 --- a/sys/kern/syscalls.master +++ b/sys/kern/syscalls.master @@ -3394,4 +3394,12 @@ ); } +599 AUE_NULL STD { + int kexec_load( + uint64_t entry, + u_long nseg, + _In_reads_(nseg) _Contains_long_ptr_ struct kexec_segment *segments, + u_long flags + ); + } ; vim: syntax=off diff --git a/sys/sys/kexec.h b/sys/sys/kexec.h new file mode 100644 index 000000000000..478193749368 --- /dev/null +++ b/sys/sys/kexec.h @@ -0,0 +1,81 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2025 Juniper Networks, Inc. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#ifndef _SYS_KEXEC_H_ +#define _SYS_KEXEC_H_ + +#include + +struct kexec_segment { + void *buf; + size_t bufsz; + vm_paddr_t mem; + vm_size_t memsz; +}; + +/* Flags (aligned with Linux) */ +#define KEXEC_ON_CRASH 0x1 + +/* Aligned with Linux's limit */ +#define KEXEC_SEGMENT_MAX 16 + +#ifdef _KERNEL +struct kexec_segment_stage { + vm_page_t first_page; + void *map_buf; + vm_paddr_t target; + vm_size_t size; + vm_pindex_t pindex; +}; + +struct kexec_image { + struct kexec_segment_stage segments[KEXEC_SEGMENT_MAX]; + vm_paddr_t entry; + struct vm_object *map_obj; /* Containing object */ + vm_offset_t map_addr; /* Mapped in kernel space */ + vm_size_t map_size; + vm_page_t first_md_page; + void *md_image; +}; + +#endif + +#ifndef _KERNEL + +__BEGIN_DECLS +int kexec_load(uint64_t, unsigned long, struct kexec_segment *, unsigned long); +__END_DECLS + +#else + +void kexec_reboot_md(struct kexec_image *); +int kexec_load_md(struct kexec_image *); + +#endif + +#endif diff --git a/sys/sys/reboot.h b/sys/sys/reboot.h index 26e78632fb2c..50ad2b78083c 100644 --- a/sys/sys/reboot.h +++ b/sys/sys/reboot.h @@ -61,6 +61,7 @@ #define RB_REROOT 0x200000 /* unmount the rootfs and mount it again */ #define RB_POWERCYCLE 0x400000 /* Power cycle if possible */ #define RB_MUTEMSGS 0x800000 /* start up with console muted after banner */ +#define RB_KEXEC 0x1000000 /* Boot new kernel using kexec */ #define RB_PROBE 0x10000000 /* Probe multiple consoles */ #define RB_MULTIPLE 0x20000000 /* use multiple consoles */ diff --git a/sys/sys/smp.h b/sys/sys/smp.h index 5b968aa69791..b642a6014f33 100644 --- a/sys/sys/smp.h +++ b/sys/sys/smp.h @@ -251,6 +251,7 @@ void cpu_mp_announce(void); int cpu_mp_probe(void); void cpu_mp_setmaxid(void); void cpu_mp_start(void); +void cpu_mp_stop(void); /* Go back to single-CPU */ void forward_signal(struct thread *); int restart_cpus(cpuset_t); diff --git a/sys/sys/syscallsubr.h b/sys/sys/syscallsubr.h index d32690634059..8f106150e193 100644 --- a/sys/sys/syscallsubr.h +++ b/sys/sys/syscallsubr.h @@ -47,6 +47,7 @@ struct image_args; struct jail; struct kevent; struct kevent_copyops; +struct kexec_segment; struct kld_file_stat; struct ksiginfo; struct mbuf; @@ -401,6 +402,8 @@ int kern_writev(struct thread *td, int fd, struct uio *auio); int kern_socketpair(struct thread *td, int domain, int type, int protocol, int *rsv); int kern_unmount(struct thread *td, const char *path, int flags); +int kern_kexec_load(struct thread *td, u_long entry, + u_long nseg, struct kexec_segment *seg, u_long flags); /* flags for kern_sigaction */ #define KSA_OSIGSET 0x0001 /* uses osigact_t */ From nobody Mon Oct 27 14:34:37 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cwGHK4sSWz6Dlkr; Mon, 27 Oct 2025 14:34: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cwGHK2D6Jz3hyF; Mon, 27 Oct 2025 14:34:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761575677; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=z1iwGfx7TNsX7kEvQ2jDTPMBgq9egAiRDIHdc8BUBts=; b=UP0VNjBHukMeyi0GuTlaIGcL2T8xkhjOG86+Tv8Z1LBwGHzzj5nHUQ1xNIi8PmvgtJz4z9 7hGMj6dXFAD8dse2RN2OwhAKkNP8duUhMOTwUChK97QIUPE0eEniaFo5p9p2GI0YoQewe7 3mtY29Q3VcutppNMj+iNX4VlsIReTShKZvAZ7dpPoLU808O5Wyg4RPABjP2FaA/PPcjEc5 2auBCRbNUUiSGQsMy9MD2ai6eKYFLKMZyhQlA4UZv2hJC909bPa5JbZpvIrcODKIUXpfg6 ycuPXSwOQENPjbRStt11LMIjUPpGb6u5WM0vWVtxWwGk3PX8b7I1c3ks5iT7yw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761575677; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=z1iwGfx7TNsX7kEvQ2jDTPMBgq9egAiRDIHdc8BUBts=; b=I7JzBgQPCH0A5/gJdXjU2sP1J0ZJSwXAyROEYFk1EEqkbRHEljX6tcArEvjG2LX5q9qGcG 55lZcOTe1iBPt9Ooj/y+xbhGgOe7b8Rv1jjSKrUKq6rdT1vBUes+PvKY9jDCvHKSwUdXwi TCG7UnbkLOvHXBx2Sa6pmRSvLlIDr0Uo6sTvHCa6u6vwY75MlszWx4nAkXcXhF8uuus0DH NkC9wLI+No2DfAVPZVnpQtByPBfu9n28P6Ggwj/WBAUfMj1N8BwHYBheh6iEXwrdbT6bwC 3K5xKZSH5H3yqkBWwQ32ZeGf4K+rOM29WiWdw4aEkFY+5HIrrMSn7tT0F6RwkQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761575677; a=rsa-sha256; cv=none; b=S2QKkeAJ2iueyTyBda/rbKkiLZiUDMwuRWBGcQYeQspLJu2Vp+vHiTziYSBdNJNIXe/tlt l361p56sJ/sIwCkNItAnQfoyXvaHbDIA+lrQbgfo5+Df1RGdDPvo+VFJ8AVcIW6AoU6Xc2 Qo+JGJxftbDIBKePFocJUMObLExFeEKoUi0gHAszFmmyoiW2ZewSd1Uk1USoWxSfINNkW0 SlwM7kL03rWT/Jzq6SdqG5usjOu4R50l+WJaEATV+T/WugGsEWCqj8gRo+FOzU6k/mbtf/ KHt8wziNKv5YcIeuNQV8smK6tpovsEv3RbnBui3FlgJ7L1e+SbPIqTP2p28o+g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cwGHK1kpwz1LGj; Mon, 27 Oct 2025 14:34: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 59REYb0x063477; Mon, 27 Oct 2025 14:34:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59REYbPx063474; Mon, 27 Oct 2025 14:34:37 GMT (envelope-from git) Date: Mon, 27 Oct 2025 14:34:37 GMT Message-Id: <202510271434.59REYbPx063474@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Justin Hibbits Subject: git: efd00c75f459 - main - sysent: Regen for kexec_load() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhibbits X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: efd00c75f459752e54e219fc47b18ee6631a7877 Auto-Submitted: auto-generated The branch main has been updated by jhibbits: URL: https://cgit.FreeBSD.org/src/commit/?id=efd00c75f459752e54e219fc47b18ee6631a7877 commit efd00c75f459752e54e219fc47b18ee6631a7877 Author: Justin Hibbits AuthorDate: 2025-10-26 02:54:20 +0000 Commit: Justin Hibbits CommitDate: 2025-10-27 14:33:50 +0000 sysent: Regen for kexec_load() --- lib/libsys/_libsys.h | 3 +++ lib/libsys/syscalls.map | 2 ++ sys/compat/freebsd32/freebsd32_syscall.h | 2 +- sys/compat/freebsd32/freebsd32_syscalls.c | 1 + sys/compat/freebsd32/freebsd32_sysent.c | 1 + sys/kern/init_sysent.c | 1 + sys/kern/syscalls.c | 1 + sys/kern/systrace_args.c | 34 +++++++++++++++++++++++++++++++ sys/sys/syscall.h | 3 ++- sys/sys/syscall.mk | 3 ++- sys/sys/sysproto.h | 8 ++++++++ 11 files changed, 56 insertions(+), 3 deletions(-) diff --git a/lib/libsys/_libsys.h b/lib/libsys/_libsys.h index 6bd768708a78..12417b572a60 100644 --- a/lib/libsys/_libsys.h +++ b/lib/libsys/_libsys.h @@ -32,6 +32,7 @@ struct itimerspec; struct itimerval; struct jail; struct kevent; +struct kexec_segment; struct kld_file_stat; struct mac; struct module_stat; @@ -470,6 +471,7 @@ typedef int (__sys_getgroups_t)(int, gid_t *); typedef int (__sys_setgroups_t)(int, const gid_t *); typedef int (__sys_jail_attach_jd_t)(int); typedef int (__sys_jail_remove_jd_t)(int); +typedef int (__sys_kexec_load_t)(uint64_t, u_long, struct kexec_segment *, u_long); _Noreturn void __sys__exit(int rval); int __sys_fork(void); @@ -876,6 +878,7 @@ int __sys_getgroups(int gidsetsize, gid_t * gidset); int __sys_setgroups(int gidsetsize, const gid_t * gidset); int __sys_jail_attach_jd(int fd); int __sys_jail_remove_jd(int fd); +int __sys_kexec_load(uint64_t entry, u_long nseg, struct kexec_segment * segments, u_long flags); __END_DECLS #endif /* __LIBSYS_H_ */ diff --git a/lib/libsys/syscalls.map b/lib/libsys/syscalls.map index b5400b9849b3..d00c862eb462 100644 --- a/lib/libsys/syscalls.map +++ b/lib/libsys/syscalls.map @@ -817,4 +817,6 @@ FBSDprivate_1.0 { __sys_jail_attach_jd; _jail_remove_jd; __sys_jail_remove_jd; + _kexec_load; + __sys_kexec_load; }; diff --git a/sys/compat/freebsd32/freebsd32_syscall.h b/sys/compat/freebsd32/freebsd32_syscall.h index 54063150eef9..f8ef7e4a20d3 100644 --- a/sys/compat/freebsd32/freebsd32_syscall.h +++ b/sys/compat/freebsd32/freebsd32_syscall.h @@ -517,4 +517,4 @@ #define FREEBSD32_SYS_setgroups 596 #define FREEBSD32_SYS_jail_attach_jd 597 #define FREEBSD32_SYS_jail_remove_jd 598 -#define FREEBSD32_SYS_MAXSYSCALL 599 +#define FREEBSD32_SYS_MAXSYSCALL 600 diff --git a/sys/compat/freebsd32/freebsd32_syscalls.c b/sys/compat/freebsd32/freebsd32_syscalls.c index f7cc4c284e4d..645cdccbc02d 100644 --- a/sys/compat/freebsd32/freebsd32_syscalls.c +++ b/sys/compat/freebsd32/freebsd32_syscalls.c @@ -604,4 +604,5 @@ const char *freebsd32_syscallnames[] = { "setgroups", /* 596 = setgroups */ "jail_attach_jd", /* 597 = jail_attach_jd */ "jail_remove_jd", /* 598 = jail_remove_jd */ + "#599", /* 599 = kexec_load */ }; diff --git a/sys/compat/freebsd32/freebsd32_sysent.c b/sys/compat/freebsd32/freebsd32_sysent.c index 18f809ef04e3..240b54ae9011 100644 --- a/sys/compat/freebsd32/freebsd32_sysent.c +++ b/sys/compat/freebsd32/freebsd32_sysent.c @@ -666,4 +666,5 @@ struct sysent freebsd32_sysent[] = { { .sy_narg = AS(setgroups_args), .sy_call = (sy_call_t *)sys_setgroups, .sy_auevent = AUE_SETGROUPS, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 596 = setgroups */ { .sy_narg = AS(jail_attach_jd_args), .sy_call = (sy_call_t *)sys_jail_attach_jd, .sy_auevent = AUE_JAIL_ATTACH, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 597 = jail_attach_jd */ { .sy_narg = AS(jail_remove_jd_args), .sy_call = (sy_call_t *)sys_jail_remove_jd, .sy_auevent = AUE_JAIL_REMOVE, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 598 = jail_remove_jd */ + { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 599 = freebsd32_kexec_load */ }; diff --git a/sys/kern/init_sysent.c b/sys/kern/init_sysent.c index e42e7dcf8b44..cd305de1ed44 100644 --- a/sys/kern/init_sysent.c +++ b/sys/kern/init_sysent.c @@ -665,4 +665,5 @@ struct sysent sysent[] = { { .sy_narg = AS(setgroups_args), .sy_call = (sy_call_t *)sys_setgroups, .sy_auevent = AUE_SETGROUPS, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 596 = setgroups */ { .sy_narg = AS(jail_attach_jd_args), .sy_call = (sy_call_t *)sys_jail_attach_jd, .sy_auevent = AUE_JAIL_ATTACH, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 597 = jail_attach_jd */ { .sy_narg = AS(jail_remove_jd_args), .sy_call = (sy_call_t *)sys_jail_remove_jd, .sy_auevent = AUE_JAIL_REMOVE, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 598 = jail_remove_jd */ + { .sy_narg = AS(kexec_load_args), .sy_call = (sy_call_t *)sys_kexec_load, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 599 = kexec_load */ }; diff --git a/sys/kern/syscalls.c b/sys/kern/syscalls.c index 4cef89cd5219..06a4adc3d8cb 100644 --- a/sys/kern/syscalls.c +++ b/sys/kern/syscalls.c @@ -604,4 +604,5 @@ const char *syscallnames[] = { "setgroups", /* 596 = setgroups */ "jail_attach_jd", /* 597 = jail_attach_jd */ "jail_remove_jd", /* 598 = jail_remove_jd */ + "kexec_load", /* 599 = kexec_load */ }; diff --git a/sys/kern/systrace_args.c b/sys/kern/systrace_args.c index e28fef931ea8..5951cebbe74a 100644 --- a/sys/kern/systrace_args.c +++ b/sys/kern/systrace_args.c @@ -3514,6 +3514,16 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) *n_args = 1; break; } + /* kexec_load */ + case 599: { + struct kexec_load_args *p = params; + uarg[a++] = p->entry; /* uint64_t */ + uarg[a++] = p->nseg; /* u_long */ + uarg[a++] = (intptr_t)p->segments; /* struct kexec_segment * */ + uarg[a++] = p->flags; /* u_long */ + *n_args = 4; + break; + } default: *n_args = 0; break; @@ -9401,6 +9411,25 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) break; }; break; + /* kexec_load */ + case 599: + switch (ndx) { + case 0: + p = "uint64_t"; + break; + case 1: + p = "u_long"; + break; + case 2: + p = "userland struct kexec_segment *"; + break; + case 3: + p = "u_long"; + break; + default: + break; + }; + break; default: break; }; @@ -11409,6 +11438,11 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) if (ndx == 0 || ndx == 1) p = "int"; break; + /* kexec_load */ + case 599: + if (ndx == 0 || ndx == 1) + p = "int"; + break; default: break; }; diff --git a/sys/sys/syscall.h b/sys/sys/syscall.h index cff27b8be316..43f46f063e3e 100644 --- a/sys/sys/syscall.h +++ b/sys/sys/syscall.h @@ -537,4 +537,5 @@ #define SYS_setgroups 596 #define SYS_jail_attach_jd 597 #define SYS_jail_remove_jd 598 -#define SYS_MAXSYSCALL 599 +#define SYS_kexec_load 599 +#define SYS_MAXSYSCALL 600 diff --git a/sys/sys/syscall.mk b/sys/sys/syscall.mk index 443dbadcfbff..ce29c050885e 100644 --- a/sys/sys/syscall.mk +++ b/sys/sys/syscall.mk @@ -440,4 +440,5 @@ MIASM = \ getgroups.o \ setgroups.o \ jail_attach_jd.o \ - jail_remove_jd.o + jail_remove_jd.o \ + kexec_load.o diff --git a/sys/sys/sysproto.h b/sys/sys/sysproto.h index 8dda4b4533ea..5f5524a4519b 100644 --- a/sys/sys/sysproto.h +++ b/sys/sys/sysproto.h @@ -1907,6 +1907,12 @@ struct jail_attach_jd_args { struct jail_remove_jd_args { char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; }; +struct kexec_load_args { + char entry_l_[PADL_(uint64_t)]; uint64_t entry; char entry_r_[PADR_(uint64_t)]; + char nseg_l_[PADL_(u_long)]; u_long nseg; char nseg_r_[PADR_(u_long)]; + char segments_l_[PADL_(struct kexec_segment *)]; struct kexec_segment * segments; char segments_r_[PADR_(struct kexec_segment *)]; + char flags_l_[PADL_(u_long)]; u_long flags; char flags_r_[PADR_(u_long)]; +}; int sys__exit(struct thread *, struct _exit_args *); int sys_fork(struct thread *, struct fork_args *); int sys_read(struct thread *, struct read_args *); @@ -2313,6 +2319,7 @@ int sys_getgroups(struct thread *, struct getgroups_args *); int sys_setgroups(struct thread *, struct setgroups_args *); int sys_jail_attach_jd(struct thread *, struct jail_attach_jd_args *); int sys_jail_remove_jd(struct thread *, struct jail_remove_jd_args *); +int sys_kexec_load(struct thread *, struct kexec_load_args *); #ifdef COMPAT_43 @@ -3311,6 +3318,7 @@ int freebsd14_setgroups(struct thread *, struct freebsd14_setgroups_args *); #define SYS_AUE_setgroups AUE_SETGROUPS #define SYS_AUE_jail_attach_jd AUE_JAIL_ATTACH #define SYS_AUE_jail_remove_jd AUE_JAIL_REMOVE +#define SYS_AUE_kexec_load AUE_NULL #undef PAD_ #undef PADL_ From nobody Mon Oct 27 14:34:38 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cwGHL3nBtz6DlYG; Mon, 27 Oct 2025 14:34: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cwGHL2q6Kz3jCC; Mon, 27 Oct 2025 14:34:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761575678; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vnfixCYfUxwuLtzRBQwJkhcjR/XmQO28ZgqUvblAbZY=; b=MP81rVzuIxBJxjPxclUPgrb3KI5+k+YQ1W8pY/LLsW4ANd5Hs4lZKc7GKsgh5Ou2zz3PSz 6178BJkJ+IvgB+72uLNaM4NjrF5oI41N9G6c54W0B8hCHMagLJrhsjHmXypgSbChKw8BX5 ddX5n5643tr8nqZPdSyT9C8bdF+IAuctSUyaPQ+CrrEzHKMO/HhJRqj/I1+wKEJ3rSnYkv ylsMmaSeWkzoDVFcfu/Cy+J5gr/yIBqQTYOJbPuj1v1FrzNBqdB17HRIYsMjmyOPzsa2yZ qFgN0eJ+EIW6/yb2OPd2wS2nvYC8gSG/KF7CIqpBjfOsPfDB1iMCKAN/z6GbSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761575678; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vnfixCYfUxwuLtzRBQwJkhcjR/XmQO28ZgqUvblAbZY=; b=ytTc0ONXVsYH7zLWTdwTrfhItUD7QM5/6Xu9txaTxRZjlgHPzt/vsUuF7k+oeqIIiQLtbF HbDjI8vYRH5psQEBUsFShz3MKaHNds0Yabbu6J2q7XTaEugWEYi6BU5/nDynOuy87gKq2/ RElKkd21BAEQBYaHxjjKdhSs7ECEGEBNt2aRknzrPNXhl7Wy/e3ax6dUez7Ofu+K8EfJ6T 87Bngb1hHnjWs2yy+YRrcsXDsHUwAMeyEHiiN4Pistfu0eP5Q8WxTb9u2Dr3UTM13Md0Bg Twz5PmM8CzBVk5twcOGfKeibjJnr0AUsfAPIiGv4l3OrCgr81hz/uZdZHIek9A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761575678; a=rsa-sha256; cv=none; b=ip9erD5AAJtvcu0ZTKelWEu2RHRErjGicCly6qaZj7taS49kgbxkXSy5D8OG75ILucUxJn pIFkdBCUzKbU5YN6knfHWFIYiW93LyZ9vW6XgBlC+9GmuxTX5w3Z0cQqABNCcp/rMUDj4Z PDg9v22pewTTWTNVtJK2ior8DOWMFklpHfC4tYcHWJZ5muskGW2zqeVeumEb/4Cjn5hStJ JFJlLB65Qu6Zve0caTeXvTcHfrkPJm29oKQqZhkupfM+3xR87AL8r1X1XJEwj80fv+cnvv lln8nW23GerXAcsTaggofYbGWYtQhn2XW5uolVj1RfnVhvcZW5NbB9ZBzXrT8A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cwGHL2NCjz1LGk; Mon, 27 Oct 2025 14:34: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 59REYcrK063512; Mon, 27 Oct 2025 14:34:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59REYcKd063509; Mon, 27 Oct 2025 14:34:38 GMT (envelope-from git) Date: Mon, 27 Oct 2025 14:34:38 GMT Message-Id: <202510271434.59REYcKd063509@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Justin Hibbits Subject: git: 1ae25866767d - main - kexec: Introduce basic arm64 support List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhibbits X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1ae25866767d686067fe6678b62681b7a8f0d361 Auto-Submitted: auto-generated The branch main has been updated by jhibbits: URL: https://cgit.FreeBSD.org/src/commit/?id=1ae25866767d686067fe6678b62681b7a8f0d361 commit 1ae25866767d686067fe6678b62681b7a8f0d361 Author: Justin Hibbits AuthorDate: 2025-10-26 02:45:00 +0000 Commit: Justin Hibbits CommitDate: 2025-10-27 14:33:50 +0000 kexec: Introduce basic arm64 support This works on older arm64 platforms, but may not work with arm64 devices using GICv3, due to a quirk in the GICv3, where some registers are write-once. Most of the kexec reboot work on arm64 can be done entirely in C code, by disabling the MMU, as the kernel is carved out of the vm_phys_segs array, so cannot be overwritten. Reviewed by: andrew Sponsored by: Juniper Networks, Inc. Differential Revision: https://reviews.freebsd.org/D51621 --- sys/arm64/arm64/kexec_support.c | 188 ++++++++++++++++++++++++++++++++++++++++ sys/arm64/arm64/locore.S | 44 ++++++++++ sys/arm64/arm64/mp_machdep.c | 78 +++++++++++++++++ sys/arm64/include/cpufunc.h | 7 ++ sys/arm64/include/kexec.h | 33 +++++++ sys/arm64/include/pcpu.h | 3 +- sys/arm64/include/smp.h | 1 + sys/conf/files.arm64 | 1 + sys/dev/psci/psci.c | 13 +++ sys/dev/psci/psci.h | 1 + 10 files changed, 368 insertions(+), 1 deletion(-) diff --git a/sys/arm64/arm64/kexec_support.c b/sys/arm64/arm64/kexec_support.c new file mode 100644 index 000000000000..8b9719c05b67 --- /dev/null +++ b/sys/arm64/arm64/kexec_support.c @@ -0,0 +1,188 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2025 Juniper Networks, Inc. + * + * 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 + +/* + * Idea behind this: + * + * kexec_load_md(): + * - Update boot page tables (identity map) to include all pages needed before + * disabling MMU. + * + * kexec_reboot_md(): + * - Copy pages into target(s) + * - Do "other stuff" + * - Does not return + */ + +extern pt_entry_t pagetable_l0_ttbr0_bootstrap[]; +extern unsigned long initstack_end[]; +void switch_stack(void *, void (*)(void *, void *, struct kexec_image *), void *); + +#define SCTLR_EL1_NO_MMU (SCTLR_RES1 | SCTLR_LSMAOE | SCTLR_nTLSMD | \ + SCTLR_EIS | SCTLR_TSCXT | SCTLR_EOS) +#define vm_page_offset(m) ((vm_offset_t)(m) - vm_page_base) +static inline vm_page_t +phys_vm_page(vm_page_t m, vm_offset_t vm_page_v, vm_paddr_t vm_page_p) +{ + return ((vm_page_t)((vm_offset_t)m - vm_page_v + vm_page_p)); +} + +/* First 2 args are filler for switch_stack() */ +static void __aligned(16) __dead2 +kexec_reboot_bottom( void *arg1 __unused, void *arg2 __unused, + struct kexec_image *image) +{ + void (*e)(void) = (void *)image->entry; + vm_offset_t vm_page_base = (vm_offset_t)vm_page_array; + vm_paddr_t vm_page_phys = pmap_kextract((vm_offset_t)vm_page_array); + struct kexec_segment_stage *phys_segs = + (void *)pmap_kextract((vm_offset_t)&image->segments); + vm_paddr_t from_pa, to_pa; + vm_size_t size; + vm_page_t first, m, mp; + struct pctrie_iter pct_i; + + /* + * Create a linked list of all pages in the object before we disable the + * MMU. Once the MMU is disabled we can't use the vm_radix iterators, + * as they rely on virtual address pointers. + */ + first = NULL; + vm_radix_iter_init(&pct_i, &image->map_obj->rtree); + VM_RADIX_FORALL(m, &pct_i) { + if (first == NULL) + first = m; + else + SLIST_INSERT_AFTER(mp, m, plinks.s.ss); + mp = m; + } + + /* + * We're running out of the identity map now, disable the MMU before we + * continue. It's possible page tables can be overwritten, which would + * be very bad if we were running with the MMU enabled. + */ + WRITE_SPECIALREG(sctlr_el1, SCTLR_EL1_NO_MMU); + isb(); + for (int i = 0; i < KEXEC_SEGMENT_MAX; i++) { + if (phys_segs[i].size == 0) + break; + to_pa = phys_segs[i].target; + /* Copy the segment here... */ + for (vm_page_t p = phys_segs[i].first_page; + p != NULL && to_pa - phys_segs[i].target < phys_segs[i].size; + p = SLIST_NEXT(p, plinks.s.ss)) { + p = phys_vm_page(p, vm_page_base, vm_page_phys); + from_pa = p->phys_addr; + if (p->phys_addr == to_pa) { + to_pa += PAGE_SIZE; + continue; + } + for (size = PAGE_SIZE / sizeof(register_t); + size > 0; --size) { + *(register_t *)to_pa = *(register_t *)from_pa; + to_pa += sizeof(register_t); + from_pa += sizeof(register_t); + } + } + } + invalidate_icache(); + e(); + while (1) + ; +} + +void +kexec_reboot_md(struct kexec_image *image) +{ + uintptr_t ptr; + register_t reg; + + for (int i = 0; i < KEXEC_SEGMENT_MAX; i++) { + if (image->segments[i].size > 0) + cpu_dcache_inv_range((void *)PHYS_TO_DMAP(image->segments[i].target), + image->segments[i].size); + } + ptr = pmap_kextract((vm_offset_t)kexec_reboot_bottom); + serror_disable(); + + reg = pmap_kextract((vm_offset_t)pagetable_l0_ttbr0_bootstrap); + set_ttbr0(reg); + cpu_tlb_flushID(); + + typeof(kexec_reboot_bottom) *p = (void *)ptr; + switch_stack((void *)pmap_kextract((vm_offset_t)initstack_end), + p, image); + while (1) + ; +} + +int +kexec_load_md(struct kexec_image *image) +{ + vm_paddr_t tmp; + pt_entry_t *pte; + + /* Create L2 page blocks for the trampoline. L0/L1 are from the startup. */ + + /* + * There are exactly 2 pages before the pagetable_l0_ttbr0_bootstrap, so + * move to there. + */ + pte = pagetable_l0_ttbr0_bootstrap; + pte -= (Ln_ENTRIES * 2); /* move to start of L2 pages */ + + /* + * Populate the identity map with symbols we know we'll need before we + * turn off the MMU. + */ + tmp = pmap_kextract((vm_offset_t)kexec_reboot_bottom); + pte[pmap_l2_index(tmp)] = (tmp | L2_BLOCK | ATTR_AF | ATTR_S1_UXN); + tmp = pmap_kextract((vm_offset_t)initstack_end); + pte[pmap_l2_index(tmp)] = (tmp | L2_BLOCK | ATTR_AF | ATTR_S1_UXN); + /* We'll need vm_page_array for doing offset calculations. */ + tmp = pmap_kextract((vm_offset_t)&vm_page_array); + pte[pmap_l2_index(tmp)] = (tmp | L2_BLOCK | ATTR_AF | ATTR_S1_UXN); + + return (0); +} diff --git a/sys/arm64/arm64/locore.S b/sys/arm64/arm64/locore.S index d35e334905a7..3ec12140f139 100644 --- a/sys/arm64/arm64/locore.S +++ b/sys/arm64/arm64/locore.S @@ -325,6 +325,19 @@ mp_virtdone: b init_secondary LEND(mpentry_common) + +ENTRY(mp_cpu_spinloop) +0: + wfe + ldr x0, mp_cpu_spin_table_release_addr + cbz x0, 0b + blr x0 + .globl mp_cpu_spin_table_release_addr +mp_cpu_spin_table_release_addr: + .quad 0 + .globl mp_cpu_spinloop_end +mp_cpu_spinloop_end: +END(mp_cpu_spinloop) #endif /* @@ -475,6 +488,29 @@ LENTRY(enter_kernel_el) eret LEND(enter_kernel_el) +/* Turn off the MMU. Install ttbr0 from the bootstrap page table, and go there. + * Does not return. + * - x0 - target address to jump to after stopping the MMU. + * - x1 - kernel load address + */ +ENTRY(stop_mmu) + mov x16, x0 /* Save target. */ + ldr x2, =(1f - KERNBASE) + add x17, x1, x2 + ldr x3, =(pagetable_l0_ttbr0_bootstrap - KERNBASE) + add x1, x1, x3 + msr ttbr0_el1, x1 + isb + br x17 +1: + BTI_J + mrs x0, sctlr_el1 + bic x0, x0, SCTLR_M + bic x0, x0, SCTLR_C + msr sctlr_el1, x0 + isb + br x16 +END(stop_mmu) /* * Get the physical address the kernel was loaded at. */ @@ -1094,12 +1130,19 @@ tcr: TCR_SH0_IS | TCR_ORGN0_WBWA | TCR_IRGN0_WBWA) LEND(start_mmu) +ENTRY(switch_stack) + mov sp, x0 + mov x16, x1 + br x16 +END(switch_stack) + ENTRY(abort) b abort END(abort) .bss .align PAGE_SHIFT + .globl initstack_end initstack: .space BOOT_STACK_SIZE initstack_end: @@ -1116,6 +1159,7 @@ initstack_end: * L0 for user */ .globl pagetable_l0_ttbr1 + .globl pagetable_l0_ttbr0_bootstrap pagetable: pagetable_l3_ttbr1: .space (PAGE_SIZE * L3_PAGE_COUNT) diff --git a/sys/arm64/arm64/mp_machdep.c b/sys/arm64/arm64/mp_machdep.c index e4d011df3a06..0bdd2ecfd8a7 100644 --- a/sys/arm64/arm64/mp_machdep.c +++ b/sys/arm64/arm64/mp_machdep.c @@ -60,6 +60,7 @@ #include #include #include +#include #ifdef VFP #include #endif @@ -103,6 +104,7 @@ static void ipi_hardclock(void *); static void ipi_preempt(void *); static void ipi_rendezvous(void *); static void ipi_stop(void *); +static void ipi_off(void *); #ifdef FDT static u_int fdt_cpuid; @@ -193,6 +195,7 @@ release_aps(void *dummy __unused) intr_ipi_setup(IPI_STOP, "stop", ipi_stop, NULL); intr_ipi_setup(IPI_STOP_HARD, "stop hard", ipi_stop, NULL); intr_ipi_setup(IPI_HARDCLOCK, "hardclock", ipi_hardclock, NULL); + intr_ipi_setup(IPI_OFF, "off", ipi_off, NULL); atomic_store_int(&aps_started, 0); atomic_store_rel_int(&aps_ready, 1); @@ -390,6 +393,34 @@ ipi_stop(void *dummy __unused) CTR0(KTR_SMP, "IPI_STOP (restart)"); } +void stop_mmu(vm_paddr_t, vm_paddr_t) __dead2; +extern uint32_t mp_cpu_spinloop[]; +extern uint32_t mp_cpu_spinloop_end[]; +extern uint64_t mp_cpu_spin_table_release_addr; +static void +ipi_off(void *dummy __unused) +{ + CTR0(KTR_SMP, "IPI_OFF"); + if (psci_present) + psci_cpu_off(); + else { + uint64_t release_addr; + vm_size_t size; + + size = (vm_offset_t)&mp_cpu_spin_table_release_addr - + (vm_offset_t)mp_cpu_spinloop; + release_addr = PCPU_GET(release_addr) - size; + isb(); + invalidate_icache(); + /* Go catatonic, don't take any interrupts. */ + intr_disable(); + stop_mmu(release_addr, pmap_kextract(KERNBASE)); + + + } + CTR0(KTR_SMP, "IPI_OFF failed"); +} + struct cpu_group * cpu_topo(void) { @@ -511,6 +542,7 @@ start_cpu(u_int cpuid, uint64_t target_cpu, int domain, vm_paddr_t release_addr) pcpu_init(pcpup, cpuid, sizeof(struct pcpu)); pcpup->pc_mpidr = target_cpu & CPU_AFF_MASK; bootpcpu = pcpup; + pcpup->pc_release_addr = release_addr; dpcpu[cpuid - 1] = (void *)(pcpup + 1); dpcpu_init(dpcpu[cpuid - 1], cpuid); @@ -752,6 +784,52 @@ cpu_mp_start(void) } } +void +cpu_mp_stop(void) +{ + + /* Short-circuit for single-CPU */ + if (CPU_COUNT(&all_cpus) == 1) + return; + + KASSERT(PCPU_GET(cpuid) == CPU_FIRST(), ("Not on the first CPU!\n")); + + /* + * If we use spin-table, assume U-boot method for now (single address + * shared by all CPUs). + */ + if (!psci_present) { + int cpu; + vm_paddr_t release_addr; + void *release_vaddr; + vm_size_t size; + + /* Find the shared release address. */ + CPU_FOREACH(cpu) { + release_addr = pcpu_find(cpu)->pc_release_addr; + if (release_addr != 0) + break; + } + /* No release address? No way of notifying other CPUs. */ + if (release_addr == 0) + return; + + size = (vm_offset_t)&mp_cpu_spinloop_end - + (vm_offset_t)&mp_cpu_spinloop; + + release_addr -= (vm_offset_t)&mp_cpu_spin_table_release_addr - + (vm_offset_t)mp_cpu_spinloop; + + release_vaddr = pmap_mapdev(release_addr, size); + bcopy(mp_cpu_spinloop, release_vaddr, size); + cpu_dcache_wbinv_range(release_vaddr, size); + pmap_unmapdev(release_vaddr, size); + invalidate_icache(); + } + ipi_all_but_self(IPI_OFF); + DELAY(1000000); +} + /* Introduce rest of cores to the world */ void cpu_mp_announce(void) diff --git a/sys/arm64/include/cpufunc.h b/sys/arm64/include/cpufunc.h index e6e1f682794e..e9eee643216b 100644 --- a/sys/arm64/include/cpufunc.h +++ b/sys/arm64/include/cpufunc.h @@ -96,6 +96,13 @@ serror_enable(void) __asm __volatile("msr daifclr, #(" __XSTRING(DAIF_A) ")"); } +static __inline void +serror_disable(void) +{ + + __asm __volatile("msr daifset, #(" __XSTRING(DAIF_A) ")"); +} + static __inline register_t get_midr(void) { diff --git a/sys/arm64/include/kexec.h b/sys/arm64/include/kexec.h new file mode 100644 index 000000000000..0a8c7a053331 --- /dev/null +++ b/sys/arm64/include/kexec.h @@ -0,0 +1,33 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2025 Juniper Networks, Inc. + * + * 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 _ARM64_KEXEC_H_ +#define _ARM64_KEXEC_H_ + +#define KEXEC_MD_PAGES(x) 0 + +#endif /* _ARM64_KEXEC_H_ */ diff --git a/sys/arm64/include/pcpu.h b/sys/arm64/include/pcpu.h index 09bd8fa8a966..73399d2c3f8c 100644 --- a/sys/arm64/include/pcpu.h +++ b/sys/arm64/include/pcpu.h @@ -50,7 +50,8 @@ struct debug_monitor_state; struct pmap *pc_curvmpmap; \ uint64_t pc_mpidr; \ u_int pc_bcast_tlbi_workaround; \ - char __pad[197] + uint64_t pc_release_addr; \ + char __pad[189] #ifdef _KERNEL diff --git a/sys/arm64/include/smp.h b/sys/arm64/include/smp.h index 500cd1ef4f02..4a5bfda3ac1c 100644 --- a/sys/arm64/include/smp.h +++ b/sys/arm64/include/smp.h @@ -40,6 +40,7 @@ enum { IPI_STOP, IPI_STOP_HARD, IPI_HARDCLOCK, + IPI_OFF, INTR_IPI_COUNT, }; diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64 index 2f412fa3cb1b..882aca705336 100644 --- a/sys/conf/files.arm64 +++ b/sys/conf/files.arm64 @@ -55,6 +55,7 @@ arm64/arm64/gic_v3_acpi.c optional acpi arm64/arm64/gic_v3_fdt.c optional fdt arm64/arm64/hyp_stub.S standard arm64/arm64/identcpu.c standard +arm64/arm64/kexec_support.c standard arm64/arm64/locore.S standard no-obj arm64/arm64/machdep.c standard arm64/arm64/machdep_boot.c standard diff --git a/sys/dev/psci/psci.c b/sys/dev/psci/psci.c index 497b23d2d4c3..2b250401ae83 100644 --- a/sys/dev/psci/psci.c +++ b/sys/dev/psci/psci.c @@ -474,6 +474,19 @@ psci_cpu_on(unsigned long cpu, unsigned long entry, unsigned long context_id) return (psci_call(fnid, cpu, entry, context_id)); } +int +psci_cpu_off(void) +{ + uint32_t fnid; + + fnid = PSCI_FNID_CPU_OFF; + if (psci_softc != NULL) + fnid = psci_softc->psci_fnids[PSCI_FN_CPU_OFF]; + + /* Returns PSCI_RETVAL_DENIED on error. */ + return (psci_call(fnid, 0, 0, 0)); +} + static void psci_shutdown(void *xsc, int howto) { diff --git a/sys/dev/psci/psci.h b/sys/dev/psci/psci.h index 451d40c0178d..6704eaf26c71 100644 --- a/sys/dev/psci/psci.h +++ b/sys/dev/psci/psci.h @@ -39,6 +39,7 @@ typedef int (*psci_callfn_t)(register_t, register_t, register_t, register_t, extern bool psci_present; int psci_cpu_on(unsigned long, unsigned long, unsigned long); +int psci_cpu_off(void); /* Operates on caller. */ void psci_reset(void); int32_t psci_features(uint32_t); int psci_get_version(void); From nobody Mon Oct 27 14:34:39 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cwGHM4vlDz6DlYH; Mon, 27 Oct 2025 14:34: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cwGHM39Pqz3jdD; Mon, 27 Oct 2025 14:34:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761575679; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kYRFgSCl9Z56OhP7bVHkWCfxqnXcGlDmoWfK+MatzLU=; b=Idjdn5HJqBVMNlf07CL+/qu8wQocDAqEtz55AcHo/VEnu/oGaUg/mIyeTNGx7OrZJZGC7s ycUcc0QUF7iaA0nIOOCtIEWqeImZLRV+cpibo9D3p/0PqfGxEJKQGT4CqFLOgAB78Fk8ZV FKmFWhll5SdRNlZSdkTqZFr/3ccX0PKuR7mJzD+w6j50uZfjYlYJK5hKu0MbEhKz8uB0ml 5gefgZJ1Ot/HWQ1Z6Nb468fsFb5QzUysZw3hHeG7KJYzBWQSFeo8HSqmTEOjlHIdgjei7i 97DUXACqPwYw7+Ip5DYDPWQN6LLXodLdB2PPI/UL1bokYlKPR4BBUQWzsauPsg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761575679; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kYRFgSCl9Z56OhP7bVHkWCfxqnXcGlDmoWfK+MatzLU=; b=IUioyk9zhrOK3SK/hkICW+ss+JRPEY179VkTQ8MwT5WvMl95uCA1eSBQ1AtFz5X1toJTuc AVKOMZjWSu9HKOUHJrj9dFGPyfe87fV00JVwYabyEo+ZnmZbfeEyV1QLYiLgEittn70SBw RDXy1zBnD1rbQE+nqYlIH9x20SzaRsZSoFCDJMAvdiXrsV3QqRWAPpqhdq/ndV+uO+Ankt 2zA2tL+zufh6WIpRAyYqkj0jvCoW7RJs8KSFz8qEAGaAKuMF+jA5JHLbBNZ5GHBr38gwD6 lfLCEnJqWaWtdMApaADe+tjltZv7PCKenO8Z2kWsdMAQOCS9mcwHS9Odu2el1Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761575679; a=rsa-sha256; cv=none; b=nL6Meo1G6GXbhDjRImkBLlWgg615GEpUsWNJvofSRZP8LqMkW/aXANNRmRQM5UHdp3mNU+ 6NmV1wjfLCfRQqoFuUq6ca/jw+vxUJKfvG/X6QSe58nR3XoB5MBmLGIPmQjUWHrgr38wNx HKMZ3HRql20TIREweIkL102RuJ1FSzhsXTf/ZMukIX4Zmh3TCOdKQ6y7gzjNz5+dhhswMz m1FxryBaL0QwGQOu9M9k1VbIJVOJNDTrow786HgOORLIxwVFhb2aGtsrCJaFIaDwa4hF9k NHIFtB241ZyTUJOnszADusDfI19mkkVpQvVGis4JNVJVgas/EE06LYW/e3Q7Mw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cwGHM2kdFz1LGl; Mon, 27 Oct 2025 14:34:39 +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 59REYdrF063546; Mon, 27 Oct 2025 14:34:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59REYdeR063543; Mon, 27 Oct 2025 14:34:39 GMT (envelope-from git) Date: Mon, 27 Oct 2025 14:34:39 GMT Message-Id: <202510271434.59REYdeR063543@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Justin Hibbits Subject: git: 16db4c6fff45 - main - amd64: Add kexec support List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhibbits X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 16db4c6fff450d3dd802b6c4b23cae0a8af44976 Auto-Submitted: auto-generated The branch main has been updated by jhibbits: URL: https://cgit.FreeBSD.org/src/commit/?id=16db4c6fff450d3dd802b6c4b23cae0a8af44976 commit 16db4c6fff450d3dd802b6c4b23cae0a8af44976 Author: Justin Hibbits AuthorDate: 2025-10-26 02:45:15 +0000 Commit: Justin Hibbits CommitDate: 2025-10-27 14:33:51 +0000 amd64: Add kexec support The biggest difference between this and arm64 kexec is that we can't disable the MMU for amd64, we have to instead create a new "safe" page table that the trampoline and "child" kernel can use. This requires a lot more work to create identity mappings, etc. Reviewed by: kib Sponsored by: Juniper Networks, Inc. Differential Revision: https://reviews.freebsd.org/D51623 --- sys/amd64/amd64/genassym.c | 12 ++ sys/amd64/amd64/kexec_support.c | 300 ++++++++++++++++++++++++++++++++++++++++ sys/amd64/amd64/kexec_tramp.S | 91 ++++++++++++ sys/amd64/include/kexec.h | 41 ++++++ sys/conf/files.amd64 | 2 + sys/x86/include/intr_machdep.h | 1 + sys/x86/x86/intr_machdep.c | 20 +++ 7 files changed, 467 insertions(+) diff --git a/sys/amd64/amd64/genassym.c b/sys/amd64/amd64/genassym.c index eb1b746f5893..2716784ee871 100644 --- a/sys/amd64/amd64/genassym.c +++ b/sys/amd64/amd64/genassym.c @@ -57,6 +57,7 @@ #include #include #include +#include #include #include #include @@ -65,6 +66,7 @@ #include #include #include +#include ASSYM(P_VMSPACE, offsetof(struct proc, p_vmspace)); ASSYM(VM_PMAP, offsetof(struct vmspace, vm_pmap)); @@ -295,3 +297,13 @@ ASSYM(EC_R13, offsetof(struct efirt_callinfo, ec_r13)); ASSYM(EC_R14, offsetof(struct efirt_callinfo, ec_r14)); ASSYM(EC_R15, offsetof(struct efirt_callinfo, ec_r15)); ASSYM(EC_RFLAGS, offsetof(struct efirt_callinfo, ec_rflags)); + +/* Kexec */ +ASSYM(KEXEC_ENTRY, offsetof(struct kexec_image, entry)); +ASSYM(KEXEC_SEGMENTS, offsetof(struct kexec_image, segments)); +ASSYM(KEXEC_SEGMENT_MAX, KEXEC_SEGMENT_MAX); +ASSYM(KEXEC_IMAGE_SIZE, sizeof(struct kexec_image)); +ASSYM(KEXEC_STAGED_SEGMENT_SIZE, sizeof(struct kexec_segment_stage)); +ASSYM(KEXEC_SEGMENT_SIZE, offsetof(struct kexec_segment_stage, size)); +ASSYM(KEXEC_SEGMENT_MAP, offsetof(struct kexec_segment_stage, map_buf)); +ASSYM(KEXEC_SEGMENT_TARGET, offsetof(struct kexec_segment_stage, target)); diff --git a/sys/amd64/amd64/kexec_support.c b/sys/amd64/amd64/kexec_support.c new file mode 100644 index 000000000000..8189a48e9ae9 --- /dev/null +++ b/sys/amd64/amd64/kexec_support.c @@ -0,0 +1,300 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2025 Juniper Networks, Inc. + * + * 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 + +/* + * Idea behind this: + * + * kexec_load_md(): + * - Update boot page tables (identity map) to include all pages needed before + * disabling MMU. + * + * kexec_reboot_md(): + * - Copy pages into target(s) + * - Do "other stuff" + * - Does not return + */ + +/* + * do_pte: Create PTE entries (4k pages). If false, create 2MB superpages. + * identity: This is for an identity map, treat `start` as a physical address. + * Only valid here if do_pte is false. + */ +static void +kexec_generate_page_tables(pml4_entry_t *root, vm_offset_t start, + vm_size_t size, bool do_pte, bool identity, struct pctrie_iter *pages) +{ + vm_paddr_t mpa; + vm_offset_t pg; + vm_size_t stride = do_pte ? PAGE_SIZE : NBPDR; + vm_page_t m; + vm_pindex_t i, j, k, l; + + pg = start & ~(stride - 1); + i = pmap_pml4e_index(pg); + j = pmap_pdpe_index(pg); + k = pmap_pde_index(pg); + l = pmap_pte_index(pg); + for (; pg < start + size; i++, j = 0, k = 0, l = 0) { + /* + * Walk linearly, as above, but one fell swoop, one page at a + * time. + */ + if (root[i] == 0) { + m = vm_radix_iter_next(pages); + mpa = VM_PAGE_TO_PHYS(m); + root[i] = mpa | PG_RW | PG_V; + } + pdp_entry_t *pdp = + (pdp_entry_t *)(PHYS_TO_DMAP(root[i] & PG_FRAME)); + for (; j < NPDPEPG && pg < start + size; j++, k = 0, l = 0) { + if (pdp[j] == 0) { + m = vm_radix_iter_next(pages); + mpa = VM_PAGE_TO_PHYS(m); + pdp[j] = mpa | PG_RW | PG_V; + } + pd_entry_t *pde = + (pd_entry_t *)(PHYS_TO_DMAP(pdp[j] & PG_FRAME)); + for (; k < NPDEPG && pg < start + size; k++, l = 0) { + if (pde[k] == 0) { + if (!do_pte) { + pde[k] = + (identity ? pg : pmap_kextract(pg)) | + PG_RW | PG_PS | PG_V; + pg += NBPDR; + continue; + } + m = vm_radix_iter_next(pages); + mpa = VM_PAGE_TO_PHYS(m); + pde[k] = mpa | PG_V | PG_RW; + } else if ((pde[k] & PG_PS) != 0) { + pg += NBPDR; + continue; + } + /* Populate the PTEs. */ + for (; l < NPTEPG && pg < start + size; + l++, pg += PAGE_SIZE) { + pt_entry_t *pte = + (pt_entry_t *)PHYS_TO_DMAP(pde[pmap_pde_index(pg)] & PG_FRAME); + pte[pmap_pte_index(pg)] = + pmap_kextract(pg) | PG_RW | PG_V; + } + } + } + } +} + +void +kexec_reboot_md(struct kexec_image *image) +{ + void (*kexec_do_tramp)(void) = image->md_image; + + intr_disable_all(); + lapic_disable(); + kexec_do_reboot_trampoline(VM_PAGE_TO_PHYS(image->first_md_page), + kexec_do_tramp); + + for (;;) + ; +} + +int +kexec_load_md(struct kexec_image *image) +{ + struct pctrie_iter pct_iter; + pml4_entry_t *PT4; + pdp_entry_t *PDP_l; + pd_entry_t *PD_l0; + vm_offset_t va; + int i; + + /* + * Start building the page table. + * First part of the page table is standard for all. + */ + vm_offset_t pa_pdp_l, pa_pd_l0, pa_pd_l1, pa_pd_l2, pa_pd_l3; + vm_page_t m; + + if (la57) + return (EINVAL); + + vm_radix_iter_init(&pct_iter, &image->map_obj->rtree); + /* Working in linear space in the mapped space, `va` is our tracker. */ + m = vm_radix_iter_lookup(&pct_iter, image->first_md_page->pindex); + va = (vm_offset_t)image->map_addr + ptoa(m->pindex); + /* We'll find a place for these later */ + PT4 = (void *)va; + va += PAGE_SIZE; + m = vm_radix_iter_next(&pct_iter); + pa_pdp_l = VM_PAGE_TO_PHYS(m); + PDP_l = (void *)va; + va += PAGE_SIZE; + m = vm_radix_iter_next(&pct_iter); + pa_pd_l0 = VM_PAGE_TO_PHYS(m); + PD_l0 = (void *)va; + va += PAGE_SIZE; + m = vm_radix_iter_next(&pct_iter); + pa_pd_l1 = VM_PAGE_TO_PHYS(m); + m = vm_radix_iter_next(&pct_iter); + pa_pd_l2 = VM_PAGE_TO_PHYS(m); + m = vm_radix_iter_next(&pct_iter); + pa_pd_l3 = VM_PAGE_TO_PHYS(m); + m = vm_radix_iter_next(&pct_iter); + + /* 1:1 mapping of lower 4G */ + PT4[0] = (pml4_entry_t)pa_pdp_l | PG_V | PG_RW; + PDP_l[0] = (pdp_entry_t)pa_pd_l0 | PG_V | PG_RW; + PDP_l[1] = (pdp_entry_t)pa_pd_l1 | PG_V | PG_RW; + PDP_l[2] = (pdp_entry_t)pa_pd_l2 | PG_V | PG_RW; + PDP_l[3] = (pdp_entry_t)pa_pd_l3 | PG_V | PG_RW; + for (i = 0; i < 4 * NPDEPG; i++) { /* we overflow PD_l0 into _l1, etc */ + PD_l0[i] = ((pd_entry_t)i << PDRSHIFT) | PG_V | + PG_RW | PG_PS; + } + + /* Map the target(s) in 2MB chunks. */ + for (i = 0; i < KEXEC_SEGMENT_MAX; i++) { + struct kexec_segment_stage *s = &image->segments[i]; + + if (s->size == 0) + break; + kexec_generate_page_tables(PT4, s->target, s->size, false, + true, &pct_iter); + } + /* Now create the source page tables */ + kexec_generate_page_tables(PT4, image->map_addr, image->map_size, true, + false, &pct_iter); + kexec_generate_page_tables(PT4, + trunc_page((vm_offset_t)kexec_do_reboot_trampoline), + PAGE_SIZE, true, false, &pct_iter); + KASSERT(m != NULL, ("kexec_load_md: Missing trampoline page!\n")); + + /* MD control pages start at this next page. */ + image->md_image = (void *)(image->map_addr + ptoa(m->pindex)); + bcopy(kexec_do_reboot, image->md_image, kexec_do_reboot_size); + + /* Save the image into the MD page(s) right after the trampoline */ + bcopy(image, (void *)((vm_offset_t)image->md_image + + (vm_offset_t)&kexec_saved_image - (vm_offset_t)&kexec_do_reboot), + sizeof(*image)); + + return (0); +} + +/* + * Required pages: + * - L4 (1) (root) + * - L3 (PDPE) - 2 (bottom 512GB, bottom 4 used, top range for kernel map) + * - L2 (PDP) - 5 (2MB superpage mappings, 1GB each, for bottom 4GB, top 1) + * - L1 (PDR) - 1 (kexec trampoline page, first MD page) + * - kexec_do_reboot trampoline - 1 + * - Slop pages for staging (in case it's not aligned nicely) - 3 (worst case) + * + * Minimum 9 pages for the direct map. + */ +int +kexec_md_pages(struct kexec_segment *seg_in) +{ + struct kexec_segment *segs = seg_in; + vm_size_t pages = 13; /* Minimum number of starting pages */ + vm_paddr_t cur_addr = (1UL << 32) - 1; /* Bottom 4G will be identity mapped in full */ + vm_size_t source_total = 0; + + for (int i = 0; i < KEXEC_SEGMENT_MAX; i++) { + vm_offset_t start, end; + if (segs[i].memsz == 0) + break; + + end = round_2mpage((vm_offset_t)segs[i].mem + segs[i].memsz); + start = trunc_2mpage((vm_offset_t)segs[i].mem); + start = max(start, cur_addr + 1); + /* + * Round to cover the full range of page table pages for each + * segment. + */ + source_total += round_2mpage(end - start); + + /* + * Bottom 4GB are identity mapped already in the count, so skip + * any segments that end up there, this will short-circuit that. + */ + if (end <= cur_addr + 1) + continue; + + if (pmap_pml4e_index(end) != pmap_pml4e_index(cur_addr)) { + /* Need a new 512GB mapping page */ + pages++; + pages += howmany(end - (start & ~PML4MASK), NBPML4); + pages += howmany(end - (start & ~PDPMASK), NBPDP); + pages += howmany(end - (start & ~PDRMASK), NBPDR); + + } else if (pmap_pdpe_index(end) != pmap_pdpe_index(cur_addr)) { + pages++; + pages += howmany(end - (start & ~PDPMASK), NBPDP) - 1; + pages += howmany(end - (start & ~PDRMASK), NBPDR); + } + + } + /* Be pessimistic when totaling up source pages. We likely + * can't use superpages, so need to map each page individually. + */ + pages += howmany(source_total, NBPDR); + pages += howmany(source_total, NBPDP); + pages += howmany(source_total, NBPML4); + + /* + * Be intentionally sloppy adding in the extra page table pages. It's + * better to go over than under. + */ + pages += howmany(pages * PAGE_SIZE, NBPDR); + pages += howmany(pages * PAGE_SIZE, NBPDP); + pages += howmany(pages * PAGE_SIZE, NBPML4); + + /* Add in the trampoline pages */ + pages += howmany(kexec_do_reboot_size, PAGE_SIZE); + + return (pages); +} diff --git a/sys/amd64/amd64/kexec_tramp.S b/sys/amd64/amd64/kexec_tramp.S new file mode 100644 index 000000000000..6a2de676bc35 --- /dev/null +++ b/sys/amd64/amd64/kexec_tramp.S @@ -0,0 +1,91 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2025 Juniper Networks, Inc. + * + * 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 "assym.inc" + +/* + * Take a pointer to the image, copy each segment, and jump to the trampoline. + * + * Assumptions: + * - image is in safe memory + * - We're already running out of the new "identity" map. + * - All registers are free game, so go nuts + * - Interrupts are disabled + * - All APs are disabled + */ +ENTRY(kexec_do_reboot) + /* + r9: image pointer + r10: segment pointer + r11: segment counter + */ + leaq kexec_stack(%rip), %rsp + /* Get the saved kexec_image. */ + leaq kexec_saved_image(%rip), %r9 + leaq KEXEC_SEGMENTS(%r9), %r10 + movq $KEXEC_SEGMENT_MAX, %r11 +copy_segment: + movq KEXEC_SEGMENT_SIZE(%r10), %rcx + cmpq $0, %rcx + je done + shrq $3, %rcx + movq KEXEC_SEGMENT_TARGET(%r10), %rdi + movq KEXEC_SEGMENT_MAP(%r10), %rsi + rep + movsq + addq $KEXEC_STAGED_SEGMENT_SIZE, %r10 + decq %r11 + jg copy_segment + +done: + pushq KEXEC_ENTRY(%r9) + ret +fail: + jmp fail +END(kexec_do_reboot) +ENTRY(kexec_do_reboot_trampoline) + /* Set new page table, clears most of TLB. */ + movq %rdi, %cr3 + + /* Now flush the rest of the TLB, including global pages. */ + movq %cr4, %rax + andq $~CR4_PGE, %rax + movq %rax, %cr4 + jmp *%rsi +END(kexec_do_reboot_trampoline) +CNAME(kexec_saved_image): + .globl kexec_saved_image + .space KEXEC_IMAGE_SIZE + .quad 0 + /* We don't need more than quad, so just fill out the page. */ + .p2align PAGE_SHIFT + kexec_stack: +CNAME(kexec_do_reboot_size): + .globl kexec_do_reboot_size + .quad . - kexec_do_reboot diff --git a/sys/amd64/include/kexec.h b/sys/amd64/include/kexec.h new file mode 100644 index 000000000000..70bc2991be3f --- /dev/null +++ b/sys/amd64/include/kexec.h @@ -0,0 +1,41 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2025 Juniper Networks, Inc. + * + * 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 _AMD64_KEXEC_H_ +#define _AMD64_KEXEC_H_ + +struct kexec_segment; +struct kexec_image; +int kexec_md_pages(struct kexec_segment *); +extern void kexec_do_reboot(void); +extern long kexec_do_reboot_size; +extern void *kexec_saved_image; +extern void kexec_do_reboot_trampoline(unsigned long, void (*)(void)); +#define KEXEC_MD_PAGES(x) kexec_md_pages(x) + + +#endif /* _AMD64_KEXEC_H_ */ diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64 index a342242ac66e..e4f01813bc8f 100644 --- a/sys/conf/files.amd64 +++ b/sys/conf/files.amd64 @@ -77,6 +77,8 @@ amd64/amd64/fpu.c standard amd64/amd64/gdb_machdep.c optional gdb amd64/amd64/initcpu.c standard amd64/amd64/io.c optional io +amd64/amd64/kexec_support.c standard +amd64/amd64/kexec_tramp.S standard amd64/amd64/locore.S standard no-obj amd64/amd64/xen-locore.S optional xenhvm \ compile-with "${NORMAL_S} -g0" \ diff --git a/sys/x86/include/intr_machdep.h b/sys/x86/include/intr_machdep.h index 9e913440c712..497c89b0a7eb 100644 --- a/sys/x86/include/intr_machdep.h +++ b/sys/x86/include/intr_machdep.h @@ -142,6 +142,7 @@ int intr_add_handler(struct intsrc *isrc, const char *name, int intr_config_intr(struct intsrc *isrc, enum intr_trigger trig, enum intr_polarity pol); int intr_describe(struct intsrc *isrc, void *ih, const char *descr); +void intr_disable_all(void); void intr_execute_handlers(struct intsrc *isrc, struct trapframe *frame); u_int intr_next_cpu(int domain); struct intsrc *intr_lookup_source(int vector); diff --git a/sys/x86/x86/intr_machdep.c b/sys/x86/x86/intr_machdep.c index 023c3df22580..a16d2ced8dba 100644 --- a/sys/x86/x86/intr_machdep.c +++ b/sys/x86/x86/intr_machdep.c @@ -245,6 +245,26 @@ intr_register_source(struct intsrc *isrc) return (0); } +void +intr_disable_all(void) +{ + /* + * Disable all external interrupts. This is used by kexec_reboot() to + * prevent problems on the other side when APs are brought up. + */ + for (int v = 0; v < num_io_irqs; v++) { + struct intsrc *is; + + is = interrupt_sources[v]; + if (is == NULL) + continue; + if (is->is_pic->pic_disable_intr != NULL) { + is->is_pic->pic_disable_source(is, PIC_EOI); + is->is_pic->pic_disable_intr(is); + } + } +} + struct intsrc * intr_lookup_source(int vector) { From nobody Mon Oct 27 14:34:40 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cwGHN6lPfz6DlrS; Mon, 27 Oct 2025 14:34:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cwGHN4Mvzz3jDC; Mon, 27 Oct 2025 14:34:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761575680; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eL78tX+iowj/0iyuYFHdopZPgvh4ZWVDDsgZsM/2yUk=; b=E+EYtlncG02AidbdrnZDgSs8XFM3BbaeOzKRg08KterpB06ClT9IhoxarVkf9nSWRyjntO 9xMrVJz+YypQFjXtxar/ujeg7sVd19xMnTS91m0DlOvO+dE4DuEsvzv01h7WFSW43TLTc3 meuaHLiVpHVgilkLjZ6ec4qLCbkZzwb/4s4sEMWe+v9mciBTF/7XLIP0A8OwmqN3bm5i2I a/mh9IRK7kXFEZuMsI+PAJBmDE43AaujlK+D7Wcd4lJM00fMZ0sCFBsm7eZVFb3ANjzZbX T7TULgS3oKGNleSXSABhUMVDLj9DaesWWrbVmNLHRMDhC+tAkg86tam4VvfmvQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761575680; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eL78tX+iowj/0iyuYFHdopZPgvh4ZWVDDsgZsM/2yUk=; b=G5pHLJkfOoFJ2gV8aljvxEkXKs384x86sMpa2CJeF1nBG53h6h0nxxlMHBYNLFgfombOg4 K+/lzapUkloYUznROj9rz5Mo0fqBN57yYgkdVgje+Y8NYW+L3OqDi29BxUJbFxW9b7eHPV vDMsZyzAG2NPwNbVFRJwL83fu7L0DS43dpndhyALxXpjTWRVpjCpcggMPiU58a04Wd2vNv guSRp/Gewl76jibYeozGAtsqLgyFy+HSMtCq191ZqbK0MED3YXi6ohViPGLG5OlXaP3/xP sNc5jM0C9i1zcD50hkXEWJgnVtESLkxApA6bGd2Bc1G4uqfV1yN5jtn8AfJmEQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761575680; a=rsa-sha256; cv=none; b=FVvwiaaNJipyTFIP3Lo3rEsYSJfwTcegZ+inK20Y3k5dDqYdtteX2jvxtoII8Fw1szhZ7N GRK5u6+wUPWjxtlEjNtV0t77cGD2Ji0kKtLcvpzuUJXeMQfr0RQy51jKdNy5X3gmNEhObl SGLgL+KSsVDrF+41dPzNsVVlHtzjTlF2YiHRWgKO6CMCjdYitW0OMj6qron0JFPSabilTr FUWecO8ww3f+GkvMPex957Py6a8nLMXn9YvbrjdLawPuijHj8wzSJ/f+CAZmND3Omknd8w NWXeo8UYQR/srkQpVzHO0CYvWDbUOT4TReXMVjiFBBnhB+EJEvVaie3/CXYgrg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cwGHN3z0hz1M9l; Mon, 27 Oct 2025 14:34: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 59REYepO063580; Mon, 27 Oct 2025 14:34:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59REYeN5063577; Mon, 27 Oct 2025 14:34:40 GMT (envelope-from git) Date: Mon, 27 Oct 2025 14:34:40 GMT Message-Id: <202510271434.59REYeN5063577@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Justin Hibbits Subject: git: 3b9578059cce - main - kexec: Add dummy headers for arm, i386, powerpc, and riscv List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhibbits X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3b9578059cce3bc193be651546e191d0177df7d4 Auto-Submitted: auto-generated The branch main has been updated by jhibbits: URL: https://cgit.FreeBSD.org/src/commit/?id=3b9578059cce3bc193be651546e191d0177df7d4 commit 3b9578059cce3bc193be651546e191d0177df7d4 Author: Justin Hibbits AuthorDate: 2025-10-26 02:43:52 +0000 Commit: Justin Hibbits CommitDate: 2025-10-27 14:33:51 +0000 kexec: Add dummy headers for arm, i386, powerpc, and riscv kexec hasn't been ported to these architectures, yet, so appease the build with dummy headers. Sponsored by: Juniper Networks, Inc. Differential Revision: https://reviews.freebsd.org/D51625 --- sys/arm/include/kexec.h | 38 ++++++++++++++++++++++++++++++++++++++ sys/i386/include/kexec.h | 38 ++++++++++++++++++++++++++++++++++++++ sys/powerpc/include/kexec.h | 38 ++++++++++++++++++++++++++++++++++++++ sys/riscv/include/kexec.h | 39 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 153 insertions(+) diff --git a/sys/arm/include/kexec.h b/sys/arm/include/kexec.h new file mode 100644 index 000000000000..50391d32812a --- /dev/null +++ b/sys/arm/include/kexec.h @@ -0,0 +1,38 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2025 Juniper Networks, Inc. + * + * 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 _ARM_KEXEC_H_ +#define _ARM_KEXEC_H_ + +int +kexec_load_md(struct kexec_image *image) +{ + return (ENOSYS); +} + +#define kexec_reboot_md(x) do {} while (0) +#endif /* _ARM_KEXEC_H_ */ diff --git a/sys/i386/include/kexec.h b/sys/i386/include/kexec.h new file mode 100644 index 000000000000..9fbdef38ad2e --- /dev/null +++ b/sys/i386/include/kexec.h @@ -0,0 +1,38 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2025 Juniper Networks, Inc. + * + * 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 _I386_KEXEC_H_ +#define _I386_KEXEC_H_ + +int +kexec_load_md(struct kexec_image *image) +{ + return (ENOSYS); +} + +#define kexec_reboot_md(x) do {} while (0) +#endif /* _I386_KEXEC_H_ */ diff --git a/sys/powerpc/include/kexec.h b/sys/powerpc/include/kexec.h new file mode 100644 index 000000000000..a57c50926696 --- /dev/null +++ b/sys/powerpc/include/kexec.h @@ -0,0 +1,38 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2025 Juniper Networks, Inc. + * + * 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 _POWERPC_KEXEC_H_ +#define _POWERPC_KEXEC_H_ + +int +kexec_load_md(struct kexec_image *image) +{ + return (ENOSYS); +} + +#define kexec_reboot_md(x) do {} while (0) +#endif /* _POWERPC_KEXEC_H_ */ diff --git a/sys/riscv/include/kexec.h b/sys/riscv/include/kexec.h new file mode 100644 index 000000000000..5fb6fd321989 --- /dev/null +++ b/sys/riscv/include/kexec.h @@ -0,0 +1,39 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2025 Juniper Networks, Inc. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#ifndef _RISCV_KEXEC_H_ +#define _RISCV_KEXEC_H_ + +int +kexec_load_md(struct kexec_image *image) +{ + return (ENOSYS); +} + +#define kexec_reboot_md(x) do {} while (0) +#endif /* _RISCV_KEXEC_H_ */ From nobody Mon Oct 27 14:38:18 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cwGMb0HYqz6DlnY; Mon, 27 Oct 2025 14:38: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cwGMZ6pm3z3ml6; Mon, 27 Oct 2025 14:38:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761575899; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mLDgECwo5BABkQMz/SxtJ9Yd6kHG1YABfytq1Cz0ieA=; b=C9Ssi1L/xBc6v+cWLFpopdF+TVEwSr+J9a7kNivDZmGlVkvPfPQVnX4IuWMq15jCpduMqq 7iNHXTm+NIigim8KdmZNMLFvzc+fH4rmTZ7kOPQdOJHZGnCyuZxtGYsvnH4BEKViECuDav zNfuIQQHOfIC1g3gplO3zDRoSeHPpw4gbJ+JGCwgFDimnebmYudk5CwYSWAG2zy8sEQZR3 8PB0pE0Wh9gjL/sUTmQMmliRwBxZ7c37AKeu6ROu2+sTnjnnoG+/sVANCvEqh0Kt7d83rA tpIcLhTuYmUgOnwIW7syIZBvdAwJ4Ts4YQ+T5R1jYLHUpJ1YeahbGV12JDXZdA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761575899; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mLDgECwo5BABkQMz/SxtJ9Yd6kHG1YABfytq1Cz0ieA=; b=ZHgd5i1NHS7mM3S8kBIqrPI24EPt/3DB4vVceXS9N/NlwWRDcKkmudcfAsn9JvL0aFfLD9 TjPOt4xLo2MXa0IJa0+ClAde5AXdwEwclk2MKVzHfNvVcKFzeF44aoxanWzVA8Lqjf7JYe YJeA6r5SDfpY+pBRPIYrB0i8YkigJF+Sih9pdzvg1lF0bzt/TVBAgXOi89HD6NZWcTXelz zY2LImj3k/nHXk+sGOhScs9nFlis9d9Ck3lCUo0dQKnyB6IKBWFSDbjvvtoii6Mc2MOfBh E2XbzhLpTWLMOWohoT1Zomqb7lJcfVhpyzejIzEfhtKRLgWZ1kQk/lVb/gaqwA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761575899; a=rsa-sha256; cv=none; b=CpRu/134A43AxU3nnS+4xs3C+4I3lhYjeyEdtNLxGepfAphmMFAyFq9t5yZMUJ5sqhJ8RX qyztflVYAfr2WLJZlVoFvGfWWmWzgSq1wDaKIZ9Toz41RAVY/BxFkwnocR+67GSVeCfC96 2j/GfnmKIhMRUtZCUhGUrkrvuOnwf/fiGq2s8G34owqkC7zV/duZZsPTzgQDDGArh8sABi Sc8AWiIol6NCaSi84iVwft3ZPa6IjmQknZ/ENJJmJnnfJLYgiGiB2VBWRammOFBH1Dy7Pk H539mS+NJhIvENkuZ/8YET6NgGlgIjfdShbIr4Vl58Xxv8Gx0rnOIuGB32wXcg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cwGMZ6CFFz1M7J; Mon, 27 Oct 2025 14:38: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 59REcIle065567; Mon, 27 Oct 2025 14:38:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59REcIPg065564; Mon, 27 Oct 2025 14:38:18 GMT (envelope-from git) Date: Mon, 27 Oct 2025 14:38:18 GMT Message-Id: <202510271438.59REcIPg065564@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: 3053b2a3dcab - main - nfs_clrpcops.c: Add sanity checks for the slot cnts List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3053b2a3dcab6e05311c3b696bee4c9e5698d93a Auto-Submitted: auto-generated The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=3053b2a3dcab6e05311c3b696bee4c9e5698d93a commit 3053b2a3dcab6e05311c3b696bee4c9e5698d93a Author: Rick Macklem AuthorDate: 2025-10-27 14:35:27 +0000 Commit: Rick Macklem CommitDate: 2025-10-27 14:35:27 +0000 nfs_clrpcops.c: Add sanity checks for the slot cnts The reply to CreateSession includes the slot cnt for both fore and back slots. It should never be larger than the argument specified and the fore slot cnt should always be at least 1. Without this patch, the replied slot cnts were not being sanity checked. While here, replace 64 with NFSV4_SLOTS (which is 64). Reported by: Ilja Van Sprundel Reviewed by: emaste, markj MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D53363 --- sys/fs/nfsclient/nfs_clrpcops.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/sys/fs/nfsclient/nfs_clrpcops.c b/sys/fs/nfsclient/nfs_clrpcops.c index d3b83eb8b94b..d9f27c3f31a2 100644 --- a/sys/fs/nfsclient/nfs_clrpcops.c +++ b/sys/fs/nfsclient/nfs_clrpcops.c @@ -5599,7 +5599,7 @@ nfsrpc_createsession(struct nfsmount *nmp, struct nfsclsession *sep, } *tl++ = txdr_unsigned(4096); /* Max response size cached */ *tl++ = txdr_unsigned(20); /* Max operations */ - *tl++ = txdr_unsigned(64); /* Max slots */ + *tl++ = txdr_unsigned(NFSV4_SLOTS); /* Max slots */ *tl = 0; /* No rdma ird */ /* Fill in back channel attributes. */ @@ -5668,6 +5668,11 @@ nfsrpc_createsession(struct nfsmount *nmp, struct nfsclsession *sep, sep->nfsess_maxcache = fxdr_unsigned(int, *tl++); tl++; sep->nfsess_foreslots = fxdr_unsigned(uint16_t, *tl++); + if (sep->nfsess_foreslots == 0) { + error = NFSERR_BADXDR; + goto nfsmout; + } else if (sep->nfsess_foreslots > NFSV4_SLOTS) + sep->nfsess_foreslots = NFSV4_SLOTS; NFSCL_DEBUG(4, "fore slots=%d\n", (int)sep->nfsess_foreslots); irdcnt = fxdr_unsigned(int, *tl); if (irdcnt < 0 || irdcnt > 1) { @@ -5681,6 +5686,8 @@ nfsrpc_createsession(struct nfsmount *nmp, struct nfsclsession *sep, NFSM_DISSECT(tl, uint32_t *, 7 * NFSX_UNSIGNED); tl += 5; sep->nfsess_backslots = fxdr_unsigned(uint16_t, *tl); + if (sep->nfsess_backslots > NFSV4_CBSLOTS) + sep->nfsess_backslots = NFSV4_CBSLOTS; NFSCL_DEBUG(4, "back slots=%d\n", (int)sep->nfsess_backslots); } error = nd->nd_repstat; From nobody Mon Oct 27 14:45:58 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cwGXR1jm6z6DmsR; Mon, 27 Oct 2025 14:45: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cwGXR0g1Rz3p5Z; Mon, 27 Oct 2025 14:45:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761576359; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=j+MZjn5XrCCrOg486oux2BuyatXgTJaAiIepqImeyCE=; b=QPn6MemLsCxuf4LYwfuhH//I6fWt8IhABbVrmsV7JX3Hq2pkQmEiRATZyuqiopQVi2aryh cmYAcDuoVkPXHGRanGUd6J4CyLlBD+z1Hh1blvqTNKzJkIPYKpymL0rA80MYWaNQUYw3st PJtSwbtnNevTTkkMfF/HW4rGd6qveeu63aFzGjdvtCZFBakIh+boJGoKGDeq6FA7WfPhlI 3stbn0pPipbVqZgfGLKrwDDnS1kstAUO63COKsZKVrgxOFyZYkU8Z3fzp8Fh/ItphEor46 JDDU9TmnfH4XEIV6Ra6pa+EEGxdR7eHh98EWwZa3Ton4/agThXxE4SocOXC1zA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761576359; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=j+MZjn5XrCCrOg486oux2BuyatXgTJaAiIepqImeyCE=; b=eoM8P8K56IDFuu/qtApGjVvCWa+26GDkyVfeOt16iUogROROo5WDrLJ2hmoYpUeFFaBmCH 00qFRwJVoNlv/P4Q/qt/l7IQEzr0lBMoYnyIWciBic+rXe/Wfv0yWw4eywgXTfFBiwvDAN esPKHEj4VIf+ucrrSsa2rybQQwTJonjeAEoe6ORyNFGlJBx7trJowO1nA1b69DMUhXuBB8 BrLCV6G9RBedYtmUvpYceVtk85HiVD91v5iHyqkGJjA37mYkP3QywdKZg3GzqUU0B+gw2t Cha2kk6wHiBiwrw7NV4mDcP34Tz1tGuFKA603XcqAboGg+m10KRVObbCbr+m6w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761576359; a=rsa-sha256; cv=none; b=b3DeVpxx4+hzB8YGRIF8pnGl81EGIJ89egKOf9q5BHWSS4ITk61qWIS/LKCentROUIpXpL GxmMOkCwQtW2tkF1rkiKJvH9yIa9CGgP9AOrQ8TsKF5gtb33frg0Ns0hw4RvI0yQ7CcK1r U8POyEfNGDRioXLBio6R/NdnoBwoGP1oMv0U88/6qM3QWRk9XQV4C750cCzQ3rhF9Nq+ss bq+riP+leKs4/9V7zSI7Pct/WJR0Gm6JIzLaSym44mBpCiJCJewo/n0M74Mp1KyTzp8NTa s2ZcBB06fhfWD454syrj8HK2a/Un4S1ZA0ubwOXo/HhDrJjmU9bUV0NNldZqYQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cwGXQ73qzz1MT1; Mon, 27 Oct 2025 14:45: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 59REjwpQ083982; Mon, 27 Oct 2025 14:45:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59REjwDM083979; Mon, 27 Oct 2025 14:45:58 GMT (envelope-from git) Date: Mon, 27 Oct 2025 14:45:58 GMT Message-Id: <202510271445.59REjwDM083979@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: b9e6206f5933 - main - nfs_clrpcops.c: Fix two possible large NFSM_DISSECT()s List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b9e6206f593385c80436d267ab759319c1e94e43 Auto-Submitted: auto-generated The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=b9e6206f593385c80436d267ab759319c1e94e43 commit b9e6206f593385c80436d267ab759319c1e94e43 Author: Rick Macklem AuthorDate: 2025-10-27 14:43:02 +0000 Commit: Rick Macklem CommitDate: 2025-10-27 14:43:02 +0000 nfs_clrpcops.c: Fix two possible large NFSM_DISSECT()s There are two cases in nfs_clrpcops.c where it was possible for the code to attempt to NFSM_DISSECT() a large size, which is not allowed by nfsm_dissct(). This patch fixes them. Reducing the maximum stripecnt should be no problem, since there in no extant NFSv4.n server that does striped File Layout pNFS and current development is centered around the Flex File layout. Reported by: Ilja Van Sprundel Reviewed by: markj MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D53367 --- sys/fs/nfsclient/nfs_clrpcops.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/sys/fs/nfsclient/nfs_clrpcops.c b/sys/fs/nfsclient/nfs_clrpcops.c index d9f27c3f31a2..c8a130c34412 100644 --- a/sys/fs/nfsclient/nfs_clrpcops.c +++ b/sys/fs/nfsclient/nfs_clrpcops.c @@ -5807,7 +5807,8 @@ nfsrpc_getdeviceinfo(struct nfsmount *nmp, uint8_t *deviceid, int layouttype, NFSM_DISSECT(tl, uint32_t *, NFSX_UNSIGNED); stripecnt = fxdr_unsigned(int, *tl); NFSCL_DEBUG(4, "stripecnt=%d\n", stripecnt); - if (stripecnt < 1 || stripecnt > 4096) { + if (stripecnt >= MHLEN / NFSX_UNSIGNED || + stripecnt < 1) { printf("pNFS File layout devinfo stripecnt %d:" " out of range\n", stripecnt); error = NFSERR_BADXDR; @@ -8253,7 +8254,7 @@ nfsrv_parseug(struct nfsrv_descript *nd, int dogrp, uid_t *uidp, gid_t *gidp, NFSPROC_T *p) { uint32_t *tl; - char *cp, *str, str0[NFSV4_SMALLSTR + 1]; + char *str, str0[NFSV4_SMALLSTR + 1]; uint32_t len = 0; int error = 0; @@ -8276,9 +8277,9 @@ nfsrv_parseug(struct nfsrv_descript *nd, int dogrp, uid_t *uidp, gid_t *gidp, str = malloc(len + 1, M_TEMP, M_WAITOK); else str = str0; - NFSM_DISSECT(cp, char *, NFSM_RNDUP(len)); - NFSBCOPY(cp, str, len); - str[len] = '\0'; + error = nfsrv_mtostr(nd, str, len); + if (error != 0) + goto nfsmout; NFSCL_DEBUG(4, "nfsrv_parseug: str=%s\n", str); if (dogrp != 0) error = nfsv4_strtogid(nd, str, len, gidp); From nobody Mon Oct 27 14:52:28 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cwGgw3twLz6Dnh3; Mon, 27 Oct 2025 14:52:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cwGgw2lPjz3pxg; Mon, 27 Oct 2025 14:52:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761576748; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dLT5/6MqcW8IKbpU0uV92xQyWCrvIu+aT/6BFmh7Uo8=; b=xJEhY9ANLc4Pmz/GX6Ny5IXK+xD79FiJRa0vDTbQE9eqnkUMSaz46Oh3+D+yT7rg5yR0hl +EA2kMXcmZj5X6BJqK64ZarHp29tzJSCaXBUguLwzMLjIZ+RaURyXzXEUVz/BL1AFKNg7O LDXprUX1+AKZuLKRKSDqSvqoG/j7QXbO8tCkeI8q0jRZJ2ax2EylPl1p+CAureltOWg1bu Bb7MrMmVUXFhuKpEC9bwav+HdRH6rCpjRst7IUmfEv3K5e8qLZuvGDke+aeQ+bU7Dyqa34 5NNc0lrk7jFpQAKZQwuf405OnOJZKwJaJuQ32qZejxErGd5Dvf2vXZ+HmNCg5w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761576748; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dLT5/6MqcW8IKbpU0uV92xQyWCrvIu+aT/6BFmh7Uo8=; b=W1Ff0HVPQ3uKACPhUfJq372jauBM82jSBF3uTObeNZo3KEpn5Lsn1trUkCRvLATGicsSz/ pqEhzysINKiKi3fKomNO8zAypbiHRFhESTvyCFUrQSN9/XvGIFkiSCaiac/hD+ynIEw5xo tArbTmD3MyYIef3aB3k/5Vrt4s7ei1rNIPDU2578Rw63l6NRj2n9V6THZ8WDFdKU3Jp3JH 1mJwcqwfKM8RHgTDs+SPr6FFCj9t2lFd8Ax3u4XvMq4EVAgcYRDoigEKTa1XH001xPJ8ek I+hhkUrxkt3IG4yOqTkwtnnIs2p60KHEWptxGirBBRTSaW8+UXkpXQGjf4KeSQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761576748; a=rsa-sha256; cv=none; b=TILz6h7qLSCbQE9ElQgi7JLlhVQpbtBzsEPgOmVjzKx+XGWLFWNz50wQpD4YVZzdci5Rjn jko1jsbdsOrwP25o8lZiHRCs5NfyVOjVnBcV08T6td91GATZYCoQywp89yNmkzG+32oEwk fWUFzBdK8CUiE/pN+SFiA01KqOn16gDV1oqkn6KKamaDkKivitjn8UZqUtfX0Um0t9DVra gpFZiSZqnbUbFZWUkKyHG15sdVFR9A8E/u8HONaHfS5c/oyWueallKWhPGrgIwHXkYEOwW W7rX68PZjqA47pfx1LQuH0U8NBgkPB9GSCmErCowdiYtse+fcjjzk5CWuW9iUw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cwGgw29Q0z1MWj; Mon, 27 Oct 2025 14:52: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 59REqStO001086; Mon, 27 Oct 2025 14:52:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59REqSOZ001083; Mon, 27 Oct 2025 14:52:28 GMT (envelope-from git) Date: Mon, 27 Oct 2025 14:52:28 GMT Message-Id: <202510271452.59REqSOZ001083@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: 2c82cdd2e29f - main - nfs_clrpcops.c: Check for too large a write reply List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2c82cdd2e29f8ba00d4289f36f8baa1598a1ad9b Auto-Submitted: auto-generated The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=2c82cdd2e29f8ba00d4289f36f8baa1598a1ad9b commit 2c82cdd2e29f8ba00d4289f36f8baa1598a1ad9b Author: Rick Macklem AuthorDate: 2025-10-27 14:49:32 +0000 Commit: Rick Macklem CommitDate: 2025-10-27 14:49:32 +0000 nfs_clrpcops.c: Check for too large a write reply The "rlen" reply length for a Write operation/RPC could cause trouble if a broken server replies with too large a value. Improve the sanity check for "rlen" to avoid this. Reported by: Ilja Van Sprundel Reviewed by: emaste, markj MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D53368 --- sys/fs/nfsclient/nfs_clrpcops.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/fs/nfsclient/nfs_clrpcops.c b/sys/fs/nfsclient/nfs_clrpcops.c index c8a130c34412..983eb8b9226f 100644 --- a/sys/fs/nfsclient/nfs_clrpcops.c +++ b/sys/fs/nfsclient/nfs_clrpcops.c @@ -2212,7 +2212,7 @@ nfsrpc_writerpc(vnode_t vp, struct uio *uiop, int *iomode, NFSM_DISSECT(tl, u_int32_t *, 2 * NFSX_UNSIGNED + NFSX_VERF); rlen = fxdr_unsigned(int, *tl++); - if (rlen == 0) { + if (rlen <= 0 || rlen > len) { error = NFSERR_IO; goto nfsmout; } else if (rlen < len) { @@ -7257,7 +7257,7 @@ nfsrpc_writeds(vnode_t vp, struct uio *uiop, int *iomode, int *must_commit, NFSM_DISSECT(tl, uint32_t *, 2 * NFSX_UNSIGNED + NFSX_VERF); rlen = fxdr_unsigned(int, *tl++); NFSCL_DEBUG(4, "nfsrpc_writeds: len=%d rlen=%d\n", len, rlen); - if (rlen == 0) { + if (rlen <= 0 || rlen > len) { error = NFSERR_IO; goto nfsmout; } else if (rlen < len) { From nobody Mon Oct 27 15:11:29 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cwH5t0R7Vz6Dq81; Mon, 27 Oct 2025 15:11: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cwH5s6nWyz3rgl; Mon, 27 Oct 2025 15:11:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761577890; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0fzQA1zV63r3AHHJe70DXEX4yvq8d0vQDdscumPLKwk=; b=Ak69ydoSaVPY7j3uvt0ID23kpFSyOdoez57AqndmsNWE4TwU5nHHRCkx/DUgwjWU36b9Tr QSSM/O2Ze5gEA+TUBe50PkLKEcQ1moKrW9O43ymj1pMdC6rZkaPe5z/7GG55vsIaJiacBn kItYA2UHY0Cd9EKkibWO7S7W+x4TrciKGDk2keF1Urhll9YbcFwn+ci0IaVXLVm68mDEDJ Mu9g5zzzojFVNR5BC/9lafMwH2ccIyTtKN0rKPNmmwcnEmfvQ+5/C9gFtk03BmxGWO1HmZ 96tQdZ2kx3/Ln9zVv1oeSDsnyMQifhYQzPftEwdTZWJoDNEWSGcGuNbpIHK/Bw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761577890; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0fzQA1zV63r3AHHJe70DXEX4yvq8d0vQDdscumPLKwk=; b=jNzr/RnRUCOM8Czcen/d46ZVXwIYffNI5j+ofnbo9y/ivptJCxNT1HAyWzQje7klnkvh3c NDlfE4cSnbtNhQYOknzuMJaJwYUyrut247qEtUEeihFzE1PPo4EiO5IFSLf0BstrrfCopm g83PD0jGaiwCfiM/iv40JZGUCo8v75/2wNAD4eNnh44KUFvoc+LKF2eG+Rb/L+RSmhITRJ R9sG1EChBdGKa8RE3/gll0B1teTBwRhOJpd3upfHRv6gt8GVH8CtX6uX4h/TWQ86fPd0nz o8ct6npAUtVjQDr6U7ZcyvADjLlQFwOMRW6iCEPDY7SLqoub8B9HCPP+H18SZw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761577890; a=rsa-sha256; cv=none; b=PGXeswHlPjM7GiV9HTf5UH7aVNFJVxCfhZbhy38BpO7lPGshs6RyM6Mzw7wpeW14Ai//TW oRP69WvKVO00douyb+j8zMFBCdZGPs7ZYXRWrcLtuZws1CnoFqU7/5R0GxIT4vW2zBx1oV ugJELGoc6eq08ksbY6UAT9bquXYNEtjZHMFk/AG8bkCA+cgcjtTqDAe8dsy9K0lkmxhyv0 zFaA9yKJknoQydAHaP79uihZeGzHt2RPv/EZsTN+7v7A8M8nkt90dUfmTCfcspeaRXyeOz Rn6IDqGC/Z+zmgjvuwF2RwurI6FEaii17T89bQ+D7AJYl0E+dU08OInq0KeP2Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cwH5s6MQKz1Lxs; Mon, 27 Oct 2025 15:11: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 59RFBTGp032417; Mon, 27 Oct 2025 15:11:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59RFBTFS032414; Mon, 27 Oct 2025 15:11:29 GMT (envelope-from git) Date: Mon, 27 Oct 2025 15:11:29 GMT Message-Id: <202510271511.59RFBTFS032414@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jose Luis Duran Subject: git: b502a451cbae - main - blocklist: blacklist: Chase recent upstream changes List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: b502a451cbae6a85636c7b8375f5ee53caca4388 Auto-Submitted: auto-generated The branch main has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=b502a451cbae6a85636c7b8375f5ee53caca4388 commit b502a451cbae6a85636c7b8375f5ee53caca4388 Author: Jose Luis Duran AuthorDate: 2025-10-27 15:01:22 +0000 Commit: Jose Luis Duran CommitDate: 2025-10-27 15:10:59 +0000 blocklist: blacklist: Chase recent upstream changes Upstream introduced a fix that avoids blocklistd(8) from running into an endless loop when it tries to delete an address from the database which has been added multiple times. Apply the same fix to blacklistd(8). Upstream PR: https://gnats.netbsd.org/cgi-bin/query-pr-single.pl?number=57193 MFC after: 2 days --- contrib/blocklist/bin/blacklistd.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/contrib/blocklist/bin/blacklistd.c b/contrib/blocklist/bin/blacklistd.c index b5f9358122ef..cb6ce6578d9c 100644 --- a/contrib/blocklist/bin/blacklistd.c +++ b/contrib/blocklist/bin/blacklistd.c @@ -1,4 +1,4 @@ -/* $NetBSD: blocklistd.c,v 1.11 2025/10/25 16:55:23 christos Exp $ */ +/* $NetBSD: blocklistd.c,v 1.12 2025/10/25 18:43:51 christos Exp $ */ /*- * Copyright (c) 2015 The NetBSD Foundation, Inc. @@ -35,7 +35,7 @@ #ifdef HAVE_SYS_CDEFS_H #include #endif -__RCSID("$NetBSD: blocklistd.c,v 1.11 2025/10/25 16:55:23 christos Exp $"); +__RCSID("$NetBSD: blocklistd.c,v 1.12 2025/10/25 18:43:51 christos Exp $"); #include #include @@ -329,8 +329,8 @@ again: (*lfun)(LOG_INFO, "released %s/%d:%d after %d seconds", buf, c.c_lmask, c.c_port, c.c_duration); } - state_del(state, &c); - goto again; + if (state_del(state, &c) == 0) + goto again; } } From nobody Mon Oct 27 15:19:11 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cwHGn0nZ5z6Dr2j; Mon, 27 Oct 2025 15:19:13 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cwHGn08DRz3t5r; Mon, 27 Oct 2025 15:19:13 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761578353; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=VxXNzEnzMghs+oSWi68iZyZMITdNmtGxeDVhX7zRd68=; b=Yprr0x6jQ6sHN9CJh34v8sD9mWxtC6eBS+sf800eKr2l9siS2YKYGno3Zg9lCKZ0UXpYrw bmlxsyuw+5xrQETNszGYGGs7gOOFzJRcXYVon6wPYvRouUdir+lMlDfYbppPclkFwr4p57 TxvXpCA4lEdUBF1mrncnK/RB930nebjXLpMlTLVt6DD+51D9MzBFtn3BQmgfys94jVwYYO kL9YLLYuZdjlmoqccybJ7ADZVhwkEXnia3V2Z186FyfUlVxRI15syXTir9CSIfT6SXnN0A YK5IDrnmiGJmNuNbYaziYmMr7A8OXLjr1rBEW1k02F23ewzufT2odIb4tC9MSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761578353; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=VxXNzEnzMghs+oSWi68iZyZMITdNmtGxeDVhX7zRd68=; b=rf6HSgDf5QceVMeGqNOPcWeUMnO0EclXCmoIOy+Uve3oEpAblNJMXEBUKTCiM5viMlFLWa 0IXtpgCxWneSSQ4+xQNXave9yUi9l4poR4TaWIrcfrivE0OyjtG8N/klIDEAYmOdt85x2Y cALtAvaRTKP66iL+fyoRC7oa1RpgswlQV4HAcYyTudHDh3NAxstjiyCgRMnk4PNjCGuFJS 0UZycxrF32kKYqgWQnrCyom/RJQv8xMq1keyXS/ffOB7TsqZRFXl0kVP0r/VMEHIGIL03M siuQtzucWCTakb8ezn/bFzom6RQSrWlkKBrjYFHhVYLR/zf3KiY7PxmdiS5PCA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761578353; a=rsa-sha256; cv=none; b=mwFNFhGOMziBlsOOyC8/OP6Mylo0gyZXHgZsDzAql8MUDb4QHstKDKyCcf4OBYbzRc2YbA m3IZMNPex7Kh1mXz2i9X6cJ4WgD9o446taVz7/Rs0rzUlCHZnd1yNmciaHU3K8g+CI9nXJ Nhrj/GB2jqgfrOplv0EICVHx710G9vlYUdUO627VcSA8Zp2Ue6c9P+gjAv77LFGefqoKZU NUyQhglIAiXMLj0KFTYz1E86DLKx6dtNCzaZJ/vLFSZI+stb1l7/meoNu4HiBqcCvEA93w S+CnvWNI8f9cDPMAyIW7o6t0W7I41j9AwrEWnm9Ctm4okeYhoNA/GfP1vmguqw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from [IPV6:2601:5c0:4202:5670:4121:6c13:1c2:3421] (unknown [IPv6:2601:5c0:4202:5670:4121:6c13:1c2:3421]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id 4cwHGm501hzM5w; Mon, 27 Oct 2025 15:19:12 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: <4496e47d-cc0c-4259-adcf-e3d739f134a8@FreeBSD.org> Date: Mon, 27 Oct 2025 11:19:11 -0400 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 46f982122c0d - main - sys: Bump non-ISA PNP removal to 16.0 Content-Language: en-US To: Ed Maste , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202510252258.59PMwthG074834@gitrepo.freebsd.org> From: John Baldwin In-Reply-To: <202510252258.59PMwthG074834@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 10/25/25 18:58, Ed Maste wrote: > The branch main has been updated by emaste: > > URL: https://cgit.FreeBSD.org/src/commit/?id=46f982122c0d670ac181b748a5b8c2b221f61517 > > commit 46f982122c0d670ac181b748a5b8c2b221f61517 > Author: Ed Maste > AuthorDate: 2025-10-24 18:39:00 +0000 > Commit: Ed Maste > CommitDate: 2025-10-25 22:57:15 +0000 > > sys: Bump non-ISA PNP removal to 16.0 > > This may include atkbdc, which is not being removed in 15.0. Note that this message is not about removing drivers, but about removing entries from /boot/device.hints (GENERIC.hints) (unless we intend to remove support for hinted devices entirely from isa(4)?). Was there a user report that motivated mentioning atkbdc here, or was that just based on past memory? I'd be really surprised if ACPI was failing to enumerate the keyboard controller and its resources at this point. It is debatable if we should make disabling ACPI work out of the box (which is what most of /boot/device.hints does) vs stripping more entries ouf of device.hints on amd64 (in particular, atkbdc, psm, the uarts, atrtc, and attimer). If we remove syscons that also removes the sc0 hint. It's less clear to me if we want to ban hinted ISA devices entirely. That pretty much breaks !ACPI booting which can matter for some custom appliance systems that use home-grown firmware that may not include a full DSDT. It's fine if we require those downstreams to ship a modified device.hints. I'm less convinced it's useful to require them to also patch isa(4) to support hinted children? -- John Baldwin From nobody Mon Oct 27 15:47:49 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cwHvp0Tkdz6Dtkp; Mon, 27 Oct 2025 15:47: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cwHvp019yz3wBj; Mon, 27 Oct 2025 15:47:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761580070; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eUlc2NyVFvynhOppIXDVQe0uA0mbA1MA05zSG1tyoM8=; b=r5Rk4ERdbULGosr6+307vte5CkQN7XZmLQg1wRM8y6mqp5jvQbTMbJYiMBE/4voSp6lk4n Bz4sXlFxEz3aipZIgcYnQ5GUqXQpk7LxYgPmdvQEv4pXFb4KSfUYG1aekC6DyvOo0ZEiLl SLa3mGH7joXmDu66vcH+zm+W8AI4sfzTl5qM/a5y9erDN0APOrvgroV6JUoBsnGB4suioy 9C9Hc2AwzH68065xF7V5Ji30z7kiMa9OY9B6TOUeGuLLJX6/1b2yp8kKHiO97wnjU9NO+Z jCw/W8o+IRCfL/ywXh79Vdx0M+CvzjT2rz3URcLeeUSlCE1Zt8pkPPu8BE0bbQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761580070; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eUlc2NyVFvynhOppIXDVQe0uA0mbA1MA05zSG1tyoM8=; b=FQB67bfEUdh20U32PTW6PVog8hOqJDBX6nwfS4h66/6v4hTcEG284nYyVfs+2cFHJAZvfq s0S1E9XBWDlrbqwpEzXoSV9a0KCbEQ2knnn3xXyjFRyXKp6tEpJpjdCjhBK37qXHIXeMbA uUmDJmkjcewJOJeKr01Qi+hpJs0I39wfONg+Z5SmWALX+JGCY70Dyqk9JDQ9h6tVkRb63d y3FWq52keyV0ukGoMKBIFa+jC1EcOt8lTM8fLUgF6l03E/w7na8kKNNc803wDOc4Lo4hXW lgoVGdU5OJpOodwP7W5QpjZ6Ph92+2mzlSyMUFYG5rkeAX+i2ObiY5FLGDzQxQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761580070; a=rsa-sha256; cv=none; b=LqxYoHDqNjbSD5IdjlaKYnR+yq0wQF7Xx5Srty+pNQ+SjvlN87bnz2MquJWCBpyJaMpQof la8nuL4SZbMAnkMoi9RQEEd1qHQWG4LpOEsjPA+QWuP1CW6hjektqw04Vs6lk6M2b5K4HS TtbQrbVDe+EzQlDCZX9ncF8RSaDu09Y6GR+5S+0hxPbDLnX9EwP54ak17Tx0Yw1QC0znEe Wb8dGhaixThVIsE+VW5YE885qaax0/frWcQ2KHiJsq3s15mQJqxZP+AQ1/5Y1E918Kx7XB Z95kXrU6P91ydT4aZp2UdNFyuRiRwdnnWh80SxQl0gerU4gZA/UTNn1vByZIyA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cwHvn6Hvlz1P6r; Mon, 27 Oct 2025 15:47: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 59RFlngA096625; Mon, 27 Oct 2025 15:47:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59RFlnxW096622; Mon, 27 Oct 2025 15:47:49 GMT (envelope-from git) Date: Mon, 27 Oct 2025 15:47:49 GMT Message-Id: <202510271547.59RFlnxW096622@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jose Luis Duran Subject: git: 79e374217d69 - main - blocklist: Fix rcorder(8) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 79e374217d69a98161fc91a286dacf1f78090894 Auto-Submitted: auto-generated The branch main has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=79e374217d69a98161fc91a286dacf1f78090894 commit 79e374217d69a98161fc91a286dacf1f78090894 Author: Jose Luis Duran AuthorDate: 2025-10-27 15:46:32 +0000 Commit: Jose Luis Duran CommitDate: 2025-10-27 15:46:32 +0000 blocklist: Fix rcorder(8) The blocklist daemon depends on a packet filter in order to block. Add all supported packet filters to the REQUIRE line, not just pf, to indicate rcorder(8) that it should start after the packet filter service has started. While here, change the mode of the rc file to include the executable bit, just like the rest of the files in the rc.d source directory. Reviewed by: 0mp MFC after: 2 days Differential Revision: https://reviews.freebsd.org/D53364 --- libexec/rc/rc.d/blacklistd | 2 +- libexec/rc/rc.d/blocklistd | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libexec/rc/rc.d/blacklistd b/libexec/rc/rc.d/blacklistd index 9157e258f43f..175e3e8c56b3 100755 --- a/libexec/rc/rc.d/blacklistd +++ b/libexec/rc/rc.d/blacklistd @@ -29,7 +29,7 @@ # # PROVIDE: blacklistd -# REQUIRE: netif pf +# REQUIRE: netif ipfilter ipfw pf . /etc/rc.subr diff --git a/libexec/rc/rc.d/blocklistd b/libexec/rc/rc.d/blocklistd old mode 100644 new mode 100755 index 24cbae77fd40..f979162ec3e0 --- a/libexec/rc/rc.d/blocklistd +++ b/libexec/rc/rc.d/blocklistd @@ -29,7 +29,7 @@ # # PROVIDE: blocklistd -# REQUIRE: netif pf +# REQUIRE: netif ipfilter ipfw pf . /etc/rc.subr From nobody Mon Oct 27 15:58:08 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cwJ7m0MClz6DvPR; Mon, 27 Oct 2025 15:58:12 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta004.cacentral1.a.cloudfilter.net (omta002.cacentral1.a.cloudfilter.net [3.97.99.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cwJ7l5FCJz3wqh; Mon, 27 Oct 2025 15:58:11 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; none Received: from shw-obgw-4004b.ext.cloudfilter.net ([10.228.9.230]) by cmsmtp with ESMTPS id DPASvrHpRPzKyDPbmvn5rJ; Mon, 27 Oct 2025 15:58:10 +0000 Received: from spqr.komquats.com ([70.66.136.217]) by cmsmtp with ESMTPSA id DPblvkPnJE9qcDPbmv1PBl; Mon, 27 Oct 2025 15:58:10 +0000 X-Auth-User: cschuber X-Authority-Analysis: v=2.4 cv=fPU0HJae c=1 sm=1 tr=0 ts=68ff9692 a=h7br+8Ma+Xn9xscxy5znUg==:117 a=h7br+8Ma+Xn9xscxy5znUg==:17 a=kj9zAlcOel0A:10 a=x6icFKpwvdMA:10 a=6I5d2MoRAAAA:8 a=EkcXrb_YAAAA:8 a=YxBL1-UpAAAA:8 a=ae8wBLNxA1x_4cVDYjcA:9 a=CjuIK1q_8ugA:10 a=LK5xJRSDVpKd5WXXoEvA:22 a=Ia-lj3WSrqcvXOmTRaiG:22 Received: from slippy.cwsent.com (slippy.cwsent.com [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id E0B557F; Mon, 27 Oct 2025 08:58:08 -0700 (PDT) Received: by slippy.cwsent.com (Postfix, from userid 1000) id A4532201; Mon, 27 Oct 2025 08:58:08 -0700 (PDT) X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.8+dev Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Jose Luis Duran cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 79e374217d69 - main - blocklist: Fix rcorder(8) In-reply-to: <202510271547.59RFlnxW096622@gitrepo.freebsd.org> References: <202510271547.59RFlnxW096622@gitrepo.freebsd.org> Comments: In-reply-to Jose Luis Duran message dated "Mon, 27 Oct 2025 15:47:49 +0000." List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Mon, 27 Oct 2025 08:58:08 -0700 Message-Id: <20251027155808.A4532201@slippy.cwsent.com> X-CMAE-Envelope: MS4xfORULRCobi2muAJcHsR7XXFingDJuQFIcP52B7o6NoVXo3YztOc1FtnAqjN75jLiTQeX1hhdkUIs4hbH23z+6x7BSbooSC3FYC26YWpFajgmVn0sGlxb 6TV60q9i3esvTkP+Pw+XqCKDz7hbEv00EwEvSg4iFrw+va8YIO581XRQVfUD30KDMpvDfAargQgj0JtJy7Rw+wgZ0AAuNFRd5LxgiGIhUTcSuKv4UX8DKw7I OPE0zQagagC6h7xbcKm7sTld6V00GRBZu9CBcPqzE39H5YHk6tneBOg1ybrCANUgLMjVI4m4zwNHpfmQpjeWfG2r8el0BvRxQgGgwK6Nf3c= X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:16509, ipnet:3.96.0.0/15, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4cwJ7l5FCJz3wqh In message <202510271547.59RFlnxW096622@gitrepo.freebsd.org>, Jose Luis Duran w rites: > The branch main has been updated by jlduran: > > URL: https://cgit.FreeBSD.org/src/commit/?id=79e374217d69a98161fc91a286dacf1f > 78090894 > > commit 79e374217d69a98161fc91a286dacf1f78090894 > Author: Jose Luis Duran > AuthorDate: 2025-10-27 15:46:32 +0000 > Commit: Jose Luis Duran > CommitDate: 2025-10-27 15:46:32 +0000 > > blocklist: Fix rcorder(8) > > The blocklist daemon depends on a packet filter in order to block. > > Add all supported packet filters to the REQUIRE line, not just pf, to > indicate rcorder(8) that it should start after the packet filter service > has started. > > While here, change the mode of the rc file to include the executable > bit, just like the rest of the files in the rc.d source directory. > > Reviewed by: 0mp > MFC after: 2 days > Differential Revision: https://reviews.freebsd.org/D53364 > --- > libexec/rc/rc.d/blacklistd | 2 +- > libexec/rc/rc.d/blocklistd | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/libexec/rc/rc.d/blacklistd b/libexec/rc/rc.d/blacklistd > index 9157e258f43f..175e3e8c56b3 100755 > --- a/libexec/rc/rc.d/blacklistd > +++ b/libexec/rc/rc.d/blacklistd > @@ -29,7 +29,7 @@ > # > > # PROVIDE: blacklistd > -# REQUIRE: netif pf > +# REQUIRE: netif ipfilter ipfw pf This means all three, ipfilter AND ipfw AND pf, must be enabled and started. What if one uses only one of the three? > > . /etc/rc.subr > > diff --git a/libexec/rc/rc.d/blocklistd b/libexec/rc/rc.d/blocklistd > old mode 100644 > new mode 100755 > index 24cbae77fd40..f979162ec3e0 > --- a/libexec/rc/rc.d/blocklistd > +++ b/libexec/rc/rc.d/blocklistd > @@ -29,7 +29,7 @@ > # > > # PROVIDE: blocklistd > -# REQUIRE: netif pf > +# REQUIRE: netif ipfilter ipfw pf Ditto. > > . /etc/rc.subr > > -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e**(i*pi)+1=0 From nobody Mon Oct 27 16:04:16 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cwJH1476Hz6DwKn for ; Mon, 27 Oct 2025 16:04:29 +0000 (UTC) (envelope-from jlduran@gmail.com) Received: from mail-qk1-f177.google.com (mail-qk1-f177.google.com [209.85.222.177]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cwJH12DDcz3xd5 for ; Mon, 27 Oct 2025 16:04:29 +0000 (UTC) (envelope-from jlduran@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-qk1-f177.google.com with SMTP id af79cd13be357-89f888a0575so61911385a.1 for ; Mon, 27 Oct 2025 09:04:29 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761581068; x=1762185868; h=content-transfer-encoding:cc:to:subject:message-id:date:from :reply-to:in-reply-to:references:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=KDzBbXKSsbQwwuJBb8DKmInuLmoUf3/HmablsfyDsgs=; b=PLVJXRUmryU5AanoJVW7l9QsRlCnUpu8QBO4qY9z+aB61fUbNekwyobD6l3Gw/Xa82 PCmzWMRSxTZrRqBbJge0M9Kdk7Arur5+qfgFksx5KWedqUCyDnG7qY2vcm2LxaO9muTa uymUurdoZFh8aRBr7VGuz8z1oubGqvWUVNooGvs/0eT5jNoeUFPzBmlRJA8Ewdkuvjj4 LART8DzMrkeXxYq4a4PvQY8KfjUCAy6S23a16IupufkJ44y50VC+/ZD/TwRqo8wmgkey YtCDqxRn4o+saVloOlFbkBbHw/WGW1xf/GfXLE9KhtHs2x8ybQ+s76zkRel0C4tzuTIY gczQ== X-Forwarded-Encrypted: i=1; AJvYcCXd7haindl32SmFx4Ki20fgUPw1L0zHSmmczbmxuazaQ7Rnk2wme2PU0SCTm3TtmOhzVxDS99F0XunrNDZPRPJIJtCzuA==@freebsd.org X-Gm-Message-State: AOJu0YwNkdy0H0Ujt5WZa8qCwC1kcTPXaa8GDjVBN/QdZakRz8MmW5eJ 1ZhTS6ldI0bRBR/EOLe5k3wu7/fQmb07dkcSn9caj4V76SdaPZvIrp8Kecx2vDMrkGY= X-Gm-Gg: ASbGnct5VHgFngAv/CA5cELR0SXdlVYo9DkeiHtQxi5si4Mx3+CC0ow3NWXm6gailLH wp/zrrmluOJdQBqtLM5WoO+pI+mJnUn+5FAN4KxX0zeek7q/ZoJm0zf878unXpG9yOxX8wz3xpM HaxuNMC0c2Biy7aCSsJBw1jnCYBxC+AQSuZrr5v/9lCGV+a2Qoy/HRie1iEDiq3hEzbcmbZl7gV ITmImeY5x6VKwM6iq9ae5i3cEp1k+h7lYfTl0ca/gB0aO0PeHsTokxjS1S3xIunffK0aFwawSsT 4SPd54brXlFO7p2iSmLwgOJMiLjXKX2202K8sDLGhIIuWdEtIAVjORpAQfUbk7SV4dHiMJxxVlp iU9SxYg2vBMdcOGuoc3uF9xlJeExKquqj38SZQhdKjyfLt55bN7D5tzD2MuBHmlv51GmxXusAba lhpEJmued8A/xzmN/tKWhL2exIvC3mfdWY2R2aUSKIwO22Nq+wg8M= X-Google-Smtp-Source: AGHT+IFBVM3ulfG3eLqu054vPT6T0trlRPL4zKO4JCUrjjj39VgRF/HABvd/ptGX3MrwZx1P+2gPAw== X-Received: by 2002:a05:620a:2908:b0:8a2:c42f:9951 with SMTP id af79cd13be357-8a6f4f8a0damr33574485a.6.1761581068231; Mon, 27 Oct 2025 09:04:28 -0700 (PDT) Received: from mail-qt1-f172.google.com (mail-qt1-f172.google.com. [209.85.160.172]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-4eba38491e3sm53389951cf.27.2025.10.27.09.04.27 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 27 Oct 2025 09:04:28 -0700 (PDT) Received: by mail-qt1-f172.google.com with SMTP id d75a77b69052e-4ecfe642fe4so761591cf.0 for ; Mon, 27 Oct 2025 09:04:27 -0700 (PDT) X-Forwarded-Encrypted: i=1; AJvYcCW5zh+tBEC37iJ/fsSvK9b96g/pRNuCLnNhc7rQ5viO6s4S/bqXawx1H5BNBjseXw55DB3KOzo4Z2I6yl7KfChdN5gw7w==@freebsd.org X-Received: by 2002:a05:622a:255:b0:4d0:3985:e425 with SMTP id d75a77b69052e-4ed074c8e00mr4568781cf.7.1761581067677; Mon, 27 Oct 2025 09:04:27 -0700 (PDT) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 References: <202510271547.59RFlnxW096622@gitrepo.freebsd.org> <20251027155808.A4532201@slippy.cwsent.com> In-Reply-To: <20251027155808.A4532201@slippy.cwsent.com> Reply-To: jlduran@freebsd.org From: Jose Luis Duran Date: Mon, 27 Oct 2025 13:04:16 -0300 X-Gmail-Original-Message-ID: X-Gm-Features: AWmQ_bngSGx7HVmvD7hSuyek4edz0BXVjpJ6w90Zk1SnmCTyYb66LGEhIPEiaoo Message-ID: Subject: Re: git: 79e374217d69 - main - blocklist: Fix rcorder(8) To: Cy Schubert Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4cwJH12DDcz3xd5 On Mon, Oct 27, 2025 at 12:58=E2=80=AFPM Cy Schubert wrote: > > In message <202510271547.59RFlnxW096622@gitrepo.freebsd.org>, Jose Luis > Duran w > rites: > > The branch main has been updated by jlduran: > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=3D79e374217d69a98161fc91a2= 86dacf1f > > 78090894 > > > > commit 79e374217d69a98161fc91a286dacf1f78090894 > > Author: Jose Luis Duran > > AuthorDate: 2025-10-27 15:46:32 +0000 > > Commit: Jose Luis Duran > > CommitDate: 2025-10-27 15:46:32 +0000 > > > > blocklist: Fix rcorder(8) > > > > The blocklist daemon depends on a packet filter in order to block. > > > > Add all supported packet filters to the REQUIRE line, not just pf, = to > > indicate rcorder(8) that it should start after the packet filter se= rvice > > has started. > > > > While here, change the mode of the rc file to include the executabl= e > > bit, just like the rest of the files in the rc.d source directory. > > > > Reviewed by: 0mp > > MFC after: 2 days > > Differential Revision: https://reviews.freebsd.org/D53364 > > --- > > libexec/rc/rc.d/blacklistd | 2 +- > > libexec/rc/rc.d/blocklistd | 2 +- > > 2 files changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/libexec/rc/rc.d/blacklistd b/libexec/rc/rc.d/blacklistd > > index 9157e258f43f..175e3e8c56b3 100755 > > --- a/libexec/rc/rc.d/blacklistd > > +++ b/libexec/rc/rc.d/blacklistd > > @@ -29,7 +29,7 @@ > > # > > > > # PROVIDE: blacklistd > > -# REQUIRE: netif pf > > +# REQUIRE: netif ipfilter ipfw pf > > This means all three, ipfilter AND ipfw AND pf, must be enabled and > started. What if one uses only one of the three? No, per rcorder(8) BUGS section: The REQUIRE keyword is misleading: It does not describe which daemons have to be running before a script will be started. It describes which scripts must be placed before it in the dependency order= ing. 0mp@ even suggests creating a FIREWALL(S) script to represent that an rc script should start after the firewall (any one or many) has started. I agree, but I cannot immediately submit a patch for it. > > > > . /etc/rc.subr > > > > diff --git a/libexec/rc/rc.d/blocklistd b/libexec/rc/rc.d/blocklistd > > old mode 100644 > > new mode 100755 > > index 24cbae77fd40..f979162ec3e0 > > --- a/libexec/rc/rc.d/blocklistd > > +++ b/libexec/rc/rc.d/blocklistd > > @@ -29,7 +29,7 @@ > > # > > > > # PROVIDE: blocklistd > > -# REQUIRE: netif pf > > +# REQUIRE: netif ipfilter ipfw pf > > Ditto. > > > > > . /etc/rc.subr > > > > > > > -- > Cheers, > Cy Schubert > FreeBSD UNIX: Web: https://FreeBSD.org > NTP: Web: https://nwtime.org > > e**(i*pi)+1=3D0 > > --=20 Jose Luis Duran From nobody Mon Oct 27 16:13:17 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cwJT943Sbz6Dy81; Mon, 27 Oct 2025 16:13: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cwJT92q8fz44c3; Mon, 27 Oct 2025 16:13:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761581597; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/2nliahQxaH50K2ByTZmJwN2C3lJxcF5XMgfTwrBUgE=; b=E/S2L8VwQqMfIVhMgIdU/CX4lmqL/Y/T4EzI05fDqAPUL6/di4u+fSh1VlRsAVgWEYWC6O e/rY5Jc0PJWWzA84N2tcRPt/UakVGsiTx/40fT1yf7dAb5FCCoFtprSY99prDbtHdWr8L1 os5j17vvc3WhHq3RkXuLshBCxlx0AaIIAj2ZCkOJUxiGWBWsLg0by+3BLG/eb+8ed+d9TU j3+QlHl1MiyNv+kRjU6IEn9vH1AMhm92w9cBR6MWKiTET12vvZNmxirlRjv58CiSSZsFYV VUBX7TC8unoX93cSG054mCc6zl+2sLsYi2wOFZLUuCtEAHqT8SlPvp+Afha3aA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761581597; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/2nliahQxaH50K2ByTZmJwN2C3lJxcF5XMgfTwrBUgE=; b=cwx9vtkUfGcr7G+a0QSKhimtVsRyHm9kOtfHxc+LkjPbIYvI7PZX8t1xAc+T+bEse1kso5 KfLheJT8hDucAYgmlfDsjxQ8UhlgsmS+h/FcHgKYDQYG1M8aj2B8wWSmQcsXfn2Ii10QIc n7q8n4QqvqtbxJOPOdvBEBsVeY4byp1mF/yh8PorryRPCpEkDZB77B4+p7dC7WSIvmgry7 ZZoReTI2RqZ1zAX3LybtOPC48ItzZrGRkEOjbXQJ0eU0ah6eERKkNwlLU+gDMl6wZdYld6 zCBYCpV8o0QDX3zYzMG/X2IU4IDKS3X7K8IWuuWC1X/kAIk1AgPGgJtxBUV79g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761581597; a=rsa-sha256; cv=none; b=Os8Nah94HB1NlibeoycG1cTL2qN57KooxRxMeXw/SRHkdeoaXL+2PmxWSapqAAkvusgfnM H+PdxW5uxRt578HBM9DUYvL6+PuQ7dMAVK3m97DrtJKDZn8d3MQOXjct+iCN+tT7B8KzhY wpzmvwj+u9RBQOAPFmuimarSjeU6vQnEK9NZkuFtqxqbju6zCBHYHKESvECqvVYV142Vc4 miUUUyvt9R1cPO5TXWk35hFqXlpnxdygK+qqCm0jAIptWIHD25vCuKiIFWcHv6cJRk5c3G MPzFFudhxxNOMNvUd1v3wmtaL5k9tgJo79fxRWhy5XXQT26eEXFY8eFp/4E7Dw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cwJT92M5Tz1Q1r; Mon, 27 Oct 2025 16:13: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 59RGDH2n060177; Mon, 27 Oct 2025 16:13:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59RGDHFh060174; Mon, 27 Oct 2025 16:13:17 GMT (envelope-from git) Date: Mon, 27 Oct 2025 16:13:17 GMT Message-Id: <202510271613.59RGDHFh060174@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 0e2e0fb955ad - main - ipfw: Remove more unused IP_FW_* cases List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0e2e0fb955adf15a217949bc4cc337d53d2c7259 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=0e2e0fb955adf15a217949bc4cc337d53d2c7259 commit 0e2e0fb955adf15a217949bc4cc337d53d2c7259 Author: Ed Maste AuthorDate: 2025-10-25 22:32:05 +0000 Commit: Ed Maste CommitDate: 2025-10-27 16:12:37 +0000 ipfw: Remove more unused IP_FW_* cases All of the do_cmd() calls are in dummynet.c and specify the socket option at compile time; none of these removed cases are used in ipfw after the v3 work. Reviewed by: markj Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D53378 --- sbin/ipfw/ipfw2.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/sbin/ipfw/ipfw2.c b/sbin/ipfw/ipfw2.c index a2b3e121e5df..27ccaea2c78f 100644 --- a/sbin/ipfw/ipfw2.c +++ b/sbin/ipfw/ipfw2.c @@ -648,11 +648,7 @@ do_cmd(int optname, void *optval, uintptr_t optlen) if (ipfw_socket < 0) err(EX_UNAVAILABLE, "socket"); - if (optname == IP_FW_GET || - optname == IP_FW_ADD || optname == IP_FW3 || - optname == IP_FW_NAT_GET_CONFIG || - optname < 0 || - optname == IP_FW_NAT_GET_LOG) { + if (optname == IP_FW3 || optname < 0) { if (optname < 0) optname = -optname; i = getsockopt(ipfw_socket, IPPROTO_IP, optname, optval, From nobody Mon Oct 27 16:17:55 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cwJZb16VLz6F0GY; Mon, 27 Oct 2025 16:17:59 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta003.cacentral1.a.cloudfilter.net (omta001.cacentral1.a.cloudfilter.net [3.97.99.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cwJZZ1Vbjz4JK1; Mon, 27 Oct 2025 16:17:58 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; none Received: from shw-obgw-4004b.ext.cloudfilter.net ([10.228.9.230]) by cmsmtp with ESMTPS id DJzJv8eHpAPFJDPuuvp569; Mon, 27 Oct 2025 16:17:56 +0000 Received: from spqr.komquats.com ([70.66.136.217]) by cmsmtp with ESMTPSA id DPutvkUIGE9qcDPuuv1S5p; Mon, 27 Oct 2025 16:17:56 +0000 X-Auth-User: cschuber X-Authority-Analysis: v=2.4 cv=fPU0HJae c=1 sm=1 tr=0 ts=68ff9b34 a=h7br+8Ma+Xn9xscxy5znUg==:117 a=h7br+8Ma+Xn9xscxy5znUg==:17 a=kj9zAlcOel0A:10 a=x6icFKpwvdMA:10 a=6I5d2MoRAAAA:8 a=EkcXrb_YAAAA:8 a=YxBL1-UpAAAA:8 a=A-PQIV8mPBIpMYVP9AcA:9 a=CjuIK1q_8ugA:10 a=LK5xJRSDVpKd5WXXoEvA:22 a=Ia-lj3WSrqcvXOmTRaiG:22 Received: from slippy.cwsent.com (slippy.cwsent.com [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id 1DD26474; Mon, 27 Oct 2025 09:17:55 -0700 (PDT) Received: by slippy.cwsent.com (Postfix, from userid 1000) id 0D67A40B; Mon, 27 Oct 2025 09:17:55 -0700 (PDT) X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.8+dev Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: jlduran@freebsd.org cc: Cy Schubert , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 79e374217d69 - main - blocklist: Fix rcorder(8) In-reply-to: References: <202510271547.59RFlnxW096622@gitrepo.freebsd.org> <20251027155808.A4532201@slippy.cwsent.com> Comments: In-reply-to Jose Luis Duran message dated "Mon, 27 Oct 2025 13:04:16 -0300." List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Mon, 27 Oct 2025 09:17:55 -0700 Message-Id: <20251027161755.0D67A40B@slippy.cwsent.com> X-CMAE-Envelope: MS4xfLtP/WrunG3iadahmpykhYIrlWGOunY4DlqLTPAw3PfVBKCIgMVhuTBuTdmToh76jYgnkLJV4zD2A0D5ruMurncyKaw0+sRI4gP/MMsX5Gv46FJT+sPp vKwObe++jT9kZGT1FV13zwzqqdsgAjoUJezvEfLcq1X2WilC0peH7RzI1xGUf2RbZXdDEvHQOUqTAVL3AMNs+6M5sMNSJXi9jPnImHnbrYoQQVROQTPDsspa Cy8AneBOnYgSCHMlzq7YNjhmxRNX4j1hLvytB7aJGbYT9M6E77LjTSEoWoh6THCjUhV1teL25wwr6EyZnGAsWD52FDBpRoBrMJIG2Bmjb2I= X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:16509, ipnet:3.96.0.0/15, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4cwJZZ1Vbjz4JK1 In message , Jose Luis Duran writes: > On Mon, Oct 27, 2025 at 12:58=E2=80=AFPM Cy Schubert .com> wrote: > > > > In message <202510271547.59RFlnxW096622@gitrepo.freebsd.org>, Jose Luis > > Duran w > > rites: > > > The branch main has been updated by jlduran: > > > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=3D79e374217d69a98161fc91a2= > 86dacf1f > > > 78090894 > > > > > > commit 79e374217d69a98161fc91a286dacf1f78090894 > > > Author: Jose Luis Duran > > > AuthorDate: 2025-10-27 15:46:32 +0000 > > > Commit: Jose Luis Duran > > > CommitDate: 2025-10-27 15:46:32 +0000 > > > > > > blocklist: Fix rcorder(8) > > > > > > The blocklist daemon depends on a packet filter in order to block. > > > > > > Add all supported packet filters to the REQUIRE line, not just pf, = > to > > > indicate rcorder(8) that it should start after the packet filter se= > rvice > > > has started. > > > > > > While here, change the mode of the rc file to include the executabl= > e > > > bit, just like the rest of the files in the rc.d source directory. > > > > > > Reviewed by: 0mp > > > MFC after: 2 days > > > Differential Revision: https://reviews.freebsd.org/D53364 > > > --- > > > libexec/rc/rc.d/blacklistd | 2 +- > > > libexec/rc/rc.d/blocklistd | 2 +- > > > 2 files changed, 2 insertions(+), 2 deletions(-) > > > > > > diff --git a/libexec/rc/rc.d/blacklistd b/libexec/rc/rc.d/blacklistd > > > index 9157e258f43f..175e3e8c56b3 100755 > > > --- a/libexec/rc/rc.d/blacklistd > > > +++ b/libexec/rc/rc.d/blacklistd > > > @@ -29,7 +29,7 @@ > > > # > > > > > > # PROVIDE: blacklistd > > > -# REQUIRE: netif pf > > > +# REQUIRE: netif ipfilter ipfw pf > > > > This means all three, ipfilter AND ipfw AND pf, must be enabled and > > started. What if one uses only one of the three? > > No, per rcorder(8) BUGS section: > > The REQUIRE keyword is misleading: > It does not describe which daemons have to be running before a script > will be started. > It describes which scripts must be placed before it in the dependency order= > ing. > > 0mp@ even suggests creating a FIREWALL(S) script to represent that an > rc script should start after the firewall (any one or many) has > started. I agree, but I cannot immediately submit a patch for it. I stand corrected. Thanks. > > > > > > > . /etc/rc.subr > > > > > > diff --git a/libexec/rc/rc.d/blocklistd b/libexec/rc/rc.d/blocklistd > > > old mode 100644 > > > new mode 100755 > > > index 24cbae77fd40..f979162ec3e0 > > > --- a/libexec/rc/rc.d/blocklistd > > > +++ b/libexec/rc/rc.d/blocklistd > > > @@ -29,7 +29,7 @@ > > > # > > > > > > # PROVIDE: blocklistd > > > -# REQUIRE: netif pf > > > +# REQUIRE: netif ipfilter ipfw pf > > > > Ditto. > > > > > > > > . /etc/rc.subr > > > > > > > > > > > > -- > > Cheers, > > Cy Schubert > > FreeBSD UNIX: Web: https://FreeBSD.org > > NTP: Web: https://nwtime.org > > > > e**(i*pi)+1=3D0 > > > > > > > --=20 > Jose Luis Duran -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e**(i*pi)+1=0 From nobody Mon Oct 27 16:19:16 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cwJcM3ckcz6F0xj for ; Mon, 27 Oct 2025 16:19:31 +0000 (UTC) (envelope-from jlduran@gmail.com) Received: from mail-qk1-f181.google.com (mail-qk1-f181.google.com [209.85.222.181]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cwJcL2ZHrz4MLR for ; Mon, 27 Oct 2025 16:19:30 +0000 (UTC) (envelope-from jlduran@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-qk1-f181.google.com with SMTP id af79cd13be357-8a3c0086c41so29051085a.1 for ; Mon, 27 Oct 2025 09:19:30 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761581969; x=1762186769; h=content-transfer-encoding:cc:to:subject:message-id:date:from :reply-to:in-reply-to:references:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=rYL/wyGYcPvp4j/Z/tLdDYawtPQ1slIuvDM9Hk8mueU=; b=DQA0foisoziMtcChasjHYYSDFCVADZYfnuWHgsRhu3YRGzNNJraEekmvByOLi5w3yR Xn4GRBanlTSHUojaMS/21XXgEhSI0EmqOu/DsM/BgbJSGwD9UV4QjJ/b/k+gSo8Bt6Y/ MAGhiI7SvbP6B9lHP8r1duyuRswrOcs5R9lxW6C56v4yBPcc6JoLXnSxk/tjm5E7WZ9H bW0kYSHE3OanxQEWBNdy3mFjZR4Rt2obzzTYiTeqNnL/5GBuVUqRC5/i+ie4f4XbHBgI qsoRoPHHDQcInAVF+bW2Z8dMiSAcQ9M1Y6e8qe2prANQbFWnw5jDEEN1A0y1vndSgaMb yQvw== X-Forwarded-Encrypted: i=1; AJvYcCUI2ICCW7GztcQMru7AOBBTwdRsqh5BWCrqKcRZYcKaqozmoHrhioo41taxaXCZSIfWdHuq7HLRVjhexTf98UEHBRj+Yw==@freebsd.org X-Gm-Message-State: AOJu0YztRJFx1kZkJMKz4LEdPag1tXHaVlxoJP7E72mVezi+pnNR5MUl WWoFekDZyBRfScXSyp0ndIstcC/Kjc7YRqdZU2RiiF5UWAHBoMGTbeRiQkBxeKzk4nY= X-Gm-Gg: ASbGncssK6+nHr/j17MnJtLry2/oNPYcTTTn20XcPa9QREPKuI7+SNx4GRDw7h3sju+ +Gw6ZEb94ec82N2/WqCH19ZYbvtPoWt2mEx3N938ZgvolfKwPh/fzb4phNH1aWNLyiVDZRUJolk tfH0LcOX9PCAuuvybbW+ZM8pm6Pyh09+7My2QVWDzqA1AarZCIcp6fP8ZecR3Dt5hfFQ23++OyW /Bm1CWu6YNcj0Z9wKgAxtDZto67MDtFr1olyBT4hy3gEiE0bsWYk7px3aeeYBd+i0+vURe0FQA2 7FRTWqjZoA+wI8w21dXImmGm0yUnMokmHMGDHzJAAJWDf8kHPB8NE/Bi4F5L90l4dvTakAUQLXT ZrJGEfBY5DRqf9jxpXDFaDCW/sJiS6YSHixX82YdkkKsiJHa858VeZXYra7VTROh/E9t0w4QmKx 6IeQXSQWYpi42TAUyDL8hLNuSelFua7On2sxwiJCc0 X-Google-Smtp-Source: AGHT+IHBds+X0/ki8ZPOE7nxGkaRsOEceMzeuty2twx+7SILTFYmptt0VFZCyVZl03XZWT+5nD+Zkg== X-Received: by 2002:a05:620a:31a4:b0:89f:7feb:fd6d with SMTP id af79cd13be357-8a6f63c55dcmr38179485a.6.1761581968803; Mon, 27 Oct 2025 09:19:28 -0700 (PDT) Received: from mail-qt1-f169.google.com (mail-qt1-f169.google.com. [209.85.160.169]) by smtp.gmail.com with ESMTPSA id af79cd13be357-89f25896d52sm627844785a.38.2025.10.27.09.19.28 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 27 Oct 2025 09:19:28 -0700 (PDT) Received: by mail-qt1-f169.google.com with SMTP id d75a77b69052e-4eba82bc42cso1190671cf.1 for ; Mon, 27 Oct 2025 09:19:28 -0700 (PDT) X-Forwarded-Encrypted: i=1; AJvYcCXHUupz6FYxHn1UKB4z7+rD8eILq9OisuLFxW5h0FJeUd+ryDgdwXR4PCjN/YYtfdiq882PNWhEnskKCZwLuEso8z2aFA==@freebsd.org X-Received: by 2002:ac8:7c43:0:b0:4e0:b24a:6577 with SMTP id d75a77b69052e-4ed0745ac40mr5912671cf.2.1761581968063; Mon, 27 Oct 2025 09:19:28 -0700 (PDT) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 References: <202510271547.59RFlnxW096622@gitrepo.freebsd.org> <20251027155808.A4532201@slippy.cwsent.com> <20251027161755.0D67A40B@slippy.cwsent.com> In-Reply-To: <20251027161755.0D67A40B@slippy.cwsent.com> Reply-To: jlduran@freebsd.org From: Jose Luis Duran Date: Mon, 27 Oct 2025 13:19:16 -0300 X-Gmail-Original-Message-ID: X-Gm-Features: AWmQ_bndW8kFlEDVHbSfRyd3orHaIwTj9C7Ksp24nx6Uh7E4HTDC9I51RfTFdvI Message-ID: Subject: Re: git: 79e374217d69 - main - blocklist: Fix rcorder(8) To: Cy Schubert Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4cwJcL2ZHrz4MLR On Mon, Oct 27, 2025 at 1:18=E2=80=AFPM Cy Schubert wrote: > > In message om> > , Jose Luis Duran writes: > > On Mon, Oct 27, 2025 at 12:58=3DE2=3D80=3DAFPM Cy Schubert > .com> wrote: > > > > > > In message <202510271547.59RFlnxW096622@gitrepo.freebsd.org>, Jose Lu= is > > > Duran w > > > rites: > > > > The branch main has been updated by jlduran: > > > > > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=3D3D79e374217d69a98161= fc91a2=3D > > 86dacf1f > > > > 78090894 > > > > > > > > commit 79e374217d69a98161fc91a286dacf1f78090894 > > > > Author: Jose Luis Duran > > > > AuthorDate: 2025-10-27 15:46:32 +0000 > > > > Commit: Jose Luis Duran > > > > CommitDate: 2025-10-27 15:46:32 +0000 > > > > > > > > blocklist: Fix rcorder(8) > > > > > > > > The blocklist daemon depends on a packet filter in order to blo= ck. > > > > > > > > Add all supported packet filters to the REQUIRE line, not just = pf, =3D > > to > > > > indicate rcorder(8) that it should start after the packet filte= r se=3D > > rvice > > > > has started. > > > > > > > > While here, change the mode of the rc file to include the execu= tabl=3D > > e > > > > bit, just like the rest of the files in the rc.d source directo= ry. > > > > > > > > Reviewed by: 0mp > > > > MFC after: 2 days > > > > Differential Revision: https://reviews.freebsd.org/D53364 > > > > --- > > > > libexec/rc/rc.d/blacklistd | 2 +- > > > > libexec/rc/rc.d/blocklistd | 2 +- > > > > 2 files changed, 2 insertions(+), 2 deletions(-) > > > > > > > > diff --git a/libexec/rc/rc.d/blacklistd b/libexec/rc/rc.d/blacklist= d > > > > index 9157e258f43f..175e3e8c56b3 100755 > > > > --- a/libexec/rc/rc.d/blacklistd > > > > +++ b/libexec/rc/rc.d/blacklistd > > > > @@ -29,7 +29,7 @@ > > > > # > > > > > > > > # PROVIDE: blacklistd > > > > -# REQUIRE: netif pf > > > > +# REQUIRE: netif ipfilter ipfw pf > > > > > > This means all three, ipfilter AND ipfw AND pf, must be enabled and > > > started. What if one uses only one of the three? > > > > No, per rcorder(8) BUGS section: > > > > The REQUIRE keyword is misleading: > > It does not describe which daemons have to be running before a script > > will be started. > > It describes which scripts must be placed before it in the dependency o= rder=3D > > ing. > > > > 0mp@ even suggests creating a FIREWALL(S) script to represent that an > > rc script should start after the firewall (any one or many) has > > started. I agree, but I cannot immediately submit a patch for it. > > I stand corrected. Thanks. No problem! It is indeed misleading. > > > > > > > > > > > . /etc/rc.subr > > > > > > > > diff --git a/libexec/rc/rc.d/blocklistd b/libexec/rc/rc.d/blocklist= d > > > > old mode 100644 > > > > new mode 100755 > > > > index 24cbae77fd40..f979162ec3e0 > > > > --- a/libexec/rc/rc.d/blocklistd > > > > +++ b/libexec/rc/rc.d/blocklistd > > > > @@ -29,7 +29,7 @@ > > > > # > > > > > > > > # PROVIDE: blocklistd > > > > -# REQUIRE: netif pf > > > > +# REQUIRE: netif ipfilter ipfw pf > > > > > > Ditto. > > > > > > > > > > > . /etc/rc.subr > > > > > > > > > > > > > > > > > -- > > > Cheers, > > > Cy Schubert > > > FreeBSD UNIX: Web: https://FreeBSD.org > > > NTP: Web: https://nwtime.org > > > > > > e**(i*pi)+1=3D3D0 > > > > > > > > > > > > --=3D20 > > Jose Luis Duran > > > > -- > Cheers, > Cy Schubert > FreeBSD UNIX: Web: https://FreeBSD.org > NTP: Web: https://nwtime.org > > e**(i*pi)+1=3D0 > > --=20 Jose Luis Duran From nobody Mon Oct 27 16:39:07 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cwK2z1mh7z6F3gC; Mon, 27 Oct 2025 16:39:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cwK2z1FFGz3qXb; Mon, 27 Oct 2025 16:39:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761583147; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2KxkOUNJiQFzPTem335lSpWSGuwTNCWcRyk276c6mVc=; b=MZN0PX/n7tXhGTkkF2DGoCOMX/ExzJBkk2OATZJnQgBUXP/tA4dhcwpwnuzkylXjQzgcVK SGwezM3LdfCXoDbRJsDOUVFxjVRgz0mDznaHkM64SDGXNwYFDis5h1tQ8wk1yAVmmbGAkO cgp3rpnc/9B3GzUyrpaBEi7qDd4j5k0XCReBnyvqYCHlkwrLXLYKYzxolU7xeWqrRQ7Y1h V77QWVApaK0mEyE/UFQMrZByP4XMa3YaCa4S1WFuoea++3wL2bCsOWckgmWYYzZHQ/AhRS yUpq05yxmZIt6+rtyGUHTDU0yea1AfkLTjZ+jbj8PfAI6gY2FTzvMOjsWl20MQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761583147; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2KxkOUNJiQFzPTem335lSpWSGuwTNCWcRyk276c6mVc=; b=Qp1f1n+mCi9Dkh1DQ5kem2/gPnAY3l/6jRQjmH60RSHY5GW9YNUNyEPljEesxrnMbc87TC ZAddk0wkOsf5CNvV76SqBkDcref9b8+qPLRd+eVh/YJh3z4qPj+X8wVXTNZLqklY2ZzdtI xcrLBu2zQ/kTBJ8QXHh5mzFtEDCUi9kP0lhvdDuLeKiJy93+87MA2agFAs7WpGTnjYswsz ZO5CWkVyFQQXPMyM49WHM8OuXYJ2of70ddB4hhCpLWI/PDeRH7ZHI4EOiJe38iGILRT1ju ify8k+lt9vOQtDJao7Xm3B4YXwRszfFU8lcgJClLueBw/5Tkuz9j6zdljy9Hrw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761583147; a=rsa-sha256; cv=none; b=DZ51B2GteW8OH55O2uFTs568YYBR1ZCwTCgaLPkf49Fs1M7CQV21yQvuS4K5l08iY2eATt 2TJEjEI6cZz+9eLMc/dzhUavUfJBy2i63yGqOzK57N3fX8ltYk8P4I/kkAp8W0DMFKfq0b n3/aeznf6KStXVQ09UJ8YaMorHIf/Fv6PAVwopkPARiICSjEv4WKSQr2MjbTMhKKyDbREn zRJk8pZo+BGgcfg7aXrJnE5HqJZEDNLDPFs7ekMsx6Vw3QpBE+9+F5nlzI1JAXuzWakLNs 7QevxxzQZDoDraXjo7uJRdtyuLkzqf6MikCjIelC3tRJBmbj6s95A8qH+FVYNw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cwK2z0pYGz1QNj; Mon, 27 Oct 2025 16:39:07 +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 59RGd7S8019599; Mon, 27 Oct 2025 16:39:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59RGd7hk019596; Mon, 27 Oct 2025 16:39:07 GMT (envelope-from git) Date: Mon, 27 Oct 2025 16:39:07 GMT Message-Id: <202510271639.59RGd7hk019596@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 32919a34f17a - main - net: Validate interface group names in ioctl handlers List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 32919a34f17ac1af99dec7376f22a8393c251602 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=32919a34f17ac1af99dec7376f22a8393c251602 commit 32919a34f17ac1af99dec7376f22a8393c251602 Author: Mark Johnston AuthorDate: 2025-10-27 16:27:13 +0000 Commit: Mark Johnston CommitDate: 2025-10-27 16:27:13 +0000 net: Validate interface group names in ioctl handlers The handlers were not checking that the group names are nul-terminated. Add checks for this. Reported by: Ilja Van Sprundel Reviewed by: zlei MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D53344 --- sys/net/if.c | 34 ++++++++++++++++++++++++++-------- 1 file changed, 26 insertions(+), 8 deletions(-) diff --git a/sys/net/if.c b/sys/net/if.c index b6a798aa0fab..cb9c47c14c32 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -2842,15 +2842,20 @@ ifhwioctl(u_long cmd, struct ifnet *ifp, caddr_t data, struct thread *td) break; case SIOCAIFGROUP: + { + const char *groupname; + error = priv_check(td, PRIV_NET_ADDIFGROUP); if (error) return (error); - error = if_addgroup(ifp, - ((struct ifgroupreq *)data)->ifgr_group); + groupname = ((struct ifgroupreq *)data)->ifgr_group; + if (strnlen(groupname, IFNAMSIZ) == IFNAMSIZ) + return (EINVAL); + error = if_addgroup(ifp, groupname); if (error != 0) return (error); break; - + } case SIOCGIFGROUP: { struct epoch_tracker et; @@ -2862,15 +2867,20 @@ ifhwioctl(u_long cmd, struct ifnet *ifp, caddr_t data, struct thread *td) } case SIOCDIFGROUP: + { + const char *groupname; + error = priv_check(td, PRIV_NET_DELIFGROUP); if (error) return (error); - error = if_delgroup(ifp, - ((struct ifgroupreq *)data)->ifgr_group); + groupname = ((struct ifgroupreq *)data)->ifgr_group; + if (strnlen(groupname, IFNAMSIZ) == IFNAMSIZ) + return (EINVAL); + error = if_delgroup(ifp, groupname); if (error != 0) return (error); break; - + } default: error = ENOIOCTL; break; @@ -3014,9 +3024,17 @@ ifioctl(struct socket *so, u_long cmd, caddr_t data, struct thread *td) goto out_noref; case SIOCGIFGMEMB: - error = if_getgroupmembers((struct ifgroupreq *)data); - goto out_noref; + { + struct ifgroupreq *req; + req = (struct ifgroupreq *)data; + if (strnlen(req->ifgr_name, IFNAMSIZ) == IFNAMSIZ) { + error = EINVAL; + goto out_noref; + } + error = if_getgroupmembers(req); + goto out_noref; + } #if defined(INET) || defined(INET6) case SIOCSVH: case SIOCGVH: From nobody Mon Oct 27 16:39:08 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cwK303BWpz6F3pM; Mon, 27 Oct 2025 16:39:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cwK302MG7z3qXc; Mon, 27 Oct 2025 16:39:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761583148; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=v/1KQNxAeoRr+cpI3UHyapKkIms38SrXV/Xo13KOx40=; b=YaYEE806lW+TySLrXadSNRe0KF/QH6J2Gax5ls2lMNOu6N9uVk/toJWfPvnJ8c4rGdWMCr rXqLWMaH1lD+TDCDy8O+irUjJ1Guz9CORAG5+mI3zWN97ZV+lkUKPuCtai+KWgOeG62dmq V+fsLEyc39xUZpDtYfwBe5u/givYUG7ZfrzHj/QmIxTCRG4AExFM6keaFIz4RyUJ/r8yhh XrG8itgO9l6+oLLMUvkSCwBeS5E4wH/IXVQ6viGUHX/T/h8wuYFVDVsfABAoXUJIHtUPjP e86eM43WyUE2WKdkiWvLZgx4zo4zHjT5cWFJHBc+xx5swocl2KO1jlyDwBM3hw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761583148; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=v/1KQNxAeoRr+cpI3UHyapKkIms38SrXV/Xo13KOx40=; b=K/6+ClTLdYq50+OWWd2M/Z46UJ1PJ3CrAdfycej65VrL4Kl/hEMRKAPKo3ArPeAuqDKNkq y8PEIxfcrhz61mdN7YS4QddWkUCuiqZ6mb++LPdQhLK+s8DCX7Edf+QWZR1TbQp3mwt4XA CuCJTaFmo6nDsUIDnGtrpoALwVlp8PUSRjIyEbDTcmtll94Iuv5beBNV239T798IVouyxK cAVWtaj9dntHK/dYc5dgPNhPHmvrVX2gWXlcO8CaYV8vI0KvIcmxK09V9cG8Uq3IVRNsmG j8rBv1TadfZ8iXrPX/tKzAHjHShDuixFizU+MOZD6zUjKD7cmu4gQlSeZPkQRA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761583148; a=rsa-sha256; cv=none; b=U4xHFbIyfGg7WVc81dyqUgWHp3/JwYQfIbKG+yOPyxrQDwPiUhXFSe1NDogCpi9uH4Np/Y 0AoGt95NR5VAyZlCUgMbKM1HlsGfuYXGlyBst5N78Vg2/+nPdZAY8i9tsjSonW1m5bcJ93 dumYn9rsHF81DsD4T/wIi+vyLH3Gf6isOGNLJJPzj6pweZ8B8Qgo4htpPbBULqwxgvPHZ2 YeeVnFoQO5Garl1ySz4Pp7F5HyPv3TGVsvQgEqbFSGgldXRoK3fXN4mtplfRQ67AduhvvW CLKeVq9AaAW0025s56l5oFTxPxJvU44CKSvyAW+hY4zrSaEDw2K/JQTkdQ+Sng== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cwK301mZpz1QNk; Mon, 27 Oct 2025 16:39:08 +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 59RGd8rt019632; Mon, 27 Oct 2025 16:39:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59RGd8L3019629; Mon, 27 Oct 2025 16:39:08 GMT (envelope-from git) Date: Mon, 27 Oct 2025 16:39:08 GMT Message-Id: <202510271639.59RGd8L3019629@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: ff08916e9ac6 - main - altq: Clear stats structures in get_class_stats() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ff08916e9ac689e6ce734de72325fc2bd9495a35 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=ff08916e9ac689e6ce734de72325fc2bd9495a35 commit ff08916e9ac689e6ce734de72325fc2bd9495a35 Author: Mark Johnston AuthorDate: 2025-10-27 16:27:40 +0000 Commit: Mark Johnston CommitDate: 2025-10-27 16:27:40 +0000 altq: Clear stats structures in get_class_stats() These structures are copied out to userspace, and it's possible to leak uninitialized stack bytes since these routines and their callers weren't careful to clear them first. Add memsets to avoid this. Reported by: Ilja Van Sprundel Reviewed by: kp, emaste MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D53342 --- sys/net/altq/altq_cbq.c | 2 ++ sys/net/altq/altq_fairq.c | 2 ++ sys/net/altq/altq_priq.c | 2 ++ 3 files changed, 6 insertions(+) diff --git a/sys/net/altq/altq_cbq.c b/sys/net/altq/altq_cbq.c index fdf39690160b..2333b9ea8678 100644 --- a/sys/net/altq/altq_cbq.c +++ b/sys/net/altq/altq_cbq.c @@ -173,6 +173,8 @@ cbq_request(struct ifaltq *ifq, int req, void *arg) static void get_class_stats(class_stats_t *statsp, struct rm_class *cl) { + memset(statsp, 0, sizeof(*statsp)); + statsp->xmit_cnt = cl->stats_.xmit_cnt; statsp->drop_cnt = cl->stats_.drop_cnt; statsp->over = cl->stats_.over; diff --git a/sys/net/altq/altq_fairq.c b/sys/net/altq/altq_fairq.c index 6069865101a0..0a00168e547e 100644 --- a/sys/net/altq/altq_fairq.c +++ b/sys/net/altq/altq_fairq.c @@ -857,6 +857,8 @@ get_class_stats(struct fairq_classstats *sp, struct fairq_class *cl) { fairq_bucket_t *b; + memset(sp, 0, sizeof(*sp)); + sp->class_handle = cl->cl_handle; sp->qlimit = cl->cl_qlimit; sp->xmit_cnt = cl->cl_xmitcnt; diff --git a/sys/net/altq/altq_priq.c b/sys/net/altq/altq_priq.c index 026346639b2e..fec488418546 100644 --- a/sys/net/altq/altq_priq.c +++ b/sys/net/altq/altq_priq.c @@ -597,6 +597,8 @@ priq_purgeq(struct priq_class *cl) static void get_class_stats(struct priq_classstats *sp, struct priq_class *cl) { + memset(sp, 0, sizeof(*sp)); + sp->class_handle = cl->cl_handle; sp->qlength = qlen(cl->cl_q); sp->qlimit = qlimit(cl->cl_q); From nobody Mon Oct 27 16:39:09 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cwK314gy9z6F3dQ; Mon, 27 Oct 2025 16:39: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cwK312kNyz3qVQ; Mon, 27 Oct 2025 16:39:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761583149; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PqU9D0Bg2CntVXQ2dm7P4qtHNDtqMP5Qw2jXvmjEo+s=; b=iijYltSfxAzPC41FJqtueAhtRJiQQ1H4DT4H1lcEiqOgAxvU2MnrSD66SMRHcZipYLpIBo SyInCVCv5ItB2xJDl63sPzWTk0qZ6MLuKuhN8GPdqRbdv8ToTniqxKkzeqUW+NpFdv3M+a W7EUdHjAKwi98KbpRwYoD5IH9ZHmxfe57+7UO+jlKghQy7LV7Cs8zSovGa5w7hqrZ8Uyyc 19HyM2vsWF0hfmKiaQPlei++6NMdzOwl0Vpwl+JvxoC5ZEBCSibTc+I5LOxq1/8nZzaDQs ZTWyBkmuGz4YhJCS/ugs56M+XUBhbJ9maESB2ex7Zf+Fr3bRbllfnYxneTF90A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761583149; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PqU9D0Bg2CntVXQ2dm7P4qtHNDtqMP5Qw2jXvmjEo+s=; b=GqpQkrMMsXAQR4h+L8RiJSvnAq6aqenbmz7wY7J9qxSU1bd96S/u9Abl2uiZHfHJTRBtfU 9IjCb+ddFU+V2S9P6sBqA0Cut+ziFPE9hwDeWc6DT3m3/mh+NiAkDoFnoDfFAJWCIzLmwm cj1PnFf5RLwPEri6jpu/rCqpII15x3FjvkkEENvygRmOjpiid11FbN21HXLGCU4Stdm+OL GHSle9+yYJNdleHxJtZ5S2JocKPWn2hOxTjfmHrCVdzA/je84wEZkqr5kjG28EJBic5mL7 m/KCXQ04oNJVfLperabB6mQH+wYpXJB7skLwTN9Ss5xJMIWpMKsB/lJQy/vOHw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761583149; a=rsa-sha256; cv=none; b=ivckGaHkdb8Ho9qqhf0UCd+09ZizddLDA6cjX/Jqv9RX2gzmkyuHMmoEguai8OK5x/pptr QWgAgQgHRa12ZgdHAB3ExMNoFCEpX2m+YOK181sY2qZdB9bEBHzqv8GfOR+L36ZEm9icLl 2d7ORekBEGSrF7dm1aTgxXHbk+lmc1Uc3M0wo6X3Plw1XyGgEMZ4GQGwOTSZisg2tP6ymN YOinR3FoFyEq2mvey4B5H9DbQzEm87ZnEIeCNDZdqY4YnrwZdigquDI+7ggj7Ovk5x5rbx fK9hLmn23k/KYl35sMYfhecDIwqoCjzWJFXKdjBim2akOtU7hagnrGNgcR3Fvw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cwK3121z5z1Qh6; Mon, 27 Oct 2025 16:39: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 59RGd9qp019664; Mon, 27 Oct 2025 16:39:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59RGd9jR019661; Mon, 27 Oct 2025 16:39:09 GMT (envelope-from git) Date: Mon, 27 Oct 2025 16:39:09 GMT Message-Id: <202510271639.59RGd9jR019661@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 500717311bff - main - net: Remove useless field annotations List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 500717311bff635dac12602a27d0dbca02cf9a2e Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=500717311bff635dac12602a27d0dbca02cf9a2e commit 500717311bff635dac12602a27d0dbca02cf9a2e Author: Mark Johnston AuthorDate: 2025-10-27 16:27:55 +0000 Commit: Mark Johnston CommitDate: 2025-10-27 16:27:55 +0000 net: Remove useless field annotations MFC after: 1 week --- sys/net/if_var.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/net/if_var.h b/sys/net/if_var.h index f2df612b19c1..961259bb0ca1 100644 --- a/sys/net/if_var.h +++ b/sys/net/if_var.h @@ -383,18 +383,18 @@ struct ifg_group { char ifg_group[IFNAMSIZ]; u_int ifg_refcnt; void *ifg_pf_kif; - CK_STAILQ_HEAD(, ifg_member) ifg_members; /* (CK_) */ - CK_STAILQ_ENTRY(ifg_group) ifg_next; /* (CK_) */ + CK_STAILQ_HEAD(, ifg_member) ifg_members; + CK_STAILQ_ENTRY(ifg_group) ifg_next; }; struct ifg_member { - CK_STAILQ_ENTRY(ifg_member) ifgm_next; /* (CK_) */ + CK_STAILQ_ENTRY(ifg_member) ifgm_next; if_t ifgm_ifp; }; struct ifg_list { struct ifg_group *ifgl_group; - CK_STAILQ_ENTRY(ifg_list) ifgl_next; /* (CK_) */ + CK_STAILQ_ENTRY(ifg_list) ifgl_next; }; #ifdef _SYS_EVENTHANDLER_H_ From nobody Mon Oct 27 16:39:10 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cwK331kwSz6F3Vn; Mon, 27 Oct 2025 16:39: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cwK323rqYz3qVd; Mon, 27 Oct 2025 16:39:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761583150; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZwzEKyvTx/3zdGaPSZWFRdeChMQQsBsA3B/gdcawcpQ=; b=mdzpz1Hsrss3oWNkD+Vmu1mo8zFeuKJUzh98UIN/LiUXqLuny898Gvoqv9CHPJC65oIDvk YxblXWISVeJ0t2nHL8ZKhvXKxle7Iy1HfIoQ40dW7iNL8trjuVMEDuPFgoD6Hp1ChwcKY4 Nl1OuyEJCVL03k+0CTye6WxhaNZQ1XZkf+zUVbQQxoVk3m7Qie/6iSJgbpmz/ih/LprE8S R7uosoZjWN3YQl1ITixCyDEpL7pBLWcoa5+h3L6E2A6vRtnvhpZqnE/3VIOk+eyKyqFuxh QJss4F4m59a0U7r1Irr3wHMrbm88QIl6o4yKeBiy3dAfj1On656dOzunOwFT7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761583150; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZwzEKyvTx/3zdGaPSZWFRdeChMQQsBsA3B/gdcawcpQ=; b=aHheduSUpe1XSsva3CMbjC3kKXtYI1OMBoFCODgaBNl8Pw9z1BHTb2hx38ss09jWhGtdDa F23k04jF5LHJyupYx4R7XS0ukPv4F7DV3O6d+z95sFIdMIJRQLTRpzR946YgaOz77kqAiu +k/+CFV21KHYgNotfFs/8MK53m+8RFu0rGYx/EuED/4+Oss6LSSFSNM/yaZMfaaVZMVvKZ AB4Jri5wE99K9EgIWPrjwNJqQI2+Eko5CirwoqNkkNzJewWtLAC9CDzJNPw6LugiJMUiIu hbt0DuOp5wboj9OqNLD8mbgTaSS8832skUKMyIdzomNV26DqkrsGAlKVH64PFw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761583150; a=rsa-sha256; cv=none; b=DvrEjEjQr7wxm9f8WKSnx+M4SLrFNC4/XtFmINr5XEl4JPZTfKl7f+2TxwY9ov+/Wagizt pz1c3OTZRSyH5eZWphU4wv5wGzmdtIBWzxtq2xUkWzPMcrPkaCDyoTGhIYc/M0oIxKhefk LRe9D6DxjdHg9w3ilTXZ3xyvRIGaz0WuANLn6E/hHfOd9Wq2BP6g0ysauPqJOjtcqmBalj b4EE/hOjwsrYYTo6O95iXA071q0US2ayEkO5/zLig2Gwn1iL53HJoe4MZT5d8CSBjYh09O /ZxnVWOW70LeSTpyO7QE2plLS+PEAUxHwIrKQA4zlQCdtqudbwV7ge3Pg4UgAw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cwK323JdWz1Qnp; Mon, 27 Oct 2025 16:39: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 59RGdADT019696; Mon, 27 Oct 2025 16:39:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59RGdAnY019693; Mon, 27 Oct 2025 16:39:10 GMT (envelope-from git) Date: Mon, 27 Oct 2025 16:39:10 GMT Message-Id: <202510271639.59RGdAnY019693@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: ef7b81340b8e - main - gdb: Improve doc strings List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ef7b81340b8e0ad06584f364aa02105c03ca5f7c Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=ef7b81340b8e0ad06584f364aa02105c03ca5f7c commit ef7b81340b8e0ad06584f364aa02105c03ca5f7c Author: Mark Johnston AuthorDate: 2025-10-27 16:28:20 +0000 Commit: Mark Johnston CommitDate: 2025-10-27 16:28:20 +0000 gdb: Improve doc strings These are printed by gdb when requesting help for the corresponding function or command, so phrase them such that they make sense in that context. MFC after: 1 week --- sys/tools/gdb/acttrace.py | 6 ++---- sys/tools/gdb/pcpu.py | 2 +- sys/tools/gdb/vnet.py | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/sys/tools/gdb/acttrace.py b/sys/tools/gdb/acttrace.py index 147effbbddf1..fdd18a4833cd 100644 --- a/sys/tools/gdb/acttrace.py +++ b/sys/tools/gdb/acttrace.py @@ -13,10 +13,8 @@ from pcpu import * class acttrace(gdb.Command): """ - Register an acttrace command with gdb. - - When run, acttrace prints the stack trace of all threads that were on-CPU - at the time of the panic. + Print the stack trace of all threads that were on-CPU at the time of + the panic. """ def __init__(self): super(acttrace, self).__init__("acttrace", gdb.COMMAND_USER) diff --git a/sys/tools/gdb/pcpu.py b/sys/tools/gdb/pcpu.py index aadc4b2d42df..94c451e6eca5 100644 --- a/sys/tools/gdb/pcpu.py +++ b/sys/tools/gdb/pcpu.py @@ -9,7 +9,7 @@ from freebsd import * class pcpu(gdb.Function): """ - Register a function to lookup PCPU and DPCPU variables by name. + A function to look up PCPU and DPCPU fields by name. To look up the value of the PCPU field foo on CPU n, use $PCPU("foo", n). This works for DPCPU fields too. If the CPU ID is diff --git a/sys/tools/gdb/vnet.py b/sys/tools/gdb/vnet.py index 36b4d512a3eb..5f416b2a515a 100644 --- a/sys/tools/gdb/vnet.py +++ b/sys/tools/gdb/vnet.py @@ -10,7 +10,7 @@ from freebsd import * class vnet(gdb.Function): """ - Register a function to look up VNET variables by name. + A function to look up VNET variables by name. To look at the value of a VNET variable V_foo, print $V("foo"). The currently selected thread's VNET is used by default, but can be optionally From nobody Mon Oct 27 16:39:11 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cwK341Qx8z6F3bW; Mon, 27 Oct 2025 16:39: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cwK334ryPz3qSQ; Mon, 27 Oct 2025 16:39:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761583151; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wlry0L5YWeVpjX1esJ3WFDsFwaZYxnSO0KT5z8IyIEs=; b=j3utqxVDDpWOncacFIFLy3Rh8g/6FqzQpYknkilsmK8Pp7CAtYGz8+eqRaeVohm6eD6c4f lYhdImDpL3Bt976QuxpPPrHoJLHTxad2I1Rfebt6Lbpc4tLfS/5O6+vmJYT2VQ6OYtASeq O2N2Y9eStUqDopL0CIDNeiuER47XZPYbKyaTulkxiZujJ053RBajjoPG6OTV2GcTBOerFM J5Vou/qh53K75K4vExDOyxk6NxqNIIMSzBht8/kzngl/HlWVl81022Qg9wkAD0j+w6tfZ0 kF/DW2T98P4bp3jlXgrSypTDWYo38n2mnK+mKf8Q+6loOPfSIXe4tR10F0F/Pw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761583151; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wlry0L5YWeVpjX1esJ3WFDsFwaZYxnSO0KT5z8IyIEs=; b=QKI29D/iWfnp6eZuYBEnUftBTL9ID947sAZkmWUMIvIF4Ls0NqyY1oTzgMmKb3L1/kDrdH 01bRQpt4Ryt7Tx1cwbz0v9uhzXU+Zk2ilfrhoxuofMge6ewQx8W9seFHbiGiqnvIh5hY7O BCpfrK+ZOEMLnZXYMOunWzgdU+uyGFJ4NjmTe/8OnZq+AAamEWNOvBfdTOcH30IXlzRxuf UImaWkpsZJwJw5PwRrHVFUBq4raxnsZ3DkLT/zDAK+aL8hTLbFwE8jYIFa9LYX7fvn5yzm QVU30kVJ8tKs+sUsIqLN+XgE/8MZCQSkQLNvUmKU7fpJxL0bFsdbG9jtHSWDDw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761583151; a=rsa-sha256; cv=none; b=f8fxiPNJdb6MYPHS75kuO1Q+iuSKoQJifsHIb/hMNYVlQSwBVxr2BSCMnArWJ2N809LM7m KE4Xg3Ttz4YSFd15so6fX1/ceYodz0YUwD3vR+hoSCtpT/j3BClOwKr5nKZWKjcJezLl/G umDrOGHrqIaxi/MkSVS/omOb45Uae8kfym2/jtoieuznAYA1441fI5NXRHOXNrFY03RMIr D1BmPIl6wSO/vpCA/iX3M+5gzpXR/dqFTrpAfYuYZdNCJyMFF6XhPeH/VB4j6mAeMuLWn9 e875EvZr3R3N6orzixC4v2w73Bj6qtkNzxLigXUULLmb/JJ6vyr/feQ1I5Ewcw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cwK333tcrz1Qnq; Mon, 27 Oct 2025 16:39: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 59RGdBfW019730; Mon, 27 Oct 2025 16:39:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59RGdBqb019727; Mon, 27 Oct 2025 16:39:11 GMT (envelope-from git) Date: Mon, 27 Oct 2025 16:39:11 GMT Message-Id: <202510271639.59RGdBqb019727@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: d5d47e1e67cd - main - gdb: Make development a bit easier List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d5d47e1e67cdf1707cb460c2722894305f3cb34d Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=d5d47e1e67cdf1707cb460c2722894305f3cb34d commit d5d47e1e67cdf1707cb460c2722894305f3cb34d Author: Mark Johnston AuthorDate: 2025-10-27 16:33:34 +0000 Commit: Mark Johnston CommitDate: 2025-10-27 16:33:34 +0000 gdb: Make development a bit easier Provide a command which can be used to reload gdb modules. MFC after: 1 week --- sys/tools/gdb/README.txt | 5 +++++ sys/tools/kernel-gdb.py | 36 ++++++++++++++++++++++++++++++++---- 2 files changed, 37 insertions(+), 4 deletions(-) diff --git a/sys/tools/gdb/README.txt b/sys/tools/gdb/README.txt index 8c31565ddc42..ad1544912c3c 100644 --- a/sys/tools/gdb/README.txt +++ b/sys/tools/gdb/README.txt @@ -8,6 +8,9 @@ be automatically loaded by kgdb when opening a vmcore, so if you add new GDB commands or functions, that script should be updated to import them, and you should document them here. +When improving these scripts, you can use the "kgdb-reload" command to reload +them from /usr/lib/debug/boot/kernel/gdb/*. + To provide some rudimentary testing, selftest.py tries to exercise all of the commands and functions defined here. To use it, run selftest.sh to panic the system. Then, create a kernel dump or attach to the panicked kernel, and invoke @@ -15,6 +18,8 @@ the script with "python import selftest" in (k)gdb. Commands: acttrace Display a backtrace for all on-CPU threads +kgdb-reload Reload all gdb modules, useful when developing the modules + themselves. Functions: $PCPU([, ]) Display the value of a PCPU/DPCPU field diff --git a/sys/tools/kernel-gdb.py b/sys/tools/kernel-gdb.py index 8a41ef6efab1..990bdaf31fda 100644 --- a/sys/tools/kernel-gdb.py +++ b/sys/tools/kernel-gdb.py @@ -4,12 +4,40 @@ # SPDX-License-Identifier: BSD-2-Clause # +import importlib import os import sys sys.path.append(os.path.join(os.path.dirname(__file__), "gdb")) -# Import FreeBSD kernel debugging commands and modules below. -import acttrace -import pcpu -import vnet +modules = [ + "acttrace", + "freebsd", + "pcpu", + "vnet" +] + + +def reload_modules(modules): + for mod in modules: + if mod in sys.modules: + importlib.reload(sys.modules[mod]) + else: + importlib.import_module(mod) + +reload_modules(modules) + + +class reload(gdb.Command): + """ + Reload the FreeBSD kernel GDB helper scripts. + """ + def __init__(self): + super(reload, self).__init__("kgdb-reload", gdb.COMMAND_USER) + + def invoke(self, arg, from_tty): + reload_modules(modules) + + +# Register the reload command with gdb. +reload() From nobody Mon Oct 27 17:36:21 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cwLK203W2z6FBgP; Mon, 27 Oct 2025 17:36: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cwLK16wKkz426k; Mon, 27 Oct 2025 17:36:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761586581; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6kbWfDTZZwH5JRIs/1Ynl04F6w0N/RVfPGqF26hR7nQ=; b=sPi2WawU6lN6cQ7bUgS4Oyl5uViJ1d0963oWV+UxhLJebvtp/tGD20sKKFbQjUvkLMK+po NO6CVfdHOu3ZQVnpMFmuXSuc646A5WLe76hfci4GpJcJ/mMMxeOu8Jc/3m+PU7eduJ1CIE 8fPlz3gHZ6/PqOtt5LDrln97z6xDIW92E2CtwEtskWJ+eNZ5AC7VGPyY34/8jmskiyPtXf Ceym/M0LK11LcoAtSdax0T3k+isnHghbVMAaRNAHOByKCZ2QHFwTBZO0Ttn+/eWXIVhSdz yivpxEgIk9MRTGdxouoU3yOg5bH2VxMs8jUg8lhS76CQpAHWAwKX0sLG4gWQmg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761586581; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6kbWfDTZZwH5JRIs/1Ynl04F6w0N/RVfPGqF26hR7nQ=; b=bOctPkQFaRBHRWbY5NWsrHW7N3UOYjflvlJBxZwC2lYcDBPlH3L3HNpMnPA7iP3LSeKSOb s3t7pDJspRAWb+GyZUIGs2GwlsQb00Lp5H0SenMletGRVC4+Ac/Hr4P5BxWGKEMXib6Ns7 HkpmlYMJnTsnd879AOHrObKKiW/UQP3v2NiudyETUMocjqNQM371vgTPCcVFQgOPnTjJS1 95CwcadNCkDZS10wTBCEvB7uIRPfutg4gQnnaQthJmpnF6x7v0kENk4sSVChWMsRHtXlKX x47zFxxeW8WK6QrAA/lVC3+JH0+7OdTsSxw4W3LsebztKsX1jj/Bu/VedlmFgw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761586581; a=rsa-sha256; cv=none; b=r8hDXfT57tDfPx6EGFbli3JSWjxyy6NYM8/zOGs5RFYd6tgs7/l91rOQ2azFQUBc65glO5 XzrkB4Alpls0enob8Evg/GoZtDV5fUIjjluOv5yVn9fHk1YRDhRTltN+hwlld6QZ4u2PH/ XrB0agBzPyYhT1XgHczOyG/KQxI7NvMvXiK9sdyy8UFy9h27meEs3mt+B7wmxbzLPCgGRT CJWn6uIr29XYmvRs3yvjJ5EE4eJsWBGZBp9D8TP9MyVvvV0NH7QDcYFOmPxKJ/fEkdJbOi V1w4vU1hhZ+eymy8xJgHih1iIXvTf2KI8evW9MDCltaaKBmdumiFr3v+1bY/JA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cwLK16S91z1Rrp; Mon, 27 Oct 2025 17:36: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 59RHaLin033082; Mon, 27 Oct 2025 17:36:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59RHaLPN033079; Mon, 27 Oct 2025 17:36:21 GMT (envelope-from git) Date: Mon, 27 Oct 2025 17:36:21 GMT Message-Id: <202510271736.59RHaLPN033079@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 2fbb6e213ac2 - main - closefrom_test: Convert to atf-c(3) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2fbb6e213ac2075594da5f68a72d41074fd85b69 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=2fbb6e213ac2075594da5f68a72d41074fd85b69 commit 2fbb6e213ac2075594da5f68a72d41074fd85b69 Author: John Baldwin AuthorDate: 2025-10-27 17:36:06 +0000 Commit: John Baldwin CommitDate: 2025-10-27 17:36:06 +0000 closefrom_test: Convert to atf-c(3) Reviewed by: ngie, markj Differential Revision: https://reviews.freebsd.org/D52800 --- tests/sys/file/Makefile | 2 +- tests/sys/file/closefrom_test.c | 490 +++++++++++++++++++--------------------- 2 files changed, 236 insertions(+), 256 deletions(-) diff --git a/tests/sys/file/Makefile b/tests/sys/file/Makefile index beb4452359b7..c1fcef68d08e 100644 --- a/tests/sys/file/Makefile +++ b/tests/sys/file/Makefile @@ -3,7 +3,7 @@ TESTSDIR= ${TESTSBASE}/sys/file BINDIR= ${TESTSDIR} ATF_TESTS_C+= path_test -TAP_TESTS_C+= closefrom_test +ATF_TESTS_C+= closefrom_test TAP_TESTS_C+= dup_test ATF_TESTS_C+= fcntlflags_test TAP_TESTS_SH+= flock_test diff --git a/tests/sys/file/closefrom_test.c b/tests/sys/file/closefrom_test.c index 212d048d7566..a51e1630e24d 100644 --- a/tests/sys/file/closefrom_test.c +++ b/tests/sys/file/closefrom_test.c @@ -25,13 +25,13 @@ * SUCH DAMAGE. */ -#include /* * Regression tests for the closefrom(2) system call. */ #include #include +#include #include #include #include @@ -44,67 +44,57 @@ #include #include -struct shared_info { - int failed; - char tag[64]; - char message[0]; -}; +#include -static int test = 1; +static char *shared_page; -static void -ok(const char *descr) +/* + * A variant of ATF_REQUIRE that is suitable for use in child + * processes. Since these tests close stderr, errors are reported to + * a shared page of memory checked by the parent process. + */ +#define CHILD_REQUIRE(exp) do { \ + if (!(exp)) \ + child_fail_require(__FILE__, __LINE__, \ + #exp " not met"); \ +} while (0) + +static __dead2 __printflike(3, 4) void +child_fail_require(const char *file, int line, const char *fmt, ...) { + FILE *fp; + va_list ap; - printf("ok %d - %s\n", test, descr); - test++; -} + fp = fmemopen(shared_page, PAGE_SIZE - 1, "w"); + if (fp == NULL) + exit(1); -static void -fail(const char *descr, const char *fmt, ...) -{ - va_list ap; + fprintf(fp, "%s:%d: ", file, line); + va_start(ap, fmt); + vfprintf(fp, fmt, ap); + va_end(ap); + fclose(fp); - printf("not ok %d - %s", test, descr); - test++; - if (fmt) { - va_start(ap, fmt); - printf(" # "); - vprintf(fmt, ap); - va_end(ap); - } - printf("\n"); - exit(1); + exit(0); } -#define fail_err(descr) fail((descr), "%s", strerror(errno)) - -static void -cok(struct shared_info *info, const char *descr) +static pid_t +child_fork(void) { - - info->failed = 0; - strlcpy(info->tag, descr, sizeof(info->tag)); - exit(0); + shared_page = mmap(NULL, PAGE_SIZE, PROT_READ | PROT_WRITE, MAP_ANON | + MAP_SHARED, -1, 0); + ATF_REQUIRE_MSG(shared_page != MAP_FAILED, "mmap: %s", strerror(errno)); + return (atf_utils_fork()); } static void -cfail(struct shared_info *info, const char *descr, const char *fmt, ...) +child_wait(pid_t pid) { - va_list ap; - - info->failed = 1; - strlcpy(info->tag, descr, sizeof(info->tag)); - if (fmt) { - va_start(ap, fmt); - vsprintf(info->message, fmt, ap); - va_end(ap); - } - exit(0); + atf_utils_wait(pid, 0, "", ""); + if (shared_page[0] != '\0') + atf_tc_fail("%s", shared_page); } -#define cfail_err(info, descr) cfail((info), (descr), "%s", strerror(errno)) - /* * Use kinfo_getfile() to fetch the list of file descriptors and figure out * the highest open file descriptor. @@ -116,9 +106,8 @@ highest_fd(void) int cnt, i, highest; kif = kinfo_getfile(getpid(), &cnt); - if (kif == NULL) - fail_err("kinfo_getfile"); - highest = INT_MIN; + ATF_REQUIRE_MSG(kif != NULL, "kinfo_getfile: %s", strerror(errno)); + highest = -1; for (i = 0; i < cnt; i++) if (kif[i].kf_fd > highest) highest = kif[i].kf_fd; @@ -132,262 +121,253 @@ devnull(void) int fd; fd = open(_PATH_DEVNULL, O_RDONLY); - if (fd < 0) - fail_err("open(\" "_PATH_DEVNULL" \")"); + ATF_REQUIRE_MSG(fd != -1, "open(\" "_PATH_DEVNULL" \"): %s", + strerror(errno)); return (fd); } -int -main(void) +ATF_TC_WITHOUT_HEAD(closefrom_simple); +ATF_TC_BODY(closefrom_simple, tc) { - struct shared_info *info; - pid_t pid; - int fd, flags, i, start; - - printf("1..22\n"); + int fd, start; /* We'd better start up with fd's 0, 1, and 2 open. */ - start = devnull(); - if (start < 3) - fail("open", "bad descriptor %d", start); - ok("open"); + start = highest_fd(); + ATF_REQUIRE(start >= 2); + + fd = devnull(); + ATF_REQUIRE(fd > start); /* Make sure highest_fd() works. */ - fd = highest_fd(); - if (start != fd) - fail("highest_fd", "bad descriptor %d != %d", start, fd); - ok("highest_fd"); - - /* Try to use closefrom() for just closing fd 3. */ - closefrom(start); - fd = highest_fd(); - if (fd != start - 1) - fail("closefrom", "highest fd %d", fd); - ok("closefrom"); + ATF_REQUIRE_INTEQ(fd, highest_fd()); + + /* Try to use closefrom() to close just the new fd. */ + closefrom(fd); + ATF_REQUIRE_INTEQ(start, highest_fd()); +} + +ATF_TC_WITHOUT_HEAD(closefrom_with_holes); +ATF_TC_BODY(closefrom_with_holes, tc) +{ + int i, start; + + start = highest_fd(); /* Eat up 16 descriptors. */ for (i = 0; i < 16; i++) (void)devnull(); - fd = highest_fd(); - if (fd != start + 15) - fail("open 16", "highest fd %d", fd); - ok("open 16"); + + ATF_REQUIRE_INTEQ(start + 16, highest_fd()); /* Close half of them. */ - closefrom(11); - fd = highest_fd(); - if (fd != 10) - fail("closefrom", "highest fd %d", fd); - ok("closefrom"); - - /* Explicitly close descriptors 6 and 8 to create holes. */ - if (close(6) < 0 || close(8) < 0) - fail_err("close2 "); - ok("close 2"); - - /* Verify that close on 6 and 8 fails with EBADF. */ - if (close(6) == 0) - fail("close(6)", "did not fail"); - if (errno != EBADF) - fail_err("close(6)"); - ok("close(6)"); - if (close(8) == 0) - fail("close(8)", "did not fail"); - if (errno != EBADF) - fail_err("close(8)"); - ok("close(8)"); - - /* Close from 4 on. */ - closefrom(4); - fd = highest_fd(); - if (fd != 3) - fail("closefrom", "highest fd %d", fd); - ok("closefrom"); - - /* Allocate a small SHM region for IPC with our child. */ - info = mmap(NULL, getpagesize(), PROT_READ | PROT_WRITE, MAP_ANON | - MAP_SHARED, -1, 0); - if (info == MAP_FAILED) - fail_err("mmap"); - ok("mmap"); - - /* Fork a child process to test closefrom(0). */ - pid = fork(); - if (pid < 0) - fail_err("fork"); + closefrom(start + 9); + ATF_REQUIRE_INTEQ(start + 8, highest_fd()); + + /* Explicitly close two descriptors to create holes. */ + ATF_REQUIRE_MSG(close(start + 3) == 0, "close(start + 3): %s", + strerror(errno)); + ATF_REQUIRE_MSG(close(start + 5) == 0, "close(start + 5): %s", + strerror(errno)); + + /* Verify that close on the closed descriptors fails with EBADF. */ + ATF_REQUIRE_ERRNO(EBADF, close(start + 3) == -1); + ATF_REQUIRE_ERRNO(EBADF, close(start + 5) == -1); + + /* Close most remaining descriptors. */ + closefrom(start + 2); + ATF_REQUIRE_INTEQ(start + 1, highest_fd()); +} + +ATF_TC_WITHOUT_HEAD(closefrom_zero); +ATF_TC_BODY(closefrom_zero, tc) +{ + pid_t pid; + int fd; + + /* Ensure standard descriptors are open. */ + ATF_REQUIRE(highest_fd() >= 2); + + pid = child_fork(); if (pid == 0) { /* Child. */ closefrom(0); fd = highest_fd(); - if (fd >= 0) - cfail(info, "closefrom(0)", "highest fd %d", fd); - cok(info, "closefrom(0)"); + CHILD_REQUIRE(fd == -1); + exit(0); } - if (wait(NULL) < 0) - fail_err("wait"); - if (info->failed) - fail(info->tag, "%s", info->message); - ok(info->tag); - - /* Fork a child process to test closefrom(-1). */ - pid = fork(); - if (pid < 0) - fail_err("fork"); + + child_wait(pid); +} + +ATF_TC_WITHOUT_HEAD(closefrom_negative_one); +ATF_TC_BODY(closefrom_negative_one, tc) +{ + pid_t pid; + int fd; + + /* Ensure standard descriptors are open. */ + ATF_REQUIRE(highest_fd() >= 2); + + pid = child_fork(); if (pid == 0) { /* Child. */ closefrom(-1); fd = highest_fd(); - if (fd >= 0) - cfail(info, "closefrom(-1)", "highest fd %d", fd); - cok(info, "closefrom(-1)"); + CHILD_REQUIRE(fd == -1); + exit(0); } - if (wait(NULL) < 0) - fail_err("wait"); - if (info->failed) - fail(info->tag, "%s", info->message); - ok(info->tag); - - /* Dup stdout to 6. */ - if (dup2(1, 6) < 0) - fail_err("dup2"); - fd = highest_fd(); - if (fd != 6) - fail("dup2", "highest fd %d", fd); - ok("dup2"); + + child_wait(pid); +} + +ATF_TC_WITHOUT_HEAD(closefrom_in_holes); +ATF_TC_BODY(closefrom_in_holes, tc) +{ + int start; + + start = highest_fd(); + ATF_REQUIRE(start >= 2); + + /* Dup stdout to a higher fd. */ + ATF_REQUIRE_INTEQ(start + 4, dup2(1, start + 4)); + ATF_REQUIRE_INTEQ(start + 4, highest_fd()); /* Do a closefrom() starting in a hole. */ - closefrom(4); - fd = highest_fd(); - if (fd != 3) - fail("closefrom", "highest fd %d", fd); - ok("closefrom"); + closefrom(start + 2); + ATF_REQUIRE_INTEQ(start, highest_fd()); /* Do a closefrom() beyond our highest open fd. */ - closefrom(32); - fd = highest_fd(); - if (fd != 3) - fail("closefrom", "highest fd %d", fd); - ok("closefrom"); + closefrom(start + 32); + ATF_REQUIRE_INTEQ(start, highest_fd()); +} + +ATF_TC_WITHOUT_HEAD(closerange_basic); +ATF_TC_BODY(closerange_basic, tc) +{ + struct stat sb; + int i, start; - /* Chew up another 8 fd */ + start = highest_fd(); + + /* Open 8 file descriptors */ for (i = 0; i < 8; i++) (void)devnull(); - fd = highest_fd(); - start = fd - 7; + ATF_REQUIRE_INTEQ(start + 8, highest_fd()); /* close_range() a hole in the middle */ - close_range(start + 3, start + 5, 0); - for (i = start + 3; i < start + 6; ++i) { - if (close(i) == 0 || errno != EBADF) { - --i; - break; - } - } - if (i != start + 6) - fail("close_range", "failed to close at %d in %d - %d", i + 1, - start + 3, start + 6); - ok("close_range"); + ATF_REQUIRE_INTEQ(0, close_range(start + 3, start + 5, 0)); + for (i = start + 3; i < start + 6; ++i) + ATF_REQUIRE_ERRNO(EBADF, fstat(i, &sb) == -1); /* close_range from the middle of the hole */ - close_range(start + 4, start + 6, 0); - if ((i = highest_fd()) != fd) - fail("close_range", "highest fd %d", i); - ok("close_range"); + ATF_REQUIRE_INTEQ(0, close_range(start + 4, start + 6, 0)); + ATF_REQUIRE_INTEQ(start + 8, highest_fd()); /* close_range to the end; effectively closefrom(2) */ - close_range(start + 3, ~0L, 0); - if ((i = highest_fd()) != start + 2) - fail("close_range", "highest fd %d", i); - ok("close_range"); + ATF_REQUIRE_INTEQ(0, close_range(start + 3, ~0L, 0)); + ATF_REQUIRE_INTEQ(start + 2, highest_fd()); /* Now close the rest */ - close_range(start, start + 4, 0); - fd = highest_fd(); - if (fd != 3) - fail("close_range", "highest fd %d", fd); - ok("close_range"); - - /* Fork a child process to test closefrom(0) twice. */ - pid = fork(); - if (pid < 0) - fail_err("fork"); + ATF_REQUIRE_INTEQ(0, close_range(start + 1, start + 4, 0)); + ATF_REQUIRE_INTEQ(start, highest_fd()); +} + +ATF_TC_WITHOUT_HEAD(closefrom_zero_twice); +ATF_TC_BODY(closefrom_zero_twice, tc) +{ + pid_t pid; + int fd; + + /* Ensure standard descriptors are open. */ + ATF_REQUIRE(highest_fd() >= 2); + + pid = child_fork(); if (pid == 0) { /* Child. */ closefrom(0); + fd = highest_fd(); + CHILD_REQUIRE(fd == -1); closefrom(0); - cok(info, "closefrom(0)"); + fd = highest_fd(); + CHILD_REQUIRE(fd == -1); + exit(0); } - if (wait(NULL) < 0) - fail_err("wait"); - if (info->failed) - fail(info->tag, "%s", info->message); - ok(info->tag); - /* test CLOSE_RANGE_CLOEXEC */ + child_wait(pid); +} + +static void +require_fd_flag(int fd, const char *descr, const char *descr2, int flag, + bool set) +{ + int flags; + + flags = fcntl(fd, F_GETFD); + ATF_REQUIRE_MSG(flags >= 0, "fcntl(.., F_GETFD): %s", strerror(errno)); + + if (set) { + ATF_REQUIRE_MSG((flags & flag) == flag, + "%s did not set %s on fd %d", descr, descr2, fd); + } else { + ATF_REQUIRE_MSG((flags & flag) == 0, + "%s set %s when it should not have on fd %d", descr, descr2, + fd); + } +} + +ATF_TC_WITHOUT_HEAD(closerange_CLOEXEC); +ATF_TC_BODY(closerange_CLOEXEC, tc) +{ + int i, start; + + start = highest_fd(); + ATF_REQUIRE(start >= 2); + for (i = 0; i < 8; i++) (void)devnull(); - fd = highest_fd(); - start = fd - 8; - if (close_range(start + 1, start + 4, CLOSE_RANGE_CLOEXEC) < 0) - fail_err("close_range(..., CLOSE_RANGE_CLOEXEC)"); - flags = fcntl(start, F_GETFD); - if (flags < 0) - fail_err("fcntl(.., F_GETFD)"); - if ((flags & FD_CLOEXEC) != 0) - fail("close_range", "CLOSE_RANGE_CLOEXEC set close-on-exec " - "when it should not have on fd %d", start); - for (i = start + 1; i <= start + 4; i++) { - flags = fcntl(i, F_GETFD); - if (flags < 0) - fail_err("fcntl(.., F_GETFD)"); - if ((flags & FD_CLOEXEC) == 0) - fail("close_range", "CLOSE_RANGE_CLOEXEC did not set " - "close-on-exec on fd %d", i); - } - for (; i < start + 8; i++) { - flags = fcntl(i, F_GETFD); - if (flags < 0) - fail_err("fcntl(.., F_GETFD)"); - if ((flags & FD_CLOEXEC) != 0) - fail("close_range", "CLOSE_RANGE_CLOEXEC set close-on-exec " - "when it should not have on fd %d", i); + ATF_REQUIRE_INTEQ(start + 8, highest_fd()); + + ATF_REQUIRE_INTEQ(0, close_range(start + 2, start + 5, + CLOSE_RANGE_CLOEXEC)); + for (i = 1; i < 9; i++) { + require_fd_flag(start + i, "CLOSE_RANGE_CLOEXEC", + "close-on-exec", FD_CLOEXEC, i >= 2 && i <= 5); } - if (close_range(start, start + 8, 0) < 0) - fail_err("close_range"); - ok("close_range(..., CLOSE_RANGE_CLOEXEC)"); + ATF_REQUIRE_INTEQ(0, close_range(start + 1, start + 8, 0)); +} + +ATF_TC_WITHOUT_HEAD(closerange_CLOFORK); +ATF_TC_BODY(closerange_CLOFORK, tc) +{ + int i, start; + + start = highest_fd(); + ATF_REQUIRE(start >= 2); - /* test CLOSE_RANGE_CLOFORK */ for (i = 0; i < 8; i++) (void)devnull(); - fd = highest_fd(); - start = fd - 8; - if (close_range(start + 1, start + 4, CLOSE_RANGE_CLOFORK) < 0) - fail_err("close_range(..., CLOSE_RANGE_CLOFORK)"); - flags = fcntl(start, F_GETFD); - if (flags < 0) - fail_err("fcntl(.., F_GETFD)"); - if ((flags & FD_CLOFORK) != 0) - fail("close_range", "CLOSE_RANGE_CLOFORK set close-on-exec " - "when it should not have on fd %d", start); - for (i = start + 1; i <= start + 4; i++) { - flags = fcntl(i, F_GETFD); - if (flags < 0) - fail_err("fcntl(.., F_GETFD)"); - if ((flags & FD_CLOFORK) == 0) - fail("close_range", "CLOSE_RANGE_CLOFORK did not set " - "close-on-exec on fd %d", i); - } - for (; i < start + 8; i++) { - flags = fcntl(i, F_GETFD); - if (flags < 0) - fail_err("fcntl(.., F_GETFD)"); - if ((flags & FD_CLOFORK) != 0) - fail("close_range", "CLOSE_RANGE_CLOFORK set close-on-exec " - "when it should not have on fd %d", i); + ATF_REQUIRE_INTEQ(start + 8, highest_fd()); + + ATF_REQUIRE_INTEQ(0, close_range(start + 2, start + 5, + CLOSE_RANGE_CLOFORK)); + for (i = 1; i < 9; i++) { + require_fd_flag(start + i, "CLOSE_RANGE_CLOFORK", + "close-on-fork", FD_CLOFORK, i >= 2 && i <= 5); } - if (close_range(start, start + 8, 0) < 0) - fail_err("close_range"); - ok("close_range(..., CLOSE_RANGE_CLOFORK)"); + ATF_REQUIRE_INTEQ(0, close_range(start + 1, start + 8, 0)); +} - return (0); +ATF_TP_ADD_TCS(tp) +{ + ATF_TP_ADD_TC(tp, closefrom_simple); + ATF_TP_ADD_TC(tp, closefrom_with_holes); + ATF_TP_ADD_TC(tp, closefrom_zero); + ATF_TP_ADD_TC(tp, closefrom_negative_one); + ATF_TP_ADD_TC(tp, closefrom_in_holes); + ATF_TP_ADD_TC(tp, closerange_basic); + ATF_TP_ADD_TC(tp, closefrom_zero_twice); + ATF_TP_ADD_TC(tp, closerange_CLOEXEC); + ATF_TP_ADD_TC(tp, closerange_CLOFORK); + + return (atf_no_error()); } From nobody Mon Oct 27 18:27:00 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cwMRS45flz6FGyW; Mon, 27 Oct 2025 18:27: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cwMRS3Js2z3Dlj; Mon, 27 Oct 2025 18:27:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761589620; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HILrL41GHANUgDhFCqKti10LwpqkVCVLw7JJUSP9N0s=; b=w9UwqUYmhzGFPvYx6rtGeDt+OdIi9VQFhRdpzLMticb5+wws0aQkorvcsE00/5wpxjxJDv kQxN8XDeMJ+BzxuLfGbN9p5Day3F2L8w8ognIztoNyuOiPIO7mib10pbsqOXnsf6OXTbQ1 emue0hjSbvjOhtRBRMFo55KMXQQ5JBrRnLqVjclcSGuPcUzknx2W1HgLZqVet7ekUZ/Yfq +CBgSVbdikcC5gai6DdbLX+yRe/ucBIU0gxw5qqqqL6gv2+BH3CYFk6Gc2kmbpBh5LVfNK zgd7d2IeLRK1if1Z56/3C4vgtD8C+Lzuubzy/3/z2bCeQ3WS+EnnFiv1gknIRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761589620; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HILrL41GHANUgDhFCqKti10LwpqkVCVLw7JJUSP9N0s=; b=EoJipGG1Va+Eo09+w0HYrneCrp3SQmIWR2Mg+Q9z5MwEvSRoZXGSVYkzgSVLh43uBl4RrW nHr+5ciZzN5m0IRXKZ7NqLiE7iWp2wfeEbiCQUXvhLxeHXnfFGozYOh23i0qQ0hcorNpA4 5CTJgXtm/7AGSRKLs3Nf3aCCA9D3eWDYlzwtWB7hxeqRvSVkc7yZ6isGt5bQ0VqwcG2JEI pvQbHOcUWf/45nR0vITig3ftjdh7z9D/wu+BNhOECHDTDRHy8fSmf1LI0CDcOF9wEbeUxg e/+COuDw1nCclZkef/DqU8tjB9F+ZCvNnF0VEGWLQCWK4RKrEGQj+SarESuWuA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761589620; a=rsa-sha256; cv=none; b=Fcht3QuKZnqYqq9tKmf2NW7KuTJqK353VrcxG3haVau/f9MP2desr+KiussR83d5agVuW6 +EAzBfcBMYurJPj/Jai8eiZynwO9ZHUF+sg8I6l7ZMRU5sQSg/njVc7a/tAUaRZAQHhjxe aTeKbopAPlCWzIS2D/4yx2hnDNfdm2k9GOztu5+atq+5Cc660SxDx8ZnNX0JFRmd/6aYN3 VXNuaCg7bcMLe4tr/3O554Ofq1h65XVlJ+SJgCZhaFbilM90Aot9aC1/mEVgIzU2Q2kEQr DCNuBOcFlatubyFL0C0nx7v8GUvoT4zoFafkp75B93dRXRjoJKN3DRnofQOrCQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cwMRS2rwpzbR; Mon, 27 Oct 2025 18:27: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 59RIR01g027013; Mon, 27 Oct 2025 18:27:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59RIR0mG027010; Mon, 27 Oct 2025 18:27:00 GMT (envelope-from git) Date: Mon, 27 Oct 2025 18:27:00 GMT Message-Id: <202510271827.59RIR0mG027010@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 34dfccc64f47 - main - acpi: in acpi_stype_sysctl() use same logic as in acpi_sleep_state_sysctl() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 34dfccc64f47f1549e65593b4a3aa8d31757529d Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=34dfccc64f47f1549e65593b4a3aa8d31757529d commit 34dfccc64f47f1549e65593b4a3aa8d31757529d Author: Gleb Smirnoff AuthorDate: 2025-10-27 18:22:46 +0000 Commit: Gleb Smirnoff CommitDate: 2025-10-27 18:26:32 +0000 acpi: in acpi_stype_sysctl() use same logic as in acpi_sleep_state_sysctl() Otherwise we allow to trigger an MPASS() by a userland sysctl, e.g. hw.acpi.power_button_state=NONE. This does not bring fully compatibility, where as before 97d152698f483 setting to 'NONE' actually meant disabling any action on a power or sleep button. Now sysctl will fail, but with this change it won't at least panic. Aymeric may come with a better fix. Fixes: 97d152698f4831db5a94d55c15233330c188feda --- sys/dev/acpica/acpi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/acpica/acpi.c b/sys/dev/acpica/acpi.c index 3f0a7b40245d..e3ff4f6937d2 100644 --- a/sys/dev/acpica/acpi.c +++ b/sys/dev/acpica/acpi.c @@ -4430,8 +4430,8 @@ acpi_stype_sysctl(SYSCTL_HANDLER_ARGS) return (EINVAL); printf("warning: this sysctl expects a sleep type, but an ACPI S-state has " "been passed to it. This functionality is deprecated; see acpi(4).\n"); - MPASS(sstate < ACPI_S_STATE_COUNT); - if (acpi_supported_sstates[sstate] == false) + if (sstate < ACPI_S_STATE_COUNT && + !acpi_supported_sstates[sstate]) return (EOPNOTSUPP); new_stype = acpi_sstate_to_stype(sstate); } From nobody Mon Oct 27 18:51:32 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cwMzn220Fz6FKdD; Mon, 27 Oct 2025 18:51: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cwMzn0FRmz3Hn0; Mon, 27 Oct 2025 18:51:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761591093; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0cIdmbQkkYVcf5lqAut6iKgtKhi6yjSW8YA/PRpbiDo=; b=quVkH/I8RoDNIvNjLyiJxkrrEOcMOIQOjcQjyg4sB9UgZR9kWwzO5i2dprEkDU8bvnf7yu owq2zu2h7TZgVFNVk3S2Dpz4k1I96ZF3H5nAcqyQ+XYN5Qp2Nx4XOCAygjlcl9rfnD8d0X r0emV3UCtc5pC89HlZGHhSkfLrDfRAF99KRdAg6IOYZwzjd2Z15h2HzDU0sWEuTIiRP+wb /s1Yl68uR/BgvarErumLCZVreocKLDVIApJXe6HOWyH+CFDijdeYWToFg5rtEyJxxDa+Sz iY8ffVllgOz+8TD6PbNzG/JfE3iB31qDpmJvlLqldl6Xp+xxZ49v4SzsFHzNVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761591093; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0cIdmbQkkYVcf5lqAut6iKgtKhi6yjSW8YA/PRpbiDo=; b=E2bd6sxcovJ2dNfzTZsFA9/1kjf7I3+BpIYC/8ir2Kb8fOneiGXFHtzX88yX/oPhzbaMNU t7CozquyYsjnONXA/yG2REtmnpFk1creYRZm4MKemKUx5zoPD5wzGxuPv4hnajX407ULfH xxRfWdoR7vYWEV5RrcdaqpksQImQfGXsUYPrJwjDjspc1T78exjAjgOOzhT99e/OymR625 sBujJc8In24TejpbEyEX1m3CAwlsXy2nEVxZYIuTsEMN8bhuIoE6IyzxZOXB3RHbmKtzrR kYPrCr7GNp5/zom2MAk728LOeL1EGGejUwWJqQLo89lY7HE5xT2OHJcYYhqTCw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761591093; a=rsa-sha256; cv=none; b=HqG3KT9KsstJ7NAyM+co9HS8kUPvGmu/7oIoTO89Jdmi6BD+S6sXFFu0N37cFpo2DE4lrf x7K3on2dOmyRtPRkNabOByg7OGO8oNymMGzM/Zxv8XGEVmuLM6kYtXQpgLPi50m5PelPGt GqcLxHM75fqvyxlhtcHu74qlVNUYbYIV6HDmtHPXCuPxnHGEpoLoGVCqomNwOM2fo3b7TF yERHV/0pRfgyx7g6PRyb0GZiZ4Yj8Ardv8X/y3/YyFzdqoEfBnj0rGsgvydByJpvo0uVio mM2ofFJoScYXLZOFuWwNGgpo7v9c9NW84BDg4lHpyie2QtTKDsWYEZCRCNatnA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cwMzm53Spz13d; Mon, 27 Oct 2025 18:51: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 59RIpWF5076385; Mon, 27 Oct 2025 18:51:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59RIpWWJ076382; Mon, 27 Oct 2025 18:51:32 GMT (envelope-from git) Date: Mon, 27 Oct 2025 18:51:32 GMT Message-Id: <202510271851.59RIpWWJ076382@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 3bcd7d4fa46a - main - gone_in(9): bring the manual page up to date List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3bcd7d4fa46a29ec3576d9474e9541510885cfaf Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=3bcd7d4fa46a29ec3576d9474e9541510885cfaf commit 3bcd7d4fa46a29ec3576d9474e9541510885cfaf Author: Gleb Smirnoff AuthorDate: 2025-10-27 18:51:04 +0000 Commit: Gleb Smirnoff CommitDate: 2025-10-27 18:51:04 +0000 gone_in(9): bring the manual page up to date Fixes: 01addd846c64fc2c8be610d83bfdc84ddb57f2ec --- share/man/man9/gone_in.9 | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/share/man/man9/gone_in.9 b/share/man/man9/gone_in.9 index ebdc1ab19bfa..1b60e1eb10c2 100644 --- a/share/man/man9/gone_in.9 +++ b/share/man/man9/gone_in.9 @@ -23,7 +23,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 August 16, 2021 +.Dd June 24, 2025 .Dt GONE_IN 9 .Os .Sh NAME @@ -33,14 +33,15 @@ .Sh SYNOPSIS .In sys/systm.h .Ft void -.Fn gone_in "int major" "const char *msg" +.Fn gone_in "int major" "const char *msg" "..." .Ft void -.Fn gone_in_dev "device_t dev" "int major" "const char *msg" +.Fn gone_in_dev "device_t dev" "int major" "const char *msg" "..." .Sh DESCRIPTION The -.Fn gone_in -functions are used to provide a notice that the kernel is using a driver or -some other functionality that is deprecated, and will be removed in a future +.Nm gone_in +functions are used to provide a notice that the kernel is actively using a +driver or some other functionality that is deprecated, and is planned for +removal in a future .Fx release. The notice is sent to the kernel @@ -51,30 +52,29 @@ The argument specifies the major version of the .Fx release that will remove the deprecated functionality. +The notice shall be printed only once, thus +.Nm +functions are safe to use in often executed code paths. +.Pp +.Nm gone_in_dev +will prepend driver name before the notice. .Pp In releases before .Fa major -the deprecation notice states -.Do -Deprecated code (to be removed in FreeBSD -.Fa major Ns ): -.Fa msg -.Dc . -In releases equal to and after -.Fa major -the notice states +the provided notice will be appended with .Do -Obsolete code will be removed soon: -.Fa msg +To be removed in FreeBSD +.Fa major Ns .Dc . .Sh EXAMPLES .Bd -literal -offset indent void -sample_init(void) +example_api(foo_t *args) { - /* Initialization code omitted. */ + gone_in(16, "Warning! %s[%u] uses obsolete API. ", + curthread->td_proc->p_comm, curthread->td_proc->p_pid); - gone_in(14, "Giant-locked filesystem"); + /* API implementation omitted. */ } int @@ -82,7 +82,7 @@ example_driver_attach(struct example_driver_softc *sc) { /* Attach code omitted. */ - gone_in_dev(sc->dev, 14, "Giant-locked driver"); + gone_in_dev(sc->dev, 16, "driver is deprecated"); } .Ed .Sh HISTORY From nobody Mon Oct 27 19:11:43 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cwNR35Lr0z6FMDf; Mon, 27 Oct 2025 19:11: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cwNR34nYlz3N3C; Mon, 27 Oct 2025 19:11:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761592303; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uCoPQCuz4YpIyWV7+Or8zPeV5YG+nY4enTyQD6xm1bg=; b=gFWB2SLT9h7Wa8YMmrIV34U4yZbJuZqJ6ZlJualnrq057cYuuT43byKh13gc6eKKBBoWSC TeXuJkxI0A26gVcW+jvsHU+peDX8h/bgljzmqRMY5BsXGilEwaaQlOZ36eoL8RMEvTITcq cpdCzFhD1pxKFJydzQYiq7fk/POEqVz6Y5svrwiaJmv/WxWMzNgMHQTZRaGZpne396NQO1 aAoGC7tQxXVqHus+mLgMaK4+AGuMXlof3HjebD7V5spscYURG9wQuBirBm4rtXs+K0NoPs Dp245SZZTOmCUZogD5bCCBz3izLVQd9M7S6NT+2D2lwO9zqeH58VbeT6V0mZ+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761592303; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uCoPQCuz4YpIyWV7+Or8zPeV5YG+nY4enTyQD6xm1bg=; b=mWQiGdta2hTa69/1oilOEdCo/gZhFZONkiR/GqtxziFwwDO2He1w2dy4lVldttFksQO85S do99GoryypZUAJyTH5F5qkJxTrsE8FsbWpkH5kWnI+OMEopUqs57Q1Vq4/TIrXnJ3rEwve e+d1au6LDjs3IFyPHaxs0y4h2Tw3xz7NQ+BXu5DooyXVgYJbObMm5IZlCS+7+3Dor6vRBc MX4skgIJ391KrJs49d5DaC0E7BBO+3C1ynea5WDza/MxdiRea2exRQ29CeBLQ4n1ggiQX3 c5ncwVltQD9eln17yeQxToGFwXXlBS4Sgy/UUKVbKlReuZ/jVZ2Z3l20WqH95g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761592303; a=rsa-sha256; cv=none; b=R2cq9WiF1h3EIiWABFj9GuIYsjuHM2LXKCN+0rRS1/wROO1WPn3ISXY+WQVoedp6mZECw3 gaBor7pSOjF646u0XUi3XgFXJQfMfmgppQztXCQrd9NxAt1PQrM4fRIXc6OSeQqqFcoDfp wP9VzTRVgM8LJ+idHbW53ezMkMHfObp8gWpLWRzGXKY05gQh3kHT5MAyirAtfGNieU2TSy NE5OG84h/i7yB/vF0Itn4akeyuxm7Pcfmb1BCATK093hCPyHsuiunGRB8O73DNIQsmhCGl x2AP9GwhI45iS2hVONTfcmOVQWPmPUoeCZaHa8NdRonoSvnQxWWlVbeW0YC4UQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cwNR347Mcz1nD; Mon, 27 Oct 2025 19:11: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 59RJBhsb017517; Mon, 27 Oct 2025 19:11:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59RJBhnG017514; Mon, 27 Oct 2025 19:11:43 GMT (envelope-from git) Date: Mon, 27 Oct 2025 19:11:43 GMT Message-Id: <202510271911.59RJBhnG017514@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alan Somers Subject: git: d86025c1d49c - main - fusefs: Fix intermittency in the BadServer.ShortWrite test case List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d86025c1d49c84c4dc8c3635c83c078ad56e5a53 Auto-Submitted: auto-generated The branch main has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=d86025c1d49c84c4dc8c3635c83c078ad56e5a53 commit d86025c1d49c84c4dc8c3635c83c078ad56e5a53 Author: Alan Somers AuthorDate: 2025-10-25 22:38:30 +0000 Commit: Alan Somers CommitDate: 2025-10-27 19:11:19 +0000 fusefs: Fix intermittency in the BadServer.ShortWrite test case We were using the m_quit bit for two similar but distinct uses: * To instruct the server to quit * To cope with the kernel forcibly unmounting the fs Fix the intermittent test failure by adding a separate bit, m_expect_unmount, to handle cases like the latter. Reported by: Siva Mahadevan MFC after: 1 week Revied by: Siva Mahadevan Differential Revision: https://reviews.freebsd.org/D53357 --- tests/sys/fs/fusefs/bad_server.cc | 8 ++++---- tests/sys/fs/fusefs/mockfs.cc | 5 +++-- tests/sys/fs/fusefs/mockfs.hh | 3 +++ 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/tests/sys/fs/fusefs/bad_server.cc b/tests/sys/fs/fusefs/bad_server.cc index c3d195735446..825523cac2bb 100644 --- a/tests/sys/fs/fusefs/bad_server.cc +++ b/tests/sys/fs/fusefs/bad_server.cc @@ -64,12 +64,12 @@ TEST_F(BadServer, ShortWrite) out.header.error = 0; out.header.unique = 0; // Asynchronous notification out.expected_errno = EINVAL; - m_mock->write_response(out); /* - * Tell the event loop to quit. The kernel has already disconnected us + * Tell the event loop to quit. The kernel will disconnect us * because of the short write. */ - m_mock->m_quit = true; + m_mock->m_expect_unmount = true; + m_mock->write_response(out); } /* @@ -98,7 +98,7 @@ TEST_F(BadServer, ErrorWithPayload) out.push_back(std::move(out1)); // The kernel may disconnect us for bad behavior, so don't try - // to read any more. + // to read or write any more. m_mock->m_quit = true; })); diff --git a/tests/sys/fs/fusefs/mockfs.cc b/tests/sys/fs/fusefs/mockfs.cc index 55c191716629..b6a32d9b60af 100644 --- a/tests/sys/fs/fusefs/mockfs.cc +++ b/tests/sys/fs/fusefs/mockfs.cc @@ -433,7 +433,8 @@ MockFS::MockFS(int max_read, int max_readahead, bool allow_other, m_child_pid(-1), m_maxwrite(MIN(max_write, max_max_write)), m_nready(-1), - m_quit(false) + m_quit(false), + m_expect_unmount(false) { struct sigaction sa; struct iovec *iov = NULL; @@ -979,7 +980,7 @@ void MockFS::read_request(mockfs_buf_in &in, ssize_t &res) { } res = read(m_fuse_fd, &in, sizeof(in)); - if (res < 0 && !m_quit) { + if (res < 0 && errno != EBADF && !m_quit && !m_expect_unmount) { m_quit = true; FAIL() << "read: " << strerror(errno); } diff --git a/tests/sys/fs/fusefs/mockfs.hh b/tests/sys/fs/fusefs/mockfs.hh index 4b0628d34dd7..f98a5337c9d1 100644 --- a/tests/sys/fs/fusefs/mockfs.hh +++ b/tests/sys/fs/fusefs/mockfs.hh @@ -360,6 +360,9 @@ class MockFS { /* Tell the daemon to shut down ASAP */ bool m_quit; + /* Tell the daemon that the server might forcibly unmount us */ + bool m_expect_unmount; + /* Create a new mockfs and mount it to a tempdir */ MockFS(int max_read, int max_readahead, bool allow_other, bool default_permissions, bool push_symlinks_in, bool ro, From nobody Mon Oct 27 19:37:03 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cwP0H2ZHQz6FPR6; Mon, 27 Oct 2025 19:37:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cwP0H1stdz3RHQ; Mon, 27 Oct 2025 19:37:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761593823; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NYqCO2Tum3vsDvRLo/rpNSFtECybYrqhkJqnYWxEXVU=; b=W+QE4fQQGnqiFIfIgdmKaHweDb8dA13oyprzgph2aDPQRVsR2EPleVIa4kgR/cIayvlw4A FF7lagfRRRflxCEE0up5hDHvK+QPKsc9BiD+tshHWSz69PDEAtS1muyAgqVF5f4QtTzfBn KsH8zq4+5AWMZ/oiTSiwu+442pGga5BSyrnsNwQfwM6s70LFvvi+wXKdJ2Dx8hmY/b2wqG 7uCeLbc9iDV8ZquWiTQJgI18/RhDUFckOqIM1NaixmSISyps5Db4zwMRqzp/uDtu0G5bTn LsCVHGpWjsywcBO5F648zwWxPwfWHeAGmvQwJKSUFOPT5FSlqBjg7KVu+3cG3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761593823; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NYqCO2Tum3vsDvRLo/rpNSFtECybYrqhkJqnYWxEXVU=; b=iK8ae3q6ap95KALogk4WdzkHWx43DpYtAZ+S4hz+iWm0QV3MeWh0YR0iCU2A5tBzKcaBTr L3L/clsHZFNcTxE8PzkGfkRp/LgbPBhEBePb8B65Q1XT1tJCmu2NZtFnhvBLKTjHKVtX3x 0XJY2dHA1Q0zFhUaV/qI6tMOg6b0FyVSA0Vz3vPyOxU7NEB7oHdsvI+5QPFFdMIsCYzZhI RVWMGl8k9eopdM2QzJgkLmfWVwK3onpXyHTVAAYVziAtAG5PYlT8NghbincFqIDYhS2uPG fLkkiVSaqF0hdKm5lhHDYbXIkEVPKZYCe2N6kaNZL1wXy+It/jQ4t3uhDGcHNw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761593823; a=rsa-sha256; cv=none; b=NnuszwI0qg+tTU2dsPpRYQI8ywG5WB2AyJQ3T02hksCn8molKI0XtexUsWmBiak/eWTB6k MNvNWbKJsBoc72Q20+ckUlpvU7Ut/fITik8Lcmq06+rw4xDc/BMvqwxeEuQAUbDzqCvvfV SqIiS0k/Ny0qW7pfxDDnHDM+c4clgX13Idc8G5CHvvYLkSV1t2E7ORfNb9dPXuA99bTMVv CE0Y1r5ia24mC3XEAPWAFbXp7d1Eg2ksBhhSRrzvvR6juCX4Ga6hFGLmGODwjYWQ8dkwQ/ NRcu6dMIu/ncvwEUd5hf9teTJIL96JpZViAjHe7+cyXWM71g2qpkqCbmsbEQqQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cwP0H1Qxjz2l6; Mon, 27 Oct 2025 19:37:03 +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 59RJb3Gf058952; Mon, 27 Oct 2025 19:37:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59RJb3g1058949; Mon, 27 Oct 2025 19:37:03 GMT (envelope-from git) Date: Mon, 27 Oct 2025 19:37:03 GMT Message-Id: <202510271937.59RJb3g1058949@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 514fff24b19f - main - closefrom.2: Add introduction of close_range to HISTORY List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 514fff24b19f69c5f22db380389128eb6bc32ea7 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=514fff24b19f69c5f22db380389128eb6bc32ea7 commit 514fff24b19f69c5f22db380389128eb6bc32ea7 Author: Ed Maste AuthorDate: 2025-10-21 14:51:50 +0000 Commit: Ed Maste CommitDate: 2025-10-27 19:36:39 +0000 closefrom.2: Add introduction of close_range to HISTORY Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D53240 --- lib/libsys/closefrom.2 | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/libsys/closefrom.2 b/lib/libsys/closefrom.2 index 1885a6fdeaa8..e6b4a5a3e9d7 100644 --- a/lib/libsys/closefrom.2 +++ b/lib/libsys/closefrom.2 @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd May 17, 2025 +.Dd October 27, 2025 .Dt CLOSEFROM 2 .Os .Sh NAME @@ -94,6 +94,11 @@ function first appeared in .Fx 8.0 . .Pp The +.Fn close_range +function first appeared in +.Fx 12.2 . +.Pp +The .Dv CLOSE_RANGE_CLOFORK flag appeared in .Fx 15.0 . From nobody Mon Oct 27 19:46:02 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cwPBf4mTWz6FQLk; Mon, 27 Oct 2025 19:46: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cwPBf4W6gz3TKf; Mon, 27 Oct 2025 19:46:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761594362; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wXskvKeonvAts396tE/QcT+9nDd68rU/4yJbhYt/h+0=; b=q2pJP+IWpUdkGzKzojAeUjmsnsUFPaGQXv0gB6u/353h/MbQlLT0WBmgbKURKy1C3RwTCk 5yh5lvcnC5lQ+04M1TkYan/W9DfFrohZkD/z51V0amw2gWDPjlz2ZgYTguKinFeMxDFqPL KC4ylqae/nTv7j0CWzvdaCtP5QAdxNSshvSIHGzHmWHXoTouKaaxX1GQ/LC134cC9kqvlj dklj1xQ6PN6OcQhHJvoCJAp3Aye89lPcOUzF6lo5db18EdkWMOIw5rWtGL3xbTo7HpH98a gBYCC9o1cejMR1YA99M8uCso/2qsQGElAoQYxw23bE/oxJiylijxGFmOkAJS+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761594362; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wXskvKeonvAts396tE/QcT+9nDd68rU/4yJbhYt/h+0=; b=YcPugl5ImcVm8UTYu0/SRVtLxIDb0mXWLWPBOx1TC3zcTheLTP4ChuhwbVUNsgarEnOF64 AJWyeJ/YASyA7hvGrPYsdMXOal/RXfVv4IoQKTSH7R8CFuKpm50z+s8ZLviFinedar4yXt wc3HPL9noJnvDX92AztbXh+Yn6mHCmbMnLr8AubqHU/kkVMHlIwNLvd6OVnI6uSPdupjGj u3/999cr5Qumw3DZev47ef1C61wxnIpP9pliljAhhxlrjrQ62gctw8WCjKuIZOPFV0+E4O SqIgp514nN282o6roCEsoYbPtFQuo1wGfgKTCotFyK5LH+e2e61fQl0VcL/ovw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761594362; a=rsa-sha256; cv=none; b=T3ZyyMtccdIkYQafGxWy27AJ49jG8aTJ0Q2+ZsPYj1vIjhNeKE/jt/Eo/2zUJK356up34U ZnqfblL7PKGjuDT8x2y4I7GeDA+TO9qADcW8uBd/hbDOgdWgbRaGkLVJLwnz1UT0PC4iP4 KfHjtzmsBac55xzmm62st03pKEnddX8Au+0IBF6mrxJt8+oFRSRdtmpZmgGiUqGTpWQqLN JJ2crWW+np3K0ZJVrNyuqv82ohSiJWE9UJN7r60vVXE8eTeg9BXS3hPQt8tA1maEKyLMBo U+MykAU5VWDT2doFsEHY238kEGNxliMwcnBfAbm3sUiS3VBBNMiyzCWBXCvXWA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cwPBf3yd8z2gF; Mon, 27 Oct 2025 19:46: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 59RJk2ZL077445; Mon, 27 Oct 2025 19:46:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59RJk2Oi077442; Mon, 27 Oct 2025 19:46:02 GMT (envelope-from git) Date: Mon, 27 Oct 2025 19:46:02 GMT Message-Id: <202510271946.59RJk2Oi077442@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: c59aab9a5b39 - main - ipfw: Retire obsolete compat code List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c59aab9a5b3970b3ccec744f759e6cb87e938dbe Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=c59aab9a5b3970b3ccec744f759e6cb87e938dbe commit c59aab9a5b3970b3ccec744f759e6cb87e938dbe Author: Ed Maste AuthorDate: 2025-10-24 20:15:01 +0000 Commit: Ed Maste CommitDate: 2025-10-27 19:45:27 +0000 ipfw: Retire obsolete compat code The current IPFW version 3 dates to 2010 (commit cc4d3c30ea28, "Bring in the most recent version of ipfw and dummynet, developed"). The compat code for FreeBSD 8 and earlier has a number of issues and is no longer needed, so remove it. Reported by: Ilja Van Sprundel Reviewed by: ae, glebius Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D53343 --- sys/conf/files | 1 - sys/modules/dummynet/Makefile | 3 +- sys/netinet/raw_ip.c | 4 - sys/netpfil/ipfw/ip_dn_glue.c | 858 --------------------------------------- sys/netpfil/ipfw/ip_dn_private.h | 10 +- sys/netpfil/ipfw/ip_dummynet.c | 96 ++--- 6 files changed, 29 insertions(+), 943 deletions(-) diff --git a/sys/conf/files b/sys/conf/files index 13b74e2fc44f..0a24b5e1e39b 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -4550,7 +4550,6 @@ netpfil/ipfw/dn_sched_rr.c optional inet dummynet netpfil/ipfw/dn_sched_wf2q.c optional inet dummynet netpfil/ipfw/ip_dummynet.c optional inet dummynet netpfil/ipfw/ip_dn_io.c optional inet dummynet -netpfil/ipfw/ip_dn_glue.c optional inet dummynet netpfil/ipfw/ip_fw2.c optional inet ipfirewall netpfil/ipfw/ip_fw_bpf.c optional inet ipfirewall netpfil/ipfw/ip_fw_dynamic.c optional inet ipfirewall \ diff --git a/sys/modules/dummynet/Makefile b/sys/modules/dummynet/Makefile index 4ff023e6bca5..a645c1673167 100644 --- a/sys/modules/dummynet/Makefile +++ b/sys/modules/dummynet/Makefile @@ -1,7 +1,6 @@ .PATH: ${SRCTOP}/sys/netpfil/ipfw KMOD= dummynet -SRCS= ip_dummynet.c -SRCS+= ip_dn_glue.c ip_dn_io.c +SRCS= ip_dummynet.c ip_dn_io.c SRCS+= dn_aqm_codel.c dn_aqm_pie.c SRCS+= dn_heap.c dn_sched_fifo.c dn_sched_qfq.c dn_sched_rr.c dn_sched_wf2q.c SRCS+= dn_sched_prio.c dn_sched_fq_codel.c dn_sched_fq_pie.c diff --git a/sys/netinet/raw_ip.c b/sys/netinet/raw_ip.c index 66070faf97e9..bfe608be6b36 100644 --- a/sys/netinet/raw_ip.c +++ b/sys/netinet/raw_ip.c @@ -680,7 +680,6 @@ rip_ctloutput(struct socket *so, struct sockopt *sopt) break; case IP_DUMMYNET3: /* generic dummynet v.3 functions */ - case IP_DUMMYNET_GET: if (ip_dn_ctl_ptr != NULL) error = ip_dn_ctl_ptr(sopt); else @@ -747,9 +746,6 @@ rip_ctloutput(struct socket *so, struct sockopt *sopt) break; case IP_DUMMYNET3: /* generic dummynet v.3 functions */ - case IP_DUMMYNET_CONFIGURE: - case IP_DUMMYNET_DEL: - case IP_DUMMYNET_FLUSH: if (ip_dn_ctl_ptr != NULL) error = ip_dn_ctl_ptr(sopt); else diff --git a/sys/netpfil/ipfw/ip_dn_glue.c b/sys/netpfil/ipfw/ip_dn_glue.c deleted file mode 100644 index 0412b730e4df..000000000000 --- a/sys/netpfil/ipfw/ip_dn_glue.c +++ /dev/null @@ -1,858 +0,0 @@ -/*- - * SPDX-License-Identifier: BSD-2-Clause - * - * Copyright (c) 2010 Riccardo Panicucci, Universita` di Pisa - * All rights reserved - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -/* - * - * Binary compatibility support for /sbin/ipfw RELENG_7 and RELENG_8 - */ - -#include "opt_inet6.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include /* IFNAMSIZ, struct ifaddr, ifq head, lock.h mutex.h */ -#include -#include /* ip_output(), IP_FORWARDING */ -#include -#include - -#include -#include -#include -#ifdef NEW_AQM -#include -#endif -#include - -/* FREEBSD7.2 ip_dummynet.h r191715*/ - -struct dn_heap_entry7 { - int64_t key; /* sorting key. Topmost element is smallest one */ - void *object; /* object pointer */ -}; - -struct dn_heap7 { - int size; - int elements; - int offset; /* XXX if > 0 this is the offset of direct ptr to obj */ - struct dn_heap_entry7 *p; /* really an array of "size" entries */ -}; - -/* Common to 7.2 and 8 */ -struct dn_flow_set { - SLIST_ENTRY(dn_flow_set) next; /* linked list in a hash slot */ - - u_short fs_nr ; /* flow_set number */ - u_short flags_fs; -#define DNOLD_HAVE_FLOW_MASK 0x0001 -#define DNOLD_IS_RED 0x0002 -#define DNOLD_IS_GENTLE_RED 0x0004 -#define DNOLD_QSIZE_IS_BYTES 0x0008 /* queue size is measured in bytes */ -#define DNOLD_NOERROR 0x0010 /* do not report ENOBUFS on drops */ -#define DNOLD_HAS_PROFILE 0x0020 /* the pipe has a delay profile. */ -#define DNOLD_IS_PIPE 0x4000 -#define DNOLD_IS_QUEUE 0x8000 - - struct dn_pipe7 *pipe ; /* pointer to parent pipe */ - u_short parent_nr ; /* parent pipe#, 0 if local to a pipe */ - - int weight ; /* WFQ queue weight */ - int qsize ; /* queue size in slots or bytes */ - int plr[4] ; /* pkt loss rate (2^31-1 means 100%) */ - - struct ipfw_flow_id flow_mask ; - - /* hash table of queues onto this flow_set */ - int rq_size ; /* number of slots */ - int rq_elements ; /* active elements */ - struct dn_flow_queue7 **rq ; /* array of rq_size entries */ - - u_int32_t last_expired ; /* do not expire too frequently */ - int backlogged ; /* #active queues for this flowset */ - - /* RED parameters */ -#define SCALE_RED 16 -#define SCALE(x) ( (x) << SCALE_RED ) -#define SCALE_VAL(x) ( (x) >> SCALE_RED ) -#define SCALE_MUL(x,y) ( ( (x) * (y) ) >> SCALE_RED ) - int w_q ; /* queue weight (scaled) */ - int max_th ; /* maximum threshold for queue (scaled) */ - int min_th ; /* minimum threshold for queue (scaled) */ - int max_p ; /* maximum value for p_b (scaled) */ - u_int c_1 ; /* max_p/(max_th-min_th) (scaled) */ - u_int c_2 ; /* max_p*min_th/(max_th-min_th) (scaled) */ - u_int c_3 ; /* for GRED, (1-max_p)/max_th (scaled) */ - u_int c_4 ; /* for GRED, 1 - 2*max_p (scaled) */ - u_int * w_q_lookup ; /* lookup table for computing (1-w_q)^t */ - u_int lookup_depth ; /* depth of lookup table */ - int lookup_step ; /* granularity inside the lookup table */ - int lookup_weight ; /* equal to (1-w_q)^t / (1-w_q)^(t+1) */ - int avg_pkt_size ; /* medium packet size */ - int max_pkt_size ; /* max packet size */ -}; -SLIST_HEAD(dn_flow_set_head, dn_flow_set); - -#define DN_IS_PIPE 0x4000 -#define DN_IS_QUEUE 0x8000 -struct dn_flow_queue7 { - struct dn_flow_queue7 *next ; - struct ipfw_flow_id id ; - - struct mbuf *head, *tail ; /* queue of packets */ - u_int len ; - u_int len_bytes ; - - u_long numbytes; - - u_int64_t tot_pkts ; /* statistics counters */ - u_int64_t tot_bytes ; - u_int32_t drops ; - - int hash_slot ; /* debugging/diagnostic */ - - /* RED parameters */ - int avg ; /* average queue length est. (scaled) */ - int count ; /* arrivals since last RED drop */ - int random ; /* random value (scaled) */ - u_int32_t q_time; /* start of queue idle time */ - - /* WF2Q+ support */ - struct dn_flow_set *fs ; /* parent flow set */ - int heap_pos ; /* position (index) of struct in heap */ - int64_t sched_time ; /* current time when queue enters ready_heap */ - - int64_t S,F ; /* start time, finish time */ -}; - -struct dn_pipe7 { /* a pipe */ - SLIST_ENTRY(dn_pipe7) next; /* linked list in a hash slot */ - - int pipe_nr ; /* number */ - uint32_t bandwidth; /* really, bytes/tick. */ - int delay ; /* really, ticks */ - - struct mbuf *head, *tail ; /* packets in delay line */ - - /* WF2Q+ */ - struct dn_heap7 scheduler_heap ; /* top extract - key Finish time*/ - struct dn_heap7 not_eligible_heap; /* top extract- key Start time */ - struct dn_heap7 idle_heap ; /* random extract - key Start=Finish time */ - - int64_t V ; /* virtual time */ - int sum; /* sum of weights of all active sessions */ - - int numbytes; - - int64_t sched_time ; /* time pipe was scheduled in ready_heap */ - - /* - * When the tx clock come from an interface (if_name[0] != '\0'), its name - * is stored below, whereas the ifp is filled when the rule is configured. - */ - char if_name[IFNAMSIZ]; - struct ifnet *ifp ; - int ready ; /* set if ifp != NULL and we got a signal from it */ - - struct dn_flow_set fs ; /* used with fixed-rate flows */ -}; -SLIST_HEAD(dn_pipe_head7, dn_pipe7); - -/* FREEBSD8 ip_dummynet.h r196045 */ -struct dn_flow_queue8 { - struct dn_flow_queue8 *next ; - struct ipfw_flow_id id ; - - struct mbuf *head, *tail ; /* queue of packets */ - u_int len ; - u_int len_bytes ; - - uint64_t numbytes ; /* credit for transmission (dynamic queues) */ - int64_t extra_bits; /* extra bits simulating unavailable channel */ - - u_int64_t tot_pkts ; /* statistics counters */ - u_int64_t tot_bytes ; - u_int32_t drops ; - - int hash_slot ; /* debugging/diagnostic */ - - /* RED parameters */ - int avg ; /* average queue length est. (scaled) */ - int count ; /* arrivals since last RED drop */ - int random ; /* random value (scaled) */ - int64_t idle_time; /* start of queue idle time */ - - /* WF2Q+ support */ - struct dn_flow_set *fs ; /* parent flow set */ - int heap_pos ; /* position (index) of struct in heap */ - int64_t sched_time ; /* current time when queue enters ready_heap */ - - int64_t S,F ; /* start time, finish time */ -}; - -struct dn_pipe8 { /* a pipe */ - SLIST_ENTRY(dn_pipe8) next; /* linked list in a hash slot */ - - int pipe_nr ; /* number */ - uint32_t bandwidth; /* really, bytes/tick. */ - int delay ; /* really, ticks */ - - struct mbuf *head, *tail ; /* packets in delay line */ - - /* WF2Q+ */ - struct dn_heap7 scheduler_heap ; /* top extract - key Finish time*/ - struct dn_heap7 not_eligible_heap; /* top extract- key Start time */ - struct dn_heap7 idle_heap ; /* random extract - key Start=Finish time */ - - int64_t V ; /* virtual time */ - int sum; /* sum of weights of all active sessions */ - - /* Same as in dn_flow_queue, numbytes can become large */ - int64_t numbytes; /* bits I can transmit (more or less). */ - uint64_t burst; /* burst size, scaled: bits * hz */ - - int64_t sched_time ; /* time pipe was scheduled in ready_heap */ - int64_t idle_time; /* start of pipe idle time */ - - char if_name[IFNAMSIZ]; - struct ifnet *ifp ; - int ready ; /* set if ifp != NULL and we got a signal from it */ - - struct dn_flow_set fs ; /* used with fixed-rate flows */ - - /* fields to simulate a delay profile */ -#define ED_MAX_NAME_LEN 32 - char name[ED_MAX_NAME_LEN]; - int loss_level; - int samples_no; - int *samples; -}; - -#define ED_MAX_SAMPLES_NO 1024 -struct dn_pipe_max8 { - struct dn_pipe8 pipe; - int samples[ED_MAX_SAMPLES_NO]; -}; -SLIST_HEAD(dn_pipe_head8, dn_pipe8); - -/* - * Changes from 7.2 to 8: - * dn_pipe: - * numbytes from int to int64_t - * add burst (int64_t) - * add idle_time (int64_t) - * add profile - * add struct dn_pipe_max - * add flag DN_HAS_PROFILE - * - * dn_flow_queue - * numbytes from u_long to int64_t - * add extra_bits (int64_t) - * q_time from u_int32_t to int64_t and name idle_time - * - * dn_flow_set unchanged - * - */ - -/* NOTE:XXX copied from dummynet.c */ -#define O_NEXT(p, len) ((void *)((char *)p + len)) -static void -oid_fill(struct dn_id *oid, int len, int type, uintptr_t id) -{ - oid->len = len; - oid->type = type; - oid->subtype = 0; - oid->id = id; -} -/* make room in the buffer and move the pointer forward */ -static void * -o_next(struct dn_id **o, int len, int type) -{ - struct dn_id *ret = *o; - oid_fill(ret, len, type, 0); - *o = O_NEXT(*o, len); - return ret; -} - -static size_t pipesize7 = sizeof(struct dn_pipe7); -static size_t pipesize8 = sizeof(struct dn_pipe8); -static size_t pipesizemax8 = sizeof(struct dn_pipe_max8); - -/* Indicate 'ipfw' version - * 1: from FreeBSD 7.2 - * 0: from FreeBSD 8 - * -1: unknown (for now is unused) - * - * It is update when a IP_DUMMYNET_DEL or IP_DUMMYNET_CONFIGURE request arrives - * NOTE: if a IP_DUMMYNET_GET arrives and the 'ipfw' version is unknown, - * it is suppose to be the FreeBSD 8 version. - */ -static int is7 = 0; - -static int -convertflags2new(int src) -{ - int dst = 0; - - if (src & DNOLD_HAVE_FLOW_MASK) - dst |= DN_HAVE_MASK; - if (src & DNOLD_QSIZE_IS_BYTES) - dst |= DN_QSIZE_BYTES; - if (src & DNOLD_NOERROR) - dst |= DN_NOERROR; - if (src & DNOLD_IS_RED) - dst |= DN_IS_RED; - if (src & DNOLD_IS_GENTLE_RED) - dst |= DN_IS_GENTLE_RED; - if (src & DNOLD_HAS_PROFILE) - dst |= DN_HAS_PROFILE; - - return dst; -} - -static int -convertflags2old(int src) -{ - int dst = 0; - - if (src & DN_HAVE_MASK) - dst |= DNOLD_HAVE_FLOW_MASK; - if (src & DN_IS_RED) - dst |= DNOLD_IS_RED; - if (src & DN_IS_GENTLE_RED) - dst |= DNOLD_IS_GENTLE_RED; - if (src & DN_NOERROR) - dst |= DNOLD_NOERROR; - if (src & DN_HAS_PROFILE) - dst |= DNOLD_HAS_PROFILE; - if (src & DN_QSIZE_BYTES) - dst |= DNOLD_QSIZE_IS_BYTES; - - return dst; -} - -static int -dn_compat_del(void *v) -{ - struct dn_pipe7 *p = (struct dn_pipe7 *) v; - struct dn_pipe8 *p8 = (struct dn_pipe8 *) v; - struct { - struct dn_id oid; - uintptr_t a[1]; /* add more if we want a list */ - } cmd; - - /* XXX DN_API_VERSION ??? */ - oid_fill((void *)&cmd, sizeof(cmd), DN_CMD_DELETE, DN_API_VERSION); - - if (is7) { - if (p->pipe_nr == 0 && p->fs.fs_nr == 0) - return EINVAL; - if (p->pipe_nr != 0 && p->fs.fs_nr != 0) - return EINVAL; - } else { - if (p8->pipe_nr == 0 && p8->fs.fs_nr == 0) - return EINVAL; - if (p8->pipe_nr != 0 && p8->fs.fs_nr != 0) - return EINVAL; - } - - if (p->pipe_nr != 0) { /* pipe x delete */ - cmd.a[0] = p->pipe_nr; - cmd.oid.subtype = DN_LINK; - } else { /* queue x delete */ - cmd.oid.subtype = DN_FS; - cmd.a[0] = (is7) ? p->fs.fs_nr : p8->fs.fs_nr; - } - - return do_config(&cmd, cmd.oid.len); -} - -static int -dn_compat_config_queue(struct dn_fs *fs, void* v) -{ - struct dn_pipe7 *p7 = (struct dn_pipe7 *)v; - struct dn_pipe8 *p8 = (struct dn_pipe8 *)v; - struct dn_flow_set *f; - - if (is7) - f = &p7->fs; - else - f = &p8->fs; - - fs->fs_nr = f->fs_nr; - fs->sched_nr = f->parent_nr; - fs->flow_mask = f->flow_mask; - fs->buckets = f->rq_size; - fs->qsize = f->qsize; - fs->plr[0] = f->plr[0]; - fs->plr[1] = f->plr[1]; - fs->plr[2] = f->plr[2]; - fs->plr[3] = f->plr[3]; - fs->par[0] = f->weight; - fs->flags = convertflags2new(f->flags_fs); - if (fs->flags & DN_IS_GENTLE_RED || fs->flags & DN_IS_RED) { - fs->w_q = f->w_q; - fs->max_th = f->max_th; - fs->min_th = f->min_th; - fs->max_p = f->max_p; - } - - return 0; -} - -static int -dn_compat_config_pipe(struct dn_sch *sch, struct dn_link *p, - struct dn_fs *fs, void* v) -{ - struct dn_pipe7 *p7 = (struct dn_pipe7 *)v; - struct dn_pipe8 *p8 = (struct dn_pipe8 *)v; - int i = p7->pipe_nr; - - sch->sched_nr = i; - sch->oid.subtype = 0; - p->link_nr = i; - fs->fs_nr = i + 2*DN_MAX_ID; - fs->sched_nr = i + DN_MAX_ID; - - /* Common to 7 and 8 */ - p->bandwidth = p7->bandwidth; - p->delay = p7->delay; - if (!is7) { - /* FreeBSD 8 has burst */ - p->burst = p8->burst; - } - - /* fill the fifo flowset */ - dn_compat_config_queue(fs, v); - fs->fs_nr = i + 2*DN_MAX_ID; - fs->sched_nr = i + DN_MAX_ID; - - /* Move scheduler related parameter from fs to sch */ - sch->buckets = fs->buckets; /*XXX*/ - fs->buckets = 0; - if (fs->flags & DN_HAVE_MASK) { - sch->flags |= DN_HAVE_MASK; - fs->flags &= ~DN_HAVE_MASK; - sch->sched_mask = fs->flow_mask; - bzero(&fs->flow_mask, sizeof(struct ipfw_flow_id)); - } - - return 0; -} - -static int -dn_compat_config_profile(struct dn_profile *pf, struct dn_link *p, - void *v) -{ - struct dn_pipe8 *p8 = (struct dn_pipe8 *)v; - - p8->samples = &(((struct dn_pipe_max8 *)p8)->samples[0]); - - pf->link_nr = p->link_nr; - pf->loss_level = p8->loss_level; -// pf->bandwidth = p->bandwidth; //XXX bandwidth redundant? - pf->samples_no = p8->samples_no; - strncpy(pf->name, p8->name,sizeof(pf->name)); - bcopy(p8->samples, pf->samples, sizeof(pf->samples)); - - return 0; -} - -/* - * If p->pipe_nr != 0 the command is 'pipe x config', so need to create - * the three main struct, else only a flowset is created - */ -static int -dn_compat_configure(void *v) -{ - struct dn_id *buf = NULL, *base; - struct dn_sch *sch = NULL; - struct dn_link *p = NULL; - struct dn_fs *fs = NULL; - struct dn_profile *pf = NULL; - int lmax; - int error; - - struct dn_pipe7 *p7 = (struct dn_pipe7 *)v; - struct dn_pipe8 *p8 = (struct dn_pipe8 *)v; - - int i; /* number of object to configure */ - - lmax = sizeof(struct dn_id); /* command header */ - lmax += sizeof(struct dn_sch) + sizeof(struct dn_link) + - sizeof(struct dn_fs) + sizeof(struct dn_profile); - - base = buf = malloc(lmax, M_DUMMYNET, M_WAITOK|M_ZERO); - o_next(&buf, sizeof(struct dn_id), DN_CMD_CONFIG); - base->id = DN_API_VERSION; - - /* pipe_nr is the same in p7 and p8 */ - i = p7->pipe_nr; - if (i != 0) { /* pipe config */ - sch = o_next(&buf, sizeof(*sch), DN_SCH); - p = o_next(&buf, sizeof(*p), DN_LINK); - fs = o_next(&buf, sizeof(*fs), DN_FS); - - error = dn_compat_config_pipe(sch, p, fs, v); - if (error) { - free(buf, M_DUMMYNET); - return error; - } - if (!is7 && p8->samples_no > 0) { - /* Add profiles*/ - pf = o_next(&buf, sizeof(*pf), DN_PROFILE); - error = dn_compat_config_profile(pf, p, v); - if (error) { - free(buf, M_DUMMYNET); - return error; - } - } - } else { /* queue config */ - fs = o_next(&buf, sizeof(*fs), DN_FS); - error = dn_compat_config_queue(fs, v); - if (error) { - free(buf, M_DUMMYNET); - return error; - } - } - error = do_config(base, (char *)buf - (char *)base); - - if (buf) - free(buf, M_DUMMYNET); - return error; -} - -int -dn_compat_calc_size(void) -{ - int need = 0; - /* XXX use FreeBSD 8 struct size */ - /* NOTE: - * - half scheduler: schk_count/2 - * - all flowset: fsk_count - * - all flowset queues: queue_count - * - all pipe queue: si_count - */ - need += V_dn_cfg.schk_count * sizeof(struct dn_pipe8) / 2; - need += V_dn_cfg.fsk_count * sizeof(struct dn_flow_set); - need += V_dn_cfg.si_count * sizeof(struct dn_flow_queue8); - need += V_dn_cfg.queue_count * sizeof(struct dn_flow_queue8); - - return need; -} - -int -dn_c_copy_q (void *_ni, void *arg) -{ - struct copy_args *a = arg; - struct dn_flow_queue7 *fq7 = (struct dn_flow_queue7 *)*a->start; - struct dn_flow_queue8 *fq8 = (struct dn_flow_queue8 *)*a->start; - struct dn_flow *ni = (struct dn_flow *)_ni; - int size = 0; - - /* XXX hash slot not set */ - /* No difference between 7.2/8 */ - fq7->len = ni->length; - fq7->len_bytes = ni->len_bytes; - fq7->id = ni->fid; - - if (is7) { - size = sizeof(struct dn_flow_queue7); - fq7->tot_pkts = ni->tot_pkts; - fq7->tot_bytes = ni->tot_bytes; - fq7->drops = ni->drops; - } else { - size = sizeof(struct dn_flow_queue8); - fq8->tot_pkts = ni->tot_pkts; - fq8->tot_bytes = ni->tot_bytes; - fq8->drops = ni->drops; - } - - *a->start += size; - return 0; -} - -int -dn_c_copy_pipe(struct dn_schk *s, struct copy_args *a, int nq) -{ - struct dn_link *l = &s->link; - struct dn_fsk *f = s->fs; - - struct dn_pipe7 *pipe7 = (struct dn_pipe7 *)*a->start; - struct dn_pipe8 *pipe8 = (struct dn_pipe8 *)*a->start; - struct dn_flow_set *fs; - int size = 0; - - if (is7) { - fs = &pipe7->fs; - size = sizeof(struct dn_pipe7); - } else { - fs = &pipe8->fs; - size = sizeof(struct dn_pipe8); - } - - /* These 4 field are the same in pipe7 and pipe8 */ - pipe7->next.sle_next = (struct dn_pipe7 *)DN_IS_PIPE; - pipe7->bandwidth = l->bandwidth; - pipe7->delay = l->delay * 1000 / hz; - pipe7->pipe_nr = l->link_nr - DN_MAX_ID; - - if (!is7) { - if (s->profile) { - struct dn_profile *pf = s->profile; - strncpy(pipe8->name, pf->name, sizeof(pf->name)); - pipe8->loss_level = pf->loss_level; - pipe8->samples_no = pf->samples_no; - } - pipe8->burst = div64(l->burst , 8 * hz); - } - - fs->flow_mask = s->sch.sched_mask; - fs->rq_size = s->sch.buckets ? s->sch.buckets : 1; - - fs->parent_nr = l->link_nr - DN_MAX_ID; - fs->qsize = f->fs.qsize; - fs->plr[0] = f->fs.plr[0]; - fs->plr[1] = f->fs.plr[1]; - fs->plr[2] = f->fs.plr[2]; - fs->plr[3] = f->fs.plr[3]; - fs->w_q = f->fs.w_q; - fs->max_th = f->max_th; - fs->min_th = f->min_th; - fs->max_p = f->fs.max_p; - fs->rq_elements = nq; - - fs->flags_fs = convertflags2old(f->fs.flags); - - *a->start += size; - return 0; -} - -int -dn_compat_copy_pipe(struct copy_args *a, void *_o) -{ - int have = a->end - *a->start; - int need = 0; - int pipe_size = sizeof(struct dn_pipe8); - int queue_size = sizeof(struct dn_flow_queue8); - int n_queue = 0; /* number of queues */ - - struct dn_schk *s = (struct dn_schk *)_o; - /* calculate needed space: - * - struct dn_pipe - * - if there are instances, dn_queue * n_instances - */ - n_queue = (s->sch.flags & DN_HAVE_MASK ? dn_ht_entries(s->siht) : - (s->siht ? 1 : 0)); - need = pipe_size + queue_size * n_queue; - if (have < need) { - D("have %d < need %d", have, need); - return 1; - } - /* copy pipe */ - dn_c_copy_pipe(s, a, n_queue); - - /* copy queues */ - if (s->sch.flags & DN_HAVE_MASK) - dn_ht_scan(s->siht, dn_c_copy_q, a); - else if (s->siht) - dn_c_copy_q(s->siht, a); - return 0; -} - -int -dn_c_copy_fs(struct dn_fsk *f, struct copy_args *a, int nq) -{ - struct dn_flow_set *fs = (struct dn_flow_set *)*a->start; - - fs->next.sle_next = (struct dn_flow_set *)DN_IS_QUEUE; - fs->fs_nr = f->fs.fs_nr; - fs->qsize = f->fs.qsize; - fs->plr[0] = f->fs.plr[0]; - fs->plr[1] = f->fs.plr[1]; - fs->plr[2] = f->fs.plr[2]; - fs->plr[3] = f->fs.plr[3]; - fs->w_q = f->fs.w_q; - fs->max_th = f->max_th; - fs->min_th = f->min_th; - fs->max_p = f->fs.max_p; - fs->flow_mask = f->fs.flow_mask; - fs->rq_elements = nq; - fs->rq_size = (f->fs.buckets ? f->fs.buckets : 1); - fs->parent_nr = f->fs.sched_nr; - fs->weight = f->fs.par[0]; - - fs->flags_fs = convertflags2old(f->fs.flags); - *a->start += sizeof(struct dn_flow_set); - return 0; -} - -int -dn_compat_copy_queue(struct copy_args *a, void *_o) -{ - int have = a->end - *a->start; - int need = 0; - int fs_size = sizeof(struct dn_flow_set); - int queue_size = sizeof(struct dn_flow_queue8); - - struct dn_fsk *fs = (struct dn_fsk *)_o; - int n_queue = 0; /* number of queues */ - - n_queue = (fs->fs.flags & DN_HAVE_MASK ? dn_ht_entries(fs->qht) : - (fs->qht ? 1 : 0)); - - need = fs_size + queue_size * n_queue; - if (have < need) { - D("have < need"); - return 1; - } - - /* copy flowset */ - dn_c_copy_fs(fs, a, n_queue); - - /* copy queues */ - if (fs->fs.flags & DN_HAVE_MASK) - dn_ht_scan(fs->qht, dn_c_copy_q, a); - else if (fs->qht) - dn_c_copy_q(fs->qht, a); - - return 0; -} - -int -copy_data_helper_compat(void *_o, void *_arg) -{ - struct copy_args *a = _arg; - - if (a->type == DN_COMPAT_PIPE) { - struct dn_schk *s = _o; - if (s->sch.oid.subtype != 1 || s->sch.sched_nr <= DN_MAX_ID) { - return 0; /* not old type */ - } - /* copy pipe parameters, and if instance exists, copy - * other parameters and eventually queues. - */ - if(dn_compat_copy_pipe(a, _o)) - return DNHT_SCAN_END; - } else if (a->type == DN_COMPAT_QUEUE) { - struct dn_fsk *fs = _o; - if (fs->fs.fs_nr >= DN_MAX_ID) - return 0; - if (dn_compat_copy_queue(a, _o)) - return DNHT_SCAN_END; - } - return 0; -} - -/* Main function to manage old requests */ -int -ip_dummynet_compat(struct sockopt *sopt) -{ - int error=0; - void *v = NULL; - struct dn_id oid; - - /* Length of data, used to found ipfw version... */ - int len = sopt->sopt_valsize; - - /* len can be 0 if command was dummynet_flush */ - if (len == pipesize7) { - D("setting compatibility with FreeBSD 7.2"); - is7 = 1; - } - else if (len == pipesize8 || len == pipesizemax8) { - D("setting compatibility with FreeBSD 8"); - is7 = 0; - } - - switch (sopt->sopt_name) { - default: - printf("dummynet: -- unknown option %d", sopt->sopt_name); - error = EINVAL; - break; - - case IP_DUMMYNET_FLUSH: - oid_fill(&oid, sizeof(oid), DN_CMD_FLUSH, DN_API_VERSION); - do_config(&oid, oid.len); - break; - - case IP_DUMMYNET_DEL: - v = malloc(len, M_TEMP, M_WAITOK); - error = sooptcopyin(sopt, v, len, len); - if (error) - break; - error = dn_compat_del(v); - free(v, M_TEMP); - break; - - case IP_DUMMYNET_CONFIGURE: - v = malloc(len, M_TEMP, M_NOWAIT); - if (v == NULL) { - error = ENOMEM; - break; - } - error = sooptcopyin(sopt, v, len, len); - if (error) - break; - error = dn_compat_configure(v); - free(v, M_TEMP); - break; - - case IP_DUMMYNET_GET: { - void *buf; - int ret; - int original_size = sopt->sopt_valsize; - int size; - - ret = dummynet_get(sopt, &buf); - if (ret) - return 0;//XXX ? - size = sopt->sopt_valsize; - sopt->sopt_valsize = original_size; - D("size=%d, buf=%p", size, buf); - ret = sooptcopyout(sopt, buf, size); - if (ret) - printf(" %s ERROR sooptcopyout\n", __FUNCTION__); - if (buf) - free(buf, M_DUMMYNET); - } - } - - return error; -} diff --git a/sys/netpfil/ipfw/ip_dn_private.h b/sys/netpfil/ipfw/ip_dn_private.h index 756a997b6ec3..9a43b86791e0 100644 --- a/sys/netpfil/ipfw/ip_dn_private.h +++ b/sys/netpfil/ipfw/ip_dn_private.h @@ -437,15 +437,7 @@ struct copy_args { }; struct sockopt; -int ip_dummynet_compat(struct sockopt *sopt); -int dummynet_get(struct sockopt *sopt, void **compat); -int dn_c_copy_q (void *_ni, void *arg); -int dn_c_copy_pipe(struct dn_schk *s, struct copy_args *a, int nq); -int dn_c_copy_fs(struct dn_fsk *f, struct copy_args *a, int nq); -int dn_compat_copy_queue(struct copy_args *a, void *_o); -int dn_compat_copy_pipe(struct copy_args *a, void *_o); -int copy_data_helper_compat(void *_o, void *_arg); -int dn_compat_calc_size(void); +int dummynet_get(struct sockopt *sopt); int do_config(void *p, size_t l); /* function to drain idle object */ diff --git a/sys/netpfil/ipfw/ip_dummynet.c b/sys/netpfil/ipfw/ip_dummynet.c index d522f9da0fbe..61442c617753 100644 --- a/sys/netpfil/ipfw/ip_dummynet.c +++ b/sys/netpfil/ipfw/ip_dummynet.c @@ -2198,9 +2198,6 @@ compute_space(struct dn_id *cmd, struct copy_args *a) case DN_FS: /* queue show */ x = DN_C_FS | DN_C_QUEUE; break; - case DN_GET_COMPAT: /* compatibility mode */ - need = dn_compat_calc_size(); - break; } a->flags = x; if (x & DN_C_SCH) { @@ -2226,11 +2223,9 @@ compute_space(struct dn_id *cmd, struct copy_args *a) } /* - * If compat != NULL dummynet_get is called in compatibility mode. - * *compat will be the pointer to the buffer to pass to ipfw */ int -dummynet_get(struct sockopt *sopt, void **compat) *** 135 LINES SKIPPED *** From nobody Mon Oct 27 19:57:27 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cwPRq6JJWz6FRVl; Mon, 27 Oct 2025 19:57:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cwPRq5kwZz3Xjl; Mon, 27 Oct 2025 19:57:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761595047; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=f3TjxfGR9/8B4PiPaAG3DxPCoVj368gQ3ck6Q30seXk=; b=rJKJXyAAnw3Ws+Nj5odTGiIEAA0jqo4JxjD+r2gau5GESL52d0HyJZ4IUzLpKWO+6vETBZ jeydtxPfkok4DoMR0cMQ+Cz/6FFwgdTUC22XgIGLMgpEPvXM3RVDzU68MwwTbO4VpLC0FB kFhux40reRi3RpKRKEaa0oBDLbH1z/+LVn/i1+X04vks3FJxZxpq9jfvU2+1+r0RS/OAMe CvTAnGfIFzGSWghr5O2mRelpE+RTSC3hmwPlMX95QXj/KhQXdsdx23kmByfhwiRKxyDzZ9 76EQOImtdZSSesCwTArJN5iW/DYBe2lrBVmy1RSdh5D0k7/CujoiP0VG5s4LHg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761595047; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=f3TjxfGR9/8B4PiPaAG3DxPCoVj368gQ3ck6Q30seXk=; b=F30xCBDTiqxFfJ0G8e3Zm4k7Rib1IMs90xhgnYRFqFJOiEXZNhw5A7ubdMA6hqveeIZyv4 YtPVwLOPq1JZyRX7+uZEe1oe4GwTrdZ5SCVn6OEZSrhn/ybio5Vz/TBpWl8sPjTxeDjVU5 q4nM4ZQjNR/KLtmmT7Qv3fDKztomyIPlTqqbFUNzQnmBROxEKT/Bnd4e/r+9fFKZXoZ/eO YyYIG4/2XeTSWodiLybNv5RadwhWeVypd9l7byPKTPz2IvyGYIllpaUcKYOnOzCFS7/w/h lb2+uvLmRkAazXIbQP2KDESbOcaIDktoszIU2ilsAiexyXtKsOtWhAn1rVj/Zw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761595047; a=rsa-sha256; cv=none; b=Y2GIy6FIXbmj8deDPLtEb0IwBK/pXBSMQPhXr1kOxMJDjAp/FZPjyXkIthDatgWeZJaj7i awgV7hnSOFIm38ra7moSR68lUdm+rcYi4Q/IeioaDDc+dIzrzjqanCTlRMBWA5S8ljLPHL R01mQD7E0JY/OANE6ecz6VSxLiVTCYQuoZ2ne31tBaeVs1Vgn+bNG/w70ec0rbw16Xb+tW bGKhNLambQlEZmv3cUDtvdUxyysleXdeo59zhO5WODNz16gjn+7lHhv3vHS/wc4TAYwsSx m4tqz+6QTdiGxFkdBxzmYdRHbxukc0TZt64QBZDrYnbTZRKzhDTHk8mkZepDgw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cwPRq5833z2mp; Mon, 27 Oct 2025 19:57:27 +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 59RJvR3c096305; Mon, 27 Oct 2025 19:57:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59RJvRXC096302; Mon, 27 Oct 2025 19:57:27 GMT (envelope-from git) Date: Mon, 27 Oct 2025 19:57:27 GMT Message-Id: <202510271957.59RJvRXC096302@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ruslan Bukin Subject: git: 8a25a04058a8 - main - xilinx pci: Codasip Prime board support List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: br X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8a25a04058a81453108e7e6accbf6663c19e9117 Auto-Submitted: auto-generated The branch main has been updated by br: URL: https://cgit.FreeBSD.org/src/commit/?id=8a25a04058a81453108e7e6accbf6663c19e9117 commit 8a25a04058a81453108e7e6accbf6663c19e9117 Author: Ruslan Bukin AuthorDate: 2025-10-27 19:41:53 +0000 Commit: Ruslan Bukin CommitDate: 2025-10-27 19:53:38 +0000 xilinx pci: Codasip Prime board support - Add a compatible string; - Fix build. Tested on Codasip X730 64-bit RISC-V CHERI Application CPU using onboard nvme(4) device. Differential Revision: https://reviews.freebsd.org/D53295 --- sys/dev/xilinx/xlnx_pcib.c | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/sys/dev/xilinx/xlnx_pcib.c b/sys/dev/xilinx/xlnx_pcib.c index d549ec445ea9..816b33ec1142 100644 --- a/sys/dev/xilinx/xlnx_pcib.c +++ b/sys/dev/xilinx/xlnx_pcib.c @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause * - * Copyright (c) 2020 Ruslan Bukin + * Copyright (c) 2020-2025 Ruslan Bukin * * This software was developed by SRI International and the University of * Cambridge Computer Laboratory (Department of Computer Science and @@ -84,7 +84,7 @@ struct xlnx_pcib_softc { struct generic_pcie_fdt_softc fdt_sc; struct resource *res[4]; struct mtx mtx; - vm_offset_t msi_page; + void *msi_page; struct xlnx_pcib_irqsrc *isrcs; device_t dev; void *intr_cookie[3]; @@ -105,6 +105,12 @@ struct xlnx_pcib_irqsrc { u_int flags; }; +static struct ofw_compat_data compat_data[] = { + { "xlnx,xdma-host-3.00", 1 }, + { "xlnx,axi-pcie-host-1.00.a", 1 }, + { NULL, 0 }, +}; + static void xlnx_pcib_clear_err_interrupts(struct generic_pcie_core_softc *sc) { @@ -333,12 +339,12 @@ xlnx_pcib_fdt_probe(device_t dev) if (!ofw_bus_status_okay(dev)) return (ENXIO); - if (ofw_bus_is_compatible(dev, "xlnx,xdma-host-3.00")) { - device_set_desc(dev, "Xilinx XDMA PCIe Controller"); - return (BUS_PROBE_DEFAULT); - } + if (ofw_bus_search_compatible(dev, compat_data)->ocd_data == 0) + return (ENXIO); + + device_set_desc(dev, "Xilinx XDMA PCIe Controller"); - return (ENXIO); + return (BUS_PROBE_DEFAULT); } static int @@ -424,8 +430,8 @@ xlnx_pcib_req_valid(struct generic_pcie_core_softc *sc, bus_space_tag_t t; uint32_t val; - t = sc->bst; - h = sc->bsh; + t = rman_get_bustag(sc->res); + h = rman_get_bushandle(sc->res); if ((bus < sc->bus_start) || (bus > sc->bus_end)) return (0); @@ -467,8 +473,8 @@ xlnx_pcib_read_config(device_t dev, u_int bus, u_int slot, return (~0U); offset = PCIE_ADDR_OFFSET(bus - sc->bus_start, slot, func, reg); - t = sc->bst; - h = sc->bsh; + t = rman_get_bustag(sc->res); + h = rman_get_bushandle(sc->res); data = bus_space_read_4(t, h, offset & ~3); @@ -512,8 +518,8 @@ xlnx_pcib_write_config(device_t dev, u_int bus, u_int slot, offset = PCIE_ADDR_OFFSET(bus - sc->bus_start, slot, func, reg); - t = sc->bst; - h = sc->bsh; + t = rman_get_bustag(sc->res); + h = rman_get_bushandle(sc->res); /* * 32-bit access used due to a bug in the Xilinx bridge that From nobody Mon Oct 27 20:46:53 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cwQYC5gQSz6FWs9 for ; Mon, 27 Oct 2025 20:47:11 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cwQYC2lFwz3nMJ for ; Mon, 27 Oct 2025 20:47:11 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-wm1-f44.google.com with SMTP id 5b1f17b1804b1-47109187c32so27830565e9.2 for ; Mon, 27 Oct 2025 13:47:11 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761598025; x=1762202825; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=0r2Oo9gKfZ8XhIKEm9LyHIc4pPMPyPHYy8PPlaQ9iY8=; b=IDVdwcrPDXiYaTGQHxDLgK1+I8PgGCPxhSx+Dte33fq0tNXWJStJbLgzn+4hKK42ts C2v8jXKmygAhURDKPdGcQaAC2fWHomlIfv0k4YlwtWzOMRXrHTQFUYk5QofqDQ2R38eE H4XQbigsaftAvoLnd67n3SNlzqoqm8DAmdbJ6sT1OMUbJ4dmQIea86tXTOfZi9SsX60T +YkkaCcf/EsjqCVwyfqwV1lE66T8xNIuTGrLgXMWlRUAWGrLx0Y7/JLJ4jw8wuUmmmdX /OLnlo8iMn7T6PGYbMuci6h2P758aEg5Vh9OSn/HiwEHQYs3iHTER5qqJye4nJ+Tn1+v kPWQ== X-Forwarded-Encrypted: i=1; AJvYcCVx7dmBpvBDLkdzGPddEI2pKDBzLODJNDKx8pM4cftFcgZ7Px1PBZ2uuZIwHOBwIolTexNULvbIbJ139SZB8SD+jXnpuA==@freebsd.org X-Gm-Message-State: AOJu0Yw/W2Kp9pJWYXos0FZLqHvnJeFb4THl/ioH4EkgegOfNOPhj06p TOLM3srTZL1Up4knLVADY6ctJJP8iWYq6Lg6vAG72v8kyUXO57oxgVeFa1JQAmglUtY= X-Gm-Gg: ASbGncvKQmus41cGIlatd3EFK84QnpXz8R8EmZSWU9eCSJ5yQVcUhQxzNPpNxCHBso/ /uZj0DvID2IQp7AHNoiyhcWjQcGe5CD5gH738go824HL+UPpznNKEwX0dJjjtS2g/8iUlLfRJ2d 1IZTl1IiTmUcQ6sDdAejtUr0dAD7/5lqlLCCdeUjFkWwKfal94HQ0gwKJhpcLLpFu9J0Fo5Isxe kWiAE0VUOJI0dMGj/x9dygaS+lSkJZbRnexnWadeRxA8jSOpAFY0Mj9S4uCied61EZh7BWzQWzH GKR5FuKz32JDaNhtNCgcUfTDuUcxtFspshZwSX4meGvJ+xBkTGsMpmhK1doP+dzWaLhYhgpPPvF +75ChLKEYVAI6TIgsK4Q5SpscaBNF69Q7Hv/MuIpVGy1I/dpyOrDRmbzI7HOh+R2A7A4UuS2VTN Cm7u+pcCtgkhnek1xnxx9znmvnM3YkYt+2uDRFjh0bdQ== X-Google-Smtp-Source: AGHT+IGqahIU3eJ7VsJ9E1eYeonx36OFWgFQwJU9wxaV7Gkgt6ptwqBz4E0Cw9GlyJVRa9ERF3zzRQ== X-Received: by 2002:a05:600c:8b17:b0:475:da13:2568 with SMTP id 5b1f17b1804b1-47717e41547mr8579885e9.25.1761598024411; Mon, 27 Oct 2025 13:47:04 -0700 (PDT) Received: from smtpclient.apple (nat-184-7.net.cam.ac.uk. [131.111.184.7]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-429952cb55asm16194016f8f.17.2025.10.27.13.47.03 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 27 Oct 2025 13:47:03 -0700 (PDT) Content-Type: text/plain; charset=utf-8 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3864.100.1.1.5\)) Subject: Re: git: 8a25a04058a8 - main - xilinx pci: Codasip Prime board support From: Jessica Clarke In-Reply-To: <202510271957.59RJvRXC096302@gitrepo.freebsd.org> Date: Mon, 27 Oct 2025 20:46:53 +0000 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: References: <202510271957.59RJvRXC096302@gitrepo.freebsd.org> To: Ruslan Bukin X-Mailer: Apple Mail (2.3864.100.1.1.5) X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4cwQYC2lFwz3nMJ On 27 Oct 2025, at 19:57, Ruslan Bukin wrote: >=20 > The branch main has been updated by br: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3D8a25a04058a81453108e7e6accbf6663= c19e9117 >=20 > commit 8a25a04058a81453108e7e6accbf6663c19e9117 > Author: Ruslan Bukin > AuthorDate: 2025-10-27 19:41:53 +0000 > Commit: Ruslan Bukin > CommitDate: 2025-10-27 19:53:38 +0000 >=20 > xilinx pci: Codasip Prime board support >=20 > - Add a compatible string; > - Fix build. >=20 > Tested on Codasip X730 64-bit RISC-V CHERI Application CPU using > onboard nvme(4) device. Is there a reason this has never been added to an in-tree (nor even downstream in CheriBSD) kernel config? I was quite surprised to see that it isn=E2=80=99t enabled for riscv=E2=80=99s GENERIC (nor even the = GFE config downstream, which is for the platform for which this driver was originally written), and therefore it=E2=80=99s bitrotted. Jessica From nobody Mon Oct 27 20:56:02 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cwQmS1P16z6FY9V; Mon, 27 Oct 2025 20:56:56 +0000 (UTC) (envelope-from br@bsdpad.com) Received: from mail.bsdpad.com (mail.bsdpad.com [91.99.52.19]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4cwQmR6T8Gz3qBZ; Mon, 27 Oct 2025 20:56:55 +0000 (UTC) (envelope-from br@bsdpad.com) Authentication-Results: mx1.freebsd.org; none DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=bsdpad.com; s=20201212; h=From:To:Subject; bh=+E1p+doImcnXufV4hYUzeIPeP9S7wT/0y1o7l3gzVbc=; b=ExLv3ecspFlJoYLE9O6h8Qpgce Rv7JHmUHe/EVW59rH9M2pGTpNYKR7Cnf+xQfeukUMPBJ3TrLqkWMRX7qtjAOt6M0Tp0pZ/Fo/v4R9 BXIyWRXeuLViijxjke73HbJnd+AmbnWGqPNfbFCA1Co0B/KvJZ2dh15iaZk48F25YLZtiWpCWAxqO D4uE+ICNnbHcGHya9BW0ZublsSrindkeOQ2dxFnFFn5oNxldZBR7mL1TNVPqj+gjZsBQtj9Qdb5eC rn66joM//pmN0ZH/vw2tdtM246hJ5wyMgBVoflLbigUbGo63E0PB63UeMIpKwhm5GeNo3hsmoj3Q7 qwxjZb5A==; Received: from mail.bsdpad.com ([91.99.52.19] helo=localhost) by mail.bsdpad.com with esmtpsa (TLS1.3) tls TLS_AES_128_GCM_SHA256 (Exim 4.98.2 (FreeBSD)) (envelope-from ) id 1vDUG2-00000000LlN-3nYl; Mon, 27 Oct 2025 20:56:02 +0000 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org Mime-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=UTF-8 Date: Mon, 27 Oct 2025 20:56:02 +0000 Message-Id: Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" , Subject: Re: git: 8a25a04058a8 - main - xilinx pci: Codasip Prime board support To: "Jessica Clarke" From: "Ruslan Bukin" X-Mailer: aerc References: <202510271957.59RJvRXC096302@gitrepo.freebsd.org> In-Reply-To: X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:24940, ipnet:91.99.0.0/16, country:DE] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4cwQmR6T8Gz3qBZ On Mon Oct 27, 2025 at 8:46 PM UTC, Jessica Clarke wrote: > On 27 Oct 2025, at 19:57, Ruslan Bukin wrote: >>=20 >> The branch main has been updated by br: >>=20 >> URL: https://cgit.FreeBSD.org/src/commit/?id=3D8a25a04058a81453108e7e6ac= cbf6663c19e9117 >>=20 >> commit 8a25a04058a81453108e7e6accbf6663c19e9117 >> Author: Ruslan Bukin >> AuthorDate: 2025-10-27 19:41:53 +0000 >> Commit: Ruslan Bukin >> CommitDate: 2025-10-27 19:53:38 +0000 >>=20 >> xilinx pci: Codasip Prime board support >>=20 >> - Add a compatible string; >> - Fix build. >>=20 >> Tested on Codasip X730 64-bit RISC-V CHERI Application CPU using >> onboard nvme(4) device. > > Is there a reason this has never been added to an in-tree (nor even > downstream in CheriBSD) kernel config? I was quite surprised to see > that it isn=E2=80=99t enabled for riscv=E2=80=99s GENERIC (nor even the G= FE config > downstream, which is for the platform for which this driver was > originally written), and therefore it=E2=80=99s bitrotted. > No reason, will add in the next commits! Thanks. Roseland From nobody Mon Oct 27 22:36:52 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cwSzm5mzbz6FjVv; Mon, 27 Oct 2025 22:36: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cwSzm5Fzrz447b; Mon, 27 Oct 2025 22:36:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761604612; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zaw/n1eeOeFhcC0L2XKsFd1obcViormDJ/pOYUHrtMw=; b=BKaLuE+/zfP3rlYpcE8wGOmOmwAUj/MmS7TWnQhMhIU2z02GlkJIMgISqwFtPgDhHMIQIB VaiJmNhEPfKYbk1gn3Njkui3VJk1W78UNq6YzU57etlM/yOgDfSqcql7/1xkr/sBRfYlZW aAaJpvT3K7fRXtQYf0Y9g4cO4P1uljyujNWXGOGluFGpTGs6Zj6UKItljivfZo6e2DLcKL 4fJs4Qwle8nWqKjjZkiRGliYqpcWtoAAUn5TlzsW1VEcWSAHty3sW8DaYuecN7aOICPi14 NFcuzaErZtAduSJJp0rzO8Cdts7qJVH4ZUrSuyNxquoGfSaP2kNo19Seo1grfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761604612; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zaw/n1eeOeFhcC0L2XKsFd1obcViormDJ/pOYUHrtMw=; b=hXlYoeQ+zkS60ldjxkfTYd0Bt0MWbfk/68frkVzyJNDwQCLypPrcHJaRMB3rO0hAzIITSK Hpj2IJbGUFzObCFBEglMjKXk83aHGDcwjOCvIUZzGL+EtsX6IKp7UPxcALEuYwO6IWF6Yb +wKc3oDGNjFV8e4w8EkdLZU/ADunkllNPxRubKaUdIdnTzdLGSh+CqI9DZzlnzwj5Ra1E+ UzZ7mSy9XakjTqaove9n2/eDcvOGjE+VV7aD65VuYBYIp/Xn++Au8rEVXEeVE00Fbh93+g eM+UsjZGXrK2B36yJhiVqI2GrbFal7T0Y49ENbAdPinS3Xeh3groM70hYf9wwA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761604612; a=rsa-sha256; cv=none; b=jyiaEydeXmmCOC+8hX+P+kUuXdbudV6NspfsTy/6sFnHF7ltvymRXW8c78uj79PofWJVWj u87u2ny5EKHRO7wm07vJuEv31e4xJUOsBZPOYO9/2X8tTJUi3NLJ1nc7COgUcN3zFeYCvl Hn4VWsORMLiFaH3uPquMKP3pkiwro0PFh+ElCbAYaWN2VP+y+581p1Tp2jOhnG+ygH3ev0 uCaMI1pgx421QFvZYQSuaxMIc8GP4tls2O1CVp7JY0/1OxPzIy1y1xhF6jTBg567OaopF/ JBny+xqhYcaEnFmNySXbad7A9mVZkBrMb/lf0quI5ei6gTxgJzDEKLliXcKQdg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cwSzm4rzzz7ZH; Mon, 27 Oct 2025 22:36: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 59RMaqSw097682; Mon, 27 Oct 2025 22:36:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59RMaqVp097679; Mon, 27 Oct 2025 22:36:52 GMT (envelope-from git) Date: Mon, 27 Oct 2025 22:36:52 GMT Message-Id: <202510272236.59RMaqVp097679@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: 44cb1e857f04 - main - tcp: improve credential handling in syncache List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 44cb1e857f048d2326bdc1a032ccd2c04d2bcdc9 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=44cb1e857f048d2326bdc1a032ccd2c04d2bcdc9 commit 44cb1e857f048d2326bdc1a032ccd2c04d2bcdc9 Author: Michael Tuexen AuthorDate: 2025-10-27 22:28:59 +0000 Commit: Michael Tuexen CommitDate: 2025-10-27 22:28:59 +0000 tcp: improve credential handling in syncache When adding a syncache entry, take a reference count of the credentials while the inp is still locked. Thanks to markj@ for providing a hint regarding the root cause. Reported by: David Marker Reviewed by: glebius Tested by: David Marker Fixes: cbc9438f0505 ("tcp: improve ref count handling when processing SYN") MFC after: 3 days Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D53380 --- sys/netinet/tcp_syncache.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/sys/netinet/tcp_syncache.c b/sys/netinet/tcp_syncache.c index 3cb538f7054d..3a7755e9f09e 100644 --- a/sys/netinet/tcp_syncache.c +++ b/sys/netinet/tcp_syncache.c @@ -1380,6 +1380,7 @@ syncache_add(struct in_conninfo *inc, struct tcpopt *to, struct tcphdr *th, struct tcpcb *tp; struct socket *rv = NULL; struct syncache *sc = NULL; + struct ucred *cred; struct syncache_head *sch; struct mbuf *ipopts = NULL; u_int ltflags; @@ -1408,6 +1409,7 @@ syncache_add(struct in_conninfo *inc, struct tcpopt *to, struct tcphdr *th, */ KASSERT(SOLISTENING(so), ("%s: %p not listening", __func__, so)); tp = sototcpcb(so); + cred = V_tcp_syncache.see_other ? NULL : crhold(so->so_cred); #ifdef INET6 if (inc->inc_flags & INC_ISIPV6) { @@ -1636,16 +1638,16 @@ syncache_add(struct in_conninfo *inc, struct tcpopt *to, struct tcphdr *th, /* * sc_cred is only used in syncache_pcblist() to list TCP endpoints in * TCPS_SYN_RECEIVED state when V_tcp_syncache.see_other is false. - * Therefore, store the credentials and take a reference count only - * when needed: + * Therefore, store the credentials only when needed: * - sc is allocated from the zone and not using the on stack instance. * - the sysctl variable net.inet.tcp.syncache.see_other is false. * The reference count is decremented when a zone allocated sc is * freed in syncache_free(). */ - if (sc != &scs && !V_tcp_syncache.see_other) - sc->sc_cred = crhold(so->so_cred); - else + if (sc != &scs && !V_tcp_syncache.see_other) { + sc->sc_cred = cred; + cred = NULL; + } else sc->sc_cred = NULL; sc->sc_port = port; sc->sc_ipopts = ipopts; @@ -1783,6 +1785,8 @@ donenoprobe: tcp_fastopen_decrement_counter(tfo_pending); tfo_expanded: + if (cred != NULL) + crfree(cred); if (sc == NULL || sc == &scs) { #ifdef MAC mac_syncache_destroy(&maclabel); From nobody Tue Oct 28 03:43:54 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cwbp25GTBz6CpVM; Tue, 28 Oct 2025 03:43: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cwbp23VzHz3lqm; Tue, 28 Oct 2025 03:43:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761623034; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HclfVjRUEbu1BlWl+vls6i3OQqI7YsXWjJPG1Je6mMQ=; b=eWsfOUAGFrcwQ5FWX6eCxtZU8zhxvUF/BRYl9ViINl5FmbGbrmZjFOJ3ToKyM5T02++7e8 HxSgwYac3m+jwWCppkpF43JOfsAJd9DvkyQ31+tiV8C0doCHTapICKkNIsfmX/ANbsIEP3 Zdcktgr8sU0SHZ4jA8NpgPECqZGhRC5h15B6EsEtSYPPZsUb43O0v+D2dClAxivCFOmu9g /U7pIyIK8zTo8Cv9xkmVKtu2EaRnALIEs4uQpThc0bgQKE+7jgiX7DLOq6EQ73aZFVAJSi PUWVlAUYEcRumIpVBBfdKek04uMu73BLy70gdmL+1HtnE6l6Jf6ONJyDaMHO6Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761623034; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HclfVjRUEbu1BlWl+vls6i3OQqI7YsXWjJPG1Je6mMQ=; b=si+EsrMFQsDjaFXgQ+2mBPhzSRDQAFkPPWwY5FgUawfuvILI8XoV8sHXyuWBXCYhhJXYyK 3BR9uuQldEj0yWMhBAWxatmS3qrNX2qcdFDGjo8opBHpAsvUMh5sIG+7xid8HFjRY4vQbv y9vcIuNBg+mpsj2EyKId0ufFb8TQ5vbInNARuQl+x55dJg29lm9Nud5bUIOMoqqYvHvX9W JqxMzAv98VxQRivUSvDZtEh+wlWOheJGizKmMJ36QhmJ5hNnEm6YvZhwwb4NKXXPrAz8fb ET771Mc7KqOLXlnzT+qhH6c1OjqS0Y9rea55pgNUtMfBRzGZtNYWF1Te3aKbdw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761623034; a=rsa-sha256; cv=none; b=WwCiOAgZIll1eKsnefvHNdqra6KJi8jwQXHE7KMNEYb9WmhSdAVWSVW4vxdJmuo+Md2O5C InChh9KiXUO/eCNFfAJCE8Kut42jSGRFVbjOW3jeH35eTTZ9XjysbPhd4EFLXakQHHDbPL u4j0tqo/dGeMR3bRwPpC0ttTno6vv4OiUsr8LaOiEd5x1z8Nz0vFffx+uq5w6cr/Dbgh7R Jc6jgROSL0476jCZQDs3JJNccVEWhiMYxwTqDjX7AiSLVo4GE/oRrCWjpHeYRxBvHnyuT2 e1IYPHtrao9q57ith85pG51gQaWAlYX7jJUnDr/jEmjgVx+2aQx/yq+uKdjMFQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cwbp22zqbzZT3; Tue, 28 Oct 2025 03:43: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 59S3hsgI079142; Tue, 28 Oct 2025 03:43:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59S3hskf079139; Tue, 28 Oct 2025 03:43:54 GMT (envelope-from git) Date: Tue, 28 Oct 2025 03:43:54 GMT Message-Id: <202510280343.59S3hskf079139@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cy Schubert Subject: git: 5ae7b106cfd4 - main - ipfs: Fix typo in error message List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5ae7b106cfd4801ef5e0f69b02ad9b3ae3ccfbec Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=5ae7b106cfd4801ef5e0f69b02ad9b3ae3ccfbec commit 5ae7b106cfd4801ef5e0f69b02ad9b3ae3ccfbec Author: Cy Schubert AuthorDate: 2025-10-28 03:43:14 +0000 Commit: Cy Schubert CommitDate: 2025-10-28 03:43:14 +0000 ipfs: Fix typo in error message MFC after: 3 days --- sbin/ipf/ipfs/ipfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/ipf/ipfs/ipfs.c b/sbin/ipf/ipfs/ipfs.c index 6225c6e1154d..94c9f70410f2 100644 --- a/sbin/ipf/ipfs/ipfs.c +++ b/sbin/ipf/ipfs/ipfs.c @@ -576,7 +576,7 @@ int readnat(int fd, char *file) in = (nat_save_t *)malloc(ipn.ipn_dsize); if (in == NULL) { - fprintf(stderr, "nat:cannot malloc nat save atruct\n"); + fprintf(stderr, "nat:cannot malloc nat save struct\n"); goto freenathead; } From nobody Tue Oct 28 05:12:20 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cwdlt43Vkz6DDwt for ; Tue, 28 Oct 2025 05:12:10 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-pj1-x1034.google.com (mail-pj1-x1034.google.com [IPv6:2607:f8b0:4864:20::1034]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cwdlt1J1Hz3wPq for ; Tue, 28 Oct 2025 05:12:10 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-pj1-x1034.google.com with SMTP id 98e67ed59e1d1-33d7589774fso5305972a91.0 for ; Mon, 27 Oct 2025 22:12:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1761628328; x=1762233128; darn=freebsd.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=o4moMeATqCR2FkJ0Z/88fylZfPCfjqBbtRxBCsEYvhk=; b=UOoU4heKnieb8ZYDsujmdMOVh3mdSxIPKK7o62/aiv/+lMWuqdK0k+xV/ONwmLobYM 1l3YOjLma0Bl9h2ECLe00MUOGdOTP6cWE3+9mUsGUBnn3gwFpzce+gowY+bi7uDvDs5S iCpxbqIw+vFsJyIP28Fmm6g85MwHmB/gkb3iNIc3yh6NlroCOM/GLEJdTNoUDf3fKOdr I0j+WQcX7q9ubM4gL+gdkh0nsVAv6g3YmvbaZDWW0bbFXYLCw+i8+4YIxHTbv2UWxoc3 OltO11xqrfdOfX90X9UZ1/w0BWTG8B9fg5Khvc7e36YKwZEdldfIKmJ6y+kMvKihk4XX 1Cgw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761628328; x=1762233128; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=o4moMeATqCR2FkJ0Z/88fylZfPCfjqBbtRxBCsEYvhk=; b=pQoYr41L2slMvRHcB2mOiEA7qL6RC2KGCl3hG1kpvp/4mU+kDk6UeFH8JuGdZqhdTD xorzoTUCz1kAbKTLkc40ZiuMZ6TQ/5wZxxZsLL2OuyN+6Ei0pwLhxgHPb5VhtvpA0PHu KwDY6I8JuE4cOpR5t72gpHmkONinMeZMhb7KAFgb1FbsENNE198tuXc67XVwXTGnAAlB sceFUpjVKm5wauOtG+g3ao4epD9qkXzokvxPIDIGm6DneY+jdO7MqOI7v7JUBn99RtRX LZLd3TxEtvQa7n+AC3JwvytI1XkoyktG+s28oa2aFUE3VdGKPZNhHgxWO/bpNiCjsKMm Lq1Q== X-Forwarded-Encrypted: i=1; AJvYcCVvNWUkH6IJAZZBsm6iA97jo2T0ZRj1twQKU8ydoJXosjOyeG5OWIsnPEW6Gg91TjfObPE7ETC5LjKW867qLqYBrj787Q==@freebsd.org X-Gm-Message-State: AOJu0YyHWjeuk56RcIgo8LidEse1za85kHwkCmWcj30pplv+R4ASv9o4 RBS2X+BCoMrZH9mqYWZ3CkNz6IqY1Hf5H/hI0npZ9BV/z5mwgPAr5/jMLtGVa1iMoxqy1zlG+4e WwNUzlB8ZczFHleMISi5+AENz6y/amlurV8+o7KZyYw== X-Gm-Gg: ASbGncsyokOM9Y+9swybV2LDjWpGZ4C7TMWuDc/Xtc4I9QRlznEkzaC/ELqTPv6mxG9 Oy4at64uZZ5w8WubzJ4FnMRKKIjq9a/sXsh5NXLdKOx6tS1pfdSol5NnE4QODInb0MnzjgFm4ZI D9/ZA/5pgEos18MsNxe1+Ctq/yj5AwxX94XdvyJCdHUaDuiTYceWdSPjy/BqLoto3raaN0qpNx7 SAkbdhOmVtRpWN2DOMwwzGm5Juze3eXtjpf6OE1XwFOC1gBGmbyDeWWb4RC+Eck8xmp4t0= X-Google-Smtp-Source: AGHT+IHjzk7tYkyaSuAwJWs7VYSviZ41WQMxHlNv4m/Owqm3k57C+DkoGLRrzdjH0nOnteOfHldntgW1LA+w1BVC4tQ= X-Received: by 2002:a17:90a:c2c8:b0:33b:b453:c900 with SMTP id 98e67ed59e1d1-34027a7b8b7mr2678762a91.19.1761628327714; Mon, 27 Oct 2025 22:12:07 -0700 (PDT) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 References: <202510252258.59PMwthG074834@gitrepo.freebsd.org> <4496e47d-cc0c-4259-adcf-e3d739f134a8@FreeBSD.org> In-Reply-To: <4496e47d-cc0c-4259-adcf-e3d739f134a8@FreeBSD.org> From: Warner Losh Date: Mon, 27 Oct 2025 23:12:20 -0600 X-Gm-Features: AWmQ_bm82OkSNXPXDYxwRX4r1rWCJN45mnTjKLzCRrF28k7euPd2phqAEyg8-Mw Message-ID: Subject: Re: git: 46f982122c0d - main - sys: Bump non-ISA PNP removal to 16.0 To: John Baldwin Cc: Ed Maste , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: multipart/alternative; boundary="000000000000b32f680642310e18" X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4cwdlt1J1Hz3wPq --000000000000b32f680642310e18 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Mon, Oct 27, 2025 at 9:19=E2=80=AFAM John Baldwin wrot= e: > On 10/25/25 18:58, Ed Maste wrote: > > The branch main has been updated by emaste: > > > > URL: > https://cgit.FreeBSD.org/src/commit/?id=3D46f982122c0d670ac181b748a5b8c2b= 221f61517 > > > > commit 46f982122c0d670ac181b748a5b8c2b221f61517 > > Author: Ed Maste > > AuthorDate: 2025-10-24 18:39:00 +0000 > > Commit: Ed Maste > > CommitDate: 2025-10-25 22:57:15 +0000 > > > > sys: Bump non-ISA PNP removal to 16.0 > > > > This may include atkbdc, which is not being removed in 15.0. > > Note that this message is not about removing drivers, but about removing > entries > from /boot/device.hints (GENERIC.hints) (unless we intend to remove > support for > hinted devices entirely from isa(4)?). Was there a user report that > motivated > mentioning atkbdc here, or was that just based on past memory? I'd be > really > surprised if ACPI was failing to enumerate the keyboard controller and it= s > resources at this point. It is debatable if we should make disabling ACP= I > work > out of the box (which is what most of /boot/device.hints does) vs strippi= ng > more entries ouf of device.hints on amd64 (in particular, atkbdc, psm, th= e > uarts, atrtc, and attimer). If we remove syscons that also removes the s= c0 > hint. > We should remove all the legacy device hints from device.hints entirely. And this stupid message. However, we still need to have a device.hints.legacy that can be added back for systems that are too old for ACPI. There's a lot of silly embedded gear that's still in widespread use (I got lots of complaints the last time I broke it). They have half-implemented ACPI that doesn't enumerate legacy devices,but none-the-less they have it. > It's less clear to me if we want to ban hinted ISA devices entirely. Tha= t > pretty much breaks !ACPI booting which can matter for some custom applian= ce > systems that use home-grown firmware that may not include a full DSDT. > It's > fine if we require those downstreams to ship a modified device.hints. I'= m > less > convinced it's useful to require them to also patch isa(4) to support > hinted > children Yes. That's why I think we should likely just remove the message here entirely. The embedded system that are trouble have ACPI, but don't enumerate many of the legacy devices that are none-the-less present. This creates a situation where for those systems we MUST have entries. But for other systems, like a STEAM deck that doesn't have legacy devices we CAN'T have them. When I added the device, I'd hoped that at least the devices would be in ISA PNP tables, but that's not true on these systems (or we ignore them because DSDT is present). I'd propose that we create a new loader.conf variable for this. Today, we have loader_conf_files that's a list of device.hints and loader.conf. However, that makes it tricky to replace one with an alternative. At $WORK we have symlinks for device.hints for wiring reasons. It's easier. But for FreeBSD I think we should separate this out into two variables, but I'm open to other designs that let us substitute one file for another, or to have a list of files (we may be able to construct device.hints.legacy such that it can just be added after device.hints and we'll be fine). We could also then have logic in lua to determine automatically for these odd-balls when to use device.hints.legacy. But there'd likely be some bumps with that since we added COM1/COM2 wiring to device.hints for ACPI enumerated device to wir= e the addresses to uart0/uart1. If we had this logic,we could then just create a 'force adding device.hints.legacy' variable that would bypass the automation. ACPI lua bindings is coming soon, I think, since kaypowkitty's GSOC project provides at least some of what we need for this (we don't need it, unless we want to walk the acpi tables since the AP2 devices have symbios entries we can key off of). Warner --000000000000b32f680642310e18 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


On Mon, Oct 27,= 2025 at 9:19=E2=80=AFAM John Baldwin <jhb@freebsd.org> wrote:
On 10/25/25 18:58, Ed Maste wrote:
> The branch main has been updated by emaste:
>
> URL: https://= cgit.FreeBSD.org/src/commit/?id=3D46f982122c0d670ac181b748a5b8c2b221f61517<= /a>
>
> commit 46f982122c0d670ac181b748a5b8c2b221f61517
> Author:=C2=A0 =C2=A0 =C2=A0Ed Maste <emaste@FreeBSD.org>
> AuthorDate: 2025-10-24 18:39:00 +0000
> Commit:=C2=A0 =C2=A0 =C2=A0Ed Maste <emaste@FreeBSD.org>
> CommitDate: 2025-10-25 22:57:15 +0000
>
>=C2=A0 =C2=A0 =C2=A0 sys: Bump non-ISA PNP removal to 16.0
>=C2=A0 =C2=A0 =C2=A0
>=C2=A0 =C2=A0 =C2=A0 This may include atkbdc, which is not being remove= d in 15.0.

Note that this message is not about removing drivers, but about removing en= tries
from /boot/device.hints (GENERIC.hints) (unless we intend to remove support= for
hinted devices entirely from isa(4)?).=C2=A0 Was there a user report that m= otivated
mentioning atkbdc here, or was that just based on past memory?=C2=A0 I'= d be really
surprised if ACPI was failing to enumerate the keyboard controller and its<= br> resources at this point.=C2=A0 It is debatable if we should make disabling = ACPI work
out of the box (which is what most of /boot/device.hints does) vs stripping=
more entries ouf of device.hints on amd64 (in particular, atkbdc, psm, the<= br> uarts, atrtc, and attimer).=C2=A0 If we remove syscons that also removes th= e sc0
hint.

stupid message.= =C2=A0However, we still need to have a device.hints.legacy that can be
added back for systems that are too old for ACPI. There's a lot o= f silly embedded gear
that's still in widespread use (I got l= ots of complaints the last time I broke it). They
have half-imple= mented ACPI that doesn't enumerate legacy devices,but none-the-less
they have it.
=C2=A0
It's less clear to me if we want to ban hinted ISA devices entirely.=C2= =A0 That
pretty much breaks !ACPI booting which can matter for some custom appliance=
systems that use home-grown firmware that may not include a full DSDT.=C2= =A0 It's
fine if we require those downstreams to ship a modified device.hints.=C2=A0= I'm less
convinced it's useful to require them to also patch isa(4) to support h= inted
children

Yes. That's why I think we sho= uld likely just remove the message here entirely.
The embedded sy= stem that are trouble have ACPI, but don't enumerate many of
= the legacy devices that are none-the-less present. This creates a situation= where
for those systems we MUST have entries. But for other syst= ems, like a STEAM
deck that doesn't have legacy devices we CA= N'T have them.=C2=A0 When I added the device,
I'd hoped t= hat at least the devices would be in ISA PNP tables, but that's not tru= e
on these systems (or we ignore them because DSDT is present).

I'd propose that we create a new loader.conf va= riable=C2=A0 for this. Today, we have loader_conf_files
that'= s a list of device.hints and loader.conf. However, that makes it tricky to = replace one with
an alternative. At $WORK we have symlinks for de= vice.hints for wiring reasons. It's easier.
But for FreeBSD I= think we should separate this out into two variables, but I'm open to<= /div>
other designs that let us substitute one file for another, or to = have a list of files (we may
be able to construct device.hints.le= gacy such that it can just be added after device.hints
and we'= ;ll be fine).

We could also then have logic in lua= to determine automatically for these odd-balls
when to use devic= e.hints.legacy.=C2=A0 But there'd likely=C2=A0be some bumps with that s= ince
we added COM1/COM2 wiring to device.hints for ACPI enumerate= d device to wire
the addresses to uart0/uart1. If we had this log= ic,we could then just create a 'force
adding device.hints.leg= acy' variable that would bypass the automation.=C2=A0 ACPI lua bindings=
is coming soon, I think, since kaypowkitty's=C2=A0GSOC proje= ct provides at least some of
what we need for this (we don't = need it, unless we want to walk the acpi tables since the AP2
dev= ices have symbios entries we can key off of).

Warn= er
--000000000000b32f680642310e18-- From nobody Tue Oct 28 08:05:07 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cwjbR3N39z6DRWf; Tue, 28 Oct 2025 08:05:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cwjbR2cC6z49kk; Tue, 28 Oct 2025 08:05:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761638707; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ubd1CiG51kaR5mrzpItTkN2C/1vfA14Snz6CPJWpWPk=; b=JduDRFJ0H9h4jsm1JGKUJZmwor8KaAwi+d5xKiz2Q5K9Oiy0OmNBrgy+u3i/j2eIoNEgNy jMwjFxjkEbwZAjt1TyoLIroCZ4pFom5KFpX2je/pqR5ulFam7JuVhJUT/zZQss4WhzfrDC +/iEHSG+vm9VDBRBedXZm1JeLq7DYmLzZj7o/HlfxAGXG/8suzvyrYK0WD8MikHGgBgTvi wisC1xvVA8m90mSOTkL8mcpL+vC18SZcc7X8n8pF1WgS9GWl5gefszokrcqGjR9txDx4ln iThA8mXIC9KwN4HV1GmM7NTs/EsIFv0BM5Ft9muURrKfsDIZycEqXKLBR7QhqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761638707; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ubd1CiG51kaR5mrzpItTkN2C/1vfA14Snz6CPJWpWPk=; b=f+1ezQxFDGnkdPsGkQu/zUF6ZoorwX2A7Y33UU3xG2jUUdeqNwfWqbkYodFbil7xkt6VGl CGPoJN1noQxK7kLeuMVcZH4qivgqq3DAwvjR5z3aAg+lri8oppqpVgSDNW61BH8ilUrMTt 7Q6P6usj3H9rjjm2aIk39mYLZKebEE43S0W/eEzblNWj6G8Lb3iZ7a8FxOSf1AcLXeZD7q PsP7ysbJux97lAaYRDc389czfP+RGSQNLsJYx2P0Sf2wZcfMGXo9DKY4IgRvmmGPxY6yB0 Y144/UDH2A2rykyvMTcrOE41EASJXxDP4VmjtoniojUFgQYsJI1NC0sEDGcxiw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761638707; a=rsa-sha256; cv=none; b=rYrJNP+ar+wkRGewBFgb1+unJPWga5UUHfRsSz6LYIctCMX0mUnw5Pu3UZyJ8K5NsWwKTg Pm9VXyJZjbRHnkuvix6+otwIXSWIV9+ivtRWMeN0BXcatRreaSwBAbtaodtTFh33fLzMiz JSa+8xj5QXmEW1uWMzVIxIyVDIN9QajXTKUe3NHZea1CDlPWtmVK8pkS4Ld2YHh3heDBZh /xUEV9uadwRct9pVybjjNbVDWr0EA+8MJpJKZpFyJ6ciQg9v9GQ6wIEHxQuEA3fmE5qmMz IH9mrMJnwUTq7kT67WaFrZ3Jd2Y7mO59l/5qp7RR1BVXlh67bDsJBsXOn6eHYA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cwjbR1xGYzj5q; Tue, 28 Oct 2025 08:05:07 +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 59S857GA067796; Tue, 28 Oct 2025 08:05:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59S857cF067793; Tue, 28 Oct 2025 08:05:07 GMT (envelope-from git) Date: Tue, 28 Oct 2025 08:05:07 GMT Message-Id: <202510280805.59S857cF067793@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: b87836e824ea - main - arm/nvidia/tegra: Fix a couple of typos in kernel messages List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b87836e824ea40793317d551eb13a8e2814f83f9 Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=b87836e824ea40793317d551eb13a8e2814f83f9 commit b87836e824ea40793317d551eb13a8e2814f83f9 Author: Gordon Bergling AuthorDate: 2025-10-28 08:04:33 +0000 Commit: Gordon Bergling CommitDate: 2025-10-28 08:04:33 +0000 arm/nvidia/tegra: Fix a couple of typos in kernel messages - s/intialization/initialization/ - s/Cannott/Cannot/ - s/ivalid/invalid/ - s/wating/waiting/ MFC after: 1 week --- sys/arm/nvidia/tegra_ahci.c | 2 +- sys/arm/nvidia/tegra_lic.c | 4 ++-- sys/arm/nvidia/tegra_mc.c | 2 +- sys/arm/nvidia/tegra_xhci.c | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/arm/nvidia/tegra_ahci.c b/sys/arm/nvidia/tegra_ahci.c index 30e28dd33235..efbad6ae618c 100644 --- a/sys/arm/nvidia/tegra_ahci.c +++ b/sys/arm/nvidia/tegra_ahci.c @@ -526,7 +526,7 @@ tegra_ahci_ctrl_init(struct tegra_ahci_sc *sc) rv = sc->soc->init(sc); if (rv != 0) { device_printf(sc->dev, - "SOC specific intialization failed: %d\n", rv); + "SOC specific initialization failed: %d\n", rv); return (rv); } } diff --git a/sys/arm/nvidia/tegra_lic.c b/sys/arm/nvidia/tegra_lic.c index e1d641635351..6956dc0ca849 100644 --- a/sys/arm/nvidia/tegra_lic.c +++ b/sys/arm/nvidia/tegra_lic.c @@ -213,12 +213,12 @@ tegra_lic_attach(device_t dev) } sc->parent = OF_device_from_xref(parent_xref); if (sc->parent == NULL) { - device_printf(dev, "Cannott find parent controller\n"); + device_printf(dev, "Cannot find parent controller\n"); goto fail; } if (bus_alloc_resources(dev, lic_spec, sc->mem_res)) { - device_printf(dev, "Cannott allocate resources\n"); + device_printf(dev, "Cannot allocate resources\n"); goto fail; } diff --git a/sys/arm/nvidia/tegra_mc.c b/sys/arm/nvidia/tegra_mc.c index 2568ff8324af..5703d768e505 100644 --- a/sys/arm/nvidia/tegra_mc.c +++ b/sys/arm/nvidia/tegra_mc.c @@ -157,7 +157,7 @@ tegra_mc_intr(void *arg) if (stat & MC_INT_DECERR_VPR) printf(" - VPR requirements violated\n"); if (stat & MC_INT_INVALID_APB_ASID_UPDATE) - printf(" - ivalid APB ASID update\n"); + printf(" - invalid APB ASID update\n"); if (stat & MC_INT_INVALID_SMMU_PAGE) printf(" - SMMU address translation error\n"); if (stat & MC_INT_ARBITRATION_EMEM) diff --git a/sys/arm/nvidia/tegra_xhci.c b/sys/arm/nvidia/tegra_xhci.c index 474e31981770..b9dac91cccd8 100644 --- a/sys/arm/nvidia/tegra_xhci.c +++ b/sys/arm/nvidia/tegra_xhci.c @@ -818,7 +818,7 @@ load_fw(struct tegra_xhci_softc *sc) DELAY(100); } if (i <= 0) { - device_printf(sc->dev, "Timedout while wating for DMA, " + device_printf(sc->dev, "Timedout while waiting for DMA, " "state: 0x%08X\n", CSB_RD4(sc, XUSB_CSB_MEMPOOL_L2IMEMOP_RESULT)); return (ETIMEDOUT); @@ -835,7 +835,7 @@ load_fw(struct tegra_xhci_softc *sc) DELAY(100); } if (i <= 0) { - device_printf(sc->dev, "Timedout while wating for FALCON cpu, " + device_printf(sc->dev, "Timedout while waiting for FALCON cpu, " "state: 0x%08X\n", CSB_RD4(sc, XUSB_FALCON_CPUCTL)); return (ETIMEDOUT); } From nobody Tue Oct 28 08:08:13 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cwjg12CtCz6DS96; Tue, 28 Oct 2025 08:08: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cwjg11cHrz4Cgx; Tue, 28 Oct 2025 08:08:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761638893; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ivp7B7rfhz1kbX7ljiZ8rh8GE5AJWBkrRU/ltoJlfgE=; b=uKygoM3LzVF0d2yOgxK1PSTNlww1Uw8loFSs6yU9niu4o6JtcVD7TFayIvy2E8OC8Z3deM AAzfoc1oO/Wvr+BzYy1IY+mqJwqySxE45Ayu/xW1xzRzI2L5ioX76RBp/ufeWRqg1A8yll gDV0pOsh+wuUsw1MiL9Y5E84pPWKKH7iki3jqYN8qllkJFZhy3EIOF0nXWT6L7p6SWTHFV wyNa3ffzaxGTTPCl2iBCAfDpxog6XftmQqvEsYHjwi1HDpD4vkdbg1FEpOqmvBHiKZNz5m 44oSs6JBLknf2YXr8mt77OjcbeMZBpISRGgP/cD6wUWa6Gq508gWYxToVnQRow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761638893; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ivp7B7rfhz1kbX7ljiZ8rh8GE5AJWBkrRU/ltoJlfgE=; b=RoL2vUICSRmzunROVEPfH3p/y08UcI9XyMNvj2r5ifPz4lBl++S7NxBjV0aUKeeMTGNdNZ WWHbXv703ThkvyFABSU61grw58jT2KiQVOTfGoO+QtXC341edqGuAHWmF2fT4OYCaUQg0k JO/iBcX18oIQglClt3YyA1PqfqhN/IgmbYeHUosGKrBQUyNo+Wn7TLblWt+aMDwLRw1bNZ 1Hx5UU3jXBGVv+BzmI4xIZlBae+cB0d/jbO0HrMr6C8Buy9Ja3XZN7MfW/pX4EObKGKLoY 0HW/cfDaxYMGsufYyL5wvfJxCnAmpFPrNzYaO2UGH3rs3uI/nDkiTuy7IxVv9g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761638893; a=rsa-sha256; cv=none; b=Yr7XpTQrwWlAyS1p24S4TeoPjfUqUWNGWjLwWZGlyxqHVdVC0y6p4p6xXcGIlXUMr72Jjh on0hiS+bF/bn8cxZ7kp6YbnZ3Eiv/F7NgExW2Fkt9nkmz1506z1fmzlR1CaRFothb0Vvmj pfU2CCjCKtQ/MpXcoZMcIa5kLuSF2IpgoCLTu07jfwXOzzg0POMXZZkh1Zdjee8w/bKo+W OLp7O9HuoM8WEEvshl0o7KGEtm/lcad+iRjjRuo45HiPLKVblOPD5xobNFyZ9Ziyai8qFH oadj0j2YXLCkZMMofXUnH5EQXeDd+1qUMRau/2V3zk8Tb+66eyOBft+NYURUag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cwjg10tMczj3f; Tue, 28 Oct 2025 08:08: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 59S88D96068795; Tue, 28 Oct 2025 08:08:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59S88De0068792; Tue, 28 Oct 2025 08:08:13 GMT (envelope-from git) Date: Tue, 28 Oct 2025 08:08:13 GMT Message-Id: <202510280808.59S88De0068792@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: 1ef6fef9d5c8 - main - hyper-v: Fix a couple of typos in kernel messages List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1ef6fef9d5c82a106ba8e42c1e087f9b5d1dfec6 Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=1ef6fef9d5c82a106ba8e42c1e087f9b5d1dfec6 commit 1ef6fef9d5c82a106ba8e42c1e087f9b5d1dfec6 Author: Gordon Bergling AuthorDate: 2025-10-28 08:07:28 +0000 Commit: Gordon Bergling CommitDate: 2025-10-28 08:07:28 +0000 hyper-v: Fix a couple of typos in kernel messages - s/tranparent/transparent/ - s/Unknow/Unknown/ - s/qury/query/ MFC after: 1 week --- sys/dev/hyperv/netvsc/if_hn.c | 6 +++--- sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c | 2 +- sys/dev/hyperv/utilities/hv_kvp.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/dev/hyperv/netvsc/if_hn.c b/sys/dev/hyperv/netvsc/if_hn.c index ab7671025107..b23c0d76115d 100644 --- a/sys/dev/hyperv/netvsc/if_hn.c +++ b/sys/dev/hyperv/netvsc/if_hn.c @@ -3574,7 +3574,7 @@ hn_rxpkt(struct hn_rx_ring *rxr) } /* - * If VF is activated (tranparent/non-transparent mode does not + * If VF is activated (transparent/non-transparent mode does not * matter here). * * - Disable LRO @@ -3591,7 +3591,7 @@ hn_rxpkt(struct hn_rx_ring *rxr) do_lro = 0; /* - * If VF is activated (tranparent/non-transparent mode does not + * If VF is activated (transparent/non-transparent mode does not * matter here), do _not_ mess with unsupported hash types or * functions. */ @@ -7600,7 +7600,7 @@ hn_sysinit(void *arg __unused) */ if (hn_xpnt_vf && hn_use_if_start) { hn_use_if_start = 0; - printf("hn: tranparent VF mode, if_transmit will be used, " + printf("hn: transparent VF mode, if_transmit will be used, " "instead of if_start\n"); } #endif diff --git a/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c b/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c index 29a88e76a579..63ac93a8773c 100644 --- a/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c +++ b/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c @@ -2088,7 +2088,7 @@ create_storvsc_request(union ccb *ccb, struct hv_storvsc_request *reqp) break; } default: - printf("Unknow flags: %d\n", ccb->ccb_h.flags); + printf("Unknown flags: %d\n", ccb->ccb_h.flags); return(EINVAL); } diff --git a/sys/dev/hyperv/utilities/hv_kvp.c b/sys/dev/hyperv/utilities/hv_kvp.c index 60bade869b49..d8ab583d69fa 100644 --- a/sys/dev/hyperv/utilities/hv_kvp.c +++ b/sys/dev/hyperv/utilities/hv_kvp.c @@ -621,7 +621,7 @@ hv_kvp_process_request(void *context, int pending) } else { if (!sc->daemon_busy) { - hv_kvp_log_info("%s: issuing qury to daemon\n", __func__); + hv_kvp_log_info("%s: issuing query to daemon\n", __func__); mtx_lock(&sc->pending_mutex); sc->req_timed_out = false; sc->daemon_busy = true; From nobody Tue Oct 28 08:11:30 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cwjkp6Xytz6DSMB; Tue, 28 Oct 2025 08:11: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cwjkp60R2z4D7p; Tue, 28 Oct 2025 08:11:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761639090; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cCLrtNcLEoYX5dplq2J7oWe5V/4PGkleVKowxXaXbFg=; b=UcrlZnRMl/KLyEbQkmzw6PWeND0Roin1Fj360UiLBD8CJadx90RKecdjy25lI8kcztRGko Erors85J4an4/O/e1sVZVSvxR28wAkLua+0AUfi3FzfWQh/7PNJVWQMNGpmjO2neWSEouc +tbQ30t1++/DuZ0PgmT03rVcj7sbfkAy+fUZbx159BFSbuzNq0+hNHvqlI+zFE1FxjIq2T exdu9atdrO74BhPdsY5p8f+uQ8ljduATtnY0Tzyunmx/hfVwa+Xc570q+EZesLZnt2gyvr rAtNjDPKx9NgYwwrteVxv6srdK36BmKr2gQsOOD/4y9awcJLzgIQ3eRlQOrTyQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761639090; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cCLrtNcLEoYX5dplq2J7oWe5V/4PGkleVKowxXaXbFg=; b=cRncSPGuq/lUqUoz6vY/a8obp9HGhQDrnCJ8z+9w6Qo8LsXL3ENsaU6FtoXajikkipcVGV R68YcoYv2bJTBCHFnLRi3Q1rkAbBArCWofvM9ALezN6+FlEJBvHZUjwGZxrZcK5GN2ybTf awc7Cp8mQMNs1gGTMQEE9cBZonBhRfNDnPc48+pBNTAQNJxFVvzxuaOB12oHtNioYs9ksN 3yZo0KxSVQXjuoBdivjB8tti0PejWWLTs0ffgUioY/AOJX9Ev/LDWho0vidm/gEgRV3wo1 sNOcE7RSPmt54zlmjsZ+O48kaM+QcwBreZlBT5Wi/pbqknFnwvubZ8RLEZjAmg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761639090; a=rsa-sha256; cv=none; b=QBcnIK8LzxAbLS8FVtXvW2/Umkh8FzXpkX6g+FT4O9C8SIhuHM6ZBVy/1/QGGK4VHrHF52 CYbgC6Lt+bq6Re8ig60kZHQW+pVN77fP77HXRexO0DPJKAz+UQ+Ch6ESgxpbI8+Gjw1FgK qG541OM0rHUob2BoDIcsR4J5DUg3zjWWmqbEBKBqtkHL7uOKIpmRdWi/pUcHLPLEmIVGHV 5er55IwiHWJ8c426yGT8l4o9lp6AfNXtdbBOzEuyt+6rdvUTq3m6Bt7vMkEB7SWBjorsN1 2TlvBpi9/NYfi4vi8Tz9f69/bLYcYMFs+nepqB1gVnoPOl4/ODu7A6dNl4kegA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cwjkp5WQ0zj1f; Tue, 28 Oct 2025 08:11: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 59S8BUeL079898; Tue, 28 Oct 2025 08:11:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59S8BUFT079895; Tue, 28 Oct 2025 08:11:30 GMT (envelope-from git) Date: Tue, 28 Oct 2025 08:11:30 GMT Message-Id: <202510280811.59S8BUFT079895@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: aa0cd9e5b4d2 - main - ocs_fc(4): Fix a couple of typos in kernel messages List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: aa0cd9e5b4d21b11097e1c21a3c0eb23525c15c3 Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=aa0cd9e5b4d21b11097e1c21a3c0eb23525c15c3 commit aa0cd9e5b4d21b11097e1c21a3c0eb23525c15c3 Author: Gordon Bergling AuthorDate: 2025-10-28 08:11:11 +0000 Commit: Gordon Bergling CommitDate: 2025-10-28 08:11:11 +0000 ocs_fc(4): Fix a couple of typos in kernel messages - s/unexpectd/unexpected/ - s/Unexected/Unexpected/ - s/niether/neither/ - s/sucessfully/successfully/ - s/Inavlid/Invalid/ - s/toplogy/topology/ MFC after: 1 week --- sys/dev/ocs_fc/ocs_device.c | 2 +- sys/dev/ocs_fc/ocs_els.c | 4 ++-- sys/dev/ocs_fc/ocs_gendump.c | 4 ++-- sys/dev/ocs_fc/ocs_ioctl.c | 2 +- sys/dev/ocs_fc/ocs_scsi.c | 2 +- sys/dev/ocs_fc/ocs_xport.c | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/sys/dev/ocs_fc/ocs_device.c b/sys/dev/ocs_fc/ocs_device.c index 7f0c5526b1c3..d9c283541d3c 100644 --- a/sys/dev/ocs_fc/ocs_device.c +++ b/sys/dev/ocs_fc/ocs_device.c @@ -825,7 +825,7 @@ __ocs_d_init(ocs_sm_ctx_t *ctx, ocs_sm_event_t evt, void *arg) ocs_node_transition(node, __ocs_d_wait_topology_notify, NULL); break; default: - node_printf(node, "received PLOGI, with unexpectd topology %d\n", + node_printf(node, "received PLOGI, with unexpected topology %d\n", node->sport->topology); ocs_assert(FALSE, NULL); break; diff --git a/sys/dev/ocs_fc/ocs_els.c b/sys/dev/ocs_fc/ocs_els.c index c62f71d4eb4f..cf4f01477f69 100644 --- a/sys/dev/ocs_fc/ocs_els.c +++ b/sys/dev/ocs_fc/ocs_els.c @@ -314,7 +314,7 @@ _ocs_els_io_free(void *arg) ocs_list_remove(&node->els_io_pend_list, els); els->els_pend = 0; } else { - ocs_log_err(ocs, "assertion failed: niether els->els_pend nor els->active set\n"); + ocs_log_err(ocs, "assertion failed: neither els->els_pend nor els->active set\n"); ocs_unlock(&node->active_ios_lock); return; } @@ -363,7 +363,7 @@ ocs_els_make_active(ocs_io_t *els) } else { /* must be retrying; make sure it's already active */ if (!els->els_active) { - ocs_log_err(node->ocs, "assertion failed: niether els->els_pend nor els->active set\n"); + ocs_log_err(node->ocs, "assertion failed: neither els->els_pend nor els->active set\n"); } } ocs_unlock(&node->active_ios_lock); diff --git a/sys/dev/ocs_fc/ocs_gendump.c b/sys/dev/ocs_fc/ocs_gendump.c index 83155d90c3a3..6a1abfefadfc 100644 --- a/sys/dev/ocs_fc/ocs_gendump.c +++ b/sys/dev/ocs_fc/ocs_gendump.c @@ -153,7 +153,7 @@ ocs_gen_dump(ocs_t *ocs) ocs_log_test(ocs, "Failed to see dump after 30 secs\n"); rc = -1; } else { - ocs_log_debug(ocs, "sucessfully generated dump\n"); + ocs_log_debug(ocs, "successfully generated dump\n"); } /* now reset port */ @@ -219,7 +219,7 @@ ocs_fdb_dump(ocs_t *ocs) return -1; } - ocs_log_debug(ocs, "sucessfully generated dump\n"); + ocs_log_debug(ocs, "successfully generated dump\n"); } else { ocs_log_err(ocs, "dump request to hw failed\n"); diff --git a/sys/dev/ocs_fc/ocs_ioctl.c b/sys/dev/ocs_fc/ocs_ioctl.c index 71ba17d5f72a..d3cea434b2be 100644 --- a/sys/dev/ocs_fc/ocs_ioctl.c +++ b/sys/dev/ocs_fc/ocs_ioctl.c @@ -796,7 +796,7 @@ ocs_sys_fwupgrade(SYSCTL_HANDLER_ARGS) break; default: ocs_log_warn(ocs, - "Unexected value change_status: %d\n", + "Unexpected value change_status: %d\n", fw_change_status); break; } diff --git a/sys/dev/ocs_fc/ocs_scsi.c b/sys/dev/ocs_fc/ocs_scsi.c index af9fc798b01c..1bbf60b9014b 100644 --- a/sys/dev/ocs_fc/ocs_scsi.c +++ b/sys/dev/ocs_fc/ocs_scsi.c @@ -720,7 +720,7 @@ ocs_scsi_build_sgls(ocs_hw_t *hw, ocs_hw_io_t *hio, ocs_hw_dif_info_t *hw_dif, o case OCS_HW_DIF_BK_SIZE_520: blocksize = 520; break; case OCS_HW_DIF_BK_SIZE_4104: blocksize = 4104; break; default: - ocs_log_test(hw->os, "Inavlid hw_dif blocksize %d\n", hw_dif->blk_size); + ocs_log_test(hw->os, "Invalid hw_dif blocksize %d\n", hw_dif->blk_size); return -1; } for (i = 0; i < sgl_count; i++) { diff --git a/sys/dev/ocs_fc/ocs_xport.c b/sys/dev/ocs_fc/ocs_xport.c index d997ea245132..9e69bf0ed98f 100644 --- a/sys/dev/ocs_fc/ocs_xport.c +++ b/sys/dev/ocs_fc/ocs_xport.c @@ -482,12 +482,12 @@ ocs_xport_initialize(ocs_xport_t *xport) /* Setup persistent topology based on topology mod-param value */ rc = ocs_topology_setup(ocs); if (rc) { - ocs_log_err(ocs, "%s: Can't set the toplogy\n", ocs->desc); + ocs_log_err(ocs, "%s: Can't set the topology\n", ocs->desc); return -1; } if (ocs_hw_set(&ocs->hw, OCS_HW_TOPOLOGY, ocs->topology) != OCS_HW_RTN_SUCCESS) { - ocs_log_err(ocs, "%s: Can't set the toplogy\n", ocs->desc); + ocs_log_err(ocs, "%s: Can't set the topology\n", ocs->desc); return -1; } ocs_hw_set(&ocs->hw, OCS_HW_RQ_DEFAULT_BUFFER_SIZE, OCS_FC_RQ_SIZE_DEFAULT); From nobody Tue Oct 28 08:15:04 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cwjpx0R3yz6DSN9; Tue, 28 Oct 2025 08:15:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cwjpw6pqjz4Fl4; Tue, 28 Oct 2025 08:15:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761639305; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=d1KZZIkHFyWi9w5s/lO7aqhFBv7HEjZ2XLOFxOhFWoA=; b=Ka2hgGzfWqUmboFZSGAwVkTPZBIF8bV5f0AERtgcQ/P0y4ZQp0dSRHepvRYICHmB68q50w y040/VI298TIPpLDpFdeWohjCW5/WRmH4aMdehn+PjIBq1U3E9FFGN6VtaQxo/K9a73/3W KN5gCM42hA1GMhL4G6IP8QIa4ySqFEnP2V5fQ/mopH0FMkT58lMo7TpaZSvezpFpU8JDwx pI91AjsD5kynlesyVovTTCnnk71RrGY/ktOA7Fd9ReAaPcQnU/hJZ1ph3b3ltERbHlX5SW s2nVKW1rLWMFyWIJGVQae2C3L3RjMIMRKaui2A0JXi+VE+OLcuBkHJ5VdVFHSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761639305; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=d1KZZIkHFyWi9w5s/lO7aqhFBv7HEjZ2XLOFxOhFWoA=; b=ylSoznwoHSNoww1bvV8+UtfrPQelHAZ8qchO5jUuAvpFLfhF8u0dueZw7/LJSJS/Ee4pGX b4Pir3fBz/lsMz54eEmywFIkJkze39Ose6MTtKWeO4kEqN+ctcOsOfJGdHWSBhSJDWCtzH ODByiRkLXYKSrdnfXHeAlRbPPkcU8yWzak6XHNPjqi472Q1lNmXlfCsqgmnmJLLVAGEO/l JLvsZFFzFF6MGfFir9QPkKfptaFiWol/gCXabHqFWe9U808nUtnlxB68pbqMM72CDgLvbd 6kNg2110qOg65QBo6ssLzDa5loY1MHNETBqs2oYmEqZfxPzdSklZw45r+Ltw3w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761639305; a=rsa-sha256; cv=none; b=LVpI6fcNBXoi3E3Ptt9RcX/m40FNVcDaYaQh2BmC6DJIIa+3my070QzsCDf/5YvQxQDWOh ltq+lH0TlS9oiJlKS/rky1903UNZuJZQWE47kCOyuLQEDmht9uVVp3cNkvwmLZKQWy3fX4 /vTaTrtcUSy7iirZGGp3jFevBGYTyXOH4HubVho25J0Ctb/W/uHKtf0n/TWIngrkGpSrLm wE1CGAV6ZczdsLUTdewFaG1jyG9LEmGFDFbOTVYNIFSJTYkkAs2uZDCzEyRQntisDDmVfA 1YZlfgXZ6TkIMYKtO++vj9rHpNsuDGdjKgUYy21Y+uuyKbqKBTpYnEnWnN/i4g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cwjpw5gKyzhXD; Tue, 28 Oct 2025 08:15: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 59S8F4NS087381; Tue, 28 Oct 2025 08:15:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59S8F4U9087378; Tue, 28 Oct 2025 08:15:04 GMT (envelope-from git) Date: Tue, 28 Oct 2025 08:15:04 GMT Message-Id: <202510280815.59S8F4U9087378@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: e9058e1444d8 - main - virtio(4): Fix a couple of typos in kernel messages List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e9058e1444d8e5831a237934ca2316e22fc55f36 Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=e9058e1444d8e5831a237934ca2316e22fc55f36 commit e9058e1444d8e5831a237934ca2316e22fc55f36 Author: Gordon Bergling AuthorDate: 2025-10-28 08:14:43 +0000 Commit: Gordon Bergling CommitDate: 2025-10-28 08:14:43 +0000 virtio(4): Fix a couple of typos in kernel messages - s/reponse/response/ - s/Cannnot/Cannot/ MFC after: 1 week --- sys/dev/virtio/gpu/virtio_gpu.c | 10 +++++----- sys/dev/virtio/scmi/virtio_scmi.c | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/dev/virtio/gpu/virtio_gpu.c b/sys/dev/virtio/gpu/virtio_gpu.c index 6f786a450900..668eb170304a 100644 --- a/sys/dev/virtio/gpu/virtio_gpu.c +++ b/sys/dev/virtio/gpu/virtio_gpu.c @@ -547,7 +547,7 @@ vtgpu_create_2d(struct vtgpu_softc *sc) return (error); if (s.resp.type != htole32(VIRTIO_GPU_RESP_OK_NODATA)) { - device_printf(sc->vtgpu_dev, "Invalid reponse type %x\n", + device_printf(sc->vtgpu_dev, "Invalid response type %x\n", le32toh(s.resp.type)); return (EINVAL); } @@ -586,7 +586,7 @@ vtgpu_attach_backing(struct vtgpu_softc *sc) return (error); if (s.resp.type != htole32(VIRTIO_GPU_RESP_OK_NODATA)) { - device_printf(sc->vtgpu_dev, "Invalid reponse type %x\n", + device_printf(sc->vtgpu_dev, "Invalid response type %x\n", le32toh(s.resp.type)); return (EINVAL); } @@ -624,7 +624,7 @@ vtgpu_set_scanout(struct vtgpu_softc *sc, uint32_t x, uint32_t y, return (error); if (s.resp.type != htole32(VIRTIO_GPU_RESP_OK_NODATA)) { - device_printf(sc->vtgpu_dev, "Invalid reponse type %x\n", + device_printf(sc->vtgpu_dev, "Invalid response type %x\n", le32toh(s.resp.type)); return (EINVAL); } @@ -663,7 +663,7 @@ vtgpu_transfer_to_host_2d(struct vtgpu_softc *sc, uint32_t x, uint32_t y, return (error); if (s.resp.type != htole32(VIRTIO_GPU_RESP_OK_NODATA)) { - device_printf(sc->vtgpu_dev, "Invalid reponse type %x\n", + device_printf(sc->vtgpu_dev, "Invalid response type %x\n", le32toh(s.resp.type)); return (EINVAL); } @@ -700,7 +700,7 @@ vtgpu_resource_flush(struct vtgpu_softc *sc, uint32_t x, uint32_t y, return (error); if (s.resp.type != htole32(VIRTIO_GPU_RESP_OK_NODATA)) { - device_printf(sc->vtgpu_dev, "Invalid reponse type %x\n", + device_printf(sc->vtgpu_dev, "Invalid response type %x\n", le32toh(s.resp.type)); return (EINVAL); } diff --git a/sys/dev/virtio/scmi/virtio_scmi.c b/sys/dev/virtio/scmi/virtio_scmi.c index f5427756e971..436711dc0ae2 100644 --- a/sys/dev/virtio/scmi/virtio_scmi.c +++ b/sys/dev/virtio/scmi/virtio_scmi.c @@ -386,7 +386,7 @@ virtio_scmi_pdu_get(struct vtscmi_queue *q, void *buf, unsigned int tx_len, mtx_unlock_spin(&q->p_mtx); if (pdu == NULL) { - device_printf(q->dev, "Cannnot allocate PDU.\n"); + device_printf(q->dev, "Cannot allocate PDU.\n"); return (NULL); } From nobody Tue Oct 28 08:17:12 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cwjsP0t0hz6DT8m; Tue, 28 Oct 2025 08:17: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cwjsN5hsdz4Fsl; Tue, 28 Oct 2025 08:17:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761639432; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yhMO0Xwb4w8NcSqnGjAn1k0sq1a+A6DpArdm823j814=; b=AKNywUz7XC1oX/iA/mp4eitkA/KR4An7KyIWDb9yTidr/gAvdXOsBpuSqNQQxcGJtBUtQz HIcaOkvoy25pzmDKLnjNPcFZT8CW/qNuGoRQEIFXArWIwKU1MZlB2w4WNPFPMZBvoSMhfv CsRTBjVE9B/pLe2/OSzljGuxuoG1KQYbJUijjTYfOG4wK+bFQxSqVnUPEVi2/Tg/QwZWi2 DKlU+BN3BCcJFVNjy0iFVq//TRERgh7HKNzvQy8ouKJ1hlEheIp9Kt/oGLB5VkKtGzDyyt h4QPuU3mFYsnhqImGMOPlMpuQZ4ZMm/TONHsq4YnhygpJP8Hc+EvcgAsMwZKlA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761639432; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yhMO0Xwb4w8NcSqnGjAn1k0sq1a+A6DpArdm823j814=; b=w9SHVsjj+a2vbB4IfEruHPSkRxFOnImzeDfQKZ1yAzK9aPNXOcEvAbijVC5gkG2Nw6PrlK N+JWfzzLMugmNZ8ii8zJDCwDdD0ty2vcjgyr8owWetf3OO6WXrRjYflMC13FtXpG24py/c Ha5OPkUVnwDYwnw9GAt02+ufF4OcqGxDXhxnLbmXQmtoTGQ/USRTp0kS1/v6ehfXfjjdga bQTTEMTkEZi/8L2BSt1EZhKyGpDxZLbeK2RsNTR2Wd2Aln6OPJHoBNIGSGLIJDKSz3CSpw VIVT/3bHlaxaTWymukDtFxX5MMoeFbmpskyOFwnTtEUxoSsn6bUIzj1afrAQ8A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761639432; a=rsa-sha256; cv=none; b=lpHz9i9CKfpfgTHRRN29k5zt0RAnmrs/rWE8Wq3VKZOXdc+ClZnNW474O07jF6ZjDbViJT FfnNPhFgDnvdD4rYQVUOSKJ3OgPoGpysoFaglYKSAcamsY7MncucHIMIeQFQwzto4pATaB QBWj4Ma2hpefz4Fr3ObLTCxu31W+9KXkUGCsjEumbUBd/0q9oAdvAz1baFWnGjNeLmPX7d 8ysiR3jtPIqOKBMhjhkW+VsDB7sNzg7rUyExkJR2Yh29X6zkLamKZvEOazyGf3nb1yWTcP Fz8JzAKPAOrFpA/QWYgXTm7FTayOIKWnS88k9L2ZY9d/fsP7eGJatCnV1LRSNA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cwjsN5561zjVh; Tue, 28 Oct 2025 08:17: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 59S8HClN088092; Tue, 28 Oct 2025 08:17:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59S8HCUk088089; Tue, 28 Oct 2025 08:17:12 GMT (envelope-from git) Date: Tue, 28 Oct 2025 08:17:12 GMT Message-Id: <202510280817.59S8HCUk088089@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: b57198f620bc - main - fusefs(5): Fix a couple of typos in kernel messages List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b57198f620bcbf899a32c3de9526bd525ab8a39e Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=b57198f620bcbf899a32c3de9526bd525ab8a39e commit b57198f620bcbf899a32c3de9526bd525ab8a39e Author: Gordon Bergling AuthorDate: 2025-10-28 08:16:35 +0000 Commit: Gordon Bergling CommitDate: 2025-10-28 08:16:35 +0000 fusefs(5): Fix a couple of typos in kernel messages - s/intalled/installed/ - s/attributess/attributes/ MFC after: 1 week --- sys/fs/fuse/fuse_ipc.c | 2 +- sys/fs/fuse/fuse_vnops.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/fs/fuse/fuse_ipc.c b/sys/fs/fuse/fuse_ipc.c index 7f754ab7f1d4..bc36f0070d7d 100644 --- a/sys/fs/fuse/fuse_ipc.c +++ b/sys/fs/fuse/fuse_ipc.c @@ -694,7 +694,7 @@ fuse_body_audit(struct fuse_ticket *ftick, size_t blen) break; case FUSE_FORGET: - panic("FUSE: a handler has been intalled for FUSE_FORGET"); + panic("FUSE: a handler has been installed for FUSE_FORGET"); break; case FUSE_GETATTR: diff --git a/sys/fs/fuse/fuse_vnops.c b/sys/fs/fuse/fuse_vnops.c index 683ee2f7ad56..97aa23bfb0b0 100644 --- a/sys/fs/fuse/fuse_vnops.c +++ b/sys/fs/fuse/fuse_vnops.c @@ -2756,7 +2756,7 @@ fuse_vnop_setextattr(struct vop_setextattr_args *ap) */ if (fsess_not_impl(mp, FUSE_REMOVEXATTR)) return (EXTERROR(EOPNOTSUPP, "This server does not " - "implement removing extended attributess")); + "implement removing extended attributes")); else return (EXTERROR(EINVAL, "DELETEEXTATTR should be used " "to remove extattrs")); From nobody Tue Oct 28 08:32:08 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cwkBd0MTFz6DV4k; Tue, 28 Oct 2025 08:32: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cwkBc6kjpz4J4N; Tue, 28 Oct 2025 08:32:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761640329; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vprVu3Q1Bhzc0RTJr2pTcBBRCZF+/cvbHScJfSLU2o0=; b=o3ghOYCS1JK3hD5MCTXYxALENjRkVJcY0Uf5INwrDE1oSF7BWEuOVhwKtoRbS+vGSrkfg3 9V37uRrFRmPk4EpdF73cYUo82tH+0lV3Eie5vNFcXauNE7qJfTw4DFsAynNrNms55YmuVA HcagtxiE7IgBRcmo/b02Nfs3yB/fegu+K+rLFqSfLkCJz/yE5Uk6FQEEmFKmu2Vnxj04s1 oQLzoITA2iSlDtJxoWCPItwAhUtzKPfz9ZacEEsvCjIPkuGHTsny5mcvBHg7E4T/GgzIsM ykrTIjoJKwIprl8X5mM3w9X1OV6RvBkONb3rEMwCB4yQG+jczoDf9xngNWMjoA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761640329; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vprVu3Q1Bhzc0RTJr2pTcBBRCZF+/cvbHScJfSLU2o0=; b=bGqPuFnDJ/WFOT5/uwKkEXQ8BACyMx0o7Yqs591V2/RsvKU0omlv6R4CC1BU5RPPiH3PPv U/seISNg3RElf0fzLpis5KGmVOljhB1VkMBBdUKMtTcnL0Cyr5xm4F/zvXqdSDCN4AUh1W O/a6rf9ltugsCGwjsBu+QwqheRqqBhPjXxJLz1k9B1japnW8R+q1+5dyK1QukktxocmavS hz08iNCXOxVYepmm01VqnPmyuOlq4wc08jG/rhsVF5nlPmYtBp/W1BceIwaIP1zUwHRAEH KT1xT7LJ7zo5d873A1eQGaZc69pv+xXcPixA01sjvYkO0smi+XEFGvq4++jDAA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761640329; a=rsa-sha256; cv=none; b=UtRiOLXAPw0twJSdI+FW2ZNZkh2Hic6Ga46hfZ6AOZy1dHrjPSS80hJWOyXE/fRuPVASe+ Ia/v97USulQNCvHi4bk9rYAHaChSiSQrjElTjYU5QpYeAKgXmxR0VumzZHipJQHgx0+ktp DdqdwK3Aa5ssL8AaTYco74DYTUk1KhUkPYKE9sZ/Rb9aNJJGBh/fZyhtSi6A5/mowV7rdq zZBxhGDI5n2SKinZ9S7GEheDwudmgISg1oJrKoNFV4j2rEumSQFxXG5MtX/F2WlVUfSC+z f7aNsTgf40+uOr+aN8Rumo21Eptd5p5LRKw1CHBziXMl231zq+uYxQtiSd0noQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cwkBc6JrXzjg2; Tue, 28 Oct 2025 08:32:08 +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 59S8W8HK023478; Tue, 28 Oct 2025 08:32:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59S8W8t5023475; Tue, 28 Oct 2025 08:32:08 GMT (envelope-from git) Date: Tue, 28 Oct 2025 08:32:08 GMT Message-Id: <202510280832.59S8W8t5023475@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 74dfef71d8c0 - main - pkgbase: fix kyua package List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 74dfef71d8c0f55ebe09337eabd797e03dc0ef1a Auto-Submitted: auto-generated The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=74dfef71d8c0f55ebe09337eabd797e03dc0ef1a commit 74dfef71d8c0f55ebe09337eabd797e03dc0ef1a Author: Baptiste Daroussin AuthorDate: 2025-10-17 14:58:41 +0000 Commit: Baptiste Daroussin CommitDate: 2025-10-28 08:29:05 +0000 pkgbase: fix kyua package All its shared data should be installed in the FreeBSD-kyua package --- usr.bin/kyua/Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/usr.bin/kyua/Makefile b/usr.bin/kyua/Makefile index 178a1d083b79..d6131651afbf 100644 --- a/usr.bin/kyua/Makefile +++ b/usr.bin/kyua/Makefile @@ -182,25 +182,25 @@ FILESGROUPS+= EXAMPLES CONFS= kyua.conf-default CONFSDIR= ${KYUA_CONFDIR} CONFSNAME= kyua.conf -CONFSDIRTAGS= package=tests +CONFSDIRTAGS= package=kyua DOCS= AUTHORS CONTRIBUTORS LICENSE DOCSDIR= ${KYUA_DOCDIR} -DOCSTAGS= package=tests +DOCSTAGS= package=kyua EXAMPLES= Kyuafile.top kyua.conf EXAMPLESDIR= ${KYUA_EGDIR} -EXAMPLESTAGS= package=tests +EXAMPLESTAGS= package=kyua .PATH: ${KYUA_SRCDIR}/examples MISC= context.html index.html report.css test_result.html MISCDIR= ${KYUA_MISCDIR} -MISCTAGS= package=tests +MISCTAGS= package=kyua .PATH: ${KYUA_SRCDIR}/misc STORE= migrate_v1_v2.sql migrate_v2_v3.sql schema_v3.sql STOREDIR= ${KYUA_STOREDIR} -STORETAGS= package=tests +STORETAGS= package=kyua .PATH: ${KYUA_SRCDIR}/store CLEANFILES+= ${MAN} From nobody Tue Oct 28 08:32:09 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cwkBf2cNWz6DTjZ; Tue, 28 Oct 2025 08:32: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cwkBf0lhMz4J4P; Tue, 28 Oct 2025 08:32:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761640330; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=49NH40qoAIWSAeGUr35/u9pk2eVuastguDkYOlXvb1Q=; b=uiItkQ2XREktbOfS+CUsjemkX+vy8obZa5LzlKEZXyf/MQJhyTEhbDcxp9uuBZDdh47wwX dCza9L95x8O8S0EWBNOEwZsjmkhg2vuBt5oAgFcHPrfAOBcrS28+7YHb6Nu7982/pHK7Lb 8+w8yIcP967bfsSY5B5xN4sn4I5PnbtP0bizrYhUIEIhq5UzckEItUIiZ8R4qO6hUQ77Rf 8veoGAH2h7H2ywmbKi9ZTs9qLy82FRdwc0GEW1UX0mJ8DH7RoOMNJsel24NC44bGdjt62X ZZ+m5I2dX7etopykK/S2T/uQdOiTwYzxtPfnVH5heP75lGIuiRZw7WY4OO4rFQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761640330; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=49NH40qoAIWSAeGUr35/u9pk2eVuastguDkYOlXvb1Q=; b=AqqOyyrIOsyvFMM4urdrmAbBD/mUgi8NnXTJoNevwCdSjLBRAoLwZOD469YP/Uqp5KRsV8 Ax6YuO0f30dtO65sLCSLp1rbrCCF37r/L7XavOpVIYuzSWxNiNT7zVnWpIf2rlsyg5O2QC UonIZyhPXWrEhGajf3lnCq4TWkYwcJgl/px7FjlCLFD5csffS2rQr3JS9L3aHQzFBBxRGt 1gfZFszc+xKNkZvK4KwseMwDzJ+65BpEX2cAtTw2cOasQqEtyGO8AGb6rGyOdUbEYQ3XQM Vmuw+KYEZy3gZYSZRTMIuYmcwzq04rFj6SgluuUIYl4vRrPMXr1i+9YUP+2+4Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761640330; a=rsa-sha256; cv=none; b=qfORegnB9c3rEmVzC8TOvU9Wn8kWeZkQBsEsrDC9N++dPwRwYz70BKdop4dfmZzkWIi5jm 0jNumezUEfqZ4CZ5E5kZM0kUSKOEgfCLsquxkUqdP1uMVi9CIYDVU44eRqe+lV0CgINRlK aDoSG5yp+zDHVi40Qb/BDf6dlQT4kw8M4hvev0hkhm6Nu6kauzmm4oXQW3GeD6eFuzzbmL UhtbRt/3wad/7zsWifbAbcJmJGV8iFe67HtQptLtmHm2X8+sLgJxzKB3hlyj/MtUWZ9e8a ABBVdRC6HGKhLbEMmIq4sM9xSaPe2H7mGVoZpjrgEuURcYERsg0ROQQXQTDPXQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cwkBd74n5zjmn; Tue, 28 Oct 2025 08:32: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 59S8W9kL023517; Tue, 28 Oct 2025 08:32:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59S8W9w1023514; Tue, 28 Oct 2025 08:32:09 GMT (envelope-from git) Date: Tue, 28 Oct 2025 08:32:09 GMT Message-Id: <202510280832.59S8W9w1023514@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 90cd623611b2 - main - usb_vendors: update to 2025-09-15 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 90cd623611b22e2e484b800743845b38d9c20250 Auto-Submitted: auto-generated The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=90cd623611b22e2e484b800743845b38d9c20250 commit 90cd623611b22e2e484b800743845b38d9c20250 Author: Baptiste Daroussin AuthorDate: 2025-10-28 08:31:02 +0000 Commit: Baptiste Daroussin CommitDate: 2025-10-28 08:31:02 +0000 usb_vendors: update to 2025-09-15 --- share/misc/usb_vendors | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/share/misc/usb_vendors b/share/misc/usb_vendors index 1878f503b676..fa798e65ed9a 100644 --- a/share/misc/usb_vendors +++ b/share/misc/usb_vendors @@ -9,8 +9,8 @@ # The latest version can be obtained from # http://www.linux-usb.org/usb.ids # -# Version: 2025.07.26 -# Date: 2025-07-26 20:34:01 +# Version: 2025.09.15 +# Date: 2025-09-15 20:34:02 # # Vendors, devices and interfaces. Please keep sorted. @@ -13488,7 +13488,9 @@ 0b0d ProjectLab 0000 CenturyCD 0b0e GN Netcom + 0301 Jabra EVOLVE 20 0305 Jabra EVOLVE Link MS + 030c Jabra EVOLVE 65 0311 Jabra EVOLVE 65 0312 enc060:Buttons Volume up/down/mute + phone [Jabra] 0343 Jabra UC VOICE 150a @@ -13507,6 +13509,11 @@ 2007 GN 2000 Stereo Corded Headset 2456 Jabra SPEAK 810 245e Jabra Link 370 + 248a Jabra Elite 85h + 24b8 Jabra Evolve2 65 + 24bb Jabra Evolve2 85 + 24c9 Jabra Link 380 + 24ca Jabra Link 380 620c Jabra BT620s 9330 Jabra GN9330 Headset a346 Jabra Engage 75 Stereo From nobody Tue Oct 28 08:32:11 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cwkBg4Lwxz6DTck; Tue, 28 Oct 2025 08:32: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cwkBg1SR7z4JGQ; Tue, 28 Oct 2025 08:32:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761640331; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PXV5tkrRwHWmoYosgKlOtTPrA7lDqPguQgZbz/eQSK8=; b=TbsRqYiXmuxdLAPCzR3YX3jczp2LMoeK7TcfrqqpzLCSp/CLCrfED6ewfi0obNdVVlwKv1 LZkkIy8/sZRNkx2ZvOJ8yuCx8u5V5Tc7aaiM+zTJX0U2QsatS2B0lBOsw+8DFlAFXBH9Dd hob3QtQ1THBmOT7PAAW8tSmny7nV44Zu12bj1wqxK9LkJQGojHB/PvYMcPhS2Y5IV/ykQx GfU9YxvKvcZ5r8ZgrFp9O40kHnNyhTUhFBx6KM4xNqv27KbM3xDrVxsBdFkLGfzdH08Hqr +2sKJ40vl7edVKaxeeqxNJlbWzHBHLyrAcudCR4GO+B2tBzcbIU309WAhtxEoA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761640331; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PXV5tkrRwHWmoYosgKlOtTPrA7lDqPguQgZbz/eQSK8=; b=tLcy3ePiD4+ytiv2MJpsvmeUcDLmxP4JJp+Uc9Kht+A55Jakecinyk/FUeeRDU0tlQgkEP JOSMEs156ru/O4zwfUUgoUvJt6VMJREo0s0om/7UWN1re694yddFgAMm5X/KjH84saK0Gn lRl0phH3S9dEktuOLasZb+MNVx72lwyLr2h16beyTZ6Kw/tbE/7+z9qRVGVzgZi6EJciYl qBIcB09ELiw2bC2tT2ccPclgjPiT5nXlPrAPIqJAAcVUTXg49zLa+Hz5wyQVE9Nm1GcoJg s94lOKGT6+dU1L2LpWzdTFHskVrimi69urXGDGhmjOwyf9rml1TywllV+tJS0g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761640331; a=rsa-sha256; cv=none; b=jBB3vRYZxJDYcTNNUZZN/3K07RIEO2P/ErfPPFcFRvrj4bf8IEv4g62caq+QQ9c9xAXWsf TRGGe9kTTQahKGgL4bSc4rk3T9zuv6c/nC9thyVz3uBEmLzTlzazVk3oiQbUdgfn/T4jrx YzWa23sThrXPOMai0mdQr1G8LfBmhVur5lEDrCy//UDqeI4AHQe5qCyngL0g3z4d/Lndrq Fbu+jgNPyASwlQ/36pcjz/8yTWJyCVscZgPfDJNMqOlxqReUQZ6iRJg6kWboySxj5kYSJe y9L3SnysaLvcB+uKUsl8MMbEI2+r55OF4UPyUAZTegA1/GGyltj3cIy948uSmw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cwkBg0tPDzk0H; Tue, 28 Oct 2025 08: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 59S8WBDM023549; Tue, 28 Oct 2025 08: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 59S8WBA8023546; Tue, 28 Oct 2025 08:32:11 GMT (envelope-from git) Date: Tue, 28 Oct 2025 08:32:11 GMT Message-Id: <202510280832.59S8WBA8023546@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: e5f545e0d872 - main - pci_vendors: update to 2025-10-18 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e5f545e0d872fbfdb6c3c94ca81e7f3bce9d094a Auto-Submitted: auto-generated The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=e5f545e0d872fbfdb6c3c94ca81e7f3bce9d094a commit e5f545e0d872fbfdb6c3c94ca81e7f3bce9d094a Author: Baptiste Daroussin AuthorDate: 2025-10-28 08:31:46 +0000 Commit: Baptiste Daroussin CommitDate: 2025-10-28 08:31:46 +0000 pci_vendors: update to 2025-10-18 --- share/misc/pci_vendors | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/share/misc/pci_vendors b/share/misc/pci_vendors index 6fb8865340a0..1b13509f002d 100644 --- a/share/misc/pci_vendors +++ b/share/misc/pci_vendors @@ -1,8 +1,8 @@ # # List of PCI ID's # -# Version: 2025.07.11 -# Date: 2025-07-11 03:15:02 +# Version: 2025.10.18 +# Date: 2025-10-18 03:15:01 # # Maintained by Albert Pool, Martin Mares, and other volunteers from # the PCI ID Project at https://pci-ids.ucw.cz/. @@ -27979,6 +27979,10 @@ 1007 CL4-8D512 NVMe SSD M.2 (DRAM-less) 1008 CL5-8D512 NVMe SSD M.2 (DRAM-less) 100c CL6 Series NVMe SSD M.2 (DRAM-less) + 100d PJ1 Series NVMe SSD + 1e95 0001 M.2 2280 960 GB + 1e95 0002 M.2 2280 1920 GB + 1e95 100d M.2 2280 480 GB 1010 CX3 Series NVMe SSD 1e95 0000 M.2 2280 480 GB 1e95 0001 M.2 2280 960 GB From nobody Tue Oct 28 08:37:10 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cwkJS6l9hz6DVHT; Tue, 28 Oct 2025 08:37:12 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cwkJS6BN1z4K2m; Tue, 28 Oct 2025 08:37:12 +0000 (UTC) (envelope-from bapt@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761640632; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=Gf2U7ZVYbDuMdZlsi9czZIzEqxT2luLFmo0TNNWNTyA=; b=AV72JiHb0ZOl4+es+B8zRa9P5D1/o0+E9BO06DD7wRjrpmLyqHNepiWWzAeRhIvwKOJDhd 52l88i41DxpWzyJPt/La2GECn6P9rOQaEd2Co2r2Pz7fRkksLbZu1F7WkvnYbuQ0M3aRna iyz47EV6vsJkw6/fSDvL+3LEQDPfACFMumpCQ3O7PMjmF8UOIWe9LuOQf4YNEApI3uY29l 7S/RUIeWUQa38wRbgvYFxnrhuJh/E/NFiISAHQUb1rDD5xwRojDbK321EbBg0NS2QhDC+t pP3DLNdLEu1BIxEk2nR3IUW6TX0l3m87TlJokPchw7KbMvv75IvGJvgQvRp1IQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761640632; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=Gf2U7ZVYbDuMdZlsi9czZIzEqxT2luLFmo0TNNWNTyA=; b=PonQEKLIYW07EY96BrgzGEqfs29pRM/8LsxNQckdTxmYk1TspnA7lE6M8LZIwqKhWPQRV/ y/KhjtKzokaPDzGxIwKS0SjpHyZQd93/rcgN2dy6/gTDbuFUhmaDP6mjMzdRCg+Upsbw8W n9aVv2EZ+ispTMZVwq+F2TOs6375qdsy+ERVDXIWov+H1XXmr4mp3W48neBFsaCNuCGXRd mTs+B3CT2faPVZ0PY/dik9hiqvRIaX7lfADtAmFV80Gmmo6EdBNNnt558pX7nUgLo8n9bL +NSvyTxyChjaq4Shc+B35i62NFMTkq5ywD5hhC5oUCXtMt2FqzkLigiDvY5d3Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761640632; a=rsa-sha256; cv=none; b=hiiKuKA/f2OjzD8gpxhHvUo+2oKJ9GhF46jr6Wz44Bf/e1w7hvQ0DZFQoLO0A7KkXqa2qW f2Ib1E5z8P41p+sq6L7mZcutDdA3aasQRSYAf0gxDMioDoM6UDwtEkdXYry3Dqnibxe7+W DzUhDHqDPT9BXv9RqFW/MyOWjKe2XGgEABRO472KapLkEUN6EUB/1A5ucHL7mwI+dN061a mlLAe0vZKP4ZZnK13Gyyv1eijA1tzNqW7T7DCOaKuBPOyoevhhAB2y3QbsFWg7YpbNWN3C i3PCn5OXGLqZdNXW9CcXrcOTHKouUbhbE6YoCTeKSh1CUx8Zw9CkTRljPzZINA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from b.nours.eu (b.nours.eu [IPv6:2001:41d0:303:5e39::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: bapt) by smtp.freebsd.org (Postfix) with ESMTPSA id 4cwkJS4shsz11S5; Tue, 28 Oct 2025 08:37:12 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: by b.nours.eu (Postfix, from userid 1001) id E017F146AF2; Tue, 28 Oct 2025 09:37:10 +0100 (CET) Date: Tue, 28 Oct 2025 09:37:10 +0100 From: Baptiste Daroussin To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 74dfef71d8c0 - main - pkgbase: fix kyua package Message-ID: References: <202510280832.59S8W8t5023475@gitrepo.freebsd.org> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <202510280832.59S8W8t5023475@gitrepo.freebsd.org> On Tue 28 Oct 08:32, Baptiste Daroussin wrote: > The branch main has been updated by bapt: > > URL: https://cgit.FreeBSD.org/src/commit/?id=74dfef71d8c0f55ebe09337eabd797e03dc0ef1a > > commit 74dfef71d8c0f55ebe09337eabd797e03dc0ef1a > Author: Baptiste Daroussin > AuthorDate: 2025-10-17 14:58:41 +0000 > Commit: Baptiste Daroussin > CommitDate: 2025-10-28 08:29:05 +0000 > > pkgbase: fix kyua package > > All its shared data should be installed in the FreeBSD-kyua package > --- Oups this should not have been pushed this time, there was a review with valid comments, sorry about that. I won't revert, but will adresse the comment in a second commit later. Best regards, Bapt From nobody Tue Oct 28 11:49:24 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cwpZD4Qbbz6DlCf; Tue, 28 Oct 2025 11:49: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cwpZD3tWmz3SGy; Tue, 28 Oct 2025 11:49:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761652164; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Sz2YXTeEpNwRzHQKtkWu+kvyP8cSlOvdFHQiIhwlkl8=; b=iyV08MFCdgEKZbOlwrtYZl5cdvJEFCvsO2tPtG5M5etoxx8SZvG7k2t1zUKi65qsd4xkcZ rggDgRoqkF2urbY0Mh2RTIOmMhntytzQcJtVHoYupvkkRwbhps2QyFYCnqfWdjF/YgdlTn CeEK69HRs9BcDttq+0BXxlUu64DCx/Tqhz2fZ/Tes5MH+s5elt1stHrfDALRp9tgphuLds 4BG9fBJ4/2fZocaEIcyRYITX6WZzDtxgsEa6+hn97Opg8uyGQTzDWhtH/ioYfWrOmGVcU1 foX1/VqtSx50Dc3GQ0RRmAlWjOaiIfFxMyosViJe3tQEUa7RWznZo+7vGvYNaw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761652164; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Sz2YXTeEpNwRzHQKtkWu+kvyP8cSlOvdFHQiIhwlkl8=; b=VX+WoR0ANfzmQ5VRgdZaGOPUGCQL0j3Uhf0/EAu64VkM0T9AlnNCCOFNRtP3RME61M4ZFW 1NWQFEVSkgZ3mC8znYM/BHGukT87z7hhjwJAJOUxT3ag4SXwqtTWGNtB6woMhEueORgttY X+c0k6fWsuPms0XiCykuMv+yKd6vK5OVoqA9vgEJrpg6ZnhybkqPKBg4CGjtQ22Z6m3O8y 1o08F67uAtI3M0KosyWCmPfNfkvMlQkP+/q8YD9krvnjxPMpmVVOMT0ZAk0caBQm/sT7Bf UZmmrcRbySVZjo0JJsd3Zk/LbWVUm9TjeLIBzRL+hkPPY8/KMwE05bitZzOTmA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761652164; a=rsa-sha256; cv=none; b=dRRxJjrURzGVvRhY4lSXxnZA9OsEhHXt72jI41MkvG1P3pXWDHZQKkL8x1uTYiVRm1sS// UpITctF6e/kkauzYEAVKCGFR6ABG6rhqL9bdvo85pzFvCh1aHblg2u/yv4JDb2C0ZrU1Fk +Gv8+PTucC+6vO3he5Stph96Qna71h2HF/+CNOyfG79jkGeQ1WAzNEkfOYTh4Pu6Kr7xkQ ANwrNPrLJcfPhg4feYP9o5TdxFyzBCgEwLEUtvdyGY0pBSFfK3apGz+wKCrNC+MqRX+avw cMBQ7lsgtcNRZQCgMgz/wndU4iSbzqWnF3bxtvBSkvGzwRMGtcc8ni2D9JJuhw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cwpZD2kCKzpgF; Tue, 28 Oct 2025 11:49: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 59SBnOim083351; Tue, 28 Oct 2025 11:49:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59SBnOBe083348; Tue, 28 Oct 2025 11:49:24 GMT (envelope-from git) Date: Tue, 28 Oct 2025 11:49:24 GMT Message-Id: <202510281149.59SBnOBe083348@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jose Luis Duran Subject: git: a943a96a50ba - main - libpfctl: Fix displaying deeply nested anchors List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: a943a96a50ba7e9d1e1935bdd18df0e11d158acb Auto-Submitted: auto-generated The branch main has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=a943a96a50ba7e9d1e1935bdd18df0e11d158acb commit a943a96a50ba7e9d1e1935bdd18df0e11d158acb Author: Jose Luis Duran AuthorDate: 2025-10-25 09:19:18 +0000 Commit: Jose Luis Duran CommitDate: 2025-10-28 11:29:19 +0000 libpfctl: Fix displaying deeply nested anchors Set the number of rulesets (i.e., anchors) directly attached to the anchor and its path in pfctl_get_ruleset(). While here, add a test to document this behavior. PR: 290478 Reviewed by: kp Fixes: 041ce1d690f1 ("pfctl: recursively flush rules and tables") MFC after: 2 days Differential Revision: https://reviews.freebsd.org/D53358 --- lib/libpfctl/libpfctl.c | 3 +++ tests/sys/netpfil/pf/anchor.sh | 46 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+) diff --git a/lib/libpfctl/libpfctl.c b/lib/libpfctl/libpfctl.c index 8c4b26b98054..17576066fcfd 100644 --- a/lib/libpfctl/libpfctl.c +++ b/lib/libpfctl/libpfctl.c @@ -3202,6 +3202,9 @@ pfctl_get_ruleset(struct pfctl_handle *h, const char *path, uint32_t nr, struct continue; } + rs->nr = nr; + strlcpy(rs->path, path, sizeof(rs->path)); + return (e.error); } diff --git a/tests/sys/netpfil/pf/anchor.sh b/tests/sys/netpfil/pf/anchor.sh index 64ca84b34c3d..034fe0d3d574 100644 --- a/tests/sys/netpfil/pf/anchor.sh +++ b/tests/sys/netpfil/pf/anchor.sh @@ -123,6 +123,51 @@ nested_anchor_cleanup() pft_cleanup } +atf_test_case "deeply_nested" "cleanup" +deeply_nested_head() +{ + atf_set descr 'Test setting and retrieving deeply nested anchors' + atf_set require.user root +} + +deeply_nested_body() +{ + pft_init + + epair=$(vnet_mkepair) + vnet_mkjail alcatraz ${epair}a + + pft_set_rules alcatraz \ + "anchor \"foo\" { \n\ + anchor \"bar\" { \n\ + anchor \"foobar\" { \n\ + pass on ${epair}a \n\ + } \n\ + anchor \"quux\" { \n\ + pass on ${epair}a \n\ + } \n\ + } \n\ + anchor \"baz\" { \n\ + pass on ${epair}a \n\ + } \n\ + anchor \"qux\" { \n\ + pass on ${epair}a \n\ + } \n\ + }" + + atf_check -s exit:0 -o \ + inline:" foo\n foo/bar\n foo/bar/foobar\n foo/bar/quux\n foo/baz\n foo/qux\n" \ + -e ignore jexec alcatraz pfctl -sA + + atf_check -s exit:0 -o inline:" foo/bar/foobar\n foo/bar/quux\n" \ + -e ignore jexec alcatraz pfctl -a foo/bar -sA +} + +deeply_nested_cleanup() +{ + pft_cleanup +} + atf_test_case "wildcard" "cleanup" wildcard_head() { @@ -498,6 +543,7 @@ atf_init_test_cases() atf_add_test_case "pr183198" atf_add_test_case "pr279225" atf_add_test_case "nested_anchor" + atf_add_test_case "deeply_nested" atf_add_test_case "wildcard" atf_add_test_case "nested_label" atf_add_test_case "quick" From nobody Tue Oct 28 11:49:25 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cwpZF5JZpz6DlZP; Tue, 28 Oct 2025 11:49: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cwpZF4DcMz3Sb0; Tue, 28 Oct 2025 11:49:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761652165; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1H6jKowRhd/KY29lZ9Me/ftstV/dddCjb1/VuY5jCyM=; b=PxOYFNKJHzQZtEOcaO1Khkxe8vkeXEkUAoXLS+mTOqmHxWYZVddRK5g2LWsQsJxF3o+sQ6 8WyOGvfHUUrAswZyt8deBx5Kkor+NgxViNBPjoZSGfo8v5jHlZv7S3txvOYJGQURf/hEWX wpBkUY0k0A1oUu1gjfcUYp5waQ8NzkT2wlIHYn7WE4gOrYfT/zxbdYC1y1Ab8lXmrWE1ex FLc4KKVIVfuOb7hYlTsGpkGr1L5bHhSqZmvdBmDyklAHEQd9LCXEWGm36T/3jv7vMi0zDd 5A6yLBvt988KDMGF9HLAgrePN1LFdWLXp2W0XNKaF/iFdB2wVlLrq2UWPOKHlQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761652165; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1H6jKowRhd/KY29lZ9Me/ftstV/dddCjb1/VuY5jCyM=; b=EYCAbx0L6/BLnJpbTJBPBBWIJidnatkxYacAV4g1pr+Cb8LT+bD1nTOGapj22al8dis/L/ XGqFzbWH5jTJcwLEnxvWsBqUkNCDvqcSQcTyph1dgE/2Qxu+7QYYv9SC9sD8o6QzFgXCqH H7pHgICDDzaBqlP+0mj9Kw4MAhmTxGAYbKJkoxlPvW4tYp7cP9XAzLyDQ/HkCNiGk2x0kJ NUiljACYIbEiT4D9PLgnVFMk6B4+31T/ydEtEhSJpAxI6SiadYjAY+NjzBRnPMRL/dYUae u4QkoeggBU+Ww2qhURplFGCgOQ+bAPPRSz3QHSHVXKkHYVIQgzaKWH189QiKfg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761652165; a=rsa-sha256; cv=none; b=eKl2Q6H/xq5rdxwKztwjVdCN7pqtYTniNdvHeyjjaJQh77g3vkl1+HKxxhVKUaYShyBPO+ TZcRKOGHln+rRTaBlgDjlx/q0M513qJ5wuyLQliHJnaEi5DBj2KOELhwrD/QGYGeZGu3qS nPGLGEC3BDbEEflPcUOnx8uOnQzmPfreTwz2N57zb5WzcJ9rdik+0KBHJglh6zj0xowaUT iewBHImV7K9RyvOstLI5TXCRo7vRkK/R51GXBy/NAyXD2NXYitDBos4ha3bzPxmyHlIMRk qKkV5mQQS9UpYNqDXqdCQiGsDspf5pcvCDkMtzxxuBv5jIJ6MNtKUWiUggSCKA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cwpZF3fb8zpPP; Tue, 28 Oct 2025 11:49: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 59SBnPLF083387; Tue, 28 Oct 2025 11:49:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59SBnPgX083384; Tue, 28 Oct 2025 11:49:25 GMT (envelope-from git) Date: Tue, 28 Oct 2025 11:49:25 GMT Message-Id: <202510281149.59SBnPgX083384@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jose Luis Duran Subject: git: 99560fe98c76 - main - pfctl: Do not warn if there is no Ethernet anchor List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 99560fe98c76371d7f0807c2088c78790ca9f943 Auto-Submitted: auto-generated The branch main has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=99560fe98c76371d7f0807c2088c78790ca9f943 commit 99560fe98c76371d7f0807c2088c78790ca9f943 Author: Jose Luis Duran AuthorDate: 2025-10-26 12:38:00 +0000 Commit: Jose Luis Duran CommitDate: 2025-10-28 11:31:20 +0000 pfctl: Do not warn if there is no Ethernet anchor Avoid emitting a warning if there is no Ethernet anchor. If the anchor --regardless of its type-- is nonexistent, should be caught earlier. This can be misleading when there is a layer 3 anchor but not an Ethernet anchor, giving the user the impression that there is no layer 3 anchor with that name. PR: 280516 Approved by: kp MFC after: 2 days Differential Revision: https://reviews.freebsd.org/D53360 --- sbin/pfctl/pfctl.c | 5 +---- tests/sys/netpfil/pf/anchor.sh | 4 ++-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/sbin/pfctl/pfctl.c b/sbin/pfctl/pfctl.c index ed317495c2e0..3d2632c1cf74 100644 --- a/sbin/pfctl/pfctl.c +++ b/sbin/pfctl/pfctl.c @@ -3167,10 +3167,7 @@ pfctl_show_eth_anchors(int dev, int opts, char *anchorname) int ret; if ((ret = pfctl_get_eth_rulesets_info(dev, &ri, anchorname)) != 0) { - if (ret == ENOENT) - fprintf(stderr, "Anchor '%s' not found.\n", - anchorname); - else + if (ret != ENOENT) errc(1, ret, "DIOCGETETHRULESETS"); return (-1); } diff --git a/tests/sys/netpfil/pf/anchor.sh b/tests/sys/netpfil/pf/anchor.sh index 034fe0d3d574..f321c742788e 100644 --- a/tests/sys/netpfil/pf/anchor.sh +++ b/tests/sys/netpfil/pf/anchor.sh @@ -157,10 +157,10 @@ deeply_nested_body() atf_check -s exit:0 -o \ inline:" foo\n foo/bar\n foo/bar/foobar\n foo/bar/quux\n foo/baz\n foo/qux\n" \ - -e ignore jexec alcatraz pfctl -sA + jexec alcatraz pfctl -sA atf_check -s exit:0 -o inline:" foo/bar/foobar\n foo/bar/quux\n" \ - -e ignore jexec alcatraz pfctl -a foo/bar -sA + jexec alcatraz pfctl -a foo/bar -sA } deeply_nested_cleanup() From nobody Tue Oct 28 11:53:28 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cwpfx10qNz6Dm6b; Tue, 28 Oct 2025 11:53: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cwpfx0QWKz3VfL; Tue, 28 Oct 2025 11:53:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761652409; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aWf0zcs+ll6mXAAXtpttTVK6QFbcB70p1Wh3b2lYDqY=; b=bQQ1T+hXZGuIa66n+t+cMeBwMD/zN3NauB7p1DJ7t0/ZdI+EKsLgjV4rkA5EAE/0SYD/0F tGDhPsDWMgSCOAWDyHdJPWyPklXi9UBpoGPNBvxH4lJWcm/D6E0XH9METcCpET+idNsfVp CZWplUs/FClncDdx0TBcoZvstmAztho/js2zH+vX7EwrgpFdFGLUb7pbgP7XkA8bh+uVOL kJAD1nvb/+KIwwhZz4AKlh2+KLr9t6XyEakBj1n2hWL135GEjomBAZe94XbkE6BtJkYxZK 24/M9Tl5gct/RpoNrK9f1OgMmHGZmq5jyspti7gGATsCM8sALExQkU8kdRq3Pw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761652409; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aWf0zcs+ll6mXAAXtpttTVK6QFbcB70p1Wh3b2lYDqY=; b=tg3IS/3GQ6AG5BRzefBx0BL3puoraKtdlVeHQA61bruVbWtS9aOp8yf9cj0OyIL5Qv2uE7 KjOnXPxfiQMIVa+E+t92Bhpexmg8CWg3yppRyVGay0tw5qFf6vgf46sO9tyaFxMaH/DgCb 9oD6L4Voik0YPYrB2GEu5soJNpV2xYrnEqvvmfCSgpqDlW8EotvJ8vBVcGdRQxEf0YrikF 2+Bxp+LKhwZGc52VHIXOHmst4fQitZz9e12VpIy+H4LysfgCoDVhUKXkjhy16iyAk9Fqjm z7h30SpB2DF6LmIwHceRI43aGC4msH3QGBr+IZtmBkoE9qLSYiqJlWT148lm6A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761652409; a=rsa-sha256; cv=none; b=nCqbi4HSjqUJ4S+C7fI6wyBrdwKZtxBTzhB7ZS4oxhY13RadVkx0UEfnJiL8Wzwyi97mgq mtvMZsfBUtHz5ix2JD3UthMmke7Ut0OBUSw2W7aF1Pvro/j0TBEdIFJwpC7TCviIGDzopR LBcUAWgAYCN1FPilcU1va2MgMpWVYDnap1qQexTRjCnG9cUtgUwR0rZ+uObWqXQG+lO8Rl sYih/ThKCeWS0gLm83yhS9b8HzmhLtJ587nuFBYfPvvtQHVTFZsHlBtg+uDtmhootmRyjS Tn/w/SLsJiXpSYi4x/bS/gotsn4TPyUffPooM6jJvlqJuF8DuB7uIetz1QY+Mw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cwpfw71fwzpsR; Tue, 28 Oct 2025 11:53: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 59SBrSbw001264; Tue, 28 Oct 2025 11:53:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59SBrSY0001261; Tue, 28 Oct 2025 11:53:28 GMT (envelope-from git) Date: Tue, 28 Oct 2025 11:53:28 GMT Message-Id: <202510281153.59SBrSY0001261@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jose Luis Duran Subject: git: 6f0942bde7a0 - main - Revert "blocklistd-helper: Silence another bogus pf warning" List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 6f0942bde7a08fe46e575486f0e9c97c055d5aad Auto-Submitted: auto-generated The branch main has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=6f0942bde7a08fe46e575486f0e9c97c055d5aad commit 6f0942bde7a08fe46e575486f0e9c97c055d5aad Author: Jose Luis Duran AuthorDate: 2025-10-28 11:41:31 +0000 Commit: Jose Luis Duran CommitDate: 2025-10-28 11:51:59 +0000 Revert "blocklistd-helper: Silence another bogus pf warning" This reverts commit 67ade69eb6079887215db1fde86eba2fb8e2acf7. A fix has been implemented in a943a96a50ba ("libpfctl: Fix displaying deeply nested anchors"). Revert this commit to avoid having differences with upstream. --- contrib/blocklist/libexec/blocklistd-helper | 2 +- libexec/blocklistd-helper/blacklistd-helper | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/blocklist/libexec/blocklistd-helper b/contrib/blocklist/libexec/blocklistd-helper index 1d4a38b1d831..14a192ee35ce 100755 --- a/contrib/blocklist/libexec/blocklistd-helper +++ b/contrib/blocklist/libexec/blocklistd-helper @@ -259,7 +259,7 @@ flush) # dynamically determine which anchors exist for anchor in $(/sbin/pfctl -a "$2" -s Anchors 2> /dev/null); do /sbin/pfctl -a "$anchor" -t "port${anchor##*/}" -T flush 2> /dev/null - /sbin/pfctl -a "$anchor" -F rules 2> /dev/null + /sbin/pfctl -a "$anchor" -F rules done echo OK ;; diff --git a/libexec/blocklistd-helper/blacklistd-helper b/libexec/blocklistd-helper/blacklistd-helper index 053c9ce9b2a2..92f768e86cdf 100644 --- a/libexec/blocklistd-helper/blacklistd-helper +++ b/libexec/blocklistd-helper/blacklistd-helper @@ -280,7 +280,7 @@ flush) # dynamically determine which anchors exist for anchor in $(/sbin/pfctl -a "$2" -s Anchors 2> /dev/null); do /sbin/pfctl -a "$anchor" -t "port${anchor##*/}" -T flush 2> /dev/null - /sbin/pfctl -a "$anchor" -F rules 2> /dev/null + /sbin/pfctl -a "$anchor" -F rules done echo OK ;; From nobody Tue Oct 28 11:53:30 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cwpfy4JhZz6Dm9D; Tue, 28 Oct 2025 11:53: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cwpfy1T9wz3VcF; Tue, 28 Oct 2025 11:53:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761652410; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=o+wAD3tAMkT+nGwYTKq/CtbpqPb2Vsih4slIiTA2Lf4=; b=ESoDMf0Ry+erAaFeCyOQs/W+iJTc4wWUwQ+tWTnPaGMN4szjpEucUWY7x0ssuYxiKexviA xF5M4jbJ3YCDzoQoExPenI1Gbc09zPVZPDGqn48289akytwWKvzeO7QHc05GAnVMkYvg22 PJ2QWDrUZJ5VjE+yCRtqXwd959iEdw3+upm2ay6uO79MBKKndsOJPsjoJs5IZc6DgRpXb5 qTN++Ba4nA7GsbOK/mB+3r9TESNxzYw2Kz+hOYcgLkOi7mQZqueyg/mVNYxSWoMQBsgnM8 jAZK+73iygKAwQS6zN1ZZ8yodC0YtVLdRsps9j+/dGnTqUIJIAiPQLoUtEhOIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761652410; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=o+wAD3tAMkT+nGwYTKq/CtbpqPb2Vsih4slIiTA2Lf4=; b=SsZWl1wpsCzu3p9mspvdVZ6yCkBn7ym/CKxi+C1KdTXGgIA4ftJdKTSBYSgYUolyoPBO5K 5bHNoXvgzGw5aNUsYEvcz1RY61FYZcvrORAWnBdAQW2zQhevQ/Qj8jF/bi7J+COoBcVDqS 5I2VrHbZNak943s2Lc27ZCoAz6CqB2st05rC7dgW7F+lAyyFt9Uw0PdPjp67jKJKjufBPj Kp+4RIy2iRssOgd0d9AE+eCQ1fDwJkSQzkqaiYfgjE7Cqzhvu2wvCOiPgXmCuPtYnFbk/V S77EvcRX+Wm1NFVuzfdF22pZuUM4B/eFCfRMsIOVgDeawaBv6/oN2dFGl1KKKw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761652410; a=rsa-sha256; cv=none; b=N9WN0oADHESL/nDVACZD/L9HwuyOeCUZyThA3hFIkhnhKNA5EyNf3L0kp9UB+e3GIfqKs/ F5gsoK0buEWoWxUyl4BDDW6gR75rxfO0jZwhlaRoECdOVorzPbhNNHLtSSyI8F/XFNizRG zbJCRgop3b9mkHWMsYY9hDEVHvG9SvX1lXxFnkC2M+GFqMBpzXwskXpjFArne4DQ4VPdUd BKbjgB2KYMb/R4nBNE8SBSfNd+9xmifcttY93b0B0kAOpkde2EBBveSzuZzBivUvF/61g/ qfC70zy3CD6Yzrhkoj17E94zI9kUOa68V7kHNbVej4bDnHLvRD7B8m6Z9r5mdA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cwpfy0rxPzq40; Tue, 28 Oct 2025 11:53: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 59SBrUu8001305; Tue, 28 Oct 2025 11:53:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59SBrUtY001302; Tue, 28 Oct 2025 11:53:30 GMT (envelope-from git) Date: Tue, 28 Oct 2025 11:53:30 GMT Message-Id: <202510281153.59SBrUtY001302@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jose Luis Duran Subject: git: e12ec5f4338c - main - Revert "blocklist-helper: Silence a bogus pf warning" List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: e12ec5f4338c2d769c266278320232a98a962f63 Auto-Submitted: auto-generated The branch main has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=e12ec5f4338c2d769c266278320232a98a962f63 commit e12ec5f4338c2d769c266278320232a98a962f63 Author: Jose Luis Duran AuthorDate: 2025-10-28 11:44:50 +0000 Commit: Jose Luis Duran CommitDate: 2025-10-28 11:52:42 +0000 Revert "blocklist-helper: Silence a bogus pf warning" This reverts commit 2347ca21d657121670e6e7246c6ac32efc996cac. A fix has been implemented in 99560fe98c76 ("pfctl: Do not warn if there is no Ethernet anchor"). Revert this commit to avoid having differences with upstream. MFC after: 2 days --- contrib/blocklist/libexec/blocklistd-helper | 2 +- libexec/blocklistd-helper/blacklistd-helper | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/blocklist/libexec/blocklistd-helper b/contrib/blocklist/libexec/blocklistd-helper index 14a192ee35ce..f27cde4ed4ea 100755 --- a/contrib/blocklist/libexec/blocklistd-helper +++ b/contrib/blocklist/libexec/blocklistd-helper @@ -258,7 +258,7 @@ flush) pf) # dynamically determine which anchors exist for anchor in $(/sbin/pfctl -a "$2" -s Anchors 2> /dev/null); do - /sbin/pfctl -a "$anchor" -t "port${anchor##*/}" -T flush 2> /dev/null + /sbin/pfctl -a "$anchor" -t "port${anchor##*/}" -T flush /sbin/pfctl -a "$anchor" -F rules done echo OK diff --git a/libexec/blocklistd-helper/blacklistd-helper b/libexec/blocklistd-helper/blacklistd-helper index 92f768e86cdf..4195f070e8ee 100644 --- a/libexec/blocklistd-helper/blacklistd-helper +++ b/libexec/blocklistd-helper/blacklistd-helper @@ -279,7 +279,7 @@ flush) pf) # dynamically determine which anchors exist for anchor in $(/sbin/pfctl -a "$2" -s Anchors 2> /dev/null); do - /sbin/pfctl -a "$anchor" -t "port${anchor##*/}" -T flush 2> /dev/null + /sbin/pfctl -a "$anchor" -t "port${anchor##*/}" -T flush /sbin/pfctl -a "$anchor" -F rules done echo OK From nobody Tue Oct 28 11:57:43 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cwplq6NXPz6DmSp; Tue, 28 Oct 2025 11:57: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cwplq5tgJz3WGy; Tue, 28 Oct 2025 11:57:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761652663; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4csUDJQ6pdsJ1lFV1nX8iaV3eLuNLAUOJrq+2O/SXJM=; b=Z1Vj8vQ0Wc7QgnKure/JPKXX5X1EMwKW1aMuU21OCbwUHDskyi7fPC9AnIoukKQckZtcEN 8BDnHcbQs/7jRDXdChVKCMUMg0u0HUfQaeuzAKAZlDtbaQBeCDxsBtZWvYDITTQN+nWEee VzZ9WiADcIJcQl4ubteOOOTQ5o7/njN0XIqvpa4YiBxVwHYDLa75x4sYvVwbz3drRjy6Nf hcsT1+U9Rit3lUH6DtHhCwviTiBf6ThZcXrM6okH8RVLB5Y708b5ZBKeux+BRqMdqPsMNn QKlcdMOafsXv0sqZjyvb2puWafqcr+s7/FCTDcyjjcn0K1sgd6ALUEvJcjvI2w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761652663; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4csUDJQ6pdsJ1lFV1nX8iaV3eLuNLAUOJrq+2O/SXJM=; b=BTIBA9rqs8GHItbHa/jU/RlfsNybdiJhS72R7DvofJRrofENFOBGxNDMg9kMVbJqRHoY4o dZxBJSnz7swuVSk/qMuQbwRv5iFyqpbi3/WSWcWwBKkRyKNdFFJzaUo65IG6F70sP/W2Fa MG0TJnV5J9rlOONXjgtdnbS3LdODJOFNmnuqrn+eIYBn39cVEQfw1IH6VFZ+XZza6A1tdY Fvxu2xatLVBfhYklv144wMjC3me5pIsvUmLvI56oLyozxnA3xSN+hkJduqKDsdCFobwuIN 18RxT+ZKTiCUze5ZWd9hLiSy5VKfvYjVl4aZtOTsVwXotcI8vyLEMhqOOlI9XA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761652663; a=rsa-sha256; cv=none; b=ZhIGtBom/wyqFsl2/qw9FQ/r+CZofYgcEVyb6++V5ALTpLyc8N+gzw9wNxDCkweA2/JTKS at42JSbzvYU+o7dYDrdgiW4pabM//0tMLC1XjyaUygvlsr65kDziJm52gdiZcZn14M/Lvr pF8fEp1oKKa9rbqIZ75D9r8DMtZpY9IStTWk7tCfMdbQhjuSejG6N1vkCLfUs7GFs8IEwf y36ciL3Nj3cBdThFqhMU3Wmx/gAgfxX+D2QVAHWvWG4JkL/MsjH5eDcJosJZgMSpzE7MBH d2B22GyGphJAabJsJhZb62aN8kThC6gW5u4LzOOq3dTIHAwm4+noiaI3nyvxKw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cwplq5N8bzpyD; Tue, 28 Oct 2025 11:57: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 59SBvhES002873; Tue, 28 Oct 2025 11:57:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59SBvhNB002870; Tue, 28 Oct 2025 11:57:43 GMT (envelope-from git) Date: Tue, 28 Oct 2025 11:57:43 GMT Message-Id: <202510281157.59SBvhNB002870@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 3d73146baeb9 - main - pwait: Add an option to print remaining processes List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3d73146baeb933fe955c7496572b483a9f92914c Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=3d73146baeb933fe955c7496572b483a9f92914c commit 3d73146baeb933fe955c7496572b483a9f92914c Author: Dag-Erling Smørgrav AuthorDate: 2025-10-28 11:56:36 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-10-28 11:57:16 +0000 pwait: Add an option to print remaining processes * On startup, insert all valid PIDs into a tree. * In our main loop, whenever a process terminates, remove its PID from the tree. * On exit, if the -p flag was specified, print the remaining PIDs. MFC after: 3 days Reviewed by: bcr, markj Differential Revision: https://reviews.freebsd.org/D53293 --- bin/pwait/pwait.1 | 6 ++- bin/pwait/pwait.c | 98 ++++++++++++++++++++++++++++--------------- bin/pwait/tests/pwait_test.sh | 38 +++++++++++++++++ 3 files changed, 107 insertions(+), 35 deletions(-) diff --git a/bin/pwait/pwait.1 b/bin/pwait/pwait.1 index 83ac8bcef317..d92b829b1d6a 100644 --- a/bin/pwait/pwait.1 +++ b/bin/pwait/pwait.1 @@ -30,7 +30,7 @@ .\" USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY .\" OF SUCH DAMAGE. .\" -.Dd January 21, 2021 +.Dd October 22, 2025 .Dt PWAIT 1 .Os .Sh NAME @@ -39,7 +39,7 @@ .Sh SYNOPSIS .Nm .Op Fl t Ar duration -.Op Fl ov +.Op Fl opv .Ar pid \&... .Sh DESCRIPTION @@ -51,6 +51,8 @@ The following option is available: .Bl -tag -width indent .It Fl o Exit when any of the given processes has terminated. +.It Fl p +On exit, print a list of processes that have not terminated. .It Fl t Ar duration If any process is still running after .Ar duration , diff --git a/bin/pwait/pwait.c b/bin/pwait/pwait.c index 27f4c8e9858d..59bf0eb93ced 100644 --- a/bin/pwait/pwait.c +++ b/bin/pwait/pwait.c @@ -33,7 +33,9 @@ #include #include +#include #include +#include #include #include @@ -46,10 +48,25 @@ #include #include +struct pid { + RB_ENTRY(pid) entry; + pid_t pid; +}; + +static int +pidcmp(const struct pid *a, const struct pid *b) +{ + return (a->pid > b->pid ? 1 : a->pid < b->pid ? -1 : 0); +} + +RB_HEAD(pidtree, pid); +static struct pidtree pids = RB_INITIALIZER(&pids); +RB_GENERATE_STATIC(pidtree, pid, entry, pidcmp); + static void usage(void) { - fprintf(stderr, "usage: pwait [-t timeout] [-ov] pid ...\n"); + fprintf(stderr, "usage: pwait [-t timeout] [-opv] pid ...\n"); exit(EX_USAGE); } @@ -61,22 +78,28 @@ main(int argc, char *argv[]) { struct itimerval itv; struct kevent *e; + struct pid k, *p; char *end, *s; double timeout; + size_t sz; long pid; pid_t mypid; - int i, kq, n, nleft, opt, status; - bool oflag, tflag, verbose; + int i, kq, n, ndone, nleft, opt, pid_max, ret, status; + bool oflag, pflag, tflag, verbose; oflag = false; + pflag = false; tflag = false; verbose = false; memset(&itv, 0, sizeof(itv)); - while ((opt = getopt(argc, argv, "ot:v")) != -1) { + while ((opt = getopt(argc, argv, "opt:v")) != -1) { switch (opt) { case 'o': - oflag = 1; + oflag = true; + break; + case 'p': + pflag = true; break; case 't': tflag = true; @@ -128,16 +151,17 @@ main(int argc, char *argv[]) usage(); } - kq = kqueue(); - if (kq == -1) { + if ((kq = kqueue()) < 0) err(EX_OSERR, "kqueue"); - } - e = malloc((argc + tflag) * sizeof(struct kevent)); - if (e == NULL) { + sz = sizeof(pid_max); + if (sysctlbyname("kern.pid_max", &pid_max, &sz, NULL, 0) != 0) { + pid_max = 99999; + } + if ((e = malloc((argc + tflag) * sizeof(*e))) == NULL) { err(EX_OSERR, "malloc"); } - nleft = 0; + ndone = nleft = 0; mypid = getpid(); for (n = 0; n < argc; n++) { s = argv[n]; @@ -147,7 +171,7 @@ main(int argc, char *argv[]) } errno = 0; pid = strtol(s, &end, 10); - if (pid < 0 || *end != '\0' || errno != 0) { + if (pid < 0 || pid > pid_max || *end != '\0' || errno != 0) { warnx("%s: bad process id", s); continue; } @@ -155,27 +179,29 @@ main(int argc, char *argv[]) warnx("%s: skipping my own pid", s); continue; } - for (i = 0; i < nleft; i++) { - if (e[i].ident == (uintptr_t)pid) { - break; - } + if ((p = malloc(sizeof(*p))) == NULL) { + err(EX_OSERR, NULL); } - if (i < nleft) { + p->pid = pid; + if (RB_INSERT(pidtree, &pids, p) != NULL) { /* Duplicate. */ + free(p); continue; } EV_SET(e + nleft, pid, EVFILT_PROC, EV_ADD, NOTE_EXIT, 0, NULL); if (kevent(kq, e + nleft, 1, NULL, 0, NULL) == -1) { + if (errno != ESRCH) + err(EX_OSERR, "kevent()"); warn("%ld", pid); - if (oflag) { - exit(EX_OK); - } + RB_REMOVE(pidtree, &pids, p); + free(p); + ndone++; } else { nleft++; } } - if (nleft > 0 && tflag) { + if ((ndone == 0 || !oflag) && nleft > 0 && tflag) { /* * Explicitly detect SIGALRM so that an exit status of 124 * can be returned rather than 142. @@ -190,7 +216,8 @@ main(int argc, char *argv[]) err(EX_OSERR, "setitimer"); } } - while (nleft > 0) { + ret = EX_OK; + while ((ndone == 0 || !oflag) && ret == EX_OK && nleft > 0) { n = kevent(kq, NULL, 0, e, nleft + tflag, NULL); if (n == -1) { err(EX_OSERR, "kevent"); @@ -200,29 +227,34 @@ main(int argc, char *argv[]) if (verbose) { printf("timeout\n"); } - exit(124); + ret = 124; } + pid = e[i].ident; if (verbose) { status = e[i].data; if (WIFEXITED(status)) { printf("%ld: exited with status %d.\n", - (long)e[i].ident, - WEXITSTATUS(status)); + pid, WEXITSTATUS(status)); } else if (WIFSIGNALED(status)) { printf("%ld: killed by signal %d.\n", - (long)e[i].ident, - WTERMSIG(status)); + pid, WTERMSIG(status)); } else { - printf("%ld: terminated.\n", - (long)e[i].ident); + printf("%ld: terminated.\n", pid); } } - if (oflag) { - exit(EX_OK); + k.pid = pid; + if ((p = RB_FIND(pidtree, &pids, &k)) != NULL) { + RB_REMOVE(pidtree, &pids, p); + free(p); + ndone++; } --nleft; } } - - exit(EX_OK); + if (pflag) { + RB_FOREACH(p, pidtree, &pids) { + printf("%d\n", p->pid); + } + } + exit(ret); } diff --git a/bin/pwait/tests/pwait_test.sh b/bin/pwait/tests/pwait_test.sh index 66bdd6981704..d31ca21cff93 100644 --- a/bin/pwait/tests/pwait_test.sh +++ b/bin/pwait/tests/pwait_test.sh @@ -310,6 +310,43 @@ or_flag_cleanup() wait $p2 $p4 $p6 >/dev/null 2>&1 } +atf_test_case print +print_head() +{ + atf_set "descr" "Test the -p flag" +} + +print_body() +{ + sleep 1 & + p1=$! + + sleep 5 & + p5=$! + + sleep 10 & + p10=$! + + atf_check \ + -o inline:"$p5\n$p10\n" \ + -s exit:124 \ + pwait -t 2 -p $p10 $p5 $p1 $p5 $p10 + + atf_check \ + -e inline:"kill: $p1: No such process\n" \ + -s exit:1 \ + kill -0 $p1 + + atf_check kill -0 $p5 + atf_check kill -0 $p10 +} + +print_cleanup() +{ + kill $p1 $p5 $p10 >/dev/null 2>&1 + wait $p1 $p5 $p10 >/dev/null 2>&1 +} + atf_init_test_cases() { atf_add_test_case basic @@ -318,4 +355,5 @@ atf_init_test_cases() atf_add_test_case timeout_no_timeout atf_add_test_case timeout_many atf_add_test_case or_flag + atf_add_test_case print } From nobody Tue Oct 28 11:57:44 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cwpls0kLjz6DmSt; Tue, 28 Oct 2025 11:57: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cwpls02gkz3WRT; Tue, 28 Oct 2025 11:57:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761652665; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=h7qR1f81l843O+9Wrx4g8gwXYr2tybidz326zof8PZs=; b=vt6EomPVTS0n3RX9tTUYv/kV+gxr16MCvfwfZ8/5OVhxDKTVBCuGL9fLaJdcu6tQz1twjy 3OXDzZxuGtRshRkIDFX7E1vyHikCjmplGGiocrJNxl6G/4CT+v+FR+k3eRZF5TmU24pNZ9 hncVZnot3MtvtDxOVHI//gb1zKFBFmlvTXP6jc73oehntoWL/bOAYltEbvZTh3y9Dyar/6 DTWFAMdU9wvdzwg/hlRW4ZWK1tf6rTH+TFWN8rM+g9z1H/BRmB6PhgL/Kq0FdFi8UqZWIf xOeOwCFcKS2+Jd6L1f5cBTEn9pJtndQ8jGZdm5+Wa7w9/5Cec7Y66g55YsBFUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761652665; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=h7qR1f81l843O+9Wrx4g8gwXYr2tybidz326zof8PZs=; b=XzQa31zvEACqLqKQqLt04ZanSW4GDovTJ8ifDjDZhjw7+nHjRH6ISeG9G8ibBP1gRFt22Z 3pMeap2QVYF14auLNlqQPfwFE6RSsebPKz06twVpmk9bKiNO2GqeY6Iuug7qKTBnR1MRam epo+uqhVFR4KQEgkHrgY4UMhfVsUdRyb0ci8BU8+FikrFEGNnxA6P+DntkhsXbZOqHK1hh g2WirTfKjB9jWvfGQVnTH30qfnWt2sLMBkHhSiGKAiXo/j3rERbiScvKzDJUjx0wJtw2q+ SoC+nWUNArOk/LDNul+FRsuqIke+foPYvNvn5jNab9wHvgofcu0ywXPA1/nHbA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761652665; a=rsa-sha256; cv=none; b=aE8UTisie7TruFJO4+JNY2yFSMSKYik5VLcHJcvUC61wl7o/yBcISG5jUORHm+d46Pt4jN Cf2TLuJCGXCp+auwLGx1R14HIZGeputjX7+dBDqzzWK7ZlsxXNDZ76E/XYjhaPT5+y+ZfM YVa7ZDuR3gJHmKAwH9ADxV4Vm4E0TSNjy7LuVQrt9JxsOBOgJA2EEAHaPKTxSGRm2oQjJE V7FSdqfdTtTpCcOiigbn/kLmFd8WO3w95kYED9G24Yo+efR3yvr+NKShtk3X1WaTnyUn5J pGxNXezTgY7JzqYUhf7PJKs+QJi/LP8UbFwVy1etYCcWVTj6dTgKurdqhFpPTw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cwplr6YrzzpdB; Tue, 28 Oct 2025 11:57: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 59SBviE4002909; Tue, 28 Oct 2025 11:57:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59SBviEm002906; Tue, 28 Oct 2025 11:57:44 GMT (envelope-from git) Date: Tue, 28 Oct 2025 11:57:44 GMT Message-Id: <202510281157.59SBviEm002906@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 22cff1f3e9d8 - main - rc.subr: Fix slow shutdown issue List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 22cff1f3e9d82b48aad440c52f883bfd4995359c Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=22cff1f3e9d82b48aad440c52f883bfd4995359c commit 22cff1f3e9d82b48aad440c52f883bfd4995359c Author: Dag-Erling Smørgrav AuthorDate: 2025-10-28 11:57:03 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-10-28 11:57:16 +0000 rc.subr: Fix slow shutdown issue Instead of sleeping after pwait returns, use its new -p option to obtain the list of processes that still have not terminated. MFC after: 3 days PR: 290357 Fixes: 5953e7c98427 ("rc.subr: Move the sleep in wait_for_pids") Reviewed by: 0mp, markj Differential Revision: https://reviews.freebsd.org/D53294 --- libexec/rc/rc.subr | 29 ++++++++--------------------- 1 file changed, 8 insertions(+), 21 deletions(-) diff --git a/libexec/rc/rc.subr b/libexec/rc/rc.subr index 6be226021949..8317ff5c0922 100644 --- a/libexec/rc/rc.subr +++ b/libexec/rc/rc.subr @@ -792,31 +792,18 @@ sort_lite() # wait_for_pids() { - local _list _prefix _nlist _j + local _list _prefix _j - _list="$@" - if [ -z "$_list" ]; then - return - fi - _prefix= - while true; do - _nlist="" - for _j in $_list; do - if kill -0 $_j 2>/dev/null; then - _nlist="${_nlist}${_nlist:+ }$_j" - fi - done - if [ -z "$_nlist" ]; then - break + for _j in "$@"; do + if kill -0 $_j 2>/dev/null; then + _list="${_list}${_list:+ }$_j" fi - _list=$_nlist + done + _prefix= + while [ -n "$_list" ]; do echo -n ${_prefix:-"Waiting for PIDS: "}$_list _prefix=", " - pwait -o $_list 2>/dev/null - # At least one of the processes we were waiting for - # has terminated. Give init a chance to collect it - # before looping around and checking again. - sleep 1 + _list=$(pwait -op $_list 2>/dev/null) done if [ -n "$_prefix" ]; then echo "." From nobody Tue Oct 28 12:22:59 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cwqJz48Ydz6Dnyg; Tue, 28 Oct 2025 12:22: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cwqJz2DRmz3YlC; Tue, 28 Oct 2025 12:22:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761654179; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FZVODFkDFUss3joN807Wc08eCEru+weEVCRL9k9F6sw=; b=PgDkH2WUWbZnH2L1PrhBJIztvqRUpvFfphY6hA+CUgSVmL3t58sSqgd94uj2GyuHnisZ9T /RamUmolCM1VdQOfYEN/+5NYBcG6PHjZbrNi1/3q6DqpIKJPx4ssdNYiTjpL93XgWDopnn bJDrKFX9FLnpsIpZofhUSXV/WKjPymJIJIuAtqxqpYQAJjz7jomPxMhMAtRew8nJtOyRO/ PATtYclokYl5VGlA0W2KsZ6f/+prI+OIDd+lcNnz86rFvK71qpNHAF3usggeOLh2jcfsur 1jvTMUfYBhH8WqD5sYajogt1XS2+RKknpCfpCg5T7X9vVmGQ3o1O4pYzv4lr8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761654179; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FZVODFkDFUss3joN807Wc08eCEru+weEVCRL9k9F6sw=; b=GzwaVNACTxiKiR8uLvheLAPtQT6NJIBl87RoAxUp4teFljYGjgZhrUjf7ctxIGawk9Tnyv fI/vJZCBMSXgC9h1zjpxXZyzp/oxvl4U3tHk9dVivRk4jqjejPCs80myK76WIOtFVIgRqu fliXH6UK1fpQ5G9pwv8AfcGenZRXDxEwOj3U21v3ddhVHeoFfZTmzp8HBCmfVhZ/luP11G s5lsXYWBrUyiYOnPwF3bB+M3dMGcV4Gx340ppg4xtHu9MdyP9HXpM8Fg7eazS8zHXRILPn Wwye+F9J/bvLfDKeZ99bjYtT5CRjrjzv7f66rGnHMiZ6Z9R164RQvhs6HMt/1w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761654179; a=rsa-sha256; cv=none; b=Hiecp1HfdVfh/cqi+tlcW/kls9XYcrrJf4gZTGnAptSwfkt/GzlvPFfpLSDVzC7EmPkD8i AOw+3icgzbHU5/Js9D6ELz1iJ4vuE+8nz8AJy/eLrHY63Dyb4AelRIqB2eElHh/uYuXwFJ 3Sme8z/DAJqt+RBE0jTZ+8XEUYpOiiSJAZf8t3DQkXY/kZuGMOGLCCLWjDn2R/MOVFtPIC OxFxeG+aD+XWP0atuiudYdAXQU4TZHTrwya41xvX93oLzRuPQLOCBwi70wFlozPLsGbxlT uvssmWuvWf4u511SUuR4DlIWcO2KGifHK9N4WGRPun3F9oE4Z83e3i9OOJhUAA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cwqJz1cPvzr2G; Tue, 28 Oct 2025 12:22:59 +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 59SCMxJQ058282; Tue, 28 Oct 2025 12:22:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59SCMx4J058279; Tue, 28 Oct 2025 12:22:59 GMT (envelope-from git) Date: Tue, 28 Oct 2025 12:22:59 GMT Message-Id: <202510281222.59SCMx4J058279@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: b0cfcd07bb61 - main - Revert "isa: Use gone_in_dev(9) for deprecation message" List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b0cfcd07bb6134ebe319c57142be2b53bb9090e7 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=b0cfcd07bb6134ebe319c57142be2b53bb9090e7 commit b0cfcd07bb6134ebe319c57142be2b53bb9090e7 Author: Ed Maste AuthorDate: 2025-10-28 12:15:33 +0000 Commit: Ed Maste CommitDate: 2025-10-28 12:19:39 +0000 Revert "isa: Use gone_in_dev(9) for deprecation message" gone_in(_dev) prints only one message per function call src line, so this would miss reporting for the second and later such devices. This reverts commit ce6792d3cd798079f0c9ba244faba4ea666bb6f4. Reported by: glebius Sponsored by: The FreeBSD Foundation --- sys/isa/isa_common.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/isa/isa_common.c b/sys/isa/isa_common.c index 91a0ee1f2f3d..41a63a3c676c 100644 --- a/sys/isa/isa_common.c +++ b/sys/isa/isa_common.c @@ -569,8 +569,8 @@ isa_probe_children(device_t dev) if (err == 0 && idev->id_vendorid == 0 && strcmp(kern_ident, "GENERIC") == 0 && device_is_attached(child)) - gone_in_dev(child, 16, - "WARNING: non-PNP ISA device will be removed from GENERIC\n"); + device_printf(child, + "non-PNP ISA device will be removed from GENERIC in FreeBSD 16.\n"); } /* From nobody Tue Oct 28 12:31:01 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cwqVF5FNzz6DpSl; Tue, 28 Oct 2025 12:31: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cwqVF4Zlnz3c7p; Tue, 28 Oct 2025 12:31:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761654661; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9sKT+1gYebRb2WocxbxZFXn/HbS5xzUQx/MaaytF/yQ=; b=dibAPyB6dAWb2CPBztoxemAPzje3IGaoc22dwmeDiagD1AfKFIIGkFeykIsvMHAMIjqHRo qOlDXRqclqpLtUPT9p8CgkqS8FUoALXEaeQju48slwm1tS2NZyod+xPs6e3JW0dOj3dtzA I5WlLmJpfYUS+IryXh8O//9gRo4rKTrBR4RsiYH5Pf0yERxSr7MVkq4iJAzyr/IOjWa6MH +bsF+Nz7QJtgpA6NI4SjDN1INRZcy57fNy3zclR4bzKRK/ep3DTlotWDHVC+XcJNE+AirN Ukqr1kseTzx2cqLQdkeHgOOItRC8eNjpDiiCa70o2A9CduGg/DpPHo8XF2K37Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761654661; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9sKT+1gYebRb2WocxbxZFXn/HbS5xzUQx/MaaytF/yQ=; b=oUYUas9UqjxLFgq4lDz0HJ8oS7lgD4d8Lnf/0Q3mcr3OkMK01HIFt4XXardDsrQfxeH+fY QcPw1iXlpW0tAhrobYei4L9B9ZtXuCeZlWeY0Xk/9PMU4g0mY00/bwZX/qfXzdVsvVPh+K d9EUEWv6uPtGrLSQ3slC8O9F1dhdS1RSslVP/WfUOUVvKEuLY+z6uzuOu2Z4oTor+vbdFn 7OmxNOMiUDXO9rigSSV09QHDviS7weGUriiKTFwgki9noBbQevECHdWNGOCbrsGSuj8MuI V9sZdH0YdCuk2yZxVDYPjvWSwNxVv0Utc47uwd6Rs7zpHLPS8FQrGVPMveECXA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761654661; a=rsa-sha256; cv=none; b=Gi1JQcc4R/pqKa8f3Y+HpifcVHKD2vnKo+1BnELb1aj77wo+zsmxaUEN5/8nhLy3NESCpK vN0Its/LVcNq2NUsuD5X39aktaSHU759eXxfPc3CyEbnSZFX8VWEoycob3qATV8fh/r1di zeIJBBkbTVWQiZrmkjlFEPOlDeeuf1r1dBDouwROJaLDY9nJLmZZZv/ismBl7YdYKE2ErT l6bNSK+Bxq7beEg2OeRvNWHM7R5Cjr8W4qK4vLMQI6PBkStc4Eo1eYCwbR1zI8P2J9er2h KAHzguEP+RPPoRybNEL3WHSK3IHwlCkxiBQ9y4PChUSwIYa3fg4TOmfGzUUFMA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cwqVF4581zr2P; Tue, 28 Oct 2025 12:31: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 59SCV1HD070591; Tue, 28 Oct 2025 12:31:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59SCV1Go070588; Tue, 28 Oct 2025 12:31:01 GMT (envelope-from git) Date: Tue, 28 Oct 2025 12:31:01 GMT Message-Id: <202510281231.59SCV1Go070588@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 24a6e040fc2e - main - insmntque.9: Refer to vnode operations vector correctly List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 24a6e040fc2e84234c684abcf3e1668a5a9467eb Auto-Submitted: auto-generated The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=24a6e040fc2e84234c684abcf3e1668a5a9467eb commit 24a6e040fc2e84234c684abcf3e1668a5a9467eb Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2025-10-24 17:34:04 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2025-10-28 12:29:37 +0000 insmntque.9: Refer to vnode operations vector correctly The comment in sys/vnode.h describes the v_op member as "vnode operations vector", so use "operations" instead of "operation" here. Reviewed by: bcr MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D53333 --- share/man/man9/insmntque.9 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/share/man/man9/insmntque.9 b/share/man/man9/insmntque.9 index 869d8767632b..33ba697b10b9 100644 --- a/share/man/man9/insmntque.9 +++ b/share/man/man9/insmntque.9 @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH .\" DAMAGE. .\" -.Dd January 29, 2022 +.Dd October 24, 2025 .Dt INSMNTQUE 9 .Os .Sh NAME @@ -56,7 +56,7 @@ The vnode must be exclusively locked. .Pp On failure, .Fn insmntque -resets vnode' operation vector to the vector of +resets vnode's operations vector to the vector of .Xr deadfs 9 , clears .Va v_data , @@ -71,7 +71,7 @@ failure is needed, the function may be used instead. It does not do any cleanup following a failure, leaving all the work to the caller. -In particular, the operation vector +In particular, the operations vector .Va v_op and .Va v_data From nobody Tue Oct 28 12:35:23 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cwqbJ04cYz6DpkH; Tue, 28 Oct 2025 12:35: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cwqbH4kTpz3cJF; Tue, 28 Oct 2025 12:35:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761654923; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RHTEW59JtiBw3PyFOVydDRO0MkOcT14+CqR4WFLWsYo=; b=TrzeZAAh353xk949drtT/97caiyrxYLlDeCqzyKgWOQ4BDn0cDP8tQkEAiuAtzivuuFPS9 bYLi39IMIZKLAO3x+66iZR5mFaRqN6hJlRZdGzSL6+gdkSXdrOkn40vONIFD05+V0KSelN OIph/f0P9L1FOgk/i3ez/RWOchZXTInmLwvDXtzguXWPSMriJQN0PJfD6ZNITvzXimubJ0 zpLMDmqLoL00zkXdFwFA+9aBu8cQN+qXxcYmjtRQa2grKtUcUyp08fkUw9RPLhp/OA2Np2 kt1xbZNhEzSx0+48+iavUD54jpWJFrHDzlB6d7Th3jQnpaV/BxVN3SU0a/F8cg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761654923; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RHTEW59JtiBw3PyFOVydDRO0MkOcT14+CqR4WFLWsYo=; b=bR7p82a196fuIJEyfOM/61A6jLrhKSsczfRY+Momyz/3B6E41303jaCcZvid5xJ761GVdy QNiVrNQ7o+cosgyqglsreIlENFWIasApkBzu3XqH6LfsO8OfAMPBLnYKL2HiRUE8OMhhte AFtJunDXNtMQnfTX4lDWH52WKFRjK/StZVKUuaunHoVTbhKZAj6CP2G5H10QNvzGDU0Zeq icKwa9qw2H9zwGpuLWdDScI7Ya40OGwP/H4eJ5/tsbSY175RGC9h7AkRXXj5m42eV6yq4+ MiXFygSCsJmak8tQqjEX2ae97pc/dBNGdzG5ovia//n3CTsYMYEpo5TTOOtcww== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761654923; a=rsa-sha256; cv=none; b=R14udULMmUYClpuZDl7wVplB1YVg9fb0ug3Wl6Yil258tKj4ggZtjp5sc4IGG2pBFXFNSy hH1blVNukRz7Y+3X8lLzizgn9TdRsHWZTAIVpkqwdSo29S1qTmiRAg7isMWSb1tXImzgR9 bKEXoGxGey0BAFY5socgy2URpbW7seqDAiPxGd/ww034PZ4DU8bny/5FtnMWBie3s45bqF WJUA7dWOSreOPa6uRz+2l24cg4BAuBqQIw5qTcza+md0Z1sKA1Urg/jXFOyZOYSHxOeisx crTsTpnTQt2WYqRek25iqbUkDVv7KDDFWrhONcW0bnvUN8QfSNUwcAHGGS3oZw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cwqbH4K8gzqWd; Tue, 28 Oct 2025 12:35: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 59SCZNY3078132; Tue, 28 Oct 2025 12:35:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59SCZNXg078129; Tue, 28 Oct 2025 12:35:23 GMT (envelope-from git) Date: Tue, 28 Oct 2025 12:35:23 GMT Message-Id: <202510281235.59SCZNXg078129@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: cadadd1a0398 - main - agp.4: Bump deprecation to 16.0 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cadadd1a0398fdeaebf62ab4d092ada0e3eb68c8 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=cadadd1a0398fdeaebf62ab4d092ada0e3eb68c8 commit cadadd1a0398fdeaebf62ab4d092ada0e3eb68c8 Author: Ed Maste AuthorDate: 2025-10-24 15:05:00 +0000 Commit: Ed Maste CommitDate: 2025-10-28 12:34:46 +0000 agp.4: Bump deprecation to 16.0 It was not actually removed prior to FreeBSD 15.0. Sponsored by: The FreeBSD Foundation --- share/man/man4/agp.4 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/man/man4/agp.4 b/share/man/man4/agp.4 index 2aeb01850085..b7a649117f36 100644 --- a/share/man/man4/agp.4 +++ b/share/man/man4/agp.4 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd November 28, 2007 +.Dd October 24, 2025 .Dt AGP 4 .Os .Sh NAME @@ -34,7 +34,7 @@ The .Nm driver is slated to be removed in -.Fx 15.0 . +.Fx 16.0 . .Sh DESCRIPTION The .Nm From nobody Tue Oct 28 12:35:24 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cwqbJ6N2pz6Dprf; Tue, 28 Oct 2025 12:35: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cwqbJ5f5Xz3cm4; Tue, 28 Oct 2025 12:35:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761654924; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jCn+/qEo4Qq1bLF2nWk1c5MQWXd8CQtHm4y83Prn17s=; b=Li8MTn1RCJNofIzh7kYK1X+MI8yn6vYHRv5wOlUOkzocLyBg4u0wFqjwF2fEAORzZJ2PfQ 36Fg3KYZr41k1qo4o3yiEFRu6RTpfE4FKX41oEQu/WwES8cLaQ2sz50JC45b9Y3qCAAS5r 6ZIQ1gPVDdNTSJG+N55/+iDh6T6LFUKvFReqAhYkpV62FhUXa1hpOZ1yS4fY9YPqH10QG9 23DTcMWJ9PXTN7srYDr1ZYR8vmaLa6PiKKqNEfaQcNBiSyVWwjhNf44jtbhJ9li0JcXiol 7PC2b11le0T9IHGR40xZg1ZFmyJU/KW3XAf46FEmFc2hxtnjWjWaXX4p74rhFQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761654924; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jCn+/qEo4Qq1bLF2nWk1c5MQWXd8CQtHm4y83Prn17s=; b=siFY9BSLJpCKRaIo049kEuZvR28WPH9AiYqlSAzTXJydHnWUm3krYGgjrnpfXTdc1G9UWc ERfsC9rX1O6ZDMCgkRy41tx1bjA9EpsvSWmVJVYo9K0WEizV2UrMgZFzBH+YTJKu7AbLJ/ t4uG85fkfHCOT4tN8rKd3YwDzP2iYAoZKB7Ys/DwoeQJbgM0+fyhGHAwqNk8OhNUtneDoB bScfmt9YQbWzo67mP6pxMZyOzmsEZ7zp/SQ5v9IwyUvxDg2qQpkQGiMdsF8WbF3vfMXe6Q VdAjaVMPIYpmaWyUcfeaHjQ/wr1iuTpGk867pWOBeU2fu1lOEre9eX2h5n0PYQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761654924; a=rsa-sha256; cv=none; b=oC5AUj+yMhXKRiTAsngT0o6K6qLOXkUKsGjrhYvtjwoh/BTqwKx+oBn9QiMVp/MRg29NOx WIMvo6dfeBWuNhMX4i1M0rNqLZWOka/sKZcMZdEP2Y9QUz1IQLIOkTHLPJYcXkagZ65ecO YDD++Fs/I9wpmdpCiYZu+lDHGNmGFdV19owlOSE+7g1q+7vXSp8jZZVSTeT8sfTequZQw5 d7XIjDLXK1qnIZ7JaTOMNLlhE6KGWTFL2Bn4+aD58JndipJMrWOQbqi6NeYT/Q4IHSOe3c NnyH84sxaM640RUwIMC0YkC3Mf1jFe6uP0vzvO2fIPNJNNJC7S6JtoWcTEmI7A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cwqbJ52YVzqWf; Tue, 28 Oct 2025 12:35: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 59SCZOls078165; Tue, 28 Oct 2025 12:35:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59SCZOnb078162; Tue, 28 Oct 2025 12:35:24 GMT (envelope-from git) Date: Tue, 28 Oct 2025 12:35:24 GMT Message-Id: <202510281235.59SCZOnb078162@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 0cd8754ad52b - main - upgt.4: bump removal to 16.0 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0cd8754ad52bb8174b8a766708424a4c53b8fc96 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=0cd8754ad52bb8174b8a766708424a4c53b8fc96 commit 0cd8754ad52bb8174b8a766708424a4c53b8fc96 Author: Ed Maste AuthorDate: 2025-10-24 15:06:37 +0000 Commit: Ed Maste CommitDate: 2025-10-28 12:35:00 +0000 upgt.4: bump removal to 16.0 It was not actually removed prior to FreeBSD 15.0. Sponsored by: The FreeBSD Foundation --- share/man/man4/upgt.4 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/man/man4/upgt.4 b/share/man/man4/upgt.4 index 5d4ada1d1a1f..cc5775d252ac 100644 --- a/share/man/man4/upgt.4 +++ b/share/man/man4/upgt.4 @@ -48,7 +48,7 @@ .\" OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd February 18, 2025 +.Dd October 24, 2025 .Dt UPGT 4 .Os .Sh NAME @@ -78,7 +78,7 @@ if_upgt_load="YES" The .Nm driver is slated to be removed in -.Fx 15.0 . +.Fx 16.0 . .Sh DESCRIPTION The .Nm From nobody Tue Oct 28 13:09:39 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cwrLq5Gw3z6Ds26; Tue, 28 Oct 2025 13:09: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cwrLq4Yqbz3hNT; Tue, 28 Oct 2025 13:09:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761656979; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ExYX0FEtK+RXx6w96Igyi5hsmYHdB5scCEpKUbGVhQE=; b=bJJn0AliJ8agureXRFS3Hl86KRirzB0d5kV3+vFTc7dveqDE7pFounA+0fHUP/satzacTn ZirA5YT9mwP64fQEW2bRCnTrXSjgwwuWUlWagXCdgupHOY5DczSp8qXbncLhCvIXMdRhzq Kx7idI/RugxAq2bFrJxuBkgatzX8EZmQOnoVeeSjMdFJj37QgvPaa8NFsMWIuEQN2RAyRc +e7u8tK3r/XzuCg9zMPmQ9qpalKsIkOb/69xj0e4xUShdpult63k5xVBDLCj9bhD8DfhYg bq0mpsCk2La7qfmAhbUqXrsqb6YlS1ipGvo6FduO1XETUuimwibzk0DO92E6JQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761656979; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ExYX0FEtK+RXx6w96Igyi5hsmYHdB5scCEpKUbGVhQE=; b=P+nWcJb9DG3d7hQQ69cnfd6TDoM1djPTDoTXcwauUw0SDfsC1Y4vBVH9/duG9pKGuSJBeT i/anf1zfNDx3RMQ3XwG5Rxz3kX9P4VQ2PXx/aYJopORPIsAEW/cA1Dm71LrTXzkBQHHxU8 ZBr0aboPfI7IBL/y7SFpW9G96KovcStFWOxLu2HhPLrQ01uta4ZjNLXFAwBIgg6FtIQymi HwJpQl8Ncc144iw6iI7ZQg6ItOQGgN8pB+nMb8OGjT4DFevoReayBsmWZgG++AOhCGUYIm qZBPSDgmpyby9gTtTdjFJ9bUBqFz3KnnP05BwKEmHNNt1Z7Mx4MqsTUYXsJR1g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761656979; a=rsa-sha256; cv=none; b=oX1RD0gyvukc9RTkGmrNR6GH5trLFdtMJ1fgV++1JVgt+caVakuXKT9wzYZ0AZGKJSDmDf 6yevUBbfKORiGsxXtpK4e4/qRU+JiJBbhs/k/JpuNPt9b3vBLL620dj7De9atOsrZ3/nyQ AxzMQIeXnH+SD6CqWV9BfglWrHndTXnYBj5ArdOIdWjY1++OTFze6zuDB4rLLGAzNWccjN 3a7v0uymSTsTTFHulDaCsf6uhg8N+UHAk9zAJE8l6RL5NQdc7SwRGDpAWoRHeKJdlGsFaF QEjCi1CrGFS5ZMS7X033bEPb4UHl2AmNv+T8BfQWoyTfQvFpOtbrSChvU5wDIg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cwrLq48KNzrVl; Tue, 28 Oct 2025 13:09:39 +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 59SD9dvf036397; Tue, 28 Oct 2025 13:09:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59SD9dRf036394; Tue, 28 Oct 2025 13:09:39 GMT (envelope-from git) Date: Tue, 28 Oct 2025 13:09:39 GMT Message-Id: <202510281309.59SD9dRf036394@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 9447a4078121 - main - bsdlabel: Bump removal to FreeBSD 16.0. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9447a4078121fd1ce961fed33dd0099040d0dac9 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=9447a4078121fd1ce961fed33dd0099040d0dac9 commit 9447a4078121fd1ce961fed33dd0099040d0dac9 Author: Ed Maste AuthorDate: 2025-10-28 13:08:30 +0000 Commit: Ed Maste CommitDate: 2025-10-28 13:08:30 +0000 bsdlabel: Bump removal to FreeBSD 16.0. It is deprecated but was not removed prior to 15.0. Sponsored by: The FreeBSD Foundation --- sbin/bsdlabel/bsdlabel.8 | 2 +- sbin/bsdlabel/bsdlabel.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sbin/bsdlabel/bsdlabel.8 b/sbin/bsdlabel/bsdlabel.8 index abea59756aea..cdf3cc249856 100644 --- a/sbin/bsdlabel/bsdlabel.8 +++ b/sbin/bsdlabel/bsdlabel.8 @@ -62,7 +62,7 @@ .Sh DEPRECATION NOTICE .Nm is deprecated and is not available in -.Fx 15.0 +.Fx 16.0 or later. Use .Xr gpart 8 diff --git a/sbin/bsdlabel/bsdlabel.c b/sbin/bsdlabel/bsdlabel.c index a68ee377a97c..912833ec12e3 100644 --- a/sbin/bsdlabel/bsdlabel.c +++ b/sbin/bsdlabel/bsdlabel.c @@ -136,7 +136,7 @@ main(int argc, char *argv[]) name = NULL; fprintf(stderr, - "WARNING: bsdlabel is deprecated and is not available in FreeBSD 15 or later.\n" + "WARNING: bsdlabel is deprecated and is not available in FreeBSD 16 or later.\n" "Please use gpart instead.\n\n"); while ((ch = getopt(argc, argv, "ABb:efm:nRrw")) != -1) From nobody Tue Oct 28 14:47:29 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cwtWj63LYz6F0Ql; Tue, 28 Oct 2025 14:47: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cwtWj5J0kz3vLT; Tue, 28 Oct 2025 14:47:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761662849; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Vi3D3unhQGOWGL2vrUIi4qrqMeQZyYywSe4FDDHpWWI=; b=xr7/CKsqEbgoU8gIeYq7xsrvajF/+unyVDumKqEAn+bdBzdJ3eM/4YGMV+swO/DFIzkonp z/SJYaDxAXawjrrz2sg/RlqibYCsjGaSgC/Q5QF/X/E9FTx1N9VqAeADUKPEcFS+ZaDhxi qzJmJemLcBe1C4LmUyqoRApR5yQ1G917cHp8m/BaxY0JeVDtlhO9DV9bEIIo8yDx2i4LQx Bl1emDj5mw0kShOZXFCcTmb3kfvoqd5h32G27K21so63h+jOVLx35JB+4DQ7IolYEhGQNg PukvrHOceaBatqjHs6rk7agwdw1lZgAYyUcvpsrGobIyDF9H2HusNoCF0mcAVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761662849; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Vi3D3unhQGOWGL2vrUIi4qrqMeQZyYywSe4FDDHpWWI=; b=ugzm86FCGqM6ux9WRd1Ne2pKitOjqrWmkuO/uHaalhD9CnK+euvuyIgTqzrp51HasuuttF k9ikZpcKpHCMIaCKHNebLALrcNOZ9RcJ9Q/evuK/x5zQdmgTszO8VNSNvBEZ4Lpvoo9Fnk H5SmGRkDz0pq38X8sj0gLNrE0ATfaiY7Vy5Nc0B2eK0IZYkKJgaPX87j+WIv5npF9WHN5d YngjVGDyrRXMVqjsua4qNpyAEnvGjGVG9bUeKA8lqqY51mptYIMtLVfTE5YuMAUkaqt5Wf 73wB1qluVLoewRFV0mnJ30P+13CF0b0w9nP9+ceXTuxfv9JKrALoxhMXKA5Jgw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761662849; a=rsa-sha256; cv=none; b=RfvZY4KFIROwK2BWN0Us5vtj8ppYEf3pqJez4woBQ1ZfHWEQDIZeL/qiH1gy3mSpdE7DtH MlVdjuK6Vla1nI0wUtm+Mk41fWbkJw1foiBlqiMbQzNcSHiFP9WqQSk0p5Tgr2hL75Qqbs iliQdOUc+z+n4ziIH2AbSnCVpp35ej9X4hpDAC5b30lxoqy0kCntuUTAuiva787JKOerrp TqH/zFB9FXkTscxn8N9+yI0JQeYI5pR8HDT4EPb/gIkBeTAl4D7o14K0WviAQ/YRQfFvWu x+Dy7Dsd9nNPc/wa0/JkLZlxGO1GvzAU3qXL1n727COA7daLksQcAkwmF/Uwog== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cwtWj4J8Yztpd; Tue, 28 Oct 2025 14:47: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 59SElT9h023106; Tue, 28 Oct 2025 14:47:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59SElTcu023103; Tue, 28 Oct 2025 14:47:29 GMT (envelope-from git) Date: Tue, 28 Oct 2025 14:47:29 GMT Message-Id: <202510281447.59SElTcu023103@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: 4672adcea4cf - main - nfs_commonsubs.c: Add a sanity check for nid_ngroup List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4672adcea4cf3c0c626d186f1f41c69552d915f1 Auto-Submitted: auto-generated The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=4672adcea4cf3c0c626d186f1f41c69552d915f1 commit 4672adcea4cf3c0c626d186f1f41c69552d915f1 Author: Rick Macklem AuthorDate: 2025-10-28 14:44:14 +0000 Commit: Rick Macklem CommitDate: 2025-10-28 14:44:14 +0000 nfs_commonsubs.c: Add a sanity check for nid_ngroup The nfsuserd(8) daemon passes user credentials (uid + gids) into the kernel for users and groups identified by name (received from a NFSv4 server). This patch add a sanity check for the number of groups (nid_ngroup) passed in. It's only purpose is to protect against a bogus nfsuserd(8) running in a jail. Reported by: Ilja Van Sprundel Reviewed by: markj MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D53389 --- sys/fs/nfs/nfs_commonsubs.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/sys/fs/nfs/nfs_commonsubs.c b/sys/fs/nfs/nfs_commonsubs.c index 8d506a5643a9..8e1a26eef354 100644 --- a/sys/fs/nfs/nfs_commonsubs.c +++ b/sys/fs/nfs/nfs_commonsubs.c @@ -4192,10 +4192,15 @@ nfssvc_idname(struct nfsd_idargs *nidp) nidp->nid_namelen); if (error == 0 && nidp->nid_ngroup > 0 && (nidp->nid_flag & NFSID_ADDUID) != 0) { - grps = malloc(sizeof(gid_t) * nidp->nid_ngroup, M_TEMP, - M_WAITOK); - error = copyin(nidp->nid_grps, grps, - sizeof(gid_t) * nidp->nid_ngroup); + grps = NULL; + if (nidp->nid_ngroup > NGROUPS_MAX) + error = EINVAL; + if (error == 0) { + grps = malloc(sizeof(gid_t) * nidp->nid_ngroup, M_TEMP, + M_WAITOK); + error = copyin(nidp->nid_grps, grps, + sizeof(gid_t) * nidp->nid_ngroup); + } if (error == 0) { /* * Create a credential just like svc_getcred(), From nobody Tue Oct 28 16:52:21 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cwxHn6ynqz6D9dk; Tue, 28 Oct 2025 16:52: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cwxHn654Rz49rY; Tue, 28 Oct 2025 16:52:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761670341; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8tsSfNKesi/KtcAGkRHZbdhmcZE0hQMENQahVdTRRwc=; b=OwoqyRV7jsaMc0IBGSdLSMEM1Sh2P5l6AIKX6lVPu6/PITPLHzzEjyK7nQ2RQhQbUbfqaw I7cs4R17B8bQGfHXmWqzs1Mopc3MJA3PBxvQXlGh7pq3n9JI0s07/UkBdDA2dXoSNK6+LS fRQabNfiV1Q/dTss1phdCx0HcDPRVptKKRNk1PCp7NpjkWGYv60qBelgmy+VM6VTh1H2fe N0jkQGsPllDte9ygB4swPqVIuzZX53pIPg7L3p4Uufn8gaANaTuclZnrYoTxOPvJCIExJf oKAn86cCKyZTk2OVtmWPXzCJzq8ONq81gvNwq8H0sEzjBZz52u4kzljWc+aiLw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761670341; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8tsSfNKesi/KtcAGkRHZbdhmcZE0hQMENQahVdTRRwc=; b=IeS7jlaIWEjNofhl/rejniijNsTGwIWd2MkX2s8huVYT5S7bQi7e3ysf2AiqNXZeJuV422 TPC9GO7bBZ86sQilr9w0charFwBF24NMqzBcUBt+hiA3ka6Ck6DO3eF/IdPSInjU1Yekeo Wb0ZLYYh68aRM+vrkeCa5swUMPi2l+l/bdfehjb3usJ/f30FP5zsjvFMyfa3EeSKVj0Wvo VQSRELZgj94/VmHWlWE2CFILb+MlXLP/4poJUJxTvxa7TscwalD+ZgRJC3vj9BwlNK8rxV YplXAnXkANCnMGiCT1KKc0uTRGDF0JcCZzf3QDKzU/hWQ4lZXgZRsHhzVIvhDQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761670341; a=rsa-sha256; cv=none; b=a3lNfKXsxE/CrUvTMF4iAWC5kKdMwITISiOHl0mpHy61O0OT9pLcmIsTHGZ6IJ2uPNEkiA 6FbsNVf6U7cVKIjKu6NBTFXh6b6uE9lWVWmmaN6BcDPE9JOENpfp+Q+vyKwmd2BAKVYGN3 vs4fWp7qH+4dK6LKWx9oq9seq2KYaz/1DODd/kGmMoFBTcHlcU94DxJPCi3B0V/06ZuYR5 XNiEVyZ9QBfYCY/+em9E4fdTuifcFh3ZEBFkyV58+hmTqeVOsCNcv/UIGsgGBXQweLgbV3 /I99pj7JfvPo0N2NkqP92HkS9FAwIh3ikS9zkV1uaSy6OldIMj2WPAycAT6Ofg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cwxHn5ZbPzyll; Tue, 28 Oct 2025 16:52: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 59SGqL94066774; Tue, 28 Oct 2025 16:52:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59SGqLG1066771; Tue, 28 Oct 2025 16:52:21 GMT (envelope-from git) Date: Tue, 28 Oct 2025 16:52:21 GMT Message-Id: <202510281652.59SGqLG1066771@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 70b72ede982f - main - id: Clean up List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 70b72ede982f3aebe03a2bf7a8245ee6bcde352c Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=70b72ede982f3aebe03a2bf7a8245ee6bcde352c commit 70b72ede982f3aebe03a2bf7a8245ee6bcde352c Author: Dag-Erling Smørgrav AuthorDate: 2025-10-28 16:51:50 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-10-28 16:52:07 +0000 id: Clean up No functional change intended. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D53300 --- usr.bin/id/id.c | 114 +++++++++++++++++++++++++++----------------------------- 1 file changed, 55 insertions(+), 59 deletions(-) diff --git a/usr.bin/id/id.c b/usr.bin/id/id.c index 7112e0dddb91..a326aa14c7c7 100644 --- a/usr.bin/id/id.c +++ b/usr.bin/id/id.c @@ -53,79 +53,86 @@ static void pretty(struct passwd *); #ifdef USE_BSM_AUDIT static void auditid(void); #endif -static void group(struct passwd *, int); +static void group(struct passwd *, bool); static void maclabel(void); static void usage(void); static struct passwd *who(char *); -static int isgroups, iswhoami; +static bool isgroups, iswhoami; int main(int argc, char *argv[]) { struct group *gr; struct passwd *pw; - int Gflag, Mflag, Pflag, ch, gflag, id, nflag, pflag, rflag, uflag; - int Aflag, cflag; - int error; - const char *myname; +#ifdef USE_BSM_AUDIT + bool Aflag; +#endif + bool Gflag, Mflag, Pflag; + bool cflag, gflag, nflag, pflag, rflag, uflag; + int ch, combo, error, id; + const char *myname, *optstr; char loginclass[MAXLOGNAME]; - Gflag = Mflag = Pflag = gflag = nflag = pflag = rflag = uflag = 0; - Aflag = cflag = 0; +#ifdef USE_BSM_AUDIT + Aflag = false; +#endif + Gflag = Mflag = Pflag = false; + cflag = gflag = nflag = pflag = rflag = uflag = false; - myname = strrchr(argv[0], '/'); - myname = (myname != NULL) ? myname + 1 : argv[0]; + myname = getprogname(); + optstr = "AGMPacgnpru"; if (strcmp(myname, "groups") == 0) { - isgroups = 1; - Gflag = nflag = 1; + isgroups = true; + optstr = ""; + Gflag = nflag = true; } else if (strcmp(myname, "whoami") == 0) { - iswhoami = 1; - uflag = nflag = 1; + iswhoami = true; + optstr = ""; + uflag = nflag = true; } - while ((ch = getopt(argc, argv, - (isgroups || iswhoami) ? "" : "APGMacgnpru")) != -1) + while ((ch = getopt(argc, argv, optstr)) != -1) { switch(ch) { #ifdef USE_BSM_AUDIT case 'A': - Aflag = 1; + Aflag = true; break; #endif case 'G': - Gflag = 1; + Gflag = true; break; case 'M': - Mflag = 1; + Mflag = true; break; case 'P': - Pflag = 1; + Pflag = true; break; case 'a': break; case 'c': - cflag = 1; + cflag = true; break; case 'g': - gflag = 1; + gflag = true; break; case 'n': - nflag = 1; + nflag = true; break; case 'p': - pflag = 1; + pflag = true; break; case 'r': - rflag = 1; + rflag = true; break; case 'u': - uflag = 1; + uflag = true; break; - case '?': default: usage(); } + } argc -= optind; argv += optind; @@ -134,16 +141,11 @@ main(int argc, char *argv[]) if ((cflag || Aflag || Mflag) && argc > 0) usage(); - switch(Aflag + Gflag + Mflag + Pflag + gflag + pflag + uflag) { - case 1: - break; - case 0: - if (!nflag && !rflag) - break; - /* FALLTHROUGH */ - default: + combo = Aflag + Gflag + Mflag + Pflag + gflag + pflag + uflag; + if (combo > 1) + usage(); + if (combo == 0 && (nflag || rflag)) usage(); - } pw = *argv ? who(*argv) : NULL; @@ -217,7 +219,7 @@ pretty(struct passwd *pw) if (pw) { (void)printf("uid\t%s\n", pw->pw_name); (void)printf("groups\t"); - group(pw, 1); + group(pw, true); } else { if ((login = getlogin()) == NULL) err(1, "getlogin"); @@ -243,7 +245,7 @@ pretty(struct passwd *pw) (void)printf("rgid\t%u\n", rid); } (void)printf("groups\t"); - group(NULL, 1); + group(NULL, true); } } @@ -366,7 +368,7 @@ auditid(void) #endif static void -group(struct passwd *pw, int nflag) +group(struct passwd *pw, bool nflag) { struct group *gr; int cnt, id, lastid, ngroups; @@ -452,41 +454,35 @@ who(char *u) static void pline(struct passwd *pw) { - - if (!pw) { + if (pw == NULL) { if ((pw = getpwuid(getuid())) == NULL) err(1, "getpwuid"); } - (void)printf("%s:%s:%d:%d:%s:%ld:%ld:%s:%s:%s\n", pw->pw_name, - pw->pw_passwd, pw->pw_uid, pw->pw_gid, pw->pw_class, - (long)pw->pw_change, (long)pw->pw_expire, pw->pw_gecos, - pw->pw_dir, pw->pw_shell); + pw->pw_passwd, pw->pw_uid, pw->pw_gid, pw->pw_class, + (long)pw->pw_change, (long)pw->pw_expire, pw->pw_gecos, + pw->pw_dir, pw->pw_shell); } - static void usage(void) { - if (isgroups) (void)fprintf(stderr, "usage: groups [user]\n"); else if (iswhoami) (void)fprintf(stderr, "usage: whoami\n"); else - (void)fprintf(stderr, "%s\n%s%s\n%s\n%s\n%s\n%s\n%s\n%s\n", - "usage: id [user]", + (void)fprintf(stderr, + "usage: id [user]\n" #ifdef USE_BSM_AUDIT - " id -A\n", -#else - "", + " id -A\n" #endif - " id -G [-n] [user]", - " id -M", - " id -P [user]", - " id -c", - " id -g [-nr] [user]", - " id -p [user]", - " id -u [-nr] [user]"); + " id -G [-n] [user]\n" + " id -M\n" + " id -P [user]\n" + " id -c\n" + " id -g [-nr] [user]\n" + " id -p [user]\n" + " id -u [-nr] [user]\n"); exit(1); } From nobody Tue Oct 28 16:52:22 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cwxHq707Yz6D9dn; Tue, 28 Oct 2025 16: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cwxHp6qLjz49xG; Tue, 28 Oct 2025 16:52:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761670343; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yraWSBJBkHDhvsyzQPzSK98AZKXZ/zSHkGXYgQjvsJc=; b=Yumpvi0DqBTeulsdZh92AzOnoPJodq3EznUBN2rGYNVcraihaa61IrRR8YFjru56G1Hdpt RM39J6C1V/WyCY36xQEMq3VPKIsKV4pSsrUSuzB/gqQm5Dk7aGKdM6x88beER3EMMKE7Jb BndMVi9rWZXh/HCgXN5nHeU2Oh53NVHNFYEsjzPhyZIkp2oCQOGD3Zk0h4n2pxjg1/EIgl QaD0TjNDZMKvhRDB1wWRIZ8KSRz/lsQTqha7/d9ElzwZbupy7z/03+zQMUFZFVQwU4Dwym 6M+IJ3rACOhM+cANY/bxaflZKQK2uH2XeNRbHsBZxV3n7kPPh9+Wi8tuHhmFfg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761670343; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yraWSBJBkHDhvsyzQPzSK98AZKXZ/zSHkGXYgQjvsJc=; b=kHEyKlfDhEe6fFu5LeRZTUNcK7iUlBWbwcLLnSXnSwxgQKAfH4nphbblV+TdsjdNqKI25D MlSfXqmmVM3icvLytx8tnT8UYmk5erq+QEK2LIgGGDzt4dr5w2ObzdYJpeh1JgZpPleDyT ELi9yPqt/YQeeOsZ2+096E4eRjTt6crxgiuUtcL0cHMeazMsBILSgESefNLbVrTjx9XXRH YfKs6wg65yloMH+m77zLolZClNU1K4dNQueh9KA8CmDJGZoRq3BBUq8ae6/8E4rUaHwqZH IVfqsQoak6GNxHTTn5pKmjOv1+jcJKktTFnicAg4WX2o5aEgYvpmdN7gLMqUBA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761670343; a=rsa-sha256; cv=none; b=r8cXJE3M5Jw8WLzApLE32p8tV3GIMCU+wQLuubgFq8z/KpggMipKLTGP33fltKrKSrYgmL yxZoUiwicwWdIhwX90q8ccY7gcHTiIxw3usze5CItbt9uey+A6JZxTKCh8EttE+pR3+LFG gXD5xad9bJuMPw6N/uN7zh9uzXygN2ZgQQ1zou4Dfgf4Ljc2E2Ac8mm2KYxxfnhUsEwpvB ZotMt9oCQCcNo9+xXHRBewltsFvUARUxqPLf9fpKmdqFAJISBQVDY5Mznnk0EPG9yuE4Hg X+4kAMwIOnTOGYl5iSTNPQMRVjJ2XRZshGqnkRlvF9qMWwIr7WK1bdt0CsVzrQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cwxHp6PzvzymT; Tue, 28 Oct 2025 16:52:22 +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 59SGqMlH066812; Tue, 28 Oct 2025 16:52:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59SGqMvQ066809; Tue, 28 Oct 2025 16:52:22 GMT (envelope-from git) Date: Tue, 28 Oct 2025 16:52:22 GMT Message-Id: <202510281652.59SGqMvQ066809@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: f41b1eb637f5 - main - id: Add -d and -s options List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f41b1eb637f576634be0df9d657f46aa57afea59 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=f41b1eb637f576634be0df9d657f46aa57afea59 commit f41b1eb637f576634be0df9d657f46aa57afea59 Author: Dag-Erling Smørgrav AuthorDate: 2025-10-28 16:51:56 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-10-28 16:52:07 +0000 id: Add -d and -s options These options may not be combined with any other options and print the current or specified user's home directory and shell respectively. Reviewed by: imp, bcr Differential Revision: https://reviews.freebsd.org/D53301 --- usr.bin/id/id.1 | 28 +++++++++++++++++++++++++--- usr.bin/id/id.c | 48 +++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 70 insertions(+), 6 deletions(-) diff --git a/usr.bin/id/id.1 b/usr.bin/id/id.1 index b8dafb6650b0..62c941f84798 100644 --- a/usr.bin/id/id.1 +++ b/usr.bin/id/id.1 @@ -28,7 +28,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd March 5, 2011 +.Dd October 23, 2025 .Dt ID 1 .Os .Sh NAME @@ -50,12 +50,18 @@ .Nm .Fl c .Nm +.Fl d +.Op Ar user +.Nm .Fl g Op Fl nr .Op Ar user .Nm .Fl p .Op Ar user .Nm +.Fl s +.Op Ar user +.Nm .Fl u Op Fl nr .Op Ar user .Sh DESCRIPTION @@ -90,6 +96,8 @@ Ignored for compatibility with other implementations. .It Fl c Display current login class. +.It Fl d +Display the home directory of the current or specified user. .It Fl g Display the effective group ID as a number. .It Fl n @@ -128,6 +136,8 @@ Display the real ID for the and .Fl u options instead of the effective ID. +.It Fl s +Display the shell of the current or specified user. .It Fl u Display the effective user ID as a number. .El @@ -174,8 +184,20 @@ bob pts/5 Dec 4 19:51 .Sh STANDARDS The .Nm -function is expected to conform to -.St -p1003.2 . +utility is expected to conform to +.St -p1003.1-2024 . +The +.Fl A , +.Fl M , +.Fl P , +.Fl c , +.Fl d , +.Fl p , +and +.Fl s +options are +.Fx +extensions. .Sh HISTORY The historic diff --git a/usr.bin/id/id.c b/usr.bin/id/id.c index a326aa14c7c7..5f9d2670caa3 100644 --- a/usr.bin/id/id.c +++ b/usr.bin/id/id.c @@ -55,6 +55,8 @@ static void auditid(void); #endif static void group(struct passwd *, bool); static void maclabel(void); +static void dir(struct passwd *); +static void shell(struct passwd *); static void usage(void); static struct passwd *who(char *); @@ -69,7 +71,7 @@ main(int argc, char *argv[]) bool Aflag; #endif bool Gflag, Mflag, Pflag; - bool cflag, gflag, nflag, pflag, rflag, uflag; + bool cflag, dflag, gflag, nflag, pflag, rflag, sflag, uflag; int ch, combo, error, id; const char *myname, *optstr; char loginclass[MAXLOGNAME]; @@ -78,10 +80,10 @@ main(int argc, char *argv[]) Aflag = false; #endif Gflag = Mflag = Pflag = false; - cflag = gflag = nflag = pflag = rflag = uflag = false; + cflag = dflag = gflag = nflag = pflag = rflag = sflag = uflag = false; myname = getprogname(); - optstr = "AGMPacgnpru"; + optstr = "AGMPacdgnprsu"; if (strcmp(myname, "groups") == 0) { isgroups = true; optstr = ""; @@ -114,6 +116,9 @@ main(int argc, char *argv[]) case 'c': cflag = true; break; + case 'd': + dflag = true; + break; case 'g': gflag = true; break; @@ -126,6 +131,9 @@ main(int argc, char *argv[]) case 'r': rflag = true; break; + case 's': + sflag = true; + break; case 'u': uflag = true; break; @@ -142,6 +150,8 @@ main(int argc, char *argv[]) usage(); combo = Aflag + Gflag + Mflag + Pflag + gflag + pflag + uflag; + if (combo + dflag + sflag > 1) + usage(); if (combo > 1) usage(); if (combo == 0 && (nflag || rflag)) @@ -185,6 +195,11 @@ main(int argc, char *argv[]) exit(0); } + if (dflag) { + dir(pw); + exit(0); + } + if (Gflag) { group(pw, nflag); exit(0); @@ -205,6 +220,11 @@ main(int argc, char *argv[]) exit(0); } + if (sflag) { + shell(pw); + exit(0); + } + id_print(pw); exit(0); } @@ -464,6 +484,26 @@ pline(struct passwd *pw) pw->pw_dir, pw->pw_shell); } +static void +dir(struct passwd *pw) +{ + if (pw == NULL) { + if ((pw = getpwuid(getuid())) == NULL) + err(1, "getpwuid"); + } + printf("%s\n", pw->pw_dir); +} + +static void +shell(struct passwd *pw) +{ + if (pw == NULL) { + if ((pw = getpwuid(getuid())) == NULL) + err(1, "getpwuid"); + } + printf("%s\n", pw->pw_shell); +} + static void usage(void) { @@ -481,8 +521,10 @@ usage(void) " id -M\n" " id -P [user]\n" " id -c\n" + " id -d [user]\n" " id -g [-nr] [user]\n" " id -p [user]\n" + " id -s [user]\n" " id -u [-nr] [user]\n"); exit(1); } From nobody Tue Oct 28 17:28:19 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cwy5L2Vwbz6DCmT; Tue, 28 Oct 2025 17:28:22 +0000 (UTC) (envelope-from glebius@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cwy5L1zkGz3HGZ; Tue, 28 Oct 2025 17:28:22 +0000 (UTC) (envelope-from glebius@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761672502; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3QpUhL6e8mikm6RU6Pff8/+KzYep8QYMj85uErAivYw=; b=J8jYhg+uUy5uZ5gEofkdnFEesB7Kj4zE0Ia1+cX9D5UANNpGjer/1N1ojWyTN4jIe31mXY dkGwQaN5mz/ujFpVd9YdfSqbn1p9Mti5I4f1H5CyWTFlyXhXHCb0UfBAFo5HBUpDKHBQ0u OxpYZGYwDc3x1ypumF8yvksg7qsfHMnYw52DevjZyfbYCZvDJ84VG+wOQvV6/LU0SGvg/D 6T62zWSy0AeUKMU8u3J/kCdEb8w3wqO0bftkp6VDbIPp8dHT2PxBm5v0AlUxW69tS3Im95 6JiXCRnriSj1rDG4p/x1I/bB0gp4E2sItgnhrnb3telcRfJrm2n5wiX6y6m6+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761672502; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3QpUhL6e8mikm6RU6Pff8/+KzYep8QYMj85uErAivYw=; b=qN4uAotqVmGbKXzdflJvrQyf0G4u4vOyRea3Eyds0aunjEt5dTnnWrfstlxhr1npXBOQoy Abtuu/Q0NO2APkoW089QbBFH0BrHmb8sZL8X5mw7pR8Sh/MAPnR5f907YmQHeNOpj/Fmuc Fnazt01jyAzSXbKAlEXG2u0ab/4g8NOvocZtql0/2aaF2X6ZmYVn29Mjo2IzGYDzE1+zs8 xWVMMmyztME8KbYC0Jl5JT30oD9tcxPIzxz06NBGK+qXlPQ1ARdHvLFs+OzPsFFkHRjemq yeU4BephX9onUxxSrIbWHQe0yJwHQSmKtwTRwaOJTzHeGPzysxF4NiyNayur6A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761672502; a=rsa-sha256; cv=none; b=P6/0H28k0/JWHhx1mBmvHGAtf5RBRVo4qNRQA8TypAs+YlRxODvd1cJTHUlv+gKgojDH62 EfOiG5sox47O6oOU88JgtPeFrdZdpZs3PiQ3NQnXrNtm7lwjxvOYi3XLVyvXNmTigUn6KI XNEk0Ra6A/PzpZi/GYt74RI2MXvRwf07aG9OLCQivCaNjvAXAUpTWGIFvE4nENbHNmEjL8 5fJtF3T7asIkuc21Z+pMXi1vADagbv4cEGdJ8Pnza7ESp5BiUN3XAu/FUhaCKbj81NCI2u W9bhOaY9R7PFBJJvNR1uB7UXu97GDajOX8OGuVI5ZCefPE4EAwgKodAN0fxb5g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from cell.glebi.us (glebi.us [162.251.186.162]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: glebius) by smtp.freebsd.org (Postfix) with ESMTPSA id 4cwy5K4NwQz1Cgl; Tue, 28 Oct 2025 17:28:21 +0000 (UTC) (envelope-from glebius@freebsd.org) Date: Tue, 28 Oct 2025 10:28:19 -0700 From: Gleb Smirnoff To: Dag-Erling =?iso-8859-1?Q?Sm=F8rgrav?= Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 3d73146baeb9 - main - pwait: Add an option to print remaining processes Message-ID: References: <202510281157.59SBvhNB002870@gitrepo.freebsd.org> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <202510281157.59SBvhNB002870@gitrepo.freebsd.org> On Tue, Oct 28, 2025 at 11:57:43AM +0000, Dag-Erling Smørgrav wrote: D> +static int D> +pidcmp(const struct pid *a, const struct pid *b) D> +{ D> + return (a->pid > b->pid ? 1 : a->pid < b->pid ? -1 : 0); D> +} D> + D> +RB_HEAD(pidtree, pid); D> +static struct pidtree pids = RB_INITIALIZER(&pids); D> +RB_GENERATE_STATIC(pidtree, pid, entry, pidcmp); We have a nice trick in our tree(3) that allows to use lighter compare functions. The function can return any signed integer type, thus we can: static pid_t pidcmp(const struct pid *a, const struct pid *b) { return (a->pid - b->pid); } -- Gleb Smirnoff From nobody Tue Oct 28 18:01:06 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cwyq62B9Gz6DFw1; Tue, 28 Oct 2025 18:01:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cwyq61Zkwz3LMx; Tue, 28 Oct 2025 18:01:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761674466; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oF1UwR3pijUWij5e60BDAcXrhmno+tcQdKroSX74TNE=; b=hCGXr82ehOIYeKkL8gQdk7ZrW/x9SAv8RMsBJI7c2FtMxMhuHiBVaX2Dogh+zaWhkyarZm rO3WZOaIho5kUbe2xf6J03Ov3ynOzFwJVuFUEIOd7WEk1tutE1sXuNTbD/BjWRjKGxsS61 QGnviWVO/Aqs3gG9IiuXgOFG1tcyB8tnPSGP2TrWu182qrFl9emBdoD1Dw25doC+S5zToX 8g8dEIyml4Sw/NuTWKNi1uZ5Gv3SyI3wpH1vcAXGnH8RnRf2f3Sce8DgVwEUXZCLwTm9nK V3VRentTjYP11qlnhY0JDImGdpYPSP64GJKbCB83FAKQvizyWBA796fhMdBiVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761674466; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oF1UwR3pijUWij5e60BDAcXrhmno+tcQdKroSX74TNE=; b=x1q64akQedfmRZxANyPk6YIS/1nefwCI2GBjDcHiFyEJ/6q+SPjI1B4NGg5S1OEh6mpm5M XeP3Hc5nH0d46NHs9HwpNkYmeTPuBmveXKW1r7GeM5cKqKAiSiu+t+N/zCH1EIjPccb0jC emLNf1grAV0BQb52N1GRY/4j4f+pWNkKjYwGyx51Za/cnHwmJMM6tIh8+/n7m3WW1CAXnj EMGRoczbU1hFjT2R7JiWKPwuRnZd5tQwjQY+kI3m9NfSzJ2uJA+SHBv8uPE07N+XCEaI8v aFVjbr/sWm4HpcbtQyT5voSY5/jvSfIbOzB/VO8RDS/HirFX5+h4sR4PbkxTLg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761674466; a=rsa-sha256; cv=none; b=FrspYdz/4/85JbHA/jI1Ti56xWyOsfVg4/eQ6JQxaGs3beKQ49SC4BUe4+YR3XViK2VIpO L9Klmg0AroiGn3dOYhp83a/7rVGqhH1iS53Dnb6P2vKw608gRBlytL8TpWZvKrtL5HmbzJ IRsfnj7GqCRiN0IoTwBToUVXrf4yN5byRNbW/tKOfB4sY13NFDj2clxgpkJO8Qcavhz+Ew GqBVMjNBbPYWDM74lU+NMLdK6YbHPktSUtbVvUpbkAkO58nOWbi30qA3bKWiDGnzaZbfuV /kpnpEhrRdF+3bnjfKSGuuBzpFIaPDx4MzCj1OdELqIdPPQj0ysKRnFO4O824A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cwyq618k3z11Ww; Tue, 28 Oct 2025 18:01:06 +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 59SI16Gl093650; Tue, 28 Oct 2025 18:01:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59SI16mZ093647; Tue, 28 Oct 2025 18:01:06 GMT (envelope-from git) Date: Tue, 28 Oct 2025 18:01:06 GMT Message-Id: <202510281801.59SI16mZ093647@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: b2c568675575 - main - tuning.7 stats.7: Cross-reference List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b2c5686755757535a6c3223b31fb96b64a961f15 Auto-Submitted: auto-generated The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=b2c5686755757535a6c3223b31fb96b64a961f15 commit b2c5686755757535a6c3223b31fb96b64a961f15 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2025-10-28 17:59:11 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2025-10-28 18:00:07 +0000 tuning.7 stats.7: Cross-reference MFC after: 3 days --- share/man/man7/stats.7 | 3 ++- share/man/man7/tuning.7 | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/share/man/man7/stats.7 b/share/man/man7/stats.7 index 715db70e118b..0b57d525522c 100644 --- a/share/man/man7/stats.7 +++ b/share/man/man7/stats.7 @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd April 22, 2021 +.Dd October 28, 2025 .Dt STATS 7 .Os .Sh NAME @@ -100,6 +100,7 @@ Report ZFS I/O statistics .Xr stat 1 , .Xr systat 1 , .Xr intro 7 , +.Xr tuning 7 , .Xr ctlstat 8 , .Xr gstat 8 , .Xr ibstat 8 , diff --git a/share/man/man7/tuning.7 b/share/man/man7/tuning.7 index ebba551f65d0..44c427c4559d 100644 --- a/share/man/man7/tuning.7 +++ b/share/man/man7/tuning.7 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd January 23, 2025 +.Dd October 28, 2025 .Dt TUNING 7 .Os .Sh NAME @@ -678,6 +678,7 @@ over services you export from your box (web services, email). .Xr firewall 7 , .Xr hier 7 , .Xr ports 7 , +.Xr stats 7 , .Xr boot 8 , .Xr bsdinstall 8 , .Xr ccdconfig 8 , From nobody Tue Oct 28 18:18:55 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cwzCr27wKz6DH3d; Tue, 28 Oct 2025 18:19:04 +0000 (UTC) (envelope-from zlei@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cwzCr0SVrz3N0j; Tue, 28 Oct 2025 18:19:04 +0000 (UTC) (envelope-from zlei@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761675544; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0CaV2MlXt0jFrOdxezVXnxvQm3V0BCCZYxQg8Z3Uias=; b=x4PbjO8sIEvB4OJOG68bP/u9f19pudvgCQ5NZA/Dx1GIRI1xMSz2QPkmIB1X1CBZ+6JWDt IjM8wqg+iHAbHlziUfKwvAOcFomVa/OrkzTRAXi2ODRCcdmLY4hBGYf3cIZMODX1e1YTpZ iRzLcyEkjAs7aYggB07vqhtOulP3ZAbc5xHfCyrrgo9PiPRoci4Fkia9oyU7MMG402dQ+R oeOp/wwfkFj4MgQ0fHhddw5erfaLT/gpt0LC22JaKdkPWUL4u/w4GV+yV3czUaZVEwh03k F/fcTrjftjpL6omS7HDhS/scCrKIwfJGMfqB0HI2L7zg3gi3LWADHxtvAVp3tQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761675544; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0CaV2MlXt0jFrOdxezVXnxvQm3V0BCCZYxQg8Z3Uias=; b=Ybjv5m1a+ivNeRzjdTPBcd5G9w54gZyGSV5A+ykKT+i7ZNSxX0RuGiM0hLa2JrTL0ZS2+7 SEUopJmSUHR2mjSxBS+DRRO7wCKSYwC1GwBUa/Jo8b3AUyQj4zwhFpzZfd73iMMAzzN+q4 xnWhI9XUfNwdu/TjOx3PRzCZwidMYUBMEBydywSlkdH2erx+J8x8a5abPwEEVrRLFWynAA KTLl7xVD8JYIn63ZhSu9ClHHOaA5oLJ4LQa1MnKrK1LDoGSRBqrm62j34gY4TVQyHVNWOz +RYQFCaLSWdMHcgeMTAd16/8s5UZsPJiJSWQqcMnWd0hgvIApNgRj+Rp19Cyzw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761675544; a=rsa-sha256; cv=none; b=M/FOdJY0n+CXxMqBjgz51KIVQVxFCv+wJGmNGB8LqU1/89gC7wA/0/GZumEj++QPszA3KD 7C4pq5TaV48uyi69Gfn/YNstXJfI8iIqXtZN/2ZqVBd/hbaCT5eiTtxkvLSD5FCqfeAbhh yq5dvvpNAUy3QhpbdQ9WCsL60e+8w8DNQi8lzNWHp3pXPCtOYO3kZVL45Mj8TZRzeisMdi DLfNLhqeGP4dfBW7IrJxmcxo1Z6QIco/+ofOgO8SWOja59jC1H55fVCa6SpemB11OWqhbr Ukl7LrmVDKp0B6ewloErd7IA00dK/fIfoRN8qnAgZQk4PyHqQ2I1/2+NS+CgQA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from smtpclient.apple (unknown [IPv6:2001:19f0:6001:9db:98f0:9fe0:3545:10]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: zlei/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4cwzCp3TMDzyr; Tue, 28 Oct 2025 18:19:02 +0000 (UTC) (envelope-from zlei@FreeBSD.org) Content-Type: text/plain; charset=utf-8 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3696.120.41.1.10\)) Subject: Re: git: 3d73146baeb9 - main - pwait: Add an option to print remaining processes From: Zhenlei Huang In-Reply-To: Date: Wed, 29 Oct 2025 02:18:55 +0800 Cc: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: References: <202510281157.59SBvhNB002870@gitrepo.freebsd.org> To: Gleb Smirnoff X-Mailer: Apple Mail (2.3696.120.41.1.10) > On Oct 29, 2025, at 1:28 AM, Gleb Smirnoff = wrote: >=20 > On Tue, Oct 28, 2025 at 11:57:43AM +0000, Dag-Erling Sm=C3=B8rgrav = wrote: > D> +static int > D> +pidcmp(const struct pid *a, const struct pid *b) > D> +{ > D> + return (a->pid > b->pid ? 1 : a->pid < b->pid ? -1 : 0); > D> +} > D> + > D> +RB_HEAD(pidtree, pid); > D> +static struct pidtree pids =3D RB_INITIALIZER(&pids); > D> +RB_GENERATE_STATIC(pidtree, pid, entry, pidcmp); >=20 > We have a nice trick in our tree(3) that allows to use lighter compare > functions. The function can return any signed integer type, thus we > can: >=20 > static pid_t > pidcmp(const struct pid *a, const struct pid *b) > { > return (a->pid - b->pid); > } I'd prefer to return const 1 / -1 / 0, that is straight forward of a = comparator. Also the compiler is smart enough to catch this pattern and generate optimized code, from my = experiment which is long long time ago. The pid has type pid_t which is a type redefinition of __int32_t. = Although the pid will not reach 2^31 or -2^31 - 1, in principle the computing of the delta of the two = signed integers may overflow and that is bad smell. Best regards, Zhenlei >=20 > --=20 > Gleb Smirnoff From nobody Tue Oct 28 18:52:33 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cwzyT2yWzz6DK31; Tue, 28 Oct 2025 18:52: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cwzyT2J4tz3RD6; Tue, 28 Oct 2025 18:52:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761677553; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iOrrFBfmTIKn58TzclBZiGEITvtQEAXVt3u3KPzHTi0=; b=NEkPcWhFLN3Tilr1XMKmQBz7ojnsQokBGUBI9cOQk75e4Kv0No8UbbjfHMAES/YWFaUANQ 9qxGT+8NUjiX/12XKE3NssFDSa3BjqDZI2MAuERA1qTNtcqPEbBnVw+lmjluxMHVSVcd67 YKIbZSK0ioCw/36auHx40/jmgJmrgnrNqByxRBVdcpP45RdF7WMr6W9OcI1f3bJsLE3g1y qwaU2H4pgkj0wbAb9h+h/O9nskcXCqhvspXQ0hcpM0QSXKTzPftjhz9/2IieqfL0W9yOZk l5zmaQQlALeez41w9KKO5k3XXOga9lslaTQfyEI3FSStlONcj7BE4V/tBcDpOg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761677553; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iOrrFBfmTIKn58TzclBZiGEITvtQEAXVt3u3KPzHTi0=; b=YV9q7Zk9cV9fVjELLMQe/tEF85ngVtgYYZRASYCeCohwMd4gz6BloaVvbMx/lwXygTmAkc UvCJMJBY/jwyvAWuuG+EK9FXC44L+GwpPA65dr44rMZn807vRL20f8REr1SEcgcxiHDAch GBoeucC3J/P1b/dclukX52MXNujwAFI4dka2De9F8AEb7sDdGfE6mR1RA9sdLPoP6IXaQ8 FIRCYyzD/Yvx26rHhK2cw75eV/heyEIFzCE3QVYvzYsRzDXGRgtl8l5Umf4krH5d6ixK4E dcaRAl/+CkXiWr00Pr0grMAEDY/BUEfT3Si+e5wN8qyBplBQWejJxHbuwESeMg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761677553; a=rsa-sha256; cv=none; b=rKOqAwqP3sohUW5571DAhnEER/4CfMEj1EeqmeTsMy3oCczECZpCpqJ+QlB2/dTPMQ1F3K Akt5YYXdRLS99ZvtU3DgflN6URAXHIYGmE/R9HPeWWCulvnUB4BLU1kS80zmFv5nU5gqmp 7drZdYh745MVKrpJLa2mIWjlJAuOzz9f8n+4tWHbmr1VioSElC+EZ8RhHrlb2LpAJbJYAv DnEKZKFI794Otb0PcPLVwc1MV6+r9x+oJGGugQQ6iBR8wtfxl4GWjgq/RNtG1+XUBNv1oU FMTzusGkE6roCl6c7v6aKYcyTCKbPhAZkoe6ZyTJ/wzlVDdV+K1eqa6ZKjaS5Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cwzyT1tKdz12dn; Tue, 28 Oct 2025 18:52: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 59SIqXcl091961; Tue, 28 Oct 2025 18:52:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59SIqXib091958; Tue, 28 Oct 2025 18:52:33 GMT (envelope-from git) Date: Tue, 28 Oct 2025 18:52:33 GMT Message-Id: <202510281852.59SIqXib091958@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: c6e12d38f167 - main - sys/dev/md: cleanup includes List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c6e12d38f167d4cea1e8bb8119f4677c1c008c6a Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=c6e12d38f167d4cea1e8bb8119f4677c1c008c6a commit c6e12d38f167d4cea1e8bb8119f4677c1c008c6a Author: Konstantin Belousov AuthorDate: 2025-10-28 17:03:12 +0000 Commit: Konstantin Belousov CommitDate: 2025-10-28 18:52:06 +0000 sys/dev/md: cleanup includes Remove twice included but unneeded explicit sys/param.h. Sort. Sponsored by: The FreeBSD Foundation MFC after: 3 days --- sys/dev/md/md.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/sys/dev/md/md.c b/sys/dev/md/md.c index ec1664fac701..9d246d7c78fd 100644 --- a/sys/dev/md/md.c +++ b/sys/dev/md/md.c @@ -60,12 +60,13 @@ #include "opt_geom.h" #include "opt_md.h" -#include #include #include #include +#include #include #include +#include #include #include #include @@ -76,11 +77,11 @@ #include #include #include -#include #include #include #include #include +#include #include #include #include @@ -88,9 +89,6 @@ #include #include #include -#include -#include -#include #include #include From nobody Tue Oct 28 19:01:52 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cx09D73Thz6DKyl; Tue, 28 Oct 2025 19:01: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cx09D6CJ5z3Rpl; Tue, 28 Oct 2025 19:01:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761678112; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3eQAGcig3wALudpRYXLPgXBaa2ue7YrQehCEsSinhwU=; b=ZaAQWBRu5xjn6LUnTmf5cu9dG16+zUA4vbfq5ie5YyT3Z6pd7pcF4KOFragX8ZczAVi21h 9hXWmql1ifng7Mla6B6ksuuiSQFINOFBJ4ed5Z8IwZaNsxgAXO6QbBpX9ckiS7pU+y8isl RyP9aemgcBIqb8eYF/WoTJWSZZ5nE2A/RjLpWtcllnFeffMsqN6KmhfHiu6g0Gm8SUWXHe 04P5VdbJUpHPngM9J1/N5tg/dhkhTehJil6tXOSigSmy85A3FAFTIkPuZ0nQwYDOLnmdVW is7cvuuJ026flGLQ/HHzTMDWdYS3Zau2px2lLVOZynSVRJ2F64Jt8ucNYaJIFg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761678112; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3eQAGcig3wALudpRYXLPgXBaa2ue7YrQehCEsSinhwU=; b=Z+wMfjTkDxSHXJF1/VXASS86kf5a0+hidLAg3rqNcaIOKwJhvAlwMxpX6hlslYVuJZzA2/ TWys/ZLaqgckzvegySd2DWfhVMcA2HY2N0hVfGiiB9z8ddmP3BsAoQA3pfxj4Hhgpf2yoO 5+WE72IO1S13WPRt2uixWu2pHY+deyn8oVqIpl+BkzP2vuKviPQ8HM05TPn81UOb6ueuwe wmhINbK9zUb2KZJZnZOpJT4m8XLWPbO+vhWt9MmIIO8PJlC+PjbA2YmPrrD8DPazULB6Mp KCv6O+XmEfyr1aQuzs8eIUdj3PicXnAo7Kt9dzcPjdNUG5/YYzUzbuh9B8n9tw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761678112; a=rsa-sha256; cv=none; b=R9wunZY0jmlu45T5zDe9RyHVYQc0PSoxB9Sx3HKgVIdJiwaNUXBjfQZ9mS54fohoDyohWG KXOByBUmxc/jIPViIA0Gx3GlJalzjoAivMoGvhKRLG8cbx/e1d8f6uF7OzvcrH/zjBmxfC 6CsbGUqN+EArIWhwhD2vXk6EAOVMm64CLUuSyowG0hFiC9f6iM26WCPk8bqaQS0SpZfEP4 wDxE6YzjO3WQNhRv2Y7/7pFKbUWQvn/lkAh8alKzZyY1sMxdTQgD0RLG/IqEeDw+ynB+FO CBcZpa7/M3VyeSNGrCqq+ysqcxU1YiO8eLC2YVPDB5/mankwc9XJOM0AgZUVPg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cx09D5c70z12Rn; Tue, 28 Oct 2025 19:01: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 59SJ1qUS009251; Tue, 28 Oct 2025 19:01:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59SJ1q7w009248; Tue, 28 Oct 2025 19:01:52 GMT (envelope-from git) Date: Tue, 28 Oct 2025 19:01:52 GMT Message-Id: <202510281901.59SJ1q7w009248@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: c6b156e360fc - main - pmcstat: Remove no-op -k option List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c6b156e360fc5b18ee20bae0fc0c4188c3aadea6 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=c6b156e360fc5b18ee20bae0fc0c4188c3aadea6 commit c6b156e360fc5b18ee20bae0fc0c4188c3aadea6 Author: Ed Maste AuthorDate: 2025-10-28 13:12:05 +0000 Commit: Ed Maste CommitDate: 2025-10-28 19:01:38 +0000 pmcstat: Remove no-op -k option Commit 53d0b9e438bc ("pmc: Provide full path to modules from kernel linker") made pmcstat's -k option have no effect, but the option was retained for backwards compatibility (while emitting a warning that -k is not in FreeBSD 15). Reviewed by: jrtc27 Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D53397 --- usr.sbin/pmcstat/pmcstat.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/usr.sbin/pmcstat/pmcstat.c b/usr.sbin/pmcstat/pmcstat.c index ac9169f3e008..1809dae7bc4c 100644 --- a/usr.sbin/pmcstat/pmcstat.c +++ b/usr.sbin/pmcstat/pmcstat.c @@ -519,7 +519,7 @@ main(int argc, char **argv) CPU_COPY(&rootmask, &cpumask); while ((option = getopt(argc, argv, - "ACD:EF:G:ILM:NO:P:R:S:TUWZa:c:def:gi:k:l:m:n:o:p:qr:s:t:u:vw:z:")) != -1) + "ACD:EF:G:ILM:NO:P:R:S:TUWZa:c:def:gi:l:m:n:o:p:qr:s:t:u:vw:z:")) != -1) switch (option) { case 'A': args.pa_flags |= FLAG_SKIP_TOP_FN_RES; @@ -607,11 +607,6 @@ main(int argc, char **argv) args.pa_flags |= FLAG_SHOW_OFFSET; break; - case 'k': /* pathname to the kernel */ - warnx("WARNING: -k is obsolete, has no effect " - "and will be removed in FreeBSD 15."); - break; - case 'L': do_listcounters = 1; break; From nobody Tue Oct 28 19:25:05 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cx0h21R0sz6DMDH; Tue, 28 Oct 2025 19:25:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cx0h20rrNz3Vvx; Tue, 28 Oct 2025 19:25:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761679506; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0vZP1XYdaARQtA3Q+RIrnakiOP7eJ/csr3U8URn+dBU=; b=EBMz7nMo/eFwIunygNYojzZPhqDhPHh2AGj9hd6cBP+3LZhJr0k1BqtmbIl4c7DlVmA2C+ r8ITwd2gO3OvH/9dM2Ipe4WKfgfZV494fDuiVcXm3iOSUEjcD+omI0za6jPRkbYjlFUz1k Zx/uBfMm1NgXxCUMyO/SEIwXVFg2d9N+SgKpm+Ibe3GSG3UnpaEuPICjHTLo4iMYR59rl0 cMSsjDubF6uViVkZOKobx+fhGwztn1R3+/XVoyhT1PJoS5/dJDyVNtRtpCfNUVc8I+lF7/ zafmEuXMW2sdrG9RiCp8yYM/56/uykQ+9w0VpQU/0I33VssbiLenuodscVBvDA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761679506; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0vZP1XYdaARQtA3Q+RIrnakiOP7eJ/csr3U8URn+dBU=; b=atk+BJrhUi54XlXxwpwe1o0w3vyRs9qhwLOMe9jiNwLkbhCaye183rwaRTNWqs2+RKYxks hKIJDdQpy/fD8/avKrxGFs+oPBfuSIWSu+JEPoLD+dSpPTHN/XFPaptdUCgxaU4hm+idaP 6e/JGQWILvA9rGj79PyzRZFT6/BKcX5c8NCuziWg+SnYKjeXe6D1+lRBR8bLHPIDg4KTLC oO8KRagkvd3PpIf6BZ4Stee0+LgeDFKL3zHuNfgoSl39cy1dvIHHLqA5o6rVh+hYVpCss+ cQgwh4f3I2yqh/IJmdOUqiJ6G7VHbnEXm+2H7T6rHyuvF3LzQJIXx585TjT1QQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761679506; a=rsa-sha256; cv=none; b=Pcs+Pu14mMY/ONpSCNQL6HH1qTOuC/xCbXBj5jYx1RsBRE9UqpZ3h0b/EYH/kcyDJPj7a3 rW5pD2PsfJ2jc8XpUvVyYwCY33kokWO1J+Jgbja9HtreUucOwxzYnmE0F+D1nU0F0ObvvT kU9Kh/gStAZOWkrNEptuoFnjGkYE+5DITYt+390rFJOyo8Otlw0tJ2QfmwWAhW6puWeEXW k4ydmyr5j+cddmm+TYuKh7IFGCxqi/SjYw4PbrOlxoF76vrn0vFcccQHDgwgW3Iv4d5Bxg pCeiJjRJu4M5jtAV/nIWeWpD44sVl6NbiYFk1BLU4jUmZAOU/L9TdZ2GcIsIEA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cx0h20LFBz13jM; Tue, 28 Oct 2025 19:25:06 +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 59SJP5B3050165; Tue, 28 Oct 2025 19:25:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59SJP5ul050162; Tue, 28 Oct 2025 19:25:05 GMT (envelope-from git) Date: Tue, 28 Oct 2025 19:25:05 GMT Message-Id: <202510281925.59SJP5ul050162@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Lexi Winter Subject: git: 924c0c60d4ae - main - zlib: Move to a new zlib package List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ivy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 924c0c60d4aeaa474fb028118ca82d505166b4ab Auto-Submitted: auto-generated The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=924c0c60d4aeaa474fb028118ca82d505166b4ab commit 924c0c60d4aeaa474fb028118ca82d505166b4ab Author: Lexi Winter AuthorDate: 2025-10-28 18:15:44 +0000 Commit: Lexi Winter CommitDate: 2025-10-28 19:24:55 +0000 zlib: Move to a new zlib package zlib is a standalone third-party component, and deserves its own package rather than living in runtime. For example, this will make future security updates less invasive. This also means there's no dependency on runtime for ports that just require zlib, which is useful for service jails. MFC after: 3 days Reviewed by: bapt, emaste Sponsored by: https://www.patreon.com/bsdivy Differential Revision: https://reviews.freebsd.org/D53058 --- lib/libz/Makefile | 5 +---- release/packages/ucl/zlib-all.ucl | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 4 deletions(-) diff --git a/lib/libz/Makefile b/lib/libz/Makefile index 6a135158e134..03204e388674 100644 --- a/lib/libz/Makefile +++ b/lib/libz/Makefile @@ -1,7 +1,4 @@ -# -# - -PACKAGE= runtime +PACKAGE= zlib LIB= z SHLIBDIR?= /lib SHLIB_MAJOR= 6 diff --git a/release/packages/ucl/zlib-all.ucl b/release/packages/ucl/zlib-all.ucl new file mode 100644 index 000000000000..d7596c698e39 --- /dev/null +++ b/release/packages/ucl/zlib-all.ucl @@ -0,0 +1,32 @@ +/* + * SPDX-License-Identifier: ISC + * + * Copyright (c) 2025 Lexi Winter + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +comment = "DEFLATE (gzip) data compression library" + +desc = < To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 20a38e847251 - main - vmm: Fix routines which create maps of the guest physical address space List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 20a38e847251076b12c173d7aa0b37eef261fd32 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=20a38e847251076b12c173d7aa0b37eef261fd32 commit 20a38e847251076b12c173d7aa0b37eef261fd32 Author: Mark Johnston AuthorDate: 2025-10-28 20:15:13 +0000 Commit: Mark Johnston CommitDate: 2025-10-28 20:15:13 +0000 vmm: Fix routines which create maps of the guest physical address space In vm_mmap_memseg(), use vm_map_insert() instead of vm_map_find(). Existing callers expect to map the GPA that they passed, whereas vm_map_find() merely treats the GPA as a hint. Also check for overflow and remove a test for first < 0 since "first" is unsigned. In vmm_mmio_alloc(), return an error number instead of an object pointer, since the sole caller doesn't need the pointer. As in vm_mmap_memseg(), use vm_map_insert() instead of vm_map_find() and validate parameters. This function is not directly reachable via ioctl(), but we ought to be careful anyway. Reviewed by: corvink, kib MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D53246 --- sys/amd64/vmm/vmm.c | 7 +---- sys/amd64/vmm/vmm_mem.h | 5 ++-- sys/amd64/vmm/vmm_mem_machdep.c | 61 +++++++++++++++++++++++------------------ sys/dev/vmm/vmm_mem.c | 13 +++++---- 4 files changed, 46 insertions(+), 40 deletions(-) diff --git a/sys/amd64/vmm/vmm.c b/sys/amd64/vmm/vmm.c index 473887240b9b..f2bea0d82b5c 100644 --- a/sys/amd64/vmm/vmm.c +++ b/sys/amd64/vmm/vmm.c @@ -724,12 +724,7 @@ vm_name(struct vm *vm) int vm_map_mmio(struct vm *vm, vm_paddr_t gpa, size_t len, vm_paddr_t hpa) { - vm_object_t obj; - - if ((obj = vmm_mmio_alloc(vm_vmspace(vm), gpa, len, hpa)) == NULL) - return (ENOMEM); - else - return (0); + return (vmm_mmio_alloc(vm_vmspace(vm), gpa, len, hpa)); } int diff --git a/sys/amd64/vmm/vmm_mem.h b/sys/amd64/vmm/vmm_mem.h index 41b9bf07c4fc..d905fd37001d 100644 --- a/sys/amd64/vmm/vmm_mem.h +++ b/sys/amd64/vmm/vmm_mem.h @@ -30,10 +30,9 @@ #define _VMM_MEM_H_ struct vmspace; -struct vm_object; -struct vm_object *vmm_mmio_alloc(struct vmspace *, vm_paddr_t gpa, size_t len, - vm_paddr_t hpa); +int vmm_mmio_alloc(struct vmspace *, vm_paddr_t gpa, size_t len, + vm_paddr_t hpa); void vmm_mmio_free(struct vmspace *, vm_paddr_t gpa, size_t size); vm_paddr_t vmm_mem_maxaddr(void); diff --git a/sys/amd64/vmm/vmm_mem_machdep.c b/sys/amd64/vmm/vmm_mem_machdep.c index e96c9e4bdc66..afb3a0274e2a 100644 --- a/sys/amd64/vmm/vmm_mem_machdep.c +++ b/sys/amd64/vmm/vmm_mem_machdep.c @@ -36,6 +36,7 @@ #include #include #include +#include #include #include #include @@ -45,40 +46,48 @@ #include "vmm_mem.h" -vm_object_t +int vmm_mmio_alloc(struct vmspace *vmspace, vm_paddr_t gpa, size_t len, - vm_paddr_t hpa) + vm_paddr_t hpa) { - int error; - vm_object_t obj; struct sglist *sg; + vm_object_t obj; + int error; + + if (gpa + len < gpa || hpa + len < hpa || (gpa & PAGE_MASK) != 0 || + (hpa & PAGE_MASK) != 0 || (len & PAGE_MASK) != 0) + return (EINVAL); sg = sglist_alloc(1, M_WAITOK); error = sglist_append_phys(sg, hpa, len); KASSERT(error == 0, ("error %d appending physaddr to sglist", error)); obj = vm_pager_allocate(OBJT_SG, sg, len, VM_PROT_RW, 0, NULL); - if (obj != NULL) { - /* - * VT-x ignores the MTRR settings when figuring out the - * memory type for translations obtained through EPT. - * - * Therefore we explicitly force the pages provided by - * this object to be mapped as uncacheable. - */ - VM_OBJECT_WLOCK(obj); - error = vm_object_set_memattr(obj, VM_MEMATTR_UNCACHEABLE); - VM_OBJECT_WUNLOCK(obj); - if (error != KERN_SUCCESS) { - panic("vmm_mmio_alloc: vm_object_set_memattr error %d", - error); - } - error = vm_map_find(&vmspace->vm_map, obj, 0, &gpa, len, 0, - VMFS_NO_SPACE, VM_PROT_RW, VM_PROT_RW, 0); - if (error != KERN_SUCCESS) { - vm_object_deallocate(obj); - obj = NULL; - } + if (obj == NULL) + return (ENOMEM); + + /* + * VT-x ignores the MTRR settings when figuring out the memory type for + * translations obtained through EPT. + * + * Therefore we explicitly force the pages provided by this object to be + * mapped as uncacheable. + */ + VM_OBJECT_WLOCK(obj); + error = vm_object_set_memattr(obj, VM_MEMATTR_UNCACHEABLE); + VM_OBJECT_WUNLOCK(obj); + if (error != KERN_SUCCESS) + panic("vmm_mmio_alloc: vm_object_set_memattr error %d", error); + + vm_map_lock(&vmspace->vm_map); + error = vm_map_insert(&vmspace->vm_map, obj, 0, gpa, gpa + len, + VM_PROT_RW, VM_PROT_RW, 0); + vm_map_unlock(&vmspace->vm_map); + if (error != KERN_SUCCESS) { + error = vm_mmap_to_errno(error); + vm_object_deallocate(obj); + } else { + error = 0; } /* @@ -94,7 +103,7 @@ vmm_mmio_alloc(struct vmspace *vmspace, vm_paddr_t gpa, size_t len, */ sglist_free(sg); - return (obj); + return (error); } void diff --git a/sys/dev/vmm/vmm_mem.c b/sys/dev/vmm/vmm_mem.c index 9df31c9ba133..5ae944713c81 100644 --- a/sys/dev/vmm/vmm_mem.c +++ b/sys/dev/vmm/vmm_mem.c @@ -279,8 +279,10 @@ vm_mmap_memseg(struct vm *vm, vm_paddr_t gpa, int segid, vm_ooffset_t first, if (seg->object == NULL) return (EINVAL); + if (first + len < first || gpa + len < gpa) + return (EINVAL); last = first + len; - if (first < 0 || first >= last || last > seg->len) + if (first >= last || last > seg->len) return (EINVAL); if ((gpa | first | last) & PAGE_MASK) @@ -298,11 +300,12 @@ vm_mmap_memseg(struct vm *vm, vm_paddr_t gpa, int segid, vm_ooffset_t first, return (ENOSPC); vmmap = &mem->mem_vmspace->vm_map; - error = vm_map_find(vmmap, seg->object, first, &gpa, len, 0, - VMFS_NO_SPACE, prot, prot, 0); + vm_map_lock(vmmap); + error = vm_map_insert(vmmap, seg->object, first, gpa, gpa + len, + prot, prot, 0); + vm_map_unlock(vmmap); if (error != KERN_SUCCESS) - return (EFAULT); - + return (vm_mmap_to_errno(error)); vm_object_reference(seg->object); if (flags & VM_MEMMAP_F_WIRED) { From nobody Tue Oct 28 20:32:44 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cx2B50tkcz6DRB3; Tue, 28 Oct 2025 20:32: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cx2B504b4z3dYd; Tue, 28 Oct 2025 20:32:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761683565; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lwGpgPIra92yVky1fFKdlcOJd0Jne40GyX4M9AGxeqI=; b=gifrmUniIPgkxKWmluVCnAvXJeLizKQYKfcBdmPpAu3qznXqrT7d1ADwRkNAh5FNYyvYv+ YnCr/whWU+DFcK8wSpsAN2Tj3Ko/L814w47lLcB9nIexDyhVlHJyqVKYBHFuyiu5hgc2k0 wRygeS5bJTLpDjHhcmGrLv7NWwgKj6NViL6Hkc72+TTCKnMr68jgbIpiSzt9fe3CekKKOn cDXAk4cMWS17+Ok6pwmdN97CNeOGorqLV9LuQgwwt5N4VpwdPOxIIWp4OGWwXlF9Shgqjc 5v2scfo2EV9w5ZujO0jqjkfVRpUUtPdBkHkbY7BeEVSKDQAwlFYojT3HLkj/SQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761683565; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lwGpgPIra92yVky1fFKdlcOJd0Jne40GyX4M9AGxeqI=; b=bRGmmfCpu5eZU47uWQrCiJojUhNS8AKKFJsCmf/dXR/P8Z6oO2y9qit5k2yNxP5D2+eS9+ EepF7T7hYYqoPbu0RMcFTWdHNtYGs5e1eH8un9aHkzJ1o9O0rzeoqtdSG5iD/ntmFtMu+j qHf2p1CpCRusd+YwtgKWVNEs/zuq1NmDilrz6LozOioBcb0r+L2uBQdU7ZlsRSHDWqBVTo 8kb8FmXT+xQQWW26Dom9t2XwZd1K7371EPnFWiLi4lKERQjDJVDH3RNVvrpLVYdbvr5QkY ZfqDbCMDkvrGB+cuj/pylO0AxbGBQv++3D0LL0Y9QZdh6S4AXUmuRpCMHiL/AA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761683565; a=rsa-sha256; cv=none; b=dAit8PH0FQBm/QNRigpCIl4Fju+LA6egYlpXog/ElQg8M9WRJpT4Ql58DUVsqHMDJMr3CV 3fQhz9MumAn38FPjyOYJaSA0f+xf6YWgStf2bDJmSbLYPqxVMPp4A9k++LR7dxMPiTbxct zKLfatEY5ie2tKTpthAVPUHBEU4pHPb++2SWmKuUYn/l5kR6RlsLFdvKdnL74BOlmzSI2H fw6oFyb4Us40c14aqZKDPECzVJ+SbSTKf1dzgSuh9J7qj1KAJiJEv2ErO3Osh34P0b64L8 f0KTSK+AYZw3nYlP3ksga6IYa/3OYQcxUGYqj6BM50EhWpH5Tr6utD7r58nS9A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cx2B46dtXz14yM; Tue, 28 Oct 2025 20:32: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 59SKWiP8082234; Tue, 28 Oct 2025 20:32:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59SKWiDe082230; Tue, 28 Oct 2025 20:32:44 GMT (envelope-from git) Date: Tue, 28 Oct 2025 20:32:44 GMT Message-Id: <202510282032.59SKWiDe082230@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 38b81fbb9c37 - main - d.7: Order user-defined variable types by scope List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 38b81fbb9c375ef20c56e5d6f4099b88fcdba44c Auto-Submitted: auto-generated The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=38b81fbb9c375ef20c56e5d6f4099b88fcdba44c commit 38b81fbb9c375ef20c56e5d6f4099b88fcdba44c Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2025-10-28 19:13:18 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2025-10-28 20:32:26 +0000 d.7: Order user-defined variable types by scope MFC after: 3 days --- share/man/man7/d.7 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/man/man7/d.7 b/share/man/man7/d.7 index c098958ffa56..4b00d3d71c79 100644 --- a/share/man/man7/d.7 +++ b/share/man/man7/d.7 @@ -3,7 +3,7 @@ .\" .\" Copyright (c) 2025 Mateusz Piotrowski <0mp@FreeBSD.org> .\" -.Dd September 24, 2025 +.Dd October 28, 2025 .Dt D 7 .Os .Sh NAME @@ -56,9 +56,9 @@ depends on .Bl -column "thread-local" "Syntax" .It Sy Type Ta Sy Syntax .It global Ta Va variable_name +.It aggregate Ta Sy @ Ns Va variable_name .It thread-local Ta Sy self-> Ns Va variable_name .It clause-local Ta Sy this-> Ns Va variable_name -.It aggregate Ta Sy @ Ns Va variable_name .El .Pp .Em Tips : From nobody Tue Oct 28 21:18:34 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cx3Bz0qcKz6DVFv; Tue, 28 Oct 2025 21:18: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cx3Bz0BsCz3kZn; Tue, 28 Oct 2025 21:18:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761686315; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZQn2u04PpJ67kuHwe/5EBAyjH/qqmMI/GNiGEdCcfIY=; b=K5UsAEhPeDxsnHMM+6to3ZSWCrMMYkTF8R2TxtNzOS8hKtlwFBXyzkcEqyWmiNYgNs1msu RbieqWVv5CqZT13sjwWBimt2ajHy+h+dp17x/ynGRULQnIjdhnY2PnnQx4miA6b1xFVH5+ 4TfoQNhtIgU8T1JUXOWrnKjWyVMa6c5yveW/QW5jo7TMmw+479n8SdLsxkrBt8GlsfrMuU LX7QfZxN0QrDw/fvc56N0QT3GmCv784Fxtq66cdFBYTfF1Jm8wPDYb3Vqjb8o+wcwrXn3z FhODFHBqXp2s228Ny8p1+ngZy/ChntDf4ucfKKX8U47x9koiVoZdkmOIm5qZ8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761686315; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZQn2u04PpJ67kuHwe/5EBAyjH/qqmMI/GNiGEdCcfIY=; b=UPE0ZbtnOR5c4gWq98zjKK2pzgOZ1KRDHzwzTR3t3tlnv0EdCPygfBEM2P9+35ONK6CxJV Kc/VD+aGAwvjyA0DlFmEcnOAG1XUeEwM41rxyQfquK1YwSOA7dgbqHXyiqFlry4GmLhbQ/ vVo4maqCxL99SdRt8GTZ3WRTrC2er2W9Gw+3OJ61SB8rSIEEOANh7dyKHDnvu6SNbN7htg VNlQAlGn5OnLlGHH/H95LuxmFFZCxpUr++MMu92s6Fs6KlXLFtIfbTpdJg0UR6IeNgVR25 BCRgKlSpz04QZtycerLo8nvK/4GR7TmfPKJFxzNoeT17azoMQyhXXbxWJ577+g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761686315; a=rsa-sha256; cv=none; b=sVWrhnM0qxRae6xA+jmA/EV9fDhtaH95PkZkfuVGI69vhT9cdmLmfmNS2u0OJ7VzZLtMCb Brb9BDyy5/caz1md3JhZNfk6V26WEqXDb1dfZONtS9oexSzHzWPnNX1NI34E/Oa8TQ9e6C hIzw5VOZc49iqH8ytv5ktnVY9YTMb8D8yZf/yZrpnnqRZ+Xp+GtvrQX9m/tj8cOkCPTTTb KyOZWNzOIGJEpcwe76rN2JkYL+yBuIXlpcnRkM97yDq4+KGsV0nvsBGuIWNEPQ1ps/pokW jrsVgdMWmNsOXxKJd7vRZvaxkGbcEPdl74YRj2B19rVGBOx3a1PquO40aM2c6w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cx3By6qDBz16RR; Tue, 28 Oct 2025 21:18: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 59SLIYpZ059371; Tue, 28 Oct 2025 21:18:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59SLIYYr059368; Tue, 28 Oct 2025 21:18:34 GMT (envelope-from git) Date: Tue, 28 Oct 2025 21:18:34 GMT Message-Id: <202510282118.59SLIYYr059368@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: cb1315c15acf - main - getvfsbyname.3 mount.8: Reference lsvfs(1) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cb1315c15acf7d3fae66b2c5631e076776683f96 Auto-Submitted: auto-generated The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=cb1315c15acf7d3fae66b2c5631e076776683f96 commit cb1315c15acf7d3fae66b2c5631e076776683f96 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2025-10-28 18:10:25 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2025-10-28 21:17:00 +0000 getvfsbyname.3 mount.8: Reference lsvfs(1) MFC after: 3 days Reviewed by: ziaee Differential Revision: https://reviews.freebsd.org/D53411 --- lib/libc/gen/getvfsbyname.3 | 3 ++- sbin/mount/mount.8 | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/libc/gen/getvfsbyname.3 b/lib/libc/gen/getvfsbyname.3 index 23036429b27e..61fd48624fbd 100644 --- a/lib/libc/gen/getvfsbyname.3 +++ b/lib/libc/gen/getvfsbyname.3 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd August 16, 2018 +.Dd October 28, 2025 .Dt GETVFSBYNAME 3 .Os .Sh NAME @@ -102,6 +102,7 @@ argument specifies a file system that is unknown or not configured in the kernel. .El .Sh SEE ALSO +.Xr lsvfs 1 , .Xr jail 2 , .Xr mount 2 , .Xr sysctl 3 , diff --git a/sbin/mount/mount.8 b/sbin/mount/mount.8 index 7bfc21ea41d5..154ad293aee4 100644 --- a/sbin/mount/mount.8 +++ b/sbin/mount/mount.8 @@ -28,7 +28,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd July 16, 2025 +.Dd October 28, 2025 .Dt MOUNT 8 .Os .Sh NAME @@ -568,6 +568,7 @@ support for a particular file system might be provided either on a static .Xr kldload 8 ) . .Sh SEE ALSO .Xr getfacl 1 , +.Xr lsvfs 1 , .Xr setfacl 1 , .Xr nmount 2 , .Xr acl 3 , From nobody Tue Oct 28 21:34:23 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cx3YD037Vz6DWHq; Tue, 28 Oct 2025 21:34: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cx3YC6ThLz3nWB; Tue, 28 Oct 2025 21:34:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761687263; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aZiOixhi8PFJ6RkuYTLEGm3NmyQZSlIa91V2Y1fIlJw=; b=uZS3geXVxroZBTr9yp+ZM1yTO6iLdETis0OF44L+kqSw9pkkIWp2VpOihfOnlrj2HxX6Dh K0SmH88q9tqbGQvxFbhXs/kDlZnIeFoZzDZZUCxxCJhfnx0SgsS3Zn/x3CB44H/G8+mM1v +IYBFsPWpseZotzymOJ/4Vd6Wc7ttwMR8oHQvEfZ4CzW4reAnQnYUdvXrn+FrYmOzNkJch vlzSsfIELXt0V4XNLkugOldW6KZ0EuIOYp1Jh10GLPKPQ98L85Uiw/U3AlazCSsReUECVM p3V1CQvdQdLZ1+ZuvqwDtmeUXm8A0XciYOWCti4Mp15kjLAKCVXJ5Uni51kPiw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761687263; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aZiOixhi8PFJ6RkuYTLEGm3NmyQZSlIa91V2Y1fIlJw=; b=FSqFnKgeUJFGonVrtldcW+5QEC/jbn89E0QPBm1UWUwce7xg1Q/YD3ugmFCIBjds0+Fc1b 3Tz1Zd1gpFztF4vxtGPPslZ1VCpu75OznsxWJl6Hf+jdSNxO46Sc4+BNdGMgSZQ5zcbj74 JPwf5pFSdWvnuQFPMG2NvT7ylM5dBYPSBnA0LYL8YSFe7eeckNNW1veYWLv8Bx1L/j1mFY mn3x2WI0MowH6U0q697jySR1izsE0JMPJRkpUOT4z0EsOMqDEf0hMKsgx4sf/E/C8O5vDq ZPKpz1zfN1rV8hBDZSdV/scEruNpiUc3WYLObmzCu7zohVT+yQVQR2RvYEvQHA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761687263; a=rsa-sha256; cv=none; b=jvj99TuHXjFOs4gyS9XQVOJr1sdzp1k7PZ+KREqo81V5TzT0L+KgY2FJoTcKAs7wbObyjn RNb7igjZok3DukAVkp4W+gZ9VV9BHybrhU59Gwc5dPwG7FI6u8ufZvFsaDoDEINTJMEg2S HNV2eaU03LG1sLZ1SXtDYBUg4/Enb+jj9mTPQSb5ewy5XCjM4znA//P9h1cMK4fsxNeux4 A20mONd5DdfxPqjX3i8jPHs1gPWd1IteSg5894RT/e0oEAvf7mhnbjJvlrEw/2QNdcKiXR KE9d7+f7WodID6A7IPJF6MS0TB3Z2feCw3q2SA/4vpD7jBUAvf/8l7QcO+9yWQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cx3YC64Nxz16J1; Tue, 28 Oct 2025 21:34: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 59SLYNpS094919; Tue, 28 Oct 2025 21:34:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59SLYN4g094916; Tue, 28 Oct 2025 21:34:23 GMT (envelope-from git) Date: Tue, 28 Oct 2025 21:34:23 GMT Message-Id: <202510282134.59SLYN4g094916@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: 9d13c87afdb3 - main - nfs_clrpcops.c: NFSM_DISSECT() reply for each dir separately List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9d13c87afdb35c0014aa6f43c5652e946c18b756 Auto-Submitted: auto-generated The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=9d13c87afdb35c0014aa6f43c5652e946c18b756 commit 9d13c87afdb35c0014aa6f43c5652e946c18b756 Author: Rick Macklem AuthorDate: 2025-10-28 21:31:30 +0000 Commit: Rick Macklem CommitDate: 2025-10-28 21:31:30 +0000 nfs_clrpcops.c: NFSM_DISSECT() reply for each dir separately Without this patch, the entire reply for all directories in the NFSv4 mount path are parsed at once. This could cause problems for mount paths with many directories in the path. This patch fixes the problem by parsing each directory reply in a loop. Spotted while fixing other cases that could do large NFSM_DISSECT() sizes. MFC after: 3 days --- sys/fs/nfsclient/nfs_clrpcops.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/sys/fs/nfsclient/nfs_clrpcops.c b/sys/fs/nfsclient/nfs_clrpcops.c index 983eb8b9226f..b88169ba69d5 100644 --- a/sys/fs/nfsclient/nfs_clrpcops.c +++ b/sys/fs/nfsclient/nfs_clrpcops.c @@ -5284,7 +5284,7 @@ nfsrpc_getdirpath(struct nfsmount *nmp, u_char *dirpath, struct ucred *cred, struct nfsrv_descript nfsd; struct nfsrv_descript *nd = &nfsd; u_char *cp, *cp2, *fhp; - int error, cnt, len, setnil; + int error, cnt, i, len, setnil; u_int32_t *opcntp; nfscl_reqstart(nd, NFSPROC_PUTROOTFH, nmp, NULL, 0, &opcntp, NULL, 0, @@ -5325,8 +5325,12 @@ nfsrpc_getdirpath(struct nfsmount *nmp, u_char *dirpath, struct ucred *cred, if (error) return (error); if (nd->nd_repstat == 0) { - NFSM_DISSECT(tl, u_int32_t *, (3 + 2 * cnt) * NFSX_UNSIGNED); - tl += (2 + 2 * cnt); + NFSM_DISSECT(tl, uint32_t *, 3 * NFSX_UNSIGNED); + tl += 2; + for (i = 0; i < cnt; i++) { + NFSM_DISSECT(tl, uint32_t *, 2 * NFSX_UNSIGNED); + tl++; + } if ((len = fxdr_unsigned(int, *tl)) <= 0 || len > NFSX_FHMAX) { nd->nd_repstat = NFSERR_BADXDR; From nobody Tue Oct 28 22:36:13 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cx4wY3sJxz6DbfN; Tue, 28 Oct 2025 22:36: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cx4wY3N2cz3v1m; Tue, 28 Oct 2025 22:36:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761690973; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=P1biY23yGJQHOyCrmpOG5D7dJI+LdIolbNpyd4ejWNw=; b=cyW1lrdzu2UdTPMr3/gjeuLGiDgE/NYmb/pTpY2aDtPwAI40vC46D2+RgHBGRJybMIzPh6 m2mxSGHnBEb61iSBkB/TOxrNhHvrqpM0sFjnBm5tXWkZbZGVc85j0wJuE0muUeEaThSqQ0 mwk15E6JqKhqXCAxVMsXQntuF3HkFbJr4aINymdIpaJyJWF21/zCReMhxf8XsAKAKVl+ZX O/wDP+I2K1Vl0JXanDBjd7cGOmdoXEMf+KV+sQWIbE5EsJO9YYPH5QnozK2ViLNoxytMN8 lICqRqFtC39qhpRZ9c5my6YaFUu2RH92WRTkJFhZ4n9WIkzKO6vV6Byx3h6WdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761690973; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=P1biY23yGJQHOyCrmpOG5D7dJI+LdIolbNpyd4ejWNw=; b=dYtQeCEuWnk955mBEae/v6Hak7fzPySAy8mI9AFsQjCETZgSxXlL5x39/HO/mKNSIEbTIq aFojNqJiz3NZyDqNNd9JAR8SVWmxCkn49HWl0sDXjyaohPQNxAhrlaW/zzkQSWb9XmasgD 5/z53+F/i8CybVE5CnZjxCSlU6Jwbm+KQySx6czGSjwHYHBr9mT89dbrV1Yqi4ds3x58au EWZDaT6s3MB71s8kNuJatlfXfa3/qYulz3fAFtS5MiSWop2LGA7PoHMTRj+UpbG7aNgUkj k1AnnMkTNgVHJsGiv5I1uspH1e03B+SEjqvZjCxmhGAqwGMh9uBwmAmog4hWOw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761690973; a=rsa-sha256; cv=none; b=J8z7VWMhc6L2gKax8Kias9oHyXI54fD4yBlvqt2xyKB3OZtrX1AzadUmmGErMyCL+4Vvf6 MLPqC5zZwFCeWNZMJaesocAudbTNyrYL/4WKlyPHU1YKCw4A6fyGJfZmjv0Pi+qXkZuubd 59nrH2C6iOgdt/QzBUP/wrUsmngAFp3DSardWK2LLFORk8bM/MtQ87Q2iUt4HmcnLc9UsL 7l9Ras1lyDn8mRERCjUmr4TWJpWkE2mDOPP+4ykcS9i0ETklnjoThXNh9nXa+7UGytzJ8W zIlBfQ/G6crgVCGSwh3HwQFYX3GninCQJ/rhwB31+TFwcaA/x5UfIZWv8PqGOA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cx4wY2yS4z18FV; Tue, 28 Oct 2025 22:36: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 59SMaDU3008540; Tue, 28 Oct 2025 22:36:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59SMaDqM008537; Tue, 28 Oct 2025 22:36:13 GMT (envelope-from git) Date: Tue, 28 Oct 2025 22:36:13 GMT Message-Id: <202510282236.59SMaDqM008537@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 83519c1764f8 - main - bus: Take the topolock in driver_module_handler() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 83519c1764f80ddbdf34e16de08ff110226aba2b Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=83519c1764f80ddbdf34e16de08ff110226aba2b commit 83519c1764f80ddbdf34e16de08ff110226aba2b Author: Warner Losh AuthorDate: 2025-10-28 19:48:07 +0000 Commit: Warner Losh CommitDate: 2025-10-28 22:35:32 +0000 bus: Take the topolock in driver_module_handler() And sprinkler some asserts. Right now all module handlers are called with Giant, but I'd like to drop that so push the newbus locking one step further. Sponsored by: Netflix --- sys/kern/subr_bus.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/sys/kern/subr_bus.c b/sys/kern/subr_bus.c index bf5bda7e058d..d57886bca5e4 100644 --- a/sys/kern/subr_bus.c +++ b/sys/kern/subr_bus.c @@ -572,6 +572,8 @@ devclass_find_internal(const char *classname, const char *parentname, { devclass_t dc; + bus_topo_assert(); + PDEBUG(("looking for %s", classname)); if (!classname) return (NULL); @@ -712,6 +714,8 @@ devclass_add_driver(devclass_t dc, driver_t *driver, int pass, devclass_t *dcp) devclass_t child_dc; const char *parentname; + bus_topo_assert(); + PDEBUG(("%s", DRIVERNAME(driver))); /* Don't allow invalid pass values. */ @@ -784,6 +788,8 @@ devclass_driver_deleted(devclass_t busclass, devclass_t dc, driver_t *driver) device_t dev; int error, i; + bus_topo_assert(); + /* * Disassociate from any devices. We iterate through all the * devices in the devclass of the driver and detach any which are @@ -856,6 +862,8 @@ devclass_delete_driver(devclass_t busclass, driver_t *driver) driverlink_t dl; int error; + bus_topo_assert(); + PDEBUG(("%s from devclass %s", driver->name, DEVCLANAME(busclass))); if (!dc) @@ -913,6 +921,8 @@ devclass_quiesce_driver(devclass_t busclass, driver_t *driver) int i; int error; + bus_topo_assert(); + PDEBUG(("%s from devclass %s", driver->name, DEVCLANAME(busclass))); if (!dc) @@ -964,6 +974,8 @@ devclass_find_driver_internal(devclass_t dc, const char *classname) { driverlink_t dl; + bus_topo_assert(); + PDEBUG(("%s in devclass %s", classname, DEVCLANAME(dc))); TAILQ_FOREACH(dl, &dc->drivers, link) { @@ -5255,6 +5267,8 @@ driver_module_handler(module_t mod, int what, void *arg) kobj_class_t driver; int error, pass; + bus_topo_lock(); + dmd = (struct driver_module_data *)arg; bus_devclass = devclass_find_internal(dmd->dmd_busname, NULL, TRUE); error = 0; @@ -5297,6 +5311,8 @@ driver_module_handler(module_t mod, int what, void *arg) break; } + bus_topo_unlock(); + return (error); } From nobody Tue Oct 28 22:36:14 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cx4wZ5mzPz6Dbd5; Tue, 28 Oct 2025 22:36: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cx4wZ4D89z3v9w; Tue, 28 Oct 2025 22:36:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761690974; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iHwLheLWLuobCAws3gSjkVaeVYZTh5VNemG8JlFnM2I=; b=m5mQ1hUUh1iqj2bST2LLJGB+3Aum2NHzrvYmKU+9oVvqEsHdcFgCjyU9oMfvCeLHZrlg9I vQ7CuHWJFO5z/ot0lnF7GGajfRq2zyZitICixJEf6UjUPfnB2eczzaBsQMHh8vxucHHczI kEOw9uzzPxJ5FEaSfY8bYXm8TerVxcxcplgi6tMM6ofJsfAqWQU+FZIjvVOypwKgc55rtg 2Yp4fLkXyRNPYih7JKWSyKzazBoELeWnW3jbNuzBe/GGsMkMzmgl0ugqolie/HaAhGe31E Mg/fXd9qIOG8PopzaSjrlW3h8DIOeN2rKELhEgfYXsr7QuHWa5zok9uHLuy0Tg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761690974; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iHwLheLWLuobCAws3gSjkVaeVYZTh5VNemG8JlFnM2I=; b=ttcUL/ar3Vyz81yY5sic5cB4GCyBwthUPYtkxzjw7rQT8Hwj7jPtJPCT++n1fi2PKQYaTW 5WijRg2uijmM6vH32aNG1dJK2oBjQuFSoroCk/vyo1HQ7mau+5S14P+Z98Vzw6OxmJ0qIe 0BQ8SlMyIa60H/Y6gdjBXyOdZMUMWOW1/Lq2msS47YK+CAKpCxh+mRC4MUP5SawcLD53/S QKyPyHKLnshZ1RQBahaSJ8mB7cXz0ohhru5uM9QpCPR4dqJwa/Tys7agHra2wDsim7YW1E XSlAalKtb8lQJr5Y/gSd4z+Oy0lXD0SD19r3wmk/R51w2PDT98VTXYFz9xx1Kg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761690974; a=rsa-sha256; cv=none; b=v8c5p2Mhyf9u2CUS/eFST3zxaBCDMRKhbdU6ACIeACm/A8Em6Q0fIuNO+S5P37rruEAzB/ JG0wxwCLyhyhEHwMl/cJ9SAFMZxGrYuwfvvEUFkzMVXx70oU8VWJNS9GPfzGsBJlkl0GwO 6ML4F/FfzqVRV3OQzA+WG4IH2O4lhIX5x7AG4GzPVq/GDvgotrhB+C0J0jVltlFwKZ7RVc sTKxzv0r4euYlImaZRZGWAyTTzZv0nzJln1Rz7JMkE6ePOz6gwCD8m0Fjrk0W8cLhnJvVz ECD6AGyqQiNCKJvMHIx/dM1yxtRyFtEjoejQMBZyt7WM5O0r2KcwkNWxxgrB9w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cx4wZ3XsZz17pm; Tue, 28 Oct 2025 22:36: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 59SMaEMW008576; Tue, 28 Oct 2025 22:36:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59SMaE3S008573; Tue, 28 Oct 2025 22:36:14 GMT (envelope-from git) Date: Tue, 28 Oct 2025 22:36:14 GMT Message-Id: <202510282236.59SMaE3S008573@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 471743e1315c - main - nvme: Remove a todo comment List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 471743e1315cdc54d85e3e77b53e3841b3647ea1 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=471743e1315cdc54d85e3e77b53e3841b3647ea1 commit 471743e1315cdc54d85e3e77b53e3841b3647ea1 Author: Warner Losh AuthorDate: 2025-10-28 22:33:36 +0000 Commit: Warner Losh CommitDate: 2025-10-28 22:35:33 +0000 nvme: Remove a todo comment The storage subsystem really wants one of a very small number of I/O errors. And since we started to do this I/O, EIO is the right error to return. Other errors may get different and weirder treatment up the stack, or even converted to just EIO. So remove this TODO comment that's been there since the initial nvme driver commit. It wouldn't be helpful to do this, and could likely hurt. Sponsored by: Netflix --- sys/dev/nvme/nvme_ns.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/sys/dev/nvme/nvme_ns.c b/sys/dev/nvme/nvme_ns.c index a759181a8c16..f4a588373c98 100644 --- a/sys/dev/nvme/nvme_ns.c +++ b/sys/dev/nvme/nvme_ns.c @@ -142,10 +142,6 @@ nvme_ns_strategy_done(void *arg, const struct nvme_completion *cpl) { struct bio *bp = arg; - /* - * TODO: add more extensive translation of NVMe status codes - * to different bio error codes (i.e. EIO, EINVAL, etc.) - */ if (nvme_completion_is_error(cpl)) { bp->bio_error = EIO; bp->bio_flags |= BIO_ERROR; From nobody Tue Oct 28 22:38:52 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cx4zc2PGgz6Dc2m; Tue, 28 Oct 2025 22:38: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cx4zc1WSWz3vmr; Tue, 28 Oct 2025 22:38:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761691132; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LrFjSBOk6cW0hrDLMS1SrBJ5HE18sna4Yp4eghFDrik=; b=vfA8HSfHPU5P9kWDIGGSyxdkJ2VC6MME0HBP9+TMqWEr7i3CpYtDD/3t7ILjvbcHcrqee/ Fok2vQu92ZYrJ+ooUfayD4T49AEwvsxY2MrQ61o+9zcMDzaoma1gflVZzE3hzRvWZtLpBp 07FMLDffwOWgyjTDb7pU7LKWwOY0n+svmOsnUPpxxz9j31FCkGn0l9SrrqWqa6IotL4pf/ KiiVGiXA9o5ran85J1deHtrai/5ioj96G/wTsv6B1Gh/0TA9Xwy4TXukWbHVUxLX/n1WCP zdu8c+lRoMJM2eMT2GtQ3fhI3QswHnh8p73g4/zW+D/QuegEFm5KSbVVVfG6Ig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761691132; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LrFjSBOk6cW0hrDLMS1SrBJ5HE18sna4Yp4eghFDrik=; b=eG3qIjXeYvk9Sn6wwDhRaqqJciiVJ59xSk3a9fG7yQiQC9yyIvuZ1C0lxlczSegQjwVMi8 U+Od4gTHXO6tjp3uAIJGAegTp+5/pzDilhV0zq24bQWx2t4xFD7D256xYkK4VFctvaGxWf blqT76QH9gK2+O7Oa2orRBZs9oAXBCSGy3kKOi+q6M3qTz4dh67dY1WnqLoBtoaHLm3jxO ys8/Ki+hhF+roAe7k7B2zJtsUV9BeRE10/B8Hq4C3kLncx3QlkTh/g8t2VWZ6NFPSZZIGP WP/k9qgZf02T6bhE4n2UriLBJzHaDSkd/kCI+HF0ctIx09cjdM/QNH2aSnsmyg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761691132; a=rsa-sha256; cv=none; b=bdiWnnqpGsKbZ7+o18XrSM7ghsZh8Ih3ulfmbw4T+KQgnQSMDxMXN8JIrpp910HLKIMIEa TKCjfiiiuMnKKMqPk8rceCy1p4q3tzawuU0rb+s/g3fVJLBC5T4+SF8mk66FGkxFGKr/6R kJpXAx1IvMc6QcgUl/T0Ys3SXpVhWglq+HSUJpAMr1u+5jGtVuoL2Y7wfCHIhPsmo4511l W0NlAPy1p19yY7QBehXJB62JxG0Fwdm5uVbusqw5P7mR4w3QZj9TEtDlun7OHgGi924PMh mnp11p/Hd+fS8a4DJ++LW0zk+8M6IWyL1XK4aB1YV7gLIlcLzHF7FGZaVuVLjA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cx4zc174qz18R7; Tue, 28 Oct 2025 22:38: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 59SMcqve009433; Tue, 28 Oct 2025 22:38:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59SMcqUU009430; Tue, 28 Oct 2025 22:38:52 GMT (envelope-from git) Date: Tue, 28 Oct 2025 22:38:52 GMT Message-Id: <202510282238.59SMcqUU009430@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 86b259a28a1a - main - bus: Revert "bus: Take the topolock in driver_module_handler()" List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 86b259a28a1a47b0506c519b17d8adb67d4a0b0d Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=86b259a28a1a47b0506c519b17d8adb67d4a0b0d commit 86b259a28a1a47b0506c519b17d8adb67d4a0b0d Author: Warner Losh AuthorDate: 2025-10-28 22:37:14 +0000 Commit: Warner Losh CommitDate: 2025-10-28 22:37:14 +0000 bus: Revert "bus: Take the topolock in driver_module_handler()" This reverts commit 83519c1764f80ddbdf34e16de08ff110226aba2b. This was accidentally in my main branch when I poushed. It's not ready yet. Sponsored by: Netflix --- sys/kern/subr_bus.c | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/sys/kern/subr_bus.c b/sys/kern/subr_bus.c index d57886bca5e4..bf5bda7e058d 100644 --- a/sys/kern/subr_bus.c +++ b/sys/kern/subr_bus.c @@ -572,8 +572,6 @@ devclass_find_internal(const char *classname, const char *parentname, { devclass_t dc; - bus_topo_assert(); - PDEBUG(("looking for %s", classname)); if (!classname) return (NULL); @@ -714,8 +712,6 @@ devclass_add_driver(devclass_t dc, driver_t *driver, int pass, devclass_t *dcp) devclass_t child_dc; const char *parentname; - bus_topo_assert(); - PDEBUG(("%s", DRIVERNAME(driver))); /* Don't allow invalid pass values. */ @@ -788,8 +784,6 @@ devclass_driver_deleted(devclass_t busclass, devclass_t dc, driver_t *driver) device_t dev; int error, i; - bus_topo_assert(); - /* * Disassociate from any devices. We iterate through all the * devices in the devclass of the driver and detach any which are @@ -862,8 +856,6 @@ devclass_delete_driver(devclass_t busclass, driver_t *driver) driverlink_t dl; int error; - bus_topo_assert(); - PDEBUG(("%s from devclass %s", driver->name, DEVCLANAME(busclass))); if (!dc) @@ -921,8 +913,6 @@ devclass_quiesce_driver(devclass_t busclass, driver_t *driver) int i; int error; - bus_topo_assert(); - PDEBUG(("%s from devclass %s", driver->name, DEVCLANAME(busclass))); if (!dc) @@ -974,8 +964,6 @@ devclass_find_driver_internal(devclass_t dc, const char *classname) { driverlink_t dl; - bus_topo_assert(); - PDEBUG(("%s in devclass %s", classname, DEVCLANAME(dc))); TAILQ_FOREACH(dl, &dc->drivers, link) { @@ -5267,8 +5255,6 @@ driver_module_handler(module_t mod, int what, void *arg) kobj_class_t driver; int error, pass; - bus_topo_lock(); - dmd = (struct driver_module_data *)arg; bus_devclass = devclass_find_internal(dmd->dmd_busname, NULL, TRUE); error = 0; @@ -5311,8 +5297,6 @@ driver_module_handler(module_t mod, int what, void *arg) break; } - bus_topo_unlock(); - return (error); } From nobody Tue Oct 28 23:46:23 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cx6TX0XGfz6DhDV; Tue, 28 Oct 2025 23:46: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cx6TW6zRgz42Xy; Tue, 28 Oct 2025 23:46:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761695183; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Z8UEw7fKr6kzKRTfZeWiZPxMuK13bhEdH3IU8clS7XE=; b=D/kS9TnrDmKXPpcujRKa1LmWR0Gdcwm4Tc5/0vIxONLLI4xWaxuV1ON4zyS+wtLxcUGukP Sir0UCyEqJIjs76YGcqMr+KQNoxz0CEkuLTpDafGd69YMVlNcj2NUXmyho7B/n71D4f2hJ zBtESjmp8NjZ04XKTynrM6GRTott8QnmTu049Hz95x2wBC3bJzBRl02iLhICVhJVcmQ6xh DjZR5rLZRi1iZWzXrzN6LVpXOa4D8ZWM3xmpitv5wvyKNpFinNoF1bvoOMn+XuD8YXn0D/ QTZdng7GJ4k9KIHjPfD3g8iIwwTYjeG9HrgLEpkLafx6CUo+2FG7WKuwCGoEUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761695183; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Z8UEw7fKr6kzKRTfZeWiZPxMuK13bhEdH3IU8clS7XE=; b=wKVnCb2TDnUrSVwvOIv2D84FfuyKeva0XDSfqwfNuVwtqx3QpWl8i3JY7oXVNGLFSfNGLV RKBFhEbZroM6ugmA/g9FdUYejLArvLRLYQyf8iH2E0guGAE2Fkrg2O4yPyPwbtMvCk3jqP 9eykNJVgxXum0VUOnKFPuLVUTXq11jFfBxswp3kCjwKwsbhUclAu6n5qXb31dfCnycOPfu RGqc+QlnC1oQ66A1VT1SB2s3OnXYzjTvaHt8gwjoafjclEmNwiQ8zv9wEdOQr+gqEYRICx CGks/jc5VdO63UPEdpAQ/jhQgbItkJOrlXx9QKJzI+Ttx6aS1ZBi/bUmoB8LRQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761695183; a=rsa-sha256; cv=none; b=G4RfFFoyXrJRNYoM0CxWCuYJkVCLKhysvmoHf0tvJ619R5CYyINdU2V9dJUsACzbwp+Z2T mZ0XwgVKBqBWK8EnELwzt+aS2uG/WUTm1ROuEXxnXWEEIhrDrRLn4zdSPmZQ4WpgKLY8H/ a4qhSbx2vX28irMo/Tx95MlG/xcQKfGMmU7Fh+epMycA4Ie7wCDR8itQH1QJZHZopugFfw ThClHh5+P8TQSEccKsBU0HE3pXrPmcGbUq/4EzbK/LrJb4XKvBv9UCst5E47CVfp7J7LmD i1A71Q7KiphNYVZxtyvIrqDbIUZGWiZ9JbSQUaJNKhj3nyufE0XqUKpLdqYiyQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cx6TW6HRxz1BFn; Tue, 28 Oct 2025 23:46: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 59SNkNJh039998; Tue, 28 Oct 2025 23:46:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59SNkNN2039995; Tue, 28 Oct 2025 23:46:23 GMT (envelope-from git) Date: Tue, 28 Oct 2025 23:46:23 GMT Message-Id: <202510282346.59SNkNN2039995@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "David E. O'Brien" Subject: git: 685a78570b35 - main - random: remove hifn(4) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: obrien X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 685a78570b359eb2bd4d8c28dde22de54d55b8ec Auto-Submitted: auto-generated The branch main has been updated by obrien: URL: https://cgit.FreeBSD.org/src/commit/?id=685a78570b359eb2bd4d8c28dde22de54d55b8ec commit 685a78570b359eb2bd4d8c28dde22de54d55b8ec Author: David E. O'Brien AuthorDate: 2025-10-18 03:15:50 +0000 Commit: David E. O'Brien CommitDate: 2025-10-28 23:46:15 +0000 random: remove hifn(4) The Hifn 7955 & 7956 only supports deprecated & NIST disallowed algorithms (NIST SP800-224idp): SHA1 and SHA1-HMAC. Furthermore the entropy RNG of the Hifn 7751, 7951, 7811, 7955, and 7956 has no NIST Entropy Source Validation (ESV) certificate and cannot be used in a FIPS-140-3 nor Common Criteara environment. Furthermore the most prolific instance for FreeBSD was the Soekris Engineering vpn1201, vpn1211, vpn1401, and vpn1411 offerings. These are all 32-bit only processors. The i386 kernel was de-supported in 15.0. Reviewed by: jhb Differential Revision: https://reviews.freebsd.org/D53182 --- ObsoleteFiles.inc | 3 + share/man/man4/hifn.4 | 132 -- share/man/man4/rndtest.4 | 1 - sys/conf/NOTES | 4 - sys/conf/files | 1 - sys/conf/options | 4 - sys/dev/hifn/hifn7751.c | 2739 ------------------------------ sys/dev/hifn/hifn7751reg.h | 542 ------ sys/dev/hifn/hifn7751var.h | 346 ---- sys/dev/random/fenestrasX/fx_pool.c | 3 - sys/dev/random/random_harvestq.c | 1 - sys/modules/Makefile | 1 - sys/modules/hifn/Makefile | 12 - sys/sys/random.h | 1 - tools/kerneldoc/subsys/Doxyfile-dev_hifn | 19 - tools/tools/crypto/Makefile | 3 +- tools/tools/crypto/hifnstats.c | 63 - 17 files changed, 4 insertions(+), 3871 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 3645cff43458..e415c2c5f9fe 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -51,6 +51,9 @@ # xargs -n1 | sort | uniq -d; # done +# 20251028: Remove hifn(4) +OLD_FILES+=share/man/man4/hifn.4 + # 20251006: Remove libnss_tacplus.a (it never should have been installed) OLD_FILES+=usr/lib/libnss_tacplus.a diff --git a/share/man/man4/hifn.4 b/share/man/man4/hifn.4 deleted file mode 100644 index 22494fcb6c6d..000000000000 --- a/share/man/man4/hifn.4 +++ /dev/null @@ -1,132 +0,0 @@ -.\" $OpenBSD: hifn.4,v 1.32 2002/09/26 07:55:40 miod Exp $ -.\" -.\" Copyright (c) 2000 Theo de Raadt -.\" All rights reserved. -.\" -.\" Redistribution and use in source and binary forms, with or without -.\" modification, are permitted provided that the following conditions -.\" are met: -.\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. -.\" 2. Redistributions in binary form must reproduce the above copyright -.\" notice, this list of conditions and the following disclaimer in the -.\" documentation and/or other materials provided with the distribution. -.\" -.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -.\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -.\" WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -.\" DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, -.\" INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -.\" (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -.\" SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -.\" STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN -.\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -.\" POSSIBILITY OF SUCH DAMAGE. -.\" -.Dd July 29, 2020 -.Dt HIFN 4 -.Os -.Sh NAME -.Nm hifn -.Nd Hifn 7751/7951/7811/7955/7956 crypto accelerator -.Sh SYNOPSIS -To compile this driver into the kernel, -place the following lines in your -kernel configuration file: -.Bd -ragged -offset indent -.Cd "device crypto" -.Cd "device cryptodev" -.Cd "device hifn" -.Ed -.Pp -Alternatively, to load the driver as a -module at boot time, place the following line in -.Xr loader.conf 5 : -.Bd -literal -offset indent -hifn_load="YES" -.Ed -.Sh DESCRIPTION -The -.Nm -driver supports various cards containing the Hifn 7751, 7951, -7811, 7955, and 7956 chipsets. -.Pp -The -.Nm -driver registers itself to accelerate -AES (7955 and 7956 only), -SHA1, and SHA1-HMAC operations for -.Xr ipsec 4 -and -.Xr crypto 4 . -.Pp -The Hifn -.Tn 7951 , -.Tn 7811 , -.Tn 7955 , -and -.Tn 7956 -will also supply data to the kernel -.Xr random 4 -subsystem. -.Sh HARDWARE -The -.Nm -driver supports various cards containing the Hifn 7751, 7951, -7811, 7955, and 7956 -chipsets, such as: -.Bl -tag -width namenamenamena -offset indent -.It Invertex AEON -No longer being made. -Came as 128KB SRAM model, or 2MB DRAM model. -.It Hifn 7751 -Reference board with 512KB SRAM. -.It PowerCrypt -Comes with 512KB SRAM. -.It XL-Crypt -Only board based on 7811 (which is faster than 7751 and has -a random number generator). -.It NetSec 7751 -Supports the most IPsec sessions, with 1MB SRAM. -.It Soekris Engineering vpn1201 and vpn1211 -See -.Pa http://www.soekris.com/ . -Contains a 7951 and supports symmetric and random number operations. -.It Soekris Engineering vpn1401 and vpn1411 -See -.Pa http://www.soekris.com/ . -Contains a 7955 and supports symmetric and random number operations. -.El -.Sh SEE ALSO -.Xr crypto 4 , -.Xr intro 4 , -.Xr ipsec 4 , -.Xr random 4 , -.Xr crypto 7 , -.Xr crypto 9 -.Sh HISTORY -The -.Nm -device driver appeared in -.Ox 2.7 . -The -.Nm -device driver was imported to -.Fx 5.0 . -.Sh CAVEATS -The Hifn 9751 shares the same PCI ID. -This chip is basically a 7751, but with the cryptographic functions missing. -Instead, the 9751 is only capable of doing compression. -Since we do not currently attempt to use any of these chips to do -compression, the 9751-based cards are not useful. -.Pp -Support for the 7955 and 7956 is incomplete; the asymmetric crypto -facilities are to be added and the performance is suboptimal. -.Sh BUGS -The 7751 chip starts out at initialization by only supporting compression. -A proprietary algorithm, which has been reverse engineered, is required to -unlock the cryptographic functionality of the chip. -It is possible for vendors to make boards which have a lock ID not known -to the driver, but all vendors currently just use the obvious ID which is -13 bytes of 0. diff --git a/share/man/man4/rndtest.4 b/share/man/man4/rndtest.4 index 9ed16caf3b87..c73302063cd3 100644 --- a/share/man/man4/rndtest.4 +++ b/share/man/man4/rndtest.4 @@ -49,7 +49,6 @@ is received from the device. Failures are optionally reported on the console. .Sh SEE ALSO .Xr crypto 4 , -.Xr hifn 4 , .Xr random 4 , .Xr safe 4 , .Xr crypto 9 diff --git a/sys/conf/NOTES b/sys/conf/NOTES index 9944375c3615..df71aa60099d 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -2655,10 +2655,6 @@ device rndtest # FIPS 140-2 entropy tester device ccr # Chelsio T6 -device hifn # Hifn 7951, 7781, etc. -options HIFN_DEBUG # enable debugging support: hw.hifn.debug -options HIFN_RNDTEST # enable rndtest support - device safe # SafeNet 1141 options SAFE_DEBUG # enable debugging support: hw.safe.debug options SAFE_RNDTEST # enable rndtest support diff --git a/sys/conf/files b/sys/conf/files index 0a24b5e1e39b..87c8830b192e 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -1782,7 +1782,6 @@ dev/hid/ietp.c optional ietp dev/hid/ps4dshock.c optional ps4dshock dev/hid/u2f.c optional u2f dev/hid/xb360gp.c optional xb360gp -dev/hifn/hifn7751.c optional hifn dev/hptiop/hptiop.c optional hptiop scbus dev/hwpmc/hwpmc_logging.c optional hwpmc dev/hwpmc/hwpmc_mod.c optional hwpmc diff --git a/sys/conf/options b/sys/conf/options index 0b795a8d28fb..b00b381d1da1 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -736,10 +736,6 @@ BCE_NVRAM_WRITE_SUPPORT opt_bce.h SOCKBUF_DEBUG opt_global.h -# options for hifn driver -HIFN_DEBUG opt_hifn.h -HIFN_RNDTEST opt_hifn.h - # options for safenet driver SAFE_DEBUG opt_safe.h SAFE_NO_RNG opt_safe.h diff --git a/sys/dev/hifn/hifn7751.c b/sys/dev/hifn/hifn7751.c deleted file mode 100644 index 2e7545779b09..000000000000 --- a/sys/dev/hifn/hifn7751.c +++ /dev/null @@ -1,2739 +0,0 @@ -/* $OpenBSD: hifn7751.c,v 1.120 2002/05/17 00:33:34 deraadt Exp $ */ - -/*- - * SPDX-License-Identifier: BSD-3-Clause - * - * Invertex AEON / Hifn 7751 driver - * Copyright (c) 1999 Invertex Inc. All rights reserved. - * Copyright (c) 1999 Theo de Raadt - * Copyright (c) 2000-2001 Network Security Technologies, Inc. - * http://www.netsec.net - * Copyright (c) 2003 Hifn Inc. - * - * This driver is based on a previous driver by Invertex, for which they - * requested: Please send any comments, feedback, bug-fixes, or feature - * requests to software@invertex.com. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * Effort sponsored in part by the Defense Advanced Research Projects - * Agency (DARPA) and Air Force Research Laboratory, Air Force - * Materiel Command, USAF, under agreement number F30602-01-2-0537. - */ - -#include -/* - * Driver for various Hifn encryption processors. - */ -#include "opt_hifn.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include - -#include -#include -#include -#include - -#include -#include -#include -#include - -#include "cryptodev_if.h" - -#include -#include - -#ifdef HIFN_RNDTEST -#include -#endif -#include -#include - -#ifdef HIFN_VULCANDEV -#include -#include - -static struct cdevsw vulcanpk_cdevsw; /* forward declaration */ -#endif - -/* - * Prototypes and count for the pci_device structure - */ -static int hifn_probe(device_t); -static int hifn_attach(device_t); -static int hifn_detach(device_t); -static int hifn_suspend(device_t); -static int hifn_resume(device_t); -static int hifn_shutdown(device_t); - -static int hifn_probesession(device_t, const struct crypto_session_params *); -static int hifn_newsession(device_t, crypto_session_t, - const struct crypto_session_params *); -static int hifn_process(device_t, struct cryptop *, int); - -static device_method_t hifn_methods[] = { - /* Device interface */ - DEVMETHOD(device_probe, hifn_probe), - DEVMETHOD(device_attach, hifn_attach), - DEVMETHOD(device_detach, hifn_detach), - DEVMETHOD(device_suspend, hifn_suspend), - DEVMETHOD(device_resume, hifn_resume), - DEVMETHOD(device_shutdown, hifn_shutdown), - - /* crypto device methods */ - DEVMETHOD(cryptodev_probesession, hifn_probesession), - DEVMETHOD(cryptodev_newsession, hifn_newsession), - DEVMETHOD(cryptodev_process, hifn_process), - - DEVMETHOD_END -}; - -static driver_t hifn_driver = { - "hifn", - hifn_methods, - sizeof (struct hifn_softc) -}; - -DRIVER_MODULE(hifn, pci, hifn_driver, 0, 0); -MODULE_DEPEND(hifn, crypto, 1, 1, 1); -#ifdef HIFN_RNDTEST -MODULE_DEPEND(hifn, rndtest, 1, 1, 1); -#endif - -static void hifn_reset_board(struct hifn_softc *, int); -static void hifn_reset_puc(struct hifn_softc *); -static void hifn_puc_wait(struct hifn_softc *); -static int hifn_enable_crypto(struct hifn_softc *); -static void hifn_set_retry(struct hifn_softc *sc); -static void hifn_init_dma(struct hifn_softc *); -static void hifn_init_pci_registers(struct hifn_softc *); -static int hifn_sramsize(struct hifn_softc *); -static int hifn_dramsize(struct hifn_softc *); -static int hifn_ramtype(struct hifn_softc *); -static void hifn_sessions(struct hifn_softc *); -static void hifn_intr(void *); -static u_int hifn_write_command(struct hifn_command *, u_int8_t *); -static u_int32_t hifn_next_signature(u_int32_t a, u_int cnt); -static void hifn_callback(struct hifn_softc *, struct hifn_command *, u_int8_t *); -static int hifn_crypto(struct hifn_softc *, struct hifn_command *, struct cryptop *, int); -static int hifn_readramaddr(struct hifn_softc *, int, u_int8_t *); -static int hifn_writeramaddr(struct hifn_softc *, int, u_int8_t *); -static int hifn_dmamap_load_src(struct hifn_softc *, struct hifn_command *); -static int hifn_dmamap_load_dst(struct hifn_softc *, struct hifn_command *); -static int hifn_init_pubrng(struct hifn_softc *); -static void hifn_rng(void *); -static void hifn_tick(void *); -static void hifn_abort(struct hifn_softc *); -static void hifn_alloc_slot(struct hifn_softc *, int *, int *, int *, int *); - -static void hifn_write_reg_0(struct hifn_softc *, bus_size_t, u_int32_t); -static void hifn_write_reg_1(struct hifn_softc *, bus_size_t, u_int32_t); - -static __inline u_int32_t -READ_REG_0(struct hifn_softc *sc, bus_size_t reg) -{ - u_int32_t v = bus_space_read_4(sc->sc_st0, sc->sc_sh0, reg); - sc->sc_bar0_lastreg = (bus_size_t) -1; - return (v); -} -#define WRITE_REG_0(sc, reg, val) hifn_write_reg_0(sc, reg, val) - -static __inline u_int32_t -READ_REG_1(struct hifn_softc *sc, bus_size_t reg) -{ - u_int32_t v = bus_space_read_4(sc->sc_st1, sc->sc_sh1, reg); - sc->sc_bar1_lastreg = (bus_size_t) -1; - return (v); -} -#define WRITE_REG_1(sc, reg, val) hifn_write_reg_1(sc, reg, val) - -static SYSCTL_NODE(_hw, OID_AUTO, hifn, CTLFLAG_RD | CTLFLAG_MPSAFE, 0, - "Hifn driver parameters"); - -#ifdef HIFN_DEBUG -static int hifn_debug = 0; -SYSCTL_INT(_hw_hifn, OID_AUTO, debug, CTLFLAG_RW, &hifn_debug, - 0, "control debugging msgs"); -#endif - -static struct hifn_stats hifnstats; -SYSCTL_STRUCT(_hw_hifn, OID_AUTO, stats, CTLFLAG_RD, &hifnstats, - hifn_stats, "driver statistics"); -static int hifn_maxbatch = 1; -SYSCTL_INT(_hw_hifn, OID_AUTO, maxbatch, CTLFLAG_RW, &hifn_maxbatch, - 0, "max ops to batch w/o interrupt"); - -/* - * Probe for a supported device. The PCI vendor and device - * IDs are used to detect devices we know how to handle. - */ -static int -hifn_probe(device_t dev) -{ - if (pci_get_vendor(dev) == PCI_VENDOR_INVERTEX && - pci_get_device(dev) == PCI_PRODUCT_INVERTEX_AEON) - return (BUS_PROBE_DEFAULT); - if (pci_get_vendor(dev) == PCI_VENDOR_HIFN && - (pci_get_device(dev) == PCI_PRODUCT_HIFN_7751 || - pci_get_device(dev) == PCI_PRODUCT_HIFN_7951 || - pci_get_device(dev) == PCI_PRODUCT_HIFN_7955 || - pci_get_device(dev) == PCI_PRODUCT_HIFN_7956 || - pci_get_device(dev) == PCI_PRODUCT_HIFN_7811)) - return (BUS_PROBE_DEFAULT); - if (pci_get_vendor(dev) == PCI_VENDOR_NETSEC && - pci_get_device(dev) == PCI_PRODUCT_NETSEC_7751) - return (BUS_PROBE_DEFAULT); - return (ENXIO); -} - -static void -hifn_dmamap_cb(void *arg, bus_dma_segment_t *segs, int nseg, int error) -{ - bus_addr_t *paddr = (bus_addr_t*) arg; - *paddr = segs->ds_addr; -} - -static const char* -hifn_partname(struct hifn_softc *sc) -{ - /* XXX sprintf numbers when not decoded */ - switch (pci_get_vendor(sc->sc_dev)) { - case PCI_VENDOR_HIFN: - switch (pci_get_device(sc->sc_dev)) { - case PCI_PRODUCT_HIFN_6500: return "Hifn 6500"; - case PCI_PRODUCT_HIFN_7751: return "Hifn 7751"; - case PCI_PRODUCT_HIFN_7811: return "Hifn 7811"; - case PCI_PRODUCT_HIFN_7951: return "Hifn 7951"; - case PCI_PRODUCT_HIFN_7955: return "Hifn 7955"; - case PCI_PRODUCT_HIFN_7956: return "Hifn 7956"; - } - return "Hifn unknown-part"; - case PCI_VENDOR_INVERTEX: - switch (pci_get_device(sc->sc_dev)) { - case PCI_PRODUCT_INVERTEX_AEON: return "Invertex AEON"; - } - return "Invertex unknown-part"; - case PCI_VENDOR_NETSEC: - switch (pci_get_device(sc->sc_dev)) { - case PCI_PRODUCT_NETSEC_7751: return "NetSec 7751"; - } - return "NetSec unknown-part"; - } - return "Unknown-vendor unknown-part"; -} - -static void -default_harvest(struct rndtest_state *rsp, void *buf, u_int count) -{ - /* MarkM: FIX!! Check that this does not swamp the harvester! */ - random_harvest_queue(buf, count, RANDOM_PURE_HIFN); -} - -static u_int -checkmaxmin(device_t dev, const char *what, u_int v, u_int min, u_int max) -{ - if (v > max) { - device_printf(dev, "Warning, %s %u out of range, " - "using max %u\n", what, v, max); - v = max; - } else if (v < min) { - device_printf(dev, "Warning, %s %u out of range, " - "using min %u\n", what, v, min); - v = min; - } - return v; -} - -/* - * Select PLL configuration for 795x parts. This is complicated in - * that we cannot determine the optimal parameters without user input. - * The reference clock is derived from an external clock through a - * multiplier. The external clock is either the host bus (i.e. PCI) - * or an external clock generator. When using the PCI bus we assume - * the clock is either 33 or 66 MHz; for an external source we cannot - * tell the speed. - * - * PLL configuration is done with a string: "pci" for PCI bus, or "ext" - * for an external source, followed by the frequency. We calculate - * the appropriate multiplier and PLL register contents accordingly. - * When no configuration is given we default to "pci66" since that - * always will allow the card to work. If a card is using the PCI - * bus clock and in a 33MHz slot then it will be operating at half - * speed until the correct information is provided. - * - * We use a default setting of "ext66" because according to Mike Ham - * of HiFn, almost every board in existence has an external crystal - * populated at 66Mhz. Using PCI can be a problem on modern motherboards, - * because PCI33 can have clocks from 0 to 33Mhz, and some have - * non-PCI-compliant spread-spectrum clocks, which can confuse the pll. - */ -static void -hifn_getpllconfig(device_t dev, u_int *pll) -{ - const char *pllspec; - u_int freq, mul, fl, fh; - u_int32_t pllconfig; - char *nxt; - - if (resource_string_value("hifn", device_get_unit(dev), - "pllconfig", &pllspec)) - pllspec = "ext66"; - fl = 33, fh = 66; - pllconfig = 0; - if (strncmp(pllspec, "ext", 3) == 0) { - pllspec += 3; - pllconfig |= HIFN_PLL_REF_SEL; - switch (pci_get_device(dev)) { - case PCI_PRODUCT_HIFN_7955: - case PCI_PRODUCT_HIFN_7956: - fl = 20, fh = 100; - break; -#ifdef notyet - case PCI_PRODUCT_HIFN_7954: - fl = 20, fh = 66; - break; -#endif - } - } else if (strncmp(pllspec, "pci", 3) == 0) - pllspec += 3; - freq = strtoul(pllspec, &nxt, 10); - if (nxt == pllspec) - freq = 66; - else - freq = checkmaxmin(dev, "frequency", freq, fl, fh); - /* - * Calculate multiplier. We target a Fck of 266 MHz, - * allowing only even values, possibly rounded down. - * Multipliers > 8 must set the charge pump current. - */ - mul = checkmaxmin(dev, "PLL divisor", (266 / freq) &~ 1, 2, 12); - pllconfig |= (mul / 2 - 1) << HIFN_PLL_ND_SHIFT; - if (mul > 8) - pllconfig |= HIFN_PLL_IS; - *pll = pllconfig; -} - -/* - * Attach an interface that successfully probed. - */ -static int -hifn_attach(device_t dev) -{ - struct hifn_softc *sc = device_get_softc(dev); - caddr_t kva; - int rseg, rid; - char rbase; - uint16_t rev; - - sc->sc_dev = dev; - - mtx_init(&sc->sc_mtx, device_get_nameunit(dev), "hifn driver", MTX_DEF); - - /* XXX handle power management */ - - /* - * The 7951 and 795x have a random number generator and - * public key support; note this. - */ - if (pci_get_vendor(dev) == PCI_VENDOR_HIFN && - (pci_get_device(dev) == PCI_PRODUCT_HIFN_7951 || - pci_get_device(dev) == PCI_PRODUCT_HIFN_7955 || - pci_get_device(dev) == PCI_PRODUCT_HIFN_7956)) - sc->sc_flags = HIFN_HAS_RNG | HIFN_HAS_PUBLIC; - /* - * The 7811 has a random number generator and - * we also note it's identity 'cuz of some quirks. - */ - if (pci_get_vendor(dev) == PCI_VENDOR_HIFN && - pci_get_device(dev) == PCI_PRODUCT_HIFN_7811) - sc->sc_flags |= HIFN_IS_7811 | HIFN_HAS_RNG; - - /* - * The 795x parts support AES. - */ - if (pci_get_vendor(dev) == PCI_VENDOR_HIFN && - (pci_get_device(dev) == PCI_PRODUCT_HIFN_7955 || - pci_get_device(dev) == PCI_PRODUCT_HIFN_7956)) { - sc->sc_flags |= HIFN_IS_7956 | HIFN_HAS_AES; - /* - * Select PLL configuration. This depends on the - * bus and board design and must be manually configured - * if the default setting is unacceptable. - */ - hifn_getpllconfig(dev, &sc->sc_pllconfig); - } - - /* - * Setup PCI resources. Note that we record the bus - * tag and handle for each register mapping, this is - * used by the READ_REG_0, WRITE_REG_0, READ_REG_1, - * and WRITE_REG_1 macros throughout the driver. - */ - pci_enable_busmaster(dev); - - rid = HIFN_BAR0; - sc->sc_bar0res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, - RF_ACTIVE); - if (sc->sc_bar0res == NULL) { - device_printf(dev, "cannot map bar%d register space\n", 0); - goto fail_pci; - } - sc->sc_st0 = rman_get_bustag(sc->sc_bar0res); - sc->sc_sh0 = rman_get_bushandle(sc->sc_bar0res); - sc->sc_bar0_lastreg = (bus_size_t) -1; - - rid = HIFN_BAR1; - sc->sc_bar1res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, - RF_ACTIVE); - if (sc->sc_bar1res == NULL) { - device_printf(dev, "cannot map bar%d register space\n", 1); - goto fail_io0; - } - sc->sc_st1 = rman_get_bustag(sc->sc_bar1res); - sc->sc_sh1 = rman_get_bushandle(sc->sc_bar1res); - sc->sc_bar1_lastreg = (bus_size_t) -1; - - hifn_set_retry(sc); - - /* - * Setup the area where the Hifn DMA's descriptors - * and associated data structures. - */ - if (bus_dma_tag_create(bus_get_dma_tag(dev), /* PCI parent */ - 1, 0, /* alignment,boundary */ - BUS_SPACE_MAXADDR_32BIT, /* lowaddr */ - BUS_SPACE_MAXADDR, /* highaddr */ - NULL, NULL, /* filter, filterarg */ - HIFN_MAX_DMALEN, /* maxsize */ - MAX_SCATTER, /* nsegments */ - HIFN_MAX_SEGLEN, /* maxsegsize */ - BUS_DMA_ALLOCNOW, /* flags */ - NULL, /* lockfunc */ - NULL, /* lockarg */ - &sc->sc_dmat)) { - device_printf(dev, "cannot allocate DMA tag\n"); - goto fail_io1; - } - if (bus_dmamap_create(sc->sc_dmat, BUS_DMA_NOWAIT, &sc->sc_dmamap)) { - device_printf(dev, "cannot create dma map\n"); - bus_dma_tag_destroy(sc->sc_dmat); - goto fail_io1; - } - if (bus_dmamem_alloc(sc->sc_dmat, (void**) &kva, BUS_DMA_NOWAIT, &sc->sc_dmamap)) { - device_printf(dev, "cannot alloc dma buffer\n"); - bus_dmamap_destroy(sc->sc_dmat, sc->sc_dmamap); - bus_dma_tag_destroy(sc->sc_dmat); - goto fail_io1; - } - if (bus_dmamap_load(sc->sc_dmat, sc->sc_dmamap, kva, - sizeof (*sc->sc_dma), - hifn_dmamap_cb, &sc->sc_dma_physaddr, - BUS_DMA_NOWAIT)) { - device_printf(dev, "cannot load dma map\n"); - bus_dmamem_free(sc->sc_dmat, kva, sc->sc_dmamap); - bus_dma_tag_destroy(sc->sc_dmat); - goto fail_io1; - } - sc->sc_dma = (struct hifn_dma *)kva; - bzero(sc->sc_dma, sizeof(*sc->sc_dma)); - - KASSERT(sc->sc_st0 != 0, ("hifn_attach: null bar0 tag!")); - KASSERT(sc->sc_sh0 != 0, ("hifn_attach: null bar0 handle!")); - KASSERT(sc->sc_st1 != 0, ("hifn_attach: null bar1 tag!")); - KASSERT(sc->sc_sh1 != 0, ("hifn_attach: null bar1 handle!")); - - /* - * Reset the board and do the ``secret handshake'' - * to enable the crypto support. Then complete the - * initialization procedure by setting up the interrupt - * and hooking in to the system crypto support so we'll - * get used for system services like the crypto device, - * IPsec, RNG device, etc. - */ - hifn_reset_board(sc, 0); - - if (hifn_enable_crypto(sc) != 0) { - device_printf(dev, "crypto enabling failed\n"); - goto fail_mem; - } - hifn_reset_puc(sc); - - hifn_init_dma(sc); - hifn_init_pci_registers(sc); - - /* XXX can't dynamically determine ram type for 795x; force dram */ - if (sc->sc_flags & HIFN_IS_7956) - sc->sc_drammodel = 1; - else if (hifn_ramtype(sc)) - goto fail_mem; - - if (sc->sc_drammodel == 0) - hifn_sramsize(sc); - else - hifn_dramsize(sc); - - /* - * Workaround for NetSec 7751 rev A: half ram size because two - * of the address lines were left floating - */ - if (pci_get_vendor(dev) == PCI_VENDOR_NETSEC && - pci_get_device(dev) == PCI_PRODUCT_NETSEC_7751 && - pci_get_revid(dev) == 0x61) /*XXX???*/ - sc->sc_ramsize >>= 1; - - /* - * Arrange the interrupt line. - */ - rid = 0; - sc->sc_irq = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, - RF_SHAREABLE|RF_ACTIVE); - if (sc->sc_irq == NULL) { - device_printf(dev, "could not map interrupt\n"); - goto fail_mem; - } - /* - * NB: Network code assumes we are blocked with splimp() - * so make sure the IRQ is marked appropriately. - */ - if (bus_setup_intr(dev, sc->sc_irq, INTR_TYPE_NET | INTR_MPSAFE, - NULL, hifn_intr, sc, &sc->sc_intrhand)) { - device_printf(dev, "could not setup interrupt\n"); - goto fail_intr2; - } - - hifn_sessions(sc); - - /* - * NB: Keep only the low 16 bits; this masks the chip id - * from the 7951. - */ - rev = READ_REG_1(sc, HIFN_1_REVID) & 0xffff; - - rseg = sc->sc_ramsize / 1024; - rbase = 'K'; - if (sc->sc_ramsize >= (1024 * 1024)) { - rbase = 'M'; - rseg /= 1024; - } - device_printf(sc->sc_dev, "%s, rev %u, %d%cB %cram", - hifn_partname(sc), rev, - rseg, rbase, sc->sc_drammodel ? 'd' : 's'); - if (sc->sc_flags & HIFN_IS_7956) - printf(", pll=0x%x<%s clk, %ux mult>", - sc->sc_pllconfig, - sc->sc_pllconfig & HIFN_PLL_REF_SEL ? "ext" : "pci", - 2 + 2*((sc->sc_pllconfig & HIFN_PLL_ND) >> 11)); - printf("\n"); - - WRITE_REG_0(sc, HIFN_0_PUCNFG, - READ_REG_0(sc, HIFN_0_PUCNFG) | HIFN_PUCNFG_CHIPID); - sc->sc_ena = READ_REG_0(sc, HIFN_0_PUSTAT) & HIFN_PUSTAT_CHIPENA; - - switch (sc->sc_ena) { - case HIFN_PUSTAT_ENA_2: - case HIFN_PUSTAT_ENA_1: - sc->sc_cid = crypto_get_driverid(dev, - sizeof(struct hifn_session), CRYPTOCAP_F_HARDWARE); - if (sc->sc_cid < 0) { - device_printf(dev, "could not get crypto driver id\n"); - goto fail_intr; - } - break; - } - - bus_dmamap_sync(sc->sc_dmat, sc->sc_dmamap, - BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); - - if (sc->sc_flags & (HIFN_HAS_PUBLIC | HIFN_HAS_RNG)) - hifn_init_pubrng(sc); - - callout_init(&sc->sc_tickto, 1); - callout_reset(&sc->sc_tickto, hz, hifn_tick, sc); - - return (0); - -fail_intr: - bus_teardown_intr(dev, sc->sc_irq, sc->sc_intrhand); -fail_intr2: - /* XXX don't store rid */ - bus_release_resource(dev, SYS_RES_IRQ, 0, sc->sc_irq); -fail_mem: - bus_dmamap_unload(sc->sc_dmat, sc->sc_dmamap); - bus_dmamem_free(sc->sc_dmat, sc->sc_dma, sc->sc_dmamap); - bus_dma_tag_destroy(sc->sc_dmat); - - /* Turn off DMA polling */ - WRITE_REG_1(sc, HIFN_1_DMA_CNFG, HIFN_DMACNFG_MSTRESET | - HIFN_DMACNFG_DMARESET | HIFN_DMACNFG_MODE); -fail_io1: - bus_release_resource(dev, SYS_RES_MEMORY, HIFN_BAR1, sc->sc_bar1res); -fail_io0: - bus_release_resource(dev, SYS_RES_MEMORY, HIFN_BAR0, sc->sc_bar0res); -fail_pci: - mtx_destroy(&sc->sc_mtx); - return (ENXIO); -} - -/* - * Detach an interface that successfully probed. - */ -static int -hifn_detach(device_t dev) -{ - struct hifn_softc *sc = device_get_softc(dev); - - KASSERT(sc != NULL, ("hifn_detach: null software carrier!")); - - /* disable interrupts */ - WRITE_REG_1(sc, HIFN_1_DMA_IER, 0); - - /*XXX other resources */ - callout_stop(&sc->sc_tickto); - callout_stop(&sc->sc_rngto); -#ifdef HIFN_RNDTEST - if (sc->sc_rndtest) - rndtest_detach(sc->sc_rndtest); -#endif - - /* Turn off DMA polling */ - WRITE_REG_1(sc, HIFN_1_DMA_CNFG, HIFN_DMACNFG_MSTRESET | - HIFN_DMACNFG_DMARESET | HIFN_DMACNFG_MODE); - - crypto_unregister_all(sc->sc_cid); - - bus_teardown_intr(dev, sc->sc_irq, sc->sc_intrhand); - /* XXX don't store rid */ - bus_release_resource(dev, SYS_RES_IRQ, 0, sc->sc_irq); - - bus_dmamap_unload(sc->sc_dmat, sc->sc_dmamap); - bus_dmamem_free(sc->sc_dmat, sc->sc_dma, sc->sc_dmamap); - bus_dma_tag_destroy(sc->sc_dmat); - - bus_release_resource(dev, SYS_RES_MEMORY, HIFN_BAR1, sc->sc_bar1res); - bus_release_resource(dev, SYS_RES_MEMORY, HIFN_BAR0, sc->sc_bar0res); - - mtx_destroy(&sc->sc_mtx); - - return (0); -} - -/* - * Stop all chip I/O so that the kernel's probe routines don't - * get confused by errant DMAs when rebooting. - */ -static int -hifn_shutdown(device_t dev) -{ -#ifdef notyet - hifn_stop(device_get_softc(dev)); -#endif - return (0); -} - -/* - * Device suspend routine. Stop the interface and save some PCI - * settings in case the BIOS doesn't restore them properly on - * resume. - */ -static int -hifn_suspend(device_t dev) -{ - struct hifn_softc *sc = device_get_softc(dev); -#ifdef notyet - hifn_stop(sc); -#endif - sc->sc_suspended = 1; - - return (0); -} - -/* - * Device resume routine. Restore some PCI settings in case the BIOS - * doesn't, re-enable busmastering, and restart the interface if - * appropriate. - */ -static int -hifn_resume(device_t dev) -{ - struct hifn_softc *sc = device_get_softc(dev); -#ifdef notyet - /* reinitialize interface if necessary */ - if (ifp->if_flags & IFF_UP) - rl_init(sc); -#endif - sc->sc_suspended = 0; - - return (0); -} - -static int -hifn_init_pubrng(struct hifn_softc *sc) -{ - u_int32_t r; - int i; - -#ifdef HIFN_RNDTEST - sc->sc_rndtest = rndtest_attach(sc->sc_dev); - if (sc->sc_rndtest) - sc->sc_harvest = rndtest_harvest; - else - sc->sc_harvest = default_harvest; -#else - sc->sc_harvest = default_harvest; -#endif - if ((sc->sc_flags & HIFN_IS_7811) == 0) { - /* Reset 7951 public key/rng engine */ - WRITE_REG_1(sc, HIFN_1_PUB_RESET, - READ_REG_1(sc, HIFN_1_PUB_RESET) | HIFN_PUBRST_RESET); - - for (i = 0; i < 100; i++) { - DELAY(1000); - if ((READ_REG_1(sc, HIFN_1_PUB_RESET) & - HIFN_PUBRST_RESET) == 0) - break; *** 3093 LINES SKIPPED *** From nobody Wed Oct 29 00:16:23 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cx7873f3Yz6Djk1; Wed, 29 Oct 2025 00:16:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cx7872pFZz44sD; Wed, 29 Oct 2025 00:16:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761696983; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Xkp7yne7L0Xy03uL931qCTsq5tb4bRmpjBcGHLbFIac=; b=Fmpf25EOg6s3TLa9pwRHJrwdCjgO/ClLifqPARNVPoUhdez5NuElJuQXUrF/I28wMXy54a OYq6rY0rbkXMxqsxaJZr0OgentFeycVxtXAlvrf/cwh2JRYni3dBwssXD7GXrU94F/dZdT srt5VcHafksIRC2ZhOhNuXwpdh2w5GlOswUWNwox01XORMbIJC4E9utqouA8SfZTqnHg24 AcO/tyy9jYf2WH1XZlKKbPaPYN7DbAsPsrdDXrAahwQJts2opvsIAWKAHqStN526PLbMCk YXcEFJMonp2Jajp/9vWoOtHY4N/lBG3sSj9p22m+VBGfx+Lrzek+nI6t2ZAPgg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761696983; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Xkp7yne7L0Xy03uL931qCTsq5tb4bRmpjBcGHLbFIac=; b=KVDOW8OwXKfX3KTLNEd9PUwEyfg/F/3KdBUWfzZX3tZcY2IzjXDE4pvqwScMGHRay9dNUv 5wAr1pyLa5EMBSzVAG6zny6uEyD2p+Y/+B67hPJpXwpLdrhgHUnmIVFUpnC6OLwhBc55zK sBv1+tHlg2FmXLihxsIYlozsItZ8OJuMxT43bSSrl8pSl4CbaOo0LbpscUp89eeht+Ip6r DrPjZeKTj4yleLZYLmswmZnm1UiBM+SQWdmj8HewQK5bc0S0ZN1YAA328JMV8GRe+pfyAO APz6rlQC7uNukDISTQOcw44YduBdhtSZz8I7PB9s6X83yynWjAYFsXga1Kv61w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761696983; a=rsa-sha256; cv=none; b=I+lho+FKtOSJ0DqwnqOBOvMEOCzm5yd0MrphFeBkAxK0FSYYRo3a1raCEjEqXT2H7pV2l+ Z6luTdMTp2QSDmFyJNEVWO3ZCjkVZyBCOVBHYlLkTyEXQPZecNeWmnqpASPviLwXNyp0PP hS3otHCjjWYIlXiBNlXkB8KkgQCtSGnxEZSREAKwd9UtsHEtEyQ+6bylAs3B6UKZu5MRxO vuxj32erCzEAh6g2+P/pZZJVTZybDFfXNLpBNMC7iGUW7h9q7voPRF06McUlqJYQduGzuY RpKwxkQeuecaIfGSIvj55n88Ru/gol17dw+0ulVS11hxjo7Aj9a/UgQoYY+YPw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cx7872GJFz1BZ6; Wed, 29 Oct 2025 00:16: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 59T0GNeQ097635; Wed, 29 Oct 2025 00:16:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59T0GNOR097632; Wed, 29 Oct 2025 00:16:23 GMT (envelope-from git) Date: Wed, 29 Oct 2025 00:16:23 GMT Message-Id: <202510290016.59T0GNOR097632@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "David E. O'Brien" Subject: git: a38a42ed9a97 - main - random: remove hifn(4) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: obrien X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a38a42ed9a9754553212058177093f24a7f48d09 Auto-Submitted: auto-generated The branch main has been updated by obrien: URL: https://cgit.FreeBSD.org/src/commit/?id=a38a42ed9a9754553212058177093f24a7f48d09 commit a38a42ed9a9754553212058177093f24a7f48d09 Author: David E. O'Brien AuthorDate: 2025-10-29 00:15:36 +0000 Commit: David E. O'Brien CommitDate: 2025-10-29 00:16:08 +0000 random: remove hifn(4) Fixes: 685a78 --- share/man/man4/Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index e94e832a3f94..ee0ce03dd038 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -204,7 +204,6 @@ MAN= aac.4 \ hidbus.4 \ hidquirk.4 \ hidraw.4 \ - hifn.4 \ hkbd.4 \ hms.4 \ hmt.4 \ From nobody Wed Oct 29 00:26:24 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cx7Mj0ZMPz6DknJ; Wed, 29 Oct 2025 00:26: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cx7Mh6wzqz46K2; Wed, 29 Oct 2025 00:26:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761697585; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cAgLLGXa2/Nkx20rVhDCL+BEDRE9mWz/aMUUz9UooPU=; b=tR4mHm8jCZeUibkHJrhLImkFAVcA6rskPYEhuhD96zHNr7M/JBHoqopnyY039bAUSiXWWG B6t+Z4hM2ZcEBorIZZ2zF7xojRrxTN19OZymR8vZDaagZA2qi5cLnJeN698n/1vqRCbkh5 2iq9EtcQB3PfEjYD8RaA5B92N96Q56WoxqT+T3mruqoswFMWJ1dYp2RGlRtB5rOBIfOwG8 3segbArc2lVuoqBR8ExGAwTx2RO0HaxzWH3XgS3r6sETA44OGq9UE5+FNGj+V1rG6oN9mi rEGWo2Lrqe2sdNM0aOLXFqUvVT9JrjemXxiLL4n38x8tzLx+1BdUdURG6dJxMQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761697585; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cAgLLGXa2/Nkx20rVhDCL+BEDRE9mWz/aMUUz9UooPU=; b=Fu6NVLPgzJn6pBZGVSwPp6NrSo7aBAs5fZqFZjc+TpcoG8X5OZXfeiNhVNeQA1lL12AiOg IQrOTmatOc1XL6eqmO25OwMnBif8vji0u9vAolu/MjE8HhRXCcM8r7+VqL8T+R9gX+gCTf kwpPAecCUd4jUcsSAPsijcad8A9ocAFjKx8bCnio0ksjTyz2VvgSaDtYIgVlRXMWqjhIoJ UGuJsdht7vpkgH0UkSXYBdzdP+s4gTWTPo+Zi+YKdBKn7VmLszIXl7HP+Nb0I92BovF+hP q/g4OvDCS3baGoWHSJWmxhY86kwavjyrKeQtbOVHuQw28PglKaPh+gLe4i0EEA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761697585; a=rsa-sha256; cv=none; b=iHnNYn1AHD+c4kgiUkMykZ2KSPVIFBs3CUKuv2AbxzMAC5ikEbvq0AsaTC3kt1pBRq+m06 TLp0NL1l9VfgXE70cuNjFxRhBO8/L0deSm4Z9RtDv7AikSMpJtDLUWfZfmEzBvhmorkda1 Xtovg6n26o6gTzlBCsFZ3Vmrv9VLUm5aifWseN7AnwOBMEvBFyqJy2rFE2xYty5s566brt 0jo6Omk6mpbw/SNC/MdUniGz1PAfjFOtXSIoBhVhkd0eVz59c06Mfl19H/rarHVRqvyyaY 9PTgzy/U/lfoHzSsD/pg8VhMlLAH6o4kTrkqK4P6j7rx7VY43s/23J8VFgmakw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cx7Mh6T5qz1C4D; Wed, 29 Oct 2025 00:26: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 59T0QOFT015798; Wed, 29 Oct 2025 00:26:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59T0QOqt015795; Wed, 29 Oct 2025 00:26:24 GMT (envelope-from git) Date: Wed, 29 Oct 2025 00:26:24 GMT Message-Id: <202510290026.59T0QOqt015795@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "David E. O'Brien" Subject: git: 88a53301e198 - main - padlock.4: only install on i386 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: obrien X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 88a53301e198b043e9b046b1c824eae5a24064f9 Auto-Submitted: auto-generated The branch main has been updated by obrien: URL: https://cgit.FreeBSD.org/src/commit/?id=88a53301e198b043e9b046b1c824eae5a24064f9 commit 88a53301e198b043e9b046b1c824eae5a24064f9 Author: David E. O'Brien AuthorDate: 2025-10-29 00:26:00 +0000 Commit: David E. O'Brien CommitDate: 2025-10-29 00:26:00 +0000 padlock.4: only install on i386 --- share/man/man4/Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index ee0ce03dd038..fe744776d9b3 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -892,7 +892,6 @@ _ntb_hw_intel.4= ntb_hw_intel.4 _ntb_hw_plx.4= ntb_hw_plx.4 _ntb_transport.4=ntb_transport.4 _nvram.4= nvram.4 -_padlock.4= padlock.4 _pchtherm.4= pchtherm.4 _qat.4= qat.4 _qat_c2xxx.4= qat_c2xxx.4 @@ -939,6 +938,10 @@ _vmm.4= vmm.4 .endif .endif +.if ${MACHINE_CPUARCH} == "i386" +_padlock.4= padlock.4 +.endif + .if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "aarch64" _hwt.4= hwt.4 .if ${MACHINE_CPUARCH} == "amd64" From nobody Wed Oct 29 00:31:14 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cx7TG3dS4z6DlJb; Wed, 29 Oct 2025 00:31: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cx7TG1nGzz46p9; Wed, 29 Oct 2025 00:31:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761697874; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=r+nEYTj6YWZ3G+Lid0NhjUeDWMu5OEjAjeDEEPXWKGU=; b=TNS2MpnHR5rJXHdV47JDIq3gLPY7t2khHn/8PpbvRs9E0aZ0nm9dAhFm9Lztiook7z14zX apQISUQ+eArR5jocAsATTFRWkTZ02UiQqPqalCtM6/G+qYiWqnmDPfUfEkHRxq0ClqnPoW DyuJEjBJ1jOyXGY1npsVR1NJvOfGU4aWa1I1hJPtY4TL9sVmJnwuRoA9SXNOShQxW0wMSv EiuAZ6rWO2cjxeMQN4Th6VnluGlDYkVjHO0VG7Np0fLu7GwEWsL3FksOo5+LMLFyH2ZR4/ HeoAg6+Q2Dna6MFn19dAutOEvZseGVqa16V+tkAycnJWYl6+bXCzN+80xscM7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761697874; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=r+nEYTj6YWZ3G+Lid0NhjUeDWMu5OEjAjeDEEPXWKGU=; b=RS3dNNklLU//jbun0dXkG2t6wJvqzxkX9v02VRPvBk7I1P18Qm5ENWQsy+UqVCCYgCQe0D aqBc8krWfLRzRHsbH8Aa+vE+EEwGp7usjky4nNQZeGpBnk1SfKSwcM8bJtlx7soBNjKe2h vx54GYHua1XhUAKyutMoHH2yvGeX5CwBqmq0UU1kGOE62SgJab8FaM2iFC50Y48h3x8H+5 HWKME516h2gNuxSxi7R3jZK5R5pdBMQYpoPGJJY1ysXO4LzAN/73O5x+qmcbAnpewRsDGO HxylfDghNM2nGPIZhFMygaMmrcHgZ3+m3pTZISWG/P+mkg4RuaB1UzmYgVtqFA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761697874; a=rsa-sha256; cv=none; b=jHz9igFIp47pkplzKHcSRM2m9kXD36OBjbfYGIab5/4gnpjb37eZPtRIn42U7z3lXk6amC EnW/PxxHv6kVqeB5TQZQNln+6P5/YSnSPMF1zvpJifL86Kkndgr7eARF+43JZN3mkvFrzm S1UzsFGStmli0jWWn41p/PuziVJE7DwtOk3gEQ0aGv0w6YFlnD3g+AN6jHYA6GoD5GSiMN r01QaiXzMzR9h5Cf7fSG3saAbdsvcqYT+h3wS38UWEcli25SV3aJoVwNoUM4AH2tvBfsx5 9NN4UnLefS1FbYSdDy8cj9dvDo6se6iwNzDXStNvHQ3i3Vru4xueDpoBMzpxlQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cx7TG1L2Tz1C6l; Wed, 29 Oct 2025 00:31: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 59T0VEoX029475; Wed, 29 Oct 2025 00:31:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59T0VE5B029472; Wed, 29 Oct 2025 00:31:14 GMT (envelope-from git) Date: Wed, 29 Oct 2025 00:31:14 GMT Message-Id: <202510290031.59T0VE5B029472@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: 73551cd6eac2 - main - nfs_commonsubs.c: Get rid of variable used as a constant List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 73551cd6eac29a6707c802c7d7fafcb560bf5e2b Auto-Submitted: auto-generated The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=73551cd6eac29a6707c802c7d7fafcb560bf5e2b commit 73551cd6eac29a6707c802c7d7fafcb560bf5e2b Author: Rick Macklem AuthorDate: 2025-10-29 00:28:04 +0000 Commit: Rick Macklem CommitDate: 2025-10-29 00:28:04 +0000 nfs_commonsubs.c: Get rid of variable used as a constant The variable ncl_mbuf_mhlen is set to MHLEN and only used in one place. This patch simply deletes it and replaces it with MHLEN. This patch should not affect semantics. Spotted while fixing cases that could do large NFSM_DISSECT() sizes. MFC after: 2 weeks --- sys/fs/nfs/nfs_commonsubs.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/fs/nfs/nfs_commonsubs.c b/sys/fs/nfs/nfs_commonsubs.c index 8e1a26eef354..f580a394a735 100644 --- a/sys/fs/nfs/nfs_commonsubs.c +++ b/sys/fs/nfs/nfs_commonsubs.c @@ -194,7 +194,6 @@ struct nfsv4_opflag nfsv4_opflag[NFSV42_NOPS] = { { 0, 1, 1, 1, LK_EXCLUSIVE, 1, 1 }, /* Removexattr */ }; -static int ncl_mbuf_mhlen = MHLEN; struct nfsrv_lughash { struct mtx mtx; struct nfsuserhashhead lughead; @@ -770,7 +769,7 @@ nfsm_dissct(struct nfsrv_descript *nd, int siz, int how) nd->nd_dpos += siz; } else if (nd->nd_md->m_next == NULL) { return (retp); - } else if (siz > ncl_mbuf_mhlen) { + } else if (siz > MHLEN) { panic("nfs S too big"); } else { MGET(mp2, how, MT_DATA); From nobody Wed Oct 29 02:37:24 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cxBGr4tpHz6F8VY; Wed, 29 Oct 2025 02:37: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cxBGr4J2Qz3K33; Wed, 29 Oct 2025 02:37:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761705444; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cZIsba1nC7gRFWut6KAHm9cW0JvAZ8ZdESKTp09KUaI=; b=DTZE53xMUINAxuf+myAtqo7PJP08GuVtGdbFRFa5kJelG5i9rauZ/l0wT2YNw7MPUszYd4 uYeZnvu8pCiqaVyVd4Q/keLswiKOyR4rw/TlwqvCHdGWQbVe98XPV5bJX7DHAfPfDYZhkT 0RLDznSqAlF7WzRsnXdxFKwgKkikwWov49bCc524x+nPZ2plRZOI9lEFxDIgaumCnMTBOA Gpjterr5NJBikotj4lWQMRp4BnAjVr2tcYMNUse77y7SLMQcLRkL+4145yRcjRMnb/ARKb VFsQKGwWo9ExWreGLmd8uUbSyC6dl3VjjzIOOJP+u5XkQenxHJfWXgUMlYmi3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761705444; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cZIsba1nC7gRFWut6KAHm9cW0JvAZ8ZdESKTp09KUaI=; b=vHSGXem1w+O36MGLsPYd2pIJhZMsp4mqqYyUCHDSBdRUiZi3fYNr1p3FkLr7J9aUgXwIyd 0plUfM3is17S/iAgdtjp0XP90WCDnuNv0iEVeHEbGtsUJRK1YnVK05G8RbnoKKOhQThpIf 0j2axtYJbPXSatwhsx7V++UbxxmZwCIEBL5ufwh3NB50P+iJSrTaQ3ewlG1PJGUU9ppXig gyTkTZwnCH/f/kAxv4coTC3uYr+YaF3YDGW1U5Wk5nly5eSDPjJhaNyF1NOCSVkMO5eELs JYzk8eUSuTS+GRqaUGdhwUxxJfFaXJJFlHQ/j/AzqzK7069ve+KJczexLWICWA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761705444; a=rsa-sha256; cv=none; b=xnZpkRDQzaDYuX2G/sviRDYEYNoAq71twvEgnJCY/LQX1veA/09oPTiLaDVg9qOYcDURQI pQWV0Tl2J4x0TVxJQEEW8eSBdfr3M5EY7zSoAp2VE1wfG86je/8G4ITX0RG2wTCQXoDWkR Sr7mdkmGLSoTtLXUNKBlzZsaLebh+g1yW3bkUzZFnAnjkYO3yeX4WLncBcwJRCw54y4mfK nuZG7WMmpDJnrKWyCEy3piyFF0/VZWyPMkXxPgwMmom/Nq6oRvAtGt237XikjumwEy6scy HOA+D/Z8cQUlhQfP8tM9WhCvSpWWMLSNtgFK0G63UZ3diY+VlNvbqYFBGmQo1g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cxBGr3ptvz2h8; Wed, 29 Oct 2025 02:37: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 59T2bOfJ060113; Wed, 29 Oct 2025 02:37:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59T2bOKK060110; Wed, 29 Oct 2025 02:37:24 GMT (envelope-from git) Date: Wed, 29 Oct 2025 02:37:24 GMT Message-Id: <202510290237.59T2bOKK060110@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 98edcbcce0a4 - main - libutil: defer setting the MAC label until after the login class List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 98edcbcce0a4650084bd86e704cfa38bf590250c Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=98edcbcce0a4650084bd86e704cfa38bf590250c commit 98edcbcce0a4650084bd86e704cfa38bf590250c Author: Kyle Evans AuthorDate: 2025-10-29 02:37:21 +0000 Commit: Kyle Evans CommitDate: 2025-10-29 02:37:21 +0000 libutil: defer setting the MAC label until after the login class MAC policies, like mac_biba(4), may forbid changing the login class once a label has been applied. For setting up the initial login context, this isn't really expected and in-fact may break some class-based configuration. Defer setting the MAC label until after the login class is set, and remove the requirement that we have a pwd entry since the label is pulled from the login class -- we only use pwd for syslog in this path. Patch is largely by Kevin Barry, with some modifications and this commit message by kevans@. PR: 177698 Reviewed by: des, olce MFC after: 3 days Co-authored-by: Kevin Barry Differential Revision: https://reviews.freebsd.org/D53362 --- lib/libutil/login_class.c | 55 ++++++++++++++++++++++++++--------------------- 1 file changed, 30 insertions(+), 25 deletions(-) diff --git a/lib/libutil/login_class.c b/lib/libutil/login_class.c index c3c1b0ddda27..9478b4dc98ca 100644 --- a/lib/libutil/login_class.c +++ b/lib/libutil/login_class.c @@ -543,7 +543,7 @@ setusercontext(login_cap_t *lc, const struct passwd *pwd, uid_t uid, unsigned in /* we need a passwd entry to set these */ if (pwd == NULL) - flags &= ~(LOGIN_SETGROUP | LOGIN_SETLOGIN | LOGIN_SETMAC); + flags &= ~(LOGIN_SETGROUP | LOGIN_SETLOGIN); /* Set the process priority */ if (flags & LOGIN_SETPRIORITY) @@ -564,6 +564,27 @@ setusercontext(login_cap_t *lc, const struct passwd *pwd, uid_t uid, unsigned in } } + /* Set the sessions login */ + if ((flags & LOGIN_SETLOGIN) && setlogin(pwd->pw_name) != 0) { + syslog(LOG_ERR, "setlogin(%s): %m", pwd->pw_name); + login_close(llc); + return (-1); + } + + /* Inform the kernel about current login class */ + if (lc != NULL && lc->lc_class != NULL && (flags & LOGIN_SETLOGINCLASS)) { + error = setloginclass(lc->lc_class); + if (error != 0) { + syslog(LOG_ERR, "setloginclass(%s): %m", lc->lc_class); +#ifdef notyet + login_close(llc); + return (-1); +#endif + } + } + + setlogincontext(lc, pwd, flags); + /* Set up the user's MAC label. */ if ((flags & LOGIN_SETMAC) && mac_is_present(NULL) == 1) { const char *label_string; @@ -572,8 +593,10 @@ setusercontext(login_cap_t *lc, const struct passwd *pwd, uid_t uid, unsigned in label_string = login_getcapstr(lc, "label", NULL, NULL); if (label_string != NULL) { if (mac_from_text(&label, label_string) == -1) { - syslog(LOG_ERR, "mac_from_text('%s') for %s: %m", - pwd->pw_name, label_string); + syslog(LOG_ERR, "mac_from_text('%s') for %s %s: %m", + label_string, pwd != NULL ? "user" : "class", + pwd != NULL ? pwd->pw_name : lc->lc_class); + login_close(llc); return (-1); } if (mac_set_proc(label) == -1) @@ -582,33 +605,15 @@ setusercontext(login_cap_t *lc, const struct passwd *pwd, uid_t uid, unsigned in error = 0; mac_free(label); if (error != 0) { - syslog(LOG_ERR, "mac_set_proc('%s') for %s: %s", - label_string, pwd->pw_name, strerror(error)); + syslog(LOG_ERR, "mac_set_proc('%s') for %s %s: %s", + label_string, pwd != NULL ? "user" : "class", + pwd != NULL ? pwd->pw_name : lc->lc_class, strerror(error)); + login_close(llc); return (-1); } } } - /* Set the sessions login */ - if ((flags & LOGIN_SETLOGIN) && setlogin(pwd->pw_name) != 0) { - syslog(LOG_ERR, "setlogin(%s): %m", pwd->pw_name); - login_close(llc); - return (-1); - } - - /* Inform the kernel about current login class */ - if (lc != NULL && lc->lc_class != NULL && (flags & LOGIN_SETLOGINCLASS)) { - error = setloginclass(lc->lc_class); - if (error != 0) { - syslog(LOG_ERR, "setloginclass(%s): %m", lc->lc_class); -#ifdef notyet - login_close(llc); - return (-1); -#endif - } - } - - setlogincontext(lc, pwd, flags); login_close(llc); /* This needs to be done after anything that needs root privs */ From nobody Wed Oct 29 06:52:20 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cxHx03qpDz6DCQ7; Wed, 29 Oct 2025 06:52: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cxHx01xSPz3hHf; Wed, 29 Oct 2025 06:52:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761720740; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lKu6vDslzhtDHNsm3QvLR3GifB0SBMRNO7P2B9p65MY=; b=iGr7MYmJRIsaaG7dDCqZJNkig+3QxBjf/47q3bu9tKGa12SicL7EmBGehrH2e+LCZqQrUH 9RjOfYcHrPBcR4mYo+6oAhMbkvelVqf0r8sHzii+VCnvgxnCDXvgwtJI+jDGoO5BN/MPSg RFijjc6+wSluGjaDpQku+q9rgWlNpjVE4/x6QyTNYzcF4yCvPdMvczfnN53FRwSFhfZ6IS 1hcvFYh49Wc/ayhY9VGXe53ytboKkSQxjR9YFMIozLNSIMuVa6G2XLQ55hKVW7nGPTxZcW vB72IwqYpxOjWp7+XMipjGD/P6/DVMwizOO4fvkiX2XnowbDQdgkqkANXVjsDw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761720740; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lKu6vDslzhtDHNsm3QvLR3GifB0SBMRNO7P2B9p65MY=; b=KSz3abo3olE3qSbkPI9hKkKqiuT32LF3sTFZjc8sBDuYQCHl0U3CrGwRNEjlHP6W+iLNxY dCEkGctLeH75s4F1cJOZclTtKz6xZ4B2aOB/ErMdE+Wz/I8fKr8ts1EnJCy026qCrOPSM9 2QETH7XQlUSfjcjChhB6vllYG/KqY//s7D65H/14GVX52YmCpQu85vjijInMwgo8vFtv3Y PR2tfXqmL/n5uDH83LHG9jhFf3X6REG5YaB8UD1IIrjZu5bq9gwEBYNeoCxa4wRYIo2kZc 6JA/VCIVoM/W4Meyh2cCk934IiwJGFjBip8ZiTephgCamIJBTAwoAU1kqbNi8A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761720740; a=rsa-sha256; cv=none; b=k2yXF8slVo4T3Sfz4D7ywpFoeot+V78ZP2zD0+1p4GmqKmjC0CI+GRJy/Tx7J7XG4M4VqA nYdO+thKtZqYhlIr1ScxAyBGusaK3skhdGSo77MT6L8ZSb1Kyv0hxCH0AD3Y6km5R7trjF llF1GDvyQYcnOrMw4OJUMrXqsZ8cHMha/hpN3LuQz990jcLp9zHFUC2lxoZpW7gUvs07sg FRwZ8jPAQPtyGhJbYbezC4cREG67aYo/31tRAvs43mJYt/JvfjahTPuzo5Iz8DSrbqcATN PVCe4UWbnMhjASuZoXoxBqzvxysygrBn3nR7zo9CAoPaEyNudrE0OzKE2TEUXA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cxHx01FXWz8yh; Wed, 29 Oct 2025 06:52: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 59T6qKkQ049941; Wed, 29 Oct 2025 06:52:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59T6qKCs049938; Wed, 29 Oct 2025 06:52:20 GMT (envelope-from git) Date: Wed, 29 Oct 2025 06:52:20 GMT Message-Id: <202510290652.59T6qKCs049938@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "David E. O'Brien" Subject: git: 4b6700f3455f - main - Document the DEPRECATION NOTICE section for kernel interfaces List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: obrien X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4b6700f3455f46aaed2c090e1c67c67565f26369 Auto-Submitted: auto-generated The branch main has been updated by obrien: URL: https://cgit.FreeBSD.org/src/commit/?id=4b6700f3455f46aaed2c090e1c67c67565f26369 commit 4b6700f3455f46aaed2c090e1c67c67565f26369 Author: David E. O'Brien AuthorDate: 2025-10-29 06:51:26 +0000 Commit: David E. O'Brien CommitDate: 2025-10-29 06:51:26 +0000 Document the DEPRECATION NOTICE section for kernel interfaces --- share/examples/mdoc/example.4 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/share/examples/mdoc/example.4 b/share/examples/mdoc/example.4 index e627f81af530..6983fb75fada 100644 --- a/share/examples/mdoc/example.4 +++ b/share/examples/mdoc/example.4 @@ -26,6 +26,9 @@ module at boot time, place the following line in .Bd -literal -offset indent example_load="YES" .Ed +.Sh DEPRECATION NOTICE +This driver is scheduled for removal prior to the release of +.Fx 13.0 . .Sh DESCRIPTION This is an example device driver manual page for the .Nm From nobody Wed Oct 29 07:17:47 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cxJVM6n16z6DF03; Wed, 29 Oct 2025 07:17:47 +0000 (UTC) (envelope-from obrien@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "freefall.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cxJVM5rqFz3kx3; Wed, 29 Oct 2025 07:17:47 +0000 (UTC) (envelope-from obrien@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761722267; h=from:from:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:in-reply-to:in-reply-to: references:references; bh=4h4vaJZpMPr5kwBB9jtJvxxhaVHie7O9xbD0gPWcsDI=; b=e5Zec/MqiCHhWu2bWlq6TGCb7mna3AeZQj6IrkmSXet7I356ll/nwIHD/FTpkx+s7gK5vl mD8ittXDIJr9L6GBzYZGce0LmDTUCFH77ysW3xjflcG3WmdQX8vUHR8ThKueN67UQmEHXJ a2XZtz+GZuCMEbbuKhFK0Q4Y8zIC33/SSG0VyRymGWATDt92kWU3g3MPaDyoIacq1JirYX vy3BdGyMBbHfBMINrfLe8Gpv4s5kI70mtU9f3w0nDHFGRvl7IM0M+8wYoFjnccQhCX7rQ5 9mtJTJsha+/0JQZ0mk8COYL/8VYSy7KzpkFhtcOG++Obs6gwQpCi+Q1u7LeBTA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761722267; h=from:from:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:in-reply-to:in-reply-to: references:references; bh=4h4vaJZpMPr5kwBB9jtJvxxhaVHie7O9xbD0gPWcsDI=; b=DzXTNgGep6KPHOqk6rGNrY3jxXNaikKvnQYuz408WW79CPfD2N5gl5o2Q5rlJD0q3Zo67t uoxzC7PW4TU4EZfWbq380thihXkDq/SY9GWqdWerzBkgDaa1gg1s06mJzSmn6hIMGqSkjY v3v56YGdkShO/g90aosRbi7NYD8wIykAzOPVcxUdqcjmimXlW5fm0/W+sBkFe/w/rEUHf9 Zt7KvVfjo7T19X+xw1zBX1Yk0RDOx/41fQ4xE+bNDlLGykrSpJd1mkCegUe7r1TBqvkvUc gixHUaSwjE55Bp7pkkT5ive+vSmApIihh99SFGKTNkc4igFdHMOJMLOQRqZ1jg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761722267; a=rsa-sha256; cv=none; b=bIAVIqbuDVhf4ARpaGYfzzKvbm/amravf7zxiDLRXrhbm4c1UUCOUPoYBJg1gdN6zeOMd7 kCyPLU5cpzyJoo07xeYjCQ/Ap5nPLXQCXr/jW2543FkBQ54omrTgEvH2Nr2xhA8QshWK2G p4INmxMBk16PG1KzYrslkW5Y2VVqLts2WTqnCRLAyPEc/ZQkqRKXXKHmlB+01mxPq9veL6 4MSoQahR3rzxq5lPVZyvnG3ZScYukW5Ub9iPHcImGd+9CrV0hOUWpV6oZrGVxVFVeizbCo XLm8MyF/LziXvOqcW+wuZNNsFRtD2SURTCXCzm/Vx7535UCqALYMBpodpABXPQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: by freefall.freebsd.org (Postfix, from userid 664) id AE5AA3654; Wed, 29 Oct 2025 07:17:47 +0000 (-00) Date: Wed, 29 Oct 2025 07:17:47 +0000 From: David O'Brien To: "Enji Cooper (yaneurabeya)" Cc: "David E. O'Brien" , "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Subject: Re: git: c1e7e8f5cb0f - main - Add FENESTRASX to LINT to avoid breakage Message-ID: Reply-To: obrien@freebsd.org References: <202510170246.59H2kbPU069229@gitrepo.freebsd.org> <0F9EF9F0-B353-426F-BE5C-04FB8EAAFAC8@gmail.com> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <0F9EF9F0-B353-426F-BE5C-04FB8EAAFAC8@gmail.com> X-Operating-System: FreeBSD 16.0-CURRENT Organization: The NUXI BSD group X-Pgp-Rsa-Fingerprint: B7 4D 3E E9 11 39 5F A3 90 76 5D 69 58 D9 98 7A X-Pgp-Rsa-Keyid: 1024/34F9F9D5 On Fri, Oct 17, 2025 at 12:39:13AM -0700, Enji Cooper (yaneurabeya) wrote: > > On Oct 16, 2025, at 7:46???PM, David E. O'Brien wrote: > > Add FENESTRASX to LINT to avoid breakage ... > > -#options RANDOM_FENESTRASX > > +options RANDOM_FENESTRASX > Hi David, > Do you know why it was commented out previously? Should other RANDOM_ options be enabled as well? No, but I almost broke the build due to it being commented out. LINT is to build everything in order to avoid doing that. The only commented out RANDOM_* I see now is RANDOM_LOADABLE. That one might be problematic to enable in the LINT build. -- -- David (obrien@FreeBSD.org) From nobody Wed Oct 29 08:24:18 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cxKz61xGpz6DKTB; Wed, 29 Oct 2025 08:24: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cxKz617bMz3rPK; Wed, 29 Oct 2025 08:24:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761726258; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Kw58UhJ0ajBYVUzF/X2L7M77ROioBB8LzjXBeS/kIag=; b=b7a1M00sskCWy2NKRMhLyQ8bUbGeoUiLYAdjMKXLXUAV++xgW1U9kC1GBe9xcyJNNoxuLe /NNjkNJR56fVL/M3Nr26cunUVLPJYDu1UxSO612xzxRfCTIepnts4vcgyVT5Jks+Ta2gJa oYjirbFymp+V0z6rFBUirzeXlEIZBO/5f7osRlPlEiMSzgWLDqFnzjeBaxud200nm5Ug5t ueP+3XA4F55H4IzugBJQrntgYv2A59Y9lfA5a+MT+RTa7vCGp6dEIhqCy2SRwW+vTLZRmq NVjs3ZQNyBYFQZwbxHIKjk+LAnjTz/v4r/9dwBMTdjemFRve9k2CQn+bEQls1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761726258; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Kw58UhJ0ajBYVUzF/X2L7M77ROioBB8LzjXBeS/kIag=; b=yQQgef58yCRIxrY8ow7Dy9MjmleOya7SjvssNRYntO1PHVNnIdrIiccnoAf/ojf6KCeo3u fkqth5gVGIguipmkjndDoCIsoLI5sj/lMzpf6xfcvboL524k8iFEE2KbJci48r7nNCkmF+ VVn11piHyqI+3TxOHQwzkzXc618/693CfDyeH/U7uEQhWU7JKuMwQhpJ5DvtmFSeo/g8aY qC+0fScI3odLqxGUEEXbYQHCV0RvujhhwKIIx1VlXbN/BfQhax8EbrQKdj9L0Hsf3v7YE+ 6z2hlXqwzhLro1XFBjvRwl5il7gYl+9v5IeB7UxOn2CD5sXyiFzjKZjqCKs31Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761726258; a=rsa-sha256; cv=none; b=VCaCjVvinnlfVWBEXtkRoNi29wJRXHq1cV89Em6je76JaDlgsF7ml5lDJo/pMWqS2qGIWE +NhuXgYmMrxc0aN4xM5x2IIkLInFRG3CGOsT6583WpxFjEY74iOO1QI5CYCq4VW1H06dhE 9rrHTzrpOkKfYbFNsilx/0l8WHX2nlB6IAqCx8UtNr+LEh0UXNdS7dZ/yQu8IHrFN7/5hB 8cgCRWbgormhYohEbXoE4qVQ+5eO5tEsT5bo08XZkH4c9C96tbwO9+F8YJGC/8j6cysPpH hHV+K0DKu7yXNZmx3l1ckYU9gBQ/9CR6gCEMtB32Wl8x9VN6SvosM6hO6aPACA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cxKz60fCjzCHP; Wed, 29 Oct 2025 08:24: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 59T8OIhW020467; Wed, 29 Oct 2025 08:24:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59T8OIt6020464; Wed, 29 Oct 2025 08:24:18 GMT (envelope-from git) Date: Wed, 29 Oct 2025 08:24:18 GMT Message-Id: <202510290824.59T8OIt6020464@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: adfe14dcc274 - main - cam: Fix three typos in kernel messages List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: adfe14dcc2747a20dff961044d6817c507087327 Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=adfe14dcc2747a20dff961044d6817c507087327 commit adfe14dcc2747a20dff961044d6817c507087327 Author: Gordon Bergling AuthorDate: 2025-10-29 08:23:51 +0000 Commit: Gordon Bergling CommitDate: 2025-10-29 08:23:51 +0000 cam: Fix three typos in kernel messages - s/maximun/maximum/ - s/queing/queueing/ - s/exhausing/exhausting/ MFC after: 1 week --- sys/cam/ctl/ctl.c | 2 +- sys/cam/scsi/scsi_enc.c | 2 +- sys/cam/scsi/scsi_enc_ses.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/cam/ctl/ctl.c b/sys/cam/ctl/ctl.c index e110281f7c85..442ef1d30542 100644 --- a/sys/cam/ctl/ctl.c +++ b/sys/cam/ctl/ctl.c @@ -2123,7 +2123,7 @@ ctl_remove_initiator(struct ctl_port *port, int iid) mtx_assert(&softc->ctl_lock, MA_NOTOWNED); if (iid > CTL_MAX_INIT_PER_PORT) { - printf("%s: initiator ID %u > maximun %u!\n", + printf("%s: initiator ID %u > maximum %u!\n", __func__, iid, CTL_MAX_INIT_PER_PORT); return (-1); } diff --git a/sys/cam/scsi/scsi_enc.c b/sys/cam/scsi/scsi_enc.c index 9705a0b890b4..65df32ead371 100644 --- a/sys/cam/scsi/scsi_enc.c +++ b/sys/cam/scsi/scsi_enc.c @@ -732,7 +732,7 @@ enc_update_request(enc_softc_t *enc, uint32_t action) { if ((enc->pending_actions & (0x1 << action)) == 0) { enc->pending_actions |= (0x1 << action); - ENC_DLOG(enc, "%s: queing requested action %d\n", + ENC_DLOG(enc, "%s: queueing requested action %d\n", __func__, action); if (enc->current_action == ENC_UPDATE_NONE) wakeup(enc->enc_daemon); diff --git a/sys/cam/scsi/scsi_enc_ses.c b/sys/cam/scsi/scsi_enc_ses.c index 3a362eaf11a4..838eecf78ad6 100644 --- a/sys/cam/scsi/scsi_enc_ses.c +++ b/sys/cam/scsi/scsi_enc_ses.c @@ -1623,7 +1623,7 @@ ses_process_status(enc_softc_t *enc, struct enc_fsm_state *state, } else { if (cur_stat <= last_stat) ENC_VLOG(enc, "Status page, exhausted objects before " - "exhausing page\n"); + "exhausting page\n"); enc_update_request(enc, SES_PUBLISH_CACHE); err = 0; } From nobody Wed Oct 29 08:26:39 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cxL1q6FXkz6DKF2; Wed, 29 Oct 2025 08:26: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cxL1q5jpNz3rp7; Wed, 29 Oct 2025 08:26:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761726399; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rkaPgq0zFZabXTGpC3O7qXv5HuPf9HwNwwirAOyIgfw=; b=sPWsDMRSNHcVZtL1rDw9BHh8+TZxKy1Z86EAvEMm8ajVYPnptk3a/+OzeLrGmcYjghS9VM F5mjMHsDfBQSTJTcjiQNklb6xFSLGaBlUcdfI3MbY7KlfO68Nl6VEF+Eu0rErN7tB6iMxn d9V4owTyv+nMOfGS2gfbMxzIGP6lYz+vh55CUFx+mxOyMzIzlpVRWzjvh4X97i5xF4mRJn bWyUEaXuS3vrjuOugc9HneyAfn4m8eYq+7T2I2Mwt62/vq+n11AuT/28Htzc/UjP5+vD+d f+wjpusIgsSUgjnYbXUNaWUNjALiRDl1ydsD89tBT9d8b59qOtZUQpM8zujncg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761726399; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rkaPgq0zFZabXTGpC3O7qXv5HuPf9HwNwwirAOyIgfw=; b=hFNmH4LwOt2GIBiQ51xv3wYqOV8WmoqND4s9XtF1OOVhJolQbdrcgBgTrD4aEbLESApZ1E e9OLQ5a+Fx7sFxM0OWnuN3WgbToBBvi6v749ro1sNG1ZOLx6bUOJUUpWCY3dhg4w147IgE rtcItaFrpBmeeSVWM7qee4AXPYfS3KONA/5RUHyV4zlE0GSU6lJ9uINN1oep/5Ezqbja0C ejZeWOYSIVI+owsy/uOoXzP4jH6LgRJ6gi3+Ri06WWE9JArO5ALp/uxQN0enmC916ZudiG TgNJlr3oW99gfWhX8XBIUt64NPWu0xnmIbX/oN9dbIN/YhxraUwl1ElPAX0lKw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761726399; a=rsa-sha256; cv=none; b=IJ4EDfh9d42AbaVzGGm4Jc2BIl7F/mMvz+bLHxAfuBXVsU4uECS9+eS9vYi2xrNhq5j+sI nIvNftQ2nQAErO1gIYiSNccefQIXkBERNga0+DumCtFoP6+MsbIjN0mmWV7pWactmzzJbQ hUL7n70A0t1OsyB4XQdD3iN0M6oBSsaxFpGqic6IOkO6LsqZIFY9HPuAVY+jiLeXza7uQP UR5omjJtS7PWzDpp5CWMghduXRUQEz8fweHyzGZ4Bj6eMH3aGw30g/dOC2Ogz1eJSXy4Ji eegHS8RJ/Egb2d8xuAHI6a5EUMAaSFrHmVZQNgOz4VX9lMhnxTw3lrUkaDwxEA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cxL1q52TSzC8Y; Wed, 29 Oct 2025 08:26:39 +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 59T8QdL0021254; Wed, 29 Oct 2025 08:26:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59T8QdLY021251; Wed, 29 Oct 2025 08:26:39 GMT (envelope-from git) Date: Wed, 29 Oct 2025 08:26:39 GMT Message-Id: <202510290826.59T8QdLY021251@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: 08a6620093dc - main - nfsclient: Fix a typo in a panic message List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 08a6620093dc2786051bf6ae6f40ae048027021b Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=08a6620093dc2786051bf6ae6f40ae048027021b commit 08a6620093dc2786051bf6ae6f40ae048027021b Author: Gordon Bergling AuthorDate: 2025-10-29 08:26:23 +0000 Commit: Gordon Bergling CommitDate: 2025-10-29 08:26:23 +0000 nfsclient: Fix a typo in a panic message - s/eroneous/erroneous/ MFC after: 1 week --- sys/fs/nfsclient/nfs_clrpcops.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/fs/nfsclient/nfs_clrpcops.c b/sys/fs/nfsclient/nfs_clrpcops.c index b88169ba69d5..b61218958550 100644 --- a/sys/fs/nfsclient/nfs_clrpcops.c +++ b/sys/fs/nfsclient/nfs_clrpcops.c @@ -9760,7 +9760,7 @@ nfsm_split(struct mbuf *mp, uint64_t xfer) pgno++; } while (pgno < m->m_epg_npgs); if (pgno == m->m_epg_npgs) - panic("nfsm_split: eroneous ext_pgs mbuf"); + panic("nfsm_split: erroneous ext_pgs mbuf"); m2 = mb_alloc_ext_pgs(M_WAITOK, mb_free_mext_pgs, 0); m2->m_epg_flags |= EPG_FLAG_ANON; From nobody Wed Oct 29 08:29:45 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cxL5Q0CS5z6DKJ0; Wed, 29 Oct 2025 08:29: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cxL5P6VKlz3sQH; Wed, 29 Oct 2025 08:29:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761726585; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EJpv2UDBC5jgldzSsRV2ukmvdYxQ0+ark+NWAW9FYZU=; b=OYSSzrVhjvN+8P63890+6Ge/fMdUhFVkI/iGOyTlaILEgf+S44C+EAV0VM1v/PD2ekdHfe 7JDK3eybdnEWrble9WrHTk5t3ykdEdfFw8okpUGhOiGX0nUPgmYELakOjUTIo/hIsfU6Xi ST6FsNqcMx7tQI5Xdxu1NZSulQdfHTkRhO++HgTgyNiTB5uRKNWP8kk7L8+Y577xjELzBU PGkBEAnyn2pU5x8NM3wIlZfjggzN+bUtPUJYd+uRu12WZeaeRYs9UtTfzHMsTV3VG6l0u7 /8Be+oth9FR1zno1XtbUIP4L6S/6rwnxcIkKttOYBLgEeMV67F9tCDrBDdhUmw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761726585; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EJpv2UDBC5jgldzSsRV2ukmvdYxQ0+ark+NWAW9FYZU=; b=Niry8X6242L1y7zhYuP1FKuzxbeZxhcLik3bwjaebnou4iWNV7wPIoZ36vxGpG8x82nekt eo4dZ76sH/3BghoAs4csX1QygXrxhG1dqVhfy5vgRayDITJ01KWLboutX0xZ3VJuPcC730 nAz2NzjWbIAFBJwWpUS3cZtFpdUND2Pufeo2l5O5bN56Mw2sc9e14dDRBp927gVR+9O18x TeMIXKxVm5EnjXsWFxJfNnotn/+45sK4leq8DSaET6uPAj/V3OLk2Vn1TS1MiROgGJP2Vi +zE0LG42dx2P1mItuAY8yP6noPa/ZWm7I/7yMAx1eWT24jAOTjQdMxofsJw7rg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761726585; a=rsa-sha256; cv=none; b=ojkhkB1AW594+k7mqVrlVMqF3lU9sjBaGwLcN6viarpimPD/YTU0HqY9uhjv+6L7ApWVcG cnpXgvKO0xMAnvYZeZ+Ggpy0QSZNL2fzzxrAgB+7lMczXFVqe2huU0SdzUFfpkOhm0/ydE /10Bt39wwugVIUKutuWasCSiLZwKMcP7XpjnvVE4T+ewGkrpfcjMTWQirOXLz9kW6s+4v9 paAbUOH6bX/3sTK1v3J3YZUJCIqD5930evYalMmFvwtwHnm1USiiosYlytETTKzuowpHaY 17m2KtvWjLAIbRsTDpSLWbVEiL5P3pQ/AnR4OsYyLNabR7kw8Q9yL2lkrMsYmA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cxL5P51WmzCXZ; Wed, 29 Oct 2025 08:29: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 59T8TjwP022486; Wed, 29 Oct 2025 08:29:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59T8Tj59022483; Wed, 29 Oct 2025 08:29:45 GMT (envelope-from git) Date: Wed, 29 Oct 2025 08:29:45 GMT Message-Id: <202510290829.59T8Tj59022483@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: d1e39f3d6e5f - main - aic7xxx: Fix a couple of typos in device messages List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d1e39f3d6e5fce1a30a5713d522f87d83654c4bd Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=d1e39f3d6e5fce1a30a5713d522f87d83654c4bd commit d1e39f3d6e5fce1a30a5713d522f87d83654c4bd Author: Gordon Bergling AuthorDate: 2025-10-29 08:29:08 +0000 Commit: Gordon Bergling CommitDate: 2025-10-29 08:29:08 +0000 aic7xxx: Fix a couple of typos in device messages - s/Reseting/Resetting/ - s/staus/status/ - s/referrenced/referenced/ MFC after: 1 week --- sys/dev/aic7xxx/aic79xx.c | 6 +++--- sys/dev/aic7xxx/aic7xxx.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/dev/aic7xxx/aic79xx.c b/sys/dev/aic7xxx/aic79xx.c index cee45fa5cc8a..d25f5de282d0 100644 --- a/sys/dev/aic7xxx/aic79xx.c +++ b/sys/dev/aic7xxx/aic79xx.c @@ -2015,7 +2015,7 @@ ahd_handle_lqiphase_error(struct ahd_softc *ahd, u_int lqistat1) ahd_outb(ahd, CLRINT, CLRSCSIINT); ahd_unpause(ahd); } else { - printf("Reseting Channel for LQI Phase error\n"); + printf("Resetting Channel for LQI Phase error\n"); AHD_CORRECTABLE_ERROR(ahd); ahd_dump_card_state(ahd); ahd_reset_channel(ahd, 'A', /*Initiate Reset*/TRUE); @@ -8179,7 +8179,7 @@ ahd_handle_scsi_status(struct ahd_softc *ahd, struct scb *scb) AHD_UNCORRECTABLE_ERROR(ahd); break; case SIU_PFC_TMF_NOT_SUPPORTED: - printf("TMF not supportd\n"); + printf("TMF not supported\n"); AHD_UNCORRECTABLE_ERROR(ahd); break; case SIU_PFC_TMF_FAILED: @@ -8313,7 +8313,7 @@ ahd_handle_scsi_status(struct ahd_softc *ahd, struct scb *scb) break; } case SCSI_STATUS_OK: - printf("%s: Interrupted for staus of 0???\n", + printf("%s: Interrupted for status of 0???\n", ahd_name(ahd)); /* FALLTHROUGH */ default: diff --git a/sys/dev/aic7xxx/aic7xxx.c b/sys/dev/aic7xxx/aic7xxx.c index 18f68b806948..ce7f8a062b49 100644 --- a/sys/dev/aic7xxx/aic7xxx.c +++ b/sys/dev/aic7xxx/aic7xxx.c @@ -78,7 +78,7 @@ struct ahc_hard_error_entry { static struct ahc_hard_error_entry ahc_hard_errors[] = { { ILLHADDR, "Illegal Host Access" }, - { ILLSADDR, "Illegal Sequencer Address referrenced" }, + { ILLSADDR, "Illegal Sequencer Address referenced" }, { ILLOPCODE, "Illegal Opcode in sequencer program" }, { SQPARERR, "Sequencer Parity Error" }, { DPARERR, "Data-path Parity Error" }, @@ -476,7 +476,7 @@ ahc_handle_seqint(struct ahc_softc *ahc, u_int intstat) aic_set_scsi_status(scb, hscb->shared_data.status.scsi_status); switch (hscb->shared_data.status.scsi_status) { case SCSI_STATUS_OK: - printf("%s: Interrupted for staus of 0???\n", + printf("%s: Interrupted for status of 0???\n", ahc_name(ahc)); break; case SCSI_STATUS_CMD_TERMINATED: From nobody Wed Oct 29 09:23:43 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cxMHg3Cm0z6DNtv; Wed, 29 Oct 2025 09:23:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cxMHg2dMNz3yn0; Wed, 29 Oct 2025 09:23:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761729823; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gvYnm1WTKhkt7aFa3n1Jn3Crn22O+3eFtBE2JY6WwmI=; b=LGayJ7uDcVMjRjK6M1WvxB0r67ZCWQEVOT07sY7EhN5LjszS6gmYoAVHNwHJ7qIBrH9bVt OLgWQ9+gj5ejIYCQ8EnTovN4vQ9AKTrt1emI7hOnOxBkfoHu3xnBGdrJGJ8IyrdvOCZQhq 5dleB8bNl0hvG1uWrjcS9Szv2lD7WWMrsGa03bnWQTHNzznZTtPKWNs322PgOgN+g9NebX 5svL1pliaHsFJotK/nKmW7eIy3OHAv5TCS0lkrpS19Y5e2q8Jb8FwwG7/aHfRNFMvq1T6A 9jISP31hsakDvydtXo8C7EgWUc7iufKrqysE2zwt+wccilB7BC/l5cXudEBLhw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761729823; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gvYnm1WTKhkt7aFa3n1Jn3Crn22O+3eFtBE2JY6WwmI=; b=XUgSZJ475cZu1Ymkla0Y64GaPxC6LVe1EGUP/2hHSj1xBe3PSSsTxshkVKj80xbeLRYH9/ gKSjUzchvvQTRI14V8LTBxjv7MlBX+68aTosubisa6eolbnJLwdOL9vBIOHfDHoTOWJQy7 Q3MFl8NvwsBaU7H45hWH+zTjhdiA/nST8/hg90nbWgOT+CbS7vWWwLyBFtfzIhx92m1xTd ZKA/5sqb8GbG7mViU+Mm+gIYCxjNdRS+ZMzRoawzAU8YhiEafkVnlmxW+/2dAvcHjkeFBb XIIZhfnVIT+640XLcrKqVzrS8kcg66uo4tcP/jbzyY25nDeX814mza61j2qbWw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761729823; a=rsa-sha256; cv=none; b=Vx++ngGAGW/a/B4at6vSZS/XSOq90UTwGH++Gey4LIQnGtoOhw1uduZ+jNq4dMbUteWt+V z8EoR/BMNbCDDU+Z5isgMmCVQFYHhuJxUClXmXxfxm2YI+VR9bSB8MGFbVlkOjVkSMDCT5 IppSrVlIwMD3d7KYdVS4K+rKvHBg+fJduni+wfyQHiwhY1SxsvXd/cml1hEON12V/m9bDn YRwevX+bbCbdFh5HpqYpFoZv+xjC1ffZcu3IJ/ZKmMIokAbOtQ4stVHlKet0sSjFSWECQC PKtvjQh6cAdqJzgr7sI3j4hTkFJ+NsxegJMvUSaggT3wtyCh8noa6uMdnbwiWQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cxMHg2DRQzVns; Wed, 29 Oct 2025 09:23: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 59T9NhSq034718; Wed, 29 Oct 2025 09:23:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59T9NhuN034715; Wed, 29 Oct 2025 09:23:43 GMT (envelope-from git) Date: Wed, 29 Oct 2025 09:23:43 GMT Message-Id: <202510290923.59T9NhuN034715@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: db0d002a217b - main - pf tests: tftp-proxy test case List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: db0d002a217b1171ca85e8c17706de744ab6635d Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=db0d002a217b1171ca85e8c17706de744ab6635d commit db0d002a217b1171ca85e8c17706de744ab6635d Author: Kristof Provost AuthorDate: 2025-10-28 13:13:56 +0000 Commit: Kristof Provost CommitDate: 2025-10-29 08:38:58 +0000 pf tests: tftp-proxy test case Sponsored by: Rubicon Communications, LLC ("Netgate") --- tests/sys/netpfil/pf/Makefile | 2 + tests/sys/netpfil/pf/proxy.sh | 61 +++++++++++++++++++++++++++++ tests/sys/netpfil/pf/tftpd_inetd.conf | 28 +++++++++++++ tests/sys/netpfil/pf/tftpd_proxy_inetd.conf | 27 +++++++++++++ 4 files changed, 118 insertions(+) diff --git a/tests/sys/netpfil/pf/Makefile b/tests/sys/netpfil/pf/Makefile index b363e0b17c76..9416f6abbdf1 100644 --- a/tests/sys/netpfil/pf/Makefile +++ b/tests/sys/netpfil/pf/Makefile @@ -90,6 +90,8 @@ ${PACKAGE}FILES+= \ pft_ether.py \ pft_read_ipfix.py \ rdr-srcport.py \ + tftpd_inetd.conf \ + tftpd_proxy_inetd.conf \ utils.subr \ utils.py diff --git a/tests/sys/netpfil/pf/proxy.sh b/tests/sys/netpfil/pf/proxy.sh index 78ce25930c04..a07bb259b544 100644 --- a/tests/sys/netpfil/pf/proxy.sh +++ b/tests/sys/netpfil/pf/proxy.sh @@ -88,7 +88,68 @@ ftp_cleanup() pft_cleanup } +atf_test_case "tftp" "cleanup" +tftp_head() +{ + atf_set descr 'Test tftp-proxy' + atf_set require.user root +} + +tftp_body() +{ + pft_init + + epair_client=$(vnet_mkepair) + epair_link=$(vnet_mkepair) + + ifconfig ${epair_client}a 192.0.2.2/24 up + route add -net 198.51.100.0/24 192.0.2.1 + + vnet_mkjail fwd ${epair_client}b ${epair_link}a + jexec fwd ifconfig lo0 127.0.0.1/8 up + jexec fwd ifconfig ${epair_client}b 192.0.2.1/24 up + jexec fwd ifconfig ${epair_link}a 198.51.100.1/24 up + jexec fwd ifconfig lo0 127.0.0.1/8 up + jexec fwd sysctl net.inet.ip.forwarding=1 + + vnet_mkjail srv ${epair_link}b + jexec srv ifconfig ${epair_link}b 198.51.100.2/24 up + jexec srv route add default 198.51.100.1 + + # Start tftp server in srv + jexec srv /usr/sbin/inetd -p ${PWD}/inetd-srv.pid \ + $(atf_get_srcdir)/tftpd_inetd.conf + + jexec fwd /usr/sbin/inetd -p ${PWD}/inetd-fwd.pid \ + $(atf_get_srcdir)/tftpd_proxy_inetd.conf + + jexec fwd pfctl -e + pft_set_rules fwd \ + "nat on ${epair_link}a inet from 192.0.2.0/24 to any -> (${epair_link}a)" \ + "nat-anchor \"tftp-proxy/*\"" \ + "rdr-anchor \"tftp-proxy/*\"" \ + "rdr pass on ${epair_client}b proto udp from 192.0.2.0/24 to any port 69 -> 127.0.0.1 port 69" \ + "anchor \"tftp-proxy/*\"" \ + "pass out proto udp from 127.0.0.1 to any port 69" + + # Create a dummy file to download + echo 'foo' > /tmp/remote.txt + echo 'get remote.txt local.txt' | tftp 198.51.100.2 + + # Compare the downloaded file to the original + if ! diff -q local.txt /tmp/remote.txt; + then + atf_fail 'Failed to retrieve file' + fi +} + +tftp_cleanup() +{ + pft_cleanup +} + atf_init_test_cases() { atf_add_test_case "ftp" + atf_add_test_case "tftp" } diff --git a/tests/sys/netpfil/pf/tftpd_inetd.conf b/tests/sys/netpfil/pf/tftpd_inetd.conf new file mode 100644 index 000000000000..3554d0a7fb08 --- /dev/null +++ b/tests/sys/netpfil/pf/tftpd_inetd.conf @@ -0,0 +1,28 @@ +# +# SPDX-License-Identifier: BSD-2-Clause +# +# Copyright (c) 2025 Rubicon Communications, LLC (Netgate) +# +# 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. + +tftp dgram udp wait root /usr/libexec/tftpd tftpd -l -S -s /tmp +tftp dgram udp6 wait root /usr/libexec/tftpd tftpd -l -S -s /tmp diff --git a/tests/sys/netpfil/pf/tftpd_proxy_inetd.conf b/tests/sys/netpfil/pf/tftpd_proxy_inetd.conf new file mode 100644 index 000000000000..aa5f000f3bba --- /dev/null +++ b/tests/sys/netpfil/pf/tftpd_proxy_inetd.conf @@ -0,0 +1,27 @@ +# +# SPDX-License-Identifier: BSD-2-Clause +# +# Copyright (c) 2025 Rubicon Communications, LLC (Netgate) +# +# 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. + +tftp dgram udp wait root /usr/libexec/tftp-proxy tftp-proxy From nobody Wed Oct 29 15:45:40 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cxWmP0Tg4z6Dt56; Wed, 29 Oct 2025 15:45: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cxWmN6Vtxz3TBB; Wed, 29 Oct 2025 15:45:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761752740; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PnCLWYUCAeJUgTjNl6z333mPC0T3vfEqxGiSUE4N+KA=; b=ysi6ksDjk/PihrzXhcRLkWDFnga+bSCCkIHqFsSa6oehQKlEYMM++3QLFUXrKuisyeTagY CJnw/oFyIStglEJR4N8EMfeLty/ynQnjr/eazqf2nJR4UU8k7954vDeRsLwzaoUTtshVL/ tEdJVydKGORS+zezTcKEgkiFHDJpz6JH7RNNEvHCAl/40rQt74r3eGcOi3FjXWDYJJQhYN fJ7itZtdkc4FGNAaw9JriJFiPMlifrqxrbUEA9MGUVL8qCiLDKuHy3ioJpC+buuMkCw2G+ ov9QVHAzYBbWYxIJ2n/GrErUBjnzUA/Z4zMcGRhRMB831uTWGvvVCGqQ9woiMg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761752740; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PnCLWYUCAeJUgTjNl6z333mPC0T3vfEqxGiSUE4N+KA=; b=OtD6Ag6OI9SfraUHsDDbR+xR6t8HfkXijgSG7//63qhQfYUhPbhhAkJulRM/ivuSbYEWH9 8Jdey8v5F6IzMsy3QEqcaZXdremVFSgB/shY9Ufw4KQrXm1kc+yAC6NWbVPvSNOzrWH18+ sK1v2vXEf4bZAQIqPXK4VGAy1f7GIxIaUDqRzkyuZQPZbb2uG9Vi1O8lB6vLdQr/DbaOhX 5rICXe6oVFAZpYsYQoldvy2adOG/MpD5r7er/b7fR6+c3Xp6MfaDK6M3psX4kjcCxen3SU yqcB+1Y5PUMop2tTI+KfXfJX8QG/zvVD2/ouKjKthj7GrUCy6GQUZd3O3MQFgg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761752740; a=rsa-sha256; cv=none; b=xuIpvc6lTAe6vAO/W0kiqsQUPUDRiQEeldBJGG+9QxGc3GafGDGZ1PeBnrToZA46l2qCtk BNAr9aD4vWadNQqqbQSKtHJYkQoLQfC0v9qb7As65DaiD+FHuT5XOoaGIzfC4Fn4EvwMrr vYQUpaWftZMC+mzp9FemHFFnT2mnYG2q/fcQLqp12MqkVnPmsOU63dYJduPPPuQ1DJghEI 5MwRRG6elpkt8gUI4QBxImKD64x6505p/cdHd6UMx2pnvfiV1GYWjKFGkryT3vO2EvMa6K KakdCv4zpcId0yEKVqa+VUQoP0CfCOFyL03ffJfRjd2FlFkUmvfeRPLtmz3exA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cxWmN5qW1zhnH; Wed, 29 Oct 2025 15:45: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 59TFjem7050088; Wed, 29 Oct 2025 15:45:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59TFjep6050085; Wed, 29 Oct 2025 15:45:40 GMT (envelope-from git) Date: Wed, 29 Oct 2025 15:45:40 GMT Message-Id: <202510291545.59TFjep6050085@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: 63af953e09cc - main - audit(4): Fix a typo in an kernel error message List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 63af953e09ccd11f2f5b4d83b10cc231f691de46 Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=63af953e09ccd11f2f5b4d83b10cc231f691de46 commit 63af953e09ccd11f2f5b4d83b10cc231f691de46 Author: Gordon Bergling AuthorDate: 2025-10-29 15:05:43 +0000 Commit: Gordon Bergling CommitDate: 2025-10-29 15:44:46 +0000 audit(4): Fix a typo in an kernel error message - s/Authenticateion/Authentication/ MFC after: 5 days --- sys/security/audit/bsm_errno.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/security/audit/bsm_errno.c b/sys/security/audit/bsm_errno.c index 6bc110cf0237..1f3b12735b84 100644 --- a/sys/security/audit/bsm_errno.c +++ b/sys/security/audit/bsm_errno.c @@ -514,7 +514,7 @@ static const struct bsm_errno bsm_errnos[] = { #else ERRNO_NO_LOCAL_MAPPING, #endif - ES("Authenticateion error") }, + ES("Authentication error") }, { BSM_ERRNO_ENEEDAUTH, #ifdef ENEEDAUTH ENEEDAUTH, From nobody Wed Oct 29 15:45:41 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cxWmQ0yTfz6Dt2r; Wed, 29 Oct 2025 15:45: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cxWmP6xfbz3T7t; Wed, 29 Oct 2025 15:45:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761752742; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=w+ZLNV+oC5KanV56XQrF6YUFAEmYeao4AGG8mVZR2vs=; b=MqDaWqyCzRhtyCDCiVrlPvyJZHzu7s0NMuosSnSmZ/IMFv+FylAdEA72gF7eU71UHzzSZ4 NaE2pNb/v7P4+h9A/egRh1ZqHhbYEmbn29TWMmj0tMRnsGrzKTRrUA3miqwkVHfKtfVCYj 8I0J5X4kqRnoRjn1ydErvlYZOdFnT3Lc0z0qSNBIZMqGDktO0o5o98174yQ56wHBUgLADL R31AvhLDFU9y9/gtNnQXIaJNtrJe3qKnT/CJeU5eiIlhB3i/aDfIgur0D9J2FTCBglKeK4 1EBF4x5uw14gR08eUgghXoNBagRyRfb1+NjP3eElwNu566+e1U4gzORJX4na8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761752742; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=w+ZLNV+oC5KanV56XQrF6YUFAEmYeao4AGG8mVZR2vs=; b=Z8u5E3F0fgPwG7bN+CiWYBP4iwoT1l1AOJVWWiaXM2AIIvbE6RtiFCmCrLM8HvkN3BVOt7 rxiA9l5t47qOcKKEP7uO52p1DGLtxuMqjqwvO0/Vkp2AKWW2nPQZ0poOn4p5/7Mvhb48w4 2mYlNxzLMGRZx7z4I7rcom3q+JHmPZUVCy5uBUJcxoHncs9wBzMibs7pHFNeBpv+sfWiD2 hoe9Fmu6+D6l3uYygjXvj7jjWcCysooaoRsKFVx7juOOqfpzwichMAbu+/pqWNH4NFjAXr EORniAURzvnMFKIu1U3im9s4Z3Yt45aUCderpRYUUuRWtXP4X3zmjqWfGbvMkg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761752742; a=rsa-sha256; cv=none; b=B4i9G3E8BILxoZZZoXVcsuE87yoy2x4FJ4hBpdI52p5QWgrmAf/FprHkvVNsO4wR1EIsob BaqMJJzmYmd0mldoFXPsIVw3GIKdkrJX3Q6bilvrETJ77nSeYvML5HxtmQUcDUChiAUa+h dl0GGCCIkb4ZqXtmbvh498v/VKzrGLsNsRhNe3dvZ9S2rXd9xvITE5z8KpTSyFoJXz4Tdp Etq/beEu6fMzEIw/G+deRdhVK3Hvn5I+j0cRJP+LP3Qvl/MqVT5Etmv3p00bWZRsJIYHR4 G8Q9ftEFl9tEmgkT05v72HAAp2VVlhKEbvS4dWa/N+/XtSD6GAyr5dzmLI1M0Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cxWmP6Xm3zjVj; Wed, 29 Oct 2025 15:45: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 59TFjfk2050123; Wed, 29 Oct 2025 15:45:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59TFjf1S050120; Wed, 29 Oct 2025 15:45:41 GMT (envelope-from git) Date: Wed, 29 Oct 2025 15:45:41 GMT Message-Id: <202510291545.59TFjf1S050120@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: 679976d81620 - main - usb(4): Fix typos in upgt(4) and zyd(4) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 679976d8162004f879a1a0d5ca0c5d2ade5fa1bd Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=679976d8162004f879a1a0d5ca0c5d2ade5fa1bd commit 679976d8162004f879a1a0d5ca0c5d2ade5fa1bd Author: Gordon Bergling AuthorDate: 2025-10-29 15:08:31 +0000 Commit: Gordon Bergling CommitDate: 2025-10-29 15:44:54 +0000 usb(4): Fix typos in upgt(4) and zyd(4) - s/frequence/frequency/ - s/finsihed/finished/ MFC after: 5 days --- sys/dev/usb/wlan/if_upgt.c | 6 +++--- sys/dev/usb/wlan/if_zyd.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/dev/usb/wlan/if_upgt.c b/sys/dev/usb/wlan/if_upgt.c index 1ab833301b3c..a860cc3e0fa9 100644 --- a/sys/dev/usb/wlan/if_upgt.c +++ b/sys/dev/usb/wlan/if_upgt.c @@ -1174,7 +1174,7 @@ upgt_eeprom_parse_freq3(struct upgt_softc *sc, uint8_t *data, int len) sc->sc_eeprom_freq3[channel] = freq3[i]; - DPRINTF(sc, UPGT_DEBUG_FW, "frequence=%d, channel=%d\n", + DPRINTF(sc, UPGT_DEBUG_FW, "frequency=%d, channel=%d\n", le16toh(sc->sc_eeprom_freq3[channel].freq), channel); } } @@ -1216,7 +1216,7 @@ upgt_eeprom_parse_freq4(struct upgt_softc *sc, uint8_t *data, int len) sc->sc_eeprom_freq4[channel][j].pad = 0; } - DPRINTF(sc, UPGT_DEBUG_FW, "frequence=%d, channel=%d\n", + DPRINTF(sc, UPGT_DEBUG_FW, "frequency=%d, channel=%d\n", le16toh(freq4_1[i].freq), channel); } } @@ -1244,7 +1244,7 @@ upgt_eeprom_parse_freq6(struct upgt_softc *sc, uint8_t *data, int len) sc->sc_eeprom_freq6[channel] = freq6[i]; - DPRINTF(sc, UPGT_DEBUG_FW, "frequence=%d, channel=%d\n", + DPRINTF(sc, UPGT_DEBUG_FW, "frequency=%d, channel=%d\n", le16toh(sc->sc_eeprom_freq6[channel].freq), channel); } } diff --git a/sys/dev/usb/wlan/if_zyd.c b/sys/dev/usb/wlan/if_zyd.c index 7affdcdce089..b7dfc941224d 100644 --- a/sys/dev/usb/wlan/if_zyd.c +++ b/sys/dev/usb/wlan/if_zyd.c @@ -827,7 +827,7 @@ zyd_cmd(struct zyd_softc *sc, uint16_t code, const void *idata, int ilen, if (error) device_printf(sc->sc_dev, "command timeout\n"); STAILQ_REMOVE(&sc->sc_rqh, &rq, zyd_rq, rq); - DPRINTF(sc, ZYD_DEBUG_CMD, "finsihed cmd %p, error = %d \n", + DPRINTF(sc, ZYD_DEBUG_CMD, "finished cmd %p, error = %d \n", &rq, error); return (error); From nobody Wed Oct 29 15:45:42 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cxWmR3c5cz6Dt9N; Wed, 29 Oct 2025 15:45: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cxWmR08Rwz3SxZ; Wed, 29 Oct 2025 15:45:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761752743; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S4JIkC8FJ4ZI7OzmXOfLrmTWKR5FqYUvR0hvYh/IY5M=; b=L4UHwsnFwKczJPJpbO4S+9K0rEm3ACoTtipZ7+3rULzQgAq7EwX6eEx9CRd2ktLU1EN31y XJvEbfSayKkUWnrd9vJM//SNVvA9aTP/h7yTidxcz5X5qHTwnTHkNoqICTe3Nt1bfZLqdR T/YPf15dKRVxxk08x+/48mHduyjQN+RUzmbS6T87F3ozI4zCJMz3l8R8PWefCPFCzAB+vG eoJ22tigigG8vv/Gem0cMRa6vTLXlPuGdfmNC9407QRHqBNWomFsIeNF7BH9cLE65S1CID CogMOOYcpBZO3NsmX+sFL6WW+11FAI8tUaAvloXhEiJuH+apv5mCfQvdh+Zu9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761752743; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S4JIkC8FJ4ZI7OzmXOfLrmTWKR5FqYUvR0hvYh/IY5M=; b=rpboUKCN8uXu7mHdobD/iWwil7gB1dF+cQp3pljRxmIkpXp9rdSKmMarQtpe+gxNjSL7u3 g01plpuGvbx+6EiUOi/J5aPwAIrsfiOIgUZYxmJRXL+TfTbGmMvI0EA8AGxlXaHFQsuKUr RmlXaMl9YALeX0aUN4+TFKV4NB6gdLQ++jDt5dcyKGCO5T5eO61zgUxqdrDBvlLD86LA9n m25p/iPIGsI0bahvuS+luKJrd7mD5rg0T4EfROP/xXEZeUKr74c8EB1DxV/nYv1L02HQ8D SNYMzCK0fsQODfgWPTnxYAJzeXTQG3E4UaRnnEIXzUuU4Ahw0IUAtNrPSwNPMg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761752743; a=rsa-sha256; cv=none; b=LV0cBKce3J8BBrjU0G9G/CwkBvvXStx++1kPmfNud/UDTcqL7uVq2P3vl7Nl1LGuNfRtYY /oOJj3OAYU4TZY394TB4Bl+MvmEXU8vzQkb87TDUtqkzrrqxF3n1V0HnKY/LsPVfv7JTJH wESf/pxBoKIDtCYtiRLgdKgof8xYscd6KelhdlaBXmCwelCg2dsyeKv1pcBg9xzAD0Mxcs mV9DL3udxy73gAHnwsHhLu7r3v6GxD1EpBAji3o+UgrAzeE4bQ7qq5op3vCG8G8+HI0SWR u6B++hMRRGjgzeAiX8VSelDTcrwNdlqFcxnmsvlvSUeGNIBPB3bcYlUNsSt+Ig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cxWmQ6qrzzjVk; Wed, 29 Oct 2025 15:45: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 59TFjgID050160; Wed, 29 Oct 2025 15:45:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59TFjgZm050157; Wed, 29 Oct 2025 15:45:42 GMT (envelope-from git) Date: Wed, 29 Oct 2025 15:45:42 GMT Message-Id: <202510291545.59TFjgZm050157@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: 57b78a557b3c - main - geom(4): Fix typo in a kernel message List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 57b78a557b3ce07b1589c9c21debe97d45599391 Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=57b78a557b3ce07b1589c9c21debe97d45599391 commit 57b78a557b3ce07b1589c9c21debe97d45599391 Author: Gordon Bergling AuthorDate: 2025-10-29 15:10:09 +0000 Commit: Gordon Bergling CommitDate: 2025-10-29 15:45:01 +0000 geom(4): Fix typo in a kernel message - s/supressing/suppressing/ MFC after: 5 days --- sys/geom/geom_vfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/geom/geom_vfs.c b/sys/geom/geom_vfs.c index d9e9a6c82da1..9b5e5a84191f 100644 --- a/sys/geom/geom_vfs.c +++ b/sys/geom/geom_vfs.c @@ -153,7 +153,7 @@ g_vfs_done(struct bio *bip) g_print_bio("g_vfs_done():", bip, "error = %d%s", bip->bio_error, bip->bio_error != ENXIO ? "" : - " supressing further ENXIO"); + " suppressing further ENXIO"); } } bp->b_error = bip->bio_error; From nobody Wed Oct 29 15:45:44 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cxWmT3443z6Dskm; Wed, 29 Oct 2025 15:45: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cxWmS1kkrz3TBW; Wed, 29 Oct 2025 15:45:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761752744; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LRUcZa1I5BFpyLOulJRzI50X+fdLxEUb0iDYPnfADao=; b=qAcoDMosITWdsTFNnm/yLO36FKaK5Ety5LtLAA9T29QK+fNcixMEBFp5DYvKBs0WmbBR8f dz/OTEc068BdMM81wToyRDkPwIvqaE28+xia/5+2X2c/lwgeDKZ8zdCt54WZ3Ic2mvayt5 mYVSVub+6tja8ldJNIXAWRe5f0I5+Hxp1idC4C2+BCogXaArfHNBIdsH7CyZs9joHCHf+e //cWeqi6qJrB7w0ON8RyEOvAqKGbrOEB4sPhiaNEd1o2lmaoCHtxhYszcm6ixN03bjBXB7 6jtkNLONy0OTs4imQ5lYhW0VJqpsqFbzsZFp517Ke5G1zIk+UtW01NhMvAPrbw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761752744; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LRUcZa1I5BFpyLOulJRzI50X+fdLxEUb0iDYPnfADao=; b=Rb+B1sc2RyR27XeyeCeA3w2Lu0E5Dh/aZv3BXrJFBpQByNv89l8wDco1Dj4u9Os5hIq2kQ 9SxQBr2IIKNffn4bLuKTuKd9C8MpU+MprVccRaIpV5r2mJWGgMdkloyKH9ic21dcPG8Xrn mD/JTyJBFOmF3mZqzebLVFlVaN/dxgj8E5xymBNoNC7KDZZ6sBfDhweMfhMed0DEJrTdzt zJm/NpiOfhuatUKx5Bd8BqnrCSN1yQQIlwB+fIwUCc3Aj6fSDpNSoXg47t9sVMlByNYeLK kKKRh+YOmsTFet3B/rj8YyEG04pFJgMV3br4NvIiblVKuan+Bme1qBv3b+vH0Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761752744; a=rsa-sha256; cv=none; b=Knsr8tz/zgU7rCmneMKkUjq/FVQo9qjlXktBaNm437jtMfbF6tAJRxBUI9Q7vkuAB7tjB5 KnHz6XluzL9/0NHCxkv+cCCgWWOLeN4I0HclFSSF/DnxcTTESzUeQErg7vgMb36bhJw/R0 KxOw4d7B91V3m8YKFqVSd5PuSOHJCRM2JiVLMlSeMloX3fHP0H693nUmv3ebkOU1PEpQAE z9JLLyA2T35j3kAbAWOzOch7X4guZ7ukZB9PcXP6Kk146JgQ28N4jjxAq3kSfOKz7Rt1gG 4kjVT1+U0+oxQC3JZFLl6KPTPUC0kx/NlfSliRussKDbZzI3wXwsDDFcZndiGQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cxWmS11j7zjVl; Wed, 29 Oct 2025 15:45: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 59TFjidg050193; Wed, 29 Oct 2025 15:45:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59TFjitY050190; Wed, 29 Oct 2025 15:45:44 GMT (envelope-from git) Date: Wed, 29 Oct 2025 15:45:44 GMT Message-Id: <202510291545.59TFjitY050190@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: b074d146969d - main - arm/mv: Fix typo in a kernel error message List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b074d146969d3097c1e144623360b36083d74927 Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=b074d146969d3097c1e144623360b36083d74927 commit b074d146969d3097c1e144623360b36083d74927 Author: Gordon Bergling AuthorDate: 2025-10-29 15:12:52 +0000 Commit: Gordon Bergling CommitDate: 2025-10-29 15:45:07 +0000 arm/mv: Fix typo in a kernel error message - s/Unkown/Unknown/ MFC after: 5 days --- sys/arm/mv/mv_cp110_icu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm/mv/mv_cp110_icu.c b/sys/arm/mv/mv_cp110_icu.c index 25ec19bee575..d30f337f56fc 100644 --- a/sys/arm/mv/mv_cp110_icu.c +++ b/sys/arm/mv/mv_cp110_icu.c @@ -257,7 +257,7 @@ mv_cp110_icu_init(struct mv_cp110_icu_softc *sc, uint64_t addr) WR4(sc, ICU_SETSPI_SEI_AH, (addr >> 32) & UINT32_MAX); break; default: - panic("Unkown ICU type."); + panic("Unknown ICU type."); } sc->initialized = true; From nobody Wed Oct 29 15:45:45 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cxWmV1lWsz6Dskp; Wed, 29 Oct 2025 15:45: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cxWmT2Pcvz3TF4; Wed, 29 Oct 2025 15:45:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761752745; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JvLAURf38vA0WdhIVxFF1f6tO6LyZd4qV5rf1dGhifE=; b=vE9tF5NwdIKO8mTYbw95xdgATQzb5ozTb+0rgPH77t37nIjPS1wA8cl9kfRS+wpImZqe2v od8xavifLQdP4q6Lubkg7u4GA+c1fKfUVc32Wyp/nkSaBbcNTx8uHcACrdL+uvH7sWSwY9 NYafA3EVmMNL2NEt9fPQKhsS4C0z90pE7AD8YstHyuZsN6WuF9DzRqlJg1Kf8bkufkX7AP rlAJfsyIqS4Ysebx7VTUBgaZD3Q0smmJ0lGseDFEZfyYd3mAdK+K0X11qFGw2pOTpLtCdd qfdkDcRMlwY5p1jc+NAVtMhqdTyZ8IpZeLDBBaZ0dDfWdoMwlGL87tXbwduUbw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761752745; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JvLAURf38vA0WdhIVxFF1f6tO6LyZd4qV5rf1dGhifE=; b=KH5ZKlSTtIOdisrerBW1cwKssHHvJr0g5LCCF6/1JsJXLsAxI8BP5JvMx01jUT1QVR2kuG LzoQ9uyXXKbzamX4xYzQh6iqXz3IE3/B3uUxXSBmwiLjjhI1Ymq697dqDE7+tkA40XgqbA nhqqpfHVL40I6TZTTeBZbZCi6Q3dbgc0oB52yhYR1NIxm9C6qQVewo8tzraBZZRaIEbKgM fdY3TmFJDND6Oi709wS4acelRuIk5WiRJ3uT/Ly4P7IZqxCJo+3LHt6QmMIXWgtoHb7i8n kliE71nHSvbQf3ojeFZ+qvsT07QRsmVqokJY3OI9LFDywfsbhIpoHZBGu5KVLw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761752745; a=rsa-sha256; cv=none; b=CV3pkuD+/xxwJ+jOP8btarkPmK6hc24T5kolF/XUISLKsY6a9kRUqm/LmQjLmi7wLmUnZK XtNCpRSeJYlhhWVx5UfRDOFkfdgI+FWpRGW3IHCoQCwZLeAflaeQgIglEunOph80uDn301 XCp1FzWEDhomV2uhBXW2JL/jDe4RCpPe7+MgB2kvM5N+qQDLknbqWkHbkf5eJR64vQUmzV pVnY5A2JyKIiWX1xmtQGWVrkXawRudV3LLnBVnO40Y4ktGfsy3c1mv/9twQo4x7T9bQ7d5 ZO8Oka3dMBcSWfuVvI1XIUQvTqOFtiHxpjK/C1Z+RpW/HT85JJR3OOeCDmpJlA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cxWmT1zXJzjmp; Wed, 29 Oct 2025 15:45: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 59TFjjfI050226; Wed, 29 Oct 2025 15:45:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59TFjjim050223; Wed, 29 Oct 2025 15:45:45 GMT (envelope-from git) Date: Wed, 29 Oct 2025 15:45:45 GMT Message-Id: <202510291545.59TFjjim050223@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: 862024c00f31 - main - arm/ti: Fix typo in a KASSERT message List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 862024c00f3126220ac425f9ec1f3d4286064688 Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=862024c00f3126220ac425f9ec1f3d4286064688 commit 862024c00f3126220ac425f9ec1f3d4286064688 Author: Gordon Bergling AuthorDate: 2025-10-29 15:14:23 +0000 Commit: Gordon Bergling CommitDate: 2025-10-29 15:45:15 +0000 arm/ti: Fix typo in a KASSERT message - s/patcket/packet/ MFC after: 5 days --- sys/arm/ti/cpsw/if_cpsw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm/ti/cpsw/if_cpsw.c b/sys/arm/ti/cpsw/if_cpsw.c index dc3d8b1f9023..e2cc9ee0d7b2 100644 --- a/sys/arm/ti/cpsw/if_cpsw.c +++ b/sys/arm/ti/cpsw/if_cpsw.c @@ -1646,7 +1646,7 @@ cpsw_rx_dequeue(struct cpsw_softc *sc) port = (bd.flags & CPDMA_BD_PORT_MASK) - 1; KASSERT(port >= 0 && port <= 1, - ("patcket received with invalid port: %d", port)); + ("packet received with invalid port: %d", port)); psc = device_get_softc(sc->port[port].dev); /* Set up mbuf */ From nobody Wed Oct 29 15:45:46 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cxWmW0BzFz6DtPG; Wed, 29 Oct 2025 15:45: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cxWmV4pS5z3TBs; Wed, 29 Oct 2025 15:45:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761752746; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8qlVwT+4ho+qO9mmb346pYfwHpmlV4U8p5GI+ettTZc=; b=Ovj14OKp5ggkOiYqkBIVevucqUpLRoRlo40u3KXl4Kv+ICLwiJBXPFxAPmv+JPyGZjhO3v /UhMeE0RLj8WyiQZ82ZlvZ0BpoIkGXyfiY8sW2RACItnD1UsRMrjcl+XBSdhz/214QtM1c sNfLA18qQfx3VF2NICyWUzuNn4L+4OADUw0VLomKhvbDfWI38JGqhKfe5kIGtjW8xbWW+p cwQ8mZC7ueKTchCU8YquhzUEQeTA0oXXf2GKKoFPCHlXi8W3JmJF/e+fr4X+A6wNUnJfHU W7sSBIPO42wwLIubdp/TsAHdaDhaU63LcPREI+HFvJ1v1YUUo5ZwvNvmX+shLw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761752746; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8qlVwT+4ho+qO9mmb346pYfwHpmlV4U8p5GI+ettTZc=; b=Aedj0cIY43AKbxWtbuGa9b1uocLminlLyTnJaoTZ7XzYJ7lQs+/sVPtSjghLydQNRzcabv 8NZ3q77kZKp29qh9AAD7kPRij2HxshHDQ3ibikCq7C/xKeqgTTr2uAREGND8PhVT2Fklg4 OE8dEuKPoEoGHC891I7QW8LW72m2AN6TtSbp2Cxz5uo7/srlECbz7eapWIGpkBgz0PTiVk DyiDC2xkuhJbKBEQXB5hZdUPZbqAcGPebz1caegx0VhTG0y+vBh+AHhiu3iNx9qh1AYLTQ QzDByX1aD4HziJLJtHHgdzXJJV+mBknx6ks1G5StCNgSaPy/xZV1BRjfZhOoYw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761752746; a=rsa-sha256; cv=none; b=qhIezSpEid+wmrVhwxYrPwr4yPCGTej0CcC8MiQLv5IO4ERFvmIXT3YOJzIBeynMbDutWh vI+AtEZBLkpA15aHsTAPlPJdNvDoleLK++AlIpGyj3rAIJLorho4iB8I4KTh8rOtmkaUtI L2m+/Zy/sPgaT98wZYW1WNvTojw85ZbxDyMAbrzUTENP2CMR5je60EdRQ4XuM/J3/1hb9k R3SsX8Ld1RNuxIBJ2G6rrMMUbhgJ6YsBWMSaaPS2q8HDiS5vc1KOzaDNSdG3+rGLplcxOH I61WxNPliQAbvVLfUCCY4e7CW4HGIEpMr0KU5SQD0mm3UDLrIwCtkDEgxtdV5Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cxWmV32YtzjVm; Wed, 29 Oct 2025 15:45: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 59TFjk0H050266; Wed, 29 Oct 2025 15:45:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59TFjkWn050263; Wed, 29 Oct 2025 15:45:46 GMT (envelope-from git) Date: Wed, 29 Oct 2025 15:45:46 GMT Message-Id: <202510291545.59TFjkWn050263@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: 6a02851a0e34 - main - tegra210: Fix typo in a kernel message List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6a02851a0e346cbff074dab87807c9ee9d1e8d94 Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=6a02851a0e346cbff074dab87807c9ee9d1e8d94 commit 6a02851a0e346cbff074dab87807c9ee9d1e8d94 Author: Gordon Bergling AuthorDate: 2025-10-29 15:16:41 +0000 Commit: Gordon Bergling CommitDate: 2025-10-29 15:45:21 +0000 tegra210: Fix typo in a kernel message - s/volatge/voltage/ MFC after: 5 days --- sys/arm64/nvidia/tegra210/max77620_regulators.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/arm64/nvidia/tegra210/max77620_regulators.c b/sys/arm64/nvidia/tegra210/max77620_regulators.c index af1a5af20ec3..d52aeaef1287 100644 --- a/sys/arm64/nvidia/tegra210/max77620_regulators.c +++ b/sys/arm64/nvidia/tegra210/max77620_regulators.c @@ -364,7 +364,7 @@ max77620_get_sel(struct max77620_reg_sc *sc, uint8_t *sel) rv = RD1(sc->base_sc, sc->def->volt_reg, sel); if (rv != 0) { - printf("%s: cannot read volatge selector: %d\n", + printf("%s: cannot read voltage selector: %d\n", regnode_get_name(sc->regnode), rv); return (rv); } @@ -384,7 +384,7 @@ max77620_set_sel(struct max77620_reg_sc *sc, uint8_t sel) rv = RM1(sc->base_sc, sc->def->volt_reg, sc->def->volt_vsel_mask, sel); if (rv != 0) { - printf("%s: cannot set volatge selector: %d\n", + printf("%s: cannot set voltage selector: %d\n", regnode_get_name(sc->regnode), rv); return (rv); } From nobody Wed Oct 29 15:45:47 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cxWmW6NWyz6Dsmh; Wed, 29 Oct 2025 15:45: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cxWmW4L9Nz3T4Q; Wed, 29 Oct 2025 15:45:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761752747; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Yze9ETxSOUUNOA9nHwMFCAPHVI9Gcq/LCEHynsGNKoM=; b=nnczluzfVZqXGEG2B5yWHMWmLAAXsvwGAvNgZs3DGbkMFK6ogM92BlNZBaB+Gk/WC1USAC 0DpJx4TxP+21gHWpe6FAdwKRKDlITJWVsT0pYNlnNrT3Ur8JX3NxttrSXYIBfjdWq51U/K 6WnheAOzyBMdJqA2dWxhNLvmptlk0x5U9OiBvdS9UqjNUKOqZ0ER4hv/wnyQrwgpSEPoJM hPpcJv1aARKwoGXqv5wyUF7q6wg2O8zSEThZ6BDoOwCl3Dchn/F2H0qen8TWQRQc2UhWcU VLKT0xTI5IV9Z1gKAttcWG3y47wRCl1STmkn9NODpD73QEQc8jlF5hhWWE3V5Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761752747; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Yze9ETxSOUUNOA9nHwMFCAPHVI9Gcq/LCEHynsGNKoM=; b=VWYMfUnXU/t8gjCn2zFMmCliYeJNCj9Q6LrBxnnglsMlczbFNt389FKYNan56CXMHdA7x4 NgDNiTKRg42oi6eDO880lKH++D52V/6LTTV7oNzHS2/giF+8KMXFAiqpEeF0g8uPF40dnA p7D9GmOC0w636TBEsDcx6WK81SHCN6P1UeBEDxN2qF880ByrGnABifZBg5/Xd1cG0oBpuS uBiB9yfOC7qfj161hXhxUQx4WSYOjauarkk/xDeAOCXIo2/faIByqOo4vjRJ+RXn3k++iE B1PPnYyK4pXFtV9hccPO8SmUtlmXoYmuk2VwXsraRbhQsqEIW/z+NA9OfknN3g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761752747; a=rsa-sha256; cv=none; b=hsJpBbERiQPc0dgaI2G1uVAQfwkY56LunHsV68rBkEujmJb/dkuDVUeV3bArdkdOB1xmX+ qjj6viYwz5rxcjl8KuqxSjNAqIXJJNNlX1KqHJbOgzZH1EaRl/dTmOoxksZE2UjGD5mrbA HXOvlHKFIrLMpBSH5KPK1d3mF445we53ivNv/fXMca9Va92CKeARlFyszfK1lCgmB4VnDy zXrgtClzWcLj+Pre2C0noaFTTBlDZ3kHlRXyT5XTq6VepkpoafR7V2tjz2dzBuUILSVmDk pxseZCtV9GyUU6tYFbm91+SlgHCNGTaSkX+tHVAMX9BCfgheSRtqNAA0nTfJTw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cxWmW3sQGzjCy; Wed, 29 Oct 2025 15:45: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 59TFjlLx050303; Wed, 29 Oct 2025 15:45:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59TFjlgs050300; Wed, 29 Oct 2025 15:45:47 GMT (envelope-from git) Date: Wed, 29 Oct 2025 15:45:47 GMT Message-Id: <202510291545.59TFjlgs050300@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: f51fb91d616d - main - acpi(4): Fix typo in a panic message List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f51fb91d616d49e91f3c2c706263a38b98176911 Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=f51fb91d616d49e91f3c2c706263a38b98176911 commit f51fb91d616d49e91f3c2c706263a38b98176911 Author: Gordon Bergling AuthorDate: 2025-10-29 15:17:32 +0000 Commit: Gordon Bergling CommitDate: 2025-10-29 15:45:28 +0000 acpi(4): Fix typo in a panic message - s/depenedent/dependent/ MFC after: 5 days --- sys/dev/acpica/acpi_pcib_acpi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/acpica/acpi_pcib_acpi.c b/sys/dev/acpica/acpi_pcib_acpi.c index 3913ec612f79..2fadd6cd32ee 100644 --- a/sys/dev/acpica/acpi_pcib_acpi.c +++ b/sys/dev/acpica/acpi_pcib_acpi.c @@ -179,7 +179,7 @@ acpi_pcib_producer_handler(ACPI_RESOURCE *res, void *context) switch (res->Type) { case ACPI_RESOURCE_TYPE_START_DEPENDENT: case ACPI_RESOURCE_TYPE_END_DEPENDENT: - panic("host bridge has depenedent resources"); + panic("host bridge has dependent resources"); case ACPI_RESOURCE_TYPE_ADDRESS16: case ACPI_RESOURCE_TYPE_ADDRESS32: case ACPI_RESOURCE_TYPE_ADDRESS64: From nobody Wed Oct 29 15:45:48 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cxWmY17WWz6Dt9S; Wed, 29 Oct 2025 15:45: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cxWmX4sWpz3T1c; Wed, 29 Oct 2025 15:45:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761752748; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CKi15U2kA2vpPzN17c2gbBz5FAN5NM5bv7JX1cciQ/4=; b=knCJD/J6OculsZXwbc4TP4AKd7dYE78944aQJzPtAhjALVl5Oqqool+bqxE2qaQeNt4JyB N+mwgNwTnW3i2wxF3/7edM5j/t02yWVAW7Gf9+p4lFiJOgjRSkL+haQyyWbpymic53XlVs 1Rwh+/XtOJoUOeBol0oTzuqvtD3DdrFNyUGTd0LluNCV9TL9t5epi0rDW9uweEm7vXM0VP vcMv3Nd3VA/wjqH4IU4HLT4SXVqxFOgIPStfRt0ZWAZcTIuFf0jSqKPCthWfHVgv8pBwpG E9Z4vztLhuAVl+73mYsjC3igCCGbzn0Kk1K6E9w+CeZQJ7uznIY9aA1Pwa3JAA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761752748; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CKi15U2kA2vpPzN17c2gbBz5FAN5NM5bv7JX1cciQ/4=; b=dXhbU+8PNgqknEspVWrNLuHSWe13gcdk7BaD5WEhY8Vb7V0N6SX8MQ4PjOB3ABmO9oasfL SOFX2iCw3Inut6ggxljbt8G3lG/o7yKt4uloq4c8B4yJJPbebApP14sKQQiOiscYIIhK+4 G5GuzrRK70JlyXu+P/X1Iutf7FSnWnz6I7BYHfmF8mnDYeACHTKhAKrvZu27VjczxHn25R l3kXDCOHDcMjDc1LnSjx0K1UnT9DoW6wOQgZygk4bZHdnS3g1lFkfLlUkLKLYwOTWeHVPa xptaNUOr7IQ+Hn/ibe5kF0vDMWBXnzN89LioOZyNpLAukf4MMI0IJdXTmAToVQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761752748; a=rsa-sha256; cv=none; b=ZAPp82TiFvunzzuNZl3EhMMSbwG63EM+Wf4EizZSNuVReyniUN9PHm9KDMGdhKLAFlJLFc FRHdYkzFBZqJVKn9FgA9diFWmijMw3M3RQVUh/CJa0sYFZfFPqAEBF3u8lLs6l9MS+8Rev HeUpYc5YXHzQ/8FgFhjYGnaWT4ylJ/9LweJZ/RawEuAbwU/Ev2WPlUafxMRHi/U0qKD7S6 gCJKT6sEdhLCc6Ol4Ei5/oN6KlHgyn/D4Dv4hKtf1vwVEqJO6ai2xybRnCNKDnKHm8Nvc5 u78etMeLaqQn8/IUWWScVGGnPJmOuAPSkcj5YKPqSJdKVl16mzygm0WQwG0VJw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cxWmX4Qprzj03; Wed, 29 Oct 2025 15:45: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 59TFjmAW050336; Wed, 29 Oct 2025 15:45:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59TFjmuv050333; Wed, 29 Oct 2025 15:45:48 GMT (envelope-from git) Date: Wed, 29 Oct 2025 15:45:48 GMT Message-Id: <202510291545.59TFjmuv050333@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: a675f3bb6377 - main - ale(4): Fix typo in a kernel message List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a675f3bb63774a63f668749c6c3c8dfbb6be1cd6 Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=a675f3bb63774a63f668749c6c3c8dfbb6be1cd6 commit a675f3bb63774a63f668749c6c3c8dfbb6be1cd6 Author: Gordon Bergling AuthorDate: 2025-10-29 15:18:31 +0000 Commit: Gordon Bergling CommitDate: 2025-10-29 15:45:34 +0000 ale(4): Fix typo in a kernel message - s/sequnce/sequence/ MFC after: 5 days --- sys/dev/ale/if_ale.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/ale/if_ale.c b/sys/dev/ale/if_ale.c index fa2306f1525e..09e0820d2c74 100644 --- a/sys/dev/ale/if_ale.c +++ b/sys/dev/ale/if_ale.c @@ -813,7 +813,7 @@ ale_sysctl_node(struct ale_softc *sc) /* Misc statistics. */ ALE_SYSCTL_STAT_ADD32(ctx, child, "reset_brk_seq", &stats->reset_brk_seq, - "Controller resets due to broken Rx sequnce number"); + "Controller resets due to broken Rx sequence number"); tree = SYSCTL_ADD_NODE(ctx, child, OID_AUTO, "stats", CTLFLAG_RD | CTLFLAG_MPSAFE, NULL, "ATE statistics"); From nobody Wed Oct 29 16:32:57 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cxXpx681Xz6DxZ4; Wed, 29 Oct 2025 16:32:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cxXpx4n14z3cZb; Wed, 29 Oct 2025 16:32:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761755577; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=a0l1Iuw9GmnmLU9JQuh/L+knIzwDXdyFVQyC7UBSKWY=; b=kfNrhdb7o8sAN5s0vdLlDD4seHedS5ihmg7JoJYT5Q6JxQCYekg1ZL3YuM/wPZWlvtkS3m 5ymagdsZt9Tt+C8Jkn9lma/b8nKVYtkdlNuQ9UXoGmvuJ6pEDAKaEBUDZf5jZrBISnExbZ Vf8b7aPHM8L4pmbEVBF4TEheM0oKkqTLtwACQZcW3hP4m7fe1tv1mtVhsJFJaocu5kHrWh a7Xjz4AL3fWyLm9xz8IYUq+YDtE8YRUxnHmWDKhhuscCzhZyAgNqW+Z/hsnDc6GcP8g3NE B0i0J9bGI2sZKE36+KcMwZSlEWpLtMISOS/T/54LZ9TrP5jnGX4+4p1ucIQIzA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761755577; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=a0l1Iuw9GmnmLU9JQuh/L+knIzwDXdyFVQyC7UBSKWY=; b=rJ12oqZ/3VxDUPHS18HFm70FXaFFejbfLCu7TsTTUVGiIF24fJTX+iZzFRWBO2qJkZZSI/ D5jJNMEGMS9fLrkmkbSP6qfzxKy5505TlE8DRbF4M0JE3+PgpckOVK8yMRpmozwQArYDIQ gElgvp2hWm/LL1m/tt/T7rxH581fSKzBd8EDf74uX6JfxSPS8gDt+d2h0YJsXVA6m+yiAg D0VSdOYKMSE80JuRDLoyBhJdjG7l9T6zU1vZdpiA8MI06uzsb/jwXn0vxoEZZzGn84ggaA UCUIP7/6uTZwQhXtBEvRT5JUhKUogie+YeZRsn4tlocpnyNZq6iSt1XKeVcxzQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761755577; a=rsa-sha256; cv=none; b=yek2RuN8eczKy+4GP3zCPb14oTUC9d+fYOwcsbRxt0Jrua+46IK9zomkClNzlTZ+V+OxO1 2+AyaplTwJFWlcAJknPDDq8yFuRmbzkouwqVGcaN+ayDeyhJGa066ULYYhKvCNM5Ho0V5K zATUrJHRB+BVE/UzMAz6qJCIbVzTNAUy85kkGqvE2OrH7CJ2NN3ugX7n2VusX1C9KTjCb8 SxOShLvcHr5mIm1rIV2atZFJ5o8biL/RKhrb+UpxpKSfPMl6JVCIsYFoxUnfCmr4A5RLvC FCqW31PUhx1L0kL+hpXsysw1Zlvx6A8cJXOb/Udvma/hWOsDpUKuQhKANuHo8g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cxXpx4HBbzl9s; Wed, 29 Oct 2025 16: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 59TGWvR9044011; Wed, 29 Oct 2025 16: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 59TGWvbF044008; Wed, 29 Oct 2025 16:32:57 GMT (envelope-from git) Date: Wed, 29 Oct 2025 16:32:57 GMT Message-Id: <202510291632.59TGWvbF044008@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: d617806aac14 - main - libc: report _SC_NPROCESSORS_ONLN more accurately in cpu-limited jails List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d617806aac1469319970e3551656e9deabb98a35 Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=d617806aac1469319970e3551656e9deabb98a35 commit d617806aac1469319970e3551656e9deabb98a35 Author: Kyle Evans AuthorDate: 2025-10-29 16:32:30 +0000 Commit: Kyle Evans CommitDate: 2025-10-29 16:32:30 +0000 libc: report _SC_NPROCESSORS_ONLN more accurately in cpu-limited jails We don't support CPU hotplug, but we do support cpuset(8) restrictions on jails (including prison0, which uses cpuset 1). The process cannot widen its cpuset beyond its root set, so it makes sense to instead report the number of cpus enabled there rather than the total number in the system. This change is effectively a nop for the majority of systems and jails in the wild, though it does reduce the performance of this query now that we can't take advantage of AT_NCPUS being provided in the auxinfo. The implementation here is notably different than Linux, which would not take cgroups into account. They do, however, take CPU hotplug into account, so the possibility for it to diverge from (and be lower than) the # configured count to reflect what the process can actually be scheduled on doesn't really diverge in semantics. Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D52295 --- lib/libc/gen/sysconf.3 | 6 +- lib/libc/gen/sysconf.c | 16 ++++- lib/libc/tests/sys/cpuset_test.c | 140 ++++++++++++++++++++++++++++++++++++++- 3 files changed, 156 insertions(+), 6 deletions(-) diff --git a/lib/libc/gen/sysconf.3 b/lib/libc/gen/sysconf.3 index e38357b898a7..290ef0dc158c 100644 --- a/lib/libc/gen/sysconf.3 +++ b/lib/libc/gen/sysconf.3 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd April 26, 2013 +.Dd August 30, 2025 .Dt SYSCONF 3 .Os .Sh NAME @@ -77,7 +77,9 @@ The maximum number of supplemental groups. .It Li _SC_NPROCESSORS_CONF The number of processors configured. .It Li _SC_NPROCESSORS_ONLN -The number of processors currently online. +The number of processors currently online, taking into account current jail +restrictions to report only the number of processors that are usable to the +process. .It Li _SC_OPEN_MAX One more than the maximum value the system may assign to a new file descriptor. .It Li _SC_PAGESIZE diff --git a/lib/libc/gen/sysconf.c b/lib/libc/gen/sysconf.c index b5b732eed05d..87aedc07c110 100644 --- a/lib/libc/gen/sysconf.c +++ b/lib/libc/gen/sysconf.c @@ -72,6 +72,7 @@ long sysconf(int name) { struct rlimit rl; + cpuset_t cpus; size_t len; int mib[2], sverrno, value; long lvalue, defaultresult; @@ -581,8 +582,21 @@ yesno: return (_POSIX_IPV6); #endif - case _SC_NPROCESSORS_CONF: case _SC_NPROCESSORS_ONLN: + /* + * Consult our root set first, because our CPU availability + * may not match the total number of CPUs available on the + * system and we may have a non-uniform layout even within + * userland. In particular, each jail has a root set that can + * be constrained by its parent and processes within the jail + * cannot widen beyond those constraints, so to those processes + * it makes sense to claim the more limited count. + */ + if (cpuset_getaffinity(CPU_LEVEL_ROOT, CPU_WHICH_PID, -1, + sizeof(cpus), &cpus) == 0) + return (CPU_COUNT(&cpus)); + /* FALLTHROUGH */ + case _SC_NPROCESSORS_CONF: if (_elf_aux_info(AT_NCPUS, &value, sizeof(value)) == 0) return ((long)value); mib[0] = CTL_HW; diff --git a/lib/libc/tests/sys/cpuset_test.c b/lib/libc/tests/sys/cpuset_test.c index 53d6a8215bbc..c8ad225fadfc 100644 --- a/lib/libc/tests/sys/cpuset_test.c +++ b/lib/libc/tests/sys/cpuset_test.c @@ -34,8 +34,10 @@ #include #include +#include #include #include +#include #include #include @@ -107,6 +109,19 @@ skip_ltncpu(int ncpu, cpuset_t *mask) atf_tc_skip("Test requires %d or more cores.", ncpu); } +static void +skip_ltncpu_root(int ncpu, cpuset_t *mask) +{ + + CPU_ZERO(mask); + ATF_REQUIRE_EQ(0, cpuset_getaffinity(CPU_LEVEL_ROOT, CPU_WHICH_PID, + -1, sizeof(*mask), mask)); + if (CPU_COUNT(mask) < ncpu) { + atf_tc_skip("Test requires cpuset root with %d or more cores.", + ncpu); + } +} + ATF_TC(newset); ATF_TC_HEAD(newset, tc) { @@ -234,9 +249,8 @@ ATF_TC_BODY(deadlk, tc) } static int -do_jail(int sock) +create_jail(void) { - struct jail_test_info info; struct iovec iov[2]; char *name; int error; @@ -250,8 +264,22 @@ do_jail(int sock) iov[1].iov_base = name; iov[1].iov_len = strlen(name) + 1; - if (jail_set(iov, 2, JAIL_CREATE | JAIL_ATTACH) < 0) + error = jail_set(iov, 2, JAIL_CREATE | JAIL_ATTACH); + free(name); + if (error < 0) return (FAILURE_JAIL); + return (0); +} + +static int +do_jail(int sock) +{ + struct jail_test_info info; + int error; + + error = create_jail(); + if (error != 0) + return (error); /* Record parameters, kick them over, then make a swift exit. */ CPU_ZERO(&info.jail_tidmask); @@ -641,6 +669,111 @@ ATF_TC_BODY(jail_attach_disjoint, tc) try_attach(jid, &smask); } +struct nproc_info { + long nproc_init; + long nproc_final; + long nproc_global; +}; + +ATF_TC(jail_nproc); +ATF_TC_HEAD(jail_nproc, tc) +{ + atf_tc_set_md_var(tc, "descr", + "Test that _SC_PROCESSORS_ONLN reflects jail cpuset constraints"); +} +ATF_TC_BODY(jail_nproc, tc) +{ + cpuset_t jmask; + struct nproc_info ninfo = { }; + int sockpair[2]; + cpusetid_t setid; + ssize_t readsz; + pid_t pid; + int fcpu, error, pfd, sock; + char okb = 0x7f, rcvb; + + skip_ltncpu_root(2, &jmask); + fcpu = CPU_FFS(&jmask) - 1; + + /* + * Just adjusting our affinity should not affect the number of + * processors considered online- we want to be sure that it's only + * adjusted if our jail's root set is. + */ + CPU_CLR(fcpu, &jmask); + error = cpuset_setaffinity(CPU_LEVEL_WHICH, CPU_WHICH_PID, -1, + sizeof(jmask), &jmask); + ATF_REQUIRE_EQ(0, error); + ATF_REQUIRE(sysconf(_SC_NPROCESSORS_ONLN) > CPU_COUNT(&jmask)); + + ATF_REQUIRE_EQ(0, socketpair(PF_UNIX, SOCK_STREAM, 0, sockpair)); + + /* We'll wait on the procdesc, too, so we can fail faster if it dies. */ + ATF_REQUIRE((pid = pdfork(&pfd, 0)) != -1); + + if (pid == 0) { + /* First child sets up the jail. */ + sock = sockpair[SP_CHILD]; + close(sockpair[SP_PARENT]); + + error = create_jail(); + if (error != 0) + _exit(error); + + ninfo.nproc_init = sysconf(_SC_NPROCESSORS_ONLN); + + /* Signal the parent that we're jailed. */ + readsz = write(sock, &okb, sizeof(okb)); + assert(readsz == sizeof(okb)); + + /* Wait for parent to adjust our mask and signal OK. */ + readsz = read(sock, &rcvb, sizeof(rcvb)); + assert(readsz == sizeof(rcvb)); + assert(rcvb == okb); + + ninfo.nproc_final = sysconf(_SC_NPROCESSORS_ONLN); + ninfo.nproc_global = sysconf(_SC_NPROCESSORS_CONF); + readsz = write(sock, &ninfo, sizeof(ninfo)); + assert(readsz == sizeof(ninfo)); + + _exit(0); + } + + close(sockpair[SP_CHILD]); + sock = sockpair[SP_PARENT]; + + /* Wait for signal that they are jailed. */ + readsz = read(sock, &rcvb, sizeof(rcvb)); + assert(readsz == sizeof(rcvb)); + assert(rcvb == okb); + + /* Grab the cpuset id and adjust it. */ + error = cpuset_getid(CPU_LEVEL_ROOT, CPU_WHICH_PID, pid, &setid); + ATF_REQUIRE_EQ(0, error); + error = cpuset_setaffinity(CPU_LEVEL_WHICH, CPU_WHICH_CPUSET, + setid, sizeof(jmask), &jmask); + ATF_REQUIRE_EQ(0, error); + + /* Signal OK to proceed. */ + readsz = write(sock, &okb, sizeof(okb)); + ATF_REQUIRE_EQ(sizeof(okb), readsz); + + /* Grab our final nproc info. */ + readsz = read(sock, &ninfo, sizeof(ninfo)); + ATF_REQUIRE_EQ(sizeof(ninfo), readsz); + + /* + * We set our own affinity to jmask, which is derived from *our* root + * set, at the beginning of the test. The jail would inherit from this + * set, so we just re-use that mask here to confirm that + * _SC_NPROCESSORS_ONLN did actually drop in response to us limiting the + * jail, and that its _SC_NPROCESSORS_CONF did not. + */ + ATF_REQUIRE_EQ(CPU_COUNT(&jmask) + 1, ninfo.nproc_init); + ATF_REQUIRE_EQ(CPU_COUNT(&jmask) + 1, ninfo.nproc_global); + ATF_REQUIRE_EQ(CPU_COUNT(&jmask), ninfo.nproc_final); +} + ATF_TC(badparent); ATF_TC_HEAD(badparent, tc) { @@ -686,6 +819,7 @@ ATF_TP_ADD_TCS(tp) ATF_TP_ADD_TC(tp, jail_attach_prevbase); ATF_TP_ADD_TC(tp, jail_attach_plain); ATF_TP_ADD_TC(tp, jail_attach_disjoint); + ATF_TP_ADD_TC(tp, jail_nproc); ATF_TP_ADD_TC(tp, badparent); return (atf_no_error()); } From nobody Wed Oct 29 16:51:45 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cxYDf1Fx4z6Dyrn; Wed, 29 Oct 2025 16:51:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cxYDd4MCLz3fYj; Wed, 29 Oct 2025 16:51:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761756705; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=R6fVhmpPxixRf+CDhCjaQq+MSgOFgAANWVvjZHSmL3w=; b=O6q1dwQUwNATtazhzN9iGskcurPAlsqaxjEx4yB/E0DIc53xJcDhM3iYe/OefEMeOIVilg Q1iuGGyuokQbgY3LudDYu/9vcmYEDH6BCe3DIeCd32cTQ+tv+WftmvIpPOfumceozaqhUR 6HEUXEPuq7fcc+pfYoag1xINPSzTI5z7KfypFLPzdjwIbwsblKWIghbI+8V2nf+Xj3X02y tisjbLiNL4bFmsl3FdnJAfn5ipoSihFTM/UOz9qRiXCYrKnTCtPJwYoletCpHkMayxZnks PScxpXKUXkv93CYVM5Ybv0/8h4D5PtQ+5jqCEMonyxQnzIW3Ps+6yugbJIO5XQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761756705; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=R6fVhmpPxixRf+CDhCjaQq+MSgOFgAANWVvjZHSmL3w=; b=ngqDSAxer7KX25buPr2HKEFyXpxbcb1w+H+yHzdPUuR6h1HAP4j18q6dw91ceJ6zQQhr0Z E/drWDWhs6WzyXV66l39AHErh1L2bS7euU+1C7/H1EM4Y8fUNiyOUFAd4shBwcImbG29+j OX4sh+ikLT6JiPwvlO3M3nwPsirUGJ87IBh/8pPNOUc1oDpnd1JFvR36AUlbPczBWMjtGV mz6RfZDEuAjVUcftKKx3FrO2xp9wcStHzWTV7GfhGg3n8GsQ3+waYdrLpcaSEueQ/oCjYI H1MmSNYjkyqp3fCuFuXfAI94oBOiCmtF4tUk1nEt4R8kQAs1IpPRkDz4hYMQjw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761756705; a=rsa-sha256; cv=none; b=e2CHDxRKwPjLeehV9pq+h7K0L4dBuyCgn7SIv/wKnCfToRGv3OoLl5VagZTaBkbrYO/TwL EZuZtvPVcHeU8jQHNmw6CsZqFZhXsNk5fr9ZTZRoupYuXvEF28+db17QGJ3TGXPjOKmsSt oNCpcImBcMSGTD0kfdEFdP5NTUUTvbGNKpZTPjkrDIjwp5TUpbSRtN1xL3Sd8ttvSNXv85 Gp6n5MOn1Cg+msWt1aAPw18JIYk8WwE52gMgvYWfF5OB74/SJbuHa8li9gY5WcsGf6Y0r2 DHolR6ol4V3XTbtoQ6t4n1etNgiAlEAiqezdybBiwM1oKOc4RzNZQ+lCES1iKA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cxYDd3tBTzlh8; Wed, 29 Oct 2025 16:51: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 59TGpjB8080516; Wed, 29 Oct 2025 16:51:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59TGpjHZ080514; Wed, 29 Oct 2025 16:51:45 GMT (envelope-from git) Date: Wed, 29 Oct 2025 16:51:45 GMT Message-Id: <202510291651.59TGpjHZ080514@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: be27c64b3a01 - main - git-arc: Fix quoting of review titles List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: be27c64b3a0150534252a66263703283a79c39a0 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=be27c64b3a0150534252a66263703283a79c39a0 commit be27c64b3a0150534252a66263703283a79c39a0 Author: Mark Johnston AuthorDate: 2025-10-29 16:48:18 +0000 Commit: Mark Johnston CommitDate: 2025-10-29 16:48:18 +0000 git-arc: Fix quoting of review titles This really only matters if a commit title has multiple consecutive spaces, which itself is probably an accident. Reported by: des --- tools/tools/git/git-arc.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/tools/git/git-arc.sh b/tools/tools/git/git-arc.sh index 22df0c61293a..fa618cdcbc22 100644 --- a/tools/tools/git/git-arc.sh +++ b/tools/tools/git/git-arc.sh @@ -242,7 +242,7 @@ title2diff() { local title - title=$(echo $1 | sed 's/"/\\"/g') + title=$(echo "$1" | sed 's/"/\\"/g') arc_list --no-ansi | awk -F': ' '{ if (substr($0, index($0, FS) + length(FS)) == "'"$title"'") { @@ -470,7 +470,7 @@ gitarc__list() title=$(git show -s --format=%s "$commit") diff=$(echo "$openrevs" | \ awk -F'D[1-9][0-9]*: ' \ - '{if ($2 == "'"$(echo $title | sed 's/"/\\"/g')"'") print $0}') + '{if ($2 == "'"$(echo "$title" | sed 's/"/\\"/g')"'") print $0}') if [ -z "$diff" ]; then echo "No Review : $title" elif [ "$(echo "$diff" | wc -l)" -ne 1 ]; then From nobody Wed Oct 29 17:53:33 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cxZby0hbcz6F51y; Wed, 29 Oct 2025 17:53: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cxZbx75bzz3lQD; Wed, 29 Oct 2025 17:53:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761760414; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=b9HwvBRaEtieT1FTvP/PlGVIpuv81K/mRYMjj3mRxAI=; b=x4yUoeVOzvsBjc6K1CCgIg2UkHVO8RMU2SgWrWqLZyuGTCijSeCO/EEoWeNtuaJnbwcqCb 0hWZactaGaDPw8WEM/ud/TNSIR5w3rXCktlWU4jPskaeMEI/JdGVkWuuUzUdnlSTXX13oO BFlAMWdju7nhjpCEPdgxi2FppTwTdI2wWcL4DEgoqu1moMxRwJtsqqfFadTYuDL7QGH9Yb wJIXy/pv05v+vUPxMstYalZ9egPxXAVLZRbdmY33WSK0n9E8GhEAMRQgPab30hSV3QME8Q DlVa+/V8ghkO/RfIy3sdtUDRSBpxvZUo+0/OR9mWJ0NuK9JVHfxes7vU18NAUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761760414; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=b9HwvBRaEtieT1FTvP/PlGVIpuv81K/mRYMjj3mRxAI=; b=PPLMXi+ouDFK1yVRkG/T+/xU8WWzOgG2XmMqPaqpC0sYUuU00xAhzRjjS9pGTR5KHAFPGl 8QekNwPbJzLyW9HoeWXbdYkyNrr3zMkVibkD39HZf4mv+n/b2qggUFbUldhcD5qDONHYs8 KRHU60jhKpw8VYYd9UQ63zU3sBfcmrTMp6sdyatgSIT1p+kymkhCmqw9tjbX4ZIPjxDpKp TfQgTJ8CVyj6V1mMxyYJcnfzf0HJZIbtW4bwyzxzsPwdaREDtQvH5g4VnM7yb+f3FhdkDu QMBPoQEDL6Y6HP0XWcWsIfkrY9YonykDeJd4UEPbxYcpgGxyz3DAbe8kNHXp1g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761760414; a=rsa-sha256; cv=none; b=wKkWaaBlFpZZRtYNXxd7h0CkEg+ebgB0HH1YGGSQbVyUloAFRJH+isuGBpy2BPngqU19Zz erXm11KWNBohqhQlW6ISH/h8oAx7Yy91Ys6QMwg/te/7Rp4HVuN786jfieniGe48QuAc+2 ph2Y65Cx+imLSFMtGF7qnuKRae+cJcTOzsuU86DG+reO6k3HSqlyxHG50Na4Z1rd81QPsz A1/mjVrmagdo7VwFGYDQ2slDPJTO2Bo24pXeRGo5xMfguIzUK4LDWWutKK+HzmJH24ugJv hhtLXI8hIq6mUMU6FGugQSxBTjRFGiBwXFZm2YN4ulvkZibjkz9cfg86nWrJgg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cxZbx6W4gznKN; Wed, 29 Oct 2025 17:53: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 59THrX9p094757; Wed, 29 Oct 2025 17:53:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59THrXsD094754; Wed, 29 Oct 2025 17:53:33 GMT (envelope-from git) Date: Wed, 29 Oct 2025 17:53:33 GMT Message-Id: <202510291753.59THrXsD094754@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konrad Witaszczyk Subject: git: 2acdec9e4d91 - main - dtrace/arm64: properly traverse the symbol table List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: def X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2acdec9e4d915ec61d0ca45b408f9beb7aa4b772 Auto-Submitted: auto-generated The branch main has been updated by def: URL: https://cgit.FreeBSD.org/src/commit/?id=2acdec9e4d915ec61d0ca45b408f9beb7aa4b772 commit 2acdec9e4d915ec61d0ca45b408f9beb7aa4b772 Author: Konrad Witaszczyk AuthorDate: 2025-10-28 16:09:24 +0000 Commit: Konrad Witaszczyk CommitDate: 2025-10-29 17:52:42 +0000 dtrace/arm64: properly traverse the symbol table LINKER_EACH_FUNCTION_NAMEVAL() stops processing the symbol table if a callback function returns a non-zero value. The fbt_provide_module_function() callback should not return 1 when ignoring symbols. Instead, always return 0, as in dtrace/x86. Fixes: 30b68ecda84e ("Changes that improve DTrace FBT reliability on freebsd/arm64:") Reviewed by: markj, oshogbo Approved by: oshogbo (mentor) Obtained from: CheriBSD Differential Revision: https://reviews.freebsd.org/D53399 --- sys/cddl/dev/fbt/aarch64/fbt_isa.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/cddl/dev/fbt/aarch64/fbt_isa.c b/sys/cddl/dev/fbt/aarch64/fbt_isa.c index ffe2f37a6d16..6c789530442d 100644 --- a/sys/cddl/dev/fbt/aarch64/fbt_isa.c +++ b/sys/cddl/dev/fbt/aarch64/fbt_isa.c @@ -104,7 +104,7 @@ fbt_provide_module_function(linker_file_t lf, int symindx, */ if (strcmp(name, "handle_el1h_sync") == 0 || strcmp(name, "do_el1h_sync") == 0) - return (1); + return (0); instr = (uint32_t *)(symval->value); limit = (uint32_t *)(symval->value + symval->size); From nobody Wed Oct 29 17:58:38 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cxZjp4xsmz6F56c; Wed, 29 Oct 2025 17:58: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cxZjp4Bt4z3lZk; Wed, 29 Oct 2025 17:58:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761760718; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TOn0FU1xUm8Uqn02cVHywyNikt+1LoSQNu/UVDW9vpM=; b=ex4gXKugzENydFn/sYcQ6ai4sXiOHu7UDHIxPpVE86L04MEiNl8O8dp6HlPfqK99sWc5/M DKo7/oAQO51+mxw3FfI3hVDxBaokDvplo60eETM+Y1BaSlcEHALJUpJcnG83f8WwHBw73O NKlMipIbD+A46De/rckWQf8IoXhQkcn3sHaj4aJqs2LgjQ9sPzOe8ZZG75K8I2UEBKBSUj 8629MhjnmuNn6oaYJDFLqiqSbYw24Z7BbE5v6ptlx1799P8n5ViCDPiC/3/HyPPMhw3Pgt QTdeHCBsBBRZ8iKuO4e7vWoNwKmj8mPeUwmt21N3b7d1ObSReDKVO37NBjNC1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761760718; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TOn0FU1xUm8Uqn02cVHywyNikt+1LoSQNu/UVDW9vpM=; b=WudswZK7Lg0DULTx3PEy45n45/X5KXm9H2dEfG+uHxpqpupMBymnVKtxD7SkpY8Cin47r1 X64idhFJbEUTtd9Ng4FFiS0YoyQyPIG8bFiGWAUYsKfHED2mSU3JUaoiaADK1oEWHHXf3L ACcvd9JSK5mcWKyPLT/KgKgXuerPYP+Su8M1/+h3BwzvB2rm/cLYJCjghMcO+BJzG5tMn/ J257hYmg5DARM2sehhdTadhQp3LBU3wrPGS+5aTx9TgQjan6ZgFr4FcbRXUCg7QFZ6cTZ1 zLTVboZSvn0ql1bgX2wWMVIhdKdvDGDtyxKSXexxf3UDKlXlbk/l2QkOa8iqAQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761760718; a=rsa-sha256; cv=none; b=lOjpAe5svgTzp9Dw9syPqGWF5HaCq/AzmI2dyLY7d0tbFo6dmnqUOYh5s1us1rXZt78zKE Vp6YUc4EINmrHC92jfifiViolww9RUniLrlrqMb006l7FpICzZR0Hl+H/NtcrWH/0gUJCu iOP6nC/I4cMQ4ieJYOA3LAY2N93fG2jQhUjo69HLaEK+PO7Jf90hdI2BxnL51h4kN4inRH tlrN0b/uKv7DwOyaPsw7Pc8nbF7I3fPTTtpfpQ6Ra6hMp08Omewyfv8N72dbWsUf5AHQYD cCBdEtpoDoe858qa6W1ODiqEQ4s2mnaGuzcjRS2vwHjdeTxlAEluViiSazwY/g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cxZjp3mHfzmtB; Wed, 29 Oct 2025 17:58: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 59THwcln096338; Wed, 29 Oct 2025 17:58:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59THwcOZ096335; Wed, 29 Oct 2025 17:58:38 GMT (envelope-from git) Date: Wed, 29 Oct 2025 17:58:38 GMT Message-Id: <202510291758.59THwcOZ096335@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ahmad Khalifa Subject: git: 330b4f470280 - main - gpiobus: use bus_generic_detach when detaching List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vexeduxr X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 330b4f470280ec42d1498f875b8873f6eb32a7dd Auto-Submitted: auto-generated The branch main has been updated by vexeduxr: URL: https://cgit.FreeBSD.org/src/commit/?id=330b4f470280ec42d1498f875b8873f6eb32a7dd commit 330b4f470280ec42d1498f875b8873f6eb32a7dd Author: Ahmad Khalifa AuthorDate: 2025-10-29 17:53:05 +0000 Commit: Ahmad Khalifa CommitDate: 2025-10-29 17:57:59 +0000 gpiobus: use bus_generic_detach when detaching Use bus_generic_detach instead of bus_detach_children so the children actually get deleted. Reviewed by: jhb MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D52305 --- sys/dev/gpio/gpiobus.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/gpio/gpiobus.c b/sys/dev/gpio/gpiobus.c index 698b5e5fdd01..0fca02c41ca7 100644 --- a/sys/dev/gpio/gpiobus.c +++ b/sys/dev/gpio/gpiobus.c @@ -618,7 +618,7 @@ gpiobus_detach(device_t dev) ("gpiobus mutex not initialized")); GPIOBUS_LOCK_DESTROY(sc); - if ((err = bus_detach_children(dev)) != 0) + if ((err = bus_generic_detach(dev)) != 0) return (err); rman_fini(&sc->sc_intr_rman); From nobody Wed Oct 29 17:58:39 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cxZjq65K8z6F5Gn; Wed, 29 Oct 2025 17:58: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cxZjq4txdz3ldZ; Wed, 29 Oct 2025 17:58:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761760719; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=E95zBf/nGYvEcIEE3cX5HCodYBbU9l7CfJGvCEpghHc=; b=ChpJ9MI69aifjl/TX7keXBoxS1t4VdYvcWQq2+plgiWoRW8ctMI2HzrMgUFh/Wz+WHjgL0 xp/F11RtLFos6GdS8cwZk/VwXH+IBH2U60PRJpJAnQLWwKNzQk+uxK6Kz6lAy0TNIM87+O CRR1nGHhZkmnPTeb4FxfFwR7LG9Yodnc0n1vxSMN6KeKEXLenodEa6RYF4LCa/U4GXRfL6 MrivJFXgFXGPeH+VztDphlKreZ9mZ9SxTLm4JsXsSqOmVByez8p+gwt3SvziTPqvgL1uyL GZcrkdNrWWeYsLqSPzaDzxJFxalNbQOlAnjJjkuUYwBJrKsuck8qdrL/rDpGfw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761760719; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=E95zBf/nGYvEcIEE3cX5HCodYBbU9l7CfJGvCEpghHc=; b=oAmQedlOPCD5Atedi3lnncGQ3RNtyFbeKRsbnef7Xm0IYU5SoFDBcpM68/36IaQQa2guNp esMx7qQMy89MCLgjxbiJtgWqP8v1PO70sE5dxF92ghUDYy436u88RuNOSFHSAwg3ZNf5hG xIkh0kXwJ9X4MLShJ9ve4U+nhTBznj3ULLBIuVuDMhEy7KS8uWZVqUD5DqKOuYierlX6Ny TyF6YKMw9RdeJdQG9llaKAtiTBvOdHk7D2QmCBBzUr52VZUf+nNn9LIzCz5V4HedfM5e3F EtG7rbiWvW64NXjEhWR+eXpIhv0zcy4w8xFugR4NJa3KvhAScvwg1t/msQZtqA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761760719; a=rsa-sha256; cv=none; b=MXo30wzAB0G4o8l3Jho6G0fFGGOy8LwunrWdMy0eWi8EoyhOgRCzk1BGrGxVOJZQR7Sv6C NtEw8D/+PGxhTwoVut50sThgHp1ULFi8jaT9tmNhxkmRejv61uvpJycqnPMFl2dfMLFqE6 SXBW1f0iwKkMqnQETlvfdkeVn2EXIlR+kalfuVpk1c7sUf0zd5KKr0PO+5IVZomipZsveB 1M3wDEOe3ZRAl3fTph/O+wPn3jx5m+Kld/Wnsh0FttOFrkniQI5BVvC2zZxq4iQ2F7MbWo 9fYBbsIswN1n1qR8+8KR9Ln1doT/XiBpQrVdRv+mV+0vWCikrLRw6kv44lGWOw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cxZjq4SzZznQL; Wed, 29 Oct 2025 17:58:39 +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 59THwdsw096372; Wed, 29 Oct 2025 17:58:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59THwdHF096369; Wed, 29 Oct 2025 17:58:39 GMT (envelope-from git) Date: Wed, 29 Oct 2025 17:58:39 GMT Message-Id: <202510291758.59THwdHF096369@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ahmad Khalifa Subject: git: 3bbdc0223a7c - main - acpi_gpiobus: implement bus_child_deleted List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vexeduxr X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3bbdc0223a7c1efaf734d3d9f3cb818e79e11d54 Auto-Submitted: auto-generated The branch main has been updated by vexeduxr: URL: https://cgit.FreeBSD.org/src/commit/?id=3bbdc0223a7c1efaf734d3d9f3cb818e79e11d54 commit 3bbdc0223a7c1efaf734d3d9f3cb818e79e11d54 Author: Ahmad Khalifa AuthorDate: 2025-10-29 17:52:51 +0000 Commit: Ahmad Khalifa CommitDate: 2025-10-29 17:58:00 +0000 acpi_gpiobus: implement bus_child_deleted Implement bus_child_deleted and attach the gpio_aei dev to it's ACPI handle. Reviewed by: wulf Differential Revision: https://reviews.freebsd.org/D51585 --- sys/dev/gpio/acpi_gpiobus.c | 17 +++++++++++++++++ sys/dev/gpio/gpiobus.c | 2 +- sys/dev/gpio/gpiobus_internal.h | 1 + 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/sys/dev/gpio/acpi_gpiobus.c b/sys/dev/gpio/acpi_gpiobus.c index 0d2455cab399..0c31f4fec16d 100644 --- a/sys/dev/gpio/acpi_gpiobus.c +++ b/sys/dev/gpio/acpi_gpiobus.c @@ -304,6 +304,12 @@ acpi_gpiobus_attach_aei(struct acpi_gpiobus_softc *sc, ACPI_HANDLE handle) devi->gpiobus.pins[i] = pins[i + 1]; free(pins, M_DEVBUF); + status = AcpiAttachData(aei_handle, acpi_fake_objhandler, child); + if (ACPI_FAILURE(status)) { + printf("WARNING: Unable to attach object data to %s - %s\n", + acpi_name(aei_handle), AcpiFormatException(status)); + } + bus_attach_children(sc->super_sc.sc_busdev); } @@ -427,6 +433,16 @@ acpi_gpiobus_child_location(device_t bus, device_t child, struct sbuf *sb) return (0); } +static void +acpi_gpiobus_child_deleted(device_t bus, device_t child) +{ + struct acpi_gpiobus_ivar *devi = device_get_ivars(child); + + if (acpi_get_device(devi->handle) == child) + AcpiDetachData(devi->handle, acpi_fake_objhandler); + gpiobus_child_deleted(bus, child); +} + static device_method_t acpi_gpiobus_methods[] = { /* Device interface */ DEVMETHOD(device_probe, acpi_gpiobus_probe), @@ -437,6 +453,7 @@ static device_method_t acpi_gpiobus_methods[] = { DEVMETHOD(bus_read_ivar, acpi_gpiobus_read_ivar), DEVMETHOD(bus_add_child, acpi_gpiobus_add_child), DEVMETHOD(bus_child_location, acpi_gpiobus_child_location), + DEVMETHOD(bus_child_deleted, acpi_gpiobus_child_deleted), DEVMETHOD_END }; diff --git a/sys/dev/gpio/gpiobus.c b/sys/dev/gpio/gpiobus.c index 0fca02c41ca7..596e468d35f3 100644 --- a/sys/dev/gpio/gpiobus.c +++ b/sys/dev/gpio/gpiobus.c @@ -734,7 +734,7 @@ gpiobus_add_child(device_t dev, u_int order, const char *name, int unit) sizeof(struct gpiobus_ivar))); } -static void +void gpiobus_child_deleted(device_t dev, device_t child) { struct gpiobus_ivar *devi; diff --git a/sys/dev/gpio/gpiobus_internal.h b/sys/dev/gpio/gpiobus_internal.h index 58f862343403..be76450b2432 100644 --- a/sys/dev/gpio/gpiobus_internal.h +++ b/sys/dev/gpio/gpiobus_internal.h @@ -43,6 +43,7 @@ int gpiobus_read_ivar(device_t, device_t, int, uintptr_t *); int gpiobus_acquire_pin(device_t, uint32_t); void gpiobus_release_pin(device_t, uint32_t); int gpiobus_child_location(device_t, device_t, struct sbuf *); +void gpiobus_child_deleted(device_t, device_t); device_t gpiobus_add_child_common(device_t, u_int, const char *, int, size_t); int gpiobus_add_gpioc(device_t); From nobody Wed Oct 29 18:50:41 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cxbss6nr8z6F8MZ; Wed, 29 Oct 2025 18:50: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cxbss5vrLz3r2Q; Wed, 29 Oct 2025 18:50:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761763841; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ynZMpOSiQntD2P9koq4XqdpJFLKCdH27y83/otPr14g=; b=WD3OdcuVKqGDwuQVpq6yiPxJq943juCO8isSCIFW3uFmVliFvBCXyVJ0cW70Ppax99pT5v STZYMHsM+OQVm6NiUqYRNZprjWzcN0kp73SvzIHLtb6NetYA+xgTqGgtHAbW7iHl4J6UyN ccHVgWvbiNnrn2keuHC8nrpZo+xs30pg89T5d7/5eRcBescoQFndXT9JajURK30GzWSdPl +p/9qBFqSRi+BxS0sdAUDWKz8iB04pih3V8V1BhW7C5bLvQMJAKtC8h7Rb4BtEb8Iu0DLd LQloafEK2iLj1fhMp762OACaaiaPfloKMRtoI1duL8xFzgNougrDLjfVnCxY0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761763841; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ynZMpOSiQntD2P9koq4XqdpJFLKCdH27y83/otPr14g=; b=ES+AHUw5Uv7fHx+OUHFhqz6Trtnj+s6fpJaI8nmUpqeiBQD6vZ70b1imJ0Q6HYTfipCFC8 Dj4/cwSMlfwUSBiyEahjfTLcRHUT9Mxnblm7ZKUj5ENZgdej1RewDUapAuEUaOlJJ810/T I8m9/7Owmf7polc4DR3iXzYLD8Rgzkugt7rtfyLvMCMjgBzb7DD1Q7OF5hgqm+qOoBnE29 mGOkaAC4IGHdfUtgBWZmIFK47lWeHMIWeT/VD/os3bt2m1cImbGrdm32wHcGP7VlWd2ZSy 4Xtl0Bf6Hx/TcO9U4uWLvRC8dCuBFQyZlJmWPopyUQHD9XAaKXHdKsz5t+RmYg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761763841; a=rsa-sha256; cv=none; b=ew7WSo5qFMn2GbUu1mDF2LqGjccDAK6w9kwlFEDmHfARHGSW5cusZjfYLEhoivUK+yAYnj tW8hJqGxxb/ld1VokzPJffLLAqr+whTfkhi4DMlPOO/KxfQqu27HPPYnHonM3biU+weidf yBE73/E2sdonDcGfxzYyujTwX1iWE/hDnvtoq5Nvs1kzE7LE2csPGf5AZ1ZZoVZiDplgHq oHBSVIbjJMBQ2qkORLwouS80hbR7rHgRAiTeoQUSLdTh+/neaT0xnZ/hx+sK62bGup213m g0XgtTpNa4MZVGdqGhfo981maUFk/Vsg+2RufKHRctF5MEjLioxpUyt2QT7sxg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cxbss5RNKzp7b; Wed, 29 Oct 2025 18:50: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 59TIofSV001397; Wed, 29 Oct 2025 18:50:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59TIofPQ001392; Wed, 29 Oct 2025 18:50:41 GMT (envelope-from git) Date: Wed, 29 Oct 2025 18:50:41 GMT Message-Id: <202510291850.59TIofPQ001392@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: 51e8e8b0f369 - main - Merge commit e24f90190c77 from llvm git (by Brad Smith): List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 51e8e8b0f36933814b1be08913857727876aece5 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=51e8e8b0f36933814b1be08913857727876aece5 commit 51e8e8b0f36933814b1be08913857727876aece5 Author: Dimitry Andric AuthorDate: 2025-10-29 18:49:54 +0000 Commit: Dimitry Andric CommitDate: 2025-10-29 18:49:54 +0000 Merge commit e24f90190c77 from llvm git (by Brad Smith): [Driver] Enable outline atomics for FreeBSD/aarch64 (#156089) The compiler_rt helper functions have been built since 12.4, 13.1, 14 and anything newer. MFC after: 3 days --- contrib/llvm-project/clang/lib/Driver/ToolChains/FreeBSD.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/contrib/llvm-project/clang/lib/Driver/ToolChains/FreeBSD.h b/contrib/llvm-project/clang/lib/Driver/ToolChains/FreeBSD.h index 7ab63905ed4f..7d090ba682b3 100644 --- a/contrib/llvm-project/clang/lib/Driver/ToolChains/FreeBSD.h +++ b/contrib/llvm-project/clang/lib/Driver/ToolChains/FreeBSD.h @@ -78,6 +78,11 @@ public: void AddHIPIncludeArgs(const llvm::opt::ArgList &DriverArgs, llvm::opt::ArgStringList &CC1Args) const override; + bool IsAArch64OutlineAtomicsDefault( + const llvm::opt::ArgList &Args) const override { + return true; + } + UnwindTableLevel getDefaultUnwindTableLevel(const llvm::opt::ArgList &Args) const override; bool isPIEDefault(const llvm::opt::ArgList &Args) const override; From nobody Wed Oct 29 18:56:42 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cxc0p3QDKz6F8nL; Wed, 29 Oct 2025 18: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cxc0p1C7pz3rCx; Wed, 29 Oct 2025 18: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=1761764202; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jn2eT6iU12cpBGH6o4L+75yhTJCdrfMfAFl6pdmxCZY=; b=pGMiBD3TPC87NHGIyYuvJXnZx9PBpjvgOXID7P5KTEl2NaaBInlLL7GXDUssw/7wW94A0K /D/Zz40sjPAoysA2aBb4Hqz8xnweviTJIGDrc01e2mewFg2YjBDK9nSYy9IONd0IrNtkMC mIvTFPJHQhWPiYfRXgh7M+Qmq5qLTcTFFyvL5U73KXmKMkxH/zGdbXfwWtP45AjXphorV6 1lBzHD7X+RuVlERHqgXpoOD1Aw6XPHUV+VF3MN1NF/vfZnyNz5wcK9SKe9fzfmrJHU9a+e i8S1zRMYyUOcPSaTgJchDH3s8X++/TLa3VxNozB6gr228JBe3pRKwQXJIhNF2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761764202; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jn2eT6iU12cpBGH6o4L+75yhTJCdrfMfAFl6pdmxCZY=; b=F5EgWZ7Am51yCSTgx1UzQY1RV3WBjlXWwsmlS+ch+RsmxqFT7VBfx87bgJ8Tpgy/PMiPgJ k9VlQ9QshnnmkGeinvmGmN6jWgPhqRw3SwqQVtzbVq5vrCQYl1HJdMwarMpcpYaSL/Ui7/ uYdf9vY9VGHXvdZSj04WQtv4mknpfLUU2pbIzFJGnaLrC106rIbpjpNW6Cmjio2pd0J09y BYjjJeI7ouBGxzc2V70bdHspQcs0wYJuQWoPNeOPePzgG0f/whg794ZZPiWz3NfG8kkx2u +ZvDYpX9Ap56OszUocg5QgHoY6uvLkjn2AfabcBT/lMVME2YpHnyNlWJI7yqBw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761764202; a=rsa-sha256; cv=none; b=heqNKezXX2kTV8+jiPTHSgJAQPQvO16+qmwoFPlNoU5GZtoG9RlW5/exJs7TJ8cAgrJ1xM yHpJP/yUG9oqSZjfYZbEs8wGPNoGoZjhlulLTYsnPs1WqLB3GIzo/9iO8qLm1QW7x8MQhd z5ICCKPDPdoIs5JoPtiYJFfkt5paG1GHnl6F37xyD7LAhKjymkakWiYfLdH+VmmzaH0lTV 4OWz8oX1MbO52UDVxz7kQsYEajyTuCvoRJtqlYLCuiRm546qX7im94rtI7Lqbo1ZmY/Dv/ bCGqhHCNnw7/FGjQ3I584wk8kqNnzOSeBAqYvCecokIuLNT0hZMC6zqpIHEHIQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cxc0p0nMDzp38; Wed, 29 Oct 2025 18: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 59TIug2r008835; Wed, 29 Oct 2025 18: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 59TIuguW008832; Wed, 29 Oct 2025 18:56:42 GMT (envelope-from git) Date: Wed, 29 Oct 2025 18:56:42 GMT Message-Id: <202510291856.59TIuguW008832@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 561571d48067 - main - nhi: Fix a race with interrupt teardown during detach List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 561571d480679933287a6d21c6929c39a7963857 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=561571d480679933287a6d21c6929c39a7963857 commit 561571d480679933287a6d21c6929c39a7963857 Author: John Baldwin AuthorDate: 2025-10-29 18:56:17 +0000 Commit: John Baldwin CommitDate: 2025-10-29 18:56:17 +0000 nhi: Fix a race with interrupt teardown during detach When nhi fails to attach on one of my systems (X1 Carbon 6th gen), an interrupt races with the teardown code such that the rings have been freed by nhi_detach() before an interrupt triggers. At the time of the crash, the thread invoking nhi_attach() is blocked in bus_teardown_intr() from nhi_pci_free() waiting for the interrupt thread to finish executing the handler. To fix, don't just disable the interrupts in nhi_detach(), but actually tear the handlers down and disable MSI-X before freeing the rings. Reviewed by: obiwac Differential Revision: https://reviews.freebsd.org/D53201 --- sys/dev/thunderbolt/nhi.c | 1 + sys/dev/thunderbolt/nhi_pci.c | 10 +++++++--- sys/dev/thunderbolt/nhi_var.h | 1 + 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/sys/dev/thunderbolt/nhi.c b/sys/dev/thunderbolt/nhi.c index 205e69c16253..30a72652535a 100644 --- a/sys/dev/thunderbolt/nhi.c +++ b/sys/dev/thunderbolt/nhi.c @@ -322,6 +322,7 @@ nhi_detach(struct nhi_softc *sc) tbdev_remove_interface(sc); nhi_pci_disable_interrupts(sc); + nhi_pci_free_interrupts(sc); nhi_free_ring0(sc); diff --git a/sys/dev/thunderbolt/nhi_pci.c b/sys/dev/thunderbolt/nhi_pci.c index 7dacff523cef..865963e275ec 100644 --- a/sys/dev/thunderbolt/nhi_pci.c +++ b/sys/dev/thunderbolt/nhi_pci.c @@ -67,7 +67,7 @@ static int nhi_pci_suspend(device_t); static int nhi_pci_resume(device_t); static void nhi_pci_free(struct nhi_softc *); static int nhi_pci_allocate_interrupts(struct nhi_softc *); -static void nhi_pci_free_interrupts(struct nhi_softc *); +static void nhi_pci_free_resources(struct nhi_softc *); static int nhi_pci_icl_poweron(struct nhi_softc *); static device_method_t nhi_methods[] = { @@ -253,7 +253,7 @@ static void nhi_pci_free(struct nhi_softc *sc) { - nhi_pci_free_interrupts(sc); + nhi_pci_free_resources(sc); if (sc->parent_dmat != NULL) { bus_dma_tag_destroy(sc->parent_dmat); @@ -307,7 +307,7 @@ nhi_pci_allocate_interrupts(struct nhi_softc *sc) return (error); } -static void +void nhi_pci_free_interrupts(struct nhi_softc *sc) { int i; @@ -319,7 +319,11 @@ nhi_pci_free_interrupts(struct nhi_softc *sc) } pci_release_msi(sc->dev); +} +static void +nhi_pci_free_resources(struct nhi_softc *sc) +{ if (sc->irq_table != NULL) { bus_release_resource(sc->dev, SYS_RES_MEMORY, sc->irq_table_rid, sc->irq_table); diff --git a/sys/dev/thunderbolt/nhi_var.h b/sys/dev/thunderbolt/nhi_var.h index 2b9e878af47d..e79ecc954c1f 100644 --- a/sys/dev/thunderbolt/nhi_var.h +++ b/sys/dev/thunderbolt/nhi_var.h @@ -217,6 +217,7 @@ struct nhi_dispatch { int nhi_pci_configure_interrupts(struct nhi_softc *sc); void nhi_pci_enable_interrupt(struct nhi_ring_pair *r); void nhi_pci_disable_interrupts(struct nhi_softc *sc); +void nhi_pci_free_interrupts(struct nhi_softc *sc); int nhi_pci_get_uuid(struct nhi_softc *sc); int nhi_read_lc_mailbox(struct nhi_softc *, u_int reg, uint32_t *val); int nhi_write_lc_mailbox(struct nhi_softc *, u_int reg, uint32_t val); From nobody Wed Oct 29 20:51:29 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cxfYF3zgfz6FHxy; Wed, 29 Oct 2025 20:51: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cxfYF3HTCz46Tc; Wed, 29 Oct 2025 20:51:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761771089; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+zl/9lwJSbdtHuqsifl+73HBu1FRPTEqQ0yBZ8sLGp8=; b=M4bJG9CyMtbVel9FSqwW08QysEch5VI4IGAJJt6fNWYj6OCsPoqcFg+XC4SywfmeMCn78m M5pIV9R9qkVkPGk3g0HqZIKHwnDW6EzhC7sct6jevpY3b3eH4f42fd9bPKB+ygpctl6LWu kwfYo6KaNQMfYP/qdBdljK0ufNnsLMLXUyCurXIyJ9FkKawxF8JXXVQm5Z3TBIdk8J1ORQ ZkR+1Y8emOUmy59mBYlw8C6UV1Sn5BNim6CDoKcp8FZ8YpCZJXnHX18ywvJ9WeQxodeqW+ ui3Kgwk/tJJSPXiyANIO5+na3uU8LRpUvZmOaPVvURmFujP7oG8NNkW5xCOUdg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761771089; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+zl/9lwJSbdtHuqsifl+73HBu1FRPTEqQ0yBZ8sLGp8=; b=Df8tZSc3J0JlQgEz3F9bWO86OECj1GiREJG6qTTlHRsahQBhozifOyFwvSHK2n9Uwn/ViZ tbeOkMMAQfEeSg/q48FWdgY6rz8PfvCs9sEMdMtpP6YjgdrrSeW2glfXJXkj9DNZC2bJ0A GKlsB9rXZ2gJez6aqsAgVCYeRMBSzKRMJa2sTx+7UCPHAHeDmzIfOBViFO3EIMnp6+XSUD 0mAddZ4aJtp7tmrfpkSDMhqs0LW5RQKWi4Ynwct3ugUtn2t3GVbwxFYQGI64llueDPSmx+ xaih+r8vAkcQ5rdec2VAAZRZj2P/99jfVEuEftxwezMQ3fORYb6quD9Bk+7gCA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761771089; a=rsa-sha256; cv=none; b=H+AVthbiVBS1pUcK0XLi6z97vQRkDqZRu+4NAmcv0eHnPBTqeEOhhtOxfCNN3I+UdAWxc+ RU+DsdOfMxZyqWncgY7ELOJ7Qm/W1qL45KEfHQvt4+dWBFJ78BdJbZ0EBj4nx2KvMBr/Fn SvkUXxyQwrgA132d+u8FI4Rn1ssSNhnVNqy1H+mzQ/0/GUqJVKu3hJC3SYcWMYWnyJuSW2 fkuh5ymYHNasP4n1mTolkzVfJwqvhS6nJw7cKRWmzKtRfFOxFILsV4ZZe0YbxzOpK/nTwk Qmf6nWA3iE4XZl+ugdRKzAlFTaJC/9uA0zkKtXmIWtCkSUcPVCipRjpCZLMLAw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cxfYF2sRHzsRN; Wed, 29 Oct 2025 20:51: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 59TKpT9g033766; Wed, 29 Oct 2025 20:51:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59TKpTga033763; Wed, 29 Oct 2025 20:51:29 GMT (envelope-from git) Date: Wed, 29 Oct 2025 20:51:29 GMT Message-Id: <202510292051.59TKpTga033763@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: f17856896d32 - main - pfctl: only set limit restore handler if limits are changed List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f17856896d329204b446e6e918e87f949a70806b Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=f17856896d329204b446e6e918e87f949a70806b commit f17856896d329204b446e6e918e87f949a70806b Author: Kristof Provost AuthorDate: 2025-10-29 15:10:24 +0000 Commit: Kristof Provost CommitDate: 2025-10-29 20:51:11 +0000 pfctl: only set limit restore handler if limits are changed Arm restore atexit(3) handler if and only if the pf(4) limits are being changed to prevent bogus error messages on stderr. OK @bluhm Obtained from: OpenBSD, sashan , 67a69daaf0 Sponsored by: Rubicon Communications, LLC ("Netgate") --- sbin/pfctl/pfctl.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sbin/pfctl/pfctl.c b/sbin/pfctl/pfctl.c index 3d2632c1cf74..02d6c9c84a32 100644 --- a/sbin/pfctl/pfctl.c +++ b/sbin/pfctl/pfctl.c @@ -2618,6 +2618,8 @@ pfctl_apply_limit(struct pfctl *pf, const char *opt, unsigned int limit) int pfctl_load_limit(struct pfctl *pf, unsigned int index, unsigned int limit) { + static int restore_limit_handler_armed = 0; + if (pfctl_set_limit(pf->h, index, limit)) { if (errno == EBUSY) warnx("Current pool size exceeds requested %s limit %u", @@ -2626,6 +2628,9 @@ pfctl_load_limit(struct pfctl *pf, unsigned int index, unsigned int limit) warnx("Cannot set %s limit to %u", pf_limits[index].name, limit); return (1); + } else if (restore_limit_handler_armed == 0) { + atexit(pfctl_restore_limits); + restore_limit_handler_armed = 1; } return (0); } @@ -3474,7 +3479,6 @@ main(int argc, char *argv[]) if ((opts & PF_OPT_NOACTION) == 0) { pfctl_read_limits(pfh); - atexit(pfctl_restore_limits); } if (opts & PF_OPT_DISABLE) From nobody Wed Oct 29 20:59:15 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cxfkD1p1dz6FJWb; Wed, 29 Oct 2025 20:59: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cxfkD197Rz47Xg; Wed, 29 Oct 2025 20:59:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761771556; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=V2FUkgDfnQAGEr/P5LWPNeU5wQ/QlqpmIcN4KvCQGUM=; b=EOK2r4Y2wvauslYPT5UnGLaZX6wfKtz4IifbZ660sTQtGbixpQPBJLAVhz87FJZgkDfdZk uUf74Nzaa4pzk8YJa6/g+PhkDaCou/ElQVW+edCAnIn349m3iQyuilyB16eBmFdFnn4kUI vK4OzyMKmx+kvtBOOTMRlAdjFesqWMhrhk1ibZbP6OT5/z6htCV0QWWqr0+Fm5aJNlmlnN KZBIk6OEwNEveCkI3h8FaF3t34XXF3IY2n18p5c45mZGz0C6z6w4k7ITXU+oZfRAVfY12Q zmM3e72hNj+nPjMugm4IFC0qYz/UsYKwKrg9pC7KoYXZyJiHnV94MkylykrZhQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761771556; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=V2FUkgDfnQAGEr/P5LWPNeU5wQ/QlqpmIcN4KvCQGUM=; b=pUZkkfnnWg7XBbyqc1EZj6dykMNCnEgnRM6XKC43WRd5D0a4YhtE73RTAqmXKql4BI18BR FRfU1h4x01Jg9YoLsuc9KlenpHlHZ7ulawKEemHqyImDTpPN3lW3DHtcL6+PBIg0MoQprc ubrLtC9ZPJIBoL2vdaF2uHK7Qh298uiKtZWvzS5gDmuSFWmMS7+cq4uV+7hy/qJJhfh0nK XxX5KdipGQtMw/g89TjKYJXKXOL2ES0X6HsztpyqItVik9FSbc2yOslRbYP7mdHOBl5yT3 siES4eVBdnYMBTBVnWOQzIco40JQ6JwOolzWWo/Vz817ORSKp0QHxoaWqHkqtQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761771556; a=rsa-sha256; cv=none; b=kr4Ws21r6dGveRRLLpCqdiGeHhxQL/WiDJvAvbUm2HREyRhJTDkEOxuV7UFyufDEOf8c2k 8NisrFxFGqnlcM/yMVdC1Tnuwl3G5la9H98Mc6Kx22WBSbVJDVIq07llOO1uVw8Vigkr6b IhlqyC4PJXhH5OT/IyxaA1i+0gXebBBOjFfAr0Cnn5HCodtgdo39nyA5Fv0MFhBMFlQogF Sdc4J6nynxkOda5FzAO2EKDXa3/4tokNyiXMGujp13aGsAOAsdC3tW/HnxukQRHuVez4VC E8ajuLiW3MGqkMKfS6Ws1Cgq0muJp0K/jsVi2AQy8tuPebeivoV258kOVLB/qw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cxfkD0PWGzsrP; Wed, 29 Oct 2025 20:59: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 59TKxF8C037142; Wed, 29 Oct 2025 20:59:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59TKxFcn037139; Wed, 29 Oct 2025 20:59:15 GMT (envelope-from git) Date: Wed, 29 Oct 2025 20:59:15 GMT Message-Id: <202510292059.59TKxFcn037139@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Austin Shafer Subject: git: 75aa13c64aba - main - linuxkpi: add stub implementation of pm_vt_switch_(un)register List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ashafer X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 75aa13c64aba71f6f26d05e8fcf96e3862d44cde Auto-Submitted: auto-generated The branch main has been updated by ashafer: URL: https://cgit.FreeBSD.org/src/commit/?id=75aa13c64aba71f6f26d05e8fcf96e3862d44cde commit 75aa13c64aba71f6f26d05e8fcf96e3862d44cde Author: Austin Shafer AuthorDate: 2025-10-28 17:03:18 +0000 Commit: Austin Shafer CommitDate: 2025-10-29 20:58:40 +0000 linuxkpi: add stub implementation of pm_vt_switch_(un)register This adds empty implementations of pm_vt_switch_(un)register which are used by nvidia-drm. We do not need to specify anything here as a VT switch always happens on suspend/resume. Sponsored by: NVIDIA Reviewed by: kbowling (mentor), emaste Differential Revision: https://reviews.freebsd.org/D53400 --- sys/compat/linuxkpi/common/include/linux/pm.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/pm.h b/sys/compat/linuxkpi/common/include/linux/pm.h index c8d943027909..932697e0eda8 100644 --- a/sys/compat/linuxkpi/common/include/linux/pm.h +++ b/sys/compat/linuxkpi/common/include/linux/pm.h @@ -97,4 +97,18 @@ pm_wakeup_event(struct device *dev __unused, unsigned int x __unused) pr_debug("%s: TODO\n", __func__); } +/* + * We do not need to specify anything here as a VT switch always happens on + * suspend/resume. + */ +static inline void +pm_vt_switch_required(struct device *dev __unused, bool required __unused) +{ +} + +static inline void +pm_vt_switch_unregister(struct device *dev __unused) +{ +} + #endif /* _LINUXKPI_LINUX_PM_H */ From nobody Wed Oct 29 20:59:16 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cxfkF1QDmz6FJZ2; Wed, 29 Oct 2025 20:59: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cxfkF0gTnz47HN; Wed, 29 Oct 2025 20:59:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761771557; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zNkgilz9EXqrG8IO72pV//x2mTF8jRogfDZPPQVCU+g=; b=xbJk+qvbbUrka+BkSRwe8q3JRc/lglivT+3q9i3GXc6T9LCWueZ2SxFG49zRlr5S44prjD K8sGNJZYGhH7XLbXvDd+PEzJVvVx7mrcbTUOOaoTOeEg0i4lo7aC9DDHxNCRPtjgfdxctR /gAfBfYzRj3VWxpedVsxwVkAfNbqtm1QxWsiA7kOYeYnE6AOvKUqpDX/pfdQzx1fmALj1l 46kCcj01gJF3/m+VChuXYBgNUf3SFZ2vPuLlok+0lK/Yfb58cnYdDESDheEku5GSvKpVqv 539+aTPUNreFLi+SLIzzdYreCZIGYysRFgJhlWGrvEF5mI0DUjXPG7k1EbXNGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761771557; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zNkgilz9EXqrG8IO72pV//x2mTF8jRogfDZPPQVCU+g=; b=K9fBSQt/XYqPkFnB2mIvsJHzKqDsYLU3pPfuhGepkjPB+4EAwI0o9D1dERz0MHB7ge7scM VBZWOd6mqj0tcsB6X4vwQQ6q/x+L1Zvp209Il6Ye9v0x6QnNBsDl15MzJya3+/OIPBvC45 XZkusvbDP/RVpf9Ro0Sr8zSajs3uJI4iiYsbcig5SDt4Ut52Up8xB6gbxFa69C/uX8YoMw 5JcKH5YPBfyQWhzUY/7VM/E/p1mqVotNEpZN7x0hvxBaLCaHR1IG5Xj3BCumswr/Tt+wuD l4pf1htJY9CHxW91xnlFMf4VANXgOi4cV8T7iHAvCCBOqRIvgB0uqaDgxxuhyA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761771557; a=rsa-sha256; cv=none; b=t70/G3Zqci+Rgx/HqNWsYZKKc87UYqzqT1qxTOFXw7IVHjeobEnn6AGnztjbFnz6TcHD/o profmh7qiFtsnH0YTW1xAoUPb96L/+23GiSQWEDJJch0oDShWOzNg8GG07ox9cDIpiq51p 42ICQC/EHKs/n4TVGFPkwExUNB4o9zKCY3xdNfu4kh7u90k4m0uvRGncnKONJTup3iDgpw Tf2RPLJzok4H58OkSptXz6Bh75qi99eci6uc+9/QRDS9WZmvrGoCBvVEYaR1drE5jmFsWl xYvkuRNRNIBX8Vg3PsRMf9vO7L73VyOTBL5EFPbCrcVX3etv35t7nJusEYbB/g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cxfkF03tqzsrQ; Wed, 29 Oct 2025 20:59: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 59TKxGTX037174; Wed, 29 Oct 2025 20:59:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59TKxG2d037171; Wed, 29 Oct 2025 20:59:16 GMT (envelope-from git) Date: Wed, 29 Oct 2025 20:59:16 GMT Message-Id: <202510292059.59TKxG2d037171@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Austin Shafer Subject: git: 03b214a35db1 - main - linuxkpi: gracefully handle page lookup failure in lkpi_vmf_insert_pfn_prot_locked List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ashafer X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 03b214a35db1ebdc7575cad8d695c65daf2817bf Auto-Submitted: auto-generated The branch main has been updated by ashafer: URL: https://cgit.FreeBSD.org/src/commit/?id=03b214a35db1ebdc7575cad8d695c65daf2817bf commit 03b214a35db1ebdc7575cad8d695c65daf2817bf Author: Austin Shafer AuthorDate: 2025-10-28 18:08:01 +0000 Commit: Austin Shafer CommitDate: 2025-10-29 20:58:41 +0000 linuxkpi: gracefully handle page lookup failure in lkpi_vmf_insert_pfn_prot_locked Currently lkpi_vmf_insert_pfn_prot_locked will check the page iter to find a usage of the page. If no page was found, it continues on to try using PHYS_TO_VM_PAGE() to get a page. Currently it does not check if a valid page was found before passing it to vm_page_busy_acquire, which can cause a kernel page fault as vm_page_busy_acquire expects a valid page pointer. This can easily be triggered while starting KDE6 in wayland mode, which many users have been reporting. With this change plasma6 starts properly in wayland mode. Sponsored by: NVIDIA PR: 288565 Reviewed by: markj, kbowling (mentor) Differential Revision: https://reviews.freebsd.org/D53412 --- sys/compat/linuxkpi/common/src/linux_page.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/compat/linuxkpi/common/src/linux_page.c b/sys/compat/linuxkpi/common/src/linux_page.c index 628af17df853..9cc981b2ba43 100644 --- a/sys/compat/linuxkpi/common/src/linux_page.c +++ b/sys/compat/linuxkpi/common/src/linux_page.c @@ -345,6 +345,10 @@ retry: page = vm_page_grab_iter(vm_obj, pindex, VM_ALLOC_NOCREAT, &pages); if (page == NULL) { page = PHYS_TO_VM_PAGE(IDX_TO_OFF(pfn)); + if (page == NULL) { + pctrie_iter_reset(&pages); + return (VM_FAULT_SIGBUS); + } if (!vm_page_busy_acquire(page, VM_ALLOC_WAITFAIL)) { pctrie_iter_reset(&pages); goto retry; From nobody Wed Oct 29 21:44:27 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cxgkM2zSZz6FM2q; Wed, 29 Oct 2025 21:44:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cxgkM2FpFz3Dsb; Wed, 29 Oct 2025 21:44:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761774267; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VI42zN9Nbx6s7lNY5xTv642OmvjRN53YqDCe7m2V5K8=; b=SBR2egW0wWROK3Ek6XI5CL+8kv2GJQLmb15il4OQtrqcKf9RuUsxPr7h2KQlz3wQIqLaih 1+UgJyx18bmWdERbgQTGFxr+y9R59YjMCymqvnr4bqqLB07IoCBniBIAW0pSfPnCVXRadU EeSvqplQMcFsQSUcKrUdg2Ss90KPMXkMDkIAg0VKCsor+jGGRNefhdsjLBCWNFryjayaHI ISmVpEeZH73yFnebSAxq1VXTUJZtW6zkatzTTlSuujalS+HGKlk0AVLiSfs0N+PJWefBrX wCbcrcHxKO3QljH3G/BEpOPfNrapYQ5x9rHV0Jn8mUQikaZWS1tP0BXgxiFICA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761774267; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VI42zN9Nbx6s7lNY5xTv642OmvjRN53YqDCe7m2V5K8=; b=nWPKynuWlSpm9FXy/lsz5kgs2C+lquUc8/HFUQL8SKcatQlGxZm7I2qdgUckAOVg79vqa+ V1iIfE5mWT0Xb1Vbxjgzr6JHU5EsSk9osYgcnkUVfViZAYqME5zW1FIX/clUngAUrjfn+5 PdkdrCsmBJ7X3MkinKPSTYnjZc+vtdtDq5nYWFLeCcVZAMFKDf5UEEcEriJMEFTsGcJ/Lk KJBKL1snCZMeIyVzViWIp6pS8bBiNRir2UjcBeidI3SPRbPwfoAlNKwfPGJQykfErMjXGa xvBK8HEtPYZ6dULNjGfve5ozD3MaFWKCJY68toxsnlcCvPE3hs+MVrnZbjUUQQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761774267; a=rsa-sha256; cv=none; b=LlmbZtAeVMWffGXq5tAzoBFNiEw1D3QbB5udAB4vW1Q/JZtzncmitxIB7eyNPrZCclYBvh rgx23zaaMSPFFSSv/OR4xBgrYYhGB87XvwQT8fEBLi//54qIycL8C6U7fKzGz7NQjjMl7Q aNgh5faKJCx9NumuTWSM9qw3guYlzZlkRE4W3oKieq/D2/H9vKXA3lRh4TCWNj3jo6ZuUS OZTARxE4zeLFU4+ZsScA5IwJTwpURHT9nZnf7NPx3nBD6TxyJ2G2JYCz3nATOT0oUbg8QK xVbqk6dKM/pUyPrMia+yi+856016FfIWXSs/jh0Tv0YmdK0AZsvoKDMWXqgPKg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cxgkM1s82ztgM; Wed, 29 Oct 2025 21:44:27 +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 59TLiRiU030321; Wed, 29 Oct 2025 21:44:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59TLiRFu030318; Wed, 29 Oct 2025 21:44:27 GMT (envelope-from git) Date: Wed, 29 Oct 2025 21:44:27 GMT Message-Id: <202510292144.59TLiRFu030318@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: 8d5a88ac95b2 - main - nfs_clvfsops.c: Allow long directory mount paths List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8d5a88ac95b23b0a8c4943be0aef1f93e3902bfb Auto-Submitted: auto-generated The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=8d5a88ac95b23b0a8c4943be0aef1f93e3902bfb commit 8d5a88ac95b23b0a8c4943be0aef1f93e3902bfb Author: Rick Macklem AuthorDate: 2025-10-29 21:41:12 +0000 Commit: Rick Macklem CommitDate: 2025-10-29 21:41:12 +0000 nfs_clvfsops.c: Allow long directory mount paths Without this patch, the NFS client code for mounts has an arbitrary 100 character limit for the directory path being mounted on the server. Someone reported this quite a while ago, but I cannot find the email or bugzilla PR. This patch fixes the problem by increasing the directory path length limit to MNAMELEN, allocated via malloc() to avoid using too much stack. MFC after: 2 weeks --- sys/fs/nfsclient/nfs_clvfsops.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/sys/fs/nfsclient/nfs_clvfsops.c b/sys/fs/nfsclient/nfs_clvfsops.c index 5ea7eab07632..212c88f28930 100644 --- a/sys/fs/nfsclient/nfs_clvfsops.c +++ b/sys/fs/nfsclient/nfs_clvfsops.c @@ -927,7 +927,7 @@ nfs_mount(struct mount *mp) struct vnode *vp; struct thread *td; char *hst; - u_char nfh[NFSX_FHMAX], krbname[100], dirpath[100], srvkrbname[100]; + u_char nfh[NFSX_FHMAX], krbname[100], *dirpath, srvkrbname[100]; char *cp, *opt, *name, *secname, *tlscertname; int nametimeo = NFS_DEFAULT_NAMETIMEO; int negnametimeo = NFS_DEFAULT_NEGNAMETIMEO; @@ -943,6 +943,7 @@ nfs_mount(struct mount *mp) newflag = 0; tlscertname = NULL; hst = malloc(MNAMELEN, M_TEMP, M_WAITOK); + dirpath = malloc(MNAMELEN, M_TEMP, M_WAITOK); if (vfs_filteropt(mp->mnt_optnew, nfs_opts)) { error = EINVAL; goto out; @@ -1329,7 +1330,7 @@ nfs_mount(struct mount *mp) goto out; } else if (nfs_mount_parse_from(mp->mnt_optnew, &args.hostname, (struct sockaddr_in **)&nam, dirpath, - sizeof(dirpath), &dirlen) == 0) { + MNAMELEN, &dirlen) == 0) { has_nfs_from_opt = 1; bcopy(args.hostname, hst, MNAMELEN); hst[MNAMELEN - 1] = '\0'; @@ -1387,7 +1388,7 @@ nfs_mount(struct mount *mp) if (has_nfs_from_opt == 0) { if (vfs_getopt(mp->mnt_optnew, "dirpath", (void **)&name, NULL) == 0) - strlcpy(dirpath, name, sizeof (dirpath)); + strlcpy(dirpath, name, MNAMELEN); else dirpath[0] = '\0'; dirlen = strlen(dirpath); @@ -1472,6 +1473,7 @@ out: MNT_IUNLOCK(mp); } free(hst, M_TEMP); + free(dirpath, M_TEMP); return (error); } From nobody Thu Oct 30 00:48:34 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cxlpp4H6Jz6DMvL; Thu, 30 Oct 2025 00:48: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cxlpp3NKBz3YC0; Thu, 30 Oct 2025 00:48:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761785314; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cR/s34Om+lwLcnIsobj4P/buBarnGLjWpOSFwevreCg=; b=i0IkqVn+4N2yNWMurDXQeQRive42Y6ODId6QZ5PynKJurmflNT7dxURtKFSYuyVEuA7U6v +0of8D+5J9sVHysgzNUZOtGvUxtJQgObrBdecjKIjjnW+6L/JbuLG8LwJth4EHwRXKgls7 PvrAwL8uK+7tpeUko5Jz5Tn4BA9Q960KUHhFVhA60FFbpiT+mQsWTqOpfyMsIvkrtiJgpG ymcRkCdq8NVgJpgDtM5g5ZXWA8yR8tvZYMCwCF0Dfw15yLh91ABQ02+Bo5EegHyH/TB2cd mclIT20OwJIolhE3g8bWl8tQVeklOauhbvSX9OiTY0ISAmrYjKba/ChhEtt/BQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761785314; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cR/s34Om+lwLcnIsobj4P/buBarnGLjWpOSFwevreCg=; b=NywQxsmXSrwf3x16Pn3Aba+rMSD4QZ0aZc3TzOvlJcc5HWdOrBCkOm2KuE9JUKL6oQJwdw qJvH3mPZs3IABmXcPxAfgvQol0YMcrUIgB09+ZQxU0n4kgpoypobFFuXrSy/HkvwYBYAQz JPTSACztoYUWrrAfbLE9h4ae0WskdA4NFCIF62nRlFd/KEMKI03xfr9rcDupwtVZSyxEE6 0k0HNM0SupDzkdff/VSPMOiVSVZtIuOTXH4YTcmBfn2KmHiE4v8BvVqKtZC2kNgGO3G8uB p+fvrzHGH/tLp1/iwobZBiM/ku0slNiH+CFNr4X1C+02NibVASI8flkLpGJbxA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761785314; a=rsa-sha256; cv=none; b=WABIo++TV9qZQkKZN/qDPu7LBTnRJ/f0JscCpQ6UzoINhjHomSy8YEsWrZvswjVtYx62lE 2Izrm6ReMUgw3VnqQtJVDG4uro9dV09pB+06Z/KaP+qjomn49kPWjySZaTIIb4aCcAJXeE l0W10HHzngnL90X9tQzHbo+zYI3agv2sQFMc+Bd8bZmHgqeKrIwtpfo4ab+h8DKFjsu1pF KzT7sWeqdgDk+bF9qC2GQtm/0N3Myrji035PPO+oAOKOjkCEfsfNwvfM059UOuCzb6d9RU Hq4snFTTIXFkQDDUMVuCPLrHO7W113vqO8ZgERfEKBpW8JVca4Oy5q0CW1uVog== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cxlpp2tzTz10FR; Thu, 30 Oct 2025 00:48: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 59U0mYSt069198; Thu, 30 Oct 2025 00:48:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59U0mYm3069195; Thu, 30 Oct 2025 00:48:34 GMT (envelope-from git) Date: Thu, 30 Oct 2025 00:48:34 GMT Message-Id: <202510300048.59U0mYm3069195@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Adrian Chadd Subject: git: df764dd133ec - main - vchiq: logging/tracing refactoring List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adrian X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: df764dd133ecba8eade6a44e9baf1f0e9cf0d2f3 Auto-Submitted: auto-generated The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=df764dd133ecba8eade6a44e9baf1f0e9cf0d2f3 commit df764dd133ecba8eade6a44e9baf1f0e9cf0d2f3 Author: Marco Devesas Campos AuthorDate: 2025-10-26 23:04:17 +0000 Commit: Adrian Chadd CommitDate: 2025-10-30 00:48:05 +0000 vchiq: logging/tracing refactoring * Create macros for error, info, warn, trace / debug * Migrate existing printf() logging to use the above macros * Add a sysctl knob to control it at runtime This is based on work done in https://reviews.freebsd.org/D37878 . Submitted by: Marco Devesas Campos Differential Revision: https://reviews.freebsd.org/D53371 --- sys/arm/broadcom/bcm2835/bcm2835_audio.c | 66 ++++++++++++++++++++++++++------ 1 file changed, 54 insertions(+), 12 deletions(-) diff --git a/sys/arm/broadcom/bcm2835/bcm2835_audio.c b/sys/arm/broadcom/bcm2835/bcm2835_audio.c index 13f309dd3f11..74dede21c0df 100644 --- a/sys/arm/broadcom/bcm2835/bcm2835_audio.c +++ b/sys/arm/broadcom/bcm2835/bcm2835_audio.c @@ -132,6 +132,7 @@ struct bcm2835_audio_info { uint32_t flags_pending; + int verbose_trace; /* Worker thread state */ int worker_state; }; @@ -140,6 +141,29 @@ struct bcm2835_audio_info { #define BCM2835_AUDIO_LOCKED(sc) mtx_assert(&(sc)->lock, MA_OWNED) #define BCM2835_AUDIO_UNLOCK(sc) mtx_unlock(&(sc)->lock) +#define BCM2835_LOG_ERROR(sc,...) \ + do { \ + device_printf((sc)->dev, __VA_ARGS__); \ + } while(0) + +#define BCM2835_LOG_INFO(sc,...) \ + do { \ + if (sc->verbose_trace > 0) \ + device_printf((sc)->dev, __VA_ARGS__); \ + } while(0) + +#define BCM2835_LOG_WARN(sc,...) \ + do { \ + if (sc->verbose_trace > 1) \ + device_printf((sc)->dev, __VA_ARGS__); \ + } while(0) + +#define BCM2835_LOG_TRACE(sc,...) \ + do { \ + if(sc->verbose_trace > 2) \ + device_printf((sc)->dev, __VA_ARGS__); \ + } while(0) + static const char * dest_description(uint32_t dest) { @@ -247,7 +271,8 @@ bcm2835_audio_callback(void *param, const VCHI_CALLBACK_REASON_T reason, void *m } BCM2835_AUDIO_UNLOCK(sc); } else - printf("%s: unknown m.type: %d\n", __func__, m.type); + BCM2835_LOG_WARN(sc, "%s: unknown m.type: %d\n", __func__, + m.type); } /* VCHIQ stuff */ @@ -259,13 +284,13 @@ bcm2835_audio_init(struct bcm2835_audio_info *sc) /* Initialize and create a VCHI connection */ status = vchi_initialise(&sc->vchi_instance); if (status != 0) { - printf("vchi_initialise failed: %d\n", status); + BCM2835_LOG_ERROR(sc, "vchi_initialise failed: %d\n", status); return; } status = vchi_connect(NULL, 0, sc->vchi_instance); if (status != 0) { - printf("vchi_connect failed: %d\n", status); + BCM2835_LOG_ERROR(sc, "vchi_connect failed: %d\n", status); return; } @@ -297,7 +322,8 @@ bcm2835_audio_release(struct bcm2835_audio_info *sc) if (sc->vchi_handle != VCHIQ_SERVICE_HANDLE_INVALID) { success = vchi_service_close(sc->vchi_handle); if (success != 0) - printf("vchi_service_close failed: %d\n", success); + BCM2835_LOG_ERROR(sc, "vchi_service_close failed: %d\n", + success); vchi_service_release(sc->vchi_handle); sc->vchi_handle = VCHIQ_SERVICE_HANDLE_INVALID; } @@ -327,7 +353,9 @@ bcm2835_audio_start(struct bcm2835_audio_chinfo *ch) &m, sizeof m, VCHI_FLAGS_BLOCK_UNTIL_QUEUED, NULL); if (ret != 0) - printf("%s: vchi_msg_queue failed (err %d)\n", __func__, ret); + BCM2835_LOG_ERROR(sc, + "%s: vchi_msg_queue failed (err %d)\n", __func__, + ret); } } @@ -346,7 +374,9 @@ bcm2835_audio_stop(struct bcm2835_audio_chinfo *ch) &m, sizeof m, VCHI_FLAGS_BLOCK_UNTIL_QUEUED, NULL); if (ret != 0) - printf("%s: vchi_msg_queue failed (err %d)\n", __func__, ret); + BCM2835_LOG_ERROR(sc, + "%s: vchi_msg_queue failed (err %d)\n", __func__, + ret); } } @@ -362,7 +392,9 @@ bcm2835_audio_open(struct bcm2835_audio_info *sc) &m, sizeof m, VCHI_FLAGS_BLOCK_UNTIL_QUEUED, NULL); if (ret != 0) - printf("%s: vchi_msg_queue failed (err %d)\n", __func__, ret); + BCM2835_LOG_ERROR(sc, + "%s: vchi_msg_queue failed (err %d)\n", __func__, + ret); } } @@ -384,7 +416,9 @@ bcm2835_audio_update_controls(struct bcm2835_audio_info *sc, uint32_t volume, ui &m, sizeof m, VCHI_FLAGS_BLOCK_UNTIL_QUEUED, NULL); if (ret != 0) - printf("%s: vchi_msg_queue failed (err %d)\n", __func__, ret); + BCM2835_LOG_ERROR(sc, + "%s: vchi_msg_queue failed (err %d)\n", __func__, + ret); } } @@ -404,7 +438,9 @@ bcm2835_audio_update_params(struct bcm2835_audio_info *sc, uint32_t fmt, uint32_ &m, sizeof m, VCHI_FLAGS_BLOCK_UNTIL_QUEUED, NULL); if (ret != 0) - printf("%s: vchi_msg_queue failed (err %d)\n", __func__, ret); + BCM2835_LOG_ERROR(sc, + "%s: vchi_msg_queue failed (err %d)\n", __func__, + ret); } } @@ -452,14 +488,15 @@ bcm2835_audio_write_samples(struct bcm2835_audio_chinfo *ch, void *buf, uint32_t &m, sizeof m, VCHI_FLAGS_BLOCK_UNTIL_QUEUED, NULL); if (ret != 0) - printf("%s: vchi_msg_queue failed (err %d)\n", __func__, ret); + BCM2835_LOG_ERROR(sc, "%s: vchi_msg_queue failed (err %d)\n", + __func__, ret); while (count > 0) { int bytes = MIN((int)m.u.write.max_packet, (int)count); ret = vchi_msg_queue(sc->vchi_handle, buf, bytes, VCHI_FLAGS_BLOCK_UNTIL_QUEUED, NULL); if (ret != 0) - printf("%s: vchi_msg_queue failed: %d\n", + BCM2835_LOG_ERROR(sc, "%s: vchi_msg_queue failed: %d\n", __func__, ret); buf = (char *)buf + bytes; count -= bytes; @@ -577,7 +614,8 @@ bcm2835_audio_create_worker(struct bcm2835_audio_info *sc) sc->worker_state = WORKER_RUNNING; if (kproc_create(bcm2835_audio_worker, (void*)sc, &newp, 0, 0, "bcm2835_audio_worker") != 0) { - printf("failed to create bcm2835_audio_worker\n"); + BCM2835_LOG_ERROR(sc, + "failed to create bcm2835_audio_worker\n"); } } @@ -830,6 +868,9 @@ vchi_audio_sysctl_init(struct bcm2835_audio_info *sc) SYSCTL_ADD_INT(ctx, tree, OID_AUTO, "starved", CTLFLAG_RD, &sc->pch.starved, sc->pch.starved, "number of starved conditions"); + SYSCTL_ADD_INT(ctx, tree, OID_AUTO, "trace", + CTLFLAG_RW, &sc->verbose_trace, + sc->verbose_trace, "enable tracing of transfers"); } static void @@ -861,6 +902,7 @@ bcm2835_audio_delayed_init(void *xsc) bcm2835_audio_open(sc); sc->volume = 75; sc->dest = DEST_AUTO; + sc->verbose_trace = 0; if (mixer_init(sc->dev, &bcmmixer_class, sc)) { device_printf(sc->dev, "mixer_init failed\n"); From nobody Thu Oct 30 00:48:35 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cxlpq4zBfz6DMyk; Thu, 30 Oct 2025 00:48: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cxlpq4Dcrz3XsC; Thu, 30 Oct 2025 00:48:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761785315; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kOX+joSeMp2U9ixlv0nEXqnrAFxtHSciKpExOlRGKlI=; b=VfI3n8U8RwVebZTnIyTGh0vXKCOua3zagwNg3hPHDkcJTP9gLYOK1FXm3sGAXeN/kDnlSx RtzfYsfZyoYmNNaHYPvnmvn9eKBa4xcan9d6iiWF3AkncAKes5zN2WNqcPfaHtd/rF1bRV C9Bm0t7Km/pTe8Ufs6jGaF4OI56jPOZ1jMbckroaozpNGixofQyJxeRdDakxIPHqlTsk9D nrk5AM5MTHE9kZ8iiQxLJW4OBU1thury0LWZfiRt01UhHsLKSby9hj7yvM4zVH7rJDNr/+ 6+hLl+g0+mwS6xL3NwWwE6ZsOFwVh7aj2Oik4t8RU4aFd7eKvTg2QxJF6cR9lg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761785315; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kOX+joSeMp2U9ixlv0nEXqnrAFxtHSciKpExOlRGKlI=; b=yLIsNsL32Ji/PZLhqIUVBZBmAOASE+RQ4RLIqa94UpLYYSsAxJ0sNtgRtYtHw1Hz9MEBfK oF3XN42qYdSKHMzBO0UbyIhmIBpphaaOtHw++sC68HyX59KvaF+x99pNIF4tK9WSCywJrm JskkSAUB9R+mFXKvFnsom9GMZ/MaaX4goS+MWZlH1jlYclma9fdke+HTBte0rBRviQ3n1Y kBTm7e3YmA/dfocSNSuUqb9DQFYlC47Slq0mscUD7xD8eLC/C+I2eJbm2HfPxR65UylrUN LRFlIA0+eeD1VFbtslI2dx+uVCsMt25i+4z+iYRQPrjWbRPm+34DfvSqYwI8Dw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761785315; a=rsa-sha256; cv=none; b=t3v2DfSEnuzlS4jZ68gt7ohl+825blDtug0Kl2oVlS3D1iqqlGDwGRJPJgktfElu5klPwl cCwEi/kyXl5jMXSxRy+TBB9FBppcey1cOhvyEDMD5CHwCjDykFRUjhxWAmTb8e1sLGcRWS aN3YS6tLULEnD7//b7Yxxj2tXALVQIv/UQYybsbhBjeViIt7PfndAYrq5+xTgye9f77RJK wz8/6qt0s6vJAXmo00WKgFSVYb6VYzA/IHTeAo2b3RsUjxUdTPkE9DgaNdoJhx3Ch6C17h 0Ad5dFh8kbHDNuK766uc4ei2Z53FUgzdPEkeOcT3am/BeTIK5ivN+xojPjArSA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cxlpq3pBBzyxk; Thu, 30 Oct 2025 00:48: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 59U0mZmb069232; Thu, 30 Oct 2025 00:48:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59U0mZ79069229; Thu, 30 Oct 2025 00:48:35 GMT (envelope-from git) Date: Thu, 30 Oct 2025 00:48:35 GMT Message-Id: <202510300048.59U0mZ79069229@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Adrian Chadd Subject: git: 8b43286fc3ba - main - vchiq: fix another logging format string for 32/64 bit List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adrian X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8b43286fc3badc646ff5a828bae226c8fca90268 Auto-Submitted: auto-generated The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=8b43286fc3badc646ff5a828bae226c8fca90268 commit 8b43286fc3badc646ff5a828bae226c8fca90268 Author: Marco Devesas Campos AuthorDate: 2025-10-26 23:08:24 +0000 Commit: Adrian Chadd CommitDate: 2025-10-30 00:48:12 +0000 vchiq: fix another logging format string for 32/64 bit This is from work from https://reviews.freebsd.org/D37878. Submitted by: Marco Devesas Campos Differential Revision: https://reviews.freebsd.org/D53372 --- sys/arm/broadcom/bcm2835/bcm2835_audio.c | 5 ++-- .../vchiq/interface/vchiq_arm/vchiq_2835_arm.c | 11 ++++----- sys/contrib/vchiq/interface/vchiq_arm/vchiq_arm.c | 28 +++++++++++----------- 3 files changed, 21 insertions(+), 23 deletions(-) diff --git a/sys/arm/broadcom/bcm2835/bcm2835_audio.c b/sys/arm/broadcom/bcm2835/bcm2835_audio.c index 74dede21c0df..2df6ac76124f 100644 --- a/sys/arm/broadcom/bcm2835/bcm2835_audio.c +++ b/sys/arm/broadcom/bcm2835/bcm2835_audio.c @@ -260,8 +260,9 @@ bcm2835_audio_callback(void *param, const VCHI_CALLBACK_REASON_T reason, void *m device_printf(sc->dev, "available_space == %d, count = %d, perr=%d\n", ch->available_space, count, perr); device_printf(sc->dev, - "retrieved_samples = %lld, submitted_samples = %lld\n", - ch->retrieved_samples, ch->submitted_samples); + "retrieved_samples = %ju, submitted_samples = %ju\n", + (uintmax_t)ch->retrieved_samples, + (uintmax_t)ch->submitted_samples); } ch->available_space += count; ch->retrieved_samples += count; diff --git a/sys/contrib/vchiq/interface/vchiq_arm/vchiq_2835_arm.c b/sys/contrib/vchiq/interface/vchiq_arm/vchiq_2835_arm.c index 0150ce72f0a4..f4aee12dec53 100644 --- a/sys/contrib/vchiq/interface/vchiq_arm/vchiq_2835_arm.c +++ b/sys/contrib/vchiq/interface/vchiq_arm/vchiq_2835_arm.c @@ -204,8 +204,8 @@ vchiq_platform_init(VCHIQ_STATE_T *state) bcm_mbox_write(BCM2835_MBOX_CHAN_VCHIQ, (unsigned int)g_slot_phys); vchiq_log_info(vchiq_arm_log_level, - "vchiq_init - done (slots %x, phys %x)", - (unsigned int)vchiq_slot_zero, g_slot_phys); + "vchiq_init - done (slots %zx, phys %zx)", + (size_t)vchiq_slot_zero, g_slot_phys); vchiq_call_connected_callbacks(); @@ -451,10 +451,7 @@ create_pagelist(char __user *buf, size_t count, unsigned short type, } vchiq_log_trace(vchiq_arm_log_level, - "create_pagelist - %x (%d bytes @%p)", (unsigned int)pagelist, count, buf); - - if (!pagelist) - return -ENOMEM; + "create_pagelist - %zx (%zu bytes @%p)", (size_t)pagelist, count, buf); addrs = pagelist->addrs; pages = (vm_page_t*)(addrs + num_pages); @@ -549,7 +546,7 @@ free_pagelist(BULKINFO_T *bi, int actual) pagelist = bi->pagelist; vchiq_log_trace(vchiq_arm_log_level, - "free_pagelist - %x, %d (%lu bytes @%p)", (unsigned int)pagelist, actual, pagelist->length, bi->buf); + "free_pagelist - %zx, %d (%u bytes @%p)", (size_t)pagelist, actual, pagelist->length, bi->buf); num_pages = (pagelist->length + pagelist->offset + PAGE_SIZE - 1) / diff --git a/sys/contrib/vchiq/interface/vchiq_arm/vchiq_arm.c b/sys/contrib/vchiq/interface/vchiq_arm/vchiq_arm.c index 763cd9ce9417..e25c4d738922 100644 --- a/sys/contrib/vchiq/interface/vchiq_arm/vchiq_arm.c +++ b/sys/contrib/vchiq/interface/vchiq_arm/vchiq_arm.c @@ -442,8 +442,8 @@ vchiq_ioctl(struct cdev *cdev, u_long cmd, caddr_t arg, int fflag, #define _IOC_TYPE(x) IOCGROUP(x) vchiq_log_trace(vchiq_arm_log_level, - "vchiq_ioctl - instance %x, cmd %s, arg %p", - (unsigned int)instance, + "vchiq_ioctl - instance %zx, cmd %s, arg %p", + (size_t)instance, ((_IOC_TYPE(cmd) == VCHIQ_IOC_MAGIC) && (_IOC_NR(cmd) <= VCHIQ_IOC_MAX)) ? ioctl_names[_IOC_NR(cmd)] : "", arg); @@ -745,8 +745,8 @@ vchiq_ioctl(struct cdev *cdev, u_long cmd, caddr_t arg, int fflag, break; } vchiq_log_info(vchiq_arm_log_level, - "found bulk_waiter %x for pid %d", - (unsigned int)waiter, current->p_pid); + "found bulk_waiter %zx for pid %d", + (size_t)waiter, current->p_pid); args.userdata = &waiter->bulk_waiter; } status = vchiq_bulk_transfer @@ -776,8 +776,8 @@ vchiq_ioctl(struct cdev *cdev, u_long cmd, caddr_t arg, int fflag, list_add(&waiter->list, &instance->bulk_waiter_list); lmutex_unlock(&instance->bulk_waiter_list_mutex); vchiq_log_info(vchiq_arm_log_level, - "saved bulk_waiter %x for pid %d", - (unsigned int)waiter, current->p_pid); + "saved bulk_waiter %zx for pid %d", + (size_t)waiter, current->p_pid); memcpy((void *) &(((VCHIQ_QUEUE_BULK_TRANSFER_T *) @@ -860,9 +860,9 @@ vchiq_ioctl(struct cdev *cdev, u_long cmd, caddr_t arg, int fflag, if (args.msgbufsize < msglen) { vchiq_log_error( vchiq_arm_log_level, - "header %x: msgbufsize" + "header %zx: msgbufsize" " %x < msglen %x", - (unsigned int)header, + (size_t)header, args.msgbufsize, msglen); WARN(1, "invalid message " @@ -1031,8 +1031,8 @@ vchiq_ioctl(struct cdev *cdev, u_long cmd, caddr_t arg, int fflag, ret = -EFAULT; } else { vchiq_log_error(vchiq_arm_log_level, - "header %x: bufsize %x < size %x", - (unsigned int)header, args.bufsize, + "header %zx: bufsize %x < size %x", + (size_t)header, args.bufsize, header->size); WARN(1, "invalid size\n"); ret = -EMSGSIZE; @@ -1435,9 +1435,9 @@ vchiq_dump_platform_instances(void *dump_context) instance = service->instance; if (instance && !instance->mark) { len = snprintf(buf, sizeof(buf), - "Instance %x: pid %d,%s completions " + "Instance %zx: pid %d,%s completions " "%d/%d", - (unsigned int)instance, instance->pid, + (size_t)instance, instance->pid, instance->connected ? " connected, " : "", instance->completion_insert - @@ -1465,8 +1465,8 @@ vchiq_dump_platform_service_state(void *dump_context, VCHIQ_SERVICE_T *service) char buf[80]; int len; - len = snprintf(buf, sizeof(buf), " instance %x", - (unsigned int)service->instance); + len = snprintf(buf, sizeof(buf), " instance %zx", + (size_t)service->instance); if ((service->base.callback == service_callback) && user_service->is_vchi) { From nobody Thu Oct 30 01:04:14 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cxm8v1Bv5z6DNpj; Thu, 30 Oct 2025 01:04:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cxm8v0ZTLz3cBc; Thu, 30 Oct 2025 01:04:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761786255; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=H0FSk7XVzygULZ3RFwOnUJmb/u66Hgdg+Jlg2h1z3Os=; b=NgxzdH/HIDdLZ8Au1uTHPgQbWz/w7EDbqO8rt+5lPXJmzCkyKmcRWM75LYnERXitjY5hBJ XWi/g8HpkTpKU1Cyhxk23tUEqLz9UxqiOOrGpFVqi+cjLaKL3XRTeo6k9lshkBkq3b/1oZ l3kStANcCZlOnAXt+9goE9UF22vi8zb+uVWM/rmJQCpc5V64wbtgDHT/nsa/qjv5y13YDi J1e1JxXWNewzsM3JdTPo2/pMmmnFeOMPYXglgL7hQ4u2oeuaCfk7wwISgrwmhWl6L5zmNv YSQQBYeWF4rSBa5JSNvseFgtoVCj62MigjFcFgXLwlZndmFu7Ffw7pkN6bPWBQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761786255; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=H0FSk7XVzygULZ3RFwOnUJmb/u66Hgdg+Jlg2h1z3Os=; b=HgnK1kktGoamlTmUoGbOAxwwrcTdiuQCEl9PvUl/jPuZYH7/+jgOGxFlCOsV7YiYbx4LJQ 1+vBGHX0UDkaFCE3FlZfPUtRsdGN5nOhy4Ch4Y2pOMq+XfUh36OHHuUQxNu1/d32cj4ITL nHjzKKDT5rcDJt136af9kyyVuwTVF7QaScecd5JPto18cFu2sUZTM31nY5O1tK3a2ucnHm tCJfTf+9P9L4vtDe5TPXPUVo6QoF5hBF0PG8w4p7HAVhArU/mog54cZAYeFNWQoCPYMlrb jFZQ8PwS6mw/A2rgmq71Zko/Gca19pTYmxRQy3xE+UYO/qpIPYYtxp4JPQLB9Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761786255; a=rsa-sha256; cv=none; b=bYL8V6GdR+thXED6LXwQWI8U7pqo6f2swaiQng0GmN9dflkKBUjKPwYOe42DyEc2YXHIxa cVra3CJ4m0ax6hO2bTxVojfQlqH49G016wEbfkZ77ACzBUZYPig3IqeS5JDVodwkj/FgkU QKzXbtbiYwy4rOu5AvuXVeKib7zHIr4r0/HnFa8yXkVpk6qmpAZ5oH7MLPaC5BP45g+z2L IyEmpjbxZXOPVXC/dYGBQMbDVrbRfsex9jzfWB37P/QpyPPpGUyG8RJg5/TdKaLGzSwQtw 1s+ZwDX1WeHu/FrscLjAwcbepgqfq9qAKlL0q+v+sN+z5x7TDDei5Q23tgHmVQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cxm8t72kJz10yG; Thu, 30 Oct 2025 01:04: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 59U14EmL007178; Thu, 30 Oct 2025 01:04:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59U14Ent007175; Thu, 30 Oct 2025 01:04:14 GMT (envelope-from git) Date: Thu, 30 Oct 2025 01:04:14 GMT Message-Id: <202510300104.59U14Ent007175@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Justin Hibbits Subject: git: 319a1dbcf46f - main - intr/powerpc: cleanup extraneous spaces in PowerMAC CPC HT driver List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhibbits X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 319a1dbcf46f4afd2d32234d6936bb9e9e006a74 Auto-Submitted: auto-generated The branch main has been updated by jhibbits: URL: https://cgit.FreeBSD.org/src/commit/?id=319a1dbcf46f4afd2d32234d6936bb9e9e006a74 commit 319a1dbcf46f4afd2d32234d6936bb9e9e006a74 Author: Elliott Mitchell AuthorDate: 2025-01-10 00:52:52 +0000 Commit: Justin Hibbits CommitDate: 2025-10-30 01:01:00 +0000 intr/powerpc: cleanup extraneous spaces in PowerMAC CPC HT driver Spotted while examing this driver. Remove some end of line spaces/tabs. Replace some spaces which should instead be tabs. Reviewed by: jhibbits MFC after: 2 weeks --- sys/powerpc/powermac/cpcht.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/sys/powerpc/powermac/cpcht.c b/sys/powerpc/powermac/cpcht.c index 138aefda5cdb..5b5c03cf83f6 100644 --- a/sys/powerpc/powermac/cpcht.c +++ b/sys/powerpc/powermac/cpcht.c @@ -113,7 +113,7 @@ static device_method_t cpcht_methods[] = { struct cpcht_irq { enum { IRQ_NONE, IRQ_HT, IRQ_MSI, IRQ_INTERNAL - } irq_type; + } irq_type; int ht_source; @@ -287,7 +287,7 @@ cpcht_configure_htbridge(device_t dev, phandle_t child) sc->htirq_map[irq].irq_type = IRQ_HT; sc->htirq_map[irq].ht_source = i; - sc->htirq_map[irq].ht_base = sc->sc_data + + sc->htirq_map[irq].ht_base = sc->sc_data + (((((s & 0x1f) << 3) | (f & 0x07)) << 8) | (ptr)); PCIB_WRITE_CONFIG(dev, b, s, f, @@ -298,13 +298,13 @@ cpcht_configure_htbridge(device_t dev, phandle_t child) /* * Apple uses a non-compliant IO/APIC that differs - * in how we signal EOIs. Check if this device was + * in how we signal EOIs. Check if this device was * made by Apple, and act accordingly. */ vend = PCIB_READ_CONFIG(dev, b, s, f, PCIR_DEVVENDOR, 4); if ((vend & 0xffff) == 0x106b) - sc->htirq_map[irq].apple_eoi = + sc->htirq_map[irq].apple_eoi = (sc->htirq_map[irq].ht_base - ptr) + 0x60; } } @@ -318,7 +318,7 @@ cpcht_read_config(device_t dev, u_int bus, u_int slot, u_int func, u_int reg, vm_offset_t caoff; sc = device_get_softc(dev); - caoff = sc->sc_data + + caoff = sc->sc_data + (((((slot & 0x1f) << 3) | (func & 0x07)) << 8) | reg); if (bus == 0 && (!(sc->sc_populated_slots & (1 << slot)) || func > 0)) @@ -350,7 +350,7 @@ cpcht_write_config(device_t dev, u_int bus, u_int slot, u_int func, vm_offset_t caoff; sc = device_get_softc(dev); - caoff = sc->sc_data + + caoff = sc->sc_data + (((((slot & 0x1f) << 3) | (func & 0x07)) << 8) | reg); if (bus == 0 && (!(sc->sc_populated_slots & (1 << slot)) || func > 0)) @@ -553,7 +553,7 @@ openpic_cpcht_probe(device_t dev) const char *type = ofw_bus_get_type(dev); if (strcmp(type, "open-pic") != 0) - return (ENXIO); + return (ENXIO); device_set_desc(dev, OPENPIC_DEVSTR); return (0); @@ -582,7 +582,7 @@ openpic_cpcht_attach(device_t dev) * Interrupts 0-3 are internally sourced and are level triggered * active low. Interrupts 4-123 are connected to a pulse generator * and should be programmed as edge triggered low-to-high. - * + * * IBM CPC945 Manual, Section 9.3. */ @@ -631,7 +631,7 @@ openpic_cpcht_config(device_t dev, u_int irq, enum intr_trigger trig, /* Mask the IRQ while we fiddle settings */ out32rb(cpcht_irqmap[irq].ht_base + 4, ht_irq | HTAPIC_MASK); - + /* Program the interrupt sense */ ht_irq &= ~(HTAPIC_TRIGGER_LEVEL | HTAPIC_REQUEST_EOI); if (trig == INTR_TRIGGER_EDGE) { @@ -671,7 +671,7 @@ openpic_cpcht_enable(device_t dev, u_int irq, u_int vec, void **priv) mtx_unlock_spin(&sc->sc_ht_mtx); } - + openpic_cpcht_eoi(dev, irq, *priv); } From nobody Thu Oct 30 01:04:16 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cxm8w4HZSz6DP3T; Thu, 30 Oct 2025 01:04: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cxm8w1qYSz3c68; Thu, 30 Oct 2025 01:04:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761786256; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lQd/V8ksNNpMaq6bqFPjr8AtXWJAcCNmuO8mr/Pd6+M=; b=SkFY/Uwn3agP+2OuuPVISvtpOCNBj2PmvK4wyUAnQGTJKZw4s+KcOYa56+oFo19mMLlktW XrgkQWBoKt3fqf7PeLPpx3z6+0UElQFItoOcMp1uqvcuraR5PEmHighaAvzWLPiNk7sjlw eHhjln8lA/ZHdyt3uansmd3H2N6/1RQU4NwBCwcjm3Hj09q63ZKBrRhzV0KBb546woqE7h nyDyF+UuoMUlcl7+emtiIY5MGjsLkwxp9/elY0OmSiZCE2vWgtLnYBJ5E57YcqakW7qaJj BbD3XUuHRenOhEbTzAhGpdnn+ljvZmmXSTwYickF6iiI+5Qp0SUc7NZcE7RyHg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761786256; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lQd/V8ksNNpMaq6bqFPjr8AtXWJAcCNmuO8mr/Pd6+M=; b=JTFu7F4NXp0tgpO++KDeUX3c+rZjKgYz6dyodNicIWZfzap4Y6e+GvqdpxQZWsR+L4QCm3 RWU4dX6BNSEliFmICJLXt/Zj6T9l1ECEfxm4A01pZmIf2GE3r3pXIV59OFYsHaYrrRrXus a7URvIrl302/7L1zjKAx570ZPSD5uegvN+BUfAP/T9cN6nEZyRZQrG0z9lTMmbGAbzbeL2 kTxcQ4Rz2wSCun1rf2ZWCuW95nRGEGrpNQR2bCWVwOCEU9nt/n4sFS7QSMd6Cc+lG/GEsb XjqvnXUSTPPTIn7f5Fj+gN6+fxJaQqQO5ctKFO0jCeOLikelO3jQgqlwPZR6OQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761786256; a=rsa-sha256; cv=none; b=Q2MIt+raRtzj7cyns/s6UnMX0Vpn6KadhI7T5BOQ+oQKGc1aUAg5krmHP2s5MMmmC/BsiG AZTxXfzHEIW+wJYdTXl3nN05xDC6SD22sYBd2fuEXUp/20W4OcR4G9z9gC03fnoopENuJI RrKTLSohBIyE545wXi3lFImwh4qpFqGn0Bjmdx2uGmuE8QPQCW/aFdWjJ1n5jc1Da+ZeOV opTl7i4143TanA0WoU6/+wWaLSHYODyCyTI4y1NVmIO2IUr8Vj5gHjg79NXx9GfQGAbyWZ CT0cj7o7irjimAXv+OKPoNlFJt+KCYQhW8iMCdv+3XEB3L9ebQmTQnrEcqrngg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cxm8w1Crxz10hS; Thu, 30 Oct 2025 01:04: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 59U14GId007210; Thu, 30 Oct 2025 01:04:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59U14G4f007207; Thu, 30 Oct 2025 01:04:16 GMT (envelope-from git) Date: Thu, 30 Oct 2025 01:04:16 GMT Message-Id: <202510300104.59U14G4f007207@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Justin Hibbits Subject: git: 8fb17896120d - main - intr/powerpc: create openpic_class kobj List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhibbits X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8fb17896120d8e7c499a13f4459f9894c20c6131 Auto-Submitted: auto-generated The branch main has been updated by jhibbits: URL: https://cgit.FreeBSD.org/src/commit/?id=8fb17896120d8e7c499a13f4459f9894c20c6131 commit 8fb17896120d8e7c499a13f4459f9894c20c6131 Author: Elliott Mitchell AuthorDate: 2025-01-02 19:03:40 +0000 Commit: Justin Hibbits CommitDate: 2025-10-30 01:02:15 +0000 intr/powerpc: create openpic_class kobj Using kobj allows implementing most PIC functions merely by inheriting from the parent class. As there are multiple OpenPIC implementations, this ensures all common hooks go through by default. Note, this adds the suspend/resume functions to other PICs. This should be harmless as suspend/resume isn't working on the devices anyway. Reviewed by: jhibbits MFC after: 2 weeks --- sys/powerpc/include/openpicvar.h | 9 +++------ sys/powerpc/ofw/openpic_ofw.c | 18 ++---------------- sys/powerpc/powermac/cpcht.c | 13 +++---------- sys/powerpc/powerpc/openpic.c | 33 +++++++++++++++++++++++++++------ sys/powerpc/psim/openpic_iobus.c | 17 +++-------------- 5 files changed, 38 insertions(+), 52 deletions(-) diff --git a/sys/powerpc/include/openpicvar.h b/sys/powerpc/include/openpicvar.h index 3a170a8a35fe..12f01cb80406 100644 --- a/sys/powerpc/include/openpicvar.h +++ b/sys/powerpc/include/openpicvar.h @@ -28,6 +28,8 @@ #ifndef _POWERPC_OPENPICVAR_H_ #define _POWERPC_OPENPICVAR_H_ +#include + #define OPENPIC_DEVSTR "OpenPIC Interrupt Controller" #define OPENPIC_IRQMAX 256 /* h/w allows more */ @@ -75,16 +77,11 @@ int openpic_common_attach(device_t, uint32_t); /* * PIC interface. */ -void openpic_bind(device_t dev, u_int irq, cpuset_t cpumask, void **); void openpic_config(device_t, u_int, enum intr_trigger, enum intr_polarity); -void openpic_dispatch(device_t, struct trapframe *); void openpic_enable(device_t, u_int, u_int, void **); void openpic_eoi(device_t, u_int, void *); -void openpic_ipi(device_t, u_int); -void openpic_mask(device_t, u_int, void *); void openpic_unmask(device_t, u_int, void *); -int openpic_suspend(device_t dev); -int openpic_resume(device_t dev); +DECLARE_CLASS(openpic_class); #endif /* _POWERPC_OPENPICVAR_H_ */ diff --git a/sys/powerpc/ofw/openpic_ofw.c b/sys/powerpc/ofw/openpic_ofw.c index fdab55fb30f5..4083e9eba749 100644 --- a/sys/powerpc/ofw/openpic_ofw.c +++ b/sys/powerpc/ofw/openpic_ofw.c @@ -68,29 +68,15 @@ static device_method_t openpic_ofw_methods[] = { /* Device interface */ DEVMETHOD(device_probe, openpic_ofw_probe), DEVMETHOD(device_attach, openpic_ofw_attach), - DEVMETHOD(device_suspend, openpic_suspend), - DEVMETHOD(device_resume, openpic_resume), /* PIC interface */ - DEVMETHOD(pic_bind, openpic_bind), - DEVMETHOD(pic_config, openpic_config), - DEVMETHOD(pic_dispatch, openpic_dispatch), - DEVMETHOD(pic_enable, openpic_enable), - DEVMETHOD(pic_eoi, openpic_eoi), - DEVMETHOD(pic_ipi, openpic_ipi), - DEVMETHOD(pic_mask, openpic_mask), - DEVMETHOD(pic_unmask, openpic_unmask), - DEVMETHOD(pic_translate_code, openpic_ofw_translate_code), DEVMETHOD_END }; -static driver_t openpic_ofw_driver = { - "openpic", - openpic_ofw_methods, - sizeof(struct openpic_softc), -}; +DEFINE_CLASS_1(openpic, openpic_ofw_driver, openpic_ofw_methods, + sizeof(struct openpic_softc), openpic_class); EARLY_DRIVER_MODULE(openpic, ofwbus, openpic_ofw_driver, 0, 0, BUS_PASS_INTERRUPT); diff --git a/sys/powerpc/powermac/cpcht.c b/sys/powerpc/powermac/cpcht.c index 5b5c03cf83f6..448144c9749e 100644 --- a/sys/powerpc/powermac/cpcht.c +++ b/sys/powerpc/powermac/cpcht.c @@ -520,16 +520,12 @@ static device_method_t openpic_cpcht_methods[] = { DEVMETHOD(device_attach, openpic_cpcht_attach), /* PIC interface */ - DEVMETHOD(pic_bind, openpic_bind), DEVMETHOD(pic_config, openpic_cpcht_config), - DEVMETHOD(pic_dispatch, openpic_dispatch), DEVMETHOD(pic_enable, openpic_cpcht_enable), DEVMETHOD(pic_eoi, openpic_cpcht_eoi), - DEVMETHOD(pic_ipi, openpic_ipi), - DEVMETHOD(pic_mask, openpic_mask), DEVMETHOD(pic_unmask, openpic_cpcht_unmask), - { 0, 0 }, + DEVMETHOD_END }; struct openpic_cpcht_softc { @@ -538,11 +534,8 @@ struct openpic_cpcht_softc { struct mtx sc_ht_mtx; }; -static driver_t openpic_cpcht_driver = { - "htpic", - openpic_cpcht_methods, - sizeof(struct openpic_cpcht_softc), -}; +DEFINE_CLASS_1(htpic, openpic_cpcht_driver, openpic_cpcht_methods, + sizeof(struct openpic_cpcht_softc), openpic_class); EARLY_DRIVER_MODULE(openpic, unin, openpic_cpcht_driver, 0, 0, BUS_PASS_INTERRUPT); diff --git a/sys/powerpc/powerpc/openpic.c b/sys/powerpc/powerpc/openpic.c index 0c717aaf6060..e2de52638d79 100644 --- a/sys/powerpc/powerpc/openpic.c +++ b/sys/powerpc/powerpc/openpic.c @@ -225,7 +225,7 @@ openpic_common_attach(device_t dev, uint32_t node) * PIC I/F methods */ -void +static void openpic_bind(device_t dev, u_int irq, cpuset_t cpumask, void **priv __unused) { struct openpic_softc *sc; @@ -291,7 +291,7 @@ openpic_intr(void *arg) return (FILTER_HANDLED); } -void +static void openpic_dispatch(device_t dev, struct trapframe *tf) { struct openpic_softc *sc; @@ -343,7 +343,7 @@ openpic_eoi(device_t dev, u_int irq __unused, void *priv __unused) openpic_write(sc, OPENPIC_PCPU_EOI(cpuid), 0); } -void +static void openpic_ipi(device_t dev, u_int cpu) { struct openpic_softc *sc; @@ -357,7 +357,7 @@ openpic_ipi(device_t dev, u_int cpu) sched_unpin(); } -void +static void openpic_mask(device_t dev, u_int irq, void *priv __unused) { struct openpic_softc *sc; @@ -393,7 +393,7 @@ openpic_unmask(device_t dev, u_int irq, void *priv __unused) } } -int +static int openpic_suspend(device_t dev) { struct openpic_softc *sc; @@ -424,7 +424,7 @@ openpic_suspend(device_t dev) return (0); } -int +static int openpic_resume(device_t dev) { struct openpic_softc *sc; @@ -453,3 +453,24 @@ openpic_resume(device_t dev) return (0); } + +static device_method_t openpic_methods[] = { + /* Device interface */ + DEVMETHOD(device_suspend, openpic_suspend), + DEVMETHOD(device_resume, openpic_resume), + + /* PIC interface */ + DEVMETHOD(pic_bind, openpic_bind), + DEVMETHOD(pic_config, openpic_config), + DEVMETHOD(pic_dispatch, openpic_dispatch), + DEVMETHOD(pic_enable, openpic_enable), + DEVMETHOD(pic_eoi, openpic_eoi), + DEVMETHOD(pic_ipi, openpic_ipi), + DEVMETHOD(pic_mask, openpic_mask), + DEVMETHOD(pic_unmask, openpic_unmask), + + DEVMETHOD_END +}; + +DEFINE_CLASS_0(openpic, openpic_class, openpic_methods, + sizeof(struct openpic_softc)); diff --git a/sys/powerpc/psim/openpic_iobus.c b/sys/powerpc/psim/openpic_iobus.c index bf5bd8235a6c..21950e248b6d 100644 --- a/sys/powerpc/psim/openpic_iobus.c +++ b/sys/powerpc/psim/openpic_iobus.c @@ -69,22 +69,11 @@ static device_method_t openpic_iobus_methods[] = { DEVMETHOD(device_probe, openpic_iobus_probe), DEVMETHOD(device_attach, openpic_iobus_attach), - /* PIC interface */ - DEVMETHOD(pic_config, openpic_config), - DEVMETHOD(pic_dispatch, openpic_dispatch), - DEVMETHOD(pic_enable, openpic_enable), - DEVMETHOD(pic_eoi, openpic_eoi), - DEVMETHOD(pic_ipi, openpic_ipi), - DEVMETHOD(pic_mask, openpic_mask), - DEVMETHOD(pic_unmask, openpic_unmask), - { 0, 0 } + DEVMETHOD_END }; -static driver_t openpic_iobus_driver = { - "openpic", - openpic_iobus_methods, - sizeof(struct openpic_softc) -}; +DEFINE_CLASS_1(openpic, openpic_iobus_driver, openpic_iobus_methods, + sizeof(struct openpic_softc), openpic_class); DRIVER_MODULE(openpic, iobus, openpic_iobus_driver, 0, 0); From nobody Thu Oct 30 03:01:45 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cxpmT49B2z6DZdJ; Thu, 30 Oct 2025 03:01: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cxpmT2nKvz417P; Thu, 30 Oct 2025 03:01:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761793305; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9B7B4p90QPeKTx0jf8Re3mXu3KiH/iR3Veqra7gQyOw=; b=tQwI6bQ6havUlAnPgnU18h9REdQw7EOqjavPxPFMc5+abeNhzx9iFSyR91YUK7rN7zgaQU WDJvztpu8T/3dbgPZqGF3ELz+IEbuKnZPC2YaH9UxTaGJx025If1/d8LWY+9iH4P+ecA/e ZXxqfLgLmCB/APc3xxst6R/bqTbgzhOAHQ5izcUPLdaAXsYWUiYPBQZajlmahQu44KMmCF apQJGsnlLLCXdapcPoEDTNw3G2Si6o5hqDsSqG76UfI702chXGv/81z9VZ3GXQyoCoXvYA Zhiy1eLIMNKeBLmSUYUOGJ8+SfZQqkRovAq4hugzvZwpv273ia2AOZazvYfPJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761793305; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9B7B4p90QPeKTx0jf8Re3mXu3KiH/iR3Veqra7gQyOw=; b=u5p5mN+vDZsq6FGzlA7/3NU9EoT5h/E/J+n7GG4YnAr+QzIGXWrw1M5A0n73uEVo9T+To3 ptbO0fI7VrseolB0ZVvwRMCLEVlZ2DL8lV0EkzxnhFNogvmuFt6kvdAEWNADyEyGweTYVl WaEQn8tceaU0sN3UQw3dLkT1zeYXN06Dw7odyMhE4FOnlZBtE96iCTSn84q6Wa/JhHKaoC 0PTwXBSbeUQoTkwSq+KKMX9bxHA6tazHuJF8NSXcuuIZ0L3OAaGNvgZ31zg6UM1DgxNX/K nsF00zx1j1Dt4dQiylJWMUkIBCvhmblgHGGpKasi7bP29FvuRwAwRAD1o1qZtw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761793305; a=rsa-sha256; cv=none; b=n5LduDm+m3+7YDCzZLl80IzvB7ZmySh+8vPJ6W4Y+kPDiKmRZkHEC07S86ihL4I3NEPUKw 7HF/pKO24/M4ru/DBIpWao+eNWfCYToG5TkF0c9D3w6bVEZkJyCji0C5+TnsBMMObY33Ld DtXN0J3/ssnqTvDBfdCpYFnyKYWQHqwZ/KzWDrIgfksYqKeltixExbeBbsdn+L1o2l+I1s oOFvc4hEQX8D4Yb3uGDIqNfu09i9JgGRPWh447OKUu9VVxY5Ro7lGxa7LtfZZnHLSbu+bn SjxiAVfvd708+5PpQEiEFiJl9Av4zeTx8GxyM9iskjUsm971zLediwd6g5ZZvQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cxpmT1pWlz14Dl; Thu, 30 Oct 2025 03:01: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 59U31jpl029521; Thu, 30 Oct 2025 03:01:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59U31jgH029518; Thu, 30 Oct 2025 03:01:45 GMT (envelope-from git) Date: Thu, 30 Oct 2025 03:01:45 GMT Message-Id: <202510300301.59U31jgH029518@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Justin Hibbits Subject: git: 5e941ac54da3 - main - powerpc: Move openpic_intr, since it's hidden now List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhibbits X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5e941ac54da32a7eff2ff96a1744843e6e030518 Auto-Submitted: auto-generated The branch main has been updated by jhibbits: URL: https://cgit.FreeBSD.org/src/commit/?id=5e941ac54da32a7eff2ff96a1744843e6e030518 commit 5e941ac54da32a7eff2ff96a1744843e6e030518 Author: Justin Hibbits AuthorDate: 2025-10-30 03:00:09 +0000 Commit: Justin Hibbits CommitDate: 2025-10-30 03:00:09 +0000 powerpc: Move openpic_intr, since it's hidden now Last minute change by me (diff reduction), that I didn't build. This was in the original commit. Fixes: 8fb1789612 ("intr/powerpc: create openpic_class kobj") MFC after: 2 weeks X-MFC-with: 8fb1789612 --- sys/powerpc/powerpc/openpic.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/sys/powerpc/powerpc/openpic.c b/sys/powerpc/powerpc/openpic.c index e2de52638d79..aa28f63cb6f5 100644 --- a/sys/powerpc/powerpc/openpic.c +++ b/sys/powerpc/powerpc/openpic.c @@ -280,17 +280,6 @@ openpic_config(device_t dev, u_int irq, enum intr_trigger trig, openpic_write(sc, OPENPIC_SRC_VECTOR(irq), x); } -static int -openpic_intr(void *arg) -{ - device_t dev = (device_t)(arg); - - /* XXX Cascaded PICs do not pass non-NULL trapframes! */ - openpic_dispatch(dev, NULL); - - return (FILTER_HANDLED); -} - static void openpic_dispatch(device_t dev, struct trapframe *tf) { @@ -311,6 +300,17 @@ openpic_dispatch(device_t dev, struct trapframe *tf) } } +static int +openpic_intr(void *arg) +{ + device_t dev = (device_t)(arg); + + /* XXX Cascaded PICs do not pass non-NULL trapframes! */ + openpic_dispatch(dev, NULL); + + return (FILTER_HANDLED); +} + void openpic_enable(device_t dev, u_int irq, u_int vector, void **priv __unused) { From nobody Thu Oct 30 04:47:19 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cxs6H2hc2z6Dlnt; Thu, 30 Oct 2025 04: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cxs6H20zwz3Pwt; Thu, 30 Oct 2025 04: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=1761799639; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PTTR9uiK43RSOy5zt9CrX7ROH3GoLih8DQIMZCtjwLw=; b=S8VpK6VD+1m6i6Uj/BIejs7lpPGCH+vbXKbuwDMesFrjxayljhdlk65WmjMkrOK64Fg/P/ 2H9Conu4d593A1BwrXPof6zw3YN4eTvxBKkCMQE+asX0YPrU36FR1b3dhOe4y7iKonuDXn PquP0oYqAe1UI/tgl6/O5A4TaHJXzbKVO9fJZTRoil1PtQSVTEjF73mKJs6brurhdMGtOi sH+hcBHOH5iB0izFTVtBaJ3TU/GNV2SWKBpCaqKr21YGAiMlTA+DUimaGu5AKUAGa7b170 KkCk13xQK54cK5TfpsAjRy+haoH1IIuuP1JZJ0sUtoxWutUx8w0TNl/AXX1J6Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761799639; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PTTR9uiK43RSOy5zt9CrX7ROH3GoLih8DQIMZCtjwLw=; b=q63tEr0cfNvjHuwe1NvN22rGBVkcPP8MBak064X1SlPbySMmDlgdw7eIO+Qm/IgEO5z/4L naaYJ29GYxKDjznrPL+7kqfmLExlQ/OQ48jQlQeymIsN/YB+SA/eeJ+HZwgU5rax/+LVJG YUQMxGN83izXaAUqfyc430rk6kr6fWbYC6XEoAaOAN1m/94xCVMz/Z3lUVBd9hb0G/u2Sb ZTtNRRjSdGj26rH8krFE8pfiRPsZzpb+ve1wOr6jJHVQGyinnyfwVvJ6mz8AfGd2LSMTeT r22YCRWaVkfu5kdFErDYcKbwhcRrVXS7CI7xLM5CkaXwfRwaKEvXP+nJeRGEQA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761799639; a=rsa-sha256; cv=none; b=fC0PO9TzdXrScg/p6UQ8ATzXvItVHgxJaTE8/G/gcJ5FpLd4E4Gc0HKFcNiMbPSyxKtbRx J7M5Q3OYYJx+yBnMGSAbVkf1guffncIzQ1fm19JX7HAgLu0tZHNi739cjklajQjoIfS/IW NhL+Mn+falSppZsdvlud0oX0E5GnD6wmPQ5MXLVrO35fIJVFByeQp1LWz+aNPPfrj7Leb7 uM6suUDggT1tc1cFxxuxezhTlAGraArk7pSMWiLU1gxtUfLicytUSFkyMhEM6tyu+PqDgy Pc1iatet0bhuYAiXPqvHjY8j/fRZ/NK/FhWT8v8ILAAe5ob1s+eUx7jHhZJe8Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cxs6H1ZfQz16gt; Thu, 30 Oct 2025 04: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 59U4lJBK023998; Thu, 30 Oct 2025 04: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 59U4lJr9023995; Thu, 30 Oct 2025 04:47:19 GMT (envelope-from git) Date: Thu, 30 Oct 2025 04:47:19 GMT Message-Id: <202510300447.59U4lJr9023995@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "David E. O'Brien" Subject: git: 237cc7b408dd - main - style.Makefile: document the style for lists List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: obrien X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 237cc7b408dd8d0c6eb4af6ab796b8d4b750c9ba Auto-Submitted: auto-generated The branch main has been updated by obrien: URL: https://cgit.FreeBSD.org/src/commit/?id=237cc7b408dd8d0c6eb4af6ab796b8d4b750c9ba commit 237cc7b408dd8d0c6eb4af6ab796b8d4b750c9ba Author: David E. O'Brien AuthorDate: 2025-10-29 07:59:18 +0000 Commit: David E. O'Brien CommitDate: 2025-10-30 03:41:59 +0000 style.Makefile: document the style for lists Reviewed by: sjg Differential Revision: https://reviews.freebsd.org/D53429 --- share/man/man5/style.Makefile.5 | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/share/man/man5/style.Makefile.5 b/share/man/man5/style.Makefile.5 index fe8754924575..9a2f1b069d99 100644 --- a/share/man/man5/style.Makefile.5 +++ b/share/man/man5/style.Makefile.5 @@ -1,7 +1,7 @@ .\" .\" SPDX-License-Identifier: BSD-3-Clause .\" -.\" Copyright (c) 2002-2003, 2023 David O'Brien +.\" Copyright (c) 2002-2003, 2023, 2025 David O'Brien .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without @@ -28,7 +28,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd July 17, 2023 +.Dd October 29, 2025 .Dt STYLE.MAKEFILE 5 .Os .Sh NAME @@ -179,6 +179,21 @@ settings between the and .Fl I Ns 's. .It +Lists that span more than one line should be formatted as follows: +.Bd -literal -offset indent +SRCS+=\\ +main.c\\ +trace.c\\ +zoo.c \\ +\& +.Ed +Specifically, the last item in the list should have a trailing '\\'. +This is to avoid causing a "false diff" or "false blame" when +a new item is appended at the end. +In general the list should be English language alphabetized. +A list of libraries or header inclusion paths are notable exceptions +if needed for proper building. +.It Do not use GCCisms (such as .Fl g and @@ -233,9 +248,6 @@ For variables that are only checked with .Fn defined , do not provide any fake value. .El -.Pp -The desire to express a logical grouping often means not obeying some of the -above. .Sh EXAMPLES The simplest program .Pa Makefile @@ -270,5 +282,7 @@ manual page and first appeared in .An David O'Brien Aq deo@NUXI.org .Sh BUGS There are few hard and fast style rules here. +The desire to express a logical grouping sometimes means not obeying some of the +above. The style of many things is too dependent on the context of the whole makefile, or the lines surrounding it. From nobody Thu Oct 30 10:08:13 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cy0DY4j8Vz6FR4C; Thu, 30 Oct 2025 10:08: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cy0DY47P2z3w7Y; Thu, 30 Oct 2025 10:08:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761818893; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZQ59jrIrpoBZCny1XoFzk29uUb3iMSigx3a9Q6cGHRE=; b=b/7rqU5lFHvUxvJqj8taoFqrkKD1k5Qg5Cq2dMKZXp/vRIOj5odL/rDagELYrOwmn2ZV+Q khaS+Z2Y/vWZOfmQQkg5u1f9Z5hM91frxcV7AWBtbkhdBptyH9V3UrfVbbbJf3TunMPYAL miZc37d5Cx6nrD0x5gKpKy564oRyhFtEIdPQjVoKpOuzrDBFWkblBckMO/84qayDEPnTiT lKzgCs4ABPG1YyjIe3sJJn+VL6tr+5Kmu+JqRGnsKwVBNmGKB9w/SqhR6sTtQykx1gxOAO hqfkS/sr95/Y5FHY9km803o4cDMk/OFbhLvDbvkFGsgayXOrbePbjq1jrjz00Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761818893; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZQ59jrIrpoBZCny1XoFzk29uUb3iMSigx3a9Q6cGHRE=; b=GjF05k4cxxzLVnYLmg5jI6mwQk+2eRIoEGG3Za2505asAT+Jg6DZXDvzjn9maCA0DOmulg QZgd7pZ47DFwY1U7YiZrAYsQCqz/tPGfyEAxwvrZtoagP9/GPKGxt7biku/nO45DP8WMtO 8M/yPoQe7cWqv1s5EcgkxdtvTHZ4nLCdIMmxaqYFC4QnB17TtWOLCLqC0uHZC9flAc8G78 C3BAImvkcpfxuteOtb+oOYE9RRxCAjTTABBuffARJiXrfl00ZV/xggmHWUGRAbw254pbzZ wj6fP9j8g1FQLHNmjVdZOIiGc5Bm3fqTgneq0i2i7EsUAZX1VxJQpsGermuhww== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761818893; a=rsa-sha256; cv=none; b=c/s6fKZ6OusZo0MhFbEnHOAjlyxu3qvPB4OuWJkQTarE4jlgH/TrLypZcJE/TYltAcNFRi ifMC/71EHsJWdYvaYabOzzMIvw8Oa86TFp4xUVMZWiDCJTIrY43exu33bu+W18qrRqxvaQ sWtTo6pGxyivaDxo7ugqo/PtTZiSkP+/AH5QHms1HP1sdK2dh9/OOF7zvYgR2hYRmH6cWy cRfvUh8YP9pt1zFpecIkb5b9sbMTyjkMhssVcrFbpB5Ktn+jFKHijryvzlvm5WQykx98kk bd+P4VEXk8bAPY0M4A5zuTcEiHfdZpLuB7IOg2dD06I47D6wllc8bFzDN3bcCQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cy0DY3k4xz2Ns; Thu, 30 Oct 2025 10:08: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 59UA8DVp025981; Thu, 30 Oct 2025 10:08:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59UA8DAF025978; Thu, 30 Oct 2025 10:08:13 GMT (envelope-from git) Date: Thu, 30 Oct 2025 10:08:13 GMT Message-Id: <202510301008.59UA8DAF025978@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 1da3c0ca5b1d - main - pf: improve DIOCRCLRTABLES validation List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1da3c0ca5b1decaa9cf55859cd134bdcd1218116 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=1da3c0ca5b1decaa9cf55859cd134bdcd1218116 commit 1da3c0ca5b1decaa9cf55859cd134bdcd1218116 Author: Kristof Provost AuthorDate: 2025-10-29 08:28:59 +0000 Commit: Kristof Provost CommitDate: 2025-10-30 08:42:27 +0000 pf: improve DIOCRCLRTABLES validation Unterminated strings in the anchor or name could cause crashes. Validate them, and add a test case. Reported by: Ilja Van Sprundel MFC after: 3 days Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/netpfil/pf/pf_ioctl.c | 11 +++++++++++ tests/sys/netpfil/pf/ioctl/validation.c | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+) diff --git a/sys/netpfil/pf/pf_ioctl.c b/sys/netpfil/pf/pf_ioctl.c index a4557f139ae5..703ecf446fad 100644 --- a/sys/netpfil/pf/pf_ioctl.c +++ b/sys/netpfil/pf/pf_ioctl.c @@ -4792,6 +4792,17 @@ DIOCCHANGEADDR_error: error = ENODEV; goto fail; } + if (strnlen(io->pfrio_table.pfrt_anchor, MAXPATHLEN) + == MAXPATHLEN) { + error = EINVAL; + goto fail; + } + if (strnlen(io->pfrio_table.pfrt_name, PF_TABLE_NAME_SIZE) + == PF_TABLE_NAME_SIZE) { + error = EINVAL; + goto fail; + } + PF_RULES_WLOCK(); error = pfr_clr_tables(&io->pfrio_table, &io->pfrio_ndel, io->pfrio_flags | PFR_FLAG_USERIOCTL); diff --git a/tests/sys/netpfil/pf/ioctl/validation.c b/tests/sys/netpfil/pf/ioctl/validation.c index 3e03163cc752..a619cfdff2ea 100644 --- a/tests/sys/netpfil/pf/ioctl/validation.c +++ b/tests/sys/netpfil/pf/ioctl/validation.c @@ -194,6 +194,38 @@ ATF_TC_CLEANUP(gettables, tc) COMMON_CLEANUP(); } +ATF_TC_WITH_CLEANUP(clrtables); +ATF_TC_HEAD(clrtables, tc) +{ + atf_tc_set_md_var(tc, "require.user", "root"); + atf_tc_set_md_var(tc, "require.kmods", "pf"); +} + +ATF_TC_BODY(clrtables, tc) +{ + struct pfioc_table io; + struct pfr_table tbl; + int flags; + + COMMON_HEAD(); + + flags = 0; + + memset(&io, '/', sizeof(io)); + io.pfrio_flags = flags; + io.pfrio_buffer = &tbl; + io.pfrio_esize = 0; + io.pfrio_size = 1; + + if (ioctl(dev, DIOCRCLRTABLES, &io) == 0) + atf_tc_fail("Request with unterminated anchor name succeeded"); +} + +ATF_TC_CLEANUP(clrtables, tc) +{ + COMMON_CLEANUP(); +} + ATF_TC_WITH_CLEANUP(gettstats); ATF_TC_HEAD(gettstats, tc) { @@ -954,6 +986,7 @@ ATF_TP_ADD_TCS(tp) ATF_TP_ADD_TC(tp, addtables); ATF_TP_ADD_TC(tp, deltables); ATF_TP_ADD_TC(tp, gettables); + ATF_TP_ADD_TC(tp, clrtables); ATF_TP_ADD_TC(tp, getastats); ATF_TP_ADD_TC(tp, gettstats); ATF_TP_ADD_TC(tp, clrtstats); From nobody Thu Oct 30 10:08:14 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cy0DZ5NqDz6FQRY; Thu, 30 Oct 2025 10:08: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cy0DZ4wFvz3w9q; Thu, 30 Oct 2025 10:08:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761818894; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aARI1ODqlpihZuT+BQp/n612UA7lzNAiGvdMQ57rXvQ=; b=b2ns7dhZO33BMedsqj0lBcaIII0pZAwCSJgfY0CkSp9XyS9sHPVohZckcBHBkyaREY0sBk h0X5EAlEOaer4O+8ZMSQ7TOWr2r2khWO/KzMZpI221Id0MXrbrQrtDLN3AoUIuagBF6jCq rFLuZ5k7SRqMvaGqIsR6KTUAWDUDCzwmLIdtDNPWoCMdDoH7+eDuDM82bMJYjjo/0Az3M8 QNDni+K2LV+PaGd1m6IWyhjeGRaYre4Y1gfdEBR7h7fLZQn79XiGAsK6mtMDiDEJZO/hnv SqrZEs9HdVs5Em2O+WZtGhYXG0lZzIjhTciHZ/0yVhvvzFzNmVuB6JtHZHqVMA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761818894; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aARI1ODqlpihZuT+BQp/n612UA7lzNAiGvdMQ57rXvQ=; b=hdMfBudWKhwp3Yv7U9AqPPB/CWtqJfYVvUz2J7dGbv/atheTlrv6YYSyGzCbNHVAc8j9BB FXw9BXznAh0oJWWSn6veISSioJwE+UFyWcU78bPqcayX/Q6j9cTKMmZPZoM15z5Zon+l9F DQ6DDlnu2y7SJOzMz9uj6II0GA62CFZ8U6TuJj+DM4UAfBH7tpumeWkLk1tny7jcae7HNI qgQLSitf+HGnJsi3XyIo0cEOC17AA3icZ0ZZR3boODwislHyy/gCH27VMaX7lzXYeGNIJB UB9dNJm1//529rkLr6++TrPuKkQRqfsgt74ypHtXi3EdocaokWsSiVSSnbdMTg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761818894; a=rsa-sha256; cv=none; b=vtfUOAeCBZyi+6utMpt1cnRkOy9joBeiMT4ilpUh0kcw8n64g0qwSZIySAWcMnpDtKu8pX UVxRAKQlZ/FLN+4iglIGaUaPCEtEA3k5g3gCa5VjQHXAm+AdQIAFEkjlQgLGKsyu8VLI81 Wp0eL7vaunclS4lqUCILVtEl4Cw7qUdfZjLFDh8fiUk3LXcnyqItEWzOyWUSJij/wri/wL rGbTjRtxLG2homXgEI4fVuas7plb30rjtY58iwrH1Jgz3RBATrCRIU/mb03HqRomyZvCyd Rhz5aRNsRn5i7roqIU6Cr4G5IKW1wdMySicncJcBHTC1uNBhEObH6pUdtOimaw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cy0DZ4Lpmz363; Thu, 30 Oct 2025 10:08: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 59UA8E0X026019; Thu, 30 Oct 2025 10:08:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59UA8Eg9026016; Thu, 30 Oct 2025 10:08:14 GMT (envelope-from git) Date: Thu, 30 Oct 2025 10:08:14 GMT Message-Id: <202510301008.59UA8Eg9026016@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: faacc0d96881 - main - pf: improve add state validation List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: faacc0d968816cf8714c974b6d8df6191cfb0e0d Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=faacc0d968816cf8714c974b6d8df6191cfb0e0d commit faacc0d968816cf8714c974b6d8df6191cfb0e0d Author: Kristof Provost AuthorDate: 2025-10-29 10:40:52 +0000 Commit: Kristof Provost CommitDate: 2025-10-30 08:42:27 +0000 pf: improve add state validation Both for the DIOCADDSTATE ioctl and for states imported through pfsync packets. Add a test case to exercise this code path. Reported by: Ilja Van Sprundel MFC after: 3 days Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/netpfil/pf/if_pfsync.c | 3 +++ tests/sys/netpfil/pf/ioctl/validation.c | 25 +++++++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/sys/netpfil/pf/if_pfsync.c b/sys/netpfil/pf/if_pfsync.c index 66bc99df2afa..de69ecbb0985 100644 --- a/sys/netpfil/pf/if_pfsync.c +++ b/sys/netpfil/pf/if_pfsync.c @@ -546,6 +546,9 @@ pfsync_state_import(union pfsync_state_union *sp, int flags, int msg_version) PF_RULES_RASSERT(); + if (strnlen(sp->pfs_1301.ifname, IFNAMSIZ) == IFNAMSIZ) + return (EINVAL); + if (sp->pfs_1301.creatorid == 0) { if (V_pf_status.debug >= PF_DEBUG_MISC) printf("%s: invalid creator id: %08x\n", __func__, diff --git a/tests/sys/netpfil/pf/ioctl/validation.c b/tests/sys/netpfil/pf/ioctl/validation.c index a619cfdff2ea..bb060e22f3a0 100644 --- a/tests/sys/netpfil/pf/ioctl/validation.c +++ b/tests/sys/netpfil/pf/ioctl/validation.c @@ -981,6 +981,30 @@ ATF_TC_CLEANUP(natlook, tc) COMMON_CLEANUP(); } +ATF_TC_WITH_CLEANUP(addstate); +ATF_TC_HEAD(addstate, tc) +{ + atf_tc_set_md_var(tc, "require.user", "root"); + atf_tc_set_md_var(tc, "require.kmods", "pfsync"); +} + +ATF_TC_BODY(addstate, tc) +{ + struct pfioc_state st; + + COMMON_HEAD(); + + memset(&st, 'a', sizeof(st)); + st.state.timeout = PFTM_TCP_FIRST_PACKET; + + ATF_CHECK_ERRNO(EINVAL, ioctl(dev, DIOCADDSTATE, &st) == -1); +} + +ATF_TC_CLEANUP(addstate, tc) +{ + COMMON_CLEANUP(); +} + ATF_TP_ADD_TCS(tp) { ATF_TP_ADD_TC(tp, addtables); @@ -1007,6 +1031,7 @@ ATF_TP_ADD_TCS(tp) ATF_TP_ADD_TC(tp, rpool_mtx); ATF_TP_ADD_TC(tp, rpool_mtx2); ATF_TP_ADD_TC(tp, natlook); + ATF_TP_ADD_TC(tp, addstate); return (atf_no_error()); } From nobody Thu Oct 30 13:22:41 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cy4Xy0LCLz6DCSm; Thu, 30 Oct 2025 13:22: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cy4Xx6LCSz3MFs; Thu, 30 Oct 2025 13:22:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761830561; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JPAp8hGPBk0Hf3ZDYcy6BizX51FIsUsDtc9doSIaPT4=; b=DWxSxO5ywW1rIRuYda7QekXIgmSp+j22T0SQFqhzequkMTV0DOLpyIDo1lO2x0QhP5dj9w COPi5/oTgjW98qeIBHb3UCDwd859OC/aBeGVL/GoIDNwIOkCQXZ8yrg3PEEsPVxmxkD4Br CGb939YlR+jBvEsuWUmFH27+PLmzT5HXHWL/t70miPapRbdqogfPryKtAdgcEoakqR2Qep sKQ4NLi0C3SCFGE/uf4nC6t3UQUmhDoVX8VoD4JJDRELVrjMOA9aL3NuwlvmstS9hbxihk PUB/FegQkALi4vVSR/jSvBcwlY3v6xF0YBlsA9Z0QQPZX0zVzVVKwp4cRlfMhg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761830561; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JPAp8hGPBk0Hf3ZDYcy6BizX51FIsUsDtc9doSIaPT4=; b=MjXReG2Tj3z3X4EWImGHEbvu6sDUQYZHnCYHTVZfsuzHg/L5w8GYvww7BNoHYigXE5N6sQ U74qjg6JqiCuvsYh57I+wZAoSma6Qs8MmNW8aWEvctmx3GLqSrAil6msSwbwXad1tfAJrk MlIQQwGQgoAKgFzBEXEHHNrOgNVPFCW4U1x5DGol3Wi1DRgmlT7geMmqXRcITIsGmqEuZL 03yf7Tghj5IKm5BxdxXveI5xN/4h1KMMycKMrCCX6HvbwXPq3c/8Tm3PFTYy8PFy7/iKZz Bg8o6PaIvkEtGkiVJ2qv9CCTkoSjx63dCM50N7dBrl0K7nqN/o+vjix92QWgiw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761830561; a=rsa-sha256; cv=none; b=CqxPUepW7JB5UPOtmbfHBULJAG0ELRaU6xkYHkJ2ycT5oW3wZsGAnMZS43u7KCGuUoXvL8 KQGBvvo1mwvasv92PokOnIl7yJFp5GL8II77/Xymq/9282CiUDlOfsOeuH9VS5SSwoD3S0 3+VfKDrPIE+Zl08KtQ1qwaaUR6wvjLzVomL46XWzcBn66OW7SnR3C7TOClkww5cbrzenP9 WqjEH7DsMu9K4Uk8+6VOdyznYs/MNOC/DVo6IsVR5UTuB68d8KJMbdDnWnVtk8IYouJA7v q7B1lNOE92UtltezbsPpJS2Vhmxup97XbVEIZ/2QPcOzqboICiMZk42uWp8ysA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cy4Xx5r0fz8kk; Thu, 30 Oct 2025 13:22: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 59UDMfi5001305; Thu, 30 Oct 2025 13:22:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59UDMf4g001302; Thu, 30 Oct 2025 13:22:41 GMT (envelope-from git) Date: Thu, 30 Oct 2025 13:22:41 GMT Message-Id: <202510301322.59UDMf4g001302@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ahmad Khalifa Subject: git: 9b9c726df1e2 - main - bus_attach_children.9: fix typo List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vexeduxr X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9b9c726df1e214afa122873395a3ac32dd80ae6b Auto-Submitted: auto-generated The branch main has been updated by vexeduxr: URL: https://cgit.FreeBSD.org/src/commit/?id=9b9c726df1e214afa122873395a3ac32dd80ae6b commit 9b9c726df1e214afa122873395a3ac32dd80ae6b Author: Ahmad Khalifa AuthorDate: 2025-10-30 13:14:42 +0000 Commit: Ahmad Khalifa CommitDate: 2025-10-30 13:20:28 +0000 bus_attach_children.9: fix typo s/DEVICE_ATTACH/DEVICE_DETACH Reviewed by: ziaee MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D53449 --- share/man/man9/bus_attach_children.9 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/man/man9/bus_attach_children.9 b/share/man/man9/bus_attach_children.9 index 5e3ca4c5e906..81a24a428d8e 100644 --- a/share/man/man9/bus_attach_children.9 +++ b/share/man/man9/bus_attach_children.9 @@ -105,7 +105,7 @@ Detached devices are not deleted. .Pp .Fn bus_detach_children is typically called at the start of a bus driver's -.Xr DEVICE_ATTACH 9 +.Xr DEVICE_DETACH 9 method to give child devices a chance to veto the detach request. It is usually paired with a later call to .Fn device_delete_children 9 From nobody Thu Oct 30 14:44:43 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cy6Mc2F88z6DKvw; Thu, 30 Oct 2025 14:44: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cy6Mc1PRrz3ZbL; Thu, 30 Oct 2025 14:44:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761835484; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=taXvxMwdYsX1laVBW//Gl5ehRijIq3YuzJzypL2/DHg=; b=RoIOvke4OUi5kqS6O/Uf6uuRChY6Q2GAYREqL1d8w0lubRANtGA+js7bTkAhMc0Lc4gFUF YHFfJCptPn8WK7f9pb+w7nFwFGOQjdI0KgqiJfHNdc80TD9sSujoZoH4UMTxvgMTgOzmkp PzZKrK3yHGzxmAXFAWXRlkghiMYyrg24MjiDURt+km1k4ywMcACksujuu0v/vanzP9shYz pfqJ330+IwPdGzNlJxx079d1dQh5NDVJ7QCCysIEXK8C7JXBpTn4dZ/jSTfd7Km2/g8Dji sD+2SJgV++k261b5x8YCGZClBlBkTmmLHTGMYi+hgaaaHv3gfiLAdICLyXNtlQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761835484; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=taXvxMwdYsX1laVBW//Gl5ehRijIq3YuzJzypL2/DHg=; b=TJI4cvLiOA1CQ9BiXs93RWARaCxdkQiKf1cdk0Y9JM36TtHU6WFN4SUEpbRAwwM6Roc4Np 575WO4m+AGYZ4a9Qm+dodI9yv/5OD/xi+lY++UTWwBR3TRMYRMrsq4gKAxsW7Jcz4FPc4s BO1mlduIE7WX6JVyiBoNDBSGGX9s2zK7AquO7sbH3N8iNBujjCF0ExVzEs0kfm7xkdkxp6 xe9W5Qi/EMcdZr1h0v5kX/2dXcCrhBu0iTEeaNeYuW+RbqbVHLKrXDyZSaaVT1szMLV0dL K8wKvwKGP6CCuysvwy6KCcnaoHy3MDfDXWnU+S5PHKipi7kog1gyPaRW2hmVdg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761835484; a=rsa-sha256; cv=none; b=QLrmGIpsCVpciHEvn14TSmKbj+pn8cNSGkGk+9TQU9+Q+JrPadtbOtVgbrkOpzG2ALjNHu CJD2WaIeiiy4KDyk+dcYseUaPqdRNLemOvn04aML8s/IL3WsrND6fxoc5NaZpW6oxlj+zx iw1/Rn7WPDSySpWWG9ONCPrn0fcBauvrC/yKzcy/WQeYtApSH8QTNOjAQ/itgC9nlvLYC7 K6g5LvsvkW+P2dpxEXzL7kuHKMVbAkvcPAzmFvdQV1JFwdwxWCgsiSqK6EZ6Z8jPFiZJWc dzk55NpKHb2pcWKakkkmpKe8AH/EjVDx+N5gMnzupiMKqIP76gvWp6nbdJrXzA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cy6Mc0cSbzBHy; Thu, 30 Oct 2025 14:44: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 59UEihiB053054; Thu, 30 Oct 2025 14:44:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59UEih4E053051; Thu, 30 Oct 2025 14:44:43 GMT (envelope-from git) Date: Thu, 30 Oct 2025 14:44:43 GMT Message-Id: <202510301444.59UEih4E053051@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Ziaee Subject: git: 7b32f4f0a7fe - main - nvme: Add handling for bar5 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7b32f4f0a7fe9b1b2f5a3905ca15f656713255ad Auto-Submitted: auto-generated The branch main has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=7b32f4f0a7fe9b1b2f5a3905ca15f656713255ad commit 7b32f4f0a7fe9b1b2f5a3905ca15f656713255ad Author: Jasper Tran O'Leary AuthorDate: 2025-10-28 20:43:35 +0000 Commit: Alexander Ziaee CommitDate: 2025-10-30 14:43:03 +0000 nvme: Add handling for bar5 The NVMe spec allows the Table BIR (TBIR) and PBA DIR (PBIR) to be 0, 4, or 5. The existing NVMe driver basically only has support for 4, perhaps under the assumption that BAR4 is 64-bit and also occupies BAR5. This change adds support for BAR5, covering the case where BAR4 and BAR5 might both be present and 32-bit, where the Table BIR might be 4 and the PBA BIR might be 5, or vice versa. The NVMe spec (in the SR-IOV section) also permits VFs to use BIR=2, so I haven't added stricter checks on which BIR will be permitted by the driver. This enables FreeBSD on Google Compute Engine C4 Machines. MFC after: 3 days Reviewed by: imp Sponsored by: Google Co-authored-by: Matt Delco Signed-off-by: Jasper Tran O'Leary Differential Revision: https://reviews.freebsd.org/D53140 --- sys/dev/nvme/nvme_ctrlr.c | 9 +++++++-- sys/dev/nvme/nvme_pci.c | 48 ++++++++++++++++++++++++++++++++++----------- sys/dev/nvme/nvme_private.h | 6 ++++-- 3 files changed, 48 insertions(+), 15 deletions(-) diff --git a/sys/dev/nvme/nvme_ctrlr.c b/sys/dev/nvme/nvme_ctrlr.c index f212759a5500..e607667decf5 100644 --- a/sys/dev/nvme/nvme_ctrlr.c +++ b/sys/dev/nvme/nvme_ctrlr.c @@ -1762,9 +1762,14 @@ noadminq: bus_release_resource(ctrlr->dev, SYS_RES_IRQ, rman_get_rid(ctrlr->res), ctrlr->res); - if (ctrlr->bar4_resource != NULL) { + if (ctrlr->msix_table_resource != NULL) { bus_release_resource(dev, SYS_RES_MEMORY, - ctrlr->bar4_resource_id, ctrlr->bar4_resource); + ctrlr->msix_table_resource_id, ctrlr->msix_table_resource); + } + + if (ctrlr->msix_pba_resource != NULL) { + bus_release_resource(dev, SYS_RES_MEMORY, + ctrlr->msix_pba_resource_id, ctrlr->msix_pba_resource); } bus_release_resource(dev, SYS_RES_MEMORY, diff --git a/sys/dev/nvme/nvme_pci.c b/sys/dev/nvme/nvme_pci.c index c07a68d2f0dc..cecb05ca0a92 100644 --- a/sys/dev/nvme/nvme_pci.c +++ b/sys/dev/nvme/nvme_pci.c @@ -152,11 +152,15 @@ static int nvme_ctrlr_allocate_bar(struct nvme_controller *ctrlr) { ctrlr->resource_id = PCIR_BAR(0); + ctrlr->msix_table_resource_id = -1; + ctrlr->msix_table_resource = NULL; + ctrlr->msix_pba_resource_id = -1; + ctrlr->msix_pba_resource = NULL; ctrlr->resource = bus_alloc_resource_any(ctrlr->dev, SYS_RES_MEMORY, &ctrlr->resource_id, RF_ACTIVE); - if(ctrlr->resource == NULL) { + if (ctrlr->resource == NULL) { nvme_printf(ctrlr, "unable to allocate pci resource\n"); return (ENOMEM); } @@ -166,15 +170,32 @@ nvme_ctrlr_allocate_bar(struct nvme_controller *ctrlr) ctrlr->regs = (struct nvme_registers *)ctrlr->bus_handle; /* - * The NVMe spec allows for the MSI-X table to be placed behind - * BAR 4/5, separate from the control/doorbell registers. Always - * try to map this bar, because it must be mapped prior to calling - * pci_alloc_msix(). If the table isn't behind BAR 4/5, - * bus_alloc_resource() will just return NULL which is OK. + * The NVMe spec allows for the MSI-X tables to be placed behind + * BAR 4 and/or 5, separate from the control/doorbell registers. */ - ctrlr->bar4_resource_id = PCIR_BAR(4); - ctrlr->bar4_resource = bus_alloc_resource_any(ctrlr->dev, SYS_RES_MEMORY, - &ctrlr->bar4_resource_id, RF_ACTIVE); + + ctrlr->msix_table_resource_id = pci_msix_table_bar(ctrlr->dev); + ctrlr->msix_pba_resource_id = pci_msix_pba_bar(ctrlr->dev); + + if (ctrlr->msix_table_resource_id >= 0 && + ctrlr->msix_table_resource_id != ctrlr->resource_id) { + ctrlr->msix_table_resource = bus_alloc_resource_any(ctrlr->dev, + SYS_RES_MEMORY, &ctrlr->msix_table_resource_id, RF_ACTIVE); + if (ctrlr->msix_table_resource == NULL) { + nvme_printf(ctrlr, "unable to allocate msi-x table resource\n"); + return (ENOMEM); + } + } + if (ctrlr->msix_pba_resource_id >= 0 && + ctrlr->msix_pba_resource_id != ctrlr->resource_id && + ctrlr->msix_pba_resource_id != ctrlr->msix_table_resource_id) { + ctrlr->msix_pba_resource = bus_alloc_resource_any(ctrlr->dev, + SYS_RES_MEMORY, &ctrlr->msix_pba_resource_id, RF_ACTIVE); + if (ctrlr->msix_pba_resource == NULL) { + nvme_printf(ctrlr, "unable to allocate msi-x pba resource\n"); + return (ENOMEM); + } + } return (0); } @@ -200,9 +221,14 @@ bad: ctrlr->resource_id, ctrlr->resource); } - if (ctrlr->bar4_resource != NULL) { + if (ctrlr->msix_table_resource != NULL) { + bus_release_resource(dev, SYS_RES_MEMORY, + ctrlr->msix_table_resource_id, ctrlr->msix_table_resource); + } + + if (ctrlr->msix_pba_resource != NULL) { bus_release_resource(dev, SYS_RES_MEMORY, - ctrlr->bar4_resource_id, ctrlr->bar4_resource); + ctrlr->msix_pba_resource_id, ctrlr->msix_pba_resource); } if (ctrlr->tag) diff --git a/sys/dev/nvme/nvme_private.h b/sys/dev/nvme/nvme_private.h index 04a47d799350..dd45e1acd0aa 100644 --- a/sys/dev/nvme/nvme_private.h +++ b/sys/dev/nvme/nvme_private.h @@ -235,8 +235,10 @@ struct nvme_controller { * separate from the control registers which are in BAR 0/1. These * members track the mapping of BAR 4/5 for that reason. */ - int bar4_resource_id; - struct resource *bar4_resource; + int msix_table_resource_id; + struct resource *msix_table_resource; + int msix_pba_resource_id; + struct resource *msix_pba_resource; int msi_count; uint32_t enable_aborts; From nobody Thu Oct 30 14:55:04 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cy6bY0LZpz6DLDk; Thu, 30 Oct 2025 14:55:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cy6bX6xJWz3d4H; Thu, 30 Oct 2025 14:55:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761836105; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TX50QHYJKr6US9T7Vae2In3Jhvr8jx1tcBrF2jxvAUQ=; b=HJCBIGkoupcXSgUNwQ+eBpaK+N7/e6PzjT1BfLt5N2n9DQilLqzjgQjAM+a/DBPJ8w87ZW pGgHSP3BZSPrz8/L+h6i5GURm7RY2O+f7KHBeaJHaATD3KXyJFecwjBiESh5yokVmHDzKQ uStC3LJ3RlIxtEw7LvBVfkGj2s6OQWlFQDMb2Uo5yGhOrZb79nfhgoKsRs5bKBn8hJcVCB 4QHKRe13mLQ4pDl4S7l/WypDCb+eRyi9x3YBmWmrP1Tbm/I6mOlAZjGUkJMy3do6bG/A38 Fb2nq0Ha83LjCW05RRR/Q+Yc0G5BvaVuFMQyo2F/HqRqxNt5Q+yq8D3InvxTvA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761836105; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TX50QHYJKr6US9T7Vae2In3Jhvr8jx1tcBrF2jxvAUQ=; b=FMmnzebrUXkBTwCAZvNUU0UXhlFY/johkwpR+r1W0Ao1rNkca/Qtt0Q+4pXWHOoY8JBjvg xs6mVg6RS3uj3ymfHn5rQWveKzTqW/JjsL/0SjO2FFZnSa4vE+SMbvUsscBj4ZP6N0uSAO KA60pOewIGJ7TD/OjPzrFL5DsFh1NN3eoidTpBw3XyLqjmGo3yOChntCvkdAV4KG8UGtpG JbEjByLqN/KqLRLqSjugbpRNmoBmymc7ilNHgJks2ESfeD2+07r7bo+JBDlzlwsxQacmEh eC6NNi58sHp4v4Dugj9HgbNvoBbG97fwe6eqMrKiQKd2nIBNWNaORxvqFHgUiA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761836105; a=rsa-sha256; cv=none; b=ElwA+vf+9mYH99VFxdF3AdxBSDB25jzAQhObpFJcVCKvbAaOTZSljevvUn0BEZgcraPeOg IgCZn/l2AYKswD3TxiA8UvMXTJyWhgIQYfcTswC39nq0l6MW4gg6QVIXDxLvkhqwEj/Lb1 JY8+4tEX9yM1kIkwDwDHlJj02sUsaYZdvYltkUBqfHrn16uC1aZ6ySE9UClChBy5hRz21S ykeKm//ATmh5kFVADCTKPVJR7rH6SBcH3IwkKni+nIRXb6GavLY3W2WNsp9tPuQ1hSzn2Z KtwttmD/xXDhMAs7I0s2PDz1VDzZcQT99QqnKwWTZ08PMd8zbwt756OruuVqNA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cy6bX6DZ5zBn5; Thu, 30 Oct 2025 14:55: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 59UEt4UF071372; Thu, 30 Oct 2025 14:55:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59UEt4ef071369; Thu, 30 Oct 2025 14:55:04 GMT (envelope-from git) Date: Thu, 30 Oct 2025 14:55:04 GMT Message-Id: <202510301455.59UEt4ef071369@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 8b2f4e6b3a47 - main - ipsec offload: never return error from the newkey/spdadd callbacks List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8b2f4e6b3a478faaa4b0b23efc9c65f5db913df4 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=8b2f4e6b3a478faaa4b0b23efc9c65f5db913df4 commit 8b2f4e6b3a478faaa4b0b23efc9c65f5db913df4 Author: Konstantin Belousov AuthorDate: 2025-10-29 16:37:17 +0000 Commit: Konstantin Belousov CommitDate: 2025-10-30 14:54:36 +0000 ipsec offload: never return error from the newkey/spdadd callbacks Returning an error causes premature termination of if_foreach_sleep() loop over the interfaces. Whatever problem we have with the specific interface trying to install an element, should not prevent an attempt to install the same element into all other interfaces. Noted by: Ariel Ehrenberg Sponsored by: NVidia networking MFC after: 1 week --- sys/netipsec/ipsec_offload.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/netipsec/ipsec_offload.c b/sys/netipsec/ipsec_offload.c index 8a09d5f37b4a..59a107881676 100644 --- a/sys/netipsec/ipsec_offload.c +++ b/sys/netipsec/ipsec_offload.c @@ -300,7 +300,7 @@ ipsec_accel_sa_newkey_cb(if_t ifp, void *arg) dprintf("ipsec_accel_sa_install_newkey: cannot alloc " "drv_spi if %s spi %#x\n", if_name(ifp), be32toh(tq->sav->spi)); - return (ENOMEM); + return (0); } error = ifp->if_ipsec_accel_m->if_sa_newkey(ifp, tq->sav, drv_spi, &priv); @@ -329,7 +329,7 @@ ipsec_accel_sa_newkey_cb(if_t ifp, void *arg) } } out: - return (error); + return (0); } static void @@ -663,7 +663,7 @@ ipsec_accel_spdadd_cb(if_t ifp, void *arg) if (error != 0) { dprintf("ipsec_accel_spdadd: %s if_spdadd %p remember res %d\n", if_name(ifp), sp, error); - return (error); + return (0); } error = ifp->if_ipsec_accel_m->if_spdadd(ifp, sp, inp, &i->ifdata); if (error != 0) { @@ -671,7 +671,7 @@ ipsec_accel_spdadd_cb(if_t ifp, void *arg) dprintf("ipsec_accel_spdadd: %s if_spdadd %p res %d\n", if_name(ifp), sp, error); } - return (error); + return (0); } static void From nobody Thu Oct 30 15:19:40 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cy77x1Kljz6DN8k; Thu, 30 Oct 2025 15:19: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cy77x0tlpz3mq4; Thu, 30 Oct 2025 15:19:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761837581; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gd5gRxjFEOyAmQ6T2BurC+fUmJdgWsDaIFUNMESyYXE=; b=UMx4a/2+Mgj0F3cjOSp5o4CchJyMUw4FhxCNtmC6Y3YyIAoLE0tXUjVjYVz6I89XdOhuMJ wsCPfd9VnZLQoIufuGi7/wt/xJfsrp60ZoACG5CafRalJhneOFS1KpnoyIVX34iuI7BGMw ZSc8PNHZjMhfZ7tAdHFSWur8TXbqH8caF9A3GzvxsAgwaW9m/088Jom/19CLggdGzuTCbj rRyyqz4Obim161P+1z1cCjbJD5AsVx2QxZkSGtOfOuAaAIYN6qWh3QWy5pXoQiES9P75j0 C13qW21pjHTK8Y1YFQGw0QXEej0CGA9heMb305ZMbGbS/2S1yMnDObamZHwDeQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761837581; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gd5gRxjFEOyAmQ6T2BurC+fUmJdgWsDaIFUNMESyYXE=; b=nbvBPmuuIczuj8ruQVKaNlVJcoNgFSblaTdh5hKqTvXDZtv6nQzT0of8CrpM/EcgprUYvK jOXNbvmVWjdyEoYJ7nfeaFxs6fGn4ZvPbcakRIEV0fSBEBYe0kfmanlvLyGHgIo+8YGHYM t/Fx1O3r6VqK97YSMfwYbli1smJIeuSTpXXlj9xYpv//Tw3LjwJSKyK2QVolxbz9EpWCsd ZoTSuEAaSvWwGl3IZHayZyN2ca/dLaQwO2D0s0pEgGEtdIieKKL+wUUE9zX58oMPDCqLzg EFOAk1bok9K9h2okuJ9Q8zesqSSjeazI37S6gohGEZDsP5VOMuzXDI2RSE098w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761837581; a=rsa-sha256; cv=none; b=bGKamGJUUVUztlkMHYAQcB8DD5t0JPxYjes+UEox6spBAX3zOwR9BAxg9YluVMGai9vZ8A 8+VDM1+owNxaqlsTfRN9HFigVeh7DauQchmOOw8una6/IPEXyuEDOBLItPuAQ9JvylonYV R+LPmE2JvHrbF6gHs9a1Cbinj26EbAM+r/y4kam9HLd1PJ9LHCMZCFWml2OPKAP4NRozCY cXicZgPRZ62ZE73/NMIUzdSu1VU0fQLNGXI0c72ul58tf935/VkLnH8Xghf4NfujLuDur4 CF9RQMRrcdSFNDy2xhgTnf52JEKt5PsFQWWQKbO/d99Utu9OEC8uhZeYhTiiMg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cy77x0TjzzC81; Thu, 30 Oct 2025 15:19: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 59UFJeT4012037; Thu, 30 Oct 2025 15:19:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59UFJe6l012034; Thu, 30 Oct 2025 15:19:40 GMT (envelope-from git) Date: Thu, 30 Oct 2025 15:19:40 GMT Message-Id: <202510301519.59UFJe6l012034@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 7eb213614b90 - main - bus_alloc_resource: First step in passing resource IDs by value List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7eb213614b90cde31707a53c4b8ae6acacf2aa0f Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=7eb213614b90cde31707a53c4b8ae6acacf2aa0f commit 7eb213614b90cde31707a53c4b8ae6acacf2aa0f Author: John Baldwin AuthorDate: 2025-10-30 15:14:27 +0000 Commit: John Baldwin CommitDate: 2025-10-30 15:19:01 +0000 bus_alloc_resource: First step in passing resource IDs by value Add wrapper inline functions for bus_alloc_resource* that accept a resource ID by value (instead of a pointer). The rest of the bus resource API (outside of compat shims) does not accept resource IDs as arguments, but instead obtains the resource ID from the resource itself when needed. As such, there is no reason to return any potentially modified resource IDs to the caller. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D53401 --- share/man/man9/bus_alloc_resource.9 | 24 +++++++-------------- sys/kern/subr_bus.c | 2 +- sys/sys/bus.h | 42 +++++++++++++++++++++++++++++++++++++ sys/sys/param.h | 2 +- 4 files changed, 51 insertions(+), 19 deletions(-) diff --git a/share/man/man9/bus_alloc_resource.9 b/share/man/man9/bus_alloc_resource.9 index 84a4c9c530c9..5d309229a34e 100644 --- a/share/man/man9/bus_alloc_resource.9 +++ b/share/man/man9/bus_alloc_resource.9 @@ -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 May 20, 2016 +.Dd October 30, 2025 .Dt BUS_ALLOC_RESOURCE 9 .Os .Sh NAME @@ -43,14 +43,14 @@ .In machine/resource.h .Ft struct resource * .Fo bus_alloc_resource -.Fa "device_t dev" "int type" "int *rid" "rman_res_t start" "rman_res_t end" +.Fa "device_t dev" "int type" "int rid" "rman_res_t start" "rman_res_t end" .Fa "rman_res_t count" "u_int flags" .Fc .Ft struct resource * -.Fn bus_alloc_resource_any "device_t dev" "int type" "int *rid" "u_int flags" +.Fn bus_alloc_resource_any "device_t dev" "int type" "int rid" "u_int flags" .Ft struct resource * .Fo bus_alloc_resource_anywhere -.Fa "device_t dev" "int type" "int *rid" "rman_res_t count" "u_int flags" +.Fa "device_t dev" "int type" "int rid" "rman_res_t count" "u_int flags" .Fc .Sh DESCRIPTION This is an easy interface to the resource-management functions. @@ -106,15 +106,13 @@ for I/O memory .El .It .Fa rid -points to a bus specific handle that identifies the resource being allocated. +is a bus specific handle that identifies the resource being allocated. For ISA this is an index into an array of resources that have been setup for this device by either the PnP mechanism, or via the hints mechanism. For PCCARD, this is an index into the array of resources described by the PC Card's CIS entry. For PCI, the offset into PCI config space which has the BAR to use to access the resource. -The bus methods are free to change the RIDs that they are given as a parameter. -You must not depend on the value you gave it earlier. .It .Fa start and @@ -175,20 +173,12 @@ A pointer to is returned on success, a null pointer otherwise. .Sh EXAMPLES This is some example code that allocates a 32 byte I/O port range and an IRQ. -The values of -.Va portid -and -.Va irqid -should be saved in the softc of the device after these calls. .Bd -literal struct resource *portres, *irqres; - int portid, irqid; - portid = 0; - irqid = 0; - portres = bus_alloc_resource(dev, SYS_RES_IOPORT, &portid, + portres = bus_alloc_resource(dev, SYS_RES_IOPORT, 0, 0ul, ~0ul, 32, RF_ACTIVE); - irqres = bus_alloc_resource_any(dev, SYS_RES_IRQ, &irqid, + irqres = bus_alloc_resource_any(dev, SYS_RES_IRQ, 0, RF_ACTIVE | RF_SHAREABLE); .Ed .Sh SEE ALSO diff --git a/sys/kern/subr_bus.c b/sys/kern/subr_bus.c index bf5bda7e058d..b84f69cfd03e 100644 --- a/sys/kern/subr_bus.c +++ b/sys/kern/subr_bus.c @@ -4633,7 +4633,7 @@ bus_release_resources(device_t dev, const struct resource_spec *rs, * parent of @p dev. */ struct resource * -bus_alloc_resource(device_t dev, int type, int *rid, rman_res_t start, +(bus_alloc_resource)(device_t dev, int type, int *rid, rman_res_t start, rman_res_t end, rman_res_t count, u_int flags) { struct resource *res; diff --git a/sys/sys/bus.h b/sys/sys/bus.h index e7ce152160f8..4cc8091bf775 100644 --- a/sys/sys/bus.h +++ b/sys/sys/bus.h @@ -600,6 +600,48 @@ bus_alloc_resource_anywhere(device_t dev, int type, int *rid, return (bus_alloc_resource(dev, type, rid, 0, ~0, count, flags)); } +/* Compat shims for bus_alloc_resource API. */ +static __inline struct resource * +bus_alloc_resource_const(device_t dev, int type, int rid, rman_res_t start, + rman_res_t end, rman_res_t count, u_int flags) +{ + return (bus_alloc_resource(dev, type, &rid, start, end, count, flags)); +} + +static __inline struct resource * +bus_alloc_resource_any_const(device_t dev, int type, int rid, u_int flags) +{ + return (bus_alloc_resource(dev, type, &rid, 0, ~0, 1, flags)); +} + +static __inline struct resource * +bus_alloc_resource_anywhere_const(device_t dev, int type, int rid, + rman_res_t count, u_int flags) +{ + return (bus_alloc_resource(dev, type, &rid, 0, ~0, count, flags)); +} + +#define bus_alloc_resource(dev, type, rid, start, end, count, flags) \ + _Generic((rid), \ + int *: bus_alloc_resource, \ + unsigned int *: bus_alloc_resource, \ + default: bus_alloc_resource_const) \ + ((dev), (type), (rid), (start), (end), (count), (flags)) + +#define bus_alloc_resource_any(dev, type, rid, flags) \ + _Generic((rid), \ + int *: bus_alloc_resource_any, \ + unsigned int *: bus_alloc_resource_any, \ + default: bus_alloc_resource_any_const) \ + ((dev), (type), (rid), (flags)) + +#define bus_alloc_resource_anywhere(dev, type, rid, count, flags) \ + _Generic((rid), \ + int *: bus_alloc_resource_anywhere, \ + unsigned int *: bus_alloc_resource_anywhere, \ + default: bus_alloc_resource_anywhere_const) \ + ((dev), (type), (rid), (count), (flags)) + /* Compat shims for simpler bus resource API. */ int bus_adjust_resource_old(device_t child, int type, struct resource *r, rman_res_t start, rman_res_t end); diff --git a/sys/sys/param.h b/sys/sys/param.h index 7cfa3c6aa4a8..957f1762a17c 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -74,7 +74,7 @@ * cannot include sys/param.h and should only be updated here. */ #undef __FreeBSD_version -#define __FreeBSD_version 1600002 +#define __FreeBSD_version 1600003 /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD, From nobody Thu Oct 30 15:51:11 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cy7rJ39Vkz6F9w2; Thu, 30 Oct 2025 15:51: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cy7rH27TKz3rK5; Thu, 30 Oct 2025 15:51:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761839471; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Dw7ct5x7aR2aNCiLHVlUpSJwXCVG/YhRipRvNwHwzxI=; b=qkpMm0iZZX2XP7Dna97SujQwTwFiPRWU877J7Clkgkte2WHXWRp+TjAXBbptwogq59cu8o Adzbc0BTaZ+j4ZLSIg7yo6sG8LiFFagQtgmcc0NL6N3VE0gP/ha9RFdAgHz2wr4nq7N5ZF lKuglrx8jlsxdMI3YrhHNQFxdh8ZYYEBfkWyHb/fqCI+N+xZUFw5xVcAPD13eNNeRBmVEH 7gbqaltPD02PlKSRxyOw9MAWTekm35ukliQBLIHnqYJQjI/3H4mA5RZnOd0Ok47LVtmnhL ML6PjRaaPAVJBBVrnqcLl4vj3fxo1zvuWGCVjKMaImQe3IDHuaWfSN9qm7nV1w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761839471; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Dw7ct5x7aR2aNCiLHVlUpSJwXCVG/YhRipRvNwHwzxI=; b=u9r2gcmJeIOJ31KYzRheI5PYSsUG9l1xHK5mLybnAjGHRiYHAHc7q0elSFiiMLJyg4Q1bM 1Q1lAfVVAxl8PKXfXjtVbRQRnyE7eFbg9MUIsv2ZQPDV9t3RajYaVPyyY4O9llcUloUICJ YQuOCDU549GSUJBU/D3U+KFHD59pnjAQ+lriXtCn9Lo0K07EFPRw+rGjpHaQzmILqxegBN 5FdmbCwuGIf6/zZVmmicwNXMvDkLlMReSqyfHsqh7JdH0y1N6csGz3hXTKdUOf+u2a/dwW 3peGhssLoQCPrpHjop4WyOIUGvi9QV2aWaAckCFd8uWpnOwTE8KtODaXsLyC+A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761839471; a=rsa-sha256; cv=none; b=k1HrnYkq+oPxHWkxlx94s3T1mApcrITT9w9V/BAC93bPAsL6mpprUtn8dJwtvBiVX7MNI+ wtrvCV11lVmramYn0tajcH/jDP6iNl1v2ZzHy7pjUzpsfpl7AEfpzI+9V8yuBMjF41Q3Gf oLxJCrhMHsUtNeA41T8OQx6sNhkLOtXH//qsdJijH+s/CTs2YIuGrgn5p5afQqVq5nprIR A6G34xy1y8Y9mN+T9EraDCMX5Wa1VkAZsRvSZHzecOfaiuAoJ3UhArl9Fiq75AtrDoo1ph GYh091Dc0isbbFFW03tVLtMMtUV+aw+cLfTe5kb7MJLNMhzIoidUt3pGgJKIvA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cy7rH18hRzDKZ; Thu, 30 Oct 2025 15:51: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 59UFpB4Y078691; Thu, 30 Oct 2025 15:51:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59UFpBff078688; Thu, 30 Oct 2025 15:51:11 GMT (envelope-from git) Date: Thu, 30 Oct 2025 15:51:11 GMT Message-Id: <202510301551.59UFpBff078688@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Ziaee Subject: git: 205af037e302 - main - bhyve.8: Correct description for -c flag, tag spdx List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 205af037e302fbd50dabc485a89e2222cd063b9e Auto-Submitted: auto-generated The branch main has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=205af037e302fbd50dabc485a89e2222cd063b9e commit 205af037e302fbd50dabc485a89e2222cd063b9e Author: Alexander Ziaee AuthorDate: 2025-10-30 15:06:30 +0000 Commit: Alexander Ziaee CommitDate: 2025-10-30 15:51:04 +0000 bhyve.8: Correct description for -c flag, tag spdx The examples only show the usage of `-c `, as did the flag description, however the -c flag supports more complex cpu topology specifiers. These were documented correctly in SYNOPSIS, add them to the body of the DESCRIPTION as well. Someone could go further and do and example with using them. MFC after: 3 days Event: OpenZFS Developer Summit '25 Reported by: Levi Worley --- usr.sbin/bhyve/bhyve.8 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/usr.sbin/bhyve/bhyve.8 b/usr.sbin/bhyve/bhyve.8 index 3df9f79c3b2c..27e067f50394 100644 --- a/usr.sbin/bhyve/bhyve.8 +++ b/usr.sbin/bhyve/bhyve.8 @@ -1,3 +1,6 @@ +.\" +.\" SPDX-License-Identifier: BSD-2-Clause +.\" .\" Copyright (c) 2013 Peter Grehan .\" All rights reserved. .\" @@ -22,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd September 16, 2025 +.Dd October 28, 2025 .Dt BHYVE 8 .Os .Sh NAME @@ -125,7 +128,7 @@ xAPIC mode is the default setting so this option is redundant. It will be deprecated in a future version. .It Fl C Include guest memory in core files. -.It Fl c Op Ar setting ... +.It Fl c Oo Oo Cm cpus= Oc Ns Ar numcpus Oc Ns Oo Cm ,sockets= Ns Ar n Oc Ns Oo Cm ,cores= Ns Ar n Oc Ns Oo Cm ,threads= Ns Ar n Oc Number of guest virtual CPUs and/or the CPU topology. The default value for each of From nobody Thu Oct 30 17:44:39 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cyBMD6s0Jz6FKvH; Thu, 30 Oct 2025 17:44: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cyBMC5swkz47Lf; Thu, 30 Oct 2025 17:44:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761846280; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=60YRqX9lRpEtO6FVu46ZuWTX3sGZ7etyfwLpmH3lcZE=; b=XMlzZ9HQEfXkPejct9N3Xu/hhWOlbD4p7ikQB+MniTQ58skHqX86kQV0e6JVEi93guzqyx 0xkpSekERI1+DcwiCd8bcsu9/UWbtxtSJPh8zp+/wUDp9HljlKzIpRljOFXW/IjJFFFNy8 wk3C6jxDG59ZvnF4q0OEisVJEKUsNkAT9Zn0VYvvnkjgq7D820vEr6X+2w+qvJ+0WltisE axtrqiNhkJzwLXBvw9qoSQRznHiFqglbP2XCiGpi+fqP+uO9ZQYuaecP97vnGfP/ZRNpaH M9sIvYVK1aZZ4hZOEEzBk9pKo361BdCEAeg1CP+2JjNHAvyEqdqyI5oVdPrhoA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761846279; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=60YRqX9lRpEtO6FVu46ZuWTX3sGZ7etyfwLpmH3lcZE=; b=oSFJl7d/22vhgPFOl5u4/N46SIeOuoO1kDToi3dMZWFf5xoKjQuDa8+r5aiC1tjI4MCAMX MSgZC9JjWI+OI9ogPE17YFiJMacHdjkLdDi4FKFnceqaq9UJh97WxH1OV9+6wjArolrQlH zqQX9Z4ia2pQ9lNrVQhVv8+QTAr/HbwxHVbiDzbgNGljp93qTeo8Fhn53EWNkxot6uOcLD vxoqKQPYMiCV244xHCtnGMeaYhh9rN3Z8C1uiL6w6bpAdPCMZ1DTw5miOlTU2WqezLtLqy iRoswgG4MtMF9oBK7MaH3zk9bem+ha2S/f3ou8mRXW7eqx/YgJas6WJ6TJ/ljw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761846279; a=rsa-sha256; cv=none; b=hFbBZpo5f3yEG69SOrrVHaZIufwQ4wSG5Vf5k7jN9E/nYXEhn8pvFkEZ7WxaXBGuSGtDAy MSV3dnPE4Wn1IwfObuWdRnuwVE7T1cXNw84RsBMuIYfKZgcw3WqY3iot1G/kY0/OKUohvp 018PL3/U8AfK2mfJQY7fu/VcgiaLsp9BRaqR/dw1bTZMh2khoageLO1E9fYFHd5RgCVQud oNKa8Vwx8MpsMCwE0gaZemliR0Sj+JHSriYZIv4FAL2PM1DQWrs0oVkK9icI5O4ujCRB2u JvBR15ZXWBL4xeV8KshYf5J7UnoQfhVzhyVuch6h24+a/RBDz8T8/jR/gxvAKA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cyBMC5SJXzY6B; Thu, 30 Oct 2025 17:44:39 +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 59UHidbV092321; Thu, 30 Oct 2025 17:44:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59UHid64092318; Thu, 30 Oct 2025 17:44:39 GMT (envelope-from git) Date: Thu, 30 Oct 2025 17:44:39 GMT Message-Id: <202510301744.59UHid64092318@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kajetan Staszkiewicz Subject: git: 646798b67831 - main - pf: Make nat-to and rdr-to work properly both on in and out rules List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 646798b6783184fb194a2d97667e05895e00c358 Auto-Submitted: auto-generated The branch main has been updated by ks: URL: https://cgit.FreeBSD.org/src/commit/?id=646798b6783184fb194a2d97667e05895e00c358 commit 646798b6783184fb194a2d97667e05895e00c358 Author: Kajetan Staszkiewicz AuthorDate: 2025-10-01 13:51:46 +0000 Commit: Kajetan Staszkiewicz CommitDate: 2025-10-30 17:32:21 +0000 pf: Make nat-to and rdr-to work properly both on in and out rules New-style address translation is done by nat-to and rdr-to actions on normal match and pass rules. Those rules, when used without address translation, can be specified without direction. But that allows users to specify pre-routing nat and post-routing rdr. This case is not handled properly and causes pre-routing nat to modify destination address, as if it was a rdr rule, and post-routing rdr to modify source address, as if it was a nat rule. Ensure that nat-to action modifies source address and rdr-to destination address no matter in which direction the rule is applied. The man page for pf.conf already specifies that nat-to and rdr-to rules should be limited to respective directions. PR: 288577 Reviewed by: kp MFC after: 3 days Sponsored by: InnoGames GmbH Differential Revision: https://reviews.freebsd.org/D53216 --- sys/netpfil/pf/pf_lb.c | 16 +++++++++++++-- tests/sys/netpfil/pf/nat.sh | 47 +++++++++++++++++++++++++++++++++++++++------ 2 files changed, 55 insertions(+), 8 deletions(-) diff --git a/sys/netpfil/pf/pf_lb.c b/sys/netpfil/pf/pf_lb.c index 5d85e16f18e3..4b1d74e0e61f 100644 --- a/sys/netpfil/pf/pf_lb.c +++ b/sys/netpfil/pf/pf_lb.c @@ -974,6 +974,7 @@ pf_get_transaddr(struct pf_test_ctx *ctx, struct pf_krule *r, { struct pf_pdesc *pd = ctx->pd; struct pf_addr *naddr; + int idx; uint16_t *nportp; uint16_t low, high; u_short reason; @@ -988,8 +989,19 @@ pf_get_transaddr(struct pf_test_ctx *ctx, struct pf_krule *r, return (PFRES_MEMORY); } - naddr = &ctx->nk->addr[1]; - nportp = &ctx->nk->port[1]; + switch (nat_action) { + case PF_NAT: + idx = pd->sidx; + break; + case PF_BINAT: + idx = 1; + break; + case PF_RDR: + idx = pd->didx; + break; + } + naddr = &ctx->nk->addr[idx]; + nportp = &ctx->nk->port[idx]; switch (nat_action) { case PF_NAT: diff --git a/tests/sys/netpfil/pf/nat.sh b/tests/sys/netpfil/pf/nat.sh index 1ef87cee3598..0824671fa0f1 100644 --- a/tests/sys/netpfil/pf/nat.sh +++ b/tests/sys/netpfil/pf/nat.sh @@ -477,15 +477,49 @@ no_addrs_random_cleanup() pft_cleanup } -atf_test_case "nat_pass" "cleanup" -nat_pass_head() +atf_test_case "nat_pass_in" "cleanup" +nat_pass_in_head() { - atf_set descr 'IPv4 NAT on pass rule' + atf_set descr 'IPv4 NAT on inbound pass rule' atf_set require.user root atf_set require.progs scapy } -nat_pass_body() +nat_pass_in_body() +{ + setup_router_server_ipv4 + # Delete the route back to make sure that the traffic has been NAT-ed + jexec server route del -net ${net_tester} ${net_server_host_router} + # Provide routing back to the NAT address + jexec server route add 203.0.113.0/24 ${net_server_host_router} + jexec router route add 203.0.113.0/24 -iface ${epair_tester}b + + pft_set_rules router \ + "block" \ + "pass in on ${epair_tester}b inet proto tcp nat-to 203.0.113.0 keep state" \ + "pass out on ${epair_server}a inet proto tcp keep state" + + ping_server_check_reply exit:0 --ping-type=tcp3way --send-sport=4201 + + jexec router pfctl -qvvsr + jexec router pfctl -qvvss + jexec router ifconfig + jexec router netstat -rn +} + +nat_pass_in_cleanup() +{ + pft_cleanup +} + +nat_pass_out_head() +{ + atf_set descr 'IPv4 NAT on outbound pass rule' + atf_set require.user root + atf_set require.progs scapy +} + +nat_pass_out_body() { setup_router_server_ipv4 # Delete the route back to make sure that the traffic has been NAT-ed @@ -504,7 +538,7 @@ nat_pass_body() jexec router netstat -rn } -nat_pass_cleanup() +nat_pass_out_cleanup() { pft_cleanup } @@ -874,7 +908,8 @@ atf_init_test_cases() atf_add_test_case "no_addrs_random" atf_add_test_case "map_e_compat" atf_add_test_case "map_e_pass" - atf_add_test_case "nat_pass" + atf_add_test_case "nat_pass_in" + atf_add_test_case "nat_pass_out" atf_add_test_case "nat_match" atf_add_test_case "binat_compat" atf_add_test_case "binat_match" From nobody Thu Oct 30 17:44:40 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cyBMF1lGsz6FKxb; Thu, 30 Oct 2025 17:44: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cyBMF03Qzz47D3; Thu, 30 Oct 2025 17:44:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761846281; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8oizuc9IukVcuwwT/aMQGpj82ko/6TFGv4TKKmqUbdU=; b=bBqsu8dFMV7vKyIxQ1be8ru024LLHDCTQ/bvsgIMRM3HC0kxbFHIVLKkykoSz0VZjTKsgC 2DKlodVejlsrYgOq7DILJegFD59g4z59Im6bZUu66xG94AuPdgE98WpmgRfzZ9AVFMwMZx 4Bb22cTGWEKq7RyP3xnrc8lXpeopmLNkIOYexnA5nk4gD18SFuWaTFoqUHk9FY0qIHGI4l WMCQ6m3aLIX35gQPJ5EHdnztHzkpVyXTwG/tVEMHaDrV8wOfvjepR0qbPfo/EX7sfnLT84 jyAUv6vyduxRYb0dreXHAggHbZKC7dQsKorOEGWxJ0tpzSF6GXp2nV9b43pWew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761846281; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8oizuc9IukVcuwwT/aMQGpj82ko/6TFGv4TKKmqUbdU=; b=pHIn6eOsOEbZAJd2R/qtSovG3G5l5Txr2hlYQvfCiWVmBh6rGS7w1wq4RD0WosfNqcgWSB 3TmG3OlUQ4ai+kbl7XOLr6HDeIg6eYIyBK6MldV7qKSK1m5swdSrFxsxLfw/EnE7AN4Jf8 MorxSJsxgBUJ6JjHdaCzAHZ8DJnmPrnwgbkkjmtdOFdVlMlXT1ZQKhxfEwswVo/11m7CVi hLw4RxIwv5Sl4J5Ho8MwPJAubCWhzBMnTP8TrPRyVt7CbSygUIIsROcTGCnyQyJSJl2gMQ 2+nhoy4fAhQrMdC2VT8Srf7mVaLS1PXJFa+JD4yIw3Z9ChAGZ65UwbQp1UuS7Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761846281; a=rsa-sha256; cv=none; b=tZOqIreUfJNfkaaskqeHNSyGJ9HPm+OTNxiHoZETLgkoh8dnhc7iHb4HEWwDUMxrK7vEga X+fKvo/qnz1yPzx5LMVrp0JheCkmGzlqz82GU0Xe5GcpyeNTeZ7mfy+Un8g8l3j3pJWoNX yP4ff5uLsbpVdiHhB7pKs/szoNcf7rKwnxBlGGC2ybUuHmMg7MD23iTBjZP2hc738UQ4sg TlRlVxl8mei6jJhYspxpOW2INuOJPx0IIkzdv4gAi76yNdWu9baFQx+Fgsv/70nO0llVBI WMQ+X2FELdZcoa8AZ3aOeswuTqY8CBgSD8V5UvD9nB8sxbmSqJO2TyJ1uwiByw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cyBMD6CYwzYwN; Thu, 30 Oct 2025 17:44: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 59UHiePJ092355; Thu, 30 Oct 2025 17:44:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59UHieST092352; Thu, 30 Oct 2025 17:44:40 GMT (envelope-from git) Date: Thu, 30 Oct 2025 17:44:40 GMT Message-Id: <202510301744.59UHieST092352@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kajetan Staszkiewicz Subject: git: ee1f417a8609 - main - pf: Check if source nodes use a valid redirection address List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ee1f417a8609b8742332950521800502759dd185 Auto-Submitted: auto-generated The branch main has been updated by ks: URL: https://cgit.FreeBSD.org/src/commit/?id=ee1f417a8609b8742332950521800502759dd185 commit ee1f417a8609b8742332950521800502759dd185 Author: Kajetan Staszkiewicz AuthorDate: 2025-10-20 16:53:50 +0000 Commit: Kajetan Staszkiewicz CommitDate: 2025-10-30 17:32:52 +0000 pf: Check if source nodes use a valid redirection address Source nodes redirect (nat-to, rdr-to, route-to) all further connections matching the rule which has created the source node. The source node is valid as long as there are states resulting from the rule or until the source node lifetime expires. When the rule's redirection pool is modified (e.g. table contents are changed) the source node is still valid and it will redirect new connections to invalid target (e.g. a dead next-hop). When performing source tracking after finding a source node check if the redirection address still exists in pool of the rule which has created this node. If not, delete the source node. This will result in finding a new redirection address and creation of a new source node. Reviewed by: kp Obtained from: OpenBSD Sponsored by: InnoGames GmbH Differential Revision: https://reviews.freebsd.org/D53231 --- sys/net/pfvar.h | 4 ++ sys/netpfil/pf/pf.c | 2 +- sys/netpfil/pf/pf_lb.c | 101 +++++++++++++++++++++++++++++++++++++- sys/netpfil/pf/pf_table.c | 2 +- tests/sys/netpfil/pf/src_track.sh | 74 ++++++++++++++++++++++++++++ 5 files changed, 179 insertions(+), 4 deletions(-) diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h index 8aefe514946e..52db00f6ce0b 100644 --- a/sys/net/pfvar.h +++ b/sys/net/pfvar.h @@ -2435,6 +2435,7 @@ extern struct pf_ksrc_node *pf_find_src_node(struct pf_addr *, struct pf_srchash **, pf_sn_types_t, bool); extern void pf_unlink_src_node(struct pf_ksrc_node *); extern u_int pf_free_src_nodes(struct pf_ksrc_node_list *); +extern void pf_free_src_node(struct pf_ksrc_node *); extern void pf_print_state(struct pf_kstate *); extern void pf_print_flags(uint16_t); extern int pf_addr_wrap_neq(struct pf_addr_wrap *, @@ -2521,6 +2522,9 @@ uint16_t pf_qname2qid(const char *, bool); void pfr_initialize(void); void pfr_cleanup(void); +struct pfr_kentry * + pfr_kentry_byaddr(struct pfr_ktable *, struct pf_addr *, sa_family_t, + int); int pfr_match_addr(struct pfr_ktable *, struct pf_addr *, sa_family_t); void pfr_update_stats(struct pfr_ktable *, struct pf_addr *, sa_family_t, u_int64_t, int, int, int); diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index fd70fb1c8a36..a39f5fe58cd6 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -1007,7 +1007,7 @@ pf_src_node_exists(struct pf_ksrc_node **sn, struct pf_srchash *sh) return (false); } -static void +void pf_free_src_node(struct pf_ksrc_node *sn) { diff --git a/sys/netpfil/pf/pf_lb.c b/sys/netpfil/pf/pf_lb.c index 4b1d74e0e61f..7aeb8266ca8c 100644 --- a/sys/netpfil/pf/pf_lb.c +++ b/sys/netpfil/pf/pf_lb.c @@ -535,6 +535,63 @@ pf_get_mape_sport(struct pf_pdesc *pd, struct pf_krule *r, return (1); } +static __inline u_short +pf_check_src_node_valid(struct pf_ksrc_node *sn, struct pf_kpool *rpool) +{ + struct pf_addr *raddr, *rmask; + struct pf_addr *caddr; /* cached redirection address */ + struct pf_kpooladdr *pa; + sa_family_t raf; + sa_family_t caf; /* cached redirection AF */ + u_short valid = 0; + + KASSERT(sn != NULL, ("sn is NULL")); + KASSERT(rpool != NULL, ("rpool is NULL")); + + /* check if the cached entry is still valid */ + + if (sn->type == PF_SN_LIMIT) { + /* Always valid as it does not store redirection address */ + return (1); + } + + mtx_lock(&rpool->mtx); + caddr = &(sn->raddr); + caf = sn->raf; + + TAILQ_FOREACH(pa, &rpool->list, entries) { + if (PF_AZERO(caddr, caf)) { + valid = 1; + goto done; + } else if (pa->addr.type == PF_ADDR_DYNIFTL) { + if (pfr_kentry_byaddr(pa->addr.p.dyn->pfid_kt, caddr, caf, 0)) { + valid = 1; + goto done; + } + } else if (pa->addr.type == PF_ADDR_TABLE) { + if (pfr_kentry_byaddr(pa->addr.p.tbl, caddr, caf, 0)) { + valid = 1; + goto done; + } + } else if (pa->addr.type != PF_ADDR_NOROUTE) { + /* PF_ADDR_URPFFAILED, PF_ADDR_RANGE, PF_ADDR_ADDRMASK */ + raddr = &(pa->addr.v.a.addr); + rmask = &(pa->addr.v.a.mask); + raf = pa->af; + if (raf == caf && pf_match_addr(0, raddr, rmask, caddr, caf)) { + valid = 1; + goto done; + } + } + /* else PF_ADDR_NOROUTE */ + } + +done: + mtx_unlock(&rpool->mtx); + + return (valid); +} + u_short pf_map_addr(sa_family_t saf, struct pf_krule *r, struct pf_addr *saddr, struct pf_addr *naddr, struct pfi_kkif **nkif, sa_family_t *naf, @@ -874,6 +931,45 @@ pf_map_addr_sn(sa_family_t saf, struct pf_krule *r, struct pf_addr *saddr, if (sn != NULL) { PF_SRC_NODE_LOCK_ASSERT(sn); + /* + * Check if source node's redirection address still exists + * in pool from which the SN was created. If not, delete it. + * Similar to pf_kill_srcnodes(). Unlink the source node + * from tree, unlink it from states, then free it. Do not + * overlap source node and state locks to avoid LOR. + */ + if (!pf_check_src_node_valid(sn, rpool)) { + pf_unlink_src_node(sn); + PF_SRC_NODE_UNLOCK(sn); + if (V_pf_status.debug >= PF_DEBUG_NOISY) { + printf("%s: stale src tracking (%d) ", + __func__, sn_type); + pf_print_host(saddr, 0, saf); + printf(" to "); + pf_print_host(&(sn->raddr), 0, sn->raf); + if (nkif) + printf("@%s", sn->rkif->pfik_name); + printf("\n"); + } + + for (int i = 0; i <= V_pf_hashmask; i++) { + struct pf_idhash *ih = &V_pf_idhash[i]; + struct pf_kstate *st; + + PF_HASHROW_LOCK(ih); + LIST_FOREACH(st, &ih->states, entry) { + if (st->sns[sn->type] == sn) { + st->sns[sn->type] = NULL; + } + } + PF_HASHROW_UNLOCK(ih); + } + pf_free_src_node(sn); + counter_u64_add(V_pf_status.scounters[SCNT_SRC_NODE_REMOVALS], 1); + sn = NULL; + goto map_addr; + } + (*naf) = sn->raf; /* If the supplied address is the same as the current one we've @@ -902,9 +998,10 @@ pf_map_addr_sn(sa_family_t saf, struct pf_krule *r, struct pf_addr *saddr, goto done; } +map_addr: /* - * Source node has not been found. Find a new address and store it - * in variables given by the caller. + * Source node has not been found or is invalid. Find a new address + * and store it in variables given by the caller. */ if ((reason = pf_map_addr(saf, r, saddr, naddr, nkif, naf, init_addr, rpool)) != 0) { diff --git a/sys/netpfil/pf/pf_table.c b/sys/netpfil/pf/pf_table.c index 73ec18fa7646..cf752ce0de18 100644 --- a/sys/netpfil/pf/pf_table.c +++ b/sys/netpfil/pf/pf_table.c @@ -2071,7 +2071,7 @@ pfr_lookup_table(struct pfr_table *tbl) (struct pfr_ktable *)tbl)); } -static struct pfr_kentry * +struct pfr_kentry * pfr_kentry_byaddr(struct pfr_ktable *kt, struct pf_addr *a, sa_family_t af, int exact) { diff --git a/tests/sys/netpfil/pf/src_track.sh b/tests/sys/netpfil/pf/src_track.sh index d86b4ce6c466..1b09030f6174 100755 --- a/tests/sys/netpfil/pf/src_track.sh +++ b/tests/sys/netpfil/pf/src_track.sh @@ -588,6 +588,79 @@ mixed_af_cleanup() pft_cleanup } +atf_test_case "check_valid" "cleanup" +check_valid_head() +{ + atf_set descr 'Test if source node is invalidated on change in redirection pool' + atf_set require.user root + atf_set require.progs python3 scapy +} + +check_valid_body() +{ + setup_router_server_nat64 + + # Clients will connect from another network behind the router. + # This allows for using multiple source addresses. + jexec router route add -6 ${net_clients_6}::/${net_clients_6_mask} ${net_tester_6_host_tester} + + jexec server1 ifconfig ${epair_server1}b inet6 ${net_server1_6}::42:1/128 alias + jexec server1 ifconfig ${epair_server1}b inet6 ${net_server1_6}::42:2/128 alias + + jexec router pfctl -e + pft_set_rules router \ + "set debug loud " \ + "set state-policy if-bound" \ + "table { ${net_server1_6}::42:1 }" \ + "pass in on ${epair_tester}b \ + route-to { (${epair_server1}a ) } \ + sticky-address \ + proto tcp \ + keep state" + + atf_check -s exit:0 ${common_dir}/pft_ping.py \ + --sendif ${epair_tester}a --replyif ${epair_tester}a \ + --fromaddr ${net_clients_6}::1 --to ${host_server_6} \ + --ping-type=tcp3way --send-sport=4201 + + # A source node is created using the original redirection target + nodes=$(mktemp) || exit 1 + jexec router pfctl -qvvsS | normalize_pfctl_s > $nodes + node_regexp='2001:db8:44::1 -> 2001:db8:4201::42:1 .* states 1,.* route sticky-address' + grep -qE "${node_regexp}" $nodes || atf_fail "Source node not found for '${node_regexp}'" + + # Change contents of the redirection table + echo ${net_server1_6}::42:2 | jexec router pfctl -Tr -t targets -f - + + atf_check -s exit:0 ${common_dir}/pft_ping.py \ + --sendif ${epair_tester}a --replyif ${epair_tester}a \ + --fromaddr ${net_clients_6}::1 --to ${host_server_6} \ + --ping-type=tcp3way --send-sport=4202 + + # The original source node was deleted, a new one was created. + # It has 1 states. + jexec router pfctl -qvvsS | normalize_pfctl_s > $nodes + node_regexp='2001:db8:44::1 -> 2001:db8:4201::42:2 .* states 1,.* route sticky-address' + grep -qE "${node_regexp}" $nodes || atf_fail "Source node not found for '${node_regexp}'" + + atf_check -s exit:0 ${common_dir}/pft_ping.py \ + --sendif ${epair_tester}a --replyif ${epair_tester}a \ + --fromaddr ${net_clients_6}::1 --to ${host_server_6} \ + --ping-type=tcp3way --send-sport=4203 + + # Without redirection table change the source node is reused. + # It has 2 states. + jexec router pfctl -qvvsS | normalize_pfctl_s > $nodes + node_regexp='2001:db8:44::1 -> 2001:db8:4201::42:2 .* states 2,.* route sticky-address' + grep -qE "${node_regexp}" $nodes || atf_fail "Source node not found for '${node_regexp}'" +} + +check_valid_cleanup() +{ + pft_cleanup +} + + atf_init_test_cases() { atf_add_test_case "source_track" @@ -598,4 +671,5 @@ atf_init_test_cases() atf_add_test_case "sn_types_compat" atf_add_test_case "sn_types_pass" atf_add_test_case "mixed_af" + atf_add_test_case "check_valid" } From nobody Thu Oct 30 18:09:39 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cyBw33zl9z6FMgQ; Thu, 30 Oct 2025 18:09: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cyBw33MgBz4BpJ; Thu, 30 Oct 2025 18:09:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761847779; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=k5t+ytof55iGm72P/12oeU68EWC9uIVBJl6n6rUbaH8=; b=bqHYWFX2QU5qrNJNMCzRcTzqM7V8SSRIBd+rVoYNEqjLBEN22umAJd5LDlRAfjbBnIKPyu rT4w3azfLF+Bzg7Csy4l5nTl60WE6rEMbruektEX1knwQf/AdzJvV3PwIlV2UJ0GQa2Cfe ZcUXeGe7Rf2/hGgcSzBfNElPjZALrsX//u+ReSae7T3V1V2fP1RZvp+qMg7LXogPyzUfBC Kr12USgZxwfHO5aCfOXHLNFKVj9qs/RM3pmAEdPqSjzx4C4ExwD043QKuAzYpZHLZl4ZKi n6oxutXB5WAKEGRT4xgeKe/mb783J7AzCvSvMbY71cD8dbr96grbn5fKzOYOvw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761847779; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=k5t+ytof55iGm72P/12oeU68EWC9uIVBJl6n6rUbaH8=; b=UmfHgVW1zPFMRyF+u/xS5MpgzQmRoL5D3JFFu399h4KCI2JmIqwFMc3oRo2BUlS5FyuB1o 1Hzc/NvC7Cd9Xyl9Obvn+C++xT5Q9gbfsi6OPFJgZc366vm+aAnHrnysfmY/5HJImu+4eB OqnkIrPWJL0odMnr4EOwPhHrQI8GfzAgutb+JGynu8o372wZAgZJEiKyiTr1y/BDgJKaEj sVNhBDeXkKaGm9leO8ewt0pRXC3k0H+Dhlk2TqPjBGsmZ+uXNYWXb80aLcNmdL/yvDUBNV BXI/y6Q0XwrbZ0n2ImBdiFlHgAZ3CuFVRmtkD313TsHXd4KJfUlh0j/13eCewA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761847779; a=rsa-sha256; cv=none; b=HwaidezRNUuy6szHy67wVqBXM0V71qUG+oJHoV3uZYVaFQnydIDgOAA8zR5rmcjcE7MhrN cufYJvbm9c30ABwN0yqoAbJaeY+4JWEtn3rzv956jh2rR+O4opqwpz4ZbbwRbwpyz+xpNF JloLvppO/BfT/88h3wUNKeWsEv88Css36FJlDXiqpNKe3Gnorj9hBCnjDD++N80jVUlXGz QSEZ15hBCbPaFH9EPNywXH8Nt/I3gSKeRreaPMKCwI6wItl7ExLAZ0JCX+TRFcj17fdKQT tfLAMV1LDOFGz56pe5f7YEgJdbyAvAQTtDWeMIZFBWx7AWJCPuEeOynMesbi2A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cyBw32sCVzZhw; Thu, 30 Oct 2025 18:09:39 +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 59UI9deW031876; Thu, 30 Oct 2025 18:09:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59UI9d4a031873; Thu, 30 Oct 2025 18:09:39 GMT (envelope-from git) Date: Thu, 30 Oct 2025 18:09:39 GMT Message-Id: <202510301809.59UI9d4a031873@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Simon J. Gerraty" Subject: git: a797702be077 - main - rc.subr set dot_dir and dot_file in dot List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a797702be077c4671e3d437d6b9ffd37f2e86277 Auto-Submitted: auto-generated The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=a797702be077c4671e3d437d6b9ffd37f2e86277 commit a797702be077c4671e3d437d6b9ffd37f2e86277 Author: Simon J. Gerraty AuthorDate: 2025-10-30 18:09:13 +0000 Commit: Simon J. Gerraty CommitDate: 2025-10-30 18:09:13 +0000 rc.subr set dot_dir and dot_file in dot Files read by '.' cannot workout for themselves where they are or what they are called, so set dot_dir and dot_file to pass this information to them. Reviewed by: obrien, stevek Differential Revision: https://reviews.freebsd.org/D53476 --- libexec/rc/rc.subr | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/libexec/rc/rc.subr b/libexec/rc/rc.subr index 8317ff5c0922..e4ad14f582d6 100644 --- a/libexec/rc/rc.subr +++ b/libexec/rc/rc.subr @@ -121,11 +121,22 @@ dotted= dot() { local f verify + local dot_dir dot_file o_verify_set off verify for f in "$@"; do if [ -f $f -a -s $f ]; then dotted="$dotted $f" + case $f in + */*) + dot_dir=${f%/*} + dot_file=${f##*/} + ;; + *) + dot_dir=. + dot_file=$f + ;; + esac . $f fi done @@ -152,8 +163,7 @@ vdot() for f in "$@"; do [ -f $f -a -s $f ] || continue if is_verified $f 2> /dev/null; then - dotted="$dotted $f" - . $f + dot $f else rc=80 # EAUTH fi From nobody Thu Oct 30 18:41:44 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cyCd45rcJz6FQGk; Thu, 30 Oct 2025 18:41: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cyCd45Kl7z4Gr2; Thu, 30 Oct 2025 18:41:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761849704; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RvNB3UOOaPbml7yBpwhqY/YEqbluT5lxwMHDrb0mkHQ=; b=qvwZd/Zg1OvWr3bluqgV13wDE6f/POH0OAiEv4voKmr176slgwUWyoX1Lo6I/N8siuOaPK HxJfvigWPZ2R2Nmh54WPwa5QHc8kRMBo6pLQsxZgV+yHGY21G7xA5CKBSqUNj1ImterWxS 07jSY9CJYaaGBHokm0SAy7CIsA7UzPqxgAWQoJHcf5VI4iNRVaECNBSX3yY51dR1Eo0/V4 Z57aFoUDu83q7w3chJUciLegoaqjNdg0lqtn43/3x+XRcSQtdBEzFtZ5sI9PViIq3qCZEW D4iyQ780mGZGbkiKlLz7Yh+SwyWGrHyOOTy0SYBx9S1FM6RyO1HsPi43LwM4aw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761849704; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RvNB3UOOaPbml7yBpwhqY/YEqbluT5lxwMHDrb0mkHQ=; b=ZdVwKZmCnjgGvFDBnEXC1znq5meSibjCZCkrzvTSR4RJn4QicYO4HB67P8Doz3R69AsL7A VfejX1v3OPxUzuqVIsjy0b/SH/RhXeQuJOvUOGuWVCanbXxYW5YzEOeUKBSRjI62Iutzcc WBm/Een90d1Og414fZ1ENZFBs9/G7RLTgqwgpVb84w/hEhTLAsFO3H5uREQltSTc7L2YCz BMioCCLh4UP7NrTAOB7T3I2+lsuxBKFazRC5DTfYrE2Tg2SUsB51icTnfiV2pPdsKMQnaI HtjyPkAWT/nbuBozcpJ4PceecKOgFBUYVIIJvUHV0tSpEqStFWXwyie4YBjDPg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761849704; a=rsa-sha256; cv=none; b=P+NEdgdmKnXJ4Hu6wQsgL4SngzoxFSRtRVj4LoSsCtWWiWA1Ao7cp7z9InSPyirxNznEc0 926ZwuPR/wju5JRYmFJDA23dOkbg4UekaVvwM8HglTnQCeA/6QquWayDTaF1LUrtZ5Cffy /+8gtqzAse0Lg7NPOSa279gd18JG3SGMkKZS/kqtI7zuyG3A1Hlq/BOUc8X7x2J2WCBq+Y zhlgE4GeQIMFQey3AXQpKwthLtwOa95zrveY0vJOwFN/KiKplleez6DryLfvTzAOncGxKe Uw1dz2rwh25vSDMgCm5KXBeI9306gy02M4LWEsPcVlX0aZ/pzNwbj6Q/XsES3A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cyCd44t2Czb7Y; Thu, 30 Oct 2025 18:41: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 59UIfiHL003824; Thu, 30 Oct 2025 18:41:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59UIfiOE003821; Thu, 30 Oct 2025 18:41:44 GMT (envelope-from git) Date: Thu, 30 Oct 2025 18:41:44 GMT Message-Id: <202510301841.59UIfiOE003821@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Ziaee Subject: git: 832cd0590598 - main - ifconfig.8: Mention max name length List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 832cd05905980d0f6547bf02745b054c1f4af1eb Auto-Submitted: auto-generated The branch main has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=832cd05905980d0f6547bf02745b054c1f4af1eb commit 832cd05905980d0f6547bf02745b054c1f4af1eb Author: William Carrel AuthorDate: 2025-10-30 18:39:29 +0000 Commit: Alexander Ziaee CommitDate: 2025-10-30 18:40:45 +0000 ifconfig.8: Mention max name length PR: 289113 MFC after: 3 days --- sbin/ifconfig/ifconfig.8 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sbin/ifconfig/ifconfig.8 b/sbin/ifconfig/ifconfig.8 index d4f8d2b5747a..627b7cd3f9e3 100644 --- a/sbin/ifconfig/ifconfig.8 +++ b/sbin/ifconfig/ifconfig.8 @@ -630,6 +630,9 @@ This is useful for devices which have multiple physical layer interfaces .It Cm name Ar name Set the interface name to .Ar name . +The +.Ar name +may not be longer than 15 characters. .It Cm rxcsum , txcsum , rxcsum6 , txcsum6 If the driver supports user-configurable checksum offloading, enable receive (or transmit) checksum offloading on the interface. From nobody Thu Oct 30 19:54:45 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cyFFK6Gvjz6FW69; Thu, 30 Oct 2025 19:54: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cyFFK5F2rz4N9Q; Thu, 30 Oct 2025 19:54:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761854085; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3vLk3k2DdPu2wPwIdYIQrtUgXfL5cKzBdVC5tJ8a8sI=; b=wPvvZaMZRNIqiTD0bY4ByfW4+Zfbe7i8zJu5JDqWM0pJh8RbsYcZ/oN1GX4GmiQIPNMYp3 NkGfW5HdQQ/8TrAlgUFz9UBVuuxvnog7O90veUInfAmK/FQM4NGXL+cMlZP9CI5wnV9ulV tt9zxjNuvht6DRQ45czNg0lek7YC3od9tIZFjJKLuG7X9z+xTRh52zXfmgnGROLtK1/tvC aaxf7gpQ8v5HfltmJYALTu4nhtyymRoOmpnJ1pvMyMqdvu5qEXOMtPcIhye4LrwGgVTY7G XixQfsTAicFleatYCfjuYns7o9+oOXi86qhJN7DjaFUfqY2DqDdHSF5tQVdHDA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761854085; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3vLk3k2DdPu2wPwIdYIQrtUgXfL5cKzBdVC5tJ8a8sI=; b=Vqto4Czd2Jf/0s+virc65+6JzXf/7uy7dj2l6Y3ZAJ1ZaZfGBZUz3qGrxpX5XLAElT4GXU xHMXQJsldRlVrCf62jVUDZpApRUGZCVaLgZDAx50kLxqjy58F6R4LQdPLRXz+bnKPf+5PZ vILoY1GpQNc1kjHECZl4ubhp88684yVTEZzXZSkeAbaB+Th/oiZ/8TYyc5N07TclI/oY3/ wPa98HFgJUWvw0wTU/JbsyBQsf7xK1bKTGbqXAJdPLBO80xOPLRtgyUZsY0S6BRj4Zp9cy vbc0dDFiaqOvuY/uTEngHp5qlNiim9H5IVkLYked3VyXR99ajEdNjIjoiZ9iyA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761854085; a=rsa-sha256; cv=none; b=pUzN4qyEPG6AQCcv+V29nugDQ5IMY/VyPDiruRpp6L7fxnD8ohIyK3RWcR5Kp/Tt/F9OpO DtsMH0PckTYa3xH7GvCBKDG933stAN5fjUce1lN/76CMn6qo/j10KYZm2Y3+9jssrcdl7S zla+rkK07GczfRXKO8GzBoQW6v9EFBfV1n1rjE82hJtBSbLoPdFKGRDYMWfvE1gTXBetW+ PNYOyDXFb45SJ9/Etd+hNioVrG+f1tTEQ+K/JJPEGYDLbGmd8PADKAYGPKjkS842xIW+xs duweijQqjGg5pUbLd48yQFiCjf7CX4gBhBwTsRGvjRkwWRgRKGNnabUiPXoT6g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cyFFK4nkrzcn6; Thu, 30 Oct 2025 19:54: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 59UJsjo9036464; Thu, 30 Oct 2025 19:54:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59UJsjj6036461; Thu, 30 Oct 2025 19:54:45 GMT (envelope-from git) Date: Thu, 30 Oct 2025 19:54:45 GMT Message-Id: <202510301954.59UJsjj6036461@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 91f66f9b377e - main - riscv: Treat pointer register as an input in fpe_store List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 91f66f9b377e09f59f481e653d8f64120a183806 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=91f66f9b377e09f59f481e653d8f64120a183806 commit 91f66f9b377e09f59f481e653d8f64120a183806 Author: John Baldwin AuthorDate: 2025-10-30 19:52:51 +0000 Commit: John Baldwin CommitDate: 2025-10-30 19:52:51 +0000 riscv: Treat pointer register as an input in fpe_store The contents of the memory is an output, but the pointer to that memory is an input. This was correct in the original version of D45697, but when adding appropriate clobbers, the pointer operand was incorrectly switched to an output rather than left an input for fpe_store. Reviewed by: jrtc27 Obtained from: CheriBSD Fixes: 44d4ee7f3dad ("riscv: add FPE code.") MFC after: 1 day Sponsored by: AFRL, DARPA Differential Revision: https://reviews.freebsd.org/D53441 --- sys/riscv/riscv/fpe.c | 66 +++++++++++++++++++++++++-------------------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/sys/riscv/riscv/fpe.c b/sys/riscv/riscv/fpe.c index b6c66e5e4f09..63103a794a8e 100644 --- a/sys/riscv/riscv/fpe.c +++ b/sys/riscv/riscv/fpe.c @@ -69,39 +69,39 @@ fpe_store(struct fpreg *regs) __asm __volatile( "frcsr %0 \n" - "fsd f0, (16 * 0)(%1)\n" - "fsd f1, (16 * 1)(%1)\n" - "fsd f2, (16 * 2)(%1)\n" - "fsd f3, (16 * 3)(%1)\n" - "fsd f4, (16 * 4)(%1)\n" - "fsd f5, (16 * 5)(%1)\n" - "fsd f6, (16 * 6)(%1)\n" - "fsd f7, (16 * 7)(%1)\n" - "fsd f8, (16 * 8)(%1)\n" - "fsd f9, (16 * 9)(%1)\n" - "fsd f10, (16 * 10)(%1)\n" - "fsd f11, (16 * 11)(%1)\n" - "fsd f12, (16 * 12)(%1)\n" - "fsd f13, (16 * 13)(%1)\n" - "fsd f14, (16 * 14)(%1)\n" - "fsd f15, (16 * 15)(%1)\n" - "fsd f16, (16 * 16)(%1)\n" - "fsd f17, (16 * 17)(%1)\n" - "fsd f18, (16 * 18)(%1)\n" - "fsd f19, (16 * 19)(%1)\n" - "fsd f20, (16 * 20)(%1)\n" - "fsd f21, (16 * 21)(%1)\n" - "fsd f22, (16 * 22)(%1)\n" - "fsd f23, (16 * 23)(%1)\n" - "fsd f24, (16 * 24)(%1)\n" - "fsd f25, (16 * 25)(%1)\n" - "fsd f26, (16 * 26)(%1)\n" - "fsd f27, (16 * 27)(%1)\n" - "fsd f28, (16 * 28)(%1)\n" - "fsd f29, (16 * 29)(%1)\n" - "fsd f30, (16 * 30)(%1)\n" - "fsd f31, (16 * 31)(%1)\n" - : "=&r"(fcsr), "=r"(fp_x), "=m"(*fp_x)); + "fsd f0, (16 * 0)(%2)\n" + "fsd f1, (16 * 1)(%2)\n" + "fsd f2, (16 * 2)(%2)\n" + "fsd f3, (16 * 3)(%2)\n" + "fsd f4, (16 * 4)(%2)\n" + "fsd f5, (16 * 5)(%2)\n" + "fsd f6, (16 * 6)(%2)\n" + "fsd f7, (16 * 7)(%2)\n" + "fsd f8, (16 * 8)(%2)\n" + "fsd f9, (16 * 9)(%2)\n" + "fsd f10, (16 * 10)(%2)\n" + "fsd f11, (16 * 11)(%2)\n" + "fsd f12, (16 * 12)(%2)\n" + "fsd f13, (16 * 13)(%2)\n" + "fsd f14, (16 * 14)(%2)\n" + "fsd f15, (16 * 15)(%2)\n" + "fsd f16, (16 * 16)(%2)\n" + "fsd f17, (16 * 17)(%2)\n" + "fsd f18, (16 * 18)(%2)\n" + "fsd f19, (16 * 19)(%2)\n" + "fsd f20, (16 * 20)(%2)\n" + "fsd f21, (16 * 21)(%2)\n" + "fsd f22, (16 * 22)(%2)\n" + "fsd f23, (16 * 23)(%2)\n" + "fsd f24, (16 * 24)(%2)\n" + "fsd f25, (16 * 25)(%2)\n" + "fsd f26, (16 * 26)(%2)\n" + "fsd f27, (16 * 27)(%2)\n" + "fsd f28, (16 * 28)(%2)\n" + "fsd f29, (16 * 29)(%2)\n" + "fsd f30, (16 * 30)(%2)\n" + "fsd f31, (16 * 31)(%2)\n" + : "=&r"(fcsr), "=m"(*fp_x) : "r"(fp_x)); regs->fp_fcsr = fcsr; } From nobody Thu Oct 30 20:18:43 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cyFmz4Tn0z6FXPw; Thu, 30 Oct 2025 20:18: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cyFmz3lsJz4QX1; Thu, 30 Oct 2025 20:18:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761855523; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nBt5exqqwakmXdO0EL+Smtx9KG6AtYQzl59D9Gfz8kQ=; b=jcILSuPWK/G2BU1x14S/3tPJjadKw0qTPNxcsmqtwum0UF61sOi0fXWWS+9EaAh3+Csb61 GHXrD3uTctxpwiRg4xNAD29I7DnVEoy2Tfe0M/IzjB1+Wk5zZ3nb/e/0EdDg++rGFqj12q NcuqCgHU4jIdzYZCv1jxY9YJUSynpOKo+3NN/A/CLrUHe74I/6ENS7p50YVeLohniioPNh NQJKilV4qTRyW6WhMFU2cwYu266qSIjST9Z+oPy413KqAVziA9SRDMYKsY7G6tBGSurys3 hiUhm/IexdnVWrZy/h5N0pQSTniGRqxlfnUqtmNW0IzfXIFr0Mc5HNbwEK0yzA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761855523; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nBt5exqqwakmXdO0EL+Smtx9KG6AtYQzl59D9Gfz8kQ=; b=qCUKLRx4QBCvVDEHPaIaQoItNvTVgKjOfKVq+i2JLn5hyWk+Gx1Vx2/Jb84g0fQuSb2sfX tt4pcW6hjkW7KIuc+VdEs1OLPR5aUZWSsIKvjW1xSPP5KgHgC0i+B0WNEaHJnoz4/hknbN x4CzFXLG2+r7QVLb6peypBmQdQ3DlauK5ze/McN5JeBPYXgy0hK/AdaOv03bFi/PKB+pmx PncqKiz24UmisR1y/S+F0NSLXjiW0+RoMa2y1BiBRfE5JaxlOUDmBh0IJtv8/8sNPGdpQj UQq5LunhJWY1/t65TDyXwo6zmLVrZKaAIcnOj+ojd51t1gYFvlXiYVknrdZ2dQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761855523; a=rsa-sha256; cv=none; b=et/ybEpmEaLqmXoq5rWei1CxWj9ZxS/GO1wFV5LV8MrhqW7TInezrqHDVXAJdab7634bZV A5LewSr+Fr7UNW+6MeqSbFcO2cfPOWRW3T3qZvJVlAwbPmA0WFUriRB3f1O4u1HpWTcqrD 1WzeRayXosCKm734IKCAPwFd18zXX8LN9ApBAxyZSrpDklez9sh/Vl57B8sggcHZGhCc8Z E7Dit01REGeZzhGgYsEO4hQD4U0j7irSwVGd7uOulTx3ZiuLw/1FWtwnath68cm9yajaxb uL7hUzS51vjfqQ0cPrhq0KIhpkb2w6dOBdP8NH30WaK4KwzKmg+KKo4FL86dAg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cyFmz2vlpzdTY; Thu, 30 Oct 2025 20:18: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 59UKIhR6075889; Thu, 30 Oct 2025 20:18:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59UKIh0V075886; Thu, 30 Oct 2025 20:18:43 GMT (envelope-from git) Date: Thu, 30 Oct 2025 20:18:43 GMT Message-Id: <202510302018.59UKIh0V075886@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 6c86379b0d0d - main - pjdfstest: Fix link count test List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6c86379b0d0deb2750a662579f63d71ffa519e81 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=6c86379b0d0deb2750a662579f63d71ffa519e81 commit 6c86379b0d0deb2750a662579f63d71ffa519e81 Author: Dag-Erling Smørgrav AuthorDate: 2025-10-30 20:18:17 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-10-30 20:18:38 +0000 pjdfstest: Fix link count test This UFS-only test verifies that attempting to create more links than permitted by the file system returns EMLINK, but has been broken ever since UFS_LINK_MAX was increased because a) it hardcodes the previous value of UFS_LINK_MAX, and b) the new value requires more space than the test allocates, so it ends up getting ENOSPC instead of EMLINK. * Switch to retrieving {PC_LINK_MAX} at runtime. * Stop the test when we reach {PC_LINK_MAX} links. This ensures that we don't go on for hours if the actual limit turns out to be much higher than we anticipated (e.g. INT64_MAX on ZFS). * Double the size of the test filesystem. MFC after: 3 days Sponsored by: Klara, Inc. Sponsored by: NetApp, Inc. Fixes: 35a301555bff ("Increase UFS/FFS maximum link count from 32767 to 65530.") Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D53442 --- contrib/pjdfstest/tests/link/05.t | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/contrib/pjdfstest/tests/link/05.t b/contrib/pjdfstest/tests/link/05.t index 5a18c2103e1d..e6a7d1cc8201 100644 --- a/contrib/pjdfstest/tests/link/05.t +++ b/contrib/pjdfstest/tests/link/05.t @@ -2,7 +2,7 @@ # vim: filetype=sh noexpandtab ts=8 sw=8 # $FreeBSD: head/tools/regression/pjdfstest/tests/link/05.t 211352 2010-08-15 21:24:17Z pjd $ -desc="link returns EMLINK if the link count of the file named by name1 would exceed 32767" +desc="link returns EMLINK if the link count of the file named by name1 would exceed {PC_LINK_MAX}" dir=`dirname $0` . ${dir}/../misc.sh @@ -16,19 +16,20 @@ n1=`namegen` n2=`namegen` expect 0 mkdir ${n0} 0755 -n=`mdconfig -a -n -t malloc -s 1m` || exit +n=`mdconfig -a -n -t malloc -s 2m` || exit newfs -i 1 /dev/md${n} >/dev/null || exit mount /dev/md${n} ${n0} || exit +link_max=`${fstest} pathconf ${n0} _PC_LINK_MAX` expect 0 create ${n0}/${n1} 0644 i=1 -while :; do +while [ ${i} -le ${link_max} ]; do link ${n0}/${n1} ${n0}/${i} >/dev/null 2>&1 if [ $? -ne 0 ]; then break fi i=`expr $i + 1` done -test_check $i -eq 32767 +test_check $i -eq ${link_max} expect EMLINK link ${n0}/${n1} ${n0}/${n2} From nobody Thu Oct 30 20:18:44 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cyFn04Gs1z6FXMN; Thu, 30 Oct 2025 20:18: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cyFn03bVyz3BmD; Thu, 30 Oct 2025 20:18:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761855524; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sbp5ghkJi+eHun3QI5Q8TV355RNJTVVjk9OpyNjwsgc=; b=DbYBnYO6ItLa1FdzeJKjd4RWdukbc58Z9msh+3bPM9cNMaTwmRJai7TlGdhCIz9nBU4m9n iJidWV6pmRuoN5LlUsyQK9VDs3CSWf4l31LR0nQtt2UOxP055CKAsApYjDg4ATUcWOcyp2 ATVT+xD6yatAflRANlJvtd7ZRUz8XNYQZSXP69vhdA2+tm//TbHZmx5yPdYsIUhcza++sd rBUaHlZfypwwmBp56+1SuvK/22bngFk4gRvw7R8lEX1c+R2c1luciVwAoBY+Z8IhfmAJF4 We3a8o7jJPrreuJGXxqwD2Jc0u814pexGPI4lP3NnOnEjyHMbUJs1zgblzgEsA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761855524; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sbp5ghkJi+eHun3QI5Q8TV355RNJTVVjk9OpyNjwsgc=; b=g8zOJmJJ+1N3OsJ8BHgu8UzOamMcGD5EpwcsAjsxlJgm474euvLsvdmVfCM8L3q9cna0p8 sI2+ccQjbHoxldMGOZuVbS6QQRh+zz6OqvOHivNn6diw1YF840xECdhS4UXbnyl36O7jhP JRnPOSE9mVuSKaS7eQqTyM8tMMqmTChft6ElNVg4Dv5m03Z4uApGrJ7Lx2roTs001ivI8c PFxVr4Q2V4WuuUq8N8LkZOROGzSkLbxAoAT05j8jrPkqwcXze3Cwzt5gmobjwxsXWY2LTr fGShEgjms8oI/guv+nWn5vGst12QKcBboYd6LNbzuwl8HwkIfID2bjwla54bFA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761855524; a=rsa-sha256; cv=none; b=b27WtC3IxrNusDEGDSlT2W40T9Vjg2DCTbGf5iTrdOBETLYJ70KNtX61IInM9FqKoe3KkS X98BG5xLcnHCMg4d6xdo8MAwOa/jkx8bpwlLeW51NQ+Xhiq2xqce+jmLL2RFmM+UhIS/pd BBUgvZWpH+YKvz+BkvdDxUVLnYlyWl2njfOu4w7XXweZAsG3n3CwGFdU8jcyefugUsYu6B qlR2BnCbzgw8DMhXcmQ1ybSAeaBCQGFXT3B7+sj8x4QOcXrOUVzcSsNDWP5red+GHw7uzX Esyjy75aGJ2ij02d3PWksySpHiGWRSQZ4y/Gr/C/CakI7XgGm5XZ7sdCZOVr2Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cyFn03635zdx2; Thu, 30 Oct 2025 20:18: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 59UKIi03075928; Thu, 30 Oct 2025 20:18:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59UKIiwg075925; Thu, 30 Oct 2025 20:18:44 GMT (envelope-from git) Date: Thu, 30 Oct 2025 20:18:44 GMT Message-Id: <202510302018.59UKIiwg075925@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 28345f093783 - main - pjdfstest: Avoid needless use of expr List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 28345f093783ec78163660dd1168838fe0ff1f12 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=28345f093783ec78163660dd1168838fe0ff1f12 commit 28345f093783ec78163660dd1168838fe0ff1f12 Author: Dag-Erling Smørgrav AuthorDate: 2025-10-30 20:18:23 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-10-30 20:18:38 +0000 pjdfstest: Avoid needless use of expr Sponsored by: Klara, Inc. Sponsored by: NetApp, Inc. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D53443 --- contrib/pjdfstest/tests/ftruncate/12.t | 2 +- contrib/pjdfstest/tests/link/05.t | 2 +- contrib/pjdfstest/tests/link/15.t | 2 +- contrib/pjdfstest/tests/mkdir/11.t | 2 +- contrib/pjdfstest/tests/mkfifo/11.t | 2 +- contrib/pjdfstest/tests/open/19.t | 2 +- contrib/pjdfstest/tests/symlink/11.t | 2 +- contrib/pjdfstest/tests/truncate/12.t | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/contrib/pjdfstest/tests/ftruncate/12.t b/contrib/pjdfstest/tests/ftruncate/12.t index 98f3daeaf461..022f2cdae47a 100644 --- a/contrib/pjdfstest/tests/ftruncate/12.t +++ b/contrib/pjdfstest/tests/ftruncate/12.t @@ -22,7 +22,7 @@ EFBIG|EINVAL) ;; *) echo "not ok ${ntest}" - ntest=`expr ${ntest} + 1` + ntest=$((ntest + 1)) ;; esac expect 0 unlink ${n0} diff --git a/contrib/pjdfstest/tests/link/05.t b/contrib/pjdfstest/tests/link/05.t index e6a7d1cc8201..4641e3605efb 100644 --- a/contrib/pjdfstest/tests/link/05.t +++ b/contrib/pjdfstest/tests/link/05.t @@ -27,7 +27,7 @@ while [ ${i} -le ${link_max} ]; do if [ $? -ne 0 ]; then break fi - i=`expr $i + 1` + i=$((i + 1)) done test_check $i -eq ${link_max} diff --git a/contrib/pjdfstest/tests/link/15.t b/contrib/pjdfstest/tests/link/15.t index cb41ad503370..0dc7648df5cb 100644 --- a/contrib/pjdfstest/tests/link/15.t +++ b/contrib/pjdfstest/tests/link/15.t @@ -26,7 +26,7 @@ while :; do if [ $? -ne 0 ]; then break fi - i=`expr $i + 1` + i=$((i + 1)) done expect ENOSPC link ${n0}/${n1} ${n0}/${n2} umount /dev/md${n} diff --git a/contrib/pjdfstest/tests/mkdir/11.t b/contrib/pjdfstest/tests/mkdir/11.t index 118ca3af8896..f162f6d4eb86 100644 --- a/contrib/pjdfstest/tests/mkdir/11.t +++ b/contrib/pjdfstest/tests/mkdir/11.t @@ -24,7 +24,7 @@ while :; do if [ $? -ne 0 ]; then break fi - i=`expr $i + 1` + i=$((i + 1)) done expect ENOSPC mkdir ${n0}/${n1} 0755 umount /dev/md${n} diff --git a/contrib/pjdfstest/tests/mkfifo/11.t b/contrib/pjdfstest/tests/mkfifo/11.t index 39cfea4e40f7..73d4a5d09f30 100644 --- a/contrib/pjdfstest/tests/mkfifo/11.t +++ b/contrib/pjdfstest/tests/mkfifo/11.t @@ -24,7 +24,7 @@ while :; do if [ $? -ne 0 ]; then break fi - i=`expr $i + 1` + i=$((i + 1)) done expect ENOSPC mkfifo ${n0}/${n1} 0644 umount /dev/md${n} diff --git a/contrib/pjdfstest/tests/open/19.t b/contrib/pjdfstest/tests/open/19.t index 4bc2df2a4313..e3c5b35fd96b 100644 --- a/contrib/pjdfstest/tests/open/19.t +++ b/contrib/pjdfstest/tests/open/19.t @@ -24,7 +24,7 @@ while :; do if [ $? -ne 0 ]; then break fi - i=`expr $i + 1` + i=$((i + 1)) done expect ENOSPC open ${n0}/${i} O_RDONLY,O_CREAT 0644 umount /dev/md${n} diff --git a/contrib/pjdfstest/tests/symlink/11.t b/contrib/pjdfstest/tests/symlink/11.t index b1be674370ad..5d5e864674d6 100644 --- a/contrib/pjdfstest/tests/symlink/11.t +++ b/contrib/pjdfstest/tests/symlink/11.t @@ -24,7 +24,7 @@ while :; do if [ $? -ne 0 ]; then break fi - i=`expr $i + 1` + i=$((i + 1)) done expect ENOSPC symlink test ${n0}/${n1} umount /dev/md${n} diff --git a/contrib/pjdfstest/tests/truncate/12.t b/contrib/pjdfstest/tests/truncate/12.t index 98f3daeaf461..022f2cdae47a 100644 --- a/contrib/pjdfstest/tests/truncate/12.t +++ b/contrib/pjdfstest/tests/truncate/12.t @@ -22,7 +22,7 @@ EFBIG|EINVAL) ;; *) echo "not ok ${ntest}" - ntest=`expr ${ntest} + 1` + ntest=$((ntest + 1)) ;; esac expect 0 unlink ${n0} From nobody Thu Oct 30 20:50:59 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cyGVC3ZY5z6FZWg; Thu, 30 Oct 2025 20:50: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cyGVC2pPxz3H1N; Thu, 30 Oct 2025 20:50:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761857459; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c+Tk6QpaN6RYnAe2aYc1u5bJvFQerzyi9rXRxoGYjPQ=; b=ollSAHFSjw3f8SJhapnTKfseZdxuD0SimZ51tQ1TqevMWA3kVywXWZLq6w6yMMHLcKyP9J ijvuH+fZHI4ip86MdzO4oxOF2Jbx+rf6/onijFW9WV/H1WmLUd7QUjqvFcI2KY4828I+ZC cfVoS9LEyEamfVufSqgXVY5gywSHm8GU9DHR0j68q6SIVj59xIRd0nVTKkysQuDmxSV/q9 8+Q/chgOGQ3zI8cSceaD9j+TYc5aqAuVMPbvHsQ0vGgcmA4G30PffGgO/NUwI9PsEPJfSN wwy4vA4sd6++TijZkJysHFetZwjCF4bcCoGUuR7r6Oi/C6WdJCNY4Ji++5d2iA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761857459; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c+Tk6QpaN6RYnAe2aYc1u5bJvFQerzyi9rXRxoGYjPQ=; b=ufDtg95vD7cWY0nNoisVwPNX/vv+tN02jz+8KZn92OZUpiW7JPp3uecMVzX+3BgdCmaxmn FFES6JroccOQxIx4I3q2YVdSY0SKLWVDlpPWdJmvyWN/M6pBs7u9K3/ARZoZ2EtS203fIS YWiD8AQsg894Ut1HWh8lQPcY7vLHdwmlMlMAbA29+HmLfJf/nEC62w2yd1p2z5bLnZuabd onZ89duXVGXjYyWV2q0C+I7ITDN3Eg9rHx4zQwGgYuvtUEub7wmJYcY1Lh21CKXU57y+PQ mCqLeTpdWE3FmcjlUY/3nZuqANiJj70dB6KEVuB8umyAsIqfecqRoK0BbdctXA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761857459; a=rsa-sha256; cv=none; b=PwluC89+jOcwn2O+O8h+oBaxGUXAK3L35lgjDsd45fmxJKX7/ZjGHvQsumOYsLPMHWbjjt SPpDrSxRySspil17JPcAoGsjHus6X06DG+vbny7lo8Vr451RG57qNvv0qVAJnhMkosXnMe FnEOj8ghRfh8ghC+OWrU02xUdvZpSKSh5hXOODAPu1UZiGROX9XG4MHVlp1CzBHW1mHbYa /YcAVaF8Ydi6Ih32vdIu1mDPejRjSqeINdiAlnS86cspTtPo8YBsfnQGeNIxTDu+bTdXn7 beK0vFxlzm9iOHtBWpF4jrUqFGVxqC6YOHOY4ac89PbJ1LZTli8zt0K5rzqjMg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cyGVC2MP1zfgr; Thu, 30 Oct 2025 20:50:59 +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 59UKox8P043569; Thu, 30 Oct 2025 20:50:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59UKoxmG043567; Thu, 30 Oct 2025 20:50:59 GMT (envelope-from git) Date: Thu, 30 Oct 2025 20:50:59 GMT Message-Id: <202510302050.59UKoxmG043567@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: b485322d6b58 - main - release: Only check no-root/no-qemu when building List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b485322d6b5846fe4fb5aff6c4a07221b09946fc Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=b485322d6b5846fe4fb5aff6c4a07221b09946fc commit b485322d6b5846fe4fb5aff6c4a07221b09946fc Author: Colin Percival AuthorDate: 2025-10-30 19:14:25 +0000 Commit: Colin Percival CommitDate: 2025-10-30 20:50:38 +0000 release: Only check no-root/no-qemu when building Building VMs as non-root requires no-QEMU code paths (installing packages from outside the VM image rather than inside it) and vice versa; we have a check for broken combinations. Unfortunately that check was breaking make -C src/usr.sbin/pkg NO_ROOT=YES -V PKGCONFBRANCH because that code reaches into src/release to determine the branch name (which is then used to determine which /etc/pkg/FreeBSD.conf to install). Wrap the no-root/no-qemu check in an .if to only run when we've asked for VM and/or CLOUD building to be enabled. Reviewed by: ivy MFC after: 5 minutes Sponsored by: https://www.patreon.com/cperciva Differential Revision: https://reviews.freebsd.org/D53486 --- release/Makefile.vm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/release/Makefile.vm b/release/Makefile.vm index 336e8fc82299..a04f779ebebb 100644 --- a/release/Makefile.vm +++ b/release/Makefile.vm @@ -101,10 +101,13 @@ QEMUTGT=emulator-portinstall .endif QEMUTGT?= +.if (defined(WITH_CLOUDWARE) && !empty(WITH_CLOUDWARE)) || \ + (defined(WITH_VMIMAGES) && !empty(WITH_VMIMAGES)) .if (defined(WITHOUT_QEMU) && !defined(NO_ROOT)) || \ (!defined(WITHOUT_QEMU) && defined(NO_ROOT)) .error WITHOUT_QEMU requires NO_ROOT (and vice versa) .endif +.endif .if defined(WITH_CLOUDWARE) && !empty(WITH_CLOUDWARE) && !empty(CLOUDWARE) . for _CW in ${CLOUDWARE} From nobody Thu Oct 30 20:51:00 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cyGVF0rF7z6FZg6; Thu, 30 Oct 2025 20:51: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cyGVD4Yt8z3Gxg; Thu, 30 Oct 2025 20:51:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761857460; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fHOyI6OnNr7ta8sCgs5gucglOzgOT81ITWIbQ6CG4nM=; b=di3jwB7Curg0zinc2UZrz8HoBOf4/kQJXIjPLVt4/Q+LDHikHy49e46RxzScilDbRSZwGF CRW6rmvRWOacJ0i2FOpUCjpm/d0NPOP+LKhuLSD8lapo+8dZiLrvIF+XV102FH7rBTuB1N fNDf037wHzX/Q6YlnlsjXm327Z8qtpt4QWhwGIf/BZ/DqS1DyY+Kr3N+ELMKodjSrFbm+s fHlFvBkLG9bVYGsMBefc+KklNBrMj1n2Yjxv18+HuImfHV0FFIfaMt3mdXbcjpwQDvamKf Sl+WZyuRVQ0E6p27OmyaTybGi9tePaxkmI15Ea09GgyGeUIbZk9ONlhzpfLI1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761857460; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fHOyI6OnNr7ta8sCgs5gucglOzgOT81ITWIbQ6CG4nM=; b=qL5HY9kXTK9ECFg2zavlnbjwb0BeV9zm8Ssd7wqNTZhOzS+dirSgBOna/kmYlvDow3brC9 HTIp4tb2VtWHg95BPB9Tm2HdTjNtF4b/wXzJusrkV+P02xRudmbV4p5c9tDytUuLt1AenE eT4w/FM95Zus2lLToFlck0i0YhPjRd+0oULbegWxbVC9zTVAWblg2oig/Ka/sOsqa5x9S2 M2fri/j8k41ejJrL9HrB2u6p0TmlxxDg9PQmnZlq3b5UUDIOSY9oSHC0RyGQGW+IiXvpqW ycdTJPYWdkXLcWJF6RYtaIoRgSF0Gj4LminXoKAJ1bC3E55DvT48Qh1hDoC8AQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761857460; a=rsa-sha256; cv=none; b=ZkuYMAyfZS5fK6VTsTurF4z3y5igXb+sMzkdPeqADW861BzUv3fbZMzxX1LPJd9OKnhUTy A29sNcuvVjo2j2tHxil4xDcRVT2yH5MxdB9JVTqSYY+jcixw2Vk34YXCCSB1Y9qPj4BZ++ j/9+EFdQ5pEpSPtZ+ZIU57xTj8JmeGXmcil/EXLqyQHR/347MGadOzMNl12i5Wf8UlGH1Z 4HQeoW/4lQdbn2UKAW3PmRMRDa2Py4bj13xc04QpSSJ++LPdbmgo7XrzK8LMeAl1L1t3Yd CWBhB1DRaln3weQf7JGrmZFOPe0Kw8ZsBirWu9I+tqBUA3w+N+xMdVUOQcy69g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cyGVD3mdgzf79; Thu, 30 Oct 2025 20:51: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 59UKp0r8043610; Thu, 30 Oct 2025 20:51:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59UKp0VT043607; Thu, 30 Oct 2025 20:51:00 GMT (envelope-from git) Date: Thu, 30 Oct 2025 20:51:00 GMT Message-Id: <202510302051.59UKp0VT043607@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: 0837b2ebd570 - main - pkg: Die if make -V BRANCH fails List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0837b2ebd570ea092353aa3c46e374f7a1533a1d Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=0837b2ebd570ea092353aa3c46e374f7a1533a1d commit 0837b2ebd570ea092353aa3c46e374f7a1533a1d Author: Colin Percival AuthorDate: 2025-10-30 20:46:12 +0000 Commit: Colin Percival CommitDate: 2025-10-30 20:50:45 +0000 pkg: Die if make -V BRANCH fails If build logic breaks such that we can't figure out which branch we're on, we should error out rather than shipping a default (and probably wrong) /etc/pkg/FreeBSD.conf Reviewed by: ivy MFC after: 5 minutes Suggested by: ivy Differential Revision: https://reviews.freebsd.org/D53487 --- usr.sbin/pkg/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/usr.sbin/pkg/Makefile b/usr.sbin/pkg/Makefile index 0420065bb7eb..68b862826992 100644 --- a/usr.sbin/pkg/Makefile +++ b/usr.sbin/pkg/Makefile @@ -1,5 +1,6 @@ PACKAGE= pkg-bootstrap +.MAKEFLAGS: -W _BRANCH!= ${MAKE} -C ${SRCTOP}/release -V BRANCH BRANCH?= ${_BRANCH} .if ${BRANCH:MCURRENT} != "" From nobody Fri Oct 31 05:31:22 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cyV2f2nMSz6FFRy; Fri, 31 Oct 2025 05:31: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cyV2f2Fl0z3CMm; Fri, 31 Oct 2025 05:31:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761888682; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VW+qjdcxU3FIEfe+5ZNyu5RZUqKVRcaJoIUW1Gn6+68=; b=Cl4p8wfoi5z15p1PqHJIb7bOCap++cpk5DO1j6w5K5wLJTcbdOk2ZYNu9BjGRDOXKN92vV LbCAS5nyFhEnDW7qKd1PiVCXbtQhcXm/XBO1XK8fTTYABFqhfPz2CZdp7ilG2yCVuEH3oh bA+zGtAIxPAYPR1ci5O+83XzDTEGbAp8KGx68jb7JS7qgWHLX5PI62zCjHqYq+qELeRWEm AULImbwA7YA9rvGA7VNqQiilEKOQ+dsijZIv83rfIyej1z63XtLPAWCdJhH4wZkOCa3U2s F4ftZ7lsQANtmQhcUPrd9PzR3NOvtBaN9Q0W70CZRwQKKqr6cQZ5lu8k4creSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761888682; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VW+qjdcxU3FIEfe+5ZNyu5RZUqKVRcaJoIUW1Gn6+68=; b=VEYKcyTGAMbogNm+qex2jZN9gZbVwdyFLV5aEVqpWVbMo01UVx6II16xm3DDgkuJ79ougK goXdy1BK2EjqmmTeYVYAlu2nu1UUzLH+Xp1RwMbadxHosGetTvLfAtMkEPEOAPABMS+vmj eafFyP2wnxmjoRQdDiYNfCqt2rLLBpo2PuGHJIDGTXwHGsNTkf59wNhQk2hj/TdZAQMnnv ftHypa07/FUz55Oc2oQHb/GVffZT/4bezUjqBmO8fFUVuRjTCCEcV5RngEjWqJDqljIPGp YDzEICRwbZvvrr0juxWKxaH6nZjbWvjEqODcVnfjAau2QVe+GP+IMX+TkiseAQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761888682; a=rsa-sha256; cv=none; b=eBvQQ4tAkWZ4KLaQZFibDRugQ/qpjdC1rGJGeBo3k6OizJw364z+F6ijq5L9pj0w+XrCIM UUK+LAyM2N6UzhZfuKDwAlHPpBolDUUUIiJQfjt7DeXCXOmmapkVV6M/Fa4WiFZZcNNVT/ uItP3xuGZf8sfAyenlHVl1zU34SyvV+zVkseJvRdED090o5OKMaKTChCY+w4C5BHtuQwip mApEES2HIJA2pq071/X/dNaGJNx8qSx8tOQJmWppc/uoGe7PoL0/pKeFlQ005bO086zF5O E02trTUdZAluSDhlFBSwwu+UkEQeAavlbzOI6gTJFrTIpAKBik+nj2zfszh1ww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cyV2f1cqCzvYd; Fri, 31 Oct 2025 05:31:22 +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 59V5VMdH028415; Fri, 31 Oct 2025 05:31:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59V5VMPv028412; Fri, 31 Oct 2025 05:31:22 GMT (envelope-from git) Date: Fri, 31 Oct 2025 05:31:22 GMT Message-Id: <202510310531.59V5VMPv028412@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "David E. O'Brien" Subject: git: 99651c30b15a - main - sbuf_delete() after sbuf_finish() & add SBUF_INCLUDENUL List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: obrien X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 99651c30b15afd085eca921a42e6ce2e67093609 Auto-Submitted: auto-generated The branch main has been updated by obrien: URL: https://cgit.FreeBSD.org/src/commit/?id=99651c30b15afd085eca921a42e6ce2e67093609 commit 99651c30b15afd085eca921a42e6ce2e67093609 Author: David E. O'Brien AuthorDate: 2025-10-22 07:12:46 +0000 Commit: David E. O'Brien CommitDate: 2025-10-31 05:31:10 +0000 sbuf_delete() after sbuf_finish() & add SBUF_INCLUDENUL Reviewed by: adrian, imp Differential Revision: https://reviews.freebsd.org/D53254 --- sys/cam/cam_xpt.c | 8 +++++--- sys/dev/nvmf/controller/nvmft_controller.c | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/sys/cam/cam_xpt.c b/sys/cam/cam_xpt.c index cae29226d13c..a11b688c4456 100644 --- a/sys/cam/cam_xpt.c +++ b/sys/cam/cam_xpt.c @@ -1046,6 +1046,7 @@ xpt_announce_periph(struct cam_periph *periph, char *announce_string) sbuf_set_drain(&sb, sbuf_printf_drain, NULL); xpt_announce_periph_sbuf(periph, &sb, announce_string); (void)sbuf_finish(&sb); + (void)sbuf_delete(&sb); } void @@ -1122,6 +1123,7 @@ xpt_denounce_periph(struct cam_periph *periph) sbuf_set_drain(&sb, sbuf_printf_drain, NULL); xpt_denounce_periph_sbuf(periph, &sb); (void)sbuf_finish(&sb); + (void)sbuf_delete(&sb); } void @@ -5547,7 +5549,7 @@ xpt_cam_path_debug(struct cam_path *path, const char *fmt, ...) { struct sbuf sbuf; char buf[XPT_PRINT_LEN]; /* balance to not eat too much stack */ - struct sbuf *sb = sbuf_new(&sbuf, buf, sizeof(buf), SBUF_FIXEDLEN); + struct sbuf *sb = sbuf_new(&sbuf, buf, sizeof(buf), SBUF_FIXEDLEN | SBUF_INCLUDENUL); va_list ap; sbuf_set_drain(sb, sbuf_printf_drain, NULL); @@ -5566,7 +5568,7 @@ xpt_cam_dev_debug(struct cam_ed *dev, const char *fmt, ...) { struct sbuf sbuf; char buf[XPT_PRINT_LEN]; /* balance to not eat too much stack */ - struct sbuf *sb = sbuf_new(&sbuf, buf, sizeof(buf), SBUF_FIXEDLEN); + struct sbuf *sb = sbuf_new(&sbuf, buf, sizeof(buf), SBUF_FIXEDLEN | SBUF_INCLUDENUL); va_list ap; sbuf_set_drain(sb, sbuf_printf_drain, NULL); @@ -5585,7 +5587,7 @@ xpt_cam_debug(const char *fmt, ...) { struct sbuf sbuf; char buf[XPT_PRINT_LEN]; /* balance to not eat too much stack */ - struct sbuf *sb = sbuf_new(&sbuf, buf, sizeof(buf), SBUF_FIXEDLEN); + struct sbuf *sb = sbuf_new(&sbuf, buf, sizeof(buf), SBUF_FIXEDLEN | SBUF_INCLUDENUL); va_list ap; sbuf_set_drain(sb, sbuf_printf_drain, NULL); diff --git a/sys/dev/nvmf/controller/nvmft_controller.c b/sys/dev/nvmf/controller/nvmft_controller.c index 390467534ca2..e618972f46cf 100644 --- a/sys/dev/nvmf/controller/nvmft_controller.c +++ b/sys/dev/nvmf/controller/nvmft_controller.c @@ -31,7 +31,7 @@ nvmft_printf(struct nvmft_controller *ctrlr, const char *fmt, ...) va_list ap; size_t retval; - sbuf_new(&sb, buf, sizeof(buf), SBUF_FIXEDLEN); + sbuf_new(&sb, buf, sizeof(buf), SBUF_FIXEDLEN | SBUF_INCLUDENUL); sbuf_set_drain(&sb, sbuf_printf_drain, &retval); sbuf_printf(&sb, "nvmft%u: ", ctrlr->cntlid); From nobody Fri Oct 31 12:38:55 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cygWz1jQXz6Flp4; Fri, 31 Oct 2025 12:38: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cygWz0zx0z41B6; Fri, 31 Oct 2025 12:38:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761914335; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QRvjV3TcTZfkoId2IGghcqW5mND+vKArgEMtE3TOsV0=; b=Fsyxsxou5mwEi9fmbh0/2HA94RmhJTRDv1ImghAFpABIjChbT07m98i3J5QFqh390MdHiI APbUxpq6rRwz/3HMkck7qbqBGHoMmnjA8Toq1qOKN+JQMxoQ5dzoRFl75IvQfWvAjnRoiw Q2Xpi2tTI44tOlG8msPVtIE62j4rh1h3XmJH4iadUGUJwJc+U7xclNwLqhdw1A/az1crm0 D79Rh6HyEK93aY6EEPeaozwsL6Cl0DJ0BNkDpfesZvH65uDJXlIntG1okTVqEWrOI4qv26 uhM2UA6uJHc83aSRm4Kb6D+Y1y7+3su9zBR86i425V/DLFfWGlCquFSFwTvMlA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761914335; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QRvjV3TcTZfkoId2IGghcqW5mND+vKArgEMtE3TOsV0=; b=XP5Kz7lcyIL9uhAOW9y+QytWWA/FPtTWIa8ePJbhX56AqWjo1/Lht9Wgs2jMRsPFNwQYt9 F6OTql//EetclyFycGRnCAbqzXGiSgh2lNll0WQP+uXMJuZwUXLAmVkIfuT25xLidOjKLJ 3iLFQN6p+q4nhR3Xq4yLxmp0BB8v7eLz8aQ464/rp2G8biE+trwUDfj539oc453yS/d8wU kWCmdkExw0akbz7IhxrNnn0LO5wUYfIO6s/UHzf1vP5xIWb80ZNKFXQobshM8U/AHjk80g uP1iHdWMsH+8KE5X6UtU4MOeiefn9NVcL/J2bWH90b/54+PKq7zBc4eyMnJXJQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761914335; a=rsa-sha256; cv=none; b=xdmO3lxpAto6SZXn3sgfm+HOesAXIHXSzVqGwyerp7Cj6vp3sFrZxPEVp0P/FUMRpAqlgM Y+XVj0wRKgb0YwThupenfcXIeCROnskvDZvr+/mHfccdCvTSNJQbuQsPg8s3KKK7Nlj3/d 2KK/8q2A5SayWnEH+HTQ4dyu6zm89780elTnIU+HBki5BkObOE83HyN8jkWFbZPRyCKFPE zkKMKOcvxsFjkRXezmb4v3cAb1Dce0cfuS2iveeqW5iB5kqkFd0Sm9qYFBr305/1S42Y/c zsYJxq9y9icpakVGUjDlCJS/c1dIzVh7ZUpkTZvSq4J/LxJ1WxdgGM91qHDAcw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cygWz0Vwnz16tF; Fri, 31 Oct 2025 12:38: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 59VCctib023936; Fri, 31 Oct 2025 12:38:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59VCcttn023933; Fri, 31 Oct 2025 12:38:55 GMT (envelope-from git) Date: Fri, 31 Oct 2025 12:38:55 GMT Message-Id: <202510311238.59VCcttn023933@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 48b63e821dec - main - revoke.2: Remove mention of block special device files List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 48b63e821dec5533dab165d4e95e876bdbd0a37e Auto-Submitted: auto-generated The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=48b63e821dec5533dab165d4e95e876bdbd0a37e commit 48b63e821dec5533dab165d4e95e876bdbd0a37e Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2025-10-24 17:17:42 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2025-10-31 12:37:45 +0000 revoke.2: Remove mention of block special device files Block devices are a thing of a past in FreeBSD. Reviewed by: ziaee MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D53332 --- lib/libsys/revoke.2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/libsys/revoke.2 b/lib/libsys/revoke.2 index f5ae1e92c357..938d2f083e27 100644 --- a/lib/libsys/revoke.2 +++ b/lib/libsys/revoke.2 @@ -28,7 +28,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd January 25, 2016 +.Dd October 24, 2025 .Dt REVOKE 2 .Os .Sh NAME @@ -62,7 +62,7 @@ using a special close method which does not block. Access to a file may be revoked only by its owner or the super user. The .Fn revoke -system call is currently supported only for block and character special +system call is currently supported only for character special device files. It is normally used to prepare a terminal device for a new login session, preventing any access by a previous user of the terminal. From nobody Fri Oct 31 12:48:27 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cygkz40FJz6FmTr; Fri, 31 Oct 2025 12:48:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cygkz3BNwz41wQ; Fri, 31 Oct 2025 12:48:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761914907; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oAFnWEurYOoAsQdCk1qUyEs0xJjxvGuyRQv8LkJBolE=; b=CNNDEhKs7liotFVfu0TD0EG5ttViCP8kzDoNubR6PPvbnYutROoJKOs/lO152nWRW9dp4y ijzyI4Ja1E2+lIP3IykMcklCBDICwPKxzjsjCwrvpEUCfo50XSZiRTFCM3Jx6dfVyYiV3e C9JCa9s1q5VYXLKV8RppYokcR2mw04pZwgxaeK3Egl5jz7ncCDpUPD1/SKsbJkIcE3576w 2bp71k/06GVD+LQ3CqmrS+eBas9H+qxusaXDmRSjK4KCpeW9URp4d1uAkChMr+rK5NXmFK DksTPlDIKPsOCZ0wz6lr4K3wHpqGbK95euI8bYYDPodzErQ98NM29CvlSzt+Sg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761914907; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oAFnWEurYOoAsQdCk1qUyEs0xJjxvGuyRQv8LkJBolE=; b=FMjTVJveDtpvXCPTF+TWdWDBBFlCLdKGNvFjgBdG9vnBalHogwUJp8x8v9H5OHrFdVLt0Y dfWH3IKMtpDFAhrCsK+kJPTCO3wSSa849Z7nOBIelmqMqFziiE4kjSlyyKPxWLGIUAr8hP kv1rD4KKbw0ZAbXFySPW46Y3bs7be75T9as+7HMlbyLP3PbPgLYiqxSTKKhp5XPwFxgVIh 4+xsNaw2XpYogON9TnNE4hxkOgUFRKTqkwiQrx/vYGhpKsjrzxo5NLilBKdvQT4tqqt+oq 7xmZ1GSF8cBNURsC9X47gKw3z1qwep6tz3B9veITM//nh9bL6elS7K9YWNImsA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761914907; a=rsa-sha256; cv=none; b=q3ke71ol2mw2oV3HVPleWEdAOsq/aSPhe4x5PDTz3FR6B8V5fQaZlCPNOqt7AdL5xfHZs1 mSDvDIJZ9LmvVHCA6llH4KXE57wq1coxl1wabGoce5rEYNIe60l2eRMAdeAn53dQsgRV+v aq+msnn8XmbgyDFM1nAc3SgrqC8FAQ5yJKkZfwMKwDwA24jLLEEzXw0n4361lv/6lIJEx3 TTXssTTc54j09ZLSuhSp8ckvtZlsk4EK+aTqvRgBiT10c3JUIhpoNqoYaOg0PaynUen/pS cMrODLsI6WHFk1zUgAuM5F6154a4Lqbz88qJDKQ6HzQ1JIvgahwuX53XmzM8hg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cygkz2hkxz17rw; Fri, 31 Oct 2025 12:48:27 +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 59VCmRL4042392; Fri, 31 Oct 2025 12:48:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59VCmRX7042389; Fri, 31 Oct 2025 12:48:27 GMT (envelope-from git) Date: Fri, 31 Oct 2025 12:48:27 GMT Message-Id: <202510311248.59VCmRX7042389@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Clausecker Subject: git: df21a004be23 - main - libc: scalar strrchr() in RISC-V assembly List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: df21a004be237a1dccd03c7b47254625eea62fa9 Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=df21a004be237a1dccd03c7b47254625eea62fa9 commit df21a004be237a1dccd03c7b47254625eea62fa9 Author: Strahinja StaniÅ¡ić AuthorDate: 2024-10-24 16:18:07 +0000 Commit: Robert Clausecker CommitDate: 2025-10-31 12:47:57 +0000 libc: scalar strrchr() in RISC-V assembly Implements strrchr in RISC-V assembly, leading to the following improvements (performance measured on SiFive HF105-001) os: FreeBSD arch: riscv │ strrchr_baseline │ strrchr_scalar │ │ sec/op │ sec/op vs base │ Short 837.2µ ± 1% 574.6µ ± 1% -31.37% (p=0.000 n=20+21) Mid 639.7µ ± 0% 269.7µ ± 0% -57.84% (p=0.000 n=20+21) Long 589.1µ ± 0% 176.7µ ± 0% -70.01% (p=0.000 n=20+21) geomean 680.8µ 301.4µ -55.73% │ strrchr_baseline │ strrchr_scalar │ │ MiB/s │ MiB/s vs base │ Short 149.3 ± 1% 217.6 ± 1% +45.71% (p=0.000 n=20+21) Mid 195.4 ± 0% 463.6 ± 0% +137.22% (p=0.000 n=20+21) Long 212.2 ± 0% 707.4 ± 0% +233.40% (p=0.000 n=20+21) geomean 183.6 414.7 +125.88% MFC after: 1 month MFC to: stable/15 Approved by: mhorne, markj (mentor) Sponsored by: Google LLC (GSoC 2024) Differential Revision: https://reviews.freebsd.org/D47275 --- lib/libc/riscv/string/Makefile.inc | 2 + lib/libc/riscv/string/strrchr.S | 124 +++++++++++++++++++++++++++++++++++++ 2 files changed, 126 insertions(+) diff --git a/lib/libc/riscv/string/Makefile.inc b/lib/libc/riscv/string/Makefile.inc new file mode 100644 index 000000000000..a9cf8bf52481 --- /dev/null +++ b/lib/libc/riscv/string/Makefile.inc @@ -0,0 +1,2 @@ +MDSRCS+= \ + strrchr.S diff --git a/lib/libc/riscv/string/strrchr.S b/lib/libc/riscv/string/strrchr.S new file mode 100644 index 000000000000..51f34ca21fac --- /dev/null +++ b/lib/libc/riscv/string/strrchr.S @@ -0,0 +1,124 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2024 Strahinja Stanisic + */ + +#include + +/* + * a0 - const char *s + * a1 - int c + */ +ENTRY(strrchr) + /* + * a0 - const char *ptr_align + * a1 - temporary + * a2 - temporary + * a3 - temporary + * a4 - temporary + * a5 - const char[8] cccccccc + * a6 - const uint64_t *save_align + * a7 - const uint64_t save_iter + * t0 - const uintr64_t REP8_0X01 + * t1 - const uintr64_t REP8_0X80 + */ + + /* + * save_align = 0 + * save_iter = 0xFFFFFFFFFFFFFF00 + * REP8_0X01 = 0x0101010101010101 + * cccccccc = (char)c * REP8_0X01 + * REP8_0X80 = (REP8_0X80 << 7) << ((str % 8) * 8) + * ptr_align = str - str % 8 + */ + li t0, 0x01010101 + li a6, 0 + slli a2, a0, 3 + slli t1, t0, 32 + li a7, 0xFFFFFFFFFFFFFF00 + or t0, t0, t1 + andi a1, a1, 0xFF + slli t1, t0, 7 + andi a0, a0, ~0b111 + mul a5, a1, t0 + sll t1, t1, a2 + +.Lloop: /* do { */ + ld a1, 0(a0) /* a1 -> data = *ptr_align */ + not a3, a1 /* a3 -> nhz = ~data */ + xor a2, a1, a5 /* a2 -> iter = data ^ cccccccc */ + sub a1, a1, t0 /* a1 -> hz = data - REP8_0X01 */ + not a4, a2 /* a4 -> nhc = ~iter */ + and a1, a1, a3 /* hz = hz & nhz */ + sub a3, a2, t0 /* a3 -> hc = iter - REP8_0X01 */ + and a1, a1, t1 /* hz = hz & REP8_0X80 */ + and a3, a3, a4 /* hc = hc & nhc */ + addi a4, a1, -1 /* a4 -> mask_end = hz - 1 */ + and a3, a3, t1 /* hc = hc & REP8_0X80 */ + xor a4, a4, a1 /* mask_end = mask_end ^ hz */ + addi a0, a0, 8 /* ptr_align = ptr_align + 8 */ + and a3, a3, a4 /* hc = hc & mask_end */ + slli t1, t0, 7 /* REP8_0X80 = REP8_0X01 << 7 */ + not a4, a4 /* mask_end = ~mask_end */ + + beqz a3, .Lskip_save /* if(!hc) goto skip_save */ + or a2, a2, a4 /* iter = iter | mask_end */ + addi a6, a0, -8 /* save_align = ptr_align - 8 */ + mv a7, a2 /* save_iter = iter */ + +.Lskip_save: + beqz a1, .Lloop /* } while(!hz) */ + +.Lfind_char: + /* + * a1 -> iter = save_iter + * a2 -> mask_iter = 0xFF00000000000000 + * a3 -> match_off = 7 + */ + li a2, 0xFF + mv a1, a7 + slli a2, a2, 56 + li a3, 7 + + and a0, a1, a2 + srli a2, a2, 8 + beqz a0, .Lret + + addi a3, a3, -1 + and a0, a1, a2 + srli a2, a2, 8 + beqz a0, .Lret + + addi a3, a3, -1 + and a0, a1, a2 + srli a2, a2, 8 + beqz a0, .Lret + + addi a3, a3, -1 + and a0, a1, a2 + srli a2, a2, 8 + beqz a0, .Lret + + addi a3, a3, -1 + and a0, a1, a2 + srli a2, a2, 8 + beqz a0, .Lret + + addi a3, a3, -1 + and a0, a1, a2 + srli a2, a2, 8 + beqz a0, .Lret + + addi a3, a3, -1 + and a0, a1, a2 + srli a2, a2, 8 + beqz a0, .Lret + + addi a3, a3, -1 + +.Lret: + /* return save_align + match_offset */ + add a0, a6, a3 + ret +END(strrchr) From nobody Fri Oct 31 12:48:28 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cygl04xxcz6FmWw; Fri, 31 Oct 2025 12:48:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cygl03jZdz42D3; Fri, 31 Oct 2025 12:48:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761914908; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wd+QKbwDPN5OLnoiZZln0GLMd8+4YbhHXvumzUxuqC0=; b=TvuhxdNyO8YxKBL+KeOA542z3utO95dkQm/jO/p9VWjfRFb9sLzEa6TVQfvIU/wX4j7J/y Uzu604wy3B6sqSrlN63cqYhP97RPo202MFAM5fFw6ad3HsjLBnY92IBUOpOTDyqsTYfO3O wIPvVXqsbfxEUA6oGeWi0dJAMZ5XUcZ+dQnSTtQ6gTUbfjIzDIv/SBQFXQGJs4Y5FSX1Sl EDy2u8vAsZOsLCBtyTP1WDjkGs3Ey4rfMEKbU9SgR14RkQA5ESJ95dCOerko2jpqIQtWF/ x6E1aq+ymwlfarsmUe/CT4s32OXDbXMzeGtFozjyla+LH1+SemMr0qLpHq/6mw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761914908; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wd+QKbwDPN5OLnoiZZln0GLMd8+4YbhHXvumzUxuqC0=; b=C2qVUawEuQX0f/NxJbPovpBVyuxwbK6HHcgKkoEtUrZV+ASASIye8nlHPGdXmmcSpBI9FF WB/zsnNubEq2qmki4+FL5MklTpI0gn3b7aIOxHlocgr0dVXH4mBovzbx97qH1FBIS+O53m +PoKR4MvOIykJHOC2LK5XzNlnD2VDFGZc9R3Ret8yLTjOkMxwBPSC5isQY4NZlxjQzLnvv RrtrHbwQzW8W0m8OdEw/ccpWdUB+eSjuihcxN/Utshy+Jon7Ux68t+Sp/RM03a9ikKoCyo svFw1Wory3tYFFxGqY+NbNmQuSBvc2/4Hif+6ZYz379g29uQytduxvFGiU23VQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761914908; a=rsa-sha256; cv=none; b=XhnYqNyjkFwH4vjvM7nXiaqi4e824U19Sr4Rv+VUdVtXzJkk+l5NpxRcjLYUBlTqsmI5+X nAYHT2eOcUncLjYYgeQ+Y2i/buYfeGixLvd0GmJFAsaGYxvuBkQ7AbG02IfxxT01E7ITJB /QHkuOA2dk3DXY0Q6NzwANmMwbEmLcRVsdXQ5M2hClXiwWNK7ju0dvI7/cxF4YflJ4xu0u kS1hhy6qqEhCOvcrUViRANwhAuyzgdbyKSJnE2FenhKAj4MFg/cH9uWBR1+b7tcjS/RAmL qS93r0AmD9JuFf3DLib12akMMIQn5reTjYrcWtJng5agncPA7o3yKhlQBoShag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cygl03Cjwz187g; Fri, 31 Oct 2025 12:48: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 59VCmSn0042425; Fri, 31 Oct 2025 12:48:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59VCmSpY042422; Fri, 31 Oct 2025 12:48:28 GMT (envelope-from git) Date: Fri, 31 Oct 2025 12:48:28 GMT Message-Id: <202510311248.59VCmSpY042422@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Clausecker Subject: git: 63ff982b17ee - main - simd.7: add scalar strrchr() for RISC-V to manpage List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 63ff982b17ee398c7808be323d8fd37819a5863c Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=63ff982b17ee398c7808be323d8fd37819a5863c commit 63ff982b17ee398c7808be323d8fd37819a5863c Author: Strahinja StaniÅ¡ić AuthorDate: 2024-10-24 16:29:04 +0000 Commit: Robert Clausecker CommitDate: 2025-10-31 12:47:57 +0000 simd.7: add scalar strrchr() for RISC-V to manpage MFC after: 1 month MFC to: stable/15 Approved by: mhorne, markj (mentor) Sponsored by: Google LLC (GSoC 2024) Differential Revision: https://reviews.freebsd.org/D47275 --- lib/libc/riscv/string/strrchr.S | 3 +++ share/man/man7/simd.7 | 15 +++++++++------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/lib/libc/riscv/string/strrchr.S b/lib/libc/riscv/string/strrchr.S index 51f34ca21fac..e922a692e77f 100644 --- a/lib/libc/riscv/string/strrchr.S +++ b/lib/libc/riscv/string/strrchr.S @@ -6,6 +6,9 @@ #include + .weak rindex + .set rindex, strrchr + /* * a0 - const char *s * a1 - int c diff --git a/share/man/man7/simd.7 b/share/man/man7/simd.7 index d5092348d9b3..92cbbdee25a4 100644 --- a/share/man/man7/simd.7 +++ b/share/man/man7/simd.7 @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE . -.Dd November 18, 2024 +.Dd October 8, 2025 .Dt SIMD 7 .Os .Sh NAME @@ -50,7 +50,7 @@ can be used to override this mechanism. .Pp Enhanced functions are present for the following architectures: .Bl -column FUNCTION_________ aarch64_ arm_ amd64_ i386_ ppc64_ -offset indent -.It Em FUNCTION Ta Em AARCH64 Ta Em ARM Ta Em AMD64 Ta Em I386 Ta Em PPC64 +.It Em FUNCTION Ta Em AARCH64 Ta Em ARM Ta Em AMD64 Ta Em I386 Ta Em PPC64 Ta Em RISC-V .It bcmp Ta A Ta Ta S1 Ta S .It bcopy Ta A Ta S Ta S Ta S Ta SV .It bzero Ta A Ta S Ta S Ta S @@ -65,7 +65,7 @@ Enhanced functions are present for the following architectures: .It memmove Ta A Ta S Ta S Ta S Ta SV .It memrchr Ta A Ta Ta S1 .It memset Ta A Ta S Ta S Ta S -.It rindex Ta A Ta Ta S1 Ta S +.It rindex Ta A Ta Ta S1 Ta S Ta Ta S .It stpcpy Ta A Ta Ta S1 .It stpncpy Ta Ta Ta S1 .It strcat Ta A Ta Ta S1 Ta S @@ -81,7 +81,7 @@ Enhanced functions are present for the following architectures: .It strncmp Ta A Ta S Ta S1 Ta S .It strncpy Ta Ta Ta S1 Ta Ta S2 .It strnlen Ta A Ta Ta S1 -.It strrchr Ta A Ta Ta S1 Ta S +.It strrchr Ta A Ta Ta S1 Ta S Ta Ta S .It strpbrk Ta S Ta Ta S2 .It strsep Ta S Ta Ta S2 .It strspn Ta S Ta Ta S2 @@ -207,10 +207,13 @@ for .Fx 11.0 for .Cm aarch64 , -and .Fx 12.0 for -.Cm powerpc64 . +.Cm powerpc64 , +and +.Fx 16.0 +for +.Cm riscv64 . SIMD-enhanced functions were first added with .Fx 13.0 for From nobody Fri Oct 31 12:48:29 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cygl21c5Jz6FmRD; Fri, 31 Oct 2025 12:48: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cygl14wS4z42Qf; Fri, 31 Oct 2025 12:48:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761914909; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DkfuTKTQQMbOdniLvydocHvXn+FV4HPgdipfuUXoGF4=; b=Nzwbr2/n8jVfwyfU0vnkH1g7Tbr31AWUfoJfyCDMpIHg/49JRQ/Bwp8gZWvdKeuSn3Qsm1 HKogqh4Uhp+46HLTxDzj8CEwuyZQT1Ckc/m85WgWwgV62hx4RJZIPXwwTHUyQbRNYDNolw TZm8QaMTnu4qgNnxOg8EA3OBwkowkWIAXzxLGAPmMlJ8200TTChA0zvdcxjz+L6rTLbKd7 oQ49sxOONw5FEICTyONTkH+AD4uIItdXcVVu9LSRw8MHZG1Ym3KHJa124BII1fm+TKrGl5 YNiXD1tMK/yy55+AB8WiS8HYAwhj5paLJkBoidfnibdhPdGndKwLwQOwF5Efaw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761914909; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DkfuTKTQQMbOdniLvydocHvXn+FV4HPgdipfuUXoGF4=; b=kGqsTIZCdNjCfUpVyuu0jecO8RvWLos+pUe0J8++6nNGHGSJR6WIco63ywgznCQQqnrTud oZ+9ldVv1tLXlfnqcHVLK72phMc9NqQWiLxoD8QkdYL+G15TmpJFVBavg7EHfd2yJyZeHK kEOOJIaojleRbMCgcofbp5ftVuJ9/90tdsn6L0+Yin5xAU4qshqJL+Se1knbMQ5AiGO5nA NU6NPvUflrtlV8AYSH04v1/Vi9XzdDCXTKfZz/ynPxnclnD0uD8U9MzSHUhooqEWpFM5+x fFIEngwDOzzOEQuM6Dtqy32OSar4nLoyzAtoeYOFgb2z+R9be8rkQiAFCvHJ+Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761914909; a=rsa-sha256; cv=none; b=VEMhUbx2zxlVehRECfAbRznVPHdmuS41Q20mXirwiRXqNDdUlGVQ4ziJhWJl8wCCwRqkhU Hqu6apdg1lI+S7bxd1c7qARcmn7CuuTHeVCMNV7ismOF4ENRcukgyrh5qtiFjnX+QPEi6I BLqjW29ykOb6NXla8J1dF+S+GmF1V5E8c7EbrWUR9yUmI+ENFFxgGgcF2LJbGX2b80Hsj0 VRCW3VwjHO0AOerEU19RPf/IC9s5Bx5N9QP+YmVYj4Rr138UAwleUQHQvAhWci5tbh6SmW CtUhW/dyW5mIb52g/ItOeWMaYNLLbO2MdUpa3Z8pobgDFUrhxqiLPrSt/I5bGA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cygl13rc0z17v0; Fri, 31 Oct 2025 12:48: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 59VCmTmf042458; Fri, 31 Oct 2025 12:48:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59VCmTRd042455; Fri, 31 Oct 2025 12:48:29 GMT (envelope-from git) Date: Fri, 31 Oct 2025 12:48:29 GMT Message-Id: <202510311248.59VCmTRd042455@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Clausecker Subject: git: 563efdd3bd5d - main - libc: scalar memchr() in RISC-V assembly List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 563efdd3bd5d5f94e356444bb64fd66e13dda5e1 Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=563efdd3bd5d5f94e356444bb64fd66e13dda5e1 commit 563efdd3bd5d5f94e356444bb64fd66e13dda5e1 Author: Strahinja StaniÅ¡ić AuthorDate: 2024-07-17 11:19:52 +0000 Commit: Robert Clausecker CommitDate: 2025-10-31 12:47:58 +0000 libc: scalar memchr() in RISC-V assembly Added an optimized memchr() implementation in RISC-V assembly and updated the relevant manpage. │ memchr_baseline │ memchr_scalar │ │ sec/op │ sec/op vs base │ Short 636.6µ ± 1% 495.9µ ± 1% -22.10% (p=0.000 n=20) Mid 279.7µ ± 1% 224.1µ ± 1% -19.87% (p=0.000 n=20) Long 138.8µ ± 0% 124.9µ ± 0% -10.00% (p=0.000 n=20) geomean 291.3µ 240.3µ -17.48% │ memchr_baseline │ memchr_scalar │ │ B/s │ B/s vs base │ Short 187.3Mi ± 1% 240.4Mi ± 1% +28.37% (p=0.000 n=20) Mid 426.2Mi ± 1% 531.9Mi ± 1% +24.79% (p=0.000 n=20) Long 859.0Mi ± 0% 954.4Mi ± 0% +11.11% (p=0.000 n=20) geomean 409.3Mi 496.0Mi +21.19% MFC after: 1 month MFC to: stable/15 Approved by: mhorne, markj (mentor) Reviewed by: fuz Sponsored by: Google LLC (GSoC 2024) Differential Revision: https://reviews.freebsd.org/D46023 --- lib/libc/riscv/string/Makefile.inc | 1 + lib/libc/riscv/string/memchr.S | 188 +++++++++++++++++++++++++++++++++++++ 2 files changed, 189 insertions(+) diff --git a/lib/libc/riscv/string/Makefile.inc b/lib/libc/riscv/string/Makefile.inc index a9cf8bf52481..cdbc19d286fc 100644 --- a/lib/libc/riscv/string/Makefile.inc +++ b/lib/libc/riscv/string/Makefile.inc @@ -1,2 +1,3 @@ MDSRCS+= \ + memchr.S \ strrchr.S diff --git a/lib/libc/riscv/string/memchr.S b/lib/libc/riscv/string/memchr.S new file mode 100644 index 000000000000..e6e04bfae96a --- /dev/null +++ b/lib/libc/riscv/string/memchr.S @@ -0,0 +1,188 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2024 Strahinja Stanisic + */ + +#include + +/* + * a0 - const void *b + * a1 - int c + * a2 - size_t len + */ +ENTRY(memchr) + /* + * a0 - const char *ptr + * a1 - char cccccccc[8] + * a2 - char iter[8] + * a3 - uint8_t *end + * a4 - uint64_t *end_align + * a5 - uint64_t *end_unroll + */ + + beqz a2, .Lno_match + + /* c = (uint8_t) c */ + andi a1, a1, 0xFF + + /* + * t0 = 0x0101010101010101 + * t1 = 0x8080808080808080 + * t2 = b << 3 + * cccccccc = (uint8_t)c * t0 + * end = b + len; + * ptr = b & ~0b111 + */ + add a3, a0, a2 + li t0, 0x01010101 + sltu t2, a0, a3 + slli t1, t0, 32 + neg t2, t2 + or t0, t0, t1 + and a3, a3, t2 + slli t1, t0, 7 + slli t2, a0, 3 + and a0, a0, ~0b111 + mul a1, t0, a1 + + ld a2, (a0) + + /* + * mask_start = REP8_0x01 ^ (REP8_0x01 << t2) + * iter = iter ^ cccccccc + * iter = iter | mask_start + */ + sll t2, t0, t2 + xor a2, a2, a1 + xor t2, t2, t0 + or a2, a2, t2 + + /* has_zero(iter) + * end_align = (end + 7) & ~0b111; + */ + addi a4, a3, 7 + not t2, a2 + sub a2, a2, t0 + and t2, t2, t1 + andi a4, a4, ~0b111 + and a2, a2, t2 + + /* ptr = ptr + 8 */ + addi a0, a0, 8 + + bnez a2, .Lfind_zero + + /* if(ptr == end_align) */ + beq a0, a4, .Lno_match + + /* end_unroll = end_align & ~0b1111 */ + andi a5, a4, ~0b1111 + + /* + * Instead of branching to check if `ptr` is 16-byte aligned: + * - Probe the next 8 bytes for `c` + * - Align `ptr` down to the nearest 16-byte boundary + * + * If `ptr` was already 16-byte aligned, those 8 bytes will be + * checked again inside the unrolled loop. + * + * This removes an unpredictable branch and improves performance. + */ + + ld a2, (a0) + xor a2, a2, a1 + + not t2, a2 + sub a2, a2, t0 + and t2, t2, t1 + and a2, a2, t2 + + addi a0, a0, 8 + + bnez a2, .Lfind_zero + + andi a0, a0, ~0b1111 + + /* while(ptr != end_unroll) */ + beq a0, a5, .Lskip_loop +.Lloop: + ld a2, (a0) + ld t3, 8(a0) + + xor a2, a2, a1 + xor t3, t3, a1 + + not t2, a2 + not t4, t3 + sub a2, a2, t0 + sub t3, t3, t0 + and t2, t2, t1 + and t4, t4, t1 + and a2, a2, t2 + and t3, t3, t4 + + addi a0, a0, 8 + + bnez a2, .Lfind_zero + + /* move into iter for find_zero */ + mv a2, t3 + + addi a0, a0, 8 + + bnez a2, .Lfind_zero + + bne a0, a5, .Lloop +.Lskip_loop: + + /* there might be one 8byte left */ + beq a0, a4, .Lno_match + + ld a2, (a0) + xor a2, a2, a1 + + not t2, a2 + sub a2, a2, t0 + and t2, t2, t1 + and a2, a2, t2 + + addi a0, a0, 8 + + beqz a2, .Lno_match + +.Lfind_zero: + /* + * ptr = ptr - 8 + * t1 = 0x0001020304050607 + * iter = iter & (-iter) + * iter = iter >> 7 + * iter = iter * t1 + * iter = iter >> 56 + */ + li t1, 0x10203000 + neg t0, a2 + slli t1, t1, 4 + and a2, a2, t0 + addi t1, t1, 0x405 + srli a2, a2, 7 + slli t1, t1, 16 + addi a0, a0, -8 + addi t1, t1, 0x607 + mul a2, a2, t1 + srli a2, a2, 56 + + /* left = end - ptr */ + sub t0, a3, a0 + + /* return iter < left ? ptr + iter : NULL */ + sltu t1, a2, t0 + neg t1, t1 + add a0, a0, a2 + and a0, a0, t1 + ret + +.Lno_match: + li a0, 0 + ret +END(memchr) From nobody Fri Oct 31 12:48:30 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cygl3181gz6Fm6F; Fri, 31 Oct 2025 12:48: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cygl25YFJz42T9; Fri, 31 Oct 2025 12:48:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761914910; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=txp66vCqzYbPgXsq0fNeGh6wvdf/3Q3U4NBWTw8K/Mk=; b=NaQ9TBInomZSWQWSum+g2fPGfTiF/2Nc4nWymFE4IEEtC+U1plvBdBuk8C6420hk2j2Wxr A7hvO8F7oXxz1aEr9rDRvaBWdCam0wHXvxwgT4116/+QMSatXErFjJepz97VUBZLGSoWVh rDBBoj1PhcjUU8LlSDpY3WMUVxHdMixfu7rRqCKxRlJIyHCcpgIjPcyxHS5qkDBEjOmpEV IjfISHzAOY0hABqm4dQNWrV8LcolcKyTwec8BhU2pdFxJG+r6UGcVqlhDEKztR3vpj8uMr wNmVMQvI73J9qc/XjF9aiA4j6JJ643dfwNDEbCgsveae9TdbesKng+7zAj7wMQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761914910; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=txp66vCqzYbPgXsq0fNeGh6wvdf/3Q3U4NBWTw8K/Mk=; b=eQ3Lm+7ZQcFujQ1lJ5nMaWKflVlFBYHOZncZmGFRdg89ULm+5+aLXq7+4ROgBEVv1N1tk8 cbWQh4dKWkg3g4T+JLq7KwyFgUlKqzVz8q1vhBTN2GVrouOIveVAM+FuTu4/wpLPL49LA3 zpPHLzVs2m+bbhsMRM10siMLLAQEqpM4lulK6bYxmkeb8JygQ++ozt2Yz15Y/nWK7r/Wc7 uzjyJdrWVRuUBM8ybG8JaHqrOywMNufDH/Mmo/j36mi9BcOWWBey5+RnI6mNqstt8L24gM 5fhwCZ6HgZEmPKAptfW+HEbNCLjdflfokJ2mWz8vmRtMJY/jbbQ/+YN9ou3xng== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761914910; a=rsa-sha256; cv=none; b=PCqnBvEVEZPo8lRMSUpcp9+GEkPUiF77Vx9DBhiVT65TSzu32eIsfpToxDupbhdJeM/7wt Gt3AQIC/j0PSZcMzWXlTWeKeX4HUu4IYI5xv2waITlWzeJQZKC47KiXpIrY2JgtYZ85fNV /yVOWbFUYGCnnyVeSYp6EBPTNsXHSAjRPCrHuXFx5gQFX5yH+OjUsDRN7/9bcYdC+A7gj5 czGEjKTPVGyb7zNZyoDttWVzz8jlaj2CVO8E254OtjLCllBrq7eemJjJ1RVKQZRq+G65wS Npfsc8irZXqzuAEGDooCX/WNS+N5M+6TQ/kxvi0yIK3qWiVLKt4iMUjAUKA0Ww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cygl2559Rz17v1; Fri, 31 Oct 2025 12:48: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 59VCmUmI042491; Fri, 31 Oct 2025 12:48:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59VCmUQq042488; Fri, 31 Oct 2025 12:48:30 GMT (envelope-from git) Date: Fri, 31 Oct 2025 12:48:30 GMT Message-Id: <202510311248.59VCmUQq042488@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Clausecker Subject: git: d2c23f5953a8 - main - simd.7: add scalar memchr() for RISC-V to manpage List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d2c23f5953a823e01f0c6418b0f98c119f145e20 Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=d2c23f5953a823e01f0c6418b0f98c119f145e20 commit d2c23f5953a823e01f0c6418b0f98c119f145e20 Author: Strahinja StaniÅ¡ić AuthorDate: 2024-07-18 17:57:51 +0000 Commit: Robert Clausecker CommitDate: 2025-10-31 12:47:58 +0000 simd.7: add scalar memchr() for RISC-V to manpage MFC after: 1 month MFC to: stable/15 Approved by: mhorne, markj (mentor) Sponsored by: Google LLC (GSoC 2024) Differential Revision: https://reviews.freebsd.org/D46023 --- share/man/man7/simd.7 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/man/man7/simd.7 b/share/man/man7/simd.7 index 92cbbdee25a4..31a4e3b0844f 100644 --- a/share/man/man7/simd.7 +++ b/share/man/man7/simd.7 @@ -58,7 +58,7 @@ Enhanced functions are present for the following architectures: .It index Ta A Ta Ta S1 .It ldiv Ta Ta Ta S Ta S .It lldiv Ta Ta Ta S -.It memchr Ta A Ta Ta S1 +.It memchr Ta A Ta Ta S1 Ta Ta Ta S .It memcmp Ta A Ta S Ta S1 Ta S .It memccpy Ta A Ta Ta S1 .It memcpy Ta A Ta S Ta S Ta S Ta SV From nobody Fri Oct 31 12:48:31 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cygl43zQgz6FmLy; Fri, 31 Oct 2025 12:48:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cygl36xQBz42Jb; Fri, 31 Oct 2025 12:48:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761914912; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SyaTTsfavhCzjFAqGvdgWXm8umFHowXIKF73QLbiUiI=; b=j7825PVrYFKp/snfwk1Vn7jZ3+plzO994d78nOmnmJmlxVUwnX3XESI8gJBTu9mLjN/ABC ndYsy4aVaiyOVNNHrWIRVUWjR8BUO/hLucmXEimhI9vpSaLAAjpvgiw5nDGHSEsQhEP1Hm xiacUxhAdnb5/gfIWzIFXtXGjBdHAKzt/GYEYZ+oxV2zsmIx+0v9uM8bbwc4FE0n07ZiG7 +bYygFC8ZxgBDKgmkcO2gVAYFcFfYzveuV8pfGicMu2wUraq3WqKMvzMOz/4iUQPMu8hKe 6OxpbEv5mhw3nMfEvsQ5HvQhub0QyJKXxoZTfzxDO61mWrNBoIQUB34w3SCftw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761914912; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SyaTTsfavhCzjFAqGvdgWXm8umFHowXIKF73QLbiUiI=; b=igaGOuvShPHtJXrn+1JHaJzRaYljLmB2rn0WbhGMx6jNonVIN1JRXToWk+EYeKaqZg7RBx EWz8Idm7zxn51t+afbLqMumpZ/TDt8xldrZJ87MJOOznvJ2awJwsY1VLlHotgJg4pTmlp/ MmCeVY24nz83c3obHbQpi/6dvfWipM6FM+Tqzcevcmt/Fv2qKFlk5SZ6M3dD9A1gVXuoLK 3JsUYyk0nKvlX2zaqEmajpuVYw6ZO6lkhN2lLe91ETw7WqNi9lFfLl165Tr2PWjF0xQ646 LLAfmfDEZ1PQsIgI7cXIAtkH4N/yFyNHae6WuQPrx4Xt68Fm/u+NwtM6nyH3Jw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761914912; a=rsa-sha256; cv=none; b=XbPaEZjqTmpNi6hwYOhIo4VMY6TdygzJWUGR+z33CfT/Yi/VKJBHlVUwQfO5YdVp/ADwwM xAx41nSyJciHb/A2LROau2N1QXUrh0e0Vh2tPFh1ky7cImIx1unhIRIVayZwQ/60Y9LC53 jImjQMJNXcoeWw+InvlHl6twzNuVXWTrL4uqSnnGutKyWmqhauFiyEvq2ynt1C/U9z/+7L AxQIbXdIXrVXX7w5HmADkGvxwGR7hEHmtBeOVO7BJ1oa6BpsUGnG9fWThCiQaWu+O/MiW0 vJ/cFnuUxA+f2oHswdjAmK6zuaHWnCfn5ReT+hx2EWhhK/87vN9OnSKLgFvhTA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cygl361XFz187t; Fri, 31 Oct 2025 12:48: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 59VCmV0r042530; Fri, 31 Oct 2025 12:48:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59VCmVrY042527; Fri, 31 Oct 2025 12:48:31 GMT (envelope-from git) Date: Fri, 31 Oct 2025 12:48:31 GMT Message-Id: <202510311248.59VCmVrY042527@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Clausecker Subject: git: 40a958d5850d - main - libc: scalar memset() in RISC-V assembly List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 40a958d5850ddda6d863558c8b31572f700d53ca Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=40a958d5850ddda6d863558c8b31572f700d53ca commit 40a958d5850ddda6d863558c8b31572f700d53ca Author: Strahinja StaniÅ¡ić AuthorDate: 2024-06-21 15:43:45 +0000 Commit: Robert Clausecker CommitDate: 2025-10-31 12:47:58 +0000 libc: scalar memset() in RISC-V assembly Adds scalar implementation of memset for RISC-V and updates the relevant manpage os: FreeBSD arch: riscv │ ./results/memset/memset_baseline │ ./results/memset/memset_scalar │ │ sec/op │ sec/op vs base │ 40 527.5µ ± 1% 479.4µ ± 1% -9.12% (p=0.000 n=20) 168 254.5µ ± 1% 216.7µ ± 1% -14.86% (p=0.000 n=20) 2k 169.5µ ± 1% 128.4µ ± 0% -24.24% (p=0.000 n=20) 256k 161.2µ ± 1% 118.6µ ± 1% -26.42% (p=0.000 n=20) 16m 56.58m ± 0% 53.91m ± 0% -4.72% (p=0.000 n=20) geomean 730.2µ 611.2µ -16.29% │ ./results/memset/memset_baseline │ ./results/memset/memset_scalar │ │ B/s │ B/s vs base │ 40 452.0Mi ± 1% 497.3Mi ± 1% +10.04% (p=0.000 n=20) 168 936.9Mi ± 1% 1100.4Mi ± 1% +17.45% (p=0.000 n=20) 2k 1.373Gi ± 1% 1.813Gi ± 0% +32.00% (p=0.000 n=20) 256k 1.444Gi ± 1% 1.962Gi ± 1% +35.91% (p=0.000 n=20) 16m 269.7Mi ± 0% 283.1Mi ± 0% +4.96% (p=0.000 n=20) geomean 750.1Mi 896.1Mi +19.47% MFC after: 1 month MFC to: stable/15 Approved by: mhorne, markj (mentor) Reviewed by: fuz Sponsored by: Google LLC (GSoc 2024) Differential Revision: https://reviews.freebsd.org/D45730 --- lib/libc/riscv/string/Makefile.inc | 1 + lib/libc/riscv/string/memset.S | 95 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 96 insertions(+) diff --git a/lib/libc/riscv/string/Makefile.inc b/lib/libc/riscv/string/Makefile.inc index cdbc19d286fc..44aeb65bf1f7 100644 --- a/lib/libc/riscv/string/Makefile.inc +++ b/lib/libc/riscv/string/Makefile.inc @@ -1,3 +1,4 @@ MDSRCS+= \ memchr.S \ + memset.S \ strrchr.S diff --git a/lib/libc/riscv/string/memset.S b/lib/libc/riscv/string/memset.S new file mode 100644 index 000000000000..ca435dfdd5c1 --- /dev/null +++ b/lib/libc/riscv/string/memset.S @@ -0,0 +1,95 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2024 Strahinja Stanisic + */ + +#include + +/* + * register a0 - void *dest + * register a1 - int c + * register a2 - size_t len + */ +ENTRY(memset) + andi a1, a1, 0xFF + + sltiu t1, a2, 8 + mv t0, a0 + bnez t1, .Lend + + li t1, 0x0101010101010101 + mul a1, a1, t1 + + andi t1, a0, 0b111 + andi t0, a0, ~0b111 + + beqz t1, .Lloop_store_64 + + la t2, .Lduff_start + slli t3, t1, 2 + add t2, t2, t3 + jr -4(t2) +.Lduff_start: + sb a1, 1(t0) + sb a1, 2(t0) + sb a1, 3(t0) + sb a1, 4(t0) + sb a1, 5(t0) + sb a1, 6(t0) + sb a1, 7(t0) + + /* a3 = a3 -(8-a) <=> a3 = a3 + (a-8) */ + addi t1, t1, -8 + add a2, a2, t1 + addi t0, t0, 8 + +.Lloop_store_64: + slti t1, a2, 64 + bnez t1, .Lstore_rest + sd a1, 0(t0) + sd a1, 8(t0) + sd a1, 16(t0) + sd a1, 24(t0) + sd a1, 32(t0) + sd a1, 40(t0) + sd a1, 48(t0) + sd a1, 56(t0) + addi a2, a2, -64 + addi t0, t0, 64 + j .Lloop_store_64 + +.Lstore_rest: + la t2, .Lduff_rest + andi t3, a2, ~0b111 + srli t4, t3, 1 + sub t2, t2, t4 + jr t2 + sd a1, 56(t0) + sd a1, 48(t0) + sd a1, 40(t0) + sd a1, 32(t0) + sd a1, 24(t0) + sd a1, 16(t0) + sd a1, 8(t0) + sd a1, 0(t0) +.Lduff_rest: + add t0, t0, t3 + sub a2, a2, t3 + +.Lend: + slli a2, a2, 2 + la t2, .Lduff_end + sub t2, t2, a2 + jr t2 + sb a1, 6(t0) + sb a1, 5(t0) + sb a1, 4(t0) + sb a1, 3(t0) + sb a1, 2(t0) + sb a1, 1(t0) + sb a1, (t0) +.Lduff_end: + ret +END(memset) + From nobody Fri Oct 31 12:48:32 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cygl547V6z6FmRF; Fri, 31 Oct 2025 12:48: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cygl50580z4222; Fri, 31 Oct 2025 12:48:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761914913; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=97EKGfvx62uJhT0H13mGmb1s8TUyAxIdcFSoT5m2Cvc=; b=xQ5oi4pQD0HOtrnUwnnEIT+1ch+a/sO8hGzXI5i4T7YKgbuE8eUc8CINlxxACvzd4r+G81 eJ/6Fwx83AjIFK2CGgdHNk1egskObbFKQHyE/3gFRSC4ZVAIVzfn8kgv/ZMQN6EDTLXFcH YL+mCqyLz738+bG/zG3AfV6Z3qqzGFI0Voz2/iwm0kTzCnoQym24f7k0oeM49tWTIFJJZe zqSdWH/IssnbWledPT4CnPWFU268HPW0/6QyzRRO7MbS7wpyVokZc/Gk+MdY5r/rr085Za wnTGtaWcINWFFRFBYtxhGmwBDgmFUbR4EpUOpHYKSPBFZZ1owXLxAVYtoxvUUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761914913; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=97EKGfvx62uJhT0H13mGmb1s8TUyAxIdcFSoT5m2Cvc=; b=Nun8QsltlDs1WyxkBskx0qkCXKW7etPhA4cOqiTVgycg2jbJwB8VGF76n3mRJ1iuZbRFlC Rw0CAkVqS3Qn8EZuxrWcIzvS6ADmviXujodyle38uXuarLtQAeJF6Mj+1Ov/jZIzPFir2S an2UVhxK0Qr6JYJsTgHoI506Y2/D0ONP1TjSor7nUuEsXDmQMxzC544Zd4cvTWaolNH3GR 55M35pNPkP7GtbIXETGqhNEgt4y7/8posyF3I4QYL9rAHB/USzqFAV6Sob/U/Nrab7aQIx PL2r0LoO5K+vsrnOXdwYTuOMJgoCq1KwAOo/N8hHL7ZyeMECkMMt2yIpSqD08A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761914913; a=rsa-sha256; cv=none; b=nt0hw+MzkjcG0toWkoR6k/H6oMuBePTXaO+JND8RRvhc1AYrjbMGWfw8DQEwPrl6NiyEfR RKMBqk0RwU3oOQXSypeMRuMHYcB0GeGIbkpeFkbzG2UAysykF0i/65YSjGgYs8kEQ6IYNy JG7QUAobmD4dSki4C03ByzX1U/hsBlTbKNHC+FcbDu3l0yKmM3vW40rj8iUNi2mwDPZ3OX DGI/KrF8z2DlydYfAHf1uR1+ISeO04Wjks8Wh260q5Uzgf8tppU+DwIhelFVkEAur4zmbf 3u8x0m2MglIruZ9uKPMhTKv8lkMO4B8FbmYKKH7P0Mi66hCbvudFmqr6o+v4+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cygl46hvWz187h; Fri, 31 Oct 2025 12:48: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 59VCmWPU042565; Fri, 31 Oct 2025 12:48:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59VCmWRe042562; Fri, 31 Oct 2025 12:48:32 GMT (envelope-from git) Date: Fri, 31 Oct 2025 12:48:32 GMT Message-Id: <202510311248.59VCmWRe042562@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Clausecker Subject: git: 164156058e72 - main - simd.7: add scalar memset() for RISC-V to manpage List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 164156058e723c0d9b2bb68054543963f40f1159 Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=164156058e723c0d9b2bb68054543963f40f1159 commit 164156058e723c0d9b2bb68054543963f40f1159 Author: Strahinja StaniÅ¡ić AuthorDate: 2024-06-24 17:07:06 +0000 Commit: Robert Clausecker CommitDate: 2025-10-31 12:47:58 +0000 simd.7: add scalar memset() for RISC-V to manpage MFC after: 1 month MFC to: stable/15 Approved by: mhorne, markj (mentor) Reviewed by: fuz Sponsored by: Google LLC (GSoC 2024) Differential Revision: https://reviews.freebsd.org/D45730 --- share/man/man7/simd.7 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/man/man7/simd.7 b/share/man/man7/simd.7 index 31a4e3b0844f..565b4fa7ea2f 100644 --- a/share/man/man7/simd.7 +++ b/share/man/man7/simd.7 @@ -64,7 +64,7 @@ Enhanced functions are present for the following architectures: .It memcpy Ta A Ta S Ta S Ta S Ta SV .It memmove Ta A Ta S Ta S Ta S Ta SV .It memrchr Ta A Ta Ta S1 -.It memset Ta A Ta S Ta S Ta S +.It memset Ta A Ta S Ta S Ta S Ta Ta S .It rindex Ta A Ta Ta S1 Ta S Ta Ta S .It stpcpy Ta A Ta Ta S1 .It stpncpy Ta Ta Ta S1 From nobody Fri Oct 31 12:48:33 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cygl63PGkz6FmTw; Fri, 31 Oct 2025 12:48: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cygl60kJTz42XK; Fri, 31 Oct 2025 12:48:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761914914; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XmzAkHwc4T2xj1XpkHGQigCkl6zgLq4slYJ/bTnGX9A=; b=YKHLuCLohJnN1NWe7bAcPKLv+vnr45J/R3dmbx7+t2QNSZ3hpsAoGBVNbSfKddo4TOy7VQ KnLkSOYPInupLO4Sm3r5lEfeJ+kEB+ryzXBbJxyJBEOHq6g6wR1mqaoPxUUcoaYOZNluPT /P2myOZ2yxVT5qk1P0I4T3F34zYyeegss/RbaqiqvMvMrt++BNJ0SIImVN8dY5Q1rW/ZLy 22xmAmMwb76yqZ6MUnSrLn3OlUD1MHWvaNCmfSwafQtYQ6Miwa4DMvZvxjNX5pcnyNNR3x gwW7E3hTe1evENuWdD7DzHnBw9ZQ7AyW0ibvRIORzyYmJSiK8D8BqJ1/8nIFcw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761914914; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XmzAkHwc4T2xj1XpkHGQigCkl6zgLq4slYJ/bTnGX9A=; b=MQgVIcQkUwZQZeVCE3AjZ1oWSMCtZkyhHe5kvnyKvNBgmYGsz2AromENxPs4pBaZqsngSj JPFsaMdX0mj0qrxPE/sng2RaKT1wqSAIKM3eIVqGAq1n1Iv2++zUekbnQUybokj2Sz4Ux1 N8VE+WfdAQt1sJdWzTEAbuET9JMR8YuGk3RBGC5AOlPAC0uxTyKVbiQvB9cahGh1AFnGVd f4mFe0E+W7P4sERJRHP0NJkl7OoVWg9C+d0EZ1xFBccvV0EEQVlXPQPAs7M474hg7LosbD yLb2NZ+ebA9Vf42wvr0KYxOo0oy0eJrWVDDUA+ElaX5QKx18ewyQzNHjBw9i4w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761914914; a=rsa-sha256; cv=none; b=A2jb7GGih3HZq6B/wOXFXbwREl8MA/tVtaf7sd0PS78R/dl/iSHuL6NeOlkzyIrA+7E4QG GpxD6rn1/+eewtvfeQkc9+PUsvJ5NbpjVw4428lkLcBfzgW+a0JpCNKXzZ4WHEXpVCNSeO MY6/CKnb7GNov4Lh7G2HkLcwk+awGyf5xIvk22DVBRrVg6xZZ/oODkj71SarkWFfFX0S0d /18oHXxYRlfAOG7C76HeF27GCHvsW42GtuFDra4rzbLCR4EGIXJ/KELLrDsSL8LTVTE2py gAstaZyEDEIEb1OOQE/YeZf0wv5h3p/wnZrgzt8p3n3rqHdQEkOGmM71GcUZGg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cygl60DKsz17p5; Fri, 31 Oct 2025 12:48: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 59VCmXsE042603; Fri, 31 Oct 2025 12:48:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59VCmXvJ042600; Fri, 31 Oct 2025 12:48:33 GMT (envelope-from git) Date: Fri, 31 Oct 2025 12:48:33 GMT Message-Id: <202510311248.59VCmXvJ042600@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Clausecker Subject: git: e09c1583eddd - main - libc: scalar strlen() in RISC-V assembly List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e09c1583eddd345bdb79f3db8a91166f6f139207 Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=e09c1583eddd345bdb79f3db8a91166f6f139207 commit e09c1583eddd345bdb79f3db8a91166f6f139207 Author: Strahinja StaniÅ¡ić AuthorDate: 2024-05-17 14:23:48 +0000 Commit: Robert Clausecker CommitDate: 2025-10-31 12:47:59 +0000 libc: scalar strlen() in RISC-V assembly Includes a scalar implementation of strlen() for the RISC-V architecture and changes to the corresponding manpage. Performance was benchamarked using before and after: https://github.com/clausecker/strperf os: FreeBSD arch: riscv │ strlen_baseline │ strlen_scalar │ │ sec/op │ sec/op vs base │ Short 541.2µ ± 17% 401.6µ ± 0% -25.78% (p=0.000 n=21+20) Mid 249.6µ ± 3% 191.9µ ± 0% -23.13% (p=0.000 n=21+20) Long 124.6µ ± 0% 110.7µ ± 0% -11.13% (p=0.000 n=21+20) geomean 256.3µ 204.3µ -20.26% │ strlen_baseline │ strlen_scalar │ │ B/s │ B/s vs base │ Short 220.3Mi ± 14% 296.8Mi ± 0% +34.74% (p=0.000 n=21+20) Mid 477.6Mi ± 3% 621.3Mi ± 0% +30.09% (p=0.000 n=21+20) Long 956.9Mi ± 0% 1076.7Mi ± 0% +12.52% (p=0.000 n=21+20) geomean 465.2Mi 583.4Mi +25.40% MFC after: 1 month MFC to: stable/15 Approved by: mhorne, markj (mentor) Reviewed by: fuz Sponsored by: Google LLC (GSoC 2024) Differential Revision: https://reviews.freebsd.org/D45693 --- lib/libc/riscv/string/Makefile.inc | 1 + lib/libc/riscv/string/strlen.S | 77 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 78 insertions(+) diff --git a/lib/libc/riscv/string/Makefile.inc b/lib/libc/riscv/string/Makefile.inc index 44aeb65bf1f7..5853ea114277 100644 --- a/lib/libc/riscv/string/Makefile.inc +++ b/lib/libc/riscv/string/Makefile.inc @@ -1,4 +1,5 @@ MDSRCS+= \ memchr.S \ memset.S \ + strlen.S \ strrchr.S diff --git a/lib/libc/riscv/string/strlen.S b/lib/libc/riscv/string/strlen.S new file mode 100644 index 000000000000..3beb160f2e6f --- /dev/null +++ b/lib/libc/riscv/string/strlen.S @@ -0,0 +1,77 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2024 Strahinja Stanisic + */ + +#include + +/* + * https://graphics.stanford.edu/~seander/bithacks.html#ZeroInWord + * uses haszero(v) (((v) - 0x01010101UL) & ~(v) & 0x80808080UL) + * which evalutates > 0 when there is zero in v + * + * register a0 - char *s + */ +ENTRY(strlen) + /* + * register a0 - char *str_start + * register a1 - char *str_ptr + * register a2 - char[8] iter + */ + + /* load constants for haszero */ + li t0, 0x0101010101010101 + slli t1, t0, 7 # 0x8080808080808080, avoid li + + /* check alignment of str_start */ + andi a1, a0, ~0b111 + ld a2, (a1) + beq a1, a0, .Lhas_zero + + /* fill bytes before str_start with non-zero */ + slli t2, a0, 3 + addi t3, t2, -64 + neg t3, t3 + srl t3, t0, t3 + or a2, a2, t3 + + /* unrolled iteration of haszero */ + not t2, a2 + sub a2, a2, t0 + and a2, a2, t2 + and a2, a2, t1 + + bnez a2, .Lfind_zero + +.Lloop_has_zero: + ld a2, 8(a1) + addi a1, a1, 8 # move ptr to next 8byte +.Lhas_zero: + not t2, a2 + sub a2, a2, t0 + and a2, a2, t2 + and a2, a2, t1 + + beqz a2, .Lloop_has_zero + +.Lfind_zero: + /* use (iter & -iter) to isolate lowest set bit */ + sub a3, zero, a2 #a3 = -iter + and t1, a2, a3 #t1 = (iter & -iter) + + li t0, 0x0001020304050607 + srli t1, t1, 7 + /* + * lowest set bit is 2^(8*k) + * multiplying by it shifts the idx array in t0 by k bytes to the left + */ + mul t1, t1, t0 + /* highest byte contains idx of first zero */ + srli t1, t1, 56 + + add a1, a1, t1 + sub a0, a1, a0 + ret +END(strlen) + From nobody Fri Oct 31 12:48:35 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cygl73qvKz6FmJm; Fri, 31 Oct 2025 12:48: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cygl71y3Bz42Pf; Fri, 31 Oct 2025 12:48:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761914915; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c/0yAzh8fT6r6wFmtum1AQoPUUG2hXK4IFBE9xIxcho=; b=cgUFRe0AayUsIbPBVs+iGCKkZNDLS9L0P0qpNfkdZ6X+Ht9+x4uN7FNrAKWIZBmWzYcsqh m+fUN42JOXq0A3WaYCLBKbLJxdcj9ZHSlDi5vgJ9fgWXIIHk3Uh1pYx4E2ebsxTfJHg2EQ A3vzDHEPMZJYeNeh2t51hI88+fuf9tIM4IubWkMyFIiXa6czwUGnmiBOOpNo/rJo1sCVxi WzSorrPEjnZvbBqrR1f36PHF5VyftyvezCoZE5yYCL02fP5y7JjvNQtP3a3S5ENtuGXcWk vkzRI9RrmjFwaBBzOrh7/dJu6KkrY0B8TKGyIGVorMv5/VIB0MaUjK9lthqJQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761914915; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c/0yAzh8fT6r6wFmtum1AQoPUUG2hXK4IFBE9xIxcho=; b=r0tRQ3hKm499CUDT0VMWK6tES8Ac9jyEuDBRGfJ+UhPAQJMAxbIJIVlJnpeAjyLKHuh5cR OhKRmedeOTXIh97j4zLg4YouYLezG7gyAWReootAqM5hentcM7sEwGnp5c0uaO9TRdWwpO lD8DlkZjSQmk8jP2if7hiJk/LImcWeu45ChGOPxBQ7gGwFWBcHuJTBpVO1s6JDpFjce3/Z yujFdldwu9Gih9P1MQUaJrI23xaM7xqS7dUKTlrJJzmujUvVsYyLFFIjNW5Ek1UZ9M+YkE RG8BmBkMZeeRwFvlhyw1nufA+V3NM0PwnxIGQalxb2SGO02j07p3mLVwBwINDA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761914915; a=rsa-sha256; cv=none; b=jjAtJWSsOFyj1w+lX1B/CtwI5imlaiy0P75Lvo+dozXM12ictqBx83Vv4UdINuYAh98/fs UXuZA1CTsOsvLa/e++LUDBArSVCGV5yZd4kaD1kuMUZ8ak8tHeJL0hYZiedav4NjNkpWTR Tfrx5cLQKjhG3nxRhuTachhyiY5BtubItB67+r94oZLJrJOf8bBLtQX+6r28UARNk00M27 3Nt5qaZIYsnQ0L2PqDBUgqrsexsILly4vXecUmeb+8TJrt6pp/yzNeP7xP9T4eNX91CXbw irZniSa94ICtD8uT+zvghpQXrjljYPp6g7Gbvw6mVh/v7r9pEDDNFxKHWYkYMA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cygl71TMpz17v2; Fri, 31 Oct 2025 12:48: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 59VCmZlP042637; Fri, 31 Oct 2025 12:48:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59VCmZpk042634; Fri, 31 Oct 2025 12:48:35 GMT (envelope-from git) Date: Fri, 31 Oct 2025 12:48:35 GMT Message-Id: <202510311248.59VCmZpk042634@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Clausecker Subject: git: 07b1d5a37741 - main - simd.7: add scalar strlen() for RISC-V to manpage List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 07b1d5a37741f5d4de69117a03ef757edff29032 Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=07b1d5a37741f5d4de69117a03ef757edff29032 commit 07b1d5a37741f5d4de69117a03ef757edff29032 Author: Strahinja StaniÅ¡ić AuthorDate: 2024-06-21 23:43:51 +0000 Commit: Robert Clausecker CommitDate: 2025-10-31 12:47:59 +0000 simd.7: add scalar strlen() for RISC-V to manpage MFC after: 1 month MFC to: stable/15 Approved by: mhorne, markj (mentor) Reviewed by: fuz Sponsored by: Google LLC (GSoC 2024) Differential Revision: https://reviews.freebsd.org/D45693 --- share/man/man7/simd.7 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/man/man7/simd.7 b/share/man/man7/simd.7 index 565b4fa7ea2f..5978d4b6655e 100644 --- a/share/man/man7/simd.7 +++ b/share/man/man7/simd.7 @@ -76,7 +76,7 @@ Enhanced functions are present for the following architectures: .It strcspn Ta S Ta Ta S2 .It strlcat Ta A Ta Ta S1 .It strlcpy Ta A Ta Ta S1 -.It strlen Ta A Ta S Ta S1 +.It strlen Ta A Ta S Ta S1 Ta Ta Ta S .It strncat Ta A Ta Ta S1 .It strncmp Ta A Ta S Ta S1 Ta S .It strncpy Ta Ta Ta S1 Ta Ta S2 From nobody Fri Oct 31 12:48:36 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cygl90XlRz6FmRM; Fri, 31 Oct 2025 12:48: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cygl831sQz42VH; Fri, 31 Oct 2025 12:48:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761914916; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=D1fTW6OdiP/7ThVRUTpfwa6IKPPmA+FQ0jCR+Ba/SxA=; b=hxBg9oB9+QwoT99ZC1PE7io4ar8TEBXBStnFP3d1kxEMD9b44obqB/5uB+WfvonGi1g+Qw tVmqNA5gqJvgZ00QNrdS79FOM9id2E80B6DkTHtkjYeNRr4QMRhLBpRVTaeWVE4xhAIPOD xexwAvFfBfWykO7MdahK1nDt2lHyBeFSiR0xIp/RoaSINyOMS+Xcu0SLbzS1kQkSl1q5Il jINpYkZh13JkkkiWAkt6UTQq3lrS7cWbn6yjyyouBiCiMNL6t/zz63HePPCObCm+o3BfTv NMU3JrUtCC3cOu1xicp1AAh/q7157WE7+IEKvH2MXTHUhfqhxSO2o+X+0SATJA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761914916; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=D1fTW6OdiP/7ThVRUTpfwa6IKPPmA+FQ0jCR+Ba/SxA=; b=CIGfLmnZTtpm12N9qYXb7L4JJ7Smo1GXwxSeJUOD5n++w3YSGHAyPhJziVr9c23mHM7bry sc68mjI7ng0fcYMTJ27lGHI0NmzJLV5s8crVQUclpEgbHPFpAQHCYZ5BLamh4JJjhhls9D U3SclpdL0KhqTHqBFYqOnlYkwI/ivOZOCkRIWHXzibr1sAZ6mM4s+FvwHdqeJOker05XOP UqgWzgRbRMINBgD8jTAtjHmxDW+7RJ5A/VrJsN7YB+qWfWPw3WAYZBUN+XuYjn6M13q1uS gNqMPU5pf4bkJOJVCRT5TBwlVFPzXrhSX0Rl2ZroB3RnmSRtaTa4F+Vf/f3b6A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761914916; a=rsa-sha256; cv=none; b=gXjvrOWRSbORg+kOibR16ElXWWNguHEA/MPYaFQlhCwULT/ymRliJbOwM8OFxMUEQk3iCG nm5+wBAdzomYk7p8vXAE6BxBQwFNpBWRzZTMOaNqK0LmyFBEH2ug5m2Zzzs09ZJx2/ma5F mXEK+Tv3gXq+Ns9RMEE2wiHQJ82E7Z+ezUncE1Fsoy8EaWhh1lL6dwRNXMf8qjWg+kvlP5 lY5mLnl0K/+d416eMF8GzLtfdROPDkuzbc4bDr0RrfwXCv/vg8kfWj9rx+Cn5FOqtoj9QF 44Os1oU8UIs+2OHwx46i39EWD2O1IXDB2T+4CiKditnRNHhMILwDDNaeSJKjLA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cygl82R2qz17x7; Fri, 31 Oct 2025 12:48: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 59VCma6a042677; Fri, 31 Oct 2025 12:48:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59VCmaQd042673; Fri, 31 Oct 2025 12:48:36 GMT (envelope-from git) Date: Fri, 31 Oct 2025 12:48:36 GMT Message-Id: <202510311248.59VCmaQd042673@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Clausecker Subject: git: 25fdd86a4c92 - main - libc: scalar memcpy() in RISC-V assembly List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 25fdd86a4c92b5bdab82db289f3bcd57756778e7 Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=25fdd86a4c92b5bdab82db289f3bcd57756778e7 commit 25fdd86a4c92b5bdab82db289f3bcd57756778e7 Author: Strahinja StaniÅ¡ić AuthorDate: 2024-07-24 23:33:30 +0000 Commit: Robert Clausecker CommitDate: 2025-10-31 12:47:59 +0000 libc: scalar memcpy() in RISC-V assembly Optimized assembly implementation of memcpy() for the RISC-V architecture. The implementation has two paths: - An aligned path - (dst - src) % 8 = 0, runs faster - An unaligned path - (dst - src) % 8 != 0, runs slower os: FreeBSD arch: riscv │ memcpy_baseline │ memcpy_scalar │ │ sec/op │ sec/op vs base │ 64Align8 851.6µ ± 1% 488.9µ ± 1% -42.59% (p=0.000 n=12) 4kAlign8 681.5µ ± 1% 255.1µ ± 2% -62.57% (p=0.000 n=12) 256kAlign8 273.0µ ± 2% 230.7µ ± 2% -15.50% (p=0.000 n=12) 16mAlign8 98.07m ± 0% 95.29m ± 0% -2.84% (p=0.000 n=12) 64UAlign 887.5µ ± 1% 531.6µ ± 1% -40.10% (p=0.000 n=12) 4kUAlign 725.6µ ± 1% 262.2µ ± 1% -63.87% (p=0.000 n=12) 256kUAlign 844.1µ ± 2% 322.8µ ± 0% -61.76% (p=0.000 n=12) 16mUAlign 134.9m ± 0% 101.2m ± 0% -24.97% (p=0.000 n=20) geomean 2.410m 1.371m -43.12% │ memcpy_baseline │ memcpy_scalar │ │ MiB/s │ MiB/s vs base │ 64Align8 293.6 ± 1% 511.3 ± 1% +74.18% (p=0.000 n=12) 4kAlign8 366.8 ± 1% 980.0 ± 2% +167.15% (p=0.000 n=12) 256kAlign8 915.8 ± 2% 1083.7 ± 2% +18.34% (p=0.000 n=12) 16mAlign8 163.1 ± 0% 167.9 ± 0% +2.92% (p=0.000 n=12) 64UAlign 281.7 ± 1% 470.3 ± 1% +66.94% (p=0.000 n=12) 4kUAlign 344.5 ± 1% 953.6 ± 1% +176.77% (p=0.000 n=12) 256kUAlign 296.2 ± 2% 774.5 ± 0% +161.49% (p=0.000 n=12) 16mUAlign 118.6 ± 0% 158.1 ± 0% +33.28% (p=0.000 n=20) geomean 293.4 515.8 +75.81% MFC after: 1 month MFC to: stable/15 Approved by: mhorne, markj (mentor) Reviewed by: fuz Sponsored by: Google LLC (GSoC 2024) Differential Revision: https://reviews.freebsd.org/D46139 --- lib/libc/riscv/string/Makefile.inc | 1 + lib/libc/riscv/string/memcpy.S | 217 +++++++++++++++++++++++++++++++++++++ 2 files changed, 218 insertions(+) diff --git a/lib/libc/riscv/string/Makefile.inc b/lib/libc/riscv/string/Makefile.inc index 5853ea114277..ebea8d1d3412 100644 --- a/lib/libc/riscv/string/Makefile.inc +++ b/lib/libc/riscv/string/Makefile.inc @@ -1,5 +1,6 @@ MDSRCS+= \ memchr.S \ + memcpy.S \ memset.S \ strlen.S \ strrchr.S diff --git a/lib/libc/riscv/string/memcpy.S b/lib/libc/riscv/string/memcpy.S new file mode 100644 index 000000000000..7536514df777 --- /dev/null +++ b/lib/libc/riscv/string/memcpy.S @@ -0,0 +1,217 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2024 Strahinja Stanisic + */ + +#include + +/* + * a0 - void* dst + * a1 - const void* src + * a2 - size_t len + */ +ENTRY(memcpy) + beqz a2, .Lreturn + + /* diff = (dstv - srcv) & 0b111 */ + sub t0, a0, a1 + andi t0, t0, 0b111 + + sltiu t1, a2, 8 + + /* we never change a0, because memcpy returns the original dst */ + mv a3, a0 + + /* len < 8 */ + bnez t1, .Lend + + /* t1 = (-dst) & 0b111 */ + neg t1, a0 + andi t1, t1, 0b111 + + sub a2, a2, t1 + + la t2, .Lduff_start + slli t3, t1, 3 + sub t2, t2, t3 + jr t2 + lb t3, 6(a1) + sb t3, 6(a3) + lb t3, 5(a1) + sb t3, 5(a3) + lb t3, 4(a1) + sb t3, 4(a3) + lb t3, 3(a1) + sb t3, 3(a3) + lb t3, 2(a1) + sb t3, 2(a3) + lb t3, 1(a1) + sb t3, 1(a3) + lb t3, 0(a1) + sb t3, 0(a3) +.Lduff_start: + + add a1, a1, t1 + add a3, a3, t1 + + beqz a2, .Lreturn + + beqz t0, .Lmemcpy8 + + /* + * a4 - size_t right_shift + * a5 - size_t left_shift + * a6 - size_t whole (number of dword stores) + */ + + /* right_shift = (src % 0b111) * 8; */ + andi a4, a1, 0b111 + slli a4, a4, 3 + + /* left_shift = 64 - right_shift */ + neg a5, a4 + + /* whole = len / 8 */ + srli a6, a2, 3 + + /* len = len % 8 */ + andi a2, a2, 0b111 + + /* t0 - uint64_t* ptr */ + + /* ptr = src & ~0b111 */ + andi t0, a1, ~0b111 + + /* src += whole * 8 */ + slli t1, a6, 3 + add a1, a1, t1 + + /* + * t1 - uint64_t low + * t2 - uint64_t high + */ + + /* low = *ptr++ */ + ld t1, (t0) + addi t0, t0, 8 + + /* low >>= right_shift */ + srl t1, t1, a4 + + beqz a6, .Llmain_skip +.Llmain: + /* high = *ptr++ */ + ld t2, (t0) + addi t0, t0, 8 + + /* whole-- */ + addi a6, a6, -1 + + /* temp = (high << left_shift) | low */ + sll t3, t2, a5 + or t3, t3, t1 + + /* low = high >> right_shift */ + srl t1, t2, a4 + + /* *dst++ = temp */ + sd t3, (a3) + addi a3, a3, 8 + + bnez a6, .Llmain + +.Llmain_skip: + +.Lend: + la t1, .Lduff_end + slli t2, a2, 3 + sub t1, t1, t2 + jr t1 + lb t2, 6(a1) + sb t2, 6(a3) + lb t2, 5(a1) + sb t2, 5(a3) + lb t2, 4(a1) + sb t2, 4(a3) + lb t2, 3(a1) + sb t2, 3(a3) + lb t2, 2(a1) + sb t2, 2(a3) + lb t2, 1(a1) + sb t2, 1(a3) + lb t2, 0(a1) + sb t2, 0(a3) +.Lduff_end: + +.Lreturn: + ret + +/* exectued when dst - src is multiple of 8 + * a0 - void* dst + * a1 - const void* src + * a2 - size_t len + */ +.Lmemcpy8: + + beqz a2, .Lreturn + + slti t0, a2, 128 + bnez t0, .Llmain8_64_skip + + /* a4 - uint64_t* end_unroll */ + + /* end_unroll = dst + len / 64 * 64 */ + andi t0, a2, ~0b111111 + add a4, a3, t0 + + /* len = len % 64 */ + andi a2, a2, 0b111111 + +.Llmain8_64: + ld t0, 0(a1) + ld t1, 8(a1) + ld t2, 16(a1) + ld t3, 24(a1) + sd t0, 0(a3) + sd t1, 8(a3) + sd t2, 16(a3) + sd t3, 24(a3) + ld t0, 32(a1) + ld t1, 40(a1) + ld t2, 48(a1) + ld t3, 56(a1) + sd t0, 32(a3) + sd t1, 40(a3) + sd t2, 48(a3) + sd t3, 56(a3) + addi a3, a3, 64 + addi a1, a1, 64 + bne a3, a4, .Llmain8_64 +.Llmain8_64_skip: + + beqz a2, .Lreturn + + /* a4 - uint64_t* end_align */ + + /* end_align = (dst + len) & ~0b111 */ + add a4, a3, a2 + andi a4, a4, ~0b111 + + /* len = len % 8 */ + andi a2, a2, 0b111 + + beq a3, a4, .Llmain8_skip +.Llmain8: + ld t0, (a1) + sd t0, (a3) + addi a3, a3, 8 + addi a1, a1, 8 + bne a3, a4, .Llmain8 +.Llmain8_skip: + + la t1, .Lduff_end + slli t2, a2, 3 + sub t1, t1, t2 + jr t1 +END(memcpy) From nobody Fri Oct 31 12:48:37 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cygl95V4sz6Fm6b; Fri, 31 Oct 2025 12:48: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cygl93f04z42bD; Fri, 31 Oct 2025 12:48:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761914917; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lKqLnmi3VFGgTgaRXFtefdc0CfUJNS7zY7l4AbP2P3E=; b=Qm8KGditHZHbMzq+Ru5onXgda3e15l7thKkm24nJ6U2MCmwV6PMnm6PCLwi041xJvKGtKs UM4iABJfWlbvXUOn7mA4kK8HJn/181R/GuSHvKfDOneOABW6d+jLIWttbtKjOrvShY8EqA 5wltTxJfamPOa5XIbGaryR/lsXFZ3p7cd203gXwmHpxFIIIMvlMpxettUO1SdA56jtmleh jq2aBHbhGU1BSyQY5XGjkQ1E4bClgIhxKl9y9zFQbRuihfdgGUTPrivFoG7C31LNBOc5bB r5mo8ndia8tINi3MfqA1xf15Nq15ZZqeGRY3cW75a96ofjtGXQqDqXjkLM/MHA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761914917; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lKqLnmi3VFGgTgaRXFtefdc0CfUJNS7zY7l4AbP2P3E=; b=IuVW7vhPoJu9s8NK4+a35amKSa0ir83xQnz+wpr/haX2Y4o2ddrNEDbYMcj55wyTR6u6dr QSiWP709oDlkCF+sbRzdIiZsQq2cKdVCEITfc9r90FDzUDUDJP83mA2/Mg7nIGdgBwYrL1 86ZVuJWpl8/6H0QNpVLh46WtdfTvbgOlVbsg3RuJqJ2svF3s4mfrUk1X6+qrq8AEk49ryg NFsMvfUNJjXABEdxJUWEjaO1UkhHQeCvI1WwoZyaL7Y7vtyjxuDNohc7jnUWkoAwdBe+EI /0ddBusGcUuYDb1RxSSVV92leor8B8jSOJ3omGnUu3UJn/C7l/u8dFogxy+7ig== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761914917; a=rsa-sha256; cv=none; b=l6fyDIdxhnaQGgnjBKnzuSFdnyymsqr979dsxjy6unaZFAxnaNkcES0Stdj7uGoWQjWcfI LDIETZTH8d0n413VRqsWTIzbGn/aF5cxhfto9pBI575KJHpH+d5keRnIYAfP2fHFEVU76M JSJdMJzyR60Rny79NDez80hsKorGSM2t8v2uAslaRQBs445NDnZGPQr+wm/yRUBCLmeE22 sm0X4eptxbJABMKtfwIusKtgR17E9i0IGLnw4NlSkoSj36oa2VOaiCgqdXARXLvXn+7ZzF TbQ+FYurklAw0TZ5VHK+pAl+mb6fzOlP7EuvFySyg75+LvU7uYHS8b1i7vx0vA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cygl937fPz17QV; Fri, 31 Oct 2025 12:48: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 59VCmbm2042712; Fri, 31 Oct 2025 12:48:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59VCmbiU042709; Fri, 31 Oct 2025 12:48:37 GMT (envelope-from git) Date: Fri, 31 Oct 2025 12:48:37 GMT Message-Id: <202510311248.59VCmbiU042709@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Clausecker Subject: git: c80dfcb37261 - main - simd.7: add scalar memcpy() for RISC-V to manpage List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c80dfcb37261e5e8575d41801e64a39b7db6f4f8 Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=c80dfcb37261e5e8575d41801e64a39b7db6f4f8 commit c80dfcb37261e5e8575d41801e64a39b7db6f4f8 Author: Strahinja StaniÅ¡ić AuthorDate: 2024-07-24 23:36:09 +0000 Commit: Robert Clausecker CommitDate: 2025-10-31 12:47:59 +0000 simd.7: add scalar memcpy() for RISC-V to manpage MFC after: 1 month MFC to: stable/15 Approved by: mhorne, markj (mentor) Reviewed by: fuz Sponsored by: Google LLC (GSoC 2024) Differential Revision: https://reviews.freebsd.org/D46139 --- share/man/man7/simd.7 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/man/man7/simd.7 b/share/man/man7/simd.7 index 5978d4b6655e..c09ed0edb960 100644 --- a/share/man/man7/simd.7 +++ b/share/man/man7/simd.7 @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE . -.Dd October 8, 2025 +.Dd October 16, 2025 .Dt SIMD 7 .Os .Sh NAME @@ -61,7 +61,7 @@ Enhanced functions are present for the following architectures: .It memchr Ta A Ta Ta S1 Ta Ta Ta S .It memcmp Ta A Ta S Ta S1 Ta S .It memccpy Ta A Ta Ta S1 -.It memcpy Ta A Ta S Ta S Ta S Ta SV +.It memcpy Ta A Ta S Ta S Ta S Ta SV Ta S .It memmove Ta A Ta S Ta S Ta S Ta SV .It memrchr Ta A Ta Ta S1 .It memset Ta A Ta S Ta S Ta S Ta Ta S From nobody Fri Oct 31 12:48:39 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cyglD0pdCz6FmZR; Fri, 31 Oct 2025 12:48: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cyglC5TNlz42YM; Fri, 31 Oct 2025 12:48:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761914919; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eFdejViRra1zochkkCDlZB+DE13MiKdvkfazrE1yUfQ=; b=QKUjxK3ZORnaiLDcKYclkkhK3fxFMAme5O3b5h5ntrcEoKEo8dCxJRoyC9WofF4ubkiP3v T1OPDb/6AAQbFBjsZwGYI1RvyAAfyeOIQj2UDiMnu5+w7mKLhtF9D8zZDD8gRH64R0noR7 7X7fAO0QqX7mqc+1ZA9467CS1mTZPD2HwaeQ1A8OEXSZqRBIOrUyeTluh+0XWpvV8bS3J+ hpBVILlTSjAWNVTAyOMkrkvtk/ueriobUw0gzjf8Vzm3Tz/T8s4PgjIWzu4ZhUvsP4CDTP ixrl0UtRLty2vQgIA7weBoezHFDeE6qeNuHbCOX322Src/z7btvRw7DGgFleSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761914919; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eFdejViRra1zochkkCDlZB+DE13MiKdvkfazrE1yUfQ=; b=GHtF6Y6tMS/sf1jf/gC+P0xr+x7DBT/CeRBboPWdwQL88P+p0QTk1WlxW7k2e2yfbbM69C r2N/dyRoahjoKqog2pH9hlXjw6VknO761KWrootktZUqHmIjVbqEBo0v27q/RXupeMHlmd zwTs5Ts9G4hcI21NRhNtqNfD894W/1ptO/3q+P5Zpy1zdWBluS9BoBRera2JsTrmFtvmRt 5xMx/OPrMmNn4j+PsLEkXpAFRpVaF8y/YHMw6QTGMDh4iMSxerTz6Nay557j0JM6h2cUGF b9K4DIsDHYrBqm+ZGFzCVKBB9EtkhNMCPG9c20O3cFDmBm3GgVU4y07N8D/o0A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761914919; a=rsa-sha256; cv=none; b=CrqfKVnhTliDS6Qle6UXj3IY+ld6gmQ6nGGTOBjQYjS7Rh2JSgK3Fl0ClhuklfWjGjZnds smQ5xhC4AQTe7z9WcuwWnzmXgIqwyUAeVkC4+DLB0JYrCE6GZ5axoCogejConTzxs+tbQY tks/p5TJ0Oqy/w/4VLte5plMgQD9xpyPAPAQ9FoGmfWVtZbs6G3CwrUWvAJiJV8TPd+EtM H2YCcxg5LMrOhZ4tJau83HnVzGztkSJs7ISNlpuN93MnVPsRPONNRDwWfvxEC0Iyi/Sd1P CGnlFYnu2lqHZb3YxwbhpwhpN0b37vMJNt2i6wrp1m0MqTOLm9jXDiSDDDZMHg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cyglC4hczz187j; Fri, 31 Oct 2025 12:48:39 +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 59VCmdvj042786; Fri, 31 Oct 2025 12:48:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59VCmdVa042783; Fri, 31 Oct 2025 12:48:39 GMT (envelope-from git) Date: Fri, 31 Oct 2025 12:48:39 GMT Message-Id: <202510311248.59VCmdVa042783@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Clausecker Subject: git: 474a80d3ff85 - main - simd.7: add scalar strnlen() for RISC-V to manpage List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 474a80d3ff8516df5c379fa7f8e563cecb032060 Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=474a80d3ff8516df5c379fa7f8e563cecb032060 commit 474a80d3ff8516df5c379fa7f8e563cecb032060 Author: Strahinja StaniÅ¡ić AuthorDate: 2024-08-05 13:51:09 +0000 Commit: Robert Clausecker CommitDate: 2025-10-31 12:48:00 +0000 simd.7: add scalar strnlen() for RISC-V to manpage MFC after: 1 month MFC to: stable/15 Approved by: mhorne, markj (mentor) Reviewed by: fuz, Jari Sihvola Sponsored by: Google LLC (GSoC 2024) Differential Revision: https://reviews.freebsd.org/D46230 --- share/man/man7/simd.7 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/man/man7/simd.7 b/share/man/man7/simd.7 index c09ed0edb960..6695a137da77 100644 --- a/share/man/man7/simd.7 +++ b/share/man/man7/simd.7 @@ -80,7 +80,7 @@ Enhanced functions are present for the following architectures: .It strncat Ta A Ta Ta S1 .It strncmp Ta A Ta S Ta S1 Ta S .It strncpy Ta Ta Ta S1 Ta Ta S2 -.It strnlen Ta A Ta Ta S1 +.It strnlen Ta A Ta Ta S1 Ta Ta Ta S .It strrchr Ta A Ta Ta S1 Ta S Ta Ta S .It strpbrk Ta S Ta Ta S2 .It strsep Ta S Ta Ta S2 From nobody Fri Oct 31 12:48:38 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cyglD0Q69z6Fm6g; Fri, 31 Oct 2025 12:48: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cyglB6pPfz42d6; Fri, 31 Oct 2025 12:48:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761914919; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LD5PIcOPAYZ0O0nU7rSP9zGKMeibaciOF8QVC4lJh0g=; b=vZ4e4ttoSsy31zbbmjAj4IHGcZWhGXZEBciC+CwMHDawLWzn0dsJ+3MNo5PTMT1JvJs7b/ b/0x2gsDh2yzlvxLqDWy8OcrTRAFjVkTzeXHujkuspxqZIFuOjatMMTc6knNFhe8migjnY t5TIVTCZoPImT3N8UvCDGwdNd//PzAToFjM002N63B1C7OMqkyT5DuUYjGAIC60fRz2mSV cesgjNm6PWS1o6KVOhYRa4yEA9fntClMBkEPAHBJQATbuVWhJVOAKLKKbdLx+lCjtVNioW oATHUsHxpvnHXykw0VQKmFrW2oBaj5pt5jL0hZAKJW1czhrklGxY4HnzK0S2Cg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761914919; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LD5PIcOPAYZ0O0nU7rSP9zGKMeibaciOF8QVC4lJh0g=; b=q1Y0GWD+gCv40vMx1dcnA61KAMFCuv9o6UdBYDI6l/AVyhcK+oGKkslwHKiUBw8VrQb04v lPAFWvtoKSczfwRwAbh5/tehq6ffxeJclYIt9AtLN2zBmyWNKLG+sz5YXQqo5rnhXEVE4z AzWqqSB17XY3BelCLD7vbm71/ENIx9z7H6y0nq0pPcX+OJbBGOvIrmm0ygdLXUaZjMSshR 4AA03919715Vr1dWwoI4b9rcZmHSWPqymGSJuL9buDFcJHjqmXtAspkkMaQdaK30uRPLoo 08CmjzjV7HTPYQgWxBm+HPhjlCbFjPLGofbjjr6MS8QLX3GxX/Hg2XQO78neeg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761914919; a=rsa-sha256; cv=none; b=azSFflpFRaPQqxz1fskfWeU84U28mty5l9iUNCFWfJORWSaxmmJJngKKiIxN+YYtZHg6Wc rK8xplVqPy1yyM9jGa05/3ow/gHAZTRd08XpF+Qj+2nxAuhByyqo8xyOKha+cmg+/9a7Od T/ymwWtZ7M85hUaCDzf4IZ7Mnu6lJe5O7GtVIOxbqMwnLDBAsx7w/77a8rnrUq9xmhCSGq 6DnLnDDegniBNKkOvFn2Yg4PM6hsm6LE0lroYLz3GZwBCEnz+JZ7ctnOMx8oCw+g+NG+55 WhY/RVKJiX6wYx0uIMAIvVCNT26VMKwI5REhWxqLaof4Nmu/AL+GgPXSGPF4pQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cyglB3S2fz17x8; Fri, 31 Oct 2025 12:48: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 59VCmckt042752; Fri, 31 Oct 2025 12:48:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59VCmceD042749; Fri, 31 Oct 2025 12:48:38 GMT (envelope-from git) Date: Fri, 31 Oct 2025 12:48:38 GMT Message-Id: <202510311248.59VCmceD042749@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Clausecker Subject: git: 5a52f0704435 - main - libc: scalar strnlen() in RISC-V assembly List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5a52f0704435b089199201be0029e0d7c9ef2fce Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=5a52f0704435b089199201be0029e0d7c9ef2fce commit 5a52f0704435b089199201be0029e0d7c9ef2fce Author: Strahinja StaniÅ¡ić AuthorDate: 2024-08-04 15:12:00 +0000 Commit: Robert Clausecker CommitDate: 2025-10-31 12:47:59 +0000 libc: scalar strnlen() in RISC-V assembly Optimized implementation of strnlen() in RISC-V assembly Performance was measured using strperf on a HiFive Unmatched (SiFive HF105-001) board. os: FreeBSD arch: riscv │ strnlen_baseline │ strnlen_scalar │ │ sec/op │ sec/op vs base │ Short 787.0µ ± 0% 430.9µ ± 1% -45.24% (p=0.000 n=20) Mid 621.6µ ± 0% 195.1µ ± 1% -68.61% (p=0.000 n=20) Long 569.4µ ± 1% 100.6µ ± 0% -82.34% (p=0.000 n=20) geomean 653.1µ 203.7µ -68.81% │ strnlen_baseline │ strnlen_scalar │ │ MiB/s │ MiB/s vs base │ Short 158.8 ± 0% 290.1 ± 1% +82.62% (p=0.000 n=20) Mid 201.1 ± 0% 640.6 ± 1% +218.59% (p=0.000 n=20) Long 219.5 ± 1% 1242.9 ± 0% +466.19% (p=0.000 n=20) geomean 191.4 613.5 +220.57% MFC after: 1 month MFC to: stable/15 Approved by: mhorne, markj (mentor) Reviewed by: fuz, Jari Sihvola Sponsored by: Google LLC (GSoC 2024) Differential Revision: https://reviews.freebsd.org/D46230 --- lib/libc/riscv/string/Makefile.inc | 1 + lib/libc/riscv/string/strnlen.S | 143 +++++++++++++++++++++++++++++++++++++ 2 files changed, 144 insertions(+) diff --git a/lib/libc/riscv/string/Makefile.inc b/lib/libc/riscv/string/Makefile.inc index ebea8d1d3412..4b97490a5494 100644 --- a/lib/libc/riscv/string/Makefile.inc +++ b/lib/libc/riscv/string/Makefile.inc @@ -3,4 +3,5 @@ MDSRCS+= \ memcpy.S \ memset.S \ strlen.S \ + strnlen.S \ strrchr.S diff --git a/lib/libc/riscv/string/strnlen.S b/lib/libc/riscv/string/strnlen.S new file mode 100644 index 000000000000..c0fd959548ff --- /dev/null +++ b/lib/libc/riscv/string/strnlen.S @@ -0,0 +1,143 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2024 Strahinja Stanisic + */ + +#include + +/* + * a0 - const char *s + * a1 - size_t maxlen; + */ +ENTRY(strnlen) + /* + * a0 - const char *s; + * a1 - size_t maxlen; + * a2 - uint64_t *ptr; + * a3 - char iter[8]; + * a4 - uint64_t *end_align; + * a5 - uint64_t *end_unroll; + */ + + beqz a1, .Lnot_found + + /* ptr = s & ~0b111 */ + /* t0 = 0x0101010101010101 */ + /* t1 = 0x8080808080808080 */ + /* end_align = (s + maxlen + 7) & ~0b111 */ + /* mask_start = t0 >> ((-s.value) << 3) */ + add a4, a0, a1 + li t0, 0x01010101 + addi a4, a4, 7 + slli t1, t0, 32 + neg t2, a0 + andi a4, a4, ~0b111 + or t0, t0, t1 + slli t2, t2, 3 + andi a2, a0, ~0b111 + slli t1, t0, 7 + srl t2, t0, t2 + + /* if pointer is aligned skip to loop */ + beq a0, a2, .Lskip_start + + /* iter = *ptr */ + ld a3, (a2) + + /* iter = iter | mask_start */ + or a3, a3, t2 + + /* has_zero */ + not t2, a3 + sub a3, a3, t0 + and t2, t2, t1 + and a3, a3, t2 + + addi a2, a2, 8 + bnez a3, .Lfind_zero + +.Lskip_start: + /* end_unroll */ + sub t2, a4, a2 + andi t2, t2, ~0b1111 + add a5, a2, t2 + + /* while (ptr != end_unroll) */ + beq a2, a5, .Lskip_loop +.Lloop: + ld a3, (a2) + ld a6, 8(a2) + + /* has_zero */ + not t2, a3 + not t3, a6 + sub a3, a3, t0 + sub a6, a6, t0 + and t2, t2, t1 + and t3, t3, t1 + and a3, a3, t2 + and a6, a6, t3 + + addi a2, a2, 8 + bnez a3, .Lfind_zero + + mv a3, a6 + + addi a2, a2, 8 + bnez a3, .Lfind_zero + + bne a2, a5, .Lloop + +.Lskip_loop: + + beq a2, a4, .Lnot_found + + ld a3, (a2) + + /* has_zero */ + not t2, a3 + sub a3, a3, t0 + and t2, t2, t1 + and a3, a3, t2 + + + addi a2, a2, 8 + beqz a3, .Lnot_found + +.Lfind_zero: + + /* move ptr back */ + addi a2, a2, -8 + + /* isolate lowest set bit */ + neg t0, a3 + and a3, a3, t0 + + li t0, 0x0001020304050607 + srli a3, a3, 7 + + /* lowest set bit is 2^(8*k) + * multiplying by it shifts the idx array in t0 by k bytes to the left */ + mul a3, a3, t0 + + /* highest byte contains idx of first zero */ + srli a3, a3, 56 + + /* zero_idx */ + sub a2, a2, a0 + add a2, a2, a3 + + /* min(zero_idx, maxlen) */ + sub a2, a2, a1 + srai t1, a2, 63 + and a2, a2, t1 + add a0, a1, a2 + + ret + +.Lnot_found: + mv a0, a1 + ret + +END(strnlen) From nobody Fri Oct 31 12:48:40 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cyglF2KRyz6FmMX; Fri, 31 Oct 2025 12:48: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cyglD66qDz42Yb; Fri, 31 Oct 2025 12:48:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761914920; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aNtzI8v9FyELyxK6ORV6+E2AO/kf8Q13kZYq6Wwfc+g=; b=fMJ8jebBCpgbWNdgyd5PLDiJZ1ZI4uaH6d6DzOxMoYjEan0tzppWNek4hq4Y2XtWpSIVGf FZJp+hbvcJRtuFAmtdo3HITUfhiiSXfDEmfD9v0jzmHmBMiEB2tTeLMYsueGpEF7Q0AZ0n bkCV/AF90PlS5cVYLhvAaRIxG1zxIQkuXSwfTuyue7Vno7LvvSgeR7GfEALM35Kt1XGeRo O/yUixqFsPRAx4hsbVwUZjUgknDjF4Ae+0qxYh1WQLpVxjHgOshZHg74HbEwwylr+6C+hv WAu6WQhLUvpkTssk89kATrz/LONga4akRBXByDPEsSs1gnA0of8AYHfnyNAkmw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761914920; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aNtzI8v9FyELyxK6ORV6+E2AO/kf8Q13kZYq6Wwfc+g=; b=QTTMh0Yj3EYn1cR8AEbOSUhN4vTbPKLa5N6My6fqrw8TASMs8HlKD89n/8EYBrID4FeBJe oPw+3LZM+9gp3Ts2C2P3B/pGlAxS4A53UeWvDW/PNLymPAK5cPwBc39jOnwwB7/TwXpLOR SqWp7IlLivfnFWfrVNXjIvnTxyJcl9TFfiygLz6LLCAdcCstTx72zg0V2C5azQxZdAf3WQ f5RNM9NnLZHSkHupLPAtjkzH7+Xq1ujuAinWahn9OPj5pgmTU1/auTVg+MWzFM0W1blyI5 uWhqq73beVVUWHLO413aNLL0NQ/IkS+y5kKAkwrOREISrvtHZu4abfw1gjIqRw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761914920; a=rsa-sha256; cv=none; b=jPlkfDiYD8dNcHqqO9nq7t9kQBaXuzGISI9lJ69SpPoDaZjdqTwEgtQXRxYOiKC0M9TnKg vVBC74/zV8oQgV/L+Uptd90IjjmQE6GY4t2N8R+5837PoPUt/02fZ/sIU3HFoHxmgwY+Or KoHjcUjq2qK9VRxAzLCQME5QREncGaVEz9YltSG3b/8Be+6KOSwEYc0mEcNaQRoU9F4etZ xSH8bts2OdKu56gocf+w4L1y6Tsu7Mek4Ul+bIi3vfhvJIgh+Fl/ifguUxy+iON+5baco0 OIQXEAXM0BUclHCyDzgmFxesaHT3qxhlE4N+lpYS3uMImBh0FeVDO/Wulvb6XA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cyglD5SlSz187k; Fri, 31 Oct 2025 12:48: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 59VCmeA4042820; Fri, 31 Oct 2025 12:48:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59VCmePV042817; Fri, 31 Oct 2025 12:48:40 GMT (envelope-from git) Date: Fri, 31 Oct 2025 12:48:40 GMT Message-Id: <202510311248.59VCmePV042817@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Clausecker Subject: git: 08af0bbc9c7d - main - libc: scalar strchrnul() in RISC-V assembly List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 08af0bbc9c7d71bbaadb31ad31f8492f40537c5c Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=08af0bbc9c7d71bbaadb31ad31f8492f40537c5c commit 08af0bbc9c7d71bbaadb31ad31f8492f40537c5c Author: Strahinja StaniÅ¡ić AuthorDate: 2024-07-19 17:58:04 +0000 Commit: Robert Clausecker CommitDate: 2025-10-31 12:48:00 +0000 libc: scalar strchrnul() in RISC-V assembly Scalar implementation of strchrnul() in RISC-V assembly and changes to the corresponding manpage. Performance was benchmarked on a HiFive Unmatched (SiFive HF105-001) board using: https://github.com/clausecker/strperf os: FreeBSD arch: riscv │ strchrnul_baseline │ strchrnul_scalar │ │ sec/op │ sec/op vs base │ Short 680.2µ ± 5% 435.3µ ± 0% -36.01% (p=0.000 n=20) Mid 314.7µ ± 3% 221.4µ ± 0% -29.63% (p=0.000 n=20) Long 152.3µ ± 0% 138.5µ ± 0% -9.08% (p=0.000 n=20) geomean 319.5µ 237.2µ -25.75% │ strchrnul_baseline │ strchrnul_scalar │ │ MiB/s │ MiB/s vs base │ Short 183.8 ± 5% 287.2 ± 0% +56.27% (p=0.000 n=20) Mid 397.3 ± 3% 564.6 ± 0% +42.12% (p=0.000 n=20) Long 820.5 ± 0% 902.5 ± 0% +9.99% (p=0.000 n=20) geomean 391.3 527.0 +34.68% MFC after: 1 month MFC to: stable/15 Approved by: markj (mentor) Reviewed by: fuz Sponsored by: Google LLC (GSoC 2024) Differential Revision: https://reviews.freebsd.org/D46047 --- lib/libc/riscv/string/Makefile.inc | 1 + lib/libc/riscv/string/strchrnul.S | 116 +++++++++++++++++++++++++++++++++++++ 2 files changed, 117 insertions(+) diff --git a/lib/libc/riscv/string/Makefile.inc b/lib/libc/riscv/string/Makefile.inc index 4b97490a5494..719f22f6077f 100644 --- a/lib/libc/riscv/string/Makefile.inc +++ b/lib/libc/riscv/string/Makefile.inc @@ -4,4 +4,5 @@ MDSRCS+= \ memset.S \ strlen.S \ strnlen.S \ + strchrnul.S \ strrchr.S diff --git a/lib/libc/riscv/string/strchrnul.S b/lib/libc/riscv/string/strchrnul.S new file mode 100644 index 000000000000..8abba71c4199 --- /dev/null +++ b/lib/libc/riscv/string/strchrnul.S @@ -0,0 +1,116 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2024 Strahinja Stanisic + */ + +#include + + .weak strchrnul + .set strchrnul, __strchrnul + +/* + * a0 - const char *str + * a1 - int c; + */ +ENTRY(__strchrnul) + /* + * a0 - const char *ptr; + * a1 - char cccccccc[8]; + * a2 - char iter[8]; + * a3 - char mask_end + */ + + /* int to char */ + andi a1, a1, 0xFF + + /* t0 = 0x0101010101010101 */ + li t0, 0x01010101 + slli t1, t0, 32 + or t0, t0, t1 + + /* t1 = 0x8080808080808080 */ + slli t1, t0, 7 + + /* spread char across bytes */ + mul a1, a1, t0 + + /* align_offset */ + andi t2, a0, 0b111 + + /* align pointer */ + andi a0, a0, ~0b111 + + /* if pointer is aligned skip to loop */ + beqz t2, .Lloop + + ld a2, (a0) + + /* mask_start calculation */ + slli t2, t2, 3 + neg t2, t2 + srl t2, t0, t2 + + /* fill bytes before start with non-zero */ + or a3, a2, t2 + + xor a2, a2, a1 + or a2, a2, t2 + + /* has_zero for \0 */ + not t3, a3 + not t2, a2 + sub a3, a3, t0 + sub a2, a2, t0 + and a3, a3, t3 + and a2, a2, t2 + and a3, a3, t1 + and a2, a2, t1 + + + /* if \0 or c was found, exit */ + or a2, a2, a3 + addi a0, a0, 8 + bnez a2, .Lfind_char + + +.Lloop: + ld a2, (a0) + + /* has_zero for both \0 or c */ + xor a3, a2, a1 + + not t2, a2 + not t3, a3 + sub a2, a2, t0 + sub a3, a3, t0 + and a2, a2, t2 + and a3, a3, t3 + and a2, a2, t1 + and a3, a3, t1 + + /* if \0 or c was found, exit */ + or a2, a2, a3 + addi a0, a0, 8 + beqz a2, .Lloop + +.Lfind_char: + addi a0, a0, -8 + + /* isolate lowest set bit */ + neg t0, a2 + and a2, a2, t0 + + li t0, 0x0001020304050607 + srli a2, a2, 7 + + /* lowest set bit is 2^(8*k) + * multiplying by it shifts the idx array in t0 by k bytes to the left */ + mul a2, a2, t0 + + /* highest byte contains idx of first zero */ + srli a2, a2, 56 + + add a0, a0, a2 + ret +END(__strchrnul) From nobody Fri Oct 31 12:48:42 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cyglH3RMSz6FmMY; Fri, 31 Oct 2025 12:48: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cyglH0y41z42kd; Fri, 31 Oct 2025 12:48:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761914923; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mjw+EPNGHIFmsJWGuQNQN4ULw42YP9lECUcx9sEfNwQ=; b=f7PTXQPYpXD4W4GzPy/umKVLQHV8KILIx7thoWxLc8kcjR7GgtSzgdJGmP8AsJtbyGMLzI CZBOdcpRC8NjziSCxfqDx3gu8a1teVRTQoYh2ecmaf7Eo4rN3dIUkPXAbd8YgM7tRsUeW6 z6TbvAjVdWGbGFvdqEMCypwggbmxy3fULKszIsHyqnLACBb0oU3mDEyN0GUul+xqTno+S+ MPchWyij4v8M+yLbTMoFaCoilXH5o+7Nm/b6oHdq3pXuQw0Y+3J0Ef6OYPHgw42UGqhUFl 2q8vajj4m1WFOA3VTkblXJKkPNb2w1FIDolcLd6edwblBCpQlZ49WXZTZklMdA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761914923; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mjw+EPNGHIFmsJWGuQNQN4ULw42YP9lECUcx9sEfNwQ=; b=Ex1ey2dMUCya6nYIqgUwwjvsrstIgMuIjIUYnji4CTxwlcjtIEDkKPpNfaE+1lUiLZTaan MrDiYu7sShbV55LH3qwmBmU++bYt8jP3a2nhvlBpuXxzzHJoBrMDTIS5gSvO67knFmxAQS XD1mT3Ib2OJlpoZre+A/rzL1CMwSvuhbWmSE3KOSXuwBV53AOoDtwY2G1AGis4KXBLuIyK jvvqJb3jvocO8geC2fC1PTQ5v99jkdNyhD8diOnFORDo+BL/mzaI57FMGF+wNGAdcms3iE sPzRetUYsoPzSYXlZ8APLFmWYTVGv+nojqlKGumtkUc7n0weRBIQSkQp/Zq3qw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761914923; a=rsa-sha256; cv=none; b=M+9Bec9Vo5nkc9OrumquLMps3cpbT8sL6o+gljjyKWT9uiWy4l8AAyj42frktRkcKS2+u6 BOwkKb9MK4HK4w/bcJyXw+0cPeruNdisO0vhxgWsnzTZkzvXLPvDfMVQ622qkQSNFTneX8 ZxtxEVHR+pEa3Q9HIM/WADHclmNzu1cM3B+/d6YoDqxa88tSVJTEhmUjS/UMCcSUflx+TO TtTx+zLUGvscQK8WNkLs4KB02KNBlpwqlHM/AC524YO10Fm2rf8/Z+y4YfuYi6KNmjQW4h 00Ek77c4+L6eofofV/wIxwOjIssh3bOofkuuUrkP23EJb2VB3Fu4EMWqrFt+tg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cyglH0L3Dz17v3; Fri, 31 Oct 2025 12:48: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 59VCmg3S042887; Fri, 31 Oct 2025 12:48:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59VCmgeg042884; Fri, 31 Oct 2025 12:48:42 GMT (envelope-from git) Date: Fri, 31 Oct 2025 12:48:42 GMT Message-Id: <202510311248.59VCmgeg042884@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Clausecker Subject: git: b5dbf3de5611 - main - libc/riscv64: implement bcopy() and bzero() through memcpy() and memset() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b5dbf3de561189140c73f915bd50c28ea69a1e19 Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=b5dbf3de561189140c73f915bd50c28ea69a1e19 commit b5dbf3de561189140c73f915bd50c28ea69a1e19 Author: Robert Clausecker AuthorDate: 2025-10-21 18:55:41 +0000 Commit: Robert Clausecker CommitDate: 2025-10-31 12:48:00 +0000 libc/riscv64: implement bcopy() and bzero() through memcpy() and memset() This picks up the accelerated string functions written by strajabot@. Event: Google Summer of Code 2024 MFC after: 1 month MFC to: stable/15 See also: 79e01e7e643c9337d8d6046b6db7df674475a099 Approved by: markj (mentor) Differential Revision: https://reviews.freebsd.org/D53248 --- lib/libc/riscv/string/Makefile.inc | 2 ++ lib/libc/riscv/string/bcopy.c | 14 ++++++++++++++ lib/libc/riscv/string/bzero.c | 14 ++++++++++++++ 3 files changed, 30 insertions(+) diff --git a/lib/libc/riscv/string/Makefile.inc b/lib/libc/riscv/string/Makefile.inc index 719f22f6077f..6dae6b2cb62d 100644 --- a/lib/libc/riscv/string/Makefile.inc +++ b/lib/libc/riscv/string/Makefile.inc @@ -1,4 +1,6 @@ MDSRCS+= \ + bcopy.c \ + bzero.c \ memchr.S \ memcpy.S \ memset.S \ diff --git a/lib/libc/riscv/string/bcopy.c b/lib/libc/riscv/string/bcopy.c new file mode 100644 index 000000000000..0dee529fb9df --- /dev/null +++ b/lib/libc/riscv/string/bcopy.c @@ -0,0 +1,14 @@ +/*- + * Public domain. + */ + +#include + +#undef bcopy /* _FORTIFY_SOURCE */ + +void +bcopy(const void *src, void *dst, size_t len) +{ + + memmove(dst, src, len); +} diff --git a/lib/libc/riscv/string/bzero.c b/lib/libc/riscv/string/bzero.c new file mode 100644 index 000000000000..d82f3061865b --- /dev/null +++ b/lib/libc/riscv/string/bzero.c @@ -0,0 +1,14 @@ +/*- + * Public domain. + */ + +#include + +#undef bzero /* _FORTIFY_SOURCE */ + +void +bzero(void *b, size_t len) +{ + + memset(b, 0, len); +} From nobody Fri Oct 31 12:48:41 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cyglG21q1z6Fm6q; Fri, 31 Oct 2025 12:48: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cyglG08yCz42WD; Fri, 31 Oct 2025 12:48:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761914922; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KHAriw0ryy82nDkfGOeZlGrg2i+zg/UW0SV+7eMsm88=; b=LxgBwoVeDWQur0hOzzBkXCR8AYDmJ/yLE7ecgGj4kxyMRj3gYiitsmy//c6ddz2RVj56xK M3vP0ui6qLafY2G0tjYiIbb9N39pWzq+VAz2y8K72nlGSaFZlf8NVwJ0wxPJGKw15aUKcP /ID9EUVQKxVifWKUU5zDqeV8Q1XNpN99KhHPwii639tXYixD2aV0Dkvgci23OIMtCIsoZL OvIbgsVZH1I3ESzMzVHxCOg2ARmJc9Dha2qUgM1pmxZ+eTxIIqRfZybORzmhBhGMROu9kW 5kcMYayBY6spd+QFRcIVcdDtDYkIPRSJ6ZdyC8+oF+aDrzRWDLECcrkYLvxifg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761914922; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KHAriw0ryy82nDkfGOeZlGrg2i+zg/UW0SV+7eMsm88=; b=RkQRIqqfya9tt+6BGgze9UmGnA3IWSMWdaGn05DgCwTkVVDpMrUIHVbXmNkfHI3mNvoUAc aWqIoEbSBiWBPEGAbwiC6MrhFYkUJeFIm6HLzCZ2FQNzJHjcvkP4Zv81qUCaP5Pdh8lKIS dySVbCk625fZKWXwbxy3fcBDI3Neze30g/UBu839lCyAAC3IzXvlPCkrn0EKAH239CVMjJ ZGHtN0oD1CInffXcqHRy4keFcAKiVlxj7aeZh6fcPqhK43Jbi13ecvqjXWBaFWYYPRvQ4+ YDAzd7GJ8EBApPVT4Nmunp8ZhAQ1FTvZnRlAa7uHGddLhVuKEH8ini9Mr4vHQg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761914922; a=rsa-sha256; cv=none; b=n0WRIb6QzOK7ABjXuil5n61XlcmNAUNZExQsn8vc1GGbcSitXqFq3zN45v4GUj3+Fr+3Zz Ar8AZ20QTIFba5v2xoYAF1K3CjY6nVqN3Ca6NzQImGJCBeYXDA1rGDQ9zOlw/sr7DTgWAq dat3P4NQfMLISWgT8vtjHOxrBNO0OvKkkv+U5LMjhkJvbtdEiwVzQnAKJFLucIRqGu6fBP xZkJInUOJ68ztT57Gaq10YD9yVux11x+XqCeI8pL+vb+zynDv6qv3go6NUQSbeN5892agR fnfqzK2nRuUglaN57BOrjZg90glNIi6vFXS3ot9VmEt1Yktg+q/q25k29MQBYA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cyglF6S97z187l; Fri, 31 Oct 2025 12:48: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 59VCmfMr042854; Fri, 31 Oct 2025 12:48:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59VCmfJI042851; Fri, 31 Oct 2025 12:48:41 GMT (envelope-from git) Date: Fri, 31 Oct 2025 12:48:41 GMT Message-Id: <202510311248.59VCmfJI042851@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Clausecker Subject: git: 39fef5b9fa94 - main - simd.7: add scalar strchrnul() for RISC-V to manpage List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 39fef5b9fa943f301776e0b0bf406cedd7c29af2 Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=39fef5b9fa943f301776e0b0bf406cedd7c29af2 commit 39fef5b9fa943f301776e0b0bf406cedd7c29af2 Author: Strahinja StaniÅ¡ić AuthorDate: 2024-07-19 18:01:51 +0000 Commit: Robert Clausecker CommitDate: 2025-10-31 12:48:00 +0000 simd.7: add scalar strchrnul() for RISC-V to manpage index() and strchr() are implemented by calling strchrnul(), so they also get to be marked as platform-specific. MFC after: 1 month MFC to: stable/15 Approved by: markj (mentor) Reviewed by: fuz Sponsored by: Google LLC (GSoC 2024) Differential Revision: https://reviews.freebsd.org/D46047 --- share/man/man7/simd.7 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/share/man/man7/simd.7 b/share/man/man7/simd.7 index 6695a137da77..449ca4274287 100644 --- a/share/man/man7/simd.7 +++ b/share/man/man7/simd.7 @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE . -.Dd October 16, 2025 +.Dd October 21, 2025 .Dt SIMD 7 .Os .Sh NAME @@ -55,7 +55,7 @@ Enhanced functions are present for the following architectures: .It bcopy Ta A Ta S Ta S Ta S Ta SV .It bzero Ta A Ta S Ta S Ta S .It div Ta Ta Ta S Ta S -.It index Ta A Ta Ta S1 +.It index Ta A Ta Ta S1 Ta Ta S .It ldiv Ta Ta Ta S Ta S .It lldiv Ta Ta Ta S .It memchr Ta A Ta Ta S1 Ta Ta Ta S @@ -69,8 +69,8 @@ Enhanced functions are present for the following architectures: .It stpcpy Ta A Ta Ta S1 .It stpncpy Ta Ta Ta S1 .It strcat Ta A Ta Ta S1 Ta S -.It strchr Ta A Ta Ta S1 Ta S -.It strchrnul Ta A Ta Ta S1 +.It strchr Ta A Ta Ta S1 Ta S Ta Ta S +.It strchrnul Ta A Ta Ta S1 Ta Ta Ta S .It strcmp Ta A Ta S Ta S1 Ta S .It strcpy Ta A Ta Ta S1 Ta S Ta S2 .It strcspn Ta S Ta Ta S2 From nobody Fri Oct 31 12:48:44 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cyglJ3Kgmz6FmXM; Fri, 31 Oct 2025 12:48: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cyglJ1pMdz42kq; Fri, 31 Oct 2025 12:48:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761914924; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mCWFwrP2SLFnzubffTYsPZJkbTNieECUEH1uTRWn4nQ=; b=AdPwVknHEvNcP+t3W3ABUHwUzC2o05poRzFkM/4pqQkPhb2Op9DFWNkwI1rJhN71DYovES kSeQufjOqW8X3e3OuLM1KxjZppboQXLXeXTNnwnYHlR2QXAZ1R0h37GmpGsZAh3BPVFksv Ted/r9OPH8f23XfvIkHfiNQjc6ZWBRjyo3bYeqXgY18cc3kp6dYuA7lb0vo+NfoV56NrrQ Vs07cbgbmFu2OJ+6yBWG5Z+CIxDzi4XsjOtB8l/Muw+p/Rh43FNdjMQ4958mVhpxgL6rWN +8zErECURNOgd1wnLOnW5xA/tUPVzUCbEmscHvogUUUG6gna0ez7R33uDjuEAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761914924; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mCWFwrP2SLFnzubffTYsPZJkbTNieECUEH1uTRWn4nQ=; b=VQbMK6/wnrqEoR92AR4ER26Wm+6vABgXH+34cnBhHiKJS1KAW/N1VHujhDh8lcfM7DBgAP PWKuOHRXnuTggpmTOIXp4DC8q+JAAe/rJ9+MbA0rb8ecEU6BiFVkNhMrUOe++pSxfPDoaJ +AMBz2XFTt7PLZGZEowUFWGFU7q8qlLm6D9fpCVxceHwae3wHiUso2kVj4PiOKdshuVcU+ wMMtLX2JakzCRoV5LEYd/hyI3+7h6ORW97oV+569srxJSjAZWKLCPqqlSI7VPkdnSlZxox u6O1aRJP3I1Sa5jx1qlQtSCJEr/+emSRrKPf0OfbkwphMxWuXj88yzxI2b6i9Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761914924; a=rsa-sha256; cv=none; b=ezbUbY79XOCM6ii4n0iO7R2BhHzT9WRG5TLpCg2AO+dAJWoBjgC6klOVR/wDWRxcZPfhsO 0VGdZsHXRjqU46CruSpBOMN7Ragk1fn/KkdOklfVz62OPG5oVFAjvdHIZ4nE4aco9BD/9S wsiEsdRJz6ZUiUw6ksrcW1091cJTMHLvnSrWnD5Rd/AL73GPXHfNV9iBWIBizfC9bQ/k3z YEDddQVyPSDTe4obJj2+obtQ1lJ2d6WCBhHbR8GLVLSBMGrAxaq/DrmeoqXakA9iwsq3yD 22+HkAVvBthfKGLE+0+tNvYB75hVanZmBelVGYf3rN79Iefy0uZIQrfA4Fxd2A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cyglJ1Prkz17QW; Fri, 31 Oct 2025 12:48: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 59VCmiRu042926; Fri, 31 Oct 2025 12:48:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59VCmiQf042922; Fri, 31 Oct 2025 12:48:44 GMT (envelope-from git) Date: Fri, 31 Oct 2025 12:48:44 GMT Message-Id: <202510311248.59VCmiQf042922@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Clausecker Subject: git: d6870bb941fe - main - simd.7: document bcopy() and bzero() as accelerated on riscv64 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d6870bb941fe235e0031f8bfb53fbd120ff859f9 Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=d6870bb941fe235e0031f8bfb53fbd120ff859f9 commit d6870bb941fe235e0031f8bfb53fbd120ff859f9 Author: Robert Clausecker AuthorDate: 2025-10-21 18:58:16 +0000 Commit: Robert Clausecker CommitDate: 2025-10-31 12:48:01 +0000 simd.7: document bcopy() and bzero() as accelerated on riscv64 Event: Google Summer of Code 2024 MFC after: 1 month MFC to: stable/15 Approved by: markj (mentor) Differential Revision: https://reviews.freebsd.org/D53248 --- share/man/man7/simd.7 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/man/man7/simd.7 b/share/man/man7/simd.7 index 449ca4274287..3343508df504 100644 --- a/share/man/man7/simd.7 +++ b/share/man/man7/simd.7 @@ -52,8 +52,8 @@ Enhanced functions are present for the following architectures: .Bl -column FUNCTION_________ aarch64_ arm_ amd64_ i386_ ppc64_ -offset indent .It Em FUNCTION Ta Em AARCH64 Ta Em ARM Ta Em AMD64 Ta Em I386 Ta Em PPC64 Ta Em RISC-V .It bcmp Ta A Ta Ta S1 Ta S -.It bcopy Ta A Ta S Ta S Ta S Ta SV -.It bzero Ta A Ta S Ta S Ta S +.It bcopy Ta A Ta S Ta S Ta S Ta SV Ta S +.It bzero Ta A Ta S Ta S Ta S Ta Ta S .It div Ta Ta Ta S Ta S .It index Ta A Ta Ta S1 Ta Ta S .It ldiv Ta Ta Ta S Ta S From nobody Fri Oct 31 12:50:47 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cygng55JVz6FmSp; Fri, 31 Oct 2025 12:50:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cygng4Gcvz476f; Fri, 31 Oct 2025 12:50:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761915047; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Nez7HYTmY6TY99y6C/Ra1EEBZLKDOJ3agMRno8c8Nkk=; b=SdRu5KPN6TvqGz2/SNS4CXX5wSPZxYbkizifpKfkdeUY5LoNeyctFu3IxnMuwWKyTrybhj 69/7Yh8QTRVEqofSvEJUkXUUVP1frOwoeZ9kbAdpN14ys5H3blYQeLiC+rABk3bC0uyrp6 sky4ayh8WBhvxez8o9qbmYomyjKMyOhKSi1YU0i1tJ4cOYsew6eaUGebjQz0HVZPr3oKPh uA6gk2ljp2CaNNBnqyoRmnBjmBWlulRmZzV+eWNUnvTrWjoJZBrh7KwF1HlMvKf93ItWFd n41QIhG5Np+awba+E3sz2z4CEhpNP/JRB9TgQ2KQI/u/wxKTau77Yw1jVDZCow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761915047; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Nez7HYTmY6TY99y6C/Ra1EEBZLKDOJ3agMRno8c8Nkk=; b=dBkM/s5w0fjadHpEnLkEPpUMPhG1dJvSl96V9GXXlltFQxIQz659DThzjgByTth7eFwPUT duRPZOu8ehSEfkjQSCPpV7Qeaks6ACcvpUEEYB0vyxrENeHtu95w/KkQx6paqnmZze+7Ps Bp46M7XVnUFN9NxIAb3LnvGh741RIxmEe6FG+JEklpo7JXwJRHlok43g/tgLuwSnl5TOK9 wCgfyn+WzmO4a59Yh0bIfek1ffvjFtbyC+Wt+7tE01hyCC2vhUBd/fueprGGmYwIgOf3O7 4fWFgtauQCqkXiDu1xxaWJGwPyAz7rB6O63MU2Sne7Inx5+wUQuPkVlgHXxb6g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761915047; a=rsa-sha256; cv=none; b=ueiFIsw6ED8c2EkNY7tn3SODsJqxYskz7QjbpDlUOf/Kw8iKvCdihp0NOYakQ57xd6c78G PvgnDRKNwOso9hKixgE3dMFqXnVC7jRnaEnLRle253PZV3h5Nm+qQ05bgLsG79OTxWvWFl y7MNfr3haLOV/nqMe8VMI7qdnMXPC2GA2UFx9Spm9D7/I3nT6C6Q+7ysDAOWEH1NxtNSzZ LtW9pk0g3p1Ruh44aJxRt5sAm063xv6gYU6oi/T+KXidg6WN08BLWa7Ocee3vkNv6Mc+Or INtsewAzghMZG49da8eseBqHaCrHjitxffdRT21qz1xJjiW2S3t5b3K540hUIw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cygng3scXz17sG; Fri, 31 Oct 2025 12:50: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 59VColiZ053348; Fri, 31 Oct 2025 12:50:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59VColPj053345; Fri, 31 Oct 2025 12:50:47 GMT (envelope-from git) Date: Fri, 31 Oct 2025 12:50:47 GMT Message-Id: <202510311250.59VColPj053345@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Clausecker Subject: git: d59e924d2969 - main - depend-cleanup.sh: clean up after riscv64 enhanced string function patch set List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d59e924d2969ce2c8bec0fc4500989865fbece75 Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=d59e924d2969ce2c8bec0fc4500989865fbece75 commit d59e924d2969ce2c8bec0fc4500989865fbece75 Author: Robert Clausecker AuthorDate: 2025-10-30 18:57:23 +0000 Commit: Robert Clausecker CommitDate: 2025-10-31 12:50:29 +0000 depend-cleanup.sh: clean up after riscv64 enhanced string function patch set This ensures an incremental build succeeds after import of D47275, D46023, D45730, D45693, D46139, D46230, D46047, and D53248. Approved by: markj (mentor) MFC after: 1 month MFC to: stable/15 Differential Revision: https://reviews.freebsd.org/D53485 --- tools/build/depend-cleanup.sh | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/tools/build/depend-cleanup.sh b/tools/build/depend-cleanup.sh index aa01db6ccc37..d751118a79a2 100755 --- a/tools/build/depend-cleanup.sh +++ b/tools/build/depend-cleanup.sh @@ -476,3 +476,30 @@ if [ -f "$OBJTOP"/usr.sbin/moused/moused ]; then echo "Removing old moused binary" run rm -fv "$OBJTOP"/usr.sbin/moused/moused fi + +if [ ${MACHINE} = riscv ]; then + # 20251031 df21a004be23 libc: scalar strrchr() in RISC-V assembly + clean_dep lib/libc strrchr c + + # 20251031 563efdd3bd5d libc: scalar memchr() in RISC-V assembly + clean_dep lib/libc memchr c + + # 20251031 40a958d5850d libc: scalar memset() in RISC-V assembly + clean_dep lib/libc memset c + + # 20251031 e09c1583eddd libc: scalar strlen() in RISC-V assembly + clean_dep lib/libc strlen c + + # 20251031 25fdd86a4c92 libc: scalar memcpy() in RISC-V assembly + clean_dep lib/libc memcpy c + + # 20251031 5a52f0704435 libc: scalar strnlen() in RISC-V assembly + clean_dep lib/libc strnlen c + + # 20251031 08af0bbc9c7d libc: scalar strchrnul() in RISC-V assembly + clean_dep lib/libc strchrnul c + + # 20251031 b5dbf3de5611 libc/riscv64: implement bcopy() and bzero() through memcpy() and memset() + clean_dep lib/libc bcopy c "libc.string.bcopy.c" + clean_dep lib/libc bzero c "libc.string.bzero.c" +fi From nobody Fri Oct 31 13:33:16 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cyhkh6r61z6FqHY; Fri, 31 Oct 2025 13:33:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cyhkh6GY2z3Fs5; Fri, 31 Oct 2025 13:33:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761917596; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CcWMFFzVDRt67dCEphyTAXM8n9ygpEbVQI2E3tLInQ0=; b=WAOndtrtHKkQ4tpNwtxgKAAbtsFFl+GivGmzZDFvfb1EWnI1KXZhZ/oGRVm6AW6RXZqQwk nC0DoDP1UK7PnKUNZVsUBDwTMknd4aJnKnhAvTx8mk1oYTvVGuZbdRNDWisH+INODL0B56 JdcqUpCh2SHhH4JywisLYUuNW+bJyFu2ybSYuAYtsSOde9/q7d70djxar8mhltE6I37/JI zfcTTldUfnnjyrR2MJ8zfrWOPv8/MIest20Tu6BYezTh5bHXWNqCesVnFC4oNeHGM58DMp oK8IooDfimG4ceukBjjiwJBLsqRSCVz+Qj0iJpq8L4ircFrBiV+DoJ3G6xAb6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761917596; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CcWMFFzVDRt67dCEphyTAXM8n9ygpEbVQI2E3tLInQ0=; b=JKehivFnC0Nd1JN7RiDGc/mEyKe57I1sN7+ha4LPMA8MECc96OpQy/nL/EdnZU4OyzQ/1r 2TOeumqF8O0SQsWUFSIgw25oZrTmUlfYRUYkQz1eVQp0utJgeORfIEI8t+WYkd3j2xF7UQ /Uh8OKKfV9HfRYjbGSdTzcz+SW6qNfXfJsTYFpBDNdAJQWAeL9QhWTYeHXVzRXylyc/6Yj z0+ghMsCHJm+rRSiokbaATR0u6g+ddZu3lqyG/qEgan+MJc4PwakL4NxzuzGa6y9mxcJ2U 7oBjDyusryqec6iOEBe8IcbrysZ9C2y3DVMGywYsSzJ6lGYkg21OMiR2AgxY7Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761917596; a=rsa-sha256; cv=none; b=ZkEdf5fIWi9Y5P/tt2UqBEsyarFVDHivcPOp2mn0qgYCO9gQCFIchfAvPkgEhoAKslaxw2 UkN72tg5EE0inyxZHTyyD90F/8KHkBAjHLxhRY25pYUHt+utI583RKlfeSzjCvmDeiVuBy mhAq7/xVwd8p9oD4jhhbEieYBpTBh/58Ju3moat6WquF6kW4aYNdq06ecu8NmMKo1C8Acb 9on4MS3p1LwM72Tv7E/qNtlaO994Q5fSjKS3+XzyivjimQWEVP+Zi30nHv/V4rINaDU4p5 qkYYRhcSYK15jsPCbZn6l+cKpwdF/3OTfodjpvi0r2pRhhtauY8R7lwrg3OVtA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cyhkh5q8xz19B7; Fri, 31 Oct 2025 13:33: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 59VDXGsj036846; Fri, 31 Oct 2025 13:33:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59VDXGBs036843; Fri, 31 Oct 2025 13:33:16 GMT (envelope-from git) Date: Fri, 31 Oct 2025 13:33:16 GMT Message-Id: <202510311333.59VDXGBs036843@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: 44ad7d4844b7 - main - tcp: remove unused define List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 44ad7d4844b7b5387cfad603a28501ac5c70e37d Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=44ad7d4844b7b5387cfad603a28501ac5c70e37d commit 44ad7d4844b7b5387cfad603a28501ac5c70e37d Author: Peter Lei AuthorDate: 2025-10-31 13:31:20 +0000 Commit: Michael Tuexen CommitDate: 2025-10-31 13:31:20 +0000 tcp: remove unused define Reviewed by: tuexen MFC after: 3 days Sponsored by: Netflix, Inc. --- sys/netinet/tcp.h | 1 - 1 file changed, 1 deletion(-) diff --git a/sys/netinet/tcp.h b/sys/netinet/tcp.h index 41a49b318cd5..cab7d1c5e726 100644 --- a/sys/netinet/tcp.h +++ b/sys/netinet/tcp.h @@ -541,7 +541,6 @@ struct tcp_log_user { #define TCP_HYBRID_PACING_H_MS 0x0008 /* A client hint for maxseg is present */ #define TCP_HYBRID_PACING_ENABLE 0x0010 /* We are enabling hybrid pacing else disable */ #define TCP_HYBRID_PACING_S_MSS 0x0020 /* Clent wants us to set the mss overriding gp est in CU */ -#define TCP_HAS_PLAYOUT_MS 0x0040 /* The client included the chunk playout milliseconds: deprecate */ /* the below are internal only flags */ #define TCP_HYBRID_PACING_USER_MASK 0x0FFF /* Non-internal flags mask */ #define TCP_HYBRID_PACING_SETMSS 0x1000 /* Internal flag that tells us we set the mss on this entry */ From nobody Fri Oct 31 13:48:06 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cyj445xMMz6FrBt for ; Fri, 31 Oct 2025 13:48:20 +0000 (UTC) (envelope-from jlduran@gmail.com) Received: from mail-qt1-f169.google.com (mail-qt1-f169.google.com [209.85.160.169]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cyj430FCbz3Hjw for ; Fri, 31 Oct 2025 13:48:19 +0000 (UTC) (envelope-from jlduran@gmail.com) Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=freebsd.org (policy=none); spf=pass (mx1.freebsd.org: domain of jlduran@gmail.com designates 209.85.160.169 as permitted sender) smtp.mailfrom=jlduran@gmail.com Received: by mail-qt1-f169.google.com with SMTP id d75a77b69052e-4ecfe76a898so2846241cf.2 for ; Fri, 31 Oct 2025 06:48:19 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761918498; x=1762523298; h=content-transfer-encoding:cc:to:subject:message-id:date:from :reply-to:in-reply-to:references:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=64LRHK8CedviInp8RjEdx7JyGIcqq93f4e4jnvxE2hk=; b=F82Xi7L37npAkV2M2KJMUjb3BhQfKiZRLm09qENgcQdbvnlGKqfulW952VYP9Um8Or kfyE/NlRQQySWGGyKBEBDo3/BYrNNh1WA3opeBzIdNtKtDsSwYo/Q1BUB+9WUk++0Mzd mlfW8Zc6mqjd+h08SrjuFr+1T1q8HzWtnWENDSEY69daU/XljG1haWQWvqavQWjdzpLw ZELXliE5twnAQx3ZTxUvkJWSreARY4W16rlpfP/uXt4YCEQypeKRqEHN+0FFOzHnLwpS ToHuA+cYyxEN92v2XWnbvN2NPYLdlhxapqR8TzkSBpkvXOWqQahhOm6LXKQKVuri+NSP mTaA== X-Forwarded-Encrypted: i=1; AJvYcCV06pQ+WiSfDZ+yYt/ytKhDPz3ZOYpBGQXpu3gDz+4bJIQgiEAOFqDlu+Nlm0fyA05g9eaRol7reKhyBmfrI7yCsZHYcQ==@freebsd.org X-Gm-Message-State: AOJu0YzdwAUwiepb08FQc87zTL8XMRgv5Y5rQaRoDOivQiwIPRnB1qV/ 84+r0Z1fHSJJvTjuWCy0DEjAm4zOTUbAGrhWnqDiXQyYqwfw/XS2wy1RdpiUFg== X-Gm-Gg: ASbGncvvGtt7OpsWY2bSRqkLWATShMhifdYh8Ky0oydQFpv5Df743qNj3evItWvBFBm Sbtv8gNfu0Smmw9iz9IlJoZ3IFXnbHAEE4DdUX0RWeH0fpBBVhtqI+opWkywN4OZE32v9XWQ2P7 S3Wg+sXpD1mjXMt0amxUK97qOBq/tKWumTP2enNFqJk8EPilMRD0IrGzG6PmQpYDlRK06ubGlBT P4w+BbT9ga/vmDo2qevErf5AP42CTrxRzwcn0rqiiqL7IdWM9AGbCV9q+hUD4jPGqgNaaQ9LSFJ lTuQBVcYgThMlg/vmFMrTc3w2yhr2R6PBqqYIxCL3Gc9Gb//4X7BzAs/bLzlw2t3b6PM5NBBWR0 26BuvXWsum5N+zEgCQqIhnJXiVZUs9VTNE+M6nYAcT7Yyx4+ufabFeIwhBJVHeP8IjwdGFKkxmI CRM/qdlqkgvPL1DX3wXckfJk9Xit3ZlexDzYE4S+164uOSOvTHhug= X-Google-Smtp-Source: AGHT+IHpc1LImdROm3NQd9XN3IJ0owxqQDd7ZHG5heO83q0uuwWCnOj4LOo7EW+MXitnEaCDY2w4gA== X-Received: by 2002:a05:622a:1889:b0:4e0:b24a:6577 with SMTP id d75a77b69052e-4ed30d4af53mr28068031cf.2.1761918497972; Fri, 31 Oct 2025 06:48:17 -0700 (PDT) Received: from mail-qt1-f178.google.com (mail-qt1-f178.google.com. [209.85.160.178]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-4ed3e058fc3sm3453171cf.5.2025.10.31.06.48.17 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 31 Oct 2025 06:48:17 -0700 (PDT) Received: by mail-qt1-f178.google.com with SMTP id d75a77b69052e-4ecfe76a898so2846201cf.2 for ; Fri, 31 Oct 2025 06:48:17 -0700 (PDT) X-Forwarded-Encrypted: i=1; AJvYcCVNWwHil16ZLVsD3+ypt7NTrzMYxp8FyOCttjPjeBN1EsBYAo+cxTUes+ro0mLsYg6IUxYbeQRXehJCuqeqcFVABTzKng==@freebsd.org X-Received: by 2002:a05:622a:cb:b0:4d8:8b29:228a with SMTP id d75a77b69052e-4ed30d4a300mr31788431cf.3.1761918497479; Fri, 31 Oct 2025 06:48:17 -0700 (PDT) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 References: <202510291850.59TIofPQ001392@gitrepo.freebsd.org> In-Reply-To: <202510291850.59TIofPQ001392@gitrepo.freebsd.org> Reply-To: jlduran@freebsd.org From: Jose Luis Duran Date: Fri, 31 Oct 2025 10:48:06 -0300 X-Gmail-Original-Message-ID: X-Gm-Features: AWmQ_bmYo4MFt0OZ9eGhagnZZ7czgeK3R89yrQrDPmKe69cj-YYEaG7HIWS0qjI Message-ID: Subject: Re: git: 51e8e8b0f369 - main - Merge commit e24f90190c77 from llvm git (by Brad Smith): To: Dimitry Andric Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Spamd-Bar: -- X-Spamd-Result: default: False [-2.90 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-0.99)[-0.992]; NEURAL_HAM_SHORT(-0.91)[-0.908]; FORGED_SENDER(0.30)[jlduran@freebsd.org,jlduran@gmail.com]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17:c]; MIME_GOOD(-0.10)[text/plain]; DMARC_POLICY_SOFTFAIL(0.10)[freebsd.org : SPF not aligned (relaxed), No valid DKIM,none]; RWL_MAILSPIKE_GOOD(-0.10)[209.85.160.169:from]; REPLYTO_DOM_EQ_TO_DOM(0.00)[]; RCVD_COUNT_THREE(0.00)[3]; MIME_TRACE(0.00)[0:+]; FREEMAIL_ENVFROM(0.00)[gmail.com]; RCVD_TLS_LAST(0.00)[]; TO_DN_SOME(0.00)[]; ARC_NA(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; FROM_HAS_DN(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[209.85.160.169:from,209.85.160.178:received]; TO_MATCH_ENVRCPT_SOME(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[dev-commits-src-main@freebsd.org]; REPLYTO_ADDR_EQ_FROM(0.00)[]; FROM_NEQ_ENVFROM(0.00)[jlduran@freebsd.org,jlduran@gmail.com]; MISSING_XM_UA(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-main@freebsd.org]; RCVD_VIA_SMTP_AUTH(0.00)[]; R_DKIM_NA(0.00)[]; FREEFALL_USER(0.00)[jlduran]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; HAS_REPLYTO(0.00)[jlduran@freebsd.org] X-Rspamd-Queue-Id: 4cyj430FCbz3Hjw On Wed, Oct 29, 2025 at 3:50=E2=80=AFPM Dimitry Andric wr= ote: > > The branch main has been updated by dim: > > URL: https://cgit.FreeBSD.org/src/commit/?id=3D51e8e8b0f36933814b1be08913= 857727876aece5 > > commit 51e8e8b0f36933814b1be08913857727876aece5 > Author: Dimitry Andric > AuthorDate: 2025-10-29 18:49:54 +0000 > Commit: Dimitry Andric > CommitDate: 2025-10-29 18:49:54 +0000 > > Merge commit e24f90190c77 from llvm git (by Brad Smith): > > [Driver] Enable outline atomics for FreeBSD/aarch64 (#156089) > > The compiler_rt helper functions have been built since 12.4, 13.1, 14 > and anything newer. > > MFC after: 3 days > --- > contrib/llvm-project/clang/lib/Driver/ToolChains/FreeBSD.h | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/contrib/llvm-project/clang/lib/Driver/ToolChains/FreeBSD.h b= /contrib/llvm-project/clang/lib/Driver/ToolChains/FreeBSD.h > index 7ab63905ed4f..7d090ba682b3 100644 > --- a/contrib/llvm-project/clang/lib/Driver/ToolChains/FreeBSD.h > +++ b/contrib/llvm-project/clang/lib/Driver/ToolChains/FreeBSD.h > @@ -78,6 +78,11 @@ public: > void AddHIPIncludeArgs(const llvm::opt::ArgList &DriverArgs, > llvm::opt::ArgStringList &CC1Args) const overri= de; > > + bool IsAArch64OutlineAtomicsDefault( > + const llvm::opt::ArgList &Args) const override { > + return true; > + } > + > UnwindTableLevel > getDefaultUnwindTableLevel(const llvm::opt::ArgList &Args) const overr= ide; > bool isPIEDefault(const llvm::opt::ArgList &Args) const override; I'm sure you're probably aware by now, but aarch64 builds are failing after this commit: https://ci.freebsd.org/job/FreeBSD-main-aarch64-build/33100/ Regards, --=20 Jose Luis Duran From nobody Fri Oct 31 14:02:28 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cyjNm3Rmmz6Fs0H for ; Fri, 31 Oct 2025 14:02:48 +0000 (UTC) (envelope-from marklmi@yahoo.com) Received: from sonic304-24.consmr.mail.gq1.yahoo.com (sonic304-24.consmr.mail.gq1.yahoo.com [98.137.68.205]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4cyjNm1bTNz3LKV for ; Fri, 31 Oct 2025 14:02:48 +0000 (UTC) (envelope-from marklmi@yahoo.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=yahoo.com header.s=s2048 header.b=KzXGYm8c; dmarc=pass (policy=reject) header.from=yahoo.com; spf=pass (mx1.freebsd.org: domain of marklmi@yahoo.com designates 98.137.68.205 as permitted sender) smtp.mailfrom=marklmi@yahoo.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1761919362; bh=Z5EO5srDeoaT5rSfeRMPaeitjR63oLe4Hj66nIKD1Zc=; h=From:Subject:Date:To:References:From:Subject:Reply-To; b=KzXGYm8cYsE1P2+Wiu/WtmSMsWQdgRNn0O/P4WwFDcpEkxjprCSzllp6y1zIkG1ZTatqwZc1kzCA7U65wOoSKO5YB6pgjB6QtcgFWlHNVptbL+MM7muxPZa7i6jztoHuQHo4yltOPi4cwaMuQWjFvAepbIJxcEk9YiogEoylj2WOJO1YN2m5ZMvmX0MFHizQf/kEIsr701r+onp2PVmLpoZXpmudKMKZ3wgHebjp8Ei4fctcGuPN8U8fxuzBD6lg305n0Rs8jS7kJ0Kds/LOOQM36reNkpLyFRuLBsdKRBHZ4Fvwjldh8lPcDSECr1kyFhIH/OjM7edQ60I0RXcwJw== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1761919362; bh=bPeCVg1dC0lCprTXvnzZuwoaQ5QVHQauYehU8YevtLO=; h=X-Sonic-MF:From:Subject:Date:To:From:Subject; b=jVQgMJDnx/7wNtEF79iBYefG4pNbRkXLpEadlNGshD2kVduYDlkqFJMh94ccvU3bfBaP9d6eqUvRTq6coz0oJBlW8Zo4S/BKhdLw8FjfYI9UNTKQ1aIz2mo/tNE3GIPgM/nXOm87UM7KDsUfMMYvIrVNdyG+Gwl9y1HMVM8+QdFUJJSv2QVDpxiqnovKMU5OQjWhUMlJMq3d/UeFy2xmaU44NQS0b5Nhpfh5Fns3qLo7QkOsfVp/KgkPkXAV1imsuETvLk3y2W2eIHOYDIWZ5xqIr4J15z5NX11Cpvym2vJrsScUWl4/G8qD5GLqAJE1CukbojvrQvyW7gZ4ii87ng== X-YMail-OSG: 2eCZjAoVM1nyHZlm8tCplE0CpvavUrpZ5KohEl8XeQzDX9cKMokg1neYTUGPuyg U2MzBwWwS4.85MqnkkugtfucPr26EO2hDSiyd9hwGVOeJp455DTpKCJWb8EeVMlI4jRrLC0FEZqP SRaM.SufFIy2mSY77YCeA.b5u9qjxx41qTjz6fAj0oLS5oMleAvhc9xweU33z0IVIB2PxvHfFxiC _gg5ioquXoR1K1AHnEPsyn6Gx5sjIYnG9zYE35j1Lz.msCWRncoT6WxAV3V_BJxx2POkAfbc3OzR h8iM0b3gu1KedA3vdh.58yPWKVLDl6GtURJG.4Yh.ES5rsSRoBeEQCR740Vl3b7B.Tu8kxo42AP6 zo.0VfVGEmntzhSFYG.zTLF6tA5CFwVYMivg7qr27Tb3lqc33jI29bUskV8Ja06ZYUQ8k6T1ZWu2 8itIJUGjxRrfvCOHC_sRsWk5KDbcbl.SD9T4531HPyYRCp0SIblnB7nCY8EvGGTjdKUoYFvc_UKP F0I9kBZhdM2HmP3zun_rFBsz2TFeAhY3VuwFhmWHZDsty4mZgrYA_Rxu_03NqQGoA.mDwGho_w_X NsN6KDWZtJSw0Yw.gekeVBD9O0JBoUcfMjGwHy2EZ1MVBQyEz6QUX2jLonUIh9iqTvHAVlUQ8o.P uI8cSy1IQ8LPf9wU1X06mosFdPldAebiJ0iVU_MYBq.Tw9EqzAYvV5Jd8YnbUxAeDa1b_Cw3tUL8 2eKLRmLumHGBH9.Cc4.IiQ7Pf4RA94kwxLvh.NtucAe2N_qP819wFY4qiM21I2E.s7_RHNU1IOTc xN941b6BpsTx4uxhxvStS.D9UCxX6fKpGF.vYmxiIEU6w6vdtWo7xjVGjIv0Khl6XASuchnYMCF9 LRLvVLNYOFc.pE.Pit1pWTgNzD7_AvNn1MylCziNQ1LN43ufuag.t6Kd6fIH4QS2.BFSz1apb4ed 0G0yvNCaAL.z63kWiC.TMQoa.T9rJQcZf8A7NlnoDQKQgpZAzzi5EVyW7XKccdczcGlpZzCV.D6f wnT._PILGxC6p3jOcOHNQ7HwBj9mszILZBeIbS2gWGAGbZCTo0WbxJYnlfRc7yftmGv9rvhhQtmP lPC20FhIUUQxT7v1ezKoHwsxlkH5VrHlN5n4LrV6_f5.jxhpp8bLkwSGPnZG_mPVJ6VR3EJY9Mr8 S6tnrboKsFDFbXzNQcnQDjvACeXf5H8VeifWdinSkzsvGo1ycrPmvDRB.7eg6iUrWVhWZmq.pLvW Qld6UdWgE7D15N27Dq82bEXqHJyRB1fGFkHsGF4DxNmnZU1fq7Pny2NYQ5zI4qyYn6sUZB8pMIum uBXPScDYMwe45eHOeXLXTB_TABzgAsImmptlxp0E6Qq0.e1xjz0XEal5UB2Lp0NIDNXxFVo.kNtP tJFxtmHqbhe7rQEKdtsMOQ5ULjqfIeN_g4.nH2ZbMKzuLay8Kls_9R6e0WHO.zJG4LHfpLK.bozW L8CnghfxV3El05vSD1WhF8oVETKsBg16RlTFVaxvi7jL8SYdUifbzG.g6iHqRXmAXyvLQkjemmwE G_3m6DpLAN_ZdEj2spAvmI4dMPpJInIcCivPTiiwarfUbIeK4dgjw7V8WFg85dDqYaGuoa0J0e03 SFfXZi2LX3BTSYO2vtBLmKYYIvAiKuu4xG1cDoE0v8E_X6dEwVrtVrnUSt8YHo4A4C7n7Ple35HB ZXbw9WOph5psY9xg9E_opHPMxg_gpV0JF.fobaHeBUz_.WuntszMVgBdTr9JfE5S_eI06HtBpbdA l9P4xlh1DtiUbWTn8IO1ghksjMOsSDjHXiBxCXftxYNhR444MY12RRRDaqS30ftUI.bSCT6Rgvk_ JwFxEIFybWzI8RRb3yzFQt0TqtDTxl2DD6YoNpUFEAHnAnqdAuKRqv5X9cDisx2qtVo84_dkwyV8 ri2l1MPrLi1BeYiIqGG4HdA2FqzlsBsN.kzarjFxyiQq8EwQUkbyfeu.GPKN1VwhW06PZp8_CT19 kiXs0ocVNXAhh_Fqd2DxPt7OsHxTYeK1YgYOTQ9yf05R.44zZO_3lDkoY5XdthbNpf6sRkaUG0jh ul46bhAq6Y5mUedl2Tx8qutxwTJM0C_T7hvF7WlySBVEFLbRvwCyroloPAWSRfIGW__gvjKdmUf2 yx3q_VtdoVgkzoumf1hOl7BjY8AxHjj1o07anf35EUNIIDXtDnpJR6gn1qf1jsRX7R8n_RFxNz79 DN1jynBGrcpSlrRUmS5.8JYfpzdIjfXqlBW06CH8iUyEaJrjJh7l4 X-Sonic-MF: X-Sonic-ID: adfb63b4-a0b2-4b00-9155-0b871bca316e Received: from sonic.gate.mail.ne1.yahoo.com by sonic304.consmr.mail.gq1.yahoo.com with HTTP; Fri, 31 Oct 2025 14:02:42 +0000 Received: by hermes--production-gq1-86c5846576-qzzfn (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID 811e3c855a700dfcac8b273cd5e867a5; Fri, 31 Oct 2025 14:02:39 +0000 (UTC) From: Mark Millard Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3826.700.81\)) Subject: RE: git: 51e8e8b0f369 - main - Merge commit e24f90190c77 from llvm git (by Brad Smith): Message-Id: <6F8D0004-E85E-43E2-A07B-3E157BEABD57@yahoo.com> Date: Fri, 31 Oct 2025 07:02:28 -0700 To: Dimitry Andric , dev-commits-src-main X-Mailer: Apple Mail (2.3826.700.81) References: <6F8D0004-E85E-43E2-A07B-3E157BEABD57.ref@yahoo.com> X-Spamd-Bar: -- X-Spamd-Result: default: False [-2.83 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; DMARC_POLICY_ALLOW(-0.50)[yahoo.com,reject]; R_SPF_ALLOW(-0.20)[+ptr:yahoo.com]; R_DKIM_ALLOW(-0.20)[yahoo.com:s=s2048]; NEURAL_SPAM_SHORT(0.17)[0.174]; MIME_GOOD(-0.10)[text/plain]; RCVD_TLS_LAST(0.00)[]; TO_DN_ALL(0.00)[]; RCPT_COUNT_TWO(0.00)[2]; MIME_TRACE(0.00)[0:+]; ARC_NA(0.00)[]; DWL_DNSWL_NONE(0.00)[yahoo.com:dkim]; FREEMAIL_FROM(0.00)[yahoo.com]; FROM_HAS_DN(0.00)[]; ASN(0.00)[asn:36647, ipnet:98.137.64.0/20, country:US]; FREEMAIL_ENVFROM(0.00)[yahoo.com]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; DKIM_TRACE(0.00)[yahoo.com:+]; MLMMJ_DEST(0.00)[dev-commits-src-main@freebsd.org]; APPLE_MAILER_COMMON(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; RWL_MAILSPIKE_POSSIBLE(0.00)[98.137.68.205:from]; RCVD_IN_DNSWL_NONE(0.00)[98.137.68.205:from] X-Rspamd-Queue-Id: 4cyjNm1bTNz3LKV Dimitry Andric wrote on Date: Wed, 29 Oct 2025 18:50:41 UTC : > The branch main has been updated by dim: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3D51e8e8b0f36933814b1be08913857727= 876aece5 >=20 > commit 51e8e8b0f36933814b1be08913857727876aece5 > Author: Dimitry Andric > AuthorDate: 2025-10-29 18:49:54 +0000 > Commit: Dimitry Andric > CommitDate: 2025-10-29 18:49:54 +0000 >=20 > Merge commit e24f90190c77 from llvm git (by Brad Smith): >=20 > [Driver] Enable outline atomics for FreeBSD/aarch64 (#156089) >=20 > The compiler_rt helper functions have been built since 12.4, 13.1, 14 > and anything newer. >=20 > MFC after: 3 days > --- > contrib/llvm-project/clang/lib/Driver/ToolChains/FreeBSD.h | 5 +++++ > 1 file changed, 5 insertions(+) >=20 > diff --git = a/contrib/llvm-project/clang/lib/Driver/ToolChains/FreeBSD.h = b/contrib/llvm-project/clang/lib/Driver/ToolChains/FreeBSD.h > index 7ab63905ed4f..7d090ba682b3 100644 > --- a/contrib/llvm-project/clang/lib/Driver/ToolChains/FreeBSD.h > +++ b/contrib/llvm-project/clang/lib/Driver/ToolChains/FreeBSD.h > @@ -78,6 +78,11 @@ public: > void AddHIPIncludeArgs(const llvm::opt::ArgList &DriverArgs, > llvm::opt::ArgStringList &CC1Args) const override; >=20 > + bool IsAArch64OutlineAtomicsDefault( > + const llvm::opt::ArgList &Args) const override { > + return true; > + } > + > UnwindTableLevel > getDefaultUnwindTableLevel(const llvm::opt::ArgList &Args) const = override; > bool isPIEDefault(const llvm::opt::ArgList &Args) const override; This broke the builds for aarch64 and armv7. See: https://ci.freebsd.org/job/FreeBSD-main-aarch64-build/33100/ https://ci.freebsd.org/job/FreeBSD-main-armv7-build/26157/ releng/15.0/ also reverted it in order to allow BETA4 builds for aarch64. See: = https://lists.freebsd.org/archives/dev-commits-src-branches/2025-October/0= 24964.html =3D=3D=3D Mark Millard marklmi at yahoo.com From nobody Fri Oct 31 14:19:34 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cyjm70C1fz6FtBw; Fri, 31 Oct 2025 14:19: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cyjm66jZHz3NMX; Fri, 31 Oct 2025 14: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=1761920374; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ykysdxZSBxWC1qqDTDATL2ykm4rWIYWM5eA/aYu5Paw=; b=XfBQ3PhXDicjquJ0CwAqaQ+hmz0JGc6xOc9VwEE0ls/YEd4PtZ8tePpfzqzTJ3Lng6xvwA MX5nY7sOLAp0cj5Wc0UIr2uNjEGP8tyJlDAYsQ3qHC/myCh87plErNZs/M5HBlfK4dUhY/ tlXJbQr6FUceFLpYq+IbdVxQRHxEcPL/3u0fQJqa2orfEGl6sKm2ufx/kgPtZ3d7dfw51m koVMGLeEH0Mmsw3Dd/xEi/pIUsZbvg2rLe5FfC+vPwNW6600Td0jqy8LDbPHeZgjSjD8At Akq7O8TYJo0AUL0wRXrRCP1Yju+UoJwyJtlrbpRACNtNvtAlS4a1hINZtBezxA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761920374; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ykysdxZSBxWC1qqDTDATL2ykm4rWIYWM5eA/aYu5Paw=; b=uewsgFS8y+KNSs0lKmaAmQGip6Cpe2RtFD7M5u8xW91McROGsoTASY/R/800+U4wYAN9nF joJN6VfDhGgPmv95SIQGlqUYj5TnLHxTpNrw3iXr5gA/c7teyNKpCJUvBskk/9NX1aiQya CEXYgXO2HzVs6G5e/vbT8vpqZZyToVkjqEq4zELdTucaApJ/m8B8NUGHhaoDc8AfbHhGm/ ZKo5KpW/foyE2hQFYJBlwurYn82OxTxiduySYp5RyWiZTpBo4+V1JoMjhnhHA1nUC5dhgG b+o/qR9HldMKQvYsTPeyFCC/9vGY1rVmsCa9nrCTgcIxHeZGYbnR99ADvAD/RQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761920374; a=rsa-sha256; cv=none; b=HslEBHph0DGNhvuHmBGLA5OsYgUHvo+oXlj02wcezI4IlodKurCLZXsZXWszU8u9CXBhKb har/ta8J/CaJCPIMHnaQmoKDbvK+ywPEiyoFmB5YXxvSQGEHFU6n9t7HpRlmMMSiWlOq3i i2fw1fQqPzO/ySdWmf/sTwNvM5pnx3I2U0HiU1uOaBE9Y8PPRaEURD1stOdY3yboou5rRU 5D75+dfTBAeCJeNTeaNpHv8jhlxzSqDegYBWwybprGb98fZB5TUyBSN2EQIYBvkxpPhe19 GV/a5XdRQN/ofw9Ig6rN7BZza8t3jbbRJxmFTJ+TUDKMKX+NagPrXHAutrI2KQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cyjm660l1z1BDT; Fri, 31 Oct 2025 14: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 59VEJYtV014170; Fri, 31 Oct 2025 14: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 59VEJYdv014167; Fri, 31 Oct 2025 14:19:34 GMT (envelope-from git) Date: Fri, 31 Oct 2025 14:19:34 GMT Message-Id: <202510311419.59VEJYdv014167@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 5baa83cfcbd8 - main - riscv/vmm: Remove a redundant maxcpu check in vm_alloc_vcpu() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5baa83cfcbd87109dc8a61fbb2e183998cc2d5c5 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=5baa83cfcbd87109dc8a61fbb2e183998cc2d5c5 commit 5baa83cfcbd87109dc8a61fbb2e183998cc2d5c5 Author: Mark Johnston AuthorDate: 2025-10-31 14:08:45 +0000 Commit: Mark Johnston CommitDate: 2025-10-31 14:08:45 +0000 riscv/vmm: Remove a redundant maxcpu check in vm_alloc_vcpu() aplic_max_cpu_count() just returns the VM's max vCPU count, and vm_alloc_vcpu() already checks that. Just remove this check so that it's easier to merge vm_alloc_vcpu() into MI code. If the APLIC really does require us to lower the limit, we should instead adjust vm->maxcpu in vm_create(). No functional change intended. Reviewed by: br MFC after: 1 week Sponsored by: The FreeBSD Foundation Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D53496 --- sys/riscv/vmm/vmm.c | 4 ---- sys/riscv/vmm/vmm_aplic.c | 10 ---------- sys/riscv/vmm/vmm_aplic.h | 1 - 3 files changed, 15 deletions(-) diff --git a/sys/riscv/vmm/vmm.c b/sys/riscv/vmm/vmm.c index 24b4be89af48..a9eb9d144336 100644 --- a/sys/riscv/vmm/vmm.c +++ b/sys/riscv/vmm/vmm.c @@ -319,10 +319,6 @@ vm_alloc_vcpu(struct vm *vm, int vcpuid) if (vcpuid < 0 || vcpuid >= vm_get_maxcpus(vm)) return (NULL); - /* Some interrupt controllers may have a CPU limit */ - if (vcpuid >= aplic_max_cpu_count(vm->cookie)) - return (NULL); - vcpu = (struct vcpu *) atomic_load_acq_ptr((uintptr_t *)&vm->vcpu[vcpuid]); if (__predict_true(vcpu != NULL)) diff --git a/sys/riscv/vmm/vmm_aplic.c b/sys/riscv/vmm/vmm_aplic.c index 4df41f2de1a5..74cb4fef4273 100644 --- a/sys/riscv/vmm/vmm_aplic.c +++ b/sys/riscv/vmm/vmm_aplic.c @@ -577,13 +577,3 @@ aplic_sync_hwstate(struct hypctx *hypctx) { } - -int -aplic_max_cpu_count(struct hyp *hyp) -{ - int16_t max_count; - - max_count = vm_get_maxcpus(hyp->vm); - - return (max_count); -} diff --git a/sys/riscv/vmm/vmm_aplic.h b/sys/riscv/vmm/vmm_aplic.h index 49510221b419..96018fe9adda 100644 --- a/sys/riscv/vmm/vmm_aplic.h +++ b/sys/riscv/vmm/vmm_aplic.h @@ -49,6 +49,5 @@ void aplic_cpuinit(struct hypctx *hypctx); void aplic_cpucleanup(struct hypctx *hypctx); void aplic_flush_hwstate(struct hypctx *hypctx); void aplic_sync_hwstate(struct hypctx *hypctx); -int aplic_max_cpu_count(struct hyp *hyp); #endif /* !_VMM_APLIC_H_ */ From nobody Fri Oct 31 15:24:13 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cylCV3d1Pz6FyBg; Fri, 31 Oct 2025 15:24:54 +0000 (UTC) (envelope-from mhorne@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cylCV2rqwz3Ysp; Fri, 31 Oct 2025 15:24:54 +0000 (UTC) (envelope-from mhorne@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761924294; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=NxTsMqX/FrH6YkeuAbq+oz6xMhnuG9ORw/4SxwuMIdY=; b=d91vUoewhTNzjhq0vPOA4nDawrt2RNKdzOtzHxTMFNhFbqRAkSqEgw8fknOHyRYD98HqYP I5awVzR5anvrTB24wCjIFRGQ3SEx0MahFMWuNLtKmfpC1gEzr+buWRBJ21fio5pmcCorha /DYSu2BCgg6xNe7bcATRYTmnju+vPaCpQi73b3JmzcUiYR1JD8zu/HsiOMDKGyWbyYo3uW xkgbTDiBdyFhyzMcFVShkjHTo9GnAAIS5I/x44cYl/v9Enpv17Ad9/p6R1Y264wp070CSv 3zO3BZAmzLhHDwNciVkI04FxH2oWGWHm8H2/F1/l1Hcxadei1sfLeJGbXGLQyw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761924294; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=NxTsMqX/FrH6YkeuAbq+oz6xMhnuG9ORw/4SxwuMIdY=; b=TKMIKGtNWNTQ/FWEetEOaPPUf6GCofg2kRzjs3OdfnNSRxaevn8eTyCO4rok2lWnFtrUqd 53nHA4I+cRCZnp3QzRRrvbpmo4MRMHQJfvoQz+f2Pea2y+lQOgq1D2zXIL5K71vIyuJ0UX mnvwzBpkldzHWlssjc1ak6NEYE0jT09MwFMQ1knMkCq+ZyJQihZPXyhwx5CL0jn2Cc976l NfZKgdykMdVNeO2dWIS6ytsokHLJDgQW9qzCrF1/f4gjbfJJbA5D7EVnPJcqMdwUfxQD3F /14E87vQTs67E5caZC63//mHiIze1iwNV95chT888GDgKFpV2iNIhcLQqY428w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761924294; a=rsa-sha256; cv=none; b=eF/m6lDGWmD+UYiEmtVmCfmnmN7yW52L4rilWF74FCXt+b0OpWzczPUA5vm4HqO2Vt+Jxu Sto+p7Yr6z6Nkjiimo3YZtGevm068O64vGmJ47CjX93Vr1QCRwnT5nnMrpFVlrM+Cfj+oY MiqUjQlomm6cKmTZGx+zE4iWPyp8Za2emiF8APflFTlXVOWWxLciuatAZJldW4w0T+0ek/ 6Gg1ApvkjIWR3FunIFpbpQ+Zt/u/GtDe/q4nmDaYCyD2yCCPi1X/MTJ8LMhUMZiqZUVnOR Igicy8bcpMcoTjUFtVCgl4q+AwC9leH9MY0Edl5fg+YnLljMADAb8tmjTbQgJQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from [192.168.2.224] (unknown [142.68.228.197]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: mhorne) by smtp.freebsd.org (Postfix) with ESMTPSA id 4cylCV1Mjtzmw6; Fri, 31 Oct 2025 15:24:54 +0000 (UTC) (envelope-from mhorne@freebsd.org) Message-ID: <836ad999-3d79-471c-9d67-4b13b19c08f4@freebsd.org> Date: Fri, 31 Oct 2025 12:24:13 -0300 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 8b43286fc3ba - main - vchiq: fix another logging format string for 32/64 bit To: Adrian Chadd , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202510300048.59U0mZ79069229@gitrepo.freebsd.org> From: Mitchell Horne Content-Language: en-CA In-Reply-To: <202510300048.59U0mZ79069229@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit --- vchiq_2835_arm.o --- /usr/src/sys/contrib/vchiq/interface/vchiq_arm/vchiq_2835_arm.c:549:71: error: format specifies type 'unsigned int' but the argument has type 'unsigned long' [-Werror,-Wformat] 549 | "free_pagelist - %zx, %d (%u bytes @%p)", (size_t)pagelist, actual, pagelist->length, bi->buf); | ~~ ^~~~~~~~~~~~~~~~ | %lu /usr/src/sys/contrib/vchiq/interface/vchiq_arm/vchiq_core.h:73:39: note: expanded from macro 'vchiq_log_trace' 73 | printf(VCHIQ_LOG_PREFIX fmt "\n", ##__VA_ARGS__); } while (0) | ~~~ ^~~~~~~~~~~ 1 error generated. *** [vchiq_2835_arm.o] Error code 1 This broke the build on armv7, I suggest a revert. Also one question below... On 10/29/25 21:48, Adrian Chadd wrote: > The branch main has been updated by adrian: > > URL: https://cgit.FreeBSD.org/src/commit/?id=8b43286fc3badc646ff5a828bae226c8fca90268 > > commit 8b43286fc3badc646ff5a828bae226c8fca90268 > Author: Marco Devesas Campos > AuthorDate: 2025-10-26 23:08:24 +0000 > Commit: Adrian Chadd > CommitDate: 2025-10-30 00:48:12 +0000 > > vchiq: fix another logging format string for 32/64 bit > > This is from work from https://reviews.freebsd.org/D37878. > > Submitted by: Marco Devesas Campos > Differential Revision: https://reviews.freebsd.org/D53372 > --- > sys/arm/broadcom/bcm2835/bcm2835_audio.c | 5 ++-- > .../vchiq/interface/vchiq_arm/vchiq_2835_arm.c | 11 ++++----- > sys/contrib/vchiq/interface/vchiq_arm/vchiq_arm.c | 28 +++++++++++----------- > 3 files changed, 21 insertions(+), 23 deletions(-) > > diff --git a/sys/arm/broadcom/bcm2835/bcm2835_audio.c b/sys/arm/broadcom/bcm2835/bcm2835_audio.c > index 74dede21c0df..2df6ac76124f 100644 > --- a/sys/arm/broadcom/bcm2835/bcm2835_audio.c > +++ b/sys/arm/broadcom/bcm2835/bcm2835_audio.c > @@ -260,8 +260,9 @@ bcm2835_audio_callback(void *param, const VCHI_CALLBACK_REASON_T reason, void *m > device_printf(sc->dev, "available_space == %d, count = %d, perr=%d\n", > ch->available_space, count, perr); > device_printf(sc->dev, > - "retrieved_samples = %lld, submitted_samples = %lld\n", > - ch->retrieved_samples, ch->submitted_samples); > + "retrieved_samples = %ju, submitted_samples = %ju\n", > + (uintmax_t)ch->retrieved_samples, > + (uintmax_t)ch->submitted_samples); > } > ch->available_space += count; > ch->retrieved_samples += count; > diff --git a/sys/contrib/vchiq/interface/vchiq_arm/vchiq_2835_arm.c b/sys/contrib/vchiq/interface/vchiq_arm/vchiq_2835_arm.c > index 0150ce72f0a4..f4aee12dec53 100644 > --- a/sys/contrib/vchiq/interface/vchiq_arm/vchiq_2835_arm.c > +++ b/sys/contrib/vchiq/interface/vchiq_arm/vchiq_2835_arm.c > @@ -204,8 +204,8 @@ vchiq_platform_init(VCHIQ_STATE_T *state) > bcm_mbox_write(BCM2835_MBOX_CHAN_VCHIQ, (unsigned int)g_slot_phys); > > vchiq_log_info(vchiq_arm_log_level, > - "vchiq_init - done (slots %x, phys %x)", > - (unsigned int)vchiq_slot_zero, g_slot_phys); > + "vchiq_init - done (slots %zx, phys %zx)", > + (size_t)vchiq_slot_zero, g_slot_phys); > > vchiq_call_connected_callbacks(); > > @@ -451,10 +451,7 @@ create_pagelist(char __user *buf, size_t count, unsigned short type, > } > > vchiq_log_trace(vchiq_arm_log_level, > - "create_pagelist - %x (%d bytes @%p)", (unsigned int)pagelist, count, buf); > - > - if (!pagelist) > - return -ENOMEM; Was this hunk unintended? I ask because it seems outside the reported scope of the change. Thanks, Mitchell > + "create_pagelist - %zx (%zu bytes @%p)", (size_t)pagelist, count, buf); > > addrs = pagelist->addrs; > pages = (vm_page_t*)(addrs + num_pages); > @@ -549,7 +546,7 @@ free_pagelist(BULKINFO_T *bi, int actual) > pagelist = bi->pagelist; > > vchiq_log_trace(vchiq_arm_log_level, > - "free_pagelist - %x, %d (%lu bytes @%p)", (unsigned int)pagelist, actual, pagelist->length, bi->buf); > + "free_pagelist - %zx, %d (%u bytes @%p)", (size_t)pagelist, actual, pagelist->length, bi->buf); > > num_pages = > (pagelist->length + pagelist->offset + PAGE_SIZE - 1) / > diff --git a/sys/contrib/vchiq/interface/vchiq_arm/vchiq_arm.c b/sys/contrib/vchiq/interface/vchiq_arm/vchiq_arm.c > index 763cd9ce9417..e25c4d738922 100644 > --- a/sys/contrib/vchiq/interface/vchiq_arm/vchiq_arm.c > +++ b/sys/contrib/vchiq/interface/vchiq_arm/vchiq_arm.c > @@ -442,8 +442,8 @@ vchiq_ioctl(struct cdev *cdev, u_long cmd, caddr_t arg, int fflag, > #define _IOC_TYPE(x) IOCGROUP(x) > > vchiq_log_trace(vchiq_arm_log_level, > - "vchiq_ioctl - instance %x, cmd %s, arg %p", > - (unsigned int)instance, > + "vchiq_ioctl - instance %zx, cmd %s, arg %p", > + (size_t)instance, > ((_IOC_TYPE(cmd) == VCHIQ_IOC_MAGIC) && > (_IOC_NR(cmd) <= VCHIQ_IOC_MAX)) ? > ioctl_names[_IOC_NR(cmd)] : "", arg); > @@ -745,8 +745,8 @@ vchiq_ioctl(struct cdev *cdev, u_long cmd, caddr_t arg, int fflag, > break; > } > vchiq_log_info(vchiq_arm_log_level, > - "found bulk_waiter %x for pid %d", > - (unsigned int)waiter, current->p_pid); > + "found bulk_waiter %zx for pid %d", > + (size_t)waiter, current->p_pid); > args.userdata = &waiter->bulk_waiter; > } > status = vchiq_bulk_transfer > @@ -776,8 +776,8 @@ vchiq_ioctl(struct cdev *cdev, u_long cmd, caddr_t arg, int fflag, > list_add(&waiter->list, &instance->bulk_waiter_list); > lmutex_unlock(&instance->bulk_waiter_list_mutex); > vchiq_log_info(vchiq_arm_log_level, > - "saved bulk_waiter %x for pid %d", > - (unsigned int)waiter, current->p_pid); > + "saved bulk_waiter %zx for pid %d", > + (size_t)waiter, current->p_pid); > > memcpy((void *) > &(((VCHIQ_QUEUE_BULK_TRANSFER_T *) > @@ -860,9 +860,9 @@ vchiq_ioctl(struct cdev *cdev, u_long cmd, caddr_t arg, int fflag, > if (args.msgbufsize < msglen) { > vchiq_log_error( > vchiq_arm_log_level, > - "header %x: msgbufsize" > + "header %zx: msgbufsize" > " %x < msglen %x", > - (unsigned int)header, > + (size_t)header, > args.msgbufsize, > msglen); > WARN(1, "invalid message " > @@ -1031,8 +1031,8 @@ vchiq_ioctl(struct cdev *cdev, u_long cmd, caddr_t arg, int fflag, > ret = -EFAULT; > } else { > vchiq_log_error(vchiq_arm_log_level, > - "header %x: bufsize %x < size %x", > - (unsigned int)header, args.bufsize, > + "header %zx: bufsize %x < size %x", > + (size_t)header, args.bufsize, > header->size); > WARN(1, "invalid size\n"); > ret = -EMSGSIZE; > @@ -1435,9 +1435,9 @@ vchiq_dump_platform_instances(void *dump_context) > instance = service->instance; > if (instance && !instance->mark) { > len = snprintf(buf, sizeof(buf), > - "Instance %x: pid %d,%s completions " > + "Instance %zx: pid %d,%s completions " > "%d/%d", > - (unsigned int)instance, instance->pid, > + (size_t)instance, instance->pid, > instance->connected ? " connected, " : > "", > instance->completion_insert - > @@ -1465,8 +1465,8 @@ vchiq_dump_platform_service_state(void *dump_context, VCHIQ_SERVICE_T *service) > char buf[80]; > int len; > > - len = snprintf(buf, sizeof(buf), " instance %x", > - (unsigned int)service->instance); > + len = snprintf(buf, sizeof(buf), " instance %zx", > + (size_t)service->instance); > > if ((service->base.callback == service_callback) && > user_service->is_vchi) { From nobody Fri Oct 31 15:28:38 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cylHq0ksWz6FyjM; Fri, 31 Oct 2025 15:28:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cylHq07CKz3bCq; Fri, 31 Oct 2025 15:28:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761924519; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Jd7snt2fN+daR/mzkBNm1/nzIkV0FxYpHBHlBjJZ5U0=; b=oE/r6e/Qg44Kjk5wFoaWk6KNjUSz/f3G1MVseaLZYNzRJzgSnJ7aQ2E39txZvR5ZqTV8HL SaCq/RJAmibqZWR7i8cm99+ZiKf1wM8KPVX/bjfpYiALKkUZ5NQ5pAJJfx0+R4F3iIKd2l v+VjyD1boDmQ/LGg+i8zwk5MioHWmFHxOaidepY00DYnbSwTDoqpP0lmipukgI6zltRvAn itgqChf1HT+CCs8NDgI5xRdEtFmaCDV6tFjYF4pQDxBt+5VSCcYf82T5WfAzF+GyOFULE2 iw6XviJwcJB9NDawHVHPTvHsZAlf2TO8IypMU09w2b1EwEuUW0thh4kfmN50dQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761924519; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Jd7snt2fN+daR/mzkBNm1/nzIkV0FxYpHBHlBjJZ5U0=; b=ktrAHihv8KIr1iUbBcC1GPzGFhWb/neTAmeVBaaOG0h06m7fEW2N52EmLk0AiqCVhTz8QT Hp6Yz7HvSPdeLxpn/qpk/O8dwn2oPsNgGU6ZNsgy7XCeSMMajkqgeisrBd6vB6BrxeETdn r683WSOFedc2Ijg2OVX7Fy33TxFTEoKCtgycbiYvv++ZxoaXxPbOY0ci0Axu6YPUoTWVB5 RREwQtmlwMscNXjzXSYHfMT+XNSbp8Gx4qwp/0m95ge5VLCNBoHTd0b3fbjfAdwjA1XT3o 1002MxuEhO6fZXiuYdc4v/0BEnSqcVzSpwRkU2Rb/Pr6sMgrE/VMkT+OEtcF4A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761924519; a=rsa-sha256; cv=none; b=ibLTwX6zBhfJS1Ol14SIdAFKtM2W5F+NN7ZEXqedhS66zdtuqyKH/KAHwvkcErDitYMhWk XRcS2nzFi7e1CtxgrpAWcEI3mSF2qINjVbFxLsvrtmkjOQ7iPUlbtdRTMmLMgrzW02xuuO kQgbEndQEFwc97gmatqN1JTdwxFqVBjOaHPGYH24yz+quYobjJcwsHwz3c7v/+hKHposSv TaN4hXinb0RM7YysvKOFOMN1ALdDLY93OsUaSnfNsCxNwEKdzqawRpw51g7MDikWnZRg5Q N/fbWi4WYoOTRYRZYLHa6T8t95coZ2/qcaU+mrRwa6JsFqyPwUvhElMdXDzZ+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cylHp6YsYz1DF4; Fri, 31 Oct 2025 15:28: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 59VFScqK045139; Fri, 31 Oct 2025 15:28:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59VFScAK045136; Fri, 31 Oct 2025 15:28:38 GMT (envelope-from git) Date: Fri, 31 Oct 2025 15:28:38 GMT Message-Id: <202510311528.59VFScAK045136@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 56d5ec30e8e1 - main - pf tests: pfctl -T replace test List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 56d5ec30e8e135f716e10b5bf2c0cc1ba18933f9 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=56d5ec30e8e135f716e10b5bf2c0cc1ba18933f9 commit 56d5ec30e8e135f716e10b5bf2c0cc1ba18933f9 Author: Kristof Provost AuthorDate: 2025-10-31 09:44:00 +0000 Commit: Kristof Provost CommitDate: 2025-10-31 15:24:09 +0000 pf tests: pfctl -T replace test Sponsored by: Rubicon Communications, LLC ("Netgate") --- tests/sys/netpfil/pf/table.sh | 62 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/tests/sys/netpfil/pf/table.sh b/tests/sys/netpfil/pf/table.sh index 69fe12fc9804..6761ce652beb 100644 --- a/tests/sys/netpfil/pf/table.sh +++ b/tests/sys/netpfil/pf/table.sh @@ -747,6 +747,67 @@ in_anchor_cleanup() pft_cleanup } +atf_test_case "replace" "cleanup" +replace_head() +{ + atf_set descr 'Test table replace command' + atf_set require.user root +} + +replace_body() +{ + pft_init + pwd=$(pwd) + + epair_send=$(vnet_mkepair) + ifconfig ${epair_send}a 192.0.2.1/24 up + + vnet_mkjail alcatraz ${epair_send}b + jexec alcatraz ifconfig ${epair_send}b 192.0.2.2/24 up + jexec alcatraz pfctl -e + + pft_set_rules alcatraz \ + "table counters { 192.0.2.1 }" \ + "block all" \ + "pass in from to any" \ + "pass out from any to " \ + "set skip on lo" + + atf_check -s exit:0 -o ignore ping -c 3 192.0.2.2 + + # Replace the address + atf_check -s exit:0 -e "match:1 addresses added." -e "match:1 addresses deleted." \ + jexec alcatraz pfctl -t foo -T replace 192.0.2.3 + atf_check -s exit:0 -o "match:192.0.2.3" \ + jexec alcatraz pfctl -t foo -T show + atf_check -s exit:2 -o ignore ping -c 3 192.0.2.2 + + # Negated address + atf_check -s exit:0 -e "match:1 addresses changed." \ + jexec alcatraz pfctl -t foo -T replace "!192.0.2.3" + + # Now add 500 addresses + for i in `seq 1 2`; do + for j in `seq 1 250`; do + echo "1.${i}.${j}.1" >> ${pwd}/foo.lst + done + done + atf_check -s exit:0 -e "match:500 addresses added." -e "match:1 addresses deleted." \ + jexec alcatraz pfctl -t foo -T replace -f ${pwd}/foo.lst + + atf_check -s exit:0 -o "not-match:192.0.2.3" \ + jexec alcatraz pfctl -t foo -T show + + # Loading the same list produces no changes. + atf_check -s exit:0 -e "match:no changes." \ + jexec alcatraz pfctl -t foo -T replace -f ${pwd}/foo.lst +} + +replace_cleanup() +{ + pft_cleanup +} + atf_init_test_cases() { atf_add_test_case "v4_counters" @@ -765,4 +826,5 @@ atf_init_test_cases() atf_add_test_case "large" atf_add_test_case "show_recursive" atf_add_test_case "in_anchor" + atf_add_test_case "replace" } From nobody Fri Oct 31 15:28:39 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cylHr2PQbz6Fycc; Fri, 31 Oct 2025 15:28: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cylHr12ZNz3b55; Fri, 31 Oct 2025 15:28:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761924520; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=D3Ilk3a2gfw9neJ3Z7E2DBuqlgsKol4WFzbTzwxEDS0=; b=RzpY60f4HMk5SUkCc5uObycWfwhu8oBDwbg36mX/CV/8a/zcTRGXrt27cEv/zR30U2OUPl 2ozzbkVhpyMHZ5ZaHWowyb47gQwhIFeF3iZCykJw2OF9za2Yxb/zERB5dsvx3Hd7AzeVS6 XdG8MNJXayR4ygyc8U+X4f5CAHGsrmqk3NIYDq0O/J/U0HfVpTArLCFrVmUJ1UFmcHTolS KZnR1EmPiVaSKBThvv/u/qZfUGD55njOCZdOJIo4mSyvoUhnu2gSMibBkg9FB0/73a9y0+ X8MsGpbchZiFq2pZ02MT7PjU59SZQ/vDixeUyEEIDAoIspLEna2NddKPBzfuRA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761924520; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=D3Ilk3a2gfw9neJ3Z7E2DBuqlgsKol4WFzbTzwxEDS0=; b=GRNvzoKTjW5M5uh1eiHN5REVodglur5fFkoaIpVR4sWuRqrHGNA8Fc3mzyZcuZUCZ5m3+Q QdcMMBa54ftrDSltZzB+Onhi67G0gYFWJ6ybOKyti+oaAGp1xBnH9+C94H5th94v2QfbJO ZIzZiOWw/QnQKIVp4zaim7qHY3WGVNwaUjI9DUZbdYVbXUimdxEP852BJoAr12g270tldE O8v57WYuUJ6ZYzVS9UHnTx8NUjFv323ZYlWDPq4IxryZE3x6w3KQcxUotCvQ1XN/ufPVNK LcPk7v/D5GEMp7YZGX7YczBTvEk7k6kyED2uYaLLuDcU/ne7hrwzBX+HtbsCEg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761924520; a=rsa-sha256; cv=none; b=HQ3BCzty3As6PJFpCN12V3j4GHtQQG+YOlKaeP6PV/FlNiToNa3m3HfnCCy67e/wzMlaSe qHTgFZNs/uZZjpi2jWkS4lZCouMkKhp2yA3iEo5MtIyQik3k4Chw044Dhpxf7fd3fz/sdh DksC569MuyoQOLdUr3wLF7i8I31slUMokFu8QDq/66Z6iuCcwk/UlKG/+kA9AajkeZMgDM 7xk7P0/njrsNTjQ3oGIA4JaRikFGNTCS0Yz/akh2P2F7os1hIPxl1jxgSdCqIeR/qNpTnP ZfxpD/kkQT43dkmk+5c2Urlme2RsoH6T9tRq1ysg5tzDzGWTAoJswtfo6IOU4g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cylHr0WB0z1CjN; Fri, 31 Oct 2025 15:28: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 59VFSeeP045173; Fri, 31 Oct 2025 15:28:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59VFSdri045170; Fri, 31 Oct 2025 15:28:39 GMT (envelope-from git) Date: Fri, 31 Oct 2025 15:28:39 GMT Message-Id: <202510311528.59VFSdri045170@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 08ed87a4a276 - main - pf: convert DIOCRSETADDRS to netlink List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 08ed87a4a2769cf6294efdd908b0ed4d29ab49b4 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=08ed87a4a2769cf6294efdd908b0ed4d29ab49b4 commit 08ed87a4a2769cf6294efdd908b0ed4d29ab49b4 Author: Kristof Provost AuthorDate: 2025-10-31 10:36:55 +0000 Commit: Kristof Provost CommitDate: 2025-10-31 15:24:09 +0000 pf: convert DIOCRSETADDRS to netlink The list of addresses is potentially very large. Larger than we can fit in a single netlink request, so we indicate via the PFR_FLAG_START/PFR_FLAG_DONE flags when we start and finish, so the kernel can work out which addresses need to be removed. Sponsored by: Rubicon Communications, LLC ("Netgate") --- lib/libpfctl/libpfctl.c | 95 +++++++++++++++++++++++++++++++++++++++++++++++ lib/libpfctl/libpfctl.h | 5 ++- sbin/pfctl/pfctl.h | 2 +- sbin/pfctl/pfctl_radix.c | 4 +- sbin/pfctl/pfctl_table.c | 13 +------ sys/net/pfvar.h | 5 ++- sys/netpfil/pf/pf_if.c | 2 +- sys/netpfil/pf/pf_ioctl.c | 2 +- sys/netpfil/pf/pf_nl.c | 44 ++++++++++++++++++++++ sys/netpfil/pf/pf_nl.h | 2 + sys/netpfil/pf/pf_table.c | 10 +++-- 11 files changed, 162 insertions(+), 22 deletions(-) diff --git a/lib/libpfctl/libpfctl.c b/lib/libpfctl/libpfctl.c index 17576066fcfd..e739e55033e2 100644 --- a/lib/libpfctl/libpfctl.c +++ b/lib/libpfctl/libpfctl.c @@ -2597,6 +2597,101 @@ pfctl_table_del_addrs_h(struct pfctl_handle *h, struct pfr_table *tbl, struct pf return (ret); } +struct pfctl_change { + int add; + int del; + int change; +}; +#define _OUT(_field) offsetof(struct pfctl_change, _field) +static struct snl_attr_parser ap_table_set_addr[] = { + { .type = PF_TA_NBR_ADDED, .off = _OUT(add), .cb = snl_attr_get_uint32 }, + { .type = PF_TA_NBR_DELETED, .off = _OUT(del), .cb = snl_attr_get_uint32 }, + { .type = PF_TA_NBR_CHANGED, .off = _OUT(change), .cb = snl_attr_get_uint32 }, +}; +#undef _OUT +SNL_DECLARE_PARSER(table_set_addr_parser, struct genlmsghdr, snl_f_p_empty, ap_table_set_addr); + +static int +_pfctl_table_set_addrs_h(struct pfctl_handle *h, struct pfr_table *tbl, struct pfr_addr + *addrs, int size, int *nadd, int *ndel, int *nchange, int flags) +{ + struct snl_writer nw; + struct snl_errmsg_data e = {}; + struct nlmsghdr *hdr; + struct pfctl_change change = { 0 }; + uint32_t seq_id; + int family_id; + + family_id = snl_get_genl_family(&h->ss, PFNL_FAMILY_NAME); + if (family_id == 0) + return (ENOTSUP); + + snl_init_writer(&h->ss, &nw); + hdr = snl_create_genl_msg_request(&nw, family_id, PFNL_CMD_TABLE_SET_ADDR); + + snl_add_msg_attr_table(&nw, PF_TA_TABLE, tbl); + snl_add_msg_attr_u32(&nw, PF_TA_FLAGS, flags); + for (int i = 0; i < size; i++) + snl_add_msg_attr_pfr_addr(&nw, PF_TA_ADDR, &addrs[i]); + + if ((hdr = snl_finalize_msg(&nw)) == NULL) + return (ENXIO); + seq_id = hdr->nlmsg_seq; + + if (! snl_send_message(&h->ss, hdr)) + return (ENXIO); + + while ((hdr = snl_read_reply_multi(&h->ss, seq_id, &e)) != NULL) { + if (! snl_parse_nlmsg(&h->ss, hdr, &table_set_addr_parser, &change)) + continue; + } + + if (nadd) + *nadd = change.add; + if (ndel) + *ndel = change.del; + if (nchange) + *nchange = change.change; + + return (e.error); +} + +int +pfctl_table_set_addrs_h(struct pfctl_handle *h, struct pfr_table *tbl, + struct pfr_addr *addr, int size, int *nadd, int *ndel, + int *nchange, int flags) +{ + int ret; + int off = 0; + int partial_add, partial_del, partial_change; + int chunk_size; + + do { + flags &= ~(PFR_FLAG_START | PFR_FLAG_DONE); + if (off == 0) + flags |= PFR_FLAG_START; + chunk_size = MIN(size - off, 256); + if ((chunk_size + off) == size) + flags |= PFR_FLAG_DONE; + ret = _pfctl_table_set_addrs_h(h, tbl, &addr[off], chunk_size, + &partial_add, &partial_del, &partial_change, flags); + if (ret != 0) + break; + if (! (flags & PFR_FLAG_DONE)) { + assert(partial_del == 0); + } + if (nadd) + *nadd += partial_add; + if (ndel) + *ndel += partial_del; + if (nchange) + *nchange += partial_change; + off += chunk_size; + } while (off < size); + + return (ret); +} + int pfctl_table_set_addrs(int dev, struct pfr_table *tbl, struct pfr_addr *addr, int size, int *size2, int *nadd, int *ndel, int *nchange, int flags) diff --git a/lib/libpfctl/libpfctl.h b/lib/libpfctl/libpfctl.h index 5880e1a88371..ae4b18dabe75 100644 --- a/lib/libpfctl/libpfctl.h +++ b/lib/libpfctl/libpfctl.h @@ -523,7 +523,10 @@ int pfctl_table_del_addrs_h(struct pfctl_handle *h, struct pfr_table *tbl, struct pfr_addr *addr, int size, int *ndel, int flags); int pfctl_table_del_addrs(int dev, struct pfr_table *tbl, struct pfr_addr *addr, int size, int *ndel, int flags); -int pfctl_table_set_addrs(int dev, struct pfr_table *tbl, struct pfr_addr +int pfctl_table_set_addrs_h(struct pfctl_handle *h, struct pfr_table *tbl, + struct pfr_addr *addr, int size, int *nadd, int *ndel, + int *nchange, int flags); +int pfctl_table_set_addrs(int dev, struct pfr_table *tbl, struct pfr_addr *addr, int size, int *size2, int *nadd, int *ndel, int *nchange, int flags); int pfctl_table_get_addrs(int dev, struct pfr_table *tbl, struct pfr_addr diff --git a/sbin/pfctl/pfctl.h b/sbin/pfctl/pfctl.h index 136f51ea08f9..c540c6348d84 100644 --- a/sbin/pfctl/pfctl.h +++ b/sbin/pfctl/pfctl.h @@ -110,7 +110,7 @@ int pfr_clr_astats(struct pfr_table *, struct pfr_addr *, int, int *, int); int pfr_clr_addrs(struct pfr_table *, int *, int); int pfr_add_addrs(struct pfr_table *, struct pfr_addr *, int, int *, int); int pfr_del_addrs(struct pfr_table *, struct pfr_addr *, int, int *, int); -int pfr_set_addrs(struct pfr_table *, struct pfr_addr *, int, int *, +int pfr_set_addrs(struct pfr_table *, struct pfr_addr *, int, int *, int *, int *, int); int pfr_get_addrs(struct pfr_table *, struct pfr_addr *, int *, int); int pfr_get_astats(struct pfr_table *, struct pfr_astats *, int *, int); diff --git a/sbin/pfctl/pfctl_radix.c b/sbin/pfctl/pfctl_radix.c index 98f907738d95..3b7161420e33 100644 --- a/sbin/pfctl/pfctl_radix.c +++ b/sbin/pfctl/pfctl_radix.c @@ -163,11 +163,11 @@ pfr_del_addrs(struct pfr_table *tbl, struct pfr_addr *addr, int size, int pfr_set_addrs(struct pfr_table *tbl, struct pfr_addr *addr, int size, - int *size2, int *nadd, int *ndel, int *nchange, int flags) + int *nadd, int *ndel, int *nchange, int flags) { int ret; - ret = pfctl_table_set_addrs(dev, tbl, addr, size, size2, nadd, ndel, + ret = pfctl_table_set_addrs_h(pfh, tbl, addr, size, nadd, ndel, nchange, flags); if (ret) { errno = ret; diff --git a/sbin/pfctl/pfctl_table.c b/sbin/pfctl/pfctl_table.c index 4955e1791fd7..aae347712547 100644 --- a/sbin/pfctl/pfctl_table.c +++ b/sbin/pfctl/pfctl_table.c @@ -236,17 +236,8 @@ pfctl_table(int argc, char *argv[], char *tname, const char *command, CREATE_TABLE; if (opts & PF_OPT_VERBOSE) flags |= PFR_FLAG_FEEDBACK; - for (;;) { - int sz2 = b.pfrb_msize; - - RVTEST(pfr_set_addrs(&table, b.pfrb_caddr, b.pfrb_size, - &sz2, &nadd, &ndel, &nchange, flags)); - if (sz2 <= b.pfrb_msize) { - b.pfrb_size = sz2; - break; - } else - pfr_buf_grow(&b, sz2); - } + RVTEST(pfr_set_addrs(&table, b.pfrb_caddr, b.pfrb_size, + &nadd, &ndel, &nchange, flags)); if (nadd) xprintf(opts, "%d addresses added", nadd); if (ndel) diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h index 52db00f6ce0b..ce266a267f3c 100644 --- a/sys/net/pfvar.h +++ b/sys/net/pfvar.h @@ -2038,14 +2038,15 @@ struct pfioc_trans { } *array; }; -#define PFR_FLAG_ATOMIC 0x00000001 /* unused */ +#define PFR_FLAG_START 0x00000001 #define PFR_FLAG_DUMMY 0x00000002 #define PFR_FLAG_FEEDBACK 0x00000004 #define PFR_FLAG_CLSTATS 0x00000008 #define PFR_FLAG_ADDRSTOO 0x00000010 #define PFR_FLAG_REPLACE 0x00000020 #define PFR_FLAG_ALLRSETS 0x00000040 -#define PFR_FLAG_ALLMASK 0x0000007F +#define PFR_FLAG_DONE 0x00000080 +#define PFR_FLAG_ALLMASK 0x000000FF #ifdef _KERNEL #define PFR_FLAG_USERIOCTL 0x10000000 #endif diff --git a/sys/netpfil/pf/pf_if.c b/sys/netpfil/pf/pf_if.c index f3be036ef745..6f41d453a7d1 100644 --- a/sys/netpfil/pf/pf_if.c +++ b/sys/netpfil/pf/pf_if.c @@ -702,7 +702,7 @@ pfi_table_update(struct pfr_ktable *kt, struct pfi_kkif *kif, uint8_t net, } if ((e = pfr_set_addrs(&kt->pfrkt_t, V_pfi_buffer, V_pfi_buffer_cnt, &size2, - NULL, NULL, NULL, 0, PFR_TFLAG_ALLMASK))) + NULL, NULL, NULL, PFR_FLAG_START | PFR_FLAG_DONE, PFR_TFLAG_ALLMASK))) printf("%s: cannot set %d new addresses into table %s: %d\n", __func__, V_pfi_buffer_cnt, kt->pfrkt_name, e); } diff --git a/sys/netpfil/pf/pf_ioctl.c b/sys/netpfil/pf/pf_ioctl.c index 703ecf446fad..5ec67021068b 100644 --- a/sys/netpfil/pf/pf_ioctl.c +++ b/sys/netpfil/pf/pf_ioctl.c @@ -5142,7 +5142,7 @@ DIOCCHANGEADDR_error: error = pfr_set_addrs(&io->pfrio_table, pfras, io->pfrio_size, &io->pfrio_size2, &io->pfrio_nadd, &io->pfrio_ndel, &io->pfrio_nchange, io->pfrio_flags | - PFR_FLAG_USERIOCTL, 0); + PFR_FLAG_START | PFR_FLAG_DONE | PFR_FLAG_USERIOCTL, 0); PF_RULES_WUNLOCK(); if (error == 0 && io->pfrio_flags & PFR_FLAG_FEEDBACK) error = copyout(pfras, io->pfrio_buffer, totlen); diff --git a/sys/netpfil/pf/pf_nl.c b/sys/netpfil/pf/pf_nl.c index 082b9b565153..21d4db1b8478 100644 --- a/sys/netpfil/pf/pf_nl.c +++ b/sys/netpfil/pf/pf_nl.c @@ -2100,6 +2100,7 @@ struct nl_parsed_table_addrs { size_t addr_count; int nadd; int ndel; + int nchange; }; #define _OUT(_field) offsetof(struct pfr_addr, _field) static const struct nlattr_parser nla_p_pfr_addr[] = { @@ -2209,6 +2210,42 @@ pf_handle_table_del_addrs(struct nlmsghdr *hdr, struct nl_pstate *npt) return (error); } +static int +pf_handle_table_set_addrs(struct nlmsghdr *hdr, struct nl_pstate *npt) +{ + struct nl_parsed_table_addrs attrs = { 0 }; + struct nl_writer *nw = npt->nw; + struct genlmsghdr *ghdr_new; + int error; + + error = nl_parse_nlmsg(hdr, &table_addr_parser, npt, &attrs); + if (error != 0) + return (error); + + PF_RULES_WLOCK(); + error = pfr_set_addrs(&attrs.table, &attrs.addrs[0], + attrs.addr_count, NULL, &attrs.nadd, &attrs.ndel, &attrs.nchange, + attrs.flags | PFR_FLAG_USERIOCTL, 0); + PF_RULES_WUNLOCK(); + + if (!nlmsg_reply(nw, hdr, sizeof(struct genlmsghdr))) + return (ENOMEM); + + ghdr_new = nlmsg_reserve_object(nw, struct genlmsghdr); + ghdr_new->cmd = PFNL_CMD_TABLE_DEL_ADDR; + ghdr_new->version = 0; + ghdr_new->reserved = 0; + + nlattr_add_u32(nw, PF_TA_NBR_ADDED, attrs.nadd); + nlattr_add_u32(nw, PF_TA_NBR_DELETED, attrs.ndel); + nlattr_add_u32(nw, PF_TA_NBR_CHANGED, attrs.nchange); + + if (!nlmsg_end(nw)) + return (ENOMEM); + + return (error); +} + static const struct nlhdr_parser *all_parsers[] = { &state_parser, &addrule_parser, @@ -2460,6 +2497,13 @@ static const struct genl_cmd pf_cmds[] = { .cmd_flags = GENL_CMD_CAP_DO | GENL_CMD_CAP_HASPOL, .cmd_priv = PRIV_NETINET_PF, }, + { + .cmd_num = PFNL_CMD_TABLE_SET_ADDR, + .cmd_name = "TABLE_SET_ADDRS", + .cmd_cb = pf_handle_table_set_addrs, + .cmd_flags = GENL_CMD_CAP_DO | GENL_CMD_CAP_HASPOL, + .cmd_priv = PRIV_NETINET_PF, + }, }; void diff --git a/sys/netpfil/pf/pf_nl.h b/sys/netpfil/pf/pf_nl.h index c46c8f2b2592..d1538ab4ff5b 100644 --- a/sys/netpfil/pf/pf_nl.h +++ b/sys/netpfil/pf/pf_nl.h @@ -69,6 +69,7 @@ enum { PFNL_CMD_CLR_ADDRS = 31, PFNL_CMD_TABLE_ADD_ADDR = 32, PFNL_CMD_TABLE_DEL_ADDR = 33, + PFNL_CMD_TABLE_SET_ADDR = 34, __PFNL_CMD_MAX, }; #define PFNL_CMD_MAX (__PFNL_CMD_MAX -1) @@ -483,6 +484,7 @@ enum pf_table_addrs_t { PF_TA_FLAGS = 3, /* u32 */ PF_TA_NBR_ADDED = 4, /* u32 */ PF_TA_NBR_DELETED = 5, /* u32 */ + PF_TA_NBR_CHANGED = 6, /* u32 */ }; #ifdef _KERNEL diff --git a/sys/netpfil/pf/pf_table.c b/sys/netpfil/pf/pf_table.c index cf752ce0de18..0e2b9fe1cac8 100644 --- a/sys/netpfil/pf/pf_table.c +++ b/sys/netpfil/pf/pf_table.c @@ -399,7 +399,8 @@ pfr_set_addrs(struct pfr_table *tbl, struct pfr_addr *addr, int size, PF_RULES_WASSERT(); - ACCEPT_FLAGS(flags, PFR_FLAG_DUMMY | PFR_FLAG_FEEDBACK); + ACCEPT_FLAGS(flags, PFR_FLAG_START | PFR_FLAG_DONE | + PFR_FLAG_DUMMY | PFR_FLAG_FEEDBACK); if (pfr_validate_table(tbl, ignore_pfrt_flags, flags & PFR_FLAG_USERIOCTL)) return (EINVAL); @@ -411,7 +412,8 @@ pfr_set_addrs(struct pfr_table *tbl, struct pfr_addr *addr, int size, tmpkt = pfr_create_ktable(&V_pfr_nulltable, 0, 0); if (tmpkt == NULL) return (ENOMEM); - pfr_mark_addrs(kt); + if (flags & PFR_FLAG_START) + pfr_mark_addrs(kt); SLIST_INIT(&addq); SLIST_INIT(&delq); SLIST_INIT(&changeq); @@ -444,6 +446,7 @@ pfr_set_addrs(struct pfr_table *tbl, struct pfr_addr *addr, int size, } p = pfr_create_kentry(&ad, (kt->pfrkt_flags & PFR_TFLAG_COUNTERS) != 0); + p->pfrke_mark = PFR_FB_ADDED; if (p == NULL) senderr(ENOMEM); if (pfr_route_kentry(tmpkt, p)) { @@ -459,7 +462,8 @@ _skip: if (flags & PFR_FLAG_FEEDBACK) bcopy(&ad, addr + i, sizeof(ad)); } - pfr_enqueue_addrs(kt, &delq, &xdel, ENQUEUE_UNMARKED_ONLY); + if (flags & PFR_FLAG_DONE) + pfr_enqueue_addrs(kt, &delq, &xdel, ENQUEUE_UNMARKED_ONLY); if ((flags & PFR_FLAG_FEEDBACK) && *size2) { if (*size2 < size+xdel) { *size2 = size+xdel; From nobody Fri Oct 31 15:30:14 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cylKf2VrTz6Fylq; Fri, 31 Oct 2025 15:30:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cylKf1ytFz3c1r; Fri, 31 Oct 2025 15:30:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761924614; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oFJtT+KFOkcYOaEtrPPSIn1FEsYxPqPbupM1NKZGGQ4=; b=NFajpYAqiFOpcm2B3A/Exfre6bgKyDD98eM5a9JwU1TNgG9aKGcOtWTt11rmNOm4J/+y9U 3nnnWOKJ7MPe7gbfvW1zL7hA+DCXkW0DxDwVxNrSp730vp8Dj70EGW2E+X5FpNNx1B9p3U 0RcMG5gQbBpgCCIkKyF1czgZwOPqvwzhcngZloiqLdyM4PKiiH+3SaOp2aifgduGdoPtSg sQ0F0Am0CC6RJxcgPdaKm9Ot1ATpyYf5WGpZNz8JaGbZyMc81vxERz8MP7AX4aEp1Un40h UHUvod0eeVOoMvGHZbNjrrGiCanxxJOml6rDSll4e81eYONyutxNMurp0+Zd5w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761924614; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oFJtT+KFOkcYOaEtrPPSIn1FEsYxPqPbupM1NKZGGQ4=; b=BBjbAlS9Gw3Le+0vryHw9dJ2z88YUZjEmrOPUf3fzEiLeVZDiRAvnAfgrbwFhvzJQ8g3R2 wRUSapdttF8+Titn7kHPshG5P8XCTzbKeIiZ1QzI+X15RMZ6f2iKbZZ/AlV6DCfoF6bfhV QHbRPinSENMUFB9IVNE8BAkkrI39pet3vgICFUv8zed2wNhpv8I/iMgLRlj3srrR16udFf xXq9Lhz+Acpvcdg0+Tt5FR2i8dWFJyHMHipiPQchDHpfg2b2Z2F9g+vwDGFN1lTdzCrXQo BtdswFWFNEM5m8k2pVE+SuoXJg1yvgJy6DX7nXpW7xnyq3oWRromZRfS55GYTg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761924614; a=rsa-sha256; cv=none; b=YKQoLJ5F79vjL6A7tRZ+qsR31B8WDMWZzjNnU6TIme82DX6BUY45zaU1nDLftEq5/ij4J7 ktHgHUgPE8LlXr3whumcaDQ66xVJePyzoG4I8YhntdWBJcdGxsWMQCz9jmVUerObckzC1v rLio20OY34wi21WvMRLW9CIgrni8XXAR83RTWEa274FV0yxUy2vfACjoxRhUqm/B9xshZW alQPeLMuhFZ4p+eGJ16Jkl5zqv3TracrRh0WzAsxb94GbBWTEgN1uefr0TMsqglVhOIloU 3oDsc74h7T9WqkNzooymfi+SQuazN/gVpTBl++tGqsre/KRH0Zs1ZlFHBzIk5w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cylKf1HWFz1Crd; Fri, 31 Oct 2025 15:30: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 59VFUEqA051978; Fri, 31 Oct 2025 15:30:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59VFUEYU051969; Fri, 31 Oct 2025 15:30:14 GMT (envelope-from git) Date: Fri, 31 Oct 2025 15:30:14 GMT Message-Id: <202510311530.59VFUEYU051969@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: 6de1c50e78a8 - main - uart: provide and use default rclk for JH7110 UART List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6de1c50e78a826abc08660e4c3ac10f1ddba9ba2 Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=6de1c50e78a826abc08660e4c3ac10f1ddba9ba2 commit 6de1c50e78a826abc08660e4c3ac10f1ddba9ba2 Author: Mitchell Horne AuthorDate: 2025-10-14 18:02:40 +0000 Commit: Mitchell Horne CommitDate: 2025-10-31 15:30:02 +0000 uart: provide and use default rclk for JH7110 UART A regression in the u-boot-provided JH7110 device tree leaves the uart incorrectly configured. The issue arises when a baud rate is specified ('current-speed' property), but the rclk value is not ('clock-frequency'). Previous releases, e.g. v2025.04, provided both. The alternative way to retrieve this value is to query the parent clock, but our clk framework is not available during early console probing and configuration. In this instance, we end up defaulting to DEFAULT_RCLK in ns8250_init(), which is the wrong value. The relevant uart class (uart_snps) should provide a default rclk in its definition, but it does not. Add a new variant class with the correct default rclk of 24000000. Finally, uart_cpu_fdt_probe() needs to be updated to actually query this default value when it does not find a 'clock-frequency' property. This was simply missing; the ACPI uart bus behaves identically, see uart_acpi_probe(). PR: 289978 Reported by: rdunkle@smallcatbrain.com MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D53119 --- sys/dev/uart/uart_bus_fdt.c | 6 ++++++ sys/dev/uart/uart_dev_snps.c | 10 ++++++++++ 2 files changed, 16 insertions(+) diff --git a/sys/dev/uart/uart_bus_fdt.c b/sys/dev/uart/uart_bus_fdt.c index 431f2962adb2..e9a7e04e4e0c 100644 --- a/sys/dev/uart/uart_bus_fdt.c +++ b/sys/dev/uart/uart_bus_fdt.c @@ -238,6 +238,12 @@ uart_cpu_fdt_probe(struct uart_class **classp, bus_space_tag_t *bst, clk = 0; } + /* + * Grab the default rclk from the uart class. + */ + if (clk == 0) + clk = class->uc_rclk; + /* * Retrieve serial attributes. */ diff --git a/sys/dev/uart/uart_dev_snps.c b/sys/dev/uart/uart_dev_snps.c index 6067920e3c2a..0372a220282b 100644 --- a/sys/dev/uart/uart_dev_snps.c +++ b/sys/dev/uart/uart_dev_snps.c @@ -113,7 +113,17 @@ struct uart_class uart_snps_class = { .uc_rclk = 0, }; +struct uart_class uart_snps_jh7110_class = { + "snps", + snps_methods, + sizeof(struct snps_softc), + .uc_ops = &uart_ns8250_ops, + .uc_range = 8, + .uc_rclk = 24000000, +}; + static struct ofw_compat_data compat_data[] = { + { "starfive,jh7110-uart", (uintptr_t)&uart_snps_jh7110_class }, { "snps,dw-apb-uart", (uintptr_t)&uart_snps_class }, { "marvell,armada-38x-uart", (uintptr_t)&uart_snps_class }, { NULL, (uintptr_t)NULL } From nobody Fri Oct 31 15:48:04 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cylkG5P9pz6G0Zn; Fri, 31 Oct 2025 15:48:06 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cylkG4Lxbz3d7x; Fri, 31 Oct 2025 15:48:06 +0000 (UTC) (envelope-from dim@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761925686; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=+JiRpm0sWYu6n1BoNN6sxayizbUZZdaGEudWZHpr2IM=; b=Jk4tkcKTpI67WhbG0lLu5BjJZmMe0zI85jx63Y9M6NE+jPVVsdVDzytj9JY38cAQUzRPe8 wODE0RXjKqFTJcrFQpeBD4rwfBK5/MUHZgsoUi1bHWiOaDiuGWiGD1q9Bh9r6sn3qpwims jyKdCEpPApyKIHVTZxe273ezWKMt97mAxfjEmMlpNPQt0HIiFLHABOZOctbrhWx7/4I9Ic Q9IksmFkZXzbA3lrvMTIZkZDtBV7ex42McqxMeLz6mH4DhWIc4tkhbUBoHE3Wva0cHWa+X /ow0JDddPAMua+ZPiGj+UUEd0pBzPh88RuvqblOJeDxM2+GERyRi2DPanvhR7g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761925686; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=+JiRpm0sWYu6n1BoNN6sxayizbUZZdaGEudWZHpr2IM=; b=tyQJMhWPOTOF1tc5Uz6GGYRF2YhGvjOyun3G7bxphk4OeFIBr9WwEjXt6GQTu+TMPHhOsy 2hSSJE23+t5AgNeUs67Q86OwM5WXUIkkNoexwEw6CEE0/Nf7DwS80IPtPvnmlgrCG0t+9h 6Hf7wl2/YgbpyHiOP8I4e9Og2TDLI6nTj9Nq8jeVerEysvY9OLfcLczmFrv90Jubqhn2vZ vEibwFQbcb7h4vqqa5ELop5hHUegTUAy7Ek9/09El0z0B6W2HFpurJdY++eY/D0epqxO0R FFw/S9G0HnRhBRKjmgletvB2VQ3tEapzDfyQOb8JT7g7kQZJi8dAkPlETgVLrA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761925686; a=rsa-sha256; cv=none; b=ndLe1g8n8nBWjs1F8h1YZd6Ek+CwhRmc7w5LoArQvFz6G5LKBcGXrQn2Pv+9YFaVwumPVD vFTJh0/V5jyHV0DlariM8EOPtiS7kiYPWH1qTOufJm8cuF7z2qXgBEKLcHWHMcm/gDqObi Qz5I5NDcHW27HHnLP/1VykNqVDcVCFQScyKGzGB1iPHVJYeKCUxPH5IJjbdXAwxge/xy3J 15SmCgBfnkJEOOsLiGrjZjv9lvPEDMAmwGJKx16od5txj/i81Hk5/x1wRXeE+KbpqTkFir w0XGibLu80kDddJVrP/HlhLZz1ddfxBkG5eqrIkB2KpWBryTC8TJ9wg3kDVsVw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from tensor.andric.com (tensor.andric.com [87.251.56.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature ECDSA (prime256v1) client-digest SHA256) (Client CN "tensor.andric.com", Issuer "E8" (verified OK)) (Authenticated sender: dim) by smtp.freebsd.org (Postfix) with ESMTPSA id 4cylkG2s44znJ2; Fri, 31 Oct 2025 15:48:06 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from smtpclient.apple (bladnoch.home.andric.com [192.168.0.20]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by tensor.andric.com (Postfix) with ESMTPSA id 6816D5A461; Fri, 31 Oct 2025 16:48:04 +0100 (CET) Content-Type: text/plain; charset=utf-8 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3826.700.81\)) Subject: Re: git: 51e8e8b0f369 - main - Merge commit e24f90190c77 from llvm git (by Brad Smith): From: Dimitry Andric In-Reply-To: Date: Fri, 31 Oct 2025 16:48:04 +0100 Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: <16C4264B-2E85-4522-8EBB-4BDF206F959D@FreeBSD.org> References: <202510291850.59TIofPQ001392@gitrepo.freebsd.org> To: jlduran@freebsd.org X-Mailer: Apple Mail (2.3826.700.81) On 31 Oct 2025, at 14:48, Jose Luis Duran wrote: >=20 > On Wed, Oct 29, 2025 at 3:50=E2=80=AFPM Dimitry Andric = wrote: >>=20 >> The branch main has been updated by dim: >>=20 >> URL: = https://cgit.FreeBSD.org/src/commit/?id=3D51e8e8b0f36933814b1be08913857727= 876aece5 >>=20 >> commit 51e8e8b0f36933814b1be08913857727876aece5 >> Author: Dimitry Andric >> AuthorDate: 2025-10-29 18:49:54 +0000 >> Commit: Dimitry Andric >> CommitDate: 2025-10-29 18:49:54 +0000 >>=20 >> Merge commit e24f90190c77 from llvm git (by Brad Smith): >>=20 >> [Driver] Enable outline atomics for FreeBSD/aarch64 (#156089) >>=20 >> The compiler_rt helper functions have been built since 12.4, 13.1, = 14 >> and anything newer. >>=20 >> MFC after: 3 days >> --- >> contrib/llvm-project/clang/lib/Driver/ToolChains/FreeBSD.h | 5 +++++ >> 1 file changed, 5 insertions(+) >>=20 >> diff --git = a/contrib/llvm-project/clang/lib/Driver/ToolChains/FreeBSD.h = b/contrib/llvm-project/clang/lib/Driver/ToolChains/FreeBSD.h >> index 7ab63905ed4f..7d090ba682b3 100644 >> --- a/contrib/llvm-project/clang/lib/Driver/ToolChains/FreeBSD.h >> +++ b/contrib/llvm-project/clang/lib/Driver/ToolChains/FreeBSD.h >> @@ -78,6 +78,11 @@ public: >> void AddHIPIncludeArgs(const llvm::opt::ArgList &DriverArgs, >> llvm::opt::ArgStringList &CC1Args) const = override; >>=20 >> + bool IsAArch64OutlineAtomicsDefault( >> + const llvm::opt::ArgList &Args) const override { >> + return true; >> + } >> + >> UnwindTableLevel >> getDefaultUnwindTableLevel(const llvm::opt::ArgList &Args) const = override; >> bool isPIEDefault(const llvm::opt::ArgList &Args) const override; >=20 > I'm sure you're probably aware by now, but aarch64 builds are failing > after this commit: >=20 > https://ci.freebsd.org/job/FreeBSD-main-aarch64-build/33100/ It's weird, but I cannot reproduce it. For me, both world and kernel = build fine. Does anybody have any particular settings that can be used to reproduce = this on a fresh 16-CURRENT or 15-STABLE box? -Dimitry From nobody Fri Oct 31 15:51:33 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cylpF3rNDz6G0sP; Fri, 31 Oct 2025 15:51: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cylpF39Fcz3djy; Fri, 31 Oct 2025 15:51:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761925893; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RgM/QK/vYOKDf6AqkonHBHYBpMGD7SoLp200sKDbL80=; b=otOd4pBcSJzGR2BZpOrwrZVKTRa0HLbVZggT3saKfwdHr4GAkPlDGgwlNWr1qro+wC4xWK UmG2fJ6zhWwUTcC2NHFOo8izW2cjJ4Qv5Wj60t9vlw7ta714LMMKJXr+7KFToMijFQap8H I/K9ybQhC2F7EVxpvrPqafBoEXKL8D9KcRGWO72EyxWl4E4NPX/0bULc5F0fIowt3Jz7P7 bs/cVkpqtf1Qboy0AQNccMECny2Tt4aNnxzRdnHU3iJOLaXbnVAfYAWOfeHFuJhMrMDmtg 7NQeCsqGDFJ1zMAWeHfphPhE26UR7Rs/Z1dgMckZg7ch6zMo+AJi4kvvaaxo7w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761925893; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RgM/QK/vYOKDf6AqkonHBHYBpMGD7SoLp200sKDbL80=; b=p1FMVSnDWNM10ahyzdwKwoR1SWS7K6wPm/20TxRjHYelAmBTK830ufWCC2oszrr1vzyCsf iL4eqmBBlipVfHEcljs0ttJFUKkquTbb6/CFLwxGLeyGOMXbGNGXTZ5UL7zh3qYROuR4af 9gOkatek4ChKSgZwx0BIrs6Q0AZVY/7ieax2TF/+HdVrPFIjoCMw9zE3j0hRpycM1XzbaN DuY6++pOgbpmqdnLDYzl5gdIt9yoZRoV+YI+UI4kv4aoamzZfmiTDqvr/6g+SjojyAdiUD HTTS0BbNGbvcoPgA4bSjoDNsfDoXM8KjWqD9Yp0Ely34tc5Jot010WpbXqzA2g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761925893; a=rsa-sha256; cv=none; b=FGZLpX0he/2OHdZ06cw1IP58miaV0Q3Rq44i3oe0EsFxr+q3M77OH+9e/w6ejTyQ8oSHKe KuYggjafk4BJP4RzxnM1tc+0o2BT8PGi3UwPq8mBNLG12P6nkRcZeaCmRHSKmE37BpP4jP UqYphBez2nSxiTBy1NaAZIqR+EV0cuxgmj+RTE7tTFuSxTUtTcxhfZZzgVVz8RRJin4607 NovzNObRt643bPbEeyh0BMQm0wIrkW8BBPYwaDVWeykBQbXGn7/5KLg8GnTTK7uvWjrl4I i/pteCXMCHuc8xDlUfnOuw2/PZykPRfsJrqy0r+JNtNHGqR36Q1/t6TBPWoTPw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cylpF2jRbz1DGW; Fri, 31 Oct 2025 15:51: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 59VFpXf5092172; Fri, 31 Oct 2025 15:51:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59VFpX2w092169; Fri, 31 Oct 2025 15:51:33 GMT (envelope-from git) Date: Fri, 31 Oct 2025 15:51:33 GMT Message-Id: <202510311551.59VFpX2w092169@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: bd27bd1f51d0 - main - Revert "Merge commit e24f90190c77 from llvm git (by Brad Smith):" List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bd27bd1f51d049538cc7a0053be9d99110a53ae1 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=bd27bd1f51d049538cc7a0053be9d99110a53ae1 commit bd27bd1f51d049538cc7a0053be9d99110a53ae1 Author: Dimitry Andric AuthorDate: 2025-10-31 15:48:31 +0000 Commit: Dimitry Andric CommitDate: 2025-10-31 15:51:16 +0000 Revert "Merge commit e24f90190c77 from llvm git (by Brad Smith):" [Driver] Enable outline atomics for FreeBSD/aarch64 (#156089) The compiler_rt helper functions have been built since 12.4, 13.1, 14 and anything newer. This reverts commit 51e8e8b0f36933814b1be08913857727876aece5. MFC after: immediately --- contrib/llvm-project/clang/lib/Driver/ToolChains/FreeBSD.h | 5 ----- 1 file changed, 5 deletions(-) diff --git a/contrib/llvm-project/clang/lib/Driver/ToolChains/FreeBSD.h b/contrib/llvm-project/clang/lib/Driver/ToolChains/FreeBSD.h index 7d090ba682b3..7ab63905ed4f 100644 --- a/contrib/llvm-project/clang/lib/Driver/ToolChains/FreeBSD.h +++ b/contrib/llvm-project/clang/lib/Driver/ToolChains/FreeBSD.h @@ -78,11 +78,6 @@ public: void AddHIPIncludeArgs(const llvm::opt::ArgList &DriverArgs, llvm::opt::ArgStringList &CC1Args) const override; - bool IsAArch64OutlineAtomicsDefault( - const llvm::opt::ArgList &Args) const override { - return true; - } - UnwindTableLevel getDefaultUnwindTableLevel(const llvm::opt::ArgList &Args) const override; bool isPIEDefault(const llvm::opt::ArgList &Args) const override; From nobody Fri Oct 31 15:52:23 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cylqD5nZKz6G0qV; Fri, 31 Oct 2025 15:52: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cylqC6Wp3z3fhh; Fri, 31 Oct 2025 15: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=1761925943; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6cjA8ne7A879LbdUiM/4XprFmX6sYKEvN6YSIlFfV/0=; b=dZJo+O7nclvXtUto5pFROM5oI4/sIE9gx5qMQTIlX2xGfqtMbmw5ZBPYYLqZ3yIZR6HSpz rbDye2olfPt/QqSCRc88LB+8+FX/8VgbYNKcmoFbXIidXarDpzqLiCNNCA+l1ofv0Bamc6 Wc9t6iJnugTpFn0DwKjlxEoBUlpf6bg6i5dmTyi4LyixqQyNjcT3WVPjXpDni41nhbGNcz ClJ5ufhT2J3TG+E8/JihDwwlSUbk3Kg/f2oLEhL92L1XYJ69xKSlVfo18JnyVA6NDxY0xH qFe0lrzT1wqSBwa0UVeOrRNgKFaRQtc8cr+F7pPycLk5SPoFsMYZQ51jAh/y/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761925943; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6cjA8ne7A879LbdUiM/4XprFmX6sYKEvN6YSIlFfV/0=; b=upLNAkh9VosJhDeMPbFTEH5E/MVomwVo/ahuj6uFRClmGAkL4P3Ofl50yDm1QH4BfTQlOg we95x4M9dqrwLS9ke0dCh2apwdTQmmJYoN/LfghVMxS2oHaevG3TWgjb+oWpq2ZkPthGvR M4f6s7M0eCzlLW7ZIMVlYj7AveOFOrEo5YXlC4SbZdrOTw2N2or+1EosMGg5iUMwMIS95R YlDL0CIdLZK5MEItutCyPoCBmn2PEIgHplAcDl2Hf1aimmR7mWkiCcDOYEx8WBAcTii/Ng pidrzQx7dTXFp+1andXkDCjRwupHiazRR+t39T9jUsxO8HTJkmqj5eeWN80QIA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761925943; a=rsa-sha256; cv=none; b=G8+8d25SdgnXSZLwCxyPZBEjQuR2tLBI6Gvs9awbbxGgWIUbcz+dIZxvuAcs1ru9GDbIdD P15zu4AsqWPtKggHop/Ka9HTwwNWHVlt5grhpilt5i2fDuUwfrI3XLe3T8xdOvLaVzdtxj 3+mYnFkRmAwOUeUDVNpB/bfBgYT2J7GNR9JpH70FwHmQcjOArz2NtUQmZ5s56kADRouE1W xCl//ex/GlctDVtZ3w9qEQUZ3QobxbEKLZAaHr6LIrRCfY/t+KHDesew5o6+IacFOR/PTM mvuk8oo//osqstoo0/dXmn/RHBqBxTg10KXWhFB1OE8b9Ohe5XzuDN7xA5thqg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cylqC66cTz1Dgn; Fri, 31 Oct 2025 15: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 59VFqNaa098762; Fri, 31 Oct 2025 15: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 59VFqNKT098759; Fri, 31 Oct 2025 15:52:23 GMT (envelope-from git) Date: Fri, 31 Oct 2025 15:52:23 GMT Message-Id: <202510311552.59VFqNKT098759@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: db25448ab9ff - main - dtrace_io.4: Use bio_length instead of bio_bcount in examples List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: db25448ab9ffa8bfe52d852674cc466494b849d1 Auto-Submitted: auto-generated The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=db25448ab9ffa8bfe52d852674cc466494b849d1 commit db25448ab9ffa8bfe52d852674cc466494b849d1 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2025-10-26 16:52:11 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2025-10-31 15:52:20 +0000 dtrace_io.4: Use bio_length instead of bio_bcount in examples Tracing bio_bcount makes little sense for some devices like for example md(4), as it is set to "0" instead of to the actual I/O length. markj@ suggested the following DTrace one-liner to identify some cases where bio_length is set but bio_bcount is not: dtrace -n 'io:::start /args[0]->bio_length != args[0]->bio_bcount/{printf("%d %d", args[0]->bio_length, args[0]->bio_bcount); stack();}' For future reference in the context of bio_length vs bio_bcount, phk@ mentioned in the code review that: > the original intent was to get rid of of bio_bcount Reviewed by: markj MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D53365 --- share/man/man4/dtrace_io.4 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/man/man4/dtrace_io.4 b/share/man/man4/dtrace_io.4 index 30ec44768fbf..1699cebab8e9 100644 --- a/share/man/man4/dtrace_io.4 +++ b/share/man/man4/dtrace_io.4 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd April 18, 2015 +.Dd October 26, 2025 .Dt DTRACE_IO 4 .Os .Sh NAME @@ -84,7 +84,7 @@ The following script shows a per-process breakdown of total I/O by disk device: io:::start { - @[args[1]->device_name, execname, pid] = sum(args[0]->bio_bcount); + @[args[1]->device_name, execname, pid] = sum(args[0]->bio_length); } END From nobody Fri Oct 31 16:20:10 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cymRG6XRRz6G39B; Fri, 31 Oct 2025 16:20: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cymRG61rsz3lCC; Fri, 31 Oct 2025 16:20:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761927610; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c1F3IvMKhHkYkVf1jZbwAV0A5KRi8HQ1m4yHlIH/YS0=; b=kxWWMV9jv4qbnna2p9nZ/WkGE5LpaH0fT4qim4cdbSxlyol74ZNV6wvqRMAxZ6uyHaoaRB enVj+OeWbfqUG6gm3LT+XENqjG+p+8GiIseIqMsRtCJgjIaHeEQMBvVTqVbJMbHaG73rWr tDixinP+d7raoVCt3RNrTFaWbZ695iMTGvHY0lTcRKpya1GRMSHqTxY6LyyMkuVxmgpS+x vR6kryiu2UB7iz9EUadAuJhpo1Wv+XwYbxsFhsJXYd6rnshBNEU0UOdQD3Qhpb0mNWAZEJ cbfJYwG9SPMLmgZav5I2hhMgfEI8U7HognKLri0XzTk9Ew9RxDIoebed7c4xkQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761927610; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c1F3IvMKhHkYkVf1jZbwAV0A5KRi8HQ1m4yHlIH/YS0=; b=gvfyDFEP5cENZmAPHKFc+E573pZrNiqK8UP5eJ+KopmOeA021bhjJ6B0P3t+6W+O/TgsYs c2QogY3bQKYFe2DDzmQTO2lfPgFYgj88q6UmHMBdkelvnfU30OkG8p/gpfsKpbuPNcBaWQ gUYN0Hm7WlpcX30307pTTGLvzfwg6Ja3Q80dx9A3+SppcNHUVXxRvEuFGdV8dia5EP4i+8 HOMzJMzsETNuAkMnVUNrRtR8bkh67t1peyjnNYxAea4+qn0T1Ql3gEQ3ygaytgPqMKQvB5 VyOU+3JJnAbtALMMYIs9Yx7AwONSnJPFI5NI18gm4anZB1LLPJJ1kruini+VSw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761927610; a=rsa-sha256; cv=none; b=ULZo9ioUArZOWXS9Mpq8pV8mD00V05TwsdfVV0AG1U2fpA6MvFESD3PBxJ6jWgK0tRN+QN vz64ajnBOB2cW88zn+0nbtQapffLHoGCb/oeeiQLzplj8XARcLQdEq/ZGU4HVyBILHyBSU 9N+f8HIn3cEc6d4audGwPHfgtr1hhMTzjQFW+XE8e3GdoelZjpeICe1e7N8fexquhBLfa0 eh/420KC65nZaUbLuRJgOTnZWPpkaFr+9hF2PArQ9qP/HtSanoQKRgJ1UsiErIZ1c01fck kk5M35ANaHXyywxvhLQj+vG0SA6EwCl5hE9uUipyum54YXSAw1lHWpSSD8QGSg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cymRG5Wx7z1DfN; Fri, 31 Oct 2025 16:20: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 59VGKAa5044481; Fri, 31 Oct 2025 16:20:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59VGKAo8044473; Fri, 31 Oct 2025 16:20:10 GMT (envelope-from git) Date: Fri, 31 Oct 2025 16:20:10 GMT Message-Id: <202510311620.59VGKAo8044473@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: b9f848ecbafc - main - truss: Properly display first argument to nmount List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b9f848ecbafce4e56ba9c8b7993b85347e83484a Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=b9f848ecbafce4e56ba9c8b7993b85347e83484a commit b9f848ecbafce4e56ba9c8b7993b85347e83484a Author: Tiago Gasiba AuthorDate: 2025-10-29 20:09:39 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-10-31 16:15:06 +0000 truss: Properly display first argument to nmount The first argument to nmount(2) is an nvlist in the form of an iovec, which truss already knows how to decode. Set the correct flag so this happens automatically. MFC after: 1 week PR: 290667 --- usr.bin/truss/syscalls.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.bin/truss/syscalls.c b/usr.bin/truss/syscalls.c index 656d642e1f19..7b299bd2e1ff 100644 --- a/usr.bin/truss/syscalls.c +++ b/usr.bin/truss/syscalls.c @@ -403,7 +403,7 @@ static const struct syscall_decode decoded_syscalls[] = { { .name = "nanosleep", .ret_type = 1, .nargs = 1, .args = { { Timespec, 0 } } }, { .name = "nmount", .ret_type = 1, .nargs = 3, - .args = { { Ptr, 0 }, { UInt, 1 }, { Mountflags, 2 } } }, + .args = { { Iovec | IN, 0 }, { UInt, 1 }, { Mountflags, 2 } } }, { .name = "open", .ret_type = 1, .nargs = 3, .args = { { Name | IN, 0 }, { Open, 1 }, { Octal, 2 } } }, { .name = "openat", .ret_type = 1, .nargs = 4, From nobody Fri Oct 31 16:20:05 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cymRR0CDgz6G3Cv for ; Fri, 31 Oct 2025 16:20:19 +0000 (UTC) (envelope-from jlduran@gmail.com) Received: from mail-qt1-f177.google.com (mail-qt1-f177.google.com [209.85.160.177]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cymRQ418Jz3ljW for ; Fri, 31 Oct 2025 16:20:18 +0000 (UTC) (envelope-from jlduran@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-qt1-f177.google.com with SMTP id d75a77b69052e-4ed3d62e6cdso1196031cf.1 for ; Fri, 31 Oct 2025 09:20:18 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761927617; x=1762532417; h=content-transfer-encoding:cc:to:subject:message-id:date:from :reply-to:in-reply-to:references:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=+1aMO6l76G9Ud+nhPrt4juhXN/Mh+hDHkwxbS/uYpc0=; b=kd/Y3OeLLo95yGRJSL0WaVyGlkicD8Ai6GsknuBRn6BwOXrwfKyTNG/g0RGu2TffqA R5o9IgaW5yeT+boRUuJd1vPCvq9p8pOD9KsiyM0EZ4QGPSetD8wupsQY2XoNdJbPnpGt UNDf00cPSpuLQs6wtQKWEod9zWUpgFJPsCCU7R9Oj0ha3QIKYzRAEzOf/3f8qdxzMJEY QsagRbcvMV5OZ5RJg41AY82qLdMOVflF5DqcrhyNkIfBqHoxv8n3kZpxKLU6N7IWLYIU tHn8j7CMfhJClKlU5ZgZ+hoIPB02poDpA1I31amgEtyIldQbO422LrQeYjPopqasYtHe nApQ== X-Forwarded-Encrypted: i=1; AJvYcCXmRp8Y9jQDSTBT9l852z+pwChEcvx9wpEKQd5gZrj3k5EvGMSFr9oDJgztf0vcXC/8eAwhnwPcOWHef7VQ2B7fXpcejQ==@freebsd.org X-Gm-Message-State: AOJu0YzdlahNJz1Q1qN8Ijvhaa6QZGIbhcWBA2FXlLicNi5mwGXxw6D9 pvMccgQqIIow+quGvibQZtt+CvQwgytLxaiZ1dvaonXGzmYP8KEndv3B6v2Q1nb2 X-Gm-Gg: ASbGncvS8f+O2YJFGCyllgxufl72E0i7ac3y00bEnXgLkcgiKbW5ojpMapZjOeJ7GwW zRffGOeLGQs9elNv7qG4mlNM29Fgon06J0I8myLktTpFFols59CwZEs0n6hgJDx8ASFH2izuAXB kJJg9DTqQWm+LgZkd1/byncRPEzHD2eacAL2ZYspGT7Ey/39a7Qm+MUy/TnhLmo1pqudrmEqx64 jZYCyKiwUJKqYr5B/E8kBj3PWj9T954LSIAULbQZ5/uGTfEW8eHBtgiWw9Xdo8vQ/kfuUhdpUem 7md/4gCauRIDvX9QOHeQTFz/9Gr5jU6533d1tGiqM28QfFJtuIIaZgG9rESdop66d6q/mCw3GOu bMFmf3JriYzDQOhgTVxXmXM8n6yBoKxkNDzdSgBbrXVDsFlztOtbvW1PgEMPHlmeJGcMBEIy7yw KZ+erBf0KKCRU4rotxYFURlLCxAvM5rJ46FD8q95V9 X-Google-Smtp-Source: AGHT+IGjaO9qgIIj2cQaD7rYJZObtUFgj9llUBcdWm2BmYyejHOaE3oDyR/Q4t6Gfnw2g+9IaF/zuw== X-Received: by 2002:a05:6214:2025:b0:815:e14a:1f44 with SMTP id 6a1803df08f44-8802ec1848bmr39658256d6.0.1761927617207; Fri, 31 Oct 2025 09:20:17 -0700 (PDT) Received: from mail-qt1-f171.google.com (mail-qt1-f171.google.com. [209.85.160.171]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-880360ffca8sm13807826d6.27.2025.10.31.09.20.16 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 31 Oct 2025 09:20:16 -0700 (PDT) Received: by mail-qt1-f171.google.com with SMTP id d75a77b69052e-4e88ac010b0so3457191cf.3 for ; Fri, 31 Oct 2025 09:20:16 -0700 (PDT) X-Forwarded-Encrypted: i=1; AJvYcCWB9ehY62LHdgqfsU7Iuawk8+bEhY5hHCYeTKJzs6hFO1tFjeS4Z1cO3TZX5iAbnA3JQ69c9SovhX7F7IfaSuc0w7ylZQ==@freebsd.org X-Received: by 2002:a05:622a:1649:b0:4ec:f9c2:c1ec with SMTP id d75a77b69052e-4ed30f7af4cmr35134841cf.9.1761927616551; Fri, 31 Oct 2025 09:20:16 -0700 (PDT) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 References: <202510291850.59TIofPQ001392@gitrepo.freebsd.org> <16C4264B-2E85-4522-8EBB-4BDF206F959D@FreeBSD.org> In-Reply-To: <16C4264B-2E85-4522-8EBB-4BDF206F959D@FreeBSD.org> Reply-To: jlduran@freebsd.org From: Jose Luis Duran Date: Fri, 31 Oct 2025 13:20:05 -0300 X-Gmail-Original-Message-ID: X-Gm-Features: AWmQ_blfHBwebjuIzlwhiwZdPRIGZ7t7kKsWPECSah6EArWumv5WYqOcO-gnksU Message-ID: Subject: Re: git: 51e8e8b0f369 - main - Merge commit e24f90190c77 from llvm git (by Brad Smith): To: Dimitry Andric Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4cymRQ418Jz3ljW On Fri, Oct 31, 2025 at 12:48=E2=80=AFPM Dimitry Andric w= rote: > > On 31 Oct 2025, at 14:48, Jose Luis Duran wrote: > > > > On Wed, Oct 29, 2025 at 3:50=E2=80=AFPM Dimitry Andric wrote: > >> > >> The branch main has been updated by dim: > >> > >> URL: https://cgit.FreeBSD.org/src/commit/?id=3D51e8e8b0f36933814b1be08= 913857727876aece5 > >> > >> commit 51e8e8b0f36933814b1be08913857727876aece5 > >> Author: Dimitry Andric > >> AuthorDate: 2025-10-29 18:49:54 +0000 > >> Commit: Dimitry Andric > >> CommitDate: 2025-10-29 18:49:54 +0000 > >> > >> Merge commit e24f90190c77 from llvm git (by Brad Smith): > >> > >> [Driver] Enable outline atomics for FreeBSD/aarch64 (#156089) > >> > >> The compiler_rt helper functions have been built since 12.4, 13.1, = 14 > >> and anything newer. > >> > >> MFC after: 3 days > >> --- > >> contrib/llvm-project/clang/lib/Driver/ToolChains/FreeBSD.h | 5 +++++ > >> 1 file changed, 5 insertions(+) > >> > >> diff --git a/contrib/llvm-project/clang/lib/Driver/ToolChains/FreeBSD.= h b/contrib/llvm-project/clang/lib/Driver/ToolChains/FreeBSD.h > >> index 7ab63905ed4f..7d090ba682b3 100644 > >> --- a/contrib/llvm-project/clang/lib/Driver/ToolChains/FreeBSD.h > >> +++ b/contrib/llvm-project/clang/lib/Driver/ToolChains/FreeBSD.h > >> @@ -78,6 +78,11 @@ public: > >> void AddHIPIncludeArgs(const llvm::opt::ArgList &DriverArgs, > >> llvm::opt::ArgStringList &CC1Args) const over= ride; > >> > >> + bool IsAArch64OutlineAtomicsDefault( > >> + const llvm::opt::ArgList &Args) const override { > >> + return true; > >> + } > >> + > >> UnwindTableLevel > >> getDefaultUnwindTableLevel(const llvm::opt::ArgList &Args) const ove= rride; > >> bool isPIEDefault(const llvm::opt::ArgList &Args) const override; > > > > I'm sure you're probably aware by now, but aarch64 builds are failing > > after this commit: > > > > https://ci.freebsd.org/job/FreeBSD-main-aarch64-build/33100/ > > It's weird, but I cannot reproduce it. For me, both world and kernel buil= d fine. > > Does anybody have any particular settings that can be used to reproduce t= his on a fresh 16-CURRENT or 15-STABLE box? I can reproduce it on an aarch64 VM (using a mac studio), vanilla settings: make cleanuniverse <--- very important! make -j $(nproc) buildworld ... as usual > > -Dimitry > --=20 Jose Luis Duran From nobody Fri Oct 31 16:57:51 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cynGl5BqKz6G5Z4; Fri, 31 Oct 2025 16:57:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cynGl4k8nz3rtc; Fri, 31 Oct 2025 16:57:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761929871; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=liOya77yuzX00+RypRMUnqPs9TU/Yh6ngWIoE+RPAm8=; b=ldHzhDWQ9WYRE6gEdbHm1kYO9Lend3U4B2u26VFtVjdVpIm7TUoR95k6l5sOSc4zvZEOl1 6U4hvBtRVxAZX8VcBcN8TaLSikg407flFa0HET4oYdjykEd5UxMH7yoy1Apmk8rt3Z4g/d 6fHUzqR3kEaZ+H/GwzbnkG65ctM9Zz0cuFeCG1af7R9dRRmOXmMkX33Kw+VklQfohqr+Gp TBwOT+hJC/I3hrTjARq4cA7Davk2boLqImNvne5Z2wrFUXECv0PrsZmSkF2T8z1syPwunR WBbd8IJd7azkoonSc12YPoampiQjxYq27BlKdYAGbpfsqnmYzA0dLzhQSIfdiw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761929871; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=liOya77yuzX00+RypRMUnqPs9TU/Yh6ngWIoE+RPAm8=; b=E05Vpv2NMwcPmLmPC4JxChX6JCmth/rrFBH4aOYjF5VRGENSLKp/map3boLLdWHErZHXwx LTnldqsFwzh2L4U0MbcNgQKQRIhgufQaUqRoJ4t1Go26NyfitHZK7+1+xtMBUkPY/OB7fK ojDd3EYP7rVtfChzJuIhVeNgk9Pplsj0mMANFlKnjWqQmUJa3wfH5EoDX2l5k26g3jpqf8 oglQ0Gh9mRJrnpks6tT2ywTesBydxeDkZNdONglg8sAxZF/IB+lHjuEpoGhcTBy5dhrZbD ZuvS0aT5QeJEZpJchZXcX+9O0WfmhQujvHUfRwS4Dzs0ADJdTGHbboyOgHo4Yw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761929871; a=rsa-sha256; cv=none; b=LofplWIhxM55m+P1NF5VMsuhnPGtmLffbqboEKcK0ZWqYiueW/pvMMOA6WdvMW2vRd1Bz3 jI4QtNKeMh2m/Q+pF1GP2sQG5AtrQpWj2PO1e1sDswrkEx6JD5hQgJVMpDLjYc62cUC7bC bzHPAC14aFuKgMTV8oGstcmDoH0Hbt6ISk0LbYTCU09ggxFnuv4ULg0feR03q5ZRIeIIZo RPzKsyrl2zRK9orVgKM1x6m9WGBSpQSWsmRGb9Ehf2N2NArjQuEeV2HTVONyO/XUoKNgf6 5ZEOQgomr5a2qUyc4wX4M2BXNHqC9KZK5Y6JDwoejC/ANdjNAn2tmFF7ZkOm9g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cynGl4CHDz1GGC; Fri, 31 Oct 2025 16:57: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 59VGvpSF014552; Fri, 31 Oct 2025 16:57:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59VGvpjs014549; Fri, 31 Oct 2025 16:57:51 GMT (envelope-from git) Date: Fri, 31 Oct 2025 16:57:51 GMT Message-Id: <202510311657.59VGvpjs014549@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 00ebecd4a09d - main - Add support for Sierra Wireless EM7590 modem. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 00ebecd4a09db84fb6c5002b082400d8f8a97407 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=00ebecd4a09db84fb6c5002b082400d8f8a97407 commit 00ebecd4a09db84fb6c5002b082400d8f8a97407 Author: Ari Suutari AuthorDate: 2025-10-22 09:59:09 +0000 Commit: Warner Losh CommitDate: 2025-10-31 16:48:21 +0000 Add support for Sierra Wireless EM7590 modem. PR: 290421 MFC After: 3 days --- sys/dev/usb/serial/u3g.c | 1 + sys/dev/usb/usbdevs | 1 + 2 files changed, 2 insertions(+) diff --git a/sys/dev/usb/serial/u3g.c b/sys/dev/usb/serial/u3g.c index a549f93b2af1..608f08ee1176 100644 --- a/sys/dev/usb/serial/u3g.c +++ b/sys/dev/usb/serial/u3g.c @@ -600,6 +600,7 @@ static const STRUCT_USB_HOST_ID u3g_devs[] = { U3G_DEV(SIERRA, EM7455_2, 0), U3G_DEV(SIERRA, EM7565, 0), U3G_DEV(SIERRA, EM7565_2, 0), + U3G_DEV(SIERRA, EM7590, 0), U3G_DEV(SILABS, SAEL, U3GINIT_SAEL_M460), U3G_DEV(STELERA, C105, 0), U3G_DEV(STELERA, E1003, 0), diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs index 2318e6bd0017..6fda6940a04f 100644 --- a/sys/dev/usb/usbdevs +++ b/sys/dev/usb/usbdevs @@ -4431,6 +4431,7 @@ product SIERRA EM7455 0x9078 Sierra Wireless EM7455 Qualcomm Snapdragon X7 LTE- product SIERRA EM7455_2 0x9079 Sierra Wireless EM7455 Qualcomm Snapdragon X7 LTE-A product SIERRA EM7565 0x9090 Sierra Wireless EM7565 Qualcomm Snapdragon X7 LTE-A product SIERRA EM7565_2 0x9091 Sierra Wireless EM7565 Qualcomm Snapdragon X7 LTE-A +product SIERRA EM7590 0xc081 Sierra Wireless EM7590 Qualcomm Snapdragon X7 LTE-A /* Sigmatel products */ product SIGMATEL WBT_3052 0x4200 WBT-3052 IrDA/USB Bridge From nobody Fri Oct 31 16:57:52 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cynGn0xtnz6G5Wk; Fri, 31 Oct 2025 16:57: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cynGm5lKnz3rtd; Fri, 31 Oct 2025 16:57:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761929872; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BYCaqaDVCYUtfGycgDDM6t7QoVCGs0osHI+R7xaFdpY=; b=E4GwfL/e9l4zpQX9nqsbyeJHi4xucC/mmDu9el8ZltMpvR2EYPgTm2Df6DNluPu4CJPsTm ssTLKL6aZvQ+2Tmv7pXEyLuIJNo3aDPEYVCxdaJZ/4j+eQw2OaGGlFsLOZNUVzM1bOf9wB xh5ESJuw8TXxOadUCPGOHIWI1/LFzPnqnkf56jnYnYRjD7i+pKEuDyDsBXAvMKZQ7XWgp2 +tC/VeClmHT8vpnjca1GMsbZZRrlf6gV6AFag5CAe24Sw5BRN1Ox1tW4aNjDRKlLbqtLzp xjEW/3l6bfEKcr0Ev4UO03TjmveG/VhYu6xMT3ewLe2oLTk73xBFT6AcJZtwlQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761929872; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BYCaqaDVCYUtfGycgDDM6t7QoVCGs0osHI+R7xaFdpY=; b=aN5Fvnn9BIlXYLRJlWf3M8XryygQYUUgLOEMBt+LldXr0SDXczWMWQ+R91mdM8BkQhLKF/ Z6WXP9XECiwK9BsXM99qmRSjJMvJR7KIAt/QuAzr9MGh10ulOg966pBx4PBODS2avdUi8H K9JC2cE1LMWgMxA8e/Zg9lNVhWXICyebILqiXmtUOpNfOhW2q4f8HVHdoN/QprHaLhtIZG M1vNCOVfA5KubUrPzG0xM0pQpliz4cslBkr96lSpb+TOCX81Qe8Fa2/vubbE5856nAFed4 2pSQfnkTyUt2M26QoatHMRj8G5g1pTN4Ugce3uu62oihrCDY2NNkKoqfvKqw1Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761929872; a=rsa-sha256; cv=none; b=JI+kUrUCShGg3dHro4amZ8eImM7UOfH5tJj9wEoDU+/kSWuJKRZ2kyQsLGJKcyOKQSOf1Y rX+3qJrK7EVwve+IffhfVrHbPxs54zj2UufcYZxF0KNiC+MleroM41TbT35pgJgritRmkY E1d2bSUHUe/TCMnWZlk8YaIgqO3CEj40Cds7wtybCqyhY5KdjgyRn3bCrDAYSRes/YUhcq LvLWNXnQwNjd56UzS5/Sgcfn7lRhsPvId06vTHoSvaVJqXa/2Pl5WAn3CmJ+L4F9PJGuOs MEflrZT/YylSIFj6i046G/I+9eDgwVv8XHKQWEKhnLszbFOENFW3ydRQ4RpJPg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cynGm57LTz1GGD; Fri, 31 Oct 2025 16:57: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 59VGvqVT014589; Fri, 31 Oct 2025 16:57:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59VGvq1R014586; Fri, 31 Oct 2025 16:57:52 GMT (envelope-from git) Date: Fri, 31 Oct 2025 16:57:52 GMT Message-Id: <202510311657.59VGvq1R014586@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 6968897a8048 - main - usb/u3g: add Quectel EM060K List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6968897a8048aee2c72efdfbe23a7b64bdebcdbc Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=6968897a8048aee2c72efdfbe23a7b64bdebcdbc commit 6968897a8048aee2c72efdfbe23a7b64bdebcdbc Author: Andre Albsmeier AuthorDate: 2025-10-31 16:50:01 +0000 Commit: Warner Losh CommitDate: 2025-10-31 16:51:15 +0000 usb/u3g: add Quectel EM060K PR: 290688 MFC After: 3 days --- sys/dev/usb/serial/u3g.c | 1 + sys/dev/usb/usbdevs | 1 + 2 files changed, 2 insertions(+) diff --git a/sys/dev/usb/serial/u3g.c b/sys/dev/usb/serial/u3g.c index 608f08ee1176..0fc774d83ee1 100644 --- a/sys/dev/usb/serial/u3g.c +++ b/sys/dev/usb/serial/u3g.c @@ -531,6 +531,7 @@ static const STRUCT_USB_HOST_ID u3g_devs[] = { U3G_DEV(QUECTEL, RG520, 0), U3G_DEV(QUECTEL, EC200, 0), U3G_DEV(QUECTEL, EC200S, 0), + U3G_DEV(QUECTEL, EM060K, 0), U3G_DEV(QUECTEL, EC200T, 0), U3G_DEV(QUECTEL, UC200, 0), U3G_DEV(SIERRA, AC402, 0), diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs index 6fda6940a04f..bb039f59ce19 100644 --- a/sys/dev/usb/usbdevs +++ b/sys/dev/usb/usbdevs @@ -4070,6 +4070,7 @@ product QUECTEL RG500 0x0800 Quectel RG500/RM500/RG510/RM510 product QUECTEL RG520 0x0801 Quectel RG520/RM520/SG520 product QUECTEL EC200 0x6000 Quectel EC200/UC200 product QUECTEL EC200S 0x6002 Quectel EC200S +product QUECTEL EM060K 0x6008 Quectel EM060K product QUECTEL EC200T 0x6026 Quectel EC200T product QUECTEL UC200 0x6120 Quectel UC200 From nobody Fri Oct 31 16:57:53 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cynGp25Ckz6G5Z7; Fri, 31 Oct 2025 16:57: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cynGn6tfKz3s6v; Fri, 31 Oct 2025 16:57:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761929874; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7R1oT+rQsqF7RiVuzIwVa3H+sXlIkwi5fhVYApgHREU=; b=MEbVvG3coyHjSphEIc3gINlrZ03EMhT4KMAtHpyGwWZI+JnzOok3fOhSew/2iH+KcEkdnO qdp6CavgwOY2jx2J6KoIpssj7fcJcoRe6ShTE8Wmw6StABbcuDHAI8eCdKggniHiTrVgkp K412IAswRDLxXkSFdBjATsgoJM/pkypUIwjks6Jsg3KFYzImYVoabGJhdMcMGqVQb9JNrq U7pKhfQx1NHO6LGd57fvrHNu1YRykdpiLV2je/zOje4qJF0P5z7zLnEhThG8O/z6zktgHZ 00JAhMTh0HChEGmHeLUcHX8L3S5zTRejqPEpkrl2o5z6RZxVY+a9x1erKwcokg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761929874; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7R1oT+rQsqF7RiVuzIwVa3H+sXlIkwi5fhVYApgHREU=; b=gDwdSAHPu4BPLpkqpoVR+6oBr9a4K9Ev79EHPOZlRuMZpNk3WkdNA0LbXnOhYK6BwcH8RJ zfXMYbI91nbwf7/bPs7wrGsNm0cZI3EspyxUueE2n8yApvTc6MZKvDNXtVhXji/2h2eMju LaTkK/t+kKa55xPAZu3rHNY6OPXW2BSwLxVbE5XBGH+q24B/NBrNms5RSWuTdnNio9dg/g gn5PB27PnDao3D2/MztVuU2AGJyBMnI1ELptmoj3x6pqdPcVxjRLWH+1CB8kwyO1BDJPN4 0g7YJlpC5uMUxBChn1Mqdtd/jFAGw6VMkd/fvq0FbZOQvy/zAEIut3WxoPmaHg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761929874; a=rsa-sha256; cv=none; b=E8HceZJ1dexRMbxOlE/NSE8lEytwsSkXP2gAiTg+C4kvaszLE9EHkdCnrl2ENPOfqvEhaQ fg9Ar+dCoIH6S0qhabSKKcx+6PIlCH1Cja08tOgiYx4FR7kJKt/y3Y0868RGzrS0MS82oD Uzg8pdImr5NsCj6CwM/iZ3aoIs9kx9uuuRZVN8YKOODX8LhioteAX4aEdfNzV9yA6Q9V/T EbAkFxvFSsHOrJ0MNhqktaPBR01KMRyV6tsbmVlmSL0PKxlfY+dS9I+e22Cu32H4A21JkW geSuN6Z9Pb9swbt2vLkI7dTX12RfY24+Wqrti7MiZvG3ArQzLL0sXQnau1i4hg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cynGn6Py1z1GTg; Fri, 31 Oct 2025 16:57: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 59VGvre2014624; Fri, 31 Oct 2025 16:57:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59VGvrnq014621; Fri, 31 Oct 2025 16:57:53 GMT (envelope-from git) Date: Fri, 31 Oct 2025 16:57:53 GMT Message-Id: <202510311657.59VGvrnq014621@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: d787ce1927bc - main - u3g: Note support for Quectel EM060K and Sierra EM7590 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d787ce1927bc7662b869cf2bc5e280c3c524dff5 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=d787ce1927bc7662b869cf2bc5e280c3c524dff5 commit d787ce1927bc7662b869cf2bc5e280c3c524dff5 Author: Warner Losh AuthorDate: 2025-10-31 16:52:37 +0000 Commit: Warner Losh CommitDate: 2025-10-31 16:54:13 +0000 u3g: Note support for Quectel EM060K and Sierra EM7590 Sponsored by: Netflix --- share/man/man4/u3g.4 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/man/man4/u3g.4 b/share/man/man4/u3g.4 index 51c883b8378e..c7bf1f98880a 100644 --- a/share/man/man4/u3g.4 +++ b/share/man/man4/u3g.4 @@ -94,14 +94,14 @@ Qualcomm Inc. GOBI 1000, 2000 and 3000 devices with MDM1000 or MDM2000 chipsets .It QUECTEL BGX, ECX, EGX, EMX, EPX, RGX series .It -Quectel EM160R +Quectel EM160R, EM060K .Pq see Sx CAVEATS .It Huawei B190, E180v, E220, E3372, E3372v153, E5573Cs322, ('') .It Novatel U740, MC950D, X950D, etc. .It -Sierra MC875U, MC8775U, etc. +Sierra MC875U, MC8775U, EM7590, etc. .It Panasonic CF-F9 GOBI .El From nobody Fri Oct 31 17:08:50 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cynWR3NZhz6G6Qf; Fri, 31 Oct 2025 17: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cynWR1l2Vz3tfT; Fri, 31 Oct 2025 17: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=1761930531; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gjtKyIqxYB9rHICiqybvUDmuumGWpvrpB7vpss6DzJ8=; b=FTGn5G06uZ8ONbiwJ0oSOBhUZtJ5DlyBiRvqVNEUQfCgSo+r7Mqf8Dq+elbXXVfy68cjEL /jjqdBZIn5n/vDbA61FIWWmi++6zCDjrpWJHOBz9fcz0XGzQkzNmo7vp5okaxy4QoanQI/ ygTk2vKVzswSdFPwizbvN2CQ06icyFyM2hHvHrnFZT6ayeYzeJNSXEcNXecW4T8JRJtlfw bxn93dQ8gwxwQS0ZTeV2zoQslzunZJTxpGz4QE31PjSgDmjMLcmnHBdmoNoyuZeWqueZvJ s1pH+crJhjycYIHlWiTcyzR4TlkhEHD8rplhQi5T1zyjfunUarKXbp1bk57Rbg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761930531; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gjtKyIqxYB9rHICiqybvUDmuumGWpvrpB7vpss6DzJ8=; b=M1j8N7yxnUOOV1E7SAkybXnxFo2Ywr6ybPOQMxLCSgB0EmLfuvFTAMx409yU204sHncJgt gApRRnn8uTGRvP0LksmYOUfEsi6Q9F71yKn4t/T7PxxnTv0IgBptWo4x9RqbkgvjEvHCb8 KSFh/h7/7iwI2tkfRPaBdGWpuDI2bBVUud6zMNI3mQ+EFWPYu5IMrypfpXfafo1l1aOwVd sduro42rEqYss8O/f1KggYMay5cO4W4G2x5dLtVHMpEuSE/HSmCtbEqKajeE6b2RXv6luf rykZb2JahGF+QYRvhqUUb25G1ft/PIeGJMFaOlcE0qndx0Ua2UzzQ1xoAWeO/Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761930531; a=rsa-sha256; cv=none; b=JzibaA5mVc/4CYzItTjpK4b25UUyxuF+FvIa8yOIuhY1vymET8gyv89SekZSUYMa7AWq3O b4rXquUu6dukPPmgJM/8EphDcTk0USd6/LKUUKvjiVa6n0ai1nPPldfisbdPYPHHjgYN1a VwPIB/HSjbMD61MKP9E8Xf07HFfa9np8UDaFnBjvYicFxGToxdSVm5EMlwRRvAL5jg02+j yczHkB2JGktuGN6p33mmVGSIGA9usKrPJAyYIdaIhsvjRg+3nFFLehAeYSxDR+9Q/7vmek sF3+89T0idyz/6Nan5EI2V/NSU6JK/Up7UIdjm8LWeZSrgxA9OQCuYE33QsjJQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cynWR13Bwz1GkP; Fri, 31 Oct 2025 17:08: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 59VH8pwR035499; Fri, 31 Oct 2025 17:08:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59VH8og4035496; Fri, 31 Oct 2025 17:08:50 GMT (envelope-from git) Date: Fri, 31 Oct 2025 17:08:50 GMT Message-Id: <202510311708.59VH8og4035496@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: ce03706ab26c - main - openssh: Handle localtime_r() failure by return "UNKNOWN-TIME" List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ce03706ab26c5770150f1ef96aca36b69baa535f Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=ce03706ab26c5770150f1ef96aca36b69baa535f commit ce03706ab26c5770150f1ef96aca36b69baa535f Author: Ed Maste AuthorDate: 2025-10-31 17:04:51 +0000 Commit: Ed Maste CommitDate: 2025-10-31 17:08:45 +0000 openssh: Handle localtime_r() failure by return "UNKNOWN-TIME" Apply openssh-portable commit 8b6c1f402feb by deraadt@openbsd.org Obtained from: openssh-portable PR: 288773 Reported by: wosch Sponsored by: The FreeBSD Foundation --- crypto/openssh/misc.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/crypto/openssh/misc.c b/crypto/openssh/misc.c index dd0bd032ae3c..1ed71646ebe4 100644 --- a/crypto/openssh/misc.c +++ b/crypto/openssh/misc.c @@ -2535,8 +2535,10 @@ format_absolute_time(uint64_t t, char *buf, size_t len) time_t tt = t > SSH_TIME_T_MAX ? SSH_TIME_T_MAX : t; struct tm tm; - localtime_r(&tt, &tm); - strftime(buf, len, "%Y-%m-%dT%H:%M:%S", &tm); + if (localtime_r(&tt, &tm) == NULL) + strlcpy(buf, "UNKNOWN-TIME", len); + else + strftime(buf, len, "%Y-%m-%dT%H:%M:%S", &tm); } /* From nobody Fri Oct 31 18:01:11 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cypgq4Gndz6DhTM; Fri, 31 Oct 2025 18:01: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cypgq2DVCz41cj; Fri, 31 Oct 2025 18:01:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761933671; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Qj5uoplkaqKMIrCKuNFMxJMFkIEuRlhs40wipiPJRIM=; b=k029ap2RyY1a3c88gMIY/ANmMMUN8wvZ/O8t2/Vx1UVa5B1aQNqWVTOyewAPoiqpKAewWE G0NwodGSHYO13tNkurFiK3FncmyE936NggAbtfLIdvoXtkeV4TjlGfJsBsAcA5o/q3jl2N ADysSKB85a0oaTS2mtfZT8j29d8TvIQPHFcCRX/LbYIgT4rxXvdaUXOK4akWwGNUI1RU+c f3H6qMLkZSkJF6pvPA2mffpzRcge7CsnVmjJ3zVBdiTYemmLdeNvLk1iH+0Jiv0N4nmj1q k6dNpteiH5G0R7rq7IzPkmEfPQvmFvUQeHMbaCBVT2nf3nq/Xoy+p8TaBSgMqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761933671; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Qj5uoplkaqKMIrCKuNFMxJMFkIEuRlhs40wipiPJRIM=; b=k/PITzUO2ZOY8QJJQxqzla1pFGIvTbuBisfp93ehCH/I/YHERQdjn6G9Mizv3lP/JToGAg vsDfIOw5no+jZsFK00zG05Y/c1znvCRWRI2IWW1SamA+5k38m3JEYAU0ZLGvEVeJlrtj7f MlAmKJicpxqlpsw7ExMii50zx6eT7Dx/5oSkQdP9pVBUhXNNzanuKuBUphmrRnjM1fCW/C zwv1fy08sbHDs74/yndln9g+cgPmNvVShbaLYWrRYaraZqR1i1ksDkesye2VplVWgux4sq gMQxsA/bbRhmtxtArj2QW53SAg7QlB2ZNFHqNkAxdJzhDuNEbDxc3RZm/daNbg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761933671; a=rsa-sha256; cv=none; b=lY+9FfeS6yeTbFidrzplMEkDcAsvoAnjm9JYVyoI47L6yOS/6PwIx+Oed9AhHrzoBOo8AM g82TNE3k8VyBCwnruzKRpJoAj7429/zN6jqHPyyizgONhEacgPh8Z+bBuOUSp9jZGPjvT9 SwUZ5xVffi6aj+Dnqv45hrlIVcJY5cLE85EZhGC5gmXHXieeApIm8y8bnV+9MbGsuF3Tgi XzJdFM007+WqHfybXsq4ZAbq1OedM5ifm34GpfePswP9WX0TNDoGduVyAfqWg88hjyoP/x YUVzwqbKMm2tKAtBPRdm/e0ZOR6fGAn6L0QtJGbBwBt2Swehu4s7DOjEgDftoA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cypgq1YzWz1H3q; Fri, 31 Oct 2025 18:01: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 59VI1BB6043062; Fri, 31 Oct 2025 18:01:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59VI1B79043050; Fri, 31 Oct 2025 18:01:11 GMT (envelope-from git) Date: Fri, 31 Oct 2025 18:01:11 GMT Message-Id: <202510311801.59VI1B79043050@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: fee2e6b9fae2 - main - ddb: improve printing of inp_flags List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fee2e6b9fae277d383b129573df2528ce0407efa Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=fee2e6b9fae277d383b129573df2528ce0407efa commit fee2e6b9fae277d383b129573df2528ce0407efa Author: Michael Tuexen AuthorDate: 2025-10-31 17:58:46 +0000 Commit: Michael Tuexen CommitDate: 2025-10-31 17:58:46 +0000 ddb: improve printing of inp_flags Add four missing flags (INP_BINDANY, INP_INHASHLIST, INP_RESERVED_0, INP_BOUNDFIB) used in inp_flags and remove one flag (INP_ORIGDSTADDR), which is actually a flag used in inp_flags2 and not in inp_flags. Reviewed by: markj MFC after: 3 days Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D53498 --- sys/netinet/in_pcb.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c index 712ff28768dc..c5af39d540e4 100644 --- a/sys/netinet/in_pcb.c +++ b/sys/netinet/in_pcb.c @@ -3076,10 +3076,6 @@ db_print_inpflags(int inp_flags) db_printf("%sINP_RECVDSTADDR", comma ? ", " : ""); comma = 1; } - if (inp_flags & INP_ORIGDSTADDR) { - db_printf("%sINP_ORIGDSTADDR", comma ? ", " : ""); - comma = 1; - } if (inp_flags & INP_HDRINCL) { db_printf("%sINP_HDRINCL", comma ? ", " : ""); comma = 1; @@ -3112,6 +3108,14 @@ db_print_inpflags(int inp_flags) db_printf("%sINP_DONTFRAG", comma ? ", " : ""); comma = 1; } + if (inp_flags & INP_BINDANY) { + db_printf("%sINP_BINDANY", comma ? ", " : ""); + comma = 1; + } + if (inp_flags & INP_INHASHLIST) { + db_printf("%sINP_INHASHLIST", comma ? ", " : ""); + comma = 1; + } if (inp_flags & INP_RECVTOS) { db_printf("%sINP_RECVTOS", comma ? ", " : ""); comma = 1; @@ -3164,6 +3168,14 @@ db_print_inpflags(int inp_flags) db_printf("%sINP_SOCKREF", comma ? ", " : ""); comma = 1; } + if (inp_flags & INP_RESERVED_0) { + db_printf("%sINP_RESERVED_0", comma ? ", " : ""); + comma = 1; + } + if (inp_flags & INP_BOUNDFIB) { + db_printf("%sINP_BOUNDFIB", comma ? ", " : ""); + comma = 1; + } if (inp_flags & IN6P_RFC2292) { db_printf("%sIN6P_RFC2292", comma ? ", " : ""); comma = 1; From nobody Fri Oct 31 18:01:49 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cyphY3B2Mz6DhLw; Fri, 31 Oct 2025 18:01: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cyphY2cDPz4283; Fri, 31 Oct 2025 18:01:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761933709; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kTGzfBKjUk5YpYwqQXQ8Q87/AcgoQr2b5e7stQJUU9E=; b=snpYDUZUU+1WcfmFmiKFsNZNqofzL/yZy2BjFQ/XBS4sHu92UQ8llOlkLDSNgRdMNkjhAe 47UZ93YF7ouRlq47ZF9PwEqJCC9V4JclRkgtHKMw+IJPKYKYCaim1n3pS+z6Q6ElQkb20V WoAV7+KD3Uknq241Lvos9Q7PYMdNsnCp3IjLvSxAKRQ0Cx3ksIHVcDyFyBKIoAMm8ggFby 6Efe7C66OHHMiX8gzApmziChY89lPQUakp5fAPl1S0gZQXDr/LZRhYbzg/KtZbKgixxh3R JbaBlGHhls+cPJ3PuWDPbfkiaEkpsK6vkwiQ0mtsYEHx5paY7pbquphJTN8LOw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761933709; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kTGzfBKjUk5YpYwqQXQ8Q87/AcgoQr2b5e7stQJUU9E=; b=UY1eLXcrA0bJIBMFhMR1DcqOo9StUPW9clchjZZcPJarn20gvYGuwA/TsnZspQM5P3X7c9 6euEK45cb6+gLtC4TMpEZou7lTDUM6rRF1LmvFUpdVVivIza3W8hn4f9w3nh94yRRShb8/ 8Y5/jIPtTtNtPlUzWtoO3RczeH8SzamLmsm913zxcbWs4pUWM2/pfAQvZ4b9pE5mVVFsyq caYGP+SsMdT8Bwa3tGrAQRtuw9SBWomAMahvb+2zw6hDSaETHP3c5n6s4rW+5SBDKI6YyZ zz86KobrGSKpUzEpQnWkcrBG5mQJ+Y3zl00iW7ylZl6fykJhvt/5Lhi73h19RA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761933709; a=rsa-sha256; cv=none; b=S6fwpYc7gUu0qmsrYXjbZJ+/3Mcx9JO6CD4EHxEMHeLBmYOFSY6cn86f1iaK9goRPUBiFE zNXDZHpo9sQl0Dnf1HdyzRN7Spb7gLZZYfGnJXYoAvdQerytZppd1UjlnpN4Lou5+wqwL0 BEEg7P9r6419IpilzgcklzzRS0aSrLrVbn9RbBPNPTWaPJWwNHugp22aoInLxtnGbQhOrz Xx6ivzCVnJC0nTiJ0LxFhX8vjCJ3+LaXF2OH4gaBsMRysYamvinM31LnUnSCPBnp4kQ282 Fy7Nj/22wyYKiZo+9Jnqr0qbp42k0g/m6nk77nu3ROF7KYG0YBl6wi1FJjJXCA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cyphY2CpMz1J9G; Fri, 31 Oct 2025 18:01: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 59VI1nup045570; Fri, 31 Oct 2025 18:01:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59VI1nfn045567; Fri, 31 Oct 2025 18:01:49 GMT (envelope-from git) Date: Fri, 31 Oct 2025 18:01:49 GMT Message-Id: <202510311801.59VI1nfn045567@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "David E. O'Brien" Subject: git: 8bd9a9e9e4cb - main - random: CTASSERT check sizeof random_source_descr[] List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: obrien X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8bd9a9e9e4cb3e293c1639319692ce201eb8fc53 Auto-Submitted: auto-generated The branch main has been updated by obrien: URL: https://cgit.FreeBSD.org/src/commit/?id=8bd9a9e9e4cb3e293c1639319692ce201eb8fc53 commit 8bd9a9e9e4cb3e293c1639319692ce201eb8fc53 Author: David E. O'Brien AuthorDate: 2025-10-22 07:19:20 +0000 Commit: David E. O'Brien CommitDate: 2025-10-31 18:01:45 +0000 random: CTASSERT check sizeof random_source_descr[] Ensure that the number of elements of random_source_descr[] and fxrng_ent_char[] matches that of enum random_entropy_source. Reviewed by: cem Differential Revision: https://reviews.freebsd.org/D53255 --- sys/dev/random/fenestrasX/fx_pool.c | 3 ++- sys/dev/random/random_harvestq.c | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sys/dev/random/fenestrasX/fx_pool.c b/sys/dev/random/fenestrasX/fx_pool.c index 8e63b345a1bd..b6ffc202769e 100644 --- a/sys/dev/random/fenestrasX/fx_pool.c +++ b/sys/dev/random/fenestrasX/fx_pool.c @@ -127,7 +127,7 @@ static const struct fxrng_ent_cls fxrng_garbage = { */ static const struct fxrng_ent_char { const struct fxrng_ent_cls *entc_cls; -} fxrng_ent_char[ENTROPYSOURCE] = { +} fxrng_ent_char[/*ENTROPYSOURCE*/] = { [RANDOM_CACHED] = { .entc_cls = &fxrng_hi_push, }, @@ -213,6 +213,7 @@ static const struct fxrng_ent_char { .entc_cls = &fxrng_hi_pull, }, }; +CTASSERT(nitems(fxrng_ent_char) == ENTROPYSOURCE); /* Useful for single-bit-per-source state. */ BITSET_DEFINE(fxrng_bits, ENTROPYSOURCE); diff --git a/sys/dev/random/random_harvestq.c b/sys/dev/random/random_harvestq.c index 643dbac1fc8b..b591ffd3b544 100644 --- a/sys/dev/random/random_harvestq.c +++ b/sys/dev/random/random_harvestq.c @@ -88,7 +88,7 @@ static void random_sources_feed(void); static __read_mostly bool epoch_inited; static __read_mostly epoch_t rs_epoch; -static const char *random_source_descr[ENTROPYSOURCE]; +static const char *random_source_descr[]; /* * How many events to queue up. We create this many items in @@ -109,6 +109,7 @@ volatile int random_kthread_control; * Updates are synchronized by the harvest mutex. */ __read_frequently u_int hc_source_mask; +CTASSERT(ENTROPYSOURCE <= sizeof(hc_source_mask) * NBBY); struct random_sources { CK_LIST_ENTRY(random_sources) rrs_entries; @@ -647,7 +648,7 @@ SYSCTL_PROC(_kern_random_harvest, OID_AUTO, mask_bin, random_print_harvestmask, "A", "Entropy harvesting mask (printable)"); -static const char *random_source_descr[ENTROPYSOURCE] = { +static const char *random_source_descr[/*ENTROPYSOURCE*/] = { [RANDOM_CACHED] = "CACHED", [RANDOM_ATTACH] = "ATTACH", [RANDOM_KEYBOARD] = "KEYBOARD", @@ -678,6 +679,7 @@ static const char *random_source_descr[ENTROPYSOURCE] = { [RANDOM_PURE_ARM_TRNG] = "PURE_ARM_TRNG", /* "ENTROPYSOURCE" */ }; +CTASSERT(nitems(random_source_descr) == ENTROPYSOURCE); static int random_print_harvestmask_symbolic(SYSCTL_HANDLER_ARGS) From nobody Fri Oct 31 18:03:45 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cypkp0Jppz6DhNX; Fri, 31 Oct 2025 18:03: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cypkn6mM0z42PJ; Fri, 31 Oct 2025 18:03:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761933826; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mTzStwCY3gW664KtCF71fTluvqp0MX0/HbsbytKWSXI=; b=wXjknUV3mRIq18ciE1DhPcgFhDNPwembOdPzBRydSYszYNbJflodm5Hsfu9+DRhBnPdFJy ZI+AVhDLZXew4gKxGnR4fdJqqtoiRdRKxDBIQg1iTjSL/CQOCXOYBhtTIUPOhsu/EqMuDI W/lXgKvDNQM/rObZiA0suWbgM1f8mzoEyyxZTvEwS4nm7le8TEUhp6kJeaT86LJHDoywkv +hGcc59+zWJU4cCy6ZDNWme9u7a4FpMj41uMeaqsALCQDMDRHKArKApo27NMd4CkyFgYKD R0m9qbQ6qDQzkQoelrrq8jGn2ponoYNnD49JGaJvf7vACXzlzdGGZWhDadMWLQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761933826; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mTzStwCY3gW664KtCF71fTluvqp0MX0/HbsbytKWSXI=; b=Sh8c3MsoQoooIPgS/7qIMhyGjnQECxgfYUmWLhUH9rzdqVLR9WonmrmDHx40qD7nZjHSJd c0dSi1QE+1qfLBc9dj4WE5Y8iP8PPewkFskDpRfwwnhIgFGsRj22fQyc37gM5PYrmyEi89 g4N9AI7m6QtpTowFtLzikKTAan9pRCcLN3UBhGcjyl6frTCObXaLSp+nOjk/LImNDqieKw Sj/AoOazRr5UhOIq1wSyJF9O7Vovf0RUYUkcfq4dtd5vRNIdMAOP8Q9cPbpRD+kOWWJSoU ysi/OJKIWo1jrXkIisH0+kpqbycGA5Ja9e/d+UHDUSbK5tG/BxxcMx7vspXFsQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761933826; a=rsa-sha256; cv=none; b=xlwt+GRFXyog+t2NwWZfTULpFjnO07PURUcNcGl2mNsYOecnbgh/j5MHznLOd3nx5Q0HSS BBVrBZUGXNhLO9juImzQbEgEJDLM1v8JkQZPbeIdYR1GuXPeJiz7lt00zHetBizk2TMMAl bLPyS/xzhq7R2u38rqiiEuDFQ+xUoS9w3dgKWyJzBTV9ofzmW6mM15AIfu+fJbkC3jL3L1 hT9alJlq/wl4BAhKQjVzvBQmuRqtGuXGjWU2xDJ21KZ5nQYoFoKmWnUvX/iUqxbHQMpEOU bm0KuWTZuqH4PONbPoWIQHuLSqsB7A9qrm1G5nh6nLFvsyhx770z1GblUiNmQQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cypkn6K5Kz1J4H; Fri, 31 Oct 2025 18:03: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 59VI3jLi047184; Fri, 31 Oct 2025 18:03:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59VI3jov047181; Fri, 31 Oct 2025 18:03:45 GMT (envelope-from git) Date: Fri, 31 Oct 2025 18:03:45 GMT Message-Id: <202510311803.59VI3jov047181@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: 3adaacad117b - main - ddb: whitespace change List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3adaacad117b23abaf93a5332d538037420e1daa Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=3adaacad117b23abaf93a5332d538037420e1daa commit 3adaacad117b23abaf93a5332d538037420e1daa Author: Michael Tuexen AuthorDate: 2025-10-31 18:01:50 +0000 Commit: Michael Tuexen CommitDate: 2025-10-31 18:03:35 +0000 ddb: whitespace change No functional change intended. MFC after: 3 days Sponsored by: Netflix, Inc. --- sys/netinet/in_pcb.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c index c5af39d540e4..dcd39bca2704 100644 --- a/sys/netinet/in_pcb.c +++ b/sys/netinet/in_pcb.c @@ -3158,15 +3158,15 @@ db_print_inpflags(int inp_flags) } if (inp_flags & INP_ONESBCAST) { db_printf("%sINP_ONESBCAST", comma ? ", " : ""); - comma = 1; + comma = 1; } if (inp_flags & INP_DROPPED) { db_printf("%sINP_DROPPED", comma ? ", " : ""); - comma = 1; + comma = 1; } if (inp_flags & INP_SOCKREF) { db_printf("%sINP_SOCKREF", comma ? ", " : ""); - comma = 1; + comma = 1; } if (inp_flags & INP_RESERVED_0) { db_printf("%sINP_RESERVED_0", comma ? ", " : ""); From nobody Fri Oct 31 18:08:10 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cypqt4wVSz6Dj1M; Fri, 31 Oct 2025 18:08: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cypqt47ckz42xK; Fri, 31 Oct 2025 18:08:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761934090; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rvHROrTmY3c1GrOQTGEgO86IWGJpvs98MvTa+XrZ2P8=; b=LVqKM4G3O5LT/NDi3eXKDnqMI4oGLMON6wNf9iURpz49szKFlvAyoqeL1J8e9ymq8+R1Fb xOtqZH4vL5cVkRGrHUaWA7x3jHS344C2tn/Ofw3bhliPpqJeKX0f94eNCILyT35I7Dzj9i 5i8wAbJ5mV3N7LpYCfp5JCNlZxX7+RJMbsZ2oteDLCxO8u6HrQE5T6LBLAD3HgtcwHmVoq S9iSqNc2muqixncmv1hyd+kAUtKiAkHQTvTDkYjkqgEyaWLz1QOCnwMePiwL7CKX2g6XeJ CgTsoC7IqNLIT0rE0ny2MPx/7HIGzZJE+aFxd9Oy2KTEqSf4mpq20iVYxLr4BA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761934090; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rvHROrTmY3c1GrOQTGEgO86IWGJpvs98MvTa+XrZ2P8=; b=YZ9OP9r/etCHdafp7/M+mHPumQ8slNUYk9YWgbxn/021rXpOklwsTffrdTtrzH/rknRbDA daPEGNRscVxmyzVGvJRW2OgRDLNcHqXp/JM1kEeMC6kfchwjeaayM9uj5VnliDCt5wNqBT +9feqKdZCoT3tnS5PM7wDu9Wu4hBSKY8HEf+w8880kUAoQ6phpMRTRgVT0Wm+QaSXpwLys sCgcLUL+bPRQOJtZCBzcUTfJ2LvFAujmwT//5j+LCXkojsiMv2nonaBoMLzAmreYNv5llg SyY1rFa9IoumfZN0ALAZSZ28Af3VK8zO+SFh84spZdOXVHN4k0Egp57mEEjkLQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761934090; a=rsa-sha256; cv=none; b=d34+g3EsyUZkdtj4t26kc4nn14J10rYoLogeJ6EMSkuSqPeuA2DsWVYxQOKqrANEFLjSjJ qVLzpjVPcMy0/RxfBQ/BszTcbUJ7QJEqPKmq29b6QN11NOGV4i91AEjU5gShvEIXao77Bt Co5kCs2Ws2Ye0m6CJombwixSS1oErUBCPVS2ntMNCt4dvPEu8plmG8utLQec9q7P14fkuH Y18VjIUPBgxZg+YlaT2B7c1GjPzuLssGAjhz4mXftXj3sE1SpkCpL6dzVKQNok4XkSZ6sA wJTCMYFPevibc4k9IrxAbQz1wmLvHGn7vmqEG/J90W8PxOsgVWj2ZWeqvfSn2w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cypqt3jMKz1JL2; Fri, 31 Oct 2025 18:08: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 59VI8AEs048547; Fri, 31 Oct 2025 18:08:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59VI8AfF048544; Fri, 31 Oct 2025 18:08:10 GMT (envelope-from git) Date: Fri, 31 Oct 2025 18:08:10 GMT Message-Id: <202510311808.59VI8AfF048544@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: 9aa5a79e2af9 - main - ddb: optionally print inp when printing tcpcb List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9aa5a79e2af9a6a8930bbe8a7a024df2cf44e433 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=9aa5a79e2af9a6a8930bbe8a7a024df2cf44e433 commit 9aa5a79e2af9a6a8930bbe8a7a024df2cf44e433 Author: Michael Tuexen AuthorDate: 2025-10-31 18:05:02 +0000 Commit: Michael Tuexen CommitDate: 2025-10-31 18:05:02 +0000 ddb: optionally print inp when printing tcpcb Add /i option to the ddb commands show tcpcb and show all tcpcbs, which enables the printing of the t_inpcb. Reviewed by: markj MFC after: 3 days Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D53497 --- share/man/man4/ddb.4 | 12 +++++++++--- sys/netinet/in_pcb.c | 2 +- sys/netinet/in_pcb.h | 3 +++ sys/netinet/tcp_usrreq.c | 21 ++++++++++++++------- 4 files changed, 27 insertions(+), 11 deletions(-) diff --git a/share/man/man4/ddb.4 b/share/man/man4/ddb.4 index 3c4894c03d62..a882a5204fb2 100644 --- a/share/man/man4/ddb.4 +++ b/share/man/man4/ddb.4 @@ -24,7 +24,7 @@ .\" any improvements or extensions that they make and grant Carnegie Mellon .\" the rights to redistribute these changes. .\" -.Dd June 10, 2025 +.Dd October 31, 2025 .Dt DDB 4 .Os .Sh NAME @@ -604,12 +604,15 @@ The modifier will print command line arguments for each process. .\" .Pp -.It Ic show Cm all tcpcbs Ns Op Li / Ns Cm b Ns Cm l +.It Ic show Cm all tcpcbs Ns Op Li / Ns Cm b Ns Cm i Ns Cm l Show the same output as "show tcpcb" does, but for all TCP control blocks within the system. The .Cm b modifier will request BBLog entries to be printed. +If the +.Cm i +modifier is provided, the corresponding IP control block is also shown. Using the .Cm l modifier will limit the output to TCP control blocks, which are locked. @@ -1106,7 +1109,7 @@ on i386.) Not present on some platforms. .\" .Pp -.It Ic show Cm tcpcb Ns Oo Li / Ns Cm b Oc Ar addr +.It Ic show Cm tcpcb Ns Oo Li / Ns Cm b Ns Cm i Oc Ar addr Print TCP control block .Vt struct tcpcb lying at address @@ -1117,6 +1120,9 @@ header file. The .Cm b modifier will request BBLog entries to be printed. +If the +.Cm i +modifier is provided, the corresponding IP control block is also shown. .\" .Pp .It Ic show Cm thread Op Ar addr | tid diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c index dcd39bca2704..f573e07163fd 100644 --- a/sys/netinet/in_pcb.c +++ b/sys/netinet/in_pcb.c @@ -3058,7 +3058,7 @@ db_print_inconninfo(struct in_conninfo *inc, const char *name, int indent) ntohs(inc->inc_fport)); } -static void +void db_print_inpflags(int inp_flags) { int comma; diff --git a/sys/netinet/in_pcb.h b/sys/netinet/in_pcb.h index 9e0618e87601..7d41e3d690e0 100644 --- a/sys/netinet/in_pcb.h +++ b/sys/netinet/in_pcb.h @@ -730,6 +730,9 @@ int in_pcbquery_txrlevel(struct inpcb *, uint32_t *); void in_pcboutput_txrtlmt(struct inpcb *, struct ifnet *, struct mbuf *); void in_pcboutput_eagain(struct inpcb *); #endif +#ifdef DDB +void db_print_inpcb(struct inpcb *, const char *, int); +#endif #endif /* _KERNEL */ #endif /* !_NETINET_IN_PCB_H_ */ diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c index 98c934955121..c4a54646f3a2 100644 --- a/sys/netinet/tcp_usrreq.c +++ b/sys/netinet/tcp_usrreq.c @@ -3088,7 +3088,8 @@ db_print_bblog_state(int state) } static void -db_print_tcpcb(struct tcpcb *tp, const char *name, int indent, bool show_bblog) +db_print_tcpcb(struct tcpcb *tp, const char *name, int indent, bool show_bblog, + bool show_inpcb) { db_print_indent(indent); @@ -3096,6 +3097,9 @@ db_print_tcpcb(struct tcpcb *tp, const char *name, int indent, bool show_bblog) indent += 2; + if (show_inpcb) + db_print_inpcb(tptoinpcb(tp), "t_inpcb", indent); + db_print_indent(indent); db_printf("t_segq first: %p t_segqlen: %d t_dupacks: %d\n", TAILQ_FIRST(&tp->t_segq), tp->t_segqlen, tp->t_dupacks); @@ -3227,33 +3231,36 @@ db_print_tcpcb(struct tcpcb *tp, const char *name, int indent, bool show_bblog) DB_SHOW_COMMAND(tcpcb, db_show_tcpcb) { struct tcpcb *tp; - bool show_bblog; + bool show_bblog, show_inpcb; if (!have_addr) { - db_printf("usage: show tcpcb \n"); + db_printf("usage: show tcpcb[/bi] \n"); return; } show_bblog = strchr(modif, 'b') != NULL; + show_inpcb = strchr(modif, 'i') != NULL; tp = (struct tcpcb *)addr; - - db_print_tcpcb(tp, "tcpcb", 0, show_bblog); + db_print_tcpcb(tp, "tcpcb", 0, show_bblog, show_inpcb); } DB_SHOW_ALL_COMMAND(tcpcbs, db_show_all_tcpcbs) { VNET_ITERATOR_DECL(vnet_iter); struct inpcb *inp; - bool only_locked, show_bblog; + struct tcpcb *tp; + bool only_locked, show_bblog, show_inpcb; only_locked = strchr(modif, 'l') != NULL; show_bblog = strchr(modif, 'b') != NULL; + show_inpcb = strchr(modif, 'i') != NULL; VNET_FOREACH(vnet_iter) { CURVNET_SET(vnet_iter); CK_LIST_FOREACH(inp, &V_tcbinfo.ipi_listhead, inp_list) { if (only_locked && inp->inp_lock.rw_lock == RW_UNLOCKED) continue; - db_print_tcpcb(intotcpcb(inp), "tcpcb", 0, show_bblog); + tp = intotcpcb(inp); + db_print_tcpcb(tp, "tcpcb", 0, show_bblog, show_inpcb); if (db_pager_quit) break; } From nobody Fri Oct 31 18:50:55 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cyqnC4S7Dz6Dmh4; Fri, 31 Oct 2025 18:50:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cyqnC1m5Rz46t3; Fri, 31 Oct 2025 18:50:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761936655; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Y1Vs2Mrv8Q7y0/dbO6itXqPZrt5rO4UOWBH0IFDxSAI=; b=qe/7XtOndkFVI2Gj4DambRQ7OzdjjMxnb9yvmlPaZykAsF1I3RZtRQQiMUAIUjGtvtvmWB 1SLjgBgyhnVuuanver2xDPc1MxCiorcLhFbinh9RKyV1FRvqH8oElJNn476zObwEDw87zK VS08PT67LinINb72zhAOHOaki6Sc3/PoaeB0WVdR+z1Iv005FJtXrH+t182sLlk5p5W9p9 YJOxtFeZNyZeAzpjUv+oCKbbk2uOv9B0kfNlxzGese8U73DOAOMcGfGkwkQDUeir6Cf0La 6HopcJDFdq9lawuUxZcVO/9qyI48xzQKtDaf9vh3D+OQqOEc6dFU4q44i5sw9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761936655; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Y1Vs2Mrv8Q7y0/dbO6itXqPZrt5rO4UOWBH0IFDxSAI=; b=PSLS69ProVZe5KCe+B40aOro2usrLM5bRuZB1IldQfPp3+BW+4EI1BrjiXu9rhFKh2v70h QpbMAKzVglqnttlzlxgpTY2fLhO4Dy1SihuwZvzP85qlfFGabsvFnDqEJfDkAgGYThZ9GF 8EllrNYVFpn0xwjT7A1oCfGrnG3i4ZFjNBH3Jzey11hwm5V/gGlNZ1MsxLWEcxrH+sXOn1 +tzACaMNzp6DPvXOhrNhcIs3KvMS3z4dirgH705o32AwmvoQDaPUv+VGXVTTwoybnOc/dx DpyX9PVtIE6Dc9ds/DdWDyZ1NMxBa1ZPN64Hp6JIC+YDqCBsXoNRdvtq04G9WA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761936655; a=rsa-sha256; cv=none; b=RTIemwsBUJ8sV0XJ/44uMzWnVojKnlgUsfuOKSw5+P0WzmPArFys4sIvRQTIpMliaSHtLI 25d6aCRPwNvU1W5WuQWoDtdbqGQRAhX/FtYCpDdJ+fenk2/x73FjEfTAR9FAUFG704ZY2A pxuLWYgsOEwf+8BHJDzUMZQAmvQkiCUbNNorly9Ae/MzkydEdWe21QyTG00hd305yoRSwQ F6DMS0eUAhKezP3LKj8r3eTjz0tNH11hXTHU7cxmNtrD7dT/w/kLcpMMLE1vhjNayPbgrq lxa7h0LGpi7ZEzwawnIcczV9LVcAVRelSEGKzTUiLZ/am0JYgtvLsUimFQtnOg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cyqnC19Rmz1JqP; Fri, 31 Oct 2025 18:50: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 59VIottY033205; Fri, 31 Oct 2025 18:50:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59VIotjO033202; Fri, 31 Oct 2025 18:50:55 GMT (envelope-from git) Date: Fri, 31 Oct 2025 18:50:55 GMT Message-Id: <202510311850.59VIotjO033202@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: 85d6c86f4b53 - main - amdtemp(4): Fix typo in a sysctl description List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 85d6c86f4b53e6ac2a9b163c553b48466638f394 Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=85d6c86f4b53e6ac2a9b163c553b48466638f394 commit 85d6c86f4b53e6ac2a9b163c553b48466638f394 Author: Gordon Bergling AuthorDate: 2025-10-29 15:21:25 +0000 Commit: Gordon Bergling CommitDate: 2025-10-31 18:50:40 +0000 amdtemp(4): Fix typo in a sysctl description - s/temparature/temperature/ MFC after: 5 days --- sys/dev/amdtemp/amdtemp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/amdtemp/amdtemp.c b/sys/dev/amdtemp/amdtemp.c index 79ccdc8c79fb..b1ecb014a2b0 100644 --- a/sys/dev/amdtemp/amdtemp.c +++ b/sys/dev/amdtemp/amdtemp.c @@ -642,7 +642,7 @@ amdtemp_intrhook(void *arg) OID_AUTO, "temperature", CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_MPSAFE, dev, sensor, amdtemp_sysctl, "IK", - "Current temparature"); + "Current temperature"); } } if (sc->sc_ich.ich_arg != NULL) From nobody Fri Oct 31 18:50:56 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cyqnD54Clz6Dmdq; Fri, 31 Oct 2025 18:50: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cyqnD2zRXz46wX; Fri, 31 Oct 2025 18:50:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761936656; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1HBDlX9wnpBp8ddhoMjvlYDSmKdxKZHtL+PEa0HYnpE=; b=QxUdmBYBDL2YkAQK0D2boUDCd6UnxFCup1dm75mepDnc2Qgvol+KDyXkM8ALQN1/CN49rP E2z+YRF9OZ0N44k4+7cApvJjLd02EPWawS+UB8kaZdAjI/cZdUr5ujhRMmHk9qDncT4T1A h+fA2I4/HqXfcNJFGHxxn0dYGO/vasnyRnz5xoz3RMFr9vO3Gfvn1t+O5Av5ZGJtxL+FKw e6EasB7Gva4KT9hcsnswJhJpkH1tYaPLw+rrW1DO1ay+8SG3MeLCIgdau/VmI2suOPiayE jdpoaXzzslXCyterzhTB+OqN8HrCikFn+vI/NvDOEEW1jvFDQ+k1XYRaLCOKhA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761936656; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1HBDlX9wnpBp8ddhoMjvlYDSmKdxKZHtL+PEa0HYnpE=; b=awdhuRzEMsSERsJyr8otsU8lGbUXLilWFAshp8qureGSqcVFiGsjV1C4dTm5nIHsRxrZhH xUuatFkLzUB6Sb7Vo9V0+M3MKTRm/EQskmfvHsTnPJfzNxzaz/sqywlSruNpT6X27WZ8le 2X6tOpAMeVph8Z7BblMiLSJeiGGcKg4/CyyzKTiGk9HfTdfE04DK03M67d3fn6GjcwJ2TR 1PSPb0GEND/shh7g/2TlzandRD6ZHHe/+Am4sCwNx5LJa9rKhAsjKZ2eovVxl67B7xwCxE HZIqP31VrKOywpI9ee5r4EAQlVGKb1sROZd+7P9/pUnhMiVHwGZM0N+2tzsNJQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761936656; a=rsa-sha256; cv=none; b=xO7pc1wRLNZTvxrz6ytBief9Br4ExQHRyH+TMNWwkJuIrGwmVid4PimA+jyRRA/1uHHtTz QBA4ZIU28jo4mnJAStLfrjb3vyidgAPsTjKAcDN6YvgKogiO/HSHcRur8LuqW/Z5tOqfeu YF5tsWJUXUhe+HixVIDA2aWyhqblS5odI0iDud9dRnL6nQjK+mi+wWjPJIFT2OuGp8dsF2 T6HtjCpVGNdv9TAzrjSndqdvB6PMgYRAQb3la8uwdk8RejGLdEmCA4UdjaUR4YNz5krfsp 23BL1ZTfieOZUiQ9hx0G6jdG5SK6hY+Ir0u7zkjgyVD9SU5ryPwkV0gr0ozKkA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cyqnD2N7jz1K1j; Fri, 31 Oct 2025 18:50: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 59VIougf033244; Fri, 31 Oct 2025 18:50:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59VIouNW033241; Fri, 31 Oct 2025 18:50:56 GMT (envelope-from git) Date: Fri, 31 Oct 2025 18:50:56 GMT Message-Id: <202510311850.59VIouNW033241@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: 542f5985a8c2 - main - oce(4): Fix a couple of typos in a sysctl descriptions List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 542f5985a8c2e7cccc9beb9801ec166082bb7e68 Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=542f5985a8c2e7cccc9beb9801ec166082bb7e68 commit 542f5985a8c2e7cccc9beb9801ec166082bb7e68 Author: Gordon Bergling AuthorDate: 2025-10-29 15:24:00 +0000 Commit: Gordon Bergling CommitDate: 2025-10-31 18:50:40 +0000 oce(4): Fix a couple of typos in a sysctl descriptions - s/Fragements/Fragments/ - s/Recived/Received/ - s/Alignmnet/Alignment/ MFC after: 5 days --- sys/dev/oce/oce_sysctl.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/dev/oce/oce_sysctl.c b/sys/dev/oce/oce_sysctl.c index 1b903d8d027a..544bec9438c4 100644 --- a/sys/dev/oce/oce_sysctl.c +++ b/sys/dev/oce/oce_sysctl.c @@ -716,7 +716,7 @@ oce_add_stats_sysctls_be3(POCE_SOFTC sc, "Total Received Bytes"); SYSCTL_ADD_UINT(ctx, rx_stat_list, OID_AUTO, "total_frags", CTLFLAG_RD, &stats->rx.t_rx_frags, 0, - "Total Received Fragements"); + "Total Received Fragments"); SYSCTL_ADD_UINT(ctx, rx_stat_list, OID_AUTO, "total_mcast_pkts", CTLFLAG_RD, &stats->rx.t_rx_mcast_pkts, 0, "Total Received Multicast Packets"); @@ -748,7 +748,7 @@ oce_add_stats_sysctls_be3(POCE_SOFTC sc, "Receive Packets"); SYSCTL_ADD_QUAD(ctx, queue_stats_list, OID_AUTO, "rx_bytes", CTLFLAG_RD, &sc->rq[i]->rx_stats.rx_bytes, - "Recived Bytes"); + "Received Bytes"); SYSCTL_ADD_UINT(ctx, queue_stats_list, OID_AUTO, "rx_frags", CTLFLAG_RD, &sc->rq[i]->rx_stats.rx_frags, 0, "Received Fragments"); @@ -786,7 +786,7 @@ oce_add_stats_sysctls_be3(POCE_SOFTC sc, "ERX Errors"); SYSCTL_ADD_UINT(ctx, rx_stat_list, OID_AUTO, "alignment_errors", CTLFLAG_RD, &stats->u0.be.rx_drops_too_many_frags, 0, - "RX Alignmnet Errors"); + "RX Alignment Errors"); SYSCTL_ADD_UINT(ctx, rx_stat_list, OID_AUTO, "in_range_errors", CTLFLAG_RD, &stats->u0.be.rx_in_range_errors, 0, "In Range Errors"); @@ -932,7 +932,7 @@ oce_add_stats_sysctls_xe201(POCE_SOFTC sc, "Total Received Bytes"); SYSCTL_ADD_UINT(ctx, rx_stat_list, OID_AUTO, "total_frags", CTLFLAG_RD, &stats->rx.t_rx_frags, 0, - "Total Received Fragements"); + "Total Received Fragments"); SYSCTL_ADD_UINT(ctx, rx_stat_list, OID_AUTO, "total_mcast_pkts", CTLFLAG_RD, &stats->rx.t_rx_mcast_pkts, 0, "Total Received Multicast Packets"); @@ -961,7 +961,7 @@ oce_add_stats_sysctls_xe201(POCE_SOFTC sc, "Receive Packets"); SYSCTL_ADD_QUAD(ctx, queue_stats_list, OID_AUTO, "rx_bytes", CTLFLAG_RD, &sc->rq[i]->rx_stats.rx_bytes, - "Recived Bytes"); + "Received Bytes"); SYSCTL_ADD_UINT(ctx, queue_stats_list, OID_AUTO, "rx_frags", CTLFLAG_RD, &sc->rq[i]->rx_stats.rx_frags, 0, "Received Fragments"); @@ -989,7 +989,7 @@ oce_add_stats_sysctls_xe201(POCE_SOFTC sc, "CRC Errors"); SYSCTL_ADD_UQUAD(ctx, rx_stat_list, OID_AUTO, "alignment_errors", CTLFLAG_RD, &stats->u0.xe201.rx_alignment_errors, - "RX Alignmnet Errors"); + "RX Alignment Errors"); SYSCTL_ADD_UINT(ctx, rx_stat_list, OID_AUTO, "in_range_errors", CTLFLAG_RD, &stats->u0.xe201.rx_in_range_errors, 0, "In Range Errors"); From nobody Fri Oct 31 18:50:57 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cyqnF5BXNz6Dmdw; Fri, 31 Oct 2025 18:50: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cyqnF3m6Xz46nJ; Fri, 31 Oct 2025 18:50:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761936657; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GRP6RemQ4I/WhNW1hxLcF9sYIwjkA/oW16msymRAdnM=; b=GmXJVQ2hH7yKJLvxI33ZJnoNsJ5gij2a5R9pAy23HgyJvgK05YZmuda93DalGH1IkR1sOK QT+iUhMr+aoDcdcKIh3znuroYxJ9A783pdHszPOQ5meVeJ8HNBVXbJ8IbhcR6H5c0+lbrE 79v1F9riBuu8wrUslbL/oaQ+/DPg7Dv08iZ8H0aHSieiq89lUfR4h3iD/QAbqFOEJpFUw+ GoLYxzeaInb/bi1QLBdSOJYrUXt67PyyX+Lzx1UPW7bQt1a9bf4fe9XVJ9DScqTwoWqgxE 83MMBMWk8ndfNrne4m4GU03X9dtnvNc65P7EfK/p34+zCn2t79bc47Q6YARUrQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761936657; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GRP6RemQ4I/WhNW1hxLcF9sYIwjkA/oW16msymRAdnM=; b=ZWGYOklUlirG+ors5pLCOa5Ybl+6p6/JpwkNegoErnEvM2GGkkbsEqBUmx6fZ52bMRE4f9 0XxDBhs5TKqJS/5tZkmwjn1Do07ZzV7wbep7hI36kyBbqlnOcGoqyfBDRASqRmZAtaEhdN x/l9tW/LJl8WGJGZf1pYSUINThMXiAnh6sK9zvM5lP/0MN47mDwoM0CCJVxsq0Ngc18AA8 cib8d27ITOr1fkQxmE3lUWs3Zchk+pehMjz2aF5dI5xGaLWE00/WIgLHUZ8XkHU1wSVghN e9670fTonYEdHau3pdlhPMJ+lJUKghqyYhfF9EEYjxzWuweJr7kC2/ZtJCuocw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761936657; a=rsa-sha256; cv=none; b=TUgdvkxgqOlxLvw7bat9QmXGb7Y7vc91FzjpjsjdVaT9LYD1NK8RNgwLNq6+ezlgDgE9ov 7wbhvudn3iUYrXAFTEPXtb4hIQp5IlR2p3G17DFT6z1D1+8Adb3vnyP1B1jzcdnuC+gAbm TFRvYpW4GRgwZtMQA3pK2Xb2Awz7W88Mm6HG/YVpQvnoYZnx2Cz+SHChKrUgsbyOT+cf6h +YqtRIdDHemQaOpfKlBbXTC6tAaqKflAobgcglBBXMrB/t95Yy0GpGJXfh9y+hiovSsqr9 yXXS/JDaeIrT96rp5AhMmYFtAC2XJHNhfHPytpYo2CkkttIl7rO0Nf+YOeG4pw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cyqnF3MRQz1JqR; Fri, 31 Oct 2025 18:50: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 59VIovDg033282; Fri, 31 Oct 2025 18:50:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59VIovNh033279; Fri, 31 Oct 2025 18:50:57 GMT (envelope-from git) Date: Fri, 31 Oct 2025 18:50:57 GMT Message-Id: <202510311850.59VIovNh033279@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: 74a44a0bc8ab - main - vnic: Fix a typo in a device messsage List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 74a44a0bc8ab965d28d1ce804d3f0aead035faf0 Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=74a44a0bc8ab965d28d1ce804d3f0aead035faf0 commit 74a44a0bc8ab965d28d1ce804d3f0aead035faf0 Author: Gordon Bergling AuthorDate: 2025-10-29 15:25:33 +0000 Commit: Gordon Bergling CommitDate: 2025-10-31 18:50:40 +0000 vnic: Fix a typo in a device messsage - s/interrups/interrupts/ MFC after: 5 days --- sys/dev/vnic/nicvf_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/vnic/nicvf_main.c b/sys/dev/vnic/nicvf_main.c index dd44e420c78f..59f7abeacdd5 100644 --- a/sys/dev/vnic/nicvf_main.c +++ b/sys/dev/vnic/nicvf_main.c @@ -1402,7 +1402,7 @@ nicvf_allocate_net_interrupts(struct nicvf *nic) /* MSI-X must be configured by now */ if (!nic->msix_enabled) { - device_printf(nic->dev, "Cannot alloacte queue interrups. " + device_printf(nic->dev, "Cannot alloacte queue interrupts. " "MSI-X interrupts disabled.\n"); return (ENXIO); } From nobody Fri Oct 31 18:50:58 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cyqnH0hZrz6Dmf0; Fri, 31 Oct 2025 18:50: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cyqnG4QB1z46hp; Fri, 31 Oct 2025 18:50:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761936658; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Cduefti5+bKBw9Nn8Sk7+QBXyrTrK2W29L4F7QOmsxU=; b=ZzfItC1/+gL6VFMps/HNoPYRdOZq/bb97vPniBzJs/iXaujZjweZ88EFsNlLGdCqct/IQm 37CbNKee8C6LQnJaaCdJUjo7lDkUSfXwHGVdpgEtoR+0drZ2Te1p/RAyFZhd2GxNS9ddis F4JeXLTR9H1sPaN7mzDg6awJmjwOkiiVyh4Ldu2tNCeBzEkam0aMyR5ICbHxry0dRH9ili yc4qHCUunO9beQIG2Z2CvnN5BZmyTwXDdZbfqlPiLtzK50+7wbrbreFdk0jqRCb5Omj1Rt ezFvFYqR4RlkMNi+g3tJTSdxJDcrugKhXXmuRBBf8FI4tGdN17/t4fatZJRSGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761936658; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Cduefti5+bKBw9Nn8Sk7+QBXyrTrK2W29L4F7QOmsxU=; b=UkzR3JFQb4z016RbIAngzsTENkD+aL1MXB6nWq1oO3hLgt8LnlInQuam5gMg3bJunjWlDZ n6GApBMOuxZsJR6nRsFZ6wZ/ruh2+zfSoheUNq8S20sgWwR1EPu9NzbZnf8RWJxKOz/lZi hxlms3sp0uLpP3VlnYZ7H8R+Ivg0OQhbUxE5qqvMtQqKxsSMm+Hq90ydZYvK1Z0bNjAdn4 3/LsgV0Le7WL+XV3v2OirIrvfQwiBVtql+qPQynJxCaalJyoTPKDbVHuM8UeLz9mdqK9M9 hRqhdKyBbxfZBl8roOEuAfAlelKWEHd7PIAj0bypsmM+0T1YVhrjRS5SsOdeew== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761936658; a=rsa-sha256; cv=none; b=b2zSHJFlq3Boqkiwm9PZVMUyopF11/eaU0mifyhk2X6mRg0wRfMaDPBo/GMFUA05mUTuUy Wsz27LOtmTBwKgda+csnnrC3puxND4wetXc5o2aJVyxgP7trgLuJlZ5+4mT9mT643pI76q XZR0S55oS3+xir+3syToL5u03y3YTJQGQ7P+Bks8GngKmgY2EZWZShDopTZ7AqWuyoEkJZ sOc2vQowKQkigA8kZu3Nfxpa8L4cP5zK6GnJ6GHjmH211ugz4ocR1KF432+d5zZkvodDkw 1DyY+8ntgaevK9GSpj//R18iNQQHVBGaJ2OFZ4YRGEYRU1VmxToWTjqsbkTkiQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cyqnG41zXz1JZJ; Fri, 31 Oct 2025 18:50: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 59VIow8C034617; Fri, 31 Oct 2025 18:50:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59VIowNV034606; Fri, 31 Oct 2025 18:50:58 GMT (envelope-from git) Date: Fri, 31 Oct 2025 18:50:58 GMT Message-Id: <202510311850.59VIowNV034606@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: 3eaa2a852b47 - main - ath(4): Fix a typo in a device messsage List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3eaa2a852b475c7f063bbf677fa536e76514d309 Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=3eaa2a852b475c7f063bbf677fa536e76514d309 commit 3eaa2a852b475c7f063bbf677fa536e76514d309 Author: Gordon Bergling AuthorDate: 2025-10-29 15:26:59 +0000 Commit: Gordon Bergling CommitDate: 2025-10-31 18:50:40 +0000 ath(4): Fix a typo in a device messsage - s/Orignal/Original/ MFC after: 5 days --- sys/dev/ath/ath_hal/ar5416/ar5416_cal_iq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/ath/ath_hal/ar5416/ar5416_cal_iq.c b/sys/dev/ath/ath_hal/ar5416/ar5416_cal_iq.c index a0c27828bbc1..50d7cc0aa7a8 100644 --- a/sys/dev/ath/ath_hal/ar5416/ar5416_cal_iq.c +++ b/sys/dev/ath/ath_hal/ar5416/ar5416_cal_iq.c @@ -76,7 +76,7 @@ ar5416IQCalibration(struct ath_hal *ah, uint8_t numChains) HALDEBUG(ah, HAL_DEBUG_PERCAL, "Start IQ Cal and Correction for Chain %d\n", i); HALDEBUG(ah, HAL_DEBUG_PERCAL, - "Orignal: iq_corr_meas = 0x%08x\n", iqCorrMeas); + "Original: iq_corr_meas = 0x%08x\n", iqCorrMeas); iqCorrNeg = 0; /* iqCorrMeas is always negative. */ From nobody Fri Oct 31 18:50:59 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cyqnJ1rgcz6DmZ6; Fri, 31 Oct 2025 18:51: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cyqnH4st2z46ns; Fri, 31 Oct 2025 18:50:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761936659; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9/aQiwxqVxV/hvxVFLNlMXI73gs30Ex9Ic/L+K/YyLA=; b=iAWxDhbxrbQaSUhqB1YB7FtFfjOblaPdlDEPB9dmaPfJHO5TbEuM/ZERDWuC9R6NffqpWC ukzqKFY8pHkjQHpuXE8oWO2wBa5AmmqZT6zU5AfbkQ60M3DMWQCkaSI4xa1WTx6TFAC+X9 eDpVcYI+PqNv0TP0lGbExNhqVvorPFXxfPG3bvu2Vr5Bi0Nr+kQXvb3nXZD7OPdX6PfXhq IigTln4/vs1H/o8Jtcn+VaS0MNJ6DTofkdbHO3Qj3BuVp5giiQcV5QYdGi18WKVRZ+KtmK QVgtumavdv3iptM5QejfG2e4BvFrjWLmBnzVkElvCN4ntEmwQy6IMD+XkG4Kyg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761936659; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9/aQiwxqVxV/hvxVFLNlMXI73gs30Ex9Ic/L+K/YyLA=; b=aNX4GMmPko2Vw3Df6eh7lj7rlWcJ0xPVJ1Ky8VeojBUJ34Uc1rVr57kAD0+t6MT3hsEzgf 6+cypPVzX8ndaExJAreERiowPaBZ4rRXAbSBghST0NyWWA8syU6uA9BRH9OrVc4YoCj3e0 C4gwOUXANgFMrrmedkb48ZK/ZYczVI351E/BulcTzUxLYtSUSKzpEXegNFh4BU++EIYgl2 Dkh5yzh9t4OPR6DgtY8VBWW3SWRl3yNrujwbO6wH8RWJ9eX6phVVw0mt5FIC1HwBSt2+bc pqo2dy5LheeR7sMrMLNVz+jUTEfqXxpT0kyPYZXfU1b/a/Bgsv/cH307UESh9w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761936659; a=rsa-sha256; cv=none; b=t7mxiv1lIqqVyaRJ70yGm1u4S0fB+TVOq08dNdxPIQDTPbffcVZgOcsFSPWA2LRFj7hko+ zzB7PeEoFnSvaz14+gQnukBr/RVq9X+EDiGLJWRQmSvZBphf6g7ctjrTPJlZag/1ELCXFO xePT6ZODPsUKcVmt0Ix5Qs4QkKlAsOr9d/oM4ne6LVf24nUIK7COipmFfxB0beemoJk3ve 7szwtgVx8sBRlYkj+zpm2Iu70p4mrHK0nCsV7XKLnSADdhOrH+JA5GrT8xGzkEyaldSvbt ZuPM+dDyYzjl6E0z3KLeq2G2DH8rAbyD7J8VDOcGIVPpc77dbviFv+l6HNr9Zg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cyqnH4Lmrz1JZK; Fri, 31 Oct 2025 18:50:59 +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 59VIoxjt035913; Fri, 31 Oct 2025 18:50:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59VIoxE6035910; Fri, 31 Oct 2025 18:50:59 GMT (envelope-from git) Date: Fri, 31 Oct 2025 18:50:59 GMT Message-Id: <202510311850.59VIoxE6035910@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: 404af374b10c - main - bwi(4): Fix a typo in a panic messsage List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 404af374b10ca56c6f82510a5bb23232a9f25c34 Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=404af374b10ca56c6f82510a5bb23232a9f25c34 commit 404af374b10ca56c6f82510a5bb23232a9f25c34 Author: Gordon Bergling AuthorDate: 2025-10-29 15:28:06 +0000 Commit: Gordon Bergling CommitDate: 2025-10-31 18:50:40 +0000 bwi(4): Fix a typo in a panic messsage - s/unsupport/unsupported/ MFC after: 5 days --- sys/dev/bwi/if_bwi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/bwi/if_bwi.c b/sys/dev/bwi/if_bwi.c index 85146d4c4010..80fc5e9e47af 100644 --- a/sys/dev/bwi/if_bwi.c +++ b/sys/dev/bwi/if_bwi.c @@ -2900,7 +2900,7 @@ bwi_plcp_header(const struct ieee80211_rate_table *rt, else if (modtype == IEEE80211_T_DS) bwi_ds_plcp_header(plcp, pkt_len, rate); else - panic("unsupport modulation type %u\n", modtype); + panic("unsupported modulation type %u\n", modtype); } static int From nobody Fri Oct 31 18:51:00 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cyqnK1Wqzz6DmNv; Fri, 31 Oct 2025 18:51: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cyqnJ60tLz47B3; Fri, 31 Oct 2025 18:51:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761936660; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Nkyd3MjcN/oXXeMD3RWuOe9tHvOyFCUUL1mJkrx1ocA=; b=NwyHX7Yhr9P27lB7mGznjW/egJFxAGqWRAZUdnS4mYSMDV5RMNakKaiqP0w9yEoMncAGll jeDRqGaketn6T9SBT0vREipQjEOReBpCH6FzH611gy18wvrOg/+YtB7dLb2kJSAXsh6guN mi/0KIzC9a6ixN2CutNnVflWAXyh9gFB0SH9MAp2w8HEimFaPIJYqyYSv5haWcBAU7hLOA vRCvH6hnDi7jxeuT1Zh8GFAKbR+vtvd6bJyJ899UBNSxZbkPwpAfG/bM5pDbfnQ3TULLQ0 /Wiy55+kGXRRmUODJF/LCj9tkDxbg4jI+Jc6D9rknymsJ9cbJpAAtfK7wGHFRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761936660; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Nkyd3MjcN/oXXeMD3RWuOe9tHvOyFCUUL1mJkrx1ocA=; b=M9geyusnjcHxVvMuDVemU0MGSrC0CuKYrc8OuZQhBmyvLz/k66dzYJgAgHl0hI0iw91wZN 6prjLcgQU4jmOgCxCpbWOk8jl+8EwGWFTY7bSdCCWzkxi5qSvlZL3VyuBMd3ps9173gflT Lb6HQei/fNKTHNLRkR9/8WljdO2wZUR0/MhT6DHP/sJwc3lPjQSxJZ0dzejUxxoXJPI4bJ ik5HOqCzeSy0CRaieQ9zy7QQckHAMCM5WYJkfvpKOorRutcpZD8jM+VwoUpBuG33KokSAg NDmPJ8/4KPeuq7HUA2zSF0HR+oWUv2kVwbUUAFcl7lYfMnNXQAz75MjPmXuXYg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761936660; a=rsa-sha256; cv=none; b=rthEDhVBwfPM0Nv25IcFaXqiTddb3oKCN2RPYcovCztrqTVARiMaDjVzh6sBTIMTqrN9dk 3TDusAIsInUpUqYw/DAb3R3RfuX2SP996J14GmREDH+c/AgM+zCQhO1y9fIvrH22aMCCvp DdlCUkYJus+XZA4xbw/y+iPdAYok7xcp0YlIK2xxSY+Y4jS20tFgMEKNTQX+MeI08hWBSG 7jdI1W9NDYm/rOT+Af6RycrKgRaEbjDhIF7Fo5B97fTXJU7nsvs2uVBBSJ675kNdm2SHwa 4Gx3NgYcr3xpKg7SronFgkBd9OAg3R21U5XJWOm+SfT2xOBgqkcXXBZwtwfI/w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cyqnJ5b5hz1Jyn; Fri, 31 Oct 2025 18:51: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 59VIp02j036027; Fri, 31 Oct 2025 18:51:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59VIp0ps036024; Fri, 31 Oct 2025 18:51:00 GMT (envelope-from git) Date: Fri, 31 Oct 2025 18:51:00 GMT Message-Id: <202510311851.59VIp0ps036024@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: 081aa26778f3 - main - cesa: Fix a typo in a device messsage List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 081aa26778f3facdd836c28b2e3fed5de2f8b7b4 Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=081aa26778f3facdd836c28b2e3fed5de2f8b7b4 commit 081aa26778f3facdd836c28b2e3fed5de2f8b7b4 Author: Gordon Bergling AuthorDate: 2025-10-29 15:35:35 +0000 Commit: Gordon Bergling CommitDate: 2025-10-31 18:50:41 +0000 cesa: Fix a typo in a device messsage - s/exhaused/exhausted/ MFC after: 5 days --- sys/dev/cesa/cesa.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/cesa/cesa.c b/sys/dev/cesa/cesa.c index 405b619d6e5b..7439dcdbc1ee 100644 --- a/sys/dev/cesa/cesa.c +++ b/sys/dev/cesa/cesa.c @@ -286,7 +286,7 @@ cesa_alloc_tdesc(struct cesa_softc *sc) CESA_GENERIC_ALLOC_LOCKED(sc, ctd, tdesc); if (!ctd) - device_printf(sc->sc_dev, "TDMA descriptors pool exhaused. " + device_printf(sc->sc_dev, "TDMA descriptors pool exhausted. " "Consider increasing CESA_TDMA_DESCRIPTORS.\n"); return (ctd); @@ -299,7 +299,7 @@ cesa_alloc_sdesc(struct cesa_softc *sc, struct cesa_request *cr) CESA_GENERIC_ALLOC_LOCKED(sc, csd, sdesc); if (!csd) { - device_printf(sc->sc_dev, "SA descriptors pool exhaused. " + device_printf(sc->sc_dev, "SA descriptors pool exhausted. " "Consider increasing CESA_SA_DESCRIPTORS.\n"); return (NULL); } From nobody Fri Oct 31 18:51:01 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cyqnL1vK5z6Dmbd; Fri, 31 Oct 2025 18:51: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cyqnK6zf2z47BF; Fri, 31 Oct 2025 18:51:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761936662; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+fQJbBSPFlAfcgHuWKsnx19OIvtuguaL5fUv+1YdoqE=; b=L/W29i3TLKqLO0vYUS3O9t98sa9gyWYs+ia2QgGb4Phb/M4PKQkeyIGFFkl4X0dOzhha+b aLOsUZycDbZrf6wOTWtyNt6hAGxzfw68RvlXGAWletQh9nAy3UPtJ0Mtz8MZnI3KnkjRiY EqT6EF6rsAM7k/E9DfAJgOCJRzbEoobvG47SEu2rrbni0ot9lEvdtDG0ADpoZdvZZJp5Kw rRZomUrlOts8Xg3rii8VFRYIjRGjzz0nOWP+LSFOmc+2TtzO03sS+ktFbJ2/OYMeo5zsun YbhS7FAqdKkybED62kOps8OZHXnGFcXRD/1yFBlVRoWnpdOx6hKJNXteB4hRMg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761936662; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+fQJbBSPFlAfcgHuWKsnx19OIvtuguaL5fUv+1YdoqE=; b=GjsPF4urqXuZ7qqzLXai5k0Gc08s6uatpquVBQtk/YxjsOuUnftHL7Qa01KNqzhu+xVVZ9 abaWdKDxU9jtqKvIM3wPFi/GmabqtuWDz5urqND3pPisdviRxKP+Cj3enPS8lhIbvVbCkk b+SwGEEqVb/rZtrcbv5EYzdOblmDK/QFrIxdZo+rFjyY6YEJ0mqXyehynObP80LYCqdV3g fq1niKRQb+vmm7U6yrJQs11yxhl2ql1XU3KBfb46AsuQ/gxgHBngiKRNVzCnqTxDZYbiGB UkgG3hYlBTy+7yvc8m0vpFTtACNfAdU/yABMXKI0FlZhYD+XgCnOTx4EzH/czw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761936662; a=rsa-sha256; cv=none; b=LPURpNVVAereoi0j+gc1Ol4KWrSIAYma+vI0BPpn74HuzHlNg71Ug0jK4iyLmJ/2zcbMNl IAyvW0OGE0bVZWe9b1V7PCsf8SCdLl52rF39HGl/lvTyYv2+FzehLawlXMtYt4j0UEB4RL 1LaoKOuv0rgArt6kFNcwJoiv4CxwC5d4MwdmoFdjvzVTBH365ZgZiTe+usJBgm7rN9rLd5 z1BF3ia5CchTWmt7qh9tLF4Z0FLd6w1Tq0bW5yTNmG/W8qJkPV3MS3xpVuCeF+VCyoL0gw 5w4mGMHJXegS3BwTkl+OMr53E4t4ijc+AQxsc5GYoonoy8h4XcJejwMzwusx3A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cyqnK6VNYz1K1l; Fri, 31 Oct 2025 18:51: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 59VIp1uS036061; Fri, 31 Oct 2025 18:51:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59VIp1J2036058; Fri, 31 Oct 2025 18:51:01 GMT (envelope-from git) Date: Fri, 31 Oct 2025 18:51:01 GMT Message-Id: <202510311851.59VIp1J2036058@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: 84d75bb018e1 - main - ciss(4): Fix a typo in a debug messsage List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 84d75bb018e1800d610760191ff64c3eebcb46d7 Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=84d75bb018e1800d610760191ff64c3eebcb46d7 commit 84d75bb018e1800d610760191ff64c3eebcb46d7 Author: Gordon Bergling AuthorDate: 2025-10-29 15:36:50 +0000 Commit: Gordon Bergling CommitDate: 2025-10-31 18:50:41 +0000 ciss(4): Fix a typo in a debug messsage - s/unspported/unsupported/ MFC after: 5 days --- sys/dev/ciss/ciss.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/ciss/ciss.c b/sys/dev/ciss/ciss.c index d4ede91f6b35..dd3df631119a 100644 --- a/sys/dev/ciss/ciss.c +++ b/sys/dev/ciss/ciss.c @@ -3140,7 +3140,7 @@ ciss_cam_action(struct cam_sim *sim, union ccb *ccb) } default: /* we can't do this */ - debug(1, "unspported func_code = 0x%x", ccb->ccb_h.func_code); + debug(1, "unsupported func_code = 0x%x", ccb->ccb_h.func_code); ccb->ccb_h.status = CAM_REQ_INVALID; break; } From nobody Fri Oct 31 18:51:04 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cyqnN3tBBz6DmR6; Fri, 31 Oct 2025 18:51: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cyqnN1XMqz47ML; Fri, 31 Oct 2025 18:51:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761936664; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1k/QvLnyg8LrQMG0Ik/9lPDhNRclL1un4RNKb76Hf6o=; b=rMaoh0quUQP73Bj6kLzPrkFv4G7zZTbgFZNqt7qSo2IYD4Zt6kZYJWX3DLe6TOHR/dlYsE qVvZoD184+gdCACmsnm7RWQHVl50r+cZBCp40kTHWf+nwk8Z7VICjKrUI99zgZu9sLcLCc D7AZQWpZMUySyyre3HmKLLEsjbF1zJbavaI5t2gNW6V1g3F0Cy3m/jyvxbUWZfN7I9GhoD gkJpXUHNqHBDpede4PzTQyg+NrgrTZBF7x8LsEUg+IlfB2gQaqaxKBFcOQ43zlxen3BATL utEM/kg+qYv+BAkS70h3HoZM1Q8dVqLgA9UpheWS2I+gbNcX2hRFIVPAKlFVsw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761936664; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1k/QvLnyg8LrQMG0Ik/9lPDhNRclL1un4RNKb76Hf6o=; b=UH7d+7E2Wzkq046y/c71Mj2kHbFGDdxxUECOX/YVWAOUiQhJ2zov4IwKpe0T7JZ+WRg8dH JJu2vq9i12yJnoDdS4z6k6plbPyEyw7m174kpP55x5yAgL/wy4m2MoAO0DM31zgPH76x9t fetGYXQEkj4tCaUAQDEnjCbonzA/vw+u07kh0Xapyeha+lwwQ6zBOuOM84zkChKL+DgIde keaWi5czlLBp9gRswttEElAuphHdEbgwqo126D9OsBT2rJJp931Y2Z6Ll12VFsZyZTlOmu nrFYihsc1wQjUxaAkdgcaFkb9tcrTnAYXoEh2Zt5EFQVeUi3zRustN9QugWXMg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761936664; a=rsa-sha256; cv=none; b=xRtxged405nzmIXEaR51USZFwL7FAbCyGSWSP3PZwxWhAvzYFLCHM5tN85sewmCu9niaP+ Ny99+QA/JM6zWWyV8Q0WHaOxLZmQsUu3HKhpyHmlm9rS6w86oictAQ33K8Cae/OVDGoP3I IVmGoS0qoelsags0IK8DWbIHZuPH2gSKsQHh6TPr3+YEi0axTOKKDUP1u1fAS1PD1lJe4Q uIsuDbpc6nYgKRbu0QsEHeY7831IYGG1CuO8fgEcrSHaffmI1ZhNc8RPMCSocd25hAK/vc naTAQrI+BlxRjOEu95cs567a+VtnwXJIuN0P5rMTwVSnhCEFhN0vnq1aV+IVJg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cyqnN12vMz1Jyp; Fri, 31 Oct 2025 18:51: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 59VIp4JE036136; Fri, 31 Oct 2025 18:51:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59VIp4Gr036133; Fri, 31 Oct 2025 18:51:04 GMT (envelope-from git) Date: Fri, 31 Oct 2025 18:51:04 GMT Message-Id: <202510311851.59VIp4Gr036133@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: a25172844eda - main - mfi(4): Fix a typo in a KASSERT message List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a25172844edaaa7e18c1dcecb6df8b8832456334 Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=a25172844edaaa7e18c1dcecb6df8b8832456334 commit a25172844edaaa7e18c1dcecb6df8b8832456334 Author: Gordon Bergling AuthorDate: 2025-10-29 15:38:59 +0000 Commit: Gordon Bergling CommitDate: 2025-10-31 18:50:41 +0000 mfi(4): Fix a typo in a KASSERT message - s/dissappeared/disappeared/ MFC after: 5 days --- sys/dev/mfi/mfi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/mfi/mfi.c b/sys/dev/mfi/mfi.c index 13e5dfc84fd1..a7d98f06aea3 100644 --- a/sys/dev/mfi/mfi.c +++ b/sys/dev/mfi/mfi.c @@ -2829,7 +2829,7 @@ mfi_check_command_post(struct mfi_softc *sc, struct mfi_command *cm) if (ld->ld_id == cm->cm_frame->dcmd.mbox[0]) break; } - KASSERT(ld != NULL, ("volume dissappeared")); + KASSERT(ld != NULL, ("volume disappeared")); if (cm->cm_frame->header.cmd_status == MFI_STAT_OK) { mtx_unlock(&sc->mfi_io_lock); bus_topo_lock(); From nobody Fri Oct 31 18:51:02 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cyqnM3G55z6Dmn4; Fri, 31 Oct 2025 18:51:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cyqnM14g3z47Rx; Fri, 31 Oct 2025 18:51:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761936663; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2j/C+igS3h1mwoy18wHaWfZ9c6hM0jJzUHo29DGIh3c=; b=LzE3tjNBpe6Rbs3aGzhOTt2Sp590mwHfO4a8y5wOOfnpTN9ppb7LoG0FKYECrfk0XGg1pe dJS6+t/ekIZds0mPTC8LR1iEKukRSNeK308tdiBlZvU1jFEh7NgQuvFYfI64Zj4Zx7on33 aqbLNd/D33l/eHhLuQBuMby+ANeJg4PTcL6m1EqKBPp6TU0HxJ+6E6Uwy0toDkHoeq/cUM p5hKXey7bR7sK6pMzexK0W1BzWs3B6xM7R+jkrfp1hwaqYAthcAFCv8pxrUjNTNY8u4AZg FHXOy/cwF6JKMCLHX2koe9Bn3PcBiI7wIGaqSRM5ScpFYFmZsnyrNknZ23QVSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761936663; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2j/C+igS3h1mwoy18wHaWfZ9c6hM0jJzUHo29DGIh3c=; b=uhGDvhctVqJ2t/iT3ncDpN5wlYRJFo8IIuJmFKTP486tT9rsKAmVB3eYCD19cSgNUZ+tHI zbPW1aPiMgm7bhPjgN87OWMx/xCU+PxvMxO+shA/xdjRvMioFBJzBO5RmGKqbjJfmY6Oku FL73wJN2+3SsXW6BqxldRX+MTgw4K2EH09WDcKj6JWAp9WQ6WQS0kaKOq1cCxr1jj8ecC+ s44ElhKL+J+fFn8wE1wpesdpMgAaU/AN5vrhbh6ZY9bviMAMU2kLmO0wRcKCX1RAtXozWl CmduCJF7utd51/3XpaBu+jwozGoB0G8ZlXiPsvA2rSlST3rekVev+zWcmUVjkw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761936663; a=rsa-sha256; cv=none; b=gZvPxzLrvyMYlRoDXOtAasPD4ZO+nyKNQ+1Wa6ocq+UKXUjtf07b3TIRsz/U8UEmeH33/i 5WKkUe+RgPL9fRAsJrNiBoRpp9s9y+LeCh2qeQadVuUTHhADj2hr4VA3LZ7QW3NY6YxHRL jf1ylLu9IjvmPfkn2ndbqKlhhx5x5fp/6mftQv1q/tX+UPImiTyG5YI9wU52q04+2W2s90 ckZiLigRPhfx1c4G0UJUg/dHY2UD56WGWhfdGnbf4xpRnORXgcCGTbky8fpbvlC5DxLIRl 3KtMzItniPULrmlT8BofF60O5NE7yGjJ0QpCW2y2qUBcaXpTL+UhurZYlw5cJw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cyqnM0PH1z1JqS; Fri, 31 Oct 2025 18:51:03 +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 59VIp2KT036101; Fri, 31 Oct 2025 18:51:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59VIp2bD036098; Fri, 31 Oct 2025 18:51:02 GMT (envelope-from git) Date: Fri, 31 Oct 2025 18:51:02 GMT Message-Id: <202510311851.59VIp2bD036098@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: defe77554d13 - main - igc(4): Fix a typo in a sysctl description List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: defe77554d134964d7c197a2f3ca552778e8b41a Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=defe77554d134964d7c197a2f3ca552778e8b41a commit defe77554d134964d7c197a2f3ca552778e8b41a Author: Gordon Bergling AuthorDate: 2025-10-29 15:38:03 +0000 Commit: Gordon Bergling CommitDate: 2025-10-31 18:50:41 +0000 igc(4): Fix a typo in a sysctl description - s/Recevied/Received/ MFC after: 5 days --- sys/dev/igc/if_igc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/igc/if_igc.c b/sys/dev/igc/if_igc.c index f199a128c783..d6c06803990f 100644 --- a/sys/dev/igc/if_igc.c +++ b/sys/dev/igc/if_igc.c @@ -2816,7 +2816,7 @@ igc_add_hw_stats(struct igc_softc *sc) "Oversized Packets Received"); SYSCTL_ADD_UQUAD(ctx, stat_list, OID_AUTO, "recv_jabber", CTLFLAG_RD, &sc->stats.rjc, - "Recevied Jabber"); + "Received Jabber"); SYSCTL_ADD_UQUAD(ctx, stat_list, OID_AUTO, "recv_errs", CTLFLAG_RD, &sc->stats.rxerrc, "Receive Errors"); From nobody Fri Oct 31 18:51:05 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cyqnP5Jl9z6DmhM; Fri, 31 Oct 2025 18:51:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cyqnP2g6bz47H0; Fri, 31 Oct 2025 18:51:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761936665; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aX1CQ26+JfS/Cy/ycHRFdicrOyebkGMk9YUybCLQU2w=; b=RXfnNgWEIKFucxBwrpmm5mp6QxQSdUqoSiuhbTOoBhN2jlqPtxkAOduzxPbKIq+LzXo+Z0 6m6eKeeZ5fd8y28bFSjYT9gozV+OZAUL8pLAR29totA9tbTkkasxYsXI2CS4KdUm4NRp6X muw/YaEWz9aMYotlG9OlY/BYqxfxKYk1MvGGCuzHpE387IbthYxj7l1yA6NQPh1FrZgfzI Zy3Qo7rLyRcqX83WTjNTvfVO6yXYuXlEqQF42IcFlw68keBoDesN1Vqu1Yrf64d7ui4wp9 Vne9uTCHxseIZ8frWpW8gURnbpGugmq6mXz0FnS/E3F9Gs3vuStmQiC/3VXctA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761936665; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aX1CQ26+JfS/Cy/ycHRFdicrOyebkGMk9YUybCLQU2w=; b=aOOBwJerlyZVrDA+5Y6rpPYRQ6D24z6zWNPcd26oWtP+CRrbwjLb1nuV/xaMNrYNylWEep XjCi+1cGOjzxTfTU60AoGv3m/0jfr7RRX5jA9k8Eqo8EruZb5gSh3D58ViL/FBweymAmOP 4LcWC5h2NrDlXqnADWV7jlXJE+nMugJXS7o2viedAxAiT+Azwmrf5IIf4/xtn+21GP9dcs mdUUooTPXx9x0fN0aNVFPUTaa0K5ilOWTmIUGEwrHVRgokdUKilq8ebzJGAWtT2ejKA6W9 FpMmMFOkWQy55kmoaaP1Z20uOv2Xlnq0eXWjWylr0PafCVZF2r3TPKBHG5YTrQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761936665; a=rsa-sha256; cv=none; b=Rs+r0y53Jhnwm4UvBFjw3CspXhWkYrjnb5QJnU/h0GbObvvvSp/JHBoJagGxLdnkOA4ZKO e/x32UnvvckJL1adto8g0CwdwMCJJMn+BKAxn+9bpAnI/66Z6Q1VyA8JwOk8pGpQEkc2yU QIa++RETK+ZQtX0remwkgggxNeU1SEA8n9VsZZXtdm7RhdJv3lAI/IQ7MtPBsAbLptFAC4 0ZSpg/5EZZhGNTKRtc76V/OzhhMwhNzVuzXQUgYMCD4iRewGV81dLJgO9UCxnQk3tz/W1+ v0BfjpvsTfutIfrOJKWG6e99z05NE35xi2Ad6GvRxEMzowknS3rI/wluOx3upw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cyqnP1z3Dz1KHr; Fri, 31 Oct 2025 18:51:05 +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 59VIp5nV036172; Fri, 31 Oct 2025 18:51:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59VIp5Vt036167; Fri, 31 Oct 2025 18:51:05 GMT (envelope-from git) Date: Fri, 31 Oct 2025 18:51:05 GMT Message-Id: <202510311851.59VIp5Vt036167@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: 7b11940d4a66 - main - isci(4): Fix two typos in a log messages List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7b11940d4a66589069c21534dd0b969f79ae79df Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=7b11940d4a66589069c21534dd0b969f79ae79df commit 7b11940d4a66589069c21534dd0b969f79ae79df Author: Gordon Bergling AuthorDate: 2025-10-29 15:41:06 +0000 Commit: Gordon Bergling CommitDate: 2025-10-31 18:50:41 +0000 isci(4): Fix two typos in a log messages - s/suspeneded/suspended/ MFC after: 5 days --- sys/dev/isci/scil/scic_sds_remote_node_context.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/isci/scil/scic_sds_remote_node_context.c b/sys/dev/isci/scil/scic_sds_remote_node_context.c index aa1e8d840282..42dd81aa1874 100644 --- a/sys/dev/isci/scil/scic_sds_remote_node_context.c +++ b/sys/dev/isci/scil/scic_sds_remote_node_context.c @@ -663,7 +663,7 @@ SCI_STATUS scic_sds_remote_node_context_invalidating_state_event_handler( SCIC_LOG_OBJECT_SSP_REMOTE_TARGET | SCIC_LOG_OBJECT_SMP_REMOTE_TARGET | SCIC_LOG_OBJECT_STP_REMOTE_TARGET, - "SCIC Remote Node Context 0x%x was suspeneded by hardware while being invalidated.\n", + "SCIC Remote Node Context 0x%x was suspended by hardware while being invalidated.\n", this_rnc )); status = SCI_SUCCESS; @@ -718,7 +718,7 @@ SCI_STATUS scic_sds_remote_node_context_resuming_state_event_handler( SCIC_LOG_OBJECT_SSP_REMOTE_TARGET | SCIC_LOG_OBJECT_SMP_REMOTE_TARGET | SCIC_LOG_OBJECT_STP_REMOTE_TARGET, - "SCIC Remote Node Context 0x%x was suspeneded by hardware while being resumed.\n", + "SCIC Remote Node Context 0x%x was suspended by hardware while being resumed.\n", this_rnc )); status = SCI_SUCCESS; From nobody Fri Oct 31 19:21:58 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cyrT31f7Jz6DqFr; Fri, 31 Oct 2025 19:21: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cyrT317f7z4Gm6; Fri, 31 Oct 2025 19:21:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761938519; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5uGtegrYpoZoso1XBPVvPr/ytt7AugraYYApDB+TzjY=; b=ApkGZsQHBaFNk6l1lde+8XtY5sdfEJDGA5kdtkbbLnBUsUcK/PxUYICbp7C3hIwC7xvnJ2 i+uYeKKxNkMriELQH0cHceOnWUW724C6kBKyxxBLIQYUCxbyy/Ff9V4a9ucff5tOy3nu4s 8hQwGXyXZhlHWTFF2n13m7HNAO5CUgsGhsP4d3eQI1+uxsHR8S+pNGcciK1P/5uVRHcxxZ 1C24724uEn436GiG+Rl6JrUuqEW1ZAFC9hW+kbHB6/Gn95nds0YykzmKxmef9OMQVd/+MA b8nyaDmfJyIPsjGflPXxlLfefGY8c3xqvp10qmYA1lpbyQGrlaScY3RLxq1/FA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761938519; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5uGtegrYpoZoso1XBPVvPr/ytt7AugraYYApDB+TzjY=; b=F9wwx5cnk2+kRUlI8au+UMDW0K5sMwRFVS8ZRkRQNxCjhBalVaZOeIREmEKPLnYktX/GJq O+snZqvLwqj4drNtQ/Bx0mmY/WY/lTVjYtIxAh8cuTasCgWSQmZK0CO257Op1oyOjKuzNZ pNe/ibSOP6ifSbbMfxRijNRrL/SUxm+K5ere3vVI1p0NUUtiELrlZdbDpNMKbcSI0ZJgva 0PUJLj7d0yzMmCoTdHMV2uRGJGpDiRMn7fo/scEaQFsFABe9qBZpBeAzsxkzap446Fj/xr 1G4E55kBktUlMnkrXKTBBql28Zg8IDJ6Laxlm/zOJecfsazI5siVY+66hCk1Qg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761938519; a=rsa-sha256; cv=none; b=sE5wTjorTsiVbQjmuXs4KJlaiEYcEFm8F+Z/aS9/9OfLyf/zekDQp0W5ja18IGR5CTx0cP /XXhTntfXwL51Ri6IraF4f9zpcIXdgMnyje0jVDWebxnTbC+d5tckaqiN+Wor04JZqs+yR LR63jAWqh+wTItvCdNu0g7OSX/nqftt02bbrx5fU+b0P3K/kLtoYjV0bLDS/M+VTJE0nbY SpQUvfT6yZbNQEeI3vADBQDQhUWzOTLLJ8lZpPvsjPAngx+iEJruo1G5cTvRq4gF3TMjP7 n1ciYrtNarMWMES8XKuCAFkDbh7ewwvvTk/6ZI4C7tyv/YCc3FpuxqeHq8nvXQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cyrT30YwPz1KSv; Fri, 31 Oct 2025 19:21:59 +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 59VJLw8n098343; Fri, 31 Oct 2025 19:21:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59VJLw8T098340; Fri, 31 Oct 2025 19:21:58 GMT (envelope-from git) Date: Fri, 31 Oct 2025 19:21:58 GMT Message-Id: <202510311921.59VJLw8T098340@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: 259b69ad3dd6 - main - ddb: fix compilation List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 259b69ad3dd6f077c99be8a7795775dd5b87b0b5 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=259b69ad3dd6f077c99be8a7795775dd5b87b0b5 commit 259b69ad3dd6f077c99be8a7795775dd5b87b0b5 Author: Michael Tuexen AuthorDate: 2025-10-31 19:20:01 +0000 Commit: Michael Tuexen CommitDate: 2025-10-31 19:20:01 +0000 ddb: fix compilation Fixes: 9aa5a79e2af9 ("ddb: optionally print inp when printing tcpcb") Sponsored by: Netflix, Inc. --- sys/netinet/in_pcb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c index f573e07163fd..79c77c105d9e 100644 --- a/sys/netinet/in_pcb.c +++ b/sys/netinet/in_pcb.c @@ -3058,7 +3058,7 @@ db_print_inconninfo(struct in_conninfo *inc, const char *name, int indent) ntohs(inc->inc_fport)); } -void +static void db_print_inpflags(int inp_flags) { int comma; @@ -3206,7 +3206,7 @@ db_print_inpvflag(u_char inp_vflag) } } -static void +void db_print_inpcb(struct inpcb *inp, const char *name, int indent) { From nobody Fri Oct 31 19:38:29 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cyrrS23MBz6Dr8y for ; Fri, 31 Oct 2025 19:38:48 +0000 (UTC) (envelope-from marklmi@yahoo.com) Received: from sonic312-24.consmr.mail.gq1.yahoo.com (sonic312-24.consmr.mail.gq1.yahoo.com [98.137.69.205]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4cyrrR6xSYz4KVX for ; Fri, 31 Oct 2025 19:38:47 +0000 (UTC) (envelope-from marklmi@yahoo.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=yahoo.com header.s=s2048 header.b="RXndHW/3"; dmarc=pass (policy=reject) header.from=yahoo.com; spf=pass (mx1.freebsd.org: domain of marklmi@yahoo.com designates 98.137.69.205 as permitted sender) smtp.mailfrom=marklmi@yahoo.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1761939521; bh=smBOJC3czoalXGC4FbJBUll9Tr5vO9Ly8e0LoolpUAc=; h=From:Subject:Date:To:References:From:Subject:Reply-To; b=RXndHW/3aGpKqR7Dv2sZd8dL5Sr4zVcdwggcu+kwnuwVOnvAv1fnlgIexmnmqq6rrTJWYQWNvLpKT+l7OtNO1PYWKYePt3ai/lS8StnvreIi4lVOg1L2eHhCn6llsJd2aRe/g8bO1oUs+dyIUQ9boUq0hveKwuh5PH1z8+BFQy9dJuJlRgQKDWKIxODF6EBauqDuYH2tDwlLuEiB6pEquQ7NKwS4kOjOA92kmbF7VAdJyWpk2POhvQABoeQKwElSwaYGxEUhEQLmYtqBheJO9ZSTM0qLOQBwksJZ5Qp8cxxrY5HkbeYKHZlrHDEzC//X1pw+ATTmDcJp99YwBdcNEA== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1761939521; bh=DV8XXsCwd9oXrEzUeizXyPDZp6pFdR4LF2tankAFAgy=; h=X-Sonic-MF:From:Subject:Date:To:From:Subject; b=p1bc+DRLcBnNOQfUu5MwVwHh/POu8T6Hg/V1uApZD9zQw0GJwnlaanc4B524a8sDyYebp165GZi0H6AGfobpfCYsoNGTTlA1ZHtT7aoLt4rHJxjQSqiyZAdkbHwo287qWi8YvtQ8P8Q4fMlo/xjCM9B4DLwSjyGYFvTV++O2w3dwwIERe+vHOctaOC2ZbAaaithAZ7OLlcHXPYXBJBqDKuPoeU10MkLCQwlaS68SJbf8tnyDHD6UTuvsK4V6T1S5w/mN+acnwv0hFvdIYHY78E6oQ3VnJQ5xdm7Qb++Ku2gBr/htbDObAyez9iOoGYRxL4jvkAujxzEo9nLDuh0OjA== X-YMail-OSG: IqFXQ5YVM1n_2UoMW_J8tiNHcZt10pLjeSG1huiJ_y9o_6oIiZV03ptP.GUoEGJ KbqBFnxUxpvVIe2tc8hIVjEEYKNaGF9DkTHhJP.Yln2u6kKuDFeQhKbu6kShWmwhowmSeNe_m8Dm xdY0Bhi5lEk7idsMs44.4ETRKzv2mAvM1xj4hMfQsoQarseb0fTYeB_jEatVJDnWmLvxqMzmFC.4 HTymUcGytue9zXk5mPOOmjLjgcadAbpL8T_Q4HdAqexvn.YZZgApO6IoejWDHg6U_MFsB55kUuvk BYWzAtvrTEYeSjnt20P6WT9KhQS4KtIY8r2MvJUkXPSkgyBio_ZKj_lD8PX_dU8Y9MsmFq8T0sGb pXY4WBQi_mMLEgvj_YTT2Z1YG4de.0I5a.LnxJyExwyJ1cs2ZiyKPP60WKWklUQq41X0Bn16WNDr qQ1Bkz344HnFi0QGjn_U0ApzjsXAsFELoeDuU5OjPR5R2Vh1OsgV8gjObonWCNq3NaDnrmbspdP8 jxvEpKRqN0Juvg4XRHVdHUOTXUtwB5crrQi0DlsR..sPEnbcRYLOJBuxeXKdBphd.2GcDrANAsW7 kdLTmIO74Ml.y82QCRhwVJFz_isIWxxvEvJdHTiqn6jhe09FKo8Oo9vcQyN8ruhi_FsDSMKvOp3L vzngJo95ClO6vSwbPwYjOoo4ZQDlPxVe1eyuvH3mN2ShP03LbnX3BI7Yx0Fk90YuK3y2KANcTlLy C6c1mMkaI2lRqdBvBYHYiI6deB_AO8A0b_1lVf7DyHm38pmDdoGD4kODu1iTt8g9cIBxYkCBJy.Z LjG0fMZFV4Ff8B7CGxKZ8tLQEEItlOEuVM9nuUxf6qM_T0RBxCp4KqRRMbsq6Q60k9UE5_qKUbWX CM4CiCmrL73gnaxgzZ_jlp.9vPz0eoZKGZ1Fl.HppHnAJePfAHJWXd6tduHsS5zWlpAbtNgfgVq4 o2EPK6TlpeNc3JwyVUytT.0Bqlr0RL8I04HwgiVL9jsN2YgofhORpfRkRQCuAcKzuslqbhaBTAB5 Vj_2YoCE1ROPLXhJF9ZsHHif9D5aowTtk1gn8hiNF98sQjX5UjYqHQWmLwFJIOEUwwVjqHit9chJ zYY.64Lw64SzL48lJd689_qi65ScYGtYzKIYWjtTy8UiCOPYF2_4z8UUdxAnnXE._iOPix0Tk247 75hkmA22cHC.Kq4RYN17TZHaod24GgvwJu2.eSjOTKVOp_FyRxcWj8gh8y0Z9mKR0zAZaXkRwIKq rFiMZYWFW6hiRzIpP.9NHbvvAYETps_.hkGF54.OseOxFVyNmtexwaR_X5EhfPSZL.vK_vpfQ0Vq XWnOUqOm2MCAxKgZU66apcr_KhC1C_7FYyrsueHlUAKvC2GemCX6pu.qnb0yEMLpBArlsW5JKsMQ wKe34cazS2pN2mvz6VdH9h48vpEs_BxXTNzezlwfAVMHYw.LlUsYQiT68u325VUIzBBZh0zk7xcW YEncRwmeK7WndDjRnUBBQ9Avp1gr_yMfTDKTPLK0nA9emqRYSzgZg200saONxSWKpP1F_DZekppi 6Ba8ZJM5Z.Z0iJpQMTfQSnecInAO.Rnpl5tIb3qwDhNQ7epf9DS.wVBh56e7O2NRwINO3yYGzcFb EP3sVcSuPeJAT8fXuESUjA_EVLlYWjKrdbSc2sUElF8QV2yE.h_SRUqnrp8tN.F._aGywgPx.lSw zTVNtgYPujO2ps4WproZ3XvPeKxam.uOnBx.ts0HBO1c1K8PRT6cHRu2_qQdE_7ohsjCOF0v1leS Guj3EYXHOVpH4MOcmtRV4IU6psllte9cFUnxLnVhhrBwj4CHA3W86im.FQ6oXknsUTNetsXhBzzi URTWdDQtLEJF8Ru4cB59YRXYV456lH0VMIFeM4y2MTG6phgkP2RLFb_3k3KvBsnhSwHnmy6Su4sR c3hUu1sdIWiyVJI8nt9myYNKI5SSZz1iFjRFf1i_UM9nnEGcMuEH4wK47mb0KIt7RgPJ2fv4ImSQ Q.VFr2ZbsH0suE68Lr.KTZiKcPUyaWjH0hA_D2.gQJwJKqoXaJFW6uU0PsdnoZ_kjL97sUthKlxx _3S_DLjbG1IP16glZNmuRTgCAByCzn.FUwokd0UufEQwkLgkEPOKTSPiyeTM61zfL99XaLTuRxGU _St49ri9NSICWnnASNtsiewaceZk1RAKBVhZ3dKDTrOq4IJn8Fs3NwqYzO2RMVVfqAwuhw.o.VbZ uQs6BvykNi.yhUoi1vuznEQzIe7kPiJ7EJ0oZW0eGgyDcro0UDiJO1qfnzoQ6jLnwmnzfzuoQKmD Qn5r8WVMoyGEINiMJQ0te X-Sonic-MF: X-Sonic-ID: d092425d-dea5-4f4f-836e-2a12f9bdb04f Received: from sonic.gate.mail.ne1.yahoo.com by sonic312.consmr.mail.gq1.yahoo.com with HTTP; Fri, 31 Oct 2025 19:38:41 +0000 Received: by hermes--production-gq1-86c5846576-vsnvj (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID 22d2088a8a3b100b6e999928d62e3b8b; Fri, 31 Oct 2025 19:38:39 +0000 (UTC) From: Mark Millard Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3826.700.81\)) Subject: RE: git: 51e8e8b0f369 - main - Merge commit e24f90190c77 from llvm git (by Brad Smith): Message-Id: <0F63F7C2-9C1C-4FF6-A165-76F15E72BEF4@yahoo.com> Date: Fri, 31 Oct 2025 12:38:29 -0700 To: Dimitry Andric , dev-commits-src-main X-Mailer: Apple Mail (2.3826.700.81) References: <0F63F7C2-9C1C-4FF6-A165-76F15E72BEF4.ref@yahoo.com> X-Spamd-Bar: --- X-Spamd-Result: default: False [-3.90 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.90)[-0.898]; DMARC_POLICY_ALLOW(-0.50)[yahoo.com,reject]; R_SPF_ALLOW(-0.20)[+ptr:yahoo.com]; R_DKIM_ALLOW(-0.20)[yahoo.com:s=s2048]; MIME_GOOD(-0.10)[text/plain]; FROM_HAS_DN(0.00)[]; TO_DN_ALL(0.00)[]; RCVD_TLS_LAST(0.00)[]; RCPT_COUNT_TWO(0.00)[2]; MIME_TRACE(0.00)[0:+]; ARC_NA(0.00)[]; DWL_DNSWL_NONE(0.00)[yahoo.com:dkim]; FREEMAIL_FROM(0.00)[yahoo.com]; DKIM_TRACE(0.00)[yahoo.com:+]; ASN(0.00)[asn:36647, ipnet:98.137.64.0/20, country:US]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; FREEMAIL_ENVFROM(0.00)[yahoo.com]; MLMMJ_DEST(0.00)[dev-commits-src-main@freebsd.org]; APPLE_MAILER_COMMON(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; RWL_MAILSPIKE_POSSIBLE(0.00)[98.137.69.205:from]; RCVD_IN_DNSWL_NONE(0.00)[98.137.69.205:from] X-Rspamd-Queue-Id: 4cyrrR6xSYz4KVX Dimitry Andric wrote on Date: Fri, 31 Oct 2025 15:48:04 UTC : > On 31 Oct 2025, at 14:48, Jose Luis Duran wrote: > >=20 > > On Wed, Oct 29, 2025 at 3:50=E2=80=AFPM Dimitry Andric = wrote: > >>=20 > >> The branch main has been updated by dim: > >>=20 > >> URL: = https://cgit.FreeBSD.org/src/commit/?id=3D51e8e8b0f36933814b1be08913857727= 876aece5 > >>=20 > >> commit 51e8e8b0f36933814b1be08913857727876aece5 > >> Author: Dimitry Andric > >> AuthorDate: 2025-10-29 18:49:54 +0000 > >> Commit: Dimitry Andric > >> CommitDate: 2025-10-29 18:49:54 +0000 > >>=20 > >> Merge commit e24f90190c77 from llvm git (by Brad Smith): > >>=20 > >> [Driver] Enable outline atomics for FreeBSD/aarch64 (#156089) > >>=20 > >> The compiler_rt helper functions have been built since 12.4, 13.1, = 14 > >> and anything newer. > >>=20 > >> MFC after: 3 days > >> --- > >> contrib/llvm-project/clang/lib/Driver/ToolChains/FreeBSD.h | 5 = +++++ > >> 1 file changed, 5 insertions(+) > >>=20 > >> diff --git = a/contrib/llvm-project/clang/lib/Driver/ToolChains/FreeBSD.h = b/contrib/llvm-project/clang/lib/Driver/ToolChains/FreeBSD.h > >> index 7ab63905ed4f..7d090ba682b3 100644 > >> --- a/contrib/llvm-project/clang/lib/Driver/ToolChains/FreeBSD.h > >> +++ b/contrib/llvm-project/clang/lib/Driver/ToolChains/FreeBSD.h > >> @@ -78,6 +78,11 @@ public: > >> void AddHIPIncludeArgs(const llvm::opt::ArgList &DriverArgs, > >> llvm::opt::ArgStringList &CC1Args) const override; > >>=20 > >> + bool IsAArch64OutlineAtomicsDefault( > >> + const llvm::opt::ArgList &Args) const override { > >> + return true; > >> + } > >> + META_MODE can not really track all the consequences, especially for files that do not include clang/lib/Driver/ToolChains/FreeBSD.h . So rebuilds need to be forced. > >> UnwindTableLevel > >> getDefaultUnwindTableLevel(const llvm::opt::ArgList &Args) const = override; > >> bool isPIEDefault(const llvm::opt::ArgList &Args) const override; > >=20 > > I'm sure you're probably aware by now, but aarch64 builds are = failing > > after this commit: > >=20 > > https://ci.freebsd.org/job/FreeBSD-main-aarch64-build/33100/ >=20 > It's weird, but I cannot reproduce it. For me, both world and kernel = build fine. Yea, it s not the typical sort of source dependency. META_MODE did not rebuild everything needed so, apparently, you still had inline Atomics. Having toolchain updates rebuild everything dependent all the time has its own issues to be avoided. > Does anybody have any particular settings that can be used to = reproduce this on a fresh 16-CURRENT or 15-STABLE box? Separately: Sorry for my earlier misleading reference to armv7. Turns to be a separate change elsewhere that lead to those failures. =3D=3D=3D Mark Millard marklmi at yahoo.com From nobody Fri Oct 31 20:26:30 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cysvV2xwnz6F9KR; Fri, 31 Oct 2025 20:26: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cysvV2FFvz3Dqq; Fri, 31 Oct 2025 20:26:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761942390; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4fQ8kOmKrwe5LZx+okxfs8h1IfN4XC3SWaD3KIjOmdc=; b=edNO9iRH1q+7DVg1ZwN89q2IIj7yBTsw7CtdCjXbzvwQ4FwQDGI7dOaeDA+pCnHODCQuR1 1i/qT9wBZhbqXtbAvfI78Wx+0uZQZvngk4FEY+HOerNUi1VjhILoFujdW1smbT92ajo0z5 w/8i5wMlAMngK6zORze5VwnYkWNPCTvWzfVMDRRS1wQtHRBZb9cPhaApNFONeuUJDWQC9T ivYAzZu+R/n/GIDzxzXcvx/APFyMDuS1xGAjqW0Al+DVfVQBAKLbeifKf1XII4NS+gmcUK XwQsD11OVOb0lOmJeMp/g8LNtM6cjcroqx1Zb6bDeWuTlDX5lv7VwbNv8YKrPw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761942390; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4fQ8kOmKrwe5LZx+okxfs8h1IfN4XC3SWaD3KIjOmdc=; b=DOhM/kYABXm3/blyBZrHFgEzJ0cxM3Hf+OEy+3GWv2kXDT9FSTaXX2DCdr9raqrlvor6cU aKOMdTKgji3e5PzHzyrHSqudWLeYKtkDEbELuGtTBL5t4MuKx599H1f4MdvbEWZVhaFTt1 T3ouzqeslIoJWHtWLGDQkODCSO8cLHJmt1rUxZ+cp7CxnTe58lI8DI5TGCBkNaJkY/TBK0 Idewn2fCbpppAK6anytEXNtG9iozJV9tK+lVUUYWhTTQw+kL6zesqlIrtJzf30XKupJxB+ /XIyqZ2ZvqVMwWFik8/jalvCSwwGlmhk6yWguHIPAoeMILKz0N/sniyJPekpRQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761942390; a=rsa-sha256; cv=none; b=RpUo5E/27TpnQJIinTKCLoNbPI1jdZzu9wLXOv1yCpE6Oe9BZ3Uw3ikCj6NTRKEZWuBWea DbRyxYAqKlN1gl514H+M/IA8cBXZbAGJG/kBH7QhVlgrCfP85xB3e7oPyzExUorMrwPraS xmt+yEwhobPyCksle5VSx+nObfLu+uT1R6mlRGhpDhJ982M6YcOI1AnToS+IWRK5gIwhAH 8dE00k5p5yigLmjarUJxj4CKDrK9OUJq4RLRSaJzGmiydAETnJKHfZjqsM9iDHOb7uLLBz NNJ5uLIK8kPlh6ZgD6d8L6sdFi42BhDzb2AXhwqk27SaEzTTirOzI7sND+82rg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cysvV1WLHz1MnM; Fri, 31 Oct 2025 20:26: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 59VKQUAH012844; Fri, 31 Oct 2025 20:26:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59VKQUgF012841; Fri, 31 Oct 2025 20:26:30 GMT (envelope-from git) Date: Fri, 31 Oct 2025 20:26:30 GMT Message-Id: <202510312026.59VKQUgF012841@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Sergey A. Osokin" Subject: git: c6e02892bbca - main - bsd-family-tree: add macOS 26 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: osa X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c6e02892bbca1237546e3943c0971768822e1745 Auto-Submitted: auto-generated The branch main has been updated by osa: URL: https://cgit.FreeBSD.org/src/commit/?id=c6e02892bbca1237546e3943c0971768822e1745 commit c6e02892bbca1237546e3943c0971768822e1745 Author: Sergey A. Osokin AuthorDate: 2025-10-31 20:25:11 +0000 Commit: Sergey A. Osokin CommitDate: 2025-10-31 20:25:11 +0000 bsd-family-tree: add macOS 26 Sponsored by: tipi.work --- share/misc/bsd-family-tree | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/share/misc/bsd-family-tree b/share/misc/bsd-family-tree index b0502dfc7925..82e9ac45c495 100644 --- a/share/misc/bsd-family-tree +++ b/share/misc/bsd-family-tree @@ -479,7 +479,10 @@ FreeBSD 5.2 | | | | | | | | | DragonFly 6.4.1 | | | | | DragonFly 6.4.2 | FreeBSD | | | | - | 14.3 | | OpenBSD 7.8 | + | 14.3 | | | | + | macOS | | | + | 26 | | | + | | | OpenBSD 7.8 | | | | | | FreeBSD 16 -current | NetBSD -current OpenBSD -current DragonFly -current | | | | | @@ -925,6 +928,7 @@ OpenBSD 7.7 2025-04-28 [OBD] DragonFly 6.4.1 2025-04-30 [DFB] DragonFly 6.4.2 2025-05-09 [DFB] FreeBSD 14.3 2025-06-10 [FBD] +macOS 26 2025-09-15 [APL] OpenBSD 7.8 2025-10-22 [OBD] Bibliography From nobody Sat Nov 1 01:18:47 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cz0Nl5SP1z6FZXr; Sat, 01 Nov 2025 01:18: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cz0Nl3VkGz3qKK; Sat, 01 Nov 2025 01:18:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761959927; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1OG9MglZ7L0UL0xTzvskRKnj7cw6n+6PLamWwkPxA/g=; b=R5A3a0cLLKLb13xxwojQcDeYxcJb4bP9TiICr3rByNrCAOeEaSwrFXGqkeXvXK68R/bYrh 3wQLmbqvq0G57900sSD5zdWlIsq9V/mJfN/R05GU1CYvGNFR5+pnP8Qqsym420vdl1N6kg FBwGsQIgMQcOc1/CP18F8vDD/k03gdoKLYehj4OpoQmIZ7zP1u7dKuPBXzivR3Zm3+b2PB DCSV0rMeZMnZ3+d9UDefzkfJVrZApxoPvy2VgALYKkB3pqiIfzKV6ma3o8f0fxz3MxLv3j Dlvzx4I/sP3+VkSL6qxBE6BCGiYp/jM655JOz2sqKJlzx17z5BH8Yw2/3ghUSA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761959927; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1OG9MglZ7L0UL0xTzvskRKnj7cw6n+6PLamWwkPxA/g=; b=qXy7qkmOSBE06RZlxpzCyZm2sospghM7aahDW1hcdff+2RMb/gjVaCbmQcORdedxR/3rmt +u7m4BxUaeYMwhZyrs06WGW36/p4IVJGtcsp5XOi9plLBvZpEc6KA5W3gvmF/qgAxzb2mb WrB2QD7GPs3QcSQ4SSTD32dFb5FDI/NWeiHBEQFdMAFUvJoty+QrYZCQP7t2QDcYTo5ybK HwRn/+LbszKlUisVyIZ2Ss5bG/djhgzYpD57TMvJ2YFMExrh8G2eh35Xf5YzLt4rXr/36c GKmhMJa+2RX7NGD6pNDENZhYvzoUzzKwR8I51tH8Bdjri9i1q3QWJKvfv+tE0g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761959927; a=rsa-sha256; cv=none; b=ZtydnxpGCzyH/4XBdWAs5hcGJzLmp2+KjAeqijHSVGPTnqHfDt54U8AYzUr/nN8ndtyVKK EWHOCtFkG4rDovaV/S5/ycAs677QRzUbrs/adBqmgKhWEly4EcDV1ZAUnm8LnU7ZeMCD+x qXPF5jPGWBur6GEi2d4WzN3Ap8KvMDUAFOcOxle39Pg7TYomBOem/+7lcZOoHQLRwFsXuE fiZHK1ENeQNv2UPfHWeYL6dNjt77qAOvnF9B+v+IoAXcW2Op688uROZ/yQWWsRcIcCsNp0 UYpT57k26VbugzeSsDM72NvWMinfEqDHurJPxpusleXZ7xhALXMrQQaWzqGUQg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cz0Nl36BBz209; Sat, 01 Nov 2025 01:18: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 5A11Ile4059449; Sat, 1 Nov 2025 01:18:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A11IlND059446; Sat, 1 Nov 2025 01:18:47 GMT (envelope-from git) Date: Sat, 1 Nov 2025 01:18:47 GMT Message-Id: <202511010118.5A11IlND059446@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: e4f2a3509554 - main - bsd.prog.mk: Skip warnings if compiler.mk was not included List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e4f2a350955406ffd58dd3f0bb7610df0f36d647 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=e4f2a350955406ffd58dd3f0bb7610df0f36d647 commit e4f2a350955406ffd58dd3f0bb7610df0f36d647 Author: Ed Maste AuthorDate: 2025-10-31 15:53:42 +0000 Commit: Ed Maste CommitDate: 2025-11-01 01:17:11 +0000 bsd.prog.mk: Skip warnings if compiler.mk was not included We emit a warning if src.conf options WITH_RETPOLINE or INIT_ALL are in use, and the compiler or linker does not support the feature. For targets like `cleandir` we skip including bsd.compiler.mk, which leaves COMPILER_FEATURES unset and spurious warnings were emitted in early buildworld stages, if these options are in use. Commit 0837b2ebd570 ("pkg: Die if make -V BRANCH fails") added -W to usr.sbin/pkg's make flags, causing it to exit on warnings. As a result buildworld failed when these src.conf options were in use. Clean this up by omitting the warning if the magic _NO_INCLUDE_COMPILERMK flag is set, which indicates that COMPILER_FEATURES is not set. Reviewed by: imp Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D53501 --- share/mk/bsd.prog.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk index 10e1c177e2b2..5697845079e2 100644 --- a/share/mk/bsd.prog.mk +++ b/share/mk/bsd.prog.mk @@ -49,9 +49,11 @@ CXXFLAGS+= -mretpoline LDFLAGS+= -Wl,-zretpolineplt .endif .else +.if !defined(_NO_INCLUDE_COMPILERMK) .warning Retpoline requested but not supported by compiler or linker .endif .endif +.endif # LLD sensibly defaults to -znoexecstack, so do the same for BFD LDFLAGS.bfd+= -Wl,-znoexecstack .if ${MK_BRANCH_PROTECTION} != "no" @@ -71,9 +73,11 @@ CFLAGS+= -enable-trivial-auto-var-init-zero-knowing-it-will-be-removed-from-clan CXXFLAGS+= -enable-trivial-auto-var-init-zero-knowing-it-will-be-removed-from-clang .endif .else +.if !defined(_NO_INCLUDE_COMPILERMK) .warning INIT_ALL (${OPT_INIT_ALL}) requested but not supported by compiler .endif .endif +.endif # Zero used registers on return (mitigate some ROP) .if ${MK_ZEROREGS} != "no" From nobody Sat Nov 1 03:39:49 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cz3Wl5XV7z6FlwB; Sat, 01 Nov 2025 03:40:03 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4cz3Wl1wBJz46JB; Sat, 01 Nov 2025 03:40:03 +0000 (UTC) (envelope-from kostikbel@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: from tom.home (kib@localhost [127.0.0.1] (may be forged)) by kib.kiev.ua (8.18.1/8.18.1) with ESMTP id 5A13dn0Y024636; Sat, 1 Nov 2025 05:39:52 +0200 (EET) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 5A13dn0Y024636 Received: (from kostik@localhost) by tom.home (8.18.1/8.18.1/Submit) id 5A13dn8H024635; Sat, 1 Nov 2025 05:39:49 +0200 (EET) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Sat, 1 Nov 2025 05:39:49 +0200 From: Konstantin Belousov To: Robert Clausecker Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 63ff982b17ee - main - simd.7: add scalar strrchr() for RISC-V to manpage Message-ID: References: <202510311248.59VCmSpY042422@gitrepo.freebsd.org> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <202510311248.59VCmSpY042422@gitrepo.freebsd.org> X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FORGED_GMAIL_RCVD,FREEMAIL_FROM, NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=4.0.1 X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on tom.home X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:6939, ipnet:2001:470::/32, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4cz3Wl1wBJz46JB On Fri, Oct 31, 2025 at 12:48:28PM +0000, Robert Clausecker wrote: > The branch main has been updated by fuz: > > URL: https://cgit.FreeBSD.org/src/commit/?id=63ff982b17ee398c7808be323d8fd37819a5863c > > commit 63ff982b17ee398c7808be323d8fd37819a5863c > Author: Strahinja StaniÅ¡ić > AuthorDate: 2024-10-24 16:29:04 +0000 > Commit: Robert Clausecker > CommitDate: 2025-10-31 12:47:57 +0000 > > simd.7: add scalar strrchr() for RISC-V to manpage > > MFC after: 1 month > MFC to: stable/15 > Approved by: mhorne, markj (mentor) > Sponsored by: Google LLC (GSoC 2024) > Differential Revision: https://reviews.freebsd.org/D47275 > --- > lib/libc/riscv/string/strrchr.S | 3 +++ > share/man/man7/simd.7 | 15 +++++++++------ > 2 files changed, 12 insertions(+), 6 deletions(-) > > diff --git a/lib/libc/riscv/string/strrchr.S b/lib/libc/riscv/string/strrchr.S > index 51f34ca21fac..e922a692e77f 100644 > --- a/lib/libc/riscv/string/strrchr.S > +++ b/lib/libc/riscv/string/strrchr.S > @@ -6,6 +6,9 @@ > > #include > > + .weak rindex > + .set rindex, strrchr > + Was this alias addition intended? From nobody Sat Nov 1 10:48:19 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4czF250KCxz6FfjK; Sat, 01 Nov 2025 10:48:29 +0000 (UTC) (envelope-from fuz@fuz.su) Received: from fuz.su (fuz.su [IPv6:2001:41d0:8:e508::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "fuz.su", Issuer "fuz.su" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4czF244R4Mz3q9n; Sat, 01 Nov 2025 10:48:28 +0000 (UTC) (envelope-from fuz@fuz.su) Authentication-Results: mx1.freebsd.org; none Received: from fuz.su (localhost [127.0.0.1]) by fuz.su (8.18.1/8.18.1) with ESMTPS id 5A1AmJsx048133 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Sat, 1 Nov 2025 11:48:19 +0100 (CET) (envelope-from fuz@fuz.su) Received: (from fuz@localhost) by fuz.su (8.18.1/8.18.1/Submit) id 5A1AmJFv048132; Sat, 1 Nov 2025 11:48:19 +0100 (CET) (envelope-from fuz) Date: Sat, 1 Nov 2025 11:48:19 +0100 From: Robert Clausecker To: Konstantin Belousov Cc: Robert Clausecker , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 63ff982b17ee - main - simd.7: add scalar strrchr() for RISC-V to manpage Message-ID: References: <202510311248.59VCmSpY042422@gitrepo.freebsd.org> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:16276, ipnet:2001:41d0::/32, country:FR] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4czF244R4Mz3q9n Hi kib, Am Sat, Nov 01, 2025 at 05:39:49AM +0200 schrieb Konstantin Belousov: > On Fri, Oct 31, 2025 at 12:48:28PM +0000, Robert Clausecker wrote: > > #include > > > > + .weak rindex > > + .set rindex, strrchr > > + > Was this alias addition intended? Yes, this is intentional. See also lib/lib/{aarch64,amd64}/string/strrchr.S. Yours, Robert Clausecker -- () ascii ribbon campaign - for an encoding-agnostic world /\ - against html email - against proprietary attachments From nobody Sat Nov 1 13:40:16 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4czJrJ6JpNz6FvCP; Sat, 01 Nov 2025 13:40: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4czJrJ5mlDz49Gf; Sat, 01 Nov 2025 13:40:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762004416; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ytT3vBFhGsyo+W5ahi1n6xkx5uciXGzOMHSpFhpJP5c=; b=x9k9aiU+fp/eURXNGGNpNmyMSbf+bgSAPQJXdalkV7xi9o5KfJ/gss7MBtnJilVTTX/oED tzZSEZtgny0Bm0wsntnZdk+reP9yOlRgq7f2ipCEC4SX10epWSgqN/ah3GLW9VKLGM6CFk 7/3gfmL4qEc6eGlaB/Fo66SGGqO224GAjMxT/SEq/VJuLE+sUnUY5S3NbXFrBUq8pfhy3w UlT3vsGKvaw7xGbXg8TVAJbUkUWBI5TiLC/uY381kmbtKU/pcMTsEoFGhE8RJT/oOnSwbc ESVSc01ISuoWrrrHt9s0lucclyQpyTaqYeensoiY9tJPuMUgX5D5KGxahCjqcQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762004416; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ytT3vBFhGsyo+W5ahi1n6xkx5uciXGzOMHSpFhpJP5c=; b=BpZGmUHeQXM0iTJ/DQDmuYw6Kd9jiZyWv4rOKBflNThGfaBOVPlZTDiTSgKC8ku1azxxDH QfAxSCX+es51KPpUxS6p5qzckbJIkezFpW+6ij1ctM+VDs/gYv1O9zE3W2m12qVX1MEQtX nT9FLozulC1iEzyDNBTMxxdP5SdQtVyt6BU1pKiWbH0YpXAMieXLLsKg07I69emfzIQasx T1ThZexyIOxJtOLeS33f+qpf64xPq9SpGV5RyQziqI+0PgwWCKoc8fuV29qfnUyx0J8feE ZcEbp7Yhpk5FKTZvEgeaERQMzjMpz3NLd8z67zDkiiBsxXHjNY1vGMHwIaUasQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762004416; a=rsa-sha256; cv=none; b=i97L6f1MuCv0CYURagxs3l0pZ2VA4S3DnTeuIzPhlg/o/Y+N/CRb9eHw31FsS+kiaQqxDR 4Q3diNOpfWoUZ5mWCD7XhVdQP+C6rmOYuhLUUz8y6UCK4oKiwyjIMpc1zOqxvCtcsDrVHI XutVjnUJjJWZ83SYz3JshvA85RLLB+GMylDrP8aV+VH9UNmEhEPUckpjLgfTfBDB+6RrL5 CyibCgj7sPMGaEHQrreR57jPqNzTDE6FpOKHtJztqBWzp27+BR9++4WtoPo1nB7HMngwxh oWGsLjT3MgiiwWy+Y55/PDT5ytVCzV8py7yyoFKZ/8+56I4EMqv022K6n26kmA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4czJrJ53qXzhj0; Sat, 01 Nov 2025 13:40: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 5A1DeGHp062949; Sat, 1 Nov 2025 13:40:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A1DeG9h062940; Sat, 1 Nov 2025 13:40:16 GMT (envelope-from git) Date: Sat, 1 Nov 2025 13:40:16 GMT Message-Id: <202511011340.5A1DeG9h062940@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Lexi Winter Subject: git: a1806e6ff37a - main - static_libpam: Don't install pam.d.5 twice List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ivy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a1806e6ff37a606277ab9657b951e918164e9f63 Auto-Submitted: auto-generated The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=a1806e6ff37a606277ab9657b951e918164e9f63 commit a1806e6ff37a606277ab9657b951e918164e9f63 Author: Lexi Winter AuthorDate: 2025-11-01 13:38:26 +0000 Commit: Lexi Winter CommitDate: 2025-11-01 13:38:26 +0000 static_libpam: Don't install pam.d.5 twice static_libpam's Makefile includes libpam's Makefile after setting some variables (like MAN) to empty to avoid installing the manpages twice. After commit 031e711647c3, it neglected to do this for MANNODEVLINKS, causing pam.d.5.gz to be installed twice. This is harmless for installworld, but breaks some things that rely on METALOG (NO_ROOT installs) since it causes two METALOG entries to be generated for the same file. Fixes: 031e711647c3 ("packages: Install development manpages in the -dev package") MFC after: 3 days PR: 290708 Reported by: emaste Reviewed by: emaste Sponsored by: https://www.patreon.com/bsdivy Differential Revision: https://reviews.freebsd.org/D53512 --- lib/libpam/static_libpam/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/libpam/static_libpam/Makefile b/lib/libpam/static_libpam/Makefile index 8830f09ef0da..703e6a4a2f00 100644 --- a/lib/libpam/static_libpam/Makefile +++ b/lib/libpam/static_libpam/Makefile @@ -45,6 +45,7 @@ MAN= MANNODEV= INCS= MLINKS= +MANNODEVLINKS= MK_TESTS= no # From nobody Sat Nov 1 17:24:42 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4czPqG4BG4z6GGRS; Sat, 01 Nov 2025 17:24: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4czPqG1mRQz3xY1; Sat, 01 Nov 2025 17:24:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762017882; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tXTCXk9E+EZUVFt1uNl1xzfmNzFD90wq1uEYorjh6cw=; b=OYKXLWm4J+7w6wvzlkRKGLNyGPEHa04mvaA6Nzp8KeWrKeNryvIUVv6to/may8CjWiIjmd Q+xRhgEmHTSlPV3qnWN54fyGXBL6UlVyzMo1quGslfI/qChAeIAdvpF6OIQFoZnZrnJSqT F2CJP38GC1XRrhcD6fTmNTg09E/ylR1hp/dzToO6yvjUWWkxS1p4ae33GRFHIDEiud8g8l 45bjQMlTicCBcCmyVzvKisARTiaKoMohHJxZ+fVI0ALbbaKRyAF4SGrderYn9fpjGp4eqi 4SvFDPMLrmFrSS5QIgxuQ8XBPqk/kuovgd2Cvd1Qj98gzXxHhXh2aFBwyDVsYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762017882; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tXTCXk9E+EZUVFt1uNl1xzfmNzFD90wq1uEYorjh6cw=; b=Y5wqDN79t+R0rHh8oCmusoAfvL7pX1Cyk0dFcBTVAOYnNLybDGMl8Vy+VG5xrs0WBRW5ga iBoo+N7WXgvs/pr13DBM7o2+IKjqKaoO4Z6w4stCfgT2b8SZoGnmEB4LrirDZfEK1noAMm F2P5yiHLOzSDgppyYEPkv3WUq5DRuCM56zqsOi9ZHUiJYfmMXO9hkJCuOHhIKeKXWj47Ad x+l/hk8Oxin+wrsu93jzBBZD+xIhCitdJBwnX2zVEJWbT35Pk7/f3SM7ewha14rAcRJMdv uBP8Hkey6svZt0CeS/EOSve5kV1B4W9F7YwUGQ7DRPP/rFqsumiasf89xSPx0A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762017882; a=rsa-sha256; cv=none; b=xePWE9L11QHwj/1sv495hdKg8h0Lom/j5tCs1Si8KL+oLKYYl0cHbD7SkSnN4gM68Hpuqy r0ACjqDOjO6xoKw5u2zTq25dkXvx9D3K9y+eVLyKnhquMcb/SflAozG1fWxvNzHAavGKNx GlZwZZ9gxO4fB7XVi3PaR1Mf265XkFJEnrplx5v4N/uxDudY61IRYzZHyNoDgD/xvS6Yjb DiR3faux+uQmr/B//eEP+6NFhTrM6d0woXivkvw7yHYK9IN63cSpkUTlRAQLA2R7VjU6U1 5iNWQfC8Epj4pc/nv8hPKV5NmW3lAclFnNBjWCoYRrEUjSbvT8x6/cB7od9gbg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4czPqG1DRpzpvs; Sat, 01 Nov 2025 17:24: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 5A1HOgGt089067; Sat, 1 Nov 2025 17:24:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A1HOghO089064; Sat, 1 Nov 2025 17:24:42 GMT (envelope-from git) Date: Sat, 1 Nov 2025 17:24:42 GMT Message-Id: <202511011724.5A1HOghO089064@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Adrian Chadd Subject: git: 0726d6e87ad5 - main - vchiq: fix compilation error on armv7 in CI and local armv7 builds List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adrian X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0726d6e87ad508f9e6a78685d3d9067edf255588 Auto-Submitted: auto-generated The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=0726d6e87ad508f9e6a78685d3d9067edf255588 commit 0726d6e87ad508f9e6a78685d3d9067edf255588 Author: Adrian Chadd AuthorDate: 2025-11-01 17:23:12 +0000 Commit: Adrian Chadd CommitDate: 2025-11-01 17:23:12 +0000 vchiq: fix compilation error on armv7 in CI and local armv7 builds This happens in CI and on local armv7 builds, but not when I cross compile to armv7 locally. > /usr/src/sys/contrib/vchiq/interface/vchiq_arm/vchiq_2835_arm.c:549:71: error: format specifies type 'unsigned int' but the argument has type 'unsigned long' [-Werror,-Wformat] > 549 | "free_pagelist - %zx, %d (%u bytes @%p)", (size_t)pagelist, actual, pagelist->length, bi->buf); So just be very specific about the printf types and explicitly cast things. --- sys/contrib/vchiq/interface/vchiq_arm/vchiq_2835_arm.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/contrib/vchiq/interface/vchiq_arm/vchiq_2835_arm.c b/sys/contrib/vchiq/interface/vchiq_arm/vchiq_2835_arm.c index f4aee12dec53..185e81e71bdc 100644 --- a/sys/contrib/vchiq/interface/vchiq_arm/vchiq_2835_arm.c +++ b/sys/contrib/vchiq/interface/vchiq_arm/vchiq_2835_arm.c @@ -546,7 +546,9 @@ free_pagelist(BULKINFO_T *bi, int actual) pagelist = bi->pagelist; vchiq_log_trace(vchiq_arm_log_level, - "free_pagelist - %zx, %d (%u bytes @%p)", (size_t)pagelist, actual, pagelist->length, bi->buf); + "free_pagelist - %zx, %d (%lu bytes @%p)", + (size_t)pagelist, (int)actual, (unsigned long)pagelist->length, + bi->buf); num_pages = (pagelist->length + pagelist->offset + PAGE_SIZE - 1) / From nobody Sat Nov 1 17:34:38 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4czQ2l1Rm1z6GHxt; Sat, 01 Nov 2025 17:34: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4czQ2k4yd4z40SW; Sat, 01 Nov 2025 17:34:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762018478; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5ocwjZLqtZXk9wqqkWAW1V68B2IgdSl8lF8zrolBmgs=; b=ukDwyoKQZWgglpW6h1RTYYRIIGBFwrse3D8s5G+hm4ERF8SM7qgfVi2p2PYksXKWJoUAep jLYUY15bhfhl8QonMmRJtQksG7JNcITyHMca38ENUc3OOLZ0k0Z0lRrjcdCbRNNKWbkWVe X/dmESqRTtVHs/eS+kFv+qIzyJJk8l73fZy2U7SBxcUqBKI6Mp7w36YujKNUO2RjJ9F1yy akoDr/CRg7NHD8xJeCtYC6pQ+h1GjPp061fWt2pi9DcUIQvMTPtj0peZZtl2V47DNDxdoG 3eGXqdGSVPX0cI2h1hR/y8rfJq0YTqN8OldMSv9lSjzJc+gtjJIl0UCk9dI+MA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762018478; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5ocwjZLqtZXk9wqqkWAW1V68B2IgdSl8lF8zrolBmgs=; b=VRxS7/d+n7GwnhBh39PEI8xuKr8B9AGpsl8n2VjjmZjzcFpA6X6nH7WMm/lCyREXVio6jn l9LUi3lPUPhfyHsQCLhFi61mtCG7MpQ4IJQ7yimvZ7dqVpFQjlOZ1V4dyNlsGgqwRZ1Wpy N4zMkvq8R0j+aU59dqIhu5UG/qKwdAH8aIVuXXZdPpqg6HoUYuaFwHg6nTCoRs6S69weOY SRhms1Lc2AavYFY3Q1WFyqDcxuIIr8Ru3Lod3UYGzgd+u+m+Nc0ntIDZlOUqFyvUsp3mfs A98QHUlpn3fuMyAbp5+s4Kyo5zdL/ho9cjcR0LulIpmGx0iLjNMoriTeZE9N5g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762018478; a=rsa-sha256; cv=none; b=Bo+Hl0sZUxmt6/kLTg47oGOan7wPHSUck1//AFGAsDjP8bIe+B+OcsRLgA9NEd41/8m0OP +tYt9sKIo4v4mPYnoYvgrLNv+0tKbOvJs9auksNIU2c4Vy2mdghuG0pkskBbauQd+WtaVp ijwntbf9XYZDDvUBl39zZQ96WwxzgYx0nKZz6+b24Z9ZoxdKKSvtn29VurGETMd6uLL6Z8 TMwmvrb/epeEYpjciiX7kCL/wzJjQ5/laPXBqsBIDxmMuDdYp6Gzf01Khj7Rqf+P4gKuxn v4pbLsn8I/7Y6bhZab7AY7coqMs7FEDAryzXGO1QML6O5RISf4DWP0jXuEdetQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4czQ2k43k2zpXS; Sat, 01 Nov 2025 17:34: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 5A1HYcRX007250; Sat, 1 Nov 2025 17:34:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A1HYc7W007247; Sat, 1 Nov 2025 17:34:38 GMT (envelope-from git) Date: Sat, 1 Nov 2025 17:34:38 GMT Message-Id: <202511011734.5A1HYc7W007247@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: c0382512bfce - main - ipfw: pmod: avoid further rule processing after tcp-mod failures List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c0382512bfce872102d213b9bc2550de0bc30b67 Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=c0382512bfce872102d213b9bc2550de0bc30b67 commit c0382512bfce872102d213b9bc2550de0bc30b67 Author: Kyle Evans AuthorDate: 2025-11-01 17:34:11 +0000 Commit: Kyle Evans CommitDate: 2025-11-01 17:34:11 +0000 ipfw: pmod: avoid further rule processing after tcp-mod failures m_pullup() here will have freed the mbuf chain, but we pass back an IP_FW_DENY without any signal that the outer loop should finish. Thus, rule processing continues without an mbuf and there's a chance that we conclude that the packet may pass (but there's no mbuf remaining) depending on the rules that follow it. PR: 284606 Reviewed by: ae MFC after: 1 week --- sys/netpfil/ipfw/pmod/tcpmod.c | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/sys/netpfil/ipfw/pmod/tcpmod.c b/sys/netpfil/ipfw/pmod/tcpmod.c index 0338dc792c64..50074ee98cca 100644 --- a/sys/netpfil/ipfw/pmod/tcpmod.c +++ b/sys/netpfil/ipfw/pmod/tcpmod.c @@ -57,7 +57,8 @@ VNET_DEFINE_STATIC(uint32_t, tcpmod_setmss_eid) = 0; #define V_tcpmod_setmss_eid VNET(tcpmod_setmss_eid) static int -tcpmod_setmss(struct mbuf **mp, struct tcphdr *tcp, int tlen, uint16_t mss) +tcpmod_setmss(struct mbuf **mp, struct tcphdr *tcp, int tlen, uint16_t mss, + int *done) { struct mbuf *m; u_char *cp; @@ -72,8 +73,10 @@ tcpmod_setmss(struct mbuf **mp, struct tcphdr *tcp, int tlen, uint16_t mss) * TCP header with options. */ *mp = m = m_pullup(m, m->m_pkthdr.len); - if (m == NULL) + if (m == NULL) { + *done = 1; return (ret); + } } /* Parse TCP options. */ for (tlen -= sizeof(struct tcphdr), cp = (u_char *)(tcp + 1); @@ -114,7 +117,7 @@ tcpmod_setmss(struct mbuf **mp, struct tcphdr *tcp, int tlen, uint16_t mss) #ifdef INET6 static int -tcpmod_ipv6_setmss(struct mbuf **mp, uint16_t mss) +tcpmod_ipv6_setmss(struct mbuf **mp, uint16_t mss, int *done) { struct ip6_hdr *ip6; struct ip6_hbh *hbh; @@ -142,13 +145,13 @@ tcpmod_ipv6_setmss(struct mbuf **mp, uint16_t mss) /* We must have TCP options and enough data in a packet. */ if (hlen <= sizeof(struct tcphdr) || hlen > plen) return (IP_FW_DENY); - return (tcpmod_setmss(mp, tcp, hlen, mss)); + return (tcpmod_setmss(mp, tcp, hlen, mss, done)); } #endif /* INET6 */ #ifdef INET static int -tcpmod_ipv4_setmss(struct mbuf **mp, uint16_t mss) +tcpmod_ipv4_setmss(struct mbuf **mp, uint16_t mss, int *done) { struct tcphdr *tcp; struct ip *ip; @@ -162,7 +165,7 @@ tcpmod_ipv4_setmss(struct mbuf **mp, uint16_t mss) /* We must have TCP options and enough data in a packet. */ if (hlen <= sizeof(struct tcphdr) || hlen > plen) return (IP_FW_DENY); - return (tcpmod_setmss(mp, tcp, hlen, mss)); + return (tcpmod_setmss(mp, tcp, hlen, mss, done)); } #endif /* INET */ @@ -206,19 +209,23 @@ ipfw_tcpmod(struct ip_fw_chain *chain, struct ip_fw_args *args, switch (args->f_id.addr_type) { #ifdef INET case 4: - ret = tcpmod_ipv4_setmss(&args->m, htons(icmd->arg1)); + ret = tcpmod_ipv4_setmss(&args->m, htons(icmd->arg1), + done); break; #endif #ifdef INET6 case 6: - ret = tcpmod_ipv6_setmss(&args->m, htons(icmd->arg1)); + ret = tcpmod_ipv6_setmss(&args->m, htons(icmd->arg1), + done); break; #endif } /* * We return zero in both @ret and @done on success, and ipfw_chk() * will update rule counters. Otherwise a packet will not be matched - * by rule. + * by rule. We passed @done around above in case we hit a fatal error + * somewhere, we'll return non-zero but signal that rule processing + * cannot succeed. */ return (ret); } From nobody Sat Nov 1 18:00:47 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4czQd81dWyz6GM0N; Sat, 01 Nov 2025 18:01:00 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4czQd76kpCz469b; Sat, 01 Nov 2025 18:00:59 +0000 (UTC) (envelope-from kostikbel@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: from tom.home (kib@localhost [127.0.0.1] (may be forged)) by kib.kiev.ua (8.18.1/8.18.1) with ESMTP id 5A1I0lrc056452; Sat, 1 Nov 2025 20:00:51 +0200 (EET) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 5A1I0lrc056452 Received: (from kostik@localhost) by tom.home (8.18.1/8.18.1/Submit) id 5A1I0lsd056451; Sat, 1 Nov 2025 20:00:47 +0200 (EET) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Sat, 1 Nov 2025 20:00:47 +0200 From: Konstantin Belousov To: Robert Clausecker Cc: Robert Clausecker , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 63ff982b17ee - main - simd.7: add scalar strrchr() for RISC-V to manpage Message-ID: References: <202510311248.59VCmSpY042422@gitrepo.freebsd.org> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FORGED_GMAIL_RCVD,FREEMAIL_FROM, NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=4.0.1 X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on tom.home X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:6939, ipnet:2001:470::/32, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4czQd76kpCz469b On Sat, Nov 01, 2025 at 11:48:19AM +0100, Robert Clausecker wrote: > Hi kib, > > Am Sat, Nov 01, 2025 at 05:39:49AM +0200 schrieb Konstantin Belousov: > > On Fri, Oct 31, 2025 at 12:48:28PM +0000, Robert Clausecker wrote: > > > #include > > > > > > + .weak rindex > > > + .set rindex, strrchr > > > + > > Was this alias addition intended? > > Yes, this is intentional. See also lib/lib/{aarch64,amd64}/string/strrchr.S. Ok, let me reformulate my question. Was the 'rindex' symbol exported from libc on riscv before your commit? I remember that there was some effort to not provide 'obsoleted' exports from libc on the new arches like aarch64 and riscv. From nobody Sat Nov 1 18:08:13 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4czQnl0QWTz6GML2 for ; Sat, 01 Nov 2025 18:08:27 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4czQnk4Flyz46bn for ; Sat, 01 Nov 2025 18:08:26 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-wm1-f45.google.com with SMTP id 5b1f17b1804b1-47114a40161so36882035e9.3 for ; Sat, 01 Nov 2025 11:08:26 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762020505; x=1762625305; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=vUk5TIoOGuJO+OksqanCnAFnPDfqSMdP7H/WOmU+xtE=; b=Mdx8VAUT1U14stobsriPl+aimN7wA89K+ITLzPIMDUwUgboRuz+0sLQM/pD3QeSHss IE6P9YaL4koUcLqdo+D/pDe8VwtmkGn53aQy+jTYJOYb0Ms+itJ0GVR9khjKn8waSkNp iyc2D1R2iJaS+Zod2gJu7zLFzFhVyBAdON8cn45UNoaoAF8yEmWjjNNUICD8AkcWJK+F CLrsyrHvyYnN4C8fIryb3DAZJ6Nhd3Cs7yww5L1hTnNl9Dlh584s7Fus/YGtObvgb04X qdbmKPuidFZAL19QeMDp93gv+0ojNrTVTQ4UlsAY9p2Cku+aRycr8Mm5L4johT2unTsQ bmCQ== X-Forwarded-Encrypted: i=1; AJvYcCVJDNB/6nBfsh0rIRJDj91QBb1wbfWyExMsup2gWEaIrIHVZjaVj6bkDWtukMMORSxdic9YiNLif+cGIE7saZZHfx6z0g==@freebsd.org X-Gm-Message-State: AOJu0YxGUI1Mm6QJudrq/c2dL8vGuSNXNSb66xI4Anqc6R78KTY0el+P My6MO5cCYo9im6C+DF8TJXIFQJS6pvuhM+YYsyRSWIFbmnrL2X1q8JTQP6Pb1gFGELg= X-Gm-Gg: ASbGncv+bIhJupcLqAyHbo5xw2F3EiFC1za5a2anSIiNy9ZymP9Ij89t/0msIklkkDK tMMmDirwiPDy3fXj+Tl45tGtota325kZFfs5W9kcavnSFJckXhQIUtqUM/v6e/91RLNU5jfw6d/ 24hQjyQP991Z0QxXrmZLlnEngGEtAuqRJciz1ghcGKPm4lC702mOMxfM6nw7XLiBq4OgmUCzAfs CRkRtLys19NxRBr8bYYSufBB7jvTbYnl2pwd2g4T0wMFkJ2ESh+0fj5GbyMDO8840GO5CnzW3rE pytD+CEzN4WGRcoUiLdMlwYhLUTAb4vd3YQ00aBEmjb/Wc+V8/NDK69QrRzs5m/uM9c1dvMaGvU GKbNZ1j9e8wmVtF+gtg99GbyKU/ZeIAtKPOaL97KP3wciw9bPEmyNzDVG4whaavMOQND4LEOy2f szvgPT3ubpHVCjHZOTjotDo9/+nWm/gjYt9VuF6rIXZA== X-Google-Smtp-Source: AGHT+IEZsJO3AnfID4ggMlpxZLFkYyR4nzm2whapkRkzEFuf8m3m+hhWbhz/NoAFXn/ezECCn2S0qg== X-Received: by 2002:a05:600c:8b6b:b0:477:fcb:2267 with SMTP id 5b1f17b1804b1-477307c1fc6mr85278635e9.8.1762020504551; Sat, 01 Nov 2025 11:08:24 -0700 (PDT) Received: from smtpclient.apple (nat-184-7.net.cam.ac.uk. [131.111.184.7]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4773c4af7c7sm60663925e9.7.2025.11.01.11.08.23 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 01 Nov 2025 11:08:24 -0700 (PDT) Content-Type: text/plain; charset=us-ascii List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3864.100.1.1.5\)) Subject: Re: git: 63ff982b17ee - main - simd.7: add scalar strrchr() for RISC-V to manpage From: Jessica Clarke In-Reply-To: Date: Sat, 1 Nov 2025 18:08:13 +0000 Cc: Robert Clausecker , Robert Clausecker , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: References: <202510311248.59VCmSpY042422@gitrepo.freebsd.org> To: Konstantin Belousov X-Mailer: Apple Mail (2.3864.100.1.1.5) X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4czQnk4Flyz46bn On 1 Nov 2025, at 18:00, Konstantin Belousov = wrote: >=20 > On Sat, Nov 01, 2025 at 11:48:19AM +0100, Robert Clausecker wrote: >> Hi kib, >>=20 >> Am Sat, Nov 01, 2025 at 05:39:49AM +0200 schrieb Konstantin Belousov: >>> On Fri, Oct 31, 2025 at 12:48:28PM +0000, Robert Clausecker wrote: >>>> #include >>>>=20 >>>> + .weak rindex >>>> + .set rindex, strrchr >>>> + >>> Was this alias addition intended? >>=20 >> Yes, this is intentional. See also = lib/lib/{aarch64,amd64}/string/strrchr.S. >=20 > Ok, let me reformulate my question. > Was the 'rindex' symbol exported from libc on riscv before your = commit? >=20 > I remember that there was some effort to not provide 'obsoleted' = exports > from libc on the new arches like aarch64 and riscv. It was exported prior to the series; see the last line in lib/libc/string/strrchr.c and the unconditional entry in the corresponding Symbol.map. The mistake was making it a part of this commit rather than the one that introduced a RISC-V strrchr.S, as the history is now a bit messed up and confusing. Jessica From nobody Sat Nov 1 18:17:40 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4czR0Y6Llkz6DdyB; Sat, 01 Nov 2025 18:17:49 +0000 (UTC) (envelope-from fuz@fuz.su) Received: from fuz.su (fuz.su [IPv6:2001:41d0:8:e508::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "fuz.su", Issuer "fuz.su" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4czR0Y3YlFz47y1; Sat, 01 Nov 2025 18:17:49 +0000 (UTC) (envelope-from fuz@fuz.su) Authentication-Results: mx1.freebsd.org; none Received: from fuz.su (localhost [127.0.0.1]) by fuz.su (8.18.1/8.18.1) with ESMTPS id 5A1IHeDL050080 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Sat, 1 Nov 2025 19:17:40 +0100 (CET) (envelope-from fuz@fuz.su) Received: (from fuz@localhost) by fuz.su (8.18.1/8.18.1/Submit) id 5A1IHekW050079; Sat, 1 Nov 2025 19:17:40 +0100 (CET) (envelope-from fuz) Date: Sat, 1 Nov 2025 19:17:40 +0100 From: Robert Clausecker To: Konstantin Belousov Cc: Robert Clausecker , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 63ff982b17ee - main - simd.7: add scalar strrchr() for RISC-V to manpage Message-ID: References: <202510311248.59VCmSpY042422@gitrepo.freebsd.org> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:16276, ipnet:2001:41d0::/32, country:FR] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4czR0Y3YlFz47y1 Hi Kib, Am Sat, Nov 01, 2025 at 08:00:47PM +0200 schrieb Konstantin Belousov: > On Sat, Nov 01, 2025 at 11:48:19AM +0100, Robert Clausecker wrote: > > Hi kib, > > > > Am Sat, Nov 01, 2025 at 05:39:49AM +0200 schrieb Konstantin Belousov: > > > On Fri, Oct 31, 2025 at 12:48:28PM +0000, Robert Clausecker wrote: > > > > #include > > > > > > > > + .weak rindex > > > > + .set rindex, strrchr > > > > + > > > Was this alias addition intended? > > > > Yes, this is intentional. See also lib/lib/{aarch64,amd64}/string/strrchr.S. > > Ok, let me reformulate my question. > Was the 'rindex' symbol exported from libc on riscv before your commit? > > I remember that there was some effort to not provide 'obsoleted' exports > from libc on the new arches like aarch64 and riscv. As far as I know, yes. lib/libc/strrchr.c provides the same alias. Yours, Robert Clausecker -- () ascii ribbon campaign - for an encoding-agnostic world /\ - against html email - against proprietary attachments From nobody Sat Nov 1 18:18:21 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4czR1C66b8z6Ddw6; Sat, 01 Nov 2025 18:18:23 +0000 (UTC) (envelope-from fuz@fuz.su) Received: from fuz.su (fuz.su [IPv6:2001:41d0:8:e508::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "fuz.su", Issuer "fuz.su" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4czR1C2yCbz48ZF; Sat, 01 Nov 2025 18:18:23 +0000 (UTC) (envelope-from fuz@fuz.su) Authentication-Results: mx1.freebsd.org; none Received: from fuz.su (localhost [127.0.0.1]) by fuz.su (8.18.1/8.18.1) with ESMTPS id 5A1IILNi050096 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Sat, 1 Nov 2025 19:18:21 +0100 (CET) (envelope-from fuz@fuz.su) Received: (from fuz@localhost) by fuz.su (8.18.1/8.18.1/Submit) id 5A1IILCK050095; Sat, 1 Nov 2025 19:18:21 +0100 (CET) (envelope-from fuz) Date: Sat, 1 Nov 2025 19:18:21 +0100 From: Robert Clausecker To: Jessica Clarke Cc: Konstantin Belousov , Robert Clausecker , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 63ff982b17ee - main - simd.7: add scalar strrchr() for RISC-V to manpage Message-ID: References: <202510311248.59VCmSpY042422@gitrepo.freebsd.org> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:16276, ipnet:2001:41d0::/32, country:FR] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4czR1C2yCbz48ZF Hi Jessica, Am Sat, Nov 01, 2025 at 06:08:13PM +0000 schrieb Jessica Clarke: > > Ok, let me reformulate my question. > > Was the 'rindex' symbol exported from libc on riscv before your commit? > > > > I remember that there was some effort to not provide 'obsoleted' exports > > from libc on the new arches like aarch64 and riscv. > > It was exported prior to the series; see the last line in > lib/libc/string/strrchr.c and the unconditional entry in the > corresponding Symbol.map. > > The mistake was making it a part of this commit rather than the one > that introduced a RISC-V strrchr.S, as the history is now a bit messed > up and confusing. Sory about that, I squashed the commits incorrectly when preparing the patch set for commit. Yours, Robert Clausecker -- () ascii ribbon campaign - for an encoding-agnostic world /\ - against html email - against proprietary attachments From nobody Sat Nov 1 18:40:54 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4czRWF27xXz6Dh0c; Sat, 01 Nov 2025 18:40:57 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4czRWD7065z3FQf; Sat, 01 Nov 2025 18:40:56 +0000 (UTC) (envelope-from dim@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762022457; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=B/BQpoWGbvo6Q8btCrerPohGmSwkGSUrkl1Zm+5DgHk=; b=xRoPXueYbI422MNFTJsj8dnWcESX0kUU4dQnYzWPQ48lrrU3Sc5nzsE0UzX3BJd2COxvFR IVbx+F4SGhGQfIzbDU8Td/r2wf/erS6mNU958FQ9ETmZCrObPdVG96hU2lLnSnJqaijrjA kE1uzEpoDzYg7dGXjvUveo+0AkdGLxVE+PuSoqWza0C/OiA3cyVN4j8QZGtdr0SctZn4m1 GpOUQlSe3NXffRU52MSm73PiYfL+YFSToveGl4qOqyTnr0nm6MiNPNm6I8xZTGwTy3NTkc NhZAB4gWOSFr8ho7SOSXU8GeMCjdfX+8b3oSYAvqabsgjfi2qwoLHifxUUi1NQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762022457; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=B/BQpoWGbvo6Q8btCrerPohGmSwkGSUrkl1Zm+5DgHk=; b=UULwZ8yvX+bnO57vi6bLI+NyUWwLUceB/ZMSeMfeT0xzROymRssASLjsbL5IGsBhW0k/qg zE7EFM2rgpLEYPaqh1Hg0ZCCTYJFMlfSTjyZrN0hXWmftchEhc6an1tGCekesd8KjxUqFm bMlNd2QogpGpmjn3GtYmRMAACAVx4WEAE3JliW7Ewy8nWlOBqVb6fkuvwvROcC5hb+I4/4 9F2DtBZoAvS53odQBjUG+qT+FQMuGyfmOl6cu7IFdNzqujlFrM2Xt5difqGlqNXUqBeu7I AgJawtA9hWE8eh70M76yV5s8WptoUeqKoDM7P+plkNPa1FstaxvjBRjmrl6J3w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762022457; a=rsa-sha256; cv=none; b=SUGQulZRva0XdB2Pm15ECsn3I6uJEUQLbgq7UF57T5naueEooQ5oNNNDfhf9H8cbU6R/+a +iEDv0NBL22/++X0UUQ8idkq2BBYbcbywk/CBbV9CiMjwbL9/VLEr4Z8jXamviONOUAbPB oO8b/dEZ9GxqwgMvI7LT5INWfsWHLvefAwpGqilp9DSNQNcfSulee0yVb5xnr+q9Q5HhVp 8waiUpgXHJ+ckDRUxplgIcazadhDpF4boD1RtD0LrvdsbQXy2twGKKUkX2n+Mt9sE9Zf7e 7mSh5Za/ddBeuzmIvutzMcP6rsgRyrwt4nBssh8nO3uhsUEnFLUJSI+mTofVAA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from tensor.andric.com (tensor.andric.com [87.251.56.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature ECDSA (prime256v1) client-digest SHA256) (Client CN "tensor.andric.com", Issuer "E8" (verified OK)) (Authenticated sender: dim) by smtp.freebsd.org (Postfix) with ESMTPSA id 4czRWD5XHGz1Mmn; Sat, 01 Nov 2025 18:40:56 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from smtpclient.apple (bladnoch.home.andric.com [192.168.0.20]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by tensor.andric.com (Postfix) with ESMTPSA id D95EA5BDC8; Sat, 01 Nov 2025 19:40:54 +0100 (CET) Content-Type: text/plain; charset=utf-8 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3826.700.81\)) Subject: Re: git: 51e8e8b0f369 - main - Merge commit e24f90190c77 from llvm git (by Brad Smith): From: Dimitry Andric In-Reply-To: Date: Sat, 1 Nov 2025 19:40:54 +0100 Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: <2D12F18A-26A5-4F3A-AB13-87F802C91896@FreeBSD.org> References: <202510291850.59TIofPQ001392@gitrepo.freebsd.org> <16C4264B-2E85-4522-8EBB-4BDF206F959D@FreeBSD.org> To: jlduran@freebsd.org X-Mailer: Apple Mail (2.3826.700.81) On 31 Oct 2025, at 17:20, Jose Luis Duran wrote: >=20 > On Fri, Oct 31, 2025 at 12:48=E2=80=AFPM Dimitry Andric = wrote: >>=20 >> On 31 Oct 2025, at 14:48, Jose Luis Duran = wrote: >>>=20 >>> On Wed, Oct 29, 2025 at 3:50=E2=80=AFPM Dimitry Andric = wrote: >>>>=20 >>>> The branch main has been updated by dim: >>>>=20 >>>> URL: = https://cgit.FreeBSD.org/src/commit/?id=3D51e8e8b0f36933814b1be08913857727= 876aece5 >>>>=20 >>>> commit 51e8e8b0f36933814b1be08913857727876aece5 >>>> Author: Dimitry Andric >>>> AuthorDate: 2025-10-29 18:49:54 +0000 >>>> Commit: Dimitry Andric >>>> CommitDate: 2025-10-29 18:49:54 +0000 >>>>=20 >>>> Merge commit e24f90190c77 from llvm git (by Brad Smith): >>>>=20 >>>> [Driver] Enable outline atomics for FreeBSD/aarch64 (#156089) >>>>=20 >>>> The compiler_rt helper functions have been built since 12.4, = 13.1, 14 >>>> and anything newer. >>>>=20 >>>> MFC after: 3 days >>>> --- >>>> contrib/llvm-project/clang/lib/Driver/ToolChains/FreeBSD.h | 5 = +++++ >>>> 1 file changed, 5 insertions(+) >>>>=20 >>>> diff --git = a/contrib/llvm-project/clang/lib/Driver/ToolChains/FreeBSD.h = b/contrib/llvm-project/clang/lib/Driver/ToolChains/FreeBSD.h >>>> index 7ab63905ed4f..7d090ba682b3 100644 >>>> --- a/contrib/llvm-project/clang/lib/Driver/ToolChains/FreeBSD.h >>>> +++ b/contrib/llvm-project/clang/lib/Driver/ToolChains/FreeBSD.h >>>> @@ -78,6 +78,11 @@ public: >>>> void AddHIPIncludeArgs(const llvm::opt::ArgList &DriverArgs, >>>> llvm::opt::ArgStringList &CC1Args) const = override; >>>>=20 >>>> + bool IsAArch64OutlineAtomicsDefault( >>>> + const llvm::opt::ArgList &Args) const override { >>>> + return true; >>>> + } >>>> + >>>> UnwindTableLevel >>>> getDefaultUnwindTableLevel(const llvm::opt::ArgList &Args) const = override; >>>> bool isPIEDefault(const llvm::opt::ArgList &Args) const override; >>>=20 >>> I'm sure you're probably aware by now, but aarch64 builds are = failing >>> after this commit: >>>=20 >>> https://ci.freebsd.org/job/FreeBSD-main-aarch64-build/33100/ >>=20 >> It's weird, but I cannot reproduce it. For me, both world and kernel = build fine. >>=20 >> Does anybody have any particular settings that can be used to = reproduce this on a fresh 16-CURRENT or 15-STABLE box? >=20 > I can reproduce it on an aarch64 VM (using a mac studio), vanilla = settings: >=20 > make cleanuniverse <--- very important! > make -j $(nproc) buildworld ... as usual Unfortunately it still does not reproduce for me. I have tried this on = two different systems. The current hypothesis is that it is due to a = race in the build system. At the point where the error occurs, libgcc.a (an alias of = libcompiler_rt.a) should already have been built, with the __aarch64_* = symbols in it. In the logs from ci.freebsd.org = you can see that libcompiler_rt.a has already been built, and installed = into ${WORLDTMP}. So it's still a mystery why this error even occurs. -Dimitry From nobody Sat Nov 1 19:48:26 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4czT1T0HJCz6Dpqg for ; Sat, 01 Nov 2025 19:48:45 +0000 (UTC) (envelope-from marklmi@yahoo.com) Received: from sonic315-55.consmr.mail.gq1.yahoo.com (sonic315-55.consmr.mail.gq1.yahoo.com [98.137.65.31]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4czT1R2NZyz3RC2 for ; Sat, 01 Nov 2025 19:48:43 +0000 (UTC) (envelope-from marklmi@yahoo.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=yahoo.com header.s=s2048 header.b=h8Cq6JJQ; dmarc=pass (policy=reject) header.from=yahoo.com; spf=pass (mx1.freebsd.org: domain of marklmi@yahoo.com designates 98.137.65.31 as permitted sender) smtp.mailfrom=marklmi@yahoo.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1762026521; bh=sln+jKBtfGW2UCYCf5n7M8xq3oO/ZVCVKwIbvMUAZXE=; h=From:Subject:Date:To:References:From:Subject:Reply-To; b=h8Cq6JJQ0LE7J/WYxzYb6wCMANMmt9ZlokUUS4Z1WQPFAeuHL3bBU2tN5fdmEyLv2OLrdOxeqDqpilAy5tTwTm6lq18QpOHx4NDa8aeiC9WYNgXtiCNAi1aQeczAPTu+92HcZZ28bKnVmKktXlnX2a8rB8vLToosyW6zFmYIg3PxgACO68nUu1NLwfgn2DAMwE1vLsx2GRYYq1b0ksxt+Mm8pT7L6NV1MWJiZFJh9BLvVEwPoZ97+4sVW57jAC1byGP8/s+MUjq3UAWSLIgv0XfWcsxi3fh0/zpNecfn6A5X7ZTtQ5c65BtoC+mSg23A+aKGvGzxcH9jg13Qh4ck5Q== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1762026521; bh=naWCqIdsWFl/9FiFmlKV/e6cE8sx98b82Qubb/QiRgU=; h=X-Sonic-MF:From:Subject:Date:To:From:Subject; b=IwJgjZYmvsNQR1zk6i9Qe6BV29cWXJQwi8QZXknX1eZd6mmg01sbeTnRy/u2UP+KQyJmkJdxnh8P8WIr1QhIfHKrYpxhsbBoEBHBoiPCcxJUpQwTFOU//HyNtjcKkh4Zl9S/i97A/7vaxjArip1E/j9mV84M55wjeUjnK8ufR1MSDMKORRckiaYZdZa4o8fEGwOwSgKGZ4k9TsWo3pKu9MD9whmREbR83MhX+QMTq5ICwXybH1I4EHHAH5kPn4teEnYfGWhKzvSuTyLw2WBAAEvV7UR96igpsGQraNzYQy86UFHs62nO0H/ibn81HXrCXXzwW5jk40leQOaDicn1Jw== X-YMail-OSG: 2ic3U.cVM1mbTXTBGt4o_Ls1ceDsNKV0qZB1Hr6f54YzFCCItZp1.2C6en.4Z9V 9QCnymjt6UZX_3kb1CGRWBO3BbJmhmlAAhF7E6TMdi3V74_IBpiMmHmcnHVS_bX_hfApg02CuRP1 8GyVcOaJwFdG4Y2gwl_Isx5GnqXy2O7TJmowNpEkKr7xDyeaF1S94boIO3fNe9tIBS4FkZpfuST3 _ZBagu8qRuPtWJccxEJmxTl95UHgyKa3Eq9pP4HjIry5iW85CNqkOaoTgvND6SjG_rGpmaxUCBKX gffl_cI4wGoaULBdUiXXOR3mVPydmYX9eFv1IhgGFSGZu2a3ej7Rb5.dT4HV6aCFhAktxDkFLkXU EqhDFiZPzXGA080YNloUuoSJn1ViuFVf5G7GzdWCQ.ZfSejTXf_KpXqwcueuiupxd8y_utBWTxqd e7V835C0jYi.5DRWQaRTEwffIEW3h558fJ2Wgp6O5upTAiqj4M.igtOmasEGB0.z2gD_TWJ3KZSv bB_p5J0BzGzSS.S8LgMmvbeXEkPgKQvyeh2dU0B5GQvl5YMBCCuF_Ll0zZ_sUOlOYd80a_rOois1 yaF9xCg6.4MVCb.Hx0lYFYoV2ImRNq71SOFixkwsFNa.Dl9r5k5X6FL2beD7Ku2IAbj0Gl0Ta8B8 P_TxP5LPOUl2bOJSt7u0ZFqQh8TPgl1QPn0toSyLFfdAgvdHFgVYrn8SRSU6J6qBJuDkOuYdcDtR VtPbKsKFAQDKsUgH8u_jGz_h0KThhnCbwXqmsgv8h41jXnFnj6zOdaawEtP33dbelDuyfhfgASX6 REozn0yJkLAdhXik.62VHBvzsYnAWN50ZWjs4xGY1LrTRLLsugAhp4Wdic_AyK5uw3Eo9IBBBj.4 wFoTOiLIMOox9pwwUSRKsk8NwpZH3cAo5xyfUW5i6T8M_XURBcU4QqGhGYoa4Ns05QMVsRT6MEzu km3bdR0pZ7NEr7VFMLezt_im.ERrhw16SGcWh8Ull8LrhBknF7js65dzSDXZDe8iiQCKIaunYtm8 yP_XaEnNRmROmBEf_18QTpbHYB7vMJfz9w0SD4oC6TaFQ51z1l1noPrHaK0Z8v9PwjYVhpXWwjLL j3bIl86AipWIr4bd1lFDj6KWbIa_AeA3uXnd6t9GkC5HSSP4W6cVGAyvnImTs22kFqBAz9hUeeKA 1P30bzl_gHBjOUybCOD4DSBVWmHtwuDMQZv2.fV5d7sKPJytvrKCIKrprbcRtQCGj749Ly64LOtv 1WVqNrT8OSpXmZrMpMOUqtIY4RzJUdBNRAYNP5_jkDIhzJuDrv_E_PNZU3pEXUIV3pyakYyRe67V AxKOMrEdmIrS9zxmx6lxWJfZm7djpRMBGHmHGKK0FFS0HYiFlPV3HXFoCTGe_SXsoH4V5jUv.Hud aueh2qoxLCK4hReMCu_f8GQkgjLsNiUrP0hhSpSJXQUJpujOqsa63qLRQDNkCq4709rOQqy_03H. Tcu5M.Y8VdqqKjzKQM0niwW6z9SWAuU06RYJyZMJiSEg8qCPp3_WQpE8J8lG64u4dgJDJaLXN4Ei iEPBMhwVwOzUJORoJwl1xcnPaPwRSyQb6oKfGwDwef3YJ.cwzrUxbTcp8AcvpPkuerdFSP0eLDLs E3IkJ494STX1s.pnwEVoz_fxp3nWprBn3XTryQSQXrrRCV1vP7L19z3cOrfIZ4ElDCowskoS6gsp HDfc4Qb_BPzHMZgUqrUZSRoSqxEt0uYb4Z5bqhUIwas9Lie1Gt9aeGD.QmMWXg.3YFsTsbkUxj1V 3oE3zyJo6Vt2qZEVpA201Zt5TI_hY_A_6zHtjNSTSNnvGEqWK38XcLyqnWCrM15zfplrgGjyRrgN jlC3wigPeL0nUr9VZLFHMNZNFGSQ5VSlzBx5snVZRMTaaJ0LMvhMVvj5wq9VwkCXJTno_c5oV_F. .TDLuOb3DDMHoZU7iPl4dExpaBk8Dytjuwrq7dEpOoAibUXmUB2TSgEbBYQK89013fEY_GsoJcVh Q..WP0W6PW2UVlI_A2sAuAb8yLxuZ5NUGtRWBYcgvrXBZPj3AFjcDK_lEjw9njFh19XHANHWYjKt v64699ygPs8kE3U__Wfdy.tXFU6i.9CKrL3ALqgTl9omSOR6CDmwBocMGfxZjDlIsq8yz_R42K7J WpJPWGt8XNcGARUZ7Nj6nd44ClWoxwX_qZ_eFqCdNmvvL42BwmcrKytO.k2nNfX1OCEhDtYfpdSL brUNBJWyCun56tbJy37GMU0Rc90w8XCI7UWH7uPmXmEGRE183Zezoq1KoHwVykqLCt2LRXYUzqTV MAFge X-Sonic-MF: X-Sonic-ID: 96df9e18-094d-4e02-bac2-568ca59c0e34 Received: from sonic.gate.mail.ne1.yahoo.com by sonic315.consmr.mail.gq1.yahoo.com with HTTP; Sat, 1 Nov 2025 19:48:41 +0000 Received: by hermes--production-gq1-86c5846576-2pjr4 (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID d983699c75ababe281489e2ab004f934; Sat, 01 Nov 2025 19:48:36 +0000 (UTC) From: Mark Millard Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3826.700.81\)) Subject: Re: git: 51e8e8b0f369 - main - Merge commit e24f90190c77 from llvm git (by Brad Smith): Message-Id: <38155720-430A-4E3B-82C3-3DFF36A37098@yahoo.com> Date: Sat, 1 Nov 2025 12:48:26 -0700 To: Dimitry Andric , dev-commits-src-main X-Mailer: Apple Mail (2.3826.700.81) References: <38155720-430A-4E3B-82C3-3DFF36A37098.ref@yahoo.com> X-Spamd-Bar: --- X-Spamd-Result: default: False [-3.99 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-0.999]; NEURAL_HAM_SHORT(-0.99)[-0.991]; DMARC_POLICY_ALLOW(-0.50)[yahoo.com,reject]; R_SPF_ALLOW(-0.20)[+ptr:yahoo.com]; R_DKIM_ALLOW(-0.20)[yahoo.com:s=s2048]; MIME_GOOD(-0.10)[text/plain]; FROM_HAS_DN(0.00)[]; TO_DN_ALL(0.00)[]; RCVD_TLS_LAST(0.00)[]; RCPT_COUNT_TWO(0.00)[2]; MIME_TRACE(0.00)[0:+]; ARC_NA(0.00)[]; DWL_DNSWL_NONE(0.00)[yahoo.com:dkim]; FREEMAIL_FROM(0.00)[yahoo.com]; DKIM_TRACE(0.00)[yahoo.com:+]; ASN(0.00)[asn:36647, ipnet:98.137.64.0/20, country:US]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; FREEMAIL_ENVFROM(0.00)[yahoo.com]; MLMMJ_DEST(0.00)[dev-commits-src-main@freebsd.org]; APPLE_MAILER_COMMON(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; RWL_MAILSPIKE_POSSIBLE(0.00)[98.137.65.31:from]; RCVD_IN_DNSWL_NONE(0.00)[98.137.65.31:from] X-Rspamd-Queue-Id: 4czT1R2NZyz3RC2 Dimitry Andric wrote on Date: Sat, 01 Nov 2025 18:40:54 UTC : > On 31 Oct 2025, at 17:20, Jose Luis Duran wrote: > >=20 > > On Fri, Oct 31, 2025 at 12:48=E2=80=AFPM Dimitry Andric = wrote: > >>=20 > >> On 31 Oct 2025, at 14:48, Jose Luis Duran = wrote: > >>>=20 > >>> On Wed, Oct 29, 2025 at 3:50=E2=80=AFPM Dimitry Andric = wrote: > >>>>=20 > >>>> . . . > >>>=20 > >>> I'm sure you're probably aware by now, but aarch64 builds are = failing > >>> after this commit: > >>>=20 > >>> https://ci.freebsd.org/job/FreeBSD-main-aarch64-build/33100/ > >>=20 > >> It's weird, but I cannot reproduce it. For me, both world and = kernel build fine. > >>=20 > >> Does anybody have any particular settings that can be used to = reproduce this on a fresh 16-CURRENT or 15-STABLE box? > >=20 > > I can reproduce it on an aarch64 VM (using a mac studio), vanilla = settings: > >=20 > > make cleanuniverse <--- very important! > > make -j $(nproc) buildworld ... as usual >=20 > Unfortunately it still does not reproduce for me. I have tried this on = two different systems. The current hypothesis is that it is due to a = race in the build system. >=20 > At the point where the error occurs, libgcc.a (an alias of = libcompiler_rt.a) should already have been built, with the __aarch64_* = symbols in it. In the logs from ci.freebsd.org = you can see that libcompiler_rt.a has already been built, and installed = into ${WORLDTMP}. So it's still a mystery why this error even occurs. When I look at the official CI log file I see, for example: --- outline_atomic_cas4_2.o --- cc -target aarch64-unknown-freebsd16.0 . . . -fpic -fvisibility=3Dhidden = -DVISIBILITY_HIDDEN . . . -c outline_atomic_cas4_2.S -o = outline_atomic_cas4_2.o Would that tend to imply that the later: ld: error: non-exported symbol '__aarch64_cas4_acq' in = '/usr/obj/usr/src/arm64.aarch64/tmp/usr/lib/libgcc.a(outline_atomic_cas4_2= .o)' is referenced by DSO = '/usr/obj/usr/src/arm64.aarch64/tmp/usr/lib/libgcc_s.so' would be expected? =3D=3D=3D Mark Millard marklmi at yahoo.com From nobody Sat Nov 1 20:17:39 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4czTfs2xPwz6Dsm9 for ; Sat, 01 Nov 2025 20:17:41 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4czTfs15wnz3WR8; Sat, 01 Nov 2025 20:17:41 +0000 (UTC) (envelope-from dim@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762028261; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=VwwwR+AvCgXbOnnH5eQ78fdF/MoMw2MjdMxGoao9n9k=; b=h+KyaFzJKdS8hmSbQRtXqax99ku91fdGrpLrhnpvveCflVOkDJkrCIxZAskuxHlPlmBJcX hvrj46TVMew9WlJsl2fhKQ/oPKJ59HW2vGS1s42MBu2B2ERdw+YgfNmRFOkFsMGRqdVA0F 9BTSdJNHtJBMD6SqJWHI1QphWolOUWBGq7oplth9/WhpHznhtehBhN1Bn8Kb0sAC/K/CgB PpF8LsDmqAr+ZKCKOH5yn6sg3uMQRRIIui7t+5IeARQ7kLJ32dRFIMFGQHyWwyAgRP34Ie 8NhzWwJlAWvbL1L2Ay56P10lV1ki1dwVxa0s3bb6NNIf6/9osjQchs6GXuWzzQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762028261; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=VwwwR+AvCgXbOnnH5eQ78fdF/MoMw2MjdMxGoao9n9k=; b=rD1OncUn8M38+yqfpZgpw0wKb4AmiT5t8lJa4ISxPJ1s5QDAFXblwbhHc6tzlLJnYwqJCz jgEyfSlWmpA26OkSKIw58IDq13XxW+l494p1V04djgxcrihpzH+G2iB85t6wGpoc0Dsvix hsEy0I1Qe68vqFd8ybDQhl36ELHHkHnWL46E3+i2JwnwoWWdUfihJz3RPUH4NSV94jRyXH gqG51LwE2/EV3XYHujaOlUiB1pb5bBmIx79pFhc7t1ALnVm9umx3leW/BJ8WgXUWVH8orx 6bUvFQHuNo/AnIokbaxDZowPU7sdMHCCAkxc92QqXKJf7JPgE9rx8HrSOhVkvw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762028261; a=rsa-sha256; cv=none; b=e1SL6SPFjf53E119AWw/pwmOdDV0fBqUlLyXLbQgz/0QKSFb1q+w8P1seTqcTfV+3BySoi Ns3PHaGefhbBzpZFe8LdvCSTGJ5lBIEt6PI+IMUfjrZL7eBhFCKq2pJCYm2DnlellI6acv CbdFlRetDxz6O1pEm/0xrIZza8o7yzGNfk4SGwwAKKDjtDsDl/9lwdYYc5JGJVujP9xoCF tQC7MyJCfdaLgVknIYuw8DM7gG5NOmAj1ZNt3npyZGJSwI2lc4A2QL9TSArEpiPijwMU24 fAWYEvcfSKlP63s58+P2ByXtx7tzTLqFhamqZAy02DgrvJhwUESdlrDIcZRm6w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from tensor.andric.com (tensor.andric.com [87.251.56.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature ECDSA (prime256v1) client-digest SHA256) (Client CN "tensor.andric.com", Issuer "E8" (verified OK)) (Authenticated sender: dim) by smtp.freebsd.org (Postfix) with ESMTPSA id 4czTfr5slVz1QVf; Sat, 01 Nov 2025 20:17:40 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from smtpclient.apple (bladnoch.home.andric.com [192.168.0.20]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by tensor.andric.com (Postfix) with ESMTPSA id 356AE5C232; Sat, 01 Nov 2025 21:17:39 +0100 (CET) Content-Type: text/plain; charset=utf-8 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3826.700.81\)) Subject: Re: git: 51e8e8b0f369 - main - Merge commit e24f90190c77 from llvm git (by Brad Smith): From: Dimitry Andric In-Reply-To: <38155720-430A-4E3B-82C3-3DFF36A37098@yahoo.com> Date: Sat, 1 Nov 2025 21:17:39 +0100 Cc: dev-commits-src-main Content-Transfer-Encoding: quoted-printable Message-Id: References: <38155720-430A-4E3B-82C3-3DFF36A37098.ref@yahoo.com> <38155720-430A-4E3B-82C3-3DFF36A37098@yahoo.com> To: Mark Millard X-Mailer: Apple Mail (2.3826.700.81) On 1 Nov 2025, at 20:48, Mark Millard wrote: >=20 > Dimitry Andric wrote on > Date: Sat, 01 Nov 2025 18:40:54 UTC : >=20 >> On 31 Oct 2025, at 17:20, Jose Luis Duran = wrote: >>>=20 >>> On Fri, Oct 31, 2025 at 12:48=E2=80=AFPM Dimitry Andric = wrote: >>>>=20 >>>> On 31 Oct 2025, at 14:48, Jose Luis Duran = wrote: >>>>>=20 >>>>> On Wed, Oct 29, 2025 at 3:50=E2=80=AFPM Dimitry Andric = wrote: >>>>>>=20 >>>>>> . . . >>>>>=20 >>>>> I'm sure you're probably aware by now, but aarch64 builds are = failing >>>>> after this commit: >>>>>=20 >>>>> https://ci.freebsd.org/job/FreeBSD-main-aarch64-build/33100/ >>>>=20 >>>> It's weird, but I cannot reproduce it. For me, both world and = kernel build fine. >>>>=20 >>>> Does anybody have any particular settings that can be used to = reproduce this on a fresh 16-CURRENT or 15-STABLE box? >>>=20 >>> I can reproduce it on an aarch64 VM (using a mac studio), vanilla = settings: >>>=20 >>> make cleanuniverse <--- very important! >>> make -j $(nproc) buildworld ... as usual >>=20 >> Unfortunately it still does not reproduce for me. I have tried this = on two different systems. The current hypothesis is that it is due to a = race in the build system. >>=20 >> At the point where the error occurs, libgcc.a (an alias of = libcompiler_rt.a) should already have been built, with the __aarch64_* = symbols in it. In the logs from ci.freebsd.org = you can see that libcompiler_rt.a has already been built, and installed = into ${WORLDTMP}. So it's still a mystery why this error even occurs. >=20 > When I look at the official CI log file I see, for example: >=20 > --- outline_atomic_cas4_2.o --- > cc -target aarch64-unknown-freebsd16.0 . . . -fpic -fvisibility=3Dhidden= -DVISIBILITY_HIDDEN . . . -c outline_atomic_cas4_2.S -o = outline_atomic_cas4_2.o >=20 > Would that tend to imply that the later: >=20 > ld: error: non-exported symbol '__aarch64_cas4_acq' in = '/usr/obj/usr/src/arm64.aarch64/tmp/usr/lib/libgcc.a(outline_atomic_cas4_2= .o)' is referenced by DSO = '/usr/obj/usr/src/arm64.aarch64/tmp/usr/lib/libgcc_s.so' >=20 > would be expected? No, the symbol should be there, and it shouldn't be "non-exported". = However, looking with readelf, I see: Symbol table '.symtab' contains 13 entries: Num: Value Size Type Bind Vis Ndx Name ... 11: 0000000000000000 0 NOTYPE GLOBAL HIDDEN UND = __aarch64_have_lse_atomics 12: 0000000000000000 48 FUNC GLOBAL HIDDEN 2 = __aarch64_cas4_acq So the symbol is global but hidden, which is because = lib/libcompiler_rt/Makefile compiles everything with = -fvisibility=3Dhidden. It has been doing that for a long time, so I am unsure why ld now = suddenly makes a problem out of it. Maybe the CI builds use another = linker, either on purpose or by accident? -Dimitry From nobody Sat Nov 1 20:47:10 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4czVKD14TVz6F9Zt for ; Sat, 01 Nov 2025 20:47:28 +0000 (UTC) (envelope-from marklmi@yahoo.com) Received: from sonic314-20.consmr.mail.gq1.yahoo.com (sonic314-20.consmr.mail.gq1.yahoo.com [98.137.69.83]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4czVKC5fm1z3ZBB for ; Sat, 01 Nov 2025 20:47:27 +0000 (UTC) (envelope-from marklmi@yahoo.com) Authentication-Results: mx1.freebsd.org; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1762030045; bh=YItYlOAFGSxXvHXkl9eKJ0uQuw2myWAQQRMYA3waYcU=; h=Subject:From:In-Reply-To:Date:Cc:References:To:From:Subject:Reply-To; b=ONaEkorNOBB9F23FX4UQTW5NIu3gju6iUkAOHDiyEKzuMQe69zhuQxU+r/LX2U0qx7mdgWdFkcrLYlSm2uQntzDSTE45YkiYwDi4G38fHkL6wy9cg5pTJBwsFDA8ikt1JiIkNTCNNN0MNdwYLKuaE4iiAnSqhQxrIkubuxecnCzPSx98zoqjfXIi27b1O/pnV6q0NA3wT8SogMF/RlniPpRGUfTD9f4K+IjHRummaMfeZT1o4WkBdu5g8CHPgvRWJMBN0TK66VuRx97M3IcRdrzmkrcZosvmYiFj4iQygLSQFzUFRXxHwkYsdwmEmabQLJdm0MbfKFJLxJdH0n/g/A== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1762030045; bh=Ia6opz8wk5TYbbZO5AOFqRH2RsLHulgc5bgbW6MMdUW=; h=X-Sonic-MF:Subject:From:Date:To:From:Subject; b=MoV9XQLvQoF3oRivhGWW5VbdnE5mynBloJYgurUt8db+jGa9XlCUjH1yacFIcUImrKh1HK2ZCDARe+SrllCptGwnunM5iAynQS8MByYpzWH1kiYK+pBw+TC2yrzq1p3YHvXHgKcwgu/lckd2qQPvPA/syDhzO3IbxXcbIKZJL48g4eaqTSZoaGiEKnrogOROEqzRqgNFFzm/I6xsfeYtRDl4jNzlb2OBs3ahZp74e/0YBEFLk64FG5H8hTCqCKPYFIGwG471rTDKJ7IPSuef9AjO6hIWX2I9MEAS6EkXH+2aGOziHKpJccfD9ySAV/8QZsj6/IVekO4qGzuwrt3KAw== X-YMail-OSG: DG8.eSkVM1k5aIbEJHOMysWmRVXLLIwc1dmbrp3EZqOhJJaODRCGkv91Sqt3TCZ UEGzKjY7fjDPytM75XGGiWO1X4BlCdW9zB5Z6GhxIpWToeKS9ASmGQmiFDSA7IWAsKLrEQ76EwFR mH6YPIbiDlBUCYMu5UnW8Ex6yFIGFLCmK0UuiyOSdokzpEf.LAxvZFOjixiTx7RXr48Os8RrOhVV 6xebbWCBSC3cr2q..GndbhRQosS78ZSNnqD7FJj6.hOi4SbfQ6RiD1SkDx.ouYq999dWjgmuTNfZ qJY5L7.fvt7T1RcH4B9ba8yfDuHArwHQ7DLeaiv4uaxKs0jJOc9hF2qC_wqsbq7gZM7F.jcAV_xV 8XwOE5dflJFgvDG_w4RIaDav2uJkmLnMa5z12ZzAbAxUcmQ5mLpO3qjDSkzGtHS4otv_0qPwuEke da1UrPOaH8zXdU9xtD5gyvRWc9J26CSeTwGLr_seGkqkosZT6qDe0cBcLRGpM5dOFh2UYy00D5fS 8I9ZNVdvfve5mJTnkpZfLR7r06TPgzPniPnLCYkxT4t7VwoW1uWMXllYusQJlIM6fDgrWy6RPqnT TOu2thy_myOJjPkp5rBRkraLiE9aOM0uops0Vr.dntcNjpsTdrvHZ6P2mZqSCBH_nVgjbPLxidDk 8jhdpX8knraZnLvnIshw1hE.rsFWUzS2XPr34MMyBZFXnXU3nKBRfm0.XfCy9y5XQ6P0Y58MEG1E 0IGQ76rSWbLR7aAtLQUWAUJ.qoFUSEoqVyegfgs3lRlSTITrsYVmXS5bQQuHO9db20AoyxyjNDuU 4PAS8FFN9NKP3ZUwRWwID8t8WSsK0WLKBOvUy8CSari04RnL4VxwJwq793pQpPsJIShyZ3.lm7bv IH69zRfEeL7GUPy0tZAXKBOqIan7HKfJIGlkb8BXq5eNC6DesXMrZgcmyIzJwamXOac.D82v4gdZ 5b_kNG_S9tDWMtbrf.lzA7vA6Gqr3PwhxvZi0pKq5cCFNLE_ovwXWDpypezvfWTxVW_RH6z9HoIb ACzPWA2WwJDNclre9JQlHsfYAl6MaXxLh7rgZRieeIF_p9KuvXjlT3jLxogj0V00mURG1oetTyKF JfLLnviTTIkfhw9PuNWM9G5I51QyDWE1jLOeG7l1GCyukvq3uFujtr0xBiWsVJajuWlHYY_ntG45 oLoQktgFd5CipjO12lNcqwgDztkAv29ZCrLHXfZVQf49zCnWhKff8pyZy0XdKm3u6gOzEHvsvNKI UwiPuQtYRxiWje9s6wHPzDL9.oozdISF.BKKFcAt_hxNDzT8FhuABRHIOuHIflwGlOy7KuMjR0zq h6kaa_hHrP4XvKITApb0Rtb6V2eBmFpFdGPJXLpICQUapyBpipIPekD5LXUbozAsOLehdw6RrSzM JWetYorEc5gfjWf7ZPn82dJTGNPl2yKFi1OBW52fHTlcjWt7TAP6d2qLtEZnHqQXsfC5yAPPTqUN 1mQXajhK_9qgQ6K.nswwMh4mggD2NYUHxZ1vCzc4FXJcXDBK9iRhelPK0Gm0AfHW644ZuSSBrHR. qvyFzVKn.QkqOHbMhQiH.IAD1z5aHmLyoBMO6iMViStz1xyls2rhwzWdn853BICXe1yM4B7q4aKe 1BIMF5mQuw38tpp_Clzgyxs39GEKLl182CWPsE8NaqtOlzkKDt0krcQgGeit8LU_eNsIcLxY_bvF 1sP9VRYWhg3BgPQgSJx2QgGxltRhEGVd0Su._EtBOzSJZJvNIgbFWTbIoqLNWQKF.i8_0fvCwKMZ i4580tPONfoXDiyNctoPy8_z7dC_3SnoJIF01OUL46P6o0IjQBVZ2UtPCJ2mpDjjNc.FP59hEdvj 3Ytpgk64WM_scm3rt_UGaeA.kVMjSM9fJ4wTF60zjDpzcKpPJrTdG.d_oIc_R.evlzn_XvsN5r69 aKlj4Np46SxVcoWQ7SOvek9Ha1sOrdcNa6csu88n58JivcDhfOWbdHgqnW5teCNCfpseq39Lf_lI l3luPm04p_uDZ9vrqsa_fuMv5GXTMEu4dZc5stdWAk7JoRRzW3I9ZK.R2JHpBXcRaXSA5gSifhfE HRNOJS9Bm4CjrXnRSOFHKw2AwYSkKiAFNFUNd76L_MCyC9Uzb7ny9Ss1ctm7FJW0CqUjMt0lSEH8 eMPkG2CQQlZ0VypDLLxNeKTU2gTcb1gGhOIuSJnmI7FAfoFyZSK98Q6uW0n_w9CXsRnL6xUA8CMt c6O6CfPodpaVSVr4TEzQvUurv0ty_N7N_ygDPRUzqdn8FJNMj97DOIeYDNZGZvPiLIVvjkbCShMj oickmqdk- X-Sonic-MF: X-Sonic-ID: 32c52f6f-7e01-4b12-a54f-fb813a195f26 Received: from sonic.gate.mail.ne1.yahoo.com by sonic314.consmr.mail.gq1.yahoo.com with HTTP; Sat, 1 Nov 2025 20:47:25 +0000 Received: by hermes--production-gq1-86c5846576-72zw7 (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID c75b5e3719aeaa0566978796bec7075b; Sat, 01 Nov 2025 20:47:21 +0000 (UTC) Content-Type: text/plain; charset=utf-8 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3826.700.81\)) Subject: Re: git: 51e8e8b0f369 - main - Merge commit e24f90190c77 from llvm git (by Brad Smith): From: Mark Millard In-Reply-To: Date: Sat, 1 Nov 2025 13:47:10 -0700 Cc: dev-commits-src-main Content-Transfer-Encoding: quoted-printable Message-Id: <9890C464-D776-4E27-9496-220F041D0973@yahoo.com> References: <38155720-430A-4E3B-82C3-3DFF36A37098.ref@yahoo.com> <38155720-430A-4E3B-82C3-3DFF36A37098@yahoo.com> To: Dimitry Andric X-Mailer: Apple Mail (2.3826.700.81) X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:36647, ipnet:98.137.64.0/20, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4czVKC5fm1z3ZBB On Nov 1, 2025, at 13:17, Dimitry Andric wrote: > On 1 Nov 2025, at 20:48, Mark Millard wrote: >>=20 >> Dimitry Andric wrote on >> Date: Sat, 01 Nov 2025 18:40:54 UTC : >>=20 >>> On 31 Oct 2025, at 17:20, Jose Luis Duran = wrote: >>>>=20 >>>> On Fri, Oct 31, 2025 at 12:48=E2=80=AFPM Dimitry Andric = wrote: >>>>>=20 >>>>> On 31 Oct 2025, at 14:48, Jose Luis Duran = wrote: >>>>>>=20 >>>>>> On Wed, Oct 29, 2025 at 3:50=E2=80=AFPM Dimitry Andric = wrote: >>>>>>>=20 >>>>>>> . . . >>>>>>=20 >>>>>> I'm sure you're probably aware by now, but aarch64 builds are = failing >>>>>> after this commit: >>>>>>=20 >>>>>> https://ci.freebsd.org/job/FreeBSD-main-aarch64-build/33100/ >>>>>=20 >>>>> It's weird, but I cannot reproduce it. For me, both world and = kernel build fine. >>>>>=20 >>>>> Does anybody have any particular settings that can be used to = reproduce this on a fresh 16-CURRENT or 15-STABLE box? >>>>=20 >>>> I can reproduce it on an aarch64 VM (using a mac studio), vanilla = settings: >>>>=20 >>>> make cleanuniverse <--- very important! >>>> make -j $(nproc) buildworld ... as usual >>>=20 >>> Unfortunately it still does not reproduce for me. I have tried this = on two different systems. The current hypothesis is that it is due to a = race in the build system. >>>=20 >>> At the point where the error occurs, libgcc.a (an alias of = libcompiler_rt.a) should already have been built, with the __aarch64_* = symbols in it. In the logs from ci.freebsd.org = you can see that libcompiler_rt.a has already been built, and installed = into ${WORLDTMP}. So it's still a mystery why this error even occurs. >>=20 >> When I look at the official CI log file I see, for example: >>=20 >> --- outline_atomic_cas4_2.o --- >> cc -target aarch64-unknown-freebsd16.0 . . . -fpic = -fvisibility=3Dhidden -DVISIBILITY_HIDDEN . . . -c = outline_atomic_cas4_2.S -o outline_atomic_cas4_2.o >>=20 >> Would that tend to imply that the later: >>=20 >> ld: error: non-exported symbol '__aarch64_cas4_acq' in = '/usr/obj/usr/src/arm64.aarch64/tmp/usr/lib/libgcc.a(outline_atomic_cas4_2= .o)' is referenced by DSO = '/usr/obj/usr/src/arm64.aarch64/tmp/usr/lib/libgcc_s.so' >>=20 >> would be expected? >=20 > No, the symbol should be there, and it shouldn't be "non-exported". = However, looking with readelf, I see: >=20 > Symbol table '.symtab' contains 13 entries: > Num: Value Size Type Bind Vis Ndx Name > ... > 11: 0000000000000000 0 NOTYPE GLOBAL HIDDEN UND = __aarch64_have_lse_atomics > 12: 0000000000000000 48 FUNC GLOBAL HIDDEN 2 = __aarch64_cas4_acq >=20 > So the symbol is global but hidden, which is because = lib/libcompiler_rt/Makefile compiles everything with = -fvisibility=3Dhidden. >=20 > It has been doing that for a long time, so I am unsure why ld now = suddenly makes a problem out of it. Maybe the CI builds use another = linker, either on purpose or by accident? May be something like: QUOTE from https://github.com/llvm/llvm-project/issues/86777 ("[lld] why does lld export hidden symbols without warning when dynamic = libraries link to object files?") swift-ci added a commit that references this issue on Mar 29, 2024 [ELF] Enhance --no-allow-shlib-undefined for non-exported definitions df54f62 For a DSO with all DT_NEEDED entries accounted for, if it contains an undefined non-weak symbol that shares a name with a non-exported definition (hidden visibility or localized by a version script), and there is no DSO definition, we should report an error. llvm#70769 implemented the error when we see `ref.so def-hidden.so`. = This patch implementes the error when we see `def-hidden.so ref.so`, matching GNU ld. Close llvm#86777 END QUOTE (Only a guess on my part.) =3D=3D=3D Mark Millard marklmi at yahoo.com From nobody Sat Nov 1 21:24:32 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4czW825S3Pz6FFj3 for ; Sat, 01 Nov 2025 21:24:34 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4czW823Zzzz3jp5; Sat, 01 Nov 2025 21:24:34 +0000 (UTC) (envelope-from dim@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762032274; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=nipMAhoFo78Cx7DpbY3Is3KGxG5VEFpYy6m64aaLoHQ=; b=jhEsPh/1oZ9UmIjubIybMow4SozuYkVyLXwdUdo5gK7HP/4gWIZVhP8Ma/e2DXOF23js3t LSoyt79C48siHKkiDKsiwhE5/kq5eX09+8ndxF6eVGg3nj/VdN90Ws+iCAfo3A3YLECymA PZ0KnMURnJZwxBBZSebtxoMVLBtFqtaSYf2RVv6zp3uCpbL3UTjiAndcW72u9nsG7Jgf6W 4lXro2AezOSNcrWj74qXpUSU/GmIeR1shDrqCiHX/QHTXkIHDJDyqZwGo/5t8zrFbuCW3Y iMMkpv+AF7I2sHX0IWk8GQjpbof0pHRd3lzrAm4uEUMA9H6ASXGdq4AZGmO1ZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762032274; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=nipMAhoFo78Cx7DpbY3Is3KGxG5VEFpYy6m64aaLoHQ=; b=TYaCP6xVw16XZJhiPNh56StRxCEllPJ+Ae+F3yRyPswScuZ5jyd7xJ+N0nIFOkMqRrLbMp D32CvT60xVFmzr26YJVl038htXt5vGjMU9PELA9D4zLrq2S4wNDFzxxyuUu4lhTYNH1SKD lTGG4UKT6R36e3XF0I9TPQSxlzm0fUqqv4kmF9Uc+/WBrbp+t0qInxCm/oYn2XDUyDjCdH Tlz+YE0Y/TaVOC6tfO2AQnKiEYNOMJ8uH7dhBKe7pWvyVUxkDEIQgaHz4t/x4iyE5zjEN1 I5fIFUDydiukDRN8YnlbMxfbWKKa+UCWAGFzDxRQPyCigOjxc2Pi0jbNpZvLnw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762032274; a=rsa-sha256; cv=none; b=KLMGNm0DuAHM7TIENyNk9i4sExYmw0V3Bu4mWXcecVqYYyFfFDBZ3PqinzU8bO/RY0yXBE eMmn3ftKoL7tidrnPIo86FdlHIg17vlUd8wlkHyu5Ok339C63ZdPlgGVHxGbt+LpyuF6G+ B/qsUmc+ynCQ7v8LCBWMHbej9D0eWFKx9pTl16D6y1U2+BbC21uXAsZJCtlvhgAv7Fjx+6 DhGNCWQvNPwNVNp6vAQrqkSnnm+nZzbCraxkrrjU3ohep6HpcZa90REUyOEWglSNtDZYur Lozj8TVT0c8qAusrCHfyQ9HYOmdgiJ/QPnEW2ezSXlgS0XZAfCkZ9qavBlDtxQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from tensor.andric.com (tensor.andric.com [87.251.56.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature ECDSA (prime256v1) client-digest SHA256) (Client CN "tensor.andric.com", Issuer "E8" (verified OK)) (Authenticated sender: dim) by smtp.freebsd.org (Postfix) with ESMTPSA id 4czW821ySGz1QTG; Sat, 01 Nov 2025 21:24:34 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from smtpclient.apple (bladnoch.home.andric.com [192.168.0.20]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by tensor.andric.com (Postfix) with ESMTPSA id DF5C55C262; Sat, 01 Nov 2025 22:24:32 +0100 (CET) Content-Type: text/plain; charset=us-ascii List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3826.700.81\)) Subject: Re: git: 51e8e8b0f369 - main - Merge commit e24f90190c77 from llvm git (by Brad Smith): From: Dimitry Andric In-Reply-To: <9890C464-D776-4E27-9496-220F041D0973@yahoo.com> Date: Sat, 1 Nov 2025 22:24:32 +0100 Cc: dev-commits-src-main Content-Transfer-Encoding: quoted-printable Message-Id: References: <38155720-430A-4E3B-82C3-3DFF36A37098.ref@yahoo.com> <38155720-430A-4E3B-82C3-3DFF36A37098@yahoo.com> <9890C464-D776-4E27-9496-220F041D0973@yahoo.com> To: Mark Millard X-Mailer: Apple Mail (2.3826.700.81) On 1 Nov 2025, at 21:47, Mark Millard wrote: >=20 > On Nov 1, 2025, at 13:17, Dimitry Andric wrote: ... >> No, the symbol should be there, and it shouldn't be "non-exported". = However, looking with readelf, I see: >>=20 >> Symbol table '.symtab' contains 13 entries: >> Num: Value Size Type Bind Vis Ndx Name >> ... >> 11: 0000000000000000 0 NOTYPE GLOBAL HIDDEN UND = __aarch64_have_lse_atomics >> 12: 0000000000000000 48 FUNC GLOBAL HIDDEN 2 = __aarch64_cas4_acq >>=20 >> So the symbol is global but hidden, which is because = lib/libcompiler_rt/Makefile compiles everything with = -fvisibility=3Dhidden. >>=20 >> It has been doing that for a long time, so I am unsure why ld now = suddenly makes a problem out of it. Maybe the CI builds use another = linker, either on purpose or by accident? >=20 > May be something like: >=20 > QUOTE from https://github.com/llvm/llvm-project/issues/86777 > ("[lld] why does lld export hidden symbols without warning when = dynamic libraries link to object files?") >=20 > swift-ci > added a commit that references this issue on Mar 29, 2024 > [ELF] Enhance --no-allow-shlib-undefined for non-exported definitions > df54f62 > For a DSO with all DT_NEEDED entries accounted for, if it contains an > undefined non-weak symbol that shares a name with a non-exported > definition (hidden visibility or localized by a version script), and > there is no DSO definition, we should report an error. >=20 > llvm#70769 implemented the error when we see `ref.so def-hidden.so`. = This patch > implementes the error when we see `def-hidden.so ref.so`, matching GNU > ld. >=20 > Close llvm#86777 > END QUOTE Yes, I found that too, and an informative blog post by Fangrui Song at = = . But it doesn't explain why this error only occurs for some people and = not others. If I understand the llvm commit and the blog post correctly, = I would expect this error to always appear. :) -Dimitry From nobody Sat Nov 1 22:23:43 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4czXSH42Ljz6FL2b; Sat, 01 Nov 2025 22:23:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4czXSH3SVBz3rbd; Sat, 01 Nov 2025 22:23:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762035823; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AOMzzyZ5Tx6Ft8gtIgbXeUv9ylissFb4tvf+Dth7mN4=; b=rEurYOSB19kzUB0Jcuilrx2La1ZaFqfcp7dMkvjrGHrZ4EIl+smoCcagDBgU6OboQHI0Bg NmUqje9Lx77SnKjKHCj29xaIjeZwLobhaddft6hMaNOt+Wjpc+4U6Pdld0NKsT/dZr+3QZ BAyI7E6d9Ye8r92fgn6mqyK+DHDMV6GIDWe8389gG20Oif8lXVbpqWwlu2h92XdgC460oR KhiTiH6o/ByEiY1Sc7XCQq1QlEQWCnQO+GIslWPSvXPoiIJUE935oZL6ypPfW2BkNLgEGf Th9V1SoJsGFk5KBqhmUxYvUwURX2LcWFiQCsRVK2eAEmxefYTUHC24uf6zcffQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762035823; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AOMzzyZ5Tx6Ft8gtIgbXeUv9ylissFb4tvf+Dth7mN4=; b=WYx1MTikomEBPEtkf01E/LY1ff9/m3mFXpS09D4zRl3KAbdtWOs+wh7CM81SsKqWH1/jis T7pDRgnkzKjkx4/RWuUQDT2noXwG3aGi8K68uGu8WGYvtpvTI87grT1jNdpI+VZIhlsTAW 9dydTuhQaKY9ais+fXIWbJ43GbvgGEey+CMaqm1jZGfEvPSXcTMedrqdyObV4EnGAOgH7P vl3ALFYOsd9hpcu8AIFrZDAgtvmm9QBaYcGSg7UhhXDBpju4iHuwKrBwC0r2hWINGkDVfS gwuAYBTMIfEjMR+sSTYGMSVGg/zigHJhD/97lDynHBW1ThwJ6DYGZ2vXlvQRyg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762035823; a=rsa-sha256; cv=none; b=BmX7Aiv1a7rHUUKfmgNpItXOHk9BGFQwap5rbap4/2cGSABu4oSX1kLSKxzYCJ85VNVvUo Y9AOmUOY9GKkIa+t2kV6UrQeDM9zSq4zJ4EF68Isoqs8mHrdXcx1vYStsF3broG7v8dCwU gDK6WMGikwXVDlGwFDBtGRF6tWMIhwdJLwmwIrsGj+0hKB7m9lo9RJYGNZCNVbEx89B3Nv RyrWR6Q/pq+CC8S6mdm8+o3zBNGUB0vKrDtWqkYI8bQqGJdQdmB4y3JyGCwr5swGm6ItJI HiVJF9+9l9nfrR33LcLbNdnM5OHpnUBRC3GFlLHjJN3SgzcIPb/NAkpXhMgMEQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4czXSH320KzyKy; Sat, 01 Nov 2025 22:23: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 5A1MNhJt051864; Sat, 1 Nov 2025 22:23:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A1MNhgK051862; Sat, 1 Nov 2025 22:23:43 GMT (envelope-from git) Date: Sat, 1 Nov 2025 22:23:43 GMT Message-Id: <202511012223.5A1MNhgK051862@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: b473bb274cef - main - pathconf.2: Document the new _PC_CASE_INSENSITIVE name List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b473bb274cef37d45940cad4624b5d3b7fc96e01 Auto-Submitted: auto-generated The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=b473bb274cef37d45940cad4624b5d3b7fc96e01 commit b473bb274cef37d45940cad4624b5d3b7fc96e01 Author: Rick Macklem AuthorDate: 2025-11-01 22:20:40 +0000 Commit: Rick Macklem CommitDate: 2025-11-01 22:20:40 +0000 pathconf.2: Document the new _PC_CASE_INSENSITIVE name Commit d6864221d8 added support for the _PC_CASE_INSENSITIVE name for pathconf, to indicate if case insensitive lookups are configured. This patch documents this new name and also updates the description for _PC_HAS_HIDDENSYSTEM to also include UF_ARCHIVE. This is a content change. Reviewed by: kib MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D53508 --- lib/libsys/pathconf.2 | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/libsys/pathconf.2 b/lib/libsys/pathconf.2 index 5a983a3a13e2..5348128be706 100644 --- a/lib/libsys/pathconf.2 +++ b/lib/libsys/pathconf.2 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd August 6, 2025 +.Dd October 31, 2025 .Dt PATHCONF 2 .Os .Sh NAME @@ -180,7 +180,8 @@ Return 1 if named attributes are enabled for the file system, otherwise 0. .It Li _PC_HAS_NAMEDATTR Return 1 if one or more named attributes exist for the file, otherwise 0. .It Li _PC_HAS_HIDDENSYSTEM -Return 1 if both +Return 1 if all of the +.Dv UF_ARCHIVE , .Dv UF_HIDDEN and .Dv UF_SYSTEM @@ -192,6 +193,9 @@ Returns the block size required for block cloning via .Xr copy_file_range 2 for a file system if block cloning is supported, otherwise 0. +.It Li _PC_CASE_INSENSITIVE +Return 1 if the file system performs case insensitive lookups, +otherwise 0. .El .Sh RETURN VALUES If the call to From nobody Sun Nov 2 00:44:33 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4czbZp282kz6FY0P; Sun, 02 Nov 2025 00:44: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4czbZp1ZLyz4CTj; Sun, 02 Nov 2025 00:44:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762044274; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+WYhUjRr6aWDsf91q7CSj65YSt1y48N+hOH/43sKA14=; b=EKOx1lbpnDyx5fk4EH2ostAxgZLAJsnmEBtlbGJUcks+lptSiOa0TUdYa6gAQQY7NixJkd KKTsi/Xw0Ih1SGfVZSZttyo7jERUaThnIPWHAwn5zBodBfpHi4x0DS7UyPRL/gsBfxq5NR ejmWRy7kAb7XAL0zUI63gsj21DutklJ/ct6wnx9qrtgvNW4ei7SJGKpyctq5CJMj82p8Jj 8G3DWPUiXNwGXzVcQTaT/5QaNGoXa/1BBfzN64wGNkXN5JwABl+SEFv0zSF7Eb6GaGUhGI tc6hPDJLPs+rDb+gMCotFGG1iv46cmmgY+rA1mkZWf3zFGoZq+AvJBlqIPC+VQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762044274; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+WYhUjRr6aWDsf91q7CSj65YSt1y48N+hOH/43sKA14=; b=UpJqoyeDGVi0QxyEZFx6DyI99o0UPErrNhOIbX9X/H94/7S2DhpbT2swCd5CXxrwPBDKJn i9QjP4oN9VEWIIUqxYEbzrq6KaXBhZAo8O7iKIWS+istPRtL+ngaoPYPYtgFlwRHB6MN3r a6wK0+hziyYmmrujAXv+Echgpj8B3lSCdf1mcfkHssf7VZFGab5Ee8hrJ3W32P7LZMZe0m 44C9aHL7XEu7xsWFcA0osnBwZUXznJ3BavxtkjKYHSFP2xK+oiPFPXiKNA7FB9YLS5nPkN oQF9C+nyMdaELUDsLjmS6JqjRBjiEGD6Qj/G0eDMA6jYnjgFOtLNqxppzd8o2g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762044274; a=rsa-sha256; cv=none; b=njIcIPjGHxMXGRAVvsGxuBFHf84BpTbNmfaE10ukIXjwPXEHflDMG2jnGmadouFlFWwJ+V MJcrvh7Z+O7bBn3sBvhr5ue98T+D3cjCS5yFzSfftSqKJTCMPBHrxUlCWYJKcEHsWLfh3/ 0jDDq+aRKshWOYTFCkD1zbg9/UXmUoldn5itLJXWNVFFPFtFUQzNi27i7N1qr+SBloUH/4 +Qyy3w0eYkYr3EiA73EFlf5KrRUA/yhZL2hqrjNG7HCMcQodA0JCYIcrtnbaUwQr4mkK+X JJojcB0Ou+X1g1FwJtWHQVozkKWBZgg5+d70Lj5JSmko4TJTl96VAnfqSNuYZQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4czbZp0lbFz12c7; Sun, 02 Nov 2025 00:44: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 5A20iXEc015881; Sun, 2 Nov 2025 00:44:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A20iXiF015878; Sun, 2 Nov 2025 00:44:33 GMT (envelope-from git) Date: Sun, 2 Nov 2025 00:44:33 GMT Message-Id: <202511020044.5A20iXiF015878@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: c3a3af134668 - main - release: Spell metalog_add_data conventionally List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c3a3af1346684eedf836fb62f874092ce602697e Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=c3a3af1346684eedf836fb62f874092ce602697e commit c3a3af1346684eedf836fb62f874092ce602697e Author: Colin Percival AuthorDate: 2025-11-02 00:16:35 +0000 Commit: Colin Percival CommitDate: 2025-11-02 00:43:22 +0000 release: Spell metalog_add_data conventionally Reviewed by: markj MFC after: 3 days Fixes: f1995d6fc13f ("release: Prepare GCE cloudware images for building as non-root") Differential Revision: https://reviews.freebsd.org/D53530 --- release/tools/gce.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/tools/gce.conf b/release/tools/gce.conf index a7ccfc27a75c..b0a65c2981e1 100644 --- a/release/tools/gce.conf +++ b/release/tools/gce.conf @@ -21,7 +21,7 @@ vm_extra_install_base() { echo 'search google.internal' > ${DESTDIR}/etc/resolv.conf echo 'nameserver 169.254.169.254' >> ${DESTDIR}/etc/resolv.conf echo 'nameserver 8.8.8.8' >> ${DESTDIR}/etc/resolv.conf - metalog_add ./etc/resolv.conf + metalog_add_data ./etc/resolv.conf } vm_extra_pre_umount() { From nobody Sun Nov 2 13:49:17 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4czx0F4m0Jz6FmxL; Sun, 02 Nov 2025 13:49: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4czx0F3ygnz3lSx; Sun, 02 Nov 2025 13:49:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762091357; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zPE1nMiZlHIets+dXiyxRswkP9GzKkcVGOWUh1IACgI=; b=Y//y55ygQV3aBSr7mpDms3UFzNG2upsqyDnsEoETBvLb30n91SjbVH93BQXAU4K8Y7p9zC nDhWKsidv1600NKMviKPWXGhloK0Av4HmSNVmPBoe0gg2MLO+aiVIrBxzuBP6/Bnnuf4f7 Fp9KUOJVrf87PDxQpWlzIFko+bmG54+ka0K/zHc3f8Qx3bFg3HtrKvB6/BQCslKGO5yU6Q aBCkzHoPyA86PhkIlUyKQ5l0w45RN1C9D1RT0usf3Q0C8g5FUh5O9qcB00HGkMWrkDYeNb 5VhRhsD6DOY/vbd7Rg30ol9JbIMcxcBWGdVaSBhZIz1e/jh3NMuovknFKdsDbw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762091357; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zPE1nMiZlHIets+dXiyxRswkP9GzKkcVGOWUh1IACgI=; b=SiGFADcahMyTkxGfTBT10AwE9WZvxsJlfjXJh8DndjzO9phj/uVhrC9uOgOgdhjaQmMljp urLDGDbmZy3E+ucU2ErHbI42NGGrhHzNxii6cb9UcP0YSNvzbr/AA8fbDqC3SkJPh7hOrr KeEd1dBPTgj+rcrFOKd2411byC1jYZFjwNOT5UhZ57O8yDeYkqm5pxQ0e+Z4Sju4870nIU 9/UmBsYeO1N9SgLfqJpXROlsiKJWxtUr1iGpR03IzxVPiAMOQ5rbuErP8tu+Z+KlrSoMPt /Z/zvU3xuipKHo3I5mfY5xD3VahrlwZ7lnaWMqoMeEziT4TLej+qMcAEgqaCUQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762091357; a=rsa-sha256; cv=none; b=EQ4v13eg5tnzBjtZP57AUdmQ553fnCbEQKo312yEHyI1fZvM/4JWJjrulMaTj0g82/wT8W 5Qk/kyNQ5KjqnzBktJNlUcPBuvwJsxJyYE63KywELFrOXQoofCHHJBERN/oEC8fC+FLGeA GQFpNpC0tY9SuaZa5p4QeQPmCWb/cys8axRYuX+StKCIbvoEFTcYT0tbW10EP9yTsvfJv3 XrQdioPt4kx3M8CTF9f6XgVKqudtvqUrehrO4/6zdj3fLL5EC5J9XZBP+xgdoQQGVUU/hb oGMS6A62O9hDWue78LSPucJr1mXzpDV1OCl2tPfKEjdNYmxGU1a9eCMVq2doTw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4czx0F3XL1zCLg; Sun, 02 Nov 2025 13:49: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 5A2DnH25085802; Sun, 2 Nov 2025 13:49:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A2DnHYo085799; Sun, 2 Nov 2025 13:49:17 GMT (envelope-from git) Date: Sun, 2 Nov 2025 13:49:17 GMT Message-Id: <202511021349.5A2DnHYo085799@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 92a533ed1d3c - main - id: Fix WITHOUT_AUDIT build List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 92a533ed1d3c81a772815f90cc9aff9237a4429c Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=92a533ed1d3c81a772815f90cc9aff9237a4429c commit 92a533ed1d3c81a772815f90cc9aff9237a4429c Author: Dag-Erling Smørgrav AuthorDate: 2025-11-02 13:45:12 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-11-02 13:48:12 +0000 id: Fix WITHOUT_AUDIT build Rather than add more ifdefs, trust the compiler to optimize Aflag away. Fixes: 70b72ede982f ("id: Clean up") PR: 290740 MFC after: 3 days --- usr.bin/id/id.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/usr.bin/id/id.c b/usr.bin/id/id.c index 5f9d2670caa3..7ba07daad11e 100644 --- a/usr.bin/id/id.c +++ b/usr.bin/id/id.c @@ -67,19 +67,13 @@ main(int argc, char *argv[]) { struct group *gr; struct passwd *pw; -#ifdef USE_BSM_AUDIT - bool Aflag; -#endif - bool Gflag, Mflag, Pflag; + bool Aflag, Gflag, Mflag, Pflag; bool cflag, dflag, gflag, nflag, pflag, rflag, sflag, uflag; int ch, combo, error, id; const char *myname, *optstr; char loginclass[MAXLOGNAME]; -#ifdef USE_BSM_AUDIT - Aflag = false; -#endif - Gflag = Mflag = Pflag = false; + Aflag = Gflag = Mflag = Pflag = false; cflag = dflag = gflag = nflag = pflag = rflag = sflag = uflag = false; myname = getprogname(); From nobody Sun Nov 2 13:53:47 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4czx5R58QSz6FnXR; Sun, 02 Nov 2025 13:53: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4czx5R4Lwlz3mkW; Sun, 02 Nov 2025 13:53:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762091627; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sGS0lPdO84F38UiO76mQZ3M0v6ADx2aozRpTl4Bl4BY=; b=OZ1ZqdtqnLbb4Al4mE1IsKAjKPMv3BdeD4KUtcchkQXvfBxlJC3hRN1xJMGFsPVt8lPxV/ JOX4s4bJMdwr3RpQHAEATvOTsN+KPjXpr9vl2nkNgbLxWAkXT3R6VFe5JQ5TJ+I0cJFKnI 6flA6LUMNnv19QC2FGNHymWrGaCXIvvTQS85+/vcudW7MEsDE/9wwesx9xNZ6HcySOlQXQ xbMdOFgblp002Hy/yHJegseZ5KBafHzEAtgbWNR97TLNXzfxX4/Ac7OIK2j/aAvnw25Mv0 LdWmsfPOTBYqo/p1azQHYEdkzucF00xuGc4s+NH2O8UV8x9B6nwoC9hpjOibGA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762091627; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sGS0lPdO84F38UiO76mQZ3M0v6ADx2aozRpTl4Bl4BY=; b=I9HA0V9LfFnJK3b0O89rS2EuYdKNj+j2euMVihhXntMs1rrjOqa45OnByASgQgoMKIiVCW NRW0VqnmoG1MfIblIyxFazzpeyvH3YIuUrxNCS8Ui1dBrHsXxUKAHLS4AP8+oS7WYIoCeW HJmxTJ7afnRPpkN8rAjTV94cKiTU6T/ef31JrrgCnGODje5y+b0KOJ1JXLNrtxJAXvttZ8 16VdcE31vTm4CBMjT/zebXsVEu/2wWM7sgRLbU6Cqg2u29yAN4pHDwW3ELk2+Fj5gLgeL4 WiQg0CY2gdu0O4M2eQo4S8nPM3XThSdBoVG3a6ioaVlWKUs8DoAqNn9KgTWYfA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762091627; a=rsa-sha256; cv=none; b=sJ2DDgjyrl12jhDzvkivz0lkZh36mjTq6O1IniCWyaf1o8V3pec1xYTERiDqKtU6Y0aTLz ta2HwBtScB0X3bRcXgtHm7CAg+O/dgoQqEuHKvM9Rgwd5EApZgYUzX8A9SXLSGZtMKaBeA jJnELRLMFmh7ubxmqZyGlKr+rz7NUb285GJIqX1GRfswD2srpFu3WxxOZiM2OrLT9Cbqtu Z9vztWY8kGEAu0WCO8mQ2jnYuu64ajK5YANr2ebwFiJeq3E7WTXtpHDURPencMwn7QFqc2 vTsHDImnz2Dat6K7dNXpqjpXo1M96uJJpBimJP71j/I+T/NCPZzra6XoeaKuHQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4czx5R3yDhzChj; Sun, 02 Nov 2025 13:53: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 5A2DrlLT003015; Sun, 2 Nov 2025 13:53:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A2Drl8X003012; Sun, 2 Nov 2025 13:53:47 GMT (envelope-from git) Date: Sun, 2 Nov 2025 13:53:47 GMT Message-Id: <202511021353.5A2Drl8X003012@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: a38c2f99f81c - main - tzcode: Fix early tz change detection List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a38c2f99f81c2fc35c8ca209931c1c46e3e81023 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=a38c2f99f81c2fc35c8ca209931c1c46e3e81023 commit a38c2f99f81c2fc35c8ca209931c1c46e3e81023 Author: Dag-Erling Smørgrav AuthorDate: 2025-11-02 13:51:42 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-11-02 13:51:42 +0000 tzcode: Fix early tz change detection Assume tzdata is not fresh if last_checked is zero, as comparing the current time to last_checked less than __tz_change_interval after boot may produce a false negative. While here, invert the return value from tzdata_is_fresh() to better match its new name (it was previously called recheck_tzdata(), so zero for fresh and non-zero for stale made sense, but it doesn't now). PR: 269207 MFC after: 3 days Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D53502 --- contrib/tzcode/localtime.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/contrib/tzcode/localtime.c b/contrib/tzcode/localtime.c index 1668475ea646..58099d234e2b 100644 --- a/contrib/tzcode/localtime.c +++ b/contrib/tzcode/localtime.c @@ -1583,15 +1583,15 @@ tzdata_is_fresh(void) struct timespec now; if (clock_gettime(CLOCK_MONOTONIC, &now) < 0) - return 0; + return 1; - if ((now.tv_sec - last_checked >= __tz_change_interval) || - (last_checked > now.tv_sec)) { + if (last_checked == 0 || last_checked > now.tv_sec || + now.tv_sec - last_checked >= __tz_change_interval) { last_checked = now.tv_sec; - return 1; + return 0; } - return 0; + return 1; } #endif /* DETECT_TZ_CHANGES */ @@ -1642,7 +1642,7 @@ tzset_unlocked_name(char const *name) ? lcl_is_set < 0 : 0 < lcl_is_set && strcmp(lcl_TZname, name) == 0) #ifdef DETECT_TZ_CHANGES - if (tzdata_is_fresh() == 0) + if (tzdata_is_fresh()) #endif /* DETECT_TZ_CHANGES */ return; # ifdef ALL_STATE From nobody Sun Nov 2 15:18:06 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4czyyk3qWRz6Fw4k; Sun, 02 Nov 2025 15:18:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4czyyk35mFz3vv7; Sun, 02 Nov 2025 15:18:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762096686; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+4Xth/oqvUq2KDjhvNdaCD0vyP+BN6XTS/7HiqxojNo=; b=MONnTZhkB/ZxGFFM38rMjzfZNwimvO7KZvZ2x/LL7cxi8VP4MuwEUv82JHzlMtwEnnNaDM Tu+IuzndwP1kPn9XARv3Rz+hGRsjMyjfQSyh2xgfvrbCVP0gw7qXtWk7WrJ4S4YOmxp3Zd J4ATBLb7zeGpnvLDB23kb8Ws6PbdH+VMoU0YxYORDYnkIB1on7AmsSu2u3UZl5EqrxFnDB FFUcmxfQN3MZE4nthmGuArxiKSRVPiotsmUhKXLXQBTEXOaRMkl3nLn9H1B9DBo1+RWrUf FK6tn//WLWUEUePVasHwLs+R1IhDa8kIdBQruAoY/4bkbv4D6urpWny/wTe06w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762096686; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+4Xth/oqvUq2KDjhvNdaCD0vyP+BN6XTS/7HiqxojNo=; b=KEf3gOyT40PcvuHReYuWUjAH0/xKNU3CHtksblH02yLdMksvfyG9fQEkDn4hRthpu9IG3Z IwW+R/dvyvn7TQ4QlQAghlE9hUr9ftBsSLu4qzrZw6EmqPJemhncXMIQxaz2oeg6ABpXxk i5WbdFht9FcppjotPw8cFPdNVuBUIUdUL99RwRbaXIEXj5BiT9J6orOgQXwi5PQM7J/Wkr jmEJdR+BlmSSd0SHYVQAc3xnIzW+foeYFf5H8vvWMbBX4MWLA+kMilpzoLfqcawR7h2N7P VBx1KZKQKoNBhb3JaAOC85txQgJ2M+IAXgVfNAHL9NVHXSInMKJCBjirgqcANg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762096686; a=rsa-sha256; cv=none; b=GIIWLm8AafY7TjLMLxqxO1B/ihf6LHrBqG8rshDpxEs1VsY/ogrQZSbQawStTYotv5gR17 H8EMbHLMuOr1kbt5tOCj/qg1ED8vfqe1IYw39v8sY2dZHyQODUoWssfA8JyYSJE3WGVWIh o79YpOh1UZ2rVjh7ruXoE/F19sRBW5DwkcBR1XJSj4Sgq3LXeD2DiULYqAIy9sCDwdO4qI 2dDlapDz74dnCCWh4WJCJOSd3HyKYgy2Qqp91AqqR/Nrom9VcXezlKKfi5JcMqfSQZ2Z/M PyAxXPmDjUv6NxQ94k8T44FUnth/KJQiAyrRWglgu6p3Z6oTIh25oZKRZgRwxQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4czyyk2Nz7zWn4; Sun, 02 Nov 2025 15:18:06 +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 5A2FI6Ps056753; Sun, 2 Nov 2025 15:18:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A2FI6dG056750; Sun, 2 Nov 2025 15:18:06 GMT (envelope-from git) Date: Sun, 2 Nov 2025 15:18:06 GMT Message-Id: <202511021518.5A2FI6dG056750@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Juraj Lutter Subject: git: 2deeed061b14 - main - sockstat(1): Add "-F" parameter List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: otis X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2deeed061b1473a4230211c6562a533b76ce846c Auto-Submitted: auto-generated The branch main has been updated by otis: URL: https://cgit.FreeBSD.org/src/commit/?id=2deeed061b1473a4230211c6562a533b76ce846c commit 2deeed061b1473a4230211c6562a533b76ce846c Author: Juraj Lutter AuthorDate: 2025-10-29 20:48:21 +0000 Commit: Juraj Lutter CommitDate: 2025-11-02 15:17:47 +0000 sockstat(1): Add "-F" parameter Add "-F" parameter that, when specified, instructs sockstat(1) to only display sockets for username/UID specified. For consistency with "-j", the last occurence of "-F" is used. Reviewed by: asomers Approved by: asomers Differential Revision: https://reviews.freebsd.org/D53458 --- usr.bin/sockstat/main.c | 170 +++++++++++++++++++++++++++++++++----------- usr.bin/sockstat/sockstat.1 | 7 +- 2 files changed, 136 insertions(+), 41 deletions(-) diff --git a/usr.bin/sockstat/main.c b/usr.bin/sockstat/main.c index 07663e54534d..1f174d827e1a 100644 --- a/usr.bin/sockstat/main.c +++ b/usr.bin/sockstat/main.c @@ -88,6 +88,7 @@ static bool opt_A; /* Show kernel address of pcb */ static bool opt_b; /* Show BBLog state */ static bool opt_C; /* Show congestion control */ static bool opt_c; /* Show connected sockets */ +static bool opt_F; /* Show sockets for selected user only */ static bool opt_f; /* Show FIB numbers */ static bool opt_I; /* Show spliced socket addresses */ static bool opt_i; /* Show inp_gencnt */ @@ -115,6 +116,12 @@ static size_t default_numprotos = nitems(default_protos); static int *protos; /* protocols to use */ static size_t numprotos; /* allocated size of protos[] */ +/* + * Show sockets for user username or UID specified + */ +static char *filter_user_optarg = NULL; /* saved optarg for username/UID resolving */ +static uid_t filter_user_uid; /* UID to show sockets for */ + struct addr { union { struct sockaddr_storage address; @@ -217,6 +224,18 @@ _enforce_ksize(size_t received_size, size_t expected_size, const char *struct_na } #define enforce_ksize(_sz, _struct) (_enforce_ksize(_sz, sizeof(_struct), #_struct)) +static inline bool +filtered_uid(uid_t i_uid) +{ + return ((i_uid) == filter_user_uid); +} + +static inline bool +need_nosocks(void) +{ + return !(opt_F || (opt_j >= 0)); +} + static int get_proto_type(const char *proto) { @@ -758,7 +777,8 @@ gather_inet(int proto) if (sock->socket != 0) RB_INSERT(socks_t, &socks, sock); else - SLIST_INSERT_HEAD(&nosocks, sock, socket_list); + if (need_nosocks()) + SLIST_INSERT_HEAD(&nosocks, sock, socket_list); } out: free(buf); @@ -862,6 +882,8 @@ getfiles(void) struct xfile *xfiles; size_t len, olen; + int filenum = 0; + olen = len = sizeof(*xfiles); if ((xfiles = malloc(len)) == NULL) xo_err(1, "malloc()"); @@ -880,14 +902,23 @@ getfiles(void) if ((files = malloc(nfiles * sizeof(struct file))) == NULL) xo_err(1, "malloc()"); + /* Fill files structure, optionally for specified user */ for (int i = 0; i < nfiles; i++) { - files[i].xf_data = xfiles[i].xf_data; - files[i].xf_pid = xfiles[i].xf_pid; - files[i].xf_uid = xfiles[i].xf_uid; - files[i].xf_fd = xfiles[i].xf_fd; - RB_INSERT(files_t, &ftree, &files[i]); + if (opt_F && !filtered_uid(xfiles[i].xf_uid)) + continue; + files[filenum].xf_data = xfiles[i].xf_data; + files[filenum].xf_pid = xfiles[i].xf_pid; + files[filenum].xf_uid = xfiles[i].xf_uid; + files[filenum].xf_fd = xfiles[i].xf_fd; + RB_INSERT(files_t, &ftree, &files[filenum]); + filenum++; } + /* Adjust global nfiles to match the number of files we + * actually filled into files[] array + */ + nfiles = filenum; + free(xfiles); } @@ -1584,6 +1615,24 @@ display_sock(struct sock *s, struct col_widths *cw, char *buf, size_t bufsize) static void display(void) { + static const char *__HDR_USER="USER", + *__HDR_COMMAND="COMMAND", + *__HDR_PID="PID", + *__HDR_FD="FD", + *__HDR_PROTO="PROTO", + *__HDR_LOCAL_ADDRESS="LOCAL ADDRESS", + *__HDR_FOREIGN_ADDRESS="FOREIGN ADDRESS", + *__HDR_PCB_KVA="PCB KVA", + *__HDR_FIB="FIB", + *__HDR_SPLICE_ADDRESS="SPLICE ADDRESS", + *__HDR_ID="ID", + *__HDR_ENCAPS="ENCAPS", + *__HDR_PATH_STATE="PATH STATE", + *__HDR_CONN_STATE="CONN STATE", + *__HDR_BBLOG_STATE="BBLOG STATE", + *__HDR_STACK="STACK", + *__HDR_CC="CC"; + struct passwd *pwd; struct file *xf; struct sock *s; @@ -1598,23 +1647,23 @@ display(void) if (!is_xo_style_encoding) { cw = (struct col_widths) { - .user = strlen("USER"), + .user = strlen(__HDR_USER), .command = 10, - .pid = strlen("PID"), - .fd = strlen("FD"), - .proto = strlen("PROTO"), - .local_addr = opt_w ? strlen("LOCAL ADDRESS") : 21, - .foreign_addr = opt_w ? strlen("FOREIGN ADDRESS") : 21, + .pid = strlen(__HDR_PID), + .fd = strlen(__HDR_FD), + .proto = strlen(__HDR_PROTO), + .local_addr = opt_w ? strlen(__HDR_LOCAL_ADDRESS) : 21, + .foreign_addr = opt_w ? strlen(__HDR_FOREIGN_ADDRESS) : 21, .pcb_kva = 18, - .fib = strlen("FIB"), - .splice_address = strlen("SPLICE ADDRESS"), - .inp_gencnt = strlen("ID"), - .encaps = strlen("ENCAPS"), - .path_state = strlen("PATH STATE"), - .conn_state = strlen("CONN STATE"), - .bblog_state = strlen("BBLOG STATE"), - .stack = strlen("STACK"), - .cc = strlen("CC"), + .fib = strlen(__HDR_FIB), + .splice_address = strlen(__HDR_SPLICE_ADDRESS), + .inp_gencnt = strlen(__HDR_ID), + .encaps = strlen(__HDR_ENCAPS), + .path_state = strlen(__HDR_PATH_STATE), + .conn_state = strlen(__HDR_CONN_STATE), + .bblog_state = strlen(__HDR_BBLOG_STATE), + .stack = strlen(__HDR_STACK), + .cc = strlen(__HDR_CC), }; calculate_column_widths(&cw); } else @@ -1625,34 +1674,34 @@ display(void) xo_open_list("socket"); if (!opt_q) { xo_emit("{T:/%-*s} {T:/%-*s} {T:/%*s} {T:/%*s} {T:/%-*s} " - "{T:/%-*s} {T:/%-*s}", cw.user, "USER", cw.command, - "COMMAND", cw.pid, "PID", cw.fd, "FD", cw.proto, - "PROTO", cw.local_addr, "LOCAL ADDRESS", - cw.foreign_addr, "FOREIGN ADDRESS"); + "{T:/%-*s} {T:/%-*s}", cw.user, __HDR_USER, cw.command, + __HDR_COMMAND, cw.pid, __HDR_PID, cw.fd, __HDR_FD, cw.proto, + __HDR_PROTO, cw.local_addr, __HDR_LOCAL_ADDRESS, + cw.foreign_addr, __HDR_FOREIGN_ADDRESS); if (opt_A) - xo_emit(" {T:/%-*s}", cw.pcb_kva, "PCB KVA"); + xo_emit(" {T:/%-*s}", cw.pcb_kva, __HDR_PCB_KVA); if (opt_f) /* RT_MAXFIBS is 65535. */ - xo_emit(" {T:/%*s}", cw.fib, "FIB"); + xo_emit(" {T:/%*s}", cw.fib, __HDR_FIB); if (opt_I) xo_emit(" {T:/%-*s}", cw.splice_address, - "SPLICE ADDRESS"); + __HDR_SPLICE_ADDRESS); if (opt_i) - xo_emit(" {T:/%*s}", cw.inp_gencnt, "ID"); + xo_emit(" {T:/%*s}", cw.inp_gencnt, __HDR_ID); if (opt_U) - xo_emit(" {T:/%*s}", cw.encaps, "ENCAPS"); + xo_emit(" {T:/%*s}", cw.encaps, __HDR_ENCAPS); if (opt_s) { if (show_path_state) xo_emit(" {T:/%-*s}", cw.path_state, - "PATH STATE"); - xo_emit(" {T:/%-*s}", cw.conn_state, "CONN STATE"); + __HDR_PATH_STATE); + xo_emit(" {T:/%-*s}", cw.conn_state, __HDR_CONN_STATE); } if (opt_b) - xo_emit(" {T:/%-*s}", cw.bblog_state, "BBLOG STATE"); + xo_emit(" {T:/%-*s}", cw.bblog_state, __HDR_BBLOG_STATE); if (opt_S) - xo_emit(" {T:/%-*s}", cw.stack, "STACK"); + xo_emit(" {T:/%-*s}", cw.stack, __HDR_STACK); if (opt_C) - xo_emit(" {T:/%-*s}", cw.cc, "CC"); + xo_emit(" {T:/%-*s}", cw.cc, __HDR_CC); xo_emit("\n"); } cap_setpassent(cappwd, 1); @@ -1684,7 +1733,7 @@ display(void) xo_close_instance("socket"); } } - if (opt_j >= 0) + if (!need_nosocks()) goto out; SLIST_FOREACH(s, &nosocks, socket_list) { if (!check_ports(s)) @@ -1775,11 +1824,44 @@ jail_getvnet(int jid) return (vnet); } +/* + * Parse username and/or UID + */ +static bool +parse_filter_user(void) +{ + struct passwd *pwd; + char *ep; + uid_t uid; + bool rv = false; + + uid = (uid_t)strtol(filter_user_optarg, &ep, 10); + + /* Open and/or rewind capsicumized password file */ + cap_setpassent(cappwd, 1); + + if (*ep == '\0') { + /* We have an UID specified, check if it's valid */ + if ((pwd = cap_getpwuid(cappwd, uid)) == NULL) + goto out; + filter_user_uid = uid; + } else { + /* Check if we have a valid username */ + if ((pwd = cap_getpwnam(cappwd, filter_user_optarg)) == NULL) + goto out; + filter_user_uid = pwd->pw_uid; + } + + rv = true; +out: + return (rv); +} + static void usage(void) { xo_error( -"usage: sockstat [--libxo ...] [-46AbCcfIiLlnqSsUuvw] [-j jid] [-p ports]\n" +"usage: sockstat [--libxo ...] [-46AbCcfIiLlnqSsUuvw] [-F uid/username] [-j jid] [-p ports]\n" " [-P protocols]\n"); exit(1); } @@ -1789,8 +1871,8 @@ main(int argc, char *argv[]) { cap_channel_t *capcas; cap_net_limit_t *limit; - const char *pwdcmds[] = { "setpassent", "getpwuid" }; - const char *pwdfields[] = { "pw_name" }; + const char *pwdcmds[] = { "setpassent", "getpwuid", "getpwnam" }; + const char *pwdfields[] = { "pw_name", "pw_uid" }; int protos_defined = -1; int o, i, err; @@ -1803,7 +1885,7 @@ main(int argc, char *argv[]) is_xo_style_encoding = true; } opt_j = -1; - while ((o = getopt(argc, argv, "46AbCcfIij:Llnp:P:qSsUuvw")) != -1) + while ((o = getopt(argc, argv, "46AbCcF:fIij:Llnp:P:qSsUuvw")) != -1) switch (o) { case '4': opt_4 = true; @@ -1823,6 +1905,11 @@ main(int argc, char *argv[]) case 'c': opt_c = true; break; + case 'F': + /* Save optarg for later use when we enter capabilities mode */ + filter_user_optarg = optarg; + opt_F = true; + break; case 'f': opt_f = true; break; @@ -1934,6 +2021,9 @@ main(int argc, char *argv[]) if (cap_pwd_limit_fields(cappwd, pwdfields, nitems(pwdfields)) < 0) xo_err(1, "Unable to apply pwd commands limits"); + if (opt_F && !parse_filter_user()) + xo_errx(1, "Invalid username or UID specified"); + if ((!opt_4 && !opt_6) && protos_defined != -1) opt_4 = opt_6 = true; if (!opt_4 && !opt_6 && !opt_u) diff --git a/usr.bin/sockstat/sockstat.1 b/usr.bin/sockstat/sockstat.1 index 1498fb1d88f7..b0fae81ee566 100644 --- a/usr.bin/sockstat/sockstat.1 +++ b/usr.bin/sockstat/sockstat.1 @@ -25,7 +25,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 October 14, 2025 +.Dd October 29, 2025 .Dt SOCKSTAT 1 .Os .Sh NAME @@ -35,6 +35,7 @@ .Nm .Op Fl -libxo .Op Fl 46AbCcfIiLlnqSsUuvw +.Op Fl F Ar user .Op Fl j Ar jail .Op Fl p Ar ports .Op Fl P Ar protocols @@ -73,6 +74,10 @@ Display the congestion control module, if applicable. This is currently only implemented for TCP. .It Fl c Show connected sockets. +.It Fl F Ar user +Show sockets for specified +.Ar user +(user name or UID) only. .It Fl f Show the FIB number of each socket. .It Fl I From nobody Sun Nov 2 17:14:19 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d01Xq5fbZz6G6Cd; Sun, 02 Nov 2025 17:14: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d01Xq56vJz3DK8; Sun, 02 Nov 2025 17:14:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762103659; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ukgR6B60S1A05ebBkZiShTrh0qinKXYZLn+h6vZ1rHM=; b=q0zq8ibDBJGgWS00Mkra+f3cMf2GmewJTnvjmL6oyD0EJsxJZ478MbD3A9Fi2wIHrbMCxY XJtuhqhJxzEusG1tkaQeEQvVXvTqEzHZftNicDkdBsKaAwdC2KKt0vMPwVJqWqLdperyO3 pK/hl8kDFqsHncqnHORjc89C56oUPWeUByp7IEhX38EqMgVa5wZL/HFLL30GdqfBxKfNks 5VBZCIlp8bXefZ5edfBGNk1M+SLE5IFkw4790OwePAFeT5tb/je38fD0hzpIiHlOo6mNKA QvVvzq1c+mPnguxK1JacODHtQq6lCSIgFbJcm/z3QU2XnJh5IpgZdUZZ0HLv3g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762103659; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ukgR6B60S1A05ebBkZiShTrh0qinKXYZLn+h6vZ1rHM=; b=F4qxz80cyhTPrQxkLVTRIcONbLwCZpYdMhJr90Dw2qQc5YMOnn0TgwkyF2O/qkzhsQHe7u OoB7AG7Y/x7s6E0yCt/uaKL5+fGyF4w8AKCNiFquPVNtQ2wLKIuwX41BnwpZszVaDe7G+2 NvrbvbxxHVMlm+GPhZEtAZ0Cj8y1HPnqZQW/aeGDYpFo2lyGNwDsfTUJaDnZhUkt/tlZpG /RJiUZi2Nwu/0UEufxb2N8HDGrhvHXlbL98DClRv8d4xDEH2cvLKChTd3y7c0BWeGg+XI4 W/oqRDkrWYYBHsfJqxx+JEFlujf64AJMejTSAU8jBSNvPICT28DlJtwZLSeYiQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762103659; a=rsa-sha256; cv=none; b=R9lY2fyG2k17whnI2iDINrmtO9dn2EoGQpvxpAB/1WwRaf779WMt+lCausB6qXJ1kv6fF+ A0uJAwM7zZMqncBq/u7YajCWZGAYbrakvmn5fOqedK4ExLFL/Jtkhy+G3xGvhZJ1Zzp+Ex 4ejZA8xBOatTwbMphqZWWYmijjHENIjXdgQnYAzJ2ERg2NQ1OzmXaGm974i0Mz+9OT+8Jo 5F2sWE4jUhCJErwRbUHV0PbJP0wUtBpqeCmbJQldELolnWc7/UgqBujKv2B5cUarkvCfy1 osKGkMc0apb1UAXR25GQwAVvPvIfCVqhqcqr8JKfe438GaIfxljxis7pmlnVsQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d01Xq4XT9zbjp; Sun, 02 Nov 2025 17:14: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 5A2HEJNW080418; Sun, 2 Nov 2025 17:14:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A2HEJ2X080415; Sun, 2 Nov 2025 17:14:19 GMT (envelope-from git) Date: Sun, 2 Nov 2025 17:14:19 GMT Message-Id: <202511021714.5A2HEJ2X080415@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 5568fba657c2 - main - mld6: Properly initialize MLD packet options List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5568fba657c260286b9f1f1e837ab83ef6ce572d Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=5568fba657c260286b9f1f1e837ab83ef6ce572d commit 5568fba657c260286b9f1f1e837ab83ef6ce572d Author: Andrey V. Elsukov AuthorDate: 2025-11-02 15:56:14 +0000 Commit: Mark Johnston CommitDate: 2025-11-02 17:10:20 +0000 mld6: Properly initialize MLD packet options After commit 530c2c30b0c7 we need to set flags to ensure that hop-by-hop and hop limit options are included. PR: 290407 Reviewed by: zlei, markj MFC after: 3 days Fixes: 530c2c30b0c7 ("ip6_output: Reduce cache misses on pktopts") --- sys/netinet6/mld6.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/netinet6/mld6.c b/sys/netinet6/mld6.c index a825658bd9ee..5dfe48908a4f 100644 --- a/sys/netinet6/mld6.c +++ b/sys/netinet6/mld6.c @@ -3267,6 +3267,7 @@ mld_init(void *unused __unused) mld_po.ip6po_hbh = &mld_ra.hbh; mld_po.ip6po_prefer_tempaddr = IP6PO_TEMPADDR_NOTPREFER; mld_po.ip6po_flags = IP6PO_DONTFRAG; + mld_po.ip6po_valid = IP6PO_VALID_HLIM | IP6PO_VALID_HBH; callout_init(&mldslow_callout, 1); callout_reset(&mldslow_callout, hz / MLD_SLOWHZ, mld_slowtimo, NULL); From nobody Sun Nov 2 17:45:35 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d02Dv6PF6z6F9KZ; Sun, 02 Nov 2025 17: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d02Dv5d5Fz3Jdv; Sun, 02 Nov 2025 17: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=1762105535; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7plbT666F6/vcISXoUC0OgEPK5m6cbIi+N+KUt9rexY=; b=Q1qZM7lPku5pyGhh7uoIF30zqSaRz112chv/1pj/cIPaCSmBHuJlN7Ujjn0KuOeK8aHkzT idPBrF0vc6hwBZkmKijbdch7Zj3nYcNAv/IYAE3z3Oeq+FscqAknJEkT7vPX3bJ8HsV14x PvXgY8qG55oHutVmCpGfE7mLDf7hDLx+EQqoh2P5fHv091U3VhUKtuF1FrMFiuuBIADakq QURVFzRmTDBRc42192aGM15SPvN0yubwIIAkmUyt3eTuP3r5Tb8DrCNratn/Ykf0OLwMjJ mulUEVDRA1IxexKgA87QB5KLrCgzWvU0iObF+1SETJxi3wfrS+WAb/xIaNC8/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762105535; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7plbT666F6/vcISXoUC0OgEPK5m6cbIi+N+KUt9rexY=; b=kHne9oJUH5HMCW7NYpCcnXn9lYPIw9FImDmQKUvLPHK2bywFjhI+17L0Su/3uYmitcDWTB rB4dAYIQh93klBd0b6fFloVE2aL6Abjo2J5e8rIyoEL+RH/H3FqcbZFB31+Ollf13ZETII 71vHZPNvT73LBw3Rg+Bx1pu3G8LLsnT58/O27Ha2uy+zBsuvykrSxLy2Ml5bQ8sT+LvoVH Q4QYoW5yToWs02+YXZsXvfwmP/cj4gGJJwWahm52o4Q2+CWopep5Mr/dhVqx7fHdCTgfpi 65H6N+wrx/fQ+4tEemaPzcvdeARRPZYmfpb+RWdPfM4RAEYvS4CWDKfVKqurwg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762105535; a=rsa-sha256; cv=none; b=FBBU11s2lP9WGgUkZ5SIDa5K2vicfB/TRFWbdcO5cEEdLJxwOuOk+ch8xr5r0icdc6fBRO yRQ7POjJOr8FvLX18hI7oM4BhG5KzYtfFNP9mgPPH+W6iYxmqn3KrWPyr2i2S/4/8p/bVU e/OQPMbb4XFtcfZP/cj2D/GPArJZ+9CCirFOzI1hUn/wAa/PB+e9OQuTUNWQb/tlf31p0L 8NQmjDUBQsGAZaMULO+XOME83xzLoPyEP/vrkVRB3nBgXYS7orn+FatFmTY1odLwgbMrNY cCkT7Lff2aBk24HHjxS3o6+dKsq7pFK868KACmACxNEfUfqh6yCVU4D1JKFllA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d02Dv4xNmzcQV; Sun, 02 Nov 2025 17: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 5A2HjZMB036656; Sun, 2 Nov 2025 17: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 5A2HjZOj036653; Sun, 2 Nov 2025 17:45:35 GMT (envelope-from git) Date: Sun, 2 Nov 2025 17:45:35 GMT Message-Id: <202511021745.5A2HjZOj036653@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: dcb6706ba494 - main - Makefile.incl1: .WAIT before distribute in etc List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dcb6706ba494f34e2a2ce97e5c5f2867b9e1f5ef Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=dcb6706ba494f34e2a2ce97e5c5f2867b9e1f5ef commit dcb6706ba494f34e2a2ce97e5c5f2867b9e1f5ef Author: Colin Percival AuthorDate: 2025-11-02 04:22:26 +0000 Commit: Colin Percival CommitDate: 2025-11-02 17:45:31 +0000 Makefile.incl1: .WAIT before distribute in etc In order to make sure that man pages are all installed before we run makewhatis to generate mandoc.db files, we have long placed etc at the end of the list of subdirectories being recursed into by the build. In order to support installworld -jN, a .WAIT was more recently added here. With the recent adoption by the release engineering team of parallel *release* builds (aka 'make release -jN') it is now also necessary to add the same .WAIT before recursing for the 'distribute' target, as we otherwise end up with distribution sets containing incomplete mandoc.db files. Reviewed by: bdrewery PR: 289683 MFC after: 3 days Sponsored by: https://www.patreon.com/cperciva Differential Revision: https://reviews.freebsd.org/D53533 --- Makefile.inc1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index e341599ac505..81af336ecfa2 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -471,7 +471,7 @@ SUBDIR+= ${_DIR} # by calling 'makedb' in share/man. This is only relevant for # install/distribute so they build the whatis file after every manpage is # installed. -.if make(installworld) || make(install) +.if make(installworld) || make(install) || make(distributeworld) || make(distribute) SUBDIR+=.WAIT .endif SUBDIR+=etc From nobody Sun Nov 2 18:17:14 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d02xR0fG3z6FDRf; Sun, 02 Nov 2025 18:17:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d02xQ5lMMz3Q9V; Sun, 02 Nov 2025 18:17:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762107434; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VymsIlmD3Hy4OiSZUAXQRaQjg18Y2w3jLDoineb+9cc=; b=j+uGg3kxmB7NDmGpPWW5TqiAJjbzQbpRss0thyPQ7NmqUZ1OTCkdsTaN25Z7FZ9UPq2607 nkwnAZaVw/4I+Gs+sfeGllsldqqB/5dnGQRmdUfhuUkHHiXufKUCW88LSdLyZfCbiItq4v cBoOvjrTDNf569NmdMmSCUzfKiI1q+ak2WiUwGTXjx4tP7WwaBvL2Ge8nN8HL3mfP8quTk fGySzFrrhJVZk0vbsdZto/XFRDHS/RgfNs4JhSZgBCpBM0YLBKqQhiCZ6Z+4Jz+ezLo5Ub I0eOXXLaq21bPhjAsx0M226k/mUct5NLB98RzAQkYH4J3G4027GCW5l6Dueogg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762107434; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VymsIlmD3Hy4OiSZUAXQRaQjg18Y2w3jLDoineb+9cc=; b=M5KY+9qmzxsafA8GSwMcHekmtO8l25M0p7kj1CN19759AX2rhum4kHL5W/Carn20SFMM6B hjwcePZIixtmZ4B6Z7gostC/FCbEpR3xvuTruHbbvyK6Qu47MOWGaXesAiOMsle3/bcOJN OQMMfIYVWLPa/wIDlVIaDtsos5ZU6oR/m0l5LbG7CiCzbjtD/k9Zc95HCect13OxTV4SI+ 8drJmLArc6qdMQq25w+LCJCPChxGtX8+cQQjv9a/shsQ8qz7Bp9nXBAdMDze7kz8GXSL1l OQ+fpgUEos02+LJnvtJStfKUANDD2oUNDkC1dmleO0bmpU33GYMPln0OEirV/w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762107434; a=rsa-sha256; cv=none; b=HcFvEmGqru4mMAwQsDFOU7lDsRMq4A9nRbWrkylKyc1Ty8wf/j5v7BDZOrS+runN/Flw1X OdQsgr0lYB+ZJAE5IaOSDiTtAVoRZGA2ZOVHE8sCaoUWMzd0/2cHEgKvUzkrV/7VTbagUx 8w2Uh+1azOerBaTL1ue8LAkbhF3IpCfF8r2ZML6+g5uBQNqbpzSSK1Izguhz+mg0ZHZ6cr 9i9Kzqjh66r7IdgRk1Bx3X367t8HhMxdw+0kyzxCGoH7Xbq1feTxTlYnngZlheIzyyG7AF megnIGHOhLHlftIjbqFj11/xnhLWGEnvBcVbA2568+DxIdQYxOEWqfrBzTEPLw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d02xQ5FL3zcqQ; Sun, 02 Nov 2025 18:17: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 5A2IHEZF093843; Sun, 2 Nov 2025 18:17:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A2IHEPh093840; Sun, 2 Nov 2025 18:17:14 GMT (envelope-from git) Date: Sun, 2 Nov 2025 18:17:14 GMT Message-Id: <202511021817.5A2IHEPh093840@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: f4315ff8b3fe - main - kern: Fix credentials leaks on RACCT but no RCTL List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f4315ff8b3fee71eb0098864a84618f2f8ba85d5 Auto-Submitted: auto-generated The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=f4315ff8b3fee71eb0098864a84618f2f8ba85d5 commit f4315ff8b3fee71eb0098864a84618f2f8ba85d5 Author: Olivier Certner AuthorDate: 2025-10-29 16:46:39 +0000 Commit: Olivier Certner CommitDate: 2025-11-02 18:15:30 +0000 kern: Fix credentials leaks on RACCT but no RCTL Affected system calls: setuid(), setreuid(), setresuid(), jail_attach(), setloginclass(). In these system calls, the crhold() calls that, on RACCT, make the just-installed process credentials survive a concurrent change of the same credentials just after PROC_UNLOCK() were not matched by a corresponding crfree() when RCTL is off. In fact, in that latter case, they are simply not necessary, so wrap them with '#ifdef RCTL' stances. 'kern_rctl.c' causes a compile error if RACCT is not defined but RCTL is, so ease reading by not nesting '#ifdef's. MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D53456 --- sys/kern/kern_jail.c | 2 ++ sys/kern/kern_loginclass.c | 2 ++ sys/kern/kern_prot.c | 6 ++++++ 3 files changed, 10 insertions(+) diff --git a/sys/kern/kern_jail.c b/sys/kern/kern_jail.c index 267b60ffb5bc..523b7e314a10 100644 --- a/sys/kern/kern_jail.c +++ b/sys/kern/kern_jail.c @@ -3047,6 +3047,8 @@ do_jail_attach(struct thread *td, struct prison *pr, int drflags) setsugid(p); #ifdef RACCT racct_proc_ucred_changed(p, oldcred, newcred); +#endif +#ifdef RCTL crhold(newcred); #endif PROC_UNLOCK(p); diff --git a/sys/kern/kern_loginclass.c b/sys/kern/kern_loginclass.c index 55db6c28a1db..0c111c4f78d8 100644 --- a/sys/kern/kern_loginclass.c +++ b/sys/kern/kern_loginclass.c @@ -225,6 +225,8 @@ sys_setloginclass(struct thread *td, struct setloginclass_args *uap) proc_set_cred(p, newcred); #ifdef RACCT racct_proc_ucred_changed(p, oldcred, newcred); +#endif +#ifdef RCTL crhold(newcred); #endif PROC_UNLOCK(p); diff --git a/sys/kern/kern_prot.c b/sys/kern/kern_prot.c index a4c5bcc52529..df725cfebd97 100644 --- a/sys/kern/kern_prot.c +++ b/sys/kern/kern_prot.c @@ -982,6 +982,8 @@ sys_setuid(struct thread *td, struct setuid_args *uap) proc_set_cred(p, newcred); #ifdef RACCT racct_proc_ucred_changed(p, oldcred, newcred); +#endif +#ifdef RCTL crhold(newcred); #endif PROC_UNLOCK(p); @@ -1390,6 +1392,8 @@ sys_setreuid(struct thread *td, struct setreuid_args *uap) proc_set_cred(p, newcred); #ifdef RACCT racct_proc_ucred_changed(p, oldcred, newcred); +#endif +#ifdef RCTL crhold(newcred); #endif PROC_UNLOCK(p); @@ -1536,6 +1540,8 @@ sys_setresuid(struct thread *td, struct setresuid_args *uap) proc_set_cred(p, newcred); #ifdef RACCT racct_proc_ucred_changed(p, oldcred, newcred); +#endif +#ifdef RCTL crhold(newcred); #endif PROC_UNLOCK(p); From nobody Sun Nov 2 18:17:15 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d02xS262fz6FDJV; Sun, 02 Nov 2025 18:17: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d02xR6c3wz3QMy; Sun, 02 Nov 2025 18:17:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762107436; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=arG7TPXqoYFjtXNIN5du+c9GI3/RkfRHM1JfG/WYS+Q=; b=EULKNkSmhSA2wtlCKchKW9Jkac1Mqp3kW5eYJesBUuKZZhmnq5SR02TOa4aU3H4BaZ3myR sJnRb1c8ott8mj9O+IfbdW1jQZkWCJsts2EOWs6k5Wn+Q/Uzqnvt2dQQVU4vRiDB82u2TM ndLqEyS2ql8Emg5xXmJDt+FTnICr8lRnG4QA1sbcuGx2/TYuUTICfC4phmPAI7K0U3gU3C dmDqk3pPHg4k/SPER5CPaiudIi9gAiFDGINSxoutmW/Su4jE9MuHN/R3c38QR6+3LS9a3f aSl8rGyaKwftwEUUtuUFT/S39jnoh+duna2RDpO6glAX4lam89H572bzPS6C5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762107436; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=arG7TPXqoYFjtXNIN5du+c9GI3/RkfRHM1JfG/WYS+Q=; b=erIS3Z8j+wOynT/1e2Kzr4Mxx/xySSYI0bNw8XdSRFj+10cKpW1yhdbreAyrWLRmS24ziJ vcrNx92ZBODnRMGpUuOM+zR5M4ih+4SkIaWDXGdrnhyWRBe7sXcXA2GFIVyBJj8MM0Q/uw CMpid8gichASirOYeO5zzWEm6xpzYnEI4G0C9mnDb5czTR7GB55ar/ny6VTBGmPRqKivA4 9Blo9C1ClnAAWJbeWaBvJmJFti7vqlZBRn7PgPj4d2iBxyqYuUJ4N2k35DstAW2xpy6ZfK fYeJiYc12FomXhkKgQv6pWzZEVYdJ6f9+JKhyz3HcUV7MkS8PQ0LP0fTV5aVVg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762107436; a=rsa-sha256; cv=none; b=MCQXLJ1dxQvnAGxAwCYqVklxyHZChEFriYLtgreoyNZbyyj8YZAJvtS7eGl27tuhVJsq3J McGgXGzexMNJf+C0KZewLM8kaNRwsSkHJOxjPEjwRTdst+DT2mur4GNggojbjnBOrWEN+E wrPU26Gzr2lXYj/xQ88exVYsGmITBD/bc6sr+fT8OIlQ12ON6YRRA8ukm+PTFB6j5JRuq2 lU+h9QuUolNbag0XR2bkHFqFMPaBFAW5BWWb8Bt19yetYlGidoCQAc5Ui8P06NyAvyMb5b bcuH3v50bWed9VZ0sdnGAYCorJoMaL3CWboMiII9O6woK9ywxNiwilURrB1hyQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d02xR63MyzcqR; Sun, 02 Nov 2025 18:17: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 5A2IHFlh093896; Sun, 2 Nov 2025 18:17:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A2IHFTG093892; Sun, 2 Nov 2025 18:17:15 GMT (envelope-from git) Date: Sun, 2 Nov 2025 18:17:15 GMT Message-Id: <202511021817.5A2IHFTG093892@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 2be5127c4a31 - main - setcred(): Fix RACCT resource accounting on credentials change List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2be5127c4a31bacac9b4158395bfa844f6033626 Auto-Submitted: auto-generated The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=2be5127c4a31bacac9b4158395bfa844f6033626 commit 2be5127c4a31bacac9b4158395bfa844f6033626 Author: Olivier Certner AuthorDate: 2025-10-29 17:07:59 +0000 Commit: Olivier Certner CommitDate: 2025-11-02 18:15:30 +0000 setcred(): Fix RACCT resource accounting on credentials change When credentials are changed, we need to adjust the sum of resources associated to the initial and new process' user IDs (and old and new login classes and jails, but setcred() does not change them) for them to stay consistent. PR: 290352 MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D53457 --- sys/kern/kern_prot.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/sys/kern/kern_prot.c b/sys/kern/kern_prot.c index df725cfebd97..3c145851b683 100644 --- a/sys/kern/kern_prot.c +++ b/sys/kern/kern_prot.c @@ -696,7 +696,7 @@ kern_setcred(struct thread *const td, const u_int flags, gid_t *groups = NULL; gid_t smallgroups[CRED_SMALLGROUPS_NB]; int error; - bool cred_set; + bool cred_set = false; /* Bail out on unrecognized flags. */ if (flags & ~SETCREDF_MASK) @@ -839,17 +839,32 @@ kern_setcred(struct thread *const td, const u_int flags, if (cred_set) { setsugid(p); to_free_cred = old_cred; +#ifdef RACCT + racct_proc_ucred_changed(p, old_cred, new_cred); +#endif +#ifdef RCTL + crhold(new_cred); +#endif MPASS(error == 0); } else error = EAGAIN; unlock_finish: PROC_UNLOCK(p); + /* * Part 3: After releasing the process lock, we perform cleanups and * finishing operations. */ +#ifdef RCTL + if (cred_set) { + rctl_proc_ucred_changed(p, new_cred); + /* Paired with the crhold() just above. */ + crfree(new_cred); + } +#endif + #ifdef MAC if (mac_set_proc_data != NULL) mac_set_proc_finish(td, proc_label_set, mac_set_proc_data); From nobody Sun Nov 2 19:22:00 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d04N83Glzz6FKGr; Sun, 02 Nov 2025 19:22: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d04N82W2Rz3XV0; Sun, 02 Nov 2025 19:22:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762111320; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NzybPUgxpSx6qlOphxJ6AUcEYzw0FFjnkwPUptjAdJs=; b=B65rJFKK87lqELUUPByEOA8yLOLZDmoIVSl2ZIM6prN389hk8UZNFEEZWqWymTOX8bshrY rY5M+RrZYoXASbCZE5Wy3K0E2Q6HceCNkpMTWpIQGn+xT8NyYd+E7olmASlPgze4UGFJuX LWKFVuzrDBVcaY2LdLjw7d9VyN4skGI+wSI/chj1usPAP7GCja5Ueq/l7ko342Fir5NVrb BzE8uLpYPo3FgPTHuBMuy8BamV/rWNeuAhgrut9N+n7uPA//KsihJ5ux8X/WwJUM9ExswJ VKAOC09bG9zFU09tGoWXwUk1vw4MrDi8meHbckki42YpQnRHyK7m6XKFqadlQg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762111320; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NzybPUgxpSx6qlOphxJ6AUcEYzw0FFjnkwPUptjAdJs=; b=b5Ayh5DhE9cE42cxIumC3gLl+V6IP6LNpY0nVvdkK5yEYgJ/Y1GT960hSiS2FuLACtCNmm 8DZSpAZpJ1KhrRnJJ+8HtwuYMF0QdH6MyekDprVRz6/nWuzZzz7QqGSW3Mtby0W7PvRFa9 +kxBjzU8UYiRGZm9usqgtXmLnHhToB5RpaUy9mi53BGksUzkHmTQFHlwz1TKJWvXlyQ8lL OPHbKQoH3uxUAi7PbsB9iUNFSo43eTN2AFyq8tHNUsUx4ajU4Di/VN33P+CGkWeE4Lhg+k UC6ETaVzNrSHcneHND61UlAL+6obvHsPBmJGH4qGplCSqifybEqPsD8smniPrw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762111320; a=rsa-sha256; cv=none; b=lqPU9BGSHfE5nGUeqGUwf2tDnYohThsbLuDl4TBIfwOSQIOkD2bapnKDeU3AbxlRV/WrIp mxx+LSLF0gSFHk+TUnaZ22g379Z7Tl0rimZOfGNTh9WCV5B6VMzgnwnNawKDYZVd172Bg/ 8fWlQ9aOAspiikzLRB+WHwVy4CsBQtGeVIXIqbYnKUFa4sqvlVz2EmTA+sj6O/8Ynq7uub KdTdgVWFLVVmicsQXy7Bcz+aERnMHjX07BroqhvhsLA3Gwp2huOmrHAKIhABxv7CMQ+eSo Pmq5JTV4eGDay8AelCtE6foLSqJsG1elKlScykMaKyy5czA3OILDIbbCuK8Nsw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d04N823SzzfVc; Sun, 02 Nov 2025 19:22: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 5A2JM0a5022256; Sun, 2 Nov 2025 19:22:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A2JM0OD022253; Sun, 2 Nov 2025 19:22:00 GMT (envelope-from git) Date: Sun, 2 Nov 2025 19:22:00 GMT Message-Id: <202511021922.5A2JM0OD022253@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: af99c4c1d03c - main - d.7: Document strchr, strjoin, strrchr, strstr, strtok, strlen, and substr List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: af99c4c1d03c742faf8bd4c62fbbb664c5f7fc18 Auto-Submitted: auto-generated The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=af99c4c1d03c742faf8bd4c62fbbb664c5f7fc18 commit af99c4c1d03c742faf8bd4c62fbbb664c5f7fc18 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2025-10-28 20:06:53 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2025-11-02 19:21:30 +0000 d.7: Document strchr, strjoin, strrchr, strstr, strtok, strlen, and substr Reviewed by: markj MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D53417 --- share/man/man7/d.7 | 124 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 124 insertions(+) diff --git a/share/man/man7/d.7 b/share/man/man7/d.7 index 4b00d3d71c79..59b3389b121b 100644 --- a/share/man/man7/d.7 +++ b/share/man/man7/d.7 @@ -198,6 +198,130 @@ The number of nanoseconds since the Epoch Suitable for timestamping logs. .El .Sh BUILT-IN FUNCTIONS +.\" Keep the indentation wide enough for the reader to be able to skim through +.\" function names quickly. +.Bl -tag -width "size_t strlen" +.It Ft string Fn strchr "string s" "char c" +Return a substring of +.Fa s +starting at the first occurance of +.Fa c +in +.Fa s . +Return +.Dv NULL +if +.Fa c +does not occur in +.Fa s . +.Pp +For example, +.Bd -literal -compact -offset indent +strchr("abc", 'b'); +.Ed +returns +.Ql "bc" +and +.Bd -literal -compact -offset indent +strchr("abc", 'd'); +.Ed +returns +.Dv NULL . +.It Ft string Fn strjoin "string s1" "string s2" +Return a string resulting from concatenating +.Fa s1 +and +.Fa s2 . +.Pp +For example, +.Bd -literal -compact -offset indent +strjoin("abc", "def") +.Ed +returns +.Ql abcdef . +.It Ft string Fn strrchr "string s" "char c" +Return a substring of +.Fa s +starting at the last occurance of +.Fa c +in +.Fa s . +Similar to +.Fn strchr . +.It Ft string Fn strstr "string haystack" "string needle" +Return a substring of +.Fa haystack +starting at the first occurrence of +.Fa needle . +Return +.Dv NULL +if +.Fa needle +is not a substring of +.Fa haystack . +.Pp +For example, +.Bd -literal -compact -offset indent +strstr("abc1bc2", "bc") +.Ed +returns +.Ql bc1bc2 +and +.Bd -literal -compact -offset indent +strstr("abc", "xy") +.Ed +returns +.Dv NULL . +.It Ft string Fn strtok "string s" "string separators" +Tokenize +.Fa s +with +.Fa separators . +.Pp +For example, +.Bd -literal -compact -offset indent +strtok("abcdefg", "xyzd") +.Ed +returns +.Ql abc . +.It Ft size_t Fn strlen "string s" +Return the length of string +.Fa s . +.It Ft string Fn substr "string s" "int position" "[int length]" +Return a +substring of string +.Fa s +starting at +.Fa position . +The substring will be at most +.Fa length Ns -long . +If +.Fa length +is not specified, use the rest of the string. +If +.Fa position +is greater than +the size of +.Fa s , +return an empty string. +.Pp +For example, +.Bd -literal -compact -offset indent +substr("abcd", 2) +.Ed +returns +.Ql cd , +.Bd -literal -compact -offset indent +substr("abcd", 2, 1) +.Ed +returns +.Ql c , +and +.Bd -literal -compact -offset indent +substr("abcd", 99) +.Ed +returns an empty string. +.El .Ss Aggregation Functions .Bl -tag -compact -width "llquantize(value, factor, low, high, nsteps)" .It Fn avg value From nobody Sun Nov 2 20:15:11 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d05YW3vDzz6FQ7D; Sun, 02 Nov 2025 20:15: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d05YW3LDGz3cM7; Sun, 02 Nov 2025 20:15:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762114511; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1zsG7PToyVP1gHzl+5/EfPCduYkODFbL+iu3PXnSMIs=; b=MVfqSbaj/9Y1kK69FVDq8N2cCcW7SdaI3GMLqAwtcKYL4l9rZS0+uFsCzaexVB80FQhtrU zKKGu+PgScIBcEW9cPGjstv4BO3OPRPXeTUMjYlVxIdDlVniaEiz980QPAQD+NMNxBgJxz hf+7KWBwtUHgdgMc1In3S0dC3MD3Csw5nWBkTEVjEWKa8NzdAxTIyxDhVBnbcvr+m5Drm3 pJvKmesplkWgCYDfyIzKpXmtB/zajSIIF1TeEnXNBffX+VkU4oNdfKCBXxkuhTv7U1sW6J TK/7EauUVcZiuHjDlttp6bosQXaGKefp6qLl2amNpcUGbbBL/XgWpGdiD+S2OA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762114511; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1zsG7PToyVP1gHzl+5/EfPCduYkODFbL+iu3PXnSMIs=; b=KiQiolmVSDWKsLIro7imcNZYA301Jl9d96WibDR1XoEJwscg9IOHnkmdwHvebXLPHLj+S2 wKmx8JnMXJdrVyj+2MzVTzYcUdRW9Un0FkE4QfbDbN5UPWhcHNh0ECCGmaRADsTuGiyy8m B41iiWhuWGT1L0/NYt70Xg2ENDJJyILDBa+UtfEdXv6ADME4L8qlKxdWnrCmx7g9tsXw9W vGjZ+g6BeaLZT4i7QN7cq2RcTr6RyhWXL08eN8sNhg3sIOGZm1rlKahve0HCb/ayfPwsnF uADsxupRJ6NqtuRJ6R8yfEpdxDdYR4qY6V3n60GeOB4tgav5x6rv9ljLNaxGvw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762114511; a=rsa-sha256; cv=none; b=jJEqg/N687ZNU+9UCGnuYE7OXpsKeg2kj2M9wMQXggPJTy2tw+01xQG9m1afqUxoFT7oN/ Yu42c1PgDXBLR+hx5GYmOo5L4AQC3cd+jvY9XlLMf8/gENld+OsCumBwkPoZ4jDBM2fjiy YsrnOXigHwoa8J57zqG+znY6Xu3pUupxfsyzvvybyW6VZg2nPlSvkmWl8Go59hNdnXuEoa Od9Z18yieSyNfaCXZFO4piSz0KrRH5zMcLfAfDCcSna4kvQlRcI885M2vG1JXE3RKGQlyp tWdmYOOf7EYkfXyBjkgJZ5YxRz/Cn/e1UaLBT6Q7nWxSIct331laVE1jZd2q7g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d05YW2tFCzgxT; Sun, 02 Nov 2025 20:15: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 5A2KFBY9019238; Sun, 2 Nov 2025 20:15:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A2KFBLi019235; Sun, 2 Nov 2025 20:15:11 GMT (envelope-from git) Date: Sun, 2 Nov 2025 20:15:11 GMT Message-Id: <202511022015.5A2KFBLi019235@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: e8c50058e8d0 - main - ddb: use %b when showing flags for an inp List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e8c50058e8d03af17b7458bb560ddee29062082f Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=e8c50058e8d03af17b7458bb560ddee29062082f commit e8c50058e8d03af17b7458bb560ddee29062082f Author: Michael Tuexen AuthorDate: 2025-11-02 16:12:32 +0000 Commit: Michael Tuexen CommitDate: 2025-11-02 16:14:57 +0000 ddb: use %b when showing flags for an inp This is much more compact. Thanks to markj@ for suggesting the change. Reviewed by: markj MFC after: 3 days Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D53507 --- sys/netinet/in_pcb.c | 160 ++------------------------------------------------- sys/netinet/in_pcb.h | 14 +++++ 2 files changed, 18 insertions(+), 156 deletions(-) diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c index 79c77c105d9e..4a1a8cdea619 100644 --- a/sys/netinet/in_pcb.c +++ b/sys/netinet/in_pcb.c @@ -3058,154 +3058,6 @@ db_print_inconninfo(struct in_conninfo *inc, const char *name, int indent) ntohs(inc->inc_fport)); } -static void -db_print_inpflags(int inp_flags) -{ - int comma; - - comma = 0; - if (inp_flags & INP_RECVOPTS) { - db_printf("%sINP_RECVOPTS", comma ? ", " : ""); - comma = 1; - } - if (inp_flags & INP_RECVRETOPTS) { - db_printf("%sINP_RECVRETOPTS", comma ? ", " : ""); - comma = 1; - } - if (inp_flags & INP_RECVDSTADDR) { - db_printf("%sINP_RECVDSTADDR", comma ? ", " : ""); - comma = 1; - } - if (inp_flags & INP_HDRINCL) { - db_printf("%sINP_HDRINCL", comma ? ", " : ""); - comma = 1; - } - if (inp_flags & INP_HIGHPORT) { - db_printf("%sINP_HIGHPORT", comma ? ", " : ""); - comma = 1; - } - if (inp_flags & INP_LOWPORT) { - db_printf("%sINP_LOWPORT", comma ? ", " : ""); - comma = 1; - } - if (inp_flags & INP_ANONPORT) { - db_printf("%sINP_ANONPORT", comma ? ", " : ""); - comma = 1; - } - if (inp_flags & INP_RECVIF) { - db_printf("%sINP_RECVIF", comma ? ", " : ""); - comma = 1; - } - if (inp_flags & INP_MTUDISC) { - db_printf("%sINP_MTUDISC", comma ? ", " : ""); - comma = 1; - } - if (inp_flags & INP_RECVTTL) { - db_printf("%sINP_RECVTTL", comma ? ", " : ""); - comma = 1; - } - if (inp_flags & INP_DONTFRAG) { - db_printf("%sINP_DONTFRAG", comma ? ", " : ""); - comma = 1; - } - if (inp_flags & INP_BINDANY) { - db_printf("%sINP_BINDANY", comma ? ", " : ""); - comma = 1; - } - if (inp_flags & INP_INHASHLIST) { - db_printf("%sINP_INHASHLIST", comma ? ", " : ""); - comma = 1; - } - if (inp_flags & INP_RECVTOS) { - db_printf("%sINP_RECVTOS", comma ? ", " : ""); - comma = 1; - } - if (inp_flags & IN6P_IPV6_V6ONLY) { - db_printf("%sIN6P_IPV6_V6ONLY", comma ? ", " : ""); - comma = 1; - } - if (inp_flags & IN6P_PKTINFO) { - db_printf("%sIN6P_PKTINFO", comma ? ", " : ""); - comma = 1; - } - if (inp_flags & IN6P_HOPLIMIT) { - db_printf("%sIN6P_HOPLIMIT", comma ? ", " : ""); - comma = 1; - } - if (inp_flags & IN6P_HOPOPTS) { - db_printf("%sIN6P_HOPOPTS", comma ? ", " : ""); - comma = 1; - } - if (inp_flags & IN6P_DSTOPTS) { - db_printf("%sIN6P_DSTOPTS", comma ? ", " : ""); - comma = 1; - } - if (inp_flags & IN6P_RTHDR) { - db_printf("%sIN6P_RTHDR", comma ? ", " : ""); - comma = 1; - } - if (inp_flags & IN6P_RTHDRDSTOPTS) { - db_printf("%sIN6P_RTHDRDSTOPTS", comma ? ", " : ""); - comma = 1; - } - if (inp_flags & IN6P_TCLASS) { - db_printf("%sIN6P_TCLASS", comma ? ", " : ""); - comma = 1; - } - if (inp_flags & IN6P_AUTOFLOWLABEL) { - db_printf("%sIN6P_AUTOFLOWLABEL", comma ? ", " : ""); - comma = 1; - } - if (inp_flags & INP_ONESBCAST) { - db_printf("%sINP_ONESBCAST", comma ? ", " : ""); - comma = 1; - } - if (inp_flags & INP_DROPPED) { - db_printf("%sINP_DROPPED", comma ? ", " : ""); - comma = 1; - } - if (inp_flags & INP_SOCKREF) { - db_printf("%sINP_SOCKREF", comma ? ", " : ""); - comma = 1; - } - if (inp_flags & INP_RESERVED_0) { - db_printf("%sINP_RESERVED_0", comma ? ", " : ""); - comma = 1; - } - if (inp_flags & INP_BOUNDFIB) { - db_printf("%sINP_BOUNDFIB", comma ? ", " : ""); - comma = 1; - } - if (inp_flags & IN6P_RFC2292) { - db_printf("%sIN6P_RFC2292", comma ? ", " : ""); - comma = 1; - } - if (inp_flags & IN6P_MTU) { - db_printf("IN6P_MTU%s", comma ? ", " : ""); - comma = 1; - } -} - -static void -db_print_inpvflag(u_char inp_vflag) -{ - int comma; - - comma = 0; - if (inp_vflag & INP_IPV4) { - db_printf("%sINP_IPV4", comma ? ", " : ""); - comma = 1; - } - if (inp_vflag & INP_IPV6) { - db_printf("%sINP_IPV6", comma ? ", " : ""); - comma = 1; - } - if (inp_vflag & INP_IPV6PROTO) { - db_printf("%sINP_IPV6PROTO", comma ? ", " : ""); - comma = 1; - } -} - void db_print_inpcb(struct inpcb *inp, const char *name, int indent) { @@ -3221,16 +3073,12 @@ db_print_inpcb(struct inpcb *inp, const char *name, int indent) db_print_inconninfo(&inp->inp_inc, "inp_conninfo", indent); db_print_indent(indent); - db_printf("inp_label: %p inp_flags: 0x%x (", - inp->inp_label, inp->inp_flags); - db_print_inpflags(inp->inp_flags); - db_printf(")\n"); + db_printf("inp_label: %p inp_flags: 0x%b\n", + inp->inp_label, inp->inp_flags, INP_FLAGS_BITS); db_print_indent(indent); - db_printf("inp_sp: %p inp_vflag: 0x%x (", inp->inp_sp, - inp->inp_vflag); - db_print_inpvflag(inp->inp_vflag); - db_printf(")\n"); + db_printf("inp_sp: %p inp_vflag: 0x%b\n", inp->inp_sp, + inp->inp_vflag, INP_VFLAGS_BITS); db_print_indent(indent); db_printf("inp_ip_ttl: %d inp_ip_p: %d inp_ip_minttl: %d\n", diff --git a/sys/netinet/in_pcb.h b/sys/netinet/in_pcb.h index 7d41e3d690e0..60f129bce216 100644 --- a/sys/netinet/in_pcb.h +++ b/sys/netinet/in_pcb.h @@ -539,6 +539,9 @@ void inp_4tuple_get(struct inpcb *inp, uint32_t *laddr, uint16_t *lp, #define INP_IPV6 0x2 #define INP_IPV6PROTO 0x4 /* opened under IPv6 protocol */ +/* inp_vflags description for use with printf(9) %b identifier. */ +#define INP_VFLAGS_BITS "\20\1INP_IPV4\2INP_IPV6\3INP_IPV6PROTO" + /* * Flags for inp_flags. */ @@ -582,6 +585,17 @@ void inp_4tuple_get(struct inpcb *inp, uint32_t *laddr, uint16_t *lp, IN6P_TCLASS|IN6P_AUTOFLOWLABEL|IN6P_RFC2292|\ IN6P_MTU) +/* inp_flags description for use with printf(9) %b identifier. */ +#define INP_FLAGS_BITS "\20" \ + "\1INP_RECVOPTS\2INP_RECVRETOPTS\3INP_RECVDSTADDR\4INP_HDRINCL" \ + "\5INP_HIGHPORT\6INP_LOWPORT\7INP_ANONPORT\10INP_RECVIF" \ + "\11INP_MTUDISC\12INP_FREED\13INP_RECVTTL\14INP_DONTFRAG" \ + "\15INP_BINDANY\16INP_INHASHLIST\17INP_RECVTOS\20IN6P_IPV6_V6ONLY" \ + "\21IN6P_PKTINFO\22IN6P_HOPLIMIT\23IN6P_HOPOPTS\24IN6P_DSTOPTS" \ + "\25IN6P_RTHDR\26IN6P_RTHDRDSTOPTS\27IN6P_TCLASS\30IN6P_AUTOFLOWLABEL" \ + "\31INP_INLBGROUP\32INP_ONESBCAST\33INP_DROPPED\34INP_SOCKREF" \ + "\35INP_RESERVED_0\36INP_BOUNDFIB\37IN6P_RFC2292\40IN6P_MTU" + /* * Flags for inp_flags2. */ From nobody Sun Nov 2 20:18:09 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d05cx5z0Vz6FQ58; Sun, 02 Nov 2025 20:18: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d05cx5Fq9z3chc; Sun, 02 Nov 2025 20:18:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762114689; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VUeSPcnepqrcnAvRUGRe/dbtigdeWVENfyhTW29hIf8=; b=YOeBdNRct0z5L9FZq1QUoa+qN0svuiX2dpxGWJTMnUc+4byaiH6A7fqOAPBvqqYNJdyELZ MkGo8TgAQQmEbfohFU+J0vJmrjROFIYSlUH6ktPPFHIY5rmx5XhYk1ZPoo0H6JV+M4C9km q/abwjlJIeRvMpepTm00LDAr4pW88eLdntAKLAdVQj4lsWDOu2iTHlbyXHQcwx6Jjfz3Ug DAwqm3FdYbWAUM1rT1SWPoXtAbYowLmUZfIZl0+kgtUcbkInFcsJNWQu3sMTRE0NDkLrmj fHe3nLYN5BvrkfarncfgSTyAabY7gkKdC9u1EV2FWLF4b+nabFgJQ+VKcTtVMA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762114689; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VUeSPcnepqrcnAvRUGRe/dbtigdeWVENfyhTW29hIf8=; b=kpiD0f9nNTbkOXzipLK8c2LOhmkhPqVDlcNsUhQY4f7tJPGxi6mZ185q/KpUKc4F/PYw3D 1DETXvb2LyIF0cBXqhK8+eMpkp02jICqvRDnJCjZVJWP4QnpWD8uEOh51pI/mLUqoBhb6F l+ZHDEQ6UJeIXyYTPhw4UxcepLy/3wRmVeKEsx07RAMwI4xqLr7OzBAoUkxDLCdJOUxStZ LCsrYDOR4WYXYmubNHIEmRwPYs2kyjPh710LlOpUmw4Aisk9pa5hQHDuZk401v4KTuTRto UvJIKWhXUaKlcjqTWwW4UkpwZlcLw7cexiuoWw5roU4qmEDMoE4c15K/uoknyQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762114689; a=rsa-sha256; cv=none; b=OqjS44z8YV6vOZ+hrBd7QRz7qeDX3/pNNwmXV6rFkJQjz5O1H++Lra1di7DpGhatfsYGRR HAAbfCMYLmjeRigS6Bi3Y6pG/yku52yZfRaU693c7xPh6P9phieTWgY5FGMlkxLI6UCiRd c4EnG1ZZjC9xnj6+yq3S6sBAAN/37ZdkZ0Xmbl93VgOFOlpWTvuBlV7VM+5KmjzUzW/0Wg ENgGlExjL8W5EOjkz9vgQPdy+rLkU6yUAVmbSHBpZV0mM33JX5Q8ddM+RRd0ApRcHWGzSk Ua9AAEwzxt+D4FEIY+nuclyXZmORLmHj9nJWK3++iCEm9bGRAL3K/hMQokM8Xg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d05cx4PQWzh4N; Sun, 02 Nov 2025 20:18: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 5A2KI9tP020239; Sun, 2 Nov 2025 20:18:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A2KI92o020236; Sun, 2 Nov 2025 20:18:09 GMT (envelope-from git) Date: Sun, 2 Nov 2025 20:18:09 GMT Message-Id: <202511022018.5A2KI92o020236@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: 8e8956f7f997 - main - ddb: use %b when showing flags for a tcpcb List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8e8956f7f99759b21bc07e884ad89d1927c39e8d Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=8e8956f7f99759b21bc07e884ad89d1927c39e8d commit 8e8956f7f99759b21bc07e884ad89d1927c39e8d Author: Michael Tuexen AuthorDate: 2025-11-02 16:15:47 +0000 Commit: Michael Tuexen CommitDate: 2025-11-02 16:15:47 +0000 ddb: use %b when showing flags for a tcpcb This is much more compact. Thanks to markj@ for suggesting the change. Reviewed by: markj, Peter Lei, imp, Nick Banks MFC after: 3 days Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D53510 --- sys/netinet/tcp_usrreq.c | 265 +---------------------------------------------- sys/netinet/tcp_var.h | 29 ++++++ 2 files changed, 33 insertions(+), 261 deletions(-) diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c index c4a54646f3a2..4d1a6455d09e 100644 --- a/sys/netinet/tcp_usrreq.c +++ b/sys/netinet/tcp_usrreq.c @@ -2798,258 +2798,6 @@ db_print_tstate(int t_state) } } -static void -db_print_tflags(u_int t_flags) -{ - int comma; - - comma = 0; - if (t_flags & TF_ACKNOW) { - db_printf("%sTF_ACKNOW", comma ? ", " : ""); - comma = 1; - } - if (t_flags & TF_DELACK) { - db_printf("%sTF_DELACK", comma ? ", " : ""); - comma = 1; - } - if (t_flags & TF_NODELAY) { - db_printf("%sTF_NODELAY", comma ? ", " : ""); - comma = 1; - } - if (t_flags & TF_NOOPT) { - db_printf("%sTF_NOOPT", comma ? ", " : ""); - comma = 1; - } - if (t_flags & TF_SENTFIN) { - db_printf("%sTF_SENTFIN", comma ? ", " : ""); - comma = 1; - } - if (t_flags & TF_REQ_SCALE) { - db_printf("%sTF_REQ_SCALE", comma ? ", " : ""); - comma = 1; - } - if (t_flags & TF_RCVD_SCALE) { - db_printf("%sTF_RECVD_SCALE", comma ? ", " : ""); - comma = 1; - } - if (t_flags & TF_REQ_TSTMP) { - db_printf("%sTF_REQ_TSTMP", comma ? ", " : ""); - comma = 1; - } - if (t_flags & TF_RCVD_TSTMP) { - db_printf("%sTF_RCVD_TSTMP", comma ? ", " : ""); - comma = 1; - } - if (t_flags & TF_SACK_PERMIT) { - db_printf("%sTF_SACK_PERMIT", comma ? ", " : ""); - comma = 1; - } - if (t_flags & TF_NEEDSYN) { - db_printf("%sTF_NEEDSYN", comma ? ", " : ""); - comma = 1; - } - if (t_flags & TF_NEEDFIN) { - db_printf("%sTF_NEEDFIN", comma ? ", " : ""); - comma = 1; - } - if (t_flags & TF_NOPUSH) { - db_printf("%sTF_NOPUSH", comma ? ", " : ""); - comma = 1; - } - if (t_flags & TF_PREVVALID) { - db_printf("%sTF_PREVVALID", comma ? ", " : ""); - comma = 1; - } - if (t_flags & TF_WAKESOR) { - db_printf("%sTF_WAKESOR", comma ? ", " : ""); - comma = 1; - } - if (t_flags & TF_GPUTINPROG) { - db_printf("%sTF_GPUTINPROG", comma ? ", " : ""); - comma = 1; - } - if (t_flags & TF_MORETOCOME) { - db_printf("%sTF_MORETOCOME", comma ? ", " : ""); - comma = 1; - } - if (t_flags & TF_SONOTCONN) { - db_printf("%sTF_SONOTCONN", comma ? ", " : ""); - comma = 1; - } - if (t_flags & TF_LASTIDLE) { - db_printf("%sTF_LASTIDLE", comma ? ", " : ""); - comma = 1; - } - if (t_flags & TF_RXWIN0SENT) { - db_printf("%sTF_RXWIN0SENT", comma ? ", " : ""); - comma = 1; - } - if (t_flags & TF_FASTRECOVERY) { - db_printf("%sTF_FASTRECOVERY", comma ? ", " : ""); - comma = 1; - } - if (t_flags & TF_WASFRECOVERY) { - db_printf("%sTF_WASFRECOVERY", comma ? ", " : ""); - comma = 1; - } - if (t_flags & TF_SIGNATURE) { - db_printf("%sTF_SIGNATURE", comma ? ", " : ""); - comma = 1; - } - if (t_flags & TF_FORCEDATA) { - db_printf("%sTF_FORCEDATA", comma ? ", " : ""); - comma = 1; - } - if (t_flags & TF_TSO) { - db_printf("%sTF_TSO", comma ? ", " : ""); - comma = 1; - } - if (t_flags & TF_TOE) { - db_printf("%sTF_TOE", comma ? ", " : ""); - comma = 1; - } - if (t_flags & TF_CLOSED) { - db_printf("%sTF_CLOSED", comma ? ", " : ""); - comma = 1; - } - if (t_flags & TF_SENTSYN) { - db_printf("%sTF_SENTSYN", comma ? ", " : ""); - comma = 1; - } - if (t_flags & TF_LRD) { - db_printf("%sTF_LRD", comma ? ", " : ""); - comma = 1; - } - if (t_flags & TF_CONGRECOVERY) { - db_printf("%sTF_CONGRECOVERY", comma ? ", " : ""); - comma = 1; - } - if (t_flags & TF_WASCRECOVERY) { - db_printf("%sTF_WASCRECOVERY", comma ? ", " : ""); - comma = 1; - } - if (t_flags & TF_FASTOPEN) { - db_printf("%sTF_FASTOPEN", comma ? ", " : ""); - comma = 1; - } -} - -static void -db_print_tflags2(u_int t_flags2) -{ - int comma; - - comma = 0; - if (t_flags2 & TF2_PLPMTU_BLACKHOLE) { - db_printf("%sTF2_PLPMTU_BLACKHOLE", comma ? ", " : ""); - comma = 1; - } - if (t_flags2 & TF2_PLPMTU_PMTUD) { - db_printf("%sTF2_PLPMTU_PMTUD", comma ? ", " : ""); - comma = 1; - } - if (t_flags2 & TF2_PLPMTU_MAXSEGSNT) { - db_printf("%sTF2_PLPMTU_MAXSEGSNT", comma ? ", " : ""); - comma = 1; - } - if (t_flags2 & TF2_LOG_AUTO) { - db_printf("%sTF2_LOG_AUTO", comma ? ", " : ""); - comma = 1; - } - if (t_flags2 & TF2_DROP_AF_DATA) { - db_printf("%sTF2_DROP_AF_DATA", comma ? ", " : ""); - comma = 1; - } - if (t_flags2 & TF2_ECN_PERMIT) { - db_printf("%sTF2_ECN_PERMIT", comma ? ", " : ""); - comma = 1; - } - if (t_flags2 & TF2_ECN_SND_CWR) { - db_printf("%sTF2_ECN_SND_CWR", comma ? ", " : ""); - comma = 1; - } - if (t_flags2 & TF2_ECN_SND_ECE) { - db_printf("%sTF2_ECN_SND_ECE", comma ? ", " : ""); - comma = 1; - } - if (t_flags2 & TF2_ACE_PERMIT) { - db_printf("%sTF2_ACE_PERMIT", comma ? ", " : ""); - comma = 1; - } - if (t_flags2 & TF2_HPTS_CPU_SET) { - db_printf("%sTF2_HPTS_CPU_SET", comma ? ", " : ""); - comma = 1; - } - if (t_flags2 & TF2_FBYTES_COMPLETE) { - db_printf("%sTF2_FBYTES_COMPLETE", comma ? ", " : ""); - comma = 1; - } - if (t_flags2 & TF2_ECN_USE_ECT1) { - db_printf("%sTF2_ECN_USE_ECT1", comma ? ", " : ""); - comma = 1; - } - if (t_flags2 & TF2_TCP_ACCOUNTING) { - db_printf("%sTF2_TCP_ACCOUNTING", comma ? ", " : ""); - comma = 1; - } - if (t_flags2 & TF2_HPTS_CALLS) { - db_printf("%sTF2_HPTS_CALLS", comma ? ", " : ""); - comma = 1; - } - if (t_flags2 & TF2_MBUF_L_ACKS) { - db_printf("%sTF2_MBUF_L_ACKS", comma ? ", " : ""); - comma = 1; - } - if (t_flags2 & TF2_MBUF_ACKCMP) { - db_printf("%sTF2_MBUF_ACKCMP", comma ? ", " : ""); - comma = 1; - } - if (t_flags2 & TF2_SUPPORTS_MBUFQ) { - db_printf("%sTF2_SUPPORTS_MBUFQ", comma ? ", " : ""); - comma = 1; - } - if (t_flags2 & TF2_MBUF_QUEUE_READY) { - db_printf("%sTF2_MBUF_QUEUE_READY", comma ? ", " : ""); - comma = 1; - } - if (t_flags2 & TF2_DONT_SACK_QUEUE) { - db_printf("%sTF2_DONT_SACK_QUEUE", comma ? ", " : ""); - comma = 1; - } - if (t_flags2 & TF2_CANNOT_DO_ECN) { - db_printf("%sTF2_CANNOT_DO_ECN", comma ? ", " : ""); - comma = 1; - } - if (t_flags2 & TF2_PROC_SACK_PROHIBIT) { - db_printf("%sTF2_PROC_SACK_PROHIBIT", comma ? ", " : ""); - comma = 1; - } - if (t_flags2 & TF2_IPSEC_TSO) { - db_printf("%sTF2_IPSEC_TSO", comma ? ", " : ""); - comma = 1; - } - if (t_flags2 & TF2_NO_ISS_CHECK) { - db_printf("%sTF2_NO_ISS_CHECK", comma ? ", " : ""); - comma = 1; - } -} - -static void -db_print_toobflags(char t_oobflags) -{ - int comma; - - comma = 0; - if (t_oobflags & TCPOOB_HAVEDATA) { - db_printf("%sTCPOOB_HAVEDATA", comma ? ", " : ""); - comma = 1; - } - if (t_oobflags & TCPOOB_HADDATA) { - db_printf("%sTCPOOB_HADDATA", comma ? ", " : ""); - comma = 1; - } -} - static void db_print_bblog_state(int state) { @@ -3114,14 +2862,10 @@ db_print_tcpcb(struct tcpcb *tp, const char *name, int indent, bool show_bblog, db_printf(")\n"); db_print_indent(indent); - db_printf("t_flags: 0x%x (", tp->t_flags); - db_print_tflags(tp->t_flags); - db_printf(")\n"); + db_printf("t_flags: 0x%b\n", tp->t_flags, TF_BITS); db_print_indent(indent); - db_printf("t_flags2: 0x%x (", tp->t_flags2); - db_print_tflags2(tp->t_flags2); - db_printf(")\n"); + db_printf("t_flags2: 0x%b\n", tp->t_flags2, TF2_BITS); db_print_indent(indent); db_printf("snd_una: 0x%08x snd_max: 0x%08x snd_nxt: 0x%08x\n", @@ -3168,9 +2912,8 @@ db_print_tcpcb(struct tcpcb *tp, const char *name, int indent, bool show_bblog, tp->t_rttupdated, tp->max_sndwnd, tp->t_softerror); db_print_indent(indent); - db_printf("t_oobflags: 0x%x (", tp->t_oobflags); - db_print_toobflags(tp->t_oobflags); - db_printf(") t_iobc: 0x%02x\n", tp->t_iobc); + db_printf("t_oobflags: 0x%b t_iobc: 0x%02x\n", tp->t_oobflags, + TCPOOB_BITS, tp->t_iobc); db_print_indent(indent); db_printf("snd_scale: %u rcv_scale: %u request_r_scale: %u\n", diff --git a/sys/netinet/tcp_var.h b/sys/netinet/tcp_var.h index c3be95c80798..f9297be46af7 100644 --- a/sys/netinet/tcp_var.h +++ b/sys/netinet/tcp_var.h @@ -795,6 +795,17 @@ tcp_packets_this_ack(struct tcpcb *tp, tcp_seq ack) #define TF_WASCRECOVERY 0x40000000 /* was in congestion recovery */ #define TF_FASTOPEN 0x80000000 /* TCP Fast Open indication */ +/* t_flags description for use with printf(9) %b identifier. */ +#define TF_BITS "\20" \ + "\1TF_ACKNOW\2TF_DELACK\3TF_NODELAY\4TF_NOOPT" \ + "\5TF_SENTFIN\6TF_REQ_SCALE\7TF_RCVD_SCALE\10TF_REQ_TSTMP" \ + "\11TF_RCVD_TSTMP\12TF_SACK_PERMIT\13TF_NEEDSYN\14TF_NEEDFIN" \ + "\15TF_NOPUSH\16TF_PREVVALID\17TF_WAKESOR\20TF_GPUTINPROG" \ + "\21TF_MORETOCOME\22TF_SONOTCONN\23TF_LASTIDLE\24TF_RXWIN0SENT" \ + "\25TF_FASTRECOVERY\26TF_WASFRECOVERY\27TF_SIGNATURE\30TF_FORCEDATA" \ + "\31TF_TSO\32TF_TOE\33TF_CLOSED\34TF_SENTSYN" \ + "\35TF_LRD\36TF_CONGRECOVERY\37TF_WASCRECOVERY\40TF_FASTOPEN" + #define IN_FASTRECOVERY(t_flags) (t_flags & TF_FASTRECOVERY) #define ENTER_FASTRECOVERY(t_flags) t_flags |= TF_FASTRECOVERY #define EXIT_FASTRECOVERY(t_flags) t_flags &= ~TF_FASTRECOVERY @@ -815,6 +826,9 @@ tcp_packets_this_ack(struct tcpcb *tp, tcp_seq ack) #define TCPOOB_HAVEDATA 0x01 #define TCPOOB_HADDATA 0x02 +/* t_oobflags description for use with printf(9) %b identifier. */ +#define TCPOOB_BITS "\20\1TCPOOB_HAVEDATA\2TCPOOB_HADDATA" + /* * Flags for the extended TCP flags field, t_flags2 */ @@ -842,6 +856,21 @@ tcp_packets_this_ack(struct tcpcb *tp, tcp_seq ack) #define TF2_IPSEC_TSO 0x00200000 /* IPSEC + TSO supported */ #define TF2_NO_ISS_CHECK 0x00400000 /* Don't check SEG.ACK against ISS */ +/* t_flags2 description for use with printf(9) %b identifier. */ +#define TF2_BITS "\20" \ + "\1TF2_PLPMTU_BLACKHOLE\2TF2_PLPMTU_PMTUD" \ + "\3TF2_PLPMTU_MAXSEGSNT\4TF2_LOG_AUTO" \ + "\5TF2_DROP_AF_DATA\6TF2_ECN_PERMIT" \ + "\7TF2_ECN_SND_CWR\10TF2_ECN_SND_ECE" \ + "\11TF2_ACE_PERMIT\12TF2_HPTS_CPU_SET" \ + "\13TF2_FBYTES_COMPLETE\14TF2_ECN_USE_ECT1" \ + "\15TF2_TCP_ACCOUNTING\16TF2_HPTS_CALLS" \ + "\17TF2_MBUF_L_ACKS\20TF2_MBUF_ACKCMP" \ + "\21TF2_SUPPORTS_MBUFQ\22TF2_MBUF_QUEUE_READY" \ + "\23TF2_DONT_SACK_QUEUE\24TF2_CANNOT_DO_ECN" \ + "\25TF2_PROC_SACK_PROHIBIT\26TF2_IPSEC_TSO" \ + "\27TF2_NO_ISS_CHECK" + /* * Structure to hold TCP options that are only used during segment * processing (in tcp_input), but not held in the tcpcb. From nobody Sun Nov 2 20:42:44 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d069J3fT6z6FSJJ; Sun, 02 Nov 2025 20:42: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d069J2vPqz3fnS; Sun, 02 Nov 2025 20:42:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762116164; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Yb+BaCM/eGdzWHNwr5L0ObOK+e5BRu0bjt62SU6sz74=; b=aibwvrTmhjE7N3mXIq0H5H2rmfoCqRVv/M3Mp8Gd3d90JHFuNS6Mf/DondvGb0FZO6hwHC SwtFWuwBVQhIKgedB60dLs0UKruFba2yODBj7UuesJ/o00CoFB2jQlWHM0pBPkHfcCqi+T FWoIliLIlhdljNyUBUgwrTv4YLxuSL8tmOeYwxeGV5OTiIIZe8mJVj5nOzFK5Yj9LRnNa9 QmiGVE/E0rWiOzv8aD6S+3j0/uaLnwgNh6dhydwyeQILm3SRO7aUukjDgQG6fJQUjKow9I 9hT2AQJIj79QvY4LLEk622pdGAJ2KPYl2VXCCPKeCVPbu0gMqcgQ4svpfeW7Vw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762116164; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Yb+BaCM/eGdzWHNwr5L0ObOK+e5BRu0bjt62SU6sz74=; b=O35uTTa8Djdd64WyEtRcI6JMcRGeBzOPPT24onZwE5McDgDKjbNiqceIOZCRoIYnHYWDR9 O9cMBjs/iyXMAQcAJKjqSOxIHn9ZAaYybvP5EaRZC1tjZ+a4zBjTC70MRMLBbkmHr1qiCu IvcBcJ/hHPTagFNN8u8laBYbJDgjXUF1FktNgf/d7VORUHbqIy0ftKI4w4THXrNon/4fN7 f//kc1En3lnO+ZL7KlvabKIsZ7sg+VUXE9hYDGZgJzgFPod3feNrT72T9qzk3LQpUa+O+e CNdQBvQkKZPptg9Vz+oi66hXoDVoKxvWz9IAqMW8RicZ20KlAo28vXz2C0YtwA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762116164; a=rsa-sha256; cv=none; b=GozHfUa6LUZsjkQnSF0pNOMRngpdLPMv6Dt+fr/5B5jaQ3Hhcm6XkuaO6QNB0nXP1cu/vQ OoEp7r4gqL7dsTk9eM8j+UVwYCFJuQEmlF6WYi9qNR7zbECtKQvCQA0GwJyjQd3ArXXPQ1 aC8mxnOg3807vAlytcDgWY8jVZklJ+ZY8oFhBYGzEuRgzM3iKAoDHLOwBex4rLcC0hinhR fZiTOLtD+uDjj6tQadyCpuDjmbIDMTmYayOwWLWcVQZRpAjytrtfeXVFtKTrHAeQ6u7dQu HntkGOCsZ3Mk5rSDymS2v0A4Ln21Y2vNGqL5NUgtnDFpfu5v4BA5xHUhHTLrgA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d069J2VhdzhSm; Sun, 02 Nov 2025 20:42: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 5A2KgiFQ075074; Sun, 2 Nov 2025 20:42:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A2KgiTw075071; Sun, 2 Nov 2025 20:42:44 GMT (envelope-from git) Date: Sun, 2 Nov 2025 20:42:44 GMT Message-Id: <202511022042.5A2KgiTw075071@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: e5aa60d06958 - main - nfs: Add support for the new _PC_CASE_INSENSITIVE name List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e5aa60d0695803c83dc0af08c057b82c463da3f2 Auto-Submitted: auto-generated The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=e5aa60d0695803c83dc0af08c057b82c463da3f2 commit e5aa60d0695803c83dc0af08c057b82c463da3f2 Author: Rick Macklem AuthorDate: 2025-11-02 21:38:45 +0000 Commit: Rick Macklem CommitDate: 2025-11-02 21:38:45 +0000 nfs: Add support for the new _PC_CASE_INSENSITIVE name Commit d6864221d8 added support for the _PC_CASE_INSENSITIVE name for pathconf, to indicate if case insensitive lookups are configured. This patch adds support for it for both NFSv4 and NFSv3. It also adds a fsidp argument to nfsv4_fillattr() which will be used in future commit(s) related to NFSv4.n directory delegations. MFC after: 2 weeks --- sys/fs/nfs/nfs_commonsubs.c | 31 ++++++++++++++++++++++--------- sys/fs/nfs/nfs_var.h | 4 ++-- sys/fs/nfsclient/nfs_clrpcops.c | 2 +- sys/fs/nfsclient/nfs_clstate.c | 3 ++- sys/fs/nfsclient/nfs_clvnops.c | 8 ++++++-- sys/fs/nfsserver/nfs_nfsdport.c | 18 ++++++++++++------ sys/fs/nfsserver/nfs_nfsdserv.c | 9 +++++++-- 7 files changed, 52 insertions(+), 23 deletions(-) diff --git a/sys/fs/nfs/nfs_commonsubs.c b/sys/fs/nfs/nfs_commonsubs.c index f580a394a735..707ad5749ab2 100644 --- a/sys/fs/nfs/nfs_commonsubs.c +++ b/sys/fs/nfs/nfs_commonsubs.c @@ -658,7 +658,7 @@ nfscl_fillsattr(struct nfsrv_descript *nd, struct vattr *vap, NFSSETBIT_ATTRBIT(&attrbits, NFSATTRBIT_TIMECREATE); (void) nfsv4_fillattr(nd, vp->v_mount, vp, NULL, vap, NULL, 0, &attrbits, NULL, NULL, 0, 0, 0, 0, (uint64_t)0, NULL, - false, false, false, 0); + false, false, false, 0, NULL, false); break; } } @@ -1706,11 +1706,18 @@ nfsv4_loadattr(struct nfsrv_descript *nd, vnode_t vp, attrsum += NFSX_UNSIGNED; break; case NFSATTRBIT_CASEINSENSITIVE: - NFSM_DISSECT(tl, u_int32_t *, NFSX_UNSIGNED); + NFSM_DISSECT(tl, uint32_t *, NFSX_UNSIGNED); if (compare) { if (!(*retcmpp)) { - if (*tl != newnfs_false) - *retcmpp = NFSERR_NOTSAME; + if (vp == NULL || VOP_PATHCONF(vp, + _PC_CASE_INSENSITIVE, + &has_pathconf) != 0) + has_pathconf = 0; + if ((has_pathconf != 0 && + *tl != newnfs_true) || + (has_pathconf == 0 && + *tl != newnfs_false)) + *retcmpp = NFSERR_NOTSAME; } } else if (pc != NULL) { pc->pc_caseinsensitive = @@ -2690,7 +2697,8 @@ nfsv4_fillattr(struct nfsrv_descript *nd, struct mount *mp, vnode_t vp, nfsattrbit_t *attrbitp, struct ucred *cred, NFSPROC_T *p, int isdgram, int reterr, int supports_nfsv4acls, int at_root, uint64_t mounted_on_fileno, struct statfs *pnfssf, bool xattrsupp, bool has_hiddensystem, - bool has_namedattr, uint32_t clone_blksize) + bool has_namedattr, uint32_t clone_blksize, fsid_t *fsidp, + bool has_caseinsensitive) { int bitpos, retnum = 0; u_int32_t *tl; @@ -2865,10 +2873,12 @@ nfsv4_fillattr(struct nfsrv_descript *nd, struct mount *mp, vnode_t vp, break; case NFSATTRBIT_FSID: NFSM_BUILD(tl, u_int32_t *, NFSX_V4FSID); + if (fsidp == NULL) + fsidp = &mp->mnt_stat.f_fsid; *tl++ = 0; - *tl++ = txdr_unsigned(mp->mnt_stat.f_fsid.val[0]); + *tl++ = txdr_unsigned(fsidp->val[0]); *tl++ = 0; - *tl = txdr_unsigned(mp->mnt_stat.f_fsid.val[1]); + *tl = txdr_unsigned(fsidp->val[1]); retnum += NFSX_V4FSID; break; case NFSATTRBIT_UNIQUEHANDLES: @@ -2914,8 +2924,11 @@ nfsv4_fillattr(struct nfsrv_descript *nd, struct mount *mp, vnode_t vp, retnum += NFSX_UNSIGNED; break; case NFSATTRBIT_CASEINSENSITIVE: - NFSM_BUILD(tl, u_int32_t *, NFSX_UNSIGNED); - *tl = newnfs_false; + NFSM_BUILD(tl, uint32_t *, NFSX_UNSIGNED); + if (has_caseinsensitive) + *tl = newnfs_true; + else + *tl = newnfs_false; retnum += NFSX_UNSIGNED; break; case NFSATTRBIT_CASEPRESERVING: diff --git a/sys/fs/nfs/nfs_var.h b/sys/fs/nfs/nfs_var.h index 16a76c060e78..7db3952ecf5c 100644 --- a/sys/fs/nfs/nfs_var.h +++ b/sys/fs/nfs/nfs_var.h @@ -398,7 +398,7 @@ void nfsrv_wcc(struct nfsrv_descript *, int, struct nfsvattr *, int, int nfsv4_fillattr(struct nfsrv_descript *, struct mount *, vnode_t, NFSACL_T *, struct vattr *, fhandle_t *, int, nfsattrbit_t *, struct ucred *, NFSPROC_T *, int, int, int, int, uint64_t, struct statfs *, bool, bool, - bool, uint32_t); + bool, uint32_t, fsid_t *, bool); void nfsrv_fillattr(struct nfsrv_descript *, struct nfsvattr *); struct mbuf *nfsrv_adj(struct mbuf *, int, int); void nfsrv_postopattr(struct nfsrv_descript *, int, struct nfsvattr *); @@ -740,7 +740,7 @@ int nfsvno_updfilerev(vnode_t, struct nfsvattr *, struct nfsrv_descript *, int nfsvno_fillattr(struct nfsrv_descript *, struct mount *, vnode_t, struct nfsvattr *, fhandle_t *, int, nfsattrbit_t *, struct ucred *, NFSPROC_T *, int, int, int, int, uint64_t, bool, bool, - bool, uint32_t); + bool, uint32_t, bool); int nfsrv_sattr(struct nfsrv_descript *, vnode_t, struct nfsvattr *, nfsattrbit_t *, NFSACL_T *, NFSPROC_T *); int nfsv4_sattr(struct nfsrv_descript *, vnode_t, struct nfsvattr *, nfsattrbit_t *, diff --git a/sys/fs/nfsclient/nfs_clrpcops.c b/sys/fs/nfsclient/nfs_clrpcops.c index b61218958550..f5deef183efb 100644 --- a/sys/fs/nfsclient/nfs_clrpcops.c +++ b/sys/fs/nfsclient/nfs_clrpcops.c @@ -5452,7 +5452,7 @@ nfsrpc_setaclrpc(vnode_t vp, struct ucred *cred, NFSPROC_T *p, NFSSETBIT_ATTRBIT(&attrbits, NFSATTRBIT_ACL); (void) nfsv4_fillattr(nd, vp->v_mount, vp, aclp, NULL, NULL, 0, &attrbits, NULL, NULL, 0, 0, 0, 0, (uint64_t)0, NULL, false, false, - false, 0); + false, 0, NULL, false); error = nfscl_request(nd, vp, p, cred); if (error) return (error); diff --git a/sys/fs/nfsclient/nfs_clstate.c b/sys/fs/nfsclient/nfs_clstate.c index aa9d01fc4632..712d49c7160c 100644 --- a/sys/fs/nfsclient/nfs_clstate.c +++ b/sys/fs/nfsclient/nfs_clstate.c @@ -3701,7 +3701,8 @@ nfscl_docb(struct nfsrv_descript *nd, NFSPROC_T *p) if (!error) (void) nfsv4_fillattr(nd, NULL, NULL, NULL, &va, NULL, 0, &rattrbits, NULL, p, 0, 0, 0, 0, - (uint64_t)0, NULL, false, false, false, 0); + (uint64_t)0, NULL, false, false, false, 0, + NULL, false); break; case NFSV4OP_CBRECALL: NFSCL_DEBUG(4, "cbrecall\n"); diff --git a/sys/fs/nfsclient/nfs_clvnops.c b/sys/fs/nfsclient/nfs_clvnops.c index f80cf30669ca..795a8d106051 100644 --- a/sys/fs/nfsclient/nfs_clvnops.c +++ b/sys/fs/nfsclient/nfs_clvnops.c @@ -4677,12 +4677,13 @@ nfs_pathconf(struct vop_pathconf_args *ap) clone_blksize = 0; if ((NFS_ISV34(vp) && (ap->a_name == _PC_LINK_MAX || ap->a_name == _PC_NAME_MAX || ap->a_name == _PC_CHOWN_RESTRICTED || - ap->a_name == _PC_NO_TRUNC)) || + ap->a_name == _PC_NO_TRUNC || + ap->a_name == _PC_CASE_INSENSITIVE)) || (NFS_ISV4(vp) && (ap->a_name == _PC_ACL_NFS4 || ap->a_name == _PC_HAS_NAMEDATTR || ap->a_name == _PC_CLONE_BLKSIZE))) { /* - * Since only the above 4 a_names are returned by the NFSv3 + * Since only the above 5 a_names are returned by the NFSv3 * Pathconf RPC, there is no point in doing it for others. * For NFSv4, the Pathconf RPC (actually a Getattr Op.) can * be used for _PC_ACL_NFS4, _PC_HAS_NAMEDATTR and @@ -4849,6 +4850,9 @@ nfs_pathconf(struct vop_pathconf_args *ap) case _PC_CLONE_BLKSIZE: *ap->a_retval = clone_blksize; break; + case _PC_CASE_INSENSITIVE: + *ap->a_retval = pc.pc_caseinsensitive; + break; default: error = vop_stdpathconf(ap); diff --git a/sys/fs/nfsserver/nfs_nfsdport.c b/sys/fs/nfsserver/nfs_nfsdport.c index 9fe3f4426124..841ec2315f1c 100644 --- a/sys/fs/nfsserver/nfs_nfsdport.c +++ b/sys/fs/nfsserver/nfs_nfsdport.c @@ -2114,7 +2114,7 @@ nfsvno_fillattr(struct nfsrv_descript *nd, struct mount *mp, struct vnode *vp, struct ucred *cred, struct thread *p, int isdgram, int reterr, int supports_nfsv4acls, int at_root, uint64_t mounted_on_fileno, bool xattrsupp, bool has_hiddensystem, bool has_namedattr, - uint32_t clone_blksize) + uint32_t clone_blksize, bool has_caseinsensitive) { struct statfs *sf; int error; @@ -2135,7 +2135,7 @@ nfsvno_fillattr(struct nfsrv_descript *nd, struct mount *mp, struct vnode *vp, error = nfsv4_fillattr(nd, mp, vp, NULL, &nvap->na_vattr, fhp, rderror, attrbitp, cred, p, isdgram, reterr, supports_nfsv4acls, at_root, mounted_on_fileno, sf, xattrsupp, has_hiddensystem, has_namedattr, - clone_blksize); + clone_blksize, NULL, has_caseinsensitive); free(sf, M_TEMP); NFSEXITCODE2(0, nd); return (error); @@ -2468,7 +2468,7 @@ nfsrvd_readdirplus(struct nfsrv_descript *nd, int isdgram, int bextpg0, bextpg1, bextpgsiz0, bextpgsiz1; size_t atsiz; long pathval; - bool has_hiddensystem, has_namedattr, xattrsupp; + bool has_caseinsensitive, has_hiddensystem, has_namedattr, xattrsupp; if (nd->nd_repstat) { nfsrv_postopattr(nd, getret, &at); @@ -2949,6 +2949,7 @@ ateof: xattrsupp = false; has_hiddensystem = false; has_namedattr = false; + has_caseinsensitive = false; clone_blksize = 0; if (nvp != NULL) { supports_nfsv4acls = @@ -2978,6 +2979,11 @@ ateof: &pathval) != 0) pathval = 0; clone_blksize = pathval; + if (VOP_PATHCONF(nvp, + _PC_CASE_INSENSITIVE, + &pathval) != 0) + pathval = 0; + has_caseinsensitive = pathval > 0; NFSVOPUNLOCK(nvp); } else supports_nfsv4acls = 0; @@ -2999,7 +3005,7 @@ ateof: supports_nfsv4acls, at_root, mounted_on_fileno, xattrsupp, has_hiddensystem, has_namedattr, - clone_blksize); + clone_blksize, has_caseinsensitive); } else { dirlen += nfsvno_fillattr(nd, new_mp, nvp, nvap, &nfh, r, &attrbits, @@ -3007,7 +3013,7 @@ ateof: supports_nfsv4acls, at_root, mounted_on_fileno, xattrsupp, has_hiddensystem, has_namedattr, - clone_blksize); + clone_blksize, has_caseinsensitive); } if (nvp != NULL) vrele(nvp); @@ -6405,7 +6411,7 @@ nfsrv_setacldsdorpc(fhandle_t *fhp, struct ucred *cred, NFSPROC_T *p, * the same type (VREG). */ nfsv4_fillattr(nd, NULL, vp, aclp, NULL, NULL, 0, &attrbits, NULL, - NULL, 0, 0, 0, 0, 0, NULL, false, false, false, 0); + NULL, 0, 0, 0, 0, 0, NULL, false, false, false, 0, NULL, false); error = newnfs_request(nd, nmp, NULL, &nmp->nm_sockreq, NULL, p, cred, NFS_PROG, NFS_VER4, NULL, 1, NULL, NULL); if (error != 0) { diff --git a/sys/fs/nfsserver/nfs_nfsdserv.c b/sys/fs/nfsserver/nfs_nfsdserv.c index 67af0cf71175..394b63c2ab07 100644 --- a/sys/fs/nfsserver/nfs_nfsdserv.c +++ b/sys/fs/nfsserver/nfs_nfsdserv.c @@ -252,7 +252,7 @@ nfsrvd_getattr(struct nfsrv_descript *nd, int isdgram, struct thread *p = curthread; size_t atsiz; long pathval; - bool has_hiddensystem, has_namedattr, xattrsupp; + bool has_caseinsensitive, has_hiddensystem, has_namedattr, xattrsupp; uint32_t clone_blksize; if (nd->nd_repstat) @@ -336,6 +336,10 @@ nfsrvd_getattr(struct nfsrv_descript *nd, int isdgram, &pathval) != 0) pathval = 0; clone_blksize = pathval; + if (VOP_PATHCONF(vp, _PC_CASE_INSENSITIVE, + &pathval) != 0) + pathval = 0; + has_caseinsensitive = pathval > 0; mp = vp->v_mount; if (nfsrv_enable_crossmntpt != 0 && vp->v_type == VDIR && @@ -371,7 +375,8 @@ nfsrvd_getattr(struct nfsrv_descript *nd, int isdgram, isdgram, 1, supports_nfsv4acls, at_root, mounted_on_fileno, xattrsupp, has_hiddensystem, - has_namedattr, clone_blksize); + has_namedattr, clone_blksize, + has_caseinsensitive); vfs_unbusy(mp); } vrele(vp); From nobody Sun Nov 2 21:21:08 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d071d5pg3z6FWB9; Sun, 02 Nov 2025 21:21: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d071d0xdvz3nWG; Sun, 02 Nov 2025 21:21:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762118469; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Y+qaQgz3BwVC6z3Ep8YevJF05yys+b3NeluMNkxigRU=; b=eNQS0f3g5O2AD3pGJoM/NdA6S3KdWuIJ5xihAP/2A9soB9CMVdszk/CQrq3GB74DeHg6mr y/9iaSVOxAgNXEAk81sjn7xfswa0kYdiUDuSYZfHpzfkjJGMJew7YzEiYcTcF0BtXTJ5Jo vwrmDl85J7tWPE1zaLYfy0vYp1TiKgjTvhFDE2aJYitSZ9/m1YI0I++NVIN+mQCQU48vZ0 2AT5jAh3iWM3jsVq+OoMemS3mz9fkNRYCQfNJBiF8Czj0QR2jw7cEWAHVeaZ0j6CP9bqzR XL0TxTohfdmRkVw7B7Fc9IoFCzzqpe4HrhhYLVFy/qX3LvWpXdyBxUQWGHDh2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762118469; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Y+qaQgz3BwVC6z3Ep8YevJF05yys+b3NeluMNkxigRU=; b=OQ07YKvdvnaSgGLzVT9gkSNyxmwUFgTY/SlSXKc/dlM0s4w0K2w4Fc5yLJI+Tkl1qeS3hK CXVP3utcodfi9bP/WO/IUM2TpqkXe+xlKqmC1YQkQRl3QCixMdgZkDKG6dI8zqfZCq9Oar nOOrP63LDOJ21TCbocNYGeQQy/X65XNLnS2GOQwC5C62DP2BUGx/WLoei7dL9AmSmKZ0+1 ozFCeqn3oFnlar+ecVKDYzqzx2SdeO6HdYTSqhKkWjWksa7rmQFhjkWvSBxsYpdH20sLck CSfPDCcFyPoW3ZG8XgBPa21a/eDS1EZuxr9bSfXj9dbgqyljwJ4m3inrX30Y6Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762118469; a=rsa-sha256; cv=none; b=HteorgrCE1GZvIJBP1K/loilXHpnhNeJXsffNMKG3qhAt5fYniZ0KzZE5BoL+uIHnLzhpV f55XNWb5ztZxeXuKgfpg83CHZ3WwW+7AOMYaHRu6Zgce4YwbJKGvAt9oWu7EwIONGBRZig Zchf3CS8LNKxW+SnnvYm6AVEVAWvUTLclrDDZUJc3OzBiEW4uqmvpg9FrN4ZltYqjW00E6 rgMb1du1HjGRzVdQlDTuA0f7gQ0Bm8BFxkxlrCBX6oOnoHewnRF82BeJjdHynoezxTYRA7 B4yXVF7GgekdxNd8O/BY05qFwnT7IMj3pdibI7gQjVRwV4YQszjd1mfG3+03sQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d071d0X4rzjDd; Sun, 02 Nov 2025 21:21: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 5A2LL8Tv043564; Sun, 2 Nov 2025 21:21:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A2LL8Cu043561; Sun, 2 Nov 2025 21:21:08 GMT (envelope-from git) Date: Sun, 2 Nov 2025 21:21:08 GMT Message-Id: <202511022121.5A2LL8Cu043561@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: 25aed6401b35 - main - ddb: improve printing of inpcbs List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 25aed6401b35834856440ffb32a61597c8019697 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=25aed6401b35834856440ffb32a61597c8019697 commit 25aed6401b35834856440ffb32a61597c8019697 Author: Michael Tuexen AuthorDate: 2025-11-02 17:17:05 +0000 Commit: Michael Tuexen CommitDate: 2025-11-02 17:21:01 +0000 ddb: improve printing of inpcbs * shuffle around the inp_label to give inp_flags more space since it can become long. * fix the indentation of in6p_icmp6filt, in6p_cksum, and in6p_hops. Reviewed by: Peter Lei MFC after: 3 days Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D53541 --- sys/netinet/in_pcb.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c index 4a1a8cdea619..edc6c8f29cc0 100644 --- a/sys/netinet/in_pcb.c +++ b/sys/netinet/in_pcb.c @@ -3068,13 +3068,13 @@ db_print_inpcb(struct inpcb *inp, const char *name, int indent) indent += 2; db_print_indent(indent); - db_printf("inp_flow: 0x%x\n", inp->inp_flow); + db_printf("inp_flow: 0x%x inp_label: %p\n", inp->inp_flow, + inp->inp_label); db_print_inconninfo(&inp->inp_inc, "inp_conninfo", indent); db_print_indent(indent); - db_printf("inp_label: %p inp_flags: 0x%b\n", - inp->inp_label, inp->inp_flags, INP_FLAGS_BITS); + db_printf("inp_flags: 0x%b\n", inp->inp_flags, INP_FLAGS_BITS); db_print_indent(indent); db_printf("inp_sp: %p inp_vflag: 0x%b\n", inp->inp_sp, @@ -3084,18 +3084,20 @@ db_print_inpcb(struct inpcb *inp, const char *name, int indent) db_printf("inp_ip_ttl: %d inp_ip_p: %d inp_ip_minttl: %d\n", inp->inp_ip_ttl, inp->inp_ip_p, inp->inp_ip_minttl); - db_print_indent(indent); #ifdef INET6 if (inp->inp_vflag & INP_IPV6) { + db_print_indent(indent); db_printf("in6p_options: %p in6p_outputopts: %p " "in6p_moptions: %p\n", inp->in6p_options, inp->in6p_outputopts, inp->in6p_moptions); + db_print_indent(indent); db_printf("in6p_icmp6filt: %p in6p_cksum %d " "in6p_hops %u\n", inp->in6p_icmp6filt, inp->in6p_cksum, inp->in6p_hops); } else #endif { + db_print_indent(indent); db_printf("inp_ip_tos: %d inp_ip_options: %p " "inp_ip_moptions: %p\n", inp->inp_ip_tos, inp->inp_options, inp->inp_moptions); From nobody Sun Nov 2 21:22:22 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d07342q65z6FWCs; Sun, 02 Nov 2025 21:22: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d073275B2z3nsZ; Sun, 02 Nov 2025 21:22:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762118543; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HDjkYkaOoGmgwzIBijD83FvlI9adDRkuWZO+N1LoMsI=; b=MWPZ4mGC5upYSY5BnJ07KY3RrQC9SKEThYKRscNEFFqtT3k/9qeKAxZ2MM2df2aQK5HK0R MKPee2JCsoRecJz3AxpCXhJIrc2b5KILJbUrvjk+Ngn5uEDBsQA6qTZZE8vHD0FlewDyEl 1Z9KLmSch/mHxmqUOzzu7RkUlV2LDaIdn81YbPHnTTfnLn8L1Wm7fghsdvYoYLoSmc9y+K b5w4/oxp1Y1g9YNPXE7HuOAhq9XiTo9QWHy7Mf8jC6YbpkdCY1kJtgR/5Dq7/13jjaFSc+ WKQfgrnxMg2jDa4bH08++7KKoeaMUilWtdN4HIEH6n3KBKk0CHGSb1oKeFKCCA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762118543; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HDjkYkaOoGmgwzIBijD83FvlI9adDRkuWZO+N1LoMsI=; b=MMv6xtCEri6tG64eSzxjhNcUyBmOgxeNpIqgol4A2jBiuFM41ODl35ARpSuwddJDgx79gy 2S+xUFOYtS1ikLw4jhzJRO00oWB9U4BH3Xk0Ph9jRbpJGUfGNlvv8OETeSOHM1ZkX+psOc 8rxdTm+yNhCmXd1FSMrSirhS/MdEp9kgBbUl1Yfgoh6HW1VNM8JEa0gsTGiV7XhAbdFEFa UAqXHovKOW1tHBFcLCt+1Mkzp8tAWoWr1LQb0TZPHuyDBap3drUfhn1h3WO/kAbIfrCtim RfPvyrarNIAdu3bTTCc8ylF4e4GOqv6HTqJMKTuj43/PgqUnVMOpUTTpjfuzRg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762118543; a=rsa-sha256; cv=none; b=yXemZtyOHTaCnEpN4CFTVzcqYRSCqo4c40adZrj+gxAx6Yiz7wBg7rpKsVt4F2As5xmvQE 3zYF1YqsyayoUk8qFGetdRIx/UY2QJXCBkEK+Lhnqvx61vba3w9ZNwFTFOPi3fXoYBS9GM 9j0S2H5Nj6OeFHfszLaBHpnuGgi/lqvaKTXQavKFw+avpNmcWljuT5psM6mRAzbY2jqOMB cz4Nn3s3+dXIMoXVHpz2pNSuwa6aVqWkyh8atUN7ZAzhHO3ot43zFwH0OC0KCKFQGVZ/A/ vruPShHhRs/tu6DNPinoCqYsztWCIKF2jMEl8ndvHS9hqvmn8Eoi8tTBtDCp2g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d07326hlQzjrP; Sun, 02 Nov 2025 21:22:22 +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 5A2LMM8u047043; Sun, 2 Nov 2025 21:22:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A2LMMSn047040; Sun, 2 Nov 2025 21:22:22 GMT (envelope-from git) Date: Sun, 2 Nov 2025 21:22:22 GMT Message-Id: <202511022122.5A2LMMSn047040@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: f26382dd72df - main - atomic.9: fix description of acquire and release List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f26382dd72dfc710a8cc7159364a8166e22a4254 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=f26382dd72dfc710a8cc7159364a8166e22a4254 commit f26382dd72dfc710a8cc7159364a8166e22a4254 Author: Konstantin Belousov AuthorDate: 2025-10-05 08:39:32 +0000 Commit: Konstantin Belousov CommitDate: 2025-11-02 21:22:08 +0000 atomic.9: fix description of acquire and release The ordering point is not the atomic operation itself, but the load for acquire or store for release done as part of the atomic. This does not matter for atomic_load_acq and atomic_store_rel, but does matter for RWM operations. Noted by: alc Reviewed by: markj Discussed with: alc Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D52744 --- share/man/man9/atomic.9 | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/share/man/man9/atomic.9 b/share/man/man9/atomic.9 index c9133c6311a5..674959648330 100644 --- a/share/man/man9/atomic.9 +++ b/share/man/man9/atomic.9 @@ -182,35 +182,42 @@ This variant is the default. The second variant has acquire semantics, and the third variant has release semantics. .Pp -When an atomic operation has acquire semantics, the operation must have +An atomic operation can only have +.Em acquire +semantics if it performs a load +from memory. +When an atomic operation has acquire semantics, a load performed as +part of the operation must have completed before any subsequent load or store (by program order) is performed. Conversely, acquire semantics do not require that prior loads or stores have -completed before the atomic operation is performed. -An atomic operation can only have acquire semantics if it performs a load -from memory. +completed before a load from the atomic operation is performed. To denote acquire semantics, the suffix .Dq Li _acq is inserted into the function name immediately prior to the .Dq Li _ Ns Aq Fa type suffix. -For example, to subtract two integers ensuring that the subtraction is +For example, to subtract two integers ensuring that the load of +the value from memory is completed before any subsequent loads and stores are performed, use .Fn atomic_subtract_acq_int . .Pp +An atomic operation can only have +.Em release +semantics if it performs a store to memory. When an atomic operation has release semantics, all prior loads or stores -(by program order) must have completed before the operation is performed. -Conversely, release semantics do not require that the atomic operation must +(by program order) must have completed before a store executed as part of +the operation that is performed. +Conversely, release semantics do not require that a store from the atomic +operation must have completed before any subsequent load or store is performed. -An atomic operation can only have release semantics if it performs a store -to memory. To denote release semantics, the suffix .Dq Li _rel is inserted into the function name immediately prior to the .Dq Li _ Ns Aq Fa type suffix. For example, to add two long integers ensuring that all prior loads and -stores are completed before the addition is performed, use +stores are completed before the store of the result is performed, use .Fn atomic_add_rel_long . .Pp When a release operation by one thread From nobody Sun Nov 2 21:22:25 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d073647tBz6FWRK; Sun, 02 Nov 2025 21:22:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d07352M9Vz3p63; Sun, 02 Nov 2025 21:22:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762118545; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KNKEFWFbDlKEofn7tuuDobWVFN6CRVvxpFGiLW5LztU=; b=gLzpxFxK0HS8Fm8U5HbI5d6R9aCfSx7W5UvM2Q+NGAaZSqgjfbEkc9g1wGqgLsy1cTVCgc zYOJe7iKZb1WjB1WtWUNoeEdnnX6A4F2xFDA8fn9ArZZlCk5CUdUypXHn0LkISvegW4ne5 VLN4h5ByMwS8VQJVK+6zuydZxhjfexjEMkjCOTZC3IA1Bb40H8xrVP6etmCGGZdM1qbjMr fsUEMoe7ep+zLqLS3dsvu/7nA+JlbxPsIz+eIooXFmMAVILhFnVAMzVTOHCs0epq4fXlDc RMvT8AGZsUxGk5CVnIacrll/4Eq321Q6a6NUnRzNzriZUd/QdvlUguN0yXykuw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762118545; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KNKEFWFbDlKEofn7tuuDobWVFN6CRVvxpFGiLW5LztU=; b=mNdTogCDMr4na7+83llaR9O6pFfxbo2ywhXkp0gCawHEXLmEcM80OlFLaOr9bwdvQPII6o kS/F7ZTVbla/FrK+M7W2KbJA3ptVquG3pt9AurxM1WpSn29+/7S9j9cShlibeLimXSgrO2 8Xe4211wO/TGIJ9lD11oUsmTgmcf+U+dPaqG1/P6Y7Ehc7I2Ambx7oUzRLWGhKtoLMxEgQ 95kHHFCxkeltBh1jhwUYbkmMPyRNWGq3prv2xV9ET+J8KBlokQhpgP5BOc7yV49mvVJmZG ptFT8j7nMeW0kIiJTVE/Ef8jvrBQrHo34/S4f0BlGG53JlLhDDZ50MaoDEenpg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762118545; a=rsa-sha256; cv=none; b=hCDF5B/WGCaNxAPfcbn3Q0CuEBHSbk1bDS/eqhQIB+rFXvCfosRBpCgpU3CBb+zWislSsW QteBFlA+7f5DsvUlIfd7bLlXogqAlV75bJ1fHwJEbaSFJHzf4dNQQmurEpIecUdq38bOOe 23fIieE2oCBm+lSmbz/R2b3+poqdZ3PyuWgBPghiHoovMusWo+qScRNARDfXks4Tf1IvOd KxJczhf1I6hvBuqhpL175t2759BdsrIYtHCiwyvponBQnmyxTfDtrtvNI5yL0Bx7pCdUyn 08xwWJA0QY3uqLLGrw7mkr0T1iiFtLAWemGPrlvJ9owMYAPjFhcytoXHoxdA0Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d07351y8PzjrT; Sun, 02 Nov 2025 21:22: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 5A2LMP9V047131; Sun, 2 Nov 2025 21:22:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A2LMPrD047120; Sun, 2 Nov 2025 21:22:25 GMT (envelope-from git) Date: Sun, 2 Nov 2025 21:22:25 GMT Message-Id: <202511022122.5A2LMPrD047120@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: a6a9d97708ec - main - kern/subr_syscalls.c: declare 'traced' local variables boolean List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a6a9d97708ec18bf307b01141d84aabd01289159 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=a6a9d97708ec18bf307b01141d84aabd01289159 commit a6a9d97708ec18bf307b01141d84aabd01289159 Author: Konstantin Belousov AuthorDate: 2025-10-30 18:35:15 +0000 Commit: Konstantin Belousov CommitDate: 2025-11-02 21:22:08 +0000 kern/subr_syscalls.c: declare 'traced' local variables boolean Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 3 days Differential revision: https://reviews.freebsd.org/D53482 --- sys/kern/subr_syscall.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/kern/subr_syscall.c b/sys/kern/subr_syscall.c index d5b3b62f0821..48896529f685 100644 --- a/sys/kern/subr_syscall.c +++ b/sys/kern/subr_syscall.c @@ -55,8 +55,8 @@ syscallenter(struct thread *td) struct proc *p; struct syscall_args *sa; struct sysent *se; - int error, traced; - bool sy_thr_static; + int error; + bool sy_thr_static, traced; VM_CNT_INC(v_syscall); p = td->td_proc; @@ -219,7 +219,7 @@ syscallret(struct thread *td) struct proc *p; struct syscall_args *sa; ksiginfo_t ksi; - int traced; + bool traced; KASSERT(td->td_errno != ERELOOKUP, ("ERELOOKUP not consumed syscall %d", td->td_sa.code)); @@ -250,9 +250,9 @@ syscallret(struct thread *td) } #endif - traced = 0; + traced = false; if (__predict_false(p->p_flag & P_TRACED)) { - traced = 1; + traced = true; PROC_LOCK(p); td->td_dbgflags |= TDB_SCX; PROC_UNLOCK(p); From nobody Sun Nov 2 23:19:15 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d09dw3nCfz6FjPW; Sun, 02 Nov 2025 23: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d09dw1nPBz41Xg; Sun, 02 Nov 2025 23:19:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762125556; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cz02kzyU8ArGGUYXdL9zaJRQhgDPINJlaq+jOQOKCsQ=; b=jvOajrAxK2iO8RwO/1e/sqEq3QOcSP8WjBtCz7N5hSZfAUB/S0W1mSuGjKBaPqbn8JDqWg LkC1v/tdcdzp4pPRPBA2BzN9vWqkby8mfX4sr7e1cw8XoQfSNbBHmTelcn6OV4dCotDwg2 ahL4yfiVP9bSn7l9vH0G6akRxXy5voIMhPbFKQzg670zTcoxronxdbOwdVkle7IcKh+BWz F1IwVnAo+RaGW+YYqOUZ+irshGMOr7e3VGmn0cP67uzXFIK+prk/gODan3QCk0XkjI9ZBh 4JMX0ZkMVl56kRaBVNXNYSckY0zsOKhnxZdsFjOz1MPIEuA/QM6eqjU+p8xepw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762125556; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cz02kzyU8ArGGUYXdL9zaJRQhgDPINJlaq+jOQOKCsQ=; b=Tqmb81bYX+NDzFjCJvFFrih420abGJx7t9naqiBHwndBvozXNHW+XwhYodQf8ANGPsN63r GW15RULcXdfrRAutkQquYnLjMsHa/9geXYp+ccDBS+rXKHCp8Z/JHgO/V7GLFkIfNOlLjX KP2dAgeVmGTkGE89deGjznZt/FNV7cCsopHH4wDgr7g879TPuFcfBEdU07AbcNbS85NPAA hViqMr9nCb8/v2ZRUHx0WqH/UDipsakshL40K5/2/XcMvm5bddTE0Vc3YbVQIR+VMBKR8k WrWdn+AV3Wsip5ne41HVvvEb/Skh06uKW3ILOTXhAHPacmVEZGCzRoS9KaXRrA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762125556; a=rsa-sha256; cv=none; b=xeUnsNDlb4tAa48kIy/VaWGpfuaGtaozxcTlp9V0G0x+P7pCX9OFz+YmFkiJ2lSfJKz+TS R+0mCE1SebgX7kQUtZswz47rTu0vgOVjkm/avX9y3hDARh0Dcx17SFCkAPZXhEBnijJt5l guLRLxZdJ53SqWqk79L/JBjRWu5PViT7K6NCikuT+EVyRqOWboiLRuQmkpav5DEBymSekm ccfFCoA8/4iqFD8A0QYtwlH00ekSiN5VdBAxfwIok9hfpgVKUrsuCtviB2b/S2Fav9tclZ Ie2lMgTahFPGU/ymR8FP6zGtU0znAZGQcUl7DIRoXxepTqTLgxiq1v5GqND0Ww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d09dw0zWrzmXm; Sun, 02 Nov 2025 23: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 5A2NJF3I061126; Sun, 2 Nov 2025 23: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 5A2NJFHq061123; Sun, 2 Nov 2025 23:19:15 GMT (envelope-from git) Date: Sun, 2 Nov 2025 23:19:15 GMT Message-Id: <202511022319.5A2NJFHq061123@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: b3de3c2dea57 - main - param.h: Bump __FreeBSD_version for e5aa60d06958 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b3de3c2dea576b626a8a107d96b0fd6562500c1e Auto-Submitted: auto-generated The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=b3de3c2dea576b626a8a107d96b0fd6562500c1e commit b3de3c2dea576b626a8a107d96b0fd6562500c1e Author: Rick Macklem AuthorDate: 2025-11-03 00:16:21 +0000 Commit: Rick Macklem CommitDate: 2025-11-03 00:16:21 +0000 param.h: Bump __FreeBSD_version for e5aa60d06958 Commit e5aa60d06958 changed the internal KAPI between the NFS modules. As such, they all need to be rebuilt from sources. Bump __FreeBSD_version to 1600004 for this. --- sys/sys/param.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/sys/param.h b/sys/sys/param.h index 957f1762a17c..bdfe4a1cfde3 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -74,7 +74,7 @@ * cannot include sys/param.h and should only be updated here. */ #undef __FreeBSD_version -#define __FreeBSD_version 1600003 +#define __FreeBSD_version 1600004 /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD, From nobody Sun Nov 2 23:23:25 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d09kk1fCDz6Fjl6; Sun, 02 Nov 2025 23:23:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d09kk15Mzz42Bh; Sun, 02 Nov 2025 23:23:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762125806; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Z5Nt9ARJ6dPE1d9BBgR4JumVLsJHGCiTpMtEosMboYc=; b=SdY9mDGi93WCPnLqdZf9Mayvwd1qhMnJBwaCvQjyE0UhqlcthjXWKBKjKALRAwj0aBc+re I+MivAg6BQlDV2bKxyNllqm6Z7f1oHYvX4CwVr3bgXSeIVMRsIXET1z/2/GxM9JdNZ4qJ2 bZcgN9oTqmhnTN/Jq9mV9REFjsETPgSPz4L7HgRWOuOmw+Gn1CfOpyN9xGIrxzTzzvK8W8 naCq6bYI1zzwJ7Fa+sG05RE5cAAlJZdyBzbRe3gDgosDKS6mN3EPkI2QxczyYHxp3BVdyq wDWaUkkSEVTKHzoo+SNQztniDx8UcPbYFxI3S9j/Q+8ujC+PlLVgai184ulB+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762125806; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Z5Nt9ARJ6dPE1d9BBgR4JumVLsJHGCiTpMtEosMboYc=; b=K1xU/cKrFxngw8qyNA8N6jw/QprHrupDxeQhnNFcU9TKoCODg1+VKDUlrmz87yFGu9DEcf WkCiWvOdtthcWZe9PrXVZHCAmTWHFVXugdG7sLu8NvniTCyEc+wcNhrTtOG6N0Fx5gG34v vgl15nryvlze7szgBTR5o2c/Ukoik8WOLNYQYXc2DpEgAk92Y844k1XWwlDd4oxNQ+Lj2I HG//T3AYhue1A49R2b0Ya7kiK3EIxtVC5AjodVUwRa/xUsLSKCT9dGtsVyLlINtrjcLG4Z wT1DQQO+P3Oxa5FfoFuMatj52iDKteEqA+ZHzl4TtTqo3g+Lf74WnahHZMuc8w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762125806; a=rsa-sha256; cv=none; b=yQeMZ/rKmjDr/dgEGGn+HUWORMr/cTi7fnABDwmiETCDuHfnFbeNV7N0vM1ei82u4gOAIi z7fkFcsKEgkKfUZCtwtaYcx1Vr/5htlYlKt06GnbtVcaQioTUQ626Iy2G9qQozReBEKsKA 7A+NHTUsmirZDzaUIylHQ6SNcrcjACnaeBOVSYM7sk/lLQKh5Z3eeY2p5tjgDesP9MAgmH /3rhikXzyEIXozZOcbLdYOvpsgfdtdJpBqR0R6up/TcyRrzE+SBt1YPhZiu510sIueAwyE b2YXwEmmwSUwchRHaH5/miQ3vW+KGh4APLYfDiueVYj9OMK3RJxk2tk/pnAZww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d09kk0hQLzn2c; Sun, 02 Nov 2025 23:23:26 +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 5A2NNP1h078055; Sun, 2 Nov 2025 23:23:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A2NNPEj078052; Sun, 2 Nov 2025 23:23:25 GMT (envelope-from git) Date: Sun, 2 Nov 2025 23:23:25 GMT Message-Id: <202511022323.5A2NNPEj078052@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: 088ced14a69b - main - UPDATING: Add an entry for e5aa60d06958 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 088ced14a69ba2dce083c031b60c0d04ba218488 Auto-Submitted: auto-generated The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=088ced14a69ba2dce083c031b60c0d04ba218488 commit 088ced14a69ba2dce083c031b60c0d04ba218488 Author: Rick Macklem AuthorDate: 2025-11-03 00:20:26 +0000 Commit: Rick Macklem CommitDate: 2025-11-03 00:20:26 +0000 UPDATING: Add an entry for e5aa60d06958 --- UPDATING | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/UPDATING b/UPDATING index d89afb7ef429..3f425d9da7c8 100644 --- a/UPDATING +++ b/UPDATING @@ -27,6 +27,11 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 16.x IS SLOW: world, or to merely disable the most expensive debugging functionality at runtime, run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20251102: + Commit e5aa60d06958 changed the internal KAPI between + the NFS modules. As such, they all need to be rebuilt + from sources. __FreeBSD_version was bumped to 1600004 for this. + 20251025: flua(1) has moved to the new FreeBSD-flua package. If you use flua, you may want to install this package if it's not otherwise installed