From nobody Mon May 26 03:05:46 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b5LHZ71q6z5x8TY; Mon, 26 May 2025 03:05: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b5LHZ5xH5z3djv; Mon, 26 May 2025 03:05:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748228746; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7koC2WgvXJVjePestPzHPX4fz26HNfTZH+qwMJmBqzk=; b=t007OYpjVVpocNb5tjA9FBrg6sWl1i+VsIdSrIVm4Sy1/lx+tWVUm2Pe8ruhdt/7mQMnqt gJyI0vHcE0GQzU2XVgvUULOVGBd0N29eADD9LUAG8c8DRIigJfujNPFvQ6a9w1l9a7Qjte BHRl7HmkaUImCVIUiMsoj1pxhyDFJqyClLq2PKO4fsDwIop/RPnNLC91qC6y1nyx+Ri5wP NDSmLzoO2QNEzmSuCqGvVytmSNTaRfm4T2G3140YBtx21PaVqGe8i2YYNlf/cBIfjakNfc cCmIA8976AqL1GI1WIyjvxom5Gcws+1fRoIC59/AIuzfrfF/DnN71cIKio8/1Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748228746; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7koC2WgvXJVjePestPzHPX4fz26HNfTZH+qwMJmBqzk=; b=mYCWsk2I4kWfurMzDzImWbG47R7SLWEgcs66YsLVpnIPCAvXPOdnVGu3D2Y/HwZCk1911b 13cZPhhR7E6/MbIVYOFcYH1P1s/8Hsi2RtrSO2eVZV5P4YR4LiE4AMG8037Bpza70uQ8fv bEAJb1Oh3/qWw7pckNrdFCtaKvau/sQkBhGk/mtYZv+bJay2dCtdjkc/vNYRIAg5QOB1Km RmZ+6Vfv+jQbN6a8nH9EyL7rCr8ggQgzgT/qG9kSYQgjHqiIt8UeTzBeYAnDLg1wbbUBDF lFeHky2Zp1Bh9H0rNu6ZmpIL0ariT1lQbnM/4cFcUo6qOHeXUgs59+2WfuLkuQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748228746; a=rsa-sha256; cv=none; b=RIJdAmRQBqLisO+HBWarXysDv5sOys1bDKO9en7ndwOMJzifXsPQTeaVUurQyuW0T/+6l5 0Fw2g+ITUD5nXzgv6ccsjVXOpyMkGWTxH4DL+4n1g9aWtz43lgi9BLvPR1dT815OBATq/r O+btfgAAVtMiue6vRsPqeahVEXtL1Ap8QkgQB2OCdEQ6MbTYlKTo4WA6Cov/70V7iib6Rj Jaj6wYZvFs55kF5GCepehn9TA8NAs1ta7OLV9m3sf6DyHYAQqeMAT93vczmmxvpFdrw31t jK1TvTqPC7L93QFZGC2SZDnxWGf/746YdQDJflrjg31NpiLGcKEGm5+nFaZsDg== 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 4b5LHZ5VGJzq4p; Mon, 26 May 2025 03:05: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 54Q35kkX042233; Mon, 26 May 2025 03:05:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54Q35kkq042231; Mon, 26 May 2025 03:05:46 GMT (envelope-from git) Date: Mon, 26 May 2025 03:05:46 GMT Message-Id: <202505260305.54Q35kkq042231@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Doug Moore Subject: git: 68e3875b623b - main - vm_object: drop reverse walk from collect_flush List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dougm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 68e3875b623b56f83e276afe6ed5334545684ba2 Auto-Submitted: auto-generated The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=68e3875b623b56f83e276afe6ed5334545684ba2 commit 68e3875b623b56f83e276afe6ed5334545684ba2 Author: Doug Moore AuthorDate: 2025-05-26 03:02:37 +0000 Commit: Doug Moore CommitDate: 2025-05-26 03:02:37 +0000 vm_object: drop reverse walk from collect_flush In vm_object_page_collect_flush, following a forward walk from page p seeking more pages to which vm_object_page_remove_write might be applied, a backward walk from page p is attempted. It never finds a page, and so this change removes that walk, and renames the function to better indicate its use for one specific application only. It never finds a page because collect_flush() is only called from one place, in vm_object_page_clean(). If there was a page p-1 to be found, then either it is less than tstart, or it would have been found in the previous iteration. If it less than tstart, then page_clean() shouldn't be messing with it. If it was found in the previous iteration, then vm_object_page_collect_flush() would have been called in that iteration, and page p would have been the first page in the forward walk from p-1, and it would have been processed then, and so p would not be passed to vm_object_page_collect_flush now. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D50517 --- sys/vm/vm_object.c | 69 ++++++++++++++++++++---------------------------------- 1 file changed, 26 insertions(+), 43 deletions(-) diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c index b885b3eda5c1..9b00aea9cdc8 100644 --- a/sys/vm/vm_object.c +++ b/sys/vm/vm_object.c @@ -110,9 +110,6 @@ static int old_msync; SYSCTL_INT(_vm, OID_AUTO, old_msync, CTLFLAG_RW, &old_msync, 0, "Use old (insecure) msync behavior"); -static int vm_object_page_collect_flush(struct pctrie_iter *pages, - vm_page_t p, int pagerflags, int flags, boolean_t *allclean, - boolean_t *eio); static boolean_t vm_object_page_remove_write(vm_page_t p, int flags, boolean_t *allclean); static void vm_object_backing_remove(vm_object_t object); @@ -1001,6 +998,31 @@ vm_object_page_remove_write(vm_page_t p, int flags, boolean_t *allclean) } } +static int +vm_object_page_clean_flush(struct pctrie_iter *pages, vm_page_t p, + int pagerflags, int flags, boolean_t *allclean, boolean_t *eio) +{ + vm_page_t ma[vm_pageout_page_count]; + int count, runlen; + + vm_page_lock_assert(p, MA_NOTOWNED); + vm_page_assert_xbusied(p); + ma[0] = p; + for (count = 1; count < vm_pageout_page_count; count++) { + p = vm_radix_iter_next(pages); + if (p == NULL || vm_page_tryxbusy(p) == 0) + break; + if (!vm_object_page_remove_write(p, flags, allclean)) { + vm_page_xunbusy(p); + break; + } + ma[count] = p; + } + + vm_pageout_flush(ma, count, pagerflags, 0, &runlen, eio); + return (runlen); +} + /* * vm_object_page_clean * @@ -1073,7 +1095,7 @@ rescan: continue; } if (object->type == OBJT_VNODE) { - n = vm_object_page_collect_flush(&pages, p, pagerflags, + n = vm_object_page_clean_flush(&pages, p, pagerflags, flags, &allclean, &eio); pctrie_iter_reset(&pages); if (eio) { @@ -1120,45 +1142,6 @@ rescan: return (res); } -static int -vm_object_page_collect_flush(struct pctrie_iter *pages, vm_page_t p, - int pagerflags, int flags, boolean_t *allclean, boolean_t *eio) -{ - vm_page_t ma[2 * vm_pageout_page_count - 1]; - int base, count, runlen; - - vm_page_lock_assert(p, MA_NOTOWNED); - vm_page_assert_xbusied(p); - base = nitems(ma) / 2; - ma[base] = p; - for (count = 1; count < vm_pageout_page_count; count++) { - p = vm_radix_iter_next(pages); - if (p == NULL || vm_page_tryxbusy(p) == 0) - break; - if (!vm_object_page_remove_write(p, flags, allclean)) { - vm_page_xunbusy(p); - break; - } - ma[base + count] = p; - } - - pages->index = ma[base]->pindex; - for (; count < vm_pageout_page_count; count++) { - p = vm_radix_iter_prev(pages); - if (p == NULL || vm_page_tryxbusy(p) == 0) - break; - if (!vm_object_page_remove_write(p, flags, allclean)) { - vm_page_xunbusy(p); - break; - } - ma[--base] = p; - } - - vm_pageout_flush(&ma[base], count, pagerflags, nitems(ma) / 2 - base, - &runlen, eio); - return (runlen); -} - /* * Note that there is absolutely no sense in writing out * anonymous objects, so we track down the vnode object From nobody Mon May 26 03:06:52 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b5LJs1Qdfz5x85T; Mon, 26 May 2025 03:06:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b5LJr6nN1z3fJm; Mon, 26 May 2025 03:06:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748228813; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=n22Zj27Y5DKKnzw2zRLbMH5Weqqz6PMI1Zu+Ve3z5Fw=; b=quNhW33afyN7fPdiqGUjmkop4Y5okilFJJ2n4+fTx75hQayO4SJWf0jROMQnsAM6eoVpAa WxifnlHpZC0/K15mYnXaorV4NG7jDnFMtT/CQWVAzNJuOlp5AyZOSVmzmFJFykTPQYTvXo YXfZp1qP6+OsQhJLDNncCU8CaEQ9l6JOLhq+OiyUcSdyf9MVDQ/ytDxtSOe5UxhucWbnxS Tvf1Jug7TesV1I0eMVFM51ZUqk9ghWk+KWDW0eZUsDEHh/QXuPXXW90jLjP/Upijaryxsp VaEN/WkXjbdxgL3bafQmVaOM/eeqmDdj+m7sgqYcQSWweoXEwBEkZpMqeAO53Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748228813; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=n22Zj27Y5DKKnzw2zRLbMH5Weqqz6PMI1Zu+Ve3z5Fw=; b=Scrxi347DM3JcyjNeD2bi5Z3SbXaQcJbbjTenZp4EHjy5yM27/2reZ+nklpyLSYqV4Fn9M DT7puMN8WEU7yrfJFCAVq7+FnIKys+iVqBWAFV/MHB+x1wwU07JJvCc2dyO5pvDjrO7fMv brqkup1wmC3gEH1kAV7PmkNQe0jKWCZD9qkJMkImGSU9xfhZ9ZfxEtp39zF4gc+zLfNKUd /L4IUCVLUCf/5hcAgdPMsLhqkZ8bX0gsdIcSHq77lVBujOQwui+PcrDRP5obFsyaQxn50t Nugk4KSJt8BWykwK8WsQdDnD6oWVvLXosRH6maPM030/bNqaQ5TWMMaKMEAfNQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748228813; a=rsa-sha256; cv=none; b=w6p0G+InQwhI0v+zpXcuGek/zs1d+wO+CU9sHodzhS8oMZV9IHcaBkWhR/Pcjy9KhPbGae yUsaJxtAtWxvFMkUcL24QwswzF/tt4Qf5NyQe+wk1DolKoygenIJQtXWj2g0ejpoX5mH1m cZTUkSmqxPiVnUzLM/qg/uScbA8ujUjDGmgnfTvWiZnOEvgb8Z0rGVMZeWB0eLyAqUWrMW UP3ghoHhVmbETO2xbqcj/MHGAKAuXney71xX0RZ7KwAfSHFH/nl/hykGEoKVRntyaFyvRT uofpibUEAm4IOVO0xcxTaP9TTao6ZMNmKInT5yCoLO+46jbwm17DG/QT2cUy8w== 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 4b5LJr6Nxyzq6l; Mon, 26 May 2025 03:06: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 54Q36qEW042682; Mon, 26 May 2025 03:06:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54Q36qrQ042679; Mon, 26 May 2025 03:06:52 GMT (envelope-from git) Date: Mon, 26 May 2025 03:06:52 GMT Message-Id: <202505260306.54Q36qrQ042679@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: b0ada425efb3 - main - safe_eval allow : and + in values List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: b0ada425efb3fb1b744d66bd1d0c1bbd5a7f25e6 Auto-Submitted: auto-generated The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=b0ada425efb3fb1b744d66bd1d0c1bbd5a7f25e6 commit b0ada425efb3fb1b744d66bd1d0c1bbd5a7f25e6 Author: Simon J. Gerraty AuthorDate: 2025-05-26 03:05:53 +0000 Commit: Simon J. Gerraty CommitDate: 2025-05-26 03:06:47 +0000 safe_eval allow : and + in values --- libexec/rc/safe_eval.sh | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/libexec/rc/safe_eval.sh b/libexec/rc/safe_eval.sh index d03eacbdff72..8aaddcaf2176 100644 --- a/libexec/rc/safe_eval.sh +++ b/libexec/rc/safe_eval.sh @@ -1,7 +1,7 @@ # SPDX-License-Identifier: BSD-2-Clause # RCSid: -# $Id: safe_eval.sh,v 1.20 2024/08/16 00:57:58 sjg Exp $ +# $Id: safe_eval.sh,v 1.24 2025/05/23 21:34:54 sjg Exp $ # # @(#) Copyright (c) 2023-2024 Simon J. Gerraty # @@ -17,6 +17,17 @@ _SAFE_EVAL_SH=: +# does local *actually* work? +local_works() { + local _fu +} + +if local_works > /dev/null 2>&1; then + _local=local +else + _local=: +fi + ## # safe_set # @@ -24,7 +35,7 @@ _SAFE_EVAL_SH=: # any non-alphanumeric chars are replaced with '_' # safe_set() { - ${SED:-sed} 's/[ ]*#.*//;/^[A-Za-z_][A-Za-z0-9_]*=/!d;s;[^A-Za-z0-9_. "$,/=-];_;g' + ${SED:-sed} 's/[ ]*#.*//;/^[A-Za-z_][A-Za-z0-9_]*=/!d;s;[^A-Za-z0-9_. "$,/=:+-];_;g' } ## @@ -54,7 +65,7 @@ safe_eval_export() { # feed all "file" that exist to safe_eval # safe_dot() { - eval ${local:-:} ef ex f rc + eval $_local ef ex f rc ef= ex= rc=1 From nobody Mon May 26 03:30:40 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b5LrK1tYRz5x9CF; Mon, 26 May 2025 03:30: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b5LrJ6Ttbz3ttq; Mon, 26 May 2025 03:30:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748230240; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wvjUo2DFbuMLRYhD31bzBCbOC005O80a5C8ndEMJgl4=; b=D4xPOL6lk65f9uJrsJ4qtjUhtWuNcdLvjnaY9Z3vI96WHuWD96/VsnZF83w752KO0u80UK Erh7WKqPhZQsu7NigBoS6aD7747DPCLX6eAMZZs8SZRlE1pcl8glzXCc6vZ3FnrA5LPC1H YJUgEX7weYE9s6OANHT9sFQMAR0HUYQV0NgGlqN7DtQEWkv/NI61V7rSz5m+c1RlmVmGRq K2H9wtiVJ0mAJpsZgEwdYqKx7e3ISTQSOgnMNdU3yLEvbZVsBtV0RcLLEKM9bHNDUSe1OV ZC1l8t4O3GJFp8Rfl24vE9LyRPH7JGHV/G3VEjYTXIWLkJzJj6etAExW9I7hEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748230240; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wvjUo2DFbuMLRYhD31bzBCbOC005O80a5C8ndEMJgl4=; b=A5FQeFdrbbfNr52ddwM+e+MejzSMOMIuNL+bT0sX1QOLd15sLkI67EoLQFlIIh+ltvojEZ BxGMQuPt41gFkiZOMdQQovEuIdGskxfOItcEoTXVWoaqBq/yjGwiC9s8FxMJZJZMq9ENyt 4bqwaFa3a1sq/XYfm63P2XLFkzM+vSxuZ3MXUGWtl22csokJWR+SSGbccYHbERJOZpR0BJ JTHbTa//UkywZYXM0lx02AR7x4E2TWUU8QHsn1LZkAStMa3a7SM5LvtbPw9pdtdcOrYvsN OpWNs+6qih+i03i8SLWyWemcWAvUkRWekxXycDobWQQse1uLyo9C/HdVXTKzoQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748230240; a=rsa-sha256; cv=none; b=XNPfiz+Tx97NQePRXn/XuT2T4/WQsJvYkHYcMta0lUATQNOVd5bPwm/nAKedQFg4pREu0K npfjnKHVTtQGD7PeGAbIGwvdVy1LEWyDnc3AOc0oY5thop7cA/LDx+qUw0nBskevr4Mwih k/TXHY1x+zh4oMkUjlcVPoJ9nnJM4FUysbzz1YvkIiPzbTCt28lr4XayP/K29OSEbHGnND oi6UIfxVE6T8L8k3TjvsRM60067WYvSf3jSged8Ko+w9tEQ91ylYBOKhatTHYAxLRX9Cnz R+7hAgG2e65EOUq5A4F0AobRAd/yJ3pkX1EOPFBjb+N62x3l63gEO77CrrLYwQ== 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 4b5LrJ4QpKzqpt; Mon, 26 May 2025 03:30: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 54Q3UeY6089523; Mon, 26 May 2025 03:30:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54Q3UeQW089520; Mon, 26 May 2025 03:30:40 GMT (envelope-from git) Date: Mon, 26 May 2025 03:30:40 GMT Message-Id: <202505260330.54Q3UeQW089520@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: 0596b4a3d42f - main - vfs_cache.c: Use CACHE_FPL_SUPPORTED_CN_FLAGS List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 0596b4a3d42f0e642f0b5f34b18d43fc8feec46f Auto-Submitted: auto-generated The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=0596b4a3d42f0e642f0b5f34b18d43fc8feec46f commit 0596b4a3d42f0e642f0b5f34b18d43fc8feec46f Author: Rick Macklem AuthorDate: 2025-05-26 03:27:17 +0000 Commit: Rick Macklem CommitDate: 2025-05-26 03:27:17 +0000 vfs_cache.c: Use CACHE_FPL_SUPPORTED_CN_FLAGS Commit 2ec2ba7e232d added some code to cache_can_fplookup() which worked (ensuring an abort when OPENNNAMED was set), but showed I didn't understand what CACHE_FPL_SUPPORTED_CN_FLAGS was used for. This patch cleans it up. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D50524 Fixes: 2ec2ba7e232d ("vfs: Add VFS/syscall support for Solaris style extended attributes") --- sys/kern/vfs_cache.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c index 69de06cff193..e2020b56f038 100644 --- a/sys/kern/vfs_cache.c +++ b/sys/kern/vfs_cache.c @@ -4456,7 +4456,7 @@ cache_fpl_terminated(struct cache_fpl *fpl) (NC_NOMAKEENTRY | NC_KEEPPOSENTRY | LOCKLEAF | LOCKPARENT | WANTPARENT | \ FAILIFEXISTS | FOLLOW | EMPTYPATH | LOCKSHARED | ISRESTARTED | WILLBEDIR | \ ISOPEN | NOMACCHECK | AUDITVNODE1 | AUDITVNODE2 | NOCAPCHECK | OPENREAD | \ - OPENWRITE | WANTIOCTLCAPS | OPENNAMED) + OPENWRITE | WANTIOCTLCAPS) #define CACHE_FPL_INTERNAL_CN_FLAGS \ (ISDOTDOT | MAKEENTRY | ISLASTCN) @@ -4520,10 +4520,6 @@ cache_can_fplookup(struct cache_fpl *fpl) cache_fpl_aborted_early(fpl); return (false); } - if ((cnp->cn_flags & OPENNAMED) != 0) { - cache_fpl_aborted_early(fpl); - return (false); - } return (true); } From nobody Mon May 26 04:22:01 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b5MzY5sFxz5xCyM; Mon, 26 May 2025 04:22: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b5MzY2wFrz3MRZ; Mon, 26 May 2025 04:22:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748233321; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4wb7olJ3vCRfyI+WJw1Kp9D0sTb/1mJ66/D61wh4aOY=; b=i+bCFE2g3L/Gm5p4OtbD5Go3Tv9FkY1OnzUI67I2evT6gnYvBao4JYrcOLymSFkJqlbZ4G BCE0s4a28Sv/vhFhiWAd4OXZ/v8UV/z3vYD2tI7mqRPO9NRg+eX2PcTVZuXkdkbEHJGC/p m9f4E+Pui/+VPzALQp4qfwx4Fs6mRYeB1/mKwnYMgroNjbPkwQ1eXpUyXpq6g61Vy/mFzz XdSCAX9icbVV4RsH6BkyuedKih3KHL6O8t54FlpLQMlKZzSNFo52nJfLCsIA2LyjDsgI2r 5r6XZkwGV8W3B8mQ3cK7EK2eg+IVQHlER/2fax/ehlcQ4LkUn/+yvNYekT7VsA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748233321; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4wb7olJ3vCRfyI+WJw1Kp9D0sTb/1mJ66/D61wh4aOY=; b=kdiQ4h1GwshSzbCgh3Y7vpEr/+nEK/kEpEAnuQbdQqd32/6P+11tTdpJXGB8MrYNB7h/ea 12MKv3bQwPu4Ffv701VGuxY8zlU+xAwaH7pkqGa+2HsnPQ8DKDKoAfE6ZfasTZ3ELSYYT5 pmwolWbl2Q34xbOklf8485+OQsa9vVUCgnDhSIjGAxT6hBtOHVwDdmPwgFnc+IvLBJos41 Xj2DsV8jOcJ8nj2hvq/IQm7JOSx1/BhoybFPhdZ0pi/Dpv76BY99xEap9qlt86wZG3Nc/h S4bH0pF8BSEwSElOLK/fT7N9K4npdvXE7jDQ3sNV1bj0RefQ5vflLj+vohpDIA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748233321; a=rsa-sha256; cv=none; b=RY3yf3VBzq+CPHyQB43FEilIFGIshZq44Imb6LEP6wMw7YvOFonFxMHkapcQ7EJ9limUcs JCcBtDXkPVRWbljFjzHdfH6XmDEPT24xe82tx+vnWCQePRHrx1wtqms0HaAongz7a7c4PZ uFz325LWlle0rxYvwLWk0JW4c0hP3nMQPtZFNsuvXy1DIRfcftPPRnyzBIlT8WuAm1yZ8K K0GAoEDX71QyKiUglJ9YkY41L3ojec92khmzgoTHP2RrRj506Xgoi2SUMX20p4XHFn/o1t ZMKCMyFw8NIkk1dV1iH3wAtuxTDn3OlMRhIUqMMT24U69YUsdDdXDMjUnN1Glg== 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 4b5MzY2Fk1zryd; Mon, 26 May 2025 04:22: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 54Q4M1H3090076; Mon, 26 May 2025 04:22:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54Q4M1j0090073; Mon, 26 May 2025 04:22:01 GMT (envelope-from git) Date: Mon, 26 May 2025 04:22:01 GMT Message-Id: <202505260422.54Q4M1j0090073@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: 9ce5410b9094 - main - src.conf: regen List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 9ce5410b9094f9a2dce72e86a70fd086acdb3ff6 Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=9ce5410b9094f9a2dce72e86a70fd086acdb3ff6 commit 9ce5410b9094f9a2dce72e86a70fd086acdb3ff6 Author: Kyle Evans AuthorDate: 2025-05-26 04:20:44 +0000 Commit: Kyle Evans CommitDate: 2025-05-26 04:21:51 +0000 src.conf: regen This appears to be reflecting the default witch for LLVM_BINUTILS in 1cae7121c667d9 ("Enable LLVM_BINUTILS by default"). --- share/man/man5/src.conf.5 | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index ba88b995e51d..66160520ec3a 100644 --- a/share/man/man5/src.conf.5 +++ b/share/man/man5/src.conf.5 @@ -1,5 +1,5 @@ .\" DO NOT EDIT-- this file is @generated by tools/build/options/makeman. -.Dd May 9, 2025 +.Dd May 25, 2025 .Dt SRC.CONF 5 .Os .Sh NAME @@ -370,18 +370,10 @@ When set, it enforces these options: When set, these options are also in effect: .Pp .Bl -inset -compact -.It Va WITHOUT_LLVM_TARGET_AARCH64 -(unless -.Va WITH_LLVM_TARGET_AARCH64 -is set explicitly) .It Va WITHOUT_LLVM_TARGET_ALL (unless .Va WITH_LLVM_TARGET_ALL is set explicitly) -.It Va WITHOUT_LLVM_TARGET_ARM -(unless -.Va WITH_LLVM_TARGET_ARM -is set explicitly) .It Va WITHOUT_LLVM_TARGET_POWERPC (unless .Va WITH_LLVM_TARGET_POWERPC @@ -390,6 +382,10 @@ is set explicitly) (unless .Va WITH_LLVM_TARGET_RISCV is set explicitly) +.It Va WITHOUT_LLVM_TARGET_X86 +(unless +.Va WITH_LLVM_TARGET_X86 +is set explicitly) .El .It Va WITHOUT_CLANG_BOOTSTRAP Do not build the Clang C/C++ compiler during the bootstrap phase of @@ -965,20 +961,20 @@ Do not build LLVM target support for AArch64. The .Va LLVM_TARGET_ALL option should be used rather than this in most cases. -.It Va WITHOUT_LLVM_TARGET_ALL -Only build the required LLVM target support. -This option is preferred to specific target support options. When set, these options are also in effect: .Pp .Bl -inset -compact -.It Va WITHOUT_LLVM_TARGET_AARCH64 -(unless -.Va WITH_LLVM_TARGET_AARCH64 -is set explicitly) .It Va WITHOUT_LLVM_TARGET_ARM (unless .Va WITH_LLVM_TARGET_ARM is set explicitly) +.El +.It Va WITHOUT_LLVM_TARGET_ALL +Only build the required LLVM target support. +This option is preferred to specific target support options. +When set, these options are also in effect: +.Pp +.Bl -inset -compact .It Va WITHOUT_LLVM_TARGET_POWERPC (unless .Va WITH_LLVM_TARGET_POWERPC @@ -987,6 +983,10 @@ is set explicitly) (unless .Va WITH_LLVM_TARGET_RISCV is set explicitly) +.It Va WITHOUT_LLVM_TARGET_X86 +(unless +.Va WITH_LLVM_TARGET_X86 +is set explicitly) .El .It Va WITHOUT_LLVM_TARGET_ARM Do not build LLVM target support for ARM. From nobody Mon May 26 08:17:05 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b5TBn67G0z5xSkC; Mon, 26 May 2025 08:17: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b5TBn56gcz3RXD; Mon, 26 May 2025 08:17:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748247425; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2KH5xL89NDHDTjof2akXu38U+nYXsXyOKBLFNuG6Mbw=; b=ozUK4ow9dkmWw0w324b5IfkuN67dHEL3HLPlE4E3Y6OkQkwUHyzOS937VDj/ajIgGgV3PP 1GQyUG1Cl415N8NPKYwsKXA7OfzC4RqfLFZyIdwCOALj5UN2PEe2wLbL/RqxHRJ9L4l4Iy FsUlhAvuw9RMBe2qdYgQJoeImsVHwBByBWD4jzSb/Dv4tWxttj7xEjw3ldIq75t+PEU0Z3 LPswjG6mwn9jfgn+Mvg4AZ8pyL+VjhH/AwaKITj6FCYke/qZ7O6UWTy5aI5o7dwFgySalB e6Nml16PgirSdQjQHytPTbh4zdPOqK89pBa925oFmciJr/U7qV9ka5YdvvGl9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748247425; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2KH5xL89NDHDTjof2akXu38U+nYXsXyOKBLFNuG6Mbw=; b=B/D98pZul/Vdlxp9B6Bo0/A23vSnyBcedf7LvIwaqE+6dI821xufOImlw6aOQwbT1LLR4p AFzkkviLj7sRMeGx66wnIE7E1xJ6v20hVnTt8KDr3G2io+M7UhFAbXRszj9uFMkfL2pCRZ rYXwQk8hYVsJtyXNX9CKu5khNNcn664RE/G63LBAvtML/PBQLf4pNC/IDIfQciOdnieZsX E6luoj7846j+8v6ls+d+fnn+CtCwMOTqSbvt/e1MZS/D/YPfTHk6GX071LTJHhAmb+Oaj4 AwdDiB4oNE9NMaWTu2oDGJbT7o9p7v7Yze9nZDCHn1TTJPbSrRLSUJuvYwOk2A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748247425; a=rsa-sha256; cv=none; b=CqO0CnEUYF9aUxtSNG8N2aqtlA0vjDT/fXiiFc6q0kI+I8mk/+IWVqnvY3hoqyDdTMih95 NDlcECqTCbPw8IIZjOLNb88DPvcCV2EBKNdnzw6a0pnGuY/NL8VxaODTit83WMzCw64k2R 1rWcW1BusIVEVl6dRRMgOjS7DiHDKg1kXPAwlVP4D+GoW0nUyXaCgwP+yl5BW9JQleUECJ Sp69FII6PodWr5otNdRxt6f8O5fcaT3qr2i7Rr7RdVr/e7JNvgIJ5GmyPb0RGJQAF2JABO K/vjhhgLt8YVQ19xJ8EOUbWn6QVT99/2emrkexDy5rV40nIQ5levb1IZolUUHw== 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 4b5TBn49dKzyGR; Mon, 26 May 2025 08:17: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 54Q8H5MP021091; Mon, 26 May 2025 08:17:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54Q8H5hc021088; Mon, 26 May 2025 08:17:05 GMT (envelope-from git) Date: Mon, 26 May 2025 08:17:05 GMT Message-Id: <202505260817.54Q8H5hc021088@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 39f442502167 - stable/14 - pthread_switch_add_np(3): remove List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 39f4425021678ee9069aa15946c4946e0bdd49e3 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=39f4425021678ee9069aa15946c4946e0bdd49e3 commit 39f4425021678ee9069aa15946c4946e0bdd49e3 Author: Konstantin Belousov AuthorDate: 2025-05-16 13:25:34 +0000 Commit: Konstantin Belousov CommitDate: 2025-05-26 08:16:35 +0000 pthread_switch_add_np(3): remove (cherry picked from commit c0fdd2bf944bb646116c6cd9879560579ebaa563) --- include/pthread_np.h | 7 --- lib/libthr/thread/thr_switch_np.c | 5 +- share/man/man3/Makefile | 2 - share/man/man3/pthread_np.3 | 10 ---- share/man/man3/pthread_switch_add_np.3 | 86 ---------------------------------- 5 files changed, 4 insertions(+), 106 deletions(-) diff --git a/include/pthread_np.h b/include/pthread_np.h index 8f0180d4bd04..dcc762156a67 100644 --- a/include/pthread_np.h +++ b/include/pthread_np.h @@ -34,11 +34,6 @@ #include #include -/* - * Non-POSIX type definitions: - */ -typedef void (*pthread_switch_routine_t)(pthread_t, pthread_t); - /* * Non-POSIX thread function prototype definitions: */ @@ -67,8 +62,6 @@ int pthread_setaffinity_np(pthread_t, size_t, const cpuset_t *); int pthread_single_np(void); void pthread_suspend_all_np(void); int pthread_suspend_np(pthread_t); -int pthread_switch_add_np(pthread_switch_routine_t); -int pthread_switch_delete_np(pthread_switch_routine_t); int pthread_timedjoin_np(pthread_t, void **, const struct timespec *); __END_DECLS diff --git a/lib/libthr/thread/thr_switch_np.c b/lib/libthr/thread/thr_switch_np.c index 80cd34c15650..59a9a4c7e1a3 100644 --- a/lib/libthr/thread/thr_switch_np.c +++ b/lib/libthr/thread/thr_switch_np.c @@ -40,10 +40,13 @@ #include "thr_private.h" - __weak_reference(_pthread_switch_add_np, pthread_switch_add_np); __weak_reference(_pthread_switch_delete_np, pthread_switch_delete_np); +typedef void (*pthread_switch_routine_t)(pthread_t, pthread_t); +int _pthread_switch_add_np(pthread_switch_routine_t routine); +int _pthread_switch_delete_np(pthread_switch_routine_t routine); + int _pthread_switch_add_np(pthread_switch_routine_t routine __unused) { diff --git a/share/man/man3/Makefile b/share/man/man3/Makefile index 5f336b6b7d2a..3aa215d095e7 100644 --- a/share/man/man3/Makefile +++ b/share/man/man3/Makefile @@ -463,7 +463,6 @@ PTHREAD_MAN= pthread.3 \ pthread_spin_lock.3 \ pthread_suspend_all_np.3 \ pthread_suspend_np.3 \ - pthread_switch_add_np.3 \ pthread_testcancel.3 \ pthread_yield.3 @@ -528,7 +527,6 @@ PTHREAD_MLINKS+=pthread_set_name_np.3 pthread_get_name_np.3 \ PTHREAD_MLINKS+=pthread_spin_init.3 pthread_spin_destroy.3 \ pthread_spin_lock.3 pthread_spin_trylock.3 \ pthread_spin_lock.3 pthread_spin_unlock.3 -PTHREAD_MLINKS+=pthread_switch_add_np.3 pthread_switch_delete_np.3 PTHREAD_MLINKS+=pthread_testcancel.3 pthread_setcancelstate.3 \ pthread_testcancel.3 pthread_setcanceltype.3 PTHREAD_MLINKS+=pthread_join.3 pthread_peekjoin_np.3 \ diff --git a/share/man/man3/pthread_np.3 b/share/man/man3/pthread_np.3 index caab8cc13209..9fb2544dd3c9 100644 --- a/share/man/man3/pthread_np.3 +++ b/share/man/man3/pthread_np.3 @@ -132,16 +132,6 @@ Suspend the specified thread. Suspend all active threads. .It Xo .Ft int -.Fn pthread_switch_add_np "pthread_switch_routine_t routine" -.Xc -Install a routine that is called every time a thread context switches. -.It Xo -.Ft int -.Fn pthread_switch_delete_np "pthread_switch_routine_t routine" -.Xc -Remove a routine that is called every time a thread context switches. -.It Xo -.Ft int .Fo pthread_timedjoin_np .Fa "pthread_t thread" "void **value_ptr" "const struct timespec *abstime" .Fc diff --git a/share/man/man3/pthread_switch_add_np.3 b/share/man/man3/pthread_switch_add_np.3 deleted file mode 100644 index f02ff15eedc3..000000000000 --- a/share/man/man3/pthread_switch_add_np.3 +++ /dev/null @@ -1,86 +0,0 @@ -.\" Copyright (c) 2003 Alexey Zelkin -.\" 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. -.\" -.Dd October 12, 2021 -.Dt PTHREAD_SWITCH_ADD_NP 3 -.Os -.Sh NAME -.Nm pthread_switch_add_np , -.Nm pthread_switch_delete_np -.Nd thread context switches debugging primitives -.Sh LIBRARY -.Lb libpthread -.Sh SYNOPSIS -.In pthread_np.h -.Ft int -.Fn pthread_switch_add_np "pthread_switch_routine_t routine" -.Ft int -.Fn pthread_switch_delete_np "pthread_switch_routine_t routine" -.Sh DESCRIPTION -An application is allowed to monitor the thread context switches inside -the threading library. -An application can install a routine that gets called every time a thread -(explicitly created by an application with the -.Xr pthread_create 3 -function) gets the context switched. -The routine is passed the thread IDs of the threads that are -being switched in and out. -Installation and removal of these hooks may be done using the -.Fn pthread_switch_add_np -and -.Fn pthread_switch_delete_np -functions respectively. -.Sh RETURN VALUES -If successful, -these functions return 0. -Otherwise, an error number is returned to indicate the error. -.Sh ERRORS -The -.Fn pthread_switch_add_np -may fail if: -.Bl -tag -width Er -.It Bq Er EINVAL -.Dv NULL -pointer was passed in the -.Fa routine -argument. -.El -.Pp -The -.Fn pthread_switch_delete_np -may fail if: -.Bl -tag -width Er -.It Bq Er EINVAL -The -.Fa routine -argument is different from the argument previously passed to the -.Fn pthread_switch_add_np -function. -.El -.Sh SEE ALSO -.Xr pthread_create 3 , -.Xr pthread_np 3 -.Sh AUTHORS -This manual page was written by -.An Alexey Zelkin Aq Mt phantom@FreeBSD.org . From nobody Mon May 26 08:17:06 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b5TBp702cz5xSmc; Mon, 26 May 2025 08:17: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b5TBp4C5Pz3RZ2; Mon, 26 May 2025 08:17:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748247426; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZaimoE2WoHjqMCeyPl1twpjbdxrJ8FmhOF0U6YsBBx4=; b=jd1wzvEy4KbURQUN4mgCwnXf/I47JsNIGxTxawIDqqv4D5/RRf7qsVqUqL4EIze9jrr464 /RA3dnr8vLCWYyoNT7dPYBElSnXePsj1yibxSt0KkL+Vfxn7cadaM675K8UTF68VBJpNrO AUKt9rtf8cPgFxuwdPm0/y/N33mBxuT0TJCqmNNcIoDiJvaD+pZfbM9PfbJ/S3FXp9RPX5 538mUjBf7Aqfa3QvyZOpnefpvDXTMMm/HXbwKYuOFWwvToCON30ENWvB5Z2P3hLpcCfMrE I0SRsBx0vkifkfDn6TN+DuffWKneh8c/Pcp2R+1iBR7kCHTkihkaqjmctizVsw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748247426; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZaimoE2WoHjqMCeyPl1twpjbdxrJ8FmhOF0U6YsBBx4=; b=sBcYQJFFSzDZdU+kmKIsLS7zD3xWl6iFX+/4sYvQMITnVTyPbuMdKcJFy3fBa10AsjRPPU h29V3/NUrRPWLeO6J85CwBv6sdAGlmVbC5C39H+suvWQyRaEsGpJoPbWh+p4CDZBC7F2wK y79XNJS3YWwjF7y/5748+h3PBYx/yAq2Z52VNTNrDPX4pRCWoijfmwbXvWLmHXitGFiXwM nFBXbN2t4d0Rvlyatt5OS6cGXJZe9GvFrrIIEZEs45mgMewMbwNNJaTjGZ2SGQDsGAUsiP eBh8a280odicmsOkZhFlxfFMPekYfASk82Zij9DOMxPYSuNGJSTzwl9qEkzrlQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748247426; a=rsa-sha256; cv=none; b=gPcn9q2F+JVxSeWn2wOwQH/RTIXR7pMFAZq5hJ3WcAWR6f9Ee+t6H5ij6Ddz2TDURZ+KrH Y37oAsNFxNGoSrqrIfpGEnZgK2iAwC6j56wy3NeCnYtNndiIpLjBRLoLIlbdBpELRnzqBK Am1kaRoNX50+jiMx2SrbNyS6JF5tLVpt4BjqjtBuZt9nt82VhBH14yV1IgW1gMO5j46z/5 ovINyr7S0L8+ekd7xrLethpSS/nBWJPFe1QexsCFNK7mAO/4h9LdH+UNQ6nsOZ2YXZfiNc yeA0gtgSa2LDl3xC9MTByTGuSrdaTZZ+gwhzy4kNV09KKQYc7apcAD5kqwxfRg== 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 4b5TBp3XGfzynb; Mon, 26 May 2025 08:17: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 54Q8H62O021124; Mon, 26 May 2025 08:17:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54Q8H6Ux021121; Mon, 26 May 2025 08:17:06 GMT (envelope-from git) Date: Mon, 26 May 2025 08:17:06 GMT Message-Id: <202505260817.54Q8H6Ux021121@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: b3188948394e - stable/14 - libthr: add stable user interface for sigfastblock(2) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b3188948394e1fa5f2413857b5d1c5d4c449c13e Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=b3188948394e1fa5f2413857b5d1c5d4c449c13e commit b3188948394e1fa5f2413857b5d1c5d4c449c13e Author: Konstantin Belousov AuthorDate: 2025-05-16 13:18:21 +0000 Commit: Konstantin Belousov CommitDate: 2025-05-26 08:16:35 +0000 libthr: add stable user interface for sigfastblock(2) (cherry picked from commit 31760ee65ae3e79434fb257d93e17a6de6021f48) --- include/pthread_np.h | 2 ++ lib/libthr/pthread.map | 2 ++ lib/libthr/thread/thr_sig.c | 19 +++++++++++++++++++ 3 files changed, 23 insertions(+) diff --git a/include/pthread_np.h b/include/pthread_np.h index dcc762156a67..a9e738540db4 100644 --- a/include/pthread_np.h +++ b/include/pthread_np.h @@ -59,6 +59,8 @@ int pthread_resume_np(pthread_t); int pthread_peekjoin_np(pthread_t, void **); void pthread_set_name_np(pthread_t, const char *); int pthread_setaffinity_np(pthread_t, size_t, const cpuset_t *); +void pthread_signals_block_np(void); +void pthread_signals_unblock_np(void); int pthread_single_np(void); void pthread_suspend_all_np(void); int pthread_suspend_np(pthread_t); diff --git a/lib/libthr/pthread.map b/lib/libthr/pthread.map index 76c574e783a2..4be126bcaabd 100644 --- a/lib/libthr/pthread.map +++ b/lib/libthr/pthread.map @@ -336,5 +336,7 @@ FBSD_1.6 { }; FBSD_1.8 { + pthread_signals_block_np; + pthread_signals_unblock_np; pthread_sigqueue; }; diff --git a/lib/libthr/thread/thr_sig.c b/lib/libthr/thread/thr_sig.c index 1e4a0b9a8f72..f43308d52327 100644 --- a/lib/libthr/thread/thr_sig.c +++ b/lib/libthr/thread/thr_sig.c @@ -37,6 +37,7 @@ #include #include #include +#include #include "un-namespace.h" #include "libc_private.h" @@ -163,6 +164,24 @@ _thr_signal_block_setup(struct pthread *curthread) __sys_sigfastblock(SIGFASTBLOCK_SETPTR, &curthread->fsigblock); } +void +pthread_signals_block_np(void) +{ + struct pthread *curthread; + + curthread = _get_curthread(); + _thr_signal_block(curthread); +} + +void +pthread_signals_unblock_np(void) +{ + struct pthread *curthread; + + curthread = _get_curthread(); + _thr_signal_unblock(curthread); +} + int _thr_send_sig(struct pthread *thread, int sig) { From nobody Mon May 26 08:17:07 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b5TBr2yrZz5xSkH; Mon, 26 May 2025 08:17: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b5TBr0dwFz3RlD; Mon, 26 May 2025 08:17:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748247428; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Mwf4RXJYMyXmj2D3/ZxfzIumJ63pdc5cerLgbsYZsus=; b=AHB5BLGSvoCCPzTlqBwIRo5/DxbL7Y/W16vFoPEFsapqOTRVn58hm1lhy9IY7FciQ/mDTE LZ3KHDPe/MgckgYUopQwrtgGTbbbtAcYQXRI1b7qiyjZZU2CvoJ97tpGlWoLDMKuciSz8m 89RJRXbVNw98tX3d5IfbLqWwlbes4yWqNISJwlS+ZsMSYq8JLkrbvvhggTjNawpcaTivfx xutXjsGnAIJTybp+k6nUdoPctLVAc64sJikZdW2u/s+nIImMcbSZ9NbydPH6UTalAjPt+6 APKHf1R3AE6suWRAkA8ItrhIec2h6X6Z89wN4XVhxl6WnpUJU0p2LE8ck31heQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748247428; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Mwf4RXJYMyXmj2D3/ZxfzIumJ63pdc5cerLgbsYZsus=; b=RASwkLrR2lltPUBJ2ghVtizV1mdXov3Poq0sdpB7g+bRA9yV8lW6ZXpM6MetN8lnQC/K26 Fi+b2DAsPtiZUNZ830ZXGj0l7uKD8Axnv8vG4MlXYh2zCQkuIocwFMgkhi0nJ/UGDpUW/E QKdVY3mefnIJudVFEAlDN/inJ3a8G8nJN7MR3BFd7twaj2K8K8QYUbEmz6SGUwj2vZhos+ jpkG844Z+qyBpqhLtRhwpC6P042Ynoztno2SvkUFg58j/jjj9eNjUCCBNgjasZtH/T7EGf SgTWK617cu3wbLe1mJVbO/HVODMKKz9ruJBlL7lI3FHDZ6fmJn6C6GUeDtki2Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748247428; a=rsa-sha256; cv=none; b=pchrOpCs+FOMkUP8A6/9jPqmr5SxhUuPUeCrPE30sF/enOQ7V154eyhlIKFbs/nJC10WUi SrHD2TBh2Hanh+vmju6sFqq3AJX37UQOlWhmHBRcyWTDTkQbARvXxJb8TB9ad6uXqAJLnC inSMAM4aoOZonbnYXAnSlLrA5Iq4fmfyDSS5kdyRUGNjwShE1l5zatecqETn5ZqVeT5lxG W7isw1tg+zlPnyUvbirRSOT4Q1rNDXP7wogQH0NfmeNAC7Ho5ADT6mjXAKw/LDloD5/hVr VejtcYwspmm7v8Ud51Q5uMvPy7TnZoc3R+TjuYDSgVUqZA8fBC1DdGhAPiEt3w== 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 4b5TBq4ZmXzync; Mon, 26 May 2025 08:17: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 54Q8H7dd021157; Mon, 26 May 2025 08:17:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54Q8H7jb021154; Mon, 26 May 2025 08:17:07 GMT (envelope-from git) Date: Mon, 26 May 2025 08:17:07 GMT Message-Id: <202505260817.54Q8H7jb021154@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: e57eeaf54cb8 - stable/14 - pthread_signals_block_np(3): document List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e57eeaf54cb83b3d38b5a16dd7e9e37e7adf13d6 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=e57eeaf54cb83b3d38b5a16dd7e9e37e7adf13d6 commit e57eeaf54cb83b3d38b5a16dd7e9e37e7adf13d6 Author: Konstantin Belousov AuthorDate: 2025-05-16 13:24:27 +0000 Commit: Konstantin Belousov CommitDate: 2025-05-26 08:16:35 +0000 pthread_signals_block_np(3): document (cherry picked from commit 1393f9a36b9c471d4af3518a3d3bb56c2a6adc58) --- share/man/man3/Makefile | 3 ++ share/man/man3/pthread_np.3 | 6 +++ share/man/man3/pthread_signals_block_np.3 | 81 +++++++++++++++++++++++++++++++ 3 files changed, 90 insertions(+) diff --git a/share/man/man3/Makefile b/share/man/man3/Makefile index 3aa215d095e7..0cabb74c6266 100644 --- a/share/man/man3/Makefile +++ b/share/man/man3/Makefile @@ -459,6 +459,7 @@ PTHREAD_MAN= pthread.3 \ pthread_setspecific.3 \ pthread_sigmask.3 \ pthread_sigqueue.3 \ + pthread_signals_block_np.3 \ pthread_spin_init.3 \ pthread_spin_lock.3 \ pthread_suspend_all_np.3 \ @@ -524,6 +525,8 @@ PTHREAD_MLINKS+=pthread_schedparam.3 pthread_getschedparam.3 \ PTHREAD_MLINKS+=pthread_set_name_np.3 pthread_get_name_np.3 \ pthread_set_name_np.3 pthread_getname_np.3 \ pthread_set_name_np.3 pthread_setname_np.3 +PTHREAD_MLINKS+=pthread_signals_block_np.3 \ + pthread_signals_unblock_np.3 PTHREAD_MLINKS+=pthread_spin_init.3 pthread_spin_destroy.3 \ pthread_spin_lock.3 pthread_spin_trylock.3 \ pthread_spin_lock.3 pthread_spin_unlock.3 diff --git a/share/man/man3/pthread_np.3 b/share/man/man3/pthread_np.3 index 9fb2544dd3c9..c6f0efac7415 100644 --- a/share/man/man3/pthread_np.3 +++ b/share/man/man3/pthread_np.3 @@ -116,6 +116,11 @@ Sets the specified thread's name. .Xc Sets the specified thread's name. .It Xo +.Ft void +.Fn pthread_signals_block_np void +.Xc +Blocks all asynchronous signals, quickly. +.It Xo .Ft int .Fn pthread_single_np void .Xc @@ -213,6 +218,7 @@ instead. .Xr pthread_resume_all_np 3 , .Xr pthread_resume_np 3 , .Xr pthread_set_name_np 3 , +.Xr pthread_signals_block_np 3 , .Xr pthread_suspend_all_np 3 , .Xr pthread_suspend_np 3 , .Xr pthread_switch_add_np 3 diff --git a/share/man/man3/pthread_signals_block_np.3 b/share/man/man3/pthread_signals_block_np.3 new file mode 100644 index 000000000000..de33f4e6189e --- /dev/null +++ b/share/man/man3/pthread_signals_block_np.3 @@ -0,0 +1,81 @@ +.\" Copyright (c) 2025 The FreeBSD Foundation +.\" All rights reserved. +.\" +.\" SPDX-License-Identifier: BSD-2-Clause +.\" +.\" This documentation was written by +.\" Konstantin Belousov under sponsorship +.\" from the FreeBSD Foundation. +.\" +.Dd May 16, 2025 +.Dt PTHREAD_SIGNALS_BLOCK_NP 3 +.Os +.Sh NAME +.Nm pthread_signals_block_np , +.Nm pthread_signals_unblock_np +.Nd fast asynchronous signals blocking and unblocking +.Sh LIBRARY +.Lb libpthread +.Sh SYNOPSIS +.In pthread_np.h +.Ft void +.Fn pthread_signals_block_np "void" +.Ft void +.Fn pthread_signals_unblock_np "void" +.Sh DESCRIPTION +The +.Fn pthread_signals_block_np +and +.Fn pthread_signals_unblock_np +functions provide user programs an interface to the fast asynchronous +signals blocking facility +.Xr sigfastblock 2 . +.Pp +Blocking signals with +.Fn pthread_signals_block_np +disables delivery of any asynchronous signal, until unblocked. +Signal blocking establishes a critical section where the execution +flow of the thread cannot be diverted into a signal handler. +Blocking signals is fast, it is performed by a single memory write into +a location established with the kernel. +.Pp +Synchronous signal delivery cannot be blocked in general, including with +these functions. +.Pp +The blocked state established by the +.Fn pthread_signals_block_np +is not completely POSIX-compliant. +Specifically, system calls executed while in a blocked section, +might abort sleep and return +.Er EINTR +upon queuing of an asynchronous signal to the thread, +but the signal handler is not called until the last unblock is done. +.Pp +Calls to +.Nm pthread_signals_block_np +can be nested, and must be complemented by an equal count of +calls to +.Nm pthread_signals_unblock_np +to return the calling thread to the standard mode of signal receiving. +.Pp +An example use of these function might be the construction of the CPU +state that cannot be done atomically, and which includes stages where +the state of the thread is not ABI compliant. +If a signal is delivered while such state is not yet finished, signal +handlers would misbehave. +Using standard functions +.Pq Fn sigprocmask +to establish critical section might be much slower, because +.Fn sigprocmask +is system call, while +.Fn pthread_signals_block_np +consists of a single atomic memory write. +.Sh RETURN VALUES +The functions do not return a value. +.Sh ERRORS +There are no errors reported by the functions. +.Sh SEE ALSO +.Xr sigfastblock 2 , +.Xr sigprocmask 2 , +.Xr pthread_sigmask 3 , +.Xr pthread_np 3 From nobody Mon May 26 08:17:08 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b5TBs5TkDz5xSXc; Mon, 26 May 2025 08:17: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b5TBs09fpz3RjJ; Mon, 26 May 2025 08:17:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748247429; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e5qyBCPZusJeI8DW9Y9Dklk+SzQDWrz2GgrsKsIhas0=; b=nBZ91qSZEOh83tIaoNqi4oPUkxFA0x8N3fTbFBC3YHssePLDC1guflqFJEtZZr6RQmsKgn ftO83dp7Ae6/l15EAKWP8AUQZALt4lfIlyKJXNNQY5GI7yUUCZN/y5TMVNNoYh2170JRUt sODYwKLz0RBxlXusjeSFLbl9mrfAfCMh/mukior45XqBDSAO48mB+WJkVpVEPiUSk5Wp9s jOdyTsnT6iyRIlF9j/KiySbAtaYucj7QNWHYmI3pNB5spLK/7cnAh1gw45narv9ocWuxfd o27N+zHozAzHuEM80UqSdwYmRWdLgoqYuxcFHRZhgy58oZI1//b/WgLVwghjWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748247429; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e5qyBCPZusJeI8DW9Y9Dklk+SzQDWrz2GgrsKsIhas0=; b=GkQc8Xb1kTPjaJxXbotU5qdq1P1HZC1jOyKMgAt4qky3SMdpRu+azhY0RuviZNtAKnUvZV mVBsLhNmEEshnlbop/RpdvkfNM802jzFehKL/QcS02k+dw9B2w5bac9aSblo0QbdmP2/fo daNrK4TmxBw+7ea9YcYTryyC7hTpqdgMf/38AoKf+D830Gn+rf77v5qZIKi7XWyc0JhEiG gC1hQlds4PjQqr4HTzqj8Zmv3diunNQraPXL7ElVb6BZR2D76eYr22QdQjk3ckuXuMuAX0 hJLTvx6FCr1oLBGuVf6dYXsak4M3rcSaRbbNLr9eJBJmqcgvUAPpR3pdOEusOg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748247429; a=rsa-sha256; cv=none; b=uuwjl441Tkja+Eoc11c6/hXdeVFvSoT/og4SQyzjSJtDD+xJx07p5It/9Cx3PAf2yXkKCx 7+RFwVm2sDa6ArKD/IdZbGibbYegG05MP4p0EYDxyXCv7MhXWufaBjYvupNgl4ICWRsZYR bqGhJhhwEW3eulLnGjG6z5Hw7aFQSVrRfuwRKhUCxw3MUqCqWX2pibcDwmvhzqY6vwvI8T N3F0qUSc5it5KAG723axVn/NqkXuto/tvOpGLsxmWywOAWojIrFNyUofSynS/QuDqJWTwl dHq7TogdEUZKv1VHZnUIDFWqnVr8a51tuxTmlkjQR99swcsY05c8BAwXHpGncw== 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 4b5TBr5Ynvz10Cj; Mon, 26 May 2025 08:17: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 54Q8H89l021189; Mon, 26 May 2025 08:17:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54Q8H8GT021186; Mon, 26 May 2025 08:17:08 GMT (envelope-from git) Date: Mon, 26 May 2025 08:17:08 GMT Message-Id: <202505260817.54Q8H8GT021186@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: c200e184cc39 - stable/14 - kern_fork.c: style List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c200e184cc3948ce9109e6b374a8e204676fb0bd Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=c200e184cc3948ce9109e6b374a8e204676fb0bd commit c200e184cc3948ce9109e6b374a8e204676fb0bd Author: Konstantin Belousov AuthorDate: 2025-05-24 11:03:50 +0000 Commit: Konstantin Belousov CommitDate: 2025-05-26 08:16:35 +0000 kern_fork.c: style (cherry picked from commit 9137de9a1b5fdbd77880344820d55e2f05883e53) --- sys/kern/kern_fork.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/kern_fork.c b/sys/kern/kern_fork.c index ee58ad42bce6..8abf6ebc20be 100644 --- a/sys/kern/kern_fork.c +++ b/sys/kern/kern_fork.c @@ -609,7 +609,7 @@ do_fork(struct thread *td, struct fork_req *fr, struct proc *p2, struct thread * * been preserved. */ p2->p_flag |= p1->p_flag & P_SUGID; - td2->td_pflags |= (td->td_pflags & (TDP_ALTSTACK | TDP_SIGFASTBLOCK)); + td2->td_pflags |= td->td_pflags & (TDP_ALTSTACK | TDP_SIGFASTBLOCK); SESS_LOCK(p1->p_session); if (p1->p_session->s_ttyvp != NULL && p1->p_flag & P_CONTROLT) p2->p_flag |= P_CONTROLT; From nobody Mon May 26 12:10:41 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b5ZNb2W8zz5xgLc; Mon, 26 May 2025 12:10:55 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-io1-f46.google.com (mail-io1-f46.google.com [209.85.166.46]) (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 4b5ZNb0NrRz3K6H; Mon, 26 May 2025 12:10:55 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-io1-f46.google.com with SMTP id ca18e2360f4ac-86a464849c2so56023539f.1; Mon, 26 May 2025 05:10:55 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748261453; x=1748866253; 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=V9yUWjxEsEkXQpCX8kBtTice4DqQPU3IeY/dfsy7yck=; b=BB9K46t39tE7ADsxpB0fwEGQSuKaQa7HzvXPfEjZH5V9edXuxUPI4K9BHjyr9PDJg0 m0PwQ7R0uVqVz3CH0idX9IBDV1hdytjZtkn3Fr6RpfdW0vwRQ4WK2Cz4vvWqy0CGGs7G ZgR4XFXC+PmdkBJa71jtRgHestdUhTUMjJh50F5Efcqu+y6oJHPTT2LFDtO8/cdAW41d IlSYsFqML3LZlZcKaf2Kz8D76HlywfrIyW5VULJD4YXzIL+q1eZzIbEsKvo07JQasFaz iC+mnoKosqekKhhG7TDtH8N+Lu9pbMt5Emy1VPxG2i4lIeVn8jDx64hn6aIzqNegikYr 2dfg== X-Forwarded-Encrypted: i=1; AJvYcCUic+mr6e0yDRu1IGI4GLnyf6z3Tvfdnoj9yUuayGMl+br9hUTAkYZ8p+v/Qpu1q6g0S5FKgvATqgCKv9j0TB4a34K9@freebsd.org, AJvYcCXGHIiWCjJzp7uzFrO1AEJzYlaT7DrsFhwJgKUoSkkoKpAJsb5O1ON4t/nE85x8iKxZtA9q07hQ4N2xiJWMF2+syPXOERY=@freebsd.org X-Gm-Message-State: AOJu0Yy0SBDj1dMtsh6GmLKE613fpi2uncw4v4aEnhT5koOa6JqDu8j2 R8dCg6ekHnB2M15PT7fpTvCfoypsyZu+5Eof6KIsNRLPl/D+ZHahz246Pb0Jocay6v/2EjkQPqi iFMBNKektDLjScLdghpO32Fa8wIPhMRFdVJJC X-Gm-Gg: ASbGncuFGClzOXfLM0jrm4Tx91PWiWHrvY1rEu0KqnGoawJffmszTh9BFfZg2b/gllG nvE7VicKVAdGvp4grf8MFp14EqkqnO7ujDsYpwds58MCSfof2IhcMwLK9d+TjFIFaPp2sjUAWd/ 7IcIxBK4VHs3hUtZW3mkvwVtXWyA0jkbvc X-Google-Smtp-Source: AGHT+IF1cr1dqROzYAI+CTYgRZskB21X3W4RzhL+SFt96XTiDV4nwW4UgIq+Se6kS905v/2GeIBx55pURpvJfhbZT2o= X-Received: by 2002:a05:6602:360b:b0:85b:4310:a91c with SMTP id ca18e2360f4ac-86cbb5eedc9mr1016871239f.1.1748261453269; Mon, 26 May 2025 05:10:53 -0700 (PDT) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 References: <202505260422.54Q4M1j0090073@gitrepo.freebsd.org> In-Reply-To: <202505260422.54Q4M1j0090073@gitrepo.freebsd.org> From: Ed Maste Date: Mon, 26 May 2025 08:10:41 -0400 X-Gm-Features: AX0GCFsP7R3GAqExUN4DcxFUclFL069_CWG9WVx9HR85V9W-k-BfExrchuJGn2s Message-ID: Subject: Re: git: 9ce5410b9094 - main - src.conf: regen To: Kyle Evans Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 4b5ZNb0NrRz3K6H X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated 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-Spamd-Bar: ---- On Mon, 26 May 2025 at 00:22, Kyle Evans wrote: > > The branch main has been updated by kevans: > > URL: https://cgit.FreeBSD.org/src/commit/?id=9ce5410b9094f9a2dce72e86a70fd086acdb3ff6 > > commit 9ce5410b9094f9a2dce72e86a70fd086acdb3ff6 > Author: Kyle Evans > AuthorDate: 2025-05-26 04:20:44 +0000 > Commit: Kyle Evans > CommitDate: 2025-05-26 04:21:51 +0000 > > src.conf: regen > > This appears to be reflecting the default witch for LLVM_BINUTILS in > 1cae7121c667d9 ("Enable LLVM_BINUTILS by default"). 1cae7121c667d9 included regenerating src.conf.5 for the LLVM_BINUTILS change, and if I run `make makeman` in main now I see it undoing this change. From nobody Mon May 26 14:19:32 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b5dF10Q74z5xp6l; Mon, 26 May 2025 14:19:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b5dF06sJtz3PcX; Mon, 26 May 2025 14:19:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748269173; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rGvTQHFt+2B7Sf1w8rI6LkA5qbG2NYaNDVsXNnAR+XE=; b=S0wfg2yspTZGgsyzuCLszVuKBqOtNCMCz9QjTeDSWBUwfVYANg3WX+vb/KDomF3ZYzHB41 uq6gSyxcWe9M0eEvu2nJrGP0iYo31j13gxg/h1A0jQgqAU0p3GlsrG5lPJIP3um3cTQKVi pxFiv9nEtd+hTituY8eTYRfZby6a1XX9nJGlJAbeLGJu+MxBu6zRUjm10mcBlcob1FLg1z X7kDD/wzZEXXn22yRRnaLFjJZ60nj7/ZBCLvUeJsmi2uGy0WNGX9C4mZ4MA4KhGA7WGnht qpH/nxPXKfpvTFtx6z7XQqS2akrvVK7lDRQxBcQqZnPwmwm/L8NybvDGtNRrMw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748269173; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rGvTQHFt+2B7Sf1w8rI6LkA5qbG2NYaNDVsXNnAR+XE=; b=jXvltCDvCy1OsX7m4A1spRin8IAC54ujA0Xtp+USb9RcpK+Wx16GdpnzIbuq9ZaYrLuQwU 4rxxyQ3Z5Ei13VSZebE5IsIZYrcE5ocI8ki7BZSxup3dLnf0sB9/mILjYxQPYeld2rEv6q gvlcjYSkY4r7+TVj9meVw6dJAWuwcaoLeUyq0z1m+/wJwU9BPcvaiiZdJSKKoDRra7oeHl tcIgEE3W5KaAi/5uTejcrC58XXfv65SKdiqBl18or4gqQDEwZVxMkHkpw16T7vMk5H8aVg K7aAD/GkUtn88+74tI/mbfY8/BiwiPFwKCaHRLuUBHb57vRF3RKAbcXw5CSP/Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748269173; a=rsa-sha256; cv=none; b=OfabAc4SDWe5JOUsBMbWygjLUqoTNQnY3+oULlKTOTXy1oKOATFtGvyTFlmVV4E+HnrQAy AyClhiaLNRnW/ZAY6ge6L+6XqgHvwsjL0fMA+7Rk0onUd+s2ZtSCBA4k2BiSi7ForvTxfJ sSCktw1jxATaGJixM2R1F6lyz7JZHT7IKs3B4VcIx8NI9+5bIRbfR4nRL0eyWcVVfEunLO +IqljGw7dfsOQNz3o9/4zB3git9l7d6Do7CcTOwVXRyzl4K5vV2SCBhLbvpSttA10arFyg MH6ku9rO5MTzGkjNwacnz09fcxEFrpTCSQc7kw+kEjd17FOy90VKco2tLYe0JA== 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 4b5dF06Qfdz18tG; Mon, 26 May 2025 14:19: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 54QEJWAk094838; Mon, 26 May 2025 14:19:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54QEJW0w094835; Mon, 26 May 2025 14:19:32 GMT (envelope-from git) Date: Mon, 26 May 2025 14:19:32 GMT Message-Id: <202505261419.54QEJW0w094835@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: a40e695a5dfe - main - socket_splice tests: Explicitly bind to the loopback address List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: a40e695a5dfed63be0998f9523d9840036f3c018 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=a40e695a5dfed63be0998f9523d9840036f3c018 commit a40e695a5dfed63be0998f9523d9840036f3c018 Author: Mark Johnston AuthorDate: 2025-05-26 14:13:36 +0000 Commit: Mark Johnston CommitDate: 2025-05-26 14:13:36 +0000 socket_splice tests: Explicitly bind to the loopback address Otherwise, when connecting to the value returned by getsockname(), we inadvertently end up connecting to INADDR_ANY, which stopped working after commit cd240957d7ba ("netinet: Disallow connections to INADDR_ANY"). Fixes: cd240957d7ba ("netinet: Disallow connections to INADDR_ANY") --- tests/sys/kern/socket_splice.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/sys/kern/socket_splice.c b/tests/sys/kern/socket_splice.c index 3a85ae91ecc7..dfd4cb4f5957 100644 --- a/tests/sys/kern/socket_splice.c +++ b/tests/sys/kern/socket_splice.c @@ -84,7 +84,7 @@ tcp_socketpair(int out[2], int domain) memset(&sin, 0, sizeof(sin)); sin.sin_family = AF_INET; sin.sin_len = sizeof(sin); - sin.sin_addr.s_addr = htonl(INADDR_ANY); + sin.sin_addr.s_addr = htonl(INADDR_LOOPBACK); sin.sin_port = htons(0); sinp = (struct sockaddr *)&sin; } else { @@ -92,7 +92,7 @@ tcp_socketpair(int out[2], int domain) memset(&sin6, 0, sizeof(sin6)); sin6.sin6_family = AF_INET6; sin6.sin6_len = sizeof(sin6); - sin6.sin6_addr = in6addr_any; + sin6.sin6_addr = in6addr_loopback; sin6.sin6_port = htons(0); sinp = (struct sockaddr *)&sin6; } From nobody Mon May 26 15:11:43 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b5fPD0DSsz5w8Xk; Mon, 26 May 2025 15:11: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b5fPC6PZlz3t4G; Mon, 26 May 2025 15: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=1748272303; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xtEzqLrSzGcdkdAcsZye8d4vMaSdrJbIxkpb0sonM3E=; b=reS7S1KEKkOSwEINLySLXW0tmzFCuG4cALA6DaNUCXdc60QvkDlsFjo+rgYPGOuSfNwud0 btfVYNis3e5z6pPeohaZAjfQuqd4tG6blR889eOKkvxKc3IR3cMOBKMZC9HHjXVIcvXy7j ihkqWqRmq1wQhc1vOn1OwLDl1vUaSkVYE14n3rD+tty8CkTyMkIOPO7dbPnPrVmZnOBMfg q2zjSMeW2wr0yNUbGu5xk6w2h/mr4GoUyu0+L0oTE3NmMzQD8ZQMSwqmpxxvj/0GPSYK4w DQ1wgc34KN7sSM5QgG6kHoxpnzSIvlwnmxBLSki26m5E4/AWNgtak8ttMKrbQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748272303; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xtEzqLrSzGcdkdAcsZye8d4vMaSdrJbIxkpb0sonM3E=; b=OiZgsKuO86ed/X+hTZNLESGtqV+0F0booTWL7vH7WMdPGO17mw2ZMV0aW3ibcJUAGYqO8T n2Q0gEoOp/nbtngIr+PurDjAKz6muK0yeTn70ihNCnj+PK0zfRKQPcWqZHgnsIm5/A4iV4 gFD4aT0dvHT/gCxmyMQQFwOQJndsOc+WbFGLAr0cmC3AEecmA6jW5zeLJsfEr8nDHCKBso nGnMB3EUnWnE+YMQdHpR/svueLbRo4wFIGWke5dm9EyCsVn1zOiE8rmw1HyNjuS/w6hM2Q L/C/F9XcHPxZ5ydfzwzy2FHA922fUMloDMtnP+zrF076SKwG7qfUFNJiFOFEHQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748272303; a=rsa-sha256; cv=none; b=iQoFm1yCjgjB9kog4uKpZAHMG+60vCJSVR9tyTODXfjM6f8qa6prnuOYomnd24JgLibWuv CHaSIBPJJCxKwzlTFIHT6+9//FsxnzZNihJiBjT6vDOw4Y+Q8FP+uryfGQpRVOR0q6yn+P lB3YjRSrYh/dfma69WiwwCRKRxf644cQfr41u3BBhpUJd4SKNF4A4+OrrAZCiMEILq7pjg utA3ExTunHjBxyMbCVlpequuh3VXZCFl0lcoo7ZkNCCg8f6lbxrwZWxsVMBteR5MA6Up4I ADP7rRP/e7qJjS485XMCfLyWjNu4OcKwxexbOEcpBIGgcLH8usbnalydrb0J9w== 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 4b5fPC5f16z1BXn; Mon, 26 May 2025 15: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 54QFBhNm002973; Mon, 26 May 2025 15: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 54QFBhR8002970; Mon, 26 May 2025 15:11:43 GMT (envelope-from git) Date: Mon, 26 May 2025 15:11:43 GMT Message-Id: <202505261511.54QFBhR8002970@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: 07b7bcf1e555 - main - Revert "src.conf: regen" List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 07b7bcf1e5550baa208a3620b6535b92508b8e74 Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=07b7bcf1e5550baa208a3620b6535b92508b8e74 commit 07b7bcf1e5550baa208a3620b6535b92508b8e74 Author: Kyle Evans AuthorDate: 2025-05-26 15:10:06 +0000 Commit: Kyle Evans CommitDate: 2025-05-26 15:10:06 +0000 Revert "src.conf: regen" This reverts commit 9ce5410b9094f9a2dce72e86a70fd086acdb3ff6. makeman is actually sensitive to the host architecture it's run on, which may result in silly little diffs like this. Likely we should pin it to amd64/amd64 or something for consistency in future updates. Reported by: emaste Diagnosis by: Mark Millard --- share/man/man5/src.conf.5 | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index 66160520ec3a..ba88b995e51d 100644 --- a/share/man/man5/src.conf.5 +++ b/share/man/man5/src.conf.5 @@ -1,5 +1,5 @@ .\" DO NOT EDIT-- this file is @generated by tools/build/options/makeman. -.Dd May 25, 2025 +.Dd May 9, 2025 .Dt SRC.CONF 5 .Os .Sh NAME @@ -370,10 +370,18 @@ When set, it enforces these options: When set, these options are also in effect: .Pp .Bl -inset -compact +.It Va WITHOUT_LLVM_TARGET_AARCH64 +(unless +.Va WITH_LLVM_TARGET_AARCH64 +is set explicitly) .It Va WITHOUT_LLVM_TARGET_ALL (unless .Va WITH_LLVM_TARGET_ALL is set explicitly) +.It Va WITHOUT_LLVM_TARGET_ARM +(unless +.Va WITH_LLVM_TARGET_ARM +is set explicitly) .It Va WITHOUT_LLVM_TARGET_POWERPC (unless .Va WITH_LLVM_TARGET_POWERPC @@ -382,10 +390,6 @@ is set explicitly) (unless .Va WITH_LLVM_TARGET_RISCV is set explicitly) -.It Va WITHOUT_LLVM_TARGET_X86 -(unless -.Va WITH_LLVM_TARGET_X86 -is set explicitly) .El .It Va WITHOUT_CLANG_BOOTSTRAP Do not build the Clang C/C++ compiler during the bootstrap phase of @@ -961,20 +965,20 @@ Do not build LLVM target support for AArch64. The .Va LLVM_TARGET_ALL option should be used rather than this in most cases. +.It Va WITHOUT_LLVM_TARGET_ALL +Only build the required LLVM target support. +This option is preferred to specific target support options. When set, these options are also in effect: .Pp .Bl -inset -compact +.It Va WITHOUT_LLVM_TARGET_AARCH64 +(unless +.Va WITH_LLVM_TARGET_AARCH64 +is set explicitly) .It Va WITHOUT_LLVM_TARGET_ARM (unless .Va WITH_LLVM_TARGET_ARM is set explicitly) -.El -.It Va WITHOUT_LLVM_TARGET_ALL -Only build the required LLVM target support. -This option is preferred to specific target support options. -When set, these options are also in effect: -.Pp -.Bl -inset -compact .It Va WITHOUT_LLVM_TARGET_POWERPC (unless .Va WITH_LLVM_TARGET_POWERPC @@ -983,10 +987,6 @@ is set explicitly) (unless .Va WITH_LLVM_TARGET_RISCV is set explicitly) -.It Va WITHOUT_LLVM_TARGET_X86 -(unless -.Va WITH_LLVM_TARGET_X86 -is set explicitly) .El .It Va WITHOUT_LLVM_TARGET_ARM Do not build LLVM target support for ARM. From nobody Mon May 26 15:24:11 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b5fgb66Bnz5w9pc; Mon, 26 May 2025 15:24: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b5fgb5HRDz40NZ; Mon, 26 May 2025 15:24:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748273051; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yjSiXN7M4/DoQhjnm281CEQiCrrohJ5rluQQcIgbmgw=; b=nMgf/0FkTC8sjf+eYVF6p5FQN8BpnBRxZ/X+8ofTTJHFxHy9aTqjODfIsJsXyVjf/8Fwhk ViuajU0y1PK/Enf2BgL5FNHn1CYLP6Sx6BuxNfTQJK50GR4RY9j9QV+ciOY6vvf9faZHUA CqrgVeVTlZU53STn/xMmjxMcjmvTrJGyN91D5KwP9ZZmNcH4gLlx2cVfdN7QmVLSDt8wZh rAz2qqmqorJVcgU/RxvZeLD0wDZOOoZ/anJ05r/tuiGscsAxst4fTvwwrUuCSuGQY8AnaD GVLSFc9ZQ7yu9kOLH5vc870sQ+WiE0jTPF3ON2oE6FNkvXtGgI+syZunn3pAgQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748273051; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yjSiXN7M4/DoQhjnm281CEQiCrrohJ5rluQQcIgbmgw=; b=xV+/22dWU4tsYwmmsjRpuR2IC3A3lUPS5kqXinBjjIT59+hCFzsY9SHweh5KKVm+NGdRY7 eXf7bcpjmdRo0kdwItedx0TmyPMQr3fvqjHoZlFIs3jjp1k5zu68+3oaicCinRlXtaiEvU MmMq9S2ufg/T7bNjoMB4+5JS4EM/n63sh7WBry3zLh5nWXxNmJmpBpLCWFxG3JLAGmEp9k dO8qnLG1rvJ+TSbwRXeaAZq50vWIIi2I03WKHKqtFqrzmyKsNqzZmYgMg3sJHczFQqYh40 t/pY+vROpcjYr01ymdAIGliwCkS6qhYvLTs/kCKRXnWK0F9B4rju47Gbk25mJA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748273051; a=rsa-sha256; cv=none; b=fvG5wIR0tqnUT+0vLVOU6pOAzrJslbBjL6IlCxxk4bJv22CUzwLGxpx29Z06tNAJOu4ziW SAmQ6xxqxnSDDHbgvS3iwiHMvNQPBbUdGRuL+sCGEHURAkvzs4Vk736IxvUNTmIS0N5z/R vPB2rxWyCERLTtxhdlBV88KJA6VqmrmOnhbK29X4gDIwZe2DBqsdvnR24fj5A9sDabL8kD RrnwfSFUaSXAPxdQgfaW/6bdJVcLviZ47fwzquyrtri8owjM4jcFy4TW7UbXMsfjO2m+3S XIUg3MDLtsUvDR2YDqhzpGy0f7R0kBZzzXxTlg9zWhp6a2A2qAWSpzATfsTyIg== 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 4b5fgb4jj5z1Bx7; Mon, 26 May 2025 15:24: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 54QFOBZP027017; Mon, 26 May 2025 15:24:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54QFOBo9027014; Mon, 26 May 2025 15:24:11 GMT (envelope-from git) Date: Mon, 26 May 2025 15:24:11 GMT Message-Id: <202505261524.54QFOBo9027014@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: 3ea0fa86f6a4 - main - buildkernel: fix build for kernels without VIMAGE List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 3ea0fa86f6a453c221c0a4aff028cb5220a2ed94 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=3ea0fa86f6a453c221c0a4aff028cb5220a2ed94 commit 3ea0fa86f6a453c221c0a4aff028cb5220a2ed94 Author: Gleb Smirnoff AuthorDate: 2025-05-26 15:23:37 +0000 Commit: Gleb Smirnoff CommitDate: 2025-05-26 15:23:37 +0000 buildkernel: fix build for kernels without VIMAGE Fixes: 9b5ddb2accfc80f70a0da52444008ebabef2a9ee --- sys/modules/Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sys/modules/Makefile b/sys/modules/Makefile index bc6fc7ae1a25..d60f7352f58d 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -429,7 +429,7 @@ SUBDIR= \ wlan_xauth \ ${_wpi} \ ${_wpifw} \ - wtap \ + ${_wtap} \ ${_x86bios} \ xdr \ xl \ @@ -824,6 +824,9 @@ _wpi= wpi .if ${MK_SOURCELESS_UCODE} != "no" _wpifw= wpifw .endif +.if ${KERN_OPTS:MVIMAGE} +_wtap= wtap +.endif _x86bios= x86bios .endif From nobody Mon May 26 15:33:28 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b5ftJ2WlJz5wBGK; Mon, 26 May 2025 15:33: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b5ftJ23Hyz42pQ; Mon, 26 May 2025 15:33:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748273608; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Z2Y03udtQrZvr58RKUOy5E7IdD+gARYWzhQBHJ5hOSg=; b=ZaReJL7UK8Ua3uBEh8U8gH2e9Z1eXTzARkR/iHqCBMb4zFBZtw24Gboy73nZT4K377S1cD /0wXF8SxRy4kN7umBGPTnQVVkNILTEzvs04mfTh5K5+0N3iQTn8VsMpW3eLrfTAN+Mel4v V35/m10gHIxRN3xlHovEuKfss8Ff2nbDTqtTv1LDPV3/SR5YT8qDFiYxLPr3EduOC24+zI aaCaA0N1O8+O2UZF8T2cbfHoPBtmkMZJZViKHC86iA4JVU/kV2ZIPKNEYs7cAcJY+FJ/Sq 6mRmpeQDxwqQVgwpWB16/QITey8933awEL7/4uJHKSuSZLffQ9HWNxc7zrI83w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748273608; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Z2Y03udtQrZvr58RKUOy5E7IdD+gARYWzhQBHJ5hOSg=; b=Oj3o3tvQsmmzdoGHxDnxOksrHZaULoAnTPSw2JLiZDHZOLy1prCSOxsdtaLhQkMRbCR5jZ 7sQv8FSIlw6A7gg4is8zG+nfFP1INtJhHsPMGQFIEGA4zFv/ZC7iZ4lO1VD3biAaW5/qoo 6s1p/KcWwJ4hOOF7Q+0ztAmSVpTJP/DTX6fNfkOKROMuH+Z/U90UP8qpbRf6J8w95zRWPr LxA3GxUuy4bDIjHSDaIbEI+c+IPVkPUaM0hguQ30gZUayFkUrJt/XJZiQYMmUy1z6OJ8lS n4ECEnFuWcLnzz36LBXy8g+IdSsQcWRdAOMXOMICVA2RwnPj9X3/RQV0OqUzeQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748273608; a=rsa-sha256; cv=none; b=wscTMVDDjJQtZ6KrKqjBDUK699YDlfw7LI4OLZwG889ZYx7c6BWM4+FTtLkEoCYmRg5u5U dkPm6flWr8Azst+19mnF7ZpghBs3xOqdFusQin4JXafH7MrZwL5dp+zi5U747vf/GUF9Q6 U8djJBZKI3VkQ0PsR2WXPCz/0KQ5AoNeUCbfx8+fdgVKDO4Oyr1nxO1brhcyuRo7g/krQn AOhDfPpEBB0MBZQfmJi2pBsSr5pMvAOjQN6Br0KStpxMYOcRQvraxsbM4VWusSIGs0PLpC pqm2hYuLsHs6g0XM/+CTD7J8zk6YMMEQzzBwJcc7OdTv/dzmpRlXGcBQJ9QJBg== 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 4b5ftJ1fn1z1BxX; Mon, 26 May 2025 15:33: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 54QFXSfD044902; Mon, 26 May 2025 15:33:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54QFXSrg044899; Mon, 26 May 2025 15:33:28 GMT (envelope-from git) Date: Mon, 26 May 2025 15:33:28 GMT Message-Id: <202505261533.54QFXSrg044899@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: 06a894ca9b41 - main - stand/uboot: Remove unneeded nitems definition List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 06a894ca9b413757e786eb7999fcf4c61424d272 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=06a894ca9b413757e786eb7999fcf4c61424d272 commit 06a894ca9b413757e786eb7999fcf4c61424d272 Author: Warner Losh AuthorDate: 2025-05-26 03:39:02 +0000 Commit: Warner Losh CommitDate: 2025-05-26 15:30:36 +0000 stand/uboot: Remove unneeded nitems definition Also, remove the trailing white space that was introduced in the same commit as the nitems fallback definition. Sponsored by: Netflix --- stand/uboot/main.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/stand/uboot/main.c b/stand/uboot/main.c index 5a896959122e..3b0f0bc04dd8 100644 --- a/stand/uboot/main.c +++ b/stand/uboot/main.c @@ -35,10 +35,6 @@ #include "glue.h" #include "libuboot.h" -#ifndef nitems -#define nitems(x) (sizeof((x)) / sizeof((x)[0])) -#endif - #ifndef HEAP_SIZE #define HEAP_SIZE (2 * 1024 * 1024) #endif @@ -50,7 +46,7 @@ int devs_no; uintptr_t uboot_heap_start; uintptr_t uboot_heap_end; -struct device_type { +struct device_type { const char *name; int type; } device_types[] = { @@ -336,7 +332,7 @@ get_load_device(int *type, int *unit, int *slice, int *partition) *unit = -1; *slice = D_SLICEWILD; *partition = D_PARTWILD; -} +} static void print_disk_probe_info(void) @@ -365,7 +361,7 @@ print_disk_probe_info(void) } static int -probe_disks(int devidx, int load_type, int load_unit, int load_slice, +probe_disks(int devidx, int load_type, int load_unit, int load_slice, int load_partition) { int open_result, unit; @@ -518,7 +514,7 @@ main(int argc, char **argv) if ((load_type == DEV_TYP_NONE || (load_type & DEV_TYP_STOR)) && strcmp(devsw[i]->dv_name, "disk") == 0) { - if (probe_disks(i, load_type, load_unit, load_slice, + if (probe_disks(i, load_type, load_unit, load_slice, load_partition) == 0) break; } @@ -634,7 +630,7 @@ handle_uboot_env_var(enum ubenv_action action, const char * var) * import the uboot variable ubname into the loader variable ldname, * otherwise the historical behavior is to import to uboot.ubname. */ - if (action == UBENV_IMPORT) { + if (action == UBENV_IMPORT) { len = strcspn(var, "="); if (len == 0) { printf("name cannot start with '=': '%s'\n", var); From nobody Mon May 26 15:33:29 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b5ftK5GWZz5wBKV; Mon, 26 May 2025 15:33: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b5ftK34n9z439j; Mon, 26 May 2025 15:33:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748273609; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9yBmj4mXU7s1is/0oCwmS7+97TgPguwj7NGHpFX5dZk=; b=URWeRDn5gx1qPqwPi3bHogXyn4JmoZL7o/erTVh3ln7ZDzbjJpymWscAYrVfDEoibt340r v564rpwQ/kR6qlbeZQvgS49AOJOEJNzokz3s/A1Xfg1R6kdfna+g3lS+hkEdzOXLpTUL/7 klPsfFWV8ELbJxpdTMbUMfWhol5QnquVp3Jpm6iktEaEntCkztsjf3bUPiIdlrK03c8ntO I4W1Nlz9JE6FCOMmOgNG1eN6GN9QxpzdgBlKX0mQRqmXjlITQTEQVvkN5dj45Q69VJLc04 Gc3cVIa04XUwRgW+bK2qVRjKEtlsh3EDmZEFRbqjT+a/AJFjopIORorlYfx6VQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748273609; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9yBmj4mXU7s1is/0oCwmS7+97TgPguwj7NGHpFX5dZk=; b=TtNJu4o8ryLACW0rx+7oD78czDHjJV5Rg+xhXtrVu+VYJQ3zGQmNyZv1gN2bNd8YmRPQEZ ZWpfB58CsHTW4KbhMcgtpEOBQm0dqmeEn77vfdFpn9SZM+M8MvepFpvHQNJ8MV9AQPweg6 IIl/4diShlRo/7B9tjDnMEdZLbHxNIkgfMU2s33pqrV/96rMBpUElL9eYVIxagJXUAryqn m0N/P0E+PsV3cvig7DsQPH6/+NY04opZ6NCI9mwrBY/mUexle4UsliuEbZFY84wG22kLAQ qH8UKaKu/rdR96RibLSc1C481NoQHssu31WZxLgVJ+E6glqqJPm0euB4ZY3yNA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748273609; a=rsa-sha256; cv=none; b=SMnzaiVW1NNX3aBsoVQIFdKUtzM9tQB6o1cJpjks2Rqm5CPh0mlkz2iOMVv+XeAU8tYSyI hP/he/l0qWkHZqfpU+yOXlmCHkh546Rf9PrbPvz3gZocQHsuHYUES5JlKZCYc+RPpf2ET1 bfZ1jreiVvkzmxdMgKJnaJg+kcE78R8u4uahspJr52VaSFUGPf1lJEhT+WGjQhdAvM/iLj divNP3aG+tWo5Yk7/zJNO1r35NkCtOK2zuFTvkqSlofgpI5rEwoY1eNMPMzVGboIRNt4RZ oLDb7IqeT2EDPHbsgvvqqK6Xm4p6nhK4qZlkttPsYter7gTdzKNSYb/42Ac23g== 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 4b5ftK2ZdPz1BC5; Mon, 26 May 2025 15:33: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 54QFXTqC044943; Mon, 26 May 2025 15:33:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54QFXTNA044940; Mon, 26 May 2025 15:33:29 GMT (envelope-from git) Date: Mon, 26 May 2025 15:33:29 GMT Message-Id: <202505261533.54QFXTNA044940@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: 81336653be4c - main - stand/uboot: Remove unneeded _etext and _edata List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 81336653be4c85ba0a4ae862ae1a299dfd2b841a Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=81336653be4c85ba0a4ae862ae1a299dfd2b841a commit 81336653be4c85ba0a4ae862ae1a299dfd2b841a Author: Warner Losh AuthorDate: 2025-05-26 03:44:50 +0000 Commit: Warner Losh CommitDate: 2025-05-26 15:30:36 +0000 stand/uboot: Remove unneeded _etext and _edata --- stand/uboot/main.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/stand/uboot/main.c b/stand/uboot/main.c index 3b0f0bc04dd8..ab63b9a33a66 100644 --- a/stand/uboot/main.c +++ b/stand/uboot/main.c @@ -61,8 +61,6 @@ struct device_type { extern char end[]; -extern unsigned char _etext[]; -extern unsigned char _edata[]; extern unsigned char __bss_start[]; extern unsigned char __sbss_start[]; extern unsigned char __sbss_end[]; From nobody Mon May 26 15:33:30 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b5ftL6clQz5wBWN; Mon, 26 May 2025 15:33: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b5ftL47dZz435R; Mon, 26 May 2025 15:33:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748273610; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=b0ushcTE7wlTQkYEEbS6Tofs10KtCuUm53TusZR4afY=; b=NO+0gnyoMwaZ5mgH10B59/i5YCAgU+EzcC8wkDxYWej7IFneuqPJ8ibbXX/HY7ZxIQu7MV hIvUV2I42vzLVniXwtSUGBdIvx7HMfNYtEYfJTlnx8ICrCvHGnkGPrteehBiAnmupZwmxA xAysIKunD3ujQtB23Nudp72UoMqSfeGmhgC1zI14Wnk+dX2abP5oX3s29ua8U+VwZFGTae zgq3snbsI0ooyqKrOh35Rx+q5DsfZIWb1pKvuv7tmTl06bb860HgUH+NE50VpSNeDEOPvF y+XLxgTQaScEcfSXg/IkaHge0Osw10eJ+wX2As/oCk3KnxCYE+ElL3lTtPAgkA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748273610; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=b0ushcTE7wlTQkYEEbS6Tofs10KtCuUm53TusZR4afY=; b=BKclF+FnNhTQYBsHS/j1jtxB4PY0Yy07u/jX/kv1IbjBVE/uH80H8z+oLFmfdLKDz4r4Om FtPItiJmCTpY/N4jMEoKebPWQgDRNZ9GbJ7zyB0szf/bHkbbj224Shya6kayeLXVvME+WL zVjW0HImANtb9NLf195NLYl17+7ISyhCWKNYjDoAyVekJfo5iuVlxiFZRPaBabDS8x+Wjo lMyan5i0z1QtygG7+y3djN0A/1dqSZmIH6avMX4EXcULiUpE64zjX27b9epwbV27wqyovh jiaas4hpEZ/FhGA8cuKrnfMuVWY/RMwxXe8hw1Nfv9l4w9me+YsyiL908pS/5A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748273610; a=rsa-sha256; cv=none; b=fa3JzV3gmMh/tt2H0ktephJ4MXLCGT46Q8SrP1K+ORD3o8cOrR8qk0D48MlpvF+kVr/hOD AZhZDYNe6pSjzsT3nB1MScMWZRU/qdlMbOMgOMEGDqVmGaeaO/VlUrve3A9cJqCbvi2zly 8fqk5ZXxLJdIdp5tjuiV3UHicnkFaO4FKYM0dka7Vcjr5jnY8WMlW4xlrv2kO1E3XRftCn erCSKlNj6PSeg2uAXUZ9XT1IM+uuURPgTYriGLgOAX+HiGnz9PRwSkYWS/xmjYe9ykKYrm SsiErdqf4NhedyLuiA4TQFbHNzFrBqeTJpAWuvC0I9JCUoLiEw8mgLHZd4LD/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 4b5ftL3WgBz1C8J; Mon, 26 May 2025 15:33: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 54QFXUIG044976; Mon, 26 May 2025 15:33:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54QFXUDK044973; Mon, 26 May 2025 15:33:30 GMT (envelope-from git) Date: Mon, 26 May 2025 15:33:30 GMT Message-Id: <202505261533.54QFXUDK044973@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: c4270ea8849d - main - stand/powerpc/ofw: Remove bogus end decl List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: c4270ea8849d7e5c5191b3c5f4a4abb391fb9027 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=c4270ea8849d7e5c5191b3c5f4a4abb391fb9027 commit c4270ea8849d7e5c5191b3c5f4a4abb391fb9027 Author: Warner Losh AuthorDate: 2025-05-26 03:29:51 +0000 Commit: Warner Losh CommitDate: 2025-05-26 15:30:37 +0000 stand/powerpc/ofw: Remove bogus end decl This likely used to be needed for some code here, or maybe it's been here since it was copied from elsewhere that did neeed it. Remove it. Sponsored by: Netflix --- stand/powerpc/ofw/main.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/stand/powerpc/ofw/main.c b/stand/powerpc/ofw/main.c index e86a8275c8eb..34c7e12778e3 100644 --- a/stand/powerpc/ofw/main.c +++ b/stand/powerpc/ofw/main.c @@ -37,8 +37,6 @@ struct arch_switch archsw; /* MI/MD interface boundary */ -extern char end[]; - uint32_t acells, scells; static char bootargs[128]; From nobody Mon May 26 15:33:32 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b5ftP1pnMz5wBXJ; Mon, 26 May 2025 15:33: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b5ftN5R3qz435v; Mon, 26 May 2025 15:33:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748273612; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=H2apwGf6VK4YemEAU1sD1a1FQPsO36iazmOh8mi8v8M=; b=rH8U7xzWOVu0qV2hvxQfDaoQkB3v5sYquux7xezAG7OuOOEO7buTne+L7abMtu2GnAWdt8 l9yTMPKKjtSmFkqmq4OGbb0fer5E86ylWkY/RJDQiKEu2x+CHIYk8sGMHUXz8aqtXxgy+n 8aj6b2pyTF6F9fIb3SGi1VTVu6QctorIf4MBr31OmStbtsTpolMFt2zet8k0dcjRN9Yh21 dCs4A310EHeKZYrEE5JZFg8ZM3T9iaHaccW+d86aYWdSQoFsap+YlUSztliHukBV9eFrKu dwWOBBQyHHiGzLXoLJ4rn7NXC9sAPwm+9/8gZdtqB+ihle3DNX/OhNbnaeUBjw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748273612; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=H2apwGf6VK4YemEAU1sD1a1FQPsO36iazmOh8mi8v8M=; b=wrmutGdgwaW9YoNaWWXowCMglPW0AJ/rl/hY9r+LnfqOu7i52vuFQtd/t40Zc6nvlmx2Gc rxBBgJrkcThxvDV+5+7upLDkqCMEsMtB7RXOOjFlHVrKOMtdeAHQsif5KiQHBE2wRzSEA3 g02yTaMaMhRzB245+xWBsehHM4FmKI11+DdOTkg73PzSRmJkXXtju5Ok6mKGCJ/G2ZQoqt SGw5V+u6r0skfTqqUZ1XaztpOFvaDLxA1Pe6z7KQPW8I+W5MMTX6M95v5t5Cbs4a525PfO 8gWPx6qlU/m/8YPX/h8BjAMda0+b8+2xPCj0NHVli5DPFpwz5C5PIT/2HceJhg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748273612; a=rsa-sha256; cv=none; b=OWf4wZ8abV95JYi36a4Vqpx41YXMyZ1pImI0TMKzceY/lC9wREizm+YF1Pqi7/Y9JNO9nA ZCzwmEmYna3QEi4zdKxl5nGqVfM+SF9+m1uXs1HXyF5jDDSvBDG5q81CfggpL01ntbJUxb tiEhUMFlOR7Akx037Kb0G0L1X8/oCaF8Jx8l537+nYFdwaQAbfCq35LleqROYFEW3e7jlo IKFt19NKdQoe4ZV0J+fTRRsnJTG1ZR/gFWiQlDKtzDiZMPKGQjhL55zMktbeUL+ocHWFPO EMJ95g7teSmyfDu7PQVwiMPcKG4LnZ37U/dy8Vp7jCoplws9qDM44BSs9zI63A== 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 4b5ftN52qFz1CBZ; Mon, 26 May 2025 15:33: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 54QFXWB5045044; Mon, 26 May 2025 15:33:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54QFXWEP045041; Mon, 26 May 2025 15:33:32 GMT (envelope-from git) Date: Mon, 26 May 2025 15:33:32 GMT Message-Id: <202505261533.54QFXWEP045041@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: 62d1ec7889a8 - main - stand/i386: Initialize archsw at compile time List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 62d1ec7889a864a4c50f727f913384ea50e8a88e Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=62d1ec7889a864a4c50f727f913384ea50e8a88e commit 62d1ec7889a864a4c50f727f913384ea50e8a88e Author: Warner Losh AuthorDate: 2025-05-25 15:17:53 +0000 Commit: Warner Losh CommitDate: 2025-05-26 15:30:37 +0000 stand/i386: Initialize archsw at compile time No need to initialize this at runtime. This trades .bss space + code in .text for just .data and is net smaller by 4 bytes. Sponsored by: Netflix --- stand/i386/loader/main.c | 38 +++++++++++++++++++++----------------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/stand/i386/loader/main.c b/stand/i386/loader/main.c index e7a42c194326..a7dfb2dde762 100644 --- a/stand/i386/loader/main.c +++ b/stand/i386/loader/main.c @@ -61,21 +61,35 @@ static uint32_t initial_howto; static uint32_t initial_bootdev; static struct bootinfo *initial_bootinfo; -struct arch_switch archsw; /* MI/MD interface boundary */ - -static void extract_currdev(void); static int isa_inb(int port); static void isa_outb(int port, int value); + +#ifdef LOADER_ZFS_SUPPORT +struct zfs_boot_args *zargs; +static void i386_zfs_probe(void); +#endif + +struct arch_switch archsw = { /* MI/MD interface boundary */ + .arch_autoload = i386_autoload, + .arch_getdev = i386_getdev, + .arch_copyin = i386_copyin, + .arch_copyout = i386_copyout, + .arch_readin = i386_readin, + .arch_isainb = isa_inb, + .arch_isaoutb = isa_outb, + .arch_hypervisor = x86_hypervisor, +#ifdef LOADER_ZFS_SUPPORT + .arch_zfs_probe = i386_zfs_probe, +#endif +}; + +static void extract_currdev(void); void exit(int code); #ifdef LOADER_GELI_SUPPORT #include "geliboot.h" struct geli_boot_args *gargs; struct geli_boot_data *gbdata; #endif -#ifdef LOADER_ZFS_SUPPORT -struct zfs_boot_args *zargs; -static void i386_zfs_probe(void); -#endif /* XXX debugging */ extern char end[]; @@ -182,17 +196,7 @@ main(void) bc_add(initial_bootdev); } - archsw.arch_autoload = i386_autoload; - archsw.arch_getdev = i386_getdev; - archsw.arch_copyin = i386_copyin; - archsw.arch_copyout = i386_copyout; - archsw.arch_readin = i386_readin; - archsw.arch_isainb = isa_inb; - archsw.arch_isaoutb = isa_outb; - archsw.arch_hypervisor = x86_hypervisor; #ifdef LOADER_ZFS_SUPPORT - archsw.arch_zfs_probe = i386_zfs_probe; - /* * zfsboot and gptzfsboot have always passed KARGS_FLAGS_ZFS, * so if that is set along with KARGS_FLAGS_EXTARG we know we From nobody Mon May 26 15:33:31 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b5ftN2vWmz5wBXH; Mon, 26 May 2025 15:33:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b5ftM4H0Mz438G; Mon, 26 May 2025 15:33:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748273611; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mURFR9IPVVka/vVd85/HCH3u2UA0wIQypu+2p3bOCnQ=; b=X7QvVqOai0NBixi2zeKB5L96fr9jQgcBfQXexoLCn48l/qmifTNJpNNqRol76fikvEjKJ0 THYJj0s7d/OhO7kx5BV7oP4Esa63rQ1eeDJoT/8Gt/BDhjX+mVa8ldaW87jGwiHB6ili/W z1XxYrUpOvaMSwGu0m7JEYpIHIF7OpwIuNOkmF98fruoRnlcH2Gc9/hcE/W/lA3xFDfoTT FLQ+pEnh/rrrCuWATf9xQsZEOw6HTC7Le1Mi5pwgDiCjJ3iclhHW09dpedQjMV3EQtQSFT Qzx1CC7bzGHsZwqbWnHHD8ML6rVOpuvqSIIXHhrcvrUtf1Uhjdw6QqSAJETzRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748273611; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mURFR9IPVVka/vVd85/HCH3u2UA0wIQypu+2p3bOCnQ=; b=SZmJp4W5kR3ScAokjGyEw4KqMAuzUtYOm5cZ2kC0db/xQ5DKNaGLI5M9DvRZbgLryHCZ9M jotwvL+kQq2jgf2+58bbURBpH8xReJ9Ed0aFXKXl/3TRoCZ1W+9KPeVwcvWNzOWlXqhC8L 9DAtPpVJ/8x7EHSqAEJA1HSB4rNV9sf1YXXJIJN3vvy9TI+iexlweQql4AWMq/S+nfWZ5i MEnUJTE3eZP+cy58cPx7d6g9IfN4air1MWXOPha/+NDSqy4f28w4eqG3OiSiHSusqNi9Yo zrOsv/CqjVa0NaEVTnqrdw9dGsvYvNfYkC06y40f9COKUqv0/J1jPKAcav0r4A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748273611; a=rsa-sha256; cv=none; b=XmE+wOhurqLQinVbDT2Suoc9ANTxqVYCa9m+b9AVmMEKpdb85M91YqEtb8BQGeEK+bCGdM +87CDpshcHrEGcWsNl7TCOwuo1qWdakiDGz7k0zzoGWdYnP0nEVZyjDaKmCSdhfRCAKXJJ KkR4/DiuCUeW4QPHwgMHkoXcuzmqFlJnnA4jgTvYUJFV0N8I2qH5aJ+sAv237RB1N2qqz7 zeU98gpXe10YRYuL7SrNUyd4t3H4w+Vegr1K/pdHOjLs6t/nlOOxxklLN8O4o0/0CnDjaj CVLHgkTkMVpNWGZMExah+VYgqJdU+sTOu6ISzvhd1LId9TvuLo+SmTt/Z8MazA== 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 4b5ftM3t4Xz1BFC; Mon, 26 May 2025 15:33: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 54QFXV2w045009; Mon, 26 May 2025 15:33:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54QFXV7a045006; Mon, 26 May 2025 15:33:31 GMT (envelope-from git) Date: Mon, 26 May 2025 15:33:31 GMT Message-Id: <202505261533.54QFXV7a045006@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: 7429d6158ca9 - main - kboot: Initialize archsw at compile time List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 7429d6158ca91195b30c807127b4758424887128 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=7429d6158ca91195b30c807127b4758424887128 commit 7429d6158ca91195b30c807127b4758424887128 Author: Warner Losh AuthorDate: 2025-05-25 15:17:53 +0000 Commit: Warner Losh CommitDate: 2025-05-26 15:30:37 +0000 kboot: Initialize archsw at compile time No need to initialize this at runtime. This trades .bss space + code in .text for just .data and is net smaller. Sponsored by: Netflix --- stand/kboot/kboot/main.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/stand/kboot/kboot/main.c b/stand/kboot/kboot/main.c index 5b7bfa246f55..668e5ac2706d 100644 --- a/stand/kboot/kboot/main.c +++ b/stand/kboot/kboot/main.c @@ -37,9 +37,6 @@ #include "stand.h" #include -struct arch_switch archsw; -extern void *_end; - int kboot_getdev(void **vdev, const char *devspec, const char **path); ssize_t kboot_copyin(const void *src, vm_offset_t dest, const size_t len); ssize_t kboot_copyout(vm_offset_t src, void *dest, const size_t len); @@ -47,6 +44,16 @@ ssize_t kboot_readin(readin_handle_t fd, vm_offset_t dest, const size_t len); int kboot_autoload(void); static void kboot_zfs_probe(void); +struct arch_switch archsw = { + .arch_getdev = kboot_getdev, + .arch_copyin = kboot_copyin, + .arch_copyout = kboot_copyout, + .arch_readin = kboot_readin, + .arch_autoload = kboot_autoload, + .arch_zfs_probe = kboot_zfs_probe, +}; +extern void *_end; + extern int command_fdt_internal(int argc, char *argv[]); /* @@ -346,13 +353,6 @@ main(int argc, const char **argv) const size_t heapsize = 64*1024*1024; const char *bootdev; - archsw.arch_getdev = kboot_getdev; - archsw.arch_copyin = kboot_copyin; - archsw.arch_copyout = kboot_copyout; - archsw.arch_readin = kboot_readin; - archsw.arch_autoload = kboot_autoload; - archsw.arch_zfs_probe = kboot_zfs_probe; - /* Give us a sane world if we're running as init */ do_init(); From nobody Mon May 26 15:33:33 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b5ftQ4Zp5z5wBcf; Mon, 26 May 2025 15:33: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b5ftP61y4z43F0; Mon, 26 May 2025 15:33:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748273613; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MmDKjW8oZsuZy046N4A/6gffKNI3y7wxUxOWYV+X9UE=; b=rzr8o9yz8BcRRZ+lTNLYC99AY7pvPGVMwoLfSoOWIL5av39mw3d1Z9Ok5NlFLqt7pOkk01 59+RjIsptVm8HYqhjlqWyIM3OvWcHenrdE0J0/2JgMtV5TCRD4viKvzHn/aJqb/adNFtjf IzVprSAyiblXrtCEH96OWdIUBWxaS5kuIi/b1LIBXyeJKPvoqvudgK2ZvxyQKP4r3eHEsa HWVbgUF0M8mJjiQAGHKGpx3mlO5iFYhXwbLFvLb93S4krGp2qvE8Z8IIl4oIxWJGz8BO66 BPAo+nCx44xyg8MjMge2hjGnMvCz9rWgwOKPvk9aUGT7GhLBeZeRNcJdtII8Pg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748273613; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MmDKjW8oZsuZy046N4A/6gffKNI3y7wxUxOWYV+X9UE=; b=LlfoT+cr1gol4tJBx0XLvvmaqThwY8cJcRXcpZfEN0BECiEEymZQvCEk3JLeSDUbQTAo7l /4/OPNJNW+meo7UdL6uIW0IEOxWesYkISSzNjyVGO7zotuKSgI05RKwNxgQqjdHPTQ5VT/ KufbV2Osremq2bkEgHCbU/BOpXcUxGPmIdgeibDhHMhN5sISSkjj8CT1GykcJbhqHPS+sm N94UfGHG9atS0Q81GS6tcBAHz2YCN9IfxrEJwDf9m+xYGoIm/CaT42Ioit2uALHKiVSlDj 5ieoXcIZbke+2/CmVD8nWyqaEfbohAg0JH5xazBc53xR3KYBiEB59QNRxzdhAA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748273613; a=rsa-sha256; cv=none; b=kSgmHIlWICMEbEkmTQZPgWs2J/liNe5i0uIIbOiwQTpiHOhstm7Ts3Idyacq3bkZIILs3Z k1wuDfy44Jb5G+75MN3AXchu2ca4C4mQTAV9Zf4/QfYojmSoZgQZuiQCVimr8Y63hZMchI omm0fm9CON85fyjkfWFC/26hV/PLmIaEwUC+lSPp7aewyh59O+xw60F1Ou5yk+5nr45C3a NwRHx1GQ1ZwUZSWhSJg6t/r12kLW6YLjhZEcfItXXFliq5R0FeM4EB51+FN0pod1zKZdBL IUGAQ48M7Y+2vjPN4crrlE9YE2qllxo4aXL3IMXssA94dsixzzDcebNkkyarDA== 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 4b5ftP5dmtz1CBb; Mon, 26 May 2025 15:33: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 54QFXXia045079; Mon, 26 May 2025 15:33:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54QFXXeK045076; Mon, 26 May 2025 15:33:33 GMT (envelope-from git) Date: Mon, 26 May 2025 15:33:33 GMT Message-Id: <202505261533.54QFXXeK045076@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: e94f269cd329 - main - stand/efi: Initialize archsw at compile time List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: e94f269cd3293187d52406f1904b82613964644f Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=e94f269cd3293187d52406f1904b82613964644f commit e94f269cd3293187d52406f1904b82613964644f Author: Warner Losh AuthorDate: 2025-05-26 03:25:26 +0000 Commit: Warner Losh CommitDate: 2025-05-26 15:30:37 +0000 stand/efi: Initialize archsw at compile time Sponsored by: Netflix --- stand/efi/loader/main.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/stand/efi/loader/main.c b/stand/efi/loader/main.c index c9a842afb06d..70cdfb2e9328 100644 --- a/stand/efi/loader/main.c +++ b/stand/efi/loader/main.c @@ -71,7 +71,17 @@ #include "loader_efi.h" -struct arch_switch archsw; /* MI/MD interface boundary */ +struct arch_switch archsw = { /* MI/MD interface boundary */ + .arch_autoload = efi_autoload, + .arch_getdev = efi_getdev, + .arch_copyin = efi_copyin, + .arch_copyout = efi_copyout, +#if defined(__amd64__) || defined(__i386__) + .arch_hypervisor = x86_hypervisor, +#endif + .arch_readin = efi_readin, + .arch_zfs_probe = efi_zfs_probe, +}; EFI_GUID acpi = ACPI_TABLE_GUID; EFI_GUID acpi20 = ACPI_20_TABLE_GUID; @@ -1202,16 +1212,6 @@ main(int argc, CHAR16 *argv[]) char buf[32]; bool uefi_boot_mgr; - archsw.arch_autoload = efi_autoload; - archsw.arch_getdev = efi_getdev; - archsw.arch_copyin = efi_copyin; - archsw.arch_copyout = efi_copyout; -#if defined(__amd64__) || defined(__i386__) - archsw.arch_hypervisor = x86_hypervisor; -#endif - archsw.arch_readin = efi_readin; - archsw.arch_zfs_probe = efi_zfs_probe; - #if !defined(__arm__) efi_smbios_detect(); #endif From nobody Mon May 26 15:33:34 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b5ftR0qPYz5wBgF; Mon, 26 May 2025 15:33: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b5ftQ72nMz43KY; Mon, 26 May 2025 15:33:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748273615; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Suf7DYIivU+1zvMUCgtbkxn5GBpcQrECbux9tH06k+4=; b=pi9NO8JWnydehUho1d4IHNgUQkH2UXIoD+Yc4To4hejMo/qnH9EUi2idON8EXzukKGxr+/ 3ERJQyKIs+6XUMpTi8+lDvRksJR/Ymmmz7CBLNZwXr/U8zptXh3cPlFP37A2ZwYbNQj4wb UxV5+P0UgP3VLNXYZnOS80/WST9NiRC++m12Xwj6Rn6BJ1Y+SRS/BMbbsX6LRb9ijDXgbP Limi88tVZlkBIyIBSDiRG3icQ4UQyolwilwr5NfTjTaJWBflfoIQlCyG0wJymBxmHvTAp+ KZc9L0QUw59K+PWmIRRVWg7ztbT07pMdwBp0gkDos1t2EAWz5M6esdRM9LAb/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748273615; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Suf7DYIivU+1zvMUCgtbkxn5GBpcQrECbux9tH06k+4=; b=XyaeWQcJ7ud8qrzt8ogFOmxYQqbPOkvNs/qL11IVpKmjWJStFRvGI6CU4PG+suObXFGS32 hPnEDqJcmwx+ANHxfMN5ue94y5nGSVlPhgTULIgk5g95YtvYrSG1uOSRXR2tLGy8D9sPU8 A2jVQBXA5Y7l2FKBfdFKNYvfdaKRL4DCxDgQs0A52fcR7GAM3NeVv+0RLQUwjkVAnNaqXx DN2vdgs3h65TdrhvJSsEe4hloXzWQyNFIjbIl6vVTRikvjALhmqLBKyWFDKitvDZrGRnik PFitWDeD+Db/QuNLsC/X+FHjhk6lBPyD3B6RZcIQ38lv91PQ9g6tF4GkMmWzFg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748273615; a=rsa-sha256; cv=none; b=dmN3+fXS5daU2qYh4oXowletgAZCjs+5LQXv0eegTddCv9cgXSTkS2/Dm9EPbMvp4343hc vg6sT8LZW4qE3eybEcRGTUeJdvjLYYjjUC8vhP3+aBM7d7EvnJSn+5+szhkmwmbBYTAWV8 BORdczZMNCQDrhycELrMNsE4HkZ9iQhvv9KAHjr4fK3P4zQMjmWG/OZiDM9ZCT2iu5S+zr lcltqYa+LgH6GuuzD7suMaMK7mi7UtEmlJQD/ZHDoJzsDcQZEmAjR0RpCQkDU1iGEbPMyr +EEr98DzHHZIgTo1PRzqSyCTtt5S2k/OaoNyxgHBHArHJEfrFTRFKF6Fa5gBfg== 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 4b5ftQ6cSJz1C8K; Mon, 26 May 2025 15:33: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 54QFXYm3045119; Mon, 26 May 2025 15:33:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54QFXYFt045116; Mon, 26 May 2025 15:33:34 GMT (envelope-from git) Date: Mon, 26 May 2025 15:33:34 GMT Message-Id: <202505261533.54QFXYFt045116@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: 36b05c058892 - main - stand/powerpc/ofw: Initialize archsw at compile time List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 36b05c058892618c9411bcb7231c7ce9d15e52dd Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=36b05c058892618c9411bcb7231c7ce9d15e52dd commit 36b05c058892618c9411bcb7231c7ce9d15e52dd Author: Warner Losh AuthorDate: 2025-05-26 03:34:16 +0000 Commit: Warner Losh CommitDate: 2025-05-26 15:30:37 +0000 stand/powerpc/ofw: Initialize archsw at compile time There's no real reason to do this at runtime. Sponsored by: Netflix --- stand/powerpc/ofw/main.c | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/stand/powerpc/ofw/main.c b/stand/powerpc/ofw/main.c index 34c7e12778e3..093dda27ae04 100644 --- a/stand/powerpc/ofw/main.c +++ b/stand/powerpc/ofw/main.c @@ -35,7 +35,21 @@ #include #include -struct arch_switch archsw; /* MI/MD interface boundary */ +#ifdef CAS +static int ppc64_autoload(void); +#endif + +struct arch_switch archsw = { /* MI/MD interface boundary */ + .arch_getdev = ofw_getdev, + .arch_copyin = ofw_copyin, + .arch_copyout = ofw_copyout, + .arch_readin = ofw_readin, +#ifdef CAS + .arch_autoload = ppc64_autoload, +#else + .arch_autoload = ofw_autoload, +#endif +}; uint32_t acells, scells; @@ -163,15 +177,8 @@ main(int (*openfirm)(void *)) */ cons_probe(); - archsw.arch_getdev = ofw_getdev; - archsw.arch_copyin = ofw_copyin; - archsw.arch_copyout = ofw_copyout; - archsw.arch_readin = ofw_readin; #ifdef CAS setenv("cas", "1", 0); - archsw.arch_autoload = ppc64_autoload; -#else - archsw.arch_autoload = ofw_autoload; #endif /* Set up currdev variable to have hooks in place. */ From nobody Mon May 26 15:33:37 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b5ftT3mpfz5wBcl; Mon, 26 May 2025 15:33: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b5ftT25tbz43QH; Mon, 26 May 2025 15:33:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748273617; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6fMU9zBTsUFx/D3nW3m8D0BvUD6Q/EDWBgxGWynRI7I=; b=ql7dbrnO7CmREPjw010S/YkcwfRqXUuv1sw3XSMcAIk6w69BVD5NO7TnU25I0B1GsQEStl 1wGElqcdAtbFlyOBzykNqNih8YnZ2KmJPXgjKpWK/48IE/9SSYz8/f43HcBZgSghsSm0J3 u3kU7GZ0aPeAZ1ecAlo95ggOtaGRF9XSzs7aQyTgFBl41Hgg9jPoPH6RFIA3XmbEVLBl/2 DP0exe0ZGrziQxW38s6gnsX9gbSsrILEUsIMKJU3ka0fOICee4q0Em/mwh5ZhpCq7Ra0dh /WJfX9YEM/ZmNs7BD7WsgjtFdTIlNDsTh2N82xqzTomWJm2nKKkpHS/SAw7SNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748273617; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6fMU9zBTsUFx/D3nW3m8D0BvUD6Q/EDWBgxGWynRI7I=; b=uMM0d3xfmco1Yg2hykO9kF2wl3q0AN/a9EPWhwjoE9ncyce+QGgaRZ6ZpeRX05L4zSMnrH 4YUMUKSjOfqDXgtMqb7F09VPPIeOL5yP/le/KLkgBo08L+QZqohiwbKVoYe1pvXkMrSaLa lKSK6yR53cHxf7kIhqQLV/D3wbRMKjyMY3mpqLSkubxwdIoEyvBv/psffu5IgLaISwssb7 Av3NQSUxW97SrL8aE14iGIzjGZdaIrpvSzKdcOaspeOtYIDC+SjMUqDfivAoEGpN9mtQzX tFnUX1axZSpey0iaOsVsnzPlIk4cDJVl6b01dbeOgOvXii/piQYtnGgxyihXZQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748273617; a=rsa-sha256; cv=none; b=rP62ut/J3EwQktrhxAEW5tc6k/gBlUKagqjTT4UrsBjPJyYNqlnEMdRbaJlTlMOAnVQWEN TmEp4Vsh2coYOGUDnPefh9KVwdcLMa5Ire1kzNmdq9sEEhMGhbJ+i9sDWtgJvEKFgzf4sC SOsS6bbtpnZH5Y42VMyAE8BQEiPYmgP+A5C6yQRATPwRAAMQzB+noDYNQbTUdIZlTqgG74 n2IBvBwpfwf/Z4vByzVr2mTeosY5bP7GFxbHQmRnWNtbWZyTX9i6m46456mNwBMnZQefq1 vKSgTj8CbnVcGawOyIvd6aBhFDDTDTpxVGtGExXMytf9rp2ULV7oEVwDB+NQ4w== 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 4b5ftT1Pj5z1BFD; Mon, 26 May 2025 15:33: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 54QFXbX2045194; Mon, 26 May 2025 15:33:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54QFXbLL045191; Mon, 26 May 2025 15:33:37 GMT (envelope-from git) Date: Mon, 26 May 2025 15:33:37 GMT Message-Id: <202505261533.54QFXbLL045191@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: 5b90ffad8759 - main - stand/i386/zfsboot: Initialzie archsw at compile time. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 5b90ffad8759633aa79bc9736b1bb65e3a5248b7 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=5b90ffad8759633aa79bc9736b1bb65e3a5248b7 commit 5b90ffad8759633aa79bc9736b1bb65e3a5248b7 Author: Warner Losh AuthorDate: 2025-05-26 03:46:32 +0000 Commit: Warner Losh CommitDate: 2025-05-26 15:30:37 +0000 stand/i386/zfsboot: Initialzie archsw at compile time. Also, add a comment about the weird reason we even have an archsw here at all. tl;dr: zfs code uses archsw when it aught not, but this hack here is easier than fixing that code properly. Sponsored by: Netflix --- stand/i386/zfsboot/zfsboot.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/stand/i386/zfsboot/zfsboot.c b/stand/i386/zfsboot/zfsboot.c index 07bf31eac7a1..4c8eae9b65e5 100644 --- a/stand/i386/zfsboot/zfsboot.c +++ b/stand/i386/zfsboot/zfsboot.c @@ -131,7 +131,16 @@ static int parse_cmd(void); static char gelipw[GELI_PW_MAXLEN]; #endif -struct arch_switch archsw; /* MI/MD interface boundary */ +/* + * Only because the zfs code requires access through archsw, otherwise the + * 'boot' programs don't need archsw. This is less than ideal, but this + * workaround is easier than many of the alternatives. + */ +struct arch_switch archsw = { /* MI/MD interface boundary */ + .arch_getdev = i386_getdev, + .arch_zfs_probe = i386_zfs_probe, +}; + static char boot_devname[2 * ZFS_MAXNAMELEN + 8]; /* disk or pool:dataset */ struct devsw *devsw[] = { @@ -184,15 +193,6 @@ main(void) */ bcache_init(32768, 512); - archsw.arch_autoload = NULL; - archsw.arch_getdev = i386_getdev; - archsw.arch_copyin = NULL; - archsw.arch_copyout = NULL; - archsw.arch_readin = NULL; - archsw.arch_isainb = NULL; - archsw.arch_isaoutb = NULL; - archsw.arch_zfs_probe = i386_zfs_probe; - bootinfo.bi_version = BOOTINFO_VERSION; bootinfo.bi_size = sizeof(bootinfo); bootinfo.bi_basemem = bios_basemem / 1024; From nobody Mon May 26 15:33:35 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b5ftS51pXz5wBck; Mon, 26 May 2025 15:33: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b5ftS15sQz43FR; Mon, 26 May 2025 15:33:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748273616; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RrHyr9SxF5eORAkDkjus56Lo5h+hGM6sGnKH+8+UQsI=; b=x7TZAmXjA2yB3n8wIZq+RYuGw/Z9MeHcNOB1FYqIpMf0tN7VrTTNHnS0LkxQaNQ90WIDyy q1+hYuCZFlHT6WJLuBtJcNZlm5mfYd/tf4cRb+2VrWMpGCLDxssAEF1CbmdKLT3eWCAdxs uMr7+6lj6whL61NGy6J0euG0pFHze5HRfFAzIzxPlxt7VUhhWTDK9xU3p4EbtY5ou7PaC6 2huGUKPiQGVo8m7Eys8Rhs2u1MbUiRnhs7E+GdSO21XmHJSumrdDQRDsDDEXBuCM4pwlUo 9EAqyLVkcBZoeMrf5Tx6QQ84NX5TLsUzuY/PetV+mOA6r8+tRSO+t0RiFVwNpQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748273616; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RrHyr9SxF5eORAkDkjus56Lo5h+hGM6sGnKH+8+UQsI=; b=m6HglVSyb77REBKB/Yr0fS17vqqG2BJoAgsEblqrv5/eoYQHNGoJK3x0PWxS9MdjJeYw7g xkVZOS78GqDzIOV9g5kZ5jotDDd/IqlKt7uCMCPic3FZhoVgwDJnDTyITK157tkeliZND+ /d3nh40m0OJfrEPrgoHuL8iSnyI6RLX+1oehI7zoS5peAmEjQK//L0v6XDbe7QRwS3Ia3j Fp7+2JTusozPJbrs8wUd83TiTj2AXRjd2Qs7gpGBK6A8gHwTKvzC0N/1HVjvWLs0Uj6ts8 sX1vk9gpIUfmgGwLJYWKh/hrnuCsvjgpacfOcmNyJHae7ojhylKoIfkLFuwUyA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748273616; a=rsa-sha256; cv=none; b=hv0xXy7sSiAcaDzJSRza0ODoHluQz/cEWorFO6tt2Bjhk8RPRB/rcduxQHrdRXU4L9ThIl tf7gC9DWiUo2LhCEOk8FKLdbd7ZeqCrcvpDhI+Wv4r10uNCb3H5wkPrv3zn2LcLWjnwp71 flMQiMPCu7QPcIddNDU3+Y2QZapFPjZvNr4bkiLZymw8OkbxvxYp8WBA2gGEcuSI1qRRRn EbaEvxCQebJkySKgo/v3NLDoalnrTQND1lxzB0fC+Yg1ZCKEE3pQH176fmYvs67wI2wITV Ved8I51hPx+sNv1ivCv3puTl0VuZ8qMYacddIPdZui6CkxjQQLHJFXTdQXAwQA== 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 4b5ftS0QLsz1C8L; Mon, 26 May 2025 15:33: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 54QFXZrJ045160; Mon, 26 May 2025 15:33:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54QFXZlD045157; Mon, 26 May 2025 15:33:35 GMT (envelope-from git) Date: Mon, 26 May 2025 15:33:35 GMT Message-Id: <202505261533.54QFXZlD045157@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: b33f61833b29 - main - stand/uboot: Move archsw init to compile time List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: b33f61833b29916190d9abf75b018576cd587b03 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=b33f61833b29916190d9abf75b018576cd587b03 commit b33f61833b29916190d9abf75b018576cd587b03 Author: Warner Losh AuthorDate: 2025-05-26 03:37:16 +0000 Commit: Warner Losh CommitDate: 2025-05-26 15:30:37 +0000 stand/uboot: Move archsw init to compile time Sponsored by: Netflix --- stand/uboot/main.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/stand/uboot/main.c b/stand/uboot/main.c index ab63b9a33a66..61b691f7edfa 100644 --- a/stand/uboot/main.c +++ b/stand/uboot/main.c @@ -40,7 +40,15 @@ #endif struct uboot_devdesc currdev; -struct arch_switch archsw; /* MI/MD interface boundary */ +struct arch_switch archsw = { /* MI/MD interface boundary */ + .arch_loadaddr = uboot_loadaddr, + .arch_getdev = uboot_getdev, + .arch_copyin = uboot_copyin, + .arch_copyout = uboot_copyout, + .arch_readin = uboot_readin, + .arch_autoload = uboot_autoload, +}; + int devs_no; uintptr_t uboot_heap_start; @@ -474,13 +482,6 @@ main(int argc, char **argv) meminfo(); - archsw.arch_loadaddr = uboot_loadaddr; - archsw.arch_getdev = uboot_getdev; - archsw.arch_copyin = uboot_copyin; - archsw.arch_copyout = uboot_copyout; - archsw.arch_readin = uboot_readin; - archsw.arch_autoload = uboot_autoload; - /* Set up currdev variable to have hooks in place. */ env_setenv("currdev", EV_VOLATILE, "", uboot_setcurrdev, env_nounset); From nobody Mon May 26 15:33:38 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b5ftV5Qdkz5wBZf; Mon, 26 May 2025 15:33: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b5ftV33GDz43WC; Mon, 26 May 2025 15:33:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748273618; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TPVw6rD8YVkFD+qlW5eEW5CzrkR0Tkv5V8UvNWBVNi8=; b=Eb+qovBaw/1cDVAlKzZUn2Na+tbNX3CXA+s0rnGAqHC+RJtMrnrxyRpcKCdTDLf04DtEJk USSojdkWX0pXMWCSRBqYrm399r8SVKTqNe4/pHpiE4Mywh1TaxTKsDacp5cBjqwHtxMHBE VJO8Bjw8wY9+GZ1DvbZc/uz4SisiEmrlxcfXLccAAcCvoOuHExRjc3B+Td9ZLoiLDgKR25 bwrI9QwWbI6B/zbpK7cSUC31q+VH0p5OkrjnlbOAGZ0qfrufPEGCyApXQZmcPWqciK5gbc UbY/WFRlgPpvATueeYi/LN3q1ZGyXrx4bLHHb8GTHQjMEfwB0RPyjLAerZNimg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748273618; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TPVw6rD8YVkFD+qlW5eEW5CzrkR0Tkv5V8UvNWBVNi8=; b=aVmpWYdVnQaTETm057XmcOEPYuQ9UrYGhK33SifRdMLlH9QwMKgWtZY9KjyggnKkDnELTk 8L8mnlESlWgfy7zNwEGC1qxUC3x56VGDox4bOLOnFM7sZGgWH9hIw2n8rJyFYeW3P/++Y5 hiKIagJlp5HGP1ugegXvUCghN69Y7CfHomzmIE+JgPBFOrjAsnlBzZ8YEjOxi4KDWMu280 vWLPfShW6aENH0vHXOiWLAldm4ZGPPeVV1GCP8/ezJgKv2YYmSVuj3A76ZeTHxDZ1LdGCj b1G6lA+OgHSRRbcoGxcM1GDnqZr8kAkijotZt3tzjvJLqfpDzdidKiF0m+jn/w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748273618; a=rsa-sha256; cv=none; b=PTGQVNgdDnJxtvFTxEjPHoULp7mD44JWTbmqQp9VjU3UPNteXMaGZkxjJiD94GvRwUk9iC xkUJG4ssKlpz1EFThi2LZDcSI9SheC17v6OggKWuebAVooxSiVD6CRRgt1Cm28dMtoMXj2 Bo4rvDbOUkwG2dDeazJg2vmaRxWRSKws4QjcbHHp5nKQwS933qBkovZ1jyeYWSSECn0gIW cV4Ww/Bd71BnTL0q69YhQxnItmJSalKtYuEJnzAicQsj8TRIROX5CGfPu6phGPIS5Us0l8 wYalQAyFNU0HI75mRfcsDuGJ5cXY+iW7IVUz+QZda5UcgELSZpZzRN7RelWb5g== 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 4b5ftV2Nn5z1BZN; Mon, 26 May 2025 15:33: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 54QFXcTk045233; Mon, 26 May 2025 15:33:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54QFXcOr045230; Mon, 26 May 2025 15:33:38 GMT (envelope-from git) Date: Mon, 26 May 2025 15:33:38 GMT Message-Id: <202505261533.54QFXcOr045230@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: 26178196de73 - main - stand/userboot: Initialize archsw at compile time List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 26178196de7345cdef047ef5b953101d0b50d41f Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=26178196de7345cdef047ef5b953101d0b50d41f commit 26178196de7345cdef047ef5b953101d0b50d41f Author: Warner Losh AuthorDate: 2025-05-26 03:52:34 +0000 Commit: Warner Losh CommitDate: 2025-05-26 15:30:38 +0000 stand/userboot: Initialize archsw at compile time Sponsored by: Netflix --- stand/userboot/userboot/main.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/stand/userboot/userboot/main.c b/stand/userboot/userboot/main.c index cf1d9b12d69f..53b76c685d92 100644 --- a/stand/userboot/userboot/main.c +++ b/stand/userboot/userboot/main.c @@ -55,7 +55,16 @@ void *callbacks_arg; static jmp_buf jb; -struct arch_switch archsw; /* MI/MD interface boundary */ +struct arch_switch archsw = { /* MI/MD interface boundary */ + .arch_autoload = userboot_autoload, + .arch_getdev = userboot_getdev, + .arch_copyin = userboot_copyin, + .arch_copyout = userboot_copyout, + .arch_readin = userboot_readin, +#if defined(USERBOOT_ZFS_SUPPORT) + .arch_zfs_probe = userboot_zfs_probe, +#endif +}; static void extract_currdev(void); static void check_interpreter(void); @@ -189,15 +198,6 @@ loader_main(struct loader_callbacks *cb, void *arg, int version, int ndisks) putenv(var); } - archsw.arch_autoload = userboot_autoload; - archsw.arch_getdev = userboot_getdev; - archsw.arch_copyin = userboot_copyin; - archsw.arch_copyout = userboot_copyout; - archsw.arch_readin = userboot_readin; -#if defined(USERBOOT_ZFS_SUPPORT) - archsw.arch_zfs_probe = userboot_zfs_probe; -#endif - /* * Initialise the block cache. Set the upper limit. */ From nobody Mon May 26 15:33:39 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b5ftW5w1cz5wBXT; Mon, 26 May 2025 15:33: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b5ftW3b7Jz43JK; Mon, 26 May 2025 15:33:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748273619; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WEJOHAq0kyuvaiilbYIPG37HPRfHb7yYKOcasukGRk8=; b=Y9DTi4Yj7fE6d47WYeanMeIPHuONv88w4MwUl0PoMnkHnJM1VhRsffqykA6ilZvnjd5dBc dNM8ykXJFU0gaGSl5z/8ysjEx7TFD1iWc2+z93sGnTRPqFk4RcC0A3WfKfE26EVlZ7RE1n iHrscA2HeVR7G3SqsAEhb+yi8IV/DAl+/Olw3vxdW0+NGcwJblT0+DwByyjJriFkKE2WbM 8zZBXbkjbwjLZZQpIvBeOIw9GXU/7+WfjFx4KjD3A9p1ZwzE17RIMB7PU6+PkQD6A9EfvD +gSzSCW3FK2sXJC2kQPQkPXLKxxugohxbMHDQzGNvXTy+/puyI+X8kvuZu+pqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748273619; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WEJOHAq0kyuvaiilbYIPG37HPRfHb7yYKOcasukGRk8=; b=CG5zqf4uP3lvjZ1Gi4JEr+39HZgk0VkI858iAZBySrTUR97iFyfUPxBS8AOn0FYl1fp7DE cXQSf9jENFM4mcwEg1fLyPbHe0EpU9hPaCLiOsJu3h88cXQINvm7N8YdPFpd+Mz43zOKiH 4eapcJaDyN1DmpDlIFK3TqSlpQa7DxW170jkY868EGHgxS3MunJsAz9Vl5/HaY3DbIEVI8 tjTT8jcjxblL/mHIJDhqIddLEexstWr2aQtEh59MzCGGRnKVaeuWqSDls6x41JPjMUoKjY ZXTZ6SfpKVmP8EZ3X1KztOtt6wVQy/NKsbsDTRIO3VJ/BohRbzikg0FpfNulUA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748273619; a=rsa-sha256; cv=none; b=EwIrX2qqKv5PmtFMufW1NN98wl07v+oiTc8z5kRHksr3co/78jd8xOPx9HKGxGTCVja6ei 1mfIsTFNPLh8DNKw0pkWWPYI392nQhAvQv8QsUNIMZIY5Oj+XUsBbmg9k18RSyb4h2N7JQ C8StwyYtBge/H1tKEFV9MxndTu6WlNy6K/lBe3kPwx0E/4hSqsug1t/O+n6Zuok/2yNcif IXqT82TkksU4iH9pdIKMvMM1CcRGWirnc2I+9/FSwWyaLgpiNYzd+qhqPA3dtCKqK1dAct Y3ql2hJLwI7Hq9BQnAeBtJvwp+HhbVj/Wz/lnw5hlRkOWggb1hSyrL9mRFzCjg== 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 4b5ftW32f0z1BC6; Mon, 26 May 2025 15:33: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 54QFXdSG045268; Mon, 26 May 2025 15:33:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54QFXdLL045265; Mon, 26 May 2025 15:33:39 GMT (envelope-from git) Date: Mon, 26 May 2025 15:33:39 GMT Message-Id: <202505261533.54QFXdLL045265@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: 8cf4ac0c2149 - main - stand/kboot: Remove _end forward decl List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 8cf4ac0c21496cd50c513cd63859dadf98dfddaf Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=8cf4ac0c21496cd50c513cd63859dadf98dfddaf commit 8cf4ac0c21496cd50c513cd63859dadf98dfddaf Author: Warner Losh AuthorDate: 2025-05-26 15:13:04 +0000 Commit: Warner Losh CommitDate: 2025-05-26 15:30:38 +0000 stand/kboot: Remove _end forward decl We don't need/use it. Sponsored by: Netflix --- stand/kboot/kboot/main.c | 1 - 1 file changed, 1 deletion(-) diff --git a/stand/kboot/kboot/main.c b/stand/kboot/kboot/main.c index 668e5ac2706d..3f1a4e6a86c2 100644 --- a/stand/kboot/kboot/main.c +++ b/stand/kboot/kboot/main.c @@ -52,7 +52,6 @@ struct arch_switch archsw = { .arch_autoload = kboot_autoload, .arch_zfs_probe = kboot_zfs_probe, }; -extern void *_end; extern int command_fdt_internal(int argc, char *argv[]); From nobody Mon May 26 16:05:40 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b5gbS5Tl3z5wD2W; Mon, 26 May 2025 16:05: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b5gbS4qSKz4Mbf; Mon, 26 May 2025 16:05:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748275540; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=To0jTWBTchv6WccK4yieR9pf5DvXsEEOrhi1cIqJeAU=; b=g2ARHZIeLlBU8cPRppKze/bhJLgCKEH3ZtCeUeNlmFiZ8dudGqtiq46Eh7WwY8Qg6uMG/R tVIj5sWqgDUUIcBACsshO5c9z/0RgGKe3yGinqrfP8HNmeealkHfXVgRDtCB/BP67Dgngq NheGk+lK4yDTd7+RQWR4fK5hEpcfD4JvKr7NrSR28HZP3+31PYRsM6LqLh+MXc/dQmk4z+ OKMmbIm7kZjgT+yVAkkVXj1za1vT0v8X76n/Lxu1QS9h9hYtUUn3eT30wgdcYiVzHh5wag XkPXNCIkG3v87NnTqEU7tF9oVrDTsGz0GeeyUbWshwpTZiPIffWBD/kcbnzhdg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748275540; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=To0jTWBTchv6WccK4yieR9pf5DvXsEEOrhi1cIqJeAU=; b=eDSRBJRqfGTHtJDtxZECo6LehCygu7IkPYikKxmuZDjGIhNHl71PxFMYoT1i+8HxmP0mxf COORjdm7iFmwGRKXV6LBmHhGAHcA9VgskVnlboCIZCqj8uW8uDSqVRFXAmrjq0R6wphy64 MT/HOQCDYXUYGuTo0ILWeeCn3KVlx3/R4X4ne3t0jejUV9D1sZF/YDnh6BIiiupESz5LXe so552YWf2bqaKV52s3sZs98wII+NkUh/R3aZCTcfnYQ3WsXD49DRxZbucvnywtYUJLEgFU AakMCeROPg4+XROkOhz7U5t5PCbEMR52Q8alvSh2qlC2rYGQoJv/W1+3ANas2Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748275540; a=rsa-sha256; cv=none; b=XBccWPPHO8XWNqb2gE0v7njLm//VBFzaFmIfP72hkENcO9s0qFJb1C0I/d6i/4knLefOpe 1N8vyX3MgtzNMmd4gA0mgvXtSo2uNWFZh5iakU3LRjvcgNSEp56hgFmQ7v0X+cj2HNAwkz v8jkqbs8aZ7tq+//zoYn24nWli56OeRSE40mP+knOiH3SnQIdi+YGhXzxNRhdMLtadKYcj A/mOvt4BmRXBMD7vqmPy9kKNOnxGvatA20fAWHLeLuBVBbo0vSvA7RlM1IqlPP/0mURs9J 3xICU4Z6tnBOaetNhbqVVv9aiS+q+zTZb2+9cqTnq3n92D8epZBft3MQp0zPgw== 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 4b5gbS3zCFz1CGn; Mon, 26 May 2025 16:05: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 54QG5e4O002771; Mon, 26 May 2025 16:05:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54QG5eZv002768; Mon, 26 May 2025 16:05:40 GMT (envelope-from git) Date: Mon, 26 May 2025 16:05:40 GMT Message-Id: <202505261605.54QG5eZv002768@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: 61f46c66ddd3 - main - Remove LLVM_TARGET_SPARC descriptions List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 61f46c66ddd353cb9b1a827d8a1ec5e3dee78b1c Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=61f46c66ddd353cb9b1a827d8a1ec5e3dee78b1c commit 61f46c66ddd353cb9b1a827d8a1ec5e3dee78b1c Author: Ed Maste AuthorDate: 2025-05-26 15:48:20 +0000 Commit: Ed Maste CommitDate: 2025-05-26 16:05:30 +0000 Remove LLVM_TARGET_SPARC descriptions Support for WITH_/WITHOUT_LLVM_TARGET_SPARC was removed in commit 47e9f42ea39b ("Remove sparc64 specific buid-system hacks") so the descriptions serve no purpose. Sponsored by: The FreeBSD Foundation --- tools/build/options/WITHOUT_LLVM_TARGET_SPARC | 4 ---- tools/build/options/WITH_LLVM_TARGET_SPARC | 4 ---- 2 files changed, 8 deletions(-) diff --git a/tools/build/options/WITHOUT_LLVM_TARGET_SPARC b/tools/build/options/WITHOUT_LLVM_TARGET_SPARC deleted file mode 100644 index 4da802ad0312..000000000000 --- a/tools/build/options/WITHOUT_LLVM_TARGET_SPARC +++ /dev/null @@ -1,4 +0,0 @@ -Do not build LLVM target support for SPARC. -The -.Va LLVM_TARGET_ALL -option should be used rather than this in most cases. diff --git a/tools/build/options/WITH_LLVM_TARGET_SPARC b/tools/build/options/WITH_LLVM_TARGET_SPARC deleted file mode 100644 index 0d67602688de..000000000000 --- a/tools/build/options/WITH_LLVM_TARGET_SPARC +++ /dev/null @@ -1,4 +0,0 @@ -Build LLVM target support for SPARC. -The -.Va LLVM_TARGET_ALL -option should be used rather than this in most cases. From nobody Mon May 26 17:12:58 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b5j571nWxz5wJkQ; Mon, 26 May 2025 17:12: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b5j570kBDz3mbm; Mon, 26 May 2025 17:12:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748279579; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uHkeKCm6QXhteSlCqUAjmUUClDKlU7GZ8CQMvrMUlyw=; b=x1IAnkZ1olw/4qDKQGevxFAEOtzcDRtyQzacyE5WZvws0gaT5wYbqBCj5He1tHXwALycE+ EjD7CuUuUIFA+MLZDLfRCs/NhRDwRI2zkpYE3cv5/pcFbKRo/JPCZvnREoSqSfDM3Ub3Wp VLi1QnEW9hDfhPCLZstam+mjN8Og0dfsaaT2mmcQu+Sop7zlcA9c+t1YUlv42mpm1+u1Sp +UuBFY6WZ2NxqWB3oIQrwZL8+rWvJwfTC554CgJndBQDtUjK1fCKFt6NzjFUeF6ICQNNjl k5xwJ/eHaODoYQ2OA90aXamGzhYAefN2ytUxncQpncK1gEerEGTQ0b8xuUEH7w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748279579; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uHkeKCm6QXhteSlCqUAjmUUClDKlU7GZ8CQMvrMUlyw=; b=MZd4LiykTGqJTL/9iIrgPZE6SUhlUZl4EeKKeTyJ8DUit/aZr56TC/FTvhwnI18nKcPS2/ BL0chSikqMtrB3Ikw39ZhWsDJU9G4Yec2n7RLXhxgJ8YyEO871jiyfOhgtFbewKwTE8kjG 4g9syc3jXZDppDD4Khgj1a5zfIB9X+lReWXmyYsVngYWcVshTcCZvkXQFPuMARsPjulWZ8 UriJlSmKWYH+hIiKDe2LypSxjdg+QeB7MzYI4ofD37UyeY6Vs82a6miNhC3byLaxWNv9MB iiDxPXQYyoi5t7PeOE058pDS50KzHgHsAl8BhyWIJ4x1Fr5lsSzr3KuthiOH3w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748279579; a=rsa-sha256; cv=none; b=NVibNfvfX+A3kW4S3CWTLMHJpWSbEYyK6B8ogkDRGTI83qQpx7YCLKX8iZLCeEZleHu5/0 is298n9AV8lWms5XtHYiA8+UbAX9FSfY0EkTPQlvQ2Qp7rxvR/WW/PXbJYBya/sktrBinq z9ichNMpRUhcUUQAe+Wjc+3WEEyYLO+VNn17YfutdMw4jJgAoUXeUUROvFHq3HxbHHg6DU 6kNcSPPcl1L1GfytvMZidWIDxw6VZbvYZchxvlRjAOaVyvmu48E/PsHJ6yXtCOoz6SToA0 gX00117JG3vNTcMPqs0P8XzrUipkryNjF+lIvHzslFyLdtAW51SgvI3wJW27tQ== 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 4b5j570Khkz1Jd; Mon, 26 May 2025 17:12: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 54QHCwKp033826; Mon, 26 May 2025 17:12:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54QHCwPZ033823; Mon, 26 May 2025 17:12:58 GMT (envelope-from git) Date: Mon, 26 May 2025 17:12:58 GMT Message-Id: <202505261712.54QHCwPZ033823@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: 8e5eacbfdef7 - main - stand: Update comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 8e5eacbfdef755f0a13c38f5aa21925d4a4cf0b5 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=8e5eacbfdef755f0a13c38f5aa21925d4a4cf0b5 commit 8e5eacbfdef755f0a13c38f5aa21925d4a4cf0b5 Author: Warner Losh AuthorDate: 2025-05-26 15:34:31 +0000 Commit: Warner Losh CommitDate: 2025-05-26 17:09:54 +0000 stand: Update comment Some routines are necessary, so note that. Sponsored by: Netflix --- stand/common/bootstrap.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/stand/common/bootstrap.h b/stand/common/bootstrap.h index 0c6462f8d1a1..88ee6de2e520 100644 --- a/stand/common/bootstrap.h +++ b/stand/common/bootstrap.h @@ -326,7 +326,8 @@ SET_DECLARE(Xcommand_set, struct bootblk_command); * The intention of the architecture switch is to provide a convenient * encapsulation of the interface between the bootstrap MI and MD code. * MD code may selectively populate the switch at runtime based on the - * actual configuration of the target system. + * actual configuration of the target system, though some routines are + * mandatory. */ struct arch_switch { From nobody Mon May 26 17:43:59 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b5jmw1H3kz5wZyY; Mon, 26 May 2025 17:44:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b5jmv6pgGz4358; Mon, 26 May 2025 17:43:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748281440; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=b881IPyI+7SRJk46XJcbKmISndzE5WRfQymn0AQbtFw=; b=sCDQfYsUBOhTMbsaRa0CL88R2XZfuHId5J2ijMoIAKthE13x8Nxx4MbHt8us8O4wJKyMCp di4USX3zuL/cztEYVnYrkAOMXWR7X4QbnPl8eSbHr+tQ+Adb3heYIliftVT98KK4YiQVZ6 Z4n+lFevCQoj/OfHopL6qhrzFyKxF++sTJkHiTZzKD09kXWx5oqRj9Or8VOmIKU7TS9YT8 lmBlqdtD/7PiDyDuAkpO+pSncYpFWVh3Xv7LVON57ORlx47VwpKA8Bys/3aw/fTCLWnL1W T69vYIQ4t3rDlhqkHRiqaoifhnyO2aXmCO90OmfmjzioW7GA9dr5Yu8L1I0GSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748281440; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=b881IPyI+7SRJk46XJcbKmISndzE5WRfQymn0AQbtFw=; b=M/DI+bx9caxioX5UxSOlQkqjsrMYd8IfGhpIoou7JYco4YhO9q/D3tucSZXKset2tOR0Z+ /vqQUjpTmRp+7g2BuTU6OJ4y6QNhSJAj2xcXtDvXcH1eS+tTtqwYwP2gau7f3ToS/DNlKN A2LB5KUDAtO6HBH/Jx3t+bwhNg3xEb0ra9FjHk98AEGMpUjBdH7jZnk7RtecdBIJeeeibR d6hAhL/BJ3ZQ4uMDA1uGmP5UMlj4kYeNz9TErG3KxpumyQILytmW5GNGoAf9b5MyQerHbV 6ibI7TsADXz+DK+5F4pIKjkwaBwdlcuMS6fkJVJVduQC0dYAn9wz1C5jQrXHnQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748281440; a=rsa-sha256; cv=none; b=ptgTpYp1f39Tfu6NqCSQFlWvCMI2fgyojdcdy/xy2XfqLUeMR1AitLt4hE6vqHdOZPY6gt LFfgzi/ydDEx11AdNET0Tc4GY2crLHFtG4G6gRe2A602B3VNIEsc/gEqxr20eY2/8mPfqA VqlnF5kuy1kD4xndou4HK08TZXKF+cVZuSM6j3F2TKYWP4MfIC4aLcusxufWQogwoRGtKC HB57oYh5HZ/vOEq6VFjpSztIFtPp3c1bGRfrEr8d0U4zQiMzHx7fjyCoFDSrYxoaolk2kU Dj+3apHw6dKS02LR2+DMpcJVcAkTyUjDXPgxY62rBIMA8x+13L7h4JkG5OuUdQ== 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 4b5jmv6Bytz2KN; Mon, 26 May 2025 17:43: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 54QHhxUN089893; Mon, 26 May 2025 17:43:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54QHhx32089890; Mon, 26 May 2025 17:43:59 GMT (envelope-from git) Date: Mon, 26 May 2025 17:43:59 GMT Message-Id: <202505261743.54QHhx32089890@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: 79537a90dc36 - main - release: Add some comments and tidy dist set targets List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 79537a90dc36a29b1c99c995651f4d7f98964af3 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=79537a90dc36a29b1c99c995651f4d7f98964af3 commit 79537a90dc36a29b1c99c995651f4d7f98964af3 Author: Ed Maste AuthorDate: 2025-05-21 13:36:46 +0000 Commit: Ed Maste CommitDate: 2025-05-26 17:43:28 +0000 release: Add some comments and tidy dist set targets Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D50458 --- release/Makefile | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/release/Makefile b/release/Makefile index cf941534995b..a9a8d0f04605 100644 --- a/release/Makefile +++ b/release/Makefile @@ -132,7 +132,10 @@ beforeclean: .include clean: beforeclean -base.txz: +# +# Legacy distribution tarballs +# +base.txz: # Also (if enabled) tests, compat libs, and -dbg variants for all. mkdir -p ${DISTDIR} ( cd ${WORLDDIR} && ${IMAKE} -DNO_ROOT distributeworld DISTDIR=${.OBJDIR}/${DISTDIR} ) # Bootstrap etcupdate(8) database. @@ -149,7 +152,7 @@ base.txz: ( cd ${WORLDDIR} && ${IMAKE} -DNO_ROOT packageworld DISTDIR=${.OBJDIR}/${DISTDIR} ) mv ${DISTDIR}/*.txz . -kernel.txz: +kernel.txz: # Also (if enabled) kernel-dbg.txz. mkdir -p ${DISTDIR} ( cd ${WORLDDIR} && ${IMAKE} -DNO_ROOT distributekernel DISTDIR=${.OBJDIR}/${DISTDIR} ) ( cd ${WORLDDIR} && ${IMAKE} -DNO_ROOT packagekernel DISTDIR=${.OBJDIR}/${DISTDIR} ) @@ -171,6 +174,10 @@ ports.txz: --exclude usr/ports/distfiles --exclude usr/ports/packages \ --exclude 'usr/ports/INDEX*' --exclude work usr/ports ) +packagesystem: ${DISTRIBUTIONS} + sh ${.CURDIR}/scripts/make-manifest.sh $$(ls *.txz | grep -v container) > MANIFEST + touch ${.TARGET} + .if defined(PKGBASE) PKGBASE_REPO= pkgbase-repo PKG_ABI= $$(${PKG_CMD} -o ABI_FILE=${.TARGET}/usr/bin/uname config ABI) @@ -361,10 +368,6 @@ mini-memstick: mini-memstick.img mini-memstick.img: bootonly-memstick cd bootonly-memstick && sh ${.CURDIR}/${TARGET}/make-memstick.sh ./METALOG ../${.TARGET} -packagesystem: ${DISTRIBUTIONS} - sh ${.CURDIR}/scripts/make-manifest.sh $$(ls *.txz | grep -v container) > MANIFEST - touch ${.TARGET} - pkg-stage: dvd .if !defined(NOPKG) || empty(NOPKG) env PORTSDIR=${PORTSDIR} REPOS_DIR=${.CURDIR}/pkg_repos/ \ From nobody Mon May 26 20:50:30 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b5nw75ZGQz5wpT3; Mon, 26 May 2025 20:50: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b5nw73xLSz3rPh; Mon, 26 May 2025 20:50:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748292631; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=viAPN/ykHt//4RI9HcnD4OixpSw5+vOP6aibn6IgLjg=; b=hGkJ/ulu8nNJ1KJAQfIn+7aKV5+CB9wnJ5+S7ER2lZh/LL3b8KEA1rdoFcfO4jd+orsQYd IwoWLLFUPWJy0iw+NV784POMhWiAHPoX79wXikZ3x/VxUyw7i8+aMzqjLYoDi9QmKv3flg 5fm80UKqSRPcSnQC9UrLfvcq9aDHOkhTST4zMkKOuiNAWkZqSqmDD29JVzWFTSlh3F19+t HxxLuHX8kUT+OsfOrGNhBsMCN7kyIoFW7Q1WxRxfoKQP9Ku/T05jU7hg3cfjZ7TC9mLsQL z5rFtRoINOuWFnWcrfKVZ5uNTFCLhu6JBkXSw9yl8+SzbMRvxoLxikjaVQso8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748292631; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=viAPN/ykHt//4RI9HcnD4OixpSw5+vOP6aibn6IgLjg=; b=aOZL2NEGu7BZ4k0VbPS0hmQxAXotkhQCCIHmzWsDUSESnDCUVUXUKw0jDMLiH19lr48cpY AkWz0gLLTfjSFQEJji0SH/g4g2FHO9UmKSeSNOlE3LRWIxQSoBHVXY5DntqsoDiZFSFTHa cCSfSOCBwe+y9PJGunsipTpHHzo4XqHRAelSZz/yse1PCVTZhtUPlzr7HuNeKtZ/na/xrr nRIl44misvac152ggUA2NGIHDoQxjyb6X35LhAUQqSGBFp6MsxgrUXRFuxLETJGsiCA0Gl sdaCPy6pZ8QpNik6eIQbJSU9QpuHjqSm/VfoXsAbS+EGCNMIESce5U9XfELiKg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748292631; a=rsa-sha256; cv=none; b=bzHNrMirKLvCHkI1REOO47TpBZQpcvmu3G85rDSmAyga7TWaO3UdwFS+0wj2EVQ42wfbGS FonFD2mL6P0Jf7kl20NPPTlDU/SJ9nvMp6JM5L0uu7DlKIU085NdW9uN2URPT1ZxgR+bmt T+B8kSlJme6orbmQgOgSctLCVaJTAWlJgiG/k4U5Pn/LWbg6sm4Nz2VmYoW66f3ffThtyQ Jyv5W+GPD8aTYQDPaUadgJ03QHRaQMw/5/3k//tFeH9ZN2W6v2rcQMu+6FO6/vFyTGn5MW UP2lHBA/H38TislJpXv4upXYomEd8MFfelRrcnH92SanDuXK7+RPS5n2RAaGXA== 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 4b5nw70bX6z74F; Mon, 26 May 2025 20:50: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 54QKoUq4036386; Mon, 26 May 2025 20:50:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54QKoUtu036383; Mon, 26 May 2025 20:50:30 GMT (envelope-from git) Date: Mon, 26 May 2025 20:50:30 GMT Message-Id: <202505262050.54QKoUtu036383@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: 136053f7db82 - main - elf.5: Add description of .ctors and .dtors List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 136053f7db824b72ede67b40b0e7a393f6686a8c Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=136053f7db824b72ede67b40b0e7a393f6686a8c commit 136053f7db824b72ede67b40b0e7a393f6686a8c Author: Ed Maste AuthorDate: 2025-05-26 19:05:25 +0000 Commit: Ed Maste CommitDate: 2025-05-26 20:50:21 +0000 elf.5: Add description of .ctors and .dtors Reviewed by: kib Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D50536 --- share/man/man5/elf.5 | 16 +++++++++++++++- share/man/man5/src.conf.5 | 2 +- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/share/man/man5/elf.5 b/share/man/man5/elf.5 index 5f1aad2298c0..d89a917bd96f 100644 --- a/share/man/man5/elf.5 +++ b/share/man/man5/elf.5 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd May 24, 2025 +.Dd May 26, 2025 .Dt ELF 5 .Os .Sh NAME @@ -864,6 +864,13 @@ This section holds version control information. This section is of type .Sy SHT_PROGBITS . No attribute types are used. +.It .ctors +This legacy section holds pointers to initialization routines, +executed before calling the main program entry point. +This section is of type +.Sy SHT_PROGBITS . +The attributes used are +.Sy SHF_ALLOC . .It .data This section holds initialized data that contribute to the program's memory image. @@ -889,6 +896,13 @@ are unspecified. This section is of type .Sy SHT_PROGBITS . No attribute types are used. +.It .dtors +This legacy section holds pointers to finalization routines, +executed when the program exits normally. +This section is of type +.Sy SHT_PROGBITS . +The attributes used are +.Sy SHF_ALLOC . .It .dynamic This section holds dynamic linking information. The section's attributes diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index ba88b995e51d..d52f0a170203 100644 --- a/share/man/man5/src.conf.5 +++ b/share/man/man5/src.conf.5 @@ -1,5 +1,5 @@ .\" DO NOT EDIT-- this file is @generated by tools/build/options/makeman. -.Dd May 9, 2025 +.Dd May 26, 2025 .Dt SRC.CONF 5 .Os .Sh NAME From nobody Mon May 26 23:33:56 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b5sXj28w2z5x13K; Mon, 26 May 2025 23:33: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b5sXj0Lrjz3gjk; Mon, 26 May 2025 23:33:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748302437; h=from:from:reply-to:subject:subject: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+7xNZ0K27QFCyxhZ75WJ7ENIrOqjP2cBfb1L/jg/yk=; b=q1XiaUgp2xdSRdld+VOIjPON+uq+HJW8y/DLmGgwxenLOoEcIw06fvGx4VrcUrU9T6G22S sb03bn8koHBNfjgjsLLBa6/hTCm4LlymVCHXz99k4OBevx553T2ok85xu1V2y8Vt0UnLiy CgO83nuEixFdu3574bhYQ6IX/uS8TH8LwkCEGDGmjkYXNHaY5nLznhLcMhJTQzcyVEVq7J c7Tw5JI2RInV5VITtYOYePTeJAF2+W4ZIANs539ar/izS5V8kyDCIjMqVZlrWqfeXgLvRz YjPBQZouUSiwaSBty5KqlactkaiRoCLcFe5Cg4zg4HBsKj821/cjL5juMUnMjA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748302437; h=from:from:reply-to:subject:subject: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+7xNZ0K27QFCyxhZ75WJ7ENIrOqjP2cBfb1L/jg/yk=; b=O0IqZS9pLF/vG4QIE4iByaxyAlTdB2CSLV1QF5ngtN4Ymd8ZiTP73/+sRmwbCsutkmUmiA AIiwJyZGxkZXRyCu57x5uajmJdXv3aJ4kaOFSHyoKa9UNwrRcKZQmFfth1lE+iw11ApiIA 2m7C/s7vCvX0LDmgiKiKhBWn4F9rSduyLsC66tGSl5MGZgE5G2cFnZpZS/EeOeNbjfRtrC Gg3bRfnzJKBuvdSUoiGupxkHlWVXTN+3oQ2Y3rLFztSjkvcOAzBduIRD1KcF22rftxLfmL KH7BaJCgx1GCm55eqyIWqnim/8frEAl6CKwFQ+HfFdmbVrO0aExuegMgfoj7zw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748302437; a=rsa-sha256; cv=none; b=yelANza1GOf6Ssc0pkNuSJocqOD+AdRQQFan6XBhUT9zwZeSAG6sqKt+gpjR5wkf8WwVz6 0F7h3c6y0BhIXGxkZHLr7ynsRrlCvpTaK3l/oLDG1nPhCrDnqcUqaiyJNvw4YIsCqadDfK UXHccx8QX3BbLx31pFUs9a+xfkAdVZrBBQPNOq1Nzjq0O1mUw9qDblbcW2Y54BSLUbIcrD DcO1eFHZfpU+Lzq5OKn2UK0K/4mInL4/U0hAKsVeikTN/dsu+sY5QcPf8UCl4WFsQ7bVQa U5oM4HORq+oF55aeu+NYiVxyz403+7Hoe4uCiuFomb6Qwwfp96bDHrUkumOYcw== 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 4b5sXh70vjzC10; Mon, 26 May 2025 23:33: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 54QNXu8Y043660; Mon, 26 May 2025 23:33:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54QNXubI043657; Mon, 26 May 2025 23:33:56 GMT (envelope-from git) Date: Mon, 26 May 2025 23:33:56 GMT Message-Id: <202505262333.54QNXubI043657@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 6cbf8a04b186 - main - LinuxKPI: 802.11: mark struct ieee80211_ht_cap __packed List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6cbf8a04b1864d933506301cabe213a9c918d968 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=6cbf8a04b1864d933506301cabe213a9c918d968 commit 6cbf8a04b1864d933506301cabe213a9c918d968 Author: Bjoern A. Zeeb AuthorDate: 2025-05-26 23:20:20 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-05-26 23:33:08 +0000 LinuxKPI: 802.11: mark struct ieee80211_ht_cap __packed In lkpi_sta_sync_ht_from_ni() we are casting the information element (IE) data to this struct as net80211 does not save the mcs/rx_mask. Not marking the structs packed results in the mcs information not being copied correctly and rx_nss calculations possibly being off. Even worse, at a later stage iwlwifi mvm/rs.c would extract the mcs values from the same field to pass to the firmware which will than crash in an assert as we would want to do HT with an empty MCS set. Sponsored by: The FreeBSD Foundation MFC after: sunrise Discovered: while testing other features on arm64. --- sys/compat/linuxkpi/common/include/linux/ieee80211.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/ieee80211.h b/sys/compat/linuxkpi/common/include/linux/ieee80211.h index 396204c3c484..fe2055f05969 100644 --- a/sys/compat/linuxkpi/common/include/linux/ieee80211.h +++ b/sys/compat/linuxkpi/common/include/linux/ieee80211.h @@ -304,7 +304,7 @@ struct ieee80211_mcs_info { uint16_t rx_highest; uint8_t tx_params; uint8_t __reserved[3]; -}; +} __packed; /* 802.11-2020, 9.4.2.55.1 HT Capabilities element structure */ struct ieee80211_ht_cap { @@ -314,7 +314,7 @@ struct ieee80211_ht_cap { uint16_t extended_ht_cap_info; uint32_t tx_BF_cap_info; uint8_t antenna_selection_info; -}; +} __packed; #define IEEE80211_HT_MAX_AMPDU_FACTOR 13 #define IEEE80211_HE_HT_MAX_AMPDU_FACTOR 16 From nobody Tue May 27 00:42:25 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b5v3j4ftXz5x5C1; Tue, 27 May 2025 00:42: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b5v3j3Rqqz3Whp; Tue, 27 May 2025 00:42:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748306545; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oDBehHrgLKC/p9NLxxYChecYkhxbErk2/NzES56MejM=; b=Ss2tMXG46WQISxrTGi0GF1MMCjZO4WNyuHMVoHA1kB5YOKXDWKxHPj+0UlCH06MdbnqoPy YDzTLpsoXjQtNGjNxfz1Z8yhH6RHufN1r2VKbB0PY638ywm8+KCVPYwum8RWc5W+8BD31U Ipt3Ong2xqXc8Q68ds2p+L/wJ23Ncb+DVQokcxMk2fp2IvwFBX2urPsJ4oEFNtcP2ot+yu 4jV6CT6S2f1YJl7ytyDWllmsfU4jO3ggUKGxFk6l9Ms5AYBq0sTLxCD+vAAjaJtpT3hKuA qLYCmFxGe3wyLd08FSvNlUbg0jjX83gF9jQUxue2UKhV590A/8PdyBmuAXp/8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748306545; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oDBehHrgLKC/p9NLxxYChecYkhxbErk2/NzES56MejM=; b=MCl4/FqJWvsikrX1i47/C3SS3JMkbgyU/fgOjxdjf0EKSqVNf9ObDQNdXEU68qyX/C8kFl LPXt5wogfrG8xbdEJzgX+E3gN41LZuTgJZ2li9UHWSCY3+7WrP2bahfpI3SKuGM1tuGsdD lFq9f66d23iZQz3f2N6Rg35laiWm5KGK5oAHyUCc/3Y8JJxdvu+u+Q3Jc27fC3u5ry7w9Z mRvCINX8evTTsFSqztOrIWrtxI4Op+op9LeDNDXP0bFFpauZokLmko4Iz/lBZHCHeo7Ka0 Txbhumt59fhaNeNRFxNr+Zw4Gz3rN5BGKpA8Ygns9FY49f/KVNbxRHByah3tAw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748306545; a=rsa-sha256; cv=none; b=vDMeKfZX/CFTGB1ZXxlB7i+JRUtGXKwcg5NFnsdYLvXdLlhLAQ9Z3RLMJRb7yLnC7d+Viq E5CZ0GfdkKRlV4gfHlKtAOeqabdsGRA/s3YM+yxdhPJxaLDpj42c5vR8APH80dB6HORX0q j0G3EhIbr9pH0rT+9IUGv8ZrC3DjrGmiQ54aaJBgjUjXUyF6E5wdss98MH/AFGhtUVcBqk 2S0Bdy0M8OMeUMtHbG6YPyY6FnvGCNTHNYIyixdaNxaS4qaYhrMZOAsit2MD1MD4x0SYsO tlC+gJyJMqwTMgqIgZ47TztgaN84u48AIrPc6JdjYDq9duWJAK/DUKrv/Hxhbg== 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 4b5v3j2xY5zVQk; Tue, 27 May 2025 00:42: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 54R0gP3a073622; Tue, 27 May 2025 00:42:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54R0gPfr073619; Tue, 27 May 2025 00:42:25 GMT (envelope-from git) Date: Tue, 27 May 2025 00:42:25 GMT Message-Id: <202505270042.54R0gPfr073619@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: e36f069ecb47 - main - fsck_ffs: change struct bufarea member b_index type to uint64_t List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: e36f069ecb478b9775b7ad717768d011251d479e Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=e36f069ecb478b9775b7ad717768d011251d479e commit e36f069ecb478b9775b7ad717768d011251d479e Author: Konstantin Belousov AuthorDate: 2025-05-25 18:11:58 +0000 Commit: Konstantin Belousov CommitDate: 2025-05-27 00:42:03 +0000 fsck_ffs: change struct bufarea member b_index type to uint64_t It needs to correctly participate in the inode numbers arithmetic. It is possible to have inode number that is negative if truncated to 32 bit, which causes OOB accesses in ginode() calculating inode location in the inode block: ip->i_dp = (union dinode *) &ip->i_bp->b_un.b_dinode2[inumber - ip->i_bp->b_index]; Tested by: pho Reviewed by: mckusick Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D50520 --- sbin/fsck_ffs/fsck.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/fsck_ffs/fsck.h b/sbin/fsck_ffs/fsck.h index 32d1d93e05c8..aaf02850f29a 100644 --- a/sbin/fsck_ffs/fsck.h +++ b/sbin/fsck_ffs/fsck.h @@ -153,7 +153,7 @@ struct bufarea { int b_flags; /* B_ flags below */ int b_type; /* BT_ type below */ int b_refcnt; /* ref count of users */ - int b_index; /* for BT_LEVEL, ptr index */ + uint64_t b_index; /* for BT_LEVEL, ptr index */ /* for BT_INODES, first inum */ union { char *b_buf; /* buffer space */ From nobody Tue May 27 02:22:32 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b5xHD715bz5xBX0; Tue, 27 May 2025 02:22:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b5xHD3DjNz3s6c; Tue, 27 May 2025 02:22:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748312552; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wJ5SNnjEHBq/SGEKvDQNv4tAgSCacz1ZVT0G4LzzSdc=; b=o/tI3XiY4qZrI/y4PbrchEDEY5ZEKDVvluM6wr21zpTGc4IBQxekNM8y4S8M/NIYhZ9TYZ TFOHjQdw5kOCW9+PFvUfEueuG43M2/qT5CA8vLVnC8jm2/q4n0AyUs3MeXzC/wXxVYSlAC qhiiPXdFNyJVmHxP5Bnk0sWZW4jVG/oR3jIVpKyq8KfmE6Hwk3fBgXpyXcQCPWS5a8E3XL MtdjgGRueq74NHOnPkqcPrcCLcE6nsZCGF00eKI2hkjdEHMQ2+9llqO97msAlfUfvKFYnI sAMpGUsvgrnP0T5AtOPsnqXhOaUXRuxF5q/loT2nRWk34is/CuwyOjAWaKzydA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748312552; a=rsa-sha256; cv=none; b=ODly6f28jAHRzMUCBsvhD+OBQbqhBjYhFDGav66z/RYJda8Sx0W08b4QOhNIKMWzm1yT+X 6yONrOqAKEoFgoQgWgUb9iLeCm+pPL8CURE3Yauy2csy/HRphijvq21ExAqEMFd7ohhlk8 Nu0R5WSvJD+PyJkZlT6AFl69BeMzjunuCCDXHPtVkzNPp/61wFWBtqpqNLF8k1TIPOT16M WNUTGdRdxytOj73mGZQ+iiKEeUoKiq29fwY7ELgyj3+13pzZRnWB3GU0iYRMIdkw1rrqcY 604gTw7tUsPDurO6Q9epWHFtHFgHpZTRpCURtTPcj6zltgsHVJwYQ1e2oDQoFQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748312552; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wJ5SNnjEHBq/SGEKvDQNv4tAgSCacz1ZVT0G4LzzSdc=; b=lywKhVlSirT3mwNte9BHsdWFMmgG9kiXdUDVDlj0uBj8u6ZDqDfP9jrvB1459dApK6MHbQ XEjOMJwATsxrg7EWOXDYymdsE+jDqGBxs/ZVHlhXizL7d8sbdihS8P1q3G/8bFRjXFLbNY zUCJs5A6UCGfH+jrZluM2QxKY2RXA71otgIZq8/U6O0+JXY1n1e28ZghZyiSoU3LOmS6L9 9xphizH+uSSb0FzGMMfxYjpT+h/XPAKElWUscGZjF64X9iHClk2kYyNso66DyngFlq0Uvx 10SgJcCe47NO2HyGa0XMMHXJWC0AHdQpltLLZsgpQK/bpPu9Jjm29RprwBSW6g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b5xHD2pBTzZcc; Tue, 27 May 2025 02:22: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 54R2MW06059983; Tue, 27 May 2025 02:22:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54R2MWHc059980; Tue, 27 May 2025 02:22:32 GMT (envelope-from git) Date: Tue, 27 May 2025 02:22:32 GMT Message-Id: <202505270222.54R2MWHc059980@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Wing Subject: git: dec24dbb29e4 - main - diskinfo: print attachment field for virtio_blk devices List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dec24dbb29e4cfb28df8323c2368d1c8504239a9 Auto-Submitted: auto-generated The branch main has been updated by rew: URL: https://cgit.FreeBSD.org/src/commit/?id=dec24dbb29e4cfb28df8323c2368d1c8504239a9 commit dec24dbb29e4cfb28df8323c2368d1c8504239a9 Author: Robert Wing AuthorDate: 2025-05-27 02:18:32 +0000 Commit: Robert Wing CommitDate: 2025-05-27 02:18:32 +0000 diskinfo: print attachment field for virtio_blk devices PR: 286280 Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D50489 --- sys/dev/virtio/block/virtio_blk.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/dev/virtio/block/virtio_blk.c b/sys/dev/virtio/block/virtio_blk.c index d3eb3cf97831..76068c91df11 100644 --- a/sys/dev/virtio/block/virtio_blk.c +++ b/sys/dev/virtio/block/virtio_blk.c @@ -755,6 +755,8 @@ vtblk_alloc_disk(struct vtblk_softc *sc, struct virtio_blk_config *blkcfg) dp->d_hba_device = virtio_get_device(dev); dp->d_hba_subvendor = virtio_get_subvendor(dev); dp->d_hba_subdevice = virtio_get_subdevice(dev); + strlcpy(dp->d_attachment, device_get_nameunit(dev), + sizeof(dp->d_attachment)); if (virtio_with_feature(dev, VIRTIO_BLK_F_RO)) dp->d_flags |= DISKFLAG_WRITE_PROTECT; From nobody Tue May 27 07:10:44 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b63gn1V2Yz5x2gC; Tue, 27 May 2025 07:10: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b63gm6nQBz3Yfv; Tue, 27 May 2025 07:10:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748329845; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6+4VuPaAlTE0/unSI7iP15ooPfqXrJXl8AGHHWcGonE=; b=lcMYPHa24NqGY/JCu2HRnlv6ywvDGp8s+TGMq4vX5X3kTVC5HCn6a1zwhS123kKyaol21Q 80ojxYs8QmlXTUdaOzTe4cWXYdJA1ir/rQEKmGZgB8tzDqwpQNJ+ENkkOT5nzey647lJYs Nl7l76R4di2S49643hOPCfP1mk3tkPRDq69UdhEOYTtMGDuS2+tWZdb5dKOcw8slkoNFVj qe5ELacAxb+GABELRz3mlLpp3jOnaGFI2/VQ2bdafCyCy14+38UUBrQSsArqWLTOB24iA6 r5/MKWX44mGfUzE62zviMiIOo95k+mIjHLmbWD1g4H2rNydcERjeMFKxj+qEiQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748329845; a=rsa-sha256; cv=none; b=CvmtrA8LbWRWXTv5E37YL50S7N+LQe1tTXNCDVGGoXyi+h5xwpG1WmL+qOKvmv+EfIgdKg T4ntuiJaJmKsMMQLgNU2zGQsAAsJ5JpLYIY7jO1YoMGzO6Juhdl7T9tYnhw+T9J+dZkPRb dkBoI1X1Zxff8JEuicNS3Ly1W8Kbdg2Qhlmqu0qOsRij2/o4Q75+yOQBHzSQbMr5HgGwKu zHP+wGDxhelkEx0kgLws5Mv5aBJl21/wex9IzYF7XLpeGsYQKy3PKORi3oiP5bKysBlIrj RZXKtqBo1c0bm9O4DtwKlg9JoXYaX2bC3kAWuNUGa9N7JxpqtHZiVLixtz0gzg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748329845; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6+4VuPaAlTE0/unSI7iP15ooPfqXrJXl8AGHHWcGonE=; b=KtMZ6yraZ/LX+znURCNCqIIJUr/rDyF28ynCDSr/TupdhoYLnrVyk94oST0gS3Rskf9tIN HBI7zQn71AvSOkVmxc43AL2icuq5uS4idA8+fm1s7c9hn52XE56pUy2T9KjPNYRWgwULL1 zLQfGkVlJ+kAjjFrUP6upJVKYS5LhE8j3wx+zJwsN9RORLYTYhdm19r5CTnvUzQsJ1ymkg 5yL8vQ/jclOAxJWt9xr5rCS96FBMQS99HgSegucfQe/YyogZAgU6mE5yPUUnOTBgH4ftZo 7Hf44SjZrc7wC65jIn+UhpQuu6ZX8jXshL1sNpo8WablvaQMJBVwd2PBW28ZBg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b63gm6NC6zjS7; Tue, 27 May 2025 07:10:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54R7AiBh096631; Tue, 27 May 2025 07:10:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54R7AimT096628; Tue, 27 May 2025 07:10:44 GMT (envelope-from git) Date: Tue, 27 May 2025 07:10:44 GMT Message-Id: <202505270710.54R7AimT096628@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: 33624770a87d - stable/14 - net/if_bridgevar.h: add include guard List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 33624770a87df04ce4834b03601dd2bdbce8e5ed Auto-Submitted: auto-generated The branch stable/14 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=33624770a87df04ce4834b03601dd2bdbce8e5ed commit 33624770a87df04ce4834b03601dd2bdbce8e5ed Author: Lexi Winter AuthorDate: 2025-04-04 10:59:09 +0000 Commit: Lexi Winter CommitDate: 2025-05-27 07:09:28 +0000 net/if_bridgevar.h: add include guard Reviewed by: kp Approved by: des (mentor) (cherry picked from commit f6aedb956ef154828c4bfaddaa5d5eb2dda5225c) --- sys/net/if_bridgevar.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sys/net/if_bridgevar.h b/sys/net/if_bridgevar.h index 4eed6ec07ade..511ca753858d 100644 --- a/sys/net/if_bridgevar.h +++ b/sys/net/if_bridgevar.h @@ -74,6 +74,9 @@ * Data structure and control definitions for bridge interfaces. */ +#ifndef _NET_IF_BRIDGEVAR_H_ +#define _NET_IF_BRIDGEVAR_H_ + #include #include #include @@ -323,3 +326,5 @@ extern void (*bridge_dn_p)(struct mbuf *, struct ifnet *); extern bool (*bridge_member_ifaddrs_p)(void); #endif /* _KERNEL */ + +#endif /* _NET_IF_BRIDGEVAR_H_ */ From nobody Tue May 27 07:12:43 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b63k41T1pz5x2Qw; Tue, 27 May 2025 07:12: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b63k35LVFz3bQn; Tue, 27 May 2025 07:12:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748329963; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=j0eTMvBRf+CWzDfZOQf0kTWZ4CXO262LeMsvAsVxIGk=; b=DTN16op/OloVzX0BmI8AQ/2BlbY+920DE9nteaeB6BuRDIHhwUuB+ahy07Fa79R1ZoJ75o bPnQHxzcTggQvh4OEd7o0jETwDRNAzgpTBurmV1fTE6uUK47Kf16Zp5mO2jr/RjHgbkRwK CJeoH/R3Dq4SaW027bwE9YG2k1+MtAVjP386h+nkQQoCsNTySHisEZ/goxFbeFesGTt6hP 09yW/T3XpHBMXhu8uQunowxvHnfSWosXsfku7hHM7S9B0RBKM8c8aXOkFvxwo0VopBDjFd hYkuSMy/Xt+KcpRmri/ARYH4hfWs/0C6pQCgnroEBemEkdNpxMVqUKw79Q05Hg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748329963; a=rsa-sha256; cv=none; b=XVLyj7bUDpTEZsWG0KhIC5I/S4x2pATUGAsKTsSmX8+62c6lIB+Mkusn6OBjvtA/C2bsMT 10gjGdP2I+YEM42cCfKlmW5DpDdtDiPry8hwKkFpQfooiv+vYDMy4UB4yzT5t7pNE0qP5v q1N6dMcgqCX+a8nhnpbT4bO/vqqI/x/kO9LiH91PYDTWoWg2c0mXPx2Bmwm3HMn94fcHCR cvvnoXGxo/eqiNE5wPTn1Vu+h4AjO+J6Yr8a2PsQQy6YZd65ihE+hTFY3nlATcwFu6Ge/h WxNraw2s6OJ2sFPKHkn8z1HPgDet5uDklV1mF2HnaIlteIRVmSRhSVnB9RtSvg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748329963; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=j0eTMvBRf+CWzDfZOQf0kTWZ4CXO262LeMsvAsVxIGk=; b=UQsNZ2UHTv3tXp4ffdV6IA4lo7oFSy4HWFCPpOxYBxT1Plv5vDu8sq/w+HzTZI/2uRg1UV O1JOK8oWA+hIWp/lVAz9wKHHeCXTZ9kfxSAl5JH2F7Tj24SjgmBPoE/0Yu5+CuIXWm+2KJ poTetCsMFZICFLoAVps0Gwa0ShzATwpKcH53QKQ5hidhj7lviElvdi3wKiWfIh1Rjuxr51 zTwxg66lGMU/qI59lWkMPk0E7GBYpkReD0uE6VST/ZAERoKWacWDy3ZoEq9aTuUto1UY7t eeyg1PgbfLIWX4DnmGuvaR2ZHBem624liyezgQCxbifHjVw+sHUxjFEqXoZ7NQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b63k34jvlzjSS; Tue, 27 May 2025 07:12: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 54R7Chdv004708; Tue, 27 May 2025 07:12:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54R7ChJA004705; Tue, 27 May 2025 07:12:43 GMT (envelope-from git) Date: Tue, 27 May 2025 07:12:43 GMT Message-Id: <202505270712.54R7ChJA004705@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: 2e4014e81f6c - stable/13 - net/if_bridgevar.h: add include guard List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 2e4014e81f6c755b5977662917c2defbb697ff53 Auto-Submitted: auto-generated The branch stable/13 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=2e4014e81f6c755b5977662917c2defbb697ff53 commit 2e4014e81f6c755b5977662917c2defbb697ff53 Author: Lexi Winter AuthorDate: 2025-04-04 10:59:09 +0000 Commit: Lexi Winter CommitDate: 2025-05-27 07:11:56 +0000 net/if_bridgevar.h: add include guard Reviewed by: kp Approved by: des (mentor) (cherry picked from commit f6aedb956ef154828c4bfaddaa5d5eb2dda5225c) --- sys/net/if_bridgevar.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sys/net/if_bridgevar.h b/sys/net/if_bridgevar.h index 8f1de6793340..48cba1c5721b 100644 --- a/sys/net/if_bridgevar.h +++ b/sys/net/if_bridgevar.h @@ -74,6 +74,9 @@ * Data structure and control definitions for bridge interfaces. */ +#ifndef _NET_IF_BRIDGEVAR_H_ +#define _NET_IF_BRIDGEVAR_H_ + #include #include #include @@ -316,3 +319,5 @@ struct ifbpstpconf { extern void (*bridge_dn_p)(struct mbuf *, struct ifnet *); #endif /* _KERNEL */ + +#endif /* _NET_IF_BRIDGEVAR_H_ */ From nobody Tue May 27 09:21:44 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b66Zx0Pwrz5xB3Y; Tue, 27 May 2025 09:21: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b66Zw4lghz3Swx; Tue, 27 May 2025 09:21:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748337704; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3DU+ObKp3ErAEo1LVlLZgWGeRmcav7FRNiNMwJvc2Yw=; b=G8ut5WFG2A31FKHwhC/jOUgiMQQu03TMZta3EAqZM6KUv4Ls2fukKzRYf3e95D1hye07VJ uayNyppHjWfb4GoSWyWkVZW03PilU7fxeWn+Ll3PaPbxgbxGU6fjWdj2MZiypzwFtSlvpN Pi2f2JOYZXUFrzlFmH72POhVA4JJtECqOmQkYGIznUBtn+GRcp7AbvL1KsHOL//5bJl3k6 LNHmsjW3A1dFPdalOWZJ70NEwDtp46Qt/ww35H3FxMZkRf5LD3T9u1rXIFozP708qAXWWp SBPV06EVZm1Vrt7L3QHKJxaG5OC29i8Roy9VrON4ALZbwzhXJ6yDsG1FDY+yhg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748337704; a=rsa-sha256; cv=none; b=XlaIUI4UcICt5zBceMpW+5/Iur/bi8fuT4KjVklL1igHATKOxvQsvJLQsSZ9esbavDfFhl d7V+ZRJDUJyIewaGXzt9EXNV4M20yU27Tt74tTcp5/epUasv7Q1vYXhRFPGDekEZYSW8mc fBk00OHQqrO5i8wYPY17zqlQm8RirqGJzlGkumHaAVcpY1j1WsxZ4f3roC2MyShCVFtE0S q1w0zJFdSkCmKfnUKRQOYJdWBcRXLrhZajGLHul5+T7RL+UCW+MpFZ/Mf5I/MSmMtYS1HZ Is9WFIleY745Oz5NqFv/Q2Ve7Ew0YxZNq/8U/ss0mnKCr0nwheFMqt4UnujhDA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748337704; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3DU+ObKp3ErAEo1LVlLZgWGeRmcav7FRNiNMwJvc2Yw=; b=XwsLDdZRXPip/G4Bde/P1L70m+OM8qzrGQyQ2YZZfTgXSZqq41TjMVNzK+9Z17xRfTAKdI i+YoQeJIh+mGYIu6yubRnxz+NUTV6udtEjVrGbpU9x6s2NPdc7Q4stcbvbetap78q4ljrV q9QNczjH89k6weMUw2NmhBKp7BD7qCKT+JzgRpgw8FFsbBGShnoUzN8Cj3SceqRbiPHBBF qGrLE7+V/aAKEo3EeHEvNhO6XHf1k2Yp3jLBjMwNZ0W5asN0pSL3IsVjh4QgOrjxd3JRAs sLb6Azo9pseYEwWnprLuhj5kbIFgK7NKmUDwJAHfNsll8xVyEtfv/LIIKJ5GSw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b66Zw491bzmyv; Tue, 27 May 2025 09:21: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 54R9LiVN041717; Tue, 27 May 2025 09:21:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54R9LibL041714; Tue, 27 May 2025 09:21:44 GMT (envelope-from git) Date: Tue, 27 May 2025 09:21:44 GMT Message-Id: <202505270921.54R9LibL041714@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: b5c9889e369a - main - MAC/do: Fix a too stringent debug assertion for a target of 'uid=*' List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: b5c9889e369a801ce7c1115f2535ddacbd69800d Auto-Submitted: auto-generated The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=b5c9889e369a801ce7c1115f2535ddacbd69800d commit b5c9889e369a801ce7c1115f2535ddacbd69800d Author: Olivier Certner AuthorDate: 2025-05-27 08:20:06 +0000 Commit: Olivier Certner CommitDate: 2025-05-27 09:20:07 +0000 MAC/do: Fix a too stringent debug assertion for a target of 'uid=*' MDF_HAS_PRIMARY_CLAUSE only concerns groups, not users, and is thus not set in the latter case. This change only has an effect on INVARIANTS builds. PR: 287057 MFC after: 10 minutes Sponsored by: The FreeBSD Foundation --- sys/security/mac_do/mac_do.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/security/mac_do/mac_do.c b/sys/security/mac_do/mac_do.c index a83c194b24ae..9aeafa62b56d 100644 --- a/sys/security/mac_do/mac_do.c +++ b/sys/security/mac_do/mac_do.c @@ -258,7 +258,8 @@ check_type_and_type_flags(const id_type_t type, const flags_t flags) "groups specification are exclusive"; goto unexpected_flags; } - if (((flags & MDF_PRIMARY) != 0 || (flags & MDF_ANY) != 0) && + if (type == IT_GID && + ((flags & MDF_PRIMARY) != 0 || (flags & MDF_ANY) != 0) && (flags & MDF_HAS_PRIMARY_CLAUSE) == 0) { str = "Presence of folded primary clause not reflected " "by presence of MDF_HAS_PRIMARY_CLAUSE"; From nobody Tue May 27 09:21:43 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b66Zv5xZKz5x9qb; Tue, 27 May 2025 09:21: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b66Zv3zxmz3Snn; Tue, 27 May 2025 09:21:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748337703; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eVqi5ASKwFZLmDyw871BtQctDF4oop/UTlD/mjBxVaA=; b=tadVL/CZdTZmofO9hy1r4qiVrIy5IhLeK1hUW2imsuBLHBpeKNaQMrUVo+vJW8+g06dNrB 99pA82gs+a/py+M2Hxq3xMVtD+0MKDhVNxuOwzgAXNRmktort5H6HXZJL2C0IR+J4T2a+8 tT7FYnJQ6cD+Fs3WLTr7SpJqL5nwAbrm0cdltBAk4irc2nwxvB3xPs2IDPz+1/5Lbh9aKg hLkM6jZScpzQzcA+FxLb9/rQYYVq9hDCdLAeMc4YlFkvysXbeKXWRq8YUMNS0We/Z6H1hL G7QJZmgSwWz8iqCgOMai0iVWycxRl2iS2VfkmRxMOTIawG63hFx7xJZ+Bk6T6A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748337703; a=rsa-sha256; cv=none; b=ErC7+4dghTaUUcAaLl9jM5S6QQpHBqIf5hAqFbhb8/VftFTeezLyxtDe8mKvKzha8A/CoO YPpdFUHTwgkkuNz4IbXA9YH9D1PP2uv8HZNCWGIgSIdmGf0VTYJQwYAyIJxXLPIJKO/6m3 JQmplEKSAXptB5FyBz2vn68tpTSEpMdpiyihbBQ/C0vkHObMFdd5iqxG1/krOanUnQLthI zBTz2RLMwVz0rFmz/OiJMaSi1beAlYemJg3m0HJnRoi8PaN/pcs1owRlDfEtOAM+qj/3Yl KC/0WLATsuj/rMFqY7l5WA7P26Ri7lM+LMpV3H+NH5Y2ijfwqOxipRzUxSsZPw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748337703; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eVqi5ASKwFZLmDyw871BtQctDF4oop/UTlD/mjBxVaA=; b=yhLTN24jtbdIWbG5xGgchsO4y67kvapxpqoUac6zoV6zGri7SpgF8dwSPMAuKXMIFkE3DI DgJ/v0EwTZq7b+nZJmI06B6hmTMFqGLbfH4AiyGIe/KKA2NbtuxTzfnV9QB2tuN1AppNkN 4KwVMxwZPhNYKqAtimPqyOIkys6oJCbueOIZO4oNVSI/uefnrAQLF6p+EN2eEuYOhFP12k ZdPIOOwaz9QW99VfHnRwixr79yK63vv3DJ8+6QYYtpfspOvht6Wc67PKApOTAyHA7IFp/w Obdh3ZG5L5DS9c9+PbafcbKxxoRloP2ohUPpMteRTuv+U59WKCyYgCRqvlYZdQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b66Zv3KP8zmtK; Tue, 27 May 2025 09:21: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 54R9Lhkh041681; Tue, 27 May 2025 09:21:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54R9Lhi5041678; Tue, 27 May 2025 09:21:43 GMT (envelope-from git) Date: Tue, 27 May 2025 09:21:43 GMT Message-Id: <202505270921.54R9Lhi5041678@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: e89d737041d1 - main - config.5: Document CONF_CFLAGS under 'makeoptions' List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: e89d737041d15d8b3763c2829ee97dc8fcc69cbc Auto-Submitted: auto-generated The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=e89d737041d15d8b3763c2829ee97dc8fcc69cbc commit e89d737041d15d8b3763c2829ee97dc8fcc69cbc Author: Olivier Certner AuthorDate: 2025-05-27 07:41:19 +0000 Commit: Olivier Certner CommitDate: 2025-05-27 07:59:05 +0000 config.5: Document CONF_CFLAGS under 'makeoptions' This variable serves to tweak CFLAGS from the kernel configuration file, easing some custom kernel builds. It was introduced by bde@ in 1999. --- usr.sbin/config/config.5 | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/usr.sbin/config/config.5 b/usr.sbin/config/config.5 index 93d65819d1d8..246e20c081ae 100644 --- a/usr.sbin/config/config.5 +++ b/usr.sbin/config/config.5 @@ -316,11 +316,27 @@ variable is specified, .Ar value is assumed to be the empty string. .Pp +Note that, as the common makefiles override the +.Va CFLAGS +variable after having processed the configuration file, +customizing +.Va CFLAGS +directly via +.Ic makeoptions +is not possible. +However, custom compiler flags can be specified using the +.Va CONF_CFLAGS +variable. +They are appended after most of the flags automatically going into +.Va CFLAGS , +allowing to override those that are not essential to the build process. +.Pp Example: .Bd -literal -offset indent -compact makeoptions MYMAKEOPTION="foo" makeoptions MYMAKEOPTION+="bar" makeoptions MYNULLMAKEOPTION +makeoptions CONF_CFLAGS+="-DSOME_CONTROLLING_MACRO" .Ed .\" -------- MAXUSERS -------- .Pp From nobody Tue May 27 09:23:51 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b66dN60dfz5xB6q; Tue, 27 May 2025 09:23: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b66dN0bXWz3VkQ; Tue, 27 May 2025 09:23:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748337832; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3TrbSXDxT5hlReePen8uvosgPne52XLZqLlmTUx7hWU=; b=xUQ4zFvlLKukD7xlL7Yhr+/Cn6LqG9+NzYaE1R9WHh8HE/oRPgWvYCXFVcwreWPPyU+dtE 9LK9XcZdt9wsELx5ebaZcxKVUrJEAZ+BHeR0hD0axel61ji8QibmAi0yc4N1B/VlFKAZqj HFKg/s0FtmuWi5A3SznRDkBrjzvk9gy1bYjilNRNlh9FcUYRT0UhitzC6Qe5jQfOFgDjzT 1j9mxtNOoRyGvbkKEcALWLznjyqmy3H+No9ziXlwxO09aEGGuZIbJ78YV3yMYDlWlDzRm9 Tq0Nxh98UglSg8F6c8N15WfG/cRF7Wdrqd+HUp9/IAV90ELg/GA0bphe+awm5Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748337832; a=rsa-sha256; cv=none; b=CS636RGvYX541jYYbH8f0Mvr2vRu4DYBZimiuguoQz060nCoDaklBvaJFu4S24kg5/7IdA rizgFfKbIIWWdw1hv4SOSjuns5T2HDE9CQx93zmh5cOt4YEF86fkqbF+UsCSPXs++OjNSc ai+ZDVHjscs8ZpnGbaU/XYwvFsnEB66tZzEQgZdGSMLTSZ+hlj1hNKa3M9JUmXLGjpxwwk 7iVa/xt5K0OCA2p1qTAtJBRP9/hSLcZD1KbT2+ZnSqzu9xXu6BhJA6FCLlGTlGeHybBpJn VRyoJQJSB0wL17UwynIUfqB+X0D0ASYUTxr+bCf5EdO9hKpb8e4ABSDHVSUYng== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748337832; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3TrbSXDxT5hlReePen8uvosgPne52XLZqLlmTUx7hWU=; b=KYe0UbfvqssrYhuhCvP2vXUBvRJ9kn1mz2t+JtPT+vUeGOaZCgz/88gwvsBTPSZrg40+2E HYWmoq4qGDiyrcAGiA0BeVNbP//rEigKZD0EoJNc5gY3Dur8yimMbAcxKnDq62QTOtz507 0j1+89lFtGT0Q2+eMQFqzrLFm7n90SqhxGp+WE9jJnpCKesLZuJQXHBQJXrUXR/VDupVb5 9ZN6fCHzzafp0+PcM/KWe4569qsnoGdCZxbbnIa5QHyYCTcZ2PpWy5LcLq8wStMRmipKNh spvnzKE5lUSAtKLRdywp3bnzWE+XnhVU2QSPF/gGpzXksjH5/Sz/XDAjMvJ6gw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b66dM722NznBY; Tue, 27 May 2025 09:23: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 54R9NpgG048213; Tue, 27 May 2025 09:23:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54R9NpNa048210; Tue, 27 May 2025 09:23:51 GMT (envelope-from git) Date: Tue, 27 May 2025 09:23:51 GMT Message-Id: <202505270923.54R9NpNa048210@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: 30f092c40ad4 - stable/14 - MAC/do: Fix a too stringent debug assertion for a target of 'uid=*' List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 30f092c40ad4eb592861839f4ffa9e9891abf1d3 Auto-Submitted: auto-generated The branch stable/14 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=30f092c40ad4eb592861839f4ffa9e9891abf1d3 commit 30f092c40ad4eb592861839f4ffa9e9891abf1d3 Author: Olivier Certner AuthorDate: 2025-05-27 08:20:06 +0000 Commit: Olivier Certner CommitDate: 2025-05-27 09:23:11 +0000 MAC/do: Fix a too stringent debug assertion for a target of 'uid=*' MDF_HAS_PRIMARY_CLAUSE only concerns groups, not users, and is thus not set in the latter case. This change only has an effect on INVARIANTS builds. PR: 287057 MFC after: 10 minutes Sponsored by: The FreeBSD Foundation (cherry picked from commit b5c9889e369a801ce7c1115f2535ddacbd69800d) --- sys/security/mac_do/mac_do.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/security/mac_do/mac_do.c b/sys/security/mac_do/mac_do.c index a83c194b24ae..9aeafa62b56d 100644 --- a/sys/security/mac_do/mac_do.c +++ b/sys/security/mac_do/mac_do.c @@ -258,7 +258,8 @@ check_type_and_type_flags(const id_type_t type, const flags_t flags) "groups specification are exclusive"; goto unexpected_flags; } - if (((flags & MDF_PRIMARY) != 0 || (flags & MDF_ANY) != 0) && + if (type == IT_GID && + ((flags & MDF_PRIMARY) != 0 || (flags & MDF_ANY) != 0) && (flags & MDF_HAS_PRIMARY_CLAUSE) == 0) { str = "Presence of folded primary clause not reflected " "by presence of MDF_HAS_PRIMARY_CLAUSE"; From nobody Tue May 27 09:32:45 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b66qf0CqBz5xBjg; Tue, 27 May 2025 09:32: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b66qd5vFtz3cj9; Tue, 27 May 2025 09: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=1748338365; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AR4AbnlVHI/YlMX5+u4NlqxS0Tphutf8duOQggrOj2Y=; b=jS1DDpDO6ZNfCIfn8USrj8tGRWyFdWN7ZRfCK9GE8OcXxzwFbvrmS96PnCyj8g47qp5LRR mPvHO/Rwg2kUMobPgNyOe46M/KxfwAZbvLBfSqEHDXChCtwylXDq2G2qXB9RGOJbOZ/dOZ z5iGJyciMqtxIgZKAweAd7vIwoL8FzjLDfx8/tXnHoZgJqOjYRP21BTbSr1S/eADSeJ5ma hN+9UpkEkZNjqNpa4mZBx6QaiSHviotTpNSjp5eqZdwgJOwhVXH146xQj8kXEaY9UxQ1xh NumLiS2p061/0FrKPKIoKsNW3Oj9mpCG86KXxAnBwiA/INgrQQZYCUKUczbfYg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748338365; a=rsa-sha256; cv=none; b=VZDOuLM+NtxjszYAIY9o74lNT7+xqRUB924rP7LkZlWeXLCz106V+najgk3aOedcsqaVVc bvdR8RRxwx5bEdJkTtcVgeoPfRg8t+KwR+E0f6VHdn6p/UNrkjGG3ikMLgnX+P4+b7mlwF PAbopKqiZsqahQx5YIcF2voEYFDb3XyhHTmu3uJDtJ1aCMpHiBVpG3nb7gjwzDlXMdnb2g NawYEhA+mA2AOi/RXZ8fLD1xP1COgZbPKIabjK7Dg/GfE3wFypnvJV0Zo4MGvBtHpq8DkU FzKwyaWwptXWQK8SgarSpTU2Ju9rA+eYizNsqveBIqRKjUccQi0HO40VWWNFWQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748338365; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AR4AbnlVHI/YlMX5+u4NlqxS0Tphutf8duOQggrOj2Y=; b=ogNMUWESfPy8mAEL2d5gC5DfVAXoCR4Ov6qppynNuAIj66Ky2W+Pg5I6iqubKsJXo10xJf C+KDMja7WGE14tZ2AO6wERQIKiLERy++9e+HxvpnY/VjE23SBeNJjjVPsLEdqhfizrW3zM k1V165tP4vUiBRSPSlFRRWQQ4zGBuH59oA2CKmWnXnGVXdCYBXkZVIHXiWqXh2RaEqACGw N46KJMIqFLGV+QHp4ro+OZcIgMbVyzOeA9oYcUjGoT9ihkLfXv7d+f1FV7GKQHrnMJVBDb jFSkwtdugKb9vXBNFgHWVM1nrct5+JfvzP93MfnkM99FtwApIumw8ySOOgh2Bw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b66qd5L0VznSx; Tue, 27 May 2025 09:32: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 54R9Wj8B066236; Tue, 27 May 2025 09:32:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54R9WjCg066233; Tue, 27 May 2025 09:32:45 GMT (envelope-from git) Date: Tue, 27 May 2025 09:32:45 GMT Message-Id: <202505270932.54R9WjCg066233@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: d67f1132f018 - main - Revert commit e89d737041d1 (config.5: Document CONF_CFLAGS under 'makeoptions'). List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: d67f1132f0181af3ca6502c562e7fb00ad4deecd Auto-Submitted: auto-generated The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=d67f1132f0181af3ca6502c562e7fb00ad4deecd commit d67f1132f0181af3ca6502c562e7fb00ad4deecd Author: Olivier Certner AuthorDate: 2025-05-27 09:31:15 +0000 Commit: Olivier Certner CommitDate: 2025-05-27 09:31:15 +0000 Revert commit e89d737041d1 (config.5: Document CONF_CFLAGS under 'makeoptions'). Was committed inadvertently before review, and does not have the proper tags. --- usr.sbin/config/config.5 | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/usr.sbin/config/config.5 b/usr.sbin/config/config.5 index 246e20c081ae..93d65819d1d8 100644 --- a/usr.sbin/config/config.5 +++ b/usr.sbin/config/config.5 @@ -316,27 +316,11 @@ variable is specified, .Ar value is assumed to be the empty string. .Pp -Note that, as the common makefiles override the -.Va CFLAGS -variable after having processed the configuration file, -customizing -.Va CFLAGS -directly via -.Ic makeoptions -is not possible. -However, custom compiler flags can be specified using the -.Va CONF_CFLAGS -variable. -They are appended after most of the flags automatically going into -.Va CFLAGS , -allowing to override those that are not essential to the build process. -.Pp Example: .Bd -literal -offset indent -compact makeoptions MYMAKEOPTION="foo" makeoptions MYMAKEOPTION+="bar" makeoptions MYNULLMAKEOPTION -makeoptions CONF_CFLAGS+="-DSOME_CONTROLLING_MACRO" .Ed .\" -------- MAXUSERS -------- .Pp From nobody Tue May 27 12:02:26 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b6B8L6Fqzz5xMBb; Tue, 27 May 2025 12:02: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b6B8L5KSbz3HQy; Tue, 27 May 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=1748347346; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=21y6AQFaqi/eAoOCD+T59sG4g/D7nQRkmBqPORu/CQY=; b=WiOfqFh1vEgdVxnNw6F4FT00pY1mrtIoio1JTW/UA18BMhPwG1GQ65hS0U9jO6d5GWVkZR 7AmvuCsfbDh+3QoysQtVdoZ9hELptKNcBk5ViZLKTOhxx6qEYA9T+qf5fPm1R5DxHF4QmX eCEhvSUQSYovPUamIiyxguIp1chvWgNaxz8jA/EACg+DAat0ujPkVVxodg/PWu5GRAUqiv saWjIyCkZVjvGZ3TVaqDhRIHV3eknClWYfURgFkz/eHbQdvVvTU5v/4O/IWNXOuwv58bXF bQXgEtpEzI582k4FMHJihQ+m/BXn8cYVysPvtYr0eWxXdmtohNBh/2cVkSZixw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748347346; a=rsa-sha256; cv=none; b=Yy2PeRP1fP6vk4xmabq6ThigXYNqR9+BSpsqyK/Gn/6uBC/R/0fr6Y427dLPPMF8CrbcQF BtfmE8CSjNbSPeKSOmM92cm4W324O0mve/ZFTMgwWiAdriML0KFCkHXfuoDIi3y6Llzq0z bjWb+X3M5TZv9PkNXvz2z9nK6pdjYuZjUwh/6h1gCa0cN1LV0ZEuf3qAKAFb4rfcVJ4KN4 HcJREmfWSw0BMkl/e2BRJpQX2JZHbimdidtqWE8qwCusTBFEepiwNtKypAtQex7aZbORyE 0gxaN4+nQgJuCiLnr/lFNUotlMPR+Yuj4Fh9ywAWDz9Y5ZqI0Wqymy9yaPS6ZQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748347346; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=21y6AQFaqi/eAoOCD+T59sG4g/D7nQRkmBqPORu/CQY=; b=QrdCw0bEcnM4m07082I1qehSjBiO0K6RUizqbIDZRr39By0lTDojtuUQI2Y8XMijA8u5dB ly9eV7sX/o0dDc/fyPQHuD4QEHLVO3cVcj5wwM7bfEvVWydVCiQOVqbeRfHWVYOu5+drMi gB2VEmSyNjskoXOB4z+Votkd8EEq6VEE9vdakHT0e3jDhEVY+T/KN6G5g78op0CkMbr5W8 BBsbn1GuJr7AeaWRAKfU/2qGL3BRux9kQNAiTgSOy7c58E+f/Cpn7za/2vSjUKYJPG3qEb OzXG49iz3tlAR8i5+L2CXim1cQCaLIne+JmBzjSpqAG44yh2C8YXSxVGDgTkJQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b6B8L4kCYzrlG; Tue, 27 May 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 54RC2QLX046078; Tue, 27 May 2025 12:02:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54RC2Quw046075; Tue, 27 May 2025 12:02:26 GMT (envelope-from git) Date: Tue, 27 May 2025 12:02:26 GMT Message-Id: <202505271202.54RC2Quw046075@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: 23d8e956fbe2 - main - icmp6: fix use-after-reference-release List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 23d8e956fbe29418d74b78d98a453fcec1ad16da Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=23d8e956fbe29418d74b78d98a453fcec1ad16da commit 23d8e956fbe29418d74b78d98a453fcec1ad16da Author: Kristof Provost AuthorDate: 2025-05-22 08:25:55 +0000 Commit: Kristof Provost CommitDate: 2025-05-27 09:47:43 +0000 icmp6: fix use-after-reference-release We release the reference to the in6_ifaddr but retain a pointer to it. Copy the address itself, rather than keeping the pointer to fix this. The previous version was actually safe, because ifa_free() uses an epoch callback to free it, so the pointer would have remained valid as long as we are in net_epoch. Change it to copying the address anyway because it is more obviously correct and will remain correct even if ifa_free() changes later. Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D50460 --- sys/netinet6/icmp6.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sys/netinet6/icmp6.c b/sys/netinet6/icmp6.c index eaf8514fd5cf..9ea640fd24c8 100644 --- a/sys/netinet6/icmp6.c +++ b/sys/netinet6/icmp6.c @@ -2391,7 +2391,7 @@ void icmp6_redirect_output(struct mbuf *m0, struct nhop_object *nh) { struct ifnet *ifp; /* my outgoing interface */ - struct in6_addr *ifp_ll6; + struct in6_addr ifp_ll6; struct in6_addr *router_ll6; struct ip6_hdr *sip6; /* m0 as struct ip6_hdr */ struct mbuf *m = NULL; /* newly allocated one */ @@ -2461,8 +2461,7 @@ icmp6_redirect_output(struct mbuf *m0, struct nhop_object *nh) IN6_IFF_NOTREADY| IN6_IFF_ANYCAST)) == NULL) goto fail; - ifp_ll6 = &ia->ia_addr.sin6_addr; - /* XXXRW: reference released prematurely. */ + bcopy(&ia->ia_addr.sin6_addr, &ifp_ll6, sizeof(ifp_ll6)); ifa_free(&ia->ia_ifa); } @@ -2485,7 +2484,7 @@ icmp6_redirect_output(struct mbuf *m0, struct nhop_object *nh) ip6->ip6_nxt = IPPROTO_ICMPV6; ip6->ip6_hlim = 255; /* ip6->ip6_src must be linklocal addr for my outgoing if. */ - bcopy(ifp_ll6, &ip6->ip6_src, sizeof(struct in6_addr)); + bcopy(&ifp_ll6, &ip6->ip6_src, sizeof(struct in6_addr)); bcopy(&sip6->ip6_src, &ip6->ip6_dst, sizeof(struct in6_addr)); /* ND Redirect */ From nobody Tue May 27 14:38:33 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b6FcT6zL8z5xW2b; Tue, 27 May 2025 14:38: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b6FcT6PMFz41BR; Tue, 27 May 2025 14:38:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748356713; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=w5VyoiNGiycZeudbmLpTMBoRMjvvhvHgJ0d3YAV1GwI=; b=ghkhOt6kENjT5giV0UskN+tJHHpC4uHP3A7VgD+NbfNnSFccHDUd+gzJ7vFf9Wg8/gapn1 pZUBvoHhTXt+tnYtHUDu7Nclrg0ce+EV1WeY9GdF/F1IqTJiAsKcV8bFR19oa7IYARgmfQ ZO+xRd3NkKxN9fPzSi84My1EHlMCeBOZWLCHSGPr6YP2BwWgnvbTX/GamV/P4FKxZJwrm3 Fxss0YtWhIlu/8CslWd5dCjNMRZwF6Pn5UWNlZG8uWzl+LYRpsr1rFwkEnAxjifLcGN0EA wZer7zi/GyYda2hCXw3AmmntFlcIYwmv80bvsI0kbw4yBfd7ikKWs51uIPjHNQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748356713; a=rsa-sha256; cv=none; b=tSpnAXPCoqDYRaPNne9311PjCS04OkZ9jW7qu9g/IrD2rXWHPpmhAHnSF5/SmkddIohVTK kILIjPw6xl/D6awesp0YDFEV8B1vArL3BjH0B8luliAKpDu6PMGKoTrPVMJVKBQYAvvC/Q HRbVFjCkwyBW3DC8H6saN50/PDV7uWYD7Gg27vh7BQtbg/XKEYYG0H4Y6TEIUYq4phacTF uiRS1KYpXe+c5w7hSrjVQqV10xzWlIlWYKKIKTWwQDq+OOUA8bxz3wb3pIXz4mEpQ9noPq PvGW3NYQsz8sDtyquYXdcaPI5yGxdo6y4RO0yJY0QD5QVjb49UjfxqZi6eym2A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748356713; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=w5VyoiNGiycZeudbmLpTMBoRMjvvhvHgJ0d3YAV1GwI=; b=SHKOFN4kzSDZY/1mW7zlAhAb0rqKymBb9smOhX74O1bikTD8X17io48c5t3uttyacvfbjH cpjte9QdhXht3WS9E0xorT7E1y0OuKGsxdNTu16xy2TD2/lFlbn10MIlOXr1aHDcysHw8Z WFu6WMLLL5yEftBPcOpXfmC/oyclD4C4jQWzS1T+ERNUyHBWsUuE7NlJRAMqLRMe+CBU3i mFGkWx2riaW7uIt1cGCwwdzf4bZlZ/b9BHpQx050NzmgPlGb45lkDTVH5O5u8WFoHx9mSZ 5x5TXBcfmB7eQ3krg4Quufc0d5dDT/xHkmnOhmZcrqnlZGdR1TYX00O6me1bPw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b6FcT5XpMzx0M; Tue, 27 May 2025 14:38: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 54REcX5l029672; Tue, 27 May 2025 14:38:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54REcXPG029669; Tue, 27 May 2025 14:38:33 GMT (envelope-from git) Date: Tue, 27 May 2025 14:38:33 GMT Message-Id: <202505271438.54REcXPG029669@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: f4158953007f - main - vfs cache: Add NAMEILOOKUP to the whitelist of fastpath lookup flags List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: f4158953007f557061d91f99d2374d48d8376cc6 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=f4158953007f557061d91f99d2374d48d8376cc6 commit f4158953007f557061d91f99d2374d48d8376cc6 Author: Mark Johnston AuthorDate: 2025-05-27 13:27:49 +0000 Commit: Mark Johnston CommitDate: 2025-05-27 13:27:49 +0000 vfs cache: Add NAMEILOOKUP to the whitelist of fastpath lookup flags Otherwise the lockless name lookup path is inadvertently disabled since NAMEILOOKUP isn't recognized. Reviewed by: olce, kib Fixes: 7587f6d4840f ("namei: Make stackable filesystems check harder for jail roots") Differential Revision: https://reviews.freebsd.org/D50532 --- sys/kern/vfs_cache.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c index e2020b56f038..af2d790b2e5b 100644 --- a/sys/kern/vfs_cache.c +++ b/sys/kern/vfs_cache.c @@ -4456,7 +4456,7 @@ cache_fpl_terminated(struct cache_fpl *fpl) (NC_NOMAKEENTRY | NC_KEEPPOSENTRY | LOCKLEAF | LOCKPARENT | WANTPARENT | \ FAILIFEXISTS | FOLLOW | EMPTYPATH | LOCKSHARED | ISRESTARTED | WILLBEDIR | \ ISOPEN | NOMACCHECK | AUDITVNODE1 | AUDITVNODE2 | NOCAPCHECK | OPENREAD | \ - OPENWRITE | WANTIOCTLCAPS) + OPENWRITE | WANTIOCTLCAPS | NAMEILOOKUP) #define CACHE_FPL_INTERNAL_CN_FLAGS \ (ISDOTDOT | MAKEENTRY | ISLASTCN) From nobody Tue May 27 14:38:34 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b6FcW3T6wz5xW2c; Tue, 27 May 2025 14:38: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b6FcV6HVjz41Cy; Tue, 27 May 2025 14:38:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748356714; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2wpKedbgeJqvAwfas6AxUuPESQLp/iQyhCD2t/C6FTg=; b=MYJeoU4Xip97fIxlG2B+5DBDPxQxS548GDcX/buxvwrMKZyOz8GrQ22wD/8GLek+1QhN0s mbZr1ZABG9O5OleDhDTwURbVjlEvLwiDqd+3u1EWCC/ZgqHqbowggdIjxdlt9w8m6eLq6y MheAa4Fd18F+DfV5kP0r164rqfY7Ah889pBwg9Upj3cA0K3UBvdnslW8fxs0v/UiPqmycR DcwcBhQMPIrSACUppKQ4ScIVa2DRGoQOm0DesFJV0xQOREC9vLWgEGcs02cy6zA6NnI5fM QIl14nBl+exEF48qMq7hiz6Q/AyAJ3UF7behzkxnhxDnmj73iPca5d9/7sYSOA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748356714; a=rsa-sha256; cv=none; b=cNhmq+PcBFvRtAzjo5bTJfrhFYDLNp9eh6WNLjiRTlw8QdxhfVcwzsPM5q6VuWO7uSqfwl rv8j7iukVwBgOETbEUQijQ+Y4+vSpXTSmRto2fuMgc5ZJPAmBCHRnMIW28EWqkxmyZQecV ISFlWu5ibvqKhYSkCepYIp5uXpsefhSnzQNLmbrHBsnfvM+MqbMYXnnSZYuw6loboK/gH9 9x6OJtLDXd4omupLuoU1kBUjVEPumsGxNagNlMUBGPqcznCH6XE/Y6SUCt8zUy4SSYhGBj SzBicMnZ1KQUudtpHAdNXa8ah9dAWcAg84Y7pBOqBM9vsX9FsDENluCEk0cmBw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748356714; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2wpKedbgeJqvAwfas6AxUuPESQLp/iQyhCD2t/C6FTg=; b=v1btkTKbZnYx5F/t7Qm3QYDbr65M4T0UlVlUopyrmlAhqFFgLcX5T1PU9DitzTKsqmVS4B Uo1j85wUuqJN1MvK7pWkA78XqHLD7XMI5ynAjBO5deaN9lKbwV/1t2Pvg8zGudJ2ZY1iQI ay49voPuU1KPxTJIXLtg+0EheRjb0vUGbOPnBxTzqP2Gjd4uAi+Vr4cwLtfKuBlBMgQRFb a3Z8rW5azDCFsqXiWMdMWOwPsvBmEHPlJOUC/d/QTBpJXxawX9uGDdoQpRktTZxZAEUfhj 9zVTkSpa358QBJYjygNk4lipb2Nbr+XSMIfVWP2B2djJ9GkgSR32tE3VctJimA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b6FcV5qsdzwrq; Tue, 27 May 2025 14:38: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 54REcYif029708; Tue, 27 May 2025 14:38:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54REcYmU029705; Tue, 27 May 2025 14:38:34 GMT (envelope-from git) Date: Tue, 27 May 2025 14:38:34 GMT Message-Id: <202505271438.54REcYmU029705@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: 0d224af399a6 - main - namei: Fix cn_flags width in various places List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 0d224af399a66f00a5b33e5512fc018062cabf1d Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=0d224af399a66f00a5b33e5512fc018062cabf1d commit 0d224af399a66f00a5b33e5512fc018062cabf1d Author: Mark Johnston AuthorDate: 2025-05-27 13:29:14 +0000 Commit: Mark Johnston CommitDate: 2025-05-27 13:29:14 +0000 namei: Fix cn_flags width in various places This truncation is mostly harmless today, but fix it anyway to avoid pain later down the road. Reviewed by: olce, kib MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D50417 --- sys/fs/cd9660/cd9660_lookup.c | 2 +- sys/fs/fuse/fuse_vnops.c | 9 ++++----- sys/fs/p9fs/p9fs_vnops.c | 2 +- sys/fs/smbfs/smbfs_vnops.c | 2 +- sys/fs/unionfs/union_vnops.c | 2 +- sys/kern/uipc_mqueue.c | 3 ++- sys/kern/vfs_cache.c | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/sys/fs/cd9660/cd9660_lookup.c b/sys/fs/cd9660/cd9660_lookup.c index 1adb7a18bcf1..75fcdc9152cd 100644 --- a/sys/fs/cd9660/cd9660_lookup.c +++ b/sys/fs/cd9660/cd9660_lookup.c @@ -125,7 +125,7 @@ cd9660_lookup(struct vop_cachedlookup_args *ap) char *name; struct vnode **vpp = ap->a_vpp; struct componentname *cnp = ap->a_cnp; - int flags = cnp->cn_flags; + uint64_t flags = cnp->cn_flags; int nameiop = cnp->cn_nameiop; ep2 = ep = NULL; diff --git a/sys/fs/fuse/fuse_vnops.c b/sys/fs/fuse/fuse_vnops.c index 016b634c4fa0..83f527ec8ec0 100644 --- a/sys/fs/fuse/fuse_vnops.c +++ b/sys/fs/fuse/fuse_vnops.c @@ -1431,8 +1431,8 @@ fuse_vnop_lookup(struct vop_lookup_args *ap) struct timespec now; int nameiop = cnp->cn_nameiop; - int flags = cnp->cn_flags; - int islastcn = flags & ISLASTCN; + bool isdotdot = cnp->cn_flags & ISDOTDOT; + bool islastcn = cnp->cn_flags & ISLASTCN; struct mount *mp = vnode_mount(dvp); struct fuse_data *data = fuse_get_mpdata(mp); int default_permissions = data->dataflags & FSESS_DEFAULT_PERMISSIONS; @@ -1465,8 +1465,7 @@ fuse_vnop_lookup(struct vop_lookup_args *ap) return err; is_dot = cnp->cn_namelen == 1 && *(cnp->cn_nameptr) == '.'; - if ((flags & ISDOTDOT) && !(data->dataflags & FSESS_EXPORT_SUPPORT)) - { + if (isdotdot && !(data->dataflags & FSESS_EXPORT_SUPPORT)) { if (!(VTOFUD(dvp)->flag & FN_PARENT_NID)) { /* * Since the file system doesn't support ".." lookups, @@ -1580,7 +1579,7 @@ fuse_vnop_lookup(struct vop_lookup_args *ap) } } else { /* Entry was found */ - if (flags & ISDOTDOT) { + if (isdotdot) { struct fuse_lookup_alloc_arg flaa; flaa.nid = nid; diff --git a/sys/fs/p9fs/p9fs_vnops.c b/sys/fs/p9fs/p9fs_vnops.c index cfb50c704019..56bf766ef801 100644 --- a/sys/fs/p9fs/p9fs_vnops.c +++ b/sys/fs/p9fs/p9fs_vnops.c @@ -222,9 +222,9 @@ p9fs_lookup(struct vop_lookup_args *ap) struct p9fs_session *vses; struct mount *mp; /* Get the mount point */ struct p9_fid *dvfid, *newfid; + uint64_t flags; int error; struct vattr vattr; - int flags; char tmpchr; dvp = ap->a_dvp; diff --git a/sys/fs/smbfs/smbfs_vnops.c b/sys/fs/smbfs/smbfs_vnops.c index 1e7dcafb1121..c30995508c00 100644 --- a/sys/fs/smbfs/smbfs_vnops.c +++ b/sys/fs/smbfs/smbfs_vnops.c @@ -1051,7 +1051,7 @@ smbfs_lookup(struct vop_lookup_args *ap) struct smbfattr fattr, *fap; struct smb_cred *scred; char *name = cnp->cn_nameptr; - int flags = cnp->cn_flags; + uint64_t flags = cnp->cn_flags; int nameiop = cnp->cn_nameiop; int nmlen = cnp->cn_namelen; int error, islastcn, isdot; diff --git a/sys/fs/unionfs/union_vnops.c b/sys/fs/unionfs/union_vnops.c index a930e3921ab3..03130f0ca949 100644 --- a/sys/fs/unionfs/union_vnops.c +++ b/sys/fs/unionfs/union_vnops.c @@ -99,8 +99,8 @@ unionfs_lookup(struct vop_cachedlookup_args *ap) struct vattr va; struct componentname *cnp; struct thread *td; + uint64_t cnflags; u_long nameiop; - u_long cnflags; int lockflag; int lkflags; int error, uerror, lerror; diff --git a/sys/kern/uipc_mqueue.c b/sys/kern/uipc_mqueue.c index d647c7b991f4..6f2760635bad 100644 --- a/sys/kern/uipc_mqueue.c +++ b/sys/kern/uipc_mqueue.c @@ -851,7 +851,8 @@ mqfs_lookupx(struct vop_cachedlookup_args *ap) struct mqfs_node *pd; struct mqfs_node *pn; struct mqfs_info *mqfs; - int nameiop, flags, error, namelen; + uint64_t flags; + int nameiop, error, namelen; char *pname; struct thread *td; diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c index af2d790b2e5b..4ab00698b311 100644 --- a/sys/kern/vfs_cache.c +++ b/sys/kern/vfs_cache.c @@ -4174,7 +4174,7 @@ SYSCTL_PROC(_vfs_cache_param, OID_AUTO, fast_lookup, CTLTYPE_INT|CTLFLAG_RW|CTLF */ struct nameidata_outer { size_t ni_pathlen; - int cn_flags; + uint64_t cn_flags; }; struct nameidata_saved { From nobody Tue May 27 16:23:37 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b6Hxk0whCz5xcbg; Tue, 27 May 2025 16:23: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b6Hxj6zCxz3kSj; Tue, 27 May 2025 16:23:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748363018; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lTLs8Mli9VR3k4sOcxPfjr6YaFqp+Dj6j/1UWiaFkFc=; b=K0jPbG3HRYsifbX/wvSXDnGPbAHo2vZcCzF0YdkK2MUHmGIcfaZixCouAjJ3Bwtc6iqhBh yVhiMNBZX8xTnJr8iE+44KgJO+l6SFpJBikVmrbckjfSdPqhhB6dKKbLEJS3pYJ4imj4MM uk95X7E0i6WpuTJEvElcetA36K8mhxtQshheovp2cOxrV9l0jGEnORD4j5Pw295n6zbh2A 0v43QDlVRCHkckpe18pZuWjZ7d1ZYPhV2zWGAsmz14dzrdVylpM/RNfo1XpHtFtOn4OQLS sVVhHUuYp0YTJSZxhKC9Cw6opt25iTpoYxVK4QLmn5KGgzcN0gKnzbqGPHPw7g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748363018; a=rsa-sha256; cv=none; b=PYWDjyt6FWcnU7iiFG851bKkOV/5YZtnhnzhQxHenBlW+wllv8h6WZPpwsyR3C+c773PaT v5sL6BUX7nVJomBSI7FrCSNtUKBPy3eaxc3WcfTWJo2uSAQYNO6ooRhTDnd/+0/3bkqOld s6trjfs3kY70XxSBgMqZrE42wPbtJKVpnSTEdMnRUVqNSbXxCxV4XNIYAJB856cCFl21EV Fzaxbw2y//rtd55WI+9oc5bHEDL9fz3yCE9Cltj8DTF7kXJRTSes8DxrtubRV/CNlrMJEM +VGi2EWAM4zp7cQJndYQEttCP+RwNkdw5e+NsYYzpyG7t/P3y/eyCJjFqDxZBA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748363018; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lTLs8Mli9VR3k4sOcxPfjr6YaFqp+Dj6j/1UWiaFkFc=; b=TFM03HZBRpxAWQlONQdx7+LGc6tFcQUEXwnpS7lcgyTa8+IC1R9H8UElTx4jVrxJVmAUBd lVNa94KiH/+B9FD/K+fZ6s6THTMZqUlOaNS2qREqQEOnRbPAKZAfXdOrxNUvl9PbgyPUqb 3YVP6zytsgBlzJrLO7SGWy3sw7y8E4qNYjU440RYkMHOYBu840HG5xm+j/NCZol/RNOt3L U/unfPt9tCmmf4czEOo67+XaFcDhoMiNVr1usDDatQFwU8pOMwYqlvd0Z1TUCdkL4lIggt ++hUS5ZsBz+oHY9xXUuUtCQCALrY3YlgMiWDTzxa0zlhp/Pl7tH9A0ANKGMHvA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b6Hxj6QQzz10j6; Tue, 27 May 2025 16:23: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 54RGNbVS034312; Tue, 27 May 2025 16:23:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54RGNbha034309; Tue, 27 May 2025 16:23:37 GMT (envelope-from git) Date: Tue, 27 May 2025 16:23:37 GMT Message-Id: <202505271623.54RGNbha034309@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: 539f84db949a - main - tests/ci: Pre-commit CI with CIRRUS-CI List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bofh X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 539f84db949a1d66ac7b9d001481b44f0b10abf0 Auto-Submitted: auto-generated The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/src/commit/?id=539f84db949a1d66ac7b9d001481b44f0b10abf0 commit 539f84db949a1d66ac7b9d001481b44f0b10abf0 Author: Muhammad Moinur Rahman AuthorDate: 2025-05-27 16:16:38 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2025-05-27 16:22:58 +0000 tests/ci: Pre-commit CI with CIRRUS-CI Currently we do not have pre-commit testing mechanism for our src tree. We have merged the CI test scripts into base(HEAD only). The plan is to replace the entire Jenkins scripts with the one from the base system. Limitations of the scripts: - Full test does not work as intended like in a local environment. Our amd64/aarch64/arm64 test requires somewhere near 4+ hours which is not supported by CIRRUS-CI hosted systems yet as the hard limitation is 120m. But in future we can try to do this using hosted system with various cloud providers. - Currently only works with main branch, stable/13 and stable/14 has not yet been processed. As the scripts are different. Approved by: lwhsu Differential Revision: https://reviews.freebsd.org/D36257 --- .cirrus.yml | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/.cirrus.yml b/.cirrus.yml index 472fab9423a8..d6c4df7a9776 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -189,3 +189,30 @@ task: post_script: - df -m - du -m -s /usr/obj + +precommit_task: + matrix: + - name: amd64 smoke test using internal ci systems + only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src' || $CIRRUS_BRANCH =~ 'pull/.*' + env: + TARGET: amd64 + TARGET_ARCH: amd64 + - name: aarch64 smoke test using internal ci systems + only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src' || $CIRRUS_BRANCH =~ 'pull/.*' + env: + TARGET: arm64 + TARGET_ARCH: aarch64 + timeout_in: 120m + + setup_script: + - uname -a + - gpart show + - df -m + - pkg --version + + ci_script: + - make -C tests/ci TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} CITYPE=smoke ci + + post_script: + - df -m + - du -m -s /usr/obj From nobody Tue May 27 17:54:35 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b6Kyh33nsz5xhgf; Tue, 27 May 2025 17:54: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b6Kyh1JJGz3jqV; Tue, 27 May 2025 17:54:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748368476; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bFhspppvg0/zLDBgFq8+KHgm+H5jc2cBU+Qi4pUV+Bc=; b=MxMSz8z0/1YERXX+mRAP8vd7hgjtede8KLm1wamSl0DD1C+ROtDNED63Vtfqzpn95/7TTu H5ruJw/jMo9zvVv6p6bZxkZkD8QmFkwDlbEQCtj8XZhiMW2rIUxyDXx2AiCBJX8Y/F7KaF aRfCjMXkWF5Ky2IZEkhTkVEKy1fpxsyIaTA9xHogcoMzGNpSy0jQUQHiPSURZeyga/kyuT bohOEb69dCuaNOM7Q6pdLbPRnbNqzl3eVDF0vLn1zp0n+UM0mnAjx3iJQ1MvnTtd+cmrgt Lfm9j3x5f6inxkb7FrBNIYt07OU0AMFZXd5yYAt2Mb6Jny2A/hOM8Ufuumadmg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748368476; a=rsa-sha256; cv=none; b=Y4A8qFdsNu4G5PmyvKiwd2Mbbi0cdYAsHxy9djayf2ErPI4OLSjWDaiu+AaUGiq68whTVp Xsf5uQfamOfWz7pNG7rfLA6qy/WEnG6n4HLB6hhRMn2SygV6QUvmw34+Km0iCjGHmXqz0S Vo2JDCx9ccnrorpXNYBtPJeVpnBqd6qQVAJbLb15JAd+LACfU17e+C5snoMKyAg61yfwkQ QmDP9wbn1vbhJuUimgvY0qyB/gSuPLe/0QIu/UimdfpNUe30YPKtPLzfZCNp5P0egI462p t0MxdjCueXge8uyx3K6ADgn2YkHFBUCPB8VkUXIV2gZ4SYwZ4NeJtVu/25yktA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748368476; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bFhspppvg0/zLDBgFq8+KHgm+H5jc2cBU+Qi4pUV+Bc=; b=jYwaa88trmPpsjFegxXzLw0UbP4Faqs3V2QwBDklNX+RHMhR0lYmlN+gzyNpxxEkKVmfrJ nYnWGO8GJZuUvK8myrAxYamHGrxBYJYFHPCe07M7y6UoW4eZFBI0WtBkpBHozVN8lYswi8 DbP9Bh9NCmtdd2kvvp+17TGnio2jiUS1q/byDmniutvS0ccXTF3m90oXCjK/mASEhNIqLr f3k/r6XYzbtBW9pMzNnIOk6lhN58uMUsmjwZcnIbdM4eHnQlr8XzRv4rHWCs2dW5HFQBS3 Ko0b/FEah/UG1W8+cixVSw+AfYKGJeksxktrWs9Ke9DC628tLYGrIlBCqWa2pQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b6Kyh0dQyz12nX; Tue, 27 May 2025 17:54: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 54RHsZ1a003641; Tue, 27 May 2025 17:54:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54RHsZMu003638; Tue, 27 May 2025 17:54:35 GMT (envelope-from git) Date: Tue, 27 May 2025 17:54:35 GMT Message-Id: <202505271754.54RHsZMu003638@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: e0267657f396 - main - e1000: Initialize helper variables in em_newitr() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: e0267657f3965a56d877075fe3d4d41b8afb2faf Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=e0267657f3965a56d877075fe3d4d41b8afb2faf commit e0267657f3965a56d877075fe3d4d41b8afb2faf Author: Mark Johnston AuthorDate: 2025-05-27 16:31:06 +0000 Commit: Mark Johnston CommitDate: 2025-05-27 17:33:39 +0000 e1000: Initialize helper variables in em_newitr() Due to races with the threaded transmit and receive paths, it's possible to have r/tx_bytes != 0 && r/tx_packets == 0, in which case the maximum byte count could be left uninitialized. Initialize them to zero to handle this case. PR: 286819 Reviewed by: kbowling MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D50416 --- sys/dev/e1000/if_em.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/dev/e1000/if_em.c b/sys/dev/e1000/if_em.c index f49682285875..27500f936c25 100644 --- a/sys/dev/e1000/if_em.c +++ b/sys/dev/e1000/if_em.c @@ -1671,6 +1671,7 @@ em_newitr(struct e1000_softc *sc, struct em_rx_queue *que, goto em_set_next_itr; } + bytes = bytes_packets = 0; /* Get largest values from the associated tx and rx ring */ if (txr->tx_bytes && txr->tx_packets) { bytes = txr->tx_bytes; From nobody Tue May 27 17:54:36 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b6Kyk3j9nz5xhkL; Tue, 27 May 2025 17:54: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b6Kyj1ZW1z3jl3; Tue, 27 May 2025 17:54:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748368477; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=H2kNC65J/GN1ZbjxrLxPBgGJZKaCt2cZhrJAjrY7C8Y=; b=xCip+L/KvTfOtuR8g59mWWkQJ0wwDpzipkvG8cFtPirbVNbdw6yhSZS3iJ1ozRk22EIQQT J1HXSBgNgQgY1uauxnmrJecQg2tw2cmOmGlLH1V3g74x1Mrt9X7i7JjY8htXcRNRUinTqB VS4HfHWzZ5eWnOjHs7JshTTLligj8dc4SkkRW5hxSp0B9gUtnN1Ezdxm0V4D18uSAHcZM/ SA/Z+zmPD8O/u1/kUY31/ZQ+QsTBZOpC0whQN+TsXY6+qoIOA4LivWN0CDRr5i5Ed4KSVj DXONFWKlAym0byQSU7vf68uzyEpd6XVx25uh+VVT++x+hCSAvF1VxA9WMtyfNA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748368477; a=rsa-sha256; cv=none; b=cdDcsFFQLA9ny8l/D06gQVkMMb+n/b4kBiag5HlwvOA0IMVarVKtn3bno4+F0LrRihHd6W aKIWZB/Tzz9reIbpvwtcZ1AaxQAJUzZiHkGYpYntqQG3uWP/2K7c1iP4N3CMPwuPPitM6y IrQ2sAbag2P0zHHbcP6Ne5RxfMuSnxLk6EDWRjDjsuzOhSHRShPu2ykkkKSbcFNZ8L9tVJ prpnEt88hnWckLFRQCUDM+qWf5q3/r8QPe6SuapIPmgbh30+ZEy2pMm22AFVOsXB+skmkn DUQ+zBM1C/AkmE00G+pA/y7ViubZ9P+P7pBirPAOLEb1Ysiq1uYGRQv7ZG9+3w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748368477; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=H2kNC65J/GN1ZbjxrLxPBgGJZKaCt2cZhrJAjrY7C8Y=; b=tt50HIqgbGlCVxkjzD8neoeFy6i9YQT+i1U+mouu2Auuy4c20+f9psuYxrVKH1goV5WZV5 eNoCeqrZ+P7LadNsxSs/4vBhICAUtxDufSVuFdtwrUHPe80WlefIXZzG3J03/LwNDDX7ZL yLB2SRi1pDgYlety5eQK9KXdG76Geq9ttqxgKY+f23S2CM3QV5TCaAsIbDjRcUyM219/Lw OXQwqaZPNco5rGgUb1iXcvc+YyN2eu/+GNnf5Iuqifo/1DfDfCWV8XZ/CkLngPMdbe5uEQ sQzjt1H1VdEWJfVqeGiWUc7ORfQVqYv5JXCidxoOqujl4cA34xtN/hWel5RdWQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b6Kyj0lk5z12Mr; Tue, 27 May 2025 17:54: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 54RHsaCV003675; Tue, 27 May 2025 17:54:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54RHsa0H003672; Tue, 27 May 2025 17:54:36 GMT (envelope-from git) Date: Tue, 27 May 2025 17:54:36 GMT Message-Id: <202505271754.54RHsa0H003672@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: 731c145612dd - main - e1000: Fix some issues in em_newitr() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 731c145612dd6ffe457a562959a5c027acf13334 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=731c145612dd6ffe457a562959a5c027acf13334 commit 731c145612dd6ffe457a562959a5c027acf13334 Author: Mark Johnston AuthorDate: 2025-05-27 17:08:07 +0000 Commit: Mark Johnston CommitDate: 2025-05-27 17:33:39 +0000 e1000: Fix some issues in em_newitr() - Load packet and byte counters exactly once, as they can be concurrently mutated. - Rename bytes_packets to bytes_per_packet, which seems clearer. - Use local variables that have the same types as the counter values, rather than truncating unsigned long to u32. Reviewed by: kbowling MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D50416 --- sys/dev/e1000/if_em.c | 40 ++++++++++++++++++++++------------------ 1 file changed, 22 insertions(+), 18 deletions(-) diff --git a/sys/dev/e1000/if_em.c b/sys/dev/e1000/if_em.c index 27500f936c25..f0ef6051fab1 100644 --- a/sys/dev/e1000/if_em.c +++ b/sys/dev/e1000/if_em.c @@ -1644,14 +1644,16 @@ em_newitr(struct e1000_softc *sc, struct em_rx_queue *que, struct tx_ring *txr, struct rx_ring *rxr) { struct e1000_hw *hw = &sc->hw; + unsigned long bytes, bytes_per_packet, packets; + unsigned long rxbytes, rxpackets, txbytes, txpackets; u32 newitr; - u32 bytes; - u32 bytes_packets; - u32 packets; u8 nextlatency; + rxbytes = atomic_load_long(&rxr->rx_bytes); + txbytes = atomic_load_long(&txr->tx_bytes); + /* Idle, do nothing */ - if ((txr->tx_bytes == 0) && (rxr->rx_bytes == 0)) + if (txbytes == 0 && rxbytes == 0) return; newitr = 0; @@ -1671,18 +1673,20 @@ em_newitr(struct e1000_softc *sc, struct em_rx_queue *que, goto em_set_next_itr; } - bytes = bytes_packets = 0; + bytes = bytes_per_packet = 0; /* Get largest values from the associated tx and rx ring */ - if (txr->tx_bytes && txr->tx_packets) { - bytes = txr->tx_bytes; - bytes_packets = txr->tx_bytes/txr->tx_packets; - packets = txr->tx_packets; + txpackets = atomic_load_long(&txr->tx_packets); + if (txpackets != 0) { + bytes = txbytes; + bytes_per_packet = txbytes / txpackets; + packets = txpackets; } - if (rxr->rx_bytes && rxr->rx_packets) { - bytes = max(bytes, rxr->rx_bytes); - bytes_packets = - max(bytes_packets, rxr->rx_bytes/rxr->rx_packets); - packets = max(packets, rxr->rx_packets); + rxpackets = atomic_load_long(&rxr->rx_packets); + if (rxpackets != 0) { + bytes = lmax(bytes, rxbytes); + bytes_per_packet = + lmax(bytes_per_packet, rxbytes / rxpackets); + packets = lmax(packets, rxpackets); } /* Latency state machine */ @@ -1692,7 +1696,7 @@ em_newitr(struct e1000_softc *sc, struct em_rx_queue *que, break; case itr_latency_lowest: /* 70k ints/s */ /* TSO and jumbo frames */ - if (bytes_packets > 8000) + if (bytes_per_packet > 8000) nextlatency = itr_latency_bulk; else if ((packets < 5) && (bytes > 512)) nextlatency = itr_latency_low; @@ -1700,14 +1704,14 @@ em_newitr(struct e1000_softc *sc, struct em_rx_queue *que, case itr_latency_low: /* 20k ints/s */ if (bytes > 10000) { /* Handle TSO */ - if (bytes_packets > 8000) + if (bytes_per_packet > 8000) nextlatency = itr_latency_bulk; else if ((packets < 10) || - (bytes_packets > 1200)) + (bytes_per_packet > 1200)) nextlatency = itr_latency_bulk; else if (packets > 35) nextlatency = itr_latency_lowest; - } else if (bytes_packets > 2000) { + } else if (bytes_per_packet > 2000) { nextlatency = itr_latency_bulk; } else if (packets < 3 && bytes < 512) { nextlatency = itr_latency_lowest; From nobody Tue May 27 19:32:42 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b6N7t5GSgz5xp2P; Tue, 27 May 2025 19:32: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b6N7t4r1qz3n46; Tue, 27 May 2025 19:32:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748374362; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kW6IXYbh0jp0S2DtISdYqeel/82aadBRhXRzjcP+C9I=; b=CUuK8aI5tgYwkTzd+qtds5ql2s6/eZWQa2ToQINmLm0CC05Bq7sBZS53B8qNub+LF2M7vz B4eWqA0Fg37WZlf44o/MkelYefoCrifyb/jaTDj7wrq6Y4GHz0Vwg/msxOl42ztKSnbF3B BAdFFTF3q5b20QGVTFG3bSGiwN+ohe4gt2t3DxvfIwRYLu9Hs5hfl4luvwtC5r0pSkwikG BDdwbAhzH/BsUIS1Fuiz1vs9YjR6Nl5T11Jj+TpqIicH5OU+QFyLaADqpSFDNDOhosQks5 tAy+JSNkkT59wAOZP3JLeayLIidnFRPuhVN4xsRI/m7EJZ7W0cnBk3xBanfD9w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748374362; a=rsa-sha256; cv=none; b=S8svtaalvu0bJ9a6UqAo48Wtzd8cEtfY+N/mBNfVuoafPa6PGt9cxWVACC2GNDx34cf9Tn F8nSIrTp52ojEo/JOtQtGBqwc+GQo7dvEEV5I1rsx5NgTlVNnWNkck+IChFBd2fSV8CVJo dpK+HKVYEWg4qQ7ARGmvoRJud1ejZ9VtXI2D3q2BkKDKp33RzQsYlTyhKjhua/WKfrhbZY Wz6ETQ7Px5jqvf6bsrQPYCEKglqHDkrqcmwuB3mumKBHn3c/rcX0a3UPcZOeFqvGXKjQZ2 mSV71+IBQ+0cH2u2x5Lg8BZZgIsZnDxOYFSjfAnkDl18qicYZAQKIuE+DaEFvA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748374362; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kW6IXYbh0jp0S2DtISdYqeel/82aadBRhXRzjcP+C9I=; b=cduGC4LNX114M2PjZrOHU/OjwYiNuirIEUMvDLOk93Hrly68/G2QfGqidyxOSSn7Oymqh8 KCQ57TFjBquOvRGKZaD21RHfzIynLWiKZT1vfhsRSMELSD7pjKdQZxpIKURIatsGZketpp Gt68r/9KOou+nX+v+z0LYaSttknWZbQzNPJpZOqOHCxTXOON+IoMOPpI6M8b4BgspjqukW /GQ3vYCQ5G8Av4YO48s3Hy6kOf9DhSiuFt16yPmB8rvwpS/wRxx0bbVzcRKiNR50osFDA+ rV1prttuILjsoNAY8zfAarTxeLi6Xz7hYGYtIpQK9ugYskKTz9amfU+eDyGPag== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b6N7t4BzGz14sp; Tue, 27 May 2025 19:32: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 54RJWg7i090636; Tue, 27 May 2025 19:32:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54RJWgZu090633; Tue, 27 May 2025 19:32:42 GMT (envelope-from git) Date: Tue, 27 May 2025 19:32:42 GMT Message-Id: <202505271932.54RJWgZu090633@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Navdeep Parhar Subject: git: 3fb4073c4c8c - stable/14 - pciconf(8): Fix the -x option and its documentation List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: np X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 3fb4073c4c8cd1f7f4706bc7750a7551f3ae08aa Auto-Submitted: auto-generated The branch stable/14 has been updated by np: URL: https://cgit.FreeBSD.org/src/commit/?id=3fb4073c4c8cd1f7f4706bc7750a7551f3ae08aa commit 3fb4073c4c8cd1f7f4706bc7750a7551f3ae08aa Author: Navdeep Parhar AuthorDate: 2025-05-19 06:16:18 +0000 Commit: Navdeep Parhar CommitDate: 2025-05-27 16:59:06 +0000 pciconf(8): Fix the -x option and its documentation Reviewed by: kib Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D50421 (cherry picked from commit 79aba7a0ca8468da36551e66d24e0b3385d8e328) --- usr.sbin/pciconf/pciconf.8 | 4 ++-- usr.sbin/pciconf/pciconf.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/usr.sbin/pciconf/pciconf.8 b/usr.sbin/pciconf/pciconf.8 index 4e46d502887a..6c67e9e50df6 100644 --- a/usr.sbin/pciconf/pciconf.8 +++ b/usr.sbin/pciconf/pciconf.8 @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd June 14, 2018 +.Dd May 19, 2025 .Dt PCICONF 8 .Os .Sh NAME @@ -39,7 +39,7 @@ .Nm .Fl w Oo Fl b | h Oc Ar device addr value .Nm -.Fl D Oo Fl b | h | x Oc Ar device addr Op start Ns Op : Ns Ar count +.Fl D Oo Fl b | h | x Oc Ar device bar Op Ar start Op Ns Ar count .Sh DESCRIPTION The .Nm diff --git a/usr.sbin/pciconf/pciconf.c b/usr.sbin/pciconf/pciconf.c index 83ea50efb183..ef75a8fa2341 100644 --- a/usr.sbin/pciconf/pciconf.c +++ b/usr.sbin/pciconf/pciconf.c @@ -110,7 +110,7 @@ main(int argc, char **argv) bars = bridge = caps = errors = verbose = vpd= 0; width = 4; - while ((c = getopt(argc, argv, "aBbcDehlrwVv")) != -1) { + while ((c = getopt(argc, argv, "aBbcDehlrwVvx")) != -1) { switch(c) { case 'a': attachedmode = 1; From nobody Tue May 27 19:32:43 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b6N7w1FzVz5xnyc; Tue, 27 May 2025 19:32: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b6N7v57DNz3msP; Tue, 27 May 2025 19:32:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748374363; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4TX1cfjAZy525LQei/Gr0pAOgsJLKUBEWSRBhBELv+w=; b=lQQPRubtrrpvPSyCdmdmEH79NMw28I2dZuhvUqPe/4LiOR52l3UAFmJJ3rc2ZqVDmtMpNJ OCabPGRHK1iU+Y89g2N3vTgD19SWjkoNfFVJ9TlnredKp10EWcgHeDHsj5hKCelsLSM5L5 my9T9j6XCpO6yK9oFzTIs2wleC31ZVA9SHjBs4+E4fFOCtnu0HSu/XYzy1IhKNBC0QrY9h WZYiepLlLeEwQZV7PG2yBN4a47lUjcvmvGfVusiB9uStC65rzCTqv1Evtk0y99a/Jvus2Y AmBgvfAjAwBB7aC0rNg0/04nhKwMdMi6j/O8S7GZtPD0Mfmldx4+MKoM1WnJ1Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748374363; a=rsa-sha256; cv=none; b=u3tICjpo6qIyJkJO8naVfE//SSc6o1ana06/1szh0T8dybFmCearcuGS8BnJILN+nYSa/i +EYmenKdcVltLLyycPiwkhDHqt//C5jlq74lk7uTHdm3JsFwXwYInxHXsX4wq0IafK8dyn FglBJ/16/ONeiWjP+cKP5pacl/fosBHkYsoYKaEW3bRrj6RGR4BH7oyIxyn7KJI7dMZPYb 8r5nCqfVRLAgCfZ0VhrfZ/ip/FgTbOysXWQthG2rZs6uUcvjHqUP9JMvHXIO464at4Ah2W B/W5+2dzHS0e/3JvMLX5kITaYv/7LoqDwLFoYpoHzlmyq6RUTtB2w3ABPRyyBw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748374363; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4TX1cfjAZy525LQei/Gr0pAOgsJLKUBEWSRBhBELv+w=; b=UhkBrkQoYjdMgbc52Nn1qMZfswsIYdJn9RiE84JN1IVnZFnQvWQOXs4xLre7DbNVkpfIi6 q0kNP3peDSTwSK8n77rMhQ7D5RrGWgHWTKj7cokHYoeoeRFL4wDH5PJxB2euU9zucR91qI i3OnpllDupG3oZ9juX+EW275O0JNofFvQNHsYTzVtU5u1ADt5Iftf/ZWinvKmitVkbat93 3MOm2GFyWZ/xPWLbUOFswrkRbTZQeAvXS/PnYwpwwXvZF1TvYGW+WlDI42E7LN6sc9TmhT ZUQfqoubOHIKXiYC+sZXcqpqLErbZjJc87iUJ7CF7fbkyt2kYYLWXJR1XFjMSg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b6N7v4Dk1z15Ct; Tue, 27 May 2025 19:32: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 54RJWh5I090669; Tue, 27 May 2025 19:32:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54RJWhCV090666; Tue, 27 May 2025 19:32:43 GMT (envelope-from git) Date: Tue, 27 May 2025 19:32:43 GMT Message-Id: <202505271932.54RJWhCV090666@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Navdeep Parhar Subject: git: 9a4e5a8a714c - stable/14 - pciconf(8): Dump the correct number of bytes List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: np X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 9a4e5a8a714cf8f5497b7c9b8944a13e19be0eb7 Auto-Submitted: auto-generated The branch stable/14 has been updated by np: URL: https://cgit.FreeBSD.org/src/commit/?id=9a4e5a8a714cf8f5497b7c9b8944a13e19be0eb7 commit 9a4e5a8a714cf8f5497b7c9b8944a13e19be0eb7 Author: Navdeep Parhar AuthorDate: 2025-05-19 06:26:46 +0000 Commit: Navdeep Parhar CommitDate: 2025-05-27 16:59:51 +0000 pciconf(8): Dump the correct number of bytes The loop variable should be incremented by 1 and not the width. Reviewed by: kib Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D50422 (cherry picked from commit 9fb60477fe260da2db029baebe63331d0f584a3d) --- usr.sbin/pciconf/pciconf.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/usr.sbin/pciconf/pciconf.c b/usr.sbin/pciconf/pciconf.c index ef75a8fa2341..4d3941131858 100644 --- a/usr.sbin/pciconf/pciconf.c +++ b/usr.sbin/pciconf/pciconf.c @@ -1153,7 +1153,7 @@ dump_bar(const char *name, const char *reg, const char *bar_start, case 1: db = (uint8_t *)(uintptr_t)((uintptr_t)pbm.pbm_map_base + pbm.pbm_bar_off + start * width); - for (a = 0; a < count; a += width, db++) { + for (a = 0; a < count; a++, db++) { res = fwrite(db, width, 1, stdout); if (res != 1) { errx(1, "error writing to stdout"); @@ -1164,7 +1164,7 @@ dump_bar(const char *name, const char *reg, const char *bar_start, case 2: dh = (uint16_t *)(uintptr_t)((uintptr_t)pbm.pbm_map_base + pbm.pbm_bar_off + start * width); - for (a = 0; a < count; a += width, dh++) { + for (a = 0; a < count; a++, dh++) { res = fwrite(dh, width, 1, stdout); if (res != 1) { errx(1, "error writing to stdout"); @@ -1175,7 +1175,7 @@ dump_bar(const char *name, const char *reg, const char *bar_start, case 4: dd = (uint32_t *)(uintptr_t)((uintptr_t)pbm.pbm_map_base + pbm.pbm_bar_off + start * width); - for (a = 0; a < count; a += width, dd++) { + for (a = 0; a < count; a ++, dd++) { res = fwrite(dd, width, 1, stdout); if (res != 1) { errx(1, "error writing to stdout"); @@ -1186,7 +1186,7 @@ dump_bar(const char *name, const char *reg, const char *bar_start, case 8: dx = (uint64_t *)(uintptr_t)((uintptr_t)pbm.pbm_map_base + pbm.pbm_bar_off + start * width); - for (a = 0; a < count; a += width, dx++) { + for (a = 0; a < count; a++, dx++) { res = fwrite(dx, width, 1, stdout); if (res != 1) { errx(1, "error writing to stdout"); From nobody Tue May 27 19:54:57 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b6Ndb4Fk9z5xqK3; Tue, 27 May 2025 19:54: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b6NdZ3Lnnz43pV; Tue, 27 May 2025 19:54:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748375698; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2VL1QbMYISihxl16I1B6paaQkzu6IE1X7CN6XwDEeHI=; b=ptY0804wfd3a84xx6pnmJcsqMc0kDM8QNeYXTdVZonaVxRFnwlAQgWiAeGj3hX9TvlWuY/ s7ruGNCYc5Hnk8C7j2Nj1RgIimA3T+0V8DjZR0shrpzF+8rWcF+w2tJS/Fixa8La+Wo6/V URWsbN3WQSSvnrbRPQIlXsWG+oNmSONZtfScE0PXgPl2f0StKioyD6GLCKmBtSRdys3bn/ hNBUkhDhyikD9pIZNOcMTPD2A+qkMR+uJA+reCTLfu6vO+ie8Z6cYqGDwJer+NKmt8xxJU mEnKaB/5Kiav+Ky3+K9iSCNx2NWR66PRT8dSWFx/n1ElHqXtnardttJJDcGKZA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748375698; a=rsa-sha256; cv=none; b=iCc6TJh32JIVozhrpM6sE847LRcKQ7C4FN8ndcAjHKh6d6QW/qZ5BbXRvEgtHgwyLgKlw8 5og+Q0Chfc0tCHb6Py8859pfOitiLi7reFcBqBkR9wz6XwhLhQRxcapaEJPkBbu36Q8Acb H6TuH1jgpfdX/i9tzsha7NpVm7YIXROhA/zn4lMWguAkKXYARZZ3haA6YFu0K/0jTtjD4m Td1EpCrZzcN561bXCeXU7WMnRg4SkwpnDQAn5vhtTOMrqLLnnshr/DYGe0NSmWSlK38SRU kNaYBRgATrfbdQc3zTB5FVBS/y17TQ875wqkq+PWIXcv0pyy+Emoua/D9a1hFQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748375698; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2VL1QbMYISihxl16I1B6paaQkzu6IE1X7CN6XwDEeHI=; b=xraPvW0uZUfkoL4AdejV1oPyWpU04FK9g/O5d/Ff6qUHcypdGdJy0/V5h2ArW3M4uQwmed lC9OKZUAO0qai1VHUk5aUeWFUBey9WOE1vzIheueRADeg1qCChzfbcju+2c9bVBx4VGtCX nWCSAuSt5iezEo24wvY6qcwmYDr5Xny5TjlK4voBMBN3EF0LOjsiTZDM2dA7ZpXMpyld1y iZUSzCi6xBcPHV7q5cvvkMqaU+FhDN7Rg3hx2nFVh6eZA/CbAUEVfIsasAKVJwWiPVKbln cKLirabPRp0fUKjmDbbdxcHjW5l1UXErd0Z3x2jWaDduUZD2EqkkQck76cW56Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b6NdY5Nrzz15bG; Tue, 27 May 2025 19:54: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 54RJsvIB028992; Tue, 27 May 2025 19:54:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54RJsvsS028989; Tue, 27 May 2025 19:54:57 GMT (envelope-from git) Date: Tue, 27 May 2025 19:54:57 GMT Message-Id: <202505271954.54RJsvsS028989@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: a49621c1d025 - main - release: Move -DNO_ROOT and -DDB_FROM_SRC into ${IMAKE} List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: a49621c1d02509fe9121b76e76656cd3a349f0b9 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=a49621c1d02509fe9121b76e76656cd3a349f0b9 commit a49621c1d02509fe9121b76e76656cd3a349f0b9 Author: Ed Maste AuthorDate: 2025-05-14 19:39:53 +0000 Commit: Ed Maste CommitDate: 2025-05-27 19:54:07 +0000 release: Move -DNO_ROOT and -DDB_FROM_SRC into ${IMAKE} All invocations specified -DNO_ROOT, so simplify by moving -DNO_ROOT directly into ${IMAKE}. Do the same for -DDB_FROM_SRC. Although it was not previously passed for all targets it is appropriate for all release artifact builds. Reviewed by: brooks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D50356 --- release/Makefile | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/release/Makefile b/release/Makefile index a9a8d0f04605..a7549284ac35 100644 --- a/release/Makefile +++ b/release/Makefile @@ -53,7 +53,8 @@ TARGET_ARCH= ${MACHINE_ARCH} TARGET_ARCH= ${TARGET} .endif .endif -IMAKE= ${MAKE} TARGET_ARCH=${TARGET_ARCH} TARGET=${TARGET} +IMAKE= ${MAKE} TARGET_ARCH=${TARGET_ARCH} TARGET=${TARGET} \ + -DNO_ROOT -DDB_FROM_SRC DISTDIR= dist # Define OSRELEASE by using newvers.sh @@ -137,7 +138,7 @@ clean: beforeclean # base.txz: # Also (if enabled) tests, compat libs, and -dbg variants for all. mkdir -p ${DISTDIR} - ( cd ${WORLDDIR} && ${IMAKE} -DNO_ROOT distributeworld DISTDIR=${.OBJDIR}/${DISTDIR} ) + ( cd ${WORLDDIR} && ${IMAKE} distributeworld DISTDIR=${.OBJDIR}/${DISTDIR} ) # Bootstrap etcupdate(8) database. sh ${WORLDDIR}/usr.sbin/etcupdate/etcupdate.sh extract -B \ -m "${MAKE}" -M "TARGET_ARCH=${TARGET_ARCH} TARGET=${TARGET}" \ @@ -149,13 +150,13 @@ base.txz: # Also (if enabled) tests, compat libs, and -dbg variants for all. env -i LC_COLLATE=C sort >> ${.OBJDIR}/${DISTDIR}/base.meta rm ${.OBJDIR}/${DISTDIR}/base/var/db/etcupdate/current/METALOG # Package all components - ( cd ${WORLDDIR} && ${IMAKE} -DNO_ROOT packageworld DISTDIR=${.OBJDIR}/${DISTDIR} ) + ( cd ${WORLDDIR} && ${IMAKE} packageworld DISTDIR=${.OBJDIR}/${DISTDIR} ) mv ${DISTDIR}/*.txz . kernel.txz: # Also (if enabled) kernel-dbg.txz. mkdir -p ${DISTDIR} - ( cd ${WORLDDIR} && ${IMAKE} -DNO_ROOT distributekernel DISTDIR=${.OBJDIR}/${DISTDIR} ) - ( cd ${WORLDDIR} && ${IMAKE} -DNO_ROOT packagekernel DISTDIR=${.OBJDIR}/${DISTDIR} ) + ( cd ${WORLDDIR} && ${IMAKE} distributekernel DISTDIR=${.OBJDIR}/${DISTDIR} ) + ( cd ${WORLDDIR} && ${IMAKE} packagekernel DISTDIR=${.OBJDIR}/${DISTDIR} ) mv ${DISTDIR}/kernel*.txz . src.txz: @@ -196,8 +197,7 @@ disc1: packagesystem ${PKGBASE_REPO} ${_ALL_LIBCOMPATS:@v@MK_LIB$v=no@} \ MK_TOOLCHAIN=no \ MK_RESCUE=no MK_DICT=no \ - MK_KERNEL_SYMBOLS=no MK_TESTS=no MK_DEBUG_FILES=no \ - -DDB_FROM_SRC -DNO_ROOT) + MK_KERNEL_SYMBOLS=no MK_TESTS=no MK_DEBUG_FILES=no) .if defined(PKGBASE) # Create offline pkgbase repo on release media mkdir -p ${.TARGET}/usr/freebsd-packages/repos/ @@ -258,8 +258,7 @@ bootonly: packagesystem ${_ALL_LIBCOMPATS:@v@MK_LIB$v=no@} \ MK_TOOLCHAIN=no \ MK_RESCUE=no MK_DICT=no \ - MK_KERNEL_SYMBOLS=no MK_TESTS=no MK_DEBUG_FILES=no \ - -DDB_FROM_SRC -DNO_ROOT) + MK_KERNEL_SYMBOLS=no MK_TESTS=no MK_DEBUG_FILES=no) # Copy manifest only (no distfiles) to get checksums mkdir -p ${.TARGET}/usr/freebsd-dist cp MANIFEST ${.TARGET}/usr/freebsd-dist @@ -290,8 +289,7 @@ dvd: packagesystem ${PKGBASE_REPO} mkdir -p ${.TARGET} ( cd ${WORLDDIR} && ${IMAKE} installworld installkernel distribution \ DESTDIR=${.OBJDIR}/${.TARGET} MK_RESCUE=no MK_KERNEL_SYMBOLS=no \ - MK_TESTS=no MK_DEBUG_FILES=no \ - -DDB_FROM_SRC -DNO_ROOT) + MK_TESTS=no MK_DEBUG_FILES=no) .if defined(PKGBASE) # Create offline pkgbase repo on release media mkdir -p ${.TARGET}/usr/freebsd-packages/repos/ From nobody Tue May 27 19:57:23 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b6NhM2PGVz5xqVM; Tue, 27 May 2025 19:57: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b6NhM1mT2z45cr; Tue, 27 May 2025 19:57:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748375843; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XF88t/UeAS1osnnOw7wsfIJchDo24I1CLNHMBjb+n6Y=; b=VnGSpcSDcstIapj7oi4H+J9Qj5ffyr4ga0z55cwdPE6hiSYtyJns/oHEBHFLJVkSoG1nQV F4ecKIas9R9qq+CdWyHs5xx8hMoWNPQ2U1//CxW+d9wEtm//75oJmVvwY+Laoel3wQqfrO Lvqg//UiPkdEbLuro2RL6cCXTKKKDurW2KUiLDsrLDQvbnIPc7TNaWM4GIm/vEZPo40+7n 9taKoNGnE1sr1ZD8ay8zSchNdEJtOp3S2CD4NXKt8LNjx7loO1+S4WJ+pmCAiLk1vYOZnm EqSuA0ZMRWY8odOPIWoMsbaw+HUA+1PF2trsgzz6+GN0OAey7AAB+ost2auWTg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748375843; a=rsa-sha256; cv=none; b=fIWTex+30+J9X9x+Q0/sr/kExvEi21iMnUG9FUibGBCI9YFRuXG60LDwwbdDAE++vzlGAc 5eySjfM7l8nRf7NpK7GoEvmY4WpQEZWapZLKk0aWOlRYt+ab2rZpcRfIwg+9lTBlXLJTuf ukD5yQYNwzStSvr5RIMK5D1PsORaJaMrOqIpa2UYX2sPfcMb/MV/FcoNHGcQrAMmFx2i2a ojJG79PtjPUBzLEtWF+O0Yk/hUxZxNyj0Y/5mijjuFad8viIlproNktWfG6Efs0nUSYAD8 4Vd1uU+LzQOZhyUe0jvtCDwdiMoi4JSoOflf7u8+5jBWEj/WrM87ptcsvJY/jw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748375843; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XF88t/UeAS1osnnOw7wsfIJchDo24I1CLNHMBjb+n6Y=; b=dXrA/2bLic1aW0Ij5fyqaVeoZ4gDaO/fJ+V37np/Xw90cZlkMbv7dpLO1793jJ71I/I7MM 1oWWMOPz/gXbT0Q3UHPu8ddgBwXMPLkZETFBkam+bTQm+EhzwF9UJiE4FRFr7cT3CvkcuV /cyaB4N1CjEH1xX2wPK2oeSZIV61UHC8WBLKQ7ATMC1V0LIeSPOvDP6RYx81Ih11QwZEDo XF3wKImuw+NMFvBF5a2IFt+STbJdosg8DQx0EiWiui+tMCiWKRqOBY6qHoA+0waVg5IkLE r5riQXeAvQi1bXqf07GvXp3rZ/mcjSwK1OlD6NRdRG8kgf9k3pVLu2k3W0KdYA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b6NhM1Lzmz15Jp; Tue, 27 May 2025 19:57: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 54RJvN5N029808; Tue, 27 May 2025 19:57:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54RJvN4T029805; Tue, 27 May 2025 19:57:23 GMT (envelope-from git) Date: Tue, 27 May 2025 19:57:23 GMT Message-Id: <202505271957.54RJvN4T029805@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 9ccf7aeaa5dc - stable/14 - LinuxKPI: 802.11: mark struct ieee80211_ht_cap __packed List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 9ccf7aeaa5dc5ceb3bf896d84ee50294b841043b Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=9ccf7aeaa5dc5ceb3bf896d84ee50294b841043b commit 9ccf7aeaa5dc5ceb3bf896d84ee50294b841043b Author: Bjoern A. Zeeb AuthorDate: 2025-05-26 23:20:20 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-05-27 19:56:50 +0000 LinuxKPI: 802.11: mark struct ieee80211_ht_cap __packed In lkpi_sta_sync_ht_from_ni() we are casting the information element (IE) data to this struct as net80211 does not save the mcs/rx_mask. Not marking the structs packed results in the mcs information not being copied correctly and rx_nss calculations possibly being off. Even worse, at a later stage iwlwifi mvm/rs.c would extract the mcs values from the same field to pass to the firmware which will than crash in an assert as we would want to do HT with an empty MCS set. Sponsored by: The FreeBSD Foundation Discovered: while testing other features on arm64. (cherry picked from commit 6cbf8a04b1864d933506301cabe213a9c918d968) --- sys/compat/linuxkpi/common/include/linux/ieee80211.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/ieee80211.h b/sys/compat/linuxkpi/common/include/linux/ieee80211.h index 396204c3c484..fe2055f05969 100644 --- a/sys/compat/linuxkpi/common/include/linux/ieee80211.h +++ b/sys/compat/linuxkpi/common/include/linux/ieee80211.h @@ -304,7 +304,7 @@ struct ieee80211_mcs_info { uint16_t rx_highest; uint8_t tx_params; uint8_t __reserved[3]; -}; +} __packed; /* 802.11-2020, 9.4.2.55.1 HT Capabilities element structure */ struct ieee80211_ht_cap { @@ -314,7 +314,7 @@ struct ieee80211_ht_cap { uint16_t extended_ht_cap_info; uint32_t tx_BF_cap_info; uint8_t antenna_selection_info; -}; +} __packed; #define IEEE80211_HT_MAX_AMPDU_FACTOR 13 #define IEEE80211_HE_HT_MAX_AMPDU_FACTOR 16 From nobody Tue May 27 20:27:29 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b6PM52kgMz5xs20; Tue, 27 May 2025 20:27: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b6PM521fPz4PDl; Tue, 27 May 2025 20:27:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748377649; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kPnzE1yJdmie9H5Mi4hAib8fhAGXM5VHLJmIHJ/rBBc=; b=STeLkfVcVJArEsKckWgZHEdyVmAeBX4JpFwwoUH1l4td2lvO4iO6vYSVKYcj85a0I6yt2u IJhe1W2scbp/1Zi1W0mFt78X8f52l640j1nT0vzTu6Jw2b3R8Joiliolzo6S210Sg2gVNN MQgqvxL9cNpyBZ2TE69O5T3GYMyeVtrGxUzw/Id+HkL8o81DKkDLm0Ym5qrFSi2qfhLHqT gcI6xo4I36u1e5+W3gjllr+l1UHAzvdI3CE72ssWTcWxDIKlRkqiSyyC/s49Qo1MFL+eKq EWalnIMA1w25cyLDvffTrZ0LVsW9XazKtOBQSKcVP4GUs07aMP9sPK4DgP/HBQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748377649; a=rsa-sha256; cv=none; b=vApTqDQMHuDJDyLk4fqA6211fmMyABJOKy4cH+Z47Eg9eHNZLeIMhWI4nQUpDg5KK0adc9 BCtO+drfvXQ2S/iJDFMJQqw6fRaXds9OUvBjk6wiSFFFwG04c9X6AFRlJjj40Ff7400mxs iqpDKwgCCGY8jrJEFpxkWfMxlCJXhanZtVkBunTzIf3YjgKbT5kgyWITpFyr5kKh0FlB+R q0GV02PXu2u84KagQX9y/zv5ZF0s3f01A+5kyqATk+PT45+0tFWTreIBOhamiehlLgQJ4K 8KV1jAP5uPeXJ1xh51gfEop5lN21fyowsek9HBZQ72t48BXG6oB3FT/1T4bG+w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748377649; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kPnzE1yJdmie9H5Mi4hAib8fhAGXM5VHLJmIHJ/rBBc=; b=ERKXodn9taOw5v/iOV484jUtd7rJc2GTbeN1l8XAkhD2XfLGUntWl0erv/yrri4VqLRw1p u+Lhq4/TEmrd/Nl6FClEIOL0Fb7OmOT8HAtmlH8j8HP93wBmQLVNpA7oQFX6W4lTz8jE8s QgLLbgYhE0Sj1RIssErBeRGL1C/wiUuAcI66lXJeH3r+bOjTPvRMXM17UzjNrcx3a0H+bL o9A9c0TgVV+eACZP9LS4McX62TxXkg5d7Yc1QQIBHthfDNScTcrcPmMzSnLM7wB3BqZhxH 7XTRWMWAK0b7L0st67A2L6vq35ZaBLzIl7g7C+ZS4NpdF/uO957dG9xz5Q7r5A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b6PM51bStz16R1; Tue, 27 May 2025 20:27: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 54RKRTi9085984; Tue, 27 May 2025 20:27:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54RKRTqj085981; Tue, 27 May 2025 20:27:29 GMT (envelope-from git) Date: Tue, 27 May 2025 20:27:29 GMT Message-Id: <202505272027.54RKRTqj085981@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: 3d516b853179 - main - Add ts(1) command List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 3d516b853179b9cc02d358410ef9b64c593022ce Auto-Submitted: auto-generated The branch main has been updated by otis: URL: https://cgit.FreeBSD.org/src/commit/?id=3d516b853179b9cc02d358410ef9b64c593022ce commit 3d516b853179b9cc02d358410ef9b64c593022ce Author: Juraj Lutter AuthorDate: 2022-07-02 15:26:42 +0000 Commit: Juraj Lutter CommitDate: 2025-05-27 20:24:22 +0000 Add ts(1) command Add /usr/bin/ts, a command that timestamps each line of its stdin before it is being printed to stdout. A typical use case is to profile shell scripts. Obtained from: OpenBSD 7.2 Relnotes: yes Reviewed by: adrian Differential Revision: https://reviews.freebsd.org/D35694 --- contrib/ts/ts.1 | 112 ++++++++++++++++++++++++++++++++++ contrib/ts/ts.c | 171 ++++++++++++++++++++++++++++++++++++++++++++++++++++ usr.bin/Makefile | 1 + usr.bin/ts/Makefile | 7 +++ 4 files changed, 291 insertions(+) diff --git a/contrib/ts/ts.1 b/contrib/ts/ts.1 new file mode 100644 index 000000000000..3406bdae9bab --- /dev/null +++ b/contrib/ts/ts.1 @@ -0,0 +1,112 @@ +.\" $OpenBSD: ts.1,v 1.6 2022/06/30 21:40:41 jmc Exp $ +.\" +.\" Copyright (c) 2022 Job Snijders +.\" +.\" 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. +.\" +.Dd June 30, 2022 +.Dt TS 1 +.Os +.Sh NAME +.Nm ts +.Nd timestamp input +.Sh SYNOPSIS +.Nm +.Op Fl i | s +.Op Fl m +.Op Ar format +.Sh DESCRIPTION +The +.Nm +utility prepends a timestamp to each line of standard input and writes +it to standard output. +.Pp +The options are as follows: +.Bl -tag -width Ds +.It Fl i +Display time elapsed since the last timestamp. +.It Fl m +Display timestamps derived from a strictly linearly increasing clock. +Without +.Fl m , +timestamps reflect the current date and time, including time jumps if the +system time is changed. +.It Fl s +Display time elapsed since the start of the program. +.El +.Pp +The optional +.Ar format +argument controls how the timestamp is displayed, according to the conversion +specifications described in the +.Xr strftime 3 +manual page. +The default format is +.Qq %b %d %H:%M:%S ; +or +.Qq %H:%M:%S +if one of the +.Fl i +or +.Fl s +options is used. +.Pp +Some additional conversion specifications are also supported +to append microsecond resolution: +.Cm %.S , +.Cm %.s , +and +.Cm %.T ; +which are similar to +.Cm %S , +.Cm %s , +and +.Cm \&%T . +Examples: +.Qq 10.00001 , +.Qq 1656427781.00001 , +and +.Qq 4:20:00.00001 . +.Sh EXAMPLES +.Bd -literal -offset indent +$ (echo foo; sleep 2; echo bar) | ts +Jun 28 12:13:38 foo +Jun 28 12:13:40 bar + +$ ls | ts -i %.S +00.000452 CVS +00.000595 Makefile +00.000004 ts.1 +00.000004 ts.c +.Ed +.Sh SEE ALSO +.Xr strftime 3 +.Sh HISTORY +A +.Nm +utility first appeared in the moreutils collection by Joey Hess, and was +rewritten from scratch for +.Ox 7.2 . +.Pp +It was imported to +.Fx +by +.An -nosplit +.An Juraj Lutter Aq Mt otis@FreeBSD.org . +.Sh AUTHORS +This +.Nm +utility was written by +.An Job Snijders Aq Mt job@openbsd.org +and +.An Claudio Jeker Aq Mt claudio@openbsd.org . diff --git a/contrib/ts/ts.c b/contrib/ts/ts.c new file mode 100644 index 000000000000..f20826176229 --- /dev/null +++ b/contrib/ts/ts.c @@ -0,0 +1,171 @@ +/* $OpenBSD: ts.c,v 1.7 2022/07/06 07:59:03 claudio Exp $ */ +/* + * Copyright (c) 2022 Job Snijders + * Copyright (c) 2022 Claudio Jeker + * + * 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. + */ + +#include +#include + +#include +#include +#include +#include +#include +#include +#include + +static const char *format = "%b %d %H:%M:%S"; +static char *buf; +static char *outbuf; +static size_t bufsize; + +static void fmtfmt(const struct timespec *); +static void __dead2 usage(void); + +int +main(int argc, char *argv[]) +{ + int iflag, mflag, sflag; + int ch, prev; + struct timespec start, now, utc_offset, ts; + clockid_t clock = CLOCK_REALTIME; + + iflag = mflag = sflag = 0; + + while ((ch = getopt(argc, argv, "ims")) != -1) { + switch (ch) { + case 'i': + iflag = 1; + format = "%H:%M:%S"; + clock = CLOCK_MONOTONIC; + break; + case 'm': + mflag = 1; + clock = CLOCK_MONOTONIC; + break; + case 's': + sflag = 1; + format = "%H:%M:%S"; + clock = CLOCK_MONOTONIC; + break; + default: + usage(); + } + } + argc -= optind; + argv += optind; + + if ((iflag && sflag) || argc > 1) + usage(); + + if (argc == 1) + format = *argv; + + bufsize = strlen(format); + if (bufsize > SIZE_MAX / 10) + errx(1, "format string too big"); + + bufsize *= 10; + if ((buf = calloc(1, bufsize)) == NULL) + err(1, NULL); + if ((outbuf = calloc(1, bufsize)) == NULL) + err(1, NULL); + + /* force UTC for interval calculations */ + if (iflag || sflag) + if (setenv("TZ", "UTC", 1) == -1) + err(1, "setenv UTC"); + + clock_gettime(clock, &start); + clock_gettime(CLOCK_REALTIME, &utc_offset); + timespecsub(&utc_offset, &start, &utc_offset); + + for (prev = '\n'; (ch = getchar()) != EOF; prev = ch) { + if (prev == '\n') { + clock_gettime(clock, &now); + if (iflag || sflag) + timespecsub(&now, &start, &ts); + else if (mflag) + timespecadd(&now, &utc_offset, &ts); + else + ts = now; + fmtfmt(&ts); + if (iflag) + start = now; + } + if (putchar(ch) == EOF) + break; + } + + if (fclose(stdout)) + err(1, "stdout"); + return 0; +} + +static void __dead2 +usage(void) +{ + fprintf(stderr, "usage: %s [-i | -s] [-m] [format]\n", getprogname()); + exit(1); +} + +/* + * yo dawg, i heard you like format strings + * so i put format strings in your user supplied input + * so you can format while you format + */ +static void +fmtfmt(const struct timespec *ts) +{ + struct tm *tm; + char *f, us[7]; + + if ((tm = localtime(&ts->tv_sec)) == NULL) + err(1, "localtime"); + + snprintf(us, sizeof(us), "%06ld", ts->tv_nsec / 1000); + strlcpy(buf, format, bufsize); + f = buf; + + do { + while ((f = strchr(f, '%')) != NULL && f[1] == '%') + f += 2; + + if (f == NULL) + break; + + f++; + if (f[0] == '.' && + (f[1] == 'S' || f[1] == 's' || f[1] == 'T')) { + size_t l; + + f[0] = f[1]; + f[1] = '.'; + f += 2; + l = strlen(f); + memmove(f + 6, f, l + 1); + memcpy(f, us, 6); + f += 6; + } + } while (*f != '\0'); + + if (strftime(outbuf, bufsize, buf, tm) == 0) + errx(1, "strftime"); + + fprintf(stdout, "%s ", outbuf); + if (ferror(stdout)) + exit(1); +} diff --git a/usr.bin/Makefile b/usr.bin/Makefile index e99670ec2d3e..787cbc0cbd78 100644 --- a/usr.bin/Makefile +++ b/usr.bin/Makefile @@ -155,6 +155,7 @@ SUBDIR= alias \ tr \ true \ truncate \ + ts \ tsort \ tty \ uname \ diff --git a/usr.bin/ts/Makefile b/usr.bin/ts/Makefile new file mode 100644 index 000000000000..4a74927fcede --- /dev/null +++ b/usr.bin/ts/Makefile @@ -0,0 +1,7 @@ +.PATH: ${SRCTOP}/contrib/ts + +PROG= ts +SRCS= ts.c +MAN= ts.1 + +.include From nobody Tue May 27 21:02:55 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b6Q7z4CR5z5xtcG; Tue, 27 May 2025 21:02: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b6Q7z3m7hz3fm7; Tue, 27 May 2025 21:02:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748379775; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bzOoXakW2Kp0U/2CObbiEJNv5ymld3nmmjhwRbaLxTc=; b=fElXqoSIA+W+Z1oPrwuChfxcPldeo5rs6iPo5LcBO4deiA3je16x4QOTiE0hyOGqCgh3c/ wpd3Whygt9mrNhZjZwIA6w2eK/kCpeoYhWsLooa65pQkPa+PE80gOa1Rd7WyGOD+4wQMXq 5TmxT5XZzbsC9vh1v0FZO+tmJ1hAmTpEW2T5wOqbZVD1uiusJkxkUpaqmrMyE8Wq3tIHA6 I4nauzHOqNm9BhyzkFcOLQX1ZM5TMsGLmILNn79m8sqLrCxYkW5WJ50M2e8lzDj8bFGXVp vFcOH4qP+ye99e/3eEBgr6IMldVgDOkL+f5IZDVQ+1hz+xbWfyl9mvktIFibEA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748379775; a=rsa-sha256; cv=none; b=wtZYxQhb/hYvUTO1TCztiLMykl3ZkBsOf/9O287yY0qSSWZLyT+OY1KSWoNCDA9LCIDEFS GLjHzN0qf2lQPVf+4cGp5j53IJjKdrroqlXwGYveepO++EphFmpkYL/WMI8NYKaduu64in kENvUQFoxUQb2BtZxvFmAwD4rk9EJdNgUNdSO8Pm8pNNSFCCZwgnuo6//M+V77ZtJLH6ri iRnehTB/l+vazwXEs0xKR7BX44r6035nLT303HefsKAnjDZ2rI2QdGL1dMCh+dkjw/VsE/ yCzs1i0K0XJi+3gv+r9IKhCQcelApuavUNhOjyWmovYoj+OVp7LdfhlmSNsYkg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748379775; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bzOoXakW2Kp0U/2CObbiEJNv5ymld3nmmjhwRbaLxTc=; b=gWs43MVRzhccnKzh80AB2ylIoHDWVgAaajETO6oAIrVd6hbdUSAF12CBI51Cb0JB24jWgn QsEvAGW8kIVeXL4tpDkbHZ7EdKVw4nAIQrmiD+Xjdgw02hFYZDv24AWVB/sM4KrvYGRtGs b3L2/CusjQkIBCruPAGnm7nXkGabodEbCqEk4uFDmCv9o18npQYOcGFTpELGmp6DUUF3hK Hq3CLWHFGYaXs6YcDOAMnVF1FMNe4Y6bbvu6t2djxuaOVd36eTkfveOpHdNNTtAgoyzPXU ssk3wTmU/t3Xbe8IR1tGZsYHxBFGJ5CwX4g41uhIGrYjVl1stBApNNRCtxmHuQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b6Q7z2lcBz17MV; Tue, 27 May 2025 21:02: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 54RL2t8j061270; Tue, 27 May 2025 21:02:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54RL2tkM061267; Tue, 27 May 2025 21:02:55 GMT (envelope-from git) Date: Tue, 27 May 2025 21:02:55 GMT Message-Id: <202505272102.54RL2tkM061267@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: adc6f56e81aa - releng/14.3 - MAC/do: Fix a too stringent debug assertion for a target of 'uid=*' List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/releng/14.3 X-Git-Reftype: branch X-Git-Commit: adc6f56e81aaca05b8ab72f07a8de6b69d9fe498 Auto-Submitted: auto-generated The branch releng/14.3 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=adc6f56e81aaca05b8ab72f07a8de6b69d9fe498 commit adc6f56e81aaca05b8ab72f07a8de6b69d9fe498 Author: Olivier Certner AuthorDate: 2025-05-27 08:20:06 +0000 Commit: Olivier Certner CommitDate: 2025-05-27 21:01:54 +0000 MAC/do: Fix a too stringent debug assertion for a target of 'uid=*' MDF_HAS_PRIMARY_CLAUSE only concerns groups, not users, and is thus not set in the latter case. This change only has an effect on INVARIANTS builds. PR: 287057 MFC after: 10 minutes Sponsored by: The FreeBSD Foundation (cherry picked from commit b5c9889e369a801ce7c1115f2535ddacbd69800d) (cherry picked from commit 30f092c40ad4eb592861839f4ffa9e9891abf1d3) Approved by: re (cperciva) --- sys/security/mac_do/mac_do.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/security/mac_do/mac_do.c b/sys/security/mac_do/mac_do.c index a83c194b24ae..9aeafa62b56d 100644 --- a/sys/security/mac_do/mac_do.c +++ b/sys/security/mac_do/mac_do.c @@ -258,7 +258,8 @@ check_type_and_type_flags(const id_type_t type, const flags_t flags) "groups specification are exclusive"; goto unexpected_flags; } - if (((flags & MDF_PRIMARY) != 0 || (flags & MDF_ANY) != 0) && + if (type == IT_GID && + ((flags & MDF_PRIMARY) != 0 || (flags & MDF_ANY) != 0) && (flags & MDF_HAS_PRIMARY_CLAUSE) == 0) { str = "Presence of folded primary clause not reflected " "by presence of MDF_HAS_PRIMARY_CLAUSE"; From nobody Tue May 27 21:36:52 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b6Qv92Jp2z5xw69; Tue, 27 May 2025 21:36: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b6Qv903fsz45Sl; Tue, 27 May 2025 21:36:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748381813; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zpWqhDQM7uVY+vNk940oNynTILkTl13C41d3Ngrl+Ec=; b=JPdIKj6Xatb3kJ7f7oAYY+diBfq1TaL1sSHoaQeSBgopgdr+0Tm8O0YPKq03LAD5Tkaw4s 7/C/FG7npc2UPoDWd64qCx7hEGTUsrNYDARMAEGoKu6lp3u8sF4TfL5KyTV6uwY/vzPkKv lMftD64Hlum4B8fGS/H0Z73133CfGdp8VHo7T8CwEhtGiy/RaWxYQZColZBRsZFxD3xKDe eO1TlI1auWhvV62aHld/hzTIpIj7MBonnKZselxGzLpCh3wMphjMgS7hWYUVU0RqsgM2Zu 3Qy/VK1uapakuPkf0MYcrgmDUVicatojoWMge65ByzztnSmDHN/hP7GF6F72cg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748381813; a=rsa-sha256; cv=none; b=H5MQg5P0B40tWYg60OGtzJv89s6yF61BRbrnE2oPVNcloDJHwd+M+tm4xiaUOgY/G0DbVC Yy1DUpVksZHweHYUmg6ZN9LggTjnk/LNCUfaKRlxLoUPSVdlcJ2GwJwpflF9IDJ7LJhQSc AdXWpagkmxib/e5X0ejf45dZDWWeQgIvF/QgVytV6Rq144FzBnKy9wa16EbfKJPJnHy24A eO50FJcztJRears81uYbkiGMPjo0l5Uzlf4NgsZ9AsObbVlL8TneigsqPGvU7cuvNIvWtW BAUtb4XCXDZMyaXJa602zW0eoSrWQeE30k1fsDUAHXFUbbg2dNBPbT5ADI1ZXw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748381813; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zpWqhDQM7uVY+vNk940oNynTILkTl13C41d3Ngrl+Ec=; b=pb7po4fgIPWxDOPTCpAht0jgyejNzkdN4iQkiHvvp7K9qCSYzwe02DJiEOGNEeOoTsbymm lf4KrL3DsUPaFUkn4GFehJfdNFHcUEZHjdRDdVHIS6L+HZGz+fpnVpWlFexKvi3Ks744O6 gxj4HUn0GruvxkPzidlXEuwFfNEI4q9TdH5y7Tc4iWH6XekKm28lWKx9MXvHWPl3zNG60z 0Uy8XBSJeCS1nIGhdK6hgTtuCVbeZQ6285uWM4bacVIXsNbHn3DPc1yyE7zG3GOQh2vVLk ibDsb5uWeJQoOgkD7vS/gN2Caq5dW1S8Btqan6XIMgnIhmT8Kf0cC+UmWOsjWw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b6Qv86bKSz17Zr; Tue, 27 May 2025 21: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 54RLaqZo017614; Tue, 27 May 2025 21: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 54RLaqW9017611; Tue, 27 May 2025 21:36:52 GMT (envelope-from git) Date: Tue, 27 May 2025 21:36:52 GMT Message-Id: <202505272136.54RLaqW9017611@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Wing Subject: git: 3701f500990a - main - write.2: sweep error code referencing disklabel(8) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3701f500990afe9cc3117c3704c5682ac20d737a Auto-Submitted: auto-generated The branch main has been updated by rew: URL: https://cgit.FreeBSD.org/src/commit/?id=3701f500990afe9cc3117c3704c5682ac20d737a commit 3701f500990afe9cc3117c3704c5682ac20d737a Author: Robert Wing AuthorDate: 2025-05-27 21:33:50 +0000 Commit: Robert Wing CommitDate: 2025-05-27 21:33:50 +0000 write.2: sweep error code referencing disklabel(8) The "-W" option for disklabel(8) was retired in: f080d33b66306419b40c2f2a879198d3d5a8d36c The ioctl used by the "-W" option, DIOCWLABEL, was retired in: 5777c5b9895805c33f1da4f72a3b5b297727888b --- lib/libsys/write.2 | 7 ------- 1 file changed, 7 deletions(-) diff --git a/lib/libsys/write.2 b/lib/libsys/write.2 index 5fea75150e3b..7ff1c42715d6 100644 --- a/lib/libsys/write.2 +++ b/lib/libsys/write.2 @@ -185,13 +185,6 @@ A signal interrupted the write before it could be completed. .It Bq Er EAGAIN The file was marked for non-blocking I/O, and no data could be written immediately. -.It Bq Er EROFS -An attempt was made to write over a disk label area at the beginning -of a slice. -Use -.Xr disklabel 8 -.Fl W -to enable writing on the disk label area. .It Bq Er EINVAL The value .Fa nbytes From nobody Tue May 27 22:44:53 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b6SPd6MNYz5y12K; Tue, 27 May 2025 22:44: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b6SPd5WSFz47rl; Tue, 27 May 2025 22:44:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748385893; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rDkopYEV0fWNKVmgv49hIL5bkOgOqTDXWOihbZ14db8=; b=Sm0E3ljadpzaWtVk6+WvzO4z04pZN3TG6QLvX//V4o03pMlihadOP8OiVb+NKHW3zO+9Vs YXID3uiFwX5z6eUQQVUW2QG1Y0KtiPWMsRTFHDZECziNl7C5iePJsPy2iT32zKx4eX8RU8 Qzmyt31FnC3h/Hf+gI53kMVOS+u+/NkuR/r75Okvkx2Sr2iKGbN+gnB3E4SftG8J62m5zl +24dIadtNpSLvxYRqpm0zlv2rQE8fq8+Xj/PHjBmjdwbybUB72F0OeAWtdFiLi7hOXaNAm mV9ZPGtDwKL3KzectApT3i2e7DaBSHFrdVr5tHL2Aj3gvvn4s8DFYx//u3Bl/Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748385893; a=rsa-sha256; cv=none; b=W/pprtsEt/bVxFLJECh9msLDsfUHtjvMiAef9qd7Ms2NDYA/SrfzEDuUCuqzxqAZ4yeFbC goGmoceQ+qUvfeOTnR1DkgYLXJHeSVrjth8TRxFqqqwKHAPLh2jFEJDtPwhXatbwA+LhNA uQ2xbUEKrtDr4skIcubonYpV2sYw0od6M7Drhvv/5p1YY1fGzOg8NB1lGCZ63bP6zjRPdL ykm+6Erjt7W+K5AcFW7i1DwyjbxjWijpWOKCMAPnxkvv0uAv9alzt6MZcQuCnk5Yn9znWn aODyaAuM0nYU6PfW6Y57yN0vzIe6COXw7wu6GR8eejUTw0NlYYNBx/B6vj2CsA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748385893; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rDkopYEV0fWNKVmgv49hIL5bkOgOqTDXWOihbZ14db8=; b=Xz4Q2PZEzVylP1/JCaFKy+qA3H5uNqKDHr3p3sXwhEjHUcZ/b44ODhhDVMup65tkPqGsUc FNfI8r2xE9hR48/VL7TAOxIdgQNzt/FXaYWquRWQ0JULezNnpTlhF1XPEWOEm5ToxjtOdm k7IWnIkq+YpUVl7uZcaIt6kQqg42yFh5Vs7SFldNckKKYaFJ9z9JLAxGZp+fgsS9yRzF57 FFenOFjxu78rcAQBcFFSTYTmueFzqZjDhcsWcVw6mqlt/aduX7Jq82sArxrCc793XFm4QN E3QFXtgq9QM4f8SGaMJIBhaX5U8HKUdpdsRVfEGda58CikvOCD9eCMQBZQighA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b6SPd4vGbz19yG; Tue, 27 May 2025 22:44: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 54RMir7o048561; Tue, 27 May 2025 22:44:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54RMir5I048558; Tue, 27 May 2025 22:44:53 GMT (envelope-from git) Date: Tue, 27 May 2025 22:44:53 GMT Message-Id: <202505272244.54RMir5I048558@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 4d66e0f8841b - releng/14.3 - LinuxKPI: 802.11: mark struct ieee80211_ht_cap __packed List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.3 X-Git-Reftype: branch X-Git-Commit: 4d66e0f8841b64e1a7d7d0250483da036ff92ab0 Auto-Submitted: auto-generated The branch releng/14.3 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=4d66e0f8841b64e1a7d7d0250483da036ff92ab0 commit 4d66e0f8841b64e1a7d7d0250483da036ff92ab0 Author: Bjoern A. Zeeb AuthorDate: 2025-05-26 23:20:20 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-05-27 22:44:20 +0000 LinuxKPI: 802.11: mark struct ieee80211_ht_cap __packed In lkpi_sta_sync_ht_from_ni() we are casting the information element (IE) data to this struct as net80211 does not save the mcs/rx_mask. Not marking the structs packed results in the mcs information not being copied correctly and rx_nss calculations possibly being off. Even worse, at a later stage iwlwifi mvm/rs.c would extract the mcs values from the same field to pass to the firmware which will than crash in an assert as we would want to do HT with an empty MCS set. Sponsored by: The FreeBSD Foundation Discovered: while testing other features on arm64. Approved by: re (cperciva) (cherry picked from commit 6cbf8a04b1864d933506301cabe213a9c918d968) (cherry picked from commit 9ccf7aeaa5dc5ceb3bf896d84ee50294b841043b) --- sys/compat/linuxkpi/common/include/linux/ieee80211.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/ieee80211.h b/sys/compat/linuxkpi/common/include/linux/ieee80211.h index 396204c3c484..fe2055f05969 100644 --- a/sys/compat/linuxkpi/common/include/linux/ieee80211.h +++ b/sys/compat/linuxkpi/common/include/linux/ieee80211.h @@ -304,7 +304,7 @@ struct ieee80211_mcs_info { uint16_t rx_highest; uint8_t tx_params; uint8_t __reserved[3]; -}; +} __packed; /* 802.11-2020, 9.4.2.55.1 HT Capabilities element structure */ struct ieee80211_ht_cap { @@ -314,7 +314,7 @@ struct ieee80211_ht_cap { uint16_t extended_ht_cap_info; uint32_t tx_BF_cap_info; uint8_t antenna_selection_info; -}; +} __packed; #define IEEE80211_HT_MAX_AMPDU_FACTOR 13 #define IEEE80211_HE_HT_MAX_AMPDU_FACTOR 16 From nobody Tue May 27 23:13:15 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b6T2M5dmrz5y24S; Tue, 27 May 2025 23:13: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b6T2M4T4bz3XgF; Tue, 27 May 2025 23:13:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748387595; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2D+5zSD7JSZ339veNxd4w7+G3N0AYEU2U5mx0Udw/34=; b=r8+OkHATeVmwrfMK+Fkw8RK+XVfhwP11SCsKXEWOdxkcW5sT7aHekqoWTLKjJRI5xeJu49 vIAH0kHspz509+xEPBwbvvAkJu2TTX9TlzCMOAmjisyO1Mwx94ZvNo0ReO6/We2+TRQmJ6 5CxBrTI+kFJ+A6qGN589em8t+Yuv01fY0RuH4UXfWzarQAtOaseuEFl0I5x6LWEzhlzFZg AVchZKw/JYEJp7UOw8iXzho7K/u0Ex4OFzyWG0n9xnTYxcdJPYuKiu+1rt2FaRAnN64Uo4 4EuScVsqHpVVQsYo3lDJ9dIbIdeGHMfAd4NSzKghfDCsXEE/59+ndK+n3j3rCA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748387595; a=rsa-sha256; cv=none; b=Dg34Rf/3LOOzLGFKYmz1B5k0CPutL2kcZtzGvNItzYvbsHyaWovchHuZdHHfmyPVpEBE8J Reary0XhEbiQwaImd5gbSHbIk0sVQqx7i1cusVvwP+kIJ6GPwUuDNPXdUD+y7Kk9c+X6Hb NUbY2yF7B6WCwXxpcZ5jlsOfMLNapCpPzuOW8mbColFl+uhrFnTjG6Sw0Ei3ho+EE+8FpG vKeJio0Qo7LP0Mp9SrxY2Nng91gigC4eAWmMjnrOuQCh5ZXJq16Hmz2wsM2uCr+gqXJzme NFKqq0DFiWpaBMn4/eqGg1+Wf1btRSadW12qkoRUh9zuJAX4HaU/+Li3veVvUQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748387595; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2D+5zSD7JSZ339veNxd4w7+G3N0AYEU2U5mx0Udw/34=; b=Gw6ErT76uhuFdLkk0MEbJjq51nYUcNE9VfiWutH02yTWYawhovTFiFLvpz9HJQxNdxm1PD hRSboz35apOHYxM96sJOq3rJwp+/Hcy6J8B0+olzE0lIA0dTHlvidlOw6DcVqrXZE8MnEG UZEBIAyOAzgfH9AlXPM/TKACaet9ZvI+fqVrI6sIY8R4NllblnHafuQP0NiuOWRaP3s2X1 R3xUCuEn5nSvSjpvJ2FexoeZBYEwZH7ZZ+PD9ukpVbK1WaLN8yTAFrwRBYXfKxJJ+lISCf SsXMiLF4WC8M3/zHkhhxCOhzOig0kPcKf3Kkjn+8c1mkG5f5p9uRYaXN+kBKAg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b6T2M3nQfz1BKF; Tue, 27 May 2025 23:13: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 54RNDFSm004381; Tue, 27 May 2025 23:13:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54RNDFNF004378; Tue, 27 May 2025 23:13:15 GMT (envelope-from git) Date: Tue, 27 May 2025 23:13:15 GMT Message-Id: <202505272313.54RNDFNF004378@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Wing Subject: git: c0f7e69d60d4 - main - tools/diag/prtblknos: fix build List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c0f7e69d60d48c17916ce5c2578808ce959ecc32 Auto-Submitted: auto-generated The branch main has been updated by rew: URL: https://cgit.FreeBSD.org/src/commit/?id=c0f7e69d60d48c17916ce5c2578808ce959ecc32 commit c0f7e69d60d48c17916ce5c2578808ce959ecc32 Author: Robert Wing AuthorDate: 2025-05-27 23:12:04 +0000 Commit: Robert Wing CommitDate: 2025-05-27 23:12:04 +0000 tools/diag/prtblknos: fix build The build was broken by two separate changes: aa90fbed151de512ab6e59f75df009533a15751f 772430dd67955850942d689714ab982da24257ba --- tools/diag/prtblknos/main.c | 7 +------ tools/diag/prtblknos/prtblknos.c | 4 ---- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/tools/diag/prtblknos/main.c b/tools/diag/prtblknos/main.c index c04b0812d6c6..bfd28206a555 100644 --- a/tools/diag/prtblknos/main.c +++ b/tools/diag/prtblknos/main.c @@ -32,11 +32,6 @@ #include #include -union dinode { - struct ufs1_dinode *dp1; - struct ufs2_dinode *dp2; -}; - void prtblknos(struct fs *fs, union dinode *dp); struct uufsd disk; @@ -81,7 +76,7 @@ main(int argc, char *argv[]) if (ufs_disk_fillout_blank(&disk, fsname) == -1 || sbfind(&disk, 0) == -1) err(1, "Cannot access file system superblock on %s", fsname); - fs = (struct fs *)&disk.d_sb; + fs = (struct fs *)&disk.d_sbunion.d_sb; /* remaining arguments are inode numbers. */ while (*++argv) { diff --git a/tools/diag/prtblknos/prtblknos.c b/tools/diag/prtblknos/prtblknos.c index e0d7a7389b48..acd0c1e1a61d 100644 --- a/tools/diag/prtblknos/prtblknos.c +++ b/tools/diag/prtblknos/prtblknos.c @@ -33,10 +33,6 @@ #include #ifdef PRTBLKNOS -union dinode { - struct ufs1_dinode dp1; - struct ufs2_dinode dp2; -}; extern struct uufsd disk; #else /* used by fsdb */ #include From nobody Wed May 28 00:25:50 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b6Vf72fP2z5wcSW; Wed, 28 May 2025 00:25: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b6Vf65s8Bz3bTH; Wed, 28 May 2025 00:25:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748391950; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EbBG+dg5/NDBltksJuqvEkUP61FSw5oonBqpElwUUXk=; b=w6Ax2FTaJqvMMI4/l8AGuMwdRDCWLT6avRFWnWD8KWmiJEuPf/kbx3qHc3lHyxFStXbkpA vFVTabOkYilaiFFzy9C53KTk34FLz4K9dhkqw0PA8F+pJ75eW1ksST0gxUqVg/9SbGL/gr DUPAlE754ffUifdskRDYSeN98l/cribmh82JFExx4yCdlE8mIWRNHYQWPypXvx7Guogy9Z UNy0AtXIO8ukBKX2BzHbaSJIzFMnkZRizlPEk6AwM/TouxEERW3HVhYuDSLH3INZS76YDW 6QOBuhJgBbdwttazu6yPdDM6rsaaLRLYhGWBE42Wlk2SN2bXjtIpBik+EvLt6Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748391950; a=rsa-sha256; cv=none; b=kEf9o6X0DuMNH6swso+6jmv5lO/Ar+o1p6aG+FDIYNc2TF5ZysD+WHK9vykbs1rg1iovcy DfUiTkxHl6TxnjxkWQpf1QfOt4kftMQFWKr2gQ9BqBWzQDuUncmAr6Byjdk1OnPVfurPDK KPUIb4ja1UoidknIv/p6q+vNItA/hFd9Rl8cTzMxPIf1ppgbJ9P4TsdyHZqGHHlzrTXDKs 2Vg3+zIguHKimFWZESR5CyOzIiRioVhKzgwECHA3fU9Ny5D2ETcIUSTkBltomyYp9JOeyV 8FjFRgww8CO72jhKQ4ruWcj/fbsu9eukinLIPTm0nqDMnTW5grPCDSqa1pYjAA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748391950; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EbBG+dg5/NDBltksJuqvEkUP61FSw5oonBqpElwUUXk=; b=wvY2sREDhsvBdqTCvFHfjaRcXyUQoQhyYKNPmo5iSOoNp9O3az5x8S78quG8A48ILcsq/l Y7EPuTkj2uOYWV+IzkzZwTkBCruyexcmlcI4qshSC/3WkQsrGwah3bDcUppbtIQmR23FmD rsCaZXXY2fuavEiXilYhhgZw0q+xfJu/VaU1cRSk1ZsmZW9WJKix7XXwMKxf+nYqeT9pMB FkLH1HnkjfuTozWnSusMl/8rsCejp9Z1kyVrd4a0Ykf6tYISi/XTX0o7AjKIDD5W5CTqzs T4VOl1U1f4+heUQfCqr3K16332m5ivHABH8igNwuBQovzMWzAYDOgfxjo8a5HQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b6Vf64gk5zgm; Wed, 28 May 2025 00:25: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 54S0PoU8035783; Wed, 28 May 2025 00:25:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54S0PovR035780; Wed, 28 May 2025 00:25:50 GMT (envelope-from git) Date: Wed, 28 May 2025 00:25:50 GMT Message-Id: <202505280025.54S0PovR035780@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: 50789d0b600b - main - tests/netinet: fix several tests that depended on connect(INADDR_ANY) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 50789d0b600bd2c1f9ea50b401473e3fd8b60851 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=50789d0b600bd2c1f9ea50b401473e3fd8b60851 commit 50789d0b600bd2c1f9ea50b401473e3fd8b60851 Author: Gleb Smirnoff AuthorDate: 2025-05-28 00:24:59 +0000 Commit: Gleb Smirnoff CommitDate: 2025-05-28 00:24:59 +0000 tests/netinet: fix several tests that depended on connect(INADDR_ANY) Fixes: cd240957d7ba43d819e9d59c6f6517fe915102c7 --- tests/sys/netinet/socket_afinet.c | 3 ++- tests/sys/netinet/tcp_implied_connect.c | 1 + tests/sys/netinet/udp_io.c | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/sys/netinet/socket_afinet.c b/tests/sys/netinet/socket_afinet.c index 6fc98d982602..9c718fc5a901 100644 --- a/tests/sys/netinet/socket_afinet.c +++ b/tests/sys/netinet/socket_afinet.c @@ -550,7 +550,8 @@ bind_connected_port_test(const atf_tc_t *tc, int domain) error = getsockname(sd[0], sinp, &(socklen_t){ sinp->sa_len }); ATF_REQUIRE_MSG(error == 0, "getsockname failed: %s", strerror(errno)); - + if (domain == PF_INET) + sin.sin_addr.s_addr = htonl(INADDR_LOOPBACK); error = connect(sd[1], sinp, sinp->sa_len); ATF_REQUIRE_MSG(error == 0, "connect failed: %s", strerror(errno)); tmp = accept(sd[0], NULL, NULL); diff --git a/tests/sys/netinet/tcp_implied_connect.c b/tests/sys/netinet/tcp_implied_connect.c index 6e8cb0606a0a..d03d6be4fb92 100644 --- a/tests/sys/netinet/tcp_implied_connect.c +++ b/tests/sys/netinet/tcp_implied_connect.c @@ -51,6 +51,7 @@ ATF_TC_BODY(tcp_implied_connect, tc) ATF_REQUIRE(bind(s, (struct sockaddr *)&sin, sizeof(sin)) == 0); len = sizeof(sin); ATF_REQUIRE(getsockname(s, (struct sockaddr *)&sin, &len) == 0); + sin.sin_addr.s_addr = htonl(INADDR_LOOPBACK); ATF_REQUIRE(listen(s, -1) == 0); #if 0 /* diff --git a/tests/sys/netinet/udp_io.c b/tests/sys/netinet/udp_io.c index 27cd02735ed4..04f9bf56ed02 100644 --- a/tests/sys/netinet/udp_io.c +++ b/tests/sys/netinet/udp_io.c @@ -52,6 +52,7 @@ udp_socketpair(int *s) ATF_REQUIRE((c = socket(PF_INET, SOCK_DGRAM, 0)) > 0); ATF_REQUIRE(bind(b, (struct sockaddr *)&sin, sizeof(sin)) == 0); ATF_REQUIRE(getsockname(b, (struct sockaddr *)&sin, &slen) == 0); + sin.sin_addr.s_addr = htonl(INADDR_LOOPBACK); ATF_REQUIRE(connect(c, (struct sockaddr *)&sin, sizeof(sin)) == 0); s[0] = b; From nobody Wed May 28 00:27:05 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b6VgZ1r3bz5wcQJ; Wed, 28 May 2025 00:27: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b6VgY4sYPz3cj4; Wed, 28 May 2025 00:27:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748392025; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5EUsJ8RmDCHdNGGvYijDRKI5rDAlLbaC1QiNtGjuqYo=; b=m8PWno5FpDieuaLkaP+xBhjp49x8a8kLZYRodqP3W5+JNUfRFPQFgYjIFR0LshrN4CrBZx 9R+ZP1K8b83GRNaMPzZwrfPzxjXiZa00k79yVxSVdvwsLjcDbjEmgPvpusjs51Gk8Qwghg aVg4piHLWXUT7HUIpfHyLY6UYh2pj2Eip5DGdCXMUM+ed1IGgRoCuABoCevngxh3bLmvie 6wuyqaEWhX02sx8FRpB9plq2TVXkESnN/bcmUSRNVHt5hR2ZTqSNILRaWjae59s9o1sUuy kciERpRlE6Vzox8drevTKjYLF8kgH2ca5DeoA5GyT44yhxIfpagVZ66iYWa1Eg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748392025; a=rsa-sha256; cv=none; b=GHqQYs8uqLAlWGbLiGMjri3JhEjIFIkbQ+SYL7VFPYcm4T32xzcpN2GLGtLvNES3o9vNZS w4Yph93VdJHDU4SmsOAzgbB2n0RrJdYTl6iDyHatXOOv1BkUqwhaXR7gpjy0Vsnbl7SY+B OYmINFJIQ1dLo8+cI9k8UMNMN8rP8FcjApX/8P9T65Dx5s+uxemvRgeGV0x6z25UaXh7Tg K77anI7k5ImRPKwYpMNbuCYv9JZgkTJeXO9xSLaHSH8g5vV2dK/5Vu8R2ynZ6V/zeY007y iWsTMp3u+y0zKMnzvkxxeZGcsWVQ1aVFeDySYmm3wCHecf3AGTZIQQi4Axyugg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748392025; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5EUsJ8RmDCHdNGGvYijDRKI5rDAlLbaC1QiNtGjuqYo=; b=I03kziEk7SIyRPyenONId98SyckuuYi7p8D2BvsmlFUy4ZCE3moI66KVim6v2YS/FSoByt 1j/McAGs90+x324p+SDIB9So6GJZ5o/HcQ3D/AexEmaxjUEmLVmOYsfOYRMRNCUFCT10Ky UuQ9VewXBZSXGEbq9RyiAUOMoRQfF/MWGFp6nyjI8Gzilv9+6sqsW2xhPp3AlB8ESNwumr 7dvg4nEYjCy6gxhwCV4kLJEA/7/e/a1K1Hzo1slOL/tSEmMUfI0PKRISadKPR2X9rz0J7w UaLy44Y/OX77sPaXzX6SMgdrZCFnPI1nWhhht6snFl65HxQZuyNBEpurrNZBEA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b6VgY4SzzzYw; Wed, 28 May 2025 00:27: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 54S0R5gr036270; Wed, 28 May 2025 00:27:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54S0R5X4036267; Wed, 28 May 2025 00:27:05 GMT (envelope-from git) Date: Wed, 28 May 2025 00:27:05 GMT Message-Id: <202505280027.54S0R5X4036267@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Motin Subject: git: f23326ff2c7c - stable/14 - systat/top: Update ZFS sysctl names List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mav X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f23326ff2c7cad9579061291b6de7feb5ea7302a Auto-Submitted: auto-generated The branch stable/14 has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=f23326ff2c7cad9579061291b6de7feb5ea7302a commit f23326ff2c7cad9579061291b6de7feb5ea7302a Author: Alexander Motin AuthorDate: 2025-05-25 18:23:54 +0000 Commit: Alexander Motin CommitDate: 2025-05-28 00:26:52 +0000 systat/top: Update ZFS sysctl names Some of ARC statistic sysctls changed years ago, but those tools are still using legacy shims, that are going to be removed. MFC after: 3 days (cherry picked from commit 8aad1e6148d3389df100bb0391e2d3a909f26ecf) --- usr.bin/systat/main.c | 6 +++--- usr.bin/top/machine.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/usr.bin/systat/main.c b/usr.bin/systat/main.c index 889ce39a6c32..ade0f41b0b2a 100644 --- a/usr.bin/systat/main.c +++ b/usr.bin/systat/main.c @@ -304,9 +304,9 @@ display(void) size_t size = sizeof(arc[0]); if (sysctlbyname("kstat.zfs.misc.arcstats.size", &arc[0], &size, NULL, 0) == 0 ) { - GETSYSCTL("vfs.zfs.mfu_size", arc[1]); - GETSYSCTL("vfs.zfs.mru_size", arc[2]); - GETSYSCTL("vfs.zfs.anon_size", arc[3]); + GETSYSCTL("kstat.zfs.misc.arcstats.mfu_size", arc[1]); + GETSYSCTL("kstat.zfs.misc.arcstats.mru_size", arc[2]); + GETSYSCTL("kstat.zfs.misc.arcstats.anon_size", arc[3]); GETSYSCTL("kstat.zfs.misc.arcstats.hdr_size", arc[4]); GETSYSCTL("kstat.zfs.misc.arcstats.l2_hdr_size", arc[5]); GETSYSCTL("kstat.zfs.misc.arcstats.bonus_size", arc[6]); diff --git a/usr.bin/top/machine.c b/usr.bin/top/machine.c index a76d77a80ce4..07a7119ad0c2 100644 --- a/usr.bin/top/machine.c +++ b/usr.bin/top/machine.c @@ -537,11 +537,11 @@ get_system_info(struct system_info *si) if (arc_enabled) { GETSYSCTL("kstat.zfs.misc.arcstats.size", arc_stat); arc_stats[0] = arc_stat >> 10; - GETSYSCTL("vfs.zfs.mfu_size", arc_stat); + GETSYSCTL("kstat.zfs.misc.arcstats.mfu_size", arc_stat); arc_stats[1] = arc_stat >> 10; - GETSYSCTL("vfs.zfs.mru_size", arc_stat); + GETSYSCTL("kstat.zfs.misc.arcstats.mru_size", arc_stat); arc_stats[2] = arc_stat >> 10; - GETSYSCTL("vfs.zfs.anon_size", arc_stat); + GETSYSCTL("kstat.zfs.misc.arcstats.anon_size", arc_stat); arc_stats[3] = arc_stat >> 10; GETSYSCTL("kstat.zfs.misc.arcstats.hdr_size", arc_stat); GETSYSCTL("kstat.zfs.misc.arcstats.l2_hdr_size", arc_stat2); From nobody Wed May 28 00:28:55 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b6Vjh1BvBz5wcbK; Wed, 28 May 2025 00:28: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b6Vjg48qbz3f9p; Wed, 28 May 2025 00:28:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748392135; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=A7GW0L23IwIS9Oj2W/i1nTDX5LH92WZF36bU+azgLBY=; b=WFGjUZ27sZXIXwZ6tY31hfOypPMXw1WoLeBzG7r4uZ0p5N4jCP/As8sreDlAoPnoDQEJWP Mb/sto3rzUvfuOcaGTlNKInCvadzjFrDSh51qbB7QYz9Gp8nd/5r/y2Tim2KpdJ9GOrUza kgWpqslvi3n6HZb63H0QvLCHwxh49EJfxCLY400Gf9ID78q6TTDilGnK/x+CYWeM9L7IRt NbvLC9ebq1ATBHQ+tlql1SNGNaSfwIwWILL5dI78iY+fU/ZqgFCPYp4fuffDEVjcbXg9Bn h/sIsJtPFbSjAbRBM3Z44MPOecYeNQVds0wtkAjc0z3h5+7nlodsAAv1AiV6/w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748392135; a=rsa-sha256; cv=none; b=rH2wI3X0MdEMRProE8KSWbtfSneGaQ/eRt7PjGHhqBSHxm89baor6y5vaXHpc47gQWZgmF lpnfB7PdsQTPzvfG0EyygUwFL/fHFiBDwtbnhLXKk4qAyUl85RRK8fU1FoFrRuRNTIk06e imgzzoYtuGNFrBinPnFPgvFnoTUZA8o89zZigGUgSOFWA0MX+sJwwV+V3H7va5oFhE7pYt nODrJ2XQPY0COaOKq0TR3RRFESJK5q8rAt77f8a5eleO+mKUixVvIStqO/SVn0woROyte5 fpVRo9Hybbo0tepdK04VTVap1qazeCg9dJ08aM2iD3THiq8U4ALlsTRQ/67VLw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748392135; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=A7GW0L23IwIS9Oj2W/i1nTDX5LH92WZF36bU+azgLBY=; b=hHtkIQ/DleKYgcSjfvpCDqV2u0yF7ejo8x25OjCH6KmEAONiS60Y4k5xtIsDUCCS82CZmF 6LsaKS+GQ30CWeUPmwpcLxgyKe+b6T4e8+Olnd46syRz4SssfdzpWfi2j6vI4BbNlqnXwG hi65WHs63/kg9oZf8z2s3dHi7E0irf1DYF1FS5Y0ymKKt9VPdcoIObnBWCipyPfQqNg7qD 6V3OJ/AqPe4BFPd2dIKOf9ChOSZ1wumzI94hQkuFbArW7csNL16z/WynWLS8V5/Bzb+fr8 2N3DXnTVap36qPzbUqLmNsGtHfJ6S3ILPp7hTytHEIRRwLv3cf5uvxMi8wwnxQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b6Vjg3NppzRm; Wed, 28 May 2025 00:28: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 54S0StnM036888; Wed, 28 May 2025 00:28:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54S0StOk036885; Wed, 28 May 2025 00:28:55 GMT (envelope-from git) Date: Wed, 28 May 2025 00:28:55 GMT Message-Id: <202505280028.54S0StOk036885@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Motin Subject: git: c92ffde748d5 - stable/13 - systat/top: Update ZFS sysctl names List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mav X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: c92ffde748d5fa397964fbc4c1f6766858aeb337 Auto-Submitted: auto-generated The branch stable/13 has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=c92ffde748d5fa397964fbc4c1f6766858aeb337 commit c92ffde748d5fa397964fbc4c1f6766858aeb337 Author: Alexander Motin AuthorDate: 2025-05-25 18:23:54 +0000 Commit: Alexander Motin CommitDate: 2025-05-28 00:27:55 +0000 systat/top: Update ZFS sysctl names Some of ARC statistic sysctls changed years ago, but those tools are still using legacy shims, that are going to be removed. MFC after: 3 days (cherry picked from commit 8aad1e6148d3389df100bb0391e2d3a909f26ecf) --- usr.bin/systat/main.c | 6 +++--- usr.bin/top/machine.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/usr.bin/systat/main.c b/usr.bin/systat/main.c index e6fc79b7ba59..be580aa2794e 100644 --- a/usr.bin/systat/main.c +++ b/usr.bin/systat/main.c @@ -296,9 +296,9 @@ display(void) size_t size = sizeof(arc[0]); if (sysctlbyname("kstat.zfs.misc.arcstats.size", &arc[0], &size, NULL, 0) == 0 ) { - GETSYSCTL("vfs.zfs.mfu_size", arc[1]); - GETSYSCTL("vfs.zfs.mru_size", arc[2]); - GETSYSCTL("vfs.zfs.anon_size", arc[3]); + GETSYSCTL("kstat.zfs.misc.arcstats.mfu_size", arc[1]); + GETSYSCTL("kstat.zfs.misc.arcstats.mru_size", arc[2]); + GETSYSCTL("kstat.zfs.misc.arcstats.anon_size", arc[3]); GETSYSCTL("kstat.zfs.misc.arcstats.hdr_size", arc[4]); GETSYSCTL("kstat.zfs.misc.arcstats.l2_hdr_size", arc[5]); GETSYSCTL("kstat.zfs.misc.arcstats.bonus_size", arc[6]); diff --git a/usr.bin/top/machine.c b/usr.bin/top/machine.c index a76d77a80ce4..07a7119ad0c2 100644 --- a/usr.bin/top/machine.c +++ b/usr.bin/top/machine.c @@ -537,11 +537,11 @@ get_system_info(struct system_info *si) if (arc_enabled) { GETSYSCTL("kstat.zfs.misc.arcstats.size", arc_stat); arc_stats[0] = arc_stat >> 10; - GETSYSCTL("vfs.zfs.mfu_size", arc_stat); + GETSYSCTL("kstat.zfs.misc.arcstats.mfu_size", arc_stat); arc_stats[1] = arc_stat >> 10; - GETSYSCTL("vfs.zfs.mru_size", arc_stat); + GETSYSCTL("kstat.zfs.misc.arcstats.mru_size", arc_stat); arc_stats[2] = arc_stat >> 10; - GETSYSCTL("vfs.zfs.anon_size", arc_stat); + GETSYSCTL("kstat.zfs.misc.arcstats.anon_size", arc_stat); arc_stats[3] = arc_stat >> 10; GETSYSCTL("kstat.zfs.misc.arcstats.hdr_size", arc_stat); GETSYSCTL("kstat.zfs.misc.arcstats.l2_hdr_size", arc_stat2); From nobody Wed May 28 00:56:22 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b6WKL6T9bz5wfhM; Wed, 28 May 2025 00:56: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b6WKL4ww3z41GK; Wed, 28 May 2025 00:56:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748393782; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8bHkL/gVvNFaaLjn0/CqQuTfDrt/2h4wT+35DWZTumw=; b=dE0lR4A8jCFqyb4Zo6MRbOA35NQcUYYzJiCb9OPPS6g6BUfrvLmuBouE9dnNDp7RZR2LPA tk4JlnvfZSwt1sVMMNTat6fOdOe8PCqL8CjIiT8GhK3GzNCFhnfum+TFQ0/CujnyCs9hw6 UbV5Sx8brt8NaycFdQkn3WdjrPDJ1T7df8ngvfBVejWFsnBMP+nRD6H32LA3jFrdi0ImsA phgjXway4lof5zpWfNNO/+OdsZHaUFX3dv/8xkpCVMpa7OO1JzKSVfiTTcMKVbqUCd3laH rZbi4BXlBG7hGYLW9Wg5M7sRF5t1s4gtzoZATcmAYHgnt/EnA1S1mqXdQLxAIw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748393782; a=rsa-sha256; cv=none; b=H3mfXbfiPJ2FZ/vJPqjdmhoJ4nCc0iJkoIy4XkU+nOobF0DyyX6Ea3qxG+XbtJqy6RhmXF 8JRDmLgfEHzgeJzTCCbFg8cCPLi5MXubRKARGWw/9K/EixXZWN0dUuwLw/GikzhqlT6w07 lQH8YbCHgs7HT1o1jOjZ86xIZ6tHyr0UI6bUboGn5PNOcukCCp4nYrLGgRh0iAWj7kjSOY kZD5onSucEOetI7hIQ7RGXLJj8EbI9kWZo60B+EkgCIC/3YU15T2BjEQfEfvrCv8TyvUir 59BX5+kPbLvaDdDlX2915mc7I0ei5LwxMQaNtYW+5IxHr1FKx60Rq/15Pjsrxw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748393782; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8bHkL/gVvNFaaLjn0/CqQuTfDrt/2h4wT+35DWZTumw=; b=JDuseNb1whRA703jH2pVA8kw1Uju2Cd02Bi64mhLAY2l/wNhGfCBZRUvsz8SX2/Y2u6Iok 5xhVOF68hPt160s7iZPBH5S9+p4u0zAdTKuvKlumZyFhpHJhXFiZb5sgSo6gkiFanesC6H 1TzH7T0vsjlzFYrc/uRXO+5kEmNVqEHRewrh6R3ljxRZm/kk/mxDh5nQ2HTBpjqhBwnsvx CsRokcE7uo4jD63dVQ06EVlUfGONfmYZjNcIlLdE/2CUAnkFjmoHQPO89w8eBxLpWHIKCy kaBh6LWr12d0GeEyRRtsqFfx7kZlrLhpYz9i+USL0ZH5sPLmqiRSPrQgbaRNGw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b6WKL4W8nz1Ls; Wed, 28 May 2025 00:56: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 54S0uMHe092041; Wed, 28 May 2025 00:56:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54S0uM7i092038; Wed, 28 May 2025 00:56:22 GMT (envelope-from git) Date: Wed, 28 May 2025 00:56:22 GMT Message-Id: <202505280056.54S0uM7i092038@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Wing Subject: git: e623b0dc6552 - main - newfs: remove write-only variable List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e623b0dc6552218369b34bd7884304c7481d4b9a Auto-Submitted: auto-generated The branch main has been updated by rew: URL: https://cgit.FreeBSD.org/src/commit/?id=e623b0dc6552218369b34bd7884304c7481d4b9a commit e623b0dc6552218369b34bd7884304c7481d4b9a Author: Robert Wing AuthorDate: 2025-05-28 00:55:49 +0000 Commit: Robert Wing CommitDate: 2025-05-28 00:55:49 +0000 newfs: remove write-only variable --- sbin/newfs/newfs.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/sbin/newfs/newfs.c b/sbin/newfs/newfs.c index 49bd8b7dc4b6..9c45c9150955 100644 --- a/sbin/newfs/newfs.c +++ b/sbin/newfs/newfs.c @@ -105,7 +105,6 @@ struct uufsd disk; /* libufs disk structure */ static char device[MAXPATHLEN]; static u_char bootarea[BBSIZE]; static int is_file; /* work on a file, not a device */ -static char *dkname; static char *disktype; static void getfssize(intmax_t *, const char *p, intmax_t, intmax_t); @@ -330,7 +329,6 @@ main(int argc, char *argv[]) if ((st.st_mode & S_IFMT) != S_IFCHR) { warn("%s: not a character-special device", special); is_file = 1; /* assume it is a file */ - dkname = special; if (sectorsize == 0) sectorsize = 512; mediasize = st.st_size; From nobody Wed May 28 01:16:40 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b6Wmn0bs2z5wgYt; Wed, 28 May 2025 01:16: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b6Wmm6n6gz4GB2; Wed, 28 May 2025 01:16:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748395001; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1bJ9r3h91eYJFqpMDz+XLGiMAboifmc8sAoKEeREw64=; b=qW1Cy0QgykshwXjygZM6403+M/okQI4sc1FM9G85nvvnoh9CAbaGak2M3DBimu8NIcJ1lX G5I1CX4MBOdcatvPsiV014Ddzs1hyL3RkRNiQ1P39CyszvIS0oM1hDGNQbbhhcXHUOt/3o RzHBbqPukSOhaNkhNHbpZpRPVeDGzALT+Vj6NN9Lu3Vpm+rQ1PtcYeFaV5Xvt10LnYOjq5 Z5Ll31Wbia5+k/I1uUxzSmMwQ0BAa7GERIX8DKZqw8EpGl35GE+Zh82F5il1TmW6Eq2jPI WqJLQfpn9mnpOOUs8/pEWuIh2NuWtM7vczMEETiV5/6m84kOa5NOIQEnibkgig== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748395001; a=rsa-sha256; cv=none; b=GOEujDApee9njYFYZRY9etna9/by5OMjS6pqBvp/wQHhFq4XHisc5Fis7x3hjf6NjoKQ/4 989joL4DCEYfBxOJZZkH4hnnb/2MrAj5TWrrbzk/Hu0XLuKbvBZtOqrlu5pY9oR2amWZm3 UPXnaCkCNCUT0EwTni1DQwsc5v0vpAtQeH9xSd7toJJ//ey+freMa3aAGiT0kphZAqupUr ov2F0oV0dE6BQAKrT2tSVljHgPpe6+NKl7LtGpgRQRPDfPNBME5GNCxyY5jITkUX3pdezE K4jG/O5ru8Y69wOBKWT2G8ja0eWXL+eJlU8XwC9O6eFUTnGmM75PwBOTnWEtJQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748395001; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1bJ9r3h91eYJFqpMDz+XLGiMAboifmc8sAoKEeREw64=; b=FjaXlzr3G2Te7yFHGW5hSvbznwUmP1S3vFOvf/XeqcUZwjjEm9jyhcv/Wl2/lfzZw1sWb9 lCZ5yUlKaOfKExd7cgoZv6bkvxVElBSqfpG8afZ07kEzdlvxy8UDVOrLiGs3z7rbsRtdpJ 59pkXSf11TSh9ZsFzhCjerbx3Jx4aEwkpZkdreKluWGnNBwhLlzHtJimYmJHvkYxK0C4o3 2S2k4MgElDaZl5cR13WbgihhpsUjnUnhWZwfjxO9rMI8ICDsqQC7nVU8wbNtjXMHQYGLWi qpg+aYxsr5wyHQ0Hr5kZm7+vpwvFT2e06rk1lIVYgFMFhY7X9FuONV68sbJCmw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b6Wmm5VPpz1rp; Wed, 28 May 2025 01:16: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 54S1Ge4k030866; Wed, 28 May 2025 01:16:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54S1Ge9A030863; Wed, 28 May 2025 01:16:40 GMT (envelope-from git) Date: Wed, 28 May 2025 01:16:40 GMT Message-Id: <202505280116.54S1Ge9A030863@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: 76a612526c84 - main - packages: move ctl{d,stat,adm} to the ctl package List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 76a612526c8477188f41825346f99a8382e70543 Auto-Submitted: auto-generated The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=76a612526c8477188f41825346f99a8382e70543 commit 76a612526c8477188f41825346f99a8382e70543 Author: Lexi Winter AuthorDate: 2025-05-27 07:17:21 +0000 Commit: Lexi Winter CommitDate: 2025-05-28 01:16:29 +0000 packages: move ctl{d,stat,adm} to the ctl package This leaves the iscsi package for the iSCSI initiator, and the new package provides the CAM target layer (including the iSCSI target). Reviewed by: manu, des, jhb Approved by: des (mentor) Differential Revision: https://reviews.freebsd.org/D50287 --- UPDATING | 5 +++++ libexec/rc/rc.d/Makefile | 9 ++++++--- usr.bin/ctlstat/Makefile | 1 + usr.sbin/ctladm/Makefile | 2 +- usr.sbin/ctld/Makefile | 2 +- 5 files changed, 14 insertions(+), 5 deletions(-) diff --git a/UPDATING b/UPDATING index c492082383f8..7efea1207e11 100644 --- a/UPDATING +++ b/UPDATING @@ -27,6 +27,11 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 15.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".) +20250527: + ctld(8), ctladm(8) and ctlstat(8) have moved to the new FreeBSD-ctl + package. If you use pkgbase and you need the CAM Target Layer, you + should install the new package. + 20250521: Commit e64fe5ad3a23 removed in6_maxmtu and its setter in6_setmaxmtu(). in6_maxmtu is used to store the max IPv6 MTU of all interfaces, diff --git a/libexec/rc/rc.d/Makefile b/libexec/rc/rc.d/Makefile index 67786672351a..d463a0732c52 100644 --- a/libexec/rc/rc.d/Makefile +++ b/libexec/rc/rc.d/Makefile @@ -260,10 +260,13 @@ NATDPACKAGE= natd .if ${MK_ISCSI} != "no" CONFGROUPS+= ISCSI -ISCSI= iscsictl \ - iscsid \ - ctld +ISCSI= iscsictl \ + iscsid ISCSIPACKAGE= iscsi + +CONFGROUPS+= CTL +CTL= ctld +CTLPACKAGE= ctl .endif .if ${MK_JAIL} != "no" diff --git a/usr.bin/ctlstat/Makefile b/usr.bin/ctlstat/Makefile index aa7c6f2a2641..e1cf3a1f142f 100644 --- a/usr.bin/ctlstat/Makefile +++ b/usr.bin/ctlstat/Makefile @@ -1,3 +1,4 @@ +PACKAGE= ctl PROG= ctlstat MAN= ctlstat.8 SDIR= ${SRCTOP}/sys diff --git a/usr.sbin/ctladm/Makefile b/usr.sbin/ctladm/Makefile index 7d2ec477a4f3..9f9ade18934b 100644 --- a/usr.sbin/ctladm/Makefile +++ b/usr.sbin/ctladm/Makefile @@ -1,6 +1,6 @@ .include -PACKAGE= iscsi +PACKAGE= ctl PROG= ctladm SRCS= ctladm.c util.c ctl_util.c ctl_nvme_all.c ctl_scsi_all.c .PATH: ${SRCTOP}/sys/cam/ctl diff --git a/usr.sbin/ctld/Makefile b/usr.sbin/ctld/Makefile index 79c69c95fbb1..314554a99b56 100644 --- a/usr.sbin/ctld/Makefile +++ b/usr.sbin/ctld/Makefile @@ -3,7 +3,7 @@ CFLAGS+=-I${SRCTOP}/contrib/libucl/include .PATH: ${SRCTOP}/contrib/libucl/include -PACKAGE= iscsi +PACKAGE= ctl PROG_CXX= ctld SRCS= ctld.cc conf.cc discovery.cc isns.cc kernel.cc SRCS+= login.cc parse.y token.l y.tab.h uclparse.cc From nobody Wed May 28 01:16:41 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b6Wmp2pkPz5wgYx; Wed, 28 May 2025 01:16:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b6Wmn6Lwrz4GHh; Wed, 28 May 2025 01:16:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748395001; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QgQXXZG5DnhUoY70OuDOjBh3whvTXxzn7iZ6Z2yWNuY=; b=Dj0cr5mfIExQ90KkvcUXwlHwLP8yLCwkCBnvqSUqCU/PmYpPFqJPrEi5adAxtu3/tMYQZE OEAOd5RQf67R/Pj1G/ogR4g0/NPmNsArlJkD0Nt8xxh6TTIP2Yxtkuj51kC9SfN5OWKaHd GIXWewXkdc+rCBUP/V50V9SAYS82rgkUzJiFCM5PH5z1LebVzPZbELLo4St7Px1zfB/sx4 jGYi4dsQKcmMv/ZeW71wqURCjNQK2BjuCBTMGnesM8hcmcMexcDebYMLcK79XZdWKZ75zx R3DHrZypjiFGuIzp4qddDIZEflcGsvjPokDM1PHJIe9k35anSERA3GZYodT7Zg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748395001; a=rsa-sha256; cv=none; b=QNGmQR+ylc/qWVfBqKleWDhvLN+h//RIqFswAnfgZRsL4XjhYzz8BJVmP8esQO3/eENDBx RP/78TkY4Da+xUELWW817Wg2bgU1VHr0SyomnsBgZzKnYu+V6Uxx2vfBsjKI3P3QGG2L92 3i9tLuCFlTSokdmLikIZTLcI+/U2F6VZm8pgQ5AxyuZu9zm+CZ+JP+wSCqjixVkT+G6Tu6 dlJg69U31PUBRHT5l/+dXJ43itFfg6W9xwiUiBoGNC42ek5yQ/Rk3rXDjIfY5woSHXh5lk Y/ZW9uyE/DwlGODg4tRt4iOHLVOotYkocKeXt4u3AfpsuLGV3rcH2AHZlIVV3A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748395001; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QgQXXZG5DnhUoY70OuDOjBh3whvTXxzn7iZ6Z2yWNuY=; b=O7POBgGnds+LboUa4gz/At5IQutiYQcpXzkUVacy6i6IcGUpS2oh4GSkHZAVOIZNCgGvvd UfeJNUaXbtoPW11iEWuut61zA0pGNMH22SEojA6o9TYKvZybp2Zei2isDpKdZ/uHOYH9Rw nRc6yZ3RNGnQaZf0Y6EezjeLp/+SUBthYa1fGAYtF/Scss2ckNCw4s0lf/9AI6lp8pmIxo 2siQGaHtwFKLuqorf1FqwGgBKvZgG+crmV1Xvaz8D7SF6ECfK3BXWJzy07gpi0mjpsqXH/ 9/iTwmDYqtnbRxjUshPlybKeBQNqVVv6joVEHYxqlV4wz/s4UvlsBe+w/GYbrw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b6Wmn5klPz23Q; Wed, 28 May 2025 01:16: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 54S1GffD030900; Wed, 28 May 2025 01:16:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54S1GfFq030897; Wed, 28 May 2025 01:16:41 GMT (envelope-from git) Date: Wed, 28 May 2025 01:16:41 GMT Message-Id: <202505280116.54S1GfFq030897@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: f947f58ce624 - main - packages: rename elftoolchain to toolchain, add more things List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: f947f58ce624b5442e24b1efa69c0ddcdf3e0ddb Auto-Submitted: auto-generated The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=f947f58ce624b5442e24b1efa69c0ddcdf3e0ddb commit f947f58ce624b5442e24b1efa69c0ddcdf3e0ddb Author: Lexi Winter AuthorDate: 2025-05-27 07:21:51 +0000 Commit: Lexi Winter CommitDate: 2025-05-28 01:16:30 +0000 packages: rename elftoolchain to toolchain, add more things Rename the existing "elftoolchain" package to "toolchain", and move everything which is gated by MK_TOOLCHAIN (e.g. lex, yacc, ...) to the toolchain package. This means we have one package called "toolchain" which contains all the development-related utilities which are not compilers or already part of some other package (e.g., llvm). Reviewed by: des, emaste Approved by: des (mentor) Differential Revision: https://reviews.freebsd.org/D50286 --- UPDATING | 12 +++++++++--- release/packages/Makefile.package | 4 ++-- usr.bin/addr2line/Makefile | 2 +- usr.bin/ar/Makefile | 1 + usr.bin/c89/Makefile | 1 + usr.bin/c99/Makefile | 1 + usr.bin/ctags/Makefile | 1 + usr.bin/cxxfilt/Makefile | 2 +- usr.bin/elfcopy/Makefile | 2 +- usr.bin/file2c/Makefile | 1 + usr.bin/gprof/Makefile | 1 + usr.bin/indent/Makefile | 1 + usr.bin/lex/Makefile | 1 + usr.bin/lorder/Makefile | 1 + usr.bin/mkstr/Makefile | 1 + usr.bin/nm/Makefile | 2 +- usr.bin/readelf/Makefile | 2 +- usr.bin/rpcgen/Makefile | 1 + usr.bin/size/Makefile | 2 +- usr.bin/unifdef/Makefile | 1 + usr.bin/xstr/Makefile | 1 + usr.bin/yacc/Makefile | 1 + usr.sbin/config/Makefile | 1 + usr.sbin/crunch/Makefile.inc | 2 ++ 24 files changed, 34 insertions(+), 11 deletions(-) diff --git a/UPDATING b/UPDATING index 7efea1207e11..53ce5a4b3095 100644 --- a/UPDATING +++ b/UPDATING @@ -28,9 +28,15 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 15.x IS SLOW: at runtime, run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) 20250527: - ctld(8), ctladm(8) and ctlstat(8) have moved to the new FreeBSD-ctl - package. If you use pkgbase and you need the CAM Target Layer, you - should install the new package. + The CAM target layer userland, i.e. ctld(8), ctladm(8) and ctlstat(8), + has moved to the new FreeBSD-ctl package. If you use pkgbase and you + need the CAM Target Layer, you should install the new package. + + Development-related tools (e.g. ar and nm) have moved to the new + "FreeBSD-toolchain" package, which subsumes and obsoletes the + existing "FreeBSD-elftoolchain" package. If you use pkgbase and + need to compile software, you should install the new package and + ensure the old FreeBSD-elftoolchain* packages are completely removed. 20250521: Commit e64fe5ad3a23 removed in6_maxmtu and its setter in6_setmaxmtu(). diff --git a/release/packages/Makefile.package b/release/packages/Makefile.package index da9d52f45099..c2427aa16945 100644 --- a/release/packages/Makefile.package +++ b/release/packages/Makefile.package @@ -63,8 +63,6 @@ ee_COMMENT= Easy Editor Utilities ee_DESC= Easy Editor Utilities efi-tools_COMMENT= UEFI Utilities efi-tools_DESC= UEFI Utilities -elftoolchain_COMMENT= ElfToolchain programs and libraries -elftoolchain_DESC= ElfToolchain programs and libraries examples_COMMENT= Examples in /usr/share/examples examples_DESC= Examples in /usr/share/examples fd_COMMENT= Floppy disk support @@ -175,6 +173,8 @@ telnet_COMMENT= Telnet client telnet_DESC= Telnet client tests_COMMENT= Test Suite tests_DESC= Test Suite +toolchain_COMMENT= Utilities for program development +toolchain_DESC= Utilities for program development ufs_COMMENT= UFS Libraries and Utilities ufs_DESC= UFS Libraries and Utilities unbound_COMMENT= Unbound DNS Resolver diff --git a/usr.bin/addr2line/Makefile b/usr.bin/addr2line/Makefile index 652282152269..e58ed082d28c 100644 --- a/usr.bin/addr2line/Makefile +++ b/usr.bin/addr2line/Makefile @@ -1,6 +1,6 @@ .include -PACKAGE= elftoolchain +PACKAGE= toolchain ELFTCDIR= ${SRCTOP}/contrib/elftoolchain ADDR2LINEDIR= ${ELFTCDIR}/addr2line diff --git a/usr.bin/ar/Makefile b/usr.bin/ar/Makefile index b926e942795e..b4e5324073ce 100644 --- a/usr.bin/ar/Makefile +++ b/usr.bin/ar/Makefile @@ -1,5 +1,6 @@ .include +PACKAGE= toolchain PROG= ar SRCS= ar.c acplex.l acpyacc.y read.c util.c write.c y.tab.h diff --git a/usr.bin/c89/Makefile b/usr.bin/c89/Makefile index 325588a3d7a8..e86604c797b1 100644 --- a/usr.bin/c89/Makefile +++ b/usr.bin/c89/Makefile @@ -1,3 +1,4 @@ +PACKAGE= toolchain PROG= c89 .include diff --git a/usr.bin/c99/Makefile b/usr.bin/c99/Makefile index 98be921c974c..259969289fff 100644 --- a/usr.bin/c99/Makefile +++ b/usr.bin/c99/Makefile @@ -1,3 +1,4 @@ +PACKAGE= toolchain PROG= c99 .include diff --git a/usr.bin/ctags/Makefile b/usr.bin/ctags/Makefile index a0d0c8522914..9d5e35652f42 100644 --- a/usr.bin/ctags/Makefile +++ b/usr.bin/ctags/Makefile @@ -1,3 +1,4 @@ +PACKAGE= toolchain PROG= ctags SRCS= C.c ctags.c fortran.c lisp.c print.c tree.c yacc.c CFLAGS+=-I${.CURDIR} diff --git a/usr.bin/cxxfilt/Makefile b/usr.bin/cxxfilt/Makefile index fe7fe2d579e5..2db9f8ded075 100644 --- a/usr.bin/cxxfilt/Makefile +++ b/usr.bin/cxxfilt/Makefile @@ -1,6 +1,6 @@ .include -PACKAGE= elftoolchain +PACKAGE= toolchain ELFTCDIR= ${SRCTOP}/contrib/elftoolchain SRCDIR= ${ELFTCDIR}/cxxfilt diff --git a/usr.bin/elfcopy/Makefile b/usr.bin/elfcopy/Makefile index 2f3386d95ebe..dd387f5433c5 100644 --- a/usr.bin/elfcopy/Makefile +++ b/usr.bin/elfcopy/Makefile @@ -1,6 +1,6 @@ .include -PACKAGE= elftoolchain +PACKAGE= toolchain ELFTCDIR= ${SRCTOP}/contrib/elftoolchain ELFCOPYDIR= ${ELFTCDIR}/elfcopy diff --git a/usr.bin/file2c/Makefile b/usr.bin/file2c/Makefile index b71834e10035..8ddd9ecb4247 100644 --- a/usr.bin/file2c/Makefile +++ b/usr.bin/file2c/Makefile @@ -1,5 +1,6 @@ .include +PACKAGE= toolchain PROG= file2c HAS_TESTS= diff --git a/usr.bin/gprof/Makefile b/usr.bin/gprof/Makefile index e486dd8ce6d9..a9625957c435 100644 --- a/usr.bin/gprof/Makefile +++ b/usr.bin/gprof/Makefile @@ -1,3 +1,4 @@ +PACKAGE= toolchain PROG= gprof SRCS= gprof.c arcs.c dfn.c elf.c lookup.c hertz.c \ printgprof.c printlist.c kernel.c diff --git a/usr.bin/indent/Makefile b/usr.bin/indent/Makefile index 3f7ee955a228..ce0d206c87f9 100644 --- a/usr.bin/indent/Makefile +++ b/usr.bin/indent/Makefile @@ -1,5 +1,6 @@ .include +PACKAGE= toolchain PROG= indent SRCS= indent.c io.c lexi.c parse.c pr_comment.c args.c diff --git a/usr.bin/lex/Makefile b/usr.bin/lex/Makefile index c1311105cdc5..89189774816b 100644 --- a/usr.bin/lex/Makefile +++ b/usr.bin/lex/Makefile @@ -8,6 +8,7 @@ # Also note that flex.skel no longer gets installed. # +PACKAGE= toolchain PROG= lex LINKS+= ${BINDIR}/lex ${BINDIR}/lex++ LINKS+= ${BINDIR}/lex ${BINDIR}/flex diff --git a/usr.bin/lorder/Makefile b/usr.bin/lorder/Makefile index 5dc868f96c7e..38e073176e0b 100644 --- a/usr.bin/lorder/Makefile +++ b/usr.bin/lorder/Makefile @@ -1,5 +1,6 @@ .include +PACKAGE=toolchain SCRIPTS=lorder.sh MAN= lorder.1 diff --git a/usr.bin/mkstr/Makefile b/usr.bin/mkstr/Makefile index 1a691e6d78d5..c255b5d56046 100644 --- a/usr.bin/mkstr/Makefile +++ b/usr.bin/mkstr/Makefile @@ -1,3 +1,4 @@ +PACKAGE= toolchain PROG= mkstr WARNS?= 2 diff --git a/usr.bin/nm/Makefile b/usr.bin/nm/Makefile index c4c75725dd1c..97464501579e 100644 --- a/usr.bin/nm/Makefile +++ b/usr.bin/nm/Makefile @@ -1,6 +1,6 @@ .include -PACKAGE= elftoolchain +PACKAGE= toolchain ELFTCDIR= ${SRCTOP}/contrib/elftoolchain NMDIR= ${ELFTCDIR}/nm diff --git a/usr.bin/readelf/Makefile b/usr.bin/readelf/Makefile index d2a386fb0d40..84e445c7e504 100644 --- a/usr.bin/readelf/Makefile +++ b/usr.bin/readelf/Makefile @@ -1,6 +1,6 @@ .include -PACKAGE= elftoolchain +PACKAGE= toolchain ELFTCDIR= ${SRCTOP}/contrib/elftoolchain READELFDIR= ${ELFTCDIR}/readelf diff --git a/usr.bin/rpcgen/Makefile b/usr.bin/rpcgen/Makefile index aafa97fd0c3d..2f4bdd984880 100644 --- a/usr.bin/rpcgen/Makefile +++ b/usr.bin/rpcgen/Makefile @@ -1,3 +1,4 @@ +PACKAGE= toolchain PROG= rpcgen SRCS= rpc_main.c rpc_clntout.c rpc_cout.c rpc_hout.c rpc_parse.c \ rpc_sample.c rpc_scan.c rpc_svcout.c rpc_tblout.c rpc_util.c diff --git a/usr.bin/size/Makefile b/usr.bin/size/Makefile index 3951cedbfa05..5e34ecd52edb 100644 --- a/usr.bin/size/Makefile +++ b/usr.bin/size/Makefile @@ -1,6 +1,6 @@ .include -PACKAGE= elftoolchain +PACKAGE= toolchain ELFTCDIR= ${SRCTOP}/contrib/elftoolchain SIZEDIR= ${ELFTCDIR}/size diff --git a/usr.bin/unifdef/Makefile b/usr.bin/unifdef/Makefile index 82b0c5839f8e..960a939bcbf2 100644 --- a/usr.bin/unifdef/Makefile +++ b/usr.bin/unifdef/Makefile @@ -1,5 +1,6 @@ .PATH: ${SRCTOP}/contrib/unifdef +PACKAGE= toolchain PROG= unifdef SCRIPTS=unifdefall.sh MLINKS= unifdef.1 unifdefall.1 diff --git a/usr.bin/xstr/Makefile b/usr.bin/xstr/Makefile index 290d553a4ed6..4b68d16b5b16 100644 --- a/usr.bin/xstr/Makefile +++ b/usr.bin/xstr/Makefile @@ -1,3 +1,4 @@ +PACKAGE= toolchain PROG= xstr .include diff --git a/usr.bin/yacc/Makefile b/usr.bin/yacc/Makefile index 42ee10952e06..c368b8084910 100644 --- a/usr.bin/yacc/Makefile +++ b/usr.bin/yacc/Makefile @@ -3,6 +3,7 @@ BYACC_SRC= ${SRCTOP}/contrib/byacc .PATH: ${BYACC_SRC} +PACKAGE= toolchain PROG= yacc SRCS= closure.c error.c graph.c lalr.c lr0.c main.c mkpar.c mstring.c output.c \ reader.c yaccpar.c symtab.c verbose.c warshall.c diff --git a/usr.sbin/config/Makefile b/usr.sbin/config/Makefile index 93011f404585..6c0320a07cc1 100644 --- a/usr.sbin/config/Makefile +++ b/usr.sbin/config/Makefile @@ -1,5 +1,6 @@ SRCDIR:=${.PARSEDIR:tA} +PACKAGE= toolchain PROG_CXX= config MAN= config.5 config.8 SRCS= config.y main.cc lang.l mkmakefile.cc mkheaders.c \ diff --git a/usr.sbin/crunch/Makefile.inc b/usr.sbin/crunch/Makefile.inc index da4210505219..5d050019d637 100644 --- a/usr.sbin/crunch/Makefile.inc +++ b/usr.sbin/crunch/Makefile.inc @@ -1,2 +1,4 @@ +PACKAGE= toolchain + # modify to taste BINDIR?= /usr/bin From nobody Wed May 28 01:16:42 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b6Wmq2Cy8z5wgK1; Wed, 28 May 2025 01:16:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b6Wmq05D6z4G56; Wed, 28 May 2025 01:16:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748395003; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iJFPDnTJ4HVQ+vD0qL+gcskI4A84iAS2UNwtiu1WTSg=; b=iFSzwTGRXdydLxn/nKMPm83A/JsN5xtG6IouCQqjI9WDg4BwMZpWHu3eyTPRusN9ER21KU wuZOSIq7tVdqUfrsVlweHqW32W8EZ4BGZJefeUubw/Eqm9CayBbMXFJP1ApFT4UPjyzrrd rthrbF/HQecZhLuDHjWc4arlOeO5pqC9J/QVseqLDzfpZnelxp3zEXhhaZDU2RYl2gLYaA cmCLy81mKtGhw2/QTkrhxcB3pP68WLkH5ZWThQwFDP0gLe5No45S4hUfjAVtCuakx4+REE L7YpTnKOQ9Do/6zRtrDzl+DfUE6mcaQpdW0qaX4qCJ7gHejx5/qEePOTFfh/YA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748395003; a=rsa-sha256; cv=none; b=h8X5ELmSPwIeDQSq4+vamea5US0Cf/lbZZQ44UN2X/tNcy0RbyIy34Fh/w5MnIFtNWcUxQ 8sTWbGT+fEP9St06K1SihJQtTwKRVQ7edBCFcDr7bG7IEJ5IPXVn4TZUm1j1R14OrLDYnw qQ2Zq3gIPnM+K3yCJ8YzGH/9T258iWE3vd7NKGIoF8q5As5FKHwLxHCzAuzXOH28bNMvRs eiGku+4b1dmRHlrI1RIfImflr3GOELaFzOfVwzaunV5qWWj8wQ8/pHw+tVTp+nFmaOBa7K HM/TaZx+8RzJIn1jQGXxE832IcLGZhOWADeyLNjsXtV1BOiAaNVhnf4UkxNJbw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748395003; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iJFPDnTJ4HVQ+vD0qL+gcskI4A84iAS2UNwtiu1WTSg=; b=vXrlfhrOd2e876wPdIfHPXXoM/69BN2dLOG/4/ex56a25PDsGldxKtDg8n2W1LL0WX9KUU rYnT+ulB3WxHKk6oA41D+li/s331PNOL3+sFpaVJ+KnikVYQQ1assKd4FMkGdVQH0Ky8lp OS24LPseYjzWW5bA7d+G3uroZvpphqrFHnYfVL6cDM91NUglkgpK5UK2AUp6dg1CTe0QWu msiarg3duQOTiHnXeDk0cMALhC9lqEJGcxnkAehlZ5BTOUK4tASCGlktPeyQ8O/+WeiLnV LuxUXHMlaVWRqq/1iNEo5mT/TonHleRb9Z0b5DnrvJfGAsZvwzSrNmDVIcd6rw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b6Wmp6jC6z23R; Wed, 28 May 2025 01:16:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54S1Gg5X030939; Wed, 28 May 2025 01:16:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54S1Gg2n030936; Wed, 28 May 2025 01:16:42 GMT (envelope-from git) Date: Wed, 28 May 2025 01:16:42 GMT Message-Id: <202505280116.54S1Gg2n030936@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: adef3618b8a5 - main - packages: move smbfs examples to the smbutils package List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: adef3618b8a51979bc961a04eefbdfee0e77343b Auto-Submitted: auto-generated The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=adef3618b8a51979bc961a04eefbdfee0e77343b commit adef3618b8a51979bc961a04eefbdfee0e77343b Author: Lexi Winter AuthorDate: 2025-05-27 07:30:18 +0000 Commit: Lexi Winter CommitDate: 2025-05-28 01:16:30 +0000 packages: move smbfs examples to the smbutils package Reviewed by: manu, des Approved by: des (mentor) Differential Revision: https://reviews.freebsd.org/D50285 --- share/examples/smbfs/Makefile | 2 +- share/examples/smbfs/Makefile.inc | 1 + share/examples/smbfs/print/Makefile | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/share/examples/smbfs/Makefile b/share/examples/smbfs/Makefile index cd235434db79..6f230bdf8802 100644 --- a/share/examples/smbfs/Makefile +++ b/share/examples/smbfs/Makefile @@ -1,4 +1,4 @@ -PACKAGE=utilities +PACKAGE= smbutils FILESDIR= ${SHAREDIR}/examples/smbfs FILES= dot.nsmbrc diff --git a/share/examples/smbfs/Makefile.inc b/share/examples/smbfs/Makefile.inc new file mode 100644 index 000000000000..8d89dafa6e25 --- /dev/null +++ b/share/examples/smbfs/Makefile.inc @@ -0,0 +1 @@ +PACKAGE?= smbutils diff --git a/share/examples/smbfs/print/Makefile b/share/examples/smbfs/print/Makefile index a8a6e12e7013..d8be651b2e31 100644 --- a/share/examples/smbfs/print/Makefile +++ b/share/examples/smbfs/print/Makefile @@ -1,4 +1,3 @@ -PACKAGE=utilities FILESDIR= ${SHAREDIR}/examples/smbfs/print FILES= lj6l ljspool printcap.sample tolj From nobody Wed May 28 01:16:43 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b6Wmr3PhWz5wghQ; Wed, 28 May 2025 01:16:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b6Wmr0xMyz4GBJ; Wed, 28 May 2025 01:16:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748395004; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Y03TkcPo8N0SzWdB004tDinxfw8LOfDW0NbuD1P9TKA=; b=d6d3efG36wM9gPOFOMwk98zMPgsJmZfmiT0w9iA4fZgp+o5SgcnsQAWmWDgSII7tCIoRTB ke3eCK6lEAAbYI+m2vj2w6xa3z0ktqAa82cCC+t+9/cfztLxN7wMLe3gMupB1SfNYtzVkW cCGIx5NYItxTKP88atIUjNBxJcY/9nhJQcztkAN3Q/BYN11qtmlf/dMYMoqX5Ym0rWo2WS cHsjhgyvCpmo4UsQb7AklK/pT6meNWcztBB2pVUuyFM3LJeY7Dkk1T+11sRDx6di+mimDb 1n2sBBFc7337Ld0c3MClAFJL6VF6Qhecpp4gQnLsFZukvGHAod32Gx4+mCm2wg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748395004; a=rsa-sha256; cv=none; b=NM/R8R9KSin+llZDYMVTKi5wlGovPSOETLaOF7H53PnGFsvWu9KZEQXUmAJ6m7dqjF0MsI CvHksesOCWEe8auTHzPz7Ilt41CeZReQqSJaGJul/x2YYJzxRX1uTH5MwmdZSiBD+pvc1F COkqbi1fyPodbZB1WJ8xCcQx7mrah8O7pbfd5+zm7xI4ZagvElFMdgdJCGE05ok3JSvnVL NBxAwHESfY1GTuasoQIxZZFyzBOr8tdWOTD8a546FJB6OoIQ+845q0CIeCjtvxiT8H99YF 3XfG6opYo+rXg2V+ALwVATJnvUNWrlU6iNQLf+wTydjAXzn3ZXQtO2Sff5uN/Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748395004; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Y03TkcPo8N0SzWdB004tDinxfw8LOfDW0NbuD1P9TKA=; b=tCXowegFsNrlc0SiRrpeDwXuTTTIeYbVC+KJ0Mf/jGFYrXHue8XdqNrj9h5Moy1nR+z+1k Gw3TntEb1seby2oq9jJjNYNTa2bB0cW3+ukTJPwVkEH83XSgOZeLvfPFb+LyKBxqe6C/rk RPBCS3KL7a4bZheSkcs6VXQX3liGVFTT5DkZtEFRW6Hgngfcq7GOJOp7rFqTo9fUsAgI1V dih1vH/CCuyT9KjsjBKFr1bjbtw7P2rY3d1zGSzXPET+6YM3GkIykbmQISkHstRkH9A5jF 6kiOajdMoerCn60uu+1IZpDKhHy+y4dvzY6cIw5ISQKvESREbMUnaNLQlH/uNA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b6Wmr0WvVz21v; Wed, 28 May 2025 01:16:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54S1Ghev030972; Wed, 28 May 2025 01:16:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54S1Ghpn030969; Wed, 28 May 2025 01:16:43 GMT (envelope-from git) Date: Wed, 28 May 2025 01:16:43 GMT Message-Id: <202505280116.54S1Ghpn030969@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: 06c41801afac - main - svcj: correctly handle kernels without INET or INET6 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 06c41801afacbcfb2912a6716788a2c26e94ea00 Auto-Submitted: auto-generated The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=06c41801afacbcfb2912a6716788a2c26e94ea00 commit 06c41801afacbcfb2912a6716788a2c26e94ea00 Author: Lexi Winter AuthorDate: 2025-05-27 07:31:18 +0000 Commit: Lexi Winter CommitDate: 2025-05-28 01:16:30 +0000 svcj: correctly handle kernels without INET or INET6 If either INET or INET6 is not enabled in the kernel, then the jail(8) options ip4= resp. ip6= are not available. Detect this case and don't try to provide those options, otherwise svcjs will not start. Do this automatically (without a warning) so that net_basic, which includes both netv4 and netv6, continues to work as expected. If _svcj_ipaddrs is explicitly configured with an address for an IP version not supported by the kernel, issue a warning but continue to start the service. This can result in the service being started with fewer addresses than expected, but never more. Reviewed by: netchild, des Approved by: des (mentor) Differential Revision: https://reviews.freebsd.org/D49976 --- libexec/rc/rc.subr | 52 ++++++++++++++++++++++++++++++++++------------------ 1 file changed, 34 insertions(+), 18 deletions(-) diff --git a/libexec/rc/rc.subr b/libexec/rc/rc.subr index e2a30d9fc9bd..2eaf336b5220 100644 --- a/libexec/rc/rc.subr +++ b/libexec/rc/rc.subr @@ -1214,27 +1214,43 @@ run_rc_command() fi fi - _svcj_ip="inherit" _svcj_ip4_addrs="" _svcj_ip6_addrs="" - - for addr in $_svcj_ipaddrs; do - case $addr in - *:*) _svcj_ip6_addrs="$addr,${_svcj_ip6_addrs}" ;; - *) _svcj_ip4_addrs="$addr,${_svcj_ip4_addrs}" ;; - esac - done - _svcj_cmd_options="" - if [ -n "$_svcj_ip4_addrs" ]; then - _svcj_cmd_options="ip4.addr=${_svcj_ip4_addrs%*,} ${_svcj_cmd_options}" + if [ -n "$_svcj_ipaddrs" ]; then _svcj_ip="new" + + for addr in $_svcj_ipaddrs; do + case $addr in + *:*) _svcj_ip6_addrs="$addr,${_svcj_ip6_addrs}" ;; + *) _svcj_ip4_addrs="$addr,${_svcj_ip4_addrs}" ;; + esac + done + else + _svcj_ip="inherit" fi - if [ -n "$_svcj_ip6_addrs" ]; then - _svcj_cmd_options="ip6.addr=${_svcj_ip6_addrs%*,} ${_svcj_cmd_options}" - _svcj_ip="new" + if check_kern_features inet; then + _svcj_ip4="ip4=${_svcj_ip}" + if [ -n "$_svcj_ip4_addrs" ]; then + _svcj_cmd_options="ip4.addr=${_svcj_ip4_addrs%*,} ${_svcj_cmd_options}" + fi + else + if [ -n "$_svcj_ip4_addrs" ]; then + warn "$rc_service: ${name}_svcj_ipaddrs contains at least one IPv4 address, but IPv4 is not enabled in the kernel; IPv4 addresses will be ignored." + fi + fi + + if check_kern_features inet6; then + _svcj_ip6="ip6=${_svcj_ip}" + if [ -n "$_svcj_ip6_addrs" ]; then + _svcj_cmd_options="ip6.addr=${_svcj_ip6_addrs%*,} ${_svcj_cmd_options}" + fi + else + if [ -n "$_svcj_ip6_addrs" ]; then + warn "$rc_service: ${name}_svcj_ipaddrs contains at least one IPv6 address, but IPv6 is not enabled in the kernel; IPv6 addresses will be ignored." + fi fi if [ -n "$_svcj_options" ]; then # translate service jail options @@ -1245,19 +1261,19 @@ run_rc_command() _svcj_cmd_options="allow.mlock ${_svcj_cmd_options}" ;; netv4) - _svcj_cmd_options="ip4=${_svcj_ip} allow.reserved_ports ${_svcj_cmd_options}" + _svcj_cmd_options="${_svcj_ip4} allow.reserved_ports ${_svcj_cmd_options}" ;; netv6) - _svcj_cmd_options="ip6=${_svcj_ip} allow.reserved_ports ${_svcj_cmd_options}" + _svcj_cmd_options="${_svcj_ip6} allow.reserved_ports ${_svcj_cmd_options}" ;; net_basic) - _svcj_cmd_options="ip4=${_svcj_ip} ip6=${_svcj_ip} allow.reserved_ports ${_svcj_cmd_options}" + _svcj_cmd_options="${_svcj_ip4} ${_svcj_ip6} allow.reserved_ports ${_svcj_cmd_options}" ;; net_raw) _svcj_cmd_options="allow.raw_sockets ${_svcj_cmd_options}" ;; net_all) - _svcj_cmd_options="allow.socket_af allow.raw_sockets allow.reserved_ports ip4=${_svcj_ip} ip6=${_svcj_ip} ${_svcj_cmd_options}" + _svcj_cmd_options="allow.socket_af allow.raw_sockets allow.reserved_ports ${_svcj_ip4} ${_svcj_ip6} ${_svcj_cmd_options}" ;; nfsd) _svcj_cmd_options="allow.nfsd enforce_statfs=1 ${_svcj_cmd_options}" From nobody Wed May 28 01:16:45 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b6Wms2zKLz5wgRv; Wed, 28 May 2025 01:16:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b6Wms1ycgz4GLD; Wed, 28 May 2025 01:16:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748395005; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=h3fyWt9PftrG+e7KdDtlDTYA1ivKr8zGkZ4SwiUL5A4=; b=hcCtG553fqeQb9j5HHSggLbaCRqj0bndGsqclykHoJe9ITntBodYZcGzZJR+ZM27AsY85y UTUrf/SOD1mKvAyDTteMFy0OWTm+WeNyPBzc8XH42iTfro+OJo8AoJyKifWdEIYu+j9xhc 9LFfwcy0lCPISDRz0CuynUM44QeGrfdddh8anBoL5Ugx84ZsUJKXitJJQ+GexeBpyLArke z7b+jgLewBSi+Ry20ivrGnH+Hs5TcCXJAp89v2BP9v2ea22nmbBcE8PuRoEsAx2JXa9lHC D42rvPi4d0fd7ZxirAoWhFm2qggSeN8JOlZZQerUVa7lIXwcKJS7ej4nd579mg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748395005; a=rsa-sha256; cv=none; b=Kk3vOXjgfnUABA1khTlzS2UO7Ruw6gl95TsoikdOM4xG76vhkciUIllJUHkKAtuDU1ZDAn B+BljExB2W0a1uxpwyRVKZSFRloGamInFkok9h2FYs+HQb/63huP2+fO7Vu7oz4TZeambr mZjogZ0if0m8gnTXEmSsAHCi6EQPpjtA1fddb72KECmAGFzrjbLQSwceSRNtgOVH7LOsJ2 eLgavKBwBzM7OD9gwhbqHc+hGO583NytSKiJay3992yhnW3NhNtYli5nU1lqqzjRBtC1iS BCU3OPfQbZgZQdcxZ4iIWi5hdGd+WsWw8usw4MdXVdVjVHOXt+DuqY9TP0vyXQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748395005; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=h3fyWt9PftrG+e7KdDtlDTYA1ivKr8zGkZ4SwiUL5A4=; b=eoB1gONtFAtlPrGVX0XBMgZvZf0PS3L3rafyKkmx/7ViXVYKq+wLtpkaQOlrmqELUVsE7Y yRgjbT1d8DRZnjeMp0RPnoW3ewNm7NAHBuIX0wIH0JOFCHNSrIqp1sBwOp5jijZ/Ct86MU geyYumGrNYT6Hc3KMCc3sopb7ACmNkVJFuwQHP/hDDwk7SftpfXvNQeEtYeuRqr1mJFcE9 M+Gp5RM3K8b1VtqshRt1lrtKBkyXhqKOJB+RVNZenoAc1TmRFSDFmuqzw2MsjTfgLfVIeo 97Q3eItn32xigJ0dBsYAZFJJja5OVKW6gd4PkI7mjt1gT+t9V013qRCGsQlI5w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b6Wms1W7Wzlx; Wed, 28 May 2025 01:16:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54S1Gj0T031005; Wed, 28 May 2025 01:16:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54S1Gjc4031002; Wed, 28 May 2025 01:16:45 GMT (envelope-from git) Date: Wed, 28 May 2025 01:16:45 GMT Message-Id: <202505280116.54S1Gjc4031002@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: 2d6c5614aab8 - main - move ch{own,grp}(8) and tee(1) to FreeBSD-runtime List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 2d6c5614aab89a93c56ef1ebff6817a024d17476 Auto-Submitted: auto-generated The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=2d6c5614aab89a93c56ef1ebff6817a024d17476 commit 2d6c5614aab89a93c56ef1ebff6817a024d17476 Author: Lexi Winter AuthorDate: 2025-05-27 07:35:49 +0000 Commit: Lexi Winter CommitDate: 2025-05-28 01:16:30 +0000 move ch{own,grp}(8) and tee(1) to FreeBSD-runtime chown and chgrp are almost essential for system management; in particular, a lot of rc.d scripts rely on them. tee is quite commonly used in shell scripts, and is small enough that there's no real need for it to be in -utilities. PR: 287014 Reviewed by: dch, manu, des, emaste Approved by: des (mentor) Differential Revision: https://reviews.freebsd.org/D50497 --- usr.bin/tee/Makefile | 1 + usr.sbin/chown/Makefile | 1 + 2 files changed, 2 insertions(+) diff --git a/usr.bin/tee/Makefile b/usr.bin/tee/Makefile index 1e5781bef4da..fbfbb8e1c9c3 100644 --- a/usr.bin/tee/Makefile +++ b/usr.bin/tee/Makefile @@ -1,5 +1,6 @@ .include +PACKAGE= runtime PROG= tee HAS_TESTS= diff --git a/usr.sbin/chown/Makefile b/usr.sbin/chown/Makefile index 3e6ce8bfbd8c..4e26b9457fd5 100644 --- a/usr.sbin/chown/Makefile +++ b/usr.sbin/chown/Makefile @@ -1,5 +1,6 @@ .include +PACKAGE= runtime PROG= chown LINKS= ${BINDIR}/chown /usr/bin/chgrp MAN= chgrp.1 chown.8 From nobody Wed May 28 01:19:27 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b6Wr01tBSz5wgjN; Wed, 28 May 2025 01:19:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b6Wqz6DH8z4LcS; Wed, 28 May 2025 01:19:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748395167; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xsn4LNOmfPf0WxbckRKqE7iQcZ8cBLP10umNicoQw0I=; b=uCw4hsRJ/M2u9sUiYZmEvn6R9tsBfwB54F6SOOIXFphZ/8QEEbl/vjessNgFSJkXg8HCus FkkKYBI2/HM00/maJ8JqsEHDZ+ArdbAQWMiF8dwruqwZjXb6slIgbg6XTPGn6Vus68jp4i j2dtqpDRd4CzwTjxdBKRIWmQIAQlJBBTEs0yvEQ3X8SiAgVMwKzX6txms/mQx0CpTyxlJq mNs+PROCyItbKEq9okyczy4M4VFJVs2WjfkA2JsrOImM+FdQfzlt8fpYKgY1CqucQa7aus hjbHFaRxloHWqb2IF6mCB+7XixvNUJJmsZhULZ5INztUiaFJsnTgBasxRH+TDA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748395167; a=rsa-sha256; cv=none; b=isxcQCkSANaDAnitkOJS1F8/JMzki7qjt5oCYs11Jr5z34Pka1ULjpKV3RAWcTb5PttNjm Oq5+PF7YA8+P2EF1EmwrLv/UNl/VjjD/edMI1UCPg0Q34Z8IU5bYHb5FOVCzfvjjlO8Lhq p6QV4BgDUHt6MLnTq7Zw9ddrVPoLwUf6oc4yQgtptYT5gn13DzxFSM21ToT/rGfb4hWDN7 +vzfexe1n+A1TxMuRvLl8tFNiMbcAsJDIOQl/0KH4xxkf1px31zDO8fTcW4TLFMH0u3TOC bbsO1/1H87wObjKQuUf81IzrokjgReLFsWfFDzZDQYzK+r7yDg23p0tTYyrOAw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748395167; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xsn4LNOmfPf0WxbckRKqE7iQcZ8cBLP10umNicoQw0I=; b=r3143/BGsSc5yK487/WpXIC5bnMoSp1ZgdmKzwNCJXavOcB/hA1Wwyfexqb3y0tBDMXjP1 BFudm5nc5+IFqRYO1cQZdaiOrfZCbjhFsI1MKen3Xvbt0GtUPX0//S0Y4J1Ed7mbFMiWeA UPXfK1knAYSg+Z0fqfxUppTdXpPjW0NtLfyoHKfDMRLjVqQ+8u/smLKly/VOwLg7RosYMd V2KYdT84/7OgZvj7cS86OyvdT25c9A6ZcKxAEoTfjUDCKsXNJXhBbZZR5o516g1o/UL2d5 Swn2+b4UeDBBVQpnt6EDejR3nJJweKWkj/8cHuxg09u7dQNgp9L/Y4vA3lhA7w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b6Wqz5Zdfz23T; Wed, 28 May 2025 01:19: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 54S1JRH7031862; Wed, 28 May 2025 01:19:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54S1JRpk031859; Wed, 28 May 2025 01:19:27 GMT (envelope-from git) Date: Wed, 28 May 2025 01:19:27 GMT Message-Id: <202505280119.54S1JRpk031859@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: 59fc4cda1bfa - main - kern: tty: refactor TIOCSTI privilege checks slightly List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 59fc4cda1bfa712c46d407d1e83bdd5c63e6e0e3 Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=59fc4cda1bfa712c46d407d1e83bdd5c63e6e0e3 commit 59fc4cda1bfa712c46d407d1e83bdd5c63e6e0e3 Author: Kyle Evans AuthorDate: 2025-05-28 01:19:17 +0000 Commit: Kyle Evans CommitDate: 2025-05-28 01:19:17 +0000 kern: tty: refactor TIOCSTI privilege checks slightly This removes some repetition from it and makes the flow a little more obvious. Future work may find some way to add more constraints to the unprivileged path, add a security sysctl to disable it, or perhaps some combination of the two. Reviewed by: kib, markj Differential Revision: https://reviews.freebsd.org/D50506 --- sys/kern/tty.c | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/sys/kern/tty.c b/sys/kern/tty.c index b1b3b268d0e9..47f9f25cec37 100644 --- a/sys/kern/tty.c +++ b/sys/kern/tty.c @@ -1643,6 +1643,24 @@ tty_set_winsize(struct tty *tp, const struct winsize *wsz) tty_signal_pgrp(tp, SIGWINCH); } +static int +tty_sti_check(struct tty *tp, int fflag, struct thread *td) +{ + /* Root can bypass all of our constraints. */ + if (priv_check(td, PRIV_TTY_STI) == 0) + return (0); + + /* Unprivileged users must have it opened for read. */ + if ((fflag & FREAD) == 0) + return (EPERM); + + /* It must also be their controlling tty. */ + if (!tty_is_ctty(tp, td->td_proc)) + return (EACCES); + + return (0); +} + static int tty_generic_ioctl(struct tty *tp, u_long cmd, void *data, int fflag, struct thread *td) @@ -1988,11 +2006,9 @@ tty_generic_ioctl(struct tty *tp, u_long cmd, void *data, int fflag, tty_info(tp); return (0); case TIOCSTI: - if ((fflag & FREAD) == 0 && priv_check(td, PRIV_TTY_STI)) - return (EPERM); - if (!tty_is_ctty(tp, td->td_proc) && - priv_check(td, PRIV_TTY_STI)) - return (EACCES); + error = tty_sti_check(tp, fflag, td); + if (error != 0) + return (error); ttydisc_rint(tp, *(char *)data, 0); ttydisc_rint_done(tp); return (0); From nobody Wed May 28 01:19:28 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b6Wr13GcNz5wgks; Wed, 28 May 2025 01:19: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b6Wr10Zwqz4Lcl; Wed, 28 May 2025 01:19:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748395169; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7TI47/XXZpMQy4NCLuYZzGpQwZ3Iwf4Ik8wHIKyfLtQ=; b=Mwex6VavfYrSPGI0mOTH9XjH3TQNCzUhKvf0AL48HvH9INwSvq96VpSojWDL/XPiPlhdA9 Ib4jofsYYluUBXB5M8grrjJazha/6rCzaSU5axmNi7ZDRdFzJfJBDfPCawpd3+iB31a3fC EhURsUiNi73xEptEdqq6qpO+RVzxIhkS8m7MdIHPWalInjl6aDn8qmNGGPtT3gP3cQHM/R nJAcnzzD6RPQjXQEySA/qq8I3YBHy+sbyyogP4mO1Lmzksx3EyiG1U4lGzk9kDjdczORjj Tp8+nNT0z+l5Dz9OrHZlgLAJ5KTCLI5+i6M5OJz6z9coJya3Dhe+dvWqAzVMkw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748395169; a=rsa-sha256; cv=none; b=x/h4QQFekLUNQ1cwgPFJhiLnwFL3l8anpsGCAKyQTiy5H1sTBllIWcrlkzkGnROA6Ju8mR N0UowXvoZXXI/rn51/cAP8Ysiidm8+5oGI4cDzpL9iUqZYJpi1U9QVUHQg7cS9T7s+qVvm Tt9ZzdLxasafMvG3ICrL5ZjaeFxKgfb6f+WzvjDBVsXvZzZ7yJGUBUUlcIWsmZlp6gQFaa +oA3R9DwQ3gSNBWm2KxZ1KU+8ZE5ETYqdaQc6vdL64/EF3QfmSXwjVJVDAzauhpgldpomA yYtsUtGAgB75e61I5FtRHckZP42vRXCa2oTcfbkCzhi5apX5AA8D0JnBqgZrkA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748395169; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7TI47/XXZpMQy4NCLuYZzGpQwZ3Iwf4Ik8wHIKyfLtQ=; b=CMk2KdXfeBlXNRc7lMOTLxbmrDuxNRfped0Y7J0wy732nS0ZrkdQrtRRdFQLZzx+GWVoxJ xxzkhI87kAI6hNbeOhS91X26jUG36noKlxN3xhpwWqauxCBY742++zwB1Tw7vK/0UJve53 TYBCIU7eu9DvbJV99OWiKgre7h2Z+i0TqNjps0ZsjWjEf2KMhT45q5t2k6wRbdGqoBxZWW LSjUwwkbHerPxQyRBVoYy0YRet4FDw4IfSvA/u5+y+EbozhVRlOs3KjBJTicvf9M5V+6OB /VO4TrjC0LHKPcWJJIOK52YkyvPKrP70d3sA/R6WO6EEyQi9RaK/b1N6m6d0VQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b6Wr06dSFz21y; Wed, 28 May 2025 01:19: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 54S1JSFI031895; Wed, 28 May 2025 01:19:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54S1JSWx031892; Wed, 28 May 2025 01:19:28 GMT (envelope-from git) Date: Wed, 28 May 2025 01:19:28 GMT Message-Id: <202505280119.54S1JSWx031892@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: d094dd9071ce - main - tests: kern: add some tests for TIOCSTI List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: d094dd9071cea1a2f67c5058caa4d22611da20ad Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=d094dd9071cea1a2f67c5058caa4d22611da20ad commit d094dd9071cea1a2f67c5058caa4d22611da20ad Author: Kyle Evans AuthorDate: 2025-05-28 01:19:18 +0000 Commit: Kyle Evans CommitDate: 2025-05-28 01:19:18 +0000 tests: kern: add some tests for TIOCSTI These offer at least rudimentary coverage of TIOCSTI, ensuring that it basically works and does what it's described to do and throws errors for unprivileged use that is supposed to be blocked. Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D50507 --- tests/sys/kern/tty/Makefile | 3 + tests/sys/kern/tty/test_sti.c | 337 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 340 insertions(+) diff --git a/tests/sys/kern/tty/Makefile b/tests/sys/kern/tty/Makefile index c362793a8b64..8628ab79875f 100644 --- a/tests/sys/kern/tty/Makefile +++ b/tests/sys/kern/tty/Makefile @@ -5,8 +5,11 @@ PLAIN_TESTS_PORCH+= test_canon PLAIN_TESTS_PORCH+= test_canon_fullbuf PLAIN_TESTS_PORCH+= test_ncanon PLAIN_TESTS_PORCH+= test_recanon +ATF_TESTS_C+= test_sti PROGS+= fionread PROGS+= readsz +LIBADD.test_sti= util + .include diff --git a/tests/sys/kern/tty/test_sti.c b/tests/sys/kern/tty/test_sti.c new file mode 100644 index 000000000000..f792001b4e3f --- /dev/null +++ b/tests/sys/kern/tty/test_sti.c @@ -0,0 +1,337 @@ +/*- + * Copyright (c) 2025 Kyle Evans + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include + +#include +#include + +enum stierr { + STIERR_CONFIG_FETCH, + STIERR_CONFIG, + STIERR_INJECT, + STIERR_READFAIL, + STIERR_BADTEXT, + STIERR_DATAFOUND, + STIERR_ROTTY, + STIERR_WOTTY, + STIERR_WOOK, + STIERR_BADERR, + + STIERR_MAXERR +}; + +static const struct stierr_map { + enum stierr stierr; + const char *msg; +} stierr_map[] = { + { STIERR_CONFIG_FETCH, "Failed to fetch ctty configuration" }, + { STIERR_CONFIG, "Failed to configure ctty in the child" }, + { STIERR_INJECT, "Failed to inject characters via TIOCSTI" }, + { STIERR_READFAIL, "Failed to read(2) from stdin" }, + { STIERR_BADTEXT, "read(2) data did not match injected data" }, + { STIERR_DATAFOUND, "read(2) data when we did not expected to" }, + { STIERR_ROTTY, "Failed to open tty r/o" }, + { STIERR_WOTTY, "Failed to open tty w/o" }, + { STIERR_WOOK, "TIOCSTI on w/o tty succeeded" }, + { STIERR_BADERR, "Received wrong error from failed TIOCSTI" }, +}; +_Static_assert(nitems(stierr_map) == STIERR_MAXERR, + "Failed to describe all errors"); + +/* + * Inject each character of the input string into the TTY. The caller can + * assume that errno is preserved on return. + */ +static ssize_t +inject(int fileno, const char *str) +{ + size_t nb = 0; + + for (const char *walker = str; *walker != '\0'; walker++) { + if (ioctl(fileno, TIOCSTI, walker) != 0) + return (-1); + nb++; + } + + return (nb); +} + +/* + * Forks off a new process, stashes the parent's handle for the pty in *termfd + * and returns the pid. 0 for the child, >0 for the parent, as usual. + * + * Most tests fork so that we can do them while unprivileged, which we can only + * do if we're operating on our ctty (and we don't want to touch the tty of + * whatever may be running the tests). + */ +static int +init_pty(int *termfd, bool canon) +{ + int pid; + + pid = forkpty(termfd, NULL, NULL, NULL); + ATF_REQUIRE(pid != -1); + + if (pid == 0) { + struct termios term; + + /* + * Child reconfigures tty to disable echo and put it into raw + * mode if requested. + */ + if (tcgetattr(STDIN_FILENO, &term) == -1) + _exit(STIERR_CONFIG_FETCH); + term.c_lflag &= ~ECHO; + if (!canon) + term.c_lflag &= ~ICANON; + if (tcsetattr(STDIN_FILENO, TCSANOW, &term) == -1) + _exit(STIERR_CONFIG); + } + + return (pid); +} + +static void +finalize_child(pid_t pid, int signo) +{ + int status, wpid; + + while ((wpid = waitpid(pid, &status, 0)) != pid) { + if (wpid != -1) + continue; + ATF_REQUIRE_EQ_MSG(EINTR, errno, + "waitpid: %s", strerror(errno)); + } + + /* + * Some tests will signal the child for whatever reason, and we're + * expecting it to terminate it. For those cases, it's OK to just see + * that termination. For all other cases, we expect a graceful exit + * with an exit status that reflects a cause that we have an error + * mapped for. + */ + if (signo >= 0) { + ATF_REQUIRE(WIFSIGNALED(status)); + ATF_REQUIRE_EQ(signo, WTERMSIG(status)); + } else { + ATF_REQUIRE(WIFEXITED(status)); + if (WEXITSTATUS(status) != 0) { + int err = WEXITSTATUS(status); + + for (size_t i = 0; i < nitems(stierr_map); i++) { + const struct stierr_map *map = &stierr_map[i]; + + if ((int)map->stierr == err) { + atf_tc_fail("%s", map->msg); + __assert_unreachable(); + } + } + } + } +} + +ATF_TC(basic); +ATF_TC_HEAD(basic, tc) +{ + atf_tc_set_md_var(tc, "descr", + "Test for basic functionality of TIOCSTI"); + atf_tc_set_md_var(tc, "require.user", "unprivileged"); +} +ATF_TC_BODY(basic, tc) +{ + int pid, term; + + /* + * We don't canonicalize on this test because we can assume that the + * injected data will be available after TIOCSTI returns. This is all + * within a single thread for the basic test, so we simplify our lives + * slightly in raw mode. + */ + pid = init_pty(&term, false); + if (pid == 0) { + static const char sending[] = "Text"; + char readbuf[32]; + ssize_t injected, readsz; + + injected = inject(STDIN_FILENO, sending); + if (injected != sizeof(sending) - 1) + _exit(STIERR_INJECT); + + readsz = read(STDIN_FILENO, readbuf, sizeof(readbuf)); + + if (readsz < 0 || readsz != injected) + _exit(STIERR_READFAIL); + if (memcmp(readbuf, sending, readsz) != 0) + _exit(STIERR_BADTEXT); + + _exit(0); + } + + finalize_child(pid, -1); +} + +ATF_TC(root); +ATF_TC_HEAD(root, tc) +{ + atf_tc_set_md_var(tc, "descr", + "Test that root can inject into another TTY"); + atf_tc_set_md_var(tc, "require.user", "root"); +} +ATF_TC_BODY(root, tc) +{ + static const char sending[] = "Text\r"; + ssize_t injected; + int pid, term; + + /* + * We leave canonicalization enabled for this one so that the read(2) + * below hangs until we have all of the data available, rather than + * having to signal OOB that it's safe to read. + */ + pid = init_pty(&term, true); + if (pid == 0) { + char readbuf[32]; + ssize_t readsz; + + readsz = read(STDIN_FILENO, readbuf, sizeof(readbuf)); + if (readsz < 0 || readsz != sizeof(sending) - 1) + _exit(STIERR_READFAIL); + + /* + * Here we ignore the trailing \r, because it won't have + * surfaced in our read(2). + */ + if (memcmp(readbuf, sending, readsz - 1) != 0) + _exit(STIERR_BADTEXT); + + _exit(0); + } + + injected = inject(term, sending); + ATF_REQUIRE_EQ_MSG(sizeof(sending) - 1, injected, + "Injected %zu characters, expected %zu", injected, + sizeof(sending) - 1); + + finalize_child(pid, -1); +} + +ATF_TC(unprivileged_fail_noctty); +ATF_TC_HEAD(unprivileged_fail_noctty, tc) +{ + atf_tc_set_md_var(tc, "descr", + "Test that unprivileged cannot inject into non-controlling TTY"); + atf_tc_set_md_var(tc, "require.user", "unprivileged"); +} +ATF_TC_BODY(unprivileged_fail_noctty, tc) +{ + const char sending[] = "Text"; + ssize_t injected; + int pid, serrno, term; + + pid = init_pty(&term, false); + if (pid == 0) { + char readbuf[32]; + ssize_t readsz; + + /* + * This should hang until we get terminated by the parent. + */ + readsz = read(STDIN_FILENO, readbuf, sizeof(readbuf)); + if (readsz > 0) + _exit(STIERR_DATAFOUND); + + _exit(0); + } + + /* Should fail. */ + injected = inject(term, sending); + serrno = errno; + + /* Done with the child, just kill it now to avoid problems later. */ + kill(pid, SIGINT); + finalize_child(pid, SIGINT); + + ATF_REQUIRE_EQ_MSG(-1, (ssize_t)injected, + "TIOCSTI into non-ctty succeeded"); + ATF_REQUIRE_EQ(EACCES, serrno); +} + +ATF_TC(unprivileged_fail_noread); +ATF_TC_HEAD(unprivileged_fail_noread, tc) +{ + atf_tc_set_md_var(tc, "descr", + "Test that unprivileged cannot inject into TTY not opened for read"); + atf_tc_set_md_var(tc, "require.user", "unprivileged"); +} +ATF_TC_BODY(unprivileged_fail_noread, tc) +{ + int pid, term; + + /* + * Canonicalization actually doesn't matter for this one, we'll trust + * that the failure means we didn't inject anything. + */ + pid = init_pty(&term, true); + if (pid == 0) { + static const char sending[] = "Text"; + ssize_t injected; + int rotty, wotty; + + /* + * We open the tty both r/o and w/o to ensure we got the device + * name right; one of these will pass, one of these will fail. + */ + wotty = openat(STDIN_FILENO, "", O_EMPTY_PATH | O_WRONLY); + if (wotty == -1) + _exit(STIERR_WOTTY); + rotty = openat(STDIN_FILENO, "", O_EMPTY_PATH | O_RDONLY); + if (rotty == -1) + _exit(STIERR_ROTTY); + + /* + * This injection is expected to fail with EPERM, because it may + * be our controlling tty but it is not open for reading. + */ + injected = inject(wotty, sending); + if (injected != -1) + _exit(STIERR_WOOK); + if (errno != EPERM) + _exit(STIERR_BADERR); + + /* + * Demonstrate that it does succeed on the other fd we opened, + * which is r/o. + */ + injected = inject(rotty, sending); + if (injected != sizeof(sending) - 1) + _exit(STIERR_INJECT); + + _exit(0); + } + + finalize_child(pid, -1); +} + +ATF_TP_ADD_TCS(tp) +{ + ATF_TP_ADD_TC(tp, basic); + ATF_TP_ADD_TC(tp, root); + ATF_TP_ADD_TC(tp, unprivileged_fail_noctty); + ATF_TP_ADD_TC(tp, unprivileged_fail_noread); + + return (atf_no_error()); +} From nobody Wed May 28 02:20:43 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b6YBg4Ns8z5wlb2; Wed, 28 May 2025 02:20: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b6YBg3bbKz3sh3; Wed, 28 May 2025 02:20:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748398843; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7lxz0BIb9zU+YdI7cTxxCZ7TWeaOVplvRqjG+JgTBRI=; b=PiuJ4CgvgXbM7MwMetDytRi5tFb+zZbhbUabGJ2aCPgrJNXPekOnda2iBuaXuaaEenanYB CRKvRyeA1aXeI348wBoGlxO4y80FuwwPzGst9t4RsQ6yt7RWmTIMOomyOz0qOgn+Bv9mz0 ghtKWJeVJQALXfaWeDNcpwr9iQ0Auxjv4oy50j1KujBbxHRvYGOCo46UOCskuXB22W2v2C qmuLhgT830/f0CRcE3A46IBj2hocET1qgg3QJMewtVV41Vb5vZbjvyBnMn+evrGL0dG6KC wxKkHiM5L+8yv/P2n9CBnoc3SY36fMmPybCrF3K0R/I8BzOaskCQ6YXrjh3EtA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748398843; a=rsa-sha256; cv=none; b=ITwuOBVgLcxXoPKhplgIhglgCfxFsnBi/eTRuPTJi9U75JaeNClZ/seTBqQonVnRSVHK58 BteWJVojPOd59oD28eq+94npb6jYHn7B4ZhjgWhkYgvdX+gVkfF3XIrm7bakJjJFNM0IUR gr0KSF6nqtYXG5QAX9Rw3kQaG0HS0LCV/mmU4qqZmN0qA0D/q/Da/AcQED6MG66eLgNU+j j2Lylt64ZM/otryx1VAA28qlatMgK/G8Z4WsmMnI84onLEXFLt2QpIciRxUSKoZ5O22rLP 4KVhPy6WeKbH48i6sADW2tE1br6PudKWScacnH9RNtbEaEFBj6+ZorLRmADCRg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748398843; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7lxz0BIb9zU+YdI7cTxxCZ7TWeaOVplvRqjG+JgTBRI=; b=FEKMkbwXMM1QXcom8lqLy55bAOjZuUFyb6E3Xga/IZZYYnwNtI9sbXBYnjVl54C7OmwqxM MYbfEtMx7Px88kgkdgR+InHylpybXn9Wm5h+gcrjW0GPZOiqFTvAImCd30w1Q6btcjhoDH QebuVEbMUrZvT61iTpsR+9wdFR7V1eaeYUOWe+zFPKh8qiOsRt3ek2jMaZBIkMhRivjyPg uo/yzgwYphiGfts4x2Dqd7URVQ+6cDIsFhssL7haMFfqaDVtsZH/D8zS+Oto5QmUfk47SL H2uioqhnuAWCIPm3NOSNkGiWOIwW7uYsCa0hVEYHL95l8H7ZCijEjjKHLuMCbA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b6YBg2xpnz3Rc; Wed, 28 May 2025 02:20: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 54S2KhWD053501; Wed, 28 May 2025 02:20:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54S2Kha4053498; Wed, 28 May 2025 02:20:43 GMT (envelope-from git) Date: Wed, 28 May 2025 02:20:43 GMT Message-Id: <202505280220.54S2Kha4053498@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Motin Subject: git: 93839cddbd08 - releng/14.3 - systat/top: Update ZFS sysctl names List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mav X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.3 X-Git-Reftype: branch X-Git-Commit: 93839cddbd08c5b866e83bda432da4eafd336415 Auto-Submitted: auto-generated The branch releng/14.3 has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=93839cddbd08c5b866e83bda432da4eafd336415 commit 93839cddbd08c5b866e83bda432da4eafd336415 Author: Alexander Motin AuthorDate: 2025-05-25 18:23:54 +0000 Commit: Alexander Motin CommitDate: 2025-05-28 02:20:01 +0000 systat/top: Update ZFS sysctl names Some of ARC statistic sysctls changed years ago, but those tools are still using legacy shims, that are going to be removed. Approved by: re (cperciva) (cherry picked from commit 8aad1e6148d3389df100bb0391e2d3a909f26ecf) (cherry picked from commit f23326ff2c7cad9579061291b6de7feb5ea7302a) --- usr.bin/systat/main.c | 6 +++--- usr.bin/top/machine.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/usr.bin/systat/main.c b/usr.bin/systat/main.c index 889ce39a6c32..ade0f41b0b2a 100644 --- a/usr.bin/systat/main.c +++ b/usr.bin/systat/main.c @@ -304,9 +304,9 @@ display(void) size_t size = sizeof(arc[0]); if (sysctlbyname("kstat.zfs.misc.arcstats.size", &arc[0], &size, NULL, 0) == 0 ) { - GETSYSCTL("vfs.zfs.mfu_size", arc[1]); - GETSYSCTL("vfs.zfs.mru_size", arc[2]); - GETSYSCTL("vfs.zfs.anon_size", arc[3]); + GETSYSCTL("kstat.zfs.misc.arcstats.mfu_size", arc[1]); + GETSYSCTL("kstat.zfs.misc.arcstats.mru_size", arc[2]); + GETSYSCTL("kstat.zfs.misc.arcstats.anon_size", arc[3]); GETSYSCTL("kstat.zfs.misc.arcstats.hdr_size", arc[4]); GETSYSCTL("kstat.zfs.misc.arcstats.l2_hdr_size", arc[5]); GETSYSCTL("kstat.zfs.misc.arcstats.bonus_size", arc[6]); diff --git a/usr.bin/top/machine.c b/usr.bin/top/machine.c index a76d77a80ce4..07a7119ad0c2 100644 --- a/usr.bin/top/machine.c +++ b/usr.bin/top/machine.c @@ -537,11 +537,11 @@ get_system_info(struct system_info *si) if (arc_enabled) { GETSYSCTL("kstat.zfs.misc.arcstats.size", arc_stat); arc_stats[0] = arc_stat >> 10; - GETSYSCTL("vfs.zfs.mfu_size", arc_stat); + GETSYSCTL("kstat.zfs.misc.arcstats.mfu_size", arc_stat); arc_stats[1] = arc_stat >> 10; - GETSYSCTL("vfs.zfs.mru_size", arc_stat); + GETSYSCTL("kstat.zfs.misc.arcstats.mru_size", arc_stat); arc_stats[2] = arc_stat >> 10; - GETSYSCTL("vfs.zfs.anon_size", arc_stat); + GETSYSCTL("kstat.zfs.misc.arcstats.anon_size", arc_stat); arc_stats[3] = arc_stat >> 10; GETSYSCTL("kstat.zfs.misc.arcstats.hdr_size", arc_stat); GETSYSCTL("kstat.zfs.misc.arcstats.l2_hdr_size", arc_stat2); From nobody Wed May 28 05:36:38 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b6dXl6lRlz5x0Yl; Wed, 28 May 2025 05:36: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b6dXl08TGz3pND; Wed, 28 May 2025 05:36:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748410599; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HEe3fG603zivyqyyj4n1d5Gk6d52Bznorjg2RtrS/o4=; b=DhSDqBcf78wl0BxYBo8gRWaaVZ23U1wvJFUPFrMqOVzetf6Jnifu3lM/1ie6goumnqdvMe 8YWpjuK1uWO0o8BwOlnrevhkf7Z2kx9nWjd9FcTkl6HyOH53DxUMcFcwZOZiY4cu+R8BYb tPrAzrGfuZvTGnkzQXmLvOBnL4lzTwwWZSXUUiz9UscKqpvNmyBQsKIOahWtF4KnLIr40k XuKTnM3Q9WY4iP3dxPUi5EXlW8foB69wIsrPSSoA9RpPT4R77fpgIzSXBa1VBk8GBsWg0Z D5+tQPUxjZeiarwuGFmOkXhvDgGIouWGibDtolASq3Fc7MSnRXRaboKfsSQi/w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748410599; a=rsa-sha256; cv=none; b=QKJCOgHTnJ146L3kJpJarpIOCx+RXfGBof047/ITqBWhc3hIpn59dVGLF7eTCjtLI/8e40 0uPgrTAgSSUGvvixe+zh5BmDOf6WaOGxSTy8CDn7rRZP9/YZXzfCQY7bbANb48Vziyl28x xp7jIwI5jqcekJourTtmTmvF95qvTie6SpXXZmAbQABDZQvHKK8QfAPiTKln2tGmq864hp 3K7nxWWDHQBvflRDGn8m/1huuz276RSEMu4eQSU8y7p/XlbGE6FsLT7qLY9xgpklPD7cqj l0rN5XyKxqZbn49hHm/RJHDB1vrGZYEABR4vm0DpIl0gGoAdNfRj/eUWRpP30w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748410599; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HEe3fG603zivyqyyj4n1d5Gk6d52Bznorjg2RtrS/o4=; b=Hc0y78Ex+MyYD42bw+B8VxVNhRgfe8RINbH6X6vx4xs7t0tIT4k07y5RWcBR1egvxzoSbO t2oa76gMwwOqm6r00ORLCa5WM2k+4mqLmH75lpW/8DI513Z1dfmiTTUD5eYkgaj+iaGbD2 evz774uL5HLtwX+pEUI3lg0g4QYbr4HthK6KKLJykbOs3+wCIY2/7NgBXAT3jkKRQzItKW gYlzJk/W79yNKZBpLSR42mYEYZHTC42QKo2LqOb67JhJZNXn+92oZjN5FxOERST1iao+8K CKDl5FMpezlGnrqyp90o547FCo71uJVMIjdBgmHZhm2fgtMitRkFmc6Yup4Icw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b6dXk62jKz8Z7; Wed, 28 May 2025 05:36: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 54S5ac2R017707; Wed, 28 May 2025 05:36:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54S5acUD017704; Wed, 28 May 2025 05:36:38 GMT (envelope-from git) Date: Wed, 28 May 2025 05:36:38 GMT Message-Id: <202505280536.54S5acUD017704@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Doug Moore Subject: git: 18a62137df40 - main - vm_object: use lookup_range in page_clean_flush List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dougm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 18a62137df40da29d2258e024a778ee559dedd30 Auto-Submitted: auto-generated The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=18a62137df40da29d2258e024a778ee559dedd30 commit 18a62137df40da29d2258e024a778ee559dedd30 Author: Doug Moore AuthorDate: 2025-05-28 05:33:43 +0000 Commit: Doug Moore CommitDate: 2025-05-28 05:33:43 +0000 vm_object: use lookup_range in page_clean_flush In vm_object_page_clean_flush, replace the loop that uses vm_radix_iter_next to visit consecutive pages with a call to vm_radix_iter_lookup_range, then a loop to check the pages looked-up. This achieves a small performance improvement. Reviewed by: alc Differential Revision: https://reviews.freebsd.org/D50425 --- sys/vm/vm_object.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c index 9b00aea9cdc8..1d372ba04488 100644 --- a/sys/vm/vm_object.c +++ b/sys/vm/vm_object.c @@ -1008,15 +1008,16 @@ vm_object_page_clean_flush(struct pctrie_iter *pages, vm_page_t p, vm_page_lock_assert(p, MA_NOTOWNED); vm_page_assert_xbusied(p); ma[0] = p; - for (count = 1; count < vm_pageout_page_count; count++) { - p = vm_radix_iter_next(pages); - if (p == NULL || vm_page_tryxbusy(p) == 0) + runlen = vm_radix_iter_lookup_range(pages, p->pindex + 1, + &ma[1], vm_pageout_page_count - 1); + for (count = 1; count <= runlen; count++) { + p = ma[count]; + if (vm_page_tryxbusy(p) == 0) break; if (!vm_object_page_remove_write(p, flags, allclean)) { vm_page_xunbusy(p); break; } - ma[count] = p; } vm_pageout_flush(ma, count, pagerflags, 0, &runlen, eio); From nobody Wed May 28 07:33:00 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b6h706bQyz5x6c3; Wed, 28 May 2025 07:33:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b6h70601Mz3MCq; Wed, 28 May 2025 07:33:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748417580; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5750QYvbU2DiRLZhm2qKYNBeBKMKEQsqBJGHZmxvZJw=; b=Kd+U4QGHNSsc89vu7FwojF57oYRZKEYO+pcS/YQsuB7U9kqwhsrZ3exDI5dLBH8fBw6sQs Mvq4iH/V6CJveYQaZ799zy0VBLKaaRxSyjbNqNenYoJt93Lvy28bF5V1PkPMhqQQBSpoJR mk03eiIHG6/09D+5gkCvVmAyjnL6cJqg3aV9fbj138TbuM2AQDOyLmz0+pxD/hcJkshaBA pUekZ7oOgmFGJZwWZopj1QLWgZe1gGpFTinyMpYutcxEvKR8lXcPSFrXBc4J62xc1e31xz mX3awbU4+zuB25NzsGGX6dn7AdlemmBBdIU9Fir38GaOiPPg/gy7EMf6WpLg/g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748417580; a=rsa-sha256; cv=none; b=JD5g6FzIfQs4oQv/oexSloFG1mR27EZXwvwQv0KQ7JFsEM8836AGg3QorGuc4BqMsBseJD PsoRVVYT7G1pMYWJqQVLoxS8wXtesnRN8ewoC/QQpSd8lIu764Wt9uFCnsKrT0YXesu+jo kTHVmFkzwJjMMXKU3i/3E1sWJ5pmRlZ05v6FVGLpeqFKTLLOfKy3ndGa0NA/MzrEFRorw1 aRCvrowSNVoRIGzLGGeGsgfQVqmQjqsl8H8FNskkGF54OVch7gOzTSrLmGjlstmFiSpiVv V6ZDG20aJFgK2CWAMhDeQ+h7WhiLOFs9Ax+Bts2BuJq2IIhgVluL/zbWzmEg+A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748417580; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5750QYvbU2DiRLZhm2qKYNBeBKMKEQsqBJGHZmxvZJw=; b=jVX2XaAg5Fr73QPKwIf389o4ZgshPtruckcpHr4Y+a8xJuindvZIUIHRELe1a+LD3SFy5Y bHMfSzkjieneSwEzuVL/17yesErjijUTYUONIah3Qkt2dNYIqJn0ZlZctiHsXguv4QZknO D6jWPLmFZbEzuCR+XiBj6o6t0m/Q/24n6/nsQAWhyjJaAzWPc4TtL0YdqjDYXu8hSk+uIX kP56Ys/viSDdKor4jMZv11/HXt+Ba8k6kn394+WuoWglin6kPz8Tq8bAxH+HI8d25TFP2t KF9JuGKlXmv+ow3yihpDXyc1LQFFfEVFy7ZIbMPIN4icWLhKPfpOjITDqC1whA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b6h705S5ZzD27; Wed, 28 May 2025 07:33: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 54S7X0Am040991; Wed, 28 May 2025 07:33:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54S7X0PD040988; Wed, 28 May 2025 07:33:00 GMT (envelope-from git) Date: Wed, 28 May 2025 07:33:00 GMT Message-Id: <202505280733.54S7X0PD040988@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Li-Wen Hsu Subject: git: f131f3c0bf01 - main - convert_ifapi: handle the special case of getting interface name List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f131f3c0bf017703fba2ee8bea9deb5955e9c4d6 Auto-Submitted: auto-generated The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=f131f3c0bf017703fba2ee8bea9deb5955e9c4d6 commit f131f3c0bf017703fba2ee8bea9deb5955e9c4d6 Author: Li-Wen Hsu AuthorDate: 2025-05-28 07:31:53 +0000 Commit: Li-Wen Hsu CommitDate: 2025-05-28 07:31:53 +0000 convert_ifapi: handle the special case of getting interface name Reviewed by: jhibbits Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D50445 --- tools/ifnet/convert_ifapi.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/ifnet/convert_ifapi.sh b/tools/ifnet/convert_ifapi.sh index b226847c9595..13509cd7182c 100755 --- a/tools/ifnet/convert_ifapi.sh +++ b/tools/ifnet/convert_ifapi.sh @@ -157,7 +157,7 @@ handle_misc() { old=`echo "$__ifp__->if_"${word}` new=`echo "if_get"${word}"($__ifp__)"` new=`echo $new | sed -e 's/&/\\\&/'` - line=`echo $line| sed -e's/'$old'/'$new'/g'` + line=`echo $line| sed -e's/'$old'/'$new'/g' | sed -e 's/if_getxname/if_name/'` return 0; fi return 1; From nobody Wed May 28 09:06:53 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b6kCK2khMz5xC3C; Wed, 28 May 2025 09:06:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b6kCK1yfrz3vLH; Wed, 28 May 2025 09:06:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748423213; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=l+pAWaD1KYInBA0d62fagqsHJvJS5xglX13Ck2aslxc=; b=x5++L0utES8jEhDKmftkUI+7s8yg98RDHu/Tu1zH2SXb025Ad1Cce3l3+PQnHDqbALTVQu vYAvcYBxdEcJm8Usb96So4kJsOpVvF4imxaV73mUMb1ZQwxC7Y3M7v8h5bzoEgUqVF4gfx gpIAJGGc+oq3WvAkFM8iJP4nCJjwqP951LEdd9MJB87Ox4UZ64Lw9AW3W/usrqfdAhg+s8 dKLYQROqT04+rDjM8bC/1HEt4FffzJpNgqyCNjv+KBDgAQTQ5eCdEIWu/2ecghLmtHbR8C hqnX7A5D88BbBr/kR06viSI173G2vkzmd9vcIjuUiZTE/s8AzhyUT8epAyg7Hg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748423213; a=rsa-sha256; cv=none; b=T8w+nbMbStsYIwaLVm7lfrtaBIu2juVuYy6k2cIDzJZ7IiDOv5JORWEMBSaErOBjQWqIHC iWj0dOMXg6sH/0QhE20PPaT+XR+JYTyqWdY9/V0fO8tQEG0ZpSuqHp8i9rKtVdUZJCkfat MH2GcNQdCFFT5I81yGo+N4T9cDcOubMw62F4s3kY1C0FTl9Bjv6RS1U/pR514LTn6fkxBa Ei6BIeE1t8r9hp1IpKOtVS+6/DfwPjRf8OfydHZVW9MW++elQ7VBOzmEcjY/fKRl36qV5h MQolvik6p2W5Yx/eEZ5aryeeuPOyayV+dryMeettiTrIQmGgGDTeRKN5SbnWAw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748423213; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=l+pAWaD1KYInBA0d62fagqsHJvJS5xglX13Ck2aslxc=; b=aqDRDlk0REwH9Lm82z6xROiErgy+eeYxftS8Ufp6Nf2Cu0v7Bq3GSnkt4qjkleS2MTPWdg p0bhapowVQeWhAWyVNxPdPMxm0pSOJpyXoq0sNTq7kqeCoWT2UmtOvjY0FkE2yYcU2ikRV ALPVulxzJ8FYGAEvfJ5SqbPOomxn+ME7dRl/SkdMRfZRXY9G0j0LwkJB3mAbwgWvufuLkB 7HDTeBDwC3uZaxcmg4Xo2UrcokOxMTQL/hztMq96XInzTbFaClIXziS+AKUQITePNHcGqd LHjc/vJ09MlSoANYD7ctGlCigGocCIzKSXhdHndob/rkiETZJTRT0twEUidQyg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b6kCK1RLnzWtv; Wed, 28 May 2025 09:06: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 54S96rJV012060; Wed, 28 May 2025 09:06:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54S96rNk012057; Wed, 28 May 2025 09:06:53 GMT (envelope-from git) Date: Wed, 28 May 2025 09:06:53 GMT Message-Id: <202505280906.54S96rNk012057@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Tom Jones Subject: git: 28345b17efca - main - if_iwx: Make firmware load error messages clearer List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: thj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 28345b17efca045ba3a24cb05167bc03b6348faf Auto-Submitted: auto-generated The branch main has been updated by thj: URL: https://cgit.FreeBSD.org/src/commit/?id=28345b17efca045ba3a24cb05167bc03b6348faf commit 28345b17efca045ba3a24cb05167bc03b6348faf Author: Tom Jones AuthorDate: 2025-05-28 08:49:48 +0000 Commit: Tom Jones CommitDate: 2025-05-28 08:49:48 +0000 if_iwx: Make firmware load error messages clearer Try to make it clearer where the errors are coming from in the iwx firmware load path. In particular make it clearer that transferring firmware to the card failed, not the loading of firmware. Hide the init firmware failed message behind a debug level, there are other errors which will show already in this path and for most people this doesn't add much. Reviewed by: adrian Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D49826 --- sys/dev/iwx/if_iwx.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sys/dev/iwx/if_iwx.c b/sys/dev/iwx/if_iwx.c index 03008e4fac93..029031802a26 100644 --- a/sys/dev/iwx/if_iwx.c +++ b/sys/dev/iwx/if_iwx.c @@ -2607,7 +2607,7 @@ iwx_apm_stop(struct iwx_softc *sc) if (!iwx_poll_bit(sc, IWX_CSR_RESET, IWX_CSR_RESET_REG_FLAG_MASTER_DISABLED, IWX_CSR_RESET_REG_FLAG_MASTER_DISABLED, 100)) - printf("%s: timeout waiting for master\n", DEVNAME(sc)); + printf("%s: timeout waiting for bus master\n", DEVNAME(sc)); /* * Clear "initialization complete" bit to move adapter from @@ -3697,7 +3697,7 @@ iwx_load_firmware(struct iwx_softc *sc) /* wait for the firmware to load */ err = msleep(&sc->sc_uc, &sc->sc_mtx, 0, "iwxuc", hz); if (err || !sc->sc_uc.uc_ok) { - printf("%s: could not load firmware, %d\n", DEVNAME(sc), err); + printf("%s: firmware upload failed, %d\n", DEVNAME(sc), err); iwx_ctxt_info_free_paging(sc); } @@ -4050,7 +4050,8 @@ iwx_run_init_mvm_ucode(struct iwx_softc *sc, int readnvm) sc->sc_init_complete = 0; err = iwx_load_ucode_wait_alive(sc); if (err) { - printf("%s: failed to load init firmware\n", DEVNAME(sc)); + IWX_DPRINTF(sc, IWX_DEBUG_FIRMWARE_TLV, + "%s: failed to load init firmware\n", DEVNAME(sc)); return err; } else { IWX_DPRINTF(sc, IWX_DEBUG_FIRMWARE_TLV, From nobody Wed May 28 09:06:54 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b6kCL3hSZz5xCLm; Wed, 28 May 2025 09:06:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b6kCL2RpKz3vWS; Wed, 28 May 2025 09:06:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748423214; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VD0y+H2ZCVQNExaM8ypJ22ctAE5GOzPQoKmlTUyzpXQ=; b=mBY+CBXAWS74uVMdRA19zVJ6e77PDMFvsxL70SLu2MluFaaMNzHOJWHQRwDUoX5HPFntEM YEfC7TL6mDnJhsxWH4SuYH2tZ8qhywKL0NF79pNpu/AxnSl/Wdm+0xgGl8Rr2EwsKvW3f5 slG4AfyDwpYqcuee+VxMVPM4N0uZNTXGTOiS7fzQaPq500NmQU4Hj46EzMvu8XXZrBFFh8 Ja2IaEWGt2bTVa4zyP3JFjPfu+PD4+wn62OzmCtMsr1seOEOJ/5Dr7aAo0am/XXzoIaNnF OK7qNu8EP5keI64/JoEt/yDYaMzNSXjX9/fPKfvwE38bVVpa6U1fggjPxn3diQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748423214; a=rsa-sha256; cv=none; b=wEptTtoUnhr1z1jVicSr2r9vtRzoRl+4N9nPsHSf755RAzN2t6Mx76t2l6jo1yAGO6clu4 Oqp40dGSX5LI/qhFCTpA/JX74GqiUC1bBqpNh/hb/cCwCMKvCyZlVyRfOLoREgZixH8M41 9mGUPryIA3jUGuRKgaJ9r5HfrLWuOy/NIy+tfNWcN+nSdgjOFZew3336JIrbYAeZWE5v5V hc/yppdgecgkkMBXct8aTfX81O6ijgYKVn6DXWBxQOap60ekQU/FNFpWnbzqgD58W/wExs fJ8hpHLnNvcOM7bfsixF0zg8m4axMTxMdTeW3+XboL51ycoYYSiKv4N97FcXOg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748423214; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VD0y+H2ZCVQNExaM8ypJ22ctAE5GOzPQoKmlTUyzpXQ=; b=fB6Yl+4iaH8gFhcrxokdrOzGnJJ8OcnOndg+Cn1uG4WFzNGWv4KaUvB5kdlSFwghyBRP8e SIe78MTlqVF2ZHLbRpz9Qv5pkh8L3qyCsyogY8qJiHJ2szoGtHQHPPKRfQPm60p8Yf39/d nysof7GivqSU0Y8Vyxerzuo7JO+rq1zNGL7+yB5RkfcOUGh3bNwqUjdwD+GDPCzuqgXfne Du/Iw3vQGTUnkzwwl6W52sHitB2TAPmou/Qa2Ofk6QldV6liM/1pBQH6AavQd0UtpBI9GD 6+JmRjYLIYhT7xvzbXlwMmdH+7VrOVgYodW8KZy+48CrFjw7EuikORwmL1Bo1A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b6kCL1yLpzX1q; Wed, 28 May 2025 09:06: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 54S96sYs012095; Wed, 28 May 2025 09:06:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54S96skP012092; Wed, 28 May 2025 09:06:54 GMT (envelope-from git) Date: Wed, 28 May 2025 09:06:54 GMT Message-Id: <202505280906.54S96skP012092@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Tom Jones Subject: git: 969f6c635358 - main - if_iwx: use net80211 suspend and resume methods List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: thj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 969f6c635358a079c50fd3ecd3d060bb5d9e0816 Auto-Submitted: auto-generated The branch main has been updated by thj: URL: https://cgit.FreeBSD.org/src/commit/?id=969f6c635358a079c50fd3ecd3d060bb5d9e0816 commit 969f6c635358a079c50fd3ecd3d060bb5d9e0816 Author: Tom Jones AuthorDate: 2025-05-28 09:02:54 +0000 Commit: Tom Jones CommitDate: 2025-05-28 09:02:54 +0000 if_iwx: use net80211 suspend and resume methods Use net80211 suspend and resume methods when entering and leaving suspend. Move the resume action outside of the IWX_LOCK. Re-assert disabling the PCI timeout, this is copied from OpenBSD (and a common pattern), but it doesn't seem to hurt. PR: 286059 Reviewed by: adrian Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D50462 --- sys/dev/iwx/if_iwx.c | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/sys/dev/iwx/if_iwx.c b/sys/dev/iwx/if_iwx.c index 029031802a26..a0e4bf8a53f6 100644 --- a/sys/dev/iwx/if_iwx.c +++ b/sys/dev/iwx/if_iwx.c @@ -195,6 +195,8 @@ int iwx_lomark = 192; #include +#define PCI_CFG_RETRY_TIMEOUT 0x41 + #define PCI_VENDOR_INTEL 0x8086 #define PCI_PRODUCT_INTEL_WL_22500_1 0x2723 /* Wi-Fi 6 AX200 */ #define PCI_PRODUCT_INTEL_WL_22500_2 0x02f0 /* Wi-Fi 6 AX201 */ @@ -10142,7 +10144,6 @@ iwx_attach(device_t dev) * We disable the RETRY_TIMEOUT register (0x41) to keep * PCI Tx retries from interfering with C3 CPU state. */ -#define PCI_CFG_RETRY_TIMEOUT 0x41 pci_write_config(dev, PCI_CFG_RETRY_TIMEOUT, 0x00, 1); if (pci_msix_count(dev)) { @@ -10657,8 +10658,11 @@ static int iwx_suspend(device_t dev) { struct iwx_softc *sc = device_get_softc(dev); + struct ieee80211com *ic = &sc->sc_ic; if (sc->sc_flags & IWX_FLAG_HW_INITED) { + ieee80211_suspend_all(ic); + iwx_stop(sc); sc->sc_flags &= ~IWX_FLAG_HW_INITED; } @@ -10669,21 +10673,27 @@ static int iwx_resume(device_t dev) { struct iwx_softc *sc = device_get_softc(dev); + struct ieee80211com *ic = &sc->sc_ic; int err; - err = iwx_start_hw(sc); - if (err) { - return err; - } + /* + * We disable the RETRY_TIMEOUT register (0x41) to keep + * PCI Tx retries from interfering with C3 CPU state. + */ + pci_write_config(dev, PCI_CFG_RETRY_TIMEOUT, 0x00, 1); - err = iwx_init_hw(sc); + IWX_LOCK(sc); + + err = iwx_init(sc); if (err) { iwx_stop_device(sc); + IWX_UNLOCK(sc); return err; } - ieee80211_start_all(&sc->sc_ic); + IWX_UNLOCK(sc); + ieee80211_resume_all(ic); return (0); } From nobody Wed May 28 10:11:17 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b6ldd43qqz5xGct; Wed, 28 May 2025 10:11: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b6ldd2Rsgz3ScG; Wed, 28 May 2025 10:11:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748427077; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NToFSy3VbUDX1W0QhGzT64l43Rwf1FK86Uez8fvmWbs=; b=DhxMfPWw8FvLn3MKscK4GTccNZtd2krovVbPUC4hWFrrOiJM3Lhyyqb4OZxZfSQrYVf01m yWaITv33G4cN0o7t08N1gbamr3j58qBvKJgm0i3A7w0PgkEL71bTXy+WXZCH6Mm153u0n9 9ODUED5xix/5Fdlr4b5tFf9i0TKigPcMWBmn4bzELCWQxlEvEorHMY4bBEsSMZezeiQ/ot LbI+U0b6CN0Xhx/wl7+N3cn/aU1laTdTvf+3NO7b+W9PLFCJX46flPfhVgj9nir0O1tVnl Ciu6jC/SAEgjjGmVpOIY7OMzi4lZYhUb2Uj3KS+N5EiT8JEUhNdV1Ut7NyErQg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748427077; a=rsa-sha256; cv=none; b=S6Y0a/GfcBQ6GezXgw5mSlg49tp7xFcUVlrhr2uUPLWYPb3wL24ch1T/4wIoVDvypPymzQ m0MSyxIa/tPx6sW3PxsKBdSf7+8+WfE8rpn0hSVpDmutpM/pEJpZLMXgG2/99P4/WY/QPr dyj3fHVj6DO6LQN24tQN40IubliE4hfY0EQNsu9bexx6hZdtjbDl+FWjQ2NulqEcGTEFar Y+jugZkm5rYb/DqQiWIBz/ztxN/aJ//nROZ+ARPxw2amoQSYi9z/S20N0Fv+Z5um16+dDf ZgeyEP1OU6om2y30VAQP7yO1aWB23VNXRmJIo43f7O467uIUiywuz9wCQiK1lQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748427077; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NToFSy3VbUDX1W0QhGzT64l43Rwf1FK86Uez8fvmWbs=; b=W5aOOchL0ZcX1g7wUtK1iUiUTkXbD0qJ4mcA06MZWeHA4p2P8odqMmQJ9EHOQ7N+CMugHL N05uE7gWocxLih13Ba6wBorr88eU4/kR6EakiCHXZlpYPU000dddu+m056sfoYxpZ/6yMj 8qzUjFB+kkWUmO75/pMgUXU88IKOSNd9lWb9as0bKVwNuYTIXFtIsxvKp0yxJwNLEqAM0O Z4eRx0t/R585PO1FDhFnX7LQA02EWEX0y98JHxJGzpMdNd0EWib4laYEp/jW6PjP8ULNbT 9ZXluba25vZ3B9Sm3vCoraCjpk6zat33soLwnBry0NYg8VVblyxRhbdeHM2+cg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b6ldd1pPfzZGw; Wed, 28 May 2025 10:11: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 54SABHhJ035473; Wed, 28 May 2025 10:11:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54SABHYx035470; Wed, 28 May 2025 10:11:17 GMT (envelope-from git) Date: Wed, 28 May 2025 10:11:17 GMT Message-Id: <202505281011.54SABHYx035470@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 5c10e8eae0f0 - stable/14 - open.2: add a note about conversion of a file descriptor into O_PATH List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 5c10e8eae0f071799744f55bc99ef3b712b698ba Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=5c10e8eae0f071799744f55bc99ef3b712b698ba commit 5c10e8eae0f071799744f55bc99ef3b712b698ba Author: Konstantin Belousov AuthorDate: 2025-05-25 16:32:34 +0000 Commit: Konstantin Belousov CommitDate: 2025-05-28 10:10:59 +0000 open.2: add a note about conversion of a file descriptor into O_PATH (cherry picked from commit fae33d1d12a51ca2bbdc7f5f189f7a4362fb48f7) --- lib/libc/sys/open.2 | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/lib/libc/sys/open.2 b/lib/libc/sys/open.2 index 7a760df7cf2f..b3bce8e77793 100644 --- a/lib/libc/sys/open.2 +++ b/lib/libc/sys/open.2 @@ -452,6 +452,13 @@ flag for .Xr fstatat 2 and related syscalls. .Pp +Conversely, a file descriptor +.Dv fd +referencing a filesystem file can be converted to the +.Dv O_PATH +type of descriptor by using the following call +.Dl opath_fd = openat(fd, \[dq]\[dq], O_EMPTY_PATH | O_PATH); +.Pp If successful, .Fn open returns a non-negative integer, termed a file descriptor. From nobody Wed May 28 10:14:34 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b6ljQ4d5rz5xGxj; Wed, 28 May 2025 10:14: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b6ljQ3rbJz3VCW; Wed, 28 May 2025 10:14:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748427274; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QBQtmAlfAtIepxBIr34nM1on40NVYa7fqIF1eRAcxaE=; b=hhjWMDMsD3Uxp5cmLOB6tDYF+hqtqymS+Veq6G9SQ5+LaVl1rOBSe/PYWqv9dEbJSJz2vx 5cQPAOYSeAHcbEOtEza9XvVrvtKGIJ+wvzRZ0Hd2HMkEqDW84OQz+LqCIQAg7ZbYhZX4yF M6iPAr/Af/Acm0g+5RKqoyOetisLOQUzVV9qbDm/vbTsp8O8QG8e/3Qydao8DEcStDBoSm XmhzimG9x/+qUD2phE1LjQCKCDw2l1ny+6WMDEPotBsZBJzzPmndNzfByVqA/sAoUl79Rm AI08Bt62qjq9sZiJJlWjzfVoivAj1JGjm9gZM5JQMgdwxWOdicLDj72IaPUZzQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748427274; a=rsa-sha256; cv=none; b=rXxx9yV/dAyAhhTKL8dGPcY/do2n90h5fTdGXJ4CRgPvzc8K4TnMbgSnHkzf0joTMFowf3 NhCSiI9lq90LPpgYbo7h0AnCGgObMJsR+FgfvSD/FbTP5JqL/fQONzHChHF4eflun5tye1 ROlAMtgXJBO1lVfrCPVORALcYwpq2aQdw1pqLmHnpExPuoqflJDXOrvW7YcXE+pM81jamM GO9SQA/awuRm+9hsCjA9Ob7kmfjOjxMgc9KEfG5CwBkoQ6JnWh63xFQVmwIRpoDsZdP8Bd gcu9Jxvlljkf2xa9aImkComkWrMftGeTUHsxvUkbjcZuy6RFMVXRF5zeBRvcBA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748427274; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QBQtmAlfAtIepxBIr34nM1on40NVYa7fqIF1eRAcxaE=; b=RuSgCaxqV6VRmvoDif5nwvM7ofNA95CthPe6LOjYQk+5MM43/LjkwzwHKG8sZ6cMU38XhO UAB40cZ1LiVMKgcixqaPO5394dxcaEQB0PnjrxSbztPY7arly/tgze5PS/MkWd7N66pxFA nAJf0PgQxAvcPdW40fC5ugOHkf9pv4GJQxAjCmBdrb5b1L9X7XbgCGvCk+wkD5LtV1pbC6 HSwSZfnlYqJxfgLJoNB4TQ7uxN9YRpypEH2XAN+B90bGkX6YbD70QpOlzE4jZAZ3JhqlJ8 NrUsc1almQDNpZjntGk5jzzOYxvCE8mB+798YeRpeCpAw30G7SVC9r0oCSLGOA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b6ljQ2rXCzZdM; Wed, 28 May 2025 10:14: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 54SAEYUq043209; Wed, 28 May 2025 10:14:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54SAEYMv043206; Wed, 28 May 2025 10:14:34 GMT (envelope-from git) Date: Wed, 28 May 2025 10:14:34 GMT Message-Id: <202505281014.54SAEYMv043206@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: 8d4f495df465 - main - ddb: improve show tcpcb List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 8d4f495df46567dcfcbec59794e9b9137b2f38fe Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=8d4f495df46567dcfcbec59794e9b9137b2f38fe commit 8d4f495df46567dcfcbec59794e9b9137b2f38fe Author: Michael Tuexen AuthorDate: 2025-05-28 10:10:51 +0000 Commit: Michael Tuexen CommitDate: 2025-05-28 10:10:51 +0000 ddb: improve show tcpcb Print the name of the TCP function block and the name of the congestion control algorithm. Furthermore, print some information related to Black Box Logging. Reviewed by: thj MFC after: 1 week Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D50535 --- sys/netinet/tcp_usrreq.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c index 61ca29dc0ad2..5be4c399893a 100644 --- a/sys/netinet/tcp_usrreq.c +++ b/sys/netinet/tcp_usrreq.c @@ -3045,6 +3045,43 @@ db_print_toobflags(char t_oobflags) } } +static void +db_print_bblog_state(int state) +{ + switch (state) { + case TCP_LOG_STATE_RATIO_OFF: + db_printf("TCP_LOG_STATE_RATIO_OFF"); + break; + case TCP_LOG_STATE_CLEAR: + db_printf("TCP_LOG_STATE_CLEAR"); + break; + case TCP_LOG_STATE_OFF: + db_printf("TCP_LOG_STATE_OFF"); + break; + case TCP_LOG_STATE_TAIL: + db_printf("TCP_LOG_STATE_TAIL"); + break; + case TCP_LOG_STATE_HEAD: + db_printf("TCP_LOG_STATE_HEAD"); + break; + case TCP_LOG_STATE_HEAD_AUTO: + db_printf("TCP_LOG_STATE_HEAD_AUTO"); + break; + case TCP_LOG_STATE_CONTINUAL: + db_printf("TCP_LOG_STATE_CONTINUAL"); + break; + case TCP_LOG_STATE_TAIL_AUTO: + db_printf("TCP_LOG_STATE_TAIL_AUTO"); + break; + case TCP_LOG_VIA_BBPOINTS: + db_printf("TCP_LOG_STATE_BBPOINTS"); + break; + default: + db_printf("UNKNOWN(%d)", state); + break; + } +} + static void db_print_tcpcb(struct tcpcb *tp, const char *name, int indent) { @@ -3156,6 +3193,21 @@ db_print_tcpcb(struct tcpcb *tp, const char *name, int indent) db_print_indent(indent); db_printf("t_rttlow: %d rfbuf_ts: %u rfbuf_cnt: %d\n", tp->t_rttlow, tp->rfbuf_ts, tp->rfbuf_cnt); + + db_print_indent(indent); + db_printf("t_fb.tfb_tcp_block_name: %s\n", tp->t_fb->tfb_tcp_block_name); + + db_print_indent(indent); + db_printf("t_cc.name: %s\n", tp->t_cc->name); + + db_print_indent(indent); + db_printf("_t_logstate: %d (", tp->_t_logstate); + db_print_bblog_state(tp->_t_logstate); + db_printf(")\n"); + + db_print_indent(indent); + db_printf("t_lognum: %d t_loglimit: %d t_logsn: %u\n", + tp->t_lognum, tp->t_loglimit, tp->t_logsn); } DB_SHOW_COMMAND(tcpcb, db_show_tcpcb) From nobody Wed May 28 10:29:40 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b6m2s1g76z5xHS8; Wed, 28 May 2025 10:29: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b6m2s16bZz3ZY1; Wed, 28 May 2025 10:29:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748428181; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NI5leqZhXh9KmiGbdKS83rVdLeiSHL2mSdH2icENgRw=; b=ez+DnF6rYwbXaCrOz7LkcjBuD4Q6hfhxU5E2JUD/WhqjF3l6u+QbW9j0ZuAZsLpRAzT4TE WMEv869pgtpt1VS2UiRYe2RPsZ/s2sq9y0Hogsq8TARIt+iaFkDGzuTPHMqcKRb1jcG07P /eQ5QEBrQhfpB5LxDjSYSJZm7PFDwy/Msq68Jk2IOEFmTd6n0YFYdS/ShEWvvWDmc+frrm /0Uqx6G7lnacY16SoF3ooPGlgBazNr4MTg5Xq5ky8CP6QAVndaQQaMp4E85nsLXaccxPdm XuR5pI3OqLK40yjjxb+zCmdE8mCk8cdD34T1Vlf0i6JcDX2q+v7ymPU99UY9Mw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748428181; a=rsa-sha256; cv=none; b=WOSpp4hw6k4N2f0Atnx23Nm47YCH9Rl5FYBH1ma0N9OahikVfXmGkKtiMmV99/TGbppdgb xDTU3y2MCDfvlV1etYVKUGtEFgwrSxfMoZ0i62Dc5gOf3hErCeIi26fUh6Pb6IWpTgwTtR F+M78X9J8ZGG2pnEfOR9F1+pDxTIFXtORaZnI7O/yQF8X2vbSzasIxY729tKdvNZHlEt6e 9WPaWy6YyVxtiJRPVB+1ORhksHIwB+0VDEbShCYZDDZyiFdLF07Fy2oAvwVgQDW0kfELh0 wTJycXHGIqG+UuuHTKZhfZauTUvJgJm94qKiptQPQhDhS4Ym0qRd2RxiG2j3Eg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748428181; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NI5leqZhXh9KmiGbdKS83rVdLeiSHL2mSdH2icENgRw=; b=bSo++ojlyt1hLiw0bKVvUQ71fekQuy+NeXlWK0RLBG2/QY1H5Vh8AymZMwiU++VfghjB/b lM70HiQ9TaOkXp+m6VnSLxZv9Ytjd2S6ND4ErsKc7LdNZh3srfCFYM0mWLQGavX7BhcLF4 yzaysH/QqUAzRbvrRsVui9uKFUizWBNoMdFLb8EU6l6hgH/GsTVZqk93Tk9PHDrkxfzfmf FnyDT2e6hZ/mcF1EfqMNko8r309M13N2HD597U4ihsEpL161ehXOFTjSrMa0UsCR8iziSL gJrZJqZI7RW39lMmbZCbYQ0o+/lHysgvscYo3ZXNiQNUJsF6YwLnVa+aEpNX+A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b6m2s0hD8zZxB; Wed, 28 May 2025 10:29: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 54SATeMN062973; Wed, 28 May 2025 10:29:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54SATeWD062970; Wed, 28 May 2025 10:29:40 GMT (envelope-from git) Date: Wed, 28 May 2025 10:29:40 GMT Message-Id: <202505281029.54SATeWD062970@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: f1430567f26b - main - ddb: add show all tcpcbs List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: f1430567f26bc84db3818914fa91c74507d1602a Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=f1430567f26bc84db3818914fa91c74507d1602a commit f1430567f26bc84db3818914fa91c74507d1602a Author: Michael Tuexen AuthorDate: 2025-05-28 10:25:26 +0000 Commit: Michael Tuexen CommitDate: 2025-05-28 10:25:26 +0000 ddb: add show all tcpcbs Add a command to show all TCP control blocks. Also provide an option to limit the output to TCP control blocks, which are locked. The plan is to run show all tcpcbs/l when syzkaller triggers a panic. If a TCP control block is affected, it is most likely locked and therefore the command shows the information of the affected TCP control block. Reviewed by: markj, thj Tested by: thj MFC after: 1 week Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D50516 --- share/man/man4/ddb.4 | 10 +++++++++- sys/netinet/tcp_usrreq.c | 23 +++++++++++++++++++++++ 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/share/man/man4/ddb.4 b/share/man/man4/ddb.4 index 4f6304e88114..9a9af553b29d 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 May 24, 2025 +.Dd May 28, 2025 .Dt DDB 4 .Os .Sh NAME @@ -604,6 +604,14 @@ The modifier will print command line arguments for each process. .\" .Pp +.It Ic show Cm all tcpcbs Ns Op Li / Ns Cm l +Show the same output as "show tcpcb" does, but for all +TCP control blocks within the system. +Using the +.Cm l +modifier will limit the output to TCP control blocks, which are locked. +.\" +.Pp .It Ic show Cm all trace .It Ic alltrace Show a stack trace for every thread in the system. diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c index 5be4c399893a..a7a1d98fd193 100644 --- a/sys/netinet/tcp_usrreq.c +++ b/sys/netinet/tcp_usrreq.c @@ -3222,4 +3222,27 @@ DB_SHOW_COMMAND(tcpcb, db_show_tcpcb) db_print_tcpcb(tp, "tcpcb", 0); } + +DB_SHOW_ALL_COMMAND(tcpcbs, db_show_all_tcpcbs) +{ + VNET_ITERATOR_DECL(vnet_iter); + struct inpcb *inp; + bool only_locked; + + only_locked = strchr(modif, 'l') != 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); + if (db_pager_quit) + break; + } + CURVNET_RESTORE(); + if (db_pager_quit) + break; + } +} #endif From nobody Wed May 28 10:43:47 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b6mM72JBLz5xHxw; Wed, 28 May 2025 10:43: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b6mM71rpPz3k80; Wed, 28 May 2025 10:43:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748429027; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0ojq5s4NzDbiGMa8lRI50Xr20G5jgUmNFt2Rf7AsDP0=; b=LyQGUBsoqjskFVa5A96PT8ibsczsNBMn/sjaT0rvE6aO+kCar3IJVYyRYDXc6OJWWY/5rC qJXzTdAortmHrwoo/LUNPry5saplWPUo0il0+RxoSwu92u7KteLC2kxADzoiqoB2kRJuFy TL5+6iq6VMRn/IlbGMQpmYoJ8ovFrgXC7iC4kdQ3QguMRJHfY2UW8c85hZVSnIXy9YLYN1 wQfu7ISBZcctmNX+ATttB0PRGXEETcieENPB9IVnzCR4Ra+UkGvvM5RvETHTSNKBcCjB2I I1oENERkRuXUrYbZ0MN3Yw1j2EslNf1+isk/v7XVH3RSnncmfYYIZhMGRxP2Jw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748429027; a=rsa-sha256; cv=none; b=gwXWm7r1gq/Dqnz6xRaV+bMbiSrMlFQpjYhaKmz5G3JII34GRGE3I0UnSPThc0jRCTedK2 sshnPCYzS5cZtx98L6zQMxaQcqCCRsCmZyPXmyFoV52/jUo4xcOpkWt/ahzGID/ADFmaRf oQjkxKx4O6RieDBY9CERzYoSh7fnAzuAaZ5u2SRMgBRKoBgqaAX+Dq/iES9/rIZMpRJo2e 6hxuHLnfoblWyF4x/HdIrwTnynvN2b+OEM+Gwq25KlYXb6n1tGhj3w+jLve7LyLHMMxqE1 HxVxFeh+inf1lTR0qQt1ZJmMJxXhMfKzYVal1CGbE8FR5Ngcaehm6dHSziLy1A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748429027; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0ojq5s4NzDbiGMa8lRI50Xr20G5jgUmNFt2Rf7AsDP0=; b=yQsrnDG3H9XB2oVfY3zxXscrrnIRmpH44gWeG3nBebCqcMtF7UCqzXZxXXNOL7LGedipFF jQDacCqx4G+q20KnZjRg4829+PtIsAXxh+FIxEMeNeGrVexULxsbFfQdKLOxtejvAsNR2W GiLZEk+2ZASz8px35K/HgiRd9pumgkrX25ccXznojVdfnRaOBo6JTul4J1Kgm2KvLrWqrI wkIOjaeTDghLYY079jQb/f7GCLY8gNwOqs2WXVAgKfUyhuuWWJc2jsY9Bh5JK0SqC9ljf9 XHiqM7PjlyxCweelsWVKn2glspzeQuCD0RSJ7mGcYajqmO0FA3TxWCHjUcOq7Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b6mM71MmqzbNw; Wed, 28 May 2025 10:43: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 54SAhlG7098736; Wed, 28 May 2025 10:43:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54SAhldt098734; Wed, 28 May 2025 10:43:47 GMT (envelope-from git) Date: Wed, 28 May 2025 10:43:47 GMT Message-Id: <202505281043.54SAhldt098734@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 54d0e1772fb6 - main - LinuxKPI: add struct_group_tagged() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 54d0e1772fb6b83d72725764e0a5d3ead8337673 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=54d0e1772fb6b83d72725764e0a5d3ead8337673 commit 54d0e1772fb6b83d72725764e0a5d3ead8337673 Author: Bjoern A. Zeeb AuthorDate: 2025-05-02 20:10:38 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-05-28 10:42:58 +0000 LinuxKPI: add struct_group_tagged() Restructure struct_group() into a wrapper around __struct_group(). Various callers have arguments annotated as /* no foo */ so try to add all we can find. Sponsored by: The FreeBSD Foundation MFC after: 3 days Reviewed by: dumbbell Differential Revision: https://reviews.freebsd.org/D50157 --- sys/compat/linuxkpi/common/include/linux/stddef.h | 26 ++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/stddef.h b/sys/compat/linuxkpi/common/include/linux/stddef.h index a3bc6b13765e..d04a5a4bf516 100644 --- a/sys/compat/linuxkpi/common/include/linux/stddef.h +++ b/sys/compat/linuxkpi/common/include/linux/stddef.h @@ -5,11 +5,27 @@ #include -#define struct_group(NAME, ...) \ +/* + * FreeBSD has multiple (vendor) drivers containing copies of this + * and including LinuxKPI headers. Put the #defines behind guards. + */ + +#ifndef __struct_group +#define __struct_group(_tag, _name, _attrs, _members...) \ union { \ - struct { __VA_ARGS__ }; \ - struct { __VA_ARGS__ } NAME; \ - } + struct { _members } _attrs; \ + struct _tag { _members } _attrs _name; \ + } _attrs +#endif -#endif /* _LINUXKPI_LINUX_STDDEF_H_ */ +#ifndef struct_group +#define struct_group(_name, _members...) \ + __struct_group(/* no tag */, _name, /* no attrs */, _members) +#endif +#ifndef struct_group_tagged +#define struct_group_tagged(_tag, _name, _members...) \ + __struct_group(_tag, _name, /* no attrs */, _members) +#endif + +#endif /* _LINUXKPI_LINUX_STDDEF_H_ */ From nobody Wed May 28 10:43:48 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b6mMB3BZ1z5xJHW; Wed, 28 May 2025 10:43: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b6mM86ZGPz3k48; Wed, 28 May 2025 10:43:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748429029; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kJOqho4bJix33hp0XE9eRu9qEjIGsvuBYJ4AFrq3K9A=; b=rqkGJHUrrgDpnG8j01vJ+XekKW8fC61V+Qt/lxmdTtCr5fxaY0w14oLG9qe0w/pdCE0ypd hT30zQUhoQNC29Ymy9F6JOsx3DV9AjeW5c5Pg+hHH42yALjo9RfHOCT7bT3SSK1bMxX4k+ zOc46BDB+EtfQysnAEDfC5pFTUDSWousLeogl/mucgME0EZMz4i2mKklO/Xi9je/8EsBQj /lcdVIxdChtShuFFk87jUNs+JsugLKkERTPpIs+d7fy5NnIIIHk2lyxMMfzgdFFwMdkC2t RPEItenZObEVkAaQ73qWz0f7jddTMHcHIurk7iPH5vmvp4pCuZsi6c7hTwm1PQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748429029; a=rsa-sha256; cv=none; b=KgA5Ss4JVXGhRQCpxyig1gGbbGUx8v8WQi+CmA1jcY5O0U+enj8do5J0eMmLWEUDkMS0lU 2rI/fb+8MOFQ4imZEvjKyEg5tqnP/vQz+/ZxiuUKV1zqfRU+438MSyZNJlAxR12Fuc5zVk wTV8J2UuN2LWhfSvUU4ynQsJkwHbvX9AFbBjq25baN4G85bHg+8QMRc23VyUx30yjexD5/ NZNXV22UM/Jx4koLzuwK0mxJG5+VkjDJYvHKDn2f+UuT2/KwgdHvCaBaRbiARNtItwJ5e/ FQStAsKuVxdefAIyLL3AvFSMabMsGq5hatXLRFKuEHKXQOGvVJncntNY9tgL2Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748429029; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kJOqho4bJix33hp0XE9eRu9qEjIGsvuBYJ4AFrq3K9A=; b=iPuKkTD3hYR+lL40ZP+t2tXAEQZKLwBC+EnsYgai9QUIN1hHzOsuBgeGCOPND4gauHdM2s rYOwaB72f+dbEyMgTh0ddehbk+D4Mu8REEvmVA02jOqIhRbWNHevccYLyVKWOBLbEITKrh rzZdEN0rhUp5Hi8mb8TsAoCVAjP4XA18L5tQ1q0ihgLJKgP+pm/8X8OEZb1O8/9RnDf6zo unDXvY9Jx13fJHCpGV+Ts9OFgSvl8eNvL7Yj1NTEUtDrcAkg1bOFaqMsjw9q5EIMWO8bRe Qq7RRFuxCIlHNF7keB4NNt412MUjnR8rKrKlF0Wby6E+rkXxBYTUOJ+dbI+AEA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b6mM82XglzbTw; Wed, 28 May 2025 10:43: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 54SAhmLN098772; Wed, 28 May 2025 10:43:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54SAhmBe098769; Wed, 28 May 2025 10:43:48 GMT (envelope-from git) Date: Wed, 28 May 2025 10:43:48 GMT Message-Id: <202505281043.54SAhmBe098769@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 32af70fae827 - main - net80211: make sure to not start a BGSCAN if not enabled List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 32af70fae827ecab34e995b49ea7656ea6e70608 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=32af70fae827ecab34e995b49ea7656ea6e70608 commit 32af70fae827ecab34e995b49ea7656ea6e70608 Author: Bjoern A. Zeeb AuthorDate: 2025-05-24 17:01:59 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-05-28 10:42:58 +0000 net80211: make sure to not start a BGSCAN if not enabled On drivers not supporting background scanning (not having announced IEEE80211_C_BGSCAN) we repeatedly have seen scanning issues and BGSCAN was "on" according to, e.g., ddb show com /a. Turns out there are multiple problems: (a) the ioctl scanreq code can pass IEEE80211_[IOC_]SCAN_BGSCAN in (ifconfig wlanX scan will do so by default). That flag ends up on flags in the scanning code which have no other checks, and we are doing a BGSCAN. So make sure BGSCAN is announced by the driver and enabled (and it's STA mode for the full check) or filter the BGSCAN out. (b) ieee80211_bg_scan() never checked if background scanning was available/enabled. Do so now. (c) ieee80211_swscan_start_scan_locked() as a consequence of (a) would start the BGSCAN unconditionally. Also check for BGSCAN to be available/enabled here. Lastly, we should no longer reach ieee80211_swscan_bg_scan() without background scanning being available/enabled, so document that fact by placing a KASSERT. That will also help in case future changes will open a new hole or there are further which I have not noticed. Sponsored by: The FreeBSD Foundation MFC after: 3 days Reviewed by: adrian Differential Revision: https://reviews.freebsd.org/D50513 --- sys/net80211/ieee80211_ioctl.c | 12 ++++++++++++ sys/net80211/ieee80211_scan.c | 13 +++++++++++++ sys/net80211/ieee80211_scan_sw.c | 8 +++++++- 3 files changed, 32 insertions(+), 1 deletion(-) diff --git a/sys/net80211/ieee80211_ioctl.c b/sys/net80211/ieee80211_ioctl.c index a72568e559aa..85d46c018d36 100644 --- a/sys/net80211/ieee80211_ioctl.c +++ b/sys/net80211/ieee80211_ioctl.c @@ -2598,6 +2598,18 @@ ieee80211_scanreq(struct ieee80211vap *vap, struct ieee80211_scan_req *sr) return EINVAL; /* cleanse flags just in case, could reject if invalid flags */ sr->sr_flags &= IEEE80211_IOC_SCAN_FLAGS; + + /* + * If the driver does not support BGSCAN, or BGSCAN is disabled + * do not allow the IEEE80211_SCAN_BGSCAN flag to go through + * to avoid accidentally enabling BGSCANs. + * Also if not STA mode [see ieee80211_vap_setup()]. + */ + if ((vap->iv_caps & IEEE80211_C_BGSCAN) == 0 || + (vap->iv_flags & IEEE80211_F_BGSCAN) == 0 || + vap->iv_opmode != IEEE80211_M_STA) + sr->sr_flags &= ~IEEE80211_IOC_SCAN_BGSCAN; + /* * Add an implicit NOPICK if the vap is not marked UP. This * allows applications to scan without joining a bss (or picking diff --git a/sys/net80211/ieee80211_scan.c b/sys/net80211/ieee80211_scan.c index 02cad610ee8e..f77baac1b134 100644 --- a/sys/net80211/ieee80211_scan.c +++ b/sys/net80211/ieee80211_scan.c @@ -428,6 +428,19 @@ ieee80211_bg_scan(struct ieee80211vap *vap, int flags) // IEEE80211_UNLOCK_ASSERT(sc); + /* + * If the driver has not announced BGSCAN capabilities + * or BGSCAN is disabled do not attempt to start a bg_scan. + * IEEE80211_F_BGSCAN only gets set if IEEE80211_C_BGSCAN + * was set by the driver, so no need to check for both here. + */ + if ((vap->iv_flags & IEEE80211_F_BGSCAN) == 0) { + IEEE80211_DPRINTF(vap, IEEE80211_MSG_SCAN, + "%s: BGSCAN not enabled; not starting bg_scan\n", + __func__); + return (0); + } + scan = ieee80211_scanner_get(vap->iv_opmode); if (scan == NULL) { IEEE80211_DPRINTF(vap, IEEE80211_MSG_SCAN, diff --git a/sys/net80211/ieee80211_scan_sw.c b/sys/net80211/ieee80211_scan_sw.c index f64730ce852f..d5770ff41968 100644 --- a/sys/net80211/ieee80211_scan_sw.c +++ b/sys/net80211/ieee80211_scan_sw.c @@ -201,7 +201,9 @@ ieee80211_swscan_start_scan_locked(const struct ieee80211_scanner *scan, vap->iv_stats.is_scan_passive++; if (flags & IEEE80211_SCAN_FLUSH) ss->ss_ops->scan_flush(ss); - if (flags & IEEE80211_SCAN_BGSCAN) + /* Only BGSCAN if enabled and requested. */ + if ((vap->iv_flags & IEEE80211_F_BGSCAN) != 0 && + (flags & IEEE80211_SCAN_BGSCAN) != 0) ic->ic_flags_ext |= IEEE80211_FEXT_BGSCAN; /* Set duration for this particular scan */ @@ -339,6 +341,10 @@ ieee80211_swscan_bg_scan(const struct ieee80211_scanner *scan, // IEEE80211_UNLOCK_ASSERT(ic); IEEE80211_LOCK(ic); + KASSERT((vap->iv_flags & IEEE80211_F_BGSCAN) != 0, + ("%s: vap %p iv_flags %#010x no IEEE80211_F_BGSCAN set", + __func__, vap, vap->iv_flags)); + scanning = ic->ic_flags & IEEE80211_F_SCAN; if (!scanning) { u_int duration; From nobody Wed May 28 10:43:49 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b6mMB4Whnz5xJMy; Wed, 28 May 2025 10:43: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b6mM94Klfz3k8K; Wed, 28 May 2025 10:43:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748429029; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yriVky2V+n+qvyzOXTEkBuew+EIy0qCvqATAqD4pFas=; b=QGMMZq52IAOgIOPRj+Yy4p+AlqG5yG0dOETfO5+l2QKW5SSQUTckQLPvsj6Q4g4WCUxRjY 66065OY/4ZjVwoydMl8rFgSAKT5Y9OszP76v+X0x4FiiVaeIh2nj5jfz/BQ586wsEujCbW O9DtLu61zCJ5cLU39+EcKKH3A0yEM2RsdqhcWKBjCCpdlHpIYWW2bGpZhnmxBqkreM+5ds D4pq7cAW61ln97ojxQAMcu/bxtWrWmvQpCm3mFjK0FHSJGY4diYxN2NJOhDGGB50sXeNA3 R5geSY2BXaTN/Pitwc5TALyyqieWU8jdOmgWfvjDtYXE2E0CkLb8zUvLtXHlsQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748429029; a=rsa-sha256; cv=none; b=hjZJ8zUFdEBSkODEDpz6MsfgAYgK1lzBNrk8F1EW+obIct1anZFK4c2+ujaIIha23V0e4x 9YIVSo1HwbGYu4jgtFhSwMvFQGTyXHlp2DdnCqdlj414mO+FP2NCAy217pbtgfBJAr5Bm5 LOWjgvsnwMEq9Tovw7MCvu3EfBzrpTZo7z671z/BuOUkwY59zGXidH1gZwpmjG+/elcbG5 oHMQC34TA4o2MMWaWodYKXmsQRuxg2O9rGBlMt0p+V4wktZL7mx3GRjC1tAyo2h0rsxM2a NedXM9ArHn6cTdY52VSsxrTZPP5mCgynDFQHBhiVfJdO5rUK3rEWtWxu1zbNWw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748429029; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yriVky2V+n+qvyzOXTEkBuew+EIy0qCvqATAqD4pFas=; b=rHP/t+zbeO3yrRoaYgyDqF3piI3RKYfub5I86xOONiEFx/xkbTW+aJgx9xzqsDe5507IX3 hxp/kxYQiMLGm0RCK2lpvW/x4bWx3ov2DScPEKyhmrjGUONLC77rdfx+OoofoJwEcOqHIx 3agTzB1rH4ZlxndEhQ0ptbdG6TsLahnsocjZD4oT8Lfj0qYNX0fVuf9vEsglZkyHFnal0H ZU7apDGHtg3CjFv/sZYglgDn2H7erUwfeWkEXCtqLU4LF0Ux+MBv5MHKwQJnilvIS3QFKr aqO2E5sUAZly2kf3bI2HzpHTujFc4uMDM62tbkbqE+Plfi7WQe9UH9EEgd6Hiw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b6mM93WsWzbD5; Wed, 28 May 2025 10:43: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 54SAhnhC098815; Wed, 28 May 2025 10:43:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54SAhnAO098812; Wed, 28 May 2025 10:43:49 GMT (envelope-from git) Date: Wed, 28 May 2025 10:43:49 GMT Message-Id: <202505281043.54SAhnAO098812@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 08471a76e3d2 - main - ifconfig: 802.11: fix a warning message List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 08471a76e3d27ffa9e2605dab0ff3c4968e7fef6 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=08471a76e3d27ffa9e2605dab0ff3c4968e7fef6 commit 08471a76e3d27ffa9e2605dab0ff3c4968e7fef6 Author: Bjoern A. Zeeb AuthorDate: 2025-05-27 19:34:48 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-05-28 10:42:58 +0000 ifconfig: 802.11: fix a warning message s/can/cannot/ Sponsored by: The FreeBSD Foundation MFC after: 3 days Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D50552 --- sbin/ifconfig/ifieee80211.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/ifconfig/ifieee80211.c b/sbin/ifconfig/ifieee80211.c index 80633e5e9ffc..1a9f0450a253 100644 --- a/sbin/ifconfig/ifieee80211.c +++ b/sbin/ifconfig/ifieee80211.c @@ -5092,7 +5092,7 @@ ieee80211_status(if_ctx *ctx) memset(&ik, 0, sizeof(ik)); ik.ik_keyix = i; if (get80211(ctx, IEEE80211_IOC_WPAKEY, &ik, sizeof(ik)) < 0) { - warn("WEP support, but can get keys!"); + warn("WEP support, but cannot get keys!"); goto end; } if (ik.ik_keylen != 0) { From nobody Wed May 28 11:11:39 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b6mzH2Mm6z5xKYR; Wed, 28 May 2025 11:11: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b6mzH1Wnbz42FR; Wed, 28 May 2025 11:11:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748430699; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=clFGHomU2txd8ZcuEGSimgFpsGydK6tAw0HODRQOPkc=; b=JXSvv0COY7U2CZzMygX4M/Vf0wszBvRsGBYrLvCsKEHX562z1VV1wxOXXRCT7RjXN+ARcV qDm5AWXHtKJfo2SBPJfaVboieglD3Cui6/7R2Dhlq7KR5HqfG+jwMMFoBx+q2ac9Cv03sa cgMdVkmwgwsmlT36DukdRP5S+2fmR/PI4crPHJaWEczvU3JMX1J7D1QrjBECl9sj7upCVg w4xBTI1bbCN19rP4FL7G+j0FOIZD1B16Am42Zv6/vixVuC3V5NqcSVggjFRdhOEPB1W7cp vUrcs5IlEU+GlsrtufpyFa/qAfzvb8p/Da9x97RFMe6h5OpB5FGFTjGhbMrapw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748430699; a=rsa-sha256; cv=none; b=hTJsG7qIlbzO/yzBu7Ky3x/of81tNeNHb/Y7OG0TCB9oTyHfKMWXm3TU43Uf7pGFhFDl+F TlPulibJa2JxZW4soWkdbvXt0V7YdK+mKoOIBIoRY18QqeK73KXUxEkdDaHy0JyLC1g2U3 fBMvdTT5yzJPB0a66aO+yX6TRMPUoj7nRSS0WUa0h4usFTizN1MWuLSOlQHNlgZQVZXik7 tPXL35OT/oUgENqF6FJYYHnjP+RMZY+WzHHIhwQf6tLIkp2eDYmYd6bsUfNqPgEfNGRdOg XWaZ9HshGXbP0zmXbaKeS/B1tKONaRCcoSFAR20JJ4tfWxIoXcC+QizQyuLeZw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748430699; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=clFGHomU2txd8ZcuEGSimgFpsGydK6tAw0HODRQOPkc=; b=biju8/g3DDtYZeELa63zlrGecpDTCS4w5E9teOQXIeQjHEkuF/dhVBnX5kLXUnXp3nU3rS eMve58hvspSulSVvhu4jZsxVwiMyboAppCf0oqAuC6EcHxOc/CSdXEhnfxIiqTC1sMxfZ0 3L4WfECxY10lM/L9HuhPllDNINznQ4Evj5rXIEAnD+zVIj66U0Bzwqxm99iP+Vu7R4JzCG pCAN3bxDvVqxLKOayXEP+0oG519v7rPUAkYiVuylA/ksreEGMsvgFnDBcCYU4Eyib0oayY 2e4Nxl2plmRQS7JB7hwEUokbZFavZTlihTBXDq3anC03kNk0eU6FNETVTGKu0g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b6mzH151nzc23; Wed, 28 May 2025 11:11: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 54SBBd1E049483; Wed, 28 May 2025 11:11:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54SBBdmO049481; Wed, 28 May 2025 11:11:39 GMT (envelope-from git) Date: Wed, 28 May 2025 11:11:39 GMT Message-Id: <202505281111.54SBBdmO049481@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: ddab534cd6f6 - main - amd64: do not handle fs/gs bases conditionally on the selector List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: ddab534cd6f6557740c24ff2019642880ad8bef6 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=ddab534cd6f6557740c24ff2019642880ad8bef6 commit ddab534cd6f6557740c24ff2019642880ad8bef6 Author: Konstantin Belousov AuthorDate: 2025-05-19 01:30:14 +0000 Commit: Konstantin Belousov CommitDate: 2025-05-28 11:11:23 +0000 amd64: do not handle fs/gs bases conditionally on the selector For machines with RDFSBASE support, we only saved and restored fs and gs base registers when corresponding segment register contained the predefined value. This breaks some valid uses of the LDT together with WR{F,G}SBASE. Unconditionally save bases, and restore them on return to usermode. The PCB_FULL_IRET optimization is still in place. Reviewed by: markj, olce Reported and tested: Alex S Tested by: pho Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D50414 --- sys/amd64/amd64/cpu_switch.S | 6 ------ sys/amd64/amd64/exception.S | 29 ----------------------------- sys/amd64/amd64/machdep.c | 6 ++---- sys/amd64/ia32/ia32_exception.S | 3 +-- 4 files changed, 3 insertions(+), 41 deletions(-) diff --git a/sys/amd64/amd64/cpu_switch.S b/sys/amd64/amd64/cpu_switch.S index 32d1b91d50b4..a053f6c70af1 100644 --- a/sys/amd64/amd64/cpu_switch.S +++ b/sys/amd64/amd64/cpu_switch.S @@ -91,14 +91,8 @@ ENTRY(cpu_switch) jnz 2f testb $CPUID_STDEXT_FSGSBASE,cpu_stdext_feature(%rip) jz 2f - movl %fs,%eax - cmpl $KUF32SEL,%eax - jne 1f rdfsbase %rax movq %rax,PCB_FSBASE(%r8) -1: movl %gs,%eax - cmpl $KUG32SEL,%eax - jne 2f movq %rdx,%r12 movl $MSR_KGSBASE,%ecx /* Read user gs base */ rdmsr diff --git a/sys/amd64/amd64/exception.S b/sys/amd64/amd64/exception.S index c3d5819378d1..babfbacf92ef 100644 --- a/sys/amd64/amd64/exception.S +++ b/sys/amd64/amd64/exception.S @@ -479,22 +479,14 @@ prot_addrf: jz 6f /* already running with kernel GS.base */ testb $CPUID_STDEXT_FSGSBASE,cpu_stdext_feature(%rip) jz 2f - cmpw $KUF32SEL,TF_FS(%rsp) - jne 1f rdfsbase %rax -1: cmpw $KUG32SEL,TF_GS(%rsp) - jne 2f rdgsbase %rdx 2: swapgs lfence movq PCPU(CURPCB),%rdi testb $CPUID_STDEXT_FSGSBASE,cpu_stdext_feature(%rip) jz 4f - cmpw $KUF32SEL,TF_FS(%rsp) - jne 3f movq %rax,PCB_FSBASE(%rdi) -3: cmpw $KUG32SEL,TF_GS(%rsp) - jne 4f movq %rdx,PCB_GSBASE(%rdi) orl $PCB_FULL_IRET,PCB_FLAGS(%rdi) /* full iret from user #gp */ 4: call handle_ibrs_entry @@ -730,12 +722,8 @@ dbg_fromuserspace: orl $PCB_FULL_IRET,PCB_FLAGS(%rdi) testb $CPUID_STDEXT_FSGSBASE,cpu_stdext_feature(%rip) jz 3f - cmpw $KUF32SEL,TF_FS(%rsp) - jne 2f rdfsbase %rax movq %rax,PCB_FSBASE(%rdi) -2: cmpw $KUG32SEL,TF_GS(%rsp) - jne 3f movl $MSR_KGSBASE,%ecx rdmsr shlq $32,%rdx @@ -842,12 +830,8 @@ nmi_fromuserspace: orl $PCB_FULL_IRET,PCB_FLAGS(%rdi) testb $CPUID_STDEXT_FSGSBASE,cpu_stdext_feature(%rip) jz 3f - cmpw $KUF32SEL,TF_FS(%rsp) - jne 2f rdfsbase %rax movq %rax,PCB_FSBASE(%rdi) -2: cmpw $KUG32SEL,TF_GS(%rsp) - jne 3f movl $MSR_KGSBASE,%ecx rdmsr shlq $32,%rdx @@ -1177,15 +1161,12 @@ do_segs: .globl ld_fs ld_fs: movw %ax,%fs - cmpw $KUF32SEL,%ax - jne 1f movl $MSR_FSBASE,%ecx movl PCB_FSBASE(%r8),%eax movl PCB_FSBASE+4(%r8),%edx .globl ld_fsbase ld_fsbase: wrmsr -1: /* Restore %gs and gsbase */ movw TF_GS(%rsp),%si pushfq @@ -1198,10 +1179,6 @@ ld_fsbase: .globl ld_gs ld_gs: movw %si,%gs - /* Save user %gs base into %r14d:%r15d */ - rdmsr - movl %eax,%r14d - movl %edx,%r15d /* Restore kernel %gs base */ movl %r12d,%eax movl %r13d,%edx @@ -1212,14 +1189,8 @@ ld_gs: * from the previously saved msr read. */ movl $MSR_KGSBASE,%ecx - cmpw $KUG32SEL,%si - jne 1f movl PCB_GSBASE(%r8),%eax movl PCB_GSBASE+4(%r8),%edx - jmp ld_gsbase -1: - movl %r14d,%eax - movl %r15d,%edx .globl ld_gsbase ld_gsbase: wrmsr /* May trap if non-canonical, but only for TLS. */ diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c index 6d9bc8b7c573..032a134bbd4b 100644 --- a/sys/amd64/amd64/machdep.c +++ b/sys/amd64/amd64/machdep.c @@ -1789,10 +1789,8 @@ set_pcb_flags_fsgsbase(struct pcb *pcb, const u_int flags) (pcb->pcb_flags & PCB_FULL_IRET) == 0) { r = intr_disable(); if ((pcb->pcb_flags & PCB_FULL_IRET) == 0) { - if (rfs() == _ufssel) - pcb->pcb_fsbase = rdfsbase(); - if (rgs() == _ugssel) - pcb->pcb_gsbase = rdmsr(MSR_KGSBASE); + pcb->pcb_fsbase = rdfsbase(); + pcb->pcb_gsbase = rdmsr(MSR_KGSBASE); } set_pcb_flags_raw(pcb, flags); intr_restore(r); diff --git a/sys/amd64/ia32/ia32_exception.S b/sys/amd64/ia32/ia32_exception.S index 42d0ff6c638b..ef1a2c59a0af 100644 --- a/sys/amd64/ia32/ia32_exception.S +++ b/sys/amd64/ia32/ia32_exception.S @@ -54,10 +54,10 @@ int0x80_syscall_common: movq %rax,TF_RAX(%rsp) movq %rdx,TF_RDX(%rsp) movq %rcx,TF_RCX(%rsp) + movq %r15,TF_R15(%rsp) call handle_ibrs_entry sti movq %rsi,TF_RSI(%rsp) - movq %r8,TF_R8(%rsp) movq %r9,TF_R9(%rsp) movq %rbx,TF_RBX(%rsp) movq %rbp,TF_RBP(%rsp) @@ -66,7 +66,6 @@ int0x80_syscall_common: movq %r12,TF_R12(%rsp) movq %r13,TF_R13(%rsp) movq %r14,TF_R14(%rsp) - movq %r15,TF_R15(%rsp) movl $TF_HASSEGS,TF_FLAGS(%rsp) pushfq andq $~(PSL_D | PSL_AC),(%rsp) From nobody Wed May 28 11:11:40 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b6mzJ49sLz5xKNG; Wed, 28 May 2025 11:11: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b6mzJ2d78z428V; Wed, 28 May 2025 11:11:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748430700; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OwEy7XQE0BrrCxsqBgCV3/MTa7hOnvCWxVTkARpoeK4=; b=ZPMf8UNdPThXLEY+MlL+B5WHeGG8MMhazK/s5K69PDpLqowgrUm6PS+beptF5IRwnTF2O8 CPHQs7mSbuZo00JkFhJ7Gg9VS2N3MrDfwQTMMIOH+hbswZqnBa24H8yVhuboe7kD6pBGT0 d2mjPpmwg1i8zAUjmRLeR8/xrClVPlWe/PzA9a7jMBUllQULFoTTYXBPYZsIF5+yp0atba kD2DqCYu2QBgMzqbMWfkAZdkLcjR9DxucaskgSrVmOkp0qnS2OE8tqIlZBET6ndIiKL00f QjueV7D48Htq3fs77gAz44DTxOcd8fewFF2wVul8ChiCubh/+ScVV2uIy7RT/A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748430700; a=rsa-sha256; cv=none; b=Ky3Q8IyBQmA+pSfb68Y9BA+gQQ/D6G78P353/k2yC35ZI1IMppfbTfjsqNGIkCcup4OrDs dg8IrpMXgl/eYomyyGbaGtuf2BT6KlzL5pv9SnrjHFUrs0gFzQAYTZVa9bdYDK4JvPJxfM li9EU8+hxcSPcYWBwZD+taxrleglDYTHbV8L6FiUYQrhQH11Mr6ThsfeEkG0QMWBWj6MwW 1S0M41114MXUyZDLySavgckicPqlmAUuOwuMbKQ0WypQuPPUO8DnbLJBAXfX3p5BdbPdWx Fgdt9iE3+Oh340T9jB/+Y8XORPmjNZuKs0i7XhJJoFYtw0SnQQxDsfoK3VV7Kg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748430700; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OwEy7XQE0BrrCxsqBgCV3/MTa7hOnvCWxVTkARpoeK4=; b=D4aLuAolCd/8/FWJh4WiEriXB/jlRjYizp1AhejyZzM/WgvL/4qK1SAmTSkBvPoP0ZVK5m AJwknv2KhyA7rMaLMHGVzIqUYWKQ2lcjjKVtVFW7LfYcWOp3U1PUEduOF9i9K43tbvIMr7 tUwuBbKRgWbfFu7utCSiHT32EwPyO7W1h6bdBs0TF4te0W4qCGRpy+zqe8hrwdCcZdWy63 //R5wP3SwWEXkNLAs8UIYNELhEWjURBTlNFfE5TBc/jfCvDCREehKvAegJQ2zRN8TmzY6S lqi596Gsz3aVM3Puk86cfeR2eB8SV71q0HP/vWSRHafPDTwFIuk21aEKmeiZpA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b6mzJ23Pkzbw8; Wed, 28 May 2025 11:11: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 54SBBePO049517; Wed, 28 May 2025 11:11:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54SBBeAo049514; Wed, 28 May 2025 11:11:40 GMT (envelope-from git) Date: Wed, 28 May 2025 11:11:40 GMT Message-Id: <202505281111.54SBBeAo049514@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: 68ba38dad388 - main - amd64: add pcb_tlsbase List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 68ba38dad388b566877ba79ff02ed12a53b0ff3f Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=68ba38dad388b566877ba79ff02ed12a53b0ff3f commit 68ba38dad388b566877ba79ff02ed12a53b0ff3f Author: Konstantin Belousov AuthorDate: 2025-05-19 23:56:37 +0000 Commit: Konstantin Belousov CommitDate: 2025-05-28 11:11:23 +0000 amd64: add pcb_tlsbase This is a value for TLS base that would be explicitly set by user. It is forced into the fsbase register on entry to signal handler, making TLS in the handler usable even if userspace uses segmentation. Reported and tested: Alex S Tested by: pho Reviewed by: olce Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D50482 --- sys/amd64/amd64/exec_machdep.c | 6 ++++-- sys/amd64/amd64/sys_machdep.c | 15 +++++++++++++++ sys/amd64/amd64/vm_machdep.c | 8 ++++---- sys/amd64/ia32/ia32_signal.c | 1 + sys/amd64/include/pcb.h | 4 +++- sys/amd64/linux/linux_sysvec.c | 2 +- sys/amd64/linux32/linux32_sysvec.c | 7 ++++--- sys/x86/include/sysarch.h | 2 ++ 8 files changed, 34 insertions(+), 11 deletions(-) diff --git a/sys/amd64/amd64/exec_machdep.c b/sys/amd64/amd64/exec_machdep.c index 8361f9fcfcab..46e4f0c9e07b 100644 --- a/sys/amd64/amd64/exec_machdep.c +++ b/sys/amd64/amd64/exec_machdep.c @@ -209,6 +209,8 @@ sendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *mask) regs->tf_fs = _ufssel; regs->tf_gs = _ugssel; regs->tf_flags = TF_HASSEGS; + if ((pcb->pcb_flags & PCB_TLSBASE) != 0) + pcb->pcb_fsbase = pcb->pcb_tlsbase; PROC_LOCK(p); mtx_lock(&psp->ps_mtx); } @@ -379,9 +381,9 @@ exec_setregs(struct thread *td, struct image_params *imgp, uintptr_t stack) user_ldt_free(td); update_pcb_bases(pcb); - pcb->pcb_fsbase = 0; + pcb->pcb_fsbase = pcb->pcb_tlsbase = 0; pcb->pcb_gsbase = 0; - clear_pcb_flags(pcb, PCB_32BIT); + clear_pcb_flags(pcb, PCB_32BIT | PCB_TLSBASE); pcb->pcb_initial_fpucw = __INITIAL_FPUCW__; saved_rflags = regs->tf_rflags & PSL_T; diff --git a/sys/amd64/amd64/sys_machdep.c b/sys/amd64/amd64/sys_machdep.c index 70a369ec64a3..6deebba5babc 100644 --- a/sys/amd64/amd64/sys_machdep.c +++ b/sys/amd64/amd64/sys_machdep.c @@ -206,6 +206,8 @@ sysarch(struct thread *td, struct sysarch_args *uap) case AMD64_GET_XFPUSTATE: case AMD64_SET_PKRU: case AMD64_CLEAR_PKRU: + case AMD64_GET_TLSBASE: + case AMD64_SET_TLSBASE: break; case I386_SET_IOPERM: @@ -311,14 +313,27 @@ sysarch(struct thread *td, struct sysarch_args *uap) error = copyout(&pcb->pcb_fsbase, uap->parms, sizeof(pcb->pcb_fsbase)); break; + case AMD64_GET_TLSBASE: + if ((pcb->pcb_flags & PCB_TLSBASE) == 0) { + error = ESRCH; + } else { + error = copyout(&pcb->pcb_tlsbase, uap->parms, + sizeof(pcb->pcb_tlsbase)); + } + break; case AMD64_SET_FSBASE: + case AMD64_SET_TLSBASE: error = copyin(uap->parms, &a64base, sizeof(a64base)); if (error == 0) { if (a64base < curproc->p_sysent->sv_maxuser) { set_pcb_flags(pcb, PCB_FULL_IRET); pcb->pcb_fsbase = a64base; td->td_frame->tf_fs = _ufssel; + if (uap->op == AMD64_SET_TLSBASE) { + pcb->pcb_tlsbase = a64base; + set_pcb_flags(pcb, PCB_TLSBASE); + } } else error = EINVAL; } diff --git a/sys/amd64/amd64/vm_machdep.c b/sys/amd64/amd64/vm_machdep.c index 2b280e960b2e..4001f40554af 100644 --- a/sys/amd64/amd64/vm_machdep.c +++ b/sys/amd64/amd64/vm_machdep.c @@ -156,7 +156,7 @@ copy_thread(struct thread *td1, struct thread *td2) /* Kernel threads start with clean FPU and segment bases. */ if ((td2->td_pflags & TDP_KTHREAD) != 0) { - pcb2->pcb_fsbase = 0; + pcb2->pcb_fsbase = pcb2->pcb_tlsbase = 0; pcb2->pcb_gsbase = 0; clear_pcb_flags(pcb2, PCB_FPUINITDONE | PCB_USERFPUINITDONE | PCB_KERNFPU | PCB_KERNFPU_THR); @@ -182,7 +182,7 @@ copy_thread(struct thread *td1, struct thread *td2) * pcb2->pcb_savefpu: cloned above. * pcb2->pcb_flags: cloned above. * pcb2->pcb_onfault: cloned above (always NULL here?). - * pcb2->pcb_[fg]sbase: cloned above + * pcb2->pcb_[f,g,tls]sbase: cloned above */ pcb2->pcb_tssp = NULL; @@ -663,14 +663,14 @@ cpu_set_user_tls(struct thread *td, void *tls_base) return (EINVAL); pcb = td->td_pcb; - set_pcb_flags(pcb, PCB_FULL_IRET); + set_pcb_flags(pcb, PCB_FULL_IRET | PCB_TLSBASE); #ifdef COMPAT_FREEBSD32 if (SV_PROC_FLAG(td->td_proc, SV_ILP32)) { pcb->pcb_gsbase = (register_t)tls_base; return (0); } #endif - pcb->pcb_fsbase = (register_t)tls_base; + pcb->pcb_fsbase = pcb->pcb_tlsbase = (register_t)tls_base; return (0); } diff --git a/sys/amd64/ia32/ia32_signal.c b/sys/amd64/ia32/ia32_signal.c index dea12c5346a3..54e170450dba 100644 --- a/sys/amd64/ia32/ia32_signal.c +++ b/sys/amd64/ia32/ia32_signal.c @@ -958,4 +958,5 @@ ia32_setregs(struct thread *td, struct image_params *imgp, uintptr_t stack) /* Return via doreti so that we can change to a different %cs */ set_pcb_flags(pcb, PCB_32BIT | PCB_FULL_IRET); + clear_pcb_flags(pcb, PCB_TLSBASE); } diff --git a/sys/amd64/include/pcb.h b/sys/amd64/include/pcb.h index 1caa33ac0019..27e1dce08ee1 100644 --- a/sys/amd64/include/pcb.h +++ b/sys/amd64/include/pcb.h @@ -84,6 +84,7 @@ struct pcb { #define PCB_KERNFPU_THR 0x0020 /* fpu_kern_thread() */ #define PCB_32BIT 0x0040 /* process has 32 bit context (segs etc) */ #define PCB_FPUNOSAVE 0x0080 /* no save area for current FPU ctx */ +#define PCB_TLSBASE 0x0100 /* tlsbase was set */ uint16_t pcb_initial_fpucw; @@ -104,7 +105,8 @@ struct pcb { struct savefpu *pcb_save; - uint64_t pcb_pad[5]; + register_t pcb_tlsbase; /* not same as pcb_fsbase */ + uint64_t pcb_pad[4]; }; /* Per-CPU state saved during suspend and resume. */ diff --git a/sys/amd64/linux/linux_sysvec.c b/sys/amd64/linux/linux_sysvec.c index 9c3d7e6405c1..3760a5455a73 100644 --- a/sys/amd64/linux/linux_sysvec.c +++ b/sys/amd64/linux/linux_sysvec.c @@ -247,7 +247,7 @@ linux_exec_setregs(struct thread *td, struct image_params *imgp, pcb->pcb_fsbase = 0; pcb->pcb_gsbase = 0; - clear_pcb_flags(pcb, PCB_32BIT); + clear_pcb_flags(pcb, PCB_32BIT | PCB_TLSBASE); pcb->pcb_initial_fpucw = __LINUX_NPXCW__; set_pcb_flags(pcb, PCB_FULL_IRET); diff --git a/sys/amd64/linux32/linux32_sysvec.c b/sys/amd64/linux32/linux32_sysvec.c index 19b4af7661f0..a8cc03ea8c71 100644 --- a/sys/amd64/linux32/linux32_sysvec.c +++ b/sys/amd64/linux32/linux32_sysvec.c @@ -580,6 +580,10 @@ linux_exec_setregs(struct thread *td, struct image_params *imgp, if (td->td_proc->p_md.md_ldt != NULL) user_ldt_free(td); + /* Do full restore on return so that we can change to a different %cs */ + set_pcb_flags(pcb, PCB_32BIT | PCB_FULL_IRET); + clear_pcb_flags(pcb, PCB_TLSBASE); + critical_enter(); wrmsr(MSR_FSBASE, 0); wrmsr(MSR_KGSBASE, 0); /* User value while we're in the kernel */ @@ -605,9 +609,6 @@ linux_exec_setregs(struct thread *td, struct image_params *imgp, x86_clear_dbregs(pcb); fpstate_drop(td); - - /* Do full restore on return so that we can change to a different %cs */ - set_pcb_flags(pcb, PCB_32BIT | PCB_FULL_IRET); } /* diff --git a/sys/x86/include/sysarch.h b/sys/x86/include/sysarch.h index 3226f3b9d93a..61f559f4bd23 100644 --- a/sys/x86/include/sysarch.h +++ b/sys/x86/include/sysarch.h @@ -61,6 +61,8 @@ #define AMD64_GET_XFPUSTATE 132 #define AMD64_SET_PKRU 133 #define AMD64_CLEAR_PKRU 134 +#define AMD64_GET_TLSBASE 135 +#define AMD64_SET_TLSBASE 136 /* Flags for AMD64_SET_PKRU */ #define AMD64_PKRU_EXCL 0x0001 From nobody Wed May 28 11:11:41 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b6mzL0Mksz5xKHs; Wed, 28 May 2025 11:11: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b6mzK30sjz424x; Wed, 28 May 2025 11:11:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748430701; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=os0zgOfHfSAzT6yAIkiBcwX1eR6Ulrs4bKg21YdCLKE=; b=g1U53mV4+jDQLiI1uVgqi7mDDN/nGk7pVKJY/rbBdUfw9w+iZ2V3nSrKdNZKL4qSML1CqC wULa6wTnQr9kxORpulEA7WMIw07DzszhkDuSjJrh47AjYd54OoOtWTte3PNcTVTEut/4g0 j71B1yJfCEHF3ThozluN4cSH4TAaq6HGXIWwJJVRM8cP7Ka+toSP7qkqYsP0RLLj61xaK8 V43jVurT/tqSLFqGF7gyu3C/dCOLaiANPka7peMsNz5864HarkW5x/jj5Yd1Y+iNbTpHAt WRyS7j3A9qXQ3jnwB7fDgx25U2fEcn4MbTCRAl23tqPI9GQDUfRK/zDkTrY0hg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748430701; a=rsa-sha256; cv=none; b=uFNOnlcDXrz8BGBAy6uTVZjXJKUiXtln6W/KZp5R4OU6JlsfJTzPDOZYC9yEGC8Yt6l2ek HrjJDjd0xTBYhKgWvsflQT8k+z3m8vNDcRcRZuJuxmqwoEVcQwU/gh6DXNLxvHOGFYHugh ClGQLBqYxMeKMHXFtLXqztD9Ke5024dDDU0arMNvh5Boixf5v6PyPlILbtlWYqnKGmoCDr VIu5WjQNdi0d/QuAs3FMfs2hqyD8dt/CK5W9C+sSLtahysnkgUhWYJcwXLjj+8mFgnFax4 wPJay7RLg2hXUD8WRofN67qR+iglVDQBLUN8dEpSgVP/jsvPAexLSKVG4eh+cg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748430701; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=os0zgOfHfSAzT6yAIkiBcwX1eR6Ulrs4bKg21YdCLKE=; b=vFrsyMagwHaTMcOHo2GkgUZ1oVm3h3/Q8uXepGf7522M+AxA0js5lLOi+GwKOqiUqAJ676 4HPbd9t5w3Qs3DUWbP+ueLtS592PbxY4sWmEv3ntFdm0w7cHfPCdCjQGa6OlW16Z49tAv1 Dk0BsKF7y8Evsmopnns00yKrus26JLLUD81EMaF+8sRla9DajSscGnK/3+z4oeUtiULntK /+DkpdFA0mh3ue5JM7tQzpBCmeAlExNakiCY90GZp2Q6khACXijba7u8De3/n7gdpKwWqo iU2Y0uUJ57lBvuK9anApsqkZ4uehwpCoH6JSAQybJTawHY6ju9FHoNC7UzwYLQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b6mzK2cWzzc25; Wed, 28 May 2025 11:11: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 54SBBfJu049551; Wed, 28 May 2025 11:11:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54SBBfD7049548; Wed, 28 May 2025 11:11:41 GMT (envelope-from git) Date: Wed, 28 May 2025 11:11:41 GMT Message-Id: <202505281111.54SBBfD7049548@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: 0ec732913fce - main - Bump __FreeBSD_version and provide P_OSREL_TLSBASE for amd64 set_tlsbase List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 0ec732913fceb9aae2d56c2dd667203711b76550 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=0ec732913fceb9aae2d56c2dd667203711b76550 commit 0ec732913fceb9aae2d56c2dd667203711b76550 Author: Konstantin Belousov AuthorDate: 2025-05-22 04:25:05 +0000 Commit: Konstantin Belousov CommitDate: 2025-05-28 11:11:23 +0000 Bump __FreeBSD_version and provide P_OSREL_TLSBASE for amd64 set_tlsbase Reviewed by: olce Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D50482 --- sys/sys/param.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/sys/param.h b/sys/sys/param.h index 6ce6903826d3..0a08d4740593 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -73,7 +73,7 @@ * cannot include sys/param.h and should only be updated here. */ #undef __FreeBSD_version -#define __FreeBSD_version 1500043 +#define __FreeBSD_version 1500044 /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD, @@ -106,6 +106,7 @@ #define P_OSREL_POWERPC_NEW_AUX_ARGS 1300070 #define P_OSREL_TIDPID 1400079 #define P_OSREL_ARM64_SPSR 1400084 +#define P_OSREL_TLSBASE 1500044 #define P_OSREL_MAJOR(x) ((x) / 100000) #endif From nobody Wed May 28 11:11:42 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b6mzM0wkyz5xKWj; Wed, 28 May 2025 11: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b6mzL401Xz42Hx; Wed, 28 May 2025 11:11:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748430702; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TjgkMFeH4iYVtPI9Bllm9+t2s/zXxeSb7s3wePGUzSI=; b=wNUD93xtkG/bymisFiAkD2JVw6EWcEQ0LDUq6sK9ZUlTsmJv9tVm+/WZb0DYglCTliUw4B QH9xLNCN/fM7GWu8WV7cH57K/dWMRvdeDSJB9YeFM9JwKZaQhgMVRbgN0Lwb9VcjW2PNmf HsrcDqD8cvlWM7OV1xuq/P6tQgG9zOzEr/9FyH/kNhrzgXlBQZzs8bnLc8doxtCmh/jkog P0jbgChUku0CKUK7pdxPY3ovhtgZOG4yuOX/eUbOzVDWIU75/ub8e8R9ozOirrlIrTyaMm knZIWGVI65shfwtL86Sc6SZmgjTwp+NwQIPNqUkf3FmPgDSzNL7lw42XeHFhmQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748430702; a=rsa-sha256; cv=none; b=y2ymOiCqu8XimJb8YONQW1bjAulFgXl7n69kcUZNxfUd5d/+kQdl39TxYjUVUNJSdtPWUZ ohUqh7wczTUwV4DwzQituzqgq14XaDWAYExevsksGVZS7xnSMTxcjHtR/McQJq0Eqw2JqF 5AAIrAkzwZBLUhHCM4+KzdTfEuD4I9v/+z5xQAkLh/xcjnNVxAVjGHsvw/y5mg/6BxJkMP jUfaqj9uEQlJjr0O2CjnTooUns54xRAcCRWeYrK2+6jtdZqqcG6RBgRr4iRfQajnk5Qw5Y ZTfk4C0xy/ljh+pU2VH9FtnguJJzcjqQZwISil2Wu0ovfVlJJ6EUK+WCIb0NDQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748430702; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TjgkMFeH4iYVtPI9Bllm9+t2s/zXxeSb7s3wePGUzSI=; b=CUsDWD0cq1BsnFwhFUz8FTBSTf3zA8WlNNG7t8jJfqWKCNMmgTXeauHZDV7D43+fIByvPD GkI0fRmziyMs4Je3mati/mwrNc8yxifrofPPtq7l0AzvjPjY6FxQm9Z0kjLjW+ahqXK5/O cBrPWswev8mn4duOq0wIhvCFkaDXa0T227GIkKw0sd8APIq8TPwNFRPCmJOQIxp9SCMe6f UcfFW9lEy1rpVpX5XVV4xEkqxXzH2lQdYUToYfsybNvEf5BhkUKLgyzzW+sZl1haT0mcIC 9btuXst8BlN7EBGQnzI7AkZnrKEG50zJC3DiUzXG7HCkrUzzfxwzZpzpTq9eQg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b6mzL3YYzzc4Q; Wed, 28 May 2025 11:11: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 54SBBgrU049585; Wed, 28 May 2025 11:11:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54SBBgf0049582; Wed, 28 May 2025 11:11:42 GMT (envelope-from git) Date: Wed, 28 May 2025 11:11:42 GMT Message-Id: <202505281111.54SBBgf0049582@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: eea3e4dd9703 - main - amd64: add mc_tlsbase member to mcontext List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: eea3e4dd9703a252509d75814049aa8da5007ebb Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=eea3e4dd9703a252509d75814049aa8da5007ebb commit eea3e4dd9703a252509d75814049aa8da5007ebb Author: Konstantin Belousov AuthorDate: 2025-05-22 06:55:50 +0000 Commit: Konstantin Belousov CommitDate: 2025-05-28 11:11:23 +0000 amd64: add mc_tlsbase member to mcontext Tested by: pho Reviewed by: olce Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D50482 --- sys/amd64/amd64/exec_machdep.c | 6 ++++++ sys/x86/include/frame.h | 1 + sys/x86/include/ucontext.h | 8 ++++++-- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/sys/amd64/amd64/exec_machdep.c b/sys/amd64/amd64/exec_machdep.c index 46e4f0c9e07b..da68289e2c83 100644 --- a/sys/amd64/amd64/exec_machdep.c +++ b/sys/amd64/amd64/exec_machdep.c @@ -635,6 +635,8 @@ get_mcontext(struct thread *td, mcontext_t *mcp, int flags) mcp->mc_gsbase = pcb->pcb_gsbase; mcp->mc_xfpustate = 0; mcp->mc_xfpustate_len = 0; + mcp->mc_tlsbase = (pcb->pcb_flags & PCB_TLSBASE) != 0 ? + pcb->pcb_tlsbase : 0; bzero(mcp->mc_spare, sizeof(mcp->mc_spare)); return (0); } @@ -709,6 +711,10 @@ set_mcontext(struct thread *td, mcontext_t *mcp) pcb->pcb_fsbase = mcp->mc_fsbase; pcb->pcb_gsbase = mcp->mc_gsbase; } + if ((mcp->mc_flags & _MC_HASTLSBASE) != 0) { + pcb->pcb_tlsbase = mcp->mc_tlsbase; + set_pcb_flags(pcb, PCB_TLSBASE); + } return (0); } diff --git a/sys/x86/include/frame.h b/sys/x86/include/frame.h index 9574e8c0ed02..994e19b979fc 100644 --- a/sys/x86/include/frame.h +++ b/sys/x86/include/frame.h @@ -152,6 +152,7 @@ struct trapframe { #define TF_HASSEGS 0x1 #define TF_HASBASES 0x2 #define TF_HASFPXSTATE 0x4 +#define TF_RESERV0 0x8 /* no tlsbase in the trapframe */ #endif /* __amd64__ */ #endif /* _MACHINE_FRAME_H_ */ diff --git a/sys/x86/include/ucontext.h b/sys/x86/include/ucontext.h index b7964e8c7141..00edc8c16bce 100644 --- a/sys/x86/include/ucontext.h +++ b/sys/x86/include/ucontext.h @@ -99,7 +99,9 @@ typedef struct __mcontext { #define _MC_HASSEGS 0x1 #define _MC_HASBASES 0x2 #define _MC_HASFPXSTATE 0x4 -#define _MC_FLAG_MASK (_MC_HASSEGS | _MC_HASBASES | _MC_HASFPXSTATE) +#define _MC_HASTLSBASE 0x8 +#define _MC_FLAG_MASK (_MC_HASSEGS | _MC_HASBASES | _MC_HASFPXSTATE | \ + _MC_HASTLSBASE) typedef struct __mcontext { /* @@ -158,7 +160,9 @@ typedef struct __mcontext { __register_t mc_xfpustate; __register_t mc_xfpustate_len; - long mc_spare[4]; + __register_t mc_tlsbase; + + long mc_spare[3]; } mcontext_t; #endif /* __amd64__ */ From nobody Wed May 28 11:11:43 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b6mzM6zwpz5xKHy; Wed, 28 May 2025 11: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b6mzM4k3Cz428j; Wed, 28 May 2025 11: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=1748430703; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PJ+glJtPKg0r+iTLHJb8VO1QtlLrpwozpUcrLYrFqiw=; b=w5BmJLoFjfzHmcJf/zkWWWGfWg18yNIMrDF1LXBrAl8dUG5eFeaDiHB8mZsRj6x9qTAi38 S4f9RukozDKmdO72W3u/yTEMNBLpUV2rN5xgi0E4JdZm/SMJUmOpbqfS0QEoYAQM3S+cWj gM/T8cluG+Ua/lyYkuECJ+eZoUe9D/AOKet48ByjOm4T4PlY1tBNT/kkG5G9r0kIrBEiYY NJp7biFZoeEfN/N/Wnd221mpy78fy83UXLFJdGyi+rA93KdW5rsnm7yMgfPNTCMnBR5ggC It70sF2iOVWUtjj9/5P8Rc56opiiFGgz+ObgCmumTFZWSrHUphvp6UY3vqreQw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748430703; a=rsa-sha256; cv=none; b=CXv/T0+387eOkTRq1fYpdqrFggdfxYbN/r4IJ+cwA8JLplPfQPNWfrpc88RdUFyxR1BPyy 1CpfzJcGUZk0WFSJ3CdSGoqYIzfJG1ANumakpcUaiuJt3yCuXRAkICLBxuRGHlJTn+AfTr 0J/N62y53Sg4nNBMmE5k8ShZqkpMZOvlVDN7iSlCaonFNMBWY8TUmf1u3M2OZzVt0iD1L/ xDEHBw4zrwWGSMZUBPQttXfXr5UvJ1ZHgWMANQu2vz181WXIunMAzco5ZFkV65lBpVIQiB MLysdygqFM0pIDHFvirm2YxnP7KxuvjEf+DuBFDvemlicsmpI7puGO1YwFmNQw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748430703; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PJ+glJtPKg0r+iTLHJb8VO1QtlLrpwozpUcrLYrFqiw=; b=N+SJjlSZaiKgYvaFYroCxPeUVB1hl2hLY3hgwAxFjp4ihB1+MJREtL52WXQ9WrTHYi7naq /2rYmxFQGzDYlyIYTdMm0/KmjnfJTW3u4zDPqojKje/KxGOrlEVEFO4ydXLwYBkWh4BVJ9 eq3vucPxOszZuynNXnrfjmc8Ift8yUTnPfJo2U9MQl+dqbUHmiBDkW6IcjNMidrmBy08Dh JZffT9EhlTcd6/3fb/m7nca5WUTlIvesXaSsU/B1ja/TOjreZ1XWEFzuWCHa4AvaRK49EL pkRqt+r7Gpc+79ZcZA/WB7BktzgK92Nee52qGu6ryuPRFRkHSX7+s+eP5b5hoA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b6mzM4Cpfzc26; Wed, 28 May 2025 11: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 54SBBhPv049621; Wed, 28 May 2025 11: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 54SBBhol049618; Wed, 28 May 2025 11:11:43 GMT (envelope-from git) Date: Wed, 28 May 2025 11:11:43 GMT Message-Id: <202505281111.54SBBhol049618@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: 7171e591a4c7 - main - amd64: add ptrace PT_{GET,SET}TLSBASE requests List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 7171e591a4c70eb4ee616e33373fd62773ad5a08 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=7171e591a4c70eb4ee616e33373fd62773ad5a08 commit 7171e591a4c70eb4ee616e33373fd62773ad5a08 Author: Konstantin Belousov AuthorDate: 2025-05-22 06:56:24 +0000 Commit: Konstantin Belousov CommitDate: 2025-05-28 11:11:23 +0000 amd64: add ptrace PT_{GET,SET}TLSBASE requests Tested by: pho Reviewed by: olce Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D50482 --- sys/amd64/amd64/ptrace_machdep.c | 21 +++++++++++++++++++++ sys/x86/include/ptrace.h | 2 ++ 2 files changed, 23 insertions(+) diff --git a/sys/amd64/amd64/ptrace_machdep.c b/sys/amd64/amd64/ptrace_machdep.c index 715f0749bda9..69616e80b708 100644 --- a/sys/amd64/amd64/ptrace_machdep.c +++ b/sys/amd64/amd64/ptrace_machdep.c @@ -368,6 +368,27 @@ cpu_ptrace(struct thread *td, int req, void *addr, int data) cpu_ptrace_setbase(td, req, rv); break; + case PT_GETTLSBASE: + pcb = td->td_pcb; + if ((pcb->pcb_flags & PCB_TLSBASE) != 0) + error = copyout(&pcb->pcb_tlsbase, addr, sizeof(*r)); + else + error = ESRCH; + break; + + case PT_SETTLSBASE: + pcb = td->td_pcb; + error = copyin(addr, &rv, sizeof(rv)); + if (error != 0) + break; + if (rv >= td->td_proc->p_sysent->sv_maxuser) { + error = EINVAL; + break; + } + pcb->pcb_tlsbase = rv; + set_pcb_flags(pcb, PCB_TLSBASE); + break; + default: error = EINVAL; break; diff --git a/sys/x86/include/ptrace.h b/sys/x86/include/ptrace.h index f477094bdd14..d4fa1fe45a3c 100644 --- a/sys/x86/include/ptrace.h +++ b/sys/x86/include/ptrace.h @@ -54,6 +54,8 @@ #define PT_SETFSBASE (PT_FIRSTMACH + 8) #define PT_GETGSBASE (PT_FIRSTMACH + 9) #define PT_SETGSBASE (PT_FIRSTMACH + 10) +#define PT_GETTLSBASE (PT_FIRSTMACH + 11) +#define PT_SETTLSBASE (PT_FIRSTMACH + 12) /* Argument structure for PT_GETXSTATE_INFO. */ struct ptrace_xstate_info { From nobody Wed May 28 11:11:45 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b6mzQ4mspz5xKNL; Wed, 28 May 2025 11:11: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b6mzQ0vtRz429L; Wed, 28 May 2025 11:11:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748430706; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Rrn4Lz6L2frUyXSaoN+eH2opr36ZRKX/wG4S1/PEmP8=; b=S9HJo43we1oh3CLIU6vrArZUdp9oxq8xdVtNy1CrIsQC5oXPmsmEbxgNrJZ9dmwniB9KQz JnfOIore5u+rjEWdAe9DBtBXGkyCmvQZDLrrfkEOgI7ifXIsQOV8smc5Hmn1U5F8j47d7W q9AqTpE1c9qPhVvwjOD3PLH3r48aIhmvnefd3AAK8kbKyNRDuv3JXtP1lTkV3E+7thE2S0 rATdPUq20qLRTWn99zbn2sva7EsqZ6iRaq/kt1GIBtfoKFshsrTKD73Iy6I3DFMUo5MLaK d786p7BApVc1Cl2seplcTlU5M3szsKc7NnXS3xFS8A/W9RFlTyqJc/W0RUd62Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748430706; a=rsa-sha256; cv=none; b=g+LHnRp1NxWpNb1qiTeza35NSo0zamI3tekt3CT5kchU7GsKyjbEsZLDcq6PKfNgy9TQe0 LRJEg0PWa8r0i+yY/OBujZffbv6kz/gJAFuHeRXGzbeB5vTt3EimKcWNuGTiry0P+LGXjX 9bpbwj5EmuaLKZByexm2fiF3UZtgmPipakOW8d9PSxSKBgqRi0iJ9oCYBUi/S5MuA62MMU nW2WDgdLkWvsaSFgsFlzH7aJu7O6HgyC03ofKeeOjoljufJi1PYuUTqj0QqHJWNiMp/6eV 1qlQsXyhc+pj6OKTOmLZKBr+10EG+sQHq1vzbpBR9g+6T3O6EPijlpumy1pijw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748430706; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Rrn4Lz6L2frUyXSaoN+eH2opr36ZRKX/wG4S1/PEmP8=; b=miff0rlatLJ2I752mmsCKlwQlNvVEq2fBvGhqZRhbKo+cJgn/epYRBn/+tn2KH4zGTrtRp HqXhyYiigpz97s7NMRCmmibMal/Uv4WeXgjVZAOPg9YuGTNS2rKaqyuzxe4LisHKAHKql8 e4CuS/80yalX2Ef8q5+aw5eYpJ+IkkZXIolRqbrPFUbRS5W6HtD/tMrvWA4iUT9KoOwEPo FCKi6NqObpLjOZCPL8DDdM39MJnkYlm0SRCz4bN2jtvYqBJDyp/F9GmhNd/SLVoddmd8a0 +JU0R/DPWDlcGQFSFVDHfTYnTp8/PqP/XH8PU0XvPZGRZhyt5Oe7FwB1TTOKcA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b6mzP5TQfzbhY; Wed, 28 May 2025 11:11: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 54SBBjwK049695; Wed, 28 May 2025 11:11:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54SBBjUt049692; Wed, 28 May 2025 11:11:45 GMT (envelope-from git) Date: Wed, 28 May 2025 11:11:45 GMT Message-Id: <202505281111.54SBBjUt049692@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: aef025fc9b6c - main - amd64: switch to amd64_set_tlsbase to set tls base List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: aef025fc9b6c8b06677086a93c866ee09622f6fa Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=aef025fc9b6c8b06677086a93c866ee09622f6fa commit aef025fc9b6c8b06677086a93c866ee09622f6fa Author: Konstantin Belousov AuthorDate: 2025-05-22 04:32:25 +0000 Commit: Konstantin Belousov CommitDate: 2025-05-28 11:11:23 +0000 amd64: switch to amd64_set_tlsbase to set tls base Reported and tested: Alex S Tested by: pho Reviewed by: olce Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D50482 --- libexec/rtld-elf/amd64/reloc.c | 6 ++++-- sys/x86/include/tls.h | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/libexec/rtld-elf/amd64/reloc.c b/libexec/rtld-elf/amd64/reloc.c index 373a1cdd2d06..95f402995836 100644 --- a/libexec/rtld-elf/amd64/reloc.c +++ b/libexec/rtld-elf/amd64/reloc.c @@ -543,10 +543,12 @@ allocate_initial_tls(Obj_Entry *objs) addr = allocate_tls(objs, 0, TLS_TCB_SIZE, TLS_TCB_ALIGN); /* - * This does not use _tcb_set() as it calls amd64_set_fsbase() + * This does not use _tcb_set() as it calls amd64_set_tlsbase() * which is an ifunc and rtld must not use ifuncs. */ - if (__getosreldate() >= P_OSREL_WRFSBASE && + if (__getosreldate() >= P_OSREL_TLSBASE) + sysarch(AMD64_SET_TLSBASE, &addr); + else if (__getosreldate() >= P_OSREL_WRFSBASE && (cpu_stdext_feature & CPUID_STDEXT_FSGSBASE) != 0) wrfsbase((uintptr_t)addr); else diff --git a/sys/x86/include/tls.h b/sys/x86/include/tls.h index 29d036fd4871..1ed47bf01938 100644 --- a/sys/x86/include/tls.h +++ b/sys/x86/include/tls.h @@ -69,7 +69,7 @@ static __inline void _tcb_set(struct tcb *tcb) { #ifdef __amd64__ - amd64_set_fsbase(tcb); + amd64_set_tlsbase(tcb); #else i386_set_gsbase(tcb); #endif From nobody Wed May 28 11:11:44 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b6mzP5kFTz5xKtx; Wed, 28 May 2025 11:11: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b6mzN5v28z42Rx; Wed, 28 May 2025 11:11:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748430704; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=33pI4upBaLJNGSi61EDPRqxJhXf4K5JLiPdxMt65Eg4=; b=ZfvJToSeRWVrQ88UH3iIqPtZD8XibOFCd/I6Tkl4Tvn5NOTj7CVB7KjADAtxYZheebqzeL FemccdKJkzRLMgWX2UEhnHDsnhPcGjdcEGXNZNu04MKEo5OeVoTsDXc7a1I5x/G0p/kap5 fkaw3jR19ztADc6ZLeureMaTvl/HufmBk/WgMT8zz8sUoBxs7klkFPKXTjoKq6KOOdzlE8 eL6BzHavlw++V5m1bI33vsjsdAw8fK7kFqefKeuczzaqamT0F8INHkDqK6Ie6R4C2DbGJv eLiAo9AF+DiVQLffCZAMaPo053myxDzcIlebGNRtEra81TN18z0LGfZP2vnk0Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748430704; a=rsa-sha256; cv=none; b=yZjlNsH5tR62ks8TpLcqVkCW1qrvN4bBkSG59zD7M0yW+rjXbWEvWAuZK6hZbodT/fCGe0 BF3Sv7+yyKmAO3TkEdI1NNaTDDogExXFGSsgL08FUliJuus+9sH5JdUxJ1+AHcip9e9TAf LeoXG0xnY45xDwcoEFGntK32u5No1tEFzQsr+6DvmU0z6ONR+4trpY61v4OjQF+tq8qALI PVNGZSbWX1MQS3DivG/0IaKwlaebP1ZdV1QpyuFLUcgdHwtF/4V52ZkH+WA2iEN9ehVqsV UhJNdNVD4E2W86zMbA5nbJ1j38oXaiKXrykeEpp2nbc04DKFSW0v1/EQADC6VQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748430704; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=33pI4upBaLJNGSi61EDPRqxJhXf4K5JLiPdxMt65Eg4=; b=EbJV9OuJ+cxNCP3S36+4iFLWUBPyEyVxWNNIktM7TANfvp5mabgRgZiVUuBSPWszRGbdo1 019UNpbjqV30qOuLGUMMCCaJ6DuZTd+E9GGZnq2Nf/Yn+XBvO6ihfFoiD4iFbPS4NPdLfp SCC00kG1WMfoSZ1h9g0dsIcdfcKCIVM3n8cS1qK/YoD7YGTC8qCvBLhBhj0rX4hErO1s+d iu4QOsDsdR/n/wjShzikOK0AGrPfUevwiSQbbOH7APvjd5LqIPr5bpbRsHu70M8IfwTq9w Wofx2r1EPcAvmQzYZRHgFVrR+cqrFysOKW2bkN/i2d3tvDRM+Mo4ZBdHluv+lw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b6mzN58XDzbw9; Wed, 28 May 2025 11:11: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 54SBBi1Z049661; Wed, 28 May 2025 11:11:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54SBBiKf049658; Wed, 28 May 2025 11:11:44 GMT (envelope-from git) Date: Wed, 28 May 2025 11:11:44 GMT Message-Id: <202505281111.54SBBiKf049658@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: 2e7cf772a411 - main - amd64: add amd64_set_tlsbase(3) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 2e7cf772a4114b78eb0ab2687d91d563de89e206 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=2e7cf772a4114b78eb0ab2687d91d563de89e206 commit 2e7cf772a4114b78eb0ab2687d91d563de89e206 Author: Konstantin Belousov AuthorDate: 2025-05-22 04:32:03 +0000 Commit: Konstantin Belousov CommitDate: 2025-05-28 11:11:23 +0000 amd64: add amd64_set_tlsbase(3) Tested by: pho Reviewed by: olce Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D50482 --- lib/libsys/amd64/Makefile.sys | 1 + lib/libsys/amd64/Symbol.sys.map | 4 +++ lib/libsys/amd64/amd64_set_tlsbase.c | 51 ++++++++++++++++++++++++++++++++++++ sys/x86/include/sysarch.h | 1 + 4 files changed, 57 insertions(+) diff --git a/lib/libsys/amd64/Makefile.sys b/lib/libsys/amd64/Makefile.sys index 09947d998480..8134bdc422a6 100644 --- a/lib/libsys/amd64/Makefile.sys +++ b/lib/libsys/amd64/Makefile.sys @@ -3,6 +3,7 @@ SRCS+= \ amd64_get_gsbase.c \ amd64_set_fsbase.c \ amd64_set_gsbase.c \ + amd64_set_tlsbase.c \ rfork_thread.S MDASM= vfork.S cerror.S getcontext.S diff --git a/lib/libsys/amd64/Symbol.sys.map b/lib/libsys/amd64/Symbol.sys.map index 5f463c85f872..11e0507b6613 100644 --- a/lib/libsys/amd64/Symbol.sys.map +++ b/lib/libsys/amd64/Symbol.sys.map @@ -13,6 +13,10 @@ FBSD_1.6 { x86_pkru_unprotect_range; }; +FBSD_1.8 { + amd64_set_tlsbase; +}; + FBSDprivate_1.0 { _vfork; }; diff --git a/lib/libsys/amd64/amd64_set_tlsbase.c b/lib/libsys/amd64/amd64_set_tlsbase.c new file mode 100644 index 000000000000..a28441fbfc5d --- /dev/null +++ b/lib/libsys/amd64/amd64_set_tlsbase.c @@ -0,0 +1,51 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2025 The FreeBSD Foundation + * All rights reserved. + * + * This software was developed by Konstantin Belousov + * under sponsorship from the FreeBSD Foundation. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#define _WANT_P_OSREL +#include +#include +#include +#include +#include +#include "libc_private.h" + +static int +amd64_set_tlsbase_syscall(void *addr) +{ + return (sysarch(AMD64_SET_TLSBASE, &addr)); +} + +DEFINE_UIFUNC(, int, amd64_set_tlsbase, (void *)) +{ + if (__getosreldate() >= P_OSREL_TLSBASE) + return (amd64_set_tlsbase_syscall); + return (amd64_set_fsbase); +} diff --git a/sys/x86/include/sysarch.h b/sys/x86/include/sysarch.h index 61f559f4bd23..a67e5c2265a3 100644 --- a/sys/x86/include/sysarch.h +++ b/sys/x86/include/sysarch.h @@ -142,6 +142,7 @@ int amd64_get_fsbase(void **); int amd64_get_gsbase(void **); int amd64_set_fsbase(void *); int amd64_set_gsbase(void *); +int amd64_set_tlsbase(void *); int x86_pkru_get_perm(unsigned int keyidx, int *access, int *modify); int x86_pkru_set_perm(unsigned int keyidx, int access, int modify); int x86_pkru_protect_range(void *addr, unsigned long len, unsigned int keyidx, From nobody Wed May 28 12:02:44 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b6p6D6V45z5xQ3V; Wed, 28 May 2025 12:02: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b6p6D5gZJz3b57; Wed, 28 May 2025 12:02:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748433764; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DQP0MdaqrbfHlPSEZkvppjQ/1tCbtOCR8H6NgDnSyWk=; b=kTfVoipfU/4kBV74wh0poo/XLcKL0IM9tGZTzhBLvmebMdod+CFjhdCP1kk6Qe0L7CahS6 kucLgs0JTkL5qMUKuzccBFZGfJlfWEnIbg8awG/IHXOxB/KOaON8yn3bEHDxpTPi9kU8r1 wiGeke+80f6vtp0mL2Ua+OR78TAKNkO9aFwxsT56sqlqOB6i7g/wzVrioGMt4nS8MudXyn TobaAXyJRfEn5tT1BiGvcYpaBRGAZLJwOWva6rzqjYbigV3CsSLgn0m9gEORtY6CKIiwY8 JGN06GJynlaqWxn54+3l4gtdGQtZAfRTXA7DnelunNKClwbWSKO2oSPJjUuItg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748433764; a=rsa-sha256; cv=none; b=sf+OsFHg3QacxP9i2buwUmQ1DfLZbhpov9Pn9KVQJFzf0UTC1+qI0uDdQApPX4lPAEhu9Q BDUKJ+e7Sd8MdlyJa5Ho0oMNweO9paHW/A7ab8heq8YxsfRxUwy5y+RgSTjflEkkTJ3P3v 3o4Gi5kcD8PpJ55QA3kRuGuirUBQliXEcBl4qwLLUUH1fqWOAC6r+vumqLrOGe1p7Zh4Mn ng4yBxBJ7V9drslC6+Mo42kqkfQUzOy8ysaXgzNUIEkXJ55h2YXX0+YeoMre2elQaWNw7K lNm1xy/tVE2Nk3S+P+aP6YVcNCiCfnt8I8+O3G+DkwHwyW1uF6k5SfYWQ4RohA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748433764; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DQP0MdaqrbfHlPSEZkvppjQ/1tCbtOCR8H6NgDnSyWk=; b=lp+5W6VLc+00+OpC2K2UuPGHv5viI5hd+h02KrVIq3EHZGzKDTrd5FCjm2/Dfat4/oUkKa KsrHToYAa8oGGwGjCz3YH6/8HZs4bWd5rB0fnK/e8Kje6reKY/zbJmGTfmtAfctnwFXNqU +2Z140RWANqckMPMd+O0/aH5dFLL6Z4D+vSGVBD1UGSGEfsqNfY5yO96ZvFMHXy6PoVvB+ UbWySa5Mip5ZdjSi6WOgpsHevPCxA9H4Ogx6ICPhh5rEamVZSHVopereLoZfRLKsEd4x8i +qYimDtm/McKsqEKwu0mg4NRyV3Im9flfpJ6NEY+5MOj92vMh6emMeL0nU/vag== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b6p6D530Nzcyg; Wed, 28 May 2025 12:02: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 54SC2iaE049191; Wed, 28 May 2025 12:02:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54SC2i44049188; Wed, 28 May 2025 12:02:44 GMT (envelope-from git) Date: Wed, 28 May 2025 12:02:44 GMT Message-Id: <202505281202.54SC2i44049188@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: 71186b6eaa07 - main - amd64: revert unintended changes in ia32_exception.S List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 71186b6eaa070dda5229af374b584e5f65ce5fb3 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=71186b6eaa070dda5229af374b584e5f65ce5fb3 commit 71186b6eaa070dda5229af374b584e5f65ce5fb3 Author: Konstantin Belousov AuthorDate: 2025-05-28 11:58:48 +0000 Commit: Konstantin Belousov CommitDate: 2025-05-28 12:02:23 +0000 amd64: revert unintended changes in ia32_exception.S The result was the missed %r8 restore into the protected mode context, which is innocent. Fixes: ddab534cd6f6557740c24ff2019642880ad8bef6 Reported by: olce Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/amd64/ia32/ia32_exception.S | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/amd64/ia32/ia32_exception.S b/sys/amd64/ia32/ia32_exception.S index ef1a2c59a0af..42d0ff6c638b 100644 --- a/sys/amd64/ia32/ia32_exception.S +++ b/sys/amd64/ia32/ia32_exception.S @@ -54,10 +54,10 @@ int0x80_syscall_common: movq %rax,TF_RAX(%rsp) movq %rdx,TF_RDX(%rsp) movq %rcx,TF_RCX(%rsp) - movq %r15,TF_R15(%rsp) call handle_ibrs_entry sti movq %rsi,TF_RSI(%rsp) + movq %r8,TF_R8(%rsp) movq %r9,TF_R9(%rsp) movq %rbx,TF_RBX(%rsp) movq %rbp,TF_RBP(%rsp) @@ -66,6 +66,7 @@ int0x80_syscall_common: movq %r12,TF_R12(%rsp) movq %r13,TF_R13(%rsp) movq %r14,TF_R14(%rsp) + movq %r15,TF_R15(%rsp) movl $TF_HASSEGS,TF_FLAGS(%rsp) pushfq andq $~(PSL_D | PSL_AC),(%rsp) From nobody Wed May 28 13:34:59 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b6r8h2HbQz5xVBx; Wed, 28 May 2025 13:35: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b6r8h1mZLz3M0f; Wed, 28 May 2025 13:35:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748439300; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UxOe0D28XPJyWSdhwgVKRQ49/hDN1QfACST2pEshrZU=; b=sxpewJpdfrBxY8ZTUIOg2bqXbSKfhdMQxMwDr1Cs4ykAhz8DflvueDISuZT6pMDzKBGOAV EDW0cvOU7/yCdDFeRR8kfsTfx8eDHvPx7K0A3sjDhjgXCdp4q84T+7Pp26GNhJQMp5Wt99 btP2HbR0pK9w8I8pp3L3q3g9yvKX1CNB9FxTJ00XR6AZkTK9hweiaaX+BIgWJO72HqFl/R SMuMOorquD/MoYgnbtJGVqFYFAE+0OzIb382gKTWVgAPokFOm8p2ON+ypzsn2OFIhYaU// 9zf3ww3cPKgeSNaUkYQEjTwd+zjAWBKOK7fqrSWLLOXJVQpIudM1hJJz7dEN6A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748439300; a=rsa-sha256; cv=none; b=ixdUdZLB5IuWl7J/gGexzWjJ1NAWqbe/vM9h8uC/DpG0R3ctocBXw6eBLzLGNEvBabo3dy 3l0CenGdBvdln0xxW6hXtSQ6CFRdxcnHBBws3IsAK6sCxzebbLlakOkdxS1RUVgj4/FFR9 NaahU/2lE6fOisrUNSEIcih2XzhR4CggksuXOlxnRPn2uLwhFzvlh0njAbCe83N86lhbAI nxJS3uhcKQpXA9MG5fbxELtym7FwSoWJVJdkqZFppMXzUporLTlo88vWznTcnomLL4eJzl LkC/HakinlP0gQYQPCxS/C1Zc/c7j4tre4KeJ8tEp3rcYgRGgY2BKfr1swo27Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748439300; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UxOe0D28XPJyWSdhwgVKRQ49/hDN1QfACST2pEshrZU=; b=J4OfLyB12ATXkYa+KimLdbcPuS9fo7CmZoqA63u20W/BCmrrf1BVm0ZEqt7n4phiTlsOu9 u55qY0hLsoEqUNbeFq+sc19+PpEN3aoTF3a/1Frkzl6bUKRltpSXpktz7KZ79aCjg488h5 hZqKfpY468TWk4Qx0vr8EPVrYrHROcBExBf3RzstY3/RO3RVehIMl2sSXtGPNgt3sm1+FK XYcoqhGy2cZBHs9iRuIyIegIjOGCYF+6PgsTSuO+yX6HraQ4b0Vf2PiBnnVkxWeVzhFsge b6G7SNYxA0icyhYFL7kGEVSnzjqjDHJg3c1Uh4VvZTxRh8uShrA+wyI08PtrrQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b6r8h0yq1zgdB; Wed, 28 May 2025 13:35: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 54SDYx9A017434; Wed, 28 May 2025 13:34:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54SDYxDP017431; Wed, 28 May 2025 13:34:59 GMT (envelope-from git) Date: Wed, 28 May 2025 13:34:59 GMT Message-Id: <202505281334.54SDYxDP017431@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: 40d2b3135204 - main - arm64: Split out the loop to wait for APs List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 40d2b313520451493d799d83612c664bd766a3ec Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=40d2b313520451493d799d83612c664bd766a3ec commit 40d2b313520451493d799d83612c664bd766a3ec Author: Andrew Turner AuthorDate: 2025-05-27 19:38:04 +0000 Commit: Andrew Turner CommitDate: 2025-05-27 19:50:11 +0000 arm64: Split out the loop to wait for APs This will be reused in a later change. Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D50365 --- sys/arm64/arm64/mp_machdep.c | 45 ++++++++++++++++++++++++-------------------- 1 file changed, 25 insertions(+), 20 deletions(-) diff --git a/sys/arm64/arm64/mp_machdep.c b/sys/arm64/arm64/mp_machdep.c index bca6487e487a..4ef0019d3f8f 100644 --- a/sys/arm64/arm64/mp_machdep.c +++ b/sys/arm64/arm64/mp_machdep.c @@ -139,11 +139,30 @@ is_boot_cpu(uint64_t target_cpu) return (PCPU_GET_MPIDR(cpuid_to_pcpu[0]) == (target_cpu & CPU_AFF_MASK)); } +static bool +wait_for_aps(void) +{ + for (int i = 0, started = 0; i < 2000; i++) { + if (atomic_load_acq_int(&smp_started) != 0) { + return (true); + } + /* + * Don't time out while we are making progress. Some large + * systems can take a while to start all CPUs. + */ + if (smp_cpus > started) { + i = 0; + started = smp_cpus; + } + DELAY(1000); + } + + return (false); +} + static void release_aps(void *dummy __unused) { - int i, started; - /* Only release CPUs if they exist */ if (mp_ncpus == 1) return; @@ -164,24 +183,10 @@ release_aps(void *dummy __unused) printf("Release APs..."); - started = 0; - for (i = 0; i < 2000; i++) { - if (atomic_load_acq_int(&smp_started) != 0) { - printf("done\n"); - return; - } - /* - * Don't time out while we are making progress. Some large - * systems can take a while to start all CPUs. - */ - if (smp_cpus > started) { - i = 0; - started = smp_cpus; - } - DELAY(1000); - } - - printf("APs not started\n"); + if (wait_for_aps()) + printf("done\n"); + else + printf("APs not started\n"); } SYSINIT(start_aps, SI_SUB_SMP, SI_ORDER_FIRST, release_aps, NULL); From nobody Wed May 28 13:35:01 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b6r8j5H8sz5xVSQ; Wed, 28 May 2025 13:35:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b6r8j2yCTz3Ld9; Wed, 28 May 2025 13:35:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748439301; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BTJrzQ+U6jNGIVI1oFH1eUcCzvdsbHlBpZtrUg0YuJg=; b=GLh3t1arfl0dYU0Ffm1lkBGqzTTk5iCrUQJec+IO01AXvtBC3z7kGTYVMT1hpiDCrHOHGb Vu7ayoj2/y4th9k/cdl71IHrnGx970fu35uiQgEB949T/b9j9su77Sb/kj3LlLldtSMUJI gm/KOpr9HQpYxA1ni/2X4cMKhC5FeIeAqAOmDezOfNf1m+vd6ViJ5lUZQTUpzbC08yVzil 8qT0x5xAkSHwr04m8lASZQ8RJSruxaux4AjMITEOg8sQgoIuJ7kZlRSFKaDa5qFoX+QIFe sqTGLLX9tkVYmUtJFGvxv/7G9WirhWqiVBg0xWE6GZGK99Jvbi3qsxyU3Fm1uQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748439301; a=rsa-sha256; cv=none; b=V0BbU5h5PzrfkBEW+n537UzPTmW3CcwOFRmONABcRjEKpbsbMRlMV5AAtI1WYTkiZs7ah8 xtsvA+h7Jw6ckTsw7IxKUeYR5JsppPc3JMGMp1n8th7vzqSvt4ue6a2QYeqbX0m+4+aTxm 4XpbGrZ6JFlVLM77Rjdt6IyaohnmeZJ5Juvjj4k/59l2InXjzkuto67cjIRfEb1kXRhNZQ x09vADE/9YIdRxzbatWPikhTy0VQ95exDNUG7Dr/KWsm4iYBk8Q4PT3mQKXtVmNcWzFP7W gjNgsNWlrcYFtQXzQFp/9qARAbX9Ql9RZnOV3Mc8lYFjEf98Bi+eCVoiGs5zFw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748439301; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BTJrzQ+U6jNGIVI1oFH1eUcCzvdsbHlBpZtrUg0YuJg=; b=q9w2HSOabrI6SdlypghoSK9wFs5i9hxFNKFheVYHwwCISmK7vPWlRQJEJaXIQ0m/bj05H1 AvqVHH/1lJjj3nhEsacD3JO6zRQiDPnhlw+5vzpqmjCk0V3qO57RziKFnDjCGp1tOn14vB 3bU1nTDzq1FZmrIoSAVcf0Fc38pg57oQOzWV7Hgep+8FVyCvqiTPjNORgo0zVmE9JfP5ww piBYZaxQV+/dFa07SnT8hGOTSqWLlxshHZB3yQNwGyBJ6hJNiM8Nrv5w9ww8NeboFSxRH7 wxqP5Vd0NXICQgR1tzojBDubIeBRqQVvOE4pX+4T1iCifZpQ2bwJu2Z+hMlSVA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b6r8j19dnzg4H; Wed, 28 May 2025 13:35: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 54SDZ1Gk017489; Wed, 28 May 2025 13:35:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54SDZ1sF017486; Wed, 28 May 2025 13:35:01 GMT (envelope-from git) Date: Wed, 28 May 2025 13:35:01 GMT Message-Id: <202505281335.54SDZ1sF017486@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: 602c858e000d - main - arm64: Reuse aps_started to simplify SMP boot List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 602c858e000dafd81bbfbdaf72588fef18fea938 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=602c858e000dafd81bbfbdaf72588fef18fea938 commit 602c858e000dafd81bbfbdaf72588fef18fea938 Author: Andrew Turner AuthorDate: 2025-05-27 19:38:29 +0000 Commit: Andrew Turner CommitDate: 2025-05-27 19:50:11 +0000 arm64: Reuse aps_started to simplify SMP boot We need to know when all CPUs have booted. Rather than locking and counting when starting CPUs we can count on the boot CPU to set smp_started. Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D50366 --- sys/arm64/arm64/mp_machdep.c | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/sys/arm64/arm64/mp_machdep.c b/sys/arm64/arm64/mp_machdep.c index 4ef0019d3f8f..88d48bceb892 100644 --- a/sys/arm64/arm64/mp_machdep.c +++ b/sys/arm64/arm64/mp_machdep.c @@ -112,9 +112,6 @@ void mpentry_psci(unsigned long cpuid); void mpentry_spintable(void); void init_secondary(uint64_t); -/* Synchronize AP startup. */ -static struct mtx ap_boot_mtx; - /* Used to initialize the PCPU ahead of calling init_secondary(). */ void *bootpcpu; uint64_t ap_cpuid; @@ -143,16 +140,19 @@ static bool wait_for_aps(void) { for (int i = 0, started = 0; i < 2000; i++) { - if (atomic_load_acq_int(&smp_started) != 0) { + int32_t nstarted; + + nstarted = atomic_load_32(&aps_started); + if (nstarted == mp_ncpus - 1) return (true); - } + /* * Don't time out while we are making progress. Some large * systems can take a while to start all CPUs. */ - if (smp_cpus > started) { + if (nstarted > started) { i = 0; - started = smp_cpus; + started = nstarted; } DELAY(1000); } @@ -174,6 +174,7 @@ release_aps(void *dummy __unused) intr_ipi_setup(IPI_STOP_HARD, "stop hard", ipi_stop, NULL); intr_ipi_setup(IPI_HARDCLOCK, "hardclock", ipi_hardclock, NULL); + atomic_store_int(&aps_started, 0); atomic_store_rel_int(&aps_ready, 1); /* Wake up the other CPUs */ __asm __volatile( @@ -187,6 +188,9 @@ release_aps(void *dummy __unused) printf("done\n"); else printf("APs not started\n"); + + smp_cpus = atomic_load_int(&aps_started) + 1; + atomic_store_rel_int(&smp_started, 1); } SYSINIT(start_aps, SI_SUB_SMP, SI_ORDER_FIRST, release_aps, NULL); @@ -263,13 +267,8 @@ init_secondary(uint64_t cpu) dbg_init(); - mtx_lock_spin(&ap_boot_mtx); - atomic_add_rel_32(&smp_cpus, 1); - if (smp_cpus == mp_ncpus) { - /* enable IPI's, tlb shootdown, freezes etc */ - atomic_store_rel_int(&smp_started, 1); - } - mtx_unlock_spin(&ap_boot_mtx); + /* Signal the CPU is ready */ + atomic_add_int(&aps_started, 1); kcsan_cpu_init(cpu); @@ -700,8 +699,6 @@ cpu_mp_start(void) { uint64_t mpidr; - mtx_init(&ap_boot_mtx, "ap boot", NULL, MTX_SPIN); - /* CPU 0 is always boot CPU. */ CPU_SET(0, &all_cpus); mpidr = READ_SPECIALREG(mpidr_el1) & CPU_AFF_MASK; From nobody Wed May 28 13:35:02 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b6r8k4bTdz5xVfF; Wed, 28 May 2025 13:35: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b6r8k2lqJz3M2G; Wed, 28 May 2025 13:35:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748439302; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aYL6/SGjof9Z1dxF8vz5WUdgE86yy1nUwUbHjnpOHIg=; b=Z6spGr3qR6NZaHiFlt193+UoWbBJK4XHD5ekfdH0LTg+KBnpims5Lvy+Xx4XMul7/uqp55 i1hkXyI4+cx4/fiitgGEMG99Rc6N9rzsl6VdtdDXAuLp1rdzMOBAM+RmYRFgSAXnZ8o5xL ZUr/5/AtbHY+7YQwLA6WAYdV8TtKu7ptH4cCXeeP4t0xX9cIzty8afeAEI/yYkjmH4Q6o0 kms/SNSn5pgj+y3bqxjF6Fj4dmNDKfCs9YJ7eyQOn/JVuih8J5fzVvzAFtJh4TBqnvqcEH fbMABBjnBogRYCdCh+roeLzu6dMuqdbxvMNlHQokIf/F/BdavfGD1HHL9i/Ucw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748439302; a=rsa-sha256; cv=none; b=YiQgxhoO2+yCUOo/w+HLN/Z3hDn9jHTO2ADVVlSJeAKd9Nk4suh2bm9Mn3h3Sna3Qn6pBS WXDrwc84e5ikW+tAfbN4DC6seTC4zO6xPGFVw7ubZfuRNxVzPK1qe5uuvAnzUrKERrT+XQ 1gE3eW7TrgSIrhTFhGDGyBCZ9oxRnfLulITpFou/9LPReYAYdm2rnqcW9M6rrZkZ4BqTGn HsrhQF89h2OVZx7/+lWWJyi2waN1JnW9eDtK7haxXOmpGgr2VsX02pr6SuXmroNczogn63 VPW6/YdyhDQJN7f2WNPdKaMlnVuoBo60oDZ2GSjKvn7vvV39BrjvvNdkMiojGQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748439302; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aYL6/SGjof9Z1dxF8vz5WUdgE86yy1nUwUbHjnpOHIg=; b=GZCrTa673IG6kgz1/jDYmRJqdLrPu+zyIohyDCvG4rB89hrddKQjh10BB+6xXb4udHgrd7 pXQ4aoLIXwcJOagGwjLTXuUNb2uRKUtkKInnI80b3E1FIaYeaNJsxXkHITFH1RX/b2iGq2 M+ocllMZ268tnbA+5A/mPlYSul7UH4vY3UUAa66eKwjdrA2r5N2VUCnIoKOa1H/fho41l5 yE49QaDBSnjfFKDiKxVsfc1G+vHsQLTVrHypCH76yuXQ7Epnz6CVG0yMrT83XmZKyr3iXD bYaRQJPcD6G47fV6llg0P/Q3JQz/lkimzd/ndlLbVSHZW0BH7yWlx1LxgF1KhA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b6r8k2HYkzgZs; Wed, 28 May 2025 13:35: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 54SDZ2v3017525; Wed, 28 May 2025 13:35:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54SDZ2Wd017522; Wed, 28 May 2025 13:35:02 GMT (envelope-from git) Date: Wed, 28 May 2025 13:35:02 GMT Message-Id: <202505281335.54SDZ2Wd017522@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: 77d5df3b9261 - main - arm64: Move CPU feature & errata setup earlier List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 77d5df3b9261173f10afb7ba739f98c62a41395f Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=77d5df3b9261173f10afb7ba739f98c62a41395f commit 77d5df3b9261173f10afb7ba739f98c62a41395f Author: Andrew Turner AuthorDate: 2025-05-27 19:39:20 +0000 Commit: Andrew Turner CommitDate: 2025-05-27 19:50:11 +0000 arm64: Move CPU feature & errata setup earlier To allow for the state of some errata to be detected we need devices, e.g. to call into the SMCCC firmware. Because of this we need to check this after devices drivers are ready. As the presence of this errata may require us to mask out some fields from the ID register views, and these register views are used to build the userspace hwcap values and used in late kernel ifunc resolvers we need to ensure they have run by a known point. Add a synchronisation point for APs at SI_SUB_CONFIGURE, SI_ORDER_MIDDLE + 1. This is early enough that we can move setting the hwcap values just after this, and late enough for devices to be present. Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D50367 --- sys/arm64/arm64/mp_machdep.c | 39 ++++++++++++++++++++++++++++++++++----- 1 file changed, 34 insertions(+), 5 deletions(-) diff --git a/sys/arm64/arm64/mp_machdep.c b/sys/arm64/arm64/mp_machdep.c index 88d48bceb892..e4d011df3a06 100644 --- a/sys/arm64/arm64/mp_machdep.c +++ b/sys/arm64/arm64/mp_machdep.c @@ -124,7 +124,7 @@ static void *bootstacks[MAXCPU]; static volatile int aps_started; /* Set to 1 once we're ready to let the APs out of the pen. */ -static volatile int aps_ready; +static volatile int aps_after_dev, aps_ready; /* Temporary variables for init_secondary() */ static void *dpcpu[MAXCPU - 1]; @@ -160,6 +160,26 @@ wait_for_aps(void) return (false); } +static void +release_aps_after_dev(void *dummy __unused) +{ + /* Only release CPUs if they exist */ + if (mp_ncpus == 1) + return; + + atomic_store_int(&aps_started, 0); + atomic_store_rel_int(&aps_after_dev, 1); + /* Wake up the other CPUs */ + __asm __volatile( + "dsb ishst \n" + "sev \n" + ::: "memory"); + + wait_for_aps(); +} +SYSINIT(aps_after_dev, SI_SUB_CONFIGURE, SI_ORDER_MIDDLE + 1, + release_aps_after_dev, NULL); + static void release_aps(void *dummy __unused) { @@ -237,8 +257,20 @@ init_secondary(uint64_t cpu) /* Detect early CPU feature support */ enable_cpu_feat(CPU_FEAT_EARLY_BOOT); - /* Signal the BSP and spin until it has released all APs. */ + /* Signal we are waiting for aps_after_dev */ atomic_add_int(&aps_started, 1); + + /* Wait for devices to be ready */ + while (!atomic_load_int(&aps_after_dev)) + __asm __volatile("wfe"); + + install_cpu_errata(); + enable_cpu_feat(CPU_FEAT_AFTER_DEV); + + /* Signal we are done */ + atomic_add_int(&aps_started, 1); + + /* Wait until we can run the scheduler */ while (!atomic_load_int(&aps_ready)) __asm __volatile("wfe"); @@ -253,9 +285,6 @@ init_secondary(uint64_t cpu) ("pmap0 doesn't match cpu %ld's ttbr0", cpu)); pcpup->pc_curpmap = pmap0; - install_cpu_errata(); - enable_cpu_feat(CPU_FEAT_AFTER_DEV); - intr_pic_init_secondary(); /* Start per-CPU event timers. */ From nobody Wed May 28 13:35:03 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b6r8m13zSz5xVHp; Wed, 28 May 2025 13:35: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b6r8l58F0z3Lw0; Wed, 28 May 2025 13:35:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748439303; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MnP2E8MLtbGaSdhRCq85wyehYaFbOF5L53m7Gc2CsNw=; b=iJaI+cV/opBkbZfOCwDmrNpIVlf2NGt636iakf8vwSjXzoF0FhikhqRmTrSeMyC+503IiZ zXkMYH+p5UCd3i9BAPt8J4HVRp7pycC04T66N3oHzZjT91iD59xEgeL3le23sRMMcvZCJB GQ1AiDSvgHXX7YL7j52JqHs8yDky7Rclesg88quUGOdTtJYNHENzw1Pi5aEi3SDMJB6Rsp cg7WI6s3lovXDn8Y5U11dYK2A7JMdcu9VR+y4s7xPFuS7by6shSFdsTjyUgKUQDa/KLg+8 W4ExtOTWF1UDcFT3GEIirQ6hGdEsVaDr/hVUvTD+wJ/a7FItagRJp+sbqemeDQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748439303; a=rsa-sha256; cv=none; b=Me0AJNQdS0qlnOML4ICgszBoRqcdJfnpOj5yzMYduHG2NGavHeE+SkYl30vmuz3hobSVPQ 0r31fLszAkhlcedBVJZkoHlnBmxQ3mls7HOeMTPVw7TRcb5IioAOKg+iO17fgB3lsryRc1 zYB9gXEkUOBUChdXdA1rJAUnYXjwvvjYhYpvTNl0oXU6ydiycYNOstwodIB4AO++rOyA7D UZRsgluwvC+zzAUEzdlKJJVupEnrYv3cRDNh0zVSmNfMTDVHe1SHYb8M/lIPVGMBizFOJL P9z1OpcLmyA2B7RApqLaTadJiBO2xI2KuyZdq3r3hIxVIIHaGUIp91IA3yjkYw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748439303; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MnP2E8MLtbGaSdhRCq85wyehYaFbOF5L53m7Gc2CsNw=; b=gegG7GVcyKIHPBb5JuFXkuBXbjyBsEI55EJjFoEYfFA4ifme3u1pYlUqxGS903FaBJnnrq neKQE30ANZp8dZxb3uB6//35beQWGATZAbL03i1MoXVX79xCRT7EtnP2KMuh9an8E6sVFS iRwXHF/9aJPM89t5YWJ0qrjwjpBBqp29dPSTwNIv8E0xqntQelslKNBCNTwFvw8dnMnxuJ p0ZzgijExqryT0b33xOOnd9GHA6eVVPtApKqNxWjoodFFOnByRmTJlOzUc9IBGjBjoiyep StCVSthEp3cn1bidWZiV5XckPbzI+PaeBfckeKuKn6KTpjQLF8dk0uXEuP7k+w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b6r8l3JLKzgZt; Wed, 28 May 2025 13:35: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 54SDZ3JO017559; Wed, 28 May 2025 13:35:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54SDZ3p3017556; Wed, 28 May 2025 13:35:03 GMT (envelope-from git) Date: Wed, 28 May 2025 13:35:03 GMT Message-Id: <202505281335.54SDZ3p3017556@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: 8535ee063118 - main - hwpmc/arm64: Make the pmcr variable descriptive List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 8535ee0631182729e431846d3d80caab1293806b Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=8535ee0631182729e431846d3d80caab1293806b commit 8535ee0631182729e431846d3d80caab1293806b Author: Andrew Turner AuthorDate: 2025-05-27 19:54:44 +0000 Commit: Andrew Turner CommitDate: 2025-05-27 19:54:44 +0000 hwpmc/arm64: Make the pmcr variable descriptive Rename the generic reg to pmcr to make it easier to find places we access the register. Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D50426 --- sys/dev/hwpmc/hwpmc_arm64.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/dev/hwpmc/hwpmc_arm64.c b/sys/dev/hwpmc/hwpmc_arm64.c index 5d221c738c2f..28745b4a3028 100644 --- a/sys/dev/hwpmc/hwpmc_arm64.c +++ b/sys/dev/hwpmc/hwpmc_arm64.c @@ -521,13 +521,13 @@ pmc_arm64_initialize(void) struct pmc_mdep *pmc_mdep; struct pmc_classdep *pcd; int classes, idcode, impcode; - int reg; + int pmcr; uint64_t midr; - reg = arm64_pmcr_read(); - arm64_npmcs = (reg & PMCR_N_MASK) >> PMCR_N_SHIFT; - impcode = (reg & PMCR_IMP_MASK) >> PMCR_IMP_SHIFT; - idcode = (reg & PMCR_IDCODE_MASK) >> PMCR_IDCODE_SHIFT; + pmcr = arm64_pmcr_read(); + arm64_npmcs = (pmcr & PMCR_N_MASK) >> PMCR_N_SHIFT; + impcode = (pmcr & PMCR_IMP_MASK) >> PMCR_IMP_SHIFT; + idcode = (pmcr & PMCR_IDCODE_MASK) >> PMCR_IDCODE_SHIFT; PMCDBG1(MDP, INI, 1, "arm64-init npmcs=%d", arm64_npmcs); From nobody Wed May 28 13:35:04 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b6r8n3SRZz5xVC6; Wed, 28 May 2025 13:35: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b6r8m4cdBz3Lw4; Wed, 28 May 2025 13:35:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748439304; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+UHGy37f8IlY03OeBQyKRUcas+pzDyIiqH9wdAiMB3s=; b=Feo0xTmOOkbusSDUb/plyQH1+xScEVfTOYNFbJzQl4E6rQ8Y7W6WUCyq+EZMfEPgnevepq QYL8ZTsa/FhWrcz7Ri8MZYL/q+P+ppZEnhBBw7TV2Oe/AbiLp8GX7fOAtCqTZvL+zkNsZu yjKhJso3GIMHU0cO5GLLusR4iIqDZDE5dNopIGrDV2o/G9HFGw7TygBs3PCMe5F+qLod4X 7cTK5UhVcT+gwrTL/EXpIAoX2HiZVLp3J4Qn3wsHmI+N03jjNfW3mf9v2uLTYDfNlBYtpp Zic3t+AxnzeDWT4+TGqZVORawCFg94T4f03CIm0FpCHfu0I5tBWaCMNMVHHryQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748439304; a=rsa-sha256; cv=none; b=sNy8sAx8cdMOWreOe688KDGHDSGeZhSQVE+k75CIR6tfDKYkFJEipCY3+eJzUUDJeiIPvK pgW2szsiAFGhMUd1II9BD7+XndXmK1r+5okNYNpinCmDu8OdP0OGs8w9cCfbIh2+K5fd/R 6VUIcUHaA0wRn+enQgDBBSs5JdlZssp3eDniZpKzOM3iUer8rBsOge9MI6HC8HsMHdEFcC sEhKVoGi6+7cxg6BlKH96inTcze/849KZsmsdBjQFqc0LLIlSUwDRx1OYVdFZUCHdZ13nv L7Bxj3b8xgZ8WhZbif6u+8aZng0HnS7lVN/9TszEzcW5LY5skoT1oeGnKzZyUA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748439304; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+UHGy37f8IlY03OeBQyKRUcas+pzDyIiqH9wdAiMB3s=; b=qChIci7VvGE+4CVbKc+Kfig4UWVh55FLm8kQxes3ZZA5ahSzQNJ4L+030cHj6c9mFg8eok 2Iz7bBZXExIFt7/SP5LX6KNc69p62LO2pyRKkzMPj8H0LH+u0w7VvJ6nBVzVdjmM1lwD+t iI8g2i+FYQljk4VKiBWb8gygFpPa5Lli62ntNN5i5u+fi8biGX3WhPj8KK/OuANmk5g+0J F6oZ+zJaJGolL7ARbvy9OTrEZh2Cken67A6tlB86WgegpI62D+sFLbmbSJ1WzIDbfYyidW jij3WFzv7EE3F2XfIiU+UXB3u4h/AktFMV/XLBUbC1FKYL/OLY7Zptfk2JTAWQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b6r8m3yFyzg4J; Wed, 28 May 2025 13:35: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 54SDZ4e9017597; Wed, 28 May 2025 13:35:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54SDZ4mW017594; Wed, 28 May 2025 13:35:04 GMT (envelope-from git) Date: Wed, 28 May 2025 13:35:04 GMT Message-Id: <202505281335.54SDZ4mW017594@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: dbb620910f15 - main - hwpmc/arm64: PMCR_EL0 is a 64-bit register List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: dbb620910f1572be46e873ae352e18f60120b369 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=dbb620910f1572be46e873ae352e18f60120b369 commit dbb620910f1572be46e873ae352e18f60120b369 Author: Andrew Turner AuthorDate: 2025-05-27 19:54:59 +0000 Commit: Andrew Turner CommitDate: 2025-05-27 19:54:59 +0000 hwpmc/arm64: PMCR_EL0 is a 64-bit register Use uint64_t to store PMCR_EL0 as it's a 64-bit register and fields may be present in the upper 64-bits. Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D50427 --- sys/dev/hwpmc/hwpmc_arm64.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/dev/hwpmc/hwpmc_arm64.c b/sys/dev/hwpmc/hwpmc_arm64.c index 28745b4a3028..b547ad2fa53e 100644 --- a/sys/dev/hwpmc/hwpmc_arm64.c +++ b/sys/dev/hwpmc/hwpmc_arm64.c @@ -113,7 +113,7 @@ arm64_counter_disable(unsigned int pmc) /* * Performance Monitors Control Register */ -static uint32_t +static uint64_t arm64_pmcr_read(void) { uint32_t reg; @@ -124,7 +124,7 @@ arm64_pmcr_read(void) } static void -arm64_pmcr_write(uint32_t reg) +arm64_pmcr_write(uint64_t reg) { WRITE_SPECIALREG(pmcr_el0, reg); @@ -500,7 +500,7 @@ arm64_pcpu_init(struct pmc_mdep *md, int cpu) static int arm64_pcpu_fini(struct pmc_mdep *md, int cpu) { - uint32_t pmcr; + uint64_t pmcr; PMCDBG0(MDP, INI, 1, "arm64-pcpu-fini"); @@ -521,7 +521,7 @@ pmc_arm64_initialize(void) struct pmc_mdep *pmc_mdep; struct pmc_classdep *pcd; int classes, idcode, impcode; - int pmcr; + uint64_t pmcr; uint64_t midr; pmcr = arm64_pmcr_read(); From nobody Wed May 28 13:35:05 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b6r8p541Vz5xVC7; Wed, 28 May 2025 13:35: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b6r8n5FLPz3M5X; Wed, 28 May 2025 13:35:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748439305; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=H16FPNe6zJ44+EbZLdT9KrYN+inRGmkEqWbM+ImvSs0=; b=KUEL2d5JJ3F+i1JCVGaF9ASu5eTS0sgx7KP6cRY2xcn8cVZOkgerWjAoxJL19gvE3iVrBs 2+TlfTkk7sNHNA9igFkgA77XIJWSUXwoHnuK3JJPT8puNJtIefT3vAmY7Uj5ssqzBQTMNo QhdsJDuJFBY/Fipm+16dhsfLNvegSXseXzr6wYdE2laIWcIVa/Nj05UHfPM+q4T7AonyE7 K0M+wSGuuy+AUa8r2ZuctrPC+ZtW3OxcySoz7Ke6/lnEU8ac+HBNZfAZFhybj38xy3FBlw dBjaAMYgQn46r+j156OWBlnCLPQg01yXwjWsZWtrmVrbxWbfji7RFhzCw6tF9w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748439305; a=rsa-sha256; cv=none; b=DTVZfZOSbqIFK7KNUHWdRm2y0rq9eCjRkwaeAT8Eutj29kdI/mm7PDOs6PgJG1hiWnOLHN b4+uFwojZ/ha7uGZXmZaAsRHzOpildZK4D2uwKcr9LX6TXWAexiA1zcpoD7xZCXsC+2Doi UKEQlYFYhNFBraXvh3rIINEPw2wtMxljgjuvmJP6zM+DW791wLIZ6YKCv8k6gNCZcTNTPM nvZOlZeV002FxHVeGMHjLITfK4VylGXni5kI7DRdG3oavBUoZkRzYIX3tI9+/tHAg8O/nH XT2VbPD+vjhTDltcp3IuAwIaLmoP7bzrXfJpdGlL84c9LXS+Nz0eLUiWpiaxWQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748439305; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=H16FPNe6zJ44+EbZLdT9KrYN+inRGmkEqWbM+ImvSs0=; b=TK19xGvxsWZs7+IwE+KDysN71cletvRvfDO1IdFPDZXH9rUB/Ilc0A5odl69EYqova2a7Q jgkWKhPbsGu9xx3U2omUAZ40wcPdIPh4n/tCjmPSy5yd5mQVaoY6HSP6NE5F47rvls5wT/ SJCpcOqTMMjvbr63zv2AUvVigLIjZHa6OlwYbjsSm9TlbwCw0Rb9LvAZDSIyAY2joFXfZT 8F1lg1fq+gHFLG67KCIar6GJ35X+UwMCsne6Syk3jgZXXuM0f2uyjnI5iceQpmtCPIF+Yz rhx2FvfAME/csoaA76f+HKYX1OHu6cwb/5mTBNvBWZYenJLP5yYnK4caxIyeaA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b6r8n4nr7zg4K; Wed, 28 May 2025 13:35: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 54SDZ5O4017630; Wed, 28 May 2025 13:35:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54SDZ5jn017627; Wed, 28 May 2025 13:35:05 GMT (envelope-from git) Date: Wed, 28 May 2025 13:35:05 GMT Message-Id: <202505281335.54SDZ5jn017627@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: 8cad445495a1 - main - arm64: Sort the PMCR_EL0 fields List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 8cad445495a159cb3a15a1ecdb057474ee9af7d8 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=8cad445495a159cb3a15a1ecdb057474ee9af7d8 commit 8cad445495a159cb3a15a1ecdb057474ee9af7d8 Author: Andrew Turner AuthorDate: 2025-05-27 19:55:07 +0000 Commit: Andrew Turner CommitDate: 2025-05-27 19:55:07 +0000 arm64: Sort the PMCR_EL0 fields Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D50428 --- sys/arm64/include/armreg.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/arm64/include/armreg.h b/sys/arm64/include/armreg.h index a7950092048d..df6f7bb7f47b 100644 --- a/sys/arm64/include/armreg.h +++ b/sys/arm64/include/armreg.h @@ -2377,9 +2377,8 @@ #define PMCR_X (1 << 4) /* Export to ext. monitoring (ETM) */ #define PMCR_DP (1 << 5) /* Disable CCNT if non-invasive debug*/ #define PMCR_LC (1 << 6) /* Long cycle count enable */ -#define PMCR_IMP_SHIFT 24 /* Implementer code */ -#define PMCR_IMP_MASK (0xff << PMCR_IMP_SHIFT) -#define PMCR_IMP_ARM 0x41 +#define PMCR_N_SHIFT 11 /* Number of counters implemented */ +#define PMCR_N_MASK (0x1f << PMCR_N_SHIFT) #define PMCR_IDCODE_SHIFT 16 /* Identification code */ #define PMCR_IDCODE_MASK (0xff << PMCR_IDCODE_SHIFT) #define PMCR_IDCODE_CORTEX_A57 0x01 @@ -2393,8 +2392,9 @@ #define PMCR_IDCODE_CORTEX_A55 0x45 #define PMCR_IDCODE_NEOVERSE_E1 0x46 #define PMCR_IDCODE_CORTEX_A75 0x4a -#define PMCR_N_SHIFT 11 /* Number of counters implemented */ -#define PMCR_N_MASK (0x1f << PMCR_N_SHIFT) +#define PMCR_IMP_SHIFT 24 /* Implementer code */ +#define PMCR_IMP_MASK (0xff << PMCR_IMP_SHIFT) +#define PMCR_IMP_ARM 0x41 /* PMEVCNTR_EL0 */ #define PMEVCNTR_EL0_op0 3 From nobody Wed May 28 13:35:06 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b6r8q2ZX9z5xVC8; Wed, 28 May 2025 13:35: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b6r8p5s19z3M1g; Wed, 28 May 2025 13:35:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748439306; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=892xrQUbspBS8OrhinM3TEHlaBWI62vbgfIMq1F1Amw=; b=OeLydSPwMY6C2DoaHyPeqWcHrCwFfDGzjSprCMJFy91oqbf0JF0tl/FRn5LocoADbjP+nY Ly8iF23x6a00Ht0chRjQvjvy0UL4hCWxjM1MmkuWCg5K4spP6eJa/OYG+UgISlNWasBG+S bhyBp3qA6kTGSXQ8mdplTOiXQphMY/kopLrVeIEbk1u6t1lCL/BKKuUDVTJCeCwlU63Gc/ CWRphJLfZc6ibfV3PIE0RjBy7DiJnEXcatGvjWRuUAWgtha0FQMC/UAtaey08R2nMSk94u YlYwoHa+V4DgLEu368/4wUUOC0IeWbS7EF8N0ic6KFn3QkeT+zVHJsAlmr/mBg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748439306; a=rsa-sha256; cv=none; b=wxibjdviDgm32aB1Lhte74x2K697ZXxMM9udOkq3778cA/Lkit77kfPxymJMXcbzuw6VnR CIU6OxnJ/nUYuqbB3DRmlW/UagKt7eK5lO91+L1KcoxKoJnRMQzo7WbB8R2zsPZUB+RpME KSGydknHx2BHyyVmRojwgO+G+XqIvetP5qENsa1IE4gJWiwIiiXuaW52Dx0So4a5iCRgtc SObAEFL/7WvBlEDBcllyUAQb2plgrwQE+39vHVr8fxG7ILGM6v+IJsGf9hlGBTQgI/bXT/ Aq5UvAvRWe16AaUFZqNlBy0v48/+ncPONE4bcutuqsyUYZvwNU7pk4V5DjPTGQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748439306; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=892xrQUbspBS8OrhinM3TEHlaBWI62vbgfIMq1F1Amw=; b=wtEB8Q598gT0I6VDtvNW1zpY26HrPvDuCvbwlbO5FEItWghUKfrBmoYXDWhUDaQP8wbOGU 1dcf8x5OpOuGG/Bz9QfqBmD7QSdnZX9NGgPL6RNqifzBQS6U6sCM/qoIAjXasj6fvYUqN8 4fW3SP6VHDeCwjeTov6M3rP/uo1I37fuF95DqsCQ+JBVLP13DGUfxlu7TMUSMDvavCeZKX ZZA0PLAICymFSIOBIfpcdt8fJgBA/DZcLhXsGpi8JbnwIZZevuIdvMaXUX5cJDVEASAoKo I9nO/KRYScvVRrtzzLbDm0ZELYWUVzPrsEaQmQdCx6yzOhtyygBWcjNPL2rHgw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b6r8p5Ll4zg6W; Wed, 28 May 2025 13:35: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 54SDZ6UD017663; Wed, 28 May 2025 13:35:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54SDZ6kJ017660; Wed, 28 May 2025 13:35:06 GMT (envelope-from git) Date: Wed, 28 May 2025 13:35:06 GMT Message-Id: <202505281335.54SDZ6kJ017660@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: 18db17f5ec86 - main - arm64: Make all the PMCR_EL0 fields 64-bit List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 18db17f5ec86f6473f40eb496739773f4c053ab2 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=18db17f5ec86f6473f40eb496739773f4c053ab2 commit 18db17f5ec86f6473f40eb496739773f4c053ab2 Author: Andrew Turner AuthorDate: 2025-05-27 19:55:15 +0000 Commit: Andrew Turner CommitDate: 2025-05-27 19:55:15 +0000 arm64: Make all the PMCR_EL0 fields 64-bit The register is 64-bit so make sure the fields are too. Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D50429 --- sys/arm64/include/armreg.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/sys/arm64/include/armreg.h b/sys/arm64/include/armreg.h index df6f7bb7f47b..1571fe273e16 100644 --- a/sys/arm64/include/armreg.h +++ b/sys/arm64/include/armreg.h @@ -2370,17 +2370,17 @@ #define PMCR_EL0_CRn 9 #define PMCR_EL0_CRm 12 #define PMCR_EL0_op2 0 -#define PMCR_E (1 << 0) /* Enable all counters */ -#define PMCR_P (1 << 1) /* Reset all counters */ -#define PMCR_C (1 << 2) /* Clock counter reset */ -#define PMCR_D (1 << 3) /* CNTR counts every 64 clk cycles */ -#define PMCR_X (1 << 4) /* Export to ext. monitoring (ETM) */ -#define PMCR_DP (1 << 5) /* Disable CCNT if non-invasive debug*/ -#define PMCR_LC (1 << 6) /* Long cycle count enable */ +#define PMCR_E (1ul << 0) /* Enable all counters */ +#define PMCR_P (1ul << 1) /* Reset all counters */ +#define PMCR_C (1ul << 2) /* Clock counter reset */ +#define PMCR_D (1ul << 3) /* CNTR counts every 64 clk cycles */ +#define PMCR_X (1ul << 4) /* Export to ext. monitoring (ETM) */ +#define PMCR_DP (1ul << 5) /* Disable CCNT if non-invasive debug*/ +#define PMCR_LC (1ul << 6) /* Long cycle count enable */ #define PMCR_N_SHIFT 11 /* Number of counters implemented */ -#define PMCR_N_MASK (0x1f << PMCR_N_SHIFT) +#define PMCR_N_MASK (0x1ful << PMCR_N_SHIFT) #define PMCR_IDCODE_SHIFT 16 /* Identification code */ -#define PMCR_IDCODE_MASK (0xff << PMCR_IDCODE_SHIFT) +#define PMCR_IDCODE_MASK (0xfful << PMCR_IDCODE_SHIFT) #define PMCR_IDCODE_CORTEX_A57 0x01 #define PMCR_IDCODE_CORTEX_A72 0x02 #define PMCR_IDCODE_CORTEX_A53 0x03 @@ -2393,7 +2393,7 @@ #define PMCR_IDCODE_NEOVERSE_E1 0x46 #define PMCR_IDCODE_CORTEX_A75 0x4a #define PMCR_IMP_SHIFT 24 /* Implementer code */ -#define PMCR_IMP_MASK (0xff << PMCR_IMP_SHIFT) +#define PMCR_IMP_MASK (0xfful << PMCR_IMP_SHIFT) #define PMCR_IMP_ARM 0x41 /* PMEVCNTR_EL0 */ From nobody Wed May 28 13:35:07 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b6r8r2Wk5z5xVfQ; Wed, 28 May 2025 13:35: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b6r8q69zVz3MGy; Wed, 28 May 2025 13:35:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748439307; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IrNGP/13n3yOlzCN15+0rZtmbAiRb8rsGVExOLyHzfQ=; b=hOyjXhWrKHWbBt0eIa2smK/Iih1q2nQWbmZuV5poqXppLNmyBV++6GmyvEWOBJCGv/+sMk hl8xzmG5rUBI3j7ESOp3qHVNBN4Kc6fpc0FmVTxyGQCAAdKvgnGCKj2BqNHb+ipCVOORUW SjVty9P6ngd6OwAhR7n0c/oKaqYKDW6uROyZVGoOdho/5tEFSg7r3Jovlnd2qIacAFSU8k UPcz69QN0aJ9k35I/6f92SjXiqQ/26OtnipZSAIORKpq8LprxET1nw9Hk7OvCvAT/MEot3 hx3eL+egDZMTqkzAigB/7pxr5u+czmYY1+7xPZ5gYFwNtXRdf4L/UPCMHF3dkw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748439307; a=rsa-sha256; cv=none; b=D/aAH3/qUB+H1X8t5h5muslWpDXSw4SSSy4m1TQtkI1V2IrpQuAoizhc2+9aKgS6hUmLDy 5TgWcmBt44ZhHsJ7bBGqOi+9hkkJEWdG3S618lhqxll+RLQZDCGgmFUCWJp+ufUwJdlUKR 3NXjejz2raexNeReg98hJcKuqI9SSwSqd5g74zgCF2vnTmm2iOnytFCGMhT/k4eE285KEl bwR3Z4L+PdB1AWY/jOEUrHwVpoEh5Q6V9DFrTg0p2ccyrqy8RDsclqY1x5uRpdNvSS1moE rdf4abRhi4sqF0Dmn3W3dymLayePhrnqmuvbVawR123awekLrMuuxNvY12q3gQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748439307; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IrNGP/13n3yOlzCN15+0rZtmbAiRb8rsGVExOLyHzfQ=; b=cOYdfGjsYUlPyISBRVnw2jOp8t3l5Dx/XU++dkpMfwmogwuoPORj8GnjuRiYp1XPOprmbl A2oMot8pBOVB7rth7l45+5xvxDpgfBiJ7FGFDgqL/xcORgnnrD2MunjKHqJ5u9GQM/S04n z2M3NylLkpBwO8KmbUx2qUYm3hO9fCTMpEDwc5lxis6e89+L/dIHhqgxnp8djQ5HEORGP2 O5PtBA9OU7eTCDpwFikCOuL1FrzCxqh99OQ2kdoolx1yMbX4pekp7M1Q9XM4UWLLehbb4W YpJnWYiFSVHfIObyUGtE9IkhZL4sAEoGpPpfJyHtsP6fDXuuHpLlQuktG3Nuwg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b6r8q5hHxzgMR; Wed, 28 May 2025 13:35: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 54SDZ7Y7017702; Wed, 28 May 2025 13:35:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54SDZ7t3017699; Wed, 28 May 2025 13:35:07 GMT (envelope-from git) Date: Wed, 28 May 2025 13:35:07 GMT Message-Id: <202505281335.54SDZ7t3017699@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: 33ec71d6c0e9 - main - arm64: Add more PMCR_EL0 fields List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 33ec71d6c0e93cde6132c4d811d8a88188203c29 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=33ec71d6c0e93cde6132c4d811d8a88188203c29 commit 33ec71d6c0e93cde6132c4d811d8a88188203c29 Author: Andrew Turner AuthorDate: 2025-05-27 19:55:21 +0000 Commit: Andrew Turner CommitDate: 2025-05-27 19:55:21 +0000 arm64: Add more PMCR_EL0 fields Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D50430 --- sys/arm64/include/armreg.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/arm64/include/armreg.h b/sys/arm64/include/armreg.h index 1571fe273e16..33866d7f822b 100644 --- a/sys/arm64/include/armreg.h +++ b/sys/arm64/include/armreg.h @@ -2377,6 +2377,8 @@ #define PMCR_X (1ul << 4) /* Export to ext. monitoring (ETM) */ #define PMCR_DP (1ul << 5) /* Disable CCNT if non-invasive debug*/ #define PMCR_LC (1ul << 6) /* Long cycle count enable */ +#define PMCR_LP (1ul << 7) /* Long event count enable */ +#define PMCR_FZO (1ul << 9) /* Freeze-on-overflow */ #define PMCR_N_SHIFT 11 /* Number of counters implemented */ #define PMCR_N_MASK (0x1ful << PMCR_N_SHIFT) #define PMCR_IDCODE_SHIFT 16 /* Identification code */ @@ -2395,6 +2397,7 @@ #define PMCR_IMP_SHIFT 24 /* Implementer code */ #define PMCR_IMP_MASK (0xfful << PMCR_IMP_SHIFT) #define PMCR_IMP_ARM 0x41 +#define PMCR_FZS (1ul << 32) /* Freeze-on-SPE event */ /* PMEVCNTR_EL0 */ #define PMEVCNTR_EL0_op0 3 From nobody Wed May 28 13:35:08 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b6r8s2RRxz5xVcL; Wed, 28 May 2025 13:35: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b6r8r6gvNz3MBM; Wed, 28 May 2025 13:35:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748439309; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EDIQOMlN9/8dr9I6tVKto9nyYRIWNdUGbMyLGDwnTjg=; b=c4aQzUfpLv2258MRhT4bWmagn6pi8otfNxDNXPdS8Q341FZ27/79PTj62VJU+ss0IdY/v9 LvZBhvqiqnvG0AXinLvLghojm6R/9/96MfvQpCB8FHe5i3zSE5FrPwumMzJk1csdFW9+ad 0ia8wLJym6nXM25Ux1Lwo2ohNEqL1YD/gEqfPvU11d61szw9tMuAgtIn6ZUQySI272o7i0 RX0x3JI+OhvEgL+DDwufBJU78Ji4Mg8iGPX3zYoqwlPg+VjrjTFglf4PNq7XBy9ujddUE+ ag4wyHeTlRmSs8/foRWMaoFGHkTuFwt1qY0r6BcJTwfpHwkfvLKO6i66Ko3v0w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748439309; a=rsa-sha256; cv=none; b=tkYenj+jFQLoZ3/roDRZv2WmuOE7jxHN5kZpdo5oaq3HUDTNfB9Aur33iXLihqOmyTfiKP V9rlrkFCavR2mEcSBrpymVd2jgOmedAXOgqNuvs9PV21tzfuEOBJx/iPQJy4CzJffXjmHI Nw88bHdrDhzSOLH6wW7glM2Cwo9bPbenURJw3JGj4cOw6GrxqNdFDM80/YhEo+jJxTbvB7 kyjLHQ9lnGa0A8CKO1ym8LAOT58dp5pjJPGMWDC2PkqI8BuA5k58lHJEhN7xsLT2RXryVA uR7MTdCpd71okMUj5beZZMJa7/q6sruNFLz0plocm242jBi9koGbLdYXswFXuQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748439309; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EDIQOMlN9/8dr9I6tVKto9nyYRIWNdUGbMyLGDwnTjg=; b=T3PR1v3wHqrKxdbHstfU1czIyErEEwFIWtmHny+am/p5+l9ZwSXfGTvSkhrUKQmxM4eFpR LY7LPXYpfgsrc17C4B3CrcOmEfCaI/60BdbOZERpkN3avm6KGppPq6Yf5WeZfQ8tLE5z7D IhhRT1Ix5vhtEOei/hyaICSMRVqIezLvtri/ylrfe1rgi7mwwoBBWW8IvuSUOgltmSvRtq hvzG/ik11iOEWbujeZ4meBGjV45okzt+Dz21eIEVKGFOhRHHoWGDc1x6DlqFWB6SlAkOUg TCz1ERkJIR4jwPlQmGsCwkkQdiSnnLn7MRuhLv6+0HcPelEPi8C8tO0YiwI0DQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b6r8r6GWTzg6X; Wed, 28 May 2025 13:35: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 54SDZ8RT017734; Wed, 28 May 2025 13:35:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54SDZ8CW017731; Wed, 28 May 2025 13:35:08 GMT (envelope-from git) Date: Wed, 28 May 2025 13:35:08 GMT Message-Id: <202505281335.54SDZ8CW017731@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: 48d41181ee1d - main - hwpmc/arm64: The PMXEVCNTR_EL0 register is 64-bit List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 48d41181ee1d43e44cf9aa8332ccb8ad855026a9 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=48d41181ee1d43e44cf9aa8332ccb8ad855026a9 commit 48d41181ee1d43e44cf9aa8332ccb8ad855026a9 Author: Andrew Turner AuthorDate: 2025-05-27 19:55:27 +0000 Commit: Andrew Turner CommitDate: 2025-05-27 19:55:27 +0000 hwpmc/arm64: The PMXEVCNTR_EL0 register is 64-bit It may return data in the upper 32-bits when FEAT_PMUv3p5 is implemented so mask those bits off. Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D50431 --- sys/dev/hwpmc/hwpmc_arm64.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/dev/hwpmc/hwpmc_arm64.c b/sys/dev/hwpmc/hwpmc_arm64.c index b547ad2fa53e..e51d3fa84828 100644 --- a/sys/dev/hwpmc/hwpmc_arm64.c +++ b/sys/dev/hwpmc/hwpmc_arm64.c @@ -135,7 +135,7 @@ arm64_pmcr_write(uint64_t reg) /* * Performance Count Register N */ -static uint32_t +static uint64_t arm64_pmcn_read(unsigned int pmc) { @@ -149,7 +149,7 @@ arm64_pmcn_read(unsigned int pmc) } static void -arm64_pmcn_write(unsigned int pmc, uint32_t reg) +arm64_pmcn_write(unsigned int pmc, uint64_t reg) { KASSERT(pmc < arm64_npmcs, ("%s: illegal PMC number %d", __func__, pmc)); @@ -247,6 +247,7 @@ arm64_read_pmc(int cpu, int ri, struct pmc *pm, pmc_value_t *v) /* Reread counter in case we raced. */ tmp = arm64_pmcn_read(ri); } + tmp &= 0xffffffffu; tmp += 0x100000000llu * pm->pm_pcpu_state[cpu].pps_overflowcnt; intr_restore(s); @@ -282,6 +283,7 @@ arm64_write_pmc(int cpu, int ri, struct pmc *pm, pmc_value_t v) PMCDBG3(MDP, WRI, 1, "arm64-write cpu=%d ri=%d v=%jx", cpu, ri, v); pm->pm_pcpu_state[cpu].pps_overflowcnt = v >> 32; + v &= 0xffffffffu; arm64_pmcn_write(ri, v); return (0); From nobody Wed May 28 13:35:09 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b6r8t3lhGz5xVcP; Wed, 28 May 2025 13:35: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b6r8t0PVkz3MHK; Wed, 28 May 2025 13:35:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748439310; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PugC2usSPog2Vs4nPJtEioEsOZPagfPajl8BLpCg9qE=; b=NZXv/0zgU6vbu7SjTy4NQTk5T+KVbgIU25saSpuNjGSJzQhc5ISKKIo4mOiQLBp2TeBXtD p/S4LxGC0ps4NgVgqnpnnC1WyAfiSd4vkt2do5SBKBYjNRt/1nTZAba9Ov8K5BAIfYdeO0 jX9GJ7uXLaztpF6oNWMUvo/zKTJz2lUwQoGnoP2hLsL/iz2O3SnY25XaslBuzKwCIwhP4a Ek5XRrMFPgPk7isoQYVpD/YC6xxBXsVdThjEXg+SOXdGGtDFFwGzFRymQRFAELpjqdTozo eZ0FpSHRSsRnGRWM9iydQhjv3PnNHFaQX45swhme00D5iKocofphWnQChw1YVg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748439310; a=rsa-sha256; cv=none; b=ZBLyIpiAun5WF4u8+9+zIwnNJDtRoW5MDQQn7CVS1djgrQnCd6UHBiTuzh8UMIA41oVqw5 YvUcD09lBSiQpGlnpbusU1N3iWp77m96SuLnZcgISHTdtcCcdEQcOwwNlHLmbwtlcpm23N uTAhxIyGWNj1NpOjUn7RzjJnd0ODjgesocpQ6AsqzQVcHvGd93LvJtVhT3m170cbSePehx 5R0YSAQVcd3k2ecg1VyWPDvtaxAI9SSG300P48C0Wfcv3jQ5adJDeyibCEKyAqd9+KOXwH Y2pYUhzwK2hG77i4cv0RtOvxybihYV5UR1U8NjgJI4Kb1BkiuYbPzaPVejhlAA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748439310; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PugC2usSPog2Vs4nPJtEioEsOZPagfPajl8BLpCg9qE=; b=ZV5OkB9Xv+VtTyakMB9mGcRQx/ZGSUh3ZcP/8AxGcevL9W95GCv/BJaAaM8juJa/FZRi9g 0VPkxH1WB6oB7j1StKcCJwQ1aMFHSmrgJep0eXA7d6BHFSYwN3986udHTV1O6H4ac1xd7W NLJRb207S78CQCHtmaTrJ5885WBsMyyFa+hBweKNAOZ2wwDc/LA8YXz95dSrfv8WFhcQMY 5O5Ewen0i4rUMeF6l0HbADze4HUlYjwGgukXb2L3iXonmuA+cfoZ2K/6z18yICsfwB1N3Z t3d0pOJ8ztkwAfJMZpy7AOWyZPmRdjMSDkkBTrcvwesmZRi/tEEQ5NlTwB5QIg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b6r8s757RzgZv; Wed, 28 May 2025 13:35: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 54SDZ9OL017766; Wed, 28 May 2025 13:35:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54SDZ99b017763; Wed, 28 May 2025 13:35:09 GMT (envelope-from git) Date: Wed, 28 May 2025 13:35:09 GMT Message-Id: <202505281335.54SDZ99b017763@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: 88365ff691f1 - main - hwpmc/arm64: The counter is 64-bit List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 88365ff691f11db9bdb67ed4819abc98ecc437e9 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=88365ff691f11db9bdb67ed4819abc98ecc437e9 commit 88365ff691f11db9bdb67ed4819abc98ecc437e9 Author: Andrew Turner AuthorDate: 2025-05-27 19:55:32 +0000 Commit: Andrew Turner CommitDate: 2025-05-27 19:55:32 +0000 hwpmc/arm64: The counter is 64-bit Because we include the overflow count in the counter mark it as 64-bit. Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D50432 --- sys/dev/hwpmc/hwpmc_arm64.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/hwpmc/hwpmc_arm64.c b/sys/dev/hwpmc/hwpmc_arm64.c index e51d3fa84828..4f7cc16b9765 100644 --- a/sys/dev/hwpmc/hwpmc_arm64.c +++ b/sys/dev/hwpmc/hwpmc_arm64.c @@ -592,7 +592,7 @@ pmc_arm64_initialize(void) pcd->pcd_class = PMC_CLASS_ARMV8; pcd->pcd_num = arm64_npmcs; pcd->pcd_ri = pmc_mdep->pmd_npmc; - pcd->pcd_width = 32; + pcd->pcd_width = 64; pcd->pcd_allocate_pmc = arm64_allocate_pmc; pcd->pcd_config_pmc = arm64_config_pmc; From nobody Wed May 28 13:35:11 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b6r8v55wqz5xVcT; Wed, 28 May 2025 13:35: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b6r8v1THtz3ML8; Wed, 28 May 2025 13:35:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748439311; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YhWLBXpwH5IK+t10/FMSMVdCYFRtl9dBhxprVM5u18k=; b=W1ghUp0B9fGBwL7uIZ68Fo/VI2U7H8ZAoI0gHylLX96waCMxX1eShlmbWEN1iWjT8De187 TYqmfvTCwFlp/tOEyYOHzfoAR1ImG8g+wyCEDBTAbIjdiw8eydYQ/7yWW+kLw/NkVcVX3L 6spq2z0+WFNguaKdbj+ve0S8BSZ0F+gY9gmZ7nEvdAdLJKu4lR48sHKgnxQs9hJ0GOr0XZ SnkjgsW1LZaupHOpzv8YbQlVInb31dLZcRzhf5yxRcVd7rhwHuojntD+aTZwlWF+kFkuKI FFRVg+uworOcRFt7Id01tdkrWPztJKBOiUJ3/YsmJuhKC8CD04jbwwi8JAr6qg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748439311; a=rsa-sha256; cv=none; b=TsAeZbZ7yenigY6FqF7IdO0NrTeVfEzp8fbCLB++ZDj2GwKN5cydQvM8N2pwkb2mVDLdo0 JIF1/B13ml+ZSHn22kfOL2sODnktGktXNY0TmsvONTY24w2bYMZeawQLa0++R649jceYQn GokYg24g6aF2cqi9INlt0fG9gfIREHD2KH4ot2DFjIPE4WTq66RbPKVLETaY3hKsQQYmCH fznep3neqnqwAt6/89gMMfnqNTlsmHbWU72mLHEgPGDv1DnVM2rdZiuS57jrYl1rHRI0Jo pnfjp/PwZk+cO/6qu0XyMcfEuHok1JJjiNcRqbpZxaX8YAaKQ7ve+/zqip59KQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748439311; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YhWLBXpwH5IK+t10/FMSMVdCYFRtl9dBhxprVM5u18k=; b=BYnjX9IVTgZX8OtUUmECCUiZQkZs1TkuBAmORx2WvvQM6979pNq/x08XlsXhFPMflREpZT H+Gvap4sW9y1LLMXuMD/QJhhsQufPvQ85JYvgM0zlyznRIVmaG1MwZWw+1UiGcPgt6PZhY ctOl+ij59fIN6CaRn+2p+JvpzQaE7L6VgbZCQnkqE5zReoHIffMyBndS6C5KgsX5+2uzaJ Bc1Rr/vzUhVFtumCnH9CSGbCdOZr97HhOVYt5g3AVUDkb8yDGChk3K0XfSuwzNsWQdu5d+ WXXF74LHOKhZj3sAr3q5GDPCD6YmM+i/RyjVUG95GZigxHeAYCAK+SxsJotf9g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b6r8v11yfzg6Y; Wed, 28 May 2025 13:35: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 54SDZBAL017798; Wed, 28 May 2025 13:35:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54SDZBIn017795; Wed, 28 May 2025 13:35:11 GMT (envelope-from git) Date: Wed, 28 May 2025 13:35:11 GMT Message-Id: <202505281335.54SDZBIn017795@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: 166d8e4f4786 - main - hwpmc/arm64: Support 64-bit counters List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 166d8e4f47860e4d0f1826923134e226684a8a20 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=166d8e4f47860e4d0f1826923134e226684a8a20 commit 166d8e4f47860e4d0f1826923134e226684a8a20 Author: Andrew Turner AuthorDate: 2025-05-27 19:55:38 +0000 Commit: Andrew Turner CommitDate: 2025-05-27 19:55:38 +0000 hwpmc/arm64: Support 64-bit counters When FEAT_PMUv3p5 is implemented the event counters become 64-bit. The PMCR_EL0.LP field is set to move the overflow to be a 64-bit overflow. As such we ignore it when getting the value for the user as there is no space in a 64-bit variable to store is. Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D50433 --- sys/dev/hwpmc/hwpmc_arm64.c | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/sys/dev/hwpmc/hwpmc_arm64.c b/sys/dev/hwpmc/hwpmc_arm64.c index 4f7cc16b9765..6b019bfcb419 100644 --- a/sys/dev/hwpmc/hwpmc_arm64.c +++ b/sys/dev/hwpmc/hwpmc_arm64.c @@ -39,6 +39,7 @@ #include "opt_acpi.h" static int arm64_npmcs; +static bool arm64_64bit_events __read_mostly = false; struct arm64_event_code_map { enum pmc_event pe_ev; @@ -247,8 +248,15 @@ arm64_read_pmc(int cpu, int ri, struct pmc *pm, pmc_value_t *v) /* Reread counter in case we raced. */ tmp = arm64_pmcn_read(ri); } - tmp &= 0xffffffffu; - tmp += 0x100000000llu * pm->pm_pcpu_state[cpu].pps_overflowcnt; + /* + * If the counter is 32-bit increment the upper bits of the counter. + * It it is 64-bit then there is nothing we can do as tmp is already + * 64-bit. + */ + if (!arm64_64bit_events) { + tmp &= 0xffffffffu; + tmp += (uint64_t)pm->pm_pcpu_state[cpu].pps_overflowcnt << 32; + } intr_restore(s); PMCDBG2(MDP, REA, 2, "arm64-read id=%d -> %jd", ri, tmp); @@ -282,8 +290,10 @@ arm64_write_pmc(int cpu, int ri, struct pmc *pm, pmc_value_t v) PMCDBG3(MDP, WRI, 1, "arm64-write cpu=%d ri=%d v=%jx", cpu, ri, v); - pm->pm_pcpu_state[cpu].pps_overflowcnt = v >> 32; - v &= 0xffffffffu; + if (!arm64_64bit_events) { + pm->pm_pcpu_state[cpu].pps_overflowcnt = v >> 32; + v &= 0xffffffffu; + } arm64_pmcn_write(ri, v); return (0); @@ -494,6 +504,8 @@ arm64_pcpu_init(struct pmc_mdep *md, int cpu) /* Enable unit */ pmcr = arm64_pmcr_read(); pmcr |= PMCR_E; + if (arm64_64bit_events) + pmcr |= PMCR_LP; arm64_pmcr_write(pmcr); return (0); @@ -523,6 +535,7 @@ pmc_arm64_initialize(void) struct pmc_mdep *pmc_mdep; struct pmc_classdep *pcd; int classes, idcode, impcode; + uint64_t dfr; uint64_t pmcr; uint64_t midr; @@ -545,6 +558,12 @@ pmc_arm64_initialize(void) midr &= ~(CPU_VAR_MASK | CPU_REV_MASK); snprintf(pmc_cpuid, sizeof(pmc_cpuid), "0x%016lx", midr); + /* Check if we have 64-bit counters */ + if (get_kernel_reg(ID_AA64DFR0_EL1, &dfr)) { + if (ID_AA64DFR0_PMUVer_VAL(dfr) >= ID_AA64DFR0_PMUVer_3_5) + arm64_64bit_events = true; + } + /* * Allocate space for pointers to PMC HW descriptors and for * the MDEP structure used by MI code. From nobody Wed May 28 13:35:12 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b6r8w5m8Nz5xVfd; Wed, 28 May 2025 13:35: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b6r8w39gyz3MHh; Wed, 28 May 2025 13:35:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748439312; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZqPoGo6Lk/kZvvdGaJu1zxDiOO1+SqRIP6PlsNNdtUQ=; b=o3SO+uHnO9tcgXCaDqzZeQlYRyUQGygCmdHQ6f4Z3jNVCtmqtIyw+AIF1EHtHd0rWeTD2E OqUtDyGm9vMfQH8MhfR8QtLLnlZKgVkE8vRr3z4/RWLPPwifoXEhEJgFqD/10aJb4M0NYm hgOxbBgyn0DFLK+miJQuyStBlG4moPc4GCtZgRL8aRDUXfPtdyMLFJXfIvhObWctAvnbbx CepQDGj74z8od+NIdDJfNPwnoDcYkiIgTkjHrpKq4vMJeViqXUMmv4kBrC7IrePReg4XQa iJnvshEquxQnla4TKGXSlhLPuTRtUqfWhw4vKrZ3JFKCUSo0O2WIFG1ofepCFQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748439312; a=rsa-sha256; cv=none; b=YXEmx+ohQwQuxJFk+V5cIyENPvlzOMa0aU21OzPHP0YAkOfUl1AMD2fsUYASGSJbcW+GNl IGCp+A2BSVeQ5cyfeBVdu8lXa9opLrM3X0hule2M1buWO/dRJ6RTs9ezLZFUp86Upa85hf ufDmfIKEcjGBXIHF2poahMHcVui43wW7SngYF6Ohi7JIe5Kk31V7Ll/0JRpLmQHKu7V13H qQgvNrLGqUSAbnhmxKIAIDDSr6jdV4n6BuqMz/YSfxuqANvxVx3OMH75NKKV2FScn4M2e8 kRmfM8izQAY/SOLtF3mdnXeJWjjBE0TyWY2p9rfA3CS3VKuI4iyJznf7nqHjUw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748439312; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZqPoGo6Lk/kZvvdGaJu1zxDiOO1+SqRIP6PlsNNdtUQ=; b=wtVbVmew9TQcjyZ6KOOXwczbRs5cXkLk2BpDNNT69udAfxVqwQPwb4pRJ2nK5E7DQi/qfX rDyQOyBO2nDz3RqZl6f2GEvOM+3Co5DUCU9eTZhcjtzXko9HVgtSvf6P3G7SlGgyRwO18m NFMvWTf32KRf4jOuq1S2rdifd1jOr8JcTZ6ui2nMnxi8Xccj5OM9/F0ony3E6w4wIstnaR IKYAS3hygaVJj0THFi9F1l8fQDYShBNDBKAPqlerHlN2ssYnj3pNelgxYbLtlVjPBsisvo LvRNA8hR4bUHieiXE95L+Jcvg4hVtYiA7OW6Wcbw7DYVt2VPxi0Y/xMWvyTXWA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b6r8w2PCpzgg3; Wed, 28 May 2025 13:35: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 54SDZClc017830; Wed, 28 May 2025 13:35:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54SDZCqN017827; Wed, 28 May 2025 13:35:12 GMT (envelope-from git) Date: Wed, 28 May 2025 13:35:12 GMT Message-Id: <202505281335.54SDZCqN017827@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: 1bf4adf8cc9a - main - hwpmc/arm64: Hard code the initial pmcr state List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 1bf4adf8cc9a22a1bcb3eafaf0315b3175a65abe Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=1bf4adf8cc9a22a1bcb3eafaf0315b3175a65abe commit 1bf4adf8cc9a22a1bcb3eafaf0315b3175a65abe Author: Andrew Turner AuthorDate: 2025-05-27 19:55:44 +0000 Commit: Andrew Turner CommitDate: 2025-05-27 19:55:44 +0000 hwpmc/arm64: Hard code the initial pmcr state We can't the fields in PMCR_EL0 are configured in the way we expect. Rather than depending on prior configuration hard code the fields we want set. Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D50434 --- sys/dev/hwpmc/hwpmc_arm64.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sys/dev/hwpmc/hwpmc_arm64.c b/sys/dev/hwpmc/hwpmc_arm64.c index 6b019bfcb419..310e43065716 100644 --- a/sys/dev/hwpmc/hwpmc_arm64.c +++ b/sys/dev/hwpmc/hwpmc_arm64.c @@ -501,9 +501,8 @@ arm64_pcpu_init(struct pmc_mdep *md, int cpu) WRITE_SPECIALREG(pmcntenclr_el0, 0xffffffff); WRITE_SPECIALREG(pmintenclr_el1, 0xffffffff); - /* Enable unit */ - pmcr = arm64_pmcr_read(); - pmcr |= PMCR_E; + /* Enable unit with a useful default state */ + pmcr = PMCR_LC | PMCR_C | PMCR_P | PMCR_E; if (arm64_64bit_events) pmcr |= PMCR_LP; arm64_pmcr_write(pmcr); From nobody Wed May 28 15:42:31 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b6tzq74C8z5wtk4; Wed, 28 May 2025 15:42: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b6tzq64ZJz4LKq; Wed, 28 May 2025 15:42:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748446951; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JcS1+OjwIjrD+o40N0YaKKxzOUwtDnZpbfrgUXEVUN4=; b=yFQaCQhMhqqCgSNJdQtb7egMj8LVY5kQkvmJpCHwRtlGfJKOrEjaJO6vx+qgto49+P/z6s AXX25rJWsoU3LUshWlr2RGw6jYHGqjC+n+5rI9yG6zQ+4+wv6irWW7wTAZcHItuDtOvG7k mf/nHLzrVBdFZbWrfAFvl40LmOyuJcHICwte6P1lQk+qobRJn6U//zmi0wldzdaJdZi68Z AKBZSrHikgSpHVp9dQNUiHrqqHya2n6VG6aLeNF8sSsTBalhI47GJBL5XS2h5K9ynOUN2s FWsU4KjliMfo09+DTZ5FA+5hPxX3PV0Hbo9TRnxK8O8ftpSTV4cxlwBUYZq0cQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748446951; a=rsa-sha256; cv=none; b=Eb64H81OScFz7VWX2FbX/tNG7gyr2PET33g3GII9OpelfP+KDowGnj319aibuLUTcrBrgq 5AVF3kS8VdFvMy5zMVu72Clfh1K3HulqRW3zldwHN7IhVkd15f1wetZT63TzAy2NNhyN8X Yuo/GBxKUp+b4Dcbh/LxEUIxoAp2iz6mSyVT9rnBYxiwbD95cAnUtOb1XyXTtUCN9xZoV/ AcgjtPFMh+ARGtt3ov1NivJ/F1u7Nohg5f6/UFRuOI8q2eUS9Cd7YnMDPvAHVFikH3D+6F nYPB8Wp5Fn89/NrK4YgLaS0b05ywOk91hO9ozfeJZn076NEel3AJkN26QcwsTA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748446951; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JcS1+OjwIjrD+o40N0YaKKxzOUwtDnZpbfrgUXEVUN4=; b=W1IljonqLrmD6vwpq9GqJOn0gjJnGeNjyBSvIDoKCFgw3KZvs/20Y0Ek4cRYwesi/8PUB2 DKTe03vHRL9cLDBU6nqxNoc9eVZFe5dZE07nIM6rgaJg7nAL8Y57QoKJwj5Sz1TUvZ6DMr Y/uBPi1IkVP5FVv0pviBp5uIpT1W8zz94HzQ+WBOS9KKjUqg1b2gQOD3DcSfBjyzVMOyO0 /5fDyIv5wNaFGI7n+p/AMfT58VXjRDDw2XPUNMiTyqWkpzkMCaOHJ3z2O3r5qnPJltVFGU sJ43G12SGuoGDRhVjt+AJeZkxiqvnKbCG/CiRlWuC1vVeD/SrZrAa/oAv1SDTw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b6tzq5gXfzkJt; Wed, 28 May 2025 15:42: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 54SFgV3C060365; Wed, 28 May 2025 15:42:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54SFgVaZ060363; Wed, 28 May 2025 15:42:31 GMT (envelope-from git) Date: Wed, 28 May 2025 15:42:31 GMT Message-Id: <202505281542.54SFgVaZ060363@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: d6a9f4918579 - main - igc: Initialize helper variables in igc_neweitr() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: d6a9f49185797c6b67e517a3d83ef63436c8d4f3 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=d6a9f49185797c6b67e517a3d83ef63436c8d4f3 commit d6a9f49185797c6b67e517a3d83ef63436c8d4f3 Author: Mark Johnston AuthorDate: 2025-05-28 13:31:34 +0000 Commit: Mark Johnston CommitDate: 2025-05-28 15:41:53 +0000 igc: Initialize helper variables in igc_neweitr() The justification is the same as in commit a5b5220b1807 ("e1000: Initialize helper variables in em_newitr()"). Reviewed by: kbowling MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D50547 --- sys/dev/igc/if_igc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/dev/igc/if_igc.c b/sys/dev/igc/if_igc.c index 318d2770911c..f34b0507c1ea 100644 --- a/sys/dev/igc/if_igc.c +++ b/sys/dev/igc/if_igc.c @@ -936,6 +936,7 @@ igc_neweitr(struct igc_softc *sc, struct igc_rx_queue *que, goto igc_set_next_eitr; } + bytes = bytes_packets = 0; /* Get largest values from the associated tx and rx ring */ if (txr->tx_bytes && txr->tx_packets) { bytes = txr->tx_bytes; From nobody Wed May 28 15:42:32 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b6tzs3QVBz5wtxL; Wed, 28 May 2025 15:42: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b6tzs0F2kz4LKt; Wed, 28 May 2025 15:42:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748446953; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7gkf+us+kXXnys0VL+Xr02u/jviYQ/KtdjNzmwoBOQg=; b=k3xpBTAsuyRWKT83S/ubGjnbWJAx1UJQNPpBKilA0VZaaChbzkvGJF6d4shrrX/krB2w/V CIptXFiDunCuAwqy3HbsomAv8+C3Xhbt0xTlXvhx8xWjCC6si/g6g8/BSxg7jiTx44Gv79 Amo0qWflJr0+qcrOkhBE4dd360TSAJTsvPF6cMi8v55mvTOsaKIbgyW3d1tDtc0b8/qHvZ C7gIKB2OrxVWg8n14XKYfVf1gUNSd/kj3VG4F7YtXNntNzmOiSnvuAyzla8LV2jxa9IzaT 47/vF/sYl8QrZvHXb6s0eOZvLkzFGs226nCt7QS2tHfClCoYjKErCXGqSEeeRA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748446953; a=rsa-sha256; cv=none; b=WpMzBaUyZ4nv++vvyjbvyhT6apY2v3HlpTtm+wvAWvJK0IXXTugYkmi692DLL2Jd+BET5G ExVEuwjcUEOLPbbolYWus1y9goA5sovyr0EoF9tSGVqUCXWAPUCJ3BYOYcgmngwLsogBm4 aisqwROnRIez1aQcOBXMtKqJC0pzvmGj12M6vVmx+ODqE0Nsq8hHgU5+deNCvi0n8rzaiA UvMrbd0p68x3LJiF/sBz8SdkSNCBdXIDG2wMlJ/Bhz/Fcx1PGB7Cd4Mtr0wE3ovnln7vqx Y36klDd0hBfk5LDdTp0/KsW6IM/0bH1tmdst38waWGgJlMVH/k/1XJqCrTOeSg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748446953; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7gkf+us+kXXnys0VL+Xr02u/jviYQ/KtdjNzmwoBOQg=; b=lpkmnod+DTvNsLqy0vIlk/tNpwQSKt76tiw8T2/6ZNRf2ZfqOxp3GVA2vvJ9WbGw+qTxmL or8yBr7l0L5qlwBkPiReILj82qX656P0cDgvPSjwxH9P+QQit+S9eqlP3gFPjSqX27HNWi 95xlgHbtLr9oSBS6DaIw9NPu5YtWcPaS93OLG4N8Pzc4C/gyct6SfAilxpK5aQ0jcBE3fa 5KdR4pcKhau95PI06SAUZ1cWmYH9Ueh6qVgNpVGm23ytz7egKZBFmBisV8TGgpalUSCHJO yV1dGiTJoCA9eJ2jYViB3UmrE6g/0sQSS5jBeAXbKKkz5DtzglFYpzujYlZOIQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b6tzr6vLxzkl4; Wed, 28 May 2025 15:42: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 54SFgWAt060399; Wed, 28 May 2025 15:42:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54SFgWwr060396; Wed, 28 May 2025 15:42:32 GMT (envelope-from git) Date: Wed, 28 May 2025 15:42:32 GMT Message-Id: <202505281542.54SFgWwr060396@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: ef062029ceff - main - igc: Fix some issues in igc_neweitr() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: ef062029ceffacb6bde3a5639a2bd8c4d59ca1df Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=ef062029ceffacb6bde3a5639a2bd8c4d59ca1df commit ef062029ceffacb6bde3a5639a2bd8c4d59ca1df Author: Mark Johnston AuthorDate: 2025-05-28 13:31:44 +0000 Commit: Mark Johnston CommitDate: 2025-05-28 15:41:53 +0000 igc: Fix some issues in igc_neweitr() The justification is the same as in commit fb876eef219e ("e1000: Fix some issues in em_newitr()"). Reviewed by: kbowling MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D50548 --- sys/dev/igc/if_igc.c | 40 ++++++++++++++++++++++------------------ 1 file changed, 22 insertions(+), 18 deletions(-) diff --git a/sys/dev/igc/if_igc.c b/sys/dev/igc/if_igc.c index f34b0507c1ea..a1ae35c7aa43 100644 --- a/sys/dev/igc/if_igc.c +++ b/sys/dev/igc/if_igc.c @@ -909,14 +909,16 @@ igc_neweitr(struct igc_softc *sc, struct igc_rx_queue *que, struct tx_ring *txr, struct rx_ring *rxr) { struct igc_hw *hw = &sc->hw; + unsigned long bytes, bytes_per_packet, packets; + unsigned long rxbytes, rxpackets, txbytes, txpackets; u32 neweitr; - u32 bytes; - u32 bytes_packets; - u32 packets; u8 nextlatency; + rxbytes = atomic_load_long(&rxr->rx_bytes); + txbytes = atomic_load_long(&txr->tx_bytes); + /* Idle, do nothing */ - if ((txr->tx_bytes == 0) && (rxr->rx_bytes == 0)) + if (txbytes == 0 && rxbytes == 0) return; neweitr = 0; @@ -936,18 +938,20 @@ igc_neweitr(struct igc_softc *sc, struct igc_rx_queue *que, goto igc_set_next_eitr; } - bytes = bytes_packets = 0; + bytes = bytes_per_packet = 0; /* Get largest values from the associated tx and rx ring */ - if (txr->tx_bytes && txr->tx_packets) { - bytes = txr->tx_bytes; - bytes_packets = txr->tx_bytes/txr->tx_packets; - packets = txr->tx_packets; + txpackets = atomic_load_long(&txr->tx_packets); + if (txpackets != 0) { + bytes = txbytes; + bytes_per_packet = txbytes / txpackets; + packets = txpackets; } - if (rxr->rx_bytes && rxr->rx_packets) { - bytes = max(bytes, rxr->rx_bytes); - bytes_packets = max(bytes_packets, - rxr->rx_bytes/rxr->rx_packets); - packets = max(packets, rxr->rx_packets); + rxpackets = atomic_load_long(&rxr->rx_packets); + if (rxpackets != 0) { + bytes = lmax(bytes, rxbytes); + bytes_per_packet = + lmax(bytes_per_packet, rxbytes / rxpackets); + packets = lmax(packets, rxpackets); } /* Latency state machine */ @@ -957,7 +961,7 @@ igc_neweitr(struct igc_softc *sc, struct igc_rx_queue *que, break; case eitr_latency_lowest: /* 70k ints/s */ /* TSO and jumbo frames */ - if (bytes_packets > 8000) + if (bytes_per_packet > 8000) nextlatency = eitr_latency_bulk; else if ((packets < 5) && (bytes > 512)) nextlatency = eitr_latency_low; @@ -965,14 +969,14 @@ igc_neweitr(struct igc_softc *sc, struct igc_rx_queue *que, case eitr_latency_low: /* 20k ints/s */ if (bytes > 10000) { /* Handle TSO */ - if (bytes_packets > 8000) + if (bytes_per_packet > 8000) nextlatency = eitr_latency_bulk; else if ((packets < 10) || - (bytes_packets > 1200)) + (bytes_per_packet > 1200)) nextlatency = eitr_latency_bulk; else if (packets > 35) nextlatency = eitr_latency_lowest; - } else if (bytes_packets > 2000) { + } else if (bytes_per_packet > 2000) { nextlatency = eitr_latency_bulk; } else if (packets < 3 && bytes < 512) { nextlatency = eitr_latency_lowest; From nobody Wed May 28 15:42:33 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b6tzt3hqHz5wtRQ; Wed, 28 May 2025 15:42: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b6tzt1jhWz4LBt; Wed, 28 May 2025 15:42:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748446954; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=POm20SXdejKXr6dRMqFlRNB/El/Uw/hjgv6kJtWK7QA=; b=XVV/HGh1FSbtstaXPDyzYiu8bZ3svne6TOSLut5pxzf1y8prhjjP3radND0IodfQ/NxW3h eP+AXIr+nzjvOut4iXKAt14EbTxf8Jr5YBxZCcj3iOQabj+bMNfVgny5hLOB+TIO1wuEMA JMsDAW7akezztHB/nYLyoZB0ujOMUXEUARWKHuAn7j66ysITLGm8ItgV3ind77S+AQKtE0 hXdQKE3nDACoPFwKNvSvj7+iMq+cGX6s9c4r8zVQ1t7mpnQ8iuUcoNqG2iynGHP1j86bI4 RUA1299EKr4t46Tu2PAkrlsNUmF8rYa2KO2eycMdCthhRgbLuFP0kQYbuq4SJg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748446954; a=rsa-sha256; cv=none; b=duhYjmmGT+G8GxeF9YpGXXm3gcIKg71e8SwoJctUd+SZTXkwFFZP2oEV+kMTsQR4mJNfOQ 037uZ2d0z3VzoAbbL6wJ2bEkk7BwwZAYFmOLt3LBzyJDW60TxrHxzSj9bXXWmPXYNDXhm2 z2UscVB2/BUOxE9LdXfLTC2Hz/jNUFRtw7aQxZH5+ZkLGxtDaSpe6MUMzibIuQyd4XF3IL 0tAMmUKa1gPc0c9DX/6OyKCZn4MUH1UNrRqFqOel6xTjhm+Mr0gLML9BOfyuzKYk9w+FGB atMgnDjJHVcPuMkujGFyZklP4wcTAWkNf3so61szL4pB0aws4b7MXfopyZiybQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748446954; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=POm20SXdejKXr6dRMqFlRNB/El/Uw/hjgv6kJtWK7QA=; b=O/jWobG5jkWp70SJ5RTdGKuevBdIh/7hbi3Iqu+FAE8/xdkoWdclfv6vfUK+nAV8vKjrxY 2Qb/Tg6chyi3Eathfx62rdZK9qFqeF0NvHrD4/+il1SVp4YIBr4mgqvXDThMmlqx/27of+ JsIP4hTIGYJblNdFydXJrHaUvF7KaGY8WXYy+UBD1KsMOpcR0mt5R6iem8hVAf4XtB0eGx 1KqDCaWJso+/IlTlmd8IY7hAaKG1oLUAPjyDZAXeFQkvGBnuZizNr+Uxgva4lQ8DJdx99j xM1aetN7mPhmg9zARybHKmDp/LLNY4W/Ay/NVVFYQNdsZ06B+FOhiPGfrvZIyA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b6tzt0jGpzkCh; Wed, 28 May 2025 15:42: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 54SFgXqb060439; Wed, 28 May 2025 15:42:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54SFgX01060436; Wed, 28 May 2025 15:42:33 GMT (envelope-from git) Date: Wed, 28 May 2025 15:42:33 GMT Message-Id: <202505281542.54SFgX01060436@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: e05e33041c25 - main - vfs: Don't clobber namei flags in vn_open_cred() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: e05e33041c252dc236939683c01ca4b7b083562c Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=e05e33041c252dc236939683c01ca4b7b083562c commit e05e33041c252dc236939683c01ca4b7b083562c Author: Mark Johnston AuthorDate: 2025-05-28 13:35:24 +0000 Commit: Mark Johnston CommitDate: 2025-05-28 15:41:53 +0000 vfs: Don't clobber namei flags in vn_open_cred() Otherwise NAMEILOOKUP is cleared. More generally it seems quite surprising that the flags set by vn_open_cred() callers are not automatically preserved. Modify open2nameif() such that it takes already-set namei flags into account. Reviewed by: olce, kib Fixes: 7587f6d4840f ("namei: Make stackable filesystems check harder for jail roots") Differential Revision: https://reviews.freebsd.org/D50531 --- sys/kern/vfs_vnops.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c index 696f5c11c8fc..9b891019bbc6 100644 --- a/sys/kern/vfs_vnops.c +++ b/sys/kern/vfs_vnops.c @@ -187,11 +187,11 @@ vn_open(struct nameidata *ndp, int *flagp, int cmode, struct file *fp) } static uint64_t -open2nameif(int fmode, u_int vn_open_flags) +open2nameif(int fmode, u_int vn_open_flags, uint64_t cn_flags) { uint64_t res; - res = ISOPEN | LOCKLEAF; + res = ISOPEN | LOCKLEAF | cn_flags; if ((fmode & O_RESOLVE_BENEATH) != 0) res |= RBENEATH; if ((fmode & O_EMPTY_PATH) != 0) @@ -202,12 +202,17 @@ open2nameif(int fmode, u_int vn_open_flags) res |= OPENWRITE; if ((fmode & O_NAMEDATTR) != 0) res |= OPENNAMED | CREATENAMED; + if ((fmode & O_NOFOLLOW) != 0) + res &= ~FOLLOW; if ((vn_open_flags & VN_OPEN_NOAUDIT) == 0) res |= AUDITVNODE1; + else + res &= ~AUDITVNODE1; if ((vn_open_flags & VN_OPEN_NOCAPCHECK) != 0) res |= NOCAPCHECK; if ((vn_open_flags & VN_OPEN_WANTIOCTLCAPS) != 0) res |= WANTIOCTLCAPS; + return (res); } @@ -258,7 +263,9 @@ restart: return (EINVAL); else if ((fmode & (O_CREAT | O_DIRECTORY)) == O_CREAT) { ndp->ni_cnd.cn_nameiop = CREATE; - ndp->ni_cnd.cn_flags = open2nameif(fmode, vn_open_flags); + ndp->ni_cnd.cn_flags = open2nameif(fmode, vn_open_flags, + ndp->ni_cnd.cn_flags); + /* * Set NOCACHE to avoid flushing the cache when * rolling in many files at once. @@ -267,8 +274,8 @@ restart: * exist despite NOCACHE. */ ndp->ni_cnd.cn_flags |= LOCKPARENT | NOCACHE | NC_KEEPPOSENTRY; - if ((fmode & O_EXCL) == 0 && (fmode & O_NOFOLLOW) == 0) - ndp->ni_cnd.cn_flags |= FOLLOW; + if ((fmode & O_EXCL) != 0) + ndp->ni_cnd.cn_flags &= ~FOLLOW; if ((vn_open_flags & VN_OPEN_INVFS) == 0) bwillwrite(); if ((error = namei(ndp)) != 0) @@ -348,9 +355,8 @@ restart: } } else { ndp->ni_cnd.cn_nameiop = LOOKUP; - ndp->ni_cnd.cn_flags = open2nameif(fmode, vn_open_flags); - ndp->ni_cnd.cn_flags |= (fmode & O_NOFOLLOW) != 0 ? NOFOLLOW : - FOLLOW; + ndp->ni_cnd.cn_flags = open2nameif(fmode, vn_open_flags, + ndp->ni_cnd.cn_flags); if ((fmode & FWRITE) == 0) ndp->ni_cnd.cn_flags |= LOCKSHARED; if ((error = namei(ndp)) != 0) From nobody Wed May 28 15:42:35 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b6tzv5CvJz5wvDy; Wed, 28 May 2025 15:42: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b6tzv2BqMz4L5m; Wed, 28 May 2025 15:42:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748446955; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lVbxHlXwN3xghCXuVLWQqUSB4FyLmbfKM0wacVS6exE=; b=aX/zEPZiU4xSNwE28P1cVwqWUkSJNN7Oj+flUQpWYtKKHV4xXbjFsomLTDICv/gYWCjnOA kJjW02SV9bgMRzigVjF1WXMAiREeFwNM1EDkJXkd6Gs9vYOrAMbI4O0Q3immIg03AAfLq9 eDA2O599WPfwVBMabHQyha14AzQ39MNxm2zqfpKd6ZVTfEOAJj+yl3oXVvnkENrZ76a8Jf Ok63mL4AbW1JE8U5G2w9CQ7kWvw34HU3K51NGWGE2jYViGRm0dwdOzFRNML+hpNob3rRFF qdTFy2U8VvKk52xg5nEcM7hU//IXxaiMn2EARL/lKqpK0M7FeXtipyHYbwBL/w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748446955; a=rsa-sha256; cv=none; b=S/hSuhvXMIiykQGdKTUtQ45how7Uf6VsJoPQtEearO5elNJcMso4ZdFrOTAasaVgV7O+g6 aPp4ElGkJY4dBpitjk/Ey1xjQ8155bxQO4NKIyfBrampjfAlBRaCo/gkr5elk9lsANtUsu uuhpgIDadWMJxMpNhLL+tloQxtFUQJSs2LRmKPYQDHgeW7XO/c3QZFzZ1mxTAkzXpKR9DB E7NVb6tdGrNJs0r761baqxYQeik8W5I0/D/qie6ual2c+sioUCHTTV2wGB+LLvAcRHJfvt UNk2jaXsq5YG9lpucfWDx+g8RBGIT5fA5upFWhfkfcd6RctvKJuTNCIZCeR/Cw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748446955; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lVbxHlXwN3xghCXuVLWQqUSB4FyLmbfKM0wacVS6exE=; b=Q6P0Ay4TcIbNMutL5B/T/qjR3CQCZxQFHCWLce11sZzuUGv92QzCGph35Qc/5OTS61y90i 68pFmGbZ/r9LKPf5u+OUtg7P8P9sdHE8OFaL4twceBdlDYs/NhWs+/ccX3tepZ7UMDfFl1 qO5rkCjcDHhWGKpwSPPo6+FlkuGuPBfsRHWTFG8B/ScXjsGak1w3MhaQkb1CrF2+XyR/hC EuzNOkQu7jnLjPqI6nXd9SU8qiSdV478MgO9abK8Klt7QWj6zEbRs6UWxG+2q3+JjwWpjc qE0lv/jt7twwvPEqoiJqxSFdAs7aChVDlrUieLIA2ZeTeDpKvls8v5NF/d13kQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b6tzv1d27zkCj; Wed, 28 May 2025 15:42: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 54SFgZRG060474; Wed, 28 May 2025 15:42:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54SFgZDl060471; Wed, 28 May 2025 15:42:35 GMT (envelope-from git) Date: Wed, 28 May 2025 15:42:35 GMT Message-Id: <202505281542.54SFgZDl060471@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: a5dac34f6e98 - main - tests: Add a regression test for commit 7587f6d4840f8 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: a5dac34f6e98c47bd7cb1946e39cc45432e167a8 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=a5dac34f6e98c47bd7cb1946e39cc45432e167a8 commit a5dac34f6e98c47bd7cb1946e39cc45432e167a8 Author: Mark Johnston AuthorDate: 2025-05-28 15:28:36 +0000 Commit: Mark Johnston CommitDate: 2025-05-28 15:41:53 +0000 tests: Add a regression test for commit 7587f6d4840f8 Reviewed by: kib MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D50533 --- tests/sys/kern/Makefile | 2 + tests/sys/kern/jail_lookup_root.c | 133 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 135 insertions(+) diff --git a/tests/sys/kern/Makefile b/tests/sys/kern/Makefile index 9480ea78266f..94a75048a31a 100644 --- a/tests/sys/kern/Makefile +++ b/tests/sys/kern/Makefile @@ -18,6 +18,7 @@ ATF_TESTS_C+= kern_descrip_test # One test modifies the maxfiles limit, which can cause spurious test failures. TEST_METADATA.kern_descrip_test+= is_exclusive="true" ATF_TESTS_C+= fdgrowtable_test +ATF_TESTS_C+= jail_lookup_root ATF_TESTS_C+= kill_zombie .if ${MK_OPENSSL} != "no" ATF_TESTS_C+= ktls_test @@ -77,6 +78,7 @@ PROGS+= coredump_phnum_helper PROGS+= pdeathsig_helper PROGS+= sendfile_helper +LIBADD.jail_lookup_root+= jail util CFLAGS.sys_getrandom+= -I${SRCTOP}/sys/contrib/zstd/lib LIBADD.sys_getrandom+= zstd LIBADD.sys_getrandom+= c diff --git a/tests/sys/kern/jail_lookup_root.c b/tests/sys/kern/jail_lookup_root.c new file mode 100644 index 000000000000..34e89f4aea2b --- /dev/null +++ b/tests/sys/kern/jail_lookup_root.c @@ -0,0 +1,133 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2025 Mark Johnston + */ + +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include + +#include + +static void +mkdir_checked(const char *dir, mode_t mode) +{ + int error; + + error = mkdir(dir, mode); + ATF_REQUIRE_MSG(error == 0 || errno == EEXIST, + "mkdir %s: %s", dir, strerror(errno)); +} + +static void __unused +mount_nullfs(const char *dir, const char *target) +{ + struct iovec *iov; + char errmsg[1024]; + int error, iovlen; + + iov = NULL; + iovlen = 0; + + build_iovec(&iov, &iovlen, __DECONST(char *, "fstype"), + __DECONST(char *, "nullfs"), (size_t)-1); + build_iovec(&iov, &iovlen, __DECONST(char *, "fspath"), + __DECONST(char *, target), (size_t)-1); + build_iovec(&iov, &iovlen, __DECONST(char *, "from"), + __DECONST(char *, dir), (size_t)-1); + build_iovec(&iov, &iovlen, __DECONST(char *, "errmsg"), + errmsg, sizeof(errmsg)); + + errmsg[0] = '\0'; + error = nmount(iov, iovlen, 0); + ATF_REQUIRE_MSG(error == 0, "nmount: %s", + errmsg[0] != '\0' ? errmsg : strerror(errno)); + + free_iovec(&iov, &iovlen); +} + +ATF_TC_WITH_CLEANUP(jail_root); +ATF_TC_HEAD(jail_root, tc) +{ + atf_tc_set_md_var(tc, "require.user", "root"); +} +ATF_TC_BODY(jail_root, tc) +{ + int error, fd, jid; + + mkdir_checked("./root", 0755); + mkdir_checked("./root/a", 0755); + mkdir_checked("./root/b", 0755); + mkdir_checked("./root/a/c", 0755); + + jid = jail_setv(JAIL_CREATE | JAIL_ATTACH, + "name", "nullfs_jail_root_test", + "allow.mount", "true", + "allow.mount.nullfs", "true", + "enforce_statfs", "1", + "path", "./root", + "persist", NULL, + NULL); + ATF_REQUIRE_MSG(jid >= 0, "jail_setv: %s", jail_errmsg); + + mount_nullfs("/a", "/b"); + + error = chdir("/b/c"); + ATF_REQUIRE(error == 0); + + error = rename("/a/c", "/c"); + ATF_REQUIRE(error == 0); + + /* Descending to the jail root should be ok. */ + error = chdir(".."); + ATF_REQUIRE(error == 0); + + /* Going beyond the root will trigger an error. */ + error = chdir(".."); + ATF_REQUIRE_ERRNO(ENOENT, error != 0); + fd = open("..", O_RDONLY | O_DIRECTORY); + ATF_REQUIRE_ERRNO(ENOENT, fd < 0); +} +ATF_TC_CLEANUP(jail_root, tc) +{ + struct statfs fs; + fsid_t fsid; + int error, jid; + + error = statfs("./root/b", &fs); + if (error != 0) + err(1, "statfs ./b"); + fsid = fs.f_fsid; + error = statfs("./root", &fs); + if (error != 0) + err(1, "statfs ./root"); + if (fsid.val[0] != fs.f_fsid.val[0] || + fsid.val[1] != fs.f_fsid.val[1]) { + error = unmount("./root/b", 0); + if (error != 0) + err(1, "unmount ./root/b"); + } + + jid = jail_getid("nullfs_jail_root_test"); + if (jid >= 0) { + error = jail_remove(jid); + if (error != 0) + err(1, "jail_remove"); + } +} + +ATF_TP_ADD_TCS(tp) +{ + ATF_TP_ADD_TC(tp, jail_root); + return (atf_no_error()); +} From nobody Wed May 28 16:27:21 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b6vzY2CL4z5wxsq; Wed, 28 May 2025 16:27: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b6vzY1Mfmz3Rvg; Wed, 28 May 2025 16:27:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748449641; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gMBvNGydlttIObnhUn1rhr2a55LMetfsDzKa2zrrHlk=; b=GYCglQ8iFjTvA+HC0kgwfiTJBG+cwdl8Yktk5oW1/rQLkrBJQSxJbemYzdaAi45TtaHKOl 3Do4gJQdHsNiVLGw0LKaCxr4jzfSMGZ/B8EkbJUt4L6XfkTPQQLS5OEyCD4xxBBF9Gn7IK dybhUwsItaDmLcB4kLYa63abNTfPSjQv9ErI1121XbiMtsJXCEKd+fGTXEdc668LBOYFeO M5+BRxiCohw3KRqPref1pEvLFTvqqsUjriR6xsOMWoT1r5PvJYut0CLnlNyDP5AhWIGOw/ ad1I70GGX7GzPC+FqbkbYqw/cudHN4ogxVY8KToETTIiL1csZONl4Ya1ItK3+g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748449641; a=rsa-sha256; cv=none; b=wWbCHiLYHWRZGKDnOFQWt0RifUtCmZF2QF+ktC1tzScVA/7ZxxoFGf6LcK8uXCvda6oZ9j 8/09srW4dCchA4Vy4SdAjLqR3RiTdQCFdkTXfum/N4/I5vHaWS+1KCCA4gq9LHY7/0bD8K ZSc4TO2uMQRCh33bX91FzVONxX7Fgcd1HT7fVKkeFpMh1kJMy6TJI+lnSkqbI6GOYYRDG0 Y+75bDh8zmJiVlE88Crw3IQOdlHPM6V+hlf2UIpitVsvYNiIwi1EMAGHXCm0rwLHSD86Ki 3gZ+C3pm3jhkwd5qE2RA233k9eqRiVVfSl7Ri+r50/s9uTb6hBbOB5756xeiMA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748449641; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gMBvNGydlttIObnhUn1rhr2a55LMetfsDzKa2zrrHlk=; b=yD2Z4tfRjT3QkJollTsnHCE7ZDw3Yt0DCeXyv9nFvEZfSlJuRBljgMpT3OlFFyNc9lpcPs VIfqCK2FfupwbrfpvjpYgwnWnP+5uZXAHWZ9swBu4o3DvKSINvv6H/cOuig2RsMcZjYT4L qDp/f1eiqjGaxWrWpIwpZSA8Pg990qY1wNIbX+CUuSlrmgh4E/snCwfLRWnM7dqM/y4CfS ZUqEP9knfaARVgAJxdB8q57QTs6Dx8SxwtjBIR/x0eu678j9xWfETuRXsm0ZBB71cGuT9b miiGUuk0HeLRGZxiWNE8aFDH3LhINIg5iTTqTHzoONSB7D8O1ZstC3f7nYabsg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b6vzY0yxTzlTq; Wed, 28 May 2025 16:27: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 54SGRLHk037334; Wed, 28 May 2025 16:27:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54SGRL7F037331; Wed, 28 May 2025 16:27:21 GMT (envelope-from git) Date: Wed, 28 May 2025 16:27:21 GMT Message-Id: <202505281627.54SGRL7F037331@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: a0d22d7934c6 - releng/14.3 - libc++: fix compiling with -fmodules List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.3 X-Git-Reftype: branch X-Git-Commit: a0d22d7934c697d8af90f1a7f902e13dcf9b3a60 Auto-Submitted: auto-generated The branch releng/14.3 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=a0d22d7934c697d8af90f1a7f902e13dcf9b3a60 commit a0d22d7934c697d8af90f1a7f902e13dcf9b3a60 Author: Jordan Gordeev AuthorDate: 2025-05-18 19:55:05 +0000 Commit: Dimitry Andric CommitDate: 2025-05-28 16:26:27 +0000 libc++: fix compiling with -fmodules In /usr/include/c++/v1/__locale_dir/locale_base_api.h, xlocale.h is included without first including stdio.h and stdlib.h, which causes functions like strtoll_l() or sscanf_l() to not be declared. When compiling with -fmodules, locale_base_api.h is processed separately due to a declaration in /usr/include/c++/v1/module.modulemap, and this will cause errors due to the above undeclared symbols. Meanwhile, upstream has substantially reorganized this part of libc++'s headers, so apply a minimalistic workaround: specifically when compiling with -fmodules, add includes of stdio.h and stdlib.h. PR: 286342 Approved by: re (cperciva) MFC after: 1 week (cherry picked from commit c809b0184d0a6543bc5327d4252fa56a07ce4689) (cherry picked from commit cab029073dc6cb5814df44556e585b8fdb1c9846) --- .../llvm-project/libcxx/include/__locale_dir/locale_base_api.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/contrib/llvm-project/libcxx/include/__locale_dir/locale_base_api.h b/contrib/llvm-project/libcxx/include/__locale_dir/locale_base_api.h index 8c000c558c52..e43e87375069 100644 --- a/contrib/llvm-project/libcxx/include/__locale_dir/locale_base_api.h +++ b/contrib/llvm-project/libcxx/include/__locale_dir/locale_base_api.h @@ -25,7 +25,13 @@ # include <__locale_dir/locale_base_api/fuchsia.h> #elif defined(__wasi__) || defined(_LIBCPP_HAS_MUSL_LIBC) # include <__locale_dir/locale_base_api/musl.h> -#elif defined(__APPLE__) || defined(__FreeBSD__) +#elif defined(__APPLE__) +# include +#elif defined(__FreeBSD__) +# if __has_feature(modules) +# include +# include +# endif # include #endif From nobody Wed May 28 18:55:19 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b6zGJ0C2Jz5x7H3; Wed, 28 May 2025 18:55: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b6zGH2xRdz3xTH; Wed, 28 May 2025 18:55:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748458519; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zCebpkB0+lHbYHwqJjf2UZY9CrURnoB4ASUGUASvkMY=; b=NkqzjH8WLWqaGVtL49Joi2TQBky9B7BgsV61DoJzhQrhhVTAyeVpkLt4EX/bXz02VndJUe nH0mjZDiFlxukeyghkVvEB4EQd4cJ5kyYxHZj5u7d6f9S+uuiDS/diAo9vWY0/wwTKAMkJ Qvw94CXa2pR/kDQRCiGNAZbDaM1Rhgl34QswAiudZ1060eRlIQKV6hYIZgNRCdkYjUHdZa ySW4L1p4L79KapNLoNhhqtCdA5uI0uXK1s2r+W0t3Z3/v28yeSFGa/JGGWywk9L9MjF01j +T0u6SZJ68X8Zxue+C5eqJHx2zuUxDGorM6f1/JCAaUrA/F+xHiZVLkCr9+82w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748458519; a=rsa-sha256; cv=none; b=Y0LqmnmaWx/wM5TFrms47bh3g68S74GmKwRRKDiCbAlo1Z/LMGwCAtQf95npdQGZU6wWgA ChtB0rcnpXu/Rw6yXMMB1RQpRdOLAyvzW4CmViX/b+W0EZ/jGKq9nMfmrUphrsmKujUNLT JqV8WESgPcOjIYrQjL2mm/2tI55jxJV5cmvcmwo5cqFq38hiC8wna6e4eqp6UuZSkQ22uN 14XnDjfoi+swM3sbtd1Mlul+ZFvA+nhhC5MCNiBCAAovm3pNgxsVuR8i+i0fk9lEUxFNOR /1o78BwD0b2Tx38MoQbP9yHZeLfGr0fQruOO2s94+OxbIVy3SDitFpwdz+LGTw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748458519; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zCebpkB0+lHbYHwqJjf2UZY9CrURnoB4ASUGUASvkMY=; b=j8omOhPrwQqiriUz4Lvg0+6ENMg6TVqFSDTqrYiZCEj/0E7kwoH4KyARh9mm60kVrkFuwI DR/okMw1tisLjddwkLX2yTSTp+L+Hc7jfCGjLQheOxIiz3oFDfOP1opLRLleZxfiqZmZFI rHZsf6DGrOaw57/UfrOz17fU7p1zHdAOwXQGtTVvBS1N6zw9lXdTfR0B2LO9aqm4p080E5 EqSQtUGtMqTI0VykqAfpwcRZw+RWGPY98kLxFMC+Og21QVAx9M48JbatF0H2yyGu4wG8pi lo/cj4t2yMrcBa7lZTyDFEx83YC0acn1yF7nd8Rir9jgGLXpSL10GOChOmXUrA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b6zGH1yTjzqkV; Wed, 28 May 2025 18:55: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 54SItJe9016911; Wed, 28 May 2025 18:55:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54SItJs5016908; Wed, 28 May 2025 18:55:19 GMT (envelope-from git) Date: Wed, 28 May 2025 18:55:19 GMT Message-Id: <202505281855.54SItJs5016908@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Osipov Subject: git: 87c46facc3cf - main - caroot: Update certdata URL for GitHub switch List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: michaelo X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 87c46facc3cf1744c30ecc9f63c10a778a1af104 Auto-Submitted: auto-generated The branch main has been updated by michaelo: URL: https://cgit.FreeBSD.org/src/commit/?id=87c46facc3cf1744c30ecc9f63c10a778a1af104 commit 87c46facc3cf1744c30ecc9f63c10a778a1af104 Author: Michael Osipov AuthorDate: 2025-05-28 15:02:54 +0000 Commit: Michael Osipov CommitDate: 2025-05-28 18:55:11 +0000 caroot: Update certdata URL for GitHub switch Mozilla has migrated its projects' source code to GitHub, update certdata URL along with it. Reference: https://github.com/curl/curl/pull/17321 Reviewed by: jrm (mentor), otis (mentor), kevans MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D50575 --- secure/caroot/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/secure/caroot/Makefile b/secure/caroot/Makefile index cd337a74a75a..ace802a906a3 100644 --- a/secure/caroot/Makefile +++ b/secure/caroot/Makefile @@ -7,7 +7,7 @@ SUBDIR+= untrusted # To be used by secteam@ to update the trusted certificates fetchcerts: .PHONY - fetch --no-sslv3 --no-tlsv1 -o certdata.txt 'https://hg.mozilla.org/projects/nss/raw-file/tip/lib/ckfw/builtins/certdata.txt' + fetch --no-sslv3 --no-tlsv1 -o certdata.txt 'https://raw.githubusercontent.com/mozilla-firefox/firefox/refs/heads/release/security/nss/lib/ckfw/builtins/certdata.txt' cleancerts: .PHONY @${MAKE} -C ${.CURDIR}/trusted ${.TARGET} From nobody Wed May 28 19:43:03 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b70KM43spz5xB3c; Wed, 28 May 2025 19:43: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b70KM2hq3z3XcD; Wed, 28 May 2025 19:43:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748461383; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Uk6HVDGOALYDTekTExU0GDgAChF9m8mT3X0uR0A61EI=; b=eIkxT5qAVA6dtvBkCiwO6Knw6yT1deprp4JXFiQMqWnJdMZ+PneDiNrQnVoM/Kd43bQVtr 1+h9MBiMu7/rraJxWHT0HC9QArPBhl5jD2sPoCREgSsVrAtqs5gCrHhvkCwnQy2hWUb9G1 aJi0kyMnJ10Lvr4JBlxRxZMn+O3xt179F3lNrhqmADIcNqq+PRxrEEcFZm0Q+q6zJ3up/h MgLBnQrDWFQxkuUVwYSx78EWeWhPIFo/urHtojGVlZFkadoEPMbZZKtzqO8CZlkZovM5pi v37W9SkyNCuwd72hfqxOwHUXbXhXwuE2AajSiTNiXkdyTryuhglvKMtZdei3hA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748461383; a=rsa-sha256; cv=none; b=RvwYMyIMZoQtP9UjTTtjqTtukt4hM1KqaLYx22//uCW5nznRNdX2KG5BMcl/IViyozNtNq DIocxByrlA3MqAfH5KJz3O1zB3iqwCbTgocitxxr/FFVLDCSo0FxSHPLAWSxtg1NOb/20I GWjy3IF4Omvl0kvz4R6aeKpJ+o64uQCDPtm2iWwhkGbFfPCj7Ddcdg6463Dhj233I/Ald1 hI28JKmKh/Og6TNx05XyrF5Ev4oyGNINcfJ3SR/BEqzHxx/io31RB0Uwn9CAMFVPiN047F Owa6WlE/KVFdtVUtf+XaprNHFdcBSfJWf7tX6TvkKJQSlX8NFrPESSWWzHijdA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748461383; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Uk6HVDGOALYDTekTExU0GDgAChF9m8mT3X0uR0A61EI=; b=NYdcnoQvzVI2MTS9GF0vs7KaFM0Al39spxZKavspI0ghLstBrfgGAP8AXmCP9gj5Q7Syin i6r1saZYRGzoNTtYF9vHQhY7mjGcEYBK8wiJL6INwzwhyQEmWqasmjpe6uE0yiwKPUOsJ/ Hj9UbMcTM9fZ/p+PTqMAKhwOGDGkYCbRvJ4w/B16X027lY1N0PjXuzUcwI5W14H1y7dzYX TKt2W6R+KpqzyxrEZDMh+6c8OhvW5nJQHYCH45TcMFBUf4QaxFXOLX9tWjkC4L0z96FSAe hqzpKaBbAo5QAWaRkJ+xv39vSQrF665RJm6WKKrlXzXGF5xVCmYMTvF/xBQHVA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b70KM2G0zzrd7; Wed, 28 May 2025 19:43: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 54SJh3mQ009734; Wed, 28 May 2025 19:43:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54SJh3fB009731; Wed, 28 May 2025 19:43:03 GMT (envelope-from git) Date: Wed, 28 May 2025 19:43:03 GMT Message-Id: <202505281943.54SJh3fB009731@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: cba5d7ab32fd - main - atkbd: Fix first keystroke force reset List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: cba5d7ab32fd0b4e9c4312cc967baf137377f812 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=cba5d7ab32fd0b4e9c4312cc967baf137377f812 commit cba5d7ab32fd0b4e9c4312cc967baf137377f812 Author: SHENGYI HUNG AuthorDate: 2025-05-24 02:31:18 +0000 Commit: Ed Maste CommitDate: 2025-05-28 19:42:44 +0000 atkbd: Fix first keystroke force reset Some i8042 falsely return KBD_ACK for ECHO command which cuase the keyboard echo test failed. Without passing echo test, the keyboard is considered as unconfigured. Though it is an incorrect behavior, we still regard it as a correct to prevent the force reset (a step for configure a keyboard) of whole keyboard when the first key interrupt reached. Co-Authored-By: Aymeric Wibo Reviewed By: wulf, obiwac, emaste Sponsored By: FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D50498 --- sys/dev/atkbdc/atkbd.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/sys/dev/atkbdc/atkbd.c b/sys/dev/atkbdc/atkbd.c index 403afcd6c2e2..e046b59803b0 100644 --- a/sys/dev/atkbdc/atkbd.c +++ b/sys/dev/atkbdc/atkbd.c @@ -1249,6 +1249,7 @@ setup_kbd_port(KBDC kbdc, int port, int intr) static int get_kbd_echo(KBDC kbdc) { + int data; /* enable the keyboard port, but disable the keyboard intr. */ if (setup_kbd_port(kbdc, TRUE, FALSE)) /* CONTROLLER ERROR: there is very little we can do... */ @@ -1256,7 +1257,18 @@ get_kbd_echo(KBDC kbdc) /* see if something is present */ write_kbd_command(kbdc, KBDC_ECHO); - if (read_kbd_data(kbdc) != KBD_ECHO) { + data = read_kbd_data(kbdc); + + /* + * Some i8042 falsely return KBD_ACK for ECHO comamnd. + * Thought it is not a correct behavior for AT keyboard, we accept + * and consume it to prevent resetting the whole keyboard after the + * first interrupt. + */ + if (data == KBD_ACK) + data = read_kbd_data(kbdc); + + if (data != KBD_ECHO) { empty_both_buffers(kbdc, 10); test_controller(kbdc); test_kbd_port(kbdc); From nobody Wed May 28 20:28:07 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b71KM3zrcz5xD8k; Wed, 28 May 2025 20:28: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b71KM3Ct9z44tG; Wed, 28 May 2025 20:28:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748464087; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0CIsSuePsK11G42XmiR9Zl9/52Pk+g3mXNDjfol1wJY=; b=PsZv8bWrsG//ARG44pvs/yf0cBhl+AU+5Ucrts9Plq4+GnaXQS2584UPCugfHGWZi0jY4K nlovGJqCIKZItGoQPkCDPVx2Y3dGDT8MrkqmmdI9CRzwfupeBiuk5tTCkwYPkgL7UiMwQ8 1lys7FrYZJJP2VixxQElZOwxRtFl+4Y6nn5MPeY3ESYfS052ivwLn7F5UpLhe6aydYWIIB abYuJZWZgUoI4DLs/Z3rsvAd718NcwELC+o3KxK1MN38haUI3sXOeQSPe/4VVvcZnT/onf Kv6xiX2RuluYySSzzd0Y7gG036HFP9iHDsHuj9KMmlOIiZF1+np5JhDcy2ZhcA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748464087; a=rsa-sha256; cv=none; b=M0pxbl6WMhqvVUoBk5uKhfpA/Tl9E62d+xfM8O6BxM8jjX6SU8a0cOMWKQU6HgIiojwErG KV256+qWH8+rBe/+WlsmoMsUNKgWZH/rqeymgPdXOdCEVbsEdJrlTi4pmC/JjxtSkdLNW0 RWG8GIdzBZqbVcSNZtUCVuua1fIHwqTGz/hHQLLchCYOfF4ThkOJwYXr1B5G4nk000vO1t RV8MgwurIo/tujiDuxPIQy/EKV52HoyVLecceUbw+rS/vVy15BIkFaydfDdTMoO0G12UPS j+nDNpl4ARyJjcAdRfHaX+QBegc3o90csHBPNitzB75iFHp7il+2PL+jF7/pqg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748464087; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0CIsSuePsK11G42XmiR9Zl9/52Pk+g3mXNDjfol1wJY=; b=MfvONxcyim5CU4hfljrV/ZXa7SAxkYjRhl1iM8EWGiaIFkF+uy6BnZjkNzxxvo0i99jsdl 0/XUxUIZbmKhE2/kSUEnjNj3YFWvBxjb9UA2SyRI1jAJNRwRK4bRsEmLBgbwO+XIxmOPr/ 5yhk1RpSwR16Y8hCZVSAn824ojUSRLoCz+WKLmeJn/Tvl4tFpLRV9bSHZB2XRde1eJOHx0 GMrT4ccGdkdrEwy45JhZh8xJI/fNkHFLrgfwNRw9GbwpBTH2fiJoMIkj/eWw34nX1SJuYW MSpjiI7Psb06WO4hnVfu5r/sOpNuP9ZzhZknaEisFX6JDUKmBiD4iMWvvMQYEQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b71KM2qXHzsZc; Wed, 28 May 2025 20:28: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 54SKS7wU087174; Wed, 28 May 2025 20:28:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54SKS7FY087171; Wed, 28 May 2025 20:28:07 GMT (envelope-from git) Date: Wed, 28 May 2025 20:28:07 GMT Message-Id: <202505282028.54SKS7FY087171@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 03801d449a37 - main - rtld-elf/riscv: Don't allocate static TLS for dynamic TLS relocations List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 03801d449a3731cb643a51625c8c4d5d07b2e54c Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=03801d449a3731cb643a51625c8c4d5d07b2e54c commit 03801d449a3731cb643a51625c8c4d5d07b2e54c Author: Jessica Clarke AuthorDate: 2025-05-28 20:22:15 +0000 Commit: Jessica Clarke CommitDate: 2025-05-28 20:22:15 +0000 rtld-elf/riscv: Don't allocate static TLS for dynamic TLS relocations Provided you don't run out of extra static TLS space this should work, but it's wholly unnecessary and not how things are supposed to be done. Only static TLS relocations should allocate static TLS. Reviewed by: kib Fixes: 4b1859c0e943 ("Add support for RISC-V architecture.") MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D50563 --- libexec/rtld-elf/riscv/reloc.c | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/libexec/rtld-elf/riscv/reloc.c b/libexec/rtld-elf/riscv/reloc.c index 4b61c4b9a061..cfa474aa93b7 100644 --- a/libexec/rtld-elf/riscv/reloc.c +++ b/libexec/rtld-elf/riscv/reloc.c @@ -404,23 +404,6 @@ reloc_non_plt(Obj_Entry *obj, Obj_Entry *obj_rtld, int flags, lockstate); if (def == NULL) return (-1); - /* - * We lazily allocate offsets for static TLS as we - * see the first relocation that references the - * TLS block. This allows us to support (small - * amounts of) static TLS in dynamically loaded - * modules. If we run out of space, we generate an - * error. - */ - if (!defobj->tls_static) { - if (!allocate_tls_offset( - __DECONST(Obj_Entry *, defobj))) { - _rtld_error( - "%s: No space available for static " - "Thread Local Storage", obj->path); - return (-1); - } - } *where += (Elf_Addr)(def->st_value + rela->r_addend - TLS_DTV_OFFSET); From nobody Wed May 28 20:28:08 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b71KN67Mlz5xCmj; Wed, 28 May 2025 20:28: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b71KN4LJtz44lV; Wed, 28 May 2025 20:28:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748464088; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fVEx0xJ9uAyGleTBYfxcVjoQSit9hGosAo46yP91Ilc=; b=fzHMbiFTu1cFbasd8Sg8Ot1fmofYpL5XuAfMKYc0H72/9mtGCvZVX+7G2bkHnaFEkcw+1r Z6F0gvsspPwfJybZuBJk14Y4gygbRfjuJpUepDH8Tn/P7sx2+z1F1H/HHLE066gONXg1vI ZU6jREgs8Gn4I5snLdFNgHDbaMHc3lFPbxS2JrA+Nj2l4pB5yzF+dIrgPYU/K70RjXUWyk n88IuUFTJmSXKR1A7pi7sa+iIbDjTJr6vVkYYF4kJtpwgdPx0qLlqIl1HohHJlAFC6WiRt MEC8bBhHNVzv0coQTyGQMi3wb6taZVg3Vt3th8xoFGwlUbw/Mo+7vGxa4neWew== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748464088; a=rsa-sha256; cv=none; b=DDzHSHQtDCRzAB94u9WpDYYp375vjpZX4okBKLXwaobrqiG8DgcSngHRnW9AdIPK/bSqOZ AfO/0eJQphGcci63mSrEI90cy3jWetmmwbZ9ssmM1pzthzfFwL9out+wYeB8ySTzvWCyPK BhgmC5QSMQPz+EmOxNQCR8Y4WeHWHaX4GhkB3ji5++z0t7ZQPi+5dFnSctDoGu8xEG97mh FlfKhalnBLk5e0+iuQPhtkSWjQimas4tdlJGFF8y3lDoqJn50p0lObgWkH3ZOR3EMo8NQw Xb4HvppkBSkWUL+di+HLV1LoMWuwkkNCSyth9xMVdHJDT/y0ytvevWmX3ECfAg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748464088; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fVEx0xJ9uAyGleTBYfxcVjoQSit9hGosAo46yP91Ilc=; b=E4xZdwr6WKdTj9XsEKlbQPEbvAmNafJO/Z/48JsgGbuuN/mzYcg8sU3WZEekIrjt+uebAQ CNlo3/4PJxw9vDHuvzycEjJ8n/myBBMHEhXHyrd2iiiKe6bQ4mHol1u4Jv6bgwu6/ZH9Xl mOGZrTM7xvw67UIqmN0E5+5Dzmhk12mvLsl1RpegdXFxZg7mzzumhV4p3KUjnR0Vtjg7b6 J7FYQqYLOtA5HUBwUhjc4wY9/Nb/dRBC0HnJcKZBaFXnmisFufkChmJUyHVCeoGsYZBqnT 4lCuCHF1OKyD/9QTg2++EwaIZIRKxkcyw9QcBngmOzijQ0j+9cONtverTVdR+A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b71KN3p2jzsw5; Wed, 28 May 2025 20:28: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 54SKS8gg087209; Wed, 28 May 2025 20:28:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54SKS88t087206; Wed, 28 May 2025 20:28:08 GMT (envelope-from git) Date: Wed, 28 May 2025 20:28:08 GMT Message-Id: <202505282028.54SKS88t087206@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 0e3dbc64d9f6 - main - libc/riscv: Fix initial exec TLS mode for dynamically loaded shared objects List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0e3dbc64d9f6c95cbb16dba60a32136ae116dada Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=0e3dbc64d9f6c95cbb16dba60a32136ae116dada commit 0e3dbc64d9f6c95cbb16dba60a32136ae116dada Author: Jessica Clarke AuthorDate: 2025-05-28 20:23:10 +0000 Commit: Jessica Clarke CommitDate: 2025-05-28 20:23:10 +0000 libc/riscv: Fix initial exec TLS mode for dynamically loaded shared objects The offset here is relative to the TCB, not whatever the thread pointer points to, so as with powerpc and powerpc64 we need to account for that. However, rather than using hard-coded offsets as they did, due to predating machine/tls.h, we can just re-use _tcb_get(). Note that if libthr is used, and its initialiser has been called, it will take a different path that uses _get_static_tls_base, which works just fine on riscv (adding the offset to thr->tcb). This only affects programs that aren't linked against libthr (or that are but manage to dlopen before the initialiser is called, if that's even possible). In future this code should be made MI by just reusing _tcb_get() and checking the TLS variant (since the offset here is positive even for variant II, where it should be subtracted), but this is a targeted fix that makes it clear what's changing. Reviewed by: kib Fixes: 5d00c5a6571c ("Fix initial exec TLS mode for dynamically loaded shared objects.") MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D50564 --- lib/libc/riscv/static_tls.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/libc/riscv/static_tls.h b/lib/libc/riscv/static_tls.h index ce9fa23338a6..40e9abd685e3 100644 --- a/lib/libc/riscv/static_tls.h +++ b/lib/libc/riscv/static_tls.h @@ -31,12 +31,14 @@ #ifndef _LIBC_RISCV_STATIC_TLS_H #define _LIBC_RISCV_STATIC_TLS_H +#include + static __inline uintptr_t _libc_get_static_tls_base(size_t offset) { uintptr_t tlsbase; - __asm __volatile("mv %0, tp" : "=r"(tlsbase)); + tlsbase = (uintptr_t)_tcb_get(); tlsbase += offset; return (tlsbase); } From nobody Wed May 28 20:28:09 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b71KQ1Rgdz5xCyt; Wed, 28 May 2025 20:28: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b71KP5fj9z44g2; Wed, 28 May 2025 20:28:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748464089; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Bd5kVBrbLj/o7pIH9BLz/yL68ohI1aSnK6ZQCmoSiXw=; b=hzXskFbeAjiHj72K62woishCanjEy3aNPkrNmct995Wd7zq6F4OuKMsHrihXrmsBwRYX1P ao0+sJfxxIclKFMGnI4AX4WJXiDDc0L/54VbCo8qdUh4Bb/JRjPhsZYqA3WDmoVK70+Y5V 6GuFCmKJNUPgYYNdh36NP64wTQqkTns/O50SJAKwR+nAuLH0Fy3bjqPHWzad5RymuSKfsM jYbfykxH0ZcRML0YxhtRXfGy+eD3pk8fZgeoomBAu94Pj01BOp09cV1o+tvx6SqDXyioXX MetQ6dPS6c7jiqGbiG448bY9Tg9nn+wtHLoWnGKv+Xotar+jgJu6IiVcFe4/Cw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748464089; a=rsa-sha256; cv=none; b=HXlgTOU7s4EW1DNPPSVSFfP5yA64jNeVok2fQL4gMMzT2gckR+bXRO2d/6HtLHW383pNl3 jGCRnFBBQBg4XhdJaicFWW33QnJGgRCLrWLiCyKQU1/NHpZ9DlVBPt3LbV9pGYvOp/d/r2 BbOG8N7s08wJtS2KkS12aA8nD5gg7Q5XMTTO3s2CeTf8oMZwV/zk084598rn7eQHfe5B2f 2AkRjyRtyz9Wpg8BHMGe8K7nkwmkNeI2/wBptgwUtFdAcpyZrcdMCrkcFHC1Ype13nxVSB hWBbLAO38oWS8AWBMdS8UdsAulY/W+NnENjiJ8QZO5N3Pm0yjXqSubO+1QCrBw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748464089; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Bd5kVBrbLj/o7pIH9BLz/yL68ohI1aSnK6ZQCmoSiXw=; b=SyPVh6zhSGW3sFv+TBcGm+1JnlaxK8G7g2S6qGTBou9WIyVpzfEssmohHQOxqmGd4H7//5 f50H/hhnx7Cjm017Fve1QtvHNhhhWR1QFmICjNfCD2wtwdIpVI7qyvwBchzYeR2yqzwZqZ JHJLxlDGFyBC7GX4CUZesxuqxtwdcsSFRyf4VRmZd5npEDkhJmefaAdY5vGfU/WyTUWa3N UIrw6WUf5mEDzqJM7Qv20cvqzoeIEiZQ0NyTvTKjXFFt2rl616ohTdqNde4hYjVhUekHOl M60aUeEJP5Np9h6nJrJBazsxMAEx1qKHiQN7i+1eYSJEx0xwKyAmW+EUBehpBA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b71KP4kz7zrjF; Wed, 28 May 2025 20:28: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 54SKS9Fv087241; Wed, 28 May 2025 20:28:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54SKS9sY087238; Wed, 28 May 2025 20:28:09 GMT (envelope-from git) Date: Wed, 28 May 2025 20:28:09 GMT Message-Id: <202505282028.54SKS9sY087238@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: ccfb1c50e45d - main - Revert "rtld: fix allocate_module_tls() variant I fallback to static allocation" List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ccfb1c50e45dbb7fcadf7e1932f63cf1702ef13a Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=ccfb1c50e45dbb7fcadf7e1932f63cf1702ef13a commit ccfb1c50e45dbb7fcadf7e1932f63cf1702ef13a Author: Jessica Clarke AuthorDate: 2025-05-28 20:24:52 +0000 Commit: Jessica Clarke CommitDate: 2025-05-28 20:24:52 +0000 Revert "rtld: fix allocate_module_tls() variant I fallback to static allocation" This was applying a NetBSD fix to FreeBSD. However, the original code was correct for FreeBSD. NetBSD's obj->tlsoffset is relative to the end of the TCB, not the TCB itself, whilst ours is relative to the TCB[1] itself. For example, our allocate_tls uses (char *)tcb + obj->tlsoffset for the memcpy and memset calls. Without this reverted, for dynamically loaded shared objects, Initial Exec accesses to TLS variables on variant I architectures (non-x86) use the correct address, whilst General Dynamic and dlsym(3) use the incorrect address (TLS_TCB_SIZE past the start). Note that, on arm64, LLVM only supports TLSDESC (including LLD) and TLSDESC will use the static resolver if the variable ends up allocated to the static TLS block, even in the presence of dlopen(3), so only dlsym(3) shows the discrepancy there. Whilst here, add a comment to explain this difference to try and avoid the same mistake being made in future. [1] In the case of variant II, it's the amount to subtract, so still positive This reverts commit e9a38ed2fa61fd264a80f24ceb35f39b0ac6463d. Reviewed by: kib (prior version) Fixes: e9a38ed2fa61 ("rtld: fix allocate_module_tls() variant I fallback to static allocation") MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D50565 --- libexec/rtld-elf/rtld.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index 8ef6301fab36..3ba6f4bb5bbe 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -5434,6 +5434,9 @@ get_tls_block_ptr(void *tcb, size_t tcbsize) * it is based on tls_last_offset, and TLS offsets here are really TCB * offsets, whereas libc's tls_static_space is just the executable's static * TLS segment. + * + * NB: This differs from NetBSD's ld.elf_so, where TLS offsets are relative to + * the end of the TCB. */ void * allocate_tls(Obj_Entry *objs, void *oldtcb, size_t tcbsize, size_t tcbalign) @@ -5683,7 +5686,7 @@ allocate_module_tls(int index) if (obj->tls_static) { #ifdef TLS_VARIANT_I - p = (char *)_tcb_get() + obj->tlsoffset + TLS_TCB_SIZE; + p = (char *)_tcb_get() + obj->tlsoffset; #else p = (char *)_tcb_get() - obj->tlsoffset; #endif From nobody Wed May 28 20:53:30 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b71tf2J1kz5xFYh for ; Wed, 28 May 2025 20: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b71tf1rr9z3DLZ; Wed, 28 May 2025 20: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=1748465610; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Mi+3BD3VAo2Kf2dIHVO4rSZRwI7+nKo93eSn6kkhYv4=; b=h9x1nHbvj963fFf39lu/Lcwr1tLpBvKiwURbauR9NI0WQvszvFkMnFVcnTpRPW5OV3U3DR onv9EZGSCNKeHp/NT0O18tsVNz0Jq4ZHBruNjhVtanFxqH5E2QuL7EZN6TaVjdbbOkCYFa 7BBL2ADDxyp1xeUSgJ12UVaCVcIaWmywLX/OEx0z1ZJaqCm5/aufuJpZIrZfp5OjBNDauQ Ot1tFrWOAhvkB1eTWlI2n2Tom7CMs7AfnkTm0AC/MlQX2m9L0fYbVOcrILdmZP4qIi/ZIY fzdIr17rmLavI0MCgAlgyRKi3cqPJZOPcyyhBtSeLlQ4v6q0ScGLtuqzHCLbCQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748465610; a=rsa-sha256; cv=none; b=yi/7bmsv6GpG29C2YvBkrAMHbkz9YylSCC3aBirs3y2D/+2fJHwnl2fitu+7Yaf7q/y9SS ChqtvqY7PqeB0QDn0/4hN/p0ZgrTMhmF7olAwoLD7e/0j15rUGi2m/uFAcCK83zevUUQYv VfuuMX29z2KBsBxWvzs0HIHga3WwC6gEhcy1pu4PbOR1nxczekFiotoe+Bc2FW/9oaU5up IyZ2kUAcRWeNeZpkY9PeGUFCMiESh+u0azPhzss6Lv4KOYHXXRLTde0krVoBpDQwiVTMZ9 9iU1YF/ZEcjTTq/KQmDNNNFGJeGd/z0b6H7n4Ku3IH4ZcfLBKe+zQkjNLNdrEg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748465610; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Mi+3BD3VAo2Kf2dIHVO4rSZRwI7+nKo93eSn6kkhYv4=; b=SeQviL6majeU7vtlYi6VIFpTsEUpEIcxbXBKshJ4pj+jsCAf5Mua2bhB6lBxucSTOPe6H4 7KCkbgSbwzDUjjg1YpCTkaoq82B3V2QkCRNbDsM91FaAQraYGTFy+Uo2EbUzp3ekhtG3zU hA23aNEOg9PiAeXdmE2CrgnE1PJSq5aP+cb5OI4+2wRW6zBpMzHu7NOjdjJ1wnYyO9Htny IsFCjlJ+UNhNMOi3vgMFNlI/Wn8yNlQZXIS4Ses7Pzfdl0dWj8zRZm9xT3veSwPeeCJmgO zab3KbHNqzE98lMJXJICSaP5wE824BpJBbspiCbGJgLv5cbopkJkwV9/vobSHw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b71tf11zKztVJ; Wed, 28 May 2025 20: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 54SKrUf6041425; Wed, 28 May 2025 20: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 54SKrUig041424; Wed, 28 May 2025 20:53:30 GMT (envelope-from git) Date: Wed, 28 May 2025 20:53:30 GMT Message-Id: <202505282053.54SKrUig041424@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Cy Schubert Subject: git: 24f0b4ca2d56 - vendor/pam-krb5 - vendor branch created List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/vendor/pam-krb5 X-Git-Reftype: branch X-Git-Commit: 24f0b4ca2d565cdbb4fe7839ff28320706bf2386 X-Git-Oldrev: 0000000000000000000000000000000000000000 X-Git-Newrev: 24f0b4ca2d565cdbb4fe7839ff28320706bf2386 Auto-Submitted: auto-generated The branch vendor/pam-krb5 has been created by cy: URL: https://cgit.FreeBSD.org/src/log/?id=24f0b4ca2d56 24f0b4ca2d56 pam-krb5: Import/add pam-krb5 from eyeire.org From nobody Wed May 28 20:53:30 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b71tf66pBz5xFRq for ; Wed, 28 May 2025 20: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b71tf283vz3DP3; Wed, 28 May 2025 20: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=1748465610; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=27ui6U7cRC8PENTw7kaxu8k/ljyputKV7VSn2aLkiRI=; b=kP8ZqbnWT//Wa3aBkJ6MA5juXxE2S/BpPBGevJLl0K26I5VyGL6Q4SvjzM0J7JEXrf/PXp 9+T9/yTFdiR3GkKAkKRi9F0gRn5LCq+cu6ci37Ve2CgsxPc04Or1LBYVwegAHKp+uK4mgs eKN2vmDUBJSqKsYDCk4AGuVkcboTxjtF7mPT+BTop5p8ExU7vFTn6M0faL8ZNVDMP4MWBq MS63DB5BaxZ+FIUgiAUJuAvaKoXman43KaBJ92Xd3Rk0fgU04zDogzKzPXvstuxRP1vRv3 SAeCZ29HMdeMvHzhS0YD1+/kHoO/C54EemqYBFXbzw12aJSVZTjKEN7ZJ3EWIA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748465610; a=rsa-sha256; cv=none; b=dLq8FRjezyrbWGL+vyhmbkKAlEcCZM83edNDlL277HcinqnU9GitvK9XDQU61CnLJ3ouRG iL1zhVqABm3A2G8cesxruilz93QO/Jo3QTuGj4djKPIXLEcLVpnGKVmwRDPObN2pFMhbuK yOeHXi9v8/VIkadL0LOumLOIl7fhkCEokauLtaTuttTQ/++k9D3TupkCzoKhpo7VhtCddu 9cLfNx4lbK12OQ7Agt0QHUOmAxxTK7Y7JalyuCdR7aj89+CuNqoLwFrortfJHWL61v7ZK/ bfxPETE7hZSmyJKmmlnx+Xm4hduFJJO4qehXNRoeMk0Skm0ASvtgaAODZ7fnEA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748465610; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=27ui6U7cRC8PENTw7kaxu8k/ljyputKV7VSn2aLkiRI=; b=MybIy0nFjPKCBNEjmKg1Il89T5FJU6ebQFp6Yi4SfzEZKUPJVVkbcLVOLGEJZppsr4gYpU 6zXXkkrYUbLm663FBfPlMTfU+q6R/0Kdb2Q9OtAnSV7gpuZbbbfvxos4O/IWQ1ZO9jh64H P0F2QQIqZw8tSkn1gzZ7qq09JzUqnED1LPG9VIlv5N5JE4dPm0/p6/y+YHDZ79+iXBN6zU aW2LMVQY9v8lFtfoUh1pNuP2ySuEbPOUupuggn+sOTwlrU4rigy0wAsouDujZZZMcMpL53 P12qTFrLa2VH7lKHetmtCftAq8ZQj8WsqXi4EsnaCALzJ5LNul2IutiJoQPkuw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b71tf1VWbzt0J; Wed, 28 May 2025 20: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 54SKrU9I041445; Wed, 28 May 2025 20: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 54SKrUv9041444; Wed, 28 May 2025 20:53:30 GMT (envelope-from git) Date: Wed, 28 May 2025 20:53:30 GMT Message-Id: <202505282053.54SKrUv9041444@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Cy Schubert Subject: git: c97352eec0dd - Create tag vendor/pam-krb5/4.11 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/tags/vendor/pam-krb5/4.11 X-Git-Reftype: annotated tag X-Git-Commit: c97352eec0dd479c2718f447c871d5c53437662d Auto-Submitted: auto-generated The annotated tag vendor/pam-krb5/4.11 has been created by cy: URL: https://cgit.FreeBSD.org/src/tag/?h=vendor/pam-krb5/4.11 tag vendor/pam-krb5/4.11 Tagger: Cy Schubert TaggerDate: 2025-05-28 20:51:05 +0000 pam-krb5: Tag 4.11 commit 24f0b4ca2d565cdbb4fe7839ff28320706bf2386 Author: Cy Schubert AuthorDate: 2025-04-17 02:13:41 +0000 Commit: Cy Schubert CommitDate: 2025-05-27 16:20:06 +0000 pam-krb5: Import/add pam-krb5 from eyeire.org From https://www.eyrie.org/~eagle/software/pam-krb5/: pam-krb5 provides a Kerberos PAM module that supports authentication, user ticket cache handling, simple authorization (via .k5login or checking Kerberos principals against local usernames), and password changing. It can be configured through either options in the PAM configuration itself or through entries in the system krb5.conf file, and it tries to work around PAM implementation flaws in commonly-used PAM-enabled applications such as OpenSSH and xdm. It supports both PKINIT and FAST to the extent that the underlying Kerberos libraries support these features. The reason for this import is to provide an MIT KRB5 compatible pam_krb5 PAM module. The existing pam_krb5 in FreeBS only works with Heimdal. Sponsored by: The FreeBSD Foundation From nobody Wed May 28 21:02:36 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b72590jScz5xG1X; Wed, 28 May 2025 21:02: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b72585TN7z3Kjr; Wed, 28 May 2025 21:02:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748466156; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=g/Q/NIOfvlC/fmzhRQaIYeXACHOI6Hl/cDgfIowQxPA=; b=Y//uL7ShcMxbrDfdXUZKT/+vIqOX2XpYFVeKLl0HFaTOlZq+Z74qPNxIa+noGTfoaXkZ28 Oy5Pq3vOOCZ2LVwjWwt3BW5gPm53tpnZJttOlNXBiA0bI8850DH3i8xjOwN9ciVeGzt2t/ w86vjw5KQO00K6UsDhyw461Ticgj2U1HhsmIUMdR6U6Jh97ZbOp4yPj+/l5vqYJ94bkrJb vSJ0lKBX7SygjNZrAn9drwC1aLxCNjwORDi7PRK52IRmxO8RDv/Bk6v/PIQ0F5UXQ9xO6/ Rm97C/iX7zWHTXTe4bbQ7FgPGzynbIBS19HeArHJuhZmkP1Pcridx/WmuaGrhQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748466156; a=rsa-sha256; cv=none; b=vsl0oWm+rXxC98m7Uc2SZh0GgLb+LcM0DxUHHUDLSbF+efT2OKawM6Fw2pwTUW9OEyHJLp CTDTbWViKa4nxM1WKZyFr7sSM1YBGIRfcGVytSCodMQ29nQ4HIuJdAVBFiHCIUhUuxeimp 3rjzwjJfDb+clEssEbUKQpv8UAaz3IkaFkVzCh8Fd+Sn3fmiHVlAFHNvlFFhB7d4JJ6AZC blPrH6ZAkO99FWl3eitfLn+Osd51QYZUg6XjtTlGy9DFimtyeIU+1T9nZXJyusVpJDiT47 uyJKJ+/c0B/wGJjI1LBH22U1GjCuvun2Ut8OAsnZOeGTyH+b3YysiLli1Rw9dQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748466156; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=g/Q/NIOfvlC/fmzhRQaIYeXACHOI6Hl/cDgfIowQxPA=; b=PJyF8QEfAOYM91+T4KfCSSh4Ux7kupV/DheCZ2oB5+V571rZtJFK8GRYrpI7ZTMr68JRKg c3SYrcDL1z4rVhVcMid1bReInRjUsBUyy9J5TlYe1cXhCIbd9pQU3sVYeupC4LXcxfXm6x rAtjGzUGSpubDpUcXt4K6H8u/nY/RcrYvSx12f5JUtLPUF7lfxGKvKe1Z0bKxrI6hgxMS2 xaRB40x3btgrAeVroT9j1GcYpeilcSuqh4LxAeO8gIH73hsJThAonBnwvPRXG82ImYbrtn +lR74HC5BROjvBUB1E51UBG3TJzAf8tTBOM9DWdT999t//1weu7x6VeUWsl3+A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b72584wZvztW3; Wed, 28 May 2025 21:02: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 54SL2adm060931; Wed, 28 May 2025 21:02:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54SL2akY060928; Wed, 28 May 2025 21:02:36 GMT (envelope-from git) Date: Wed, 28 May 2025 21:02:36 GMT Message-Id: <202505282102.54SL2akY060928@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: 1c7f8214e92e - main - scc.4: Improve acronyms + tag SPDX List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 1c7f8214e92e40907bf8faf8d43c9db0f98294a6 Auto-Submitted: auto-generated The branch main has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=1c7f8214e92e40907bf8faf8d43c9db0f98294a6 commit 1c7f8214e92e40907bf8faf8d43c9db0f98294a6 Author: Alexander Ziaee AuthorDate: 2025-05-26 06:43:17 +0000 Commit: Alexander Ziaee CommitDate: 2025-05-28 20:42:33 +0000 scc.4: Improve acronyms + tag SPDX + tag spdx + remove duplicated acronym in manual title, reword for consistency + expand acronym in HARDWARE for HW Relnotes MFC after: 3 days Reviewed by: mhorne Approved by: mhorne (mentor) Differential Revision: https://reviews.freebsd.org/D50528 --- share/man/man4/scc.4 | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/share/man/man4/scc.4 b/share/man/man4/scc.4 index 05e9890a0bcc..db0c6deaf6bd 100644 --- a/share/man/man4/scc.4 +++ b/share/man/man4/scc.4 @@ -1,4 +1,6 @@ .\" +.\" SPDX-License-Identifier: BSD-2-Clause +.\" .\" Copyright (c) 2006 Marcel Moolenaar .\" All rights reserved. .\" @@ -23,13 +25,13 @@ .\" (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 December 26, 2020 +.Dd May 26, 2025 .Dt SCC 4 .Os .\" .Sh NAME .Nm scc -.Nd driver for Serial Communications Controllers (SCC) devices +.Nd Serial Communications Controller driver .\" .Sh SYNOPSIS .Cd "device scc" @@ -48,7 +50,7 @@ take care of the details of the communication itself. .Sh HARDWARE The .Nm -driver supports the following classes of SCCs: +driver supports the following classes of Serial Communications Controllers: .Pp .Bl -bullet -compact .It From nobody Wed May 28 21:02:37 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b725B2C03z5xFwr; Wed, 28 May 2025 21:02: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b72596SVHz3Ks3; Wed, 28 May 2025 21:02:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748466157; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+t1+MwgV0coat/inYLD2ggVwE+TfLkcFEd0Pg6f8szM=; b=OBCwm9VKX3G37QK/qtCSJaR4PrVD6LcyBWCPnCtsA5A0ibUfwVqVSKLcG+mEICMRV1+TNU E3iyc7MPxVoRzOSswu1I16SNFhn2yr+PKEoe0YcarkZnlI/5brVbm4qQjtdPPvjsAKLXKx ByR+jka7kkpQmcTNAhLLIZtMNmHcOyCz/JKcWzfJfqI/sdCoRP+7TmyNthsnZklOvdvrG9 0IdQsdrsdyiEoOZ8hMhU0axtCqh20MWOAnbBq9eUzMWwEarTCYB7CE3kMK88PAIu+sE0jq e+RMk4nHpG/YnLUcLeS2qL+11lVGnifLhWJlV5aQ+LkxBNEBwvHYULM4TV3Ygw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748466157; a=rsa-sha256; cv=none; b=qTvfWfvrfWG69s4ctVdWOQEQBkb6CmcHTBZj5SU0/AbKdUtnHZSy78Px1/3/Q6T1u8Gq6R tNr2zjqZvORDq5CK0D0mKxOCgyuPl5wie0IbLQatL6djbwUB9pAlieRoc16xTszO9cxeQ0 WckVdfm/ZMZZnA8PqJ8TakVICxdLR+RTxS+GecTYupIZivHcrRPy22lQPUduzLN85M+VO5 LSVueiQbreHsqfcj3Zk8/z0xmY12+eKFA2TzYdgsRhg29j3ut35f79DxvxZi5OK+T1+pTA g5pbZm2L9hCk0ZBxkaiX6MTiLEegIqf8xz8M2dNA2vTVVUQ3+z64Naqv40irAA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748466157; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+t1+MwgV0coat/inYLD2ggVwE+TfLkcFEd0Pg6f8szM=; b=uqi6Pk24prnQ0m20NXKk521c37C8XeVJlBBZez/jJdWjmotnn8PWv4e1E9oh/Uz5z8s/8Q QEg6KQVxLQ4dRKbhruF60UZZfbS5Qcz3W8JyJr2aUsOy2n0kJ/PkctZ11Jz15PYrWUAFyb koR1Ci2vMZub5RyDVMjjl2P2tBA4TDZ/Dd4QakQ0HPktFaHVUME/LUcxWfgVkMTYRk7BwA ahUSqwn2AsDtWXzImAk1Q/EgPkKd59X5MvdasdBAelrbRUQYQUwqaDlckqO07zeRu5jyB/ WMDngUVLFobyABrGL6cVdJpwMTo0fpTQXR3CoWqrHrk5MHA16X6T6REAkTSBbQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b72595v2zztHS; Wed, 28 May 2025 21:02: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 54SL2b2R060972; Wed, 28 May 2025 21:02:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54SL2bJ3060969; Wed, 28 May 2025 21:02:37 GMT (envelope-from git) Date: Wed, 28 May 2025 21:02:37 GMT Message-Id: <202505282102.54SL2bJ3060969@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: 616bb0b23083 - main - pam_xdg.8: Improve usage and standards List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 616bb0b230835e8b88d032e2026854ad031afea2 Auto-Submitted: auto-generated The branch main has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=616bb0b230835e8b88d032e2026854ad031afea2 commit 616bb0b230835e8b88d032e2026854ad031afea2 Author: Alexander Ziaee AuthorDate: 2025-05-28 20:43:03 +0000 Commit: Alexander Ziaee CommitDate: 2025-05-28 20:43:16 +0000 pam_xdg.8: Improve usage and standards Explain the directory created by this module, its usage, and a bit more about the standard. MFC after: 3 days Reviewed by: mhorne, manu Approved by: mhorne (mentor) Differential Revision: https://reviews.freebsd.org/D50440 --- lib/libpam/modules/pam_xdg/pam_xdg.8 | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/lib/libpam/modules/pam_xdg/pam_xdg.8 b/lib/libpam/modules/pam_xdg/pam_xdg.8 index 9b97d3626531..9b335751a9fb 100644 --- a/lib/libpam/modules/pam_xdg/pam_xdg.8 +++ b/lib/libpam/modules/pam_xdg/pam_xdg.8 @@ -22,7 +22,7 @@ .\" * 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 August 22, 2024 +.Dd May 20, 2025 .Dt PAM_XDG 8 .Os .Sh NAME @@ -35,17 +35,26 @@ .Pa pam_xdg .Op Ar arguments .Sh DESCRIPTION -The xdg service module for PAM sets up the runtime directory according -to the XDG specifications. +The xdg service module for PAM creates the runtime files base directory +according to the Cross Desktop Group Base Directory Specification. .Pp By default the directory is created under -.Pa /var/run/xdg/ . +.Pa /var/run/xdg/ Ns $ Ns Ev USER . .Pp The following option may be passed to the authentication module: -.Bl -tag -width ".Cm runtime_dir_prefix" +.Bl -tag -width "runtime_dir_prefix=directory" .It Cm runtime_dir_prefix Ns = Ns Ar directory Use an alternate base directory .El +.Sh ENVIRONMENT +.Bl -tag -width indent +.It Ev XDG_RUNTIME_DIR +The location of the runtime files base directory created by this module. +Note that the module does not set this environment variable. +.El +.Sh STANDARDS +The directory created by this module conforms to the +.Lk https://specifications.freedesktop.org/basedir-spec XDG Base Directory Specification . .Sh SEE ALSO .Xr pam 3 , .Xr pam.conf 5 From nobody Wed May 28 21:02:38 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b725C13t4z5xGCG; Wed, 28 May 2025 21:02: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b725B6j3wz3KmJ; Wed, 28 May 2025 21:02:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748466158; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gC1CLnK4/JeIzaxJR4GQkSOo6/IqKRhuSdD5Xc7y+58=; b=rJ3Wv71wtnqk5W6X2yweHr/vg39eOclyADPr3QJ3vmIhMlOjq9Ga85CkzZpvj0DMxx7fR8 qtIfTBPGGUjGVyPtrD1l0eYcdNPRiZuUDCIp304yJZC+uW5cQereRsycXVAJp1NcQKUenB bGxCvInUcx5ubnFEhJbLw4pDRlHiUQP9IOoAVh3qPQtisE7giO6fDoUFDFDeJKKEmg4LwA +JcoOSokJPehHE5Zte5jRPoklsNXve/+da9un6EHMcpLL642vLqAzN5PkqHaySdIOlZlWA OZMhdAQ73urmmLGULDzAT8UBXjz1MmqHIAiJ1SdkSl3iXmHx+lVpH89+xlGiFg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748466158; a=rsa-sha256; cv=none; b=aYLjhgy/KkksmvacyGKpeoEErA85X1Ou7dxC9VC9aj8QgAAg1RzMRy497pdwQvNCF4J2Px IZ+0KArfw0yXHuN/jiALYzu8fLw1EIHhMinDaVcDg/SiG2j9we+xMdtAn4rQ/oVbfkpvbP 69Ig+qcr8NFCyti+aA7zkhAngSxy+jrUVhvfXWthKZpZdUdqJHnwR80xmVNQXDmxaIghW3 faAglOmqCppZTrs8/uGPO3xPx6fiOHcFqAW+M1F0yzRRRzr8DWmUr/0oaMFhao4GUPDwZT gJnt935U3pAgQkESyqmwQtREw78O6LMcRaQzZzyladfeitvJnW1wELk30tXlZQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748466158; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gC1CLnK4/JeIzaxJR4GQkSOo6/IqKRhuSdD5Xc7y+58=; b=PU/QJ+q7ACSutPjuFaZMzsSlbTJgNkAgZybbTRB+0aYv7TJ00zIO34r7LFh05mEkbFKhWp mekUW1v5XnCCXE1GCTRPD60pUdqtRUX40Oxbg5t3vGLixI1XpwTXg0ipYq+CqpuqN95uFg xOosuvP8sgKGBJP4auzPOatfQGf3LejokLPCIlbZRrdQjdKA2gUPBUEukqw43Msj3jaBg+ wM0UKX28KLVIxcr6ykog/ZIwAjC3fZHSR7W3xSrC/koTf7T5tpoWbfPS63cKY10SUlhgt9 ZEavWZBKa0coBMOoo5c1tJc3tVwocCXndoIJHZygMM8u6a7jdSHZS/zs4oLsJw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b725B65fQztL6; Wed, 28 May 2025 21:02: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 54SL2clX061010; Wed, 28 May 2025 21:02:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54SL2cPq061006; Wed, 28 May 2025 21:02:38 GMT (envelope-from git) Date: Wed, 28 May 2025 21:02:38 GMT Message-Id: <202505282102.54SL2cPq061006@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: e3eae3b1e587 - main - axge.4: Create a HARDWARE section List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: e3eae3b1e587ad3e99a064400b57111966a55005 Auto-Submitted: auto-generated The branch main has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=e3eae3b1e587ad3e99a064400b57111966a55005 commit e3eae3b1e587ad3e99a064400b57111966a55005 Author: Alexander Ziaee AuthorDate: 2025-05-28 20:45:39 +0000 Commit: Alexander Ziaee CommitDate: 2025-05-28 20:49:30 +0000 axge.4: Create a HARDWARE section For inclusion in the HW Relnotes. MFC after: 3 days Reviewed by: mhorne Approved by: mhorne (mentor) Differential Revision: https://reviews.freebsd.org/D50523 --- share/man/man4/axge.4 | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/share/man/man4/axge.4 b/share/man/man4/axge.4 index 9ca268d6ff83..7133ee3253eb 100644 --- a/share/man/man4/axge.4 +++ b/share/man/man4/axge.4 @@ -1,3 +1,6 @@ +.\" +.\" SPDX-License-Identifier: BSD-4-Clause +.\" .\" Copyright (c) 1997, 1998, 1999, 2000-2003 .\" Bill Paul . All rights reserved. .\" @@ -28,7 +31,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF .\" THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd October 4, 2023 +.Dd May 25, 2025 .Dt AXGE 4 .Os .Sh NAME @@ -121,6 +124,19 @@ Force half duplex operation. .Pp For more information on configuring this device, see .Xr ifconfig 8 . +.Sh HARDWARE +The +.Nm +driver supports the following USB Gigabit Ethernet controllers: +.Pp +.Bl -bullet -compact +.It +ASIX Electronics AX88179A +.It +ASIX Electronics AX88179 +.It +ASIX Electronics AX88178A +.El .Sh SEE ALSO .Xr altq 4 , .Xr arp 4 , From nobody Wed May 28 21:02:39 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b725D1ZdBz5xFww; Wed, 28 May 2025 21:02: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b725D0X7Wz3Kk3; Wed, 28 May 2025 21:02:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748466160; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ptyj5CaouyDCPlLPd7VWlRS5zh8VBwsO7pk5sRP8RoY=; b=o1V7dCmg60Qwb7S/ihWmB41PibY77gqV+wpCq0MDEsT8JRHVJ6SaNVAF9I+bQjofGnGaOr QL18CAzGq0pVsieb8y63hXTr6psGcgs0PbyRH9KB//SDh039qyJ3GOo6t2KravTLN1VXda MH5GawlkyCQw8lqRd5CGZ+rO1Xn6lFANetxuoTASDYVx/clRrUQ4a1qxDDKce6+tf4DqgD vInlNEfqHLFP/+4VyUBhFYhujg2VRcIOph4gd8nx33J6iCoqZscIefr7BxXIgcMm/816Bd 9r0I1iuxRbEJkrbPRYX8Pr3/4R+W76u/0TVwurn8jGcvQQb7nXVYoP2VcHlDgg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748466160; a=rsa-sha256; cv=none; b=Iku3DBhnkwMrNtHRcMgDN/6vx4nX9Q3NUhvjPlMrXGJDlXvEizXsIl5WZ5ckU3cqtKTE8y Dev2Aafp71xkVGBENcQN7dOihLT7dYcE2LspRoMpFVmZnGOjsrSwbzeaH3AuvSYzV/Egdw XL5OzcQ+ERAW6hEfr+Bf66KRLLlI+J1kqqTzMMHR0aVeLfKtvKqGLa5L9Lcc8+MIcJprfM bVkxixuU62r3JY7Fut1pA6YG05XgzYyurAj97gewK8DXsrnRP/FvjPCt2n5iKbYa0otA3m CqNNq6gApCqswZ/heL49CvTGs1kkWBatkfypSwpXdYls4QedsVvaCBVvsnROtQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748466160; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ptyj5CaouyDCPlLPd7VWlRS5zh8VBwsO7pk5sRP8RoY=; b=hz/AGhYpL1di5etqLtdCquWw7EoBomyQd0KvsWVawkPCWRG/Z5+1/5VfQOgYTuUtl8lhQl TnWLRZCN0XRMZUnnLKtksWKYAOBMkN53tRsSccEPa99IIBnXNQeps/emxlngkhN4lKhENa Y7x7kaDR7lwgDm8Oxn/eogPFTz+Wljb5JJ3POFWhXDGt/RStT2aK0QjiwEz01q6MKw3P0s A4mwGAPhsQwiZU2joNbRmQF6JghjlalQCC1B7oDnh+Gqe/kn0vXuWnhIs6vKc699qNkMMC 3M9gqiBC8EcZc1FQTtvpXPj7toYwGSYfnvtwdEjwLwUmABlQAIcIEuM07Sb+fQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b725D01QKztwQ; Wed, 28 May 2025 21:02: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 54SL2dg8061044; Wed, 28 May 2025 21:02:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54SL2dcO061041; Wed, 28 May 2025 21:02:39 GMT (envelope-from git) Date: Wed, 28 May 2025 21:02:39 GMT Message-Id: <202505282102.54SL2dcO061041@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: 7390e96107c8 - main - rtsx.4: Improve hardware, add history and spdx List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 7390e96107c81212b75b50e4b5c6cbcf14e34c84 Auto-Submitted: auto-generated The branch main has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=7390e96107c81212b75b50e4b5c6cbcf14e34c84 commit 7390e96107c81212b75b50e4b5c6cbcf14e34c84 Author: Alexander Ziaee AuthorDate: 2025-05-28 20:50:26 +0000 Commit: Alexander Ziaee CommitDate: 2025-05-28 20:51:17 +0000 rtsx.4: Improve hardware, add history and spdx + tag spdx + massage hardware for inclusion in hardware release notes + note first appeared in 13.0R MFC after: 3 days Reviewed by: mhorne Approved by: mhorne (mentor) Differential Revision: https://reviews.freebsd.org/D50529 --- share/man/man4/rtsx.4 | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/share/man/man4/rtsx.4 b/share/man/man4/rtsx.4 index c9be7a6f21f4..69de84c6d707 100644 --- a/share/man/man4/rtsx.4 +++ b/share/man/man4/rtsx.4 @@ -1,4 +1,6 @@ .\" +.\" SPDX-License-Identifier: BSD-2-Clause +.\" .\" Copyright (c) 2020 Henri Hennebert .\" All rights reserved. .\" @@ -22,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd April 26, 2022 +.Dd May 26, 2025 .Dt RTSX 4 .Os .Sh NAME @@ -53,8 +55,7 @@ Driver attaches mmc bus on card insertion and detaches it on card removing. .Sh HARDWARE The .Nm -driver supports different specification compatible chips. -The following chips have been verified to work: +driver supports the following Realtek SD card readers: .Pp .Bl -bullet -compact .It @@ -71,17 +72,12 @@ RTS525A RTS5260 .It RTL8411B -.El -.Pp -It should also work for: -.Pp -.Bl -bullet -compact .It -RTS5249 +RTS5249 (unverified) .It -RTL8402 +RTL8402 (unverified) .It -RTL8411 +RTL8411 (unverified) .El .Sh SEE ALSO .Xr mmc 4 , @@ -93,7 +89,9 @@ RTL8411 .Sh HISTORY The .Nm -driver was ported from +driver appeared in +.Fx 13.0 +and was ported from .Ox with modifications found in Linux and .Nx . From nobody Wed May 28 21:02:40 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b725G1Y6vz5xGCK; Wed, 28 May 2025 21:02: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b725F56Xwz3KkJ; Wed, 28 May 2025 21:02:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748466161; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ArUoSv/P9Rk0Tng6h2FFgUGWxcwmCQbduru9yZnZsZI=; b=wGO4rxy/DJt6fbL4Ambzw2mHWJpxhVNfhhFX0aVAdmEKa2t4F39Z6D9Orh7qCEBHuBoCc4 POC/K9jPzQfwRJX+4ck/TChEN52HxgzW7qBFZfIvG8wIhFI6JnMQ1LuAcx5ZtS1//Jyqix P2g5w3jmZUX5ClFmmGLjPI99+4Pqb5B89t88LmnsaEJSF1MfvBr3Ezz7LXJE9o/O14MKLu 25f6uKE4eSrZmJpB9gBtKLg4o4+/qJDnNe4WTsaDxdbH9T/zW7eu0DVykiLmHC95rwNrM5 fAqGnqumlMSnliVAYPIlKRciCZg4ZKI5IrKM0X0KP6ysYt+N5yAxIKlQixJnuw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748466161; a=rsa-sha256; cv=none; b=Dh1xi9b4cbQa3fADRx7btQSef3oY/At3bkQHyzJjQRZpw22MVeL3KjvC/4z5SK0MWvooNH Nu/vDdcyIdeSbAhwmHQKf3Zunnrh3O6beHUbZ1QjdQTBhPWe3adDg6K6FeZCY3vG1P4ihN 3aNQfdDSTrluXAuV9yU1Ct0GrGpn4m96Sm7793sXNr6jjhHLOrm+aJ2ELclQd2kRYqJKbv ZK5yQD8t/gBfMUdt/UN5ut8gNKljHtEUBo6yNcy8PVEGb7NWHrK2W2CnNPgVsM4BsxS/pi G7+vHQmU82T25Dda/zhU9T6acHu2KCTTZPOhIz+NAOYhdgJZEZsHn9zKAuDTfQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748466161; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ArUoSv/P9Rk0Tng6h2FFgUGWxcwmCQbduru9yZnZsZI=; b=Om23MspEf2Pv9TVCfGrUt8/T84vI5d3in5bq60HU4FPCYu+Q9lAOFlUMlo5GV/z6Rjj10u fb69gbGTCbyfKx46Kr0dwbB/QwIOi9v6zHLiNZKDvegG1qEsSyOIp+jyihAbpJme/W+CG+ kdgyTNvVakmtHUw4uwpRVh1IAsjarUgZqMSiZa0I9hE6SmdtzR3TUGFyXQPogghNf8zFWY Bs/kUjPfHzJNonXaOIXV/iKpns2N1UsZtgnwmPY87V5oR3kVmIGnHYYuRACFzALyG89yzi 7QLfApMI3znINKZjkMbUjINYBRBQh19gxnDV9+6DiJOOOULgu5tqw3U5WuKwTA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b725F0ZpZztys; Wed, 28 May 2025 21:02: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 54SL2eGC061078; Wed, 28 May 2025 21:02:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54SL2egi061075; Wed, 28 May 2025 21:02:40 GMT (envelope-from git) Date: Wed, 28 May 2025 21:02:40 GMT Message-Id: <202505282102.54SL2egi061075@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: 420e58595d20 - main - aue.4: Improve HARDWARE, specificity, and tag spdx List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 420e58595d20b6fd0dfdf2f486462fbb572f3351 Auto-Submitted: auto-generated The branch main has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=420e58595d20b6fd0dfdf2f486462fbb572f3351 commit 420e58595d20b6fd0dfdf2f486462fbb572f3351 Author: Alexander Ziaee AuthorDate: 2025-05-28 20:53:31 +0000 Commit: Alexander Ziaee CommitDate: 2025-05-28 20:54:27 +0000 aue.4: Improve HARDWARE, specificity, and tag spdx + Improve HARDWARE introductory sentence for hardware release notes. + Mention "Fast" ethernet in title for apropos. + tag SPDX MFC after: 3 days Reviewed by: mhorne Approved by: mhorne (mentor) Differential Revision: https://reviews.freebsd.org/D50540 --- share/man/man4/aue.4 | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/share/man/man4/aue.4 b/share/man/man4/aue.4 index e451315672e9..9b82fdc4ba55 100644 --- a/share/man/man4/aue.4 +++ b/share/man/man4/aue.4 @@ -1,3 +1,6 @@ +.\" +.\" SPDX-License-Identifier: BSD-4-Clause +.\" .\" Copyright (c) 1997, 1998, 1999 .\" Bill Paul . All rights reserved. .\" @@ -28,12 +31,12 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF .\" THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd November 24, 2015 +.Dd May 26, 2025 .Dt AUE 4 .Os .Sh NAME .Nm aue -.Nd ADMtek AN986 Pegasus USB Ethernet driver +.Nd ADMtek AN986 Pegasus USB Fast Ethernet driver .Sh SYNOPSIS To compile this driver into the kernel, place the following lines in your @@ -56,8 +59,8 @@ if_aue_load="YES" .Sh DESCRIPTION The .Nm -driver provides support for USB Ethernet adapters based on the ADMtek -AN986 Pegasus chipset. +driver provides support for USB Fast Ethernet adapters based on the +ADMtek AN986 Pegasus chipset. .Pp The LinkSys USB10T adapters that contain the AN986 Pegasus chipset will operate at 100Base-TX and full-duplex. @@ -125,9 +128,10 @@ half duplex mode if this media option is not specified. For more information on configuring this device, see .Xr ifconfig 8 . .Sh HARDWARE -Adapters supported by the +The .Nm -driver include: +driver supports the following USB Fast Ethernet adapters based on the +ADMtek AN986 Pegasus chipset: .Pp .Bl -bullet -compact .It From nobody Wed May 28 21:02:42 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b725G5Km7z5xFqg; Wed, 28 May 2025 21:02: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b725G20XSz3Ksk; Wed, 28 May 2025 21:02:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748466162; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hRQpy3hHL8/nPvsMIp5RELhTR2z978DVvrnJIPWnUrA=; b=F7wmEs8OKVdVJYkbE4zoF91TLuz0PH+nX6MGaWLaPehm5Q9Ef2EXaas8bgFp13vHoQx6tH sCH1yzlDTgt2GncvKSbm8W75novSEmscFGuN7CKymsOCAtV8OAcO0nzG6rtPqlONq/h5eZ wqyI08VUqWcMnllHjAAF9/s+zIGvoChnn97C8YLESQq7yCtecBGGCwdUXeP2McmHXBLUEO JLV+PWDtK9C8vd7WvNnTR9mv/WwtDNb+VRLG7OYeoSgzNGtUvi5b1OGfF/7FJh/Ro7plAX Cx+hu1sepxYzuB51NUjXPjwcrCoqPhmGDEWLgU4BFULM5SgKlXl2QEzWmvP5Cg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748466162; a=rsa-sha256; cv=none; b=dEfvQAtx2+DHMnNexEC7hVAw5gCkpsnG+ytf2yhr0zx0/0ro9Afz0u3/VpM+w8LCWxvxJX wl014df7QmIiC/ThZHU9ae1zKZyCwsce+xYqLMwh/pGY+VLFhxChY+if0D9mXS6DGTwRez rPfh0ZMsOrzJ9inxzYTBimx7w0rBsFf9KHGSiHVxM6HbUKdC8y4r0Oh/iyXPzuDOgvRfUx fAdsWdyhzyqE8oql5HOxzL3eCudoUHILkQzcuCr5PIBibPt+LvsaBP1yvXyRdAb6hAWDz7 sl+VcZJedK/2Cj55KzJKuQOE2KRmVFPfxyUBfTAP5mfUAwSCgRQkxfiDfr2ssg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748466162; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hRQpy3hHL8/nPvsMIp5RELhTR2z978DVvrnJIPWnUrA=; b=GdiaJDJ+a87EvmS1WOkcMWHsGC+Ku2VuIEZw9WtnTJuHzJT3Fn+2lLB/pDRyRYSkOGZ0jK 559fwiB0gKHFjrlxHsmQjgHk39k9VdRODzBv8FeUlnUQZeb20WnxMhNgseU7HMYsfX18Tr hp0Y+dPkwmJ7XEqLqDjD6rKpFmSZV08XJqemJTG1U5J9gf/5K1UjAAWV75lgCa8jRFxm6H nxoz1sk/nYt+KiFxZMMVayXN2mv3QrD6lF14+XkPMK/TnvDGt74JVP86iELFY5KOza8xpG nPlXUW+z+YxlQqAo/Nb0b8pde8rRIReaE/AaalBhotIBJEz4UQiJi3OV+CyCFA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b725G1VjBzt9s; Wed, 28 May 2025 21:02: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 54SL2gZo061115; Wed, 28 May 2025 21:02:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54SL2gp9061112; Wed, 28 May 2025 21:02:42 GMT (envelope-from git) Date: Wed, 28 May 2025 21:02:42 GMT Message-Id: <202505282102.54SL2gp9061112@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: e8260f2cea3c - main - cdce.4: Improve HARDWARE List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: e8260f2cea3c447b0a16f1075ff580dc4ef06efc Auto-Submitted: auto-generated The branch main has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=e8260f2cea3c447b0a16f1075ff580dc4ef06efc commit e8260f2cea3c447b0a16f1075ff580dc4ef06efc Author: Alexander Ziaee AuthorDate: 2025-05-28 20:55:27 +0000 Commit: Alexander Ziaee CommitDate: 2025-05-28 20:58:38 +0000 cdce.4: Improve HARDWARE The cdce driver is the main USB tethering driver now that both Android and iPhone tethering are using USB NCM. I would like to test a recent 5G hotspot to see what those are doing. Improve the HARDWARE section to reflect this. MFC after: 3 days Reviewed by: mhorne Approved by: mhorne (mentor) Differential Revision: https://reviews.freebsd.org/D50541 --- share/man/man4/cdce.4 | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/share/man/man4/cdce.4 b/share/man/man4/cdce.4 index 87a6f5da4b08..8c5dbb36d197 100644 --- a/share/man/man4/cdce.4 +++ b/share/man/man4/cdce.4 @@ -27,7 +27,7 @@ .\" .\" $NetBSD: cdce.4,v 1.4 2004/12/08 18:35:56 peter Exp $ .\" -.Dd May 3, 2024 +.Dd May 26, 2025 .Dt CDCE 4 .Os .Sh NAME @@ -95,12 +95,18 @@ where .Dq internet is your providers apn name. .Sh HARDWARE -The following devices are supported by the +The .Nm -driver: +driver supports USB Ethernet interfaces implementing the +USB Communication Device Class Ethernet Control Model (CDC ECM) or +Network Control Model (CDC NCM) protocol, such as: .Pp .Bl -bullet -compact .It +Android USB tethering +.It +iPhone USB tethering +.It Prolific PL-2501 Host-to-Host Bridge Controller .It Sharp Zaurus PDA From nobody Wed May 28 21:05:32 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b728X6m72z5xG3K; Wed, 28 May 2025 21:05: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b728X3r7Gz3PJQ; Wed, 28 May 2025 21:05:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748466332; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/T4Wp3t2yYnZ3iuAkPDh4QgvX8VLgONDf97jvQO8xRY=; b=ewxG5h9CGKC/NzqDfJ6eiKm2Axi0RmmEzVq0SA7LJZbTIms/UPf+jPc/5EIaQmuYsIHq7i UFre7vhNyTOYzsHWDzAA16CemDAXS9BAghzJm/l8Wv6vrPCOuGWdw83x7PpNToSmUUK/O6 0v5rzrCB3GVxMsFDUoXtA4ytD8/tAualC8uQ9TX9tBzIoe7M6PUi2yd4/d3a0HsonPEewL sOYwD/T27axPq9b4ZOFviOozQD6L+YgxH01XMKijA6TSDWCU69HzQQpBIMlGuRkjBCsrwr MoMEyY1WM2OwPRAINQp0NOOOePxo9l3d2rilct2TK/kOYbgZwMvhEHMPrm6k0Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748466332; a=rsa-sha256; cv=none; b=OuyMT5jlpBqGBv72x4is/+lFghDgFpmonsOVROFTbJxlxP86G+iHgQ3W03Mm0eZOiFOtK/ QuQfSzCZuMF/+2QwGiK5ahDP0jT0SmNIN5UacbRmZzfXJ2/EmERoTVLEUfDSiIkga49nwb fYlzagcjaKYS2pXyVoYteN53AWBzCpyVTypkIYsrDhLz075PmlKUo4c9lVM1Bz0B7bWLf2 PpdHjDl09AhTKPttpky9ONgnKvT16I1RmvkJp6l6yzfh8KmtWJnDZL/Leo0JWRTKn71gna 0V01X5qZp2z4+ag+Ep0v6X/gUVHs9gpqYAgBLsJBOoLGBSQB3UVqK3GD/7Zkng== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748466332; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/T4Wp3t2yYnZ3iuAkPDh4QgvX8VLgONDf97jvQO8xRY=; b=BkFhKt+nxB6KnA7IHjLUWlWnnrjNXxuS/61i85QvU3F0koEOglwzCu1qk0ci7JE623xA2/ zenttw/J4oFhsVDvCKCx1ZSSXy6H3Hj89wcgQT92Tw4Axd8x+sw5E7yReygkijH5TIIefI T2tB0MRFhujJEfViUYkumReUT9usTyDmnUKR/QCIa0aKzFK8ruqdVWyibRfRLTtc5Ft20R pee3QPyX3m5SXJ48uLboA0H2uS9akV1kue8se7Xt/3Ewwgykxj80sZti0eqX0aODA/NwMs AIrqPRTAEcQXN10fNpJiwiYlXqDOnCp4959K4FP5N8x4iJotCfP/UJ2EQe6+fQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b728X2SgKztL7; Wed, 28 May 2025 21:05: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 54SL5WDd062082; Wed, 28 May 2025 21:05:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54SL5WZo062079; Wed, 28 May 2025 21:05:32 GMT (envelope-from git) Date: Wed, 28 May 2025 21:05:32 GMT Message-Id: <202505282105.54SL5WZo062079@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: 0440b3d2cbf8 - main - dtrace: Add compiler barriers around updates to per-CPU flags List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 0440b3d2cbf83afb55209a9938b31a48912f222c Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=0440b3d2cbf83afb55209a9938b31a48912f222c commit 0440b3d2cbf83afb55209a9938b31a48912f222c Author: Mark Johnston AuthorDate: 2025-05-28 20:45:27 +0000 Commit: Mark Johnston CommitDate: 2025-05-28 21:05:16 +0000 dtrace: Add compiler barriers around updates to per-CPU flags Otherwise there's nothing preventing reordering of memory accesses with respect to these flags being set or cleared. Since their most common use is to create a section in dtrace probe context where memory faults are intercepted by dtrace_trap(), such reordering can turn dtrace errors into fatal exceptions. MFC after: 2 weeks Sponsored by: Innovate UK --- sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c | 2 ++ sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h | 16 +++++++++++----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c b/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c index cfd403ac1a01..7192df200ae2 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c +++ b/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c @@ -549,10 +549,12 @@ dtrace_load##bits(uintptr_t addr) \ return (0); \ } \ \ + __compiler_membar(); \ *flags |= CPU_DTRACE_NOFAULT; \ /*CSTYLED*/ \ rval = *((volatile uint##bits##_t *)addr); \ *flags &= ~CPU_DTRACE_NOFAULT; \ + __compiler_membar(); \ \ return (!(*flags & CPU_DTRACE_FAULT) ? rval : 0); \ } diff --git a/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h b/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h index 263b254b9021..c274a9f3357a 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h +++ b/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h @@ -2421,11 +2421,17 @@ extern void dtrace_helpers_destroy(proc_t *); #define DTRACE_CPUFLAG_ISSET(flag) \ (cpu_core[curcpu].cpuc_dtrace_flags & (flag)) -#define DTRACE_CPUFLAG_SET(flag) \ - (cpu_core[curcpu].cpuc_dtrace_flags |= (flag)) - -#define DTRACE_CPUFLAG_CLEAR(flag) \ - (cpu_core[curcpu].cpuc_dtrace_flags &= ~(flag)) +#define DTRACE_CPUFLAG_SET(flag) do { \ + __compiler_membar(); \ + cpu_core[curcpu].cpuc_dtrace_flags |= (flag); \ + __compiler_membar(); \ +} while (0) + +#define DTRACE_CPUFLAG_CLEAR(flag) do { \ + __compiler_membar(); \ + cpu_core[curcpu].cpuc_dtrace_flags &= ~(flag); \ + __compiler_membar(); \ +} while (0) #endif /* _KERNEL */ From nobody Wed May 28 21:08:35 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b72D3743Fz5xGN4; Wed, 28 May 2025 21:08: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b72D360v0z3RdD; Wed, 28 May 2025 21:08:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748466515; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YbSANsNFe3EETqZzoEs2TFags0nFcmQiyfjgxeCiiRo=; b=HYZYBFl5wJRRzciLdOzv6Xo6sLK3VpCLUWPxOdYTlGxHJznj7d+ILPITP6yuGKDR4RfL3P u/+DMqi2PIF67JFbtdJ2qNOknue9rQ9bYKx9IjbBRGRQPFgzesxDWbaBw5LvfHYxK2SmVL DopenRQZ9BjtdOlT44ajSwKA8rqBUet4KuZnhwFC77wIiHq0Ue8w0m/yGpKuLbNmeDt4ml K/hptcKEgqQHY1RJvMnPxnStUOx/ZyCEMemetpGnPAj9Z4fcxhKCxUfxMuyYOQRh3EvaL9 RqiiFB5ZLhPj7rR1248vxFLEV8HdV0NEV2uHYuCpwS2zBOEhVYL/GjffiK9foA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748466515; a=rsa-sha256; cv=none; b=PVoWVtaVyBXGFRnK686jlPiS60ggsXqVdQQsalqZJyVlNZP1vtyUzztj/mftPy8W2TFx70 5Do57h5TCQA4A7D9PqePhX7HyDX3USo4anbm2VROnP9r7CNZdM24b6oOVjU4f9x0tA8iwE 2ejrYVAovDVap/PmqCG3jzgtYqr9EoZv6dybcGGcOO0UI7D4tsdocMc54eCoG6QI7tNiOP 0zuO+t6Eo1PKfseZEnL6xv10IZOQt2w9H5wnwzRknJ3l/r/Vep1AOJ50jdF60L6ZqZKC1y HfgsXw1CiBKBu18J5Yo40IP9hd5n7+abE0AJhj33IOEy3JsMNCMBqPYUHEM1Dg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748466515; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YbSANsNFe3EETqZzoEs2TFags0nFcmQiyfjgxeCiiRo=; b=UxRUXvivfhmtm3X3BJvH8eTDJjmpScNMfiRusjhTuywu7i3t9vIlPIIItO1Isa7f8StOBd YFP67s7v6pL/yIpd7AP1F0W/cDm72BC3GwXwq3g8Gwge18NUNQQSHwxSLli4WXaW5MaZmf AtyRNF8Vs+id7N512djjfJuuywjzjMO64aWyFLI90++vBQtpILq5OVAba6QxQPm3i9FhI2 xeucgBWh6TTmhcRCTINLfxVe9nzOY2zSIyeY+havPjBEsFGd8TbOZhXCawZr0CRcPODBG4 gNy9Ux5b8QaLrj1NkKITu6M5bH4Jrmg8ax6HWN95zxUzAoa2YRwi9lCNOKFHfQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b72D35XFsztHV; Wed, 28 May 2025 21:08: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 54SL8ZVS063215; Wed, 28 May 2025 21:08:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54SL8Zed063212; Wed, 28 May 2025 21:08:35 GMT (envelope-from git) Date: Wed, 28 May 2025 21:08:35 GMT Message-Id: <202505282108.54SL8Zed063212@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: ca47411ea5e8 - main - usb/if_mos.c: Fix incorrect SPDX ID List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: ca47411ea5e8a38ac1a9a29df25bc32ffcaa2904 Auto-Submitted: auto-generated The branch main has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=ca47411ea5e8a38ac1a9a29df25bc32ffcaa2904 commit ca47411ea5e8a38ac1a9a29df25bc32ffcaa2904 Author: Alexander Ziaee AuthorDate: 2025-05-16 01:53:28 +0000 Commit: Alexander Ziaee CommitDate: 2025-05-28 21:08:00 +0000 usb/if_mos.c: Fix incorrect SPDX ID Fixes: 718cf2ccb995 (further adoption of SPDX) MFC after: 3 days Reviewed by: carlavilla, imp, mhorne Approved by: carlavilla, mhorne (mentors) Differential Revision: https://reviews.freebsd.org/D50374 --- sys/dev/usb/net/if_mos.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/usb/net/if_mos.c b/sys/dev/usb/net/if_mos.c index 442bfb27d83f..41881fb778a5 100644 --- a/sys/dev/usb/net/if_mos.c +++ b/sys/dev/usb/net/if_mos.c @@ -1,6 +1,6 @@ +/* SPDX-License-Identifier: ISC AND BSD-4-Clause */ + /*- - * SPDX-License-Identifier: (BSD-1-Clause AND BSD-4-Clause) - * * Copyright (c) 2011 Rick van der Zwet * * Permission to use, copy, modify, and distribute this software for any From nobody Wed May 28 21:55:48 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b73GY4bM5z5xJgc; Wed, 28 May 2025 21:55: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b73GX614Wz4752; Wed, 28 May 2025 21:55:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748469348; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5cmIuohQAj5e+teIN9sZd+/LpR/j5lA9qWRAPLWJBNE=; b=gE7uHoLJpdtOIyFgwBQeftcIOawgT473BMoE1i8BMJ4bfg531N+7aomqI25cb4coOz0zpk rVKIXdbGCwZV9A8PDUhgV4VyUOQATwui2wdqYAwp+eMerji6kRl9qBVMoAw0NEBkpdQ+Hn vqwhXllWpQUx1KZ70hm3thXL/itBNy2CVdcfaznh7zktT4cer/mvyTzSXerFCDCJ6fybl/ jFzr5bYXMncrcXVYZCGHKxk4PvoxLUrEqk1y5MoO0mNUXhPhe9VDl785fvAgWjzbIP29bp j/NONP4dcH9X9CpQqAqaBzWNIAKRo9hpeWbYebVeV0+D1Nk8ze2uDBvddiXuFw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748469348; a=rsa-sha256; cv=none; b=RVRKyr28487GSWU+obldjYbGCnvMspDsv0JW/wgrhAmdZNF6HCToKZs8q8YolL1TPf5JDs 3kZfQsDuooQtjsY8v245Ij343cuoDDXIMiDaocm8HojMjfbUNtx1u8GnLsjrGosY3gi1kc qkAf0HHNuEjnNxS7ZGlpUuX7JOTozNIlawAPQWj+8dIjgcMMA0xj4kYwISwr69JkFlTclg 6eBeo1wR2cCZdl1g55+wNtn+drwD6eVVqG875QxWkinqjRICq8Bka0Ga0gL+19/o9kckrh uMGVU/9dZ3huSkBjA4IUndbHz7bX3g0sqxlQSSfu7NuYIP3zL2vdji4aDCZn9g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748469348; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5cmIuohQAj5e+teIN9sZd+/LpR/j5lA9qWRAPLWJBNE=; b=ufouYUF1u8CS/6iIP4IHu3yi3hp8/ZV56nju+N0pV86MmkegxktmppYY9PxHpEOc2pTvE1 +dJV0+nKWiXR9hJpFt+ygULsonFRcQYjggjw7KSiKm5RLIq8nSnzMypnetvpMawTAfGpNu lsq4mbxRNLYPZYBldqJfVteF4SN0YRsIwVv9jRBhi8pMt1R4rhuE3jiMbnx3pHS3hO1ls5 tBmxAMT3r6g2gv27BNIJP4my3IlSeByTxJnYohRhokxJCio7yC5RmxBKj8GYCEKaJfVgc0 q82FRmCedL7oNmUdiXOSLA2/+evekpaasiqK9Gq+GU3xMEhnmKkBMOqGuxXxQQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b73GX4wYvzvqf; Wed, 28 May 2025 21:55: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 54SLtm6M054867; Wed, 28 May 2025 21:55:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54SLtmST054864; Wed, 28 May 2025 21:55:48 GMT (envelope-from git) Date: Wed, 28 May 2025 21:55:48 GMT Message-Id: <202505282155.54SLtmST054864@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: d321dc9783bf - main - pf.conf.5: better describe "!" List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: d321dc9783bf55f8c128ec9e4cdb362eab77b8eb Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=d321dc9783bf55f8c128ec9e4cdb362eab77b8eb commit d321dc9783bf55f8c128ec9e4cdb362eab77b8eb Author: Kristof Provost AuthorDate: 2025-05-26 08:02:36 +0000 Commit: Kristof Provost CommitDate: 2025-05-28 21:40:36 +0000 pf.conf.5: better describe "!" from michal mazurek, tweaked a bit by myself Obtained from: OpenBSD, jmc , 5e78806cfb Sponsored by: Rubicon Communications, LLC ("Netgate") --- share/man/man5/pf.conf.5 | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/share/man/man5/pf.conf.5 b/share/man/man5/pf.conf.5 index b75143f81b4b..6cabdc6741a6 100644 --- a/share/man/man5/pf.conf.5 +++ b/share/man/man5/pf.conf.5 @@ -27,7 +27,7 @@ .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd May 8, 2025 +.Dd May 26, 2025 .Dt PF.CONF 5 .Os .Sh NAME @@ -724,6 +724,9 @@ A packet always comes in on, or goes out through, one interface. Most parameters are optional. If a parameter is specified, the rule only applies to packets with matching attributes. +The matching for some parameters can be inverted with the +.Cm !\& +operator. Certain parameters can be expressed as lists, in which case .Xr pfctl 8 generates all needed rule combinations. @@ -2239,7 +2242,7 @@ For example: pass in proto tcp to port 25 set prio 2 pass in proto tcp to port 22 set prio (2, 5) .Ed -.It Ar received-on Aq Ar interface +.It Oo Cm \&! Oc Ns Cm received-on Ar interface Only match packets which were received on the specified .Ar interface (or interface group). @@ -2272,12 +2275,6 @@ Tags take the same macros as labels (see above). Used with filter, translation or scrub rules to specify that packets must already be tagged with the given tag in order to match the rule. -Inverse tag matching can also be done -by specifying the -.Cm !\& -operator before the -.Ar tagged -keyword. .It Ar rtable Aq Ar number Used to select an alternate routing table for the routing lookup. Only effective before the route lookup happened, i.e. when filtering inbound. @@ -3379,7 +3376,7 @@ filteropt = user | group | flags | icmp-type | icmp6-type | "tos" tos | "fragment" | "no-df" | "min-ttl" number | "set-tos" tos | "max-mss" number | "random-id" | "reassemble tcp" | fragmentation | "allow-opts" | - "label" string | "tag" string | [ ! ] "tagged" string | + "label" string | "tag" string | [ "!" ] "tagged" string | "set prio" ( number | "(" number [ [ "," ] number ] ")" ) | "queue" ( string | "(" string [ [ "," ] string ] ")" ) | "rtable" number | "probability" number"%" | "prio" number | From nobody Wed May 28 21:55:49 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b73GZ3ncCz5xK6B; Wed, 28 May 2025 21:55: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b73GY64GQz476n; Wed, 28 May 2025 21:55:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748469349; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CRF/NvQ3EZ4zROufeENkoMP3qtMuY0+87W/Vjkc5OWM=; b=PceR3psoTVUoER7OHHE3GPhnGK6B6+vOwf+AcJ4/AcD6U0ZntKS9+MAOQja566w8pxPUgH VEceVBoM25BJ3G1qNmVopkgTkujPtUXt013/oifQq59lE5SGbF5SPxH2oVwJbCrIB5rUjZ mVtd+ouLLvthi64XFAbwati0vxOrO1hTd40wzSxAwUKCHFEaLtr2uiHk0V+HGXfZM79VLu /mYvrjYOSsH0NIsCsZznqNXWBJxrHvkuot5mtdRd3YDR1lYMN7H0o59MKJpkjjI+XSuzQC X1zyIf7yD4plDW6Y/C9y3mSPK1R/vkdKBfLTmUdL2s4AZRj5gqu4KIyDo5VRMA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748469349; a=rsa-sha256; cv=none; b=Bl0/1KO84P5GPthnL6mW+C8/o/UPMvB/Alblg2dLIjMPUNRL7EUO0YglTWluN56+FnRUSi XU3rQrh/dmcP/+SMaJU0hlfxOlHoJfEkv2g4MBa4+GwOCyBJPyePKf8di/pjUS1G5/2dg2 YLokDLCe0oy7Bj9D6efY5G9wcWw6Q21TTBZFSzlLNn55q6rJoprfIiwRriDRamIgO6tEWZ QQz4VjIlFgPpJAdgOzt3DnhAApgo247BByiqgvk+ncB9XE8B3TAGhzVGKC4EIEGd8nQXZV NIuYNnIP2LBAgDRhJmg6LrzuiqDFtd0a41vgXgujFFMulBQ3PXatMHOIKt8IsQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748469349; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CRF/NvQ3EZ4zROufeENkoMP3qtMuY0+87W/Vjkc5OWM=; b=bajLpPTHiyaH5tEIt1qPzIrZEuLlN3WXTa+nQ1d3YevBAyXEDjblNoRCegOy71+0O5Lisb RvVEUFGCbl/HplVFAReSSah1ULyz1S7kPkWKKcS6gdjqEZL0Nyb4PZGwJykHXK+bP4+3EQ dcthMwb+DRhKGEeoJzJdZ+zZCtnzTnhuA7VQltGmIx831tfob2yRNK/xP3jZ655o2Fg7k3 M4O6IsoMmQVDO/glK1eIfAMg02eBfE5KGJY2mANTnfRKFEApv0Lk+R7Do1ZAeWs5pAjJxQ ymJrbds1e69bHvJFb9gVWXxgMrGOPacCxZPiZ4tDqq0xbORp06hU85ZBPZIR3g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b73GY5XTdzvv3; Wed, 28 May 2025 21:55: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 54SLtniB054900; Wed, 28 May 2025 21:55:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54SLtnfl054897; Wed, 28 May 2025 21:55:49 GMT (envelope-from git) Date: Wed, 28 May 2025 21:55:49 GMT Message-Id: <202505282155.54SLtnfl054897@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: fb7c3f0274ff - main - pf: refactor length check in pf_pull_hdr() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: fb7c3f0274ffb00f983a02251bf97089767a921c Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=fb7c3f0274ffb00f983a02251bf97089767a921c commit fb7c3f0274ffb00f983a02251bf97089767a921c Author: Kristof Provost AuthorDate: 2025-05-26 08:16:20 +0000 Commit: Kristof Provost CommitDate: 2025-05-28 21:40:36 +0000 pf: refactor length check in pf_pull_hdr() Move the common length check in pf_pull_hdr() after the address family switch. This makes the specific calculation more obvious. OK claudio@ Obtained from: OpenBSD, bluhm , 9f98372a33 Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/netpfil/pf/pf.c | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index e9082da193e6..996e329a204e 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -8756,6 +8756,7 @@ void * pf_pull_hdr(const struct mbuf *m, int off, void *p, int len, u_short *actionp, u_short *reasonp, sa_family_t af) { + int iplen = 0; switch (af) { #ifdef INET case AF_INET: { @@ -8771,12 +8772,7 @@ pf_pull_hdr(const struct mbuf *m, int off, void *p, int len, } return (NULL); } - if (m->m_pkthdr.len < off + len || - ntohs(h->ip_len) < off + len) { - ACTION_SET(actionp, PF_DROP); - REASON_SET(reasonp, PFRES_SHORT); - return (NULL); - } + iplen = ntohs(h->ip_len); break; } #endif /* INET */ @@ -8784,17 +8780,16 @@ pf_pull_hdr(const struct mbuf *m, int off, void *p, int len, case AF_INET6: { const struct ip6_hdr *h = mtod(m, struct ip6_hdr *); - if (m->m_pkthdr.len < off + len || - (ntohs(h->ip6_plen) + sizeof(struct ip6_hdr)) < - (unsigned)(off + len)) { - ACTION_SET(actionp, PF_DROP); - REASON_SET(reasonp, PFRES_SHORT); - return (NULL); - } + iplen = ntohs(h->ip6_plen) + sizeof(struct ip6_hdr); break; } #endif /* INET6 */ } + if (m->m_pkthdr.len < off + len || iplen < off + len) { + ACTION_SET(actionp, PF_DROP); + REASON_SET(reasonp, PFRES_SHORT); + return (NULL); + } m_copydata(m, off, len, p); return (p); } From nobody Wed May 28 21:55:51 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b73Gc4SrKz5xJvx; Wed, 28 May 2025 21:55: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b73Gc0NK3z476t; Wed, 28 May 2025 21:55:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748469352; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/G9YkOCSCppah3pOrCFhVnjs09jNIfIReGC8vEn/dRE=; b=aCS1B7o5DOKFzTFP6EoFLM4srcVkGCaNKiVv1FgrSkXbOQwGRoDwGLJoKLxUPshI9JEIqb +bcrCxD4lALMwzfY2NAKd+sT6u8TGzszbZMeTaHVaoGCyCazTtZunsRjZGLmJQQc80TANw eoPYlpgRiRPMA0cDS+WZwiMEUIBjg+Rq/+YQQhgmiszaI+0preqkPhr4ecrNI+8fegvazU z4o5mlju8kDiY6BXdNSxkHtIOw9JUJbID2bF0hJflH3+snNrM822c8jcKr/lQ1Lg76vhhu SxgawLcv1JWng7SinUr/eH4DMJOrWGBeRCxeNQ18dPBcZFe16sERgO2XN2WjUg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748469352; a=rsa-sha256; cv=none; b=HBvoQFHApb02MShQnmxBE0dsxd0kNkMoFr+mrcoseQJudsFypLR2kTi0aa+vrEz5oL4NNx yq2M+YMFYoNi1ZssSsKuyKn8FZhhNRnJ8oXxQpCfE0u1It2x8BA1WB0OIfUFCSTMUxOU0l f+s9EMt0xzB2HapwJyn4Yu7GxL5XSWGvFaYfpeR9PWwxpULrlqPVwYmxGNXI79TxZgPywf poOwGixeQBrUEQiQczuXh+/UernFr8Ici5YIcEL06qnDohSqVdOP+lUEyke4ckkGXvqmcy zGGc3BLvDmnUQ+uli8EuJcFnLdNO0/F0ObCvQ+W32Eb9M4eoe5M+svfI3DYWpw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748469352; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/G9YkOCSCppah3pOrCFhVnjs09jNIfIReGC8vEn/dRE=; b=sMncqolL+WUviC3m7Ze8aXZUww79/a65gGnMAkC/3+htNMhxzjzTq45Rf5/HwVy1Cad3Lv ye8HZkecYnJK3v/3gIDGEPMwqDibZJE18a+za0VDLTH+D2yIfc/8hxlVwv5SaiJvJhQywP sQgFw9wI+ObOHL2IGiCGP8ulALlPFe+rAbc+wO/+bCGkqXUqWnZBGYFc/HPPlDJlz16CXG 3T7hd3oIW54fWNaaZPmLwqLE3TdANAP8Dv2AwYojQliB2/HJxf1a/xmelgGMzFKJ3j+QjK 5UxMX4v4DJmpWuQ/r8OYh631z7JoVJXHnLvmyWvIZbEAoHc1d7kaq1+9NfLdOg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b73Gb6ctyzvqg; Wed, 28 May 2025 21:55: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 54SLtpCS054968; Wed, 28 May 2025 21:55:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54SLtp1R054965; Wed, 28 May 2025 21:55:51 GMT (envelope-from git) Date: Wed, 28 May 2025 21:55:51 GMT Message-Id: <202505282155.54SLtp1R054965@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: 63cc817adde5 - main - pf tests: deduplicate DelayedSend List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 63cc817adde5aec0f6446e44c1eee0a7d5908dfd Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=63cc817adde5aec0f6446e44c1eee0a7d5908dfd commit 63cc817adde5aec0f6446e44c1eee0a7d5908dfd Author: Kristof Provost AuthorDate: 2025-05-26 13:34:06 +0000 Commit: Kristof Provost CommitDate: 2025-05-28 21:40:37 +0000 pf tests: deduplicate DelayedSend We had a few copies of the DelayedSend class around. Introduce a python utils file (utils.py), move DelayedSend into that and use it in each test that wants it. Sponsored by: Rubicon Communications, LLC ("Netgate") --- tests/sys/netpfil/pf/Makefile | 3 ++- tests/sys/netpfil/pf/frag6.py | 15 +-------------- tests/sys/netpfil/pf/nat64.py | 15 +-------------- tests/sys/netpfil/pf/nat66.py | 15 +-------------- tests/sys/netpfil/pf/tcp.py | 17 +---------------- tests/sys/netpfil/pf/utils.py | 41 +++++++++++++++++++++++++++++++++++++++++ 6 files changed, 47 insertions(+), 59 deletions(-) diff --git a/tests/sys/netpfil/pf/Makefile b/tests/sys/netpfil/pf/Makefile index b6c7a2703b7a..d70631a9de53 100644 --- a/tests/sys/netpfil/pf/Makefile +++ b/tests/sys/netpfil/pf/Makefile @@ -81,7 +81,8 @@ ${PACKAGE}FILES+= \ pft_ether.py \ pft_read_ipfix.py \ rdr-srcport.py \ - utils.subr + utils.subr \ + utils.py ${PACKAGE}FILESMODE_bsnmpd.conf= 0555 ${PACKAGE}FILESMODE_CVE-2019-5597.py= 0555 diff --git a/tests/sys/netpfil/pf/frag6.py b/tests/sys/netpfil/pf/frag6.py index de14fec528fd..0ed980f96fdd 100644 --- a/tests/sys/netpfil/pf/frag6.py +++ b/tests/sys/netpfil/pf/frag6.py @@ -1,24 +1,11 @@ import pytest import logging -import threading -import time import random logging.getLogger("scapy").setLevel(logging.CRITICAL) +from utils import DelayedSend from atf_python.sys.net.tools import ToolsHelper from atf_python.sys.net.vnet import VnetTestTemplate -class DelayedSend(threading.Thread): - def __init__(self, packet): - threading.Thread.__init__(self) - self._packet = packet - - self.start() - - def run(self): - import scapy.all as sp - time.sleep(1) - sp.send(self._packet) - class TestFrag6(VnetTestTemplate): REQUIRED_MODULES = ["pf", "dummymbuf"] TOPOLOGY = { diff --git a/tests/sys/netpfil/pf/nat64.py b/tests/sys/netpfil/pf/nat64.py index e64b7bbd573b..32fd8f4245a1 100644 --- a/tests/sys/netpfil/pf/nat64.py +++ b/tests/sys/netpfil/pf/nat64.py @@ -28,23 +28,10 @@ import pytest import selectors import socket import sys -import threading -import time +from utils import DelayedSend from atf_python.sys.net.tools import ToolsHelper from atf_python.sys.net.vnet import VnetTestTemplate -class DelayedSend(threading.Thread): - def __init__(self, packet): - threading.Thread.__init__(self) - self._packet = packet - - self.start() - - def run(self): - import scapy.all as sp - time.sleep(1) - sp.send(self._packet) - class TestNAT64(VnetTestTemplate): REQUIRED_MODULES = [ "pf" ] TOPOLOGY = { diff --git a/tests/sys/netpfil/pf/nat66.py b/tests/sys/netpfil/pf/nat66.py index f93512b5b99c..16b4ef3dd02b 100644 --- a/tests/sys/netpfil/pf/nat66.py +++ b/tests/sys/netpfil/pf/nat66.py @@ -29,23 +29,10 @@ import ipaddress import pytest import re import socket -import threading -import time +from utils import DelayedSend from atf_python.sys.net.tools import ToolsHelper from atf_python.sys.net.vnet import VnetTestTemplate -class DelayedSend(threading.Thread): - def __init__(self, packet): - threading.Thread.__init__(self) - self._packet = packet - - self.start() - - def run(self): - import scapy.all as sp - time.sleep(1) - sp.send(self._packet) - class TestNAT66(VnetTestTemplate): REQUIRED_MODULES = [ "pf" ] TOPOLOGY = { diff --git a/tests/sys/netpfil/pf/tcp.py b/tests/sys/netpfil/pf/tcp.py index 49a9ef4e0e66..53e0658f419c 100644 --- a/tests/sys/netpfil/pf/tcp.py +++ b/tests/sys/netpfil/pf/tcp.py @@ -29,23 +29,10 @@ import pytest import random import socket import selectors -import threading -import time +from utils import DelayedSend from atf_python.sys.net.tools import ToolsHelper from atf_python.sys.net.vnet import VnetTestTemplate -class DelayedSend(threading.Thread): - def __init__(self, packet): - threading.Thread.__init__(self) - self._packet = packet - - self.start() - - def run(self): - import scapy.all as sp - time.sleep(1) - sp.send(self._packet) - class TCPClient: def __init__(self, src, dst, sport, dport, sp): self.src = src @@ -136,8 +123,6 @@ class TestTcp(VnetTestTemplate): # Import in the correct vnet, so at to not confuse Scapy import scapy.all as sp - #time.sleep(30) - a = TCPClient("192.0.2.3", "192.0.2.2", 1234, 1234, sp) a.connect() a.send(b"foo") diff --git a/tests/sys/netpfil/pf/utils.py b/tests/sys/netpfil/pf/utils.py new file mode 100644 index 000000000000..3cd8278f7cf7 --- /dev/null +++ b/tests/sys/netpfil/pf/utils.py @@ -0,0 +1,41 @@ +# +# 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. +# +import threading +import time + +class DelayedSend(threading.Thread): + def __init__(self, packet): + threading.Thread.__init__(self) + self._packet = packet + + self.start() + + def run(self): + import scapy.all as sp + time.sleep(1) + sp.send(self._packet) + From nobody Wed May 28 21:55:50 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b73Gb6X7gz5xK3k; Wed, 28 May 2025 21:55: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b73Gb1dBMz46xH; Wed, 28 May 2025 21:55:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748469351; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9xzXwF9X+dL2x+JNKC3ATEQHoxDhgdu46+lHeA+5RZs=; b=qCsMxppzgMEU1HgD9Cs+192B+CCtnhiOu0GIQOZfh92nA4PEbOshYU6TqJ7CZkBKBiJ3pn +x1eI8P2BNF6R6ei43hOMYtthlShuxQMExn4WizGqnloaZ2aMeDKkf95U5iYQiVnFAU4so SgzJVqfpna2Uup0w98B8txnip/hdZ4yH3JMyFyXWuowX4oQ+qEQuNwmtu1XW1HUEfL56lB fsBuP11DU0KC/yGSlVfPzi99gEtR8iUqzeENwz+zcXZbfctAOjvyETC4ezNdYIYVG7DTxG bawmP72zKYTz+zIxK09lbPJrdg5gfaEaKJ7HdWwu0vUQz5DHMa1mctcMSbqoDw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748469351; a=rsa-sha256; cv=none; b=r+EyZwQr9QSEa0QpyLvrkuNjmnFFMyYZVXgCp53SJWYRMIR7KlaDZPZjy48A6zw5RNxmDc iYk9uw3uxqVXLmoDSSzTOCxN0xIOyK7ZwYNBvCq/DErGh6vhRvVOgsQBbUu4qzM0Ja/Ap8 4cXTsmi7iJ0eI96qcyVFoMkBwtbC86yITnTbJjqm5vu6pRrt42PZvrDSEUwO37n/QkPl7j XL3ACyn7Sye0cJf/GdRhy8pVOOWYcZCBeP8LtAoPex8CyDzR1cCQgZZP1IJeRG15NsmoD0 acd4JDuo2LodgEolHpvTqFA0+jxD73xvw2MLSEYHVXCJ2NborZKZUSA4l6U/rw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748469351; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9xzXwF9X+dL2x+JNKC3ATEQHoxDhgdu46+lHeA+5RZs=; b=EXRgSXQQGvhdLmNatVPpLRrIQTM5i54KFIYYgTCiZrol6LLbW/9KUQY1bk0h2zGQcwpS27 fSxeyigUU0Vk9AQ5h5Qd+GZenIiGhkl39Dv6peaPB0kPEg/2lyQuBeYFOu3cN57E16NqOC ls85vznf8mC12BCOKqeI7B2x+EGuEOWhVbIjY98Rqcpx4NH232PvQ6ftQq/2Mm33TnAciF t7exLBuYIeG1cLxvKqH8P7NB6DX6Daf2XrHxkR62+CNqU9R6R/1M0bGNjtFcj64b7Z5J8w sI+di9SadFMXTtQkIuMstgcxAPIt07P/vn3INLalZt1wJnbUOOXNx7WZTTYUNw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b73GZ69gTzvXx; Wed, 28 May 2025 21:55: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 54SLto5v054934; Wed, 28 May 2025 21:55:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54SLtowk054931; Wed, 28 May 2025 21:55:50 GMT (envelope-from git) Date: Wed, 28 May 2025 21:55:50 GMT Message-Id: <202505282155.54SLtowk054931@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: 8801e3adff00 - main - pfctl: don't check np->port for NULL List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 8801e3adff004f9facb16b0e3dffbf68f3ac1365 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=8801e3adff004f9facb16b0e3dffbf68f3ac1365 commit 8801e3adff004f9facb16b0e3dffbf68f3ac1365 Author: Kristof Provost AuthorDate: 2025-05-26 09:24:39 +0000 Commit: Kristof Provost CommitDate: 2025-05-28 21:40:36 +0000 pfctl: don't check np->port for NULL It's an array, it's never NULL. OK bluhm@ Obtained from: OpenBSD, akfaew , abfef119a6 Sponsored by: Rubicon Communications, LLC ("Netgate") --- sbin/pfctl/parse.y | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/pfctl/parse.y b/sbin/pfctl/parse.y index befa5a9b0d39..3ddf391810c6 100644 --- a/sbin/pfctl/parse.y +++ b/sbin/pfctl/parse.y @@ -6091,7 +6091,7 @@ apply_rdr_ports(struct pfctl_rule *r, struct pfctl_pool *rpool, struct redirspec rpool->proxy_port[0] = ntohs(rs->rport.a); - if (!rs->rport.b && rs->rport.t && r->dst.port != NULL) { + if (!rs->rport.b && rs->rport.t) { rpool->proxy_port[1] = ntohs(rs->rport.a) + (ntohs(r->dst.port[1]) - ntohs(r->dst.port[0])); } else From nobody Wed May 28 21:55:52 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b73Gd70rpz5xK6D; Wed, 28 May 2025 21:55: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b73Gd1cKhz4770; Wed, 28 May 2025 21:55:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748469353; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cvZit0cSi/4P6q8OZFpBQOJ80KbqG/OFbGt+sRQVlNw=; b=w7yXx6XZ2WlxC6LuatqtdQp0VvHT8g/hgtPjkS2I6vB9+sS07GIzGm6w7xVEfOT8SFuBfg 0yGi3eaAMmrEOgMQSsN+0y609eD5uxcOx93wNUhhqR2zFuwcz6M2oDrDmCq6+4eVDaAVTy 0f3L+hLDQUO8x45QgtPu+MgVRH/GDhpLsLsdOIhdDN+4jYTH5CzYQDCMKtyC2TXZhrvoYa QIrzhiFabFRioVm6psfB7WFWrhW2bWVpxJR1NbDHmaUwGbZ10NhoQAs1objJORWOiXDzDb Ng6Geagya8aS1JZPm7yy1p7kmX1DhksG5pzOf7EcDNOBI+sKULRHRs71NVV8UA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748469353; a=rsa-sha256; cv=none; b=esrwSmosXvN1691StARJ9RnFbF6f0yMY+cm2+I0gn14pZf4MWbY8JNEexTHNvFgIuOS1aU shS8RUfhOX7eARPfBqoVgmIgvPYbfN7xI1ZBRaIAKZID9iAP+wuWu/71iJ8TiN/B5d/OYA YEdECzCwAIaiPr0ArP+x5RrDhsFwPahxte3xUlL5qshtOoKb1mJfSuwnzvgkxTEeumxSEw 9E6sfmk2SY7RltkW/b3PYgdmUA6o/YrMKTwqpBN5r2Ji2ZAdIfP/jAKgLGyKFHnp2gb9gi F1Jnk2mPHnGy+Mwj5ioH69Jo0lxvqE2ZGMREtGz5AAwn+2D2X0oYiEEfrSs4Tg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748469353; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cvZit0cSi/4P6q8OZFpBQOJ80KbqG/OFbGt+sRQVlNw=; b=F715hgNw9X/LZR29Y4RyWaMThO/WAx+itpA3nrN0kgMGUZSVifnJ9Z4pauVbt2J7+prfNY XWC11nLF0pVZy3Syer4+/PlMXxcNzvGIyZnfY1rba8srutK7uEUYLDeoH+WTNOS22Vf3qJ EPsdAHcFNxinCK8wvZrIaXG9bulumZ+ZMwIFt3OJMGvcoLTylDlBWuy4vi5rP0r54Ro2YU J5HjVjx+/cm5UtCcDKHPDdxxvomonbKAGmAjKpQOfvDeTDzmVCfzBWSw5Ifw1wCZVPj+54 ET9pSp7NYkVdBgC1Vg5rQ8XXDkOPvKwey7hbguZNCoRzdBDvmd3TC/yn88v1/A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b73Gd0bcJzvl1; Wed, 28 May 2025 21:55: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 54SLtqxA055009; Wed, 28 May 2025 21:55:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54SLtqj7055006; Wed, 28 May 2025 21:55:52 GMT (envelope-from git) Date: Wed, 28 May 2025 21:55:52 GMT Message-Id: <202505282155.54SLtqj7055006@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: 9a445773752f - main - pf: teach pf_build_tcp() about SACK List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 9a445773752f238226940da403e3a4773d2930a9 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=9a445773752f238226940da403e3a4773d2930a9 commit 9a445773752f238226940da403e3a4773d2930a9 Author: Kristof Provost AuthorDate: 2025-05-27 10:02:15 +0000 Commit: Kristof Provost CommitDate: 2025-05-28 21:40:37 +0000 pf: teach pf_build_tcp() about SACK ok & with sashan Obtained from: OpenBSD, henning , 01c3818b6b Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/net/pfvar.h | 2 +- sys/netpfil/pf/pf.c | 14 ++++++++++++-- sys/netpfil/pf/pf_syncookies.c | 2 +- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h index 91fdcfcbec1d..1cdd575366e8 100644 --- a/sys/net/pfvar.h +++ b/sys/net/pfvar.h @@ -2561,7 +2561,7 @@ struct mbuf *pf_build_tcp(const struct pf_krule *, sa_family_t, const struct pf_addr *, const struct pf_addr *, u_int16_t, u_int16_t, u_int32_t, u_int32_t, u_int8_t, u_int16_t, u_int16_t, u_int8_t, int, - u_int16_t, u_int16_t, int); + u_int16_t, u_int16_t, u_int, int); void pf_send_tcp(const struct pf_krule *, sa_family_t, const struct pf_addr *, const struct pf_addr *, u_int16_t, u_int16_t, u_int32_t, u_int32_t, diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 996e329a204e..5c572dfcd425 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -3990,7 +3990,8 @@ pf_build_tcp(const struct pf_krule *r, sa_family_t af, const struct pf_addr *saddr, const struct pf_addr *daddr, u_int16_t sport, u_int16_t dport, u_int32_t seq, u_int32_t ack, u_int8_t tcp_flags, u_int16_t win, u_int16_t mss, u_int8_t ttl, - int mbuf_flags, u_int16_t mtag_tag, u_int16_t mtag_flags, int rtableid) + int mbuf_flags, u_int16_t mtag_tag, u_int16_t mtag_flags, u_int sack, + int rtableid) { struct mbuf *m; int len, tlen; @@ -4011,6 +4012,8 @@ pf_build_tcp(const struct pf_krule *r, sa_family_t af, tlen = sizeof(struct tcphdr); if (mss) tlen += 4; + if (sack) + tlen += 2; switch (af) { #ifdef INET @@ -4115,12 +4118,19 @@ pf_build_tcp(const struct pf_krule *r, sa_family_t af, tcp_set_flags(th, tcp_flags); th->th_win = htons(win); + opt = (char *)(th + 1); if (mss) { opt = (char *)(th + 1); opt[0] = TCPOPT_MAXSEG; opt[1] = 4; mss = htons(mss); memcpy((opt + 2), &mss, 2); + opt += 4; + } + if (sack) { + opt[0] = TCPOPT_SACK_PERMITTED; + opt[1] = 2; + opt += 2; } return (m); @@ -4253,7 +4263,7 @@ pf_send_tcp(const struct pf_krule *r, sa_family_t af, struct mbuf *m; m = pf_build_tcp(r, af, saddr, daddr, sport, dport, seq, ack, tcp_flags, - win, mss, ttl, mbuf_flags, mtag_tag, mtag_flags, rtableid); + win, mss, ttl, mbuf_flags, mtag_tag, mtag_flags, 0, rtableid); if (m == NULL) return; diff --git a/sys/netpfil/pf/pf_syncookies.c b/sys/netpfil/pf/pf_syncookies.c index 3a0e23100f7c..66757fa4b756 100644 --- a/sys/netpfil/pf/pf_syncookies.c +++ b/sys/netpfil/pf/pf_syncookies.c @@ -518,5 +518,5 @@ pf_syncookie_recreate_syn(struct pf_pdesc *pd) return (pf_build_tcp(NULL, pd->af, pd->src, pd->dst, *pd->sport, *pd->dport, seq, 0, TH_SYN, wscale, mss, pd->ttl, (pd->m->m_flags & M_LOOP), 0, PF_MTAG_FLAG_SYNCOOKIE_RECREATED, - pd->act.rtableid)); + cookie.flags.sack_ok, pd->act.rtableid)); } From nobody Wed May 28 22:18:18 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b73mV65blz5xLMB; Wed, 28 May 2025 22:18: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b73mV5681z3T6C; Wed, 28 May 2025 22:18:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748470698; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Jx7yXD2Hn3/b2yZWMtXcSQKf2nH3xFn2cNSv9z34w7A=; b=vR31YSjA/F+dvoJzAuUk5QEBxZJxGvv6Zc6kk8y01a4hy4MNuGNC6QqBAoWIQqYvaFQTyp Ly+v9IenD7x922HWjCcnodqG17jqzIqbJVSsBdLllvMtC89UxpYL4CpKnlkOno6VyN84nb bR2C4dFyGFBLu0cNu/ZZl4gpHuPeuBK51cCGXhySoJaEiXSuitAe1wT+F+UtL7I6okRSOd rOAfsY8GyJT4/NxKCKEbugxr93hfWyfL4i5Ks2zlz2GkV0eqlr2YEwjkKHrK06UdXSvtpj Md80Hbg3X+CDnmHevbDQaZGF8rUEBGseWDCy1BZrw09LtJa1VD14U7yq6IvLPw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748470698; a=rsa-sha256; cv=none; b=IUloBxTz9xHF6nzVlV97SJOm52ZBEbdTOUOQvDb0YkTdMNs2s480JmptETCNfYIlL0BRz4 cTeTr67ZhYHzVtbjwsCujCj1gE0dhiQPZkjL5bLdlaFGoatjq3zuN2xnooLG4KCWeijg6v uwfx78uCldm/eZU7jnY52r6LEkdvgG1wox53x+5mHpsWv+XB9r+8S7DgoYYpF3lwUGKObI a32+R1CSV7UIOPxAufj3ayMk9HM/d8PjH8s3cab5yVdKFEfWBDFEP4DhhNtWExsY+GLuC7 3KYDzUctFeJE0NIh4imJFNKNcHsSXD/mvi6+0mQVuUfJBLaAQSqA7m8O66N7Rg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748470698; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Jx7yXD2Hn3/b2yZWMtXcSQKf2nH3xFn2cNSv9z34w7A=; b=FV74eFAjUZh9SV/PTrUcs0qL2K7t6LAOo9wBenE1u2O3/v5tvf7FFFnV5NuMGweWuVudAU 40OVd4heTcQAeICX6PG8v/EQWX1lbYpuINrq+9mu1GfRbHW4ifjX61mW3OUzgtyYoInRo6 PcRMkAbf1sswphg19S6vnK3RU5HNa9Qda8gH0OiqhLvxViGeaAlExVtU3Cy26d/fgRVZpv R5OP3sUlogS0el5hVFbFuXUCh/Lyi2XJ9FNVENV5C8taPLvv1qd5Ojv2gXrma6T3EohyYg D1gsV2gX//WZLJrq4OLziqEDdDBhxxRVeQUKc9Zn4U+m+fX4FHE79JodU0PcGg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b73mV4PgNzwT5; Wed, 28 May 2025 22:18: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 54SMII7k093500; Wed, 28 May 2025 22:18:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54SMIIfO093497; Wed, 28 May 2025 22:18:18 GMT (envelope-from git) Date: Wed, 28 May 2025 22:18:18 GMT Message-Id: <202505282218.54SMIIfO093497@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Enji Cooper Subject: git: 9b37d84c87e6 - main - Mark several getaddrinfo tests as XFAIL List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ngie X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9b37d84c87e69dabc69d818aa4d2fea718bd8b74 Auto-Submitted: auto-generated The branch main has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=9b37d84c87e69dabc69d818aa4d2fea718bd8b74 commit 9b37d84c87e69dabc69d818aa4d2fea718bd8b74 Author: Enji Cooper AuthorDate: 2025-04-01 04:51:50 +0000 Commit: Enji Cooper CommitDate: 2025-05-28 22:15:08 +0000 Mark several getaddrinfo tests as XFAIL These tests were recently enabled on main and have failed consistently since they were enabled. - lib.libc.net.getaddrinfo.getaddrinfo.basic - lib.libc.net.getaddrinfo.getaddrinfo.nofamily - lib.libc.net.getaddrinfo.getaddrinfo_test.basic - lib.libc.net.getaddrinfo.getaddrinfo_test.empty_servname - lib.libc.net.getaddrinfo.getaddrinfo_test.sock_raw Mark them as expected failures so they no longer count as failures in Jenkins CI. PR: 285826 MFC with: 5313457780, 0b773a94ab --- .../lib/libc/net/getaddrinfo/t_getaddrinfo.sh | 18 ++++++++++++++++++ lib/libc/tests/net/getaddrinfo/getaddrinfo.c | 6 ++++++ 2 files changed, 24 insertions(+) diff --git a/contrib/netbsd-tests/lib/libc/net/getaddrinfo/t_getaddrinfo.sh b/contrib/netbsd-tests/lib/libc/net/getaddrinfo/t_getaddrinfo.sh index 94a3c0b2e52c..e299702c790d 100755 --- a/contrib/netbsd-tests/lib/libc/net/getaddrinfo/t_getaddrinfo.sh +++ b/contrib/netbsd-tests/lib/libc/net/getaddrinfo/t_getaddrinfo.sh @@ -68,6 +68,12 @@ basic_body() { TEST=$(atf_get_srcdir)/h_gai + # Begin FreeBSD + if [ "$(atf_config_get ci false)" = "true" ]; then + atf_expect_fail "https://bugs.freebsd.org/285826" + fi + # End FreeBSD + ( $TEST ::1 http $TEST 127.0.0.1 http $TEST localhost http @@ -128,6 +134,12 @@ empty_servname_body() { TEST=$(atf_get_srcdir)/h_gai + # Begin FreeBSD + if [ "$(atf_config_get ci false)" = "true" ]; then + atf_expect_fail "https://bugs.freebsd.org/285826" + fi + # End FreeBSD + ( $TEST ::1 '' $TEST 127.0.0.1 '' $TEST localhost '' @@ -145,6 +157,12 @@ sock_raw_body() { TEST=$(atf_get_srcdir)/h_gai + # Begin FreeBSD + if [ "$(atf_config_get ci false)" = "true" ]; then + atf_expect_fail "https://bugs.freebsd.org/285826" + fi + # End FreeBSD + ( $TEST -R -p 0 localhost '' $TEST -R -p 59 localhost '' $TEST -R -p 59 localhost 80 diff --git a/lib/libc/tests/net/getaddrinfo/getaddrinfo.c b/lib/libc/tests/net/getaddrinfo/getaddrinfo.c index 1e066add3119..72e3c66c92ba 100644 --- a/lib/libc/tests/net/getaddrinfo/getaddrinfo.c +++ b/lib/libc/tests/net/getaddrinfo/getaddrinfo.c @@ -94,6 +94,9 @@ ATF_TC_BODY(basic, tc) struct addrinfo *res; int rv; + if (atf_tc_get_config_var_as_bool_wd(tc, "ci", false)) + atf_tc_expect_fail("https://bugs.freebsd.org/285826"); + rv = getaddrinfo(goodname, NULL, &hints, &res); ATF_REQUIRE_MSG(rv == 0, "Expected 0, got %d (%s)", rv, gai_strerror(rv)); @@ -227,6 +230,9 @@ ATF_TC_BODY(nofamily, tc) struct addrinfo *res; int rv; + if (atf_tc_get_config_var_as_bool_wd(tc, "ci", false)) + atf_tc_expect_fail("https://bugs.freebsd.org/285826"); + rv = getaddrinfo(ipv6onlyname, NULL, &hints4, &res); ATF_REQUIRE_MSG(rv == EAI_ADDRFAMILY, "Expected %d (EAI_ADDRFAMILY), got %d (%s)", From nobody Wed May 28 22:18:19 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b73mX0hlMz5xKwf; Wed, 28 May 2025 22:18: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b73mW55PJz3T6F; Wed, 28 May 2025 22:18:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748470699; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DhzafGkLLnil9XX9rr4MZLfmEA3fN29rSDL3uwfyREw=; b=YCBLGgv4cZd77kzncG236Qqj8rJO8XfH/DSk+Ph/wYfd7IJbRxlQToTN81CLT0toLr0aEF G8ru7eOhnoXlIDVsblcg9QKW4C8oB+Gb1UGvzHc+Xnmnka0N5SA7oL5rltp9f0BzYbDutp 2NGAAVXGaNiSKnhX9T+suDM8aZTDfnXAIuhM/OMai3Xj0rB9AF2rWvqhBdK4/UfGaQyD5Y kCsKqTJTF4HPS2xUyI7Xfa4n5sNMumFhE6+qESYRDx3i3M2vDWsdZ7/Qlw7gHJ/EHg2aCx 43l9Zp40lmagAS6gRZDstYvFmJ+3k+ZPcLKSOx2HNnynPMJdet7q872neh+hMw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748470699; a=rsa-sha256; cv=none; b=D7TD/HzV7cc/LU2NZWWUk0TrzPjnFY/In8KP22IA7EHUE28hO+rPxpct492pMdSK3mhZVm WsSSb1WgFcuhpFxB/PCb1tzd/nwNPqEHCaGxzNcTdpRVnblrjbmw6bkcFvplEYEYaU4ppl juhy9FtF6h01d6aZ1OnT2OPh90CdCkaYkdRERQ5D0pGV0bWG34NCNxBspQFxl47gG56iLq Sj7IMj4D9a/HZRdbvyP47wsFOabNMtyAY3zj7vMyWemFdTRGgqDj5jOiOQqycd9sDFwL0M yZwxDG+FLStco+F0FJgnY/sV/pV4vTWwWp4IQR5eVi9Nw6SCFnUjkVzqMbywNQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748470699; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DhzafGkLLnil9XX9rr4MZLfmEA3fN29rSDL3uwfyREw=; b=MrCr5ogim9eoa73bVM3LYJc/S0GkYVGDTYzow2FkOSWfvz04j/hc2Uu6SLONNIAxvRODN+ KMvifQ5T0nIU6GMRIRLD/Lv36Ny0FKfssKoUgIdHDS9zQjxhWNRB2peQC9xQDVxwCp0lXa ahJ61pSRWlwaC9l1C/7towj3xN8MVchT02TJqq/1s+tJcpQRf/1b4Oq/8V43sUMHAjpNCt pqQRcQpGDJtz86wSmVa350zyFOJ2mAvw87DsnYriUDHGUY7vrH/zNnUiBY4LIy32w6os+W E8nqiMRMaj9o0WCw3Az2C1bah6vc2ArquJfsHjKPSnPzT6XtyTdhHTBgly6UoQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b73mW4gYRzwY6; Wed, 28 May 2025 22:18: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 54SMIJju093535; Wed, 28 May 2025 22:18:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54SMIJcl093532; Wed, 28 May 2025 22:18:19 GMT (envelope-from git) Date: Wed, 28 May 2025 22:18:19 GMT Message-Id: <202505282218.54SMIJcl093532@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Enji Cooper Subject: git: 5c6ad1a2d175 - main - libarchive: update documentation for suggested `git pull` List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ngie X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5c6ad1a2d175ec84e0e50621ce746c0d34fd5679 Auto-Submitted: auto-generated The branch main has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=5c6ad1a2d175ec84e0e50621ce746c0d34fd5679 commit 5c6ad1a2d175ec84e0e50621ce746c0d34fd5679 Author: Enji Cooper AuthorDate: 2025-05-22 18:16:15 +0000 Commit: Enji Cooper CommitDate: 2025-05-28 22:17:42 +0000 libarchive: update documentation for suggested `git pull` Replace git:// with https:// . The git:// protocol URL might not be available, depending on firewall rules, as git:// is commonly blocked by ISPs. MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D50470 --- contrib/libarchive/FREEBSD-upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/libarchive/FREEBSD-upgrade b/contrib/libarchive/FREEBSD-upgrade index 0b5d4e921f49..7bdeb87d674e 100644 --- a/contrib/libarchive/FREEBSD-upgrade +++ b/contrib/libarchive/FREEBSD-upgrade @@ -2,7 +2,7 @@ libarchive The source code is pulled with git: - git clone git://github.com/libarchive/libarchive.git + git clone https://github.com/libarchive/libarchive.git The git branch for imports is named vendor/libarchive. From nobody Wed May 28 22:19:21 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b73nk1vm0z5xLRV; Wed, 28 May 2025 22:19: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b73nj4ZVYz3VF2; Wed, 28 May 2025 22:19:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748470761; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ycaOcxCa9Hh26/ETw9E194yPmvwAX6xP+CdVnuixBwA=; b=clSofSdB5E38Coys5ynRw41EYxdscOktbeSt88lVMTt3VjwVqReh+RFcukasIVIyzLcY8v CYDLmbfvRi5kiNbGpXIWWjvm5sRJ1RoCtduOTVhs71Et1Bag6oMjTHiL0Byzk/1RmJtsEo LZvfi6LoqaUE4cYN7GjILN4frwOLr+drHiMILefp6EtDzHVMajHBx1AJO4hVE/B6j6qdXn qH5j5iaKC/YFQAVk1MmL8Wi/6XVkASyDjpsvAwK+vsYDMV5WZdcvjtOzfPsflz2CReNVEx gVMkR12+20V1a+ehUJgD4iNjz5Z8qxDxOP4+QN7W28KghAdO44oIIIOvm5hwvA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748470761; a=rsa-sha256; cv=none; b=lM/w0kOzP25PYD0Ys2HXdysaChBNTWGjkgYSIc2FnTE05EaT0cpGJLepdUk8GxdzVoEsJQ wGJwrx5EZnKmUV7huwXucTnT0QJ2zm6FJTbEh9vy+JWgPJNoN0Zv61jH4BH9nciHwBQMjk 6gGIPzs9dcYr8rgfXk77vYGcpFH+sunib8QbQ+/ZUBwR3qzfv6YDOtrh6twToVtX8+ZPkB 5i5hwO9rUsFcdDWbp3YRDQzhhX9A1JlI32KLaJMil8bDc4YteuxvOv0V4tlBoJKj9jydwb HTkvlyEJ15d52Iu8vzWs7ih49ovxJjZL5JHh+7df1oupX4TMagAzSkAoUv/neA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748470761; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ycaOcxCa9Hh26/ETw9E194yPmvwAX6xP+CdVnuixBwA=; b=K1bO52hVVaiGu2WC7RqIcD6SKbyTqcednZhT/pwbqs6bH5oSw1qIu9RbriTJW7AGsv2CBm FPcxzJZb834Wrk2zEExUAq6rGp1Rno1FxYTXx2IAHXaTEwwKJ1usMUNtJmE+jsjUAcQcW7 68Jq9CPxEM9T5kMsddklXw3q04MYzxdWULki1O0vBcf4C4NqQDajWb2fi30BsyHWCdz/3l 2ZJ5l29NnYxZ7onHy129HHQBOS85Z9v3gnhKLfHWQdVR0YxV9v19Yip4kHTj7sZnhrG5n4 r5KwwPBa7jOBUenw9kXcTPHPg7SbFpOqHhx4KjyR7T8yddqkkypu96qep92DTA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b73nj42kyzw1N; Wed, 28 May 2025 22:19:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54SMJLH4093953; Wed, 28 May 2025 22:19:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54SMJLDC093950; Wed, 28 May 2025 22:19:21 GMT (envelope-from git) Date: Wed, 28 May 2025 22:19:21 GMT Message-Id: <202505282219.54SMJLDC093950@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Enji Cooper Subject: git: 19fb56b19244 - main - Revert "Mark several getaddrinfo tests as XFAIL" List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ngie X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 19fb56b192442552f2f57ef35de57f55b8d050ca Auto-Submitted: auto-generated The branch main has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=19fb56b192442552f2f57ef35de57f55b8d050ca commit 19fb56b192442552f2f57ef35de57f55b8d050ca Author: Enji Cooper AuthorDate: 2025-05-28 22:18:51 +0000 Commit: Enji Cooper CommitDate: 2025-05-28 22:18:51 +0000 Revert "Mark several getaddrinfo tests as XFAIL" This change was unreviewed and should not have been committed to :main. This reverts commit 9b37d84c87e69dabc69d818aa4d2fea718bd8b74. --- .../lib/libc/net/getaddrinfo/t_getaddrinfo.sh | 18 ------------------ lib/libc/tests/net/getaddrinfo/getaddrinfo.c | 6 ------ 2 files changed, 24 deletions(-) diff --git a/contrib/netbsd-tests/lib/libc/net/getaddrinfo/t_getaddrinfo.sh b/contrib/netbsd-tests/lib/libc/net/getaddrinfo/t_getaddrinfo.sh index e299702c790d..94a3c0b2e52c 100755 --- a/contrib/netbsd-tests/lib/libc/net/getaddrinfo/t_getaddrinfo.sh +++ b/contrib/netbsd-tests/lib/libc/net/getaddrinfo/t_getaddrinfo.sh @@ -68,12 +68,6 @@ basic_body() { TEST=$(atf_get_srcdir)/h_gai - # Begin FreeBSD - if [ "$(atf_config_get ci false)" = "true" ]; then - atf_expect_fail "https://bugs.freebsd.org/285826" - fi - # End FreeBSD - ( $TEST ::1 http $TEST 127.0.0.1 http $TEST localhost http @@ -134,12 +128,6 @@ empty_servname_body() { TEST=$(atf_get_srcdir)/h_gai - # Begin FreeBSD - if [ "$(atf_config_get ci false)" = "true" ]; then - atf_expect_fail "https://bugs.freebsd.org/285826" - fi - # End FreeBSD - ( $TEST ::1 '' $TEST 127.0.0.1 '' $TEST localhost '' @@ -157,12 +145,6 @@ sock_raw_body() { TEST=$(atf_get_srcdir)/h_gai - # Begin FreeBSD - if [ "$(atf_config_get ci false)" = "true" ]; then - atf_expect_fail "https://bugs.freebsd.org/285826" - fi - # End FreeBSD - ( $TEST -R -p 0 localhost '' $TEST -R -p 59 localhost '' $TEST -R -p 59 localhost 80 diff --git a/lib/libc/tests/net/getaddrinfo/getaddrinfo.c b/lib/libc/tests/net/getaddrinfo/getaddrinfo.c index 72e3c66c92ba..1e066add3119 100644 --- a/lib/libc/tests/net/getaddrinfo/getaddrinfo.c +++ b/lib/libc/tests/net/getaddrinfo/getaddrinfo.c @@ -94,9 +94,6 @@ ATF_TC_BODY(basic, tc) struct addrinfo *res; int rv; - if (atf_tc_get_config_var_as_bool_wd(tc, "ci", false)) - atf_tc_expect_fail("https://bugs.freebsd.org/285826"); - rv = getaddrinfo(goodname, NULL, &hints, &res); ATF_REQUIRE_MSG(rv == 0, "Expected 0, got %d (%s)", rv, gai_strerror(rv)); @@ -230,9 +227,6 @@ ATF_TC_BODY(nofamily, tc) struct addrinfo *res; int rv; - if (atf_tc_get_config_var_as_bool_wd(tc, "ci", false)) - atf_tc_expect_fail("https://bugs.freebsd.org/285826"); - rv = getaddrinfo(ipv6onlyname, NULL, &hints4, &res); ATF_REQUIRE_MSG(rv == EAI_ADDRFAMILY, "Expected %d (EAI_ADDRFAMILY), got %d (%s)", From nobody Thu May 29 09:05:14 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b7L6z0SRZz5xytr; Thu, 29 May 2025 09:05: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b7L6z003yz401C; Thu, 29 May 2025 09:05:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748509515; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9jirHtcgLjl6+CLM6TU/U53xOKiL/vIPjC0XnF41f7s=; b=kYPF0+EHxzac756IHG/kCXQJAn5REBXb/OLZLmAzS/v9itO1+B4324RuWDtHC/hH2X/gv8 e5PpP/qJvM0A91wEbneW3M+SGDiN+bK2M7IEEBV7hkTFeJyfACfkswR40bDitgKufBemDp R23TS6RknyidTIk3kPN+9Z+KjGx9eFg5BA7OiNYt8MorYpeQHBEFEXEaeJfzVmSLmRldvj NhBwmmhVI7dVryv+17RqCWSSMsUBX1j67xsLnVJdxm/jnSuWCs7c+0fseg11xBXPT0A7Hb 4CxjT0b7ko8Zsd/xFaM2fg2eDXUQg4aF7K6vqNuO9GumxICuD1dkbg/LsoiSQA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748509515; a=rsa-sha256; cv=none; b=ToAaDkEYAou0eMSEErW4PuoI/XGAYW5aFEO2wAi/tNXOciQR4vv9cfc/RAD9UWv8bGk3/j euwuDbb7tnhYXCj6D3oRRfNNdbAa0lJwlfarJAD/bvMaIpTUdrALb/6y94x4wwMeoIeImG 8jf1AFafTVgKHiNgTw3I+CroTCe/xm+ARHGX96abX/71Rcg9R6b4kqfCjL3EInza0fCkXR VLhi40V84RClLqMktTJQPQ1Klzs4laXVec00l9s/o59095mTSw9YyxmU5Ve0qxeJZzVKGi LgHjn53rghvv1eQW2NdqD8XVGvipt6pHs+M/4jXYIg4XM+vf3kOxIAX00cIR2Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748509515; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9jirHtcgLjl6+CLM6TU/U53xOKiL/vIPjC0XnF41f7s=; b=F78qKrG0pa0Na5/m/M4omGg4XcXwgxw3/+m4FHBWGpw7Ph6++N6T+rBkRVy8XHcTG4P24m C9XDzb3u7WxBlKQ1iNlc5OtKScvOaOGvseP4UkoNChVrK+Zxp1gFn2zIukscJ2WwG6awhM aknax+kTFIek9SwJ5ReMpuFzrHN8OOVMLZ2GFfBodeWFyL4xHBpmagNyTAzPr5zpe3vhKq HpLjagjclXrcUVJ9O7uMoQry2fqGdRdfF/Kb4ne8FOZ64HEvWMzZuRVqJbcZ0ARQnFJViA tRBJGm39yr3w5E0IjNqJoBQwmVXaQegLnpRiTva+jiY9p6G6YNvMZweGc7Xj4Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b7L6y65PPz1FQJ; Thu, 29 May 2025 09:05: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 54T95Emb011383; Thu, 29 May 2025 09:05:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54T95EnR011380; Thu, 29 May 2025 09:05:14 GMT (envelope-from git) Date: Thu, 29 May 2025 09:05:14 GMT Message-Id: <202505290905.54T95EnR011380@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: 562b1e79ba02 - main - pfctl: fix a comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 562b1e79ba024476e8e6dc472a438d60c83757a9 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=562b1e79ba024476e8e6dc472a438d60c83757a9 commit 562b1e79ba024476e8e6dc472a438d60c83757a9 Author: Kristof Provost AuthorDate: 2025-05-27 12:06:02 +0000 Commit: Kristof Provost CommitDate: 2025-05-29 07:14:54 +0000 pfctl: fix a comment Obtained from: OpenBSD, henning , a135ce1ad3 Sponsored by: Rubicon Communications, LLC ("Netgate") --- sbin/pfctl/pfctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/pfctl/pfctl.c b/sbin/pfctl/pfctl.c index 94aaaa315639..9320ca1aba03 100644 --- a/sbin/pfctl/pfctl.c +++ b/sbin/pfctl/pfctl.c @@ -2516,7 +2516,7 @@ pfctl_load_options(struct pfctl *pf) } /* - * If we've set the limit, but haven't explicitly set adaptive + * If we've set the states limit, but haven't explicitly set adaptive * timeouts, do it now with a start of 60% and end of 120%. */ if (pf->limit_set[PF_LIMIT_STATES] && From nobody Thu May 29 09:05:15 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b7L7127bYz5xyx8; Thu, 29 May 2025 09:05: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b7L703ZnGz40CT; Thu, 29 May 2025 09:05:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748509516; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TmJpTMkwdnCBvu55eNbjHq+QQwZnqrMR1SzQOniILGw=; b=CPz790jhIXyB6gKNCIZlXkNN25tjWDMoh1yMpTggB4Xs99QEsW8ClemYYSY7qAdYiA6ns8 7PGQIwiEHmA+Ja/sEJlHm5Ho1YegML6gF6BqsWE+8NES09X3viz2IKimiYZ63vq5qOfk6a 485Tv9zfYHieiydV5c/QJuwMr3QKobrGTiA1UHck2Pw6o11Sfe6dEwMGQu1mr3DSkD5M34 Scz1DHUmrUf1hCrF1MQv386Vnj2xmXPao+jpsunTVU32UtVoALwtGZ3agDcryEPvksJsfc PL2rIfeU0sVet1mnFuPw396JP9lu0yylFzouFIh8nHrPSz7cK23hfkh3ePQgjA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748509516; a=rsa-sha256; cv=none; b=rMDkR3xyR9Aqgu/TirbxuXZQJP8R113SAXEtP4KRac5gg1m62EcY3rxw8UphF38CLcLf5P jcoE3BA1oScRNSYYXE8mfftzbStDsT24QTNobysaaJ5o9ZKYhCLstTRoDXNXPuX35w3Pn4 pCkgeCGa7+s9XFdMxUPx9JKonDdMuUkzQSqJtek91yAoVY0+B9RvVNIBiASC1ZfVAxIk5q ydLIkQaKvf8Ths5MGDEHeJJ/xDZ4+k0Xo7UZRPL1uHVgcDHlW7O/B81WXokEsV1lcdvoi+ 58tmIhHRhkXPjTV1KjqTubMRn+FZE5jvdiFw+tk76YYjSO8/fdDlLS9cS0+QGg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748509516; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TmJpTMkwdnCBvu55eNbjHq+QQwZnqrMR1SzQOniILGw=; b=ZQS9XTJw4QIcUYCd/uAwjhNixiq1bUoRBff/oidaXgpQQ8vIqW+GTjIZXJZ8Ko6Z47Zja8 mUjKIiXL260kG2hV+EDsdIYnOzFCMuN6j0p4p8fl5a+ig8/FEuCSzHmhufoRDIiESGg/LZ TfLH1bfHTGwIvGsonkqyo4FqDKDcFMK4BmW91DYt9UI5U5Bp1iPlYWpcZmn9mFNsbHYXr6 Wk6R+ewoEhil9Mg4I77B/oxmVQjxUu01ya6MdtBcpSAsfnTfEnS1i0NZaSlUbYyLWrc/h3 aiHKyQsKnpbJDYTbXLYkTvXuyimBuyI00jsONF6Yzf8uNp97D19osv787LVY2Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b7L6z696mz1G0T; Thu, 29 May 2025 09:05: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 54T95FTT011421; Thu, 29 May 2025 09:05:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54T95Fqr011418; Thu, 29 May 2025 09:05:15 GMT (envelope-from git) Date: Thu, 29 May 2025 09:05:15 GMT Message-Id: <202505290905.54T95Fqr011418@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: 0ad26d40a403 - main - pf: remove XXX from the comments marking "holes" in the ioctls List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 0ad26d40a403fabe578d8ab3133c9f222a5168bf Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=0ad26d40a403fabe578d8ab3133c9f222a5168bf commit 0ad26d40a403fabe578d8ab3133c9f222a5168bf Author: Kristof Provost AuthorDate: 2025-05-27 12:11:17 +0000 Commit: Kristof Provost CommitDate: 2025-05-29 07:14:58 +0000 pf: remove XXX from the comments marking "holes" in the ioctls I see very very little value in these comments at all, but the XXX is just wrong and in the way when looking for real XXXs. phessler agrees Obtained from: OpenBSD, henning , a44a24888a Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/net/pfvar.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h index 1cdd575366e8..82d74e08c14f 100644 --- a/sys/net/pfvar.h +++ b/sys/net/pfvar.h @@ -2059,7 +2059,6 @@ struct pfioc_iface { #define DIOCADDRULENV _IOWR('D', 4, struct pfioc_nv) #define DIOCGETRULES _IOWR('D', 6, struct pfioc_rule) #define DIOCGETRULENV _IOWR('D', 7, struct pfioc_nv) -/* XXX cut 8 - 17 */ #define DIOCCLRSTATESNV _IOWR('D', 18, struct pfioc_nv) #define DIOCGETSTATE _IOWR('D', 19, struct pfioc_state) #define DIOCGETSTATENV _IOWR('D', 19, struct pfioc_nv) @@ -2072,7 +2071,6 @@ struct pfioc_iface { #define DIOCGETSTATES _IOWR('D', 25, struct pfioc_states) #endif #define DIOCCHANGERULE _IOWR('D', 26, struct pfioc_rule) -/* XXX cut 26 - 28 */ #define DIOCSETTIMEOUT _IOWR('D', 29, struct pfioc_tm) #define DIOCGETTIMEOUT _IOWR('D', 30, struct pfioc_tm) #define DIOCADDSTATE _IOWR('D', 37, struct pfioc_state) @@ -2097,7 +2095,6 @@ struct pfioc_iface { #define DIOCGETADDRS _IOWR('D', 53, struct pfioc_pooladdr) #define DIOCGETADDR _IOWR('D', 54, struct pfioc_pooladdr) #define DIOCCHANGEADDR _IOWR('D', 55, struct pfioc_pooladdr) -/* XXX cut 55 - 57 */ #define DIOCGETRULESETS _IOWR('D', 58, struct pfioc_ruleset) #define DIOCGETRULESET _IOWR('D', 59, struct pfioc_ruleset) #define DIOCRCLRTABLES _IOWR('D', 60, struct pfioc_table) From nobody Thu May 29 09:05:16 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b7L722bfMz5xynW; Thu, 29 May 2025 09:05: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b7L714Z1pz40Bx; Thu, 29 May 2025 09:05:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748509517; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=moME/v3ATcyNX8wwA3O5rA/of6BbexybI/xffOXj7F4=; b=EP6ULxyHJLr4+hEDpiMdqkQ9isJ7nhRfhmZAboM59TzmS+TFrEGRqVTdhiuzwxlPUtCfH/ BIx6aAMCoi6UlJhp7aVuQ4yu+1YJMtrsYPpYrLe4jIOaiMqpuiekFUnCob0GrexLQhlzbp DKkrPiefTr37IYjNFyVXWpv1dkm3lwzp1cc1c0ej2iYFcI3dAAZ8lNDfKEIZ2aUxgpluAo 30jBrKg8rQhzXJPyv4OFbQAfsdUtkukknopP9qL9p74C6WXHGt2mxUTJBFI6pKDYyswY62 GPnetN6tMZkOPaRFWrBpYZKgaNdG42okUCxHcKfyiFgBEksjWw2hRbuTH+VkWQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748509517; a=rsa-sha256; cv=none; b=f0LnvU5NpC09xIhchKwSKt5VEHTd3BBEDjrBrBcPzGKGhxAq2xZEiO6rwY/SdrfQ3IWeEV Pv9IZRxlICf4ZLDL6kgjxRckGGQ+9Uq0uGlxEFL8dmhPpthCXKxgjpEoJ8At7fqfd1u5HE mTakO71EoBo4U2p7p2gXRdVvs2VT/USC6BEM0+9fPWo+bWDGoUsGj3XTp2SX9CCN2BJPqw C+SL7MMzm3GARAHFYDQ6NxbpFRRNO1SqSZlZ2Lb/q8Tx6eN2UsMzgW7xmFCWXQuXvReFBY ld5OlSe/ba7/IzVoDbrevbQpCTIjBOkbULd1EltGc6+SM5PqIf5AL/VFi8vB1A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748509517; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=moME/v3ATcyNX8wwA3O5rA/of6BbexybI/xffOXj7F4=; b=cL5p6NL2TGGxicHyaERBE6IRN2ilWUA+lYGWymIAUJKIDtM1Fl+CRCa5DvvE6FH49LWPOp AN4g5tKXHr/OdsFJDHQ5/TaClJGGLS9VOXMYgGiDwKGsIEwIY0q9aMSNz26BTBC2BhLZ8c LJvEiVe35aTujKCCfCZQi4YLeAzJ0RTtiUv7J3CKV8Mtn3fb2aMJbPiZC95oUczUf2GryL qqJD+W68fpJJXKnyquMlVA1y3GZhEhbpl866Pa5OZkEuOtzvMUozTebicamU5mLmCNXZGe T5jDQPkt0XS0XGPwcLsql9HBiiGO73HCnKlty6kVmda3PCqyv/PC/VffE/rF9g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b7L710HmNz1FDq; Thu, 29 May 2025 09:05: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 54T95GTv011456; Thu, 29 May 2025 09:05:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54T95GKN011453; Thu, 29 May 2025 09:05:16 GMT (envelope-from git) Date: Thu, 29 May 2025 09:05:16 GMT Message-Id: <202505290905.54T95GKN011453@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: dd06ff741938 - main - pfctl: void functions discarding ret values List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: dd06ff7419387513a7436fafb41db75ab54d7707 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=dd06ff7419387513a7436fafb41db75ab54d7707 commit dd06ff7419387513a7436fafb41db75ab54d7707 Author: Kristof Provost AuthorDate: 2025-05-28 13:04:12 +0000 Commit: Kristof Provost CommitDate: 2025-05-29 07:15:22 +0000 pfctl: void functions discarding ret values Transform the following functions (which never return anything other than 0, and whose return value is never used) to void: pfctl_clear_stats, pfctl_get_skip_ifaces, pfctl_check_skip_ifaces, pfctl_adjust_skip_ifaces, pfctl_clear_interface_flags, pfctl_flush_eth_rules, pfctl_flush_rules, pfctl_flush_nat, pfctl_clear_src_nodes, pfctl_clear_iface_states, pfctl_kill_src_nodes, pfctl_net_kill_states, pfctl_gateway_kill_states, pfctl_label_kill_states, pfctl_id_kill_states and pfctl_key_kill_states Submitted by rain1 (thanks!) with additional credit to: - mikeb@ for pointing out we can void all _clear_ functions - ghostyy for pointing out all _kill_ functions can be voided OK tb@, mikeb@ Obtained from: OpenBSD, awolk , 7363dae4f9 Sponsored by: Rubicon Communications, LLC ("Netgate") --- sbin/pfctl/pfctl.c | 88 ++++++++++++++++++++---------------------------------- 1 file changed, 33 insertions(+), 55 deletions(-) diff --git a/sbin/pfctl/pfctl.c b/sbin/pfctl/pfctl.c index 9320ca1aba03..32b957cbc889 100644 --- a/sbin/pfctl/pfctl.c +++ b/sbin/pfctl/pfctl.c @@ -66,24 +66,24 @@ void usage(void); int pfctl_enable(int, int); int pfctl_disable(int, int); -int pfctl_clear_stats(struct pfctl_handle *, int); -int pfctl_get_skip_ifaces(void); -int pfctl_check_skip_ifaces(char *); -int pfctl_adjust_skip_ifaces(struct pfctl *); -int pfctl_clear_interface_flags(int, int); -int pfctl_flush_eth_rules(int, int, char *); -int pfctl_flush_rules(int, int, char *); -int pfctl_flush_nat(int, int, char *); +void pfctl_clear_stats(struct pfctl_handle *, int); +void pfctl_get_skip_ifaces(void); +void pfctl_check_skip_ifaces(char *); +void pfctl_adjust_skip_ifaces(struct pfctl *); +void pfctl_clear_interface_flags(int, int); +void pfctl_flush_eth_rules(int, int, char *); +void pfctl_flush_rules(int, int, char *); +void pfctl_flush_nat(int, int, char *); int pfctl_clear_altq(int, int); -int pfctl_clear_src_nodes(int, int); -int pfctl_clear_iface_states(int, const char *, int); +void pfctl_clear_src_nodes(int, int); +void pfctl_clear_iface_states(int, const char *, int); void pfctl_addrprefix(char *, struct pf_addr *); -int pfctl_kill_src_nodes(int, const char *, int); -int pfctl_net_kill_states(int, const char *, int); -int pfctl_gateway_kill_states(int, const char *, int); -int pfctl_label_kill_states(int, const char *, int); -int pfctl_id_kill_states(int, const char *, int); -int pfctl_key_kill_states(int, const char *, int); +void pfctl_kill_src_nodes(int, const char *, int); +void pfctl_net_kill_states(int, const char *, int); +void pfctl_gateway_kill_states(int, const char *, int); +void pfctl_label_kill_states(int, const char *, int); +void pfctl_id_kill_states(int, const char *, int); +void pfctl_key_kill_states(int, const char *, int); int pfctl_parse_host(char *, struct pf_rule_addr *); void pfctl_init_options(struct pfctl *); int pfctl_load_options(struct pfctl *); @@ -354,7 +354,7 @@ pfctl_disable(int dev, int opts) return (0); } -int +void pfctl_clear_stats(struct pfctl_handle *h, int opts) { int ret; @@ -362,10 +362,9 @@ pfctl_clear_stats(struct pfctl_handle *h, int opts) errc(1, ret, "DIOCCLRSTATUS"); if ((opts & PF_OPT_QUIET) == 0) fprintf(stderr, "pf: statistics cleared\n"); - return (0); } -int +void pfctl_get_skip_ifaces(void) { bzero(&skip_b, sizeof(skip_b)); @@ -378,10 +377,9 @@ pfctl_get_skip_ifaces(void) if (skip_b.pfrb_size <= skip_b.pfrb_msize) break; } - return (0); } -int +void pfctl_check_skip_ifaces(char *ifname) { struct pfi_kif *p; @@ -403,10 +401,9 @@ pfctl_check_skip_ifaces(char *ifname) } } } - return (0); } -int +void pfctl_adjust_skip_ifaces(struct pfctl *pf) { struct pfi_kif *p, *pp; @@ -439,11 +436,9 @@ pfctl_adjust_skip_ifaces(struct pfctl *pf) pfctl_set_interface_flags(pf, p->pfik_name, PFI_IFLAG_SKIP, 0); } - - return (0); } -int +void pfctl_clear_interface_flags(int dev, int opts) { struct pfioc_iface pi; @@ -457,10 +452,9 @@ pfctl_clear_interface_flags(int dev, int opts) if ((opts & PF_OPT_QUIET) == 0) fprintf(stderr, "pf: interface flags reset\n"); } - return (0); } -int +void pfctl_flush_eth_rules(int dev, int opts, char *anchorname) { int ret; @@ -471,11 +465,9 @@ pfctl_flush_eth_rules(int dev, int opts, char *anchorname) if ((opts & PF_OPT_QUIET) == 0) fprintf(stderr, "Ethernet rules cleared\n"); - - return (ret); } -int +void pfctl_flush_rules(int dev, int opts, char *anchorname) { int ret; @@ -485,10 +477,9 @@ pfctl_flush_rules(int dev, int opts, char *anchorname) err(1, "pfctl_clear_rules"); if ((opts & PF_OPT_QUIET) == 0) fprintf(stderr, "rules cleared\n"); - return (0); } -int +void pfctl_flush_nat(int dev, int opts, char *anchorname) { int ret; @@ -498,7 +489,6 @@ pfctl_flush_nat(int dev, int opts, char *anchorname) err(1, "pfctl_clear_nat"); if ((opts & PF_OPT_QUIET) == 0) fprintf(stderr, "nat cleared\n"); - return (0); } int @@ -519,17 +509,16 @@ pfctl_clear_altq(int dev, int opts) return (0); } -int +void pfctl_clear_src_nodes(int dev, int opts) { if (ioctl(dev, DIOCCLRSRCNODES)) err(1, "DIOCCLRSRCNODES"); if ((opts & PF_OPT_QUIET) == 0) fprintf(stderr, "source tracking entries cleared\n"); - return (0); } -int +void pfctl_clear_iface_states(int dev, const char *iface, int opts) { struct pfctl_kill kill; @@ -548,7 +537,6 @@ pfctl_clear_iface_states(int dev, const char *iface, int opts) errc(1, ret, "DIOCCLRSTATES"); if ((opts & PF_OPT_QUIET) == 0) fprintf(stderr, "%d states cleared\n", killed); - return (0); } void @@ -601,7 +589,7 @@ pfctl_addrprefix(char *addr, struct pf_addr *mask) freeaddrinfo(res); } -int +void pfctl_kill_src_nodes(int dev, const char *iface, int opts) { struct pfioc_src_node_kill psnk; @@ -701,10 +689,9 @@ pfctl_kill_src_nodes(int dev, const char *iface, int opts) if ((opts & PF_OPT_QUIET) == 0) fprintf(stderr, "killed %d src nodes from %d sources and %d " "destinations\n", killed, sources, dests); - return (0); } -int +void pfctl_net_kill_states(int dev, const char *iface, int opts) { struct pfctl_kill kill; @@ -817,10 +804,9 @@ pfctl_net_kill_states(int dev, const char *iface, int opts) if ((opts & PF_OPT_QUIET) == 0) fprintf(stderr, "killed %d states from %d sources and %d " "destinations\n", killed, sources, dests); - return (0); } -int +void pfctl_gateway_kill_states(int dev, const char *iface, int opts) { struct pfctl_kill kill; @@ -881,10 +867,9 @@ pfctl_gateway_kill_states(int dev, const char *iface, int opts) if ((opts & PF_OPT_QUIET) == 0) fprintf(stderr, "killed %d states\n", killed); - return (0); } -int +void pfctl_label_kill_states(int dev, const char *iface, int opts) { struct pfctl_kill kill; @@ -912,11 +897,9 @@ pfctl_label_kill_states(int dev, const char *iface, int opts) if ((opts & PF_OPT_QUIET) == 0) fprintf(stderr, "killed %d states\n", killed); - - return (0); } -int +void pfctl_id_kill_states(int dev, const char *iface, int opts) { struct pfctl_kill kill; @@ -952,11 +935,9 @@ pfctl_id_kill_states(int dev, const char *iface, int opts) if ((opts & PF_OPT_QUIET) == 0) fprintf(stderr, "killed %d states\n", killed); - - return (0); } -int +void pfctl_key_kill_states(int dev, const char *iface, int opts) { struct pfctl_kill kill; @@ -1014,8 +995,6 @@ pfctl_key_kill_states(int dev, const char *iface, int opts) if ((opts & PF_OPT_QUIET) == 0) fprintf(stderr, "killed %d states\n", killed); - - return (0); } int @@ -3433,8 +3412,7 @@ main(int argc, char *argv[]) if ((rulesopt != NULL) && (loadopt & PFCTL_FLAG_OPTION) && !anchorname[0] && !(opts & PF_OPT_NOACTION)) - if (pfctl_get_skip_ifaces()) - error = 1; + pfctl_get_skip_ifaces(); if (rulesopt != NULL && !(opts & PF_OPT_MERGE) && !anchorname[0] && (loadopt & PFCTL_FLAG_OPTION)) From nobody Thu May 29 09:05:18 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b7L7269Zwz5y00K; Thu, 29 May 2025 09:05: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b7L7221pbz40CG; Thu, 29 May 2025 09:05:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748509518; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Z/cFRy3SdMrTX0dD7PXSh3g7555aONpMT+n20tu3vWs=; b=Zja6AcPK7L+++PoxB0bjMeQHtM+ukll6gio9h90ias1IQ6/Pih7/hMTA4/tlWxjowHN32U 8Hb4XRhrA+hvlpN0er25WvHKM8BfiBFj1qO7Hzq1aQgjuiIyH5tDdH/F+mXrGWid+kNbtO eEM6HZejtCgMQfNw/DpBvsHucf7ls1tMYn17PyP3V2YXMO4HDEs7FrC/MzxG9hbfKCuOSh E0aQVTxZx3MNFgNVpUmYIE0Dm3NRtUYHb+860ALeLmOkDjCY4qO4MC0wX/WKmCYXs+gFZn OZk+cHxK0R4YpCIvBkdv0m6ciRbVSHrifKNAOeCBrjHc9DcZ8rdDZUIz+wdb+w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748509518; a=rsa-sha256; cv=none; b=Qr1aiKcMgDCoBeP+G73ZAQSHdZG3K3KWt8ETeOPi7HIPN33UjtJWDOL3eT6HPVn1ZKOwk6 JKTFp8R3O50TxZzB+ApxX51KM9CBq+HkODi9hxOR1NY2Eh5l7VMjxfZx6DYjG/um8ckCQ2 xlHsOgtPH+AnFLNmc4UoMWy1gl3REebTMTpz/4hrLbBrXgx1gyIQCc48bhPJ4Ka047LO4e 3Vl9jq+f0/DdiUZS38OslilQD9AUz0TOjFPKKTPkyHe7f3WztMplRU0rgCRqLtMe3M2QPz URiDir+WFSx96OT2D3eFyT1f0XrDHqdyRdXyhLDupExpykbF1+/lbCyDLr2r4A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748509518; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Z/cFRy3SdMrTX0dD7PXSh3g7555aONpMT+n20tu3vWs=; b=YjM4grDfTniF2X/SgnREOIhYcgjhoZYoIUIqbZ3AzO9MMOf8E/YAbpi+F4zdXDv2JHIBjX WdbgM5su3qzWPeLs9a3NyF0kiisl5vW+2SjolVpzweXt8Yh43H2zM6TPzYxWIyGSzzOfYd i6apTCI+RoDA4FoHMRg5Mcfr0PnXPTInS24EZc43z2Fhfg0H15ZJC7FObW/w0sBcWMomPQ YHhv7Jn2q7GaSpHYFBYsj9o4oWx+L0Bgnm4U5aI7E6sknVpa9NZwYmKTn+1muwStFIVoJy O9ADA4+mX+Q+ovjn5bHNy5YuKWtAw/71ATkmfuD/2TUuHSACgFKCGWsuggqsiQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b7L721F2jz1FQK; Thu, 29 May 2025 09:05: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 54T95Ih3011490; Thu, 29 May 2025 09:05:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54T95I2b011487; Thu, 29 May 2025 09:05:18 GMT (envelope-from git) Date: Thu, 29 May 2025 09:05:18 GMT Message-Id: <202505290905.54T95I2b011487@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: 460729900299 - main - pf tests: make sctp:related_icmp test more robust List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 460729900299ed31059ffef99e1ae9a9212f8def Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=460729900299ed31059ffef99e1ae9a9212f8def commit 460729900299ed31059ffef99e1ae9a9212f8def Author: Kristof Provost AuthorDate: 2025-05-29 08:31:23 +0000 Commit: Kristof Provost CommitDate: 2025-05-29 08:31:23 +0000 pf tests: make sctp:related_icmp test more robust Send more data (i.e. more than one large packet) to the SCTP server so rtr2 generates more than one ICMP error message. Sponsored by: Rubicon Communications, LLC ("Netgate") --- tests/sys/netpfil/pf/sctp.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/sys/netpfil/pf/sctp.sh b/tests/sys/netpfil/pf/sctp.sh index 563103827fac..14cd49dfb1f5 100644 --- a/tests/sys/netpfil/pf/sctp.sh +++ b/tests/sys/netpfil/pf/sctp.sh @@ -818,10 +818,10 @@ related_icmp_body() # Generate traffic that will be fragmented by rtr2, and will provoke an # ICMP unreachable - need to frag (mtu 1300) message - dd if=/dev/random bs=1600 count=1 | nc --sctp -N -w 3 203.0.113.2 1234 + dd if=/dev/random bs=10000 count=1 | nc --sctp -N -w 3 203.0.113.2 1234 # We'd expect to see an ICMP message - atf_check -s exit:0 -o match:".*destination unreachable: 1" \ + atf_check -s exit:0 -o match:".*destination unreachable: [1-9]" \ netstat -s -p icmp } From nobody Thu May 29 10:20:39 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b7Mnz6R29z5y3Ps; Thu, 29 May 2025 10:20: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b7Mnz5WQlz3tDP; Thu, 29 May 2025 10:20:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748514039; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=y0dTvSF+qF6aUC8cJDoktNMwRTc72/T0Yf3DFTOtPDc=; b=u7MdV20jLLEzuVcXo+Pm+frVQ96kFnK+6el4xQBnSUIOulWm691JUYdrUr2/90ak/K+LIi aLZVceJ0WAn/HFPPe3/Y5pzJq9Pwx/eyD1YB3K+BIfeggxmvzvG4KtREt9gDAjKuuwNpMF JMYLmwdv5Uj7112pRYS/H4N8eLN497O2h/hbRhb05xnCA6FoyrWydEWpkq1v5ZoP0NPhva sHaDPlUT5Ar7oVq/KmAKzyGrlwdkTewP0ivJ9EsPkPF8Qjl6f9z7PfAhELkn+wJL5Xz/uX 9ICNxDcJj67YIz+X+cMTGzu5a/L+25ad9in2RypoZnw3qQR/PoItgoSRXrLYHQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748514039; a=rsa-sha256; cv=none; b=QjWdnwlrf2jwGriRlkxSPcPua8/QdQn4d6RDKAE5W+yUaYRvCf2kGDtX3wutW2NJ9aluML +90/Uv+Fr7l8fi4XBy183pwL9x2KjODwsfm7CeI1xL1r+x4KJ1pZdvIFJd+0bgqi9eW/4w iJErRtGTgmLdElthG7SyEaOeOldNyZEhHrMOUx45r1yaoke82ltxGzQxnXXnKJI12K0fFw ftuCWl+/np98aTNGy7sbOCk3kl+6zQK0qBSROjW2Zk4GIkt1fYd7fJjQ+n576TtKaOVE8W pzy2CrZ//EszpBDp9fotj0BInJL+0cksdERIoHsJqk4SFbREx46vt0V/Li4DNw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748514039; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=y0dTvSF+qF6aUC8cJDoktNMwRTc72/T0Yf3DFTOtPDc=; b=sCRpD8BXfOKEx9JUgod1KEX7n4P/hGhGJNaAqt3HKLC9pXMa7Y0rJDPyEf3l3WniFX7df2 EKVlZXFVyK/O5DN8pP8DdCFWPKm8tlV/6iHnRQyn3T/fAXgd7ZCBsmBl74TrsPxkpInsQh CZ/j0mvXfGyrYgSYHq9fvFCRMhMqtRhKSwPSGBjxZX679aYp87wSkSOdV8HrUHG6JZl4EZ t2zmWzf57OSwxhAsdpXXhRd0L00oZR+Eaxzd/YW8MYTWsVqlFAiA3EM+6ohusUOsGkxKPM qhQnzslqtimOXCot9DFlZ4yi9g93G9hh/JStc6vOtCE6xs/brkeVvR5RsZdjhA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b7Mnz56HYz1HRH; Thu, 29 May 2025 10:20: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 54TAKdj1052570; Thu, 29 May 2025 10:20:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54TAKdDY052567; Thu, 29 May 2025 10:20:39 GMT (envelope-from git) Date: Thu, 29 May 2025 10:20:39 GMT Message-Id: <202505291020.54TAKdDY052567@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Oskar Holmlund Subject: git: 781a630db6fe - main - Restore #include List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: oh X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 781a630db6fecfb26ab5e3ee97b4d9b4c87de406 Auto-Submitted: auto-generated The branch main has been updated by oh: URL: https://cgit.FreeBSD.org/src/commit/?id=781a630db6fecfb26ab5e3ee97b4d9b4c87de406 commit 781a630db6fecfb26ab5e3ee97b4d9b4c87de406 Author: Oskar Holmlund AuthorDate: 2025-05-29 10:14:25 +0000 Commit: Oskar Holmlund CommitDate: 2025-05-29 10:14:25 +0000 Restore #include Partial revert https://reviews.freebsd.org/D50017 These files still use devmap_add_entry() and needs sys/devmap.h Reviewed by: andrew Approved by: manu (mentor) Differential revision: https://reviews.freebsd.org/D50574 --- sys/arm/annapurna/alpine/alpine_machdep.c | 1 + sys/arm/freescale/vybrid/vf_machdep.c | 1 + sys/arm/qualcomm/ipq4018_machdep.c | 1 + sys/arm/ti/ti_machdep.c | 1 + 4 files changed, 4 insertions(+) diff --git a/sys/arm/annapurna/alpine/alpine_machdep.c b/sys/arm/annapurna/alpine/alpine_machdep.c index a4e51d339354..89d21bf9fcae 100644 --- a/sys/arm/annapurna/alpine/alpine_machdep.c +++ b/sys/arm/annapurna/alpine/alpine_machdep.c @@ -32,6 +32,7 @@ #include #include #include +#include #include #include diff --git a/sys/arm/freescale/vybrid/vf_machdep.c b/sys/arm/freescale/vybrid/vf_machdep.c index fe36558b7ece..2ab14f5154eb 100644 --- a/sys/arm/freescale/vybrid/vf_machdep.c +++ b/sys/arm/freescale/vybrid/vf_machdep.c @@ -30,6 +30,7 @@ #include #include +#include #include diff --git a/sys/arm/qualcomm/ipq4018_machdep.c b/sys/arm/qualcomm/ipq4018_machdep.c index c0131d08dee6..49dd2ff0193a 100644 --- a/sys/arm/qualcomm/ipq4018_machdep.c +++ b/sys/arm/qualcomm/ipq4018_machdep.c @@ -31,6 +31,7 @@ #include #include #include +#include #include #include diff --git a/sys/arm/ti/ti_machdep.c b/sys/arm/ti/ti_machdep.c index ee4f416eeded..29afcb7d9b59 100644 --- a/sys/arm/ti/ti_machdep.c +++ b/sys/arm/ti/ti_machdep.c @@ -42,6 +42,7 @@ #include #include #include +#include #include #include From nobody Thu May 29 10:25:25 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b7MvV2t0Tz5y3cQ; Thu, 29 May 2025 10:25: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b7MvT5MPFz3xM6; Thu, 29 May 2025 10:25:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748514325; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=x3WeQJgTBKKZCsG7kajIcjwZKcfS/dW5ctmxX4G1EEo=; b=Gu4zkoQvGXvL2okgG4+/41ACbG58AW9FIraWoJ+ixhyT0rlSB/AxwmJPucMrShREKlQMGF euFCOdJitrM/z/yks6MXb7DBY5mJ2B6A61WalU9tmGV2Y+bOd0Qx3gp2uNUm77wZePojXu qF8a8PBQWMGCitk2iPXk2+jIDH9gAfscmQzNZVzSnKCJ5WI0JzEvaqOxgzlRYJM1tA2U5k xiLGAmh7PcCbnawBjKsK0wSIbssDTq6NfWq0DfK64J3PEakIcR6cHmIeV8+p8TT24zcafE 5Zr1eD+zC0hqEG7RVbgoIo3V8aYF+8HVXFneASYPwy8ksY5xO7WJIVeKBIEKMQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748514325; a=rsa-sha256; cv=none; b=AWdvShClQDD6x6ivu7ytTwN8naKG2SMVXYiaGhtqWVATUDz+ACZwbx1CqBiE6trfJDObxO JSdoLvHjizMxi4L67rJxFgOPBcZTgLE9sPHFufyCVe15slvJC4O5+vioWIbf+Bsx6FzcnN uoHoQEaRuo+lLCZzqVF6cKr/04qfCa1x1kfkrGbCtgmybpcY5iVEdRjvNSkFaYsi9Bsi2A d49qRC+8ssI70lhvpMadfrmyQGzZEtFIfh9TUX5waNwnkluGrFmsweM+/aPXwyrdh8HjtE x2xPo41oP10WenlwetHuC+3GnMX4CCUMVWIzL4zm+DRkx3Rjn88AoJH2qMg3FA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748514325; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=x3WeQJgTBKKZCsG7kajIcjwZKcfS/dW5ctmxX4G1EEo=; b=K7TLjWrRVCKCDtjZ3o0R4wNVNM8cnjSSs3nSzls7VHgmw3UU3O6xJnDhaueL7uRuV/iQgm EDMcvGlyG5L+fj6TqbKwtJLKDvUIbaogtmWDIoC+KPi9KIkVYJyZQN1LS14tiojgV6K91h Jd37W40NMDjTOYYy54ZrA+CoqrxtZ7Sr7Y6JlRmA5Ga5nHc+RbTebhVie14KLLkjaigc8+ mk1SZl+iibPpTUDxko912WGvgCjE116G/RfcUozihd15zfeOCUvIqiAbjau8VpXXnHK7BC a/bYOM6U9nWIYa2m9ZjXaePP92qnXDV0Bj9rOEd86bh9+0A83YLnntj8fRHK5w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b7MvT4Rdzz1HgJ; Thu, 29 May 2025 10:25: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 54TAPP21061027; Thu, 29 May 2025 10:25:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54TAPPIY061024; Thu, 29 May 2025 10:25:25 GMT (envelope-from git) Date: Thu, 29 May 2025 10:25:25 GMT Message-Id: <202505291025.54TAPPIY061024@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: a946852ff296 - main - sound: Merge pcm_sysinit() with pcm_register() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: a946852ff2963b5ec83cb7ccb5eee214b1d47ad5 Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=a946852ff2963b5ec83cb7ccb5eee214b1d47ad5 commit a946852ff2963b5ec83cb7ccb5eee214b1d47ad5 Author: Christos Margiolis AuthorDate: 2025-05-29 10:24:08 +0000 Commit: Christos Margiolis CommitDate: 2025-05-29 10:25:18 +0000 sound: Merge pcm_sysinit() with pcm_register() There is no need for a separate function here. No functional change intended. Sponsored by: The FreeBSD Foundation MFC after: 1 day Reviewed by: adrian, markj Differential Revision: https://reviews.freebsd.org/D50409 --- sys/dev/sound/pcm/sound.c | 67 ++++++++++++++++++++--------------------------- 1 file changed, 29 insertions(+), 38 deletions(-) diff --git a/sys/dev/sound/pcm/sound.c b/sys/dev/sound/pcm/sound.c index e690b53c411d..cb510d526fa8 100644 --- a/sys/dev/sound/pcm/sound.c +++ b/sys/dev/sound/pcm/sound.c @@ -57,8 +57,6 @@ SYSCTL_INT(_hw_snd, OID_AUTO, default_auto, CTLFLAG_RWTUN, SYSCTL_NODE(_hw, OID_AUTO, snd, CTLFLAG_RD | CTLFLAG_MPSAFE, 0, "Sound driver"); -static void pcm_sysinit(device_t); - /** * @brief Unit number allocator for syncgroup IDs */ @@ -351,41 +349,6 @@ sysctl_dev_pcm_mode(SYSCTL_HANDLER_ARGS) return (sysctl_handle_int(oidp, &mode, 0, req)); } -static void -pcm_sysinit(device_t dev) -{ - struct snddev_info *d = device_get_softc(dev); - - sysctl_ctx_init(&d->play_sysctl_ctx); - d->play_sysctl_tree = SYSCTL_ADD_NODE(&d->play_sysctl_ctx, - SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO, "play", - CTLFLAG_RD | CTLFLAG_MPSAFE, 0, "playback channels node"); - sysctl_ctx_init(&d->rec_sysctl_ctx); - d->rec_sysctl_tree = SYSCTL_ADD_NODE(&d->rec_sysctl_ctx, - SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO, "rec", - CTLFLAG_RD | CTLFLAG_MPSAFE, 0, "recording channels node"); - - /* XXX: a user should be able to set this with a control tool, the - sysadmin then needs min+max sysctls for this */ - SYSCTL_ADD_UINT(device_get_sysctl_ctx(dev), - SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), - OID_AUTO, "buffersize", CTLFLAG_RD, &d->bufsz, 0, "allocated buffer size"); - SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev), - SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO, - "bitperfect", CTLTYPE_INT | CTLFLAG_RWTUN | CTLFLAG_MPSAFE, d, - sizeof(d), sysctl_dev_pcm_bitperfect, "I", - "bit-perfect playback/recording (0=disable, 1=enable)"); - SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev), - SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO, - "mode", CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_MPSAFE, d, sizeof(d), - sysctl_dev_pcm_mode, "I", - "mode (1=mixer, 2=play, 4=rec. The values are OR'ed if more than " - "one mode is supported)"); - vchan_initsys(dev); - if (d->flags & SD_F_EQ) - feeder_eq_initsys(dev); -} - /* * Basic initialization so that drivers can use pcm_addchan() before * pcm_register(). @@ -455,7 +418,35 @@ pcm_register(device_t dev, char *str) * Create all sysctls once SD_F_REGISTERED is set else * tunable sysctls won't work: */ - pcm_sysinit(dev); + sysctl_ctx_init(&d->play_sysctl_ctx); + d->play_sysctl_tree = SYSCTL_ADD_NODE(&d->play_sysctl_ctx, + SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO, "play", + CTLFLAG_RD | CTLFLAG_MPSAFE, 0, "playback channels node"); + sysctl_ctx_init(&d->rec_sysctl_ctx); + d->rec_sysctl_tree = SYSCTL_ADD_NODE(&d->rec_sysctl_ctx, + SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO, "rec", + CTLFLAG_RD | CTLFLAG_MPSAFE, 0, "recording channels node"); + + /* XXX: a user should be able to set this with a control tool, the + sysadmin then needs min+max sysctls for this */ + SYSCTL_ADD_UINT(device_get_sysctl_ctx(dev), + SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), + OID_AUTO, "buffersize", CTLFLAG_RD, &d->bufsz, 0, + "allocated buffer size"); + SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev), + SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO, + "bitperfect", CTLTYPE_INT | CTLFLAG_RWTUN | CTLFLAG_MPSAFE, d, + sizeof(d), sysctl_dev_pcm_bitperfect, "I", + "bit-perfect playback/recording (0=disable, 1=enable)"); + SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev), + SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO, + "mode", CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_MPSAFE, d, sizeof(d), + sysctl_dev_pcm_mode, "I", + "mode (1=mixer, 2=play, 4=rec. The values are OR'ed if more than " + "one mode is supported)"); + vchan_initsys(dev); + if (d->flags & SD_F_EQ) + feeder_eq_initsys(dev); if (snd_unit_auto < 0) snd_unit_auto = (snd_unit < 0) ? 1 : 0; From nobody Thu May 29 10:25:26 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b7MvW2g9jz5wprc; Thu, 29 May 2025 10:25: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b7MvV4tMWz3xM8; Thu, 29 May 2025 10:25:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748514326; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Xuhk/573uoeeEYiY4w92T8X8kGk2WzK6eyv/RLKfKRI=; b=S7Omc2kcpojVYI+WSM6faEDNQLq+XANy+Lw8cWZQSzWDqyktaCvZ7v95hujw54LpRacYfO oMjU+J/RvwXx+HJxxLtoM2UjFmlvWXaZ3ZMQExngob6JrwKHanS0R1BfVv5XTxVEamUNTy j2qK3R1WbQaDLAUqOjS0AQxhgU/A//hl45T666r2mIxhiCxPOhv2WFh1XvEH0eaitAAlDp Kv9W8ea6SzKO3TSKC0ruWa/lX/lz+pg0tm0lXVdVyMMt/xiVOkHynfM3a31vFHotxclonN 9dEYTBUZGSYjB1hopuTH1KPwAQ8Mgcr/AxYJyjy0YuOlO1EpdEj7EEtWNyFHug== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748514326; a=rsa-sha256; cv=none; b=ODMiUUAAGMN9dTe4d2r1D8uHyFqFOOKrsqEXzVyNVvgAXkOsVfWE5oWq8OBELChXuTwIWV ZvyAVCmhoo2Bh+NWY5ej2jqpNGzUmgQBBOdkGIF8yTAF6ndUp2D+tB81Wf5K8z0zCO0QCD uoPuiyTCrzJuufEsrAo4BX2nFPHcElsEGlxB7jNYQcEDrrQARHMHgH/IzBcOW5QU7ZkhIt 2yAMgMizjt/eIKGz1fcGWheXf/YH5uZDQbCeA4wSP9cgpvwxUJkYIjMDU/Yx3uYkGLxSeK OS+aas1hAremEP60vifvxIUtViNKh1B3PxcySoF3V8UV4Hv028RganTvz2rOxw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748514326; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Xuhk/573uoeeEYiY4w92T8X8kGk2WzK6eyv/RLKfKRI=; b=N98ALp6t7l5LR45WpLs73HP3H1sudG2psMTIEfLqKHFQ7NLM/P7C6PTNK7EQ60wtTnBgs6 Zn7FEdTR9O95MbFRZzC7TKk3AgMuRuB7OIVa9E+Ptw4GbPsf9wqhNf6nHOh30z2qRMCJwD E5SEV9Uln8od4Wy1fbD4leOZ9+g15nLcOeUzIm8c7ABW/CKwsH3BEWQ9ARTK3zU9b01i71 TSm5Hc3kbMYV6PBGHD3IrabZYuScepaq8GVDx8fqg4Y+1+fXfAwIL8+oM4xPCkoncMd3xc LwPI154btSsYoyrbYQU7QM7Q/DONL/BfhrF1OvPRn6OwvrB676LynuH2n9dOTQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b7MvV4B5nz1HPl; Thu, 29 May 2025 10:25: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 54TAPQGb061065; Thu, 29 May 2025 10:25:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54TAPQ0Q061062; Thu, 29 May 2025 10:25:26 GMT (envelope-from git) Date: Thu, 29 May 2025 10:25:26 GMT Message-Id: <202505291025.54TAPQ0Q061062@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: f6430bc61df7 - main - sound: Terminate stream properly when closing vchans List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: f6430bc61df78be070209d52b4452ae9cf4cd015 Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=f6430bc61df78be070209d52b4452ae9cf4cd015 commit f6430bc61df78be070209d52b4452ae9cf4cd015 Author: Christos Margiolis AuthorDate: 2025-05-29 10:24:17 +0000 Commit: Christos Margiolis CommitDate: 2025-05-29 10:25:18 +0000 sound: Terminate stream properly when closing vchans When a channel is closed, dsp_close() either calls vchan_destroy() on vchans, or chn_abort()/chn_flush() on primary channels. However, the problem with this is that, when closing a vchan, we end up not terminating the stream properly. The call sequence we are interested in is the following: vchan_destroy(vchan) -> chn_kill(vchan) -> chn_trigger(vchan) -> vchan_trigger(vchan) -> chn_notify(parent) Even though chn_notify() contains codepaths which call chn_abort(parent), apparently we do not execute any of those codepaths in this case, so the DMA remains unterminated, hence why we keep seeing the primary channel(s) being interrupted even once the application has exited: root@freebsd:~ # sndctl interrupts dsp0.play.0.interrupts=1139 dsp0.record.0.interrupts=0 root@freebsd:~ # sndctl interrupts dsp0.play.0.interrupts=1277 dsp0.record.0.interrupts=0 root@freebsd:~ # sndctl interrupts dsp0.play.0.interrupts=1394 dsp0.record.0.interrupts=0 The only applications that do not have this issue are those (e.g., mpv) that manually call ioctls which end up calling chn_abort(), like SNDCTL_DSP_HALT, to abort the channel(s) during shutdown. For all other applications that do not manually abort the channel(s), we can confirm that chn_abort()/chn_flush(), or even chn_trigger(PCMTRIG_ABORT) on the parent, doesn't happen during shutdown. root@freebsd:~ # dtrace -n 'fbt::chn_abort:entry,fbt::chn_flush:entry { printf("%s", args[0]->name); stack(); }' dtrace: description 'fbt::chn_abort:entry,fbt::chn_flush:entry ' matched 2 probes dtrace: buffer size lowered to 1m ^C [...] root@freebsd:~ # dtrace -n 'fbt::chn_trigger:entry /args[1] == -1/ { printf("%s", args[0]->name); stack(); }' dtrace: description 'fbt::chn_trigger:entry ' matched 1 probe dtrace: buffer size lowered to 1m CPU ID FUNCTION:NAME 0 68037 chn_trigger:entry dsp0.virtual_play.0 sound.ko`chn_kill+0x134 sound.ko`vchan_destroy+0x94 sound.ko`dsp_close+0x39b kernel`devfs_destroy_cdevpriv+0xab kernel`devfs_close_f+0x63 kernel`_fdrop+0x1a kernel`closef+0x1e3 kernel`closefp_impl+0x76 kernel`amd64_syscall+0x151 kernel`0xffffffff8103841b1 To fix this, modify dsp_close() to execute the primary channel case on both primary and virtual channels. While what we really care about are the chn_abort()/chn_flush() calls, it shouldn't hurt to call the rest of the functions on the vchans as well, to avoid complicating things; they get deleted right below, anyway. With the patch applied: root@freebsd:~ # dtrace -n 'fbt::chn_trigger:entry /args[1] == -1/ { printf("%s", args[0]->name); stack(); }' dtrace: description 'fbt::chn_trigger:entry ' matched 1 probe dtrace: buffer size lowered to 1m CPU ID FUNCTION:NAME 1 68037 chn_trigger:entry dsp0.virtual_play.0 sound.ko`chn_flush+0x2a sound.ko`dsp_close+0x330 kernel`devfs_destroy_cdevpriv+0xab kernel`devfs_close_f+0x63 kernel`_fdrop+0x1a kernel`closef+0x1e3 kernel`closefp_impl+0x76 kernel`amd64_syscall+0x151 kernel`0xffffffff8103841b 0 68037 chn_trigger:entry dsp0.play.0 sound.ko`chn_notify+0x4ce sound.ko`vchan_trigger+0x105 sound.ko`chn_trigger+0xb4 sound.ko`chn_flush+0x2a sound.ko`dsp_close+0x330 kernel`devfs_destroy_cdevpriv+0xab kernel`devfs_close_f+0x63 kernel`_fdrop+0x1a kernel`closef+0x1e3 kernel`closefp_impl+0x76 kernel`amd64_syscall+0x151 kernel`0xffffffff8103841b Above we can see a chn_trigger(PCMTRIG_ABORT) on the parent (dsp0.play.0), which is coming from the chn_abort() (inlined) in chn_notify(): root@freebsd:~ # dtrace -n 'kinst::chn_abort:entry { stack(); }' dtrace: description 'kinst::chn_abort:entry ' matched 5 probes dtrace: buffer size lowered to 1m CPU ID FUNCTION:NAME 1 72580 chn_notify:1192 sound.ko`0xffffffff8296cab4 sound.ko`vchan_trigger+0x105 sound.ko`chn_trigger+0xb4 sound.ko`chn_flush+0x2a sound.ko`dsp_close+0x330 kernel`devfs_destroy_cdevpriv+0xab kernel`devfs_close_f+0x63 kernel`_fdrop+0x1a kernel`closef+0x1e3 kernel`closefp_impl+0x76 kernel`amd64_syscall+0x151 kernel`0xffffffff8103841b We can also confirm the primary channel(s) are not interrupted anymore: root@freebsd:/mnt/src # sndctl interrupts dsp0.play.0.interrupts=0 dsp0.record.0.interrupts=0 In collaboration with: adrian Tested by: adrian, christos, thj Sponsored by: The FreeBSD Foundation MFC after: 2 days Reviewed by: thj, adrian, emaste Differential Revision: https://reviews.freebsd.org/D50488 --- sys/dev/sound/pcm/dsp.c | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/sys/dev/sound/pcm/dsp.c b/sys/dev/sound/pcm/dsp.c index f1adcdbc5d70..aa6ad4a59778 100644 --- a/sys/dev/sound/pcm/dsp.c +++ b/sys/dev/sound/pcm/dsp.c @@ -289,19 +289,25 @@ dsp_close(void *data) if (sg_ids != 0) free_unr(pcmsg_unrhdr, sg_ids); + /* + * Go through the channel abort/flush path for both + * primary and virtual channels to ensure that, in the + * case of vchans, the stream is always properly + * stopped, and the primary channels do not keep being + * interrupted even if all vchans are gone. + */ + CHN_LOCK(rdch); + chn_abort(rdch); /* won't sleep */ + rdch->flags &= ~(CHN_F_RUNNING | CHN_F_MMAP | + CHN_F_DEAD | CHN_F_EXCLUSIVE); + chn_reset(rdch, 0, 0); + chn_release(rdch); if (rdch->flags & CHN_F_VIRTUAL) { parent = rdch->parentchannel; CHN_LOCK(parent); CHN_LOCK(rdch); vchan_destroy(rdch); CHN_UNLOCK(parent); - } else { - CHN_LOCK(rdch); - chn_abort(rdch); /* won't sleep */ - rdch->flags &= ~(CHN_F_RUNNING | CHN_F_MMAP | - CHN_F_DEAD | CHN_F_EXCLUSIVE); - chn_reset(rdch, 0, 0); - chn_release(rdch); } } if (wrch != NULL) { @@ -314,19 +320,18 @@ dsp_close(void *data) if (sg_ids != 0) free_unr(pcmsg_unrhdr, sg_ids); + CHN_LOCK(wrch); + chn_flush(wrch); /* may sleep */ + wrch->flags &= ~(CHN_F_RUNNING | CHN_F_MMAP | + CHN_F_DEAD | CHN_F_EXCLUSIVE); + chn_reset(wrch, 0, 0); + chn_release(wrch); if (wrch->flags & CHN_F_VIRTUAL) { parent = wrch->parentchannel; CHN_LOCK(parent); CHN_LOCK(wrch); vchan_destroy(wrch); CHN_UNLOCK(parent); - } else { - CHN_LOCK(wrch); - chn_flush(wrch); /* may sleep */ - wrch->flags &= ~(CHN_F_RUNNING | CHN_F_MMAP | - CHN_F_DEAD | CHN_F_EXCLUSIVE); - chn_reset(wrch, 0, 0); - chn_release(wrch); } } PCM_LOCK(d); From nobody Thu May 29 10:25:27 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b7MvX2C5fz5y3cR; Thu, 29 May 2025 10:25: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b7MvW5Zz8z3xQV; Thu, 29 May 2025 10:25:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748514327; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EwqiTx0stRpxsPDnfWEohrA1sMG1ZpK5rIFVEM6cysA=; b=SNCqSx2Hyh3WKPxiEzfXa5slzq3Bu/3O94/PUSVBmg9OYuhKwjkS+QiSLVziCczelzrrAx i+SO0r4Y9qswBk6xLRc2SAiXwBHhGdOapKsYxK0TlliOxc8cHCcHjhpkG+BFMMbN4k5MNk zUjU2pAVxGX75Ydy0IUgXs47/JGNBML7Iz69EZFVWCAHmqwtj8A57siwGRFsdjBvPVI/af B1HPU45+ygE4xGMQJAIPG91/ZkZQcUPFVRrmyKO4qpUTx+Ba5um53KXQgortKL/3rzGlwC /LJJlDN/pH+RxSRoiqx7Z/XJAHD8cVZnL+ZpZXPQxHHFVHiJiemoI1sVuNDDAg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748514327; a=rsa-sha256; cv=none; b=Z177rmFjaig7tMNSBpoc7g8pnU/aN9QHN5eiziI5wq6L+ggd5Qg4T0MPWagNntCa2LVBDg 3GYmhKhBCl08/1UjcOMTTItMXDIWCQxWq1T87NcjvPXzSm0wNo6N67O7ro6CnVQedHH8BC I7AeHjxqzTPyzPebi/ZO7XHmeyisxA+42pftHekKWhDTSZTanoZshXjXxEG0bsqKPCT3Hl yjQAxEgB5g25k7YlGfGP1xvaWKFM8JO13NQlIRQete2tOTnao8Ex9YUbG70ktnaXicQFHl mBI/3w2cHKHnFBavJ7jjTXfYlrCCnIwv28fjyopv7cQ7GmVrBnfCHOT3Y9DVVQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748514327; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EwqiTx0stRpxsPDnfWEohrA1sMG1ZpK5rIFVEM6cysA=; b=aN4IqYDKlrmO7MfJayIt/uKBYwT/+iQmRoKAK52fg1+2k6nqtlK3py2qhSJE0VdB2Em7gl dClJuQsAUHko45kwndnp3BnuAODE/MpUWzXWnMlqnSe8hmyFuTCq+0lkrPycJvac5WHrYj Dw3Xa5/Sl/O0PnTpuwe2FEYlMCTbZtPshWiaMBsqrTGqB9QTqqOmm18U2+GA1AFRiooNE+ yzPLOH86jh+6yfYt7mxh6DjP4J3KShTSNK099oyhxrv4ebKUAz5hc6hRgUjAXguyGxofsd I+RDXcNOAcIUFfbox9XQGWIut8MdDiZsOOjpIcRuY2ZP3Y93FJzzbtqTS8y55w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b7MvW56Ypz1HPm; Thu, 29 May 2025 10:25: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 54TAPRND061101; Thu, 29 May 2025 10:25:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54TAPRin061098; Thu, 29 May 2025 10:25:27 GMT (envelope-from git) Date: Thu, 29 May 2025 10:25:27 GMT Message-Id: <202505291025.54TAPRin061098@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: 0432b2183f25 - main - snd_dummy: Make callout stopping more robust List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 0432b2183f25ddba7e13a33adf1dd6f9563b0bd1 Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=0432b2183f25ddba7e13a33adf1dd6f9563b0bd1 commit 0432b2183f25ddba7e13a33adf1dd6f9563b0bd1 Author: Christos Margiolis AuthorDate: 2025-05-29 10:24:28 +0000 Commit: Christos Margiolis CommitDate: 2025-05-29 10:25:18 +0000 snd_dummy: Make callout stopping more robust If the callout gets rescheduled during detach, we might access freed pcm_channel resources in dummy_chan_io(), which will cause a panic similar to this: panic: ASan: Invalid access, 8-byte read at 0xfffffe00479f65d8, UMAUseAfterFree(fd) cpuid = 1 time = 1747433047 KDB: stack backtrace: db_trace_self_wrapper() at db_trace_self_wrapper+0xa5/frame 0xfffffe0046a8d730 kdb_backtrace() at kdb_backtrace+0xc6/frame 0xfffffe0046a8d890 vpanic() at vpanic+0x226/frame 0xfffffe0046a8da30 panic() at panic+0xb5/frame 0xfffffe0046a8db00 kasan_code_name() at kasan_code_name/frame 0xfffffe0046a8dbd0 __mtx_lock_flags() at __mtx_lock_flags+0xd3/frame 0xfffffe0046a8dcc0 chn_intr() at chn_intr+0x3d/frame 0xfffffe0046a8dce0 dummy_chan_io() at dummy_chan_io+0x9c/frame 0xfffffe0046a8dd10 softclock_call_cc() at softclock_call_cc+0x2bb/frame 0xfffffe0046a8de80 softclock_thread() at softclock_thread+0x162/frame 0xfffffe0046a8def0 fork_exit() at fork_exit+0xa3/frame 0xfffffe0046a8df30 fork_trampoline() at fork_trampoline+0xe/frame 0xfffffe0046a8df30 Reviewed by: adrian Differential Revision: https://reviews.freebsd.org/D50386 --- sys/dev/sound/dummy.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/sys/dev/sound/dummy.c b/sys/dev/sound/dummy.c index ae2af6fa61ed..1e2a81f40103 100644 --- a/sys/dev/sound/dummy.c +++ b/sys/dev/sound/dummy.c @@ -65,6 +65,7 @@ struct dummy_softc { struct dummy_chan chans[DUMMY_NCHAN]; struct callout callout; struct mtx *lock; + bool stopped; }; static bool @@ -92,6 +93,9 @@ dummy_chan_io(void *arg) struct dummy_chan *ch; int i = 0; + if (sc->stopped) + return; + /* Do not reschedule if no channel is running. */ if (!dummy_active(sc)) return; @@ -108,7 +112,8 @@ dummy_chan_io(void *arg) chn_intr(ch->chan); snd_mtxlock(sc->lock); } - callout_schedule(&sc->callout, 1); + if (!sc->stopped) + callout_schedule(&sc->callout, 1); } static int @@ -195,6 +200,11 @@ dummy_chan_trigger(kobj_t obj, void *data, int go) snd_mtxlock(sc->lock); + if (sc->stopped) { + snd_mtxunlock(sc->lock); + return (0); + } + switch (go) { case PCMTRIG_START: ch->ptr = 0; @@ -345,8 +355,11 @@ dummy_detach(device_t dev) struct dummy_softc *sc = device_get_softc(dev); int err; - err = pcm_unregister(dev); + snd_mtxlock(sc->lock); + sc->stopped = true; + snd_mtxunlock(sc->lock); callout_drain(&sc->callout); + err = pcm_unregister(dev); snd_mtxfree(sc->lock); return (err); From nobody Thu May 29 12:47:37 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b7R3Z0TQMz5wym8; Thu, 29 May 2025 12:47: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b7R3Y6F2Tz3QBK; Thu, 29 May 2025 12:47:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748522857; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TW1n9FZ6FuLRhgOKemxOKksZjKRNUE7butFkCDeFIUY=; b=gyZ1VgLgrHcEBh2jIrOepaYP2YxM92HL51XlMtfEb+YDjLec4720jvzpJAuVqPwWIx0P+z 53YkXdH4W1Wd41BmThe59qwPXplIKS30uieHXE4iooKYb/dK062u3u8FUIt7+Mt/Ws/h8Y QYKlSfPEUtSIToyrUZ+4tzsXb3aBWOvwDLdzO7iYjoZD77Qydwei8ZKpApNlYrSyICTFVO wNycaB3XQJpWeHbfs6Q7/35dpGlLWs0hcu+ZtByWtnXZhoEI0WPwxE4iu+HqqNnwvKf8zC A5LKkMiBgBXem1zMp2xIZcWym/m6kxT6ZjMcqnyOwnJVX9XkKH0XhNxtpAsSNw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748522857; a=rsa-sha256; cv=none; b=n9hS8CogV7k1szryem+mYKwdFKH8Mkbx3c0x2SxK9vvfnK1IPyOpRc5XJRnIeLYE02nozQ WR4/8Lv0Hk2NS8jidOSs18T6yxd6L/uzM6SljmKlNLgmwZifmkWRfnd3SwUk8qt4w0AQhx mdaIpjxsZAgUx6ZEji7vEZIeN+OuaxSNOsUXpNXOda68DdgBI/jHa4enC4rIiwU51TKDmZ vzlwIcaZOy3Q40uyf8qmNO8XSQ4qVbwFOqtQK3myZtQgyLhaxgYYuwwb6QrBn+hu73ykjM Y6dYZz0hH8ht487Qaxyqw6c1irhJJSQ/UlrGF5eDetsEb+zcf9+C4UwpxV2+aA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748522857; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TW1n9FZ6FuLRhgOKemxOKksZjKRNUE7butFkCDeFIUY=; b=vBO+NVUfC879/dpeluprZvCy0hAKztrZ5rxV1ZRKYoBpSdcjWERDe21tLmqTA57Wak6/Qa xzhCMO6P9zzs9GkGVBxvGk07ligL+uz3/j6JwjHrx66+8siNOdZG0T//eNB7huOZLpKV+6 X/oXbhhgX2PRDmmIMypvyyEpPwjhzpo7iQ1RYulukl8nkWQ5qWfvSoINMUcyRbLCS0NF78 t6jC+EpByTyJ82HTAFYwueAavhnNnLCB/Qc3QHpQkVM/a5Msuk+//bh/dM0TcG3lXpDRD9 nLkAaN8TnIc/mkp4N1tVx+s98s6QC2dpqZamCGTL3s4itV0CZvp0lT+2DEvB1A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b7R3Y52yqz1M85; Thu, 29 May 2025 12:47: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 54TClbPb023406; Thu, 29 May 2025 12:47:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54TClb5P023403; Thu, 29 May 2025 12:47:37 GMT (envelope-from git) Date: Thu, 29 May 2025 12:47:37 GMT Message-Id: <202505291247.54TClb5P023403@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: 7f81f87a74a4 - main - pf: remove unused 'dir' argument in pf_reassemble() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 7f81f87a74a413f7c1a42ba9a48dd21603fa94e1 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=7f81f87a74a413f7c1a42ba9a48dd21603fa94e1 commit 7f81f87a74a413f7c1a42ba9a48dd21603fa94e1 Author: Kristof Provost AuthorDate: 2025-05-29 11:24:46 +0000 Commit: Kristof Provost CommitDate: 2025-05-29 11:54:55 +0000 pf: remove unused 'dir' argument in pf_reassemble() pf_reassemble() only uses it to pass to pf_ip2key(), which also does not use it. Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/netpfil/pf/pf_norm.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/netpfil/pf/pf_norm.c b/sys/netpfil/pf/pf_norm.c index 8157ea556591..ed9aed157993 100644 --- a/sys/netpfil/pf/pf_norm.c +++ b/sys/netpfil/pf/pf_norm.c @@ -147,7 +147,7 @@ static struct pf_fragment *pf_fillup_fragment(struct pf_fragment_cmp *, struct pf_frent *, u_short *); static struct mbuf *pf_join_fragment(struct pf_fragment *); #ifdef INET -static int pf_reassemble(struct mbuf **, int, u_short *); +static int pf_reassemble(struct mbuf **, u_short *); #endif /* INET */ #ifdef INET6 static int pf_reassemble6(struct mbuf **, @@ -163,7 +163,7 @@ static int pf_reassemble6(struct mbuf **, #ifdef INET static void -pf_ip2key(struct ip *ip, int dir, struct pf_fragment_cmp *key) +pf_ip2key(struct ip *ip, struct pf_fragment_cmp *key) { key->frc_src.v4 = ip->ip_src; @@ -735,7 +735,7 @@ pf_join_fragment(struct pf_fragment *frag) #ifdef INET static int -pf_reassemble(struct mbuf **m0, int dir, u_short *reason) +pf_reassemble(struct mbuf **m0, u_short *reason) { struct mbuf *m = *m0; struct ip *ip = mtod(m, struct ip *); @@ -759,7 +759,7 @@ pf_reassemble(struct mbuf **m0, int dir, u_short *reason) frent->fe_off = (ntohs(ip->ip_off) & IP_OFFMASK) << 3; frent->fe_mff = ntohs(ip->ip_off) & IP_MF; - pf_ip2key(ip, dir, &key); + pf_ip2key(ip, &key); if ((frag = pf_fillup_fragment(&key, frent, reason)) == NULL) return (PF_DROP); @@ -1200,7 +1200,7 @@ pf_normalize_ip(u_short *reason, struct pf_pdesc *pd) * Might return a completely reassembled mbuf, or NULL */ PF_FRAG_LOCK(); DPFPRINTF(("reass frag %d @ %d-%d\n", h->ip_id, fragoff, max)); - verdict = pf_reassemble(&pd->m, pd->dir, reason); + verdict = pf_reassemble(&pd->m, reason); PF_FRAG_UNLOCK(); if (verdict != PF_PASS) From nobody Thu May 29 13:09:51 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b7RYC40Tqz5x12J; Thu, 29 May 2025 13:09: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b7RYC3BVnz3fZF; Thu, 29 May 2025 13:09:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748524191; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=T9d/p0MgL1tKZNM9CBslxzgiEEdnAeDXaj2z38iZiv0=; b=wOUEqgxyHAA/Rl+slqWpzk7pXV1wK5p/Ql/NWHRMUlnu6PsrWLur0I/glsiJPPd3KjCcg/ iUq9FHXoWlSpr8fa1idekoPHxv37DfMDzueuyEFcPBTUmFtu0dJRYgUANk7jukIkOYAb8O fK407SDQLWFQox7NPJDMG+ZW2nmZ+GsGXMJV/jdRzgr53dsdQiZatwPnPh/Jf4Yvw0tY4t MEhn38KEBY79ILRxK+FF7+a3LdA+C5BHlkrmYdNVZTYbM2mCflhwU9WixxEIjW3jkdclhz dbz3qmM1rJv4q6uoCFvg8iCTuQjLN7JH4hnwA0ZawX3yvccAluduOGSeaZHi0g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748524191; a=rsa-sha256; cv=none; b=IOZFYlNmT+OEA2TOUJHvGkIRa9eDe9K9oGwfsDANvklk8C/1u3ovLy1H2gHxyqMksNvumf CtgEno7tNtucs4uhCGpLr+jT+yiq0o61bK34K+zmUxfZsONOcVLlu/y0WBu3zWA67mYvYH tNlBQj7IUZqwCgnQQOHgT6b0rPigYXDv+wMJnnCfQt2znBTJWE8sGq/Qf1SDYzQHyjvnz/ luHAiXGytbE2axMFIABYwWrTzC4q/shXFepdQAS3Mi6DL7i5UVt+h/jm2PAluFSC7LTpOS pErAYOAZRBoeJD5kBxzd9SdIvKSgvV9+2TOo5x2fp30nvgcXoArbiF0hmmo9Ag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748524191; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=T9d/p0MgL1tKZNM9CBslxzgiEEdnAeDXaj2z38iZiv0=; b=xAIS2LCu4jvbqBo0oZRz56yuEOyjnH/Gtd7hxgjCxtYR/7K1dmjfEcJaDsPxf4ZDXMb/8I KJqym4WMF0UgOJuTcpG10xPIhaV0oiMAF4MSimr4nKtkzmGvqIhvJTt/+AH2a8CAA2BIwd syeQUI7w99nQQp4Uw0h+WjymAJqPLaJrOQc0ZakMbU87I+G4yOfqY0TiWH7hqTMtuMbKFJ 8t+1meng05NxwE0vkKvpDYGECkih9JTmbbGgSi29Yv4mjgsov9G87TXrJu0j+iP6n10m3C B+UYkqbyZusfd/6QEnqwxXKuEmENTeA5uedTpHFHpUazkzm1dIc2lHvoozAQkw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b7RYC2nS5z1MWm; Thu, 29 May 2025 13:09: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 54TD9p2T061595; Thu, 29 May 2025 13:09:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54TD9pqe061592; Thu, 29 May 2025 13:09:51 GMT (envelope-from git) Date: Thu, 29 May 2025 13:09:51 GMT Message-Id: <202505291309.54TD9pqe061592@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Pierre Pronchery Subject: git: 5ed36e2e1729 - main - umb: avoid buffer overflow in umb_in_len2mask() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: khorben X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5ed36e2e1729d6a49a65366c03fc15515967ae67 Auto-Submitted: auto-generated The branch main has been updated by khorben: URL: https://cgit.FreeBSD.org/src/commit/?id=5ed36e2e1729d6a49a65366c03fc15515967ae67 commit 5ed36e2e1729d6a49a65366c03fc15515967ae67 Author: Pierre Pronchery AuthorDate: 2025-05-26 23:18:53 +0000 Commit: Pierre Pronchery CommitDate: 2025-05-29 13:07:52 +0000 umb: avoid buffer overflow in umb_in_len2mask() len comes from ipv4elem.prefixlen in a MBIM_CID_IP_CONFIGURATION message from the USB device, and should not be trusted, as it could be any uint32_t value. Without this extra check, a potential buffer overflow could subsequently occur in umb_in_len2mask(). Fix from Gerhard Roth, after coordination upstream with OpenBSD. PR: 284904 Reported by: Robert Morris Approved by: philip (mentor) Sponsored by: The FreeBSD Foundation --- sys/dev/usb/net/if_umb.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/dev/usb/net/if_umb.c b/sys/dev/usb/net/if_umb.c index 9b2b504cfa6b..50f481973be0 100644 --- a/sys/dev/usb/net/if_umb.c +++ b/sys/dev/usb/net/if_umb.c @@ -1753,7 +1753,8 @@ umb_add_inet_config(struct umb_softc *sc, struct in_addr ip, u_int prefixlen, sin = (struct sockaddr_in *)&ifra.ifra_mask; sin->sin_family = AF_INET; sin->sin_len = sizeof (*sin); - umb_in_len2mask(&sin->sin_addr, prefixlen); + umb_in_len2mask(&sin->sin_addr, + MIN(prefixlen, sizeof (struct in_addr) * 8)); mtx_unlock(&sc->sc_mutex); CURVNET_SET_QUIET(if_getvnet(ifp)); From nobody Thu May 29 13:09:52 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b7RYD6Qs5z5x0tb; Thu, 29 May 2025 13:09: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b7RYD4kvdz3fc9; Thu, 29 May 2025 13:09:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748524192; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0rSYSDii00HVFFgXvnlffxKQnMOWnDvQQhj+Mii02bw=; b=apm+vLAwz5uvLNTL+IwlZ/y+gBd/M3evgLp0RL65VO8GQZOe5vi5PszTiPyDC7gwEM4CjZ RfWbxLDUF8S8O5JzOeb4juvhElPJ8gXORt46Lez0qSfWBNrelPAj9gLNNmP2NsQgwAK2Xe e1MrZ+xVwmq+JVJyyWRer5VhKo7YCTWkXFwjrmHWNA5O0OxUKWuXvGlCNGLIQLhj/QpoEI Gvc/rPdhahe6OIWgAppdPgVjbqIinwnbNtYEgi7UoBu+HnGcISD2z36d3MBLJ//k/8poY/ rpZVyHSEavjoj1kfW0IuZdCSeYZEZXcEbRj1V4Xd1sID34OOPhQNQg3eVelvGA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748524192; a=rsa-sha256; cv=none; b=aUHnH/uPMl3hdcP4249p/WKKP0lfVkFTNDWNtWXD+84bwp6RmdId6tXUuXVLwP0dV3PiGL XzxFSJ81NQ5mTJsZFn1dqX3ouSFGkXhjJScQcO8O0eTZf2f4TG1vElwmnH7f5gFxvd+dbo mNezu7uFPFyqEPS5WkXgLO6q5vKmm493i7yNHvaKW8Y8f8RY+JrPQ0Luo6N8Vs1P+6qk6j V+54kq9/HynxwcUHgHeb84i6NQBMoMmrM1HOqT/gw6m0NfSExtYW/VIvuBwD3KBzP1Y0ps 0LaNvfDQ7xvpTV/2nIHtneB3/l1aDY8yKintLus47GHOyuf+I0Y2Ar79Z8pFmw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748524192; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0rSYSDii00HVFFgXvnlffxKQnMOWnDvQQhj+Mii02bw=; b=WfLSQFBYE1uHAteSfx5oa+8AslN6fMRQD1NkE+05B7GEMmoGWcli7ax7UYhtF//iXDLkOD vFrLN5FuJLCB3lL86XFiSKgqDZizebxBQg61wPFPJDyt8cBeoEHk4OrbWvbhpMmEmjftRg X5hv+FSNfIW05UCO3ncH8W7CRdPUBpIe1mC5TzsFe/2DLBvQHWkEAEjga7RuEn8MO9JT64 OhReAowTv+dkQiA2GIZUrkMGPYa3MgQnWZDTsm0NpzymwHUgY3qOq9UM/XgaWRulSnWdPL 6C1ZbMy3GQGcBdE5Dbfpb7iMoKRTxbTVAht71TL2GfOQwWZYM3O1CQOr+Q2pmQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b7RYD3n2rz1MxJ; Thu, 29 May 2025 13:09: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 54TD9q1e061634; Thu, 29 May 2025 13:09:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54TD9qi7061631; Thu, 29 May 2025 13:09:52 GMT (envelope-from git) Date: Thu, 29 May 2025 13:09:52 GMT Message-Id: <202505291309.54TD9qi7061631@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Pierre Pronchery Subject: git: 152bb8e30204 - main - umb: avoid buffer overflow in umb_getinfobuf() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: khorben X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 152bb8e3020451963a3f2a8adf05f00a5222a4e5 Auto-Submitted: auto-generated The branch main has been updated by khorben: URL: https://cgit.FreeBSD.org/src/commit/?id=152bb8e3020451963a3f2a8adf05f00a5222a4e5 commit 152bb8e3020451963a3f2a8adf05f00a5222a4e5 Author: Pierre Pronchery AuthorDate: 2025-05-26 23:42:30 +0000 Commit: Pierre Pronchery CommitDate: 2025-05-29 13:07:54 +0000 umb: avoid buffer overflow in umb_getinfobuf() umb_getinfobuf() is called with offs and size taken from messages sent by the USB device. The sanity check is not sufficient, due to a possible integer wrap. This can allow a broken or malicious USB device, or possibly the network operator, to cause a buffer overflow. This fix from Gerhard Roth was obtained after coordination upstream with OpenBSD. It converts the variables to 64-bit integers, which should mitigate the risk of overflows. PR: 284906 Reported by: Robert Morris Approved by: philip (mentor) Sponsored by: The FreeBSD Foundation --- sys/dev/usb/net/if_umb.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sys/dev/usb/net/if_umb.c b/sys/dev/usb/net/if_umb.c index 50f481973be0..a7d3bb764a2b 100644 --- a/sys/dev/usb/net/if_umb.c +++ b/sys/dev/usb/net/if_umb.c @@ -1377,10 +1377,9 @@ umb_getinfobuf(char *in, int inlen, uint32_t offs, uint32_t sz, { offs = le32toh(offs); sz = le32toh(sz); - if (inlen >= offs + sz) { - memset(out, 0, outlen); + memset(out, 0, outlen); + if ((uint64_t)inlen >= (uint64_t)offs + (uint64_t)sz) memcpy(out, in + offs, MIN(sz, outlen)); - } } static inline int From nobody Thu May 29 13:09:53 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b7RYH0pPkz5x0tc; Thu, 29 May 2025 13:09: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b7RYF5BLnz3fjS; Thu, 29 May 2025 13:09:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748524193; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=65BQsMa7G5jXL6ZsD1UC6C+JJpCGpE3QR/XxVfmqWQA=; b=jLn5k/nvy6WIELfBFMJlL6wytkf1I4DH+t22qvnT45H+08X2uHgR9vsB3p5K4//ust3jq3 Qi2Vmp8zy0mDWcwe/EFDnwyFCfgeb0oQkEpfaT6W9FZ8J+f9Z0v9/xjvymbDvu4h88AyJW 592N1uLBKDR7w/FX2dtCi2awKaNqY2doolKN+aZR2Y63xCXq9N4ev6BcUlbZBPWdUUpVbr dsYQ5G7CqYf/GDTQlbeVFYvmRbJtN696OS1UinX/NB7mHUYITqxGDunEBBkdc4/zVfYSx7 B0xITjT02cRq7mqii5WwlznyzHcDGbE0vt6JfzyLwNIJ+u3Bt4Yf1Xf3hu2JCQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748524193; a=rsa-sha256; cv=none; b=Ixu4xL/8Ynh1QS+tyOdDjzpt86/q567mHwSyCtnR1D24GoZB9oO0TnysNo+gVW/gfjae9E zZQ4I7edPJLnIBtJIhIpYMyylw3Pi6MpkNylitoRzs6Gw+Z621AF90KZ54pVcN7/17Ky+4 YFB+EMfAdJ4j1TVSHsks1F4Kzih2BbLXAEP4TI1WfhCSdiEvwjV9Ms3bkG+PDxZvYA9wkL Tzt3U/gF0KLLMXHbIeQD/cH/alRUkKXGU72uAP/d3zaauTlzmZLfozmrPbGeO+0kTY6CTR gvxRsqNjGU8UBzWrVKicskUG2SS1mu/WqrpLa+XYDSUI/m2a2vD+P2+a1xd2BQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748524193; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=65BQsMa7G5jXL6ZsD1UC6C+JJpCGpE3QR/XxVfmqWQA=; b=g2+3jabbVmm8cYw9Ad7geH6PJ21l07ywZxQaHsPL+qsVHrnPBh/E1G6nx3TJdV8TAnvK4c 2c9diq+kgLbb53X7fkATPJeCXcZeKgP0I0pxPY1pvqUh3NTEcocpEk+AgfxL7dHN83yGck VFUDiu4GriE3k7LQhFBuZh+zaXnKACPcDh0KX961Qj3P8vl8nEpzZ9Ls5qdcCiEPdDZ0YY kA1jpcMEy7oxTxGqH6hiZfwQ12bxhTVMnMMR7aK8RbzH8Kh/qHH5cXNE4/oZ8e+SoKxj9v qCdZCLGaTi4PTJ2dAGp2maCTgfOMz2JjI1kdlbouByVLiKHOEB6kjVbpnsrNng== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b7RYF4gp2z1MF7; Thu, 29 May 2025 13:09: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 54TD9rAD061672; Thu, 29 May 2025 13:09:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54TD9rmS061669; Thu, 29 May 2025 13:09:53 GMT (envelope-from git) Date: Thu, 29 May 2025 13:09:53 GMT Message-Id: <202505291309.54TD9rmS061669@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Pierre Pronchery Subject: git: 82c41c9ffc42 - main - umb: avoid wild pointer dereference in umb_decap() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: khorben X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 82c41c9ffc42b8e95eabae7cdc4e0bfbbcad51fb Auto-Submitted: auto-generated The branch main has been updated by khorben: URL: https://cgit.FreeBSD.org/src/commit/?id=82c41c9ffc42b8e95eabae7cdc4e0bfbbcad51fb commit 82c41c9ffc42b8e95eabae7cdc4e0bfbbcad51fb Author: Pierre Pronchery AuthorDate: 2025-05-27 00:10:49 +0000 Commit: Pierre Pronchery CommitDate: 2025-05-29 13:07:57 +0000 umb: avoid wild pointer dereference in umb_decap() When processing messages produced by the USB device, umb_decap() trusts ptroff and later dlen and doff with pointer arithmetic, without sufficient sanity checks. The resulting pointer address may be outside of the valid boundary, causing the wrong memory to be copied or a page fault. This fix from Gerhard Roth was obtained after coordination upstream with OpenBSD. It converts the variables to 64-bit integers, which should mitigate the risk of overflows. PR: 284920 Reported by: Robert Morris Approved by: philip (mentor) Sponsored by: The FreeBSD Foundation --- sys/dev/usb/net/if_umb.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/dev/usb/net/if_umb.c b/sys/dev/usb/net/if_umb.c index a7d3bb764a2b..5703bc03dd39 100644 --- a/sys/dev/usb/net/if_umb.c +++ b/sys/dev/usb/net/if_umb.c @@ -2147,10 +2147,12 @@ umb_decap(struct umb_softc *sc, struct usb_xfer *xfer, int frame) goto fail; } + if (len < ptroff) + goto toosmall; ptr16 = (struct ncm_pointer16 *)(buf + ptroff); psig = UGETDW(ptr16->dwSignature); ptrlen = UGETW(ptr16->wLength); - if (len < ptrlen + ptroff) + if ((uint64_t)len < (uint64_t)ptrlen + (uint64_t)ptroff) goto toosmall; if (!MBIM_NCM_NTH16_ISISG(psig) && !MBIM_NCM_NTH32_ISISG(psig)) { DPRINTF("%s: unsupported NCM pointer signature (0x%08x)\n", @@ -2197,7 +2199,7 @@ umb_decap(struct umb_softc *sc, struct usb_xfer *xfer, int frame) /* Terminating zero entry */ if (dlen == 0 || doff == 0) break; - if (len < dlen + doff) { + if ((uint64_t)len < (uint64_t)dlen + (uint64_t)doff) { /* Skip giant datagram but continue processing */ DPRINTF("%s: datagram too large (%d @ off %d)\n", DEVNAM(sc), dlen, doff); From nobody Thu May 29 14:23:02 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b7T9g11RPz5x4xN; Thu, 29 May 2025 14:23: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b7T9f1XSMz3dW9; Thu, 29 May 2025 14:23:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748528582; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=w4y0m4Ws8kcvo84usxoK20A6AtEr024k5yjFNqkmaE0=; b=fEjQuyDhjLYQgJXr6p167MTXnEpEUIpeIuPIUZKphcJBwQ5btLR1BgYjf3laUqlG2s7mSe V9QI2ErATvxAOY/6Sx7krVWd76xAHGbUpPPsqhiViaZXrSz37qYPGQv8ieXA0VRRoCf7gY Ol3OmmURYbmLW3OIO3dbYlNS2tLBnG5M5i4UBeX6bnbU5NVCop1tCdadnp5fAzOiNAfgiH i6sZXKEu2Yb7Rn+mkEsSpbjdJlVHZXtNYYJASQooKubgmkqz5GYas37N8mhDoasBWKTRhb fAWIOnZSIoDDLaBc5vdP5sWB58e6VcEFDwnWRhX+a1hd1USrZJFzVHh5HCBogQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748528582; a=rsa-sha256; cv=none; b=mZY9cV2CDn6zE2GVTXOEq3jrYd7XCB+GWLyzdsIt0vzMUd/fiFi07aKaCSYCzcHzwmd8Tp Nh/gxMVJQv/H4BeYRzpiE6gCb7gY3j0x1nzHW2tXzwkTeSzTHxSCCuP+MVqfu1+h+nXiza v2TeyRINIuVv+Qdglj1MkAmWN8vY0riSevzWXNbWFZ/6S/HZC0IqL/QHUhPaCPWWYJKEgp EFMcxoE6a70pkVJjUvS9oEGwcv0iK9CMxoRnZleCHkbFbJSXyi0SpHnXcHmDmwEsT0QicM hwRsPDq0/uno9GwX8wA2DL2zyjNQ73gkltr4JW4kXcpre/GMelu6HoQA9mayJA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748528582; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=w4y0m4Ws8kcvo84usxoK20A6AtEr024k5yjFNqkmaE0=; b=Ab/qAERZ2mzO6MXdZQ9Vs+dhxAZfTxDmLbFLxeisfurF0dJ2omKwBfNqhei+LYHyMKBPUI FUSkTzIL0AlM6lTjlzsQjeUHFdrirZ1JzOaP+RYMQLbFyjAfWWIfvI/QC6MroVsJU2iVdO Il7feWDX2SIIghk8miZWieUiklxCrVkmc/rsyXMU4Ypf8RV0U2yPws0aL6mbus607IIorC jZIUkuuAnLqSLSYsrt1DSdxzC4Zzfx5W9MsIgd6OWqFSR28qNfC7+/TJrt3Br8WdGuCwyd ASEUzvmFMDUI3QpRtp5awaqcdplYRK0qiRWCjnbRDE2DSp4y7M4DriDxKPnsgg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b7T9f0xtqz1PWG; Thu, 29 May 2025 14:23: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 54TEN2C1009186; Thu, 29 May 2025 14:23:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54TEN2I6009183; Thu, 29 May 2025 14:23:02 GMT (envelope-from git) Date: Thu, 29 May 2025 14:23:02 GMT Message-Id: <202505291423.54TEN2I6009183@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: 58b2bd33aff7 - main - namei: clear internal flags in NDREINIT() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 58b2bd33aff71c0268d99d63e9c83f6544d3beb3 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=58b2bd33aff71c0268d99d63e9c83f6544d3beb3 commit 58b2bd33aff71c0268d99d63e9c83f6544d3beb3 Author: Konstantin Belousov AuthorDate: 2025-05-28 21:51:42 +0000 Commit: Konstantin Belousov CommitDate: 2025-05-29 14:22:49 +0000 namei: clear internal flags in NDREINIT() same as it is done for NDRESTART() Fixes: e05e33041c252 Reported and tested by: pho Reviewed by: markj Sponsored by: The FreeBSD Foundation --- sys/sys/namei.h | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/sys/namei.h b/sys/sys/namei.h index 4a16ec923bd8..eda3cc9b6f24 100644 --- a/sys/sys/namei.h +++ b/sys/sys/namei.h @@ -266,6 +266,7 @@ do { \ filecaps_free(&_ndp->ni_filecaps); \ _ndp->ni_resflags = 0; \ _ndp->ni_startdir = NULL; \ + _ndp->ni_cnd.cn_flags &= ~NAMEI_INTERNAL_FLAGS; \ } while (0) #define NDPREINIT(ndp) do { \ From nobody Thu May 29 14:29:41 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b7TKK57t7z5x56v; Thu, 29 May 2025 14:29: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b7TKK3xc7z3lVQ; Thu, 29 May 2025 14:29:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748528981; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eXTY9dF3+PMSFgOMF8vy3sa6rNbbUsikEP+XSBZJkYQ=; b=elaMEAcRmJ3iP7VoKcLnHC/CY9I/+CChPmccD/ylHROxvl3wBnMPfovp+KSCY4OKJpEQze aa1R59aaQYQYKgHNssPOKUY6TCG2dgGqIhZJrELvzMfJba92KKy+pzNgxYx0oBNPLRk0Yb VgV6j67mOGDpIxnprH3+ITZiFkncoMlDTz+NOdDfMPZUfrMJjENeb6juJhZ+/i0cdy7Yto VJV8q4FVw/KN3JnLV+zNXkyrdeTJhjDfvDitYyPcFiX4blVBhRxR6B96Elt5kfFmEuErm+ cMlf0FZtyFnCk88+5vqdWEu6OEUGQlf9imngkYHyQksys0r5LP3p3KirXSyl3Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748528981; a=rsa-sha256; cv=none; b=erJ0gBbEly+YsReGxnhQ0ywGO1Cp39ii+jMZVuBgH8jve+7fcCw8vWRvrDEYNcQ3L9hcwH OIX6xZK3zm6j7xhy6tk+cDAbfFdcRJBD8b0hQnhzHa6YMJ5O2WFdE99ZQaiTkmNll3Fae6 OTP2XwprgqQqUdz2ekYUzV7pTSYjFLbSRhkkkH43sWkXge9sTrIszLWsxfLh316VrEeUCy 5bdL2WHy331L6Z5/xat9LGVL7pYux9eOZpWhciAbAQsu/Wrz363rfLlexrPEEZrwepa10/ J2QHJOVaQ5N0we4v0L4B1EY69iIDOILdqLKXEWQ7vMoqux30nI9MbdWbifvQUA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748528981; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eXTY9dF3+PMSFgOMF8vy3sa6rNbbUsikEP+XSBZJkYQ=; b=wypk2eEdEMIx7Ui86n4zTPsIbmYnYB6buFJMQmzksOrAePCFr+5qCsMsVXVEHkC5aTi7OH TF6YOrgv7wNXNFI38HDq3Fj9BYE8H1GptNDk2c9BQV7iohyNStxQRp6vNBIdN4lKy6eANm 5KlGZHZKvWnVFxI+U2xdH5pfC9AWYotv3NMfuKD66w2o2bh5hmD6WP6uJjoTz/K38wIRXZ p7SYRjrQ+jcWMlLq0lvcNBOjNT2Y81nHyMBVD2HnjVAueeiwuGG9YH+qOY1IoJZpsk3I/2 bMHQRB15nArD5UDGMZG8121ZU2YodgJIvqPQU7nHgIhnD5A8CQCvB82Kwc1MUg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b7TKK2nmRz1PkL; Thu, 29 May 2025 14:29: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 54TETfpZ011579; Thu, 29 May 2025 14:29:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54TETfHl011576; Thu, 29 May 2025 14:29:41 GMT (envelope-from git) Date: Thu, 29 May 2025 14:29:41 GMT Message-Id: <202505291429.54TETfHl011576@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: b57eb8059665 - main - kern_sig.c: make pt_attach_transparent global List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: b57eb80596651c1f5972f3b6cd21ef95cc95ac85 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=b57eb80596651c1f5972f3b6cd21ef95cc95ac85 commit b57eb80596651c1f5972f3b6cd21ef95cc95ac85 Author: Konstantin Belousov AuthorDate: 2025-05-27 21:08:12 +0000 Commit: Konstantin Belousov CommitDate: 2025-05-29 14:26:52 +0000 kern_sig.c: make pt_attach_transparent global Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differrential revision: https://reviews.freebsd.org/D50556 --- sys/kern/kern_sig.c | 2 +- sys/sys/signalvar.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c index 4637a1218bf1..f5ebd7c7b1ce 100644 --- a/sys/kern/kern_sig.c +++ b/sys/kern/kern_sig.c @@ -174,7 +174,7 @@ SYSCTL_BOOL(_kern, OID_AUTO, sig_discard_ign, CTLFLAG_RWTUN, "Discard ignored signals on delivery, otherwise queue them to " "the target queue"); -static bool pt_attach_transparent = true; +bool pt_attach_transparent = true; SYSCTL_BOOL(_debug, OID_AUTO, ptrace_attach_transparent, CTLFLAG_RWTUN, &pt_attach_transparent, 0, "Hide wakes from PT_ATTACH on interruptible sleeps"); diff --git a/sys/sys/signalvar.h b/sys/sys/signalvar.h index 18e21e33c241..23e8426b26ee 100644 --- a/sys/sys/signalvar.h +++ b/sys/sys/signalvar.h @@ -270,6 +270,7 @@ int __sys_sigfastblock(int cmd, void *ptr); #ifdef _KERNEL extern bool sigfastblock_fetch_always; +extern bool pt_attach_transparent; /* Return nonzero if process p has an unmasked pending signal. */ #define SIGPENDING(td) \ From nobody Thu May 29 14:29:42 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b7TKL4yRXz5x56y; Thu, 29 May 2025 14:29: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b7TKL48DVz3lPw; Thu, 29 May 2025 14:29:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748528982; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8iVvfzzdWabXsJvrXNJzXf53jHLKZuAv8hMLmKDGWvA=; b=wikr3QIblsTwR42154ARnovAHDvkohjeq2Kcb4bYYsCRG9XOluH9ligztYIF6j8lf3ladC AiRFq2RXT6uJbEYbRgOgsNyRb0GwnbGIQqPaVI89y9RgT1nvqlFLkW7yrsTz4phB1ZkE/3 celhGwXwWjgchXeMUe/tdEdiRGqdoN41UQzD9rSODdb9Y+nBFQLRRDxZM78IsaknSdMIG9 HMKEB+QHmnt5ZjDHoIIG+jIpcGbcXGMJpSWK0aRB00KyPVTFje1xw4Sy6uk3coSejPk0Bw 84QPM2IJKTpn286TxoRQq6Y/BnNktRrPA22CgpoCNxH18W7Q9yzcLDKOI3H7NA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748528982; a=rsa-sha256; cv=none; b=WDFzsa5B6GUAXzA6oFZK2QMBsozHXxDPD0uVCBwLGHVqPeHsO28aMM6FZuUBezvIpEyAnx q6ZkgMGhyUm8Oj3ryYi+4sEJ19FLhoUBZKi6TkGDiefmSACDhMj5rVO5Lcc8godDhzHsGP HxOI+2HS1Zpc1UISOKwBFiOKTNH4mSCB8iMk/peTsohqAOtajOXm7PyCg4qXylZnlYh79L qi0lvyts95lWp0WlfJgtk0Ses9YBNSUvmmAKtZFlYO56pDiwHDr7XtjE3cGUH0EHOIxLcm 6e5U8JKRFz46GepzHxQozCptVWU3xZmOOpvGepZzIVbs3jbevbIsOAVRSLtU5w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748528982; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8iVvfzzdWabXsJvrXNJzXf53jHLKZuAv8hMLmKDGWvA=; b=Gg9FppXQY7he2q7SGIbekbMATbZlwU6a4kJFwCPsYTtZ5mi2wmmQJ7rhoC/ziayPH4wA/7 J1LyFO+vcVc4YOa2dFXE1/sOD1RmSjIXXptv6GXsay3Ag0cH0KcKHuageDxnOpxI5I+jec hg3gyHj37I2yDcVxuMYFad9FG3sSqH+T0S8vqAVx/U7PQPZAjwgH8AOCD0F4qoOZst8PRH vAaf1FwWbTc3HQzzqLR4Nfm3+aHcHduJWKoD10gbsdjBAI2OGtLElAuhkR1POR7C3XUnr6 1JmROVigewTceqApxooQ0ZUUeRxmmQKH8nxBQ/1fAZGcHhdJcvSPHs3OiSjfNw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b7TKL3htQz1PkM; Thu, 29 May 2025 14:29: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 54TETgOS011613; Thu, 29 May 2025 14:29:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54TETgn8011610; Thu, 29 May 2025 14:29:42 GMT (envelope-from git) Date: Thu, 29 May 2025 14:29:42 GMT Message-Id: <202505291429.54TETgn8011610@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: def0c056d338 - main - PT_CONTINUE: if pc is set, mark the thread state as modified by user List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: def0c056d3380b91ca7422d0a8727c6a4c8f6dae Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=def0c056d3380b91ca7422d0a8727c6a4c8f6dae commit def0c056d3380b91ca7422d0a8727c6a4c8f6dae Author: Konstantin Belousov AuthorDate: 2025-05-27 21:08:43 +0000 Commit: Konstantin Belousov CommitDate: 2025-05-29 14:27:46 +0000 PT_CONTINUE: if pc is set, mark the thread state as modified by user Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differrential revision: https://reviews.freebsd.org/D50556 --- sys/kern/sys_process.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/kern/sys_process.c b/sys/kern/sys_process.c index 69ea3d97d505..35112f6c29d1 100644 --- a/sys/kern/sys_process.c +++ b/sys/kern/sys_process.c @@ -1233,6 +1233,7 @@ kern_ptrace(struct thread *td, int req, pid_t pid, void *addr, int data) (u_long)(uintfptr_t)addr); if (error) goto out; + td2->td_dbgflags |= TDB_USERWR; } switch (req) { case PT_TO_SCE: From nobody Thu May 29 14:29:43 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b7TKM5w2Zz5x5Fj; Thu, 29 May 2025 14:29: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b7TKM56Wzz3lQ3; Thu, 29 May 2025 14:29:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748528983; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MJssb6Nze/WaRVApie8b1qp/h8+64VlouZk3w+/bhmg=; b=hEnOML8YA/M4+WItuKJjlem95ToD+v8k6BiQ0ayMz7mknBkbWfJvrwDBMja5RI1vttwE2f Ew3NV6ay2mXKBjdpxiZgLS3dyzR5SW8VM6Un/EfyoYvAeLGQ5QNmqjNA0KzD5BdI4gtBs6 cKCKfV8/4UheYXvAB57Li1ckWss1IwUKB0d3DcLX0r3qhlr6cdcrq8hkiOzpQnGyRPXvtm v8GdZ6frAYfb3l3u65fRp/GbyHq7i/DP1ZRHJW4yGudi5t8t/i/yQ/J0YodQUJM6DB9hri ytxaItvM6OZdt7reW4RB/LjbJAaH3+mDbchiasgP7A4F7Irl+taqag6DV5oanQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748528983; a=rsa-sha256; cv=none; b=X/O+T41xmBg7YufdDZItHXrjimoQmXQXqk8i9EsNQ+Vp9lG9fhP21j1ACxHGbbct+tt9/g PybQ2by/L3tAlZQRO/fET+msw2a1xj9bG+MUR6M/bBGnafpPBMvLt1nZfcLPqvlOHaLK6H 7+VpYG8guRSjrFk35X8EYG+mC1W0xUdS7Ge7uhczxtwRICsgP6XboM3glik/rJJW3qg4mB oq98mHxGG5aKYt0YdPkewxtp/9vhqgV9L/SPuabPpSnUWzRpw62HAW4T7sZVMbBO7io6W/ ysDnvBC8R4328iYQ+oKCmAtFo1IUasRgWZwTIwHLUH51YoDWZp7w9A+x5haMzQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748528983; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MJssb6Nze/WaRVApie8b1qp/h8+64VlouZk3w+/bhmg=; b=BVjOHoo6+ler2zYsU/gF+qPAPHVhRs5rm+Vwa+WIxTm/E/oIHyC4iBfpqhPcZTzFqZEJW3 bB3xZIygIUYROR2NYFw8AZnDqEUfle04gV3tWRyuUoH6DhiyiOIUD8CSIe8eQR2hjjYWyW hWvKFHXRNI+ETMqoDjyjlBtnpJcjk88QCWm9Pqk3QPoNPTpFqKvZnCyWJQEflsrBHjsdfO N1QpEk2JgdrgXuOW46+zXKjhhy+pcJ6IF9meg6MMvJ+N1XmBOMV2SsAdlhZGbyE3QgVmpX u9OGdLncKRrcQFNMjKoWPCBr1mCmMO4LoPRnxWWBSHS81GmDflR9HiKvSsA8Lg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b7TKM4dkBz1PkN; Thu, 29 May 2025 14:29: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 54TEThqp011650; Thu, 29 May 2025 14:29:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54TEThc1011647; Thu, 29 May 2025 14:29:43 GMT (envelope-from git) Date: Thu, 29 May 2025 14:29:43 GMT Message-Id: <202505291429.54TEThc1011647@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: 99976934274d - main - PT_CONTINUE: undo transparent attach consequences List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 99976934274de6fa19f049a0b6eac10856710f96 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=99976934274de6fa19f049a0b6eac10856710f96 commit 99976934274de6fa19f049a0b6eac10856710f96 Author: Konstantin Belousov AuthorDate: 2025-05-27 21:09:18 +0000 Commit: Konstantin Belousov CommitDate: 2025-05-29 14:28:06 +0000 PT_CONTINUE: undo transparent attach consequences PR: 287050 Reported and tested by: Paul Floyd Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D50556 --- sys/kern/sys_process.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/sys/kern/sys_process.c b/sys/kern/sys_process.c index 35112f6c29d1..8b382cb3048e 100644 --- a/sys/kern/sys_process.c +++ b/sys/kern/sys_process.c @@ -39,6 +39,7 @@ #include #include #include +#include #include #include #include @@ -1346,6 +1347,27 @@ kern_ptrace(struct thread *td, int req, pid_t pid, void *addr, int data) if (data == SIGKILL) proc_wkilled(p); + /* + * If the PT_CONTINUE-like operation is attempted on + * the thread on sleepq, this is possible only after + * the transparent PT_ATTACH. In this case, if the + * caller modified the thread state, e.g. by writing + * register file or specifying the pc, make the thread + * xstopped by waking it up. + */ + if ((td2->td_dbgflags & TDB_USERWR) != 0) { + if (pt_attach_transparent) { + thread_lock(td2); + if (TD_ON_SLEEPQ(td2) && + (td2->td_flags & TDF_SINTR) != 0) { + sleepq_abort(td2, EINTR); + } else { + thread_unlock(td2); + } + } + td2->td_dbgflags &= ~TDB_USERWR; + } + /* * Unsuspend all threads. To leave a thread * suspended, use PT_SUSPEND to suspend it before From nobody Thu May 29 15:57:49 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b7WH24gwyz5x9ZR; Thu, 29 May 2025 15:57:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b7WH16bnWz3bMZ; Thu, 29 May 2025 15:57:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748534269; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZdXEfz20tV2X5eaWvck543v8S+UPMIZfsy1DLCaL2Ms=; b=ViIg9DYU4Q3DGo/9Vy10AeDPDQ5WRrkmRIz6EtPLdmIXY3qqG1+kXH5DTJLpKp/JIcfiB7 XKfXKyCuVmOVWAHH9C3XZCLDqGDy7Ni28rUNpV3gGPLQETaswtRUgvyiBCwQUYtsztSQw9 MwRN9PDOrEzZH0ttGI2vBD1ZRYbzS9gpn9qMd9N8UL0+ZGWgcgkfEnDrr4ARedzcXNrds5 OspczEry29BpEUJicujL5oPfM6w2VGBbYqjf/YbTIzLhZVY8dFS583caPZrQoYzF2o8DgM p2jFzOGE6BSRMhb2c17O+FI9U5fJSaP9mJqp+RJHlqrwcFueNNauIL7ARsJkbw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748534269; a=rsa-sha256; cv=none; b=tQx73M+6NGbosqXHJwriqnGKsG63ko75Pc9xwNWQ17gj80B45gT1tjJmxyR763TUUE4G85 XGzJx/BLQU0oYCTYNZjJAQZzU+03AtEweBUe1moxdOhJ0pp/aXKXFWI+TKTF6j/TyVFkHQ xUTm201xMaDRydLM7ntX8I33GCwL76QPIPnMCLZhWHrr7q9vLFWaBmPhQbBwXOimagLaEh gi8uq5K5NL7rwbu9Z7q+niVYAtfY2qgKP+LfW9u72MEidb/E8WQ3BBuGPwyDCmsnJZxRgp duHq7BlZEnqoRmsZuwLecXQ95BZoge8LuKSbuZqG8CXURsYHH2mpD+CG215Lmw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748534269; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZdXEfz20tV2X5eaWvck543v8S+UPMIZfsy1DLCaL2Ms=; b=xsKRmdhv/6sSxfvhGloodBir7aKo6MNtGRIbK23P8SMRuvCgsGUb924pOwKWSfu5QWhG+Z K9HiumSTx8LXwrXSuBZHrUiCud9qXocbX8OILM75RaGzCffmEBYKTsL/RKSF3m1EITvLGU WhUc2EneSWd9bd62iM22yt/Pr4b1oYuPcBOiDCNNJauCfZcaucGYkCGq9JYvR8jK4YRKaY EVJS1C+jJcD8STc1Oa2caGvwC3Ae3gOZRxm9M8eYTnqLcAZyepbwRBMfv6ELMnsiWTRzdz UANf9UwXKFsBf6ZUbxSPyZuNkxDINsDNISy4hdl024nRvnMVtkkLBI9tg9OgdQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b7WH167Xtz1S5X; Thu, 29 May 2025 15:57: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 54TFvnWB080534; Thu, 29 May 2025 15:57:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54TFvnvF080530; Thu, 29 May 2025 15:57:49 GMT (envelope-from git) Date: Thu, 29 May 2025 15:57:49 GMT Message-Id: <202505291557.54TFvnvF080530@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Fernando =?utf-8?Q?Apestegu=C3=ADa?= Subject: git: 1d193b180809 - main - Update linprocfs.4 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fernape X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1d193b1808098328d3ad16b436a329b258935e0c Auto-Submitted: auto-generated The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/src/commit/?id=1d193b1808098328d3ad16b436a329b258935e0c commit 1d193b1808098328d3ad16b436a329b258935e0c Author: Fernando Apesteguía AuthorDate: 2025-04-04 18:02:59 +0000 Commit: Fernando Apesteguía CommitDate: 2025-05-29 15:57:18 +0000 Update linprocfs.4 Add documentation for missing files and directories. Also reorganize a bit. Approved by: gbe@, ziaee@ (manpages) Differential Revision: https://reviews.freebsd.org/D50408 --- share/man/man4/linprocfs.4 | 87 +++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 78 insertions(+), 9 deletions(-) diff --git a/share/man/man4/linprocfs.4 b/share/man/man4/linprocfs.4 index f5ab7d9a10ad..53940d7c02b0 100644 --- a/share/man/man4/linprocfs.4 +++ b/share/man/man4/linprocfs.4 @@ -1,7 +1,7 @@ .\" Written by Garrett Wollman .\" This file is in the public domain. .\" -.Dd November 13, 2019 +.Dd May 29, 2025 .Dt LINPROCFS 4 .Os .Sh NAME @@ -26,17 +26,53 @@ There is also a special node called .Pa self which always refers to the process making the lookup request. .Pp -Each node is a directory containing several files: -.Bl -tag -width status +Each process node is a directory containing several files: +.Bl -tag -width oom_score_adj +.It Pa auxv +The auxiliary vector passed to the program. +.It Pa cmdline +The command line used to execute the process. +.It Pa cwd +A symbolic link pointing to the current work directory of the process. +.It Pa environ +The list of environment variables and values of the process. +Every variable and pair value is separated from the next by a NULL byte. .It Pa exe A reference to the vnode from which the process text was read. This can be used to gain access to the process' symbol table, or to start another copy of the process. +.It Pa limits +The soft and hard limits for the process along with the units used. +.It Pa maps +Memory map of the process. .It Pa mem The complete virtual memory image of the process. Only those addresses which exist in the process can be accessed. Reads and writes to this file modify the process. Writes to the text segment remain private to the process. +.It Pa mountinfo +Information about mount points. +.It Pa mounts +Similar to the above. +.It Pa oom_score_adj +Score adjustment for the Out Of Memory killer. +.It Pa root +Symbolic link to the root directory for this process. +.It Pa stat +Process statistics. +It includes user, nice, system, idle, iowait, irq, softirq, +steal, guest and guest_nice. +.It Pa statm +Process size statistics. +It includes total program size, resident set size, number of resident shared +pages (unused), text size, library size (unused), data + stack and dirty pages +(unused). +.It Pa status +Process statistics in human readable form. +It includes process name, state, PID, +etc. +.It Pa task +Dummy directory to avoid problems in specific software such as Chromium. .El .Pp Each node is owned by the process's user, and belongs to that user's @@ -46,23 +82,55 @@ node, which belongs to the .Li kmem group. .Sh FILES -.Bl -tag -width /compat/linux/proc/self/XXXXXXX -compact +.Bl -tag -width /compat/linux/proc/filesystems -compact .It Pa /compat/linux/proc -The normal mount point for the +The normal mount point for .Nm . +.It Pa /compat/linux/proc/cmdline +Contains the path of the kernel image used to boot the system. .It Pa /compat/linux/proc/cpuinfo CPU vendor and model information in human-readable form. +.It Pa /compat/linux/proc/devices +List of character and block devices. +The later is usually empty on +.Fx . +.It Pa /compat/linux/proc/filesystems +List of supported filesystems. +For pseudo filesystems, the first column contains +.Em nodev . .It Pa /compat/linux/proc/meminfo System memory information in human-readable form. +.It Pa /compat/linux/proc/modules +Loaded kernel modules. +Empty for now. +.It Pa /compat/linux/proc/mounts +Devices corresponding mount points. +.It Pa /compat/linux/proc/mtab +Same as above. +.It Pa /compat/linux/proc/partitions +Partition information including major and minor numbers, number of blocks and +name. +The rest of the fields are set to zero. +.It Pa /compat/linux/proc/stat +System statistics. +For each cpu it includes at most user time, nice time, system +time and idle time, iowait (time waiting for I/O to complete), times serving +irqs and softirq, steal, guest and guest_nice times that represent times spent +in different modes in a virtualized environment. +The last columns are set to zero. +This file also contains brief statistics for disks, context switches and +more. +.It Pa /compat/linux/proc/swap +Information about the swap device if any. +.It Pa /compat/linux/proc/uptime +Time since the last boot and time spent in idle state. +.It Pa /compat/linux/proc/version +Version of the emulated linux system. .It Pa /compat/linux/proc/pid A directory containing process information for process .Pa pid . .It Pa /compat/linux/proc/self A directory containing process information for the current process. -.It Pa /compat/linux/proc/self/exe -The executable image for the current process. -.It Pa /compat/linux/proc/self/mem -The complete virtual address space of the current process. .El .Sh EXAMPLES To mount a @@ -74,6 +142,7 @@ file system on .Sh SEE ALSO .Xr mount 2 , .Xr unmount 2 , +.Xr auxv 3 , .Xr linux 4 , .Xr procfs 5 , .Xr pseudofs 9 From nobody Thu May 29 16:07:28 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b7WV82QDkz5xB2y; Thu, 29 May 2025 16:07: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b7WV81pFKz3gBb; Thu, 29 May 2025 16:07:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748534848; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4eQUtGFxRusg8FmMDIkQK6QCoN0YXG55cDCSZHyqPXQ=; b=ykCOsLgRRYQByvr4DDss4Gl0JW1tISLyvM1wWCo6UukA+a0PPlb2u30Z0oQMKa6XCwbSMr XREgjGsijAIunghBwcPhdrwCx3Gz935aZOjpkzIy2CrXMirwPrNyQSJS6ZyB36xDoCKFea wuU9g7ZCTCABAyXam+hcK2V8hcFLVq6MQHWDb8CG7w94SriogTNCVNFsdD8O4bCqXn5Od5 mT9yZ910vXHd7pUhnY20dgy0iy8oYz+x36lONGMM1kwPVyQwZEWI9Pj1SFZXC34EoG3r9F wS2Kf0u4UYpIEsMCOxEkcfqClsRLT7hSDa5s4v6mSzLDx2Xb7oEseA8OHKMfIQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748534848; a=rsa-sha256; cv=none; b=WYncGEdM0p0VHuaqoNgMfJsZYCh9RVuYMPmVe/jl41Yy0/5b22c2W9NZHFWWm605OLuqQM hIGEwhnt6+pVDROrdLQ8nI/WwglIQPd2aLROIWHEf9eLrtaXnd0GhEdveBbytJRG8Ljfjm R9Z53ccIP+AyhAS13XrPjH+bXqLujri1V/D0kZFPvt9mDeko3ElT2j5ObE+/CyT1PzjMtB S0Pko8M3flPcC0fyPJ4NZ6h/3FU/aAUCt36gxjkNLUCceVrwyKm0m+4dXWc64LzcybpLM+ 9pJeJwaAuQ6acZTNOWWi6DC+e5+JFopOJ6vDe+NKwIqmdvs7hM2377MV1TG+Gg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748534848; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4eQUtGFxRusg8FmMDIkQK6QCoN0YXG55cDCSZHyqPXQ=; b=oQDv7DFMkqp1AvWTa912R+Y6zNY3g1JQxvi2vkVsK1hkodDtPUEESlyNY8bWKzi4+BlTfZ 93TiHlIvzJT/G1LwK4HZjszXvViSHsQJVXD7GlHcMatgfrdjRg0AKLxnVmOGjkuXFMRc45 fQBsFkcbKLV0OxLfalYEBwPRnJ/DXf5jQp7SA2SysW142YYbCq3tlt34pvVyJfYG2JftiT g9OIl3eYJ5PqNTtTyoqAvtHIYC4DPGCtV6f1OZFALnMoVVFLg76hPSuYCcLCia4ZSXIt/t l0AB1jgg1RRyH06AvnJFRYOfIkvqHwnqMS6wAMIRxdgCX5ZK7KojYUfXLXkDiQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b7WV81PSyz1SPh; Thu, 29 May 2025 16:07: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 54TG7Svm000405; Thu, 29 May 2025 16:07:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54TG7Snb000402; Thu, 29 May 2025 16:07:28 GMT (envelope-from git) Date: Thu, 29 May 2025 16:07:28 GMT Message-Id: <202505291607.54TG7Snb000402@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 960f40b892cf - main - rtld-elf: Pass struct tcb * around rather than struct dtv ** List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 960f40b892cf15961f059f509990652555db7b4f Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=960f40b892cf15961f059f509990652555db7b4f commit 960f40b892cf15961f059f509990652555db7b4f Author: Jessica Clarke AuthorDate: 2025-05-29 16:06:49 +0000 Commit: Jessica Clarke CommitDate: 2025-05-29 16:06:49 +0000 rtld-elf: Pass struct tcb * around rather than struct dtv ** When this code was first written we didn't have even a struct tcb, so to make it MI a pointer to the DTV pointer in the TCB was passed around. Now that we have a struct tcb we can simplify the code by instead passing around a pointer to that, and the MI code can access the tcb_dtv member wherever it happens to be in the layout. This reduces boilerplate in all the various callers of tls_get_addr_common/slow and makes it clearer that tls_get_addr_common/slow are operating on the TCB, rather than obfuscating it slightly through the double pointer. Whilst here, clarify the comments in aarch64's TLSDESC dynamic resolver, which were using tp without clarifying what this was for (previously a pointer to the DTV pointer, now a pointer to the TCB, which happen to be the same thing for Variant I TLS, and in the case of AArch64 are what TPIDR_EL0 point to directly, with no offset/bias). Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D50591 --- libexec/rtld-elf/aarch64/reloc.c | 5 +---- libexec/rtld-elf/aarch64/rtld_start.S | 4 ++-- libexec/rtld-elf/amd64/reloc.c | 5 +---- libexec/rtld-elf/arm/reloc.c | 5 +---- libexec/rtld-elf/i386/reloc.c | 10 ++-------- libexec/rtld-elf/powerpc/reloc.c | 5 +---- libexec/rtld-elf/powerpc64/reloc.c | 5 +---- libexec/rtld-elf/riscv/reloc.c | 5 +---- libexec/rtld-elf/rtld.c | 19 ++++++++----------- libexec/rtld-elf/rtld.h | 2 +- 10 files changed, 19 insertions(+), 46 deletions(-) diff --git a/libexec/rtld-elf/aarch64/reloc.c b/libexec/rtld-elf/aarch64/reloc.c index 8182bb428bd2..2b64b48585db 100644 --- a/libexec/rtld-elf/aarch64/reloc.c +++ b/libexec/rtld-elf/aarch64/reloc.c @@ -629,8 +629,5 @@ allocate_initial_tls(Obj_Entry *objs) void * __tls_get_addr(tls_index* ti) { - struct dtv **dtvp; - - dtvp = &_tcb_get()->tcb_dtv; - return (tls_get_addr_common(dtvp, ti->ti_module, ti->ti_offset)); + return (tls_get_addr_common(_tcb_get(), ti->ti_module, ti->ti_offset)); } diff --git a/libexec/rtld-elf/aarch64/rtld_start.S b/libexec/rtld-elf/aarch64/rtld_start.S index 53a7463e2634..fdc493198676 100644 --- a/libexec/rtld-elf/aarch64/rtld_start.S +++ b/libexec/rtld-elf/aarch64/rtld_start.S @@ -189,7 +189,7 @@ ENTRY(_rtld_tlsdesc_dynamic) /* * Slow path * return( - * tls_get_addr_common(tp, tlsdesc->tls_index, tlsdesc->tls_offs)); + * tls_get_addr_common(tcb, tlsdesc->tls_index, tlsdesc->tls_offs)); * */ 1: @@ -223,7 +223,7 @@ ENTRY(_rtld_tlsdesc_dynamic) .cfi_rel_offset x18, 120 /* Find the tls offset */ - mov x0, x4 /* tp */ + mov x0, x4 /* tcb */ mov x3, x1 /* tlsdesc ptr */ ldr w1, [x3, #8] /* tlsdec->tls_index */ ldr x2, [x3, #16] /* tlsdec->tls_offs */ diff --git a/libexec/rtld-elf/amd64/reloc.c b/libexec/rtld-elf/amd64/reloc.c index 95f402995836..883e3dcdff88 100644 --- a/libexec/rtld-elf/amd64/reloc.c +++ b/libexec/rtld-elf/amd64/reloc.c @@ -558,10 +558,7 @@ allocate_initial_tls(Obj_Entry *objs) void * __tls_get_addr(tls_index *ti) { - struct dtv **dtvp; - - dtvp = &_tcb_get()->tcb_dtv; - return (tls_get_addr_common(dtvp, ti->ti_module, ti->ti_offset)); + return (tls_get_addr_common(_tcb_get(), ti->ti_module, ti->ti_offset)); } size_t diff --git a/libexec/rtld-elf/arm/reloc.c b/libexec/rtld-elf/arm/reloc.c index 7bb7ce83e1bd..d1c7d3e43349 100644 --- a/libexec/rtld-elf/arm/reloc.c +++ b/libexec/rtld-elf/arm/reloc.c @@ -465,8 +465,5 @@ allocate_initial_tls(Obj_Entry *objs) void * __tls_get_addr(tls_index* ti) { - struct dtv **dtvp; - - dtvp = &_tcb_get()->tcb_dtv; - return (tls_get_addr_common(dtvp, ti->ti_module, ti->ti_offset)); + return (tls_get_addr_common(_tcb_get(), ti->ti_module, ti->ti_offset)); } diff --git a/libexec/rtld-elf/i386/reloc.c b/libexec/rtld-elf/i386/reloc.c index ff4b1ebbb148..845735deac7d 100644 --- a/libexec/rtld-elf/i386/reloc.c +++ b/libexec/rtld-elf/i386/reloc.c @@ -523,20 +523,14 @@ allocate_initial_tls(Obj_Entry *objs) __attribute__((__regparm__(1))) void * ___tls_get_addr(tls_index *ti) { - struct dtv **dtvp; - - dtvp = &_tcb_get()->tcb_dtv; - return (tls_get_addr_common(dtvp, ti->ti_module, ti->ti_offset)); + return (tls_get_addr_common(_tcb_get(), ti->ti_module, ti->ti_offset)); } /* Sun ABI */ void * __tls_get_addr(tls_index *ti) { - struct dtv **dtvp; - - dtvp = &_tcb_get()->tcb_dtv; - return (tls_get_addr_common(dtvp, ti->ti_module, ti->ti_offset)); + return (tls_get_addr_common(_tcb_get(), ti->ti_module, ti->ti_offset)); } size_t diff --git a/libexec/rtld-elf/powerpc/reloc.c b/libexec/rtld-elf/powerpc/reloc.c index 283a02c53511..8932c2c21278 100644 --- a/libexec/rtld-elf/powerpc/reloc.c +++ b/libexec/rtld-elf/powerpc/reloc.c @@ -837,9 +837,6 @@ allocate_initial_tls(Obj_Entry *list) void* __tls_get_addr(tls_index* ti) { - struct dtv **dtvp; - - dtvp = &_tcb_get()->tcb_dtv; - return (tls_get_addr_common(dtvp, ti->ti_module, ti->ti_offset + + return (tls_get_addr_common(_tcb_get(), ti->ti_module, ti->ti_offset + TLS_DTV_OFFSET)); } diff --git a/libexec/rtld-elf/powerpc64/reloc.c b/libexec/rtld-elf/powerpc64/reloc.c index b1ca871d2780..9ea14f63b5c7 100644 --- a/libexec/rtld-elf/powerpc64/reloc.c +++ b/libexec/rtld-elf/powerpc64/reloc.c @@ -734,9 +734,6 @@ allocate_initial_tls(Obj_Entry *list) void* __tls_get_addr(tls_index* ti) { - struct dtv **dtvp; - - dtvp = &_tcb_get()->tcb_dtv; - return (tls_get_addr_common(dtvp, ti->ti_module, ti->ti_offset + + return (tls_get_addr_common(_tcb_get(), ti->ti_module, ti->ti_offset + TLS_DTV_OFFSET)); } diff --git a/libexec/rtld-elf/riscv/reloc.c b/libexec/rtld-elf/riscv/reloc.c index cfa474aa93b7..390e8c458c28 100644 --- a/libexec/rtld-elf/riscv/reloc.c +++ b/libexec/rtld-elf/riscv/reloc.c @@ -478,9 +478,6 @@ allocate_initial_tls(Obj_Entry *objs) void * __tls_get_addr(tls_index* ti) { - struct dtv **dtvp; - - dtvp = &_tcb_get()->tcb_dtv; - return (tls_get_addr_common(dtvp, ti->ti_module, ti->ti_offset + + return (tls_get_addr_common(_tcb_get(), ti->ti_module, ti->ti_offset + TLS_DTV_OFFSET)); } diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index 3ba6f4bb5bbe..9758fa78bc1b 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -170,7 +170,7 @@ static int symlook_list(SymLook *, const Objlist *, DoneList *); static int symlook_needed(SymLook *, const Needed_Entry *, DoneList *); static int symlook_obj1_sysv(SymLook *, const Obj_Entry *); static int symlook_obj1_gnu(SymLook *, const Obj_Entry *); -static void *tls_get_addr_slow(struct dtv **, int, size_t, bool) __noinline; +static void *tls_get_addr_slow(struct tcb *, int, size_t, bool) __noinline; static void trace_loaded_objects(Obj_Entry *, bool); static void unlink_object(Obj_Entry *); static void unload_object(Obj_Entry *, RtldLockState *lockstate); @@ -4312,15 +4312,12 @@ dlinfo(void *handle, int request, void *p) static void rtld_fill_dl_phdr_info(const Obj_Entry *obj, struct dl_phdr_info *phdr_info) { - struct dtv **dtvp; - phdr_info->dlpi_addr = (Elf_Addr)obj->relocbase; phdr_info->dlpi_name = obj->path; phdr_info->dlpi_phdr = obj->phdr; phdr_info->dlpi_phnum = obj->phsize / sizeof(obj->phdr[0]); phdr_info->dlpi_tls_modid = obj->tlsindex; - dtvp = &_tcb_get()->tcb_dtv; - phdr_info->dlpi_tls_data = (char *)tls_get_addr_slow(dtvp, + phdr_info->dlpi_tls_data = (char *)tls_get_addr_slow(_tcb_get(), obj->tlsindex, 0, true); phdr_info->dlpi_adds = obj_loads; phdr_info->dlpi_subs = obj_loads - obj_count; @@ -5350,13 +5347,13 @@ unref_dag(Obj_Entry *root) * Common code for MD __tls_get_addr(). */ static void * -tls_get_addr_slow(struct dtv **dtvp, int index, size_t offset, bool locked) +tls_get_addr_slow(struct tcb *tcb, int index, size_t offset, bool locked) { struct dtv *newdtv, *dtv; RtldLockState lockstate; int to_copy; - dtv = *dtvp; + dtv = tcb->tcb_dtv; /* Check dtv generation in case new modules have arrived */ if (dtv->dtv_gen != tls_dtv_generation) { if (!locked) @@ -5373,7 +5370,7 @@ tls_get_addr_slow(struct dtv **dtvp, int index, size_t offset, bool locked) free(dtv); if (!locked) lock_release(rtld_bind_lock, &lockstate); - dtv = *dtvp = newdtv; + dtv = tcb->tcb_dtv = newdtv; } /* Dynamically allocate module TLS if necessary */ @@ -5391,16 +5388,16 @@ tls_get_addr_slow(struct dtv **dtvp, int index, size_t offset, bool locked) } void * -tls_get_addr_common(struct dtv **dtvp, int index, size_t offset) +tls_get_addr_common(struct tcb *tcb, int index, size_t offset) { struct dtv *dtv; - dtv = *dtvp; + dtv = tcb->tcb_dtv; /* Check dtv generation in case new modules have arrived */ if (__predict_true(dtv->dtv_gen == tls_dtv_generation && dtv->dtv_slots[index - 1].dtvs_tls != 0)) return (dtv->dtv_slots[index - 1].dtvs_tls + offset); - return (tls_get_addr_slow(dtvp, index, offset, false)); + return (tls_get_addr_slow(tcb, index, offset, false)); } #ifdef TLS_VARIANT_I diff --git a/libexec/rtld-elf/rtld.h b/libexec/rtld-elf/rtld.h index a92350b9387c..378cb51d36c6 100644 --- a/libexec/rtld-elf/rtld.h +++ b/libexec/rtld-elf/rtld.h @@ -415,7 +415,7 @@ void _rtld_bind_start(void); void *rtld_resolve_ifunc(const Obj_Entry *obj, const Elf_Sym *def); void symlook_init(SymLook *, const char *); int symlook_obj(SymLook *, const Obj_Entry *); -void *tls_get_addr_common(struct dtv **dtvp, int index, size_t offset); +void *tls_get_addr_common(struct tcb *tcb, int index, size_t offset); void *allocate_tls(Obj_Entry *, void *, size_t, size_t); void free_tls(void *, size_t, size_t); void *allocate_module_tls(int index); From nobody Thu May 29 16:07:29 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b7WV93T3Nz5xB54; Thu, 29 May 2025 16:07: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b7WV92kDQz3g94; Thu, 29 May 2025 16:07:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748534849; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=T9DV+7oxvy2iQnoMJC5i9apFIsQmPjbOFw5XPSKlGYE=; b=vUxRDHwlTQKXMj5bGObRj3huuwLy+gJ8Aft8tDXezyV+XBbFvgcDC0x1J682vuTcVpkq3F ekIw5d5Kq+vDLAVb9Djl9SluB7U3rMLpmTNUhaHGyc5uADiu/gf3S+Qts1G5BcM6ncROIT ND0rVvDvoK87cAOzH6qmzhzj+PpSQlbbZyWTBzdSOSt7L0CJtbt+6pq+89kA2CMMNHSUxU rjqnzoWq9TDhOjdZJoIoFk898QkuhEPuAY5+GI34nwfhXKlXwM8g0XAWR994RUIOmX3zwh LzOXQAmMDYU+ctzT3zVRBYfSPYe7qKMKnTTVqLCK3uMa+YM1T0oFIoJEfeMxDw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748534849; a=rsa-sha256; cv=none; b=INPJFa67BKXAAf9TPRBxM1NyukOzV8HsOyZZSAg61heRNjt9XVaxyM8soXitG9bNRCe8T/ gldmNHKeIgZPL2A1xQ8HE4J66w+irsXuPecuSbknJyv/amDVDj24OYbHzKgyY9mF3aES3A zLJb1IHw/2kE+qLJg7xED5ahTqjxs6u+qc3N030NFOZ4rgfPb+6q6LBqOT18TW+U6x0jrF TYOD3E0ziqFi4wOwr7TGFGzgCwAfetrzYXNX9l7taPLGwoUCUDuCiUhnU8MgF5/pyYm3OS 3Lf9tDgkhJqynOytclUn00OdNYBPHb2pKESjqRDwdxbqzsEnpwJa1NbMmULjjw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748534849; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=T9DV+7oxvy2iQnoMJC5i9apFIsQmPjbOFw5XPSKlGYE=; b=YT00lPf+Ta0dRkiJXxwwf6NBdM+nWWn+ehOcoEKEZGpTqT8ytRQnbz7reQ/cjbeOucDN18 gkk7BSrR4q+B2u6zLgmGGE1XVjSsj8D6MTBhMldbPKVPgfXZxxVPTQf+obTxcKV6qwrm6Y EUvw3eoIZt3rVs3/W3fSwkC6i2mq94XYVePdrz1wuMxnuXKXSN+0uU9Vm4UbEWzI5TEL3W MWkxDFG2TkVz20MbQF8G0ZajCjU6e6H0OFC9nOiv7T3UaTUkD6gVUYYmSgh7YSU+VyAZ2Q jh77rpSvl3lXUrumR47Xe3PYqj9lkFgAAXpuOhbhwyGeWwuCbvJZ5NnuksHphQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b7WV925RHz1Rrn; Thu, 29 May 2025 16:07: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 54TG7Tqa000438; Thu, 29 May 2025 16:07:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54TG7TeO000435; Thu, 29 May 2025 16:07:29 GMT (envelope-from git) Date: Thu, 29 May 2025 16:07:29 GMT Message-Id: <202505291607.54TG7TeO000435@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 250b2eda0acc - main - libc, libthr: Ditch MD __pthread_distribute_static_tls helpers List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 250b2eda0acc44cf882d5ea8fcf28125e7501719 Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=250b2eda0acc44cf882d5ea8fcf28125e7501719 commit 250b2eda0acc44cf882d5ea8fcf28125e7501719 Author: Jessica Clarke AuthorDate: 2025-05-29 16:06:54 +0000 Commit: Jessica Clarke CommitDate: 2025-05-29 16:06:54 +0000 libc, libthr: Ditch MD __pthread_distribute_static_tls helpers _libc_get_static_tls_base() is just _tcb_get() followed by adding (for Variant I) or subtracting (for Variant II) the offset, so just inline that as the implementation (like we do in rtld-elf) rather than having another copy (or equivalent) of _tcb_get()'s assembly. _get_static_tls_base() doesn't even have any MD assembly as it's reading thr->tcb, the only difference is whether to add or subtract, so again just inline that. Whilst here add some missing blank lines to comply with style(9) for elf_utils.c's includes, and use a pointer type rather than uintptr_t to reduce the need to cast, as is done in rtld-elf. Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D50592 --- lib/libc/aarch64/static_tls.h | 44 ------------------------- lib/libc/amd64/static_tls.h | 44 ------------------------- lib/libc/arm/static_tls.h | 45 -------------------------- lib/libc/gen/elf_utils.c | 17 +++++++--- lib/libc/i386/static_tls.h | 44 ------------------------- lib/libc/powerpc/static_tls.h | 44 ------------------------- lib/libc/powerpc64/static_tls.h | 44 ------------------------- lib/libc/riscv/static_tls.h | 46 --------------------------- lib/libthr/arch/aarch64/include/pthread_tls.h | 44 ------------------------- lib/libthr/arch/amd64/include/pthread_tls.h | 44 ------------------------- lib/libthr/arch/arm/include/pthread_tls.h | 44 ------------------------- lib/libthr/arch/i386/include/pthread_tls.h | 44 ------------------------- lib/libthr/arch/powerpc/include/pthread_tls.h | 44 ------------------------- lib/libthr/arch/riscv/include/pthread_tls.h | 44 ------------------------- lib/libthr/thread/thr_list.c | 25 +++++++++------ 15 files changed, 28 insertions(+), 589 deletions(-) diff --git a/lib/libc/aarch64/static_tls.h b/lib/libc/aarch64/static_tls.h deleted file mode 100644 index 2bb717eb75ce..000000000000 --- a/lib/libc/aarch64/static_tls.h +++ /dev/null @@ -1,44 +0,0 @@ -/*- - * SPDX-License-Identifier: BSD-2-Clause - * - * Copyright (c) 2019 The FreeBSD Foundation - * - * This software was developed by Konstantin Belousov - * under sponsorship from the FreeBSD Foundation. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#ifndef _LIBC_AARCH64_STATIC_TLS_H -#define _LIBC_AARCH64_STATIC_TLS_H - -static __inline uintptr_t -_libc_get_static_tls_base(size_t offset) -{ - uintptr_t tlsbase; - - __asm __volatile("mrs %x0, tpidr_el0" : "=r" (tlsbase)); - tlsbase += offset; - return (tlsbase); -} - -#endif diff --git a/lib/libc/amd64/static_tls.h b/lib/libc/amd64/static_tls.h deleted file mode 100644 index 1ee738b231c7..000000000000 --- a/lib/libc/amd64/static_tls.h +++ /dev/null @@ -1,44 +0,0 @@ -/*- - * SPDX-License-Identifier: BSD-2-Clause - * - * Copyright (c) 2019 The FreeBSD Foundation - * - * This software was developed by Konstantin Belousov - * under sponsorship from the FreeBSD Foundation. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#ifndef _LIBC_AMD64_STATIC_TLS_H -#define _LIBC_AMD64_STATIC_TLS_H - -static __inline uintptr_t -_libc_get_static_tls_base(size_t offset) -{ - uintptr_t tlsbase; - - __asm __volatile("movq %%fs:0, %0" : "=r" (tlsbase)); - tlsbase -= offset; - return (tlsbase); -} - -#endif diff --git a/lib/libc/arm/static_tls.h b/lib/libc/arm/static_tls.h deleted file mode 100644 index 557748d75347..000000000000 --- a/lib/libc/arm/static_tls.h +++ /dev/null @@ -1,45 +0,0 @@ -/*- - * SPDX-License-Identifier: BSD-2-Clause - * - * Copyright (c) 2019 The FreeBSD Foundation - * - * This software was developed by Konstantin Belousov - * under sponsorship from the FreeBSD Foundation. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#ifndef _LIBC_ARM_STATIC_TLS_H -#define _LIBC_ARM_STATIC_TLS_H - -static __inline uintptr_t -_libc_get_static_tls_base(size_t offset) -{ - uintptr_t tlsbase; - - __asm __volatile("mrc p15, 0, %0, c13, c0, 3" : "=r" (tlsbase)); - - tlsbase += offset; - return (tlsbase); -} - -#endif diff --git a/lib/libc/gen/elf_utils.c b/lib/libc/gen/elf_utils.c index 5b87e012d0eb..330aa8f17f7e 100644 --- a/lib/libc/gen/elf_utils.c +++ b/lib/libc/gen/elf_utils.c @@ -31,11 +31,14 @@ #include #include #include + +#include + #include #include #include + #include "libc_private.h" -#include "static_tls.h" void __pthread_map_stacks_exec(void); void __pthread_distribute_static_tls(size_t, void *, size_t, size_t); @@ -107,11 +110,15 @@ void __libc_distribute_static_tls(size_t offset, void *src, size_t len, size_t total_len) { - uintptr_t tlsbase; + char *tlsbase; - tlsbase = _libc_get_static_tls_base(offset); - memcpy((void *)tlsbase, src, len); - memset((char *)tlsbase + len, 0, total_len - len); +#ifdef TLS_VARIANT_I + tlsbase = (char *)_tcb_get() + offset; +#else + tlsbase = (char *)_tcb_get() - offset; +#endif + memcpy(tlsbase, src, len); + memset(tlsbase + len, 0, total_len - len); } #pragma weak __pthread_distribute_static_tls diff --git a/lib/libc/i386/static_tls.h b/lib/libc/i386/static_tls.h deleted file mode 100644 index baf9dfc59a5a..000000000000 --- a/lib/libc/i386/static_tls.h +++ /dev/null @@ -1,44 +0,0 @@ -/*- - * SPDX-License-Identifier: BSD-2-Clause - * - * Copyright (c) 2019 The FreeBSD Foundation - * - * This software was developed by Konstantin Belousov - * under sponsorship from the FreeBSD Foundation. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#ifndef _LIBC_I386_STATIC_TLS_H -#define _LIBC_I386_STATIC_TLS_H - -static __inline uintptr_t -_libc_get_static_tls_base(size_t offset) -{ - uintptr_t tlsbase; - - __asm __volatile("movl %%gs:0, %0" : "=r" (tlsbase)); - tlsbase -= offset; - return (tlsbase); -} - -#endif diff --git a/lib/libc/powerpc/static_tls.h b/lib/libc/powerpc/static_tls.h deleted file mode 100644 index 9ae38c71a515..000000000000 --- a/lib/libc/powerpc/static_tls.h +++ /dev/null @@ -1,44 +0,0 @@ -/*- - * SPDX-License-Identifier: BSD-2-Clause - * - * Copyright (c) 2019 The FreeBSD Foundation - * - * This software was developed by Konstantin Belousov - * under sponsorship from the FreeBSD Foundation. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#ifndef _LIBC_POWERPC_STATIC_TLS_H -#define _LIBC_POWERPC_STATIC_TLS_H - -static __inline uintptr_t -_libc_get_static_tls_base(size_t offset) -{ - uintptr_t tlsbase; - - __asm __volatile("mr %0,2" : "=r"(tlsbase)); - tlsbase += offset - 0x7008; - return (tlsbase); -} - -#endif diff --git a/lib/libc/powerpc64/static_tls.h b/lib/libc/powerpc64/static_tls.h deleted file mode 100644 index 014b8a931453..000000000000 --- a/lib/libc/powerpc64/static_tls.h +++ /dev/null @@ -1,44 +0,0 @@ -/*- - * SPDX-License-Identifier: BSD-2-Clause - * - * Copyright (c) 2019 The FreeBSD Foundation - * - * This software was developed by Konstantin Belousov - * under sponsorship from the FreeBSD Foundation. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#ifndef _LIBC_POWERPC64_STATIC_TLS_H -#define _LIBC_POWERPC64_STATIC_TLS_H - -static __inline uintptr_t -_libc_get_static_tls_base(size_t offset) -{ - uintptr_t tlsbase; - - __asm __volatile("mr %0,13" : "=r"(tlsbase)); - tlsbase += offset - 0x7010; - return (tlsbase); -} - -#endif diff --git a/lib/libc/riscv/static_tls.h b/lib/libc/riscv/static_tls.h deleted file mode 100644 index 40e9abd685e3..000000000000 --- a/lib/libc/riscv/static_tls.h +++ /dev/null @@ -1,46 +0,0 @@ -/*- - * SPDX-License-Identifier: BSD-2-Clause - * - * Copyright (c) 2019 The FreeBSD Foundation - * - * This software was developed by Konstantin Belousov - * under sponsorship from the FreeBSD Foundation. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#ifndef _LIBC_RISCV_STATIC_TLS_H -#define _LIBC_RISCV_STATIC_TLS_H - -#include - -static __inline uintptr_t -_libc_get_static_tls_base(size_t offset) -{ - uintptr_t tlsbase; - - tlsbase = (uintptr_t)_tcb_get(); - tlsbase += offset; - return (tlsbase); -} - -#endif diff --git a/lib/libthr/arch/aarch64/include/pthread_tls.h b/lib/libthr/arch/aarch64/include/pthread_tls.h deleted file mode 100644 index 4e02f8d4e03f..000000000000 --- a/lib/libthr/arch/aarch64/include/pthread_tls.h +++ /dev/null @@ -1,44 +0,0 @@ -/*- - * SPDX-License-Identifier: BSD-2-Clause - * - * Copyright (c) 2019 The FreeBSD Foundation - * - * This software was developed by Konstantin Belousov - * under sponsorship from the FreeBSD Foundation. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#ifndef _ARCH_AARCH64_PTHREAD_TLS_H -#define _ARCH_AARCH64_PTHREAD_TLS_H - -static __inline uintptr_t -_get_static_tls_base(struct pthread *thr, size_t offset) -{ - uintptr_t tlsbase; - - tlsbase = (uintptr_t)thr->tcb; - tlsbase += offset; - return (tlsbase); -} - -#endif diff --git a/lib/libthr/arch/amd64/include/pthread_tls.h b/lib/libthr/arch/amd64/include/pthread_tls.h deleted file mode 100644 index 2af0aeda4c85..000000000000 --- a/lib/libthr/arch/amd64/include/pthread_tls.h +++ /dev/null @@ -1,44 +0,0 @@ -/*- - * SPDX-License-Identifier: BSD-2-Clause - * - * Copyright (c) 2019 The FreeBSD Foundation - * - * This software was developed by Konstantin Belousov - * under sponsorship from the FreeBSD Foundation. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#ifndef _ARCH_AMD64_PTHREAD_TLS_H -#define _ARCH_AMD64_PTHREAD_TLS_H - -static __inline uintptr_t -_get_static_tls_base(struct pthread *thr, size_t offset) -{ - uintptr_t tlsbase; - - tlsbase = (uintptr_t)thr->tcb; - tlsbase -= offset; - return (tlsbase); -} - -#endif diff --git a/lib/libthr/arch/arm/include/pthread_tls.h b/lib/libthr/arch/arm/include/pthread_tls.h deleted file mode 100644 index 27a07f69f474..000000000000 --- a/lib/libthr/arch/arm/include/pthread_tls.h +++ /dev/null @@ -1,44 +0,0 @@ -/*- - * SPDX-License-Identifier: BSD-2-Clause - * - * Copyright (c) 2019 The FreeBSD Foundation - * - * This software was developed by Konstantin Belousov - * under sponsorship from the FreeBSD Foundation. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#ifndef _ARCH_ARM_PTHREAD_TLS_H -#define _ARCH_ARM_PTHREAD_TLS_H - -static __inline uintptr_t -_get_static_tls_base(struct pthread *thr, size_t offset) -{ - uintptr_t tlsbase; - - tlsbase = (uintptr_t)thr->tcb; - tlsbase += offset; - return (tlsbase); -} - -#endif diff --git a/lib/libthr/arch/i386/include/pthread_tls.h b/lib/libthr/arch/i386/include/pthread_tls.h deleted file mode 100644 index b2d0f2dbe845..000000000000 --- a/lib/libthr/arch/i386/include/pthread_tls.h +++ /dev/null @@ -1,44 +0,0 @@ -/*- - * SPDX-License-Identifier: BSD-2-Clause - * - * Copyright (c) 2019 The FreeBSD Foundation - * - * This software was developed by Konstantin Belousov - * under sponsorship from the FreeBSD Foundation. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#ifndef _ARCH_I386_PTHREAD_TLS_H -#define _ARCH_I386_PTHREAD_TLS_H - -static __inline uintptr_t -_get_static_tls_base(struct pthread *thr, size_t offset) -{ - uintptr_t tlsbase; - - tlsbase = (uintptr_t)thr->tcb; - tlsbase -= offset; - return (tlsbase); -} - -#endif diff --git a/lib/libthr/arch/powerpc/include/pthread_tls.h b/lib/libthr/arch/powerpc/include/pthread_tls.h deleted file mode 100644 index e53164436018..000000000000 --- a/lib/libthr/arch/powerpc/include/pthread_tls.h +++ /dev/null @@ -1,44 +0,0 @@ -/*- - * SPDX-License-Identifier: BSD-2-Clause - * - * Copyright (c) 2019 The FreeBSD Foundation - * - * This software was developed by Konstantin Belousov - * under sponsorship from the FreeBSD Foundation. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#ifndef _ARCH_POWERPC_PTHREAD_TLS_H -#define _ARCH_POWERPC_PTHREAD_TLS_H - -static __inline uintptr_t -_get_static_tls_base(struct pthread *thr, size_t offset) -{ - uintptr_t tlsbase; - - tlsbase = (uintptr_t)thr->tcb; - tlsbase += offset; - return (tlsbase); -} - -#endif diff --git a/lib/libthr/arch/riscv/include/pthread_tls.h b/lib/libthr/arch/riscv/include/pthread_tls.h deleted file mode 100644 index 0af1ddd4cfaf..000000000000 --- a/lib/libthr/arch/riscv/include/pthread_tls.h +++ /dev/null @@ -1,44 +0,0 @@ -/*- - * SPDX-License-Identifier: BSD-2-Clause - * - * Copyright (c) 2019 The FreeBSD Foundation - * - * This software was developed by Konstantin Belousov - * under sponsorship from the FreeBSD Foundation. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#ifndef _ARCH_RISCV_PTHREAD_TLS_H -#define _ARCH_RISCV_PTHREAD_TLS_H - -static __inline uintptr_t -_get_static_tls_base(struct pthread *thr, size_t offset) -{ - uintptr_t tlsbase; - - tlsbase = (uintptr_t)thr->tcb; - tlsbase += offset; - return (tlsbase); -} - -#endif diff --git a/lib/libthr/thread/thr_list.c b/lib/libthr/thread/thr_list.c index 5578abdc8727..820766f6f5e0 100644 --- a/lib/libthr/thread/thr_list.c +++ b/lib/libthr/thread/thr_list.c @@ -30,13 +30,14 @@ #include #include +#include + #include #include #include #include "libc_private.h" #include "thr_private.h" -#include "static_tls.h" /*#define DEBUG_THREAD_LIST */ #ifdef DEBUG_THREAD_LIST @@ -363,15 +364,13 @@ _thr_find_thread(struct pthread *curthread, struct pthread *thread, return (ret); } -#include "pthread_tls.h" - static void -thr_distribute_static_tls(uintptr_t tlsbase, void *src, size_t len, +thr_distribute_static_tls(char *tlsbase, void *src, size_t len, size_t total_len) { - memcpy((void *)tlsbase, src, len); - memset((char *)tlsbase + len, 0, total_len - len); + memcpy(tlsbase, src, len); + memset(tlsbase + len, 0, total_len - len); } void @@ -379,17 +378,25 @@ __pthread_distribute_static_tls(size_t offset, void *src, size_t len, size_t total_len) { struct pthread *curthread, *thrd; - uintptr_t tlsbase; + char *tlsbase; if (!_thr_is_inited()) { - tlsbase = _libc_get_static_tls_base(offset); +#ifdef TLS_VARIANT_I + tlsbase = (char *)_tcb_get() + offset; +#else + tlsbase = (char *)_tcb_get() - offset; +#endif thr_distribute_static_tls(tlsbase, src, len, total_len); return; } curthread = _get_curthread(); THREAD_LIST_RDLOCK(curthread); TAILQ_FOREACH(thrd, &_thread_list, tle) { - tlsbase = _get_static_tls_base(thrd, offset); +#ifdef TLS_VARIANT_I + tlsbase = (char *)thrd->tcb + offset; +#else + tlsbase = (char *)thrd->tcb - offset; +#endif thr_distribute_static_tls(tlsbase, src, len, total_len); } THREAD_LIST_UNLOCK(curthread); From nobody Thu May 29 16:07:30 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b7WVB53FGz5x9m4; Thu, 29 May 2025 16:07: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b7WVB3dnWz3g9G; Thu, 29 May 2025 16:07:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748534850; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=b6fWrrUUT35RlCubHOHM6zeXka9ELz0RVlNO6lCe9hA=; b=cDINlggh+e+D2NySp4lE6kzbV1ipja3nom2qOfd+49BjL7BpXNBpGyir1GXcvXsK837tKY sGzTD0BrJUz9VMUiaJqLHQOYSJYGzzwiC1XMuek0CP1H+w6fNnIjO825+z5imMI3Z3bLcl z7OENNqqyYuObSu20/BonpUEtIUCTzupEu541kAkt9uuwGeG5LD/PjVaHtg1D49McANjsO s7Uza7C1fgtcai+f5rbdXxFjUVMxt8cHrIXi2BB1UpSAvO4FKLYJ7/SoaICZtaUXnoMWvf DM/JXjXsrzz+XZiKmyaWlqwQ26McG4S4O3fwT5ylRFyq4YNTP/BCBmf1hx370A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748534850; a=rsa-sha256; cv=none; b=rYw2h6lFFyNVX4jKYWnIqwhsZ9AzrejEz96ySe5F8XKCC+9K/Qg5JG4zrVrY3lWrFSTDGy oRVnD77ZfhXpNVER3rLV9U8NLXeKBXx//AsUbudF9vw/gJ0Uzy0IMntPQoAqQOtBejEUUa UkLqvRb+V0lNP/tnTBfiG7eQDGQoINgKsggI8zF+ZCpaAE33yiE/314i5p4AnapyXnQ/4F +HnfMAouqLgW87Jf4UsjQnJ1hG8oC3UYosEVrtxpzfIlzksuouZkK+y7rXEyRvRIQrxv7u +exl2LpFddIdcWAB4NM8bt3jZDJPZEGL7DPq1QSqqm5bKNr9PIgaQTVwYASu7A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748534850; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=b6fWrrUUT35RlCubHOHM6zeXka9ELz0RVlNO6lCe9hA=; b=TIETSA1vfIbf5/zhzRUuhlL2/Ot8at8zymLcaYEJnQLH3h1Cw0xOA5v4Y0Tsy7R1DjGNZL h3vldIr+hMFtwuNep/IvDJrTU2cBA/ICK3NR35JaUjm9MkthhlWqYd4wJaqzKKuTDh7peS u5z1PjDm/rHlGXQXLYbCSibkvu4UFxdinDUKt2ww/ER1SqTQ7o13SJAAw6RcIiRXFNJtFX cWC7fvuQoJ2lfRUln0VlgsdFUctKBImFDbu86lZTLGNK7MFR2ynqkz00Ovn77L+DqTvEUW Nn+wuTPMLAbdvL744IHxsUperu3p+hXDDUNMYLSrNgRkfiLy6kzIWML6ITr8Vw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b7WVB2s8yz1Rrp; Thu, 29 May 2025 16:07: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 54TG7ULp000479; Thu, 29 May 2025 16:07:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54TG7Uc1000476; Thu, 29 May 2025 16:07:30 GMT (envelope-from git) Date: Thu, 29 May 2025 16:07:30 GMT Message-Id: <202505291607.54TG7Uc1000476@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 48fd084579af - main - rtld-elf: Pass TCB to allocate_module_tls to avoid re-getting List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 48fd084579af7604e934b827ef473194d3d5e3ba Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=48fd084579af7604e934b827ef473194d3d5e3ba commit 48fd084579af7604e934b827ef473194d3d5e3ba Author: Jessica Clarke AuthorDate: 2025-05-29 16:07:02 +0000 Commit: Jessica Clarke CommitDate: 2025-05-29 16:07:02 +0000 rtld-elf: Pass TCB to allocate_module_tls to avoid re-getting The only caller already has the current TCB to hand, so just pass it down rather than get it again. This also makes it clear in the caller that it depends on the (current) TCB, rather than being storage that could be assigned to any thread (concurrency issues aside). Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D50594 --- libexec/rtld-elf/rtld.c | 8 ++++---- libexec/rtld-elf/rtld.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index 9758fa78bc1b..625e67941be3 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -5380,7 +5380,7 @@ tls_get_addr_slow(struct tcb *tcb, int index, size_t offset, bool locked) wlock_acquire(rtld_bind_lock, &lockstate); if (!dtv->dtv_slots[index - 1].dtvs_tls) dtv->dtv_slots[index - 1].dtvs_tls = - allocate_module_tls(index); + allocate_module_tls(tcb, index); if (!locked) lock_release(rtld_bind_lock, &lockstate); } @@ -5665,7 +5665,7 @@ free_tls(void *tcb, size_t tcbsize __unused, size_t tcbalign) * Allocate TLS block for module with given index. */ void * -allocate_module_tls(int index) +allocate_module_tls(struct tcb *tcb, int index) { Obj_Entry *obj; char *p; @@ -5683,9 +5683,9 @@ allocate_module_tls(int index) if (obj->tls_static) { #ifdef TLS_VARIANT_I - p = (char *)_tcb_get() + obj->tlsoffset; + p = (char *)tcb + obj->tlsoffset; #else - p = (char *)_tcb_get() - obj->tlsoffset; + p = (char *)tcb - obj->tlsoffset; #endif return (p); } diff --git a/libexec/rtld-elf/rtld.h b/libexec/rtld-elf/rtld.h index 378cb51d36c6..46473b92a637 100644 --- a/libexec/rtld-elf/rtld.h +++ b/libexec/rtld-elf/rtld.h @@ -418,7 +418,7 @@ int symlook_obj(SymLook *, const Obj_Entry *); void *tls_get_addr_common(struct tcb *tcb, int index, size_t offset); void *allocate_tls(Obj_Entry *, void *, size_t, size_t); void free_tls(void *, size_t, size_t); -void *allocate_module_tls(int index); +void *allocate_module_tls(struct tcb *tcb, int index); bool allocate_tls_offset(Obj_Entry *obj); void free_tls_offset(Obj_Entry *obj); const Ver_Entry *fetch_ventry(const Obj_Entry *obj, unsigned long); From nobody Thu May 29 17:57:09 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b7Ywj1nzHz5xHlT; Thu, 29 May 2025 17:57: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b7Ywj18cnz3mNP; Thu, 29 May 2025 17:57:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748541429; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S7/nTYdtYxcRZYAULw7AX7VJnZLT4nwNVMQsX739ESA=; b=UfOp1yd7GoflEjbVK5NjGtci33x1hhyrdQycPOpr9U2oB3FCdRZHEr8hEbGOCzpdW40FNn aBWVpz+zEAsF2FL3rdVdRZp0l/fBEKdWB3fNBCrMombG0HEKwVkkJM2P0NMPcI7su1drN1 IFCFZ0rx+Q7APVNz9q/U2tdHCragJIssNEUTZ+FpTGLq2XOLt4IPOMaicVEp2SAHAp9R3Z C6wJI6oRtskBXdh57PRRQfrbx75Jwv0IOMJQHyJFiuqXjDwvZMVfivWQ2X+/koRj/QZzf8 yNPpzKeG35q4v/m/qe57ugXG2MO1O7kUXBTAYSCOk7VZqQsPHzLPU1oDPBsesQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748541429; a=rsa-sha256; cv=none; b=bjxzN1TMqy8UiDcZmJFqFXwJ1XlKFCiVRyBlI6o+KrnARyMn+M6v6Lq/9/PWGUSwqcHMqP pTMqlHG8CKMbTy+H5tiFS+er0C+cYsiBUzm3PcKimR4AaGjUIpJibYAj615HQeo89p51bN kOxy4y5sJ5f1r24Ck8xtoNiZIYjtyI4RxwHFrJXPnBPAQb6e5iyb4NRQbBfQ0gCS0sypOV 9dnLg6SCc5UKTqgIlfhbmtOlX4g5EbW5CKWG7AgtWyzRog8AEUp+33xRECYytszYo41CVd ECADDrRHiN9HvAgBlfvoYTEZVEQsRUYgJHoKuG1LTv7HV57ay9KOAWrox/WNsw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748541429; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S7/nTYdtYxcRZYAULw7AX7VJnZLT4nwNVMQsX739ESA=; b=m8bXzj7Tme1mPZorm2mnOAt4rDU6ha7JKzWzPoirStiyjcYFZ7AeRd/fdg2W956R1Ylgw8 GeOwPRJq6zYICs4Jarms7JpvCvIMifAz9yN8LvZTVygTU7EaOR5AgoRVsvoOsoVCYj/5RX wCJOtvQaZ7PnJloCs0CxplGVFe1AnOlHDGcTQ7S+uDza4ppm9TIr77Yfm7xOchTM55ghte zlN2RgZR1kOAEOIpXrZO0cGypyddIf47OVf3z3+GenacIPTFvjBidbFQSPd262sgGZTuIO kxAiNSpDWvbHPpfQTLXnQ0s7b3MBUVSFFKn/VOQZmFNIOCwRU+JUIVWcu6AkdQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b7Ywj0WKVz2q6; Thu, 29 May 2025 17:57: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 54THv9i4005849; Thu, 29 May 2025 17:57:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54THv9Rg005846; Thu, 29 May 2025 17:57:09 GMT (envelope-from git) Date: Thu, 29 May 2025 17:57:09 GMT Message-Id: <202505291757.54THv9Rg005846@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Enji Cooper Subject: git: 18378ef11a0a - main - OSSL_HTTP_get(): Reset redirection_url in each iteration List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ngie X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 18378ef11a0a5a8fb6c62761b1a20c23c12a4aa6 Auto-Submitted: auto-generated The branch main has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=18378ef11a0a5a8fb6c62761b1a20c23c12a4aa6 commit 18378ef11a0a5a8fb6c62761b1a20c23c12a4aa6 Author: Enji Cooper AuthorDate: 2025-05-28 02:34:44 +0000 Commit: Enji Cooper CommitDate: 2025-05-29 17:56:46 +0000 OSSL_HTTP_get(): Reset redirection_url in each iteration Also remove some dead assignments. Obtained from: openssl (e78c8b791c0e03e750ef7196bc7bfee8e5bd00a0) MFC after: 2 weeks Requested by: Phillip Sabatino Sponsored by: Dell, Inc. --- crypto/openssl/crypto/http/http_client.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/crypto/openssl/crypto/http/http_client.c b/crypto/openssl/crypto/http/http_client.c index c86db4405b8f..4652269b9ada 100644 --- a/crypto/openssl/crypto/http/http_client.c +++ b/crypto/openssl/crypto/http/http_client.c @@ -1138,13 +1138,12 @@ BIO *OSSL_HTTP_get(const char *url, const char *proxy, const char *no_proxy, const char *expected_ct, int expect_asn1, size_t max_resp_len, int timeout) { - char *current_url, *redirection_url = NULL; + char *current_url; int n_redirs = 0; char *host; char *port; char *path; int use_ssl; - OSSL_HTTP_REQ_CTX *rctx = NULL; BIO *resp = NULL; time_t max_time = timeout > 0 ? time(NULL) + timeout : 0; @@ -1156,6 +1155,9 @@ BIO *OSSL_HTTP_get(const char *url, const char *proxy, const char *no_proxy, return NULL; for (;;) { + char *redirection_url; + OSSL_HTTP_REQ_CTX *rctx; + if (!OSSL_HTTP_parse_url(current_url, &use_ssl, NULL /* user */, &host, &port, NULL /* port_num */, &path, NULL, NULL)) break; @@ -1164,6 +1166,7 @@ BIO *OSSL_HTTP_get(const char *url, const char *proxy, const char *no_proxy, use_ssl, bio, rbio, bio_update_fn, arg, buf_size, timeout); new_rpath: + redirection_url = NULL; if (rctx != NULL) { if (!OSSL_HTTP_set1_request(rctx, path, headers, NULL /* content_type */, @@ -1173,9 +1176,9 @@ BIO *OSSL_HTTP_get(const char *url, const char *proxy, const char *no_proxy, 0 /* no keep_alive */)) { OSSL_HTTP_REQ_CTX_free(rctx); rctx = NULL; - } else { + } else { resp = OSSL_HTTP_exchange(rctx, &redirection_url); - } + } } OPENSSL_free(path); if (resp == NULL && redirection_url != NULL) { @@ -1190,7 +1193,6 @@ BIO *OSSL_HTTP_get(const char *url, const char *proxy, const char *no_proxy, OPENSSL_free(host); OPENSSL_free(port); (void)OSSL_HTTP_close(rctx, 1); - rctx = NULL; BIO_free(resp); OPENSSL_free(current_url); return NULL; @@ -1200,7 +1202,6 @@ BIO *OSSL_HTTP_get(const char *url, const char *proxy, const char *no_proxy, OPENSSL_free(host); OPENSSL_free(port); (void)OSSL_HTTP_close(rctx, 1); - rctx = NULL; continue; } /* if redirection not allowed, ignore it */ @@ -1210,7 +1211,6 @@ BIO *OSSL_HTTP_get(const char *url, const char *proxy, const char *no_proxy, OPENSSL_free(port); if (!OSSL_HTTP_close(rctx, resp != NULL)) { BIO_free(resp); - rctx = NULL; resp = NULL; } break; From nobody Thu May 29 18:28:13 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b7ZcY6dVmz5xKJg; Thu, 29 May 2025 18:28: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b7ZcY4GXmz46yF; Thu, 29 May 2025 18:28:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748543293; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rFZrBf9fTkuzjcqxN/gFE2C3xvPAOP5tR3RfPeaC8vE=; b=N3MNt1jlIiPsT0+/7u1jgdLmmMckQPflvLjSIUSKadtBVHMkreqeXg0Hdj/gJjyViErhmA NgfT7+2W4yDW2iob7LiOPlQ+SthjUW+udJl6HglXbu4aRwHtKOf5OAWEdAxjl4y6v9b7sb 9sxMCzmPAovx4JezI5XS7//AF4kxMf2cYnNdG/uANd8esIFqJolcUCnXOTtTr2Nl6wYGxp KDgdGuczmUMBbonyaP0eWgYPaSWhZaDtD3ZRIy2QV7nMvouBHiHf3bZ3QJUO3blbIsSgyZ TFSmHuvTNeL4sW09da1o6xGO7uQp9bDH1TLmVpzOlYE8KRC2FlCgxtSUC5Wpkg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748543293; a=rsa-sha256; cv=none; b=EAr53dGPqtnm8eOg2Yq/qGYpdZlRfIwKY71RB1YgxwqdDR4A2N1Ar8ALSCTOOxEl/srYfW Y4RfrFOHU8WvJT1D9kUjYSlawCD4MqyzlNRb7fWH1XPOE8CnQ8xuhpT6jaO1BeDQl9ZI0Y dTLUXhyAFfD1ryZ40cAVV7L3p9NNMfBt9hU7YWpqwteJkWzFsxW4xCcV2oEatCpqgvdHfy tTBgBJYMopFYkAuDz18CdVnH8H7RqwuekRcrKVRhBhORQiFN204PGp0EG5BheDbamhKD4i GZRD5+z5UGF5YTdF0KqVn/k+sdt8mCUEJs1jyvyeVSoTJ54atKasarshMGYbpQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748543293; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rFZrBf9fTkuzjcqxN/gFE2C3xvPAOP5tR3RfPeaC8vE=; b=qXwqbLiBgFWTey0jvDSQG+8Gdm/YWYRCxk9m6P8uVGWHx9Oc2rnNdKSZjDWJJcrFl8+glt X7khN9KBYMeGihoxTpYNVZjgsFAeF3qle74tCHFIRPb52GXQQ8urkmOLBGgZDGh58Pl48V LWXP0qLR7BTHFse9r+rIGz2FWyFPIffv2MCTibocUIOMM1Et4lNFKggx1k3yXkx8Sm07J4 cKpONAsf6BAVtyBVUquU3nM/jZb2f3iRp386bIVLxSRbtaLWKe9/x/SrT13gFr7VjYxhfO oy0G/bdEs5rhI3Qvq9qW3jMPK5Da1t3WyZf88UwgS26nMlnWufa4kRvzY+aGHg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b7ZcY3kHwz3T3; Thu, 29 May 2025 18:28: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 54TISDOE062512; Thu, 29 May 2025 18:28:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54TISDGY062509; Thu, 29 May 2025 18:28:13 GMT (envelope-from git) Date: Thu, 29 May 2025 18:28:13 GMT Message-Id: <202505291828.54TISDGY062509@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: 198d2ed2d4c6 - main - devfs: Set eofflag in devfs_readdir() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 198d2ed2d4c6c921928a9175f825d0d8345e5a46 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=198d2ed2d4c6c921928a9175f825d0d8345e5a46 commit 198d2ed2d4c6c921928a9175f825d0d8345e5a46 Author: Mark Johnston AuthorDate: 2025-05-29 18:25:56 +0000 Commit: Mark Johnston CommitDate: 2025-05-29 18:25:56 +0000 devfs: Set eofflag in devfs_readdir() At least vn_dir_next_dirent() checks that eofflag is set appropriately when INVARIANTS is enabled, so the omission here could cause an assertion failure. Reviewed by: kib MFC after: 2 weeks Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D50598 --- sys/fs/devfs/devfs_vnops.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/fs/devfs/devfs_vnops.c b/sys/fs/devfs/devfs_vnops.c index e55082b49d97..1d744e6593c0 100644 --- a/sys/fs/devfs/devfs_vnops.c +++ b/sys/fs/devfs/devfs_vnops.c @@ -1515,6 +1515,8 @@ devfs_readdir(struct vop_readdir_args *ap) */ if (tmp_ncookies != NULL) ap->a_ncookies = tmp_ncookies; + if (dd == NULL && error == 0 && ap->a_eofflag != NULL) + *ap->a_eofflag = 1; return (error); } From nobody Thu May 29 18:37:28 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b7ZqD73Vfz5xL6f; Thu, 29 May 2025 18:37: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b7ZqD3596z3J49; Thu, 29 May 2025 18:37:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748543848; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CLl42wgaKjWWsI9cOvDnrh2eXvKRbgUQrrsLlDlR0Ls=; b=PArfum0XQ3RTiv8KWTl9Ccrdnsjh5Lq80HeVTyJUsTKjR8UpKW5UBW+ymm6unat5EhY3WW lUI1VD+U6+ke7RWIjAZwm4O4PI53qERTsbDoS54qKYX1zGWHZCWRhFgD7QUn46R3XdY5eO zZYyo5UbtdCQ66w1mAlTmNtJIe8hFvcC3qZiYy6UyMW0vmWvcM/SUI4nYkKF81twBYjlSb +Pn1tQYLBsz9AjFk+1ZMbqL5/1EPTza8qzBIRYoeoGL9eFNfoctaoxH8n2LffOrTQUvuZ2 7EO94C1N6M4Q9w6aTbES2mDxlQfFeO/g8Ms05oFDJqVl1T9B9xjUwgjca5XsvQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748543848; a=rsa-sha256; cv=none; b=gxBz+ayoZnuruuenCsz1UKzpU0Hd3qcQZJuv/Tym7ZaSSDhMxctuL9lExXTLwxsa6jOEBe uJ0HKfeff4krOGBMzQWRN88mNkB0JTOmPVQ3QDSBTJv7iZ4jBUlkSJcJJrC+D5i4xfNp+Q /Gbreq0Nr9XUUUOceyrQn1JZVNinpN/rG7SEjmnhsG3+x4AQOv5U1bd9ZI0lWYqtzh7o/f YVvberEXZzmCudC1rWZ4otnNcUpsFmJv/QmKi6yw3pW+UGCiao4Yqj6xPm0V6yM1z37k42 wqtcbuFhRKw3dgJuQ2hrpDv6S3kAZnlG4NPVJk44HBAcXIl6D89G+mjkeuIXHQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748543848; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CLl42wgaKjWWsI9cOvDnrh2eXvKRbgUQrrsLlDlR0Ls=; b=itPT3FyRq/gmtZom+ejwTxWYWvVxYdypCjpnqEPRBLHo4YEM6ZHWMImWnMsCQgv2mxMmJq +5jDg3l2btXpalcpSXR1ScgER0ulOHT+I/IBOXQcLlZydwLp0FCRx9El3zLPJxQJjkImQj 27/s6NhqEbCUNurd2h1QL8HHAX8qP3UdXeOHUsFqpg2fQlHJtI1ftrsDsrWSJLMpIA6mej RprY82AKB00eDb1HnqFOhju1MxplvYD+fsRXA9JgfzqRHC/IJFPzcvlT5+3nGkiqv6a1Uy XegtYjffeLrXAXnH74z1kb9lIow3ucBT10eO/12FGyXC/I5/mxMoCLqdxNuGnw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b7ZqD25Srz3VW; Thu, 29 May 2025 18:37: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 54TIbSKR080910; Thu, 29 May 2025 18:37:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54TIbSvQ080908; Thu, 29 May 2025 18:37:28 GMT (envelope-from git) Date: Thu, 29 May 2025 18:37:28 GMT Message-Id: <202505291837.54TIbSvQ080908@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: 9486d6d57d14 - main - loader: Fix beastie and fbsdbw logo positions List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 9486d6d57d14844972ee63382045e2ed7a300963 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=9486d6d57d14844972ee63382045e2ed7a300963 commit 9486d6d57d14844972ee63382045e2ed7a300963 Author: Marek Zarychta AuthorDate: 2025-05-29 16:36:57 +0000 Commit: Warner Losh CommitDate: 2025-05-29 18:37:03 +0000 loader: Fix beastie and fbsdbw logo positions Fix the beaste, beastiebw and fbsdbw postions broken after ee233742a569 PR: 285044, 286356 Fixes: 1b4e11713153 Reviewed by: imp MFC After: 2 days (14.3 candiate) Sponsored by: PANS Jarosław --- stand/lua/gfx-beastie.lua | 1 + stand/lua/gfx-beastiebw.lua | 1 + stand/lua/gfx-fbsdbw.lua | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/stand/lua/gfx-beastie.lua b/stand/lua/gfx-beastie.lua index 443f0fd888ba..f91e70667dac 100644 --- a/stand/lua/gfx-beastie.lua +++ b/stand/lua/gfx-beastie.lua @@ -49,5 +49,6 @@ return { " `--{__________)\027[m", }, requires_color = true, + shift = {x = 2, y = -5}, } } diff --git a/stand/lua/gfx-beastiebw.lua b/stand/lua/gfx-beastiebw.lua index c71e53a9c4e3..84e3dc6997df 100644 --- a/stand/lua/gfx-beastiebw.lua +++ b/stand/lua/gfx-beastiebw.lua @@ -48,5 +48,6 @@ return { " ,' ,-----' |", " `--{__________)", }, + shift = {x = 2, y = -5}, } } diff --git a/stand/lua/gfx-fbsdbw.lua b/stand/lua/gfx-fbsdbw.lua index 470af71a07b5..df3b6c856eef 100644 --- a/stand/lua/gfx-fbsdbw.lua +++ b/stand/lua/gfx-fbsdbw.lua @@ -42,6 +42,6 @@ return { " | | | |", " |____/|_____/|_____/", }, - shift = {x = 5, y = 4}, + shift = {x = 7, y = -1}, } } From nobody Thu May 29 18:45:23 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b7b0N1kZbz5xMRZ; Thu, 29 May 2025 18:45: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b7b0N12Hqz3Phm; Thu, 29 May 2025 18:45:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748544324; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=h5qV/uvJO2Hih/+2/0MkAwtMrhe1BDJ8D6NO4Asguvw=; b=KGiDJi4SFZHnh972Vsi2Cht9WhceUOmwQ68XudPIJapdxPZ9NMnc69x+M7vE9YYexeeEX6 4UF0HwIXNvjwsDy/2CH/bx4P5zUnoirPfCxKU6vW7kY3W35k9MSrc5d0ZaAcQjF//tgdXL XF1HPQGC+WHLxaP7wIZblGJ3Mhz6lARTJ5d1GmGj5DVsSh6vL7tZW+jK8vG+zcvAVpB20a w3gY7htlvOKB96rNPaPZ2qTGgREsyTA32R1mDoV/EsLX4gl/M6drdfA0uRwhPZTO3evJza iqLa0bhWw4BJpRCYLnKOxyjz0e6wVQJfGfShrz1cM4LqrqDbP5S98zpRbAZ1fw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748544324; a=rsa-sha256; cv=none; b=I1c9J5VwAoa7jrVwIX3e2w2XPSsPcf7HKMxYLK4Y+LAuI3eK1XNfh8fwHKgO3EdAsOVtLA CV/PKTA5aZ6p9EU+Xwa62f3YC8tYsVX5EIR3i8uggdUY90IvajO8mIP+Go+viviDle7Lyy gQx2TITge0uMORtgT8f3hoTLdPUGey9GNhuCVlnFJHzDYQD22FMDyF0+DW6SG41g707i7B wibHALYG3es9o2PWUQsGjEy+79cVoKyonB94puAOKrH9FOsGIy9E/t15tJKjlHx0If41fA eme/q9LcyEXEIYHy59DihpRJu/u8Y0qAHluF+mgdjKZaXLOb9pSet/zLq6LCBg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748544324; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=h5qV/uvJO2Hih/+2/0MkAwtMrhe1BDJ8D6NO4Asguvw=; b=VpphDiX0cdKjLZH4ooavCg1oDy11O7ZNdgxp60EtSRPyNQJvBVQ6wumSIryE0e/jAaKlJA psEsshTKoy4vqLzFuQDhj8jhedP5JKyeKWF81x/Lsppx9cnPAcSdEM/U26vqTAeMUjDk8L HaEn7kCvlEtlo+u8DHXTgp2tQx9JN72EkplLkiSUdiwuhNqI4oH2aZGa6H43R4UPGjZxRb ITq6Dcy/klrw9ATSuvxHk0Dk+SqJT6mjVNbEmJosaZuLkj9qH9Y9Ef1Y6esZKc4fmPllXP zk6Fu0uBsNoJ7OANri0I2WkLmpaUvpZuz6wLXV4vPa9LU3ORlQx2FWKEKa4gnw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b7b0N0FqJz475; Thu, 29 May 2025 18:45: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 54TIjN1g099284; Thu, 29 May 2025 18:45:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54TIjNti099279; Thu, 29 May 2025 18:45:23 GMT (envelope-from git) Date: Thu, 29 May 2025 18:45:23 GMT Message-Id: <202505291845.54TIjNti099279@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: f20e8cd50996 - main - sockets: remove dom_externalize List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: f20e8cd5099600bea9c2c517292afe3a05b4cb92 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=f20e8cd5099600bea9c2c517292afe3a05b4cb92 commit f20e8cd5099600bea9c2c517292afe3a05b4cb92 Author: Gleb Smirnoff AuthorDate: 2025-05-28 17:24:57 +0000 Commit: Gleb Smirnoff CommitDate: 2025-05-29 18:44:52 +0000 sockets: remove dom_externalize It was used only by unix(4) and now is completely isolated. --- sys/kern/uipc_debug.c | 3 --- sys/kern/uipc_socket.c | 13 ++----------- sys/kern/uipc_usrreq.c | 1 - sys/sys/domain.h | 2 -- 4 files changed, 2 insertions(+), 17 deletions(-) diff --git a/sys/kern/uipc_debug.c b/sys/kern/uipc_debug.c index bbd6c078fd06..df36ec75cb5f 100644 --- a/sys/kern/uipc_debug.c +++ b/sys/kern/uipc_debug.c @@ -236,9 +236,6 @@ db_print_domain(struct domain *d, const char *domain_name, int indent) db_printf("dom_family: %d ", d->dom_family); db_printf("dom_name: %s\n", d->dom_name); - db_print_indent(indent); - db_printf("dom_externalize: %p ", d->dom_externalize); - db_print_indent(indent); db_printf("dom_protosw: %p ", d->dom_protosw); db_printf("dom_next: %p\n", d->dom_next.sle_next); diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c index d478b09ca71c..6c9eb7139cd1 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -2934,13 +2934,7 @@ dontblock: while (cm != NULL) { cmn = cm->m_next; cm->m_next = NULL; - if (pr->pr_domain->dom_externalize != NULL) { - SOCKBUF_UNLOCK(&so->so_rcv); - VNET_SO_ASSERT(so); - error = (*pr->pr_domain->dom_externalize) - (cm, controlp, flags); - SOCKBUF_LOCK(&so->so_rcv); - } else if (controlp != NULL) + if (controlp != NULL) *controlp = cm; else m_freem(cm); @@ -3623,10 +3617,7 @@ soreceive_dgram(struct socket *so, struct sockaddr **psa, struct uio *uio, while (cm != NULL) { cmn = cm->m_next; cm->m_next = NULL; - if (pr->pr_domain->dom_externalize != NULL) { - error = (*pr->pr_domain->dom_externalize) - (cm, controlp, flags); - } else if (controlp != NULL) + if (controlp != NULL) *controlp = cm; else m_freem(cm); diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c index 5b1b8443f8e6..19634e3916da 100644 --- a/sys/kern/uipc_usrreq.c +++ b/sys/kern/uipc_usrreq.c @@ -4422,7 +4422,6 @@ static struct protosw seqpacketproto = { static struct domain localdomain = { .dom_family = AF_LOCAL, .dom_name = "local", - .dom_externalize = unp_externalize, .dom_nprotosw = 3, .dom_protosw = { &streamproto, diff --git a/sys/sys/domain.h b/sys/sys/domain.h index 45180aa06f80..dfdda1bc9491 100644 --- a/sys/sys/domain.h +++ b/sys/sys/domain.h @@ -52,8 +52,6 @@ struct domain { char *dom_name; int dom_flags; int (*dom_probe)(void); /* check for support (optional) */ - int (*dom_externalize) /* externalize access rights */ - (struct mbuf *, struct mbuf **, int); struct rib_head *(*dom_rtattach) /* initialize routing table */ (uint32_t); void (*dom_rtdetach) /* clean up routing table */ From nobody Thu May 29 18:45:25 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b7b0P2BWPz5xLvW; Thu, 29 May 2025 18:45: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b7b0P1NJ8z3PWl; Thu, 29 May 2025 18:45:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748544325; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=i/C8d0+e9L4tENa0cRxqcxTLsJqiVVlxW6KN6y7Ubs8=; b=YcRRSctGvimPi/1ILWAZoj2m62BwEEUJxWfTEV2SftKL7xl/ta/1QaNJ6GaOJ7sSIZt0mR WLx82uOWpPEoC1BNTiTgR62OyHMBejrfgzsBC8riiWxuKRbMP/Yhndd2xl/UTJhM9m90FK y/1Se+0fgVmH+5TxcRxF43SLn9bibGNkBXHJ5vAQIQ48Wgo3jkEnOgMJJMPMbh2pXtOa7d elZXftMFRzx4kYiNb/hLk7bFr1ChbwVyScGa3K7ewQV4lOEePOUXiPfzaEMXeexGntKdAG 12Yw9F9N0WQr8kN4EMqtxAoaQtXP6znS3ne1iOL0HXXFkz+FOxCnMszuSyYG7w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748544325; a=rsa-sha256; cv=none; b=TydotF5kNoXcyS36IIBYBYZoeU0jo9zkiZqjmAiMKOTdYzHyWv/d3OO3UdzCnoAFCe3UeJ xJLqtBAQ5KyTfSL9BwFnDOgTDaagd12GBuedS7A9tv4WM1zQx/yxRtlebwU3MEvzcxfAfV tbLIR/7+JNKyxSBAn4VZpjU63xtOqTy+EwQuVjRyaGgljKZIlHDibsCjgA4Jxj4aX8GS9G ugxJ4jK8HHsPJ4+sNpp6p5kzK+Dlgl2qKC1TjslVwiIEkDA202zv9BI4WPYmdwcSFOXtAq 7t0WfXlLHARCIUYiK4Jp48/j5A+oZwfImarM6vtdUT2pezHTumXkt0FclbUCfw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748544325; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=i/C8d0+e9L4tENa0cRxqcxTLsJqiVVlxW6KN6y7Ubs8=; b=ncYfQc86y+BZUgwc/aYXUnTZVKkpQt4puP0eokOqZLhqjfswrk9sjPqxLxBH8O7euCJ92V ojyd2fu9Vvzsudt5of0m/LO2gZjH1lLXhOdZDi2gqrVcJQgn47NuvvZ68XWMIB8Tm+rtcW 1dTGI3Md0WORk8qZG14ZAEcLrCvQkhS7If0H5FIIzKLsXCrwabtAUXvQ7Ckx3TN0Xkna5O 84bIQBxhVCsQ46yxfXpcQO/Nfjexqqg/YTGHchH1MrZ0byuYzkqJThayyH9Z9bfcUQg9o4 6G6wKuDHj0zssKta2GSyltOlRwz5To9Wi/CyvUskU9Mg5RFw81LeGKkslhv1mQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b7b0P0z2Jz44w; Thu, 29 May 2025 18:45: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 54TIjP9g099321; Thu, 29 May 2025 18:45:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54TIjPiO099316; Thu, 29 May 2025 18:45:25 GMT (envelope-from git) Date: Thu, 29 May 2025 18:45:25 GMT Message-Id: <202505291845.54TIjPiO099316@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: 23204710f2b2 - main - unix: don't free the source mbuf in unp_externalize() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 23204710f2b267ea396b53f81cc3b8b111d4aaf1 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=23204710f2b267ea396b53f81cc3b8b111d4aaf1 commit 23204710f2b267ea396b53f81cc3b8b111d4aaf1 Author: Gleb Smirnoff AuthorDate: 2025-05-28 18:54:26 +0000 Commit: Gleb Smirnoff CommitDate: 2025-05-29 18:44:52 +0000 unix: don't free the source mbuf in unp_externalize() This makes calling the function simplier. --- sys/kern/uipc_usrreq.c | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c index 19634e3916da..c411f22970e7 100644 --- a/sys/kern/uipc_usrreq.c +++ b/sys/kern/uipc_usrreq.c @@ -1526,8 +1526,6 @@ restart: while (control != NULL && control->m_type == MT_CONTROL) { if (!peek) { - struct mbuf *c; - /* * unp_externalize() failure must abort entire read(2). * Such failure should also free the problematic @@ -1537,14 +1535,9 @@ restart: * Probability of such a failure is really low, so it * is fine that we need to perform pretty complex * operation here to reconstruct the buffer. - * XXXGL: unp_externalize() used to be - * dom_externalize() KBI and it frees whole chain, so - * we need to feed it with mbufs one by one. */ - c = control; - control = STAILQ_NEXT(c, m_stailq); - STAILQ_NEXT(c, m_stailq) = NULL; - error = unp_externalize(c, controlp, flags); + error = unp_externalize(control, controlp, flags); + control = m_free(control); if (__predict_false(error && control != NULL)) { struct mchain cmc; @@ -2322,13 +2315,8 @@ uipc_soreceive_dgram(struct socket *so, struct sockaddr **psa, struct uio *uio, * without MT_DATA mbufs. */ while (m != NULL && m->m_type == MT_CONTROL) { - struct mbuf *cm; - - /* XXXGL: unp_externalize() is also dom_externalize() KBI and - * it frees whole chain, so we must disconnect the mbuf. - */ - cm = m; m = m->m_next; cm->m_next = NULL; - error = unp_externalize(cm, controlp, flags); + error = unp_externalize(m, controlp, flags); + m = m_free(m); if (error != 0) { SOCK_IO_RECV_UNLOCK(so); unp_scan(m, unp_freerights); @@ -3541,7 +3529,6 @@ next: } } - m_freem(control); return (error); } From nobody Thu May 29 18:45:26 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b7b0Q3nQmz5xMHk; Thu, 29 May 2025 18:45: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b7b0Q26Brz3PnT; Thu, 29 May 2025 18:45:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748544326; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LLGMrMkglbokwqAWw5Wsn+VARBWN/mDOXeB90HMPJOw=; b=EJsvQUA60HnXdIUsOLgZIAyAlXorRY4lnVpYWJcl/vPpa9Ry/x1so8sYu1enbN2Ek4F/iS bQKH+IyoMH0nFjukd428YrLM+mVgAG6jyDu0vhVoLQ2EYwVLXo9hS3eAJWf8NhblRZy6iJ oNPMIP5UyWJnwN4kpEebdyPwZS4kfsT4bFjVqEkmyJDmt3AxISnVJggyOx9e0o6PPcKbKW GsVr9EICo9dQpG50cOON4ONZwGDAr7qr0klufU8pmfd75Q+02G3Nqzdak+nxSJumoBcnHa GuLLlJv9imiHG/b+SxC6nL6p4qqhJIi7GwuGaOMNXkcVTRocTY/+ghRSByYIvw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748544326; a=rsa-sha256; cv=none; b=aMmR3EA4cxVBOIc+n9OhGx1p1do0tNOxU0yO0bQPDJhSNnjElP0NpVMSnVDQdA2GBbjoSQ kulb6ggqieEVyNaMF/Lgi1b2sgmKXcKWm++5KEgPpMtihCCNCoXl5d7k6INODp45yNGDNB GCCbyoRuoVFJ5z04wxPJ0gO74hjAuXelN4wimLvzg4PFd7LZxRlQ7pNimJG9lO/lhoHm29 ozWbt3MHovkuBpx6BQylee3+Z+N+CaAvCEbZzPzK4IyU0/7aCUhoYi/Skj6/hEHUJIWlDl UyG+s7TmUrC6KjS+TE1hGhJBcaDSBJcKeZVE4U1vk15UgWMLMKkT+ORxxJClKA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748544326; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LLGMrMkglbokwqAWw5Wsn+VARBWN/mDOXeB90HMPJOw=; b=r05wjYVipaxxisOwl5NlqwpeH0kdL+2FJbsf7RzGjv0WprEXRDvc0VcDLay+gG9MfPSYeO R6dBJTX0F2VyOB3br4Ck5UT3+meOpXieAicyn3Bkqyrh2nRO+WVKx+Obvz/g2xnr0CDoHK TMqImP70kbVuXnB8IiBDW0zfFHO8wPmM8v0Til9Bbay3nonqJsJhVNkBeagDCh4NItbvPu 99O7rpzdnf743RCEWbVBqGbUDDpCn9IB9JBrT6bSWtkQC2TYLgbBa+/0IW+S7HtXz0Yq+G W3WrLoEtHjTxDql1pnYfHhsl8ZBekX5Av8Z71TfxxkMkDfveuqfo92eMN91QNA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b7b0Q1k6Lz3yq; Thu, 29 May 2025 18:45: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 54TIjQUr099354; Thu, 29 May 2025 18:45:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54TIjQCM099351; Thu, 29 May 2025 18:45:26 GMT (envelope-from git) Date: Thu, 29 May 2025 18:45:26 GMT Message-Id: <202505291845.54TIjQCM099351@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: 3267e0815e06 - main - tests/unix: test MSG_PEEK read from a socket that has a descriptor List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 3267e0815e0624d6971483b2bd9f3be175771deb Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=3267e0815e0624d6971483b2bd9f3be175771deb commit 3267e0815e0624d6971483b2bd9f3be175771deb Author: Gleb Smirnoff AuthorDate: 2025-05-28 19:48:35 +0000 Commit: Gleb Smirnoff CommitDate: 2025-05-29 18:44:52 +0000 tests/unix: test MSG_PEEK read from a socket that has a descriptor --- tests/sys/kern/unix_passfd_test.c | 46 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/tests/sys/kern/unix_passfd_test.c b/tests/sys/kern/unix_passfd_test.c index 74095859d899..8c6a976a0e12 100644 --- a/tests/sys/kern/unix_passfd_test.c +++ b/tests/sys/kern/unix_passfd_test.c @@ -544,6 +544,51 @@ ATF_TC_BODY(send_overflow, tc) closesocketpair(fd); } +/* + * Make sure that we do not receive descriptors with MSG_PEEK. + */ +ATF_TC_WITHOUT_HEAD(peek); +ATF_TC_BODY(peek, tc) +{ + int fd[2], getfd, putfd, nfds; + + domainsocketpair(fd); + tempfile(&putfd); + nfds = getnfds(); + sendfd(fd[0], putfd); + ATF_REQUIRE(getnfds() == nfds); + + /* First make MSG_PEEK recvmsg(2)... */ + char cbuf[CMSG_SPACE(sizeof(int))]; + char buf[1]; + struct iovec iov = { + .iov_base = buf, + .iov_len = sizeof(buf) + }; + struct msghdr msghdr = { + .msg_iov = &iov, + .msg_iovlen = 1, + .msg_control = cbuf, + .msg_controllen = sizeof(cbuf), + }; + ATF_REQUIRE(1 == recvmsg(fd[1], &msghdr, MSG_PEEK)); + for (struct cmsghdr *cmsghdr = CMSG_FIRSTHDR(&msghdr); + cmsghdr != NULL; cmsghdr = CMSG_NXTHDR(&msghdr, cmsghdr)) { + /* Usually this is some garbage. */ + printf("level %d type %d len %u\n", + cmsghdr->cmsg_level, cmsghdr->cmsg_type, cmsghdr->cmsg_len); + } + + /* ... and make sure we did not receive any descriptors! */ + ATF_REQUIRE(getnfds() == nfds); + + /* Now really receive a descriptor. */ + recvfd(fd[1], &getfd, 0); + ATF_REQUIRE(getnfds() == nfds + 1); + close(putfd); + close(getfd); + closesocketpair(fd); +} /* * Send two files. Then receive them. Make sure they are returned in the @@ -997,6 +1042,7 @@ ATF_TP_ADD_TCS(tp) ATF_TP_ADD_TC(tp, send_and_shutdown); ATF_TP_ADD_TC(tp, send_a_lot); ATF_TP_ADD_TC(tp, send_overflow); + ATF_TP_ADD_TC(tp, peek); ATF_TP_ADD_TC(tp, two_files); ATF_TP_ADD_TC(tp, bundle); ATF_TP_ADD_TC(tp, bundle_cancel); From nobody Thu May 29 19:58:00 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b7cc932SPz5xR0p; Thu, 29 May 2025 19:58: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b7cc91kwrz3Ky1; Thu, 29 May 2025 19:58:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748548681; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dp2/SiG6S26Pd+ycg2r4bUl0TRzH9LV637sjnDiuhLA=; b=Suxy4KM5EDUXvwzGNupATnO+Agp/p6aN6H/M3zGdyarzO6nZqi0leYvbhMCW2oUHEG3fc0 XoEUbeiejuxNFUlSlml5sQi4Su55jE1TiU6yn/WmZ5mFDN6C8m6XGK9Beg1ZtAgIuLEGnt xa+8JDyj3FbJ3X6NnF7K7iri1cE2FaF9W9srHFXijQO1BVOrZ+GmZiIFbGnjF+uliXKbYB jB9sMD3Mtcf6RhMqwpr0SQ8s4b9Wp/g9nW9VPVT9iQQhNDau+0cCXx6p0x991bMoiX9tHs W4cMDsEHJ5UM2SqCuOD2Vv7/urEOJaHMm850mBOXHnZPtU3HhI4TACRQ0D3rUw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748548681; a=rsa-sha256; cv=none; b=FA8nzdrVYql+pnwPYIe2mnw0xGT4FCGAP5leOo2BhjnLD1fUVlkkZfyNRcf57eep/Z8M1B GWqcIUiqMGNge2BL99X1wRP0B/ykNeLybH/8troYVj5FfTb0enbYMWJXs/AoBz68SeS8nM 1O9rR764YQkBuI6z1eJjh0MU5l+PBWR4JbWAP+qxCq+nzw61+4fPibLWTymweJZ3pmoEmM NReiH7LHBBlFscuxpmRhURlamI9WZ6I/9j/imsE0+CVwUeRCfE+Ezh4ucd8A7aZf6Us7J9 39tkJ3YeeTFZGntqvnHwPcwHtk+YZ9BHQTf3NEUjGzgCYNUJn5mQ3hioxYBqYA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748548681; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dp2/SiG6S26Pd+ycg2r4bUl0TRzH9LV637sjnDiuhLA=; b=LNL9m4JX5VI4ds3tQQFm411cvlS3wGjn3gOIyA3w8hGYjK1B219hPsZdgmeVtMtcv8FED8 X9KnQgfT3rOpHaDnw3iV1tnH0UkTYpuRu5T2vgc9WeVADsTMKY7BBZhwVYVt8CKBM3W25c N9Zv+w9O61DBQ2wgTI7g9VfdvvFRdAe6lKU0xBC/SUjPQrqI2lWRztekGLEwXy5dXKL6gM rBEooluP89Hjz/8+JPuYBQiJTSFVZUUcQ+ARy13zXyMCEnobnU+wBQ6WmU3WsLyhddaOjz O/LZixtfqguzNZOXqJg8P4rWAhxLJ1HUFO4hWRKq+dLg9KglYAvJdd3fvzbXUQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b7cc90YPBz5Zq; Thu, 29 May 2025 19:58: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 54TJw0GD031107; Thu, 29 May 2025 19:58:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54TJw0PG031104; Thu, 29 May 2025 19:58:00 GMT (envelope-from git) Date: Thu, 29 May 2025 19:58:00 GMT Message-Id: <202505291958.54TJw0PG031104@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: 29f076ae0cb5 - main - pkg.conf: Use kmod repositories List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 29f076ae0cb536d1e891d3375edf28f1bc82df79 Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=29f076ae0cb536d1e891d3375edf28f1bc82df79 commit 29f076ae0cb536d1e891d3375edf28f1bc82df79 Author: Colin Percival AuthorDate: 2025-05-28 21:10:41 +0000 Commit: Colin Percival CommitDate: 2025-05-29 19:57:48 +0000 pkg.conf: Use kmod repositories The kmod repositories were added shortly after 14.2-RELEASE. Point at them here so that users don't need to manually add the configuration in order to get e.g. working graphics. MFC after: 1 minute Sponsored by: Amazon Differential Revision: https://reviews.freebsd.org/D50583 --- usr.sbin/pkg/FreeBSD.conf.latest | 7 +++++++ usr.sbin/pkg/FreeBSD.conf.quarterly | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/usr.sbin/pkg/FreeBSD.conf.latest b/usr.sbin/pkg/FreeBSD.conf.latest index a75b0703386f..b7b528bc3756 100644 --- a/usr.sbin/pkg/FreeBSD.conf.latest +++ b/usr.sbin/pkg/FreeBSD.conf.latest @@ -13,3 +13,10 @@ FreeBSD: { fingerprints: "/usr/share/keys/pkg", enabled: yes } +FreeBSD-kmods: { + url: "pkg+https://pkg.FreeBSD.org/${ABI}/kmods_latest_${VERSION_MINOR}", + mirror_type: "srv", + signature_type: "fingerprints", + fingerprints: "/usr/share/keys/pkg", + enabled: yes +} diff --git a/usr.sbin/pkg/FreeBSD.conf.quarterly b/usr.sbin/pkg/FreeBSD.conf.quarterly index 645053820dda..2050350baa1f 100644 --- a/usr.sbin/pkg/FreeBSD.conf.quarterly +++ b/usr.sbin/pkg/FreeBSD.conf.quarterly @@ -13,3 +13,10 @@ FreeBSD: { fingerprints: "/usr/share/keys/pkg", enabled: yes } +FreeBSD-kmods: { + url: "pkg+https://pkg.FreeBSD.org/${ABI}/kmods_quarterly_${VERSION_MINOR}", + mirror_type: "srv", + signature_type: "fingerprints", + fingerprints: "/usr/share/keys/pkg", + enabled: yes +} From nobody Thu May 29 19:58:29 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b7cck01nyz5xR57; Thu, 29 May 2025 19:58: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b7ccj5Pz3z3LQh; Thu, 29 May 2025 19:58:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748548709; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ODL1K73iOZN49XXCzKQ7p03Aowj/BV5oSTfu2TJZoYk=; b=sdQBfFmnArgA66vE50O/7D6/b6KlalqLZbUf2Ln+dPYy92NiJTy39ehYZQX1xqXzT4C1aj JsToBtx/ebVRxXmG1c1y0NCPAWvvuKSWFeOfTIMHl9ZzKvDhYFaI6FqhX/VFK39zAI34X5 /x4Dn2/yuxYycQ/NpRTnyuUR+MQYjfoZAL09vo+PcuMizRtvlGiCgR59ROZqPOP1hHKfjA /lifip4OG7xQEykRWWasGvRt7/F6h0TjhkTFHgHYaChaMqmCye2zDI6uWTUJStM6YHf/Q1 xOrXoPRd51WWqJpTmPTGgy4iphUCKDtbFrBrq73zk85iYaXjQilcCPrDLO2WPQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748548709; a=rsa-sha256; cv=none; b=TVvJxgG4EkJ5u9PWNn7HaAhgqY2Iec9VrR83sBp1WzMhGAZJfZ8H9+JCGPHks3kdfmBhGl 1V1oTnUlvv08MnB11Ua+SkNLXSSheXOtoBCBwm57jm14/x/Bc+tF0EGFHeSSYS6a3d+HV+ BCYkagZPysjksoPPwNN1iqvRf3S6Bs8VaF2XMu0rIjAxF9XwriAva2AhFP4/37ebTyVLeM 1TkX3JGrulSRXvvUGyRUGYv4g4ZfXRHdGx8yxM4knR1iCYzouxoSRpK8ASlTaVfiapWQRc AJcdBLA29xIc19Ng9sNe89oYt7LxFS6DH5yQfHgkNf7rD2I85tnE7SjP0IFx0Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748548709; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ODL1K73iOZN49XXCzKQ7p03Aowj/BV5oSTfu2TJZoYk=; b=BG4JQkToKu7n3IzPKhOEwwBfMNf/IRqEmPeOoKGBuv+viaEMALU9GR2wHDVvBGmS3fDJcS rhLzMRS/kDqYcwosegMuvIGrA0IeLy9DcUjnicYuRj+jPUE8MWnJAI3bRI8uQDAXlHQxVG Ei3noUfpQ0cGDnUfUVST5UMnp+yLhlNadP/hbU2Wa+EkB3HkBE9/12YkATPqksD0EgkeWO rOdpxi1IhVL8a5zW7KDlcZXoaqXbViHnfE2dsW8xO2TXGTLi0oeYl3a5dNz+7ZgQR7pFM3 oi5cMn4H3T7dJP4qp3avYB739HG36uXqVN9MAcXiFrPZSTR1clERb78TNpFydg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b7ccj3XDYz5gt; Thu, 29 May 2025 19:58: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 54TJwTXi031352; Thu, 29 May 2025 19:58:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54TJwTOa031349; Thu, 29 May 2025 19:58:29 GMT (envelope-from git) Date: Thu, 29 May 2025 19:58:29 GMT Message-Id: <202505291958.54TJwTOa031349@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 8a2ce9f9dd67 - stable/14 - pkg.conf: Use kmod repositories List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 8a2ce9f9dd6745e77bdfe78f03e96ddc8ad1b9d7 Auto-Submitted: auto-generated The branch stable/14 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=8a2ce9f9dd6745e77bdfe78f03e96ddc8ad1b9d7 commit 8a2ce9f9dd6745e77bdfe78f03e96ddc8ad1b9d7 Author: Colin Percival AuthorDate: 2025-05-28 21:10:41 +0000 Commit: Colin Percival CommitDate: 2025-05-29 19:58:15 +0000 pkg.conf: Use kmod repositories The kmod repositories were added shortly after 14.2-RELEASE. Point at them here so that users don't need to manually add the configuration in order to get e.g. working graphics. MFC after: 1 minute Sponsored by: Amazon Differential Revision: https://reviews.freebsd.org/D50583 (cherry picked from commit 29f076ae0cb536d1e891d3375edf28f1bc82df79) --- usr.sbin/pkg/FreeBSD.conf.latest | 7 +++++++ usr.sbin/pkg/FreeBSD.conf.quarterly | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/usr.sbin/pkg/FreeBSD.conf.latest b/usr.sbin/pkg/FreeBSD.conf.latest index a75b0703386f..b7b528bc3756 100644 --- a/usr.sbin/pkg/FreeBSD.conf.latest +++ b/usr.sbin/pkg/FreeBSD.conf.latest @@ -13,3 +13,10 @@ FreeBSD: { fingerprints: "/usr/share/keys/pkg", enabled: yes } +FreeBSD-kmods: { + url: "pkg+https://pkg.FreeBSD.org/${ABI}/kmods_latest_${VERSION_MINOR}", + mirror_type: "srv", + signature_type: "fingerprints", + fingerprints: "/usr/share/keys/pkg", + enabled: yes +} diff --git a/usr.sbin/pkg/FreeBSD.conf.quarterly b/usr.sbin/pkg/FreeBSD.conf.quarterly index 645053820dda..2050350baa1f 100644 --- a/usr.sbin/pkg/FreeBSD.conf.quarterly +++ b/usr.sbin/pkg/FreeBSD.conf.quarterly @@ -13,3 +13,10 @@ FreeBSD: { fingerprints: "/usr/share/keys/pkg", enabled: yes } +FreeBSD-kmods: { + url: "pkg+https://pkg.FreeBSD.org/${ABI}/kmods_quarterly_${VERSION_MINOR}", + mirror_type: "srv", + signature_type: "fingerprints", + fingerprints: "/usr/share/keys/pkg", + enabled: yes +} From nobody Thu May 29 19:59:03 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b7cdM4BNxz5xR0y; Thu, 29 May 2025 19:59: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b7cdM2zkrz3M6P; Thu, 29 May 2025 19:59:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748548743; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/UQPbLPxEvrM06P20JAoo28yCSjv6f1wRMw/mdnOqMU=; b=i4uzPe7MzzYjCWebt2cXhdZbO7nDat9wXSDk0Ry5bcH8j5ERmoNDIAIzFzuBdWLS1h+20P VAEb8HwpcGg91NNrTBcnpWHPX76vzRZT1HEeQOqDUhS7EIWo/xiizZ2CKhF3KLI7XRe5eP JluGr6NEj03k46P4vkYb+FyPFadIg63IxOha2mg2gbWhhdFB3r7+ll7VHoNmK/M1neRd3j 2KjhtUMJC13IjNDKDkJnoCkficwHt2oiyp44PX6D9tT9dUMm3ombMNyJ0ygdaRJjwKT1+C HDFjMdU3Pg+2LhboNN1pSI+rcNt9+C1wawgo5OmorgOMLqubzlj6OzzYFDk2rw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748548743; a=rsa-sha256; cv=none; b=GuFU6gtJb/vtNYvBEgxxEI4Aj4ATVYWaecXLHJ4Vove1xQYW2Xm7Ax+gMIRMGlXMH+R0fC bQyggXF8RDV3fmKWkq9litdUP2LRs1EqL9AmmfXxRrpgyDQCD8AvYcCZTcWDXPQxYvcy3m FZK0xUXgrXjI0RdtBSYU+8sqYuptIcJ2daUFnA2Fbl8MfMxNNGDWntjU31Z/CgBbaKvyar jiI+FA3LIcUVPyvCObIX6/PWtdsID9ZVsQmtEWLzXLhj7L19WSZgxpPJJlGuAPut6VrAc+ h0cQiNARtmjMaGWAZ6LH7BxxrLVx2DYmPYEcYTxDqCAvxR1Fa76Qlc8bsn65IA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748548743; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/UQPbLPxEvrM06P20JAoo28yCSjv6f1wRMw/mdnOqMU=; b=NWKDAscTdqzl8nHoUhi/4Wdguoj0pyIRn/wz2EvYYSTeavWOoXYCLnxNXJXePWX9Yc+Y+y ENpOv8Wf748ODcstSjMxAKkIQLWqg2IlaNZ+OyTE3JYXuiVxNBgQBkrp4Mv0aWj6Yt9u8i uqCTYnWg6BUjbMesdxPqpPclMAwRZN05QgccwcWZcFBCdUyHgsJBB1BGKjEn1L6L5qgpWX MjUyc2k/VdoE4poPCn/I8MLkAK1WRt8+dAufCaAisacGJGhoRqmBJqWbJAUS1zCF9ORZyq BZty8sFEgoEHOEZEchhVpf56KV8/69RmYtQff16ZMEuMT8M65BTV3JVzM1WKoA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b7cdM2K5sz5nM; Thu, 29 May 2025 19:59: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 54TJx32v031671; Thu, 29 May 2025 19:59:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54TJx35k031668; Thu, 29 May 2025 19:59:03 GMT (envelope-from git) Date: Thu, 29 May 2025 19:59:03 GMT Message-Id: <202505291959.54TJx35k031668@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: a47542f71511 - releng/14.3 - pkg.conf: Use kmod repositories List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.3 X-Git-Reftype: branch X-Git-Commit: a47542f7151160cb2d9606b4eb91d7d3fb555e92 Auto-Submitted: auto-generated The branch releng/14.3 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=a47542f7151160cb2d9606b4eb91d7d3fb555e92 commit a47542f7151160cb2d9606b4eb91d7d3fb555e92 Author: Colin Percival AuthorDate: 2025-05-28 21:10:41 +0000 Commit: Colin Percival CommitDate: 2025-05-29 19:58:46 +0000 pkg.conf: Use kmod repositories The kmod repositories were added shortly after 14.2-RELEASE. Point at them here so that users don't need to manually add the configuration in order to get e.g. working graphics. Approved by: re (cperciva) MFC after: 1 minute Sponsored by: Amazon Differential Revision: https://reviews.freebsd.org/D50583 (cherry picked from commit 29f076ae0cb536d1e891d3375edf28f1bc82df79) (cherry picked from commit 8a2ce9f9dd6745e77bdfe78f03e96ddc8ad1b9d7) --- usr.sbin/pkg/FreeBSD.conf.latest | 7 +++++++ usr.sbin/pkg/FreeBSD.conf.quarterly | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/usr.sbin/pkg/FreeBSD.conf.latest b/usr.sbin/pkg/FreeBSD.conf.latest index a75b0703386f..b7b528bc3756 100644 --- a/usr.sbin/pkg/FreeBSD.conf.latest +++ b/usr.sbin/pkg/FreeBSD.conf.latest @@ -13,3 +13,10 @@ FreeBSD: { fingerprints: "/usr/share/keys/pkg", enabled: yes } +FreeBSD-kmods: { + url: "pkg+https://pkg.FreeBSD.org/${ABI}/kmods_latest_${VERSION_MINOR}", + mirror_type: "srv", + signature_type: "fingerprints", + fingerprints: "/usr/share/keys/pkg", + enabled: yes +} diff --git a/usr.sbin/pkg/FreeBSD.conf.quarterly b/usr.sbin/pkg/FreeBSD.conf.quarterly index 645053820dda..2050350baa1f 100644 --- a/usr.sbin/pkg/FreeBSD.conf.quarterly +++ b/usr.sbin/pkg/FreeBSD.conf.quarterly @@ -13,3 +13,10 @@ FreeBSD: { fingerprints: "/usr/share/keys/pkg", enabled: yes } +FreeBSD-kmods: { + url: "pkg+https://pkg.FreeBSD.org/${ABI}/kmods_quarterly_${VERSION_MINOR}", + mirror_type: "srv", + signature_type: "fingerprints", + fingerprints: "/usr/share/keys/pkg", + enabled: yes +} From nobody Thu May 29 20:08:56 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b7crm4ncsz5xRlg; Thu, 29 May 2025 20:08: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b7crm2pFSz3TG1; Thu, 29 May 2025 20:08:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748549336; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2qFtmUPo3D2/iCk1plRAnWYf53z3evx/WedGMbjVB8I=; b=yOcVWCIDEZQK3/9zAtlcGn9ZL39Rl/mzyNm3aFboJJqo+rRgwp+vKYC4K7uiqC/nRj0FKj L0fUidPgIrkJlXRPoCq6cc79L0uVZwDKJH1JP3TOyjMXXvxvracRxoaNuJPnMRXE/TasxV AE+X7Er8wPY7oZX5WrDdM0ZmI3WrjHTbd3I7jMu9hJ+mjA9CJgD9gVtFooJlAi77o4WTmt DNhvDLTJ/Mi9IOWB7211hOzivANd54sbZU7dTTUokoFxjbH+4XmycDVt4jAdPzg6CspM1Y rNMmM6UUEpGKgaFWQoaHsO0AnD3B9c0y/5uKVMC7P5T29K6izx89vRODJPo1LQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748549336; a=rsa-sha256; cv=none; b=NPuqo/s519tMX4k5yv0pm5KewK6A8rwxOg/FOHO8n8AEDkykr+m0dXqrp9FX3Q1t0jnivO ae2WxOUvNSwnAArLuiKdrKsTpZRMOhvCVavQPYTPzyCgLGu9cx+YAGH8pqqoXlVxqORfMB 8CdtIXGZlr0q9QLv0KPkO/ywjjzimCVjjmKQ2TKeBCahKXBu22Ui9kYFmn4aF8raoYkrca eFTChe5z90vjjeXZ5IH3XwcpA0eBsBlZI9+YAegWLj2U45TqqieJw6TGMBs79dpW1zyD/j 4rEQyaHBMBdZKq/aBJQNKWh/jAcKyTPW6igwHGsmS+l6yZMeQEUxca9wanBqPA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748549336; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2qFtmUPo3D2/iCk1plRAnWYf53z3evx/WedGMbjVB8I=; b=KxET2teliuZUR8AhNDm8JyVADQHdJNeyrSKQJ6wgD9XSZP4QwPIKIzYXuaCGVUPZHbCSB+ z0z39ynylIyihRD7ww8NMm1hRL1Cf/IkWVkj4VPqcEiVH30Og12AGrt5oCocRLRvuXr2g3 RwF6BrOSWqwc+JjKO+SQJTGogP46XT7ABV2e7OgBX9lPWtsEDE6gVAjMOUWObMrSQTn1cb yOIsKnrS/PxrxbhuL8GFJDmT7Cp2WbsfRPoclnxj7Pk9cdNZy7VW8hz+Pj8rT7BZfKZooM ZzctbUBn6WDHgIC25zMD1OpqRwUacx+PVQObkeT7hes7HBVpb7cRUrHVzf4dHQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b7crm2MMSz5np; Thu, 29 May 2025 20:08: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 54TK8uw4051343; Thu, 29 May 2025 20:08:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54TK8u9T051340; Thu, 29 May 2025 20:08:56 GMT (envelope-from git) Date: Thu, 29 May 2025 20:08:56 GMT Message-Id: <202505292008.54TK8u9T051340@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: 2e47009079fc - main - mail: don't rewrite buffer sizes as much List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 2e47009079fc01ca05c9779d85616e1df037693c Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=2e47009079fc01ca05c9779d85616e1df037693c commit 2e47009079fc01ca05c9779d85616e1df037693c Author: Kyle Evans AuthorDate: 2025-05-29 20:08:49 +0000 Commit: Kyle Evans CommitDate: 2025-05-29 20:08:49 +0000 mail: don't rewrite buffer sizes as much Thes buffers are arrays with a known size, just use sizeof() rather than rewriting their sizes -- no functional change, slightly more resilient against future possible errors. Reviewed by: markj Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D50582 --- usr.bin/mail/collect.c | 11 ++++++----- usr.bin/mail/lex.c | 3 ++- usr.bin/mail/util.c | 10 +++++----- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/usr.bin/mail/collect.c b/usr.bin/mail/collect.c index 97c4d499ea3a..8c308d217195 100644 --- a/usr.bin/mail/collect.c +++ b/usr.bin/mail/collect.c @@ -152,7 +152,7 @@ cont: } for (;;) { colljmp_p = 1; - c = readline(stdin, linebuf, LINESIZE); + c = readline(stdin, linebuf, sizeof(linebuf)); colljmp_p = 0; if (c < 0) { if (value("interactive") != NULL && @@ -163,7 +163,7 @@ cont: break; } lastlong = longline; - longline = c == LINESIZE - 1; + longline = c == sizeof(linebuf) - 1; eofcount = 0; hadintr = 0; if (linebuf[0] == '.' && linebuf[1] == '\0' && @@ -384,11 +384,12 @@ cont: (void)fflush(stdout); lc = 0; cc = 0; - while ((rc = readline(fbuf, linebuf, LINESIZE)) >= 0) { - if (rc != LINESIZE - 1) + while ((rc = readline(fbuf, linebuf, + sizeof(linebuf))) >= 0) { + if (rc != sizeof(linebuf) - 1) lc++; if ((t = putline(collf, linebuf, - rc != LINESIZE - 1)) < 0) { + rc != sizeof(linebuf) - 1)) < 0) { (void)Fclose(fbuf); goto err; } diff --git a/usr.bin/mail/lex.c b/usr.bin/mail/lex.c index 2d86a17c13e9..1c39c876b3f1 100644 --- a/usr.bin/mail/lex.c +++ b/usr.bin/mail/lex.c @@ -223,7 +223,8 @@ commands(void) */ n = 0; for (;;) { - if (readline(input, &linebuf[n], LINESIZE - n) < 0) { + if (readline(input, &linebuf[n], + sizeof(linebuf) - n) < 0) { if (n == 0) n = -1; break; diff --git a/usr.bin/mail/util.c b/usr.bin/mail/util.c index ce53c7108a0d..5c9a2f2f6d8e 100644 --- a/usr.bin/mail/util.c +++ b/usr.bin/mail/util.c @@ -135,7 +135,7 @@ hfield(const char *field, struct message *mp) ibuf = setinput(mp); if ((lc = mp->m_lines - 1) < 0) return (NULL); - if (readline(ibuf, linebuf, LINESIZE) < 0) + if (readline(ibuf, linebuf, sizeof(linebuf)) < 0) return (NULL); while (lc > 0) { if ((lc = gethfield(ibuf, linebuf, lc, &colon)) < 0) @@ -184,7 +184,7 @@ gethfield(FILE *f, char linebuf[], int rem, char **colon) ungetc(c = getc(f), f); if (c != ' ' && c != '\t') break; - if ((c = readline(f, line2, LINESIZE)) < 0) + if ((c = readline(f, line2, sizeof(line2))) < 0) break; rem--; for (cp2 = line2; *cp2 == ' ' || *cp2 == '\t'; cp2++) @@ -503,7 +503,7 @@ name1(struct message *mp, int reptype) return (cp); ibuf = setinput(mp); namebuf[0] = '\0'; - if (readline(ibuf, linebuf, LINESIZE) < 0) + if (readline(ibuf, linebuf, sizeof(linebuf)) < 0) return (savestr(namebuf)); newname: for (cp = linebuf; *cp != '\0' && *cp != ' '; cp++) @@ -512,10 +512,10 @@ newname: ; for (cp2 = &namebuf[strlen(namebuf)]; *cp != '\0' && *cp != ' ' && *cp != '\t' && - cp2 < namebuf + LINESIZE - 1;) + cp2 < namebuf + sizeof(namebuf) - 1;) *cp2++ = *cp++; *cp2 = '\0'; - if (readline(ibuf, linebuf, LINESIZE) < 0) + if (readline(ibuf, linebuf, sizeof(linebuf)) < 0) return (savestr(namebuf)); if ((cp = strchr(linebuf, 'F')) == NULL) return (savestr(namebuf)); From nobody Thu May 29 20:08:57 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b7crn632wz5xRRL; Thu, 29 May 2025 20:08: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b7crn3klwz3THf; Thu, 29 May 2025 20:08:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748549337; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RJJo1cICxQnUiGQR+XXfvmOA1h22psJXLa42F78suk4=; b=oeK6b8B9hSMvhNTmyAXAnuE38g71nsSKTg7KNDaGszcOqi5jjNCpDHWid/xNpfC/aRiGU/ 9XmQlAZ54fjyLwxrM78j0kdPlJn/HOMHXhTg4+7r/2NNVtrLUvYji3/pumOmBciM3ieLH+ vMFVdu4x0i3ikg3R9lraOdDI7aREgz6lVHnYtWxaVCuyZhEg2tSlPhWmklv83/xZn2q+/3 0yhHcaRNMGt2v9erkHtRBXeRSokbyLxMj1TctDaLHsEk1jjohBSWVt2ZxPSZhOBEq6L27c wVRhMSoJ/PPGrK3DfYMNQuxMkfB2LOTC1TmhZC196/Ighf7/qTFvkbvKVHcOtQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748549337; a=rsa-sha256; cv=none; b=YUfos5wpU7hINQWxcaO12RSqzApt2Ec1aRz1jrJjVmGzTPd1XfAFBSN+5ll7yHGPVctMXd /IQYFcBPq0umd853lgywpZ+93UWf+xgudSLRTRknCSp6m+zPGz5ZwKrmEXlmI4XrbX8aX1 AfmsQQEiWARRKLLe3wdMaJr89SaN7afyTXA0BuAM72sk/L3kHAnEES6cv1JZjZbWEmKw2E m+WQZNK5XWqN/552dpwCAOT7dDiAdqdGRl9+I6IIeHU63gVqjiVLvQt5w9/KIOjEZ3Km86 meptJVxgqorUfTrNJnBAbA04jR3rAW3My3d93k7LbrO3eqmFz/4/LruuyEYgzQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748549337; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RJJo1cICxQnUiGQR+XXfvmOA1h22psJXLa42F78suk4=; b=YeAtdwmarRiWfkXwP6eANYNfx1PgHoiDhXOXF5CfPQz9H5gJBqh3uziWwoNKSh+QqgIk5g 8jOWX8EE8b2vGRbfV3YpPYHhmZsMSmkctLgPwqCO/G4nYbxWrwHP9odUinTDy1codAjpni V9pcMr+VkzZYvyKYKxIIKxRFU23Y9D8W7VSlvBIQHJdH2W7psILcDEflDi5VWjSc07oS/O DJOcB4QIVIGVwmKXRjRqYPeXB/DBrVrMGVYILhXmBX6qZlFfBxZ6W3HtqL04a18+OxGrEK YwYZuB7Sj73o1N/WEXXglKVQwLsldLnmadw+KbF3tJbhUGELKydP3V7OqW3lOQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b7crn3L8Kz5nq; Thu, 29 May 2025 20:08: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 54TK8vGn051378; Thu, 29 May 2025 20:08:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54TK8vRI051375; Thu, 29 May 2025 20:08:57 GMT (envelope-from git) Date: Thu, 29 May 2025 20:08:57 GMT Message-Id: <202505292008.54TK8vRI051375@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: d5e5e24179f4 - main - mail: tests: reset signal disposition before testing List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: d5e5e24179f4a98efaadea2b3c43006b322d7f15 Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=d5e5e24179f4a98efaadea2b3c43006b322d7f15 commit d5e5e24179f4a98efaadea2b3c43006b322d7f15 Author: Kyle Evans AuthorDate: 2025-05-29 20:08:50 +0000 Commit: Kyle Evans CommitDate: 2025-05-29 20:08:50 +0000 mail: tests: reset signal disposition before testing As a good citizen of the OS, mail(1) won't try to catch signals that were ignored when it started and it won't reconfigure its signal mask unless it's going to try and handle a signal. The test should start mail(1) off in a well-known state for the signal that it's trying to test in order to get the behavior that's desired. No functional change, just improves the resilience of the test. Reviewed by: des Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D50599 --- usr.bin/mail/tests/mailx_signal_test.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/usr.bin/mail/tests/mailx_signal_test.c b/usr.bin/mail/tests/mailx_signal_test.c index d4ce1e536935..be03b54fd51e 100644 --- a/usr.bin/mail/tests/mailx_signal_test.c +++ b/usr.bin/mail/tests/mailx_signal_test.c @@ -50,6 +50,17 @@ mailx_signal_test(int signo, bool interactive) atf_tc_fail("failed to fork"); if (pid == 0) { /* child */ + sigset_t set; + + /* + * Ensure mailx(1) will handle SIGINT; i.e., that it's not + * ignored or blocked. + */ + (void)signal(signo, SIG_DFL); + sigemptyset(&set); + sigaddset(&set, signo); + ATF_REQUIRE_INTEQ(0, sigprocmask(SIG_UNBLOCK, &set, NULL)); + dup2(ipd[0], STDIN_FILENO); close(ipd[0]); close(ipd[1]); From nobody Thu May 29 22:10:08 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b7gXd51qbz5xYvM; Thu, 29 May 2025 22:10: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b7gXd3JgZz3rhS; Thu, 29 May 2025 22:10:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748556609; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=68inXk82v8GMMaPGvKZDdsN2mov79QO2l9UudgFcqt8=; b=ZYmxvotH0zYh8vSB2RqGaFo+dl+wx87vK7xb5h65Fvf/uWatSDBBD2gYABrL2ozHzrihk1 1IGW2rNx+ljdzz7+UQC9OJc8QEdMMwrbhD94RETFiZEkWtnlHbcOg3DapvxG5qXIQ7tqcZ JsR7fpqqh3VwrFFpWEgQ31whpkFSYfm006ZvHcQtS8Bpv+/k++gMWyY6O1fPmffQu3yX14 W6FaAzGmvx7DVnAJSoMhgGiwboV0Kz5P5TvBQoX4TY6d/zIFz2sICl1RpsN/roO/Hlj/h7 7AN0Kg9Mr/pUKPoQl2eA2xjxFGBH9PrTvmMNeaCstknZvLn5192PL9A006YnZQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748556609; a=rsa-sha256; cv=none; b=dosT5BbA/qsbgl8dzfrq/i9sd9zbH1MHCTPXSrPUgC4B6arGG/fqHP2XRrV36HDJvll89C vVbh5bxWu1cqZcRMvgHVepcNvQweZiNwBYuU5nAloq5DyYmZ2bUjCW/QAwqRUUjYTOFak8 3VezVEEmaw1O8M8iUNqTUzaHNrdqlRyM6FpDYCHJHQr/3GYA4a33g8I3OrOtXBZfdmPxek UA4OuCj6EB8CT3LBI6SVtMGpMLpA0MX8pMGbs1MafTMz8Su7xTYTtvAK4QFzciBlNtj727 op5ySu7vRS0j71o/KK5+SepSys8kLey2h+VJ7W3y9oLIvwFr8y1dHEG7shzhIg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748556609; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=68inXk82v8GMMaPGvKZDdsN2mov79QO2l9UudgFcqt8=; b=umuCZ8nfSZS21m6QYWnB3iGpVloM4j/xNoyH4ikzzYaq45fat6V+/FfRYmPP1VSNquFlwX NgV16D+v7jbllMsZ6n+SA4LfWIjcApX+8Rug1C9i5f10i5abG3PiEkud7o5za1cvxC0MRr 5WdG87gmirXmQpskkuLaAEYvCubCH9oQEhTu7SRAc9N8395qKvJmIcBV6rXL/Ei8pUwcZY 5YqPVQws7u6dOsT/sf05el9EWBgmDhq3YBE8u6t8hfZXYHNPYwDP801ee3N+5JQytcZ0Fl 2SNxXczvAFCyUgWollDB13hzBo6IGYkAcm0xqao9hlrjWuBia+JIGO2oDNCjkg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b7gXd1Ppjz9Dv; Thu, 29 May 2025 22:10: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 54TMA8M8079377; Thu, 29 May 2025 22:10:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54TMA8Nf079371; Thu, 29 May 2025 22:10:08 GMT (envelope-from git) Date: Thu, 29 May 2025 22:10:08 GMT Message-Id: <202505292210.54TMA8Nf079371@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 0c6aa445ec0c - stable/14 - sound: Terminate stream properly when closing vchans List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 0c6aa445ec0c85e7c9653d20562907742569de6f Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=0c6aa445ec0c85e7c9653d20562907742569de6f commit 0c6aa445ec0c85e7c9653d20562907742569de6f Author: Christos Margiolis AuthorDate: 2025-05-29 10:24:17 +0000 Commit: Christos Margiolis CommitDate: 2025-05-29 22:09:40 +0000 sound: Terminate stream properly when closing vchans When a channel is closed, dsp_close() either calls vchan_destroy() on vchans, or chn_abort()/chn_flush() on primary channels. However, the problem with this is that, when closing a vchan, we end up not terminating the stream properly. The call sequence we are interested in is the following: vchan_destroy(vchan) -> chn_kill(vchan) -> chn_trigger(vchan) -> vchan_trigger(vchan) -> chn_notify(parent) Even though chn_notify() contains codepaths which call chn_abort(parent), apparently we do not execute any of those codepaths in this case, so the DMA remains unterminated, hence why we keep seeing the primary channel(s) being interrupted even once the application has exited: root@freebsd:~ # sndctl interrupts dsp0.play.0.interrupts=1139 dsp0.record.0.interrupts=0 root@freebsd:~ # sndctl interrupts dsp0.play.0.interrupts=1277 dsp0.record.0.interrupts=0 root@freebsd:~ # sndctl interrupts dsp0.play.0.interrupts=1394 dsp0.record.0.interrupts=0 The only applications that do not have this issue are those (e.g., mpv) that manually call ioctls which end up calling chn_abort(), like SNDCTL_DSP_HALT, to abort the channel(s) during shutdown. For all other applications that do not manually abort the channel(s), we can confirm that chn_abort()/chn_flush(), or even chn_trigger(PCMTRIG_ABORT) on the parent, doesn't happen during shutdown. root@freebsd:~ # dtrace -n 'fbt::chn_abort:entry,fbt::chn_flush:entry { printf("%s", args[0]->name); stack(); }' dtrace: description 'fbt::chn_abort:entry,fbt::chn_flush:entry ' matched 2 probes dtrace: buffer size lowered to 1m ^C [...] root@freebsd:~ # dtrace -n 'fbt::chn_trigger:entry /args[1] == -1/ { printf("%s", args[0]->name); stack(); }' dtrace: description 'fbt::chn_trigger:entry ' matched 1 probe dtrace: buffer size lowered to 1m CPU ID FUNCTION:NAME 0 68037 chn_trigger:entry dsp0.virtual_play.0 sound.ko`chn_kill+0x134 sound.ko`vchan_destroy+0x94 sound.ko`dsp_close+0x39b kernel`devfs_destroy_cdevpriv+0xab kernel`devfs_close_f+0x63 kernel`_fdrop+0x1a kernel`closef+0x1e3 kernel`closefp_impl+0x76 kernel`amd64_syscall+0x151 kernel`0xffffffff8103841b1 To fix this, modify dsp_close() to execute the primary channel case on both primary and virtual channels. While what we really care about are the chn_abort()/chn_flush() calls, it shouldn't hurt to call the rest of the functions on the vchans as well, to avoid complicating things; they get deleted right below, anyway. With the patch applied: root@freebsd:~ # dtrace -n 'fbt::chn_trigger:entry /args[1] == -1/ { printf("%s", args[0]->name); stack(); }' dtrace: description 'fbt::chn_trigger:entry ' matched 1 probe dtrace: buffer size lowered to 1m CPU ID FUNCTION:NAME 1 68037 chn_trigger:entry dsp0.virtual_play.0 sound.ko`chn_flush+0x2a sound.ko`dsp_close+0x330 kernel`devfs_destroy_cdevpriv+0xab kernel`devfs_close_f+0x63 kernel`_fdrop+0x1a kernel`closef+0x1e3 kernel`closefp_impl+0x76 kernel`amd64_syscall+0x151 kernel`0xffffffff8103841b 0 68037 chn_trigger:entry dsp0.play.0 sound.ko`chn_notify+0x4ce sound.ko`vchan_trigger+0x105 sound.ko`chn_trigger+0xb4 sound.ko`chn_flush+0x2a sound.ko`dsp_close+0x330 kernel`devfs_destroy_cdevpriv+0xab kernel`devfs_close_f+0x63 kernel`_fdrop+0x1a kernel`closef+0x1e3 kernel`closefp_impl+0x76 kernel`amd64_syscall+0x151 kernel`0xffffffff8103841b Above we can see a chn_trigger(PCMTRIG_ABORT) on the parent (dsp0.play.0), which is coming from the chn_abort() (inlined) in chn_notify(): root@freebsd:~ # dtrace -n 'kinst::chn_abort:entry { stack(); }' dtrace: description 'kinst::chn_abort:entry ' matched 5 probes dtrace: buffer size lowered to 1m CPU ID FUNCTION:NAME 1 72580 chn_notify:1192 sound.ko`0xffffffff8296cab4 sound.ko`vchan_trigger+0x105 sound.ko`chn_trigger+0xb4 sound.ko`chn_flush+0x2a sound.ko`dsp_close+0x330 kernel`devfs_destroy_cdevpriv+0xab kernel`devfs_close_f+0x63 kernel`_fdrop+0x1a kernel`closef+0x1e3 kernel`closefp_impl+0x76 kernel`amd64_syscall+0x151 kernel`0xffffffff8103841b We can also confirm the primary channel(s) are not interrupted anymore: root@freebsd:/mnt/src # sndctl interrupts dsp0.play.0.interrupts=0 dsp0.record.0.interrupts=0 In collaboration with: adrian Tested by: adrian, christos, thj Sponsored by: The FreeBSD Foundation MFC after: 2 days Reviewed by: thj, adrian, emaste Differential Revision: https://reviews.freebsd.org/D50488 (cherry picked from commit f6430bc61df78be070209d52b4452ae9cf4cd015) --- sys/dev/sound/pcm/dsp.c | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/sys/dev/sound/pcm/dsp.c b/sys/dev/sound/pcm/dsp.c index f1adcdbc5d70..aa6ad4a59778 100644 --- a/sys/dev/sound/pcm/dsp.c +++ b/sys/dev/sound/pcm/dsp.c @@ -289,19 +289,25 @@ dsp_close(void *data) if (sg_ids != 0) free_unr(pcmsg_unrhdr, sg_ids); + /* + * Go through the channel abort/flush path for both + * primary and virtual channels to ensure that, in the + * case of vchans, the stream is always properly + * stopped, and the primary channels do not keep being + * interrupted even if all vchans are gone. + */ + CHN_LOCK(rdch); + chn_abort(rdch); /* won't sleep */ + rdch->flags &= ~(CHN_F_RUNNING | CHN_F_MMAP | + CHN_F_DEAD | CHN_F_EXCLUSIVE); + chn_reset(rdch, 0, 0); + chn_release(rdch); if (rdch->flags & CHN_F_VIRTUAL) { parent = rdch->parentchannel; CHN_LOCK(parent); CHN_LOCK(rdch); vchan_destroy(rdch); CHN_UNLOCK(parent); - } else { - CHN_LOCK(rdch); - chn_abort(rdch); /* won't sleep */ - rdch->flags &= ~(CHN_F_RUNNING | CHN_F_MMAP | - CHN_F_DEAD | CHN_F_EXCLUSIVE); - chn_reset(rdch, 0, 0); - chn_release(rdch); } } if (wrch != NULL) { @@ -314,19 +320,18 @@ dsp_close(void *data) if (sg_ids != 0) free_unr(pcmsg_unrhdr, sg_ids); + CHN_LOCK(wrch); + chn_flush(wrch); /* may sleep */ + wrch->flags &= ~(CHN_F_RUNNING | CHN_F_MMAP | + CHN_F_DEAD | CHN_F_EXCLUSIVE); + chn_reset(wrch, 0, 0); + chn_release(wrch); if (wrch->flags & CHN_F_VIRTUAL) { parent = wrch->parentchannel; CHN_LOCK(parent); CHN_LOCK(wrch); vchan_destroy(wrch); CHN_UNLOCK(parent); - } else { - CHN_LOCK(wrch); - chn_flush(wrch); /* may sleep */ - wrch->flags &= ~(CHN_F_RUNNING | CHN_F_MMAP | - CHN_F_DEAD | CHN_F_EXCLUSIVE); - chn_reset(wrch, 0, 0); - chn_release(wrch); } } PCM_LOCK(d); From nobody Thu May 29 22:10:09 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b7gXg0Clrz5xYxY; Thu, 29 May 2025 22:10: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b7gXf395cz3rlr; Thu, 29 May 2025 22:10:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748556610; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1CBdmFd3PFSWGvAPvanZAtPUZyYD3vS2xos8kD5zO08=; b=lW7PKTq4pKwIt0XXGYTmczAT+2q4XU6bpN4f+QE+0JnUdp6Q7+SGsmdyhRvk892hjGMnj7 uozq7UY9MMXhzq0ABi4mAfyhxj4PdzGqJDoMII1ocqu6m9s82vOUnkr1PYv2mfEXFK211/ j2QvibVavK6a+bGW0YI2RgGTyFiMVhKB9KYrGsES5nmuGIk6rObts9X3E/UaKuZS/CpCok nRkSEsAHGrQGHRR7/g9RlYQAp3h3elDBJU3oMBpXYx1bDHmF8+g3LAhs1azriVUlA6STtj iKCCE2ydLSz6N0VNZBO7w+a34Z8xTjYKxRhKauh8zyWGDzqSazLJrOGxHH55iw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748556610; a=rsa-sha256; cv=none; b=frv4jJSdHPpFvbKPFyJGLVDhKWasP6nr0I3h0iwdjTWVS5L7Fk9M+ylTI/5qCbsiKgGpCD tGRSxN9OLxWanvgwhSEVmFQitghzYk/nRDsCfbEL82feQhh8/F7KJZU6zYXl8qaewqR2an XQivrpug7kF8rCEc+TIEVnhvqmTISxOyOFFvSEQwV+3UJDTHupbgoFuA8of5b+jRGQxQ+B F3OGT22C6CDedf42actQOvqSxirALJR+pSBd5o1QcyEloh8rHhNm3c4vylUSB5LpD6GxOt x20bjAPYBdszgYeMFLr5OTVqLQVnItX9y7uzPreC/3Qxpjt5gwkUTPj7XhNe3w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748556610; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1CBdmFd3PFSWGvAPvanZAtPUZyYD3vS2xos8kD5zO08=; b=uXC0cQ2c140sg3QT5pZ5qm0/TfPJVtFBeJGZ8C8KL5GknMU0Hk/SVBhMCv7AZ235bC0to6 xTU7A0IzGqwCdx0cXSmhry6iyAMV+bByGr5+ycBQXOIoAZQ0TyRdtpysKeOvLvxyum7Myp K0pVs8hhuZKDuHF27ZwBNXzOHBKrtXxWFChW9nt9kbL93r9DzweIZ6HiTfN6gYrSYOT/va IQ9baFRi6l/s0iTORkytrzVZsPb4XhqFgfYzeMCT2L7YPmd6jbvkDhJthr1u+qtjkcZarZ FMybFDi4ZpzN/NRNMDJM5a6YJFU4GypA1touyfGfw5Sz9zF+HVBlkYiNfTT9mw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b7gXf0x9jz8kb; Thu, 29 May 2025 22:10: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 54TMA9vL079986; Thu, 29 May 2025 22:10:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54TMA9A6079981; Thu, 29 May 2025 22:10:09 GMT (envelope-from git) Date: Thu, 29 May 2025 22:10:09 GMT Message-Id: <202505292210.54TMA9A6079981@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: b760fa5bf0e9 - stable/14 - snd_dummy: Make callout stopping more robust List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b760fa5bf0e965210f8df05cef9ff46c68377d2a Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=b760fa5bf0e965210f8df05cef9ff46c68377d2a commit b760fa5bf0e965210f8df05cef9ff46c68377d2a Author: Christos Margiolis AuthorDate: 2025-05-29 10:24:28 +0000 Commit: Christos Margiolis CommitDate: 2025-05-29 22:09:40 +0000 snd_dummy: Make callout stopping more robust If the callout gets rescheduled during detach, we might access freed pcm_channel resources in dummy_chan_io(), which will cause a panic similar to this: panic: ASan: Invalid access, 8-byte read at 0xfffffe00479f65d8, UMAUseAfterFree(fd) cpuid = 1 time = 1747433047 KDB: stack backtrace: db_trace_self_wrapper() at db_trace_self_wrapper+0xa5/frame 0xfffffe0046a8d730 kdb_backtrace() at kdb_backtrace+0xc6/frame 0xfffffe0046a8d890 vpanic() at vpanic+0x226/frame 0xfffffe0046a8da30 panic() at panic+0xb5/frame 0xfffffe0046a8db00 kasan_code_name() at kasan_code_name/frame 0xfffffe0046a8dbd0 __mtx_lock_flags() at __mtx_lock_flags+0xd3/frame 0xfffffe0046a8dcc0 chn_intr() at chn_intr+0x3d/frame 0xfffffe0046a8dce0 dummy_chan_io() at dummy_chan_io+0x9c/frame 0xfffffe0046a8dd10 softclock_call_cc() at softclock_call_cc+0x2bb/frame 0xfffffe0046a8de80 softclock_thread() at softclock_thread+0x162/frame 0xfffffe0046a8def0 fork_exit() at fork_exit+0xa3/frame 0xfffffe0046a8df30 fork_trampoline() at fork_trampoline+0xe/frame 0xfffffe0046a8df30 Reviewed by: adrian Differential Revision: https://reviews.freebsd.org/D50386 (cherry picked from commit 0432b2183f25ddba7e13a33adf1dd6f9563b0bd1) --- sys/dev/sound/dummy.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/sys/dev/sound/dummy.c b/sys/dev/sound/dummy.c index 89e22a5ceb44..eeb6bd4ad4ad 100644 --- a/sys/dev/sound/dummy.c +++ b/sys/dev/sound/dummy.c @@ -65,6 +65,7 @@ struct dummy_softc { struct dummy_chan chans[DUMMY_NCHAN]; struct callout callout; struct mtx *lock; + bool stopped; }; static bool @@ -92,6 +93,9 @@ dummy_chan_io(void *arg) struct dummy_chan *ch; int i = 0; + if (sc->stopped) + return; + /* Do not reschedule if no channel is running. */ if (!dummy_active(sc)) return; @@ -108,7 +112,8 @@ dummy_chan_io(void *arg) chn_intr(ch->chan); snd_mtxlock(sc->lock); } - callout_schedule(&sc->callout, 1); + if (!sc->stopped) + callout_schedule(&sc->callout, 1); } static int @@ -195,6 +200,11 @@ dummy_chan_trigger(kobj_t obj, void *data, int go) snd_mtxlock(sc->lock); + if (sc->stopped) { + snd_mtxunlock(sc->lock); + return (0); + } + switch (go) { case PCMTRIG_START: ch->ptr = 0; @@ -345,8 +355,11 @@ dummy_detach(device_t dev) struct dummy_softc *sc = device_get_softc(dev); int err; - err = pcm_unregister(dev); + snd_mtxlock(sc->lock); + sc->stopped = true; + snd_mtxunlock(sc->lock); callout_drain(&sc->callout); + err = pcm_unregister(dev); snd_mtxfree(sc->lock); return (err); From nobody Thu May 29 22:19:03 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b7gkw0zYVz5xZK0; Thu, 29 May 2025 22:19: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b7gkv6dP9z41TN; Thu, 29 May 2025 22:19:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748557143; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Zbfx9aqXks8qxfh3OezTsYAYje1K0kFe4cBCFqpCCsE=; b=xr2kmBb5W3RHbAeR45O3sfYJlV9kMpZ4cFtZVXeHbTYLGojCqwWI0DOrJ4EjaKMo5j1TOT V0fDeZV1nomkS+9TZ8z5D6VbhVsOXPbx7UD4VEr0+uXCzISa6PQnvdVdExRbR4h4WGPUzd m8hcps1jPsy0mQVgQmq71+4ST2AXACk1Q10d6sPjCfXkD7iywvrBOdz98DSOaYZSDxAeqW MPIYjbyKckLLE/TvWoczPckYhstfBZ2MXYD4D27rmQOfu52Mi7aTvJA95H/bDhDDiOJPbK o7N4Ewc+LjI2t7gX9TVFotpP7FCbz/mLK7h4qR7v3qBZFk3cK1R2/cpnXAtqqg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748557143; a=rsa-sha256; cv=none; b=b9jZ2aXfx4WgvXoGC9DPm3kIH787rEV/jeOcompQZe1P4ji3sJ2B0X8ViNuNvHWBhKUpDk bSOsGMF12DPScrkGybqQS0lKc/5SQbhHYcVCdERi5mfai/JMMEa8T5MEAIhDAt244g0XRV VsBZAXlvA9b4eN+qqR7JeSLstmBMdhelqvmmtPB/NdVc8mrny6MfwvzyRrRGTYdZ2rBzkl ai0DQ0i2Qwwc9xdKNOGNaTkQTq7+QvNw/HtrbfklNFo/Fqkss79GTUztQ27s3fBK5+DvGE jNc5G1wLRUUy9k1kfG6QGix+zG7hDx6PWMTogeGtvCXsK+UYOcjVGzua20+EKQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748557143; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Zbfx9aqXks8qxfh3OezTsYAYje1K0kFe4cBCFqpCCsE=; b=AwEqpEhKVf0MIkGO1s6qhRROV60+WJTfwSmbnC9fh9UBDfjVKfeZtRc9ZzuEk6Ebjaaalc sjuJWpv0QtCiMbTal1HO/432B1d5whuwUUbr5Z0pJ63Rp1rQiIfR6C6T9AVqOLrJIcN1uZ SVJS0sLi5TB44yO8HvauYap4stdXCeLuN7ps2rSYNy6nW7i8S1gSfcZLwiEiLj4DrjhYeD JaWYUs4BROHalhAhv0ixFJXQeiXhuhJA5P/1HJQ8DDRUlKNBJl82H9ZqxCeJ/HqhgamyUl 26Rw6rkAvUuS4Q2wcQQe6/LAHeEL+kqulRztrkMBpC5x8INGP6i6tx5QI49Pew== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b7gkv5h1qz9XW; Thu, 29 May 2025 22:19: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 54TMJ31c094213; Thu, 29 May 2025 22:19:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54TMJ3h6094210; Thu, 29 May 2025 22:19:03 GMT (envelope-from git) Date: Thu, 29 May 2025 22:19:03 GMT Message-Id: <202505292219.54TMJ3h6094210@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 85739bcbce22 - releng/14.3 - 14.3: Switch from "quarterly" to "release" pkgs List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.3 X-Git-Reftype: branch X-Git-Commit: 85739bcbce22212f4a998bd3dc8cf8fdb3b69e4e Auto-Submitted: auto-generated The branch releng/14.3 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=85739bcbce22212f4a998bd3dc8cf8fdb3b69e4e commit 85739bcbce22212f4a998bd3dc8cf8fdb3b69e4e Author: Colin Percival AuthorDate: 2025-05-29 22:18:34 +0000 Commit: Colin Percival CommitDate: 2025-05-29 22:18:34 +0000 14.3: Switch from "quarterly" to "release" pkgs Approved by: re (implicit) Sponsored by: Amazon --- release/pkg_repos/release-dvd.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/pkg_repos/release-dvd.conf b/release/pkg_repos/release-dvd.conf index 600c309d5979..72c369da39b1 100644 --- a/release/pkg_repos/release-dvd.conf +++ b/release/pkg_repos/release-dvd.conf @@ -1,5 +1,5 @@ release: { - url: "pkg+http://pkg.FreeBSD.org/${ABI}/quarterly", + url: "pkg+http://pkg.FreeBSD.org/${ABI}/release_3", mirror_type: "srv", signature_type: "fingerprints", fingerprints: "/usr/share/keys/pkg", From nobody Thu May 29 22:51:56 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b7hSr6SGRz5xbxf; Thu, 29 May 2025 22:51: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b7hSr4nsmz3XVb; Thu, 29 May 2025 22:51:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748559116; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uSsYVvpKHWChCgsgOkGruyo7tbuwjHOMfoghr6x03vc=; b=YvE+2A/orTsO47Ooc0swCCeHBnFwhLlNEW6f8fXytdNwLgaXzZtoKEWMoq7gfjyLjyfaTy fXv95ZEJ6f21VQLnYnw2M+GUlbf0XWlj5GBacKehKLk+KxBMLqKhK9lVJAvnnWAsxwLMb5 SVfezqxaq0z/bqnQuHhu0bm2MWtWx7pfs3GmMDCnWspdKYzLQ/+rGfFMHcHNziaQrbnflF Qalrxi7auysrvdtIaY/7HgkncZAFdErA9Uh9hj4q5bELxIPYkXSqrmHq3fU+q4M2knWyx8 BDOKILgV/sb6IyTd+aWPs/fd/cI7PGs0E69561QrPjT3hwpfXLA8XH2leMW6YA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748559116; a=rsa-sha256; cv=none; b=wI0Uu1giKCQLFD8geH4LKflhb7Zc5gaB8Q8UXJPK/EF/6SD7DjPOxAcD17vweKC8yKYo3J xlrHUDfeWCCWT4Ft/HuAa0nKSlfQNX65EUKIQ9RMB5yMjXQgG1vVSnAPtBtZZFwzXvluwr i1nOmJo9rUyQFcTL5ZGzAFOxK48btagryxkZXmEMC8udegeip1+izzYjux5b0RaQ/cbe2J P5JArBbNwcedXDlDCZo35ldEIIJzQCuZeSwI8rXCV4UVHGWWq1nyEmL8JtfhJjHVeOUsVN E8L9I/xzQAylwpcJPo/BpMDCRdyJqYjME2Xxr/dRQNrLplEC8SGeztcmxjxhoQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748559116; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uSsYVvpKHWChCgsgOkGruyo7tbuwjHOMfoghr6x03vc=; b=w9j+0ByKJfGCHjIlIZQFCHaTIZwXtMiMV6wYixSHkhQCzSxNloKATB9TOVTl/pHVWbPdRt TlYxMDoJODT7RWvyJ9MhRmaipmew7ESKLtT+RVVqSXr7VvRXjllhR+k60S40i/LfWOoHEP UmB5KK9UhiBire4AYEkY9pkgURCvuiiTljhMAWmGd//cY19xxjEPh29IwSbFO6lLzz5S4P h9WJUwLhWFdTA3MNSPZ2VALiiLqqDOmV2TZ8m2qPCL0deTZGOWQCVGBS/38rUTZL4ZHoUz O2p5OrBGru7DEgaQenHg6TDFh27HyigLYq1pjSSTxIl9kfE4WuN39Ckwoqufbg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b7hSr4NRvzBNF; Thu, 29 May 2025 22:51: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 54TMpu1L065663; Thu, 29 May 2025 22:51:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54TMpueS065660; Thu, 29 May 2025 22:51:56 GMT (envelope-from git) Date: Thu, 29 May 2025 22:51:56 GMT Message-Id: <202505292251.54TMpueS065660@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 99b8be414cbc - releng/14.3 - sound: Terminate stream properly when closing vchans List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/releng/14.3 X-Git-Reftype: branch X-Git-Commit: 99b8be414cbcb4577859985ef80eb053d761ae5f Auto-Submitted: auto-generated The branch releng/14.3 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=99b8be414cbcb4577859985ef80eb053d761ae5f commit 99b8be414cbcb4577859985ef80eb053d761ae5f Author: Christos Margiolis AuthorDate: 2025-05-29 10:24:17 +0000 Commit: Christos Margiolis CommitDate: 2025-05-29 22:51:30 +0000 sound: Terminate stream properly when closing vchans When a channel is closed, dsp_close() either calls vchan_destroy() on vchans, or chn_abort()/chn_flush() on primary channels. However, the problem with this is that, when closing a vchan, we end up not terminating the stream properly. The call sequence we are interested in is the following: vchan_destroy(vchan) -> chn_kill(vchan) -> chn_trigger(vchan) -> vchan_trigger(vchan) -> chn_notify(parent) Even though chn_notify() contains codepaths which call chn_abort(parent), apparently we do not execute any of those codepaths in this case, so the DMA remains unterminated, hence why we keep seeing the primary channel(s) being interrupted even once the application has exited: root@freebsd:~ # sndctl interrupts dsp0.play.0.interrupts=1139 dsp0.record.0.interrupts=0 root@freebsd:~ # sndctl interrupts dsp0.play.0.interrupts=1277 dsp0.record.0.interrupts=0 root@freebsd:~ # sndctl interrupts dsp0.play.0.interrupts=1394 dsp0.record.0.interrupts=0 The only applications that do not have this issue are those (e.g., mpv) that manually call ioctls which end up calling chn_abort(), like SNDCTL_DSP_HALT, to abort the channel(s) during shutdown. For all other applications that do not manually abort the channel(s), we can confirm that chn_abort()/chn_flush(), or even chn_trigger(PCMTRIG_ABORT) on the parent, doesn't happen during shutdown. root@freebsd:~ # dtrace -n 'fbt::chn_abort:entry,fbt::chn_flush:entry { printf("%s", args[0]->name); stack(); }' dtrace: description 'fbt::chn_abort:entry,fbt::chn_flush:entry ' matched 2 probes dtrace: buffer size lowered to 1m ^C [...] root@freebsd:~ # dtrace -n 'fbt::chn_trigger:entry /args[1] == -1/ { printf("%s", args[0]->name); stack(); }' dtrace: description 'fbt::chn_trigger:entry ' matched 1 probe dtrace: buffer size lowered to 1m CPU ID FUNCTION:NAME 0 68037 chn_trigger:entry dsp0.virtual_play.0 sound.ko`chn_kill+0x134 sound.ko`vchan_destroy+0x94 sound.ko`dsp_close+0x39b kernel`devfs_destroy_cdevpriv+0xab kernel`devfs_close_f+0x63 kernel`_fdrop+0x1a kernel`closef+0x1e3 kernel`closefp_impl+0x76 kernel`amd64_syscall+0x151 kernel`0xffffffff8103841b1 To fix this, modify dsp_close() to execute the primary channel case on both primary and virtual channels. While what we really care about are the chn_abort()/chn_flush() calls, it shouldn't hurt to call the rest of the functions on the vchans as well, to avoid complicating things; they get deleted right below, anyway. With the patch applied: root@freebsd:~ # dtrace -n 'fbt::chn_trigger:entry /args[1] == -1/ { printf("%s", args[0]->name); stack(); }' dtrace: description 'fbt::chn_trigger:entry ' matched 1 probe dtrace: buffer size lowered to 1m CPU ID FUNCTION:NAME 1 68037 chn_trigger:entry dsp0.virtual_play.0 sound.ko`chn_flush+0x2a sound.ko`dsp_close+0x330 kernel`devfs_destroy_cdevpriv+0xab kernel`devfs_close_f+0x63 kernel`_fdrop+0x1a kernel`closef+0x1e3 kernel`closefp_impl+0x76 kernel`amd64_syscall+0x151 kernel`0xffffffff8103841b 0 68037 chn_trigger:entry dsp0.play.0 sound.ko`chn_notify+0x4ce sound.ko`vchan_trigger+0x105 sound.ko`chn_trigger+0xb4 sound.ko`chn_flush+0x2a sound.ko`dsp_close+0x330 kernel`devfs_destroy_cdevpriv+0xab kernel`devfs_close_f+0x63 kernel`_fdrop+0x1a kernel`closef+0x1e3 kernel`closefp_impl+0x76 kernel`amd64_syscall+0x151 kernel`0xffffffff8103841b Above we can see a chn_trigger(PCMTRIG_ABORT) on the parent (dsp0.play.0), which is coming from the chn_abort() (inlined) in chn_notify(): root@freebsd:~ # dtrace -n 'kinst::chn_abort:entry { stack(); }' dtrace: description 'kinst::chn_abort:entry ' matched 5 probes dtrace: buffer size lowered to 1m CPU ID FUNCTION:NAME 1 72580 chn_notify:1192 sound.ko`0xffffffff8296cab4 sound.ko`vchan_trigger+0x105 sound.ko`chn_trigger+0xb4 sound.ko`chn_flush+0x2a sound.ko`dsp_close+0x330 kernel`devfs_destroy_cdevpriv+0xab kernel`devfs_close_f+0x63 kernel`_fdrop+0x1a kernel`closef+0x1e3 kernel`closefp_impl+0x76 kernel`amd64_syscall+0x151 kernel`0xffffffff8103841b We can also confirm the primary channel(s) are not interrupted anymore: root@freebsd:/mnt/src # sndctl interrupts dsp0.play.0.interrupts=0 dsp0.record.0.interrupts=0 In collaboration with: adrian Tested by: adrian, christos, thj Sponsored by: The FreeBSD Foundation MFC after: 2 days Reviewed by: thj, adrian, emaste Differential Revision: https://reviews.freebsd.org/D50488 (cherry picked from commit f6430bc61df78be070209d52b4452ae9cf4cd015) (cherry picked from commit 0c6aa445ec0c85e7c9653d20562907742569de6f) Approved by: re (cperciva) --- sys/dev/sound/pcm/dsp.c | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/sys/dev/sound/pcm/dsp.c b/sys/dev/sound/pcm/dsp.c index c5caeea8a002..8ee3d1d3f2a8 100644 --- a/sys/dev/sound/pcm/dsp.c +++ b/sys/dev/sound/pcm/dsp.c @@ -290,19 +290,25 @@ dsp_close(void *data) if (sg_ids != 0) free_unr(pcmsg_unrhdr, sg_ids); + /* + * Go through the channel abort/flush path for both + * primary and virtual channels to ensure that, in the + * case of vchans, the stream is always properly + * stopped, and the primary channels do not keep being + * interrupted even if all vchans are gone. + */ + CHN_LOCK(rdch); + chn_abort(rdch); /* won't sleep */ + rdch->flags &= ~(CHN_F_RUNNING | CHN_F_MMAP | + CHN_F_DEAD | CHN_F_EXCLUSIVE); + chn_reset(rdch, 0, 0); + chn_release(rdch); if (rdch->flags & CHN_F_VIRTUAL) { parent = rdch->parentchannel; CHN_LOCK(parent); CHN_LOCK(rdch); vchan_destroy(rdch); CHN_UNLOCK(parent); - } else { - CHN_LOCK(rdch); - chn_abort(rdch); /* won't sleep */ - rdch->flags &= ~(CHN_F_RUNNING | CHN_F_MMAP | - CHN_F_DEAD | CHN_F_EXCLUSIVE); - chn_reset(rdch, 0, 0); - chn_release(rdch); } } if (wrch != NULL) { @@ -315,19 +321,18 @@ dsp_close(void *data) if (sg_ids != 0) free_unr(pcmsg_unrhdr, sg_ids); + CHN_LOCK(wrch); + chn_flush(wrch); /* may sleep */ + wrch->flags &= ~(CHN_F_RUNNING | CHN_F_MMAP | + CHN_F_DEAD | CHN_F_EXCLUSIVE); + chn_reset(wrch, 0, 0); + chn_release(wrch); if (wrch->flags & CHN_F_VIRTUAL) { parent = wrch->parentchannel; CHN_LOCK(parent); CHN_LOCK(wrch); vchan_destroy(wrch); CHN_UNLOCK(parent); - } else { - CHN_LOCK(wrch); - chn_flush(wrch); /* may sleep */ - wrch->flags &= ~(CHN_F_RUNNING | CHN_F_MMAP | - CHN_F_DEAD | CHN_F_EXCLUSIVE); - chn_reset(wrch, 0, 0); - chn_release(wrch); } } PCM_LOCK(d); From nobody Thu May 29 23:44:46 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b7jdp5yqhz5xfZV; Thu, 29 May 2025 23:44: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b7jdp4VMGz3NPr; Thu, 29 May 2025 23:44:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748562286; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=k6s7kE2InUUCowNhswA46HUzCf8meSjAKHOCfLi5i5w=; b=SjAXB83wHGsfiOEXWkX25z1IGull2Qjuu2tmUucMJLBkjffj/BoOyA4afTXLqea1rblgA9 HyO+6BcU+RNNb8ZZu1oDvn2GOTLCBxqbxUs3ldPS2/oUEAQzxvLa2km9XZxS6zYDF5XEme 6C/lRkFSY1KoXpSBt2goSLcRQpPviMZXBGMP+JjjfZCosxpUtXrdZEa5u6Gm4hgiyR6PkH FE0xHV1JCMUKJRB7F6IvGVQnfLCrDQBFH6aqpI9mL//jx2SQOSgRB04iLc3o9DXBqXoJ5D 4POyG1T8VU8g0u/xcyUuifY5ZXoT02Cz40GYRubrgCAaSK/PHKWf7IFEt9sYPA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748562286; a=rsa-sha256; cv=none; b=us4DJj2aKZh/XJnjBAURT5qWv2FbI1yDpoMMM4Fi3CI3BBbhTvgg+qYabiHBBh70vk+SpF GBxH8tXlLu6hHZ0AuzPn55AOwkk0HKvoXd5p+EAmGpBvkAt/3y8rZMH380FaOU280isu8w LZpnhiX+ZqcLg/4BpMJaqY80GVKqzDN1VM8M7dGrR5p6jqWcwMJGGv9JAoA0iVhK6uA75M ajf/CU8E+5oNxabq52KhJCCbY/AgNnJWvHRZywK7TJ9ZsQia7M/z622b6TMl12HlUP02oI KY1+e471ZoSiTSEruoj13cVO47gqnVlAfR9sS6erHRdSbjDHXrQw9HNOzd1pLQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748562286; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=k6s7kE2InUUCowNhswA46HUzCf8meSjAKHOCfLi5i5w=; b=a8L30WF2KcHDQrNP+J9wX22NP3RgsMOnE9URNKXZRZ558eIJG5bfSbzf8YxQDModvqYVNn j3xKsM2SLPA8kLpMu8k3euwCMUu7A6Xsm5ZrDEAllGWQr1yg6iWW/rUo8SJN5Zl0XSTHYb +3j0ztlOOJRb9Bz0rvpCQt2zv6Go8Ic4lUMau+Zo8DHOd/stubZe+S0L2EKMw6U5GVGTHa /OHPhHgIvIjnaCukjWbHYFsBuQM1n/grz7eyEsslDElZ196vhK64aCb7UqjlXBQeuexuch ewHPsyDQMw8dfg2CTHoWCw/D7eghDdNQa3w26AxLTllGFOvgZv4gnmVdvRNQHA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b7jdp3cQjzCls; Thu, 29 May 2025 23:44: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 54TNikJE061998; Thu, 29 May 2025 23:44:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54TNikhe061995; Thu, 29 May 2025 23:44:46 GMT (envelope-from git) Date: Thu, 29 May 2025 23:44:46 GMT Message-Id: <202505292344.54TNikhe061995@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: 955ab1a8f21e - main - pkg/FreeBSD.conf: Fix comments to reflect -kmods List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 955ab1a8f21ec1a662a87fc5e76e6d5690e09085 Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=955ab1a8f21ec1a662a87fc5e76e6d5690e09085 commit 955ab1a8f21ec1a662a87fc5e76e6d5690e09085 Author: Colin Percival AuthorDate: 2025-05-29 23:40:30 +0000 Commit: Colin Percival CommitDate: 2025-05-29 23:43:46 +0000 pkg/FreeBSD.conf: Fix comments to reflect -kmods Now that this file lists two repositories, the text "to disable *this* repository" no longer makes sense. Also, expand the example to list how to disable both FreeBSD and FreeBSD-kmods repositories. Reported by: Graham Perrin MFC after: 3 days --- usr.sbin/pkg/FreeBSD.conf.latest | 5 +++-- usr.sbin/pkg/FreeBSD.conf.quarterly | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/usr.sbin/pkg/FreeBSD.conf.latest b/usr.sbin/pkg/FreeBSD.conf.latest index b7b528bc3756..2175a3387437 100644 --- a/usr.sbin/pkg/FreeBSD.conf.latest +++ b/usr.sbin/pkg/FreeBSD.conf.latest @@ -1,9 +1,10 @@ # -# To disable this repository, instead of modifying or removing this file, -# create a /usr/local/etc/pkg/repos/FreeBSD.conf file: +# To disable a repository, instead of modifying or removing this file, +# create a /usr/local/etc/pkg/repos/FreeBSD.conf file, e.g.: # # mkdir -p /usr/local/etc/pkg/repos # echo "FreeBSD: { enabled: no }" > /usr/local/etc/pkg/repos/FreeBSD.conf +# echo "FreeBSD-kmods: { enabled: no }" >> /usr/local/etc/pkg/repos/FreeBSD.conf # FreeBSD: { diff --git a/usr.sbin/pkg/FreeBSD.conf.quarterly b/usr.sbin/pkg/FreeBSD.conf.quarterly index 2050350baa1f..bd0ee13b9b43 100644 --- a/usr.sbin/pkg/FreeBSD.conf.quarterly +++ b/usr.sbin/pkg/FreeBSD.conf.quarterly @@ -1,9 +1,10 @@ # -# To disable this repository, instead of modifying or removing this file, -# create a /usr/local/etc/pkg/repos/FreeBSD.conf file: +# To disable a repository, instead of modifying or removing this file, +# create a /usr/local/etc/pkg/repos/FreeBSD.conf file, e.g.: # # mkdir -p /usr/local/etc/pkg/repos # echo "FreeBSD: { enabled: no }" > /usr/local/etc/pkg/repos/FreeBSD.conf +# echo "FreeBSD-kmods: { enabled: no }" >> /usr/local/etc/pkg/repos/FreeBSD.conf # FreeBSD: { From nobody Fri May 30 00:00:18 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b7jzl0gvMz5xgHB; Fri, 30 May 2025 00:00: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b7jzk5vskz3cMP; Fri, 30 May 2025 00:00:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748563218; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=leM3EyvKMvtvnyrzzuwQTurv5ZxWjKBw5SxQGWWulks=; b=kL57R+bY/ZEcIWW6C70+O67bYYH1lT2KaK7Z5n+cl3PAjRM3MKtYoCvfyoUmqJyc3fdW/z 5P5z1FIgdLVtf2b8b1mON2LDOccTvtjm5o7p2EHgGrUK/5/dPoxBZcOwgonm/KEksqtfbJ O12cYiW4axbuy9ss3+OFg0H1jy1GzHdQWVyLSg6zSUI3CLbUcV/EqTjSpFWtLkhyWMgLNw 00ZEY+hSFJNj97tiOI5Mbw2vCz6Q2g3fWUwi3QhfzdMl+kWJEUpUFwETUbbgdIol1SbF2W 3dMF+AYC91SaIniniaXTriKXKW0HVfRmzneOa6fe8r4zBKzUe9KIF/JLw+ht7g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748563218; a=rsa-sha256; cv=none; b=vcZa5wF22HH9rqsg3LgSU6TJlpjBiSGj5P7lKalw/CVdxpuSnw2myAbssG1UL1PfRd+frP qnPfxq2hQS8TAcA9JMnA0hLNRAsck09bYSQr+qATV5BBpaObyHaYuNTC9t2k/H8duFeWnk tYLAj1VqtBCOIcpjwMIcIYcu654CHEPqgGD+8SievEo69gX+1/akywFC+u3HhNFdjwuq/L UPpE7hqPmPo6DzsbmejCjDe1ai2zq6jWaloqwxcVxTV09zIffIHyr/KQHgmmudW2u/Qdm+ Hfp6z7na+3xIFZDxgJfhGu62n1wLNb1zcuylXaYiAs5JWYSuR1aGcNjhWNzNBA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748563218; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=leM3EyvKMvtvnyrzzuwQTurv5ZxWjKBw5SxQGWWulks=; b=vSZXafSewr8JgXo/VMQUVya5LXt7VnpCwHhGVam1uQ93x4HLKRBShpRXau7XOC9Ituf8x7 HpjA0KtIh1kLx98OSv2cWmI6XAVOw9IdVCsI0PF6GJUW+eVj1t47TgIRNTEE+Sxva+IbIV YmoTr7vekiLNmtPhqN57SOhiXauHl2SJYAVFLcwtg1l1IJTmhDlP1txSpx3E/sFUs2FyVm y2PMihC2zZDqCEnVKJcAS9BhNdC7bQOtQHyCJ/UL1jFDY8SlcRtrMexLo5kgNhIKtNqsJc 5znONHBKaBlrgOYv1H+wD8f3mj9sqfTKeW9orxRvpj5y9pVC/YWT5BOfaxJEmg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b7jzk5PyJzCyR; Fri, 30 May 2025 00:00: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 54U00IMt091751; Fri, 30 May 2025 00:00:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54U00IiE091748; Fri, 30 May 2025 00:00:18 GMT (envelope-from git) Date: Fri, 30 May 2025 00:00:18 GMT Message-Id: <202505300000.54U00IiE091748@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 3383279318c0 - releng/14.3 - 14.3: Update to RC1 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.3 X-Git-Reftype: branch X-Git-Commit: 3383279318c0564d405c64516cdd127bc2a0dd9f Auto-Submitted: auto-generated The branch releng/14.3 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=3383279318c0564d405c64516cdd127bc2a0dd9f commit 3383279318c0564d405c64516cdd127bc2a0dd9f Author: Colin Percival AuthorDate: 2025-05-30 00:00:00 +0000 Commit: Colin Percival CommitDate: 2025-05-29 22:54:06 +0000 14.3: Update to RC1 Approved by: re (implicit) Sponsored by: Amazon --- sys/conf/newvers.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index 8c988150f902..1ebacc6cc176 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -53,7 +53,7 @@ TYPE="FreeBSD" REVISION="14.3" -BRANCH="BETA4" +BRANCH="RC1" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi From nobody Fri May 30 07:56:54 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b7wYf2FdQz5xDnH for ; Fri, 30 May 2025 07:56: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b7wYf1bd3z3sn0; Fri, 30 May 2025 07:56:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748591814; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jIHNbP5XWlTPU7bUSf/jVpYepPOEdsdROoayNZDazqo=; b=GG/BkmgGDkigHBIfH/hEkbarGV/XmdEGjZtoLOVQMZbY/itEzyqXnnOz+NBJ7K4/Y68hKT CCZBMGlNQQTmoaJH6I0vn1rsYoXLDgQgnFHyBq7OcbvAowSVZvhr52DGdbCi19Gp5sswCY 6j/xickepvyd8tFuCASyeCsGOyrcdFHoZq3wO/OsA3UOq5IHCuOmsSra9C7LSXO6YKJpDy XQsR3M/yzEoDe2u53GKoCkoQNDK0a1iq2DB7VsVN92lM7ns1i2yOWhx6NeJvBMxf8Ojx1g uvK9Q3rnGl2fOjJma+SrzhJ/q9C4umuVY3pYO6Jy3FYgb5ZTLyrz4awr3GQ1NA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748591814; a=rsa-sha256; cv=none; b=yQvhezE8I+BlsLmNUzv4PRw+gRryxQPSC+uMu79Fmnf6k870Oh4pk+jyvfzxTTdNGNznEm E/rOKxgCWZlQv67xyikqXKN2ny/wmtECaRwc2AifUnI7JCCx39PZC4GM3etsrEfeBWPckU x6Kgp0bFRMpI4IZ/uHuNu3Xtwpq1dxP+F9kK6NDbEE3LhYeukhOW1UDd+BR3x6e9Vu0cLw oLyYG8rwDf3cmiMBTWmOPLk7SE75FXnb4ZIRA6XAgXs0+D6U/FcpSY30AgDRdB48BiVV14 TTZ7mwbodz3cg5kiz/hdyOXsHIekPJqgFPI68bVmXsxj5zhwOc23WKdw7co2Mg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748591814; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jIHNbP5XWlTPU7bUSf/jVpYepPOEdsdROoayNZDazqo=; b=EkuohB2T+G+BMXWGA/86QrN8NDW2Z0JEqDsnSa29ougyfKZGK6Cx5upkU6OswZ9Mzh/q5z 9mi+jVlC6NDv/j62toTZ9zlHGJ5a4unQ7IPsHguKJ5aW38e+yKMUnQwB9Ri2Gn8ILw3I42 fcTytg/fiu2LvCNzJP65oK3T4hqA30aNLqNKXiugxI0KuAiKymB4Hw3/e7y3I+d5xP3znd h9c0m5hbQbiOO3LjWqvbYR+cyX5puBff5fRScgLSCMWNUgbNptZHcbU6g7eTGhW3UQ97Ff UdNZDj7QYrBk7l8qJC20qQNYXE6bGX+kBZhto046dTcOHldIwSQQp5Gcab+YdQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b7wYf14XyzkvP; Fri, 30 May 2025 07:56: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 54U7usEd080952; Fri, 30 May 2025 07:56:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54U7usxx080951; Fri, 30 May 2025 07:56:54 GMT (envelope-from git) Date: Fri, 30 May 2025 07:56:54 GMT Message-Id: <202505300756.54U7usxx080951@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Martin Matuska Subject: git: 246e5883bb5b..3084336ae4a4 - vendor/openzfs/master - vendor branch updated List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/vendor/openzfs/master X-Git-Reftype: branch X-Git-Commit: 3084336ae4a4e114e41be3177a3f5c779d66e93c X-Git-Oldrev: 246e5883bb5b8e09b1a4213f7b1704b5a9ed5568 X-Git-Newrev: 3084336ae4a4e114e41be3177a3f5c779d66e93c Auto-Submitted: auto-generated The branch vendor/openzfs/master has been updated by mm: URL: https://cgit.FreeBSD.org/src/log/?id=246e5883bb5b..3084336ae4a4 c5a6b4417d64 zfs_valstr: update zio_flag strings for ZIO_FLAG_PREALLOCATED b1ccab17213b ARC: Avoid overflows in arc_evict_adj() (#17255) 78628a5c15f2 FreeBSD: Use new SYSCTL_SIZEOF() 4800181b3b95 ioctl: remove FICLONE/FICLONERANGE/FIDEDUPERANGE compat f13d760aa8c0 Delete dead code: dbuf_loan_arcbuf 1a8f5ad3b0ff zvol: Enable zvol threading functionality on FreeBSD c17bdc49142d More aggressively assert that db_mtx protects db.db_data 2ee5b51a57cb linux/uio: remove "skip" offset for UIO_ITER 8b9c4e643b69 spa: clear checkpoint information during retry 9aae14a14a66 test-runner: rework output dir construction 49fbdd453345 Introduce zfs rewrite subcommand (#17246) b2284aedab33 metaslab_alloc: make hint BP and DVA const (#17324) 8e318fda80e8 update_authors: consider Signed-off-by trailers for committer idents ae2caf9cb0e0 update_authors: output possible mailmap additions 485a2d0112f9 AUTHORS/mailmap: update with new contributors e2ba0f764376 vdev_id: symlinks creation for multipath disk partitions (#17331) 734eba251d09 Wire O_DIRECT also to Uncached I/O (#17218) b55256e5bbfb runners: Add option to install custom kernel on Fedora 0aa83dce99e4 Linux: Stop using NR_FILE_PAGES for ARC scaling 89a8a91582fa ARC: Notify dbuf cache about target size reduction b6916f995ed2 ARC: parallel eviction 086105f4c4e6 Cause zpool scan resume commands to get logged in history d5616ad34a2f Increase meta-dnode redundancy in "some" mode e55225be3e2a Add explicit DMU_DIRECTIO checks ea74cdedda8b Fix 2 bugs in non-raw send with encryption d8a33bc0a5d3 icp: Use explicit_memset() exclusively in gcm_clear_ctx() bb740d66de2b Linux 6.15: mkdir now returns struct dentry * 841be1d04952 Linux 6.2/6.15: del_timer_sync() renamed to timer_delete_sync() f0baaa329ab2 arcstat: prevent ZeroDivisionError when L2ARC becomes empty 83fa80a5500e dmu_objset_hold_flags() should call dsl_dataset_rele_flags() on error 2e5e4bb0f803 Add Quality Assurance to pull request template f454cc172355 libzfs: ensure all ioctl calls go through lzc_ioctl_fd() c4c3917b2a83 lzc: move lzc_ioctl_fd() into lzc proper a387b7599ce8 lzc_ioctl_fd: add ZFS_IOC_TRACE envvar to enable ioctl tracing a6f20250de7f Update 69-vdev.rules.in 5c30b2438164 Fix null dereference in spa_vdev_remove_cancel_sync() ddf28f27c564 Fix off-by-one bug in range tree code cdb4c4468478 Reformat cli help and man page to be in sync 92157c840c37 Refactor man page and CLI help output per mandoc b01d7bd32d6e ZTS: testing for leaked key mappings in encrypted non-raw send 9d76950d6784 ZIL: Improve write log size accounting b048bfa9c156 Allow opt-in of zvol blocks in special class 2a91d577b1dc Expose dataset encryption status via fast stat path 284580c8780e dmu_traverse: remove 'ignore_hole_birth' tunable alias fc617645a344 vdev_disk: remove zfs_vdev_scheduler option 087d7d80c7c8 ZVOL: Comment platform-specific empty functions bodies on FreeBSD side 06fa8f3f6924 zfs_cmd: reorganise zfs_cmd_t to match original size 8487945034bf zcp: get_prop: fix encryptionroot and encryption 468d22d60ced txg_wait_synced_flags: add TXG_WAIT_SUSPEND flag to not wait if pool suspended ac2e5795215d dmu_tx: make DMU_TX_* flags an enum 4653e2f7d3b0 dmu_tx: break tx assign/wait when pool suspends 55d035e866b1 dmu_tx_assign: make all VERIFY0 calls use DMU_TX_SUSPEND 2303775feabf ZTS: test dmu_tx response when pool suspends 0372def8c9b0 vdev_geom: converted injected EIO errors to ENXIO c464f1d01402 Only interrupt active disk I/Os in failmode=continue 906ced88df21 Linux 6.15 compat: META 5ef91c2bee49 zfs_log: make zfs_immediate_write_sz uint d1724b59dc52 tunables: don't assert initialisation in impl getters b0e053a10dc8 tunables: ensure tunable and variable have same define gate 7b183f1918f5 tunables: remove FreeBSD compat macros for Linux module params 58235f52af1b tunables: remove direct use of module_param_cb 6e7e7ea7ef06 tunables: remove support for s64 tunables 589d99171f52 tunables: use Linux ullong param ops for u64 dd4e2f99f0c7 tunables: remove unused param get/set aliases 9392be427e58 tunables: remove __check_old_set_param workaround 00360efa35a4 tunables: fix spelling fa697b94e65c FreeBSD: Add posix_fadvise(POSIX_FADV_WILLNEED) support 3dfa98d01358 ZVOL: Make zvol_inhibit_dev module parameter platform-independent 3084336ae4a4 Linux build: always use objtool From nobody Fri May 30 09:34:18 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b7yk32WH8z5xLG5; Fri, 30 May 2025 09:34: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b7yk32DS5z3cDJ; Fri, 30 May 2025 09:34:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748597659; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cnBT/MwH88kjDsNgYOeUgGrYMNSYc5BbIqDbEcNJuIc=; b=uGG0dLLgjh8mMK+qEud29Es+eG9X21xZzHUNnaxrQ1I6Lszi8Be6Zv3rbMM9kvH/sDRoF0 Fs5yfOOrR+tMZ5OqqktFyinWsO0SgUZIK0YUTusD7hpiHd11J7vdLmpzg258hWlaFA9oru SH+Mz+qVs2YX9GLkw9prGbBliHRxARVJMGINfDuK8iV1htMbYwIvIK9RdxVMryXo2PTiyC hXnL3pSHAjbKW2fIy3wjf4bP8Wwhfqntobuww8++cLylNDFMW5ipKkzixL/+Q17Kqu0OTm Ajx9BuX5eeluku0zbS1hDgix/y+IHPpW+0ytr1FhJ8z4L4XLx8Mndd2gg3wGbg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748597659; a=rsa-sha256; cv=none; b=g6obFb+jJw8m1ym1pCMZgtmCnJMYn8XknOHosRYXVud0i1RFQZwsO69Z8W7ut8ACEcphpB fMamsQqTdy9qYUONExaD6JIW9QLzvENvI0kF9HhOYBLSdK5YJQseTwOzz8duszG1goiB+l od2A4YRT6gBtik1eAFG9IAcBgxfql9P0MdkowoHyY7qFXKOudk13p5QmrFMPu5mw/F201Z YnDRmq4QlGZbLOvK57+6QXdJzy+pIvYsY8lI1Ks8P8lCZiCTrpO0Rdg/dznZWcBAmmtgta 6rJRw0CMItpMEVPQmshLs2Y4UuSdEA/N9QgXedExHwc92JTNCBS/Gtxdp8cDnQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748597659; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cnBT/MwH88kjDsNgYOeUgGrYMNSYc5BbIqDbEcNJuIc=; b=QLLDzPt8q77jgfXL9I7t2pW1S7gs4uPr+U0C3uR73/jYP/XTVicauRxOyPRICDujk2CFG4 om1vvxPy8VHoGn3QnUf4+x5vgz5gl01XgS2UL8dBZLO9jAAV12BloVbQWK0Yr00teKdRel cJ1/LG/JCJ6Y5m6A+0SIp9ptwoyW+/Ea4hyG3ZsBCArEWj06TuFkS7CRNF8hZef1ODKMJL sMwNcTIOReoLQfEnpk4TgKg1J6q/HYERWCUvTbeaAmngNL/+ABqQJDOd+padmx4tVYWeOZ 0oJc33bd8/oKob+gKkGAAjN43ujQ9cJfC+ayoUeVL7Fn9TZEIqpfcryMc0jHDg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b7yk31f9XznDc; Fri, 30 May 2025 09:34: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 54U9YJSB066717; Fri, 30 May 2025 09:34:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54U9YIht066712; Fri, 30 May 2025 09:34:18 GMT (envelope-from git) Date: Fri, 30 May 2025 09:34:18 GMT Message-Id: <202505300934.54U9YIht066712@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Martin Matuska Subject: git: b1c1ee4429fc - main - zfs: merge openzfs/zfs@3084336ae List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b1c1ee4429fcca8f69873a8be66184e68e1b19d7 Auto-Submitted: auto-generated The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=b1c1ee4429fcca8f69873a8be66184e68e1b19d7 commit b1c1ee4429fcca8f69873a8be66184e68e1b19d7 Merge: 955ab1a8f21e 3084336ae4a4 Author: Martin Matuska AuthorDate: 2025-05-30 07:59:22 +0000 Commit: Martin Matuska CommitDate: 2025-05-30 09:17:41 +0000 zfs: merge openzfs/zfs@3084336ae Notable upstream pull request merges: #14876 b048bfa9c Allow opt-in of zvol blocks in special class #16486 b6916f995 ARC: parallel eviction #17169 1a8f5ad3b zvol: Enable zvol threading functionality on FreeBSD #17209 c17bdc491 More aggressively assert that db_mtx protects db.db_data #17218 734eba251 Wire O_DIRECT also to Uncached I/O #17246 49fbdd453 Introduce zfs rewrite subcommand #17255 b1ccab172 ARC: Avoid overflows in arc_evict_adj() #17280 848794503 zcp: get_prop: fix encryptionroot and encryption #17301 086105f4c Cause zpool scan resume commands to get logged in history #17306 246e5883b zfs_valstr: update zio_flag strings for ZIO_FLAG_PREALLOCATED #17309 78628a5c1 FreeBSD: Use new SYSCTL_SIZEOF() #17314 89a8a9158 ARC: Notify dbuf cache about target size reduction #17319 8b9c4e643 spa: clear checkpoint information during retry #17339 d5616ad34 Increase meta-dnode redundancy in "some" mode #17340 ea74cdedd Fix 2 bugs in non-raw send with encryption #17342 e55225be3 Add explicit DMU_DIRECTIO checks #17343 d8a33bc0a icp: Use explicit_memset() exclusively in gcm_clear_ctx() #17344 -multiple libzfs_core: add ZFS_IOC_TRACE envvar to enable ioctl tracing #17348 f0baaa329 arcstat: prevent ZeroDivisionError when L2ARC becomes empty #17353 83fa80a55 dmu_objset_hold_flags() should call dsl_dataset_rele_flags() on error #17355 -multiple Allow txg_wait_synced_flags() and dmu_tx_assign() to return when the pool suspends #17361 5c30b2438 Fix null dereference in spa_vdev_remove_cancel_sync() #17363 ddf28f27c Fix off-by-one bug in range tree code #17367 06fa8f3f6 zfs_cmd: reorganise zfs_cmd_t to match original size #17368 2a91d577b Expose dataset encryption status via fast stat path #17372 c464f1d01 Only interrupt active disk I/Os in failmode=continue #17373 9d76950d6 ZIL: Improve write log size accounting #17377 -multiple tunables: general code cleanup #17379 fa697b94e FreeBSD: Add posix_fadvise(POSIX_FADV_WILLNEED) support #17384 3dfa98d01 ZVOL: Make zvol_inhibit_dev module parameter platform-independent Obtained from: OpenZFS OpenZFS commit: 3084336ae4a4e114e41be3177a3f5c779d66e93c cddl/lib/libzfs_core/Makefile | 1 + cddl/sbin/zfs/Makefile | 1 + .../openzfs/.github/PULL_REQUEST_TEMPLATE.md | 1 + .../.github/workflows/scripts/qemu-3-deps-vm.sh | 26 +++ .../.github/workflows/scripts/qemu-3-deps.sh | 15 +- sys/contrib/openzfs/.github/workflows/zfs-qemu.yml | 17 +- sys/contrib/openzfs/.mailmap | 8 +- sys/contrib/openzfs/AUTHORS | 10 +- sys/contrib/openzfs/META | 2 +- sys/contrib/openzfs/cmd/arcstat.in | 13 +- sys/contrib/openzfs/cmd/zfs/zfs_main.c | 204 ++++++++++++++++- sys/contrib/openzfs/cmd/zpool/zpool_main.c | 32 +-- sys/contrib/openzfs/cmd/ztest.c | 24 +- sys/contrib/openzfs/config/kernel-mkdir.m4 | 57 +++-- sys/contrib/openzfs/config/kernel-timer.m4 | 32 +++ sys/contrib/openzfs/config/kernel.m4 | 2 + .../contrib/debian/openzfs-zfsutils.install | 1 + sys/contrib/openzfs/include/libzfs.h | 1 + .../openzfs/include/os/freebsd/spl/sys/ccompile.h | 5 +- .../include/os/linux/kernel/linux/mod_compat.h | 65 ++---- .../include/os/linux/kernel/linux/page_compat.h | 4 +- sys/contrib/openzfs/include/os/linux/spl/sys/uio.h | 4 +- sys/contrib/openzfs/include/os/linux/zfs/sys/zpl.h | 35 --- sys/contrib/openzfs/include/sys/dbuf.h | 27 +-- sys/contrib/openzfs/include/sys/dmu.h | 106 ++++++--- sys/contrib/openzfs/include/sys/dmu_impl.h | 10 +- sys/contrib/openzfs/include/sys/dmu_tx.h | 6 +- sys/contrib/openzfs/include/sys/dmu_zfetch.h | 5 +- sys/contrib/openzfs/include/sys/fs/zfs.h | 9 + sys/contrib/openzfs/include/sys/metaslab.h | 6 +- sys/contrib/openzfs/include/sys/spa.h | 4 +- sys/contrib/openzfs/include/sys/txg.h | 9 + sys/contrib/openzfs/include/sys/zfs_ioctl.h | 34 ++- sys/contrib/openzfs/include/sys/zfs_racct.h | 6 +- sys/contrib/openzfs/include/sys/zfs_vnops.h | 1 + sys/contrib/openzfs/include/sys/zvol_impl.h | 32 +++ sys/contrib/openzfs/lib/libzfs/libzfs.abi | 134 ++++++----- sys/contrib/openzfs/lib/libzfs/libzfs_crypto.c | 11 + sys/contrib/openzfs/lib/libzfs/libzfs_dataset.c | 2 +- sys/contrib/openzfs/lib/libzfs/libzfs_pool.c | 5 + sys/contrib/openzfs/lib/libzfs/libzfs_util.c | 6 + .../openzfs/lib/libzfs/os/freebsd/libzfs_compat.c | 6 - .../openzfs/lib/libzfs/os/linux/libzfs_util_os.c | 6 - sys/contrib/openzfs/lib/libzfs_core/Makefile.am | 7 +- .../openzfs/lib/libzfs_core/libzfs_core.abi | 94 +++++--- sys/contrib/openzfs/lib/libzfs_core/libzfs_core.c | 44 ++++ .../openzfs/lib/libzfs_core/libzfs_core_impl.h | 36 +++ .../lib/libzfs_core/os/freebsd/libzfs_core_ioctl.c | 3 +- .../lib/libzfs_core/os/linux/libzfs_core_ioctl.c | 3 +- sys/contrib/openzfs/lib/libzpool/zfs_racct.c | 4 +- sys/contrib/openzfs/man/Makefile.am | 1 + sys/contrib/openzfs/man/man4/zfs.4 | 59 +++-- sys/contrib/openzfs/man/man7/zfsprops.7 | 7 +- sys/contrib/openzfs/man/man7/zpoolconcepts.7 | 5 +- sys/contrib/openzfs/man/man8/zfs-rewrite.8 | 76 +++++++ sys/contrib/openzfs/man/man8/zfs.8 | 8 +- sys/contrib/openzfs/man/man8/zpool-status.8 | 80 +++---- sys/contrib/openzfs/module/Kbuild.in | 13 -- sys/contrib/openzfs/module/icp/algs/aes/aes_impl.c | 2 - sys/contrib/openzfs/module/icp/algs/modes/gcm.c | 2 - sys/contrib/openzfs/module/icp/algs/modes/modes.c | 4 +- sys/contrib/openzfs/module/os/freebsd/zfs/dmu_os.c | 15 +- .../openzfs/module/os/freebsd/zfs/vdev_geom.c | 11 +- .../openzfs/module/os/freebsd/zfs/zfs_racct.c | 4 +- .../openzfs/module/os/freebsd/zfs/zfs_vnops_os.c | 87 +++++++- .../openzfs/module/os/freebsd/zfs/zio_crypt.c | 6 - .../openzfs/module/os/freebsd/zfs/zvol_os.c | 193 ++++++++-------- .../openzfs/module/os/linux/spl/spl-generic.c | 23 -- .../openzfs/module/os/linux/spl/spl-taskq.c | 28 +-- .../openzfs/module/os/linux/zfs/vdev_disk.c | 25 +-- .../openzfs/module/os/linux/zfs/zfs_racct.c | 8 +- sys/contrib/openzfs/module/os/linux/zfs/zfs_uio.c | 11 +- .../openzfs/module/os/linux/zfs/zfs_vnops_os.c | 2 +- .../openzfs/module/os/linux/zfs/zpl_ctldir.c | 12 +- sys/contrib/openzfs/module/os/linux/zfs/zpl_file.c | 34 ++- .../openzfs/module/os/linux/zfs/zpl_file_range.c | 82 ------- .../openzfs/module/os/linux/zfs/zpl_inode.c | 21 +- sys/contrib/openzfs/module/os/linux/zfs/zvol_os.c | 152 +------------ sys/contrib/openzfs/module/zcommon/zfs_prop.c | 3 +- sys/contrib/openzfs/module/zcommon/zfs_valstr.c | 1 + sys/contrib/openzfs/module/zfs/arc.c | 245 +++++++++++++++++++-- sys/contrib/openzfs/module/zfs/dbuf.c | 169 +++++++------- sys/contrib/openzfs/module/zfs/ddt.c | 2 +- sys/contrib/openzfs/module/zfs/dmu.c | 212 +++++++++--------- sys/contrib/openzfs/module/zfs/dmu_direct.c | 14 +- sys/contrib/openzfs/module/zfs/dmu_objset.c | 11 +- sys/contrib/openzfs/module/zfs/dmu_recv.c | 21 +- sys/contrib/openzfs/module/zfs/dmu_redact.c | 2 +- sys/contrib/openzfs/module/zfs/dmu_send.c | 6 +- sys/contrib/openzfs/module/zfs/dmu_traverse.c | 16 +- sys/contrib/openzfs/module/zfs/dmu_tx.c | 111 ++++++++-- sys/contrib/openzfs/module/zfs/dmu_zfetch.c | 9 +- sys/contrib/openzfs/module/zfs/dnode.c | 4 +- sys/contrib/openzfs/module/zfs/dnode_sync.c | 1 + sys/contrib/openzfs/module/zfs/dsl_dataset.c | 3 + sys/contrib/openzfs/module/zfs/dsl_scan.c | 6 +- sys/contrib/openzfs/module/zfs/dsl_synctask.c | 2 +- sys/contrib/openzfs/module/zfs/fm.c | 3 +- sys/contrib/openzfs/module/zfs/metaslab.c | 10 +- sys/contrib/openzfs/module/zfs/range_tree.c | 2 +- sys/contrib/openzfs/module/zfs/sa.c | 4 +- sys/contrib/openzfs/module/zfs/spa.c | 3 +- sys/contrib/openzfs/module/zfs/spa_config.c | 2 + sys/contrib/openzfs/module/zfs/spa_misc.c | 6 +- sys/contrib/openzfs/module/zfs/spa_stats.c | 6 +- sys/contrib/openzfs/module/zfs/txg.c | 21 +- sys/contrib/openzfs/module/zfs/vdev_indirect.c | 2 +- sys/contrib/openzfs/module/zfs/vdev_initialize.c | 4 +- sys/contrib/openzfs/module/zfs/vdev_raidz.c | 3 +- sys/contrib/openzfs/module/zfs/vdev_raidz_math.c | 2 - sys/contrib/openzfs/module/zfs/vdev_rebuild.c | 6 +- sys/contrib/openzfs/module/zfs/vdev_removal.c | 10 +- sys/contrib/openzfs/module/zfs/vdev_trim.c | 4 +- sys/contrib/openzfs/module/zfs/zcp_get.c | 32 ++- sys/contrib/openzfs/module/zfs/zfs_log.c | 18 +- sys/contrib/openzfs/module/zfs/zfs_vnops.c | 238 +++++++++++++++++--- sys/contrib/openzfs/module/zfs/zil.c | 12 +- sys/contrib/openzfs/module/zfs/zio.c | 16 +- sys/contrib/openzfs/module/zfs/zvol.c | 129 ++++++++++- sys/contrib/openzfs/scripts/update_authors.pl | 104 +++++++-- sys/contrib/openzfs/tests/runfiles/common.run | 19 +- sys/contrib/openzfs/tests/runfiles/linux.run | 4 - sys/contrib/openzfs/tests/runfiles/sanity.run | 6 +- .../tests/test-runner/bin/test-runner.py.in | 47 ++-- .../openzfs/tests/zfs-tests/cmd/Makefile.am | 2 +- .../tests/zfs-tests/cmd/file/file_fadvise.c | 32 ++- .../openzfs/tests/zfs-tests/include/libtest.shlib | 18 +- .../openzfs/tests/zfs-tests/include/tunables.cfg | 4 +- .../openzfs/tests/zfs-tests/tests/Makefile.am | 13 +- .../functional/alloc_class/alloc_class_016_pos.ksh | 60 +++++ .../tests/functional/bclone/bclone_common.kshlib | 7 - .../bclone/bclone_crossfs_corner_cases.ksh | 1 - .../bclone/bclone_crossfs_corner_cases_limited.ksh | 1 - .../functional/bclone/bclone_crossfs_data.ksh | 1 - .../functional/bclone/bclone_crossfs_embedded.ksh | 1 - .../functional/bclone/bclone_crossfs_hole.ksh | 1 - .../functional/bclone/bclone_diffprops_all.ksh | 1 - .../bclone/bclone_diffprops_checksum.ksh | 1 - .../bclone/bclone_diffprops_compress.ksh | 1 - .../functional/bclone/bclone_diffprops_copies.ksh | 1 - .../bclone/bclone_diffprops_recordsize.ksh | 1 - .../tests/functional/bclone/bclone_prop_sync.ksh | 1 - .../bclone/bclone_samefs_corner_cases.ksh | 2 - .../bclone/bclone_samefs_corner_cases_limited.ksh | 2 - .../tests/functional/bclone/bclone_samefs_data.ksh | 2 - .../functional/bclone/bclone_samefs_embedded.ksh | 2 - .../tests/functional/bclone/bclone_samefs_hole.ksh | 2 - .../block_cloning_clone_mmap_cached.ksh | 4 - .../block_cloning_clone_mmap_write.ksh | 4 - .../block_cloning/block_cloning_copyfilerange.ksh | 4 - .../block_cloning_copyfilerange_fallback.ksh | 4 - ...ock_cloning_copyfilerange_fallback_same_txg.ksh | 4 - .../block_cloning_copyfilerange_partial.ksh | 4 - .../block_cloning_disabled_copyfilerange.ksh | 4 - .../block_cloning/block_cloning_large_offset.ksh | 4 - .../block_cloning_lwb_buffer_overflow.ksh | 4 - .../block_cloning/block_cloning_replay.ksh | 4 - .../block_cloning_replay_encrypted.ksh | 4 - .../channel_program/lua_core/tst.encryption.ksh | 43 ++++ .../channel_program/lua_core/tst.encryption.zcp | 23 ++ .../channel_program/lua_core/tst.exists.ksh | 9 +- .../functional/cli_root/zfs_rewrite/cleanup.ksh | 26 +++ .../functional/cli_root/zfs_rewrite/setup.ksh | 28 +++ .../cli_root/zfs_rewrite/zfs_rewrite.ksh | 104 +++++++++ .../tests/functional/cp_files/cp_files_002_pos.ksh | 1 - .../functional/direct/dio_unaligned_block.ksh | 9 + ...fadvise_sequential.ksh => fadvise_willneed.ksh} | 4 +- .../tests/functional/failmode/cleanup.ksh | 30 +++ .../failmode/failmode_dmu_tx_continue.ksh | 102 +++++++++ .../functional/failmode/failmode_dmu_tx_wait.ksh | 98 +++++++++ .../zfs-tests/tests/functional/failmode/setup.ksh | 28 +++ .../tests/functional/rsend/send_leak_keymaps.ksh | 82 +++++++ .../tests/functional/stat/statx_dioalign.ksh | 11 + .../tests/functional/zvol/zvol_common.shlib | 8 + .../zvol/zvol_misc/zvol_misc_volmode.ksh | 58 +++-- .../functional/zvol/zvol_stress/zvol_stress.ksh | 18 +- sys/contrib/openzfs/udev/rules.d/69-vdev.rules.in | 1 + sys/contrib/openzfs/udev/vdev_id | 42 +++- sys/modules/zfs/zfs_config.h | 14 +- sys/modules/zfs/zfs_gitrev.h | 2 +- 180 files changed, 3246 insertions(+), 1394 deletions(-) diff --cc cddl/lib/libzfs_core/Makefile index 8ce0a152852f,000000000000..bac81ca73497 mode 100644,000000..100644 --- a/cddl/lib/libzfs_core/Makefile +++ b/cddl/lib/libzfs_core/Makefile @@@ -1,32 -1,0 +1,33 @@@ +.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libzfs_core +.PATH: ${SRCTOP}/sys/contrib/openzfs/include +.PATH: ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/zfs +.PATH: ${SRCTOP}/sys/contrib/openzfs/module/os/freebsd/zfs + + +LIB= zfs_core +LIBADD= nvpair spl zutil +PACKAGE= libzfs + +INCS= libzfs_core.h +SRCS= libzfs_core.c \ + os/freebsd/libzfs_core_ioctl.c \ + zfs_ioctl_compat.c + +WARNS?= 2 +CSTD= c99 +CFLAGS+= -DIN_BASE +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include ++CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libzfs_core +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libzfs_core/common +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/ +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libzpool/include +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/zfs +CFLAGS+= -I${SRCTOP}/sys +CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/module/icp/include +CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h +CFLAGS+= -DHAVE_ISSETUGID +CFLAGS+= -include ${SRCTOP}/sys/modules/zfs/zfs_config.h + +.include diff --cc cddl/sbin/zfs/Makefile index b6ecfbe33ba3,000000000000..9a0a5198602e mode 100644,000000..100644 --- a/cddl/sbin/zfs/Makefile +++ b/cddl/sbin/zfs/Makefile @@@ -1,79 -1,0 +1,80 @@@ +ZFSTOP= ${SRCTOP}/sys/contrib/openzfs + +.PATH: ${ZFSTOP}/cmd/zfs +.PATH: ${ZFSTOP}/man/man7 +.PATH: ${ZFSTOP}/man/man8 +.PATH: ${ZFSTOP}/module/os/freebsd/spl + +PACKAGE= zfs +PROG= zfs +MAN= \ + zfs.8 \ + zfs-allow.8 \ + zfs-bookmark.8 \ + zfs-clone.8 \ + zfs-create.8 \ + zfs-destroy.8 \ + zfs-diff.8 \ + zfs-hold.8 \ + zfs-jail.8 \ + zfs-list.8 \ + zfs-load-key.8 \ + zfs-mount.8 \ + zfs-program.8 \ + zfs-project.8 \ + zfs-promote.8 \ + zfs-receive.8 \ + zfs-rename.8 \ ++ zfs-rewrite.8 \ + zfs-rollback.8 \ + zfs-send.8 \ + zfs-set.8 \ + zfs-share.8 \ + zfs-snapshot.8 \ + zfs-upgrade.8 \ + zfs-userspace.8 \ + zfs-wait.8 \ + zfsconcepts.7 \ + zfsprops.7 +MLINKS= \ + zfs-allow.8 zfs-unallow.8 \ + zfs-hold.8 zfs-release.8 \ + zfs-jail.8 zfs-unjail.8 \ + zfs-load-key.8 zfs-change-key.8 \ + zfs-load-key.8 zfs-unload-key.8 \ + zfs-mount.8 zfs-unmount.8 \ + zfs-receive.8 zfs-recv.8 \ + zfs-send.8 zfs-redact.8 \ + zfs-set.8 zfs-get.8 \ + zfs-set.8 zfs-inherit.8 \ + zfs-userspace.8 zfs-groupspace.8 \ + zfs-userspace.8 zfs-projectspace.8 +SRCS= \ + zfs_iter.c \ + zfs_iter.h \ + zfs_main.c \ + zfs_util.h \ + zfs_project.c \ + zfs_projectutil.h + +WARNS?= 2 + +CFLAGS+= \ + -DIN_BASE \ + -I${ZFSTOP}/include \ + -I${ZFSTOP}/include/os/freebsd \ + -I${ZFSTOP}/lib/libspl/include \ + -I${ZFSTOP}/lib/libspl/include/os/freebsd \ + -I${SRCTOP}/sys \ + -I${SRCTOP}/cddl/compat/opensolaris/include \ + -I${ZFSTOP}/module/icp/include \ + -include ${ZFSTOP}/include/os/freebsd/spl/sys/ccompile.h \ + -DHAVE_ISSETUGID \ + -include ${SRCTOP}/sys/modules/zfs/zfs_config.h \ + -I${SRCTOP}/sys/modules/zfs + +LIBADD= jail avl nvpair geom uutil zfs_core spl tpool zutil zfs m crypto +LDADD+= -pthread +.include + +CWARNFLAGS.zfs_main.c+= -Wno-unused-variable diff --cc sys/contrib/openzfs/.mailmap index 89d579e60d01,000000000000..b6d942c000b8 mode 100644,000000..100644 --- a/sys/contrib/openzfs/.mailmap +++ b/sys/contrib/openzfs/.mailmap @@@ -1,221 -1,0 +1,225 @@@ +# This file maps the name+email seen in a commit back to a canonical +# name+email. Git will replace the commit name/email with the canonical version +# wherever it sees it. +# +# If there is a commit in the history with a "wrong" name or email, list it +# here. If you regularly commit with an alternate name or email address and +# would like to ensure that you are always listed consistently in the repo, add +# mapping here. +# +# On the other hand, if you use multiple names or email addresses legitimately +# (eg you use a company email address for your paid OpenZFS work, and a +# personal address for your evening side projects), then don't map one to the +# other here. +# +# The most common formats are: +# +# Canonical Name +# Canonical Name +# Canonical Name Commit Name +# +# See https://git-scm.com/docs/gitmailmap for more info. + +# These maps are making names consistent where they have varied but the email +# address has never changed. In most cases, the full name is in the +# Signed-off-by of a commit with a matching author. +Ahelenia Ziemiańska +Ahelenia Ziemiańska +Alex John +Andreas Dilger +Andrew Walker +Benedikt Neuffer +Chengfei Zhu +ChenHao Lu <18302010006@fudan.edu.cn> +Chris Lindee +Colm Buckley +Crag Wang +Damian Szuberski +Daniel Kolesa +Debabrata Banerjee +Finix Yan +Gaurav Kumar +Gionatan Danti +Glenn Washburn +Gordan Bobic +Gregory Bartholomew +hedong zhang +Ilkka Sovanto +InsanePrawn +Jason Cohen +Jason Harmening +Jeremy Faulkner +Jinshan Xiong +John Poduska +Justin Scholz +Ka Ho Ng +Kash Pande +Kay Pedersen +KernelOfTruth +Liu Hua +Liu Qing +loli10K +Mart Frauenlob +Matthias Blankertz +Michael Gmelin +Olivier Mazouffre +Piotr Kubaj +Quentin Zdanis +Roberto Ricci +Rob Norris +Rob Norris +Sam Lunt +Sanjeev Bagewadi +Sebastian Wuerl +SHENGYI HONG +Stoiko Ivanov +Tamas TEVESZ +WHR +Yanping Gao +Youzhong Yang + +# Signed-off-by: overriding Author: +Alexander Ziaee - Ryan - Sietse ++Felix Schmidt ++Olivier Certner +Phil Sutter +poscat +Qiuhao Chen ++Ryan ++Sietse +Yuxin Wang +Zhenlei Huang + +# Commits from strange places, long ago +Brian Behlendorf +Brian Behlendorf +Brian Behlendorf +Brian Behlendorf +Brian Behlendorf +Herb Wartens +Ned Bass +Tulsi Jain + +# Mappings from Github no-reply addresses +ajs124 +Alek Pinchuk ++Aleksandr Liber <61714074+AleksandrLiber@users.noreply.github.com> +Alexander Lobakin +Alexey Smirnoff +Allen Holl <65494904+allen-4@users.noreply.github.com> +Alphan Yılmaz +Ameer Hamza <106930537+ixhamza@users.noreply.github.com> +Andrew J. Hesford <48421688+ahesford@users.noreply.github.com>> +Andrew Sun +Aron Xu +Arun KV <65647132+arun-kv@users.noreply.github.com> +Ben Wolsieffer +bernie1995 <42413912+bernie1995@users.noreply.github.com> +Bojan Novković <72801811+bnovkov@users.noreply.github.com> +Boris Protopopov +Brad Forschinger +Brandon Thetford +buzzingwires <131118055+buzzingwires@users.noreply.github.com> +Cedric Maunoury <38213715+cedricmaunoury@users.noreply.github.com> +Charles Suh +Chris Peredun <126915832+chrisperedun@users.noreply.github.com> +Dacian Reece-Stremtan <35844628+dacianstremtan@users.noreply.github.com> +Damian Szuberski <30863496+szubersk@users.noreply.github.com> +Daniel Hiepler <32984777+heeplr@users.noreply.github.com> +Daniel Kobras +Daniel Reichelt +David Quigley +Dennis R. Friedrichsen <31087738+dennisfriedrichsen@users.noreply.github.com> +Dex Wood +DHE +Dmitri John Ledkov <19779+xnox@users.noreply.github.com> +Dries Michiels <32487486+driesmp@users.noreply.github.com> +Edmund Nadolski <137826107+ednadolski-ix@users.noreply.github.com> +Érico Nogueira <34201958+ericonr@users.noreply.github.com> +Fedor Uporov <60701163+fuporovvStack@users.noreply.github.com> +Felix Dörre +Felix Neumärker <34678034+xdch47@users.noreply.github.com> +Finix Yan ++Friedrich Weber <56110206+frwbr@users.noreply.github.com> +Gaurav Kumar +George Gaydarov +Georgy Yakovlev <168902+gyakovlev@users.noreply.github.com> +Gerardwx +Gian-Carlo DeFazio +Giuseppe Di Natale +Hajo Möller +Harry Mallon <1816667+hjmallon@users.noreply.github.com> +Hiếu Lê +Jake Howard +James Cowgill +Jaron Kent-Dobias +Jason King +Jeff Dike <52420226+jdike@users.noreply.github.com> +Jitendra Patidar <53164267+jsai20@users.noreply.github.com> +João Carlos Mendes Luís +John Eismeier <32205350+jeis2497052@users.noreply.github.com> +John L. Hammond <35266395+jhammond-intel@users.noreply.github.com> +John-Mark Gurney +John Ramsden +Jonathon Fernyhough <559369+jonathonf@users.noreply.github.com> +Jose Luis Duran +Justin Hibbits +Kevin Greene <104801862+kxgreene@users.noreply.github.com> +Kevin Jin <33590050+jxdking@users.noreply.github.com> +Kevin P. Fleming +Krzysztof Piecuch <3964215+pikrzysztof@users.noreply.github.com> +Kyle Evans +Laurențiu Nicola +loli10K +Lorenz Hüdepohl +Luís Henriques <73643340+lumigch@users.noreply.github.com> +Marcin Skarbek +Matt Fiddaman <81489167+matt-fidd@users.noreply.github.com> +Maxim Filimonov +Max Zettlmeißl <6818198+maxz@users.noreply.github.com> +Michael Niewöhner +Michael Zhivich <33133421+mzhivich@users.noreply.github.com> +MigeljanImeri <78048439+MigeljanImeri@users.noreply.github.com> +Mo Zhou <5723047+cdluminate@users.noreply.github.com> +Nick Mattis +omni <79493359+omnivagant@users.noreply.github.com> +Pablo Correa Gómez <32678034+pablofsf@users.noreply.github.com> +Paul Zuchowski <31706010+PaulZ-98@users.noreply.github.com> +Peter Ashford +Peter Dave Hello +Peter Wirdemo <4224155+pewo@users.noreply.github.com> +Petros Koutoupis +Ping Huang <101400146+hpingfs@users.noreply.github.com> +Piotr P. Stefaniak +Richard Allen <33836503+belperite@users.noreply.github.com> +Rich Ercolani <214141+rincebrain@users.noreply.github.com> +Rick Macklem <64620010+rmacklem@users.noreply.github.com> +Rob Wing <98866084+rob-wing@users.noreply.github.com> +Roman Strashkin +Ryan Hirasaki <4690732+RyanHir@users.noreply.github.com> +Samuel Wycliffe J <115969550+samwyc@users.noreply.github.com> +Samuel Wycliffe <50765275+npc203@users.noreply.github.com> +Savyasachee Jha +Scott Colby +Sean Eric Fagan +Spencer Kinny <30333052+Spencer-Kinny@users.noreply.github.com> +Srikanth N S <75025422+nssrikanth@users.noreply.github.com> +Stefan Lendl <1321542+stfl@users.noreply.github.com> +Thomas Bertschinger <101425190+bertschinger@users.noreply.github.com> +Thomas Geppert +Tim Crawford +Todd Seidelmann <18294602+seidelma@users.noreply.github.com> +Tom Matthews +Tony Perkins <62951051+tony-zfs@users.noreply.github.com> +Torsten Wörtwein +Tulsi Jain +Václav Skála <33496485+vaclavskala@users.noreply.github.com> +Vaibhav Bhanawat <88050553+vaibhav-delphix@users.noreply.github.com> +Vandana Rungta <46906819+vandanarungta@users.noreply.github.com> +Violet Purcell <66446404+vimproved@users.noreply.github.com> +Vipin Kumar Verma <75025470+vermavipinkumar@users.noreply.github.com> +Wolfgang Bumiller +XDTG <35128600+XDTG@users.noreply.github.com> +xtouqh <72357159+xtouqh@users.noreply.github.com> +Yuri Pankov <113725409+yuripv@users.noreply.github.com> +Yuri Pankov <82001006+yuripv@users.noreply.github.com> diff --cc sys/contrib/openzfs/config/kernel-timer.m4 index 000000000000,c89ea204e83d..c89ea204e83d mode 000000,100644..100644 --- a/sys/contrib/openzfs/config/kernel-timer.m4 +++ b/sys/contrib/openzfs/config/kernel-timer.m4 diff --cc sys/contrib/openzfs/lib/libzfs_core/libzfs_core_impl.h index 000000000000,baf9a7a95834..baf9a7a95834 mode 000000,100644..100644 --- a/sys/contrib/openzfs/lib/libzfs_core/libzfs_core_impl.h +++ b/sys/contrib/openzfs/lib/libzfs_core/libzfs_core_impl.h diff --cc sys/contrib/openzfs/man/man8/zfs-rewrite.8 index 000000000000,423d6d439e28..423d6d439e28 mode 000000,100644..100644 --- a/sys/contrib/openzfs/man/man8/zfs-rewrite.8 +++ b/sys/contrib/openzfs/man/man8/zfs-rewrite.8 diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/alloc_class/alloc_class_016_pos.ksh index 000000000000,2cd3c26492f3..2cd3c26492f3 mode 000000,100755..100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/alloc_class/alloc_class_016_pos.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/alloc_class/alloc_class_016_pos.ksh diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/channel_program/lua_core/tst.encryption.ksh index 000000000000,448f91a70461..448f91a70461 mode 000000,100755..100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/channel_program/lua_core/tst.encryption.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/channel_program/lua_core/tst.encryption.ksh diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/channel_program/lua_core/tst.encryption.zcp index 000000000000,5b9896b2a9af..5b9896b2a9af mode 000000,100644..100644 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/channel_program/lua_core/tst.encryption.zcp +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/channel_program/lua_core/tst.encryption.zcp diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_rewrite/cleanup.ksh index 000000000000,5e73dd34936e..5e73dd34936e mode 000000,100755..100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_rewrite/cleanup.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_rewrite/cleanup.ksh diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_rewrite/setup.ksh index 000000000000,dddfdf8a4679..dddfdf8a4679 mode 000000,100755..100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_rewrite/setup.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_rewrite/setup.ksh diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_rewrite/zfs_rewrite.ksh index 000000000000,d1c0b3c64c27..d1c0b3c64c27 mode 000000,100755..100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_rewrite/zfs_rewrite.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_rewrite/zfs_rewrite.ksh diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/failmode/cleanup.ksh index 000000000000,59d225388f47..59d225388f47 mode 000000,100755..100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/failmode/cleanup.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/failmode/cleanup.ksh diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/failmode/failmode_dmu_tx_continue.ksh index 000000000000,f5f37b3f51bb..f5f37b3f51bb mode 000000,100755..100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/failmode/failmode_dmu_tx_continue.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/failmode/failmode_dmu_tx_continue.ksh diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/failmode/failmode_dmu_tx_wait.ksh index 000000000000,88284942603e..88284942603e mode 000000,100755..100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/failmode/failmode_dmu_tx_wait.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/failmode/failmode_dmu_tx_wait.ksh diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/failmode/setup.ksh index 000000000000,099c6306dbd5..099c6306dbd5 mode 000000,100755..100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/failmode/setup.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/failmode/setup.ksh diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/rsend/send_leak_keymaps.ksh index 000000000000,6ab8da6fd740..6ab8da6fd740 mode 000000,100755..100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/rsend/send_leak_keymaps.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/rsend/send_leak_keymaps.ksh diff --cc sys/modules/zfs/zfs_config.h index 86ccdbee2d5b,000000000000..039570c67af7 mode 100644,000000..100644 --- a/sys/modules/zfs/zfs_config.h +++ b/sys/modules/zfs/zfs_config.h @@@ -1,839 -1,0 +1,845 @@@ +/* + */ + +/* zfs_config.h. Generated from zfs_config.h.in by configure. */ +/* zfs_config.h.in. Generated from configure.ac by autoheader. */ + +/* Define to 1 if translation of program messages to the user's native + language is requested. */ +/* #undef ENABLE_NLS */ + +/* __assign_str() has one arg */ +/* #undef HAVE_1ARG_ASSIGN_STR */ + +/* lookup_bdev() wants 1 arg */ +/* #undef HAVE_1ARG_LOOKUP_BDEV */ + +/* kernel has access_ok with 'type' parameter */ +/* #undef HAVE_ACCESS_OK_TYPE */ + +/* add_disk() returns int */ +/* #undef HAVE_ADD_DISK_RET */ + +/* Define if host toolchain supports AES */ +#define HAVE_AES 1 + +/* Define if you have [rt] */ +#define HAVE_AIO_H 1 + +#ifdef __amd64__ +#ifndef RESCUE +/* Define if host toolchain supports AVX */ +#define HAVE_AVX 1 +#endif + +/* Define if host toolchain supports AVX2 */ +#define HAVE_AVX2 1 + +/* Define if host toolchain supports AVX512BW */ +#define HAVE_AVX512BW 1 + +/* Define if host toolchain supports AVX512CD */ +#define HAVE_AVX512CD 1 + +/* Define if host toolchain supports AVX512DQ */ +#define HAVE_AVX512DQ 1 + +/* Define if host toolchain supports AVX512ER */ +#define HAVE_AVX512ER 1 + +/* Define if host toolchain supports AVX512F */ +#define HAVE_AVX512F 1 + +/* Define if host toolchain supports AVX512IFMA */ +#define HAVE_AVX512IFMA 1 + +/* Define if host toolchain supports AVX512PF */ +#define HAVE_AVX512PF 1 + +/* Define if host toolchain supports AVX512VBMI */ +#define HAVE_AVX512VBMI 1 + +/* Define if host toolchain supports AVX512VL */ +#define HAVE_AVX512VL 1 +#endif + +/* backtrace() is available */ +/* #undef HAVE_BACKTRACE */ + +/* bdevname() is available */ +/* #undef HAVE_BDEVNAME */ + +/* bdev_check_media_change() exists */ +/* #undef HAVE_BDEV_CHECK_MEDIA_CHANGE */ + +/* bdev_file_open_by_path() exists */ +/* #undef HAVE_BDEV_FILE_OPEN_BY_PATH */ + +/* bdev_*_io_acct() available */ +/* #undef HAVE_BDEV_IO_ACCT_63 */ + +/* bdev_*_io_acct() available */ +/* #undef HAVE_BDEV_IO_ACCT_OLD */ + +/* bdev_kobj() exists */ +/* #undef HAVE_BDEV_KOBJ */ + +/* bdev_max_discard_sectors() is available */ +/* #undef HAVE_BDEV_MAX_DISCARD_SECTORS */ + +/* bdev_max_secure_erase_sectors() is available */ +/* #undef HAVE_BDEV_MAX_SECURE_ERASE_SECTORS */ + +/* bdev_nr_bytes() is available */ +/* #undef HAVE_BDEV_NR_BYTES */ + +/* bdev_open_by_path() exists */ +/* #undef HAVE_BDEV_OPEN_BY_PATH */ + +/* bdev_release() exists */ +/* #undef HAVE_BDEV_RELEASE */ + +/* block_device_operations->submit_bio() returns void */ +/* #undef HAVE_BDEV_SUBMIT_BIO_RETURNS_VOID */ + +/* bdev_whole() is available */ +/* #undef HAVE_BDEV_WHOLE */ + +/* bio_alloc() takes 4 arguments */ +/* #undef HAVE_BIO_ALLOC_4ARG */ + +/* bio->bi_bdev->bd_disk exists */ +/* #undef HAVE_BIO_BDEV_DISK */ + +/* bio_*_io_acct() available */ +/* #undef HAVE_BIO_IO_ACCT */ + +/* bio_max_segs() is implemented */ +/* #undef HAVE_BIO_MAX_SEGS */ + +/* bio_set_dev() GPL-only */ +/* #undef HAVE_BIO_SET_DEV_GPL_ONLY */ + +/* bio_set_dev() is a macro */ +/* #undef HAVE_BIO_SET_DEV_MACRO */ + +/* bio_set_op_attrs is available */ +/* #undef HAVE_BIO_SET_OP_ATTRS */ + +/* blkdev_get_by_path() exists and takes 4 args */ +/* #undef HAVE_BLKDEV_GET_BY_PATH_4ARG */ + +/* blkdev_get_by_path() handles ERESTARTSYS */ +/* #undef HAVE_BLKDEV_GET_ERESTARTSYS */ + +/* __blkdev_issue_discard(flags) is available */ +/* #undef HAVE_BLKDEV_ISSUE_DISCARD_ASYNC_FLAGS */ + +/* __blkdev_issue_discard() is available */ +/* #undef HAVE_BLKDEV_ISSUE_DISCARD_ASYNC_NOFLAGS */ + +/* blkdev_issue_discard(flags) is available */ +/* #undef HAVE_BLKDEV_ISSUE_DISCARD_FLAGS */ + +/* blkdev_issue_discard() is available */ +/* #undef HAVE_BLKDEV_ISSUE_DISCARD_NOFLAGS */ + +/* blkdev_issue_secure_erase() is available */ +/* #undef HAVE_BLKDEV_ISSUE_SECURE_ERASE */ + +/* blkdev_put() exists */ +/* #undef HAVE_BLKDEV_PUT */ + +/* blkdev_put() accepts void* as arg 2 */ +/* #undef HAVE_BLKDEV_PUT_HOLDER */ + +/* struct queue_limits has a features field */ +/* #undef HAVE_BLKDEV_QUEUE_LIMITS_FEATURES */ + +/* blkdev_reread_part() exists */ +/* #undef HAVE_BLKDEV_REREAD_PART */ + +/* blkg_tryget() is available */ +/* #undef HAVE_BLKG_TRYGET */ + +/* blkg_tryget() GPL-only */ +/* #undef HAVE_BLKG_TRYGET_GPL_ONLY */ + +/* blk_alloc_disk() exists */ +/* #undef HAVE_BLK_ALLOC_DISK */ + +/* blk_alloc_disk() exists and takes 2 args */ +/* #undef HAVE_BLK_ALLOC_DISK_2ARG */ + +/* blk_alloc_queue() expects request function */ +/* #undef HAVE_BLK_ALLOC_QUEUE_REQUEST_FN */ + +/* blk_alloc_queue_rh() expects request function */ +/* #undef HAVE_BLK_ALLOC_QUEUE_REQUEST_FN_RH */ + +/* blk_cleanup_disk() exists */ +/* #undef HAVE_BLK_CLEANUP_DISK */ + +/* blk_mode_t is defined */ +/* #undef HAVE_BLK_MODE_T */ + +/* block multiqueue hardware context is cached in struct request */ +/* #undef HAVE_BLK_MQ_RQ_HCTX */ + +/* blk queue backing_dev_info is dynamic */ +/* #undef HAVE_BLK_QUEUE_BDI_DYNAMIC */ + +/* blk_queue_discard() is available */ +/* #undef HAVE_BLK_QUEUE_DISCARD */ + +/* backing_dev_info is available through queue gendisk */ +/* #undef HAVE_BLK_QUEUE_DISK_BDI */ + +/* blk_queue_secure_erase() is available */ +/* #undef HAVE_BLK_QUEUE_SECURE_ERASE */ + +/* blk_queue_update_readahead() exists */ +/* #undef HAVE_BLK_QUEUE_UPDATE_READAHEAD */ + +/* BLK_STS_RESV_CONFLICT is defined */ +/* #undef HAVE_BLK_STS_RESV_CONFLICT */ + +/* Define if release() in block_device_operations takes 1 arg */ +/* #undef HAVE_BLOCK_DEVICE_OPERATIONS_RELEASE_1ARG */ + +/* Define if revalidate_disk() in block_device_operations */ +/* #undef HAVE_BLOCK_DEVICE_OPERATIONS_REVALIDATE_DISK */ + +/* Define to 1 if you have the Mac OS X function + CFLocaleCopyPreferredLanguages in the CoreFoundation framework. */ +/* #undef HAVE_CFLOCALECOPYPREFERREDLANGUAGES */ + +/* Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in + the CoreFoundation framework. */ +/* #undef HAVE_CFPREFERENCESCOPYAPPVALUE */ + +/* check_disk_change() exists */ +/* #undef HAVE_CHECK_DISK_CHANGE */ + +/* copy_splice_read exists */ +/* #undef HAVE_COPY_SPLICE_READ */ + +/* cpu_has_feature() is GPL-only */ +/* #undef HAVE_CPU_HAS_FEATURE_GPL_ONLY */ + +/* Define if the GNU dcgettext() function is already present or preinstalled. + */ +/* #undef HAVE_DCGETTEXT */ + +/* DECLARE_EVENT_CLASS() is available */ +/* #undef HAVE_DECLARE_EVENT_CLASS */ + +/* 3-arg dequeue_signal() takes a type argument */ +/* #undef HAVE_DEQUEUE_SIGNAL_3ARG_TYPE */ + +/* dequeue_signal() takes 4 arguments */ +/* #undef HAVE_DEQUEUE_SIGNAL_4ARG */ + +/* lookup_bdev() wants dev_t arg */ +/* #undef HAVE_DEVT_LOOKUP_BDEV */ + +/* disk_check_media_change() exists */ +/* #undef HAVE_DISK_CHECK_MEDIA_CHANGE */ + +/* disk_*_io_acct() available */ +/* #undef HAVE_DISK_IO_ACCT */ + +/* disk_update_readahead() exists */ +/* #undef HAVE_DISK_UPDATE_READAHEAD */ + +/* Define to 1 if you have the header file. */ +#define HAVE_DLFCN_H 1 + +/* dops->d_revalidate() takes 4 args */ +/* #undef HAVE_D_REVALIDATE_4ARGS */ + +/* Define to 1 if you have the 'execvpe' function. */ +#define HAVE_EXECVPE 1 + +/* fault_in_iov_iter_readable() is available */ +/* #undef HAVE_FAULT_IN_IOV_ITER_READABLE */ + +/* file->f_version exists */ +/* #undef HAVE_FILE_F_VERSION */ + +/* flush_dcache_page() is GPL-only */ +/* #undef HAVE_FLUSH_DCACHE_PAGE_GPL_ONLY */ + +/* Define if compiler supports -Wformat-overflow */ +/* #undef HAVE_FORMAT_OVERFLOW */ + +/* fsync_bdev() is declared in include/blkdev.h */ +/* #undef HAVE_FSYNC_BDEV */ + +/* yes */ +/* #undef HAVE_GENERIC_FADVISE */ + +/* generic_fillattr requires struct mnt_idmap* */ +/* #undef HAVE_GENERIC_FILLATTR_IDMAP */ + +/* generic_fillattr requires struct mnt_idmap* and u32 request_mask */ +/* #undef HAVE_GENERIC_FILLATTR_IDMAP_REQMASK */ + +/* generic_fillattr requires struct user_namespace* */ +/* #undef HAVE_GENERIC_FILLATTR_USERNS */ + +/* generic_*_io_acct() 4 arg available */ +/* #undef HAVE_GENERIC_IO_ACCT_4ARG */ + +/* GENHD_FL_EXT_DEVT flag is available */ +/* #undef HAVE_GENHD_FL_EXT_DEVT */ + +/* GENHD_FL_NO_PART flag is available */ +/* #undef HAVE_GENHD_FL_NO_PART */ + +/* Define if the GNU gettext() function is already present or preinstalled. */ +/* #undef HAVE_GETTEXT */ + +/* Define to 1 if you have the 'gettid' function. */ +/* #undef HAVE_GETTID */ + +/* iops->get_acl() exists */ +/* #undef HAVE_GET_ACL */ + +/* iops->get_acl() takes rcu */ +/* #undef HAVE_GET_ACL_RCU */ + +/* has iops->get_inode_acl() */ +/* #undef HAVE_GET_INODE_ACL */ + +/* iattr->ia_vfsuid and iattr->ia_vfsgid exist */ +/* #undef HAVE_IATTR_VFSID */ + *** 540 LINES SKIPPED *** From nobody Fri May 30 12:16:55 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b82Kg1YRdz5xbsb; Fri, 30 May 2025 12:16:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b82Kg10w4z4D23; Fri, 30 May 2025 12:16:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748607415; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hF5Ebos4RFnfSd/6IFfea0fmRanN/+lDEWlGa2ojq6k=; b=hkIn8wbaSSCRG3708XXmMv40gK/68nFyOOaBPx54rDq2ZslztL4Bs8k6RZemc0GIPaHEe6 4trc61YhhWnYOVl721BKXSzRRdTBzXPFzcfNmS0PTna6nYKuWgWJ0PePBXVZ/CrMEQ6vXQ 9MLsfv8EFdlseO7w8i5QDUJBjzsmmVJOS7SO3ygLD8SwTGbRuzW8bdrZIh4HzYtZx8GqAg 4ub2P2dNpgzjogal/fJKUKCk4IeCoT/q7xvaOWczK7dBsQK2vB+15zcHMNSOcsjTJwbL0h KVrqhpIOi/VCRSlXYyHj/EkrDd9gTBHgwHlhJETRIRfXb8OeE72ffdy2kkVfbA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748607415; a=rsa-sha256; cv=none; b=cbKQ/fH5TU1QbA/j0pVtJnP0j+XIJqw5NpaG5r72ubCPAQpkMDLdma/dwDcpdz5qSzwBoZ RZgrznGpCpA0jIjzracrl39FsKxyiPu9hrK20/CNPhUvZh2BLU6IShaZvLnDEarIwTRrcr dXqFcnN0Koh26hx75FH0d/dDTExIdOt32nquJe+pKjA++7rRNHo7JGji1kl5SyhDVcapTC uJCgr3JA4L3objFQX0MM01u/3hUYOStPynUSaEscvYMsy4jop7K2rnPLayWSBg83X7CE7y r4+LZw6qWCF6S8UxMKzu6O+bh0hUYnAm1z9EIhfzIsv2GGYG1e4jG0q8tOSCLg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748607415; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hF5Ebos4RFnfSd/6IFfea0fmRanN/+lDEWlGa2ojq6k=; b=RqJ7gNlvF464qbBBIaSLrIRc9czHaDKW3Gn203LKAcsitGrgPe3n73yfr1VbxdzxqSU1/J csB55zWvqGe/QwFoacrfeTd+1Z3DZXsDZhBXW7ILMrrLjk0ZZxw+nJTZFScmN7p00Ph0Sl Cp8HMd97DsN+lxHmwlLfc0uAy7BYyujH1PbS5Zq2gbsM4AxgOYo1Q4O36ENN3cZ9HxSIwy L7gM5UJajIPkGPfxVGogXZcn0iNaBmi+0YzfUFsLRrjamXEHp6FFPJLWeznFNWX9PalzeA im1VOllhPI7axQ36BwCS1mV1tkU0KDIAD5DqaEGVqUDKXWQcmtKLdB56XBxUAg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b82Kg0YHbzsFL; Fri, 30 May 2025 12:16: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 54UCGttU067276; Fri, 30 May 2025 12:16:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54UCGtSV067273; Fri, 30 May 2025 12:16:55 GMT (envelope-from git) Date: Fri, 30 May 2025 12:16:55 GMT Message-Id: <202505301216.54UCGtSV067273@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: 2df0e8ff8f21 - main - hid.h: Add U2F usage tables constants List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 2df0e8ff8f21e69240668463fa2700e5b21ef728 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=2df0e8ff8f21e69240668463fa2700e5b21ef728 commit 2df0e8ff8f21e69240668463fa2700e5b21ef728 Author: Vladimir Kondratyev AuthorDate: 2025-05-27 18:02:16 +0000 Commit: Ed Maste CommitDate: 2025-05-30 12:16:16 +0000 hid.h: Add U2F usage tables constants Per "HID Usage Tables for Universal Serial Bus (USB)" Version 1.6. Page ID F1D0 FIDO Alliance Page Usage ID 01 U2F Authenticator Device - A device that provides 2nd factor authentication using the FIDO U2FHID protocol. Reviewed by: wulf Differential Revision: https://reviews.freebsd.org/D50549 --- sys/dev/hid/hid.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/dev/hid/hid.h b/sys/dev/hid/hid.h index aeb0da98b181..e56f8ffe772b 100644 --- a/sys/dev/hid/hid.h +++ b/sys/dev/hid/hid.h @@ -57,6 +57,7 @@ #define HUP_SCALE 0x008c #define HUP_CAMERA_CONTROL 0x0090 #define HUP_ARCADE 0x0091 +#define HUP_FIDO 0xf1d0 #define HUP_MICROSOFT 0xff00 /* Usages, generic desktop */ @@ -161,6 +162,9 @@ #define HUC_HEADPHONE 0x0005 #define HUC_AC_PAN 0x0238 +/* Usages, FIDO */ +#define HUF_U2FHID 0x0001 + #define HID_USAGE2(p,u) (((p) << 16) | (u)) #define HID_GET_USAGE(u) ((u) & 0xffff) #define HID_GET_USAGE_PAGE(u) (((u) >> 16) & 0xffff) From nobody Fri May 30 12:42:19 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b82v013rxz5xd7v; Fri, 30 May 2025 12:42:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b82v00M0pz3HC7; Fri, 30 May 2025 12:42:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748608940; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Trt4q20IhkW6ukM5KMoHeiEVusPtmbgqoY109EpNlS8=; b=MW/7EW4/jEFqxxRlL19V2pl6go/9oGLwuDotLUeud705I8ghFxC6tUyptpO8AsAgGA2ZeZ 1Ke0Lz0YlbdZuBhSHQDvxkOeemhPEu7AMTpcwkuV1KNtFyTHxMFfOBqlY3Zpc7BAdmcDcM BxGaO/4LuCFp+DbNv+JrE/T+/lQxNfEmdoRDCttNUphi1OS8gFeFLrh5lkGveAOWBfPQH0 wYTg6MP7zS4U2udDVltQEX60XYpb/0jNut9G7iKnrn2dyLBNnJKt299CEmQ717DaYEsXs5 TJfsAgClauXCGxVyaVFjGyx5dnzN9RMQ02cv0Kmgtg7hLl3uNbR3AIAq4a+SfQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748608940; a=rsa-sha256; cv=none; b=e0sELgSFzig0GS2tFPNmVFIU6p1OFp5l+OBFEcz4Q6Z+5+vNAv7X8VPWrvVhTJyxEVZsMX VCeQZ7hF/KSB9vmHFeX+MLQclbt5fABPA/kdFv6BPA3xgCDqKQ2GjY5wa3Ag1MU1vyJ/k5 N6YV80o6CFfESul8AVT3dr8LUK/99e0tsDoT1xDnc1wdKFd/IvKT1PGHPWpvNEStGkbe3j PNNjGMnMberFBxstGdTi7DNAluWrlkroKAt5/5gNgCKnofisbprt9REa48QpCBywwF/mJG Fxh2SwhBvxuByCtQKsdrxHV7PmRxGS3tQAp/BJP5tjhUORxE3jY+TW1B+zr1Og== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748608940; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Trt4q20IhkW6ukM5KMoHeiEVusPtmbgqoY109EpNlS8=; b=wcgTnWkwfaIqq+T8p1KTFx3zrx2o1654FkVsN96xeL0v49iCnEQAMuqz9BkiUeDuP1mn9/ tdh9uQSSjG3av9PF8IEYWUdCQ33pDVpyH3c+77eS5P9Hyp9HcZcxrRj0QDa+00OuiXXAxn 0lvmXwyQYXl4myvKv0waofl/1fDUIEoA3+U3Y0gB7KOfT9ulI3fpr+88KVu0Hw/xbArPGB DKbYwq+ISvS6DvKrOLhrzpdEs1Ssw6986uoHDIhkJVa8GBc0rT5MnpRkt+m28to37D1Ivn 4h8bAA4k/ERuuUMKs9TMsMDDKQowo+Za3UCFJ40U63DXsqcwi44Tmlo0ag03EQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b82tz6sJczskQ; Fri, 30 May 2025 12:42: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 54UCgJUZ022070; Fri, 30 May 2025 12:42:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54UCgJKp022067; Fri, 30 May 2025 12:42:19 GMT (envelope-from git) Date: Fri, 30 May 2025 12:42:19 GMT Message-Id: <202505301242.54UCgJKp022067@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 9c34a6876a60 - stable/14 - certctl: Split certificate bundles before processing. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 9c34a6876a60dc10fda6ad6a0cbe8f99a372aadc Auto-Submitted: auto-generated The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=9c34a6876a60dc10fda6ad6a0cbe8f99a372aadc commit 9c34a6876a60dc10fda6ad6a0cbe8f99a372aadc Author: Dag-Erling Smørgrav AuthorDate: 2023-10-05 14:50:01 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-05-30 12:40:53 +0000 certctl: Split certificate bundles before processing. This allows 'certctl rehash' to do the right thing when ca_root_nss is installed, instead of linking the entire bundle to the hash of the first certificate it contains. MFC after: 3 days Reviewed by: allanjude Differential Revision: https://reviews.freebsd.org/D42087 (cherry picked from commit a401c8cb26b22688087ad7c5ee527718459df15a) certctl: Fix recent regressions. - If an untrusted certificate is also found in the list of trusted certificate, issue a warning and skip it, but don't fail. - Split on -+BEGIN CERTIFICATE-+ instead of "Certificate:" since that's what we're really looking for. Also fix a long-standing bug: .crl files are not certificates, so we should not include them when searching for certificates. Reported by: madpilot, netchild, tijl Reviewed by: netchild, allanjude Differential Revision: https://reviews.freebsd.org/D42276 (cherry picked from commit 87945a082980260b52507ad5bfb3a0ce773a80da) certctl: Convert line endings before inspecting files. This ensures that certificate files or bundles with DOS or Mac line endings are recognized as such and handled identically to those with Unix line endings. PR: 274952 Reviewed by: allanjude Differential Revision: https://reviews.freebsd.org/D42490 (cherry picked from commit f7d16a627efa8ba610eb9b8a12dd67b6cdbb2542) certctl: Revert to symlinks. Unfortunately tar will not be able to extract base.txz to a system where /etc and /usr are not on the same filesystem if the certificates are hard links. PR: 277828 Reviewed by: mp Differential Revision: https://reviews.freebsd.org/D44496 (cherry picked from commit 3fed4f0db53a66a0135bea5c491431eb3348cf51) --- usr.sbin/certctl/certctl.sh | 105 ++++++++++++++++++++++++++++---------------- 1 file changed, 68 insertions(+), 37 deletions(-) diff --git a/usr.sbin/certctl/certctl.sh b/usr.sbin/certctl/certctl.sh index 5af8fecb93ac..458f5c53682f 100755 --- a/usr.sbin/certctl/certctl.sh +++ b/usr.sbin/certctl/certctl.sh @@ -32,7 +32,6 @@ set -u : ${DESTDIR:=} : ${DISTBASE:=} -: ${FILEPAT:="\.pem$|\.crt$|\.cer$|\.crl$"} ############################################################ GLOBALS @@ -63,6 +62,20 @@ perform() fi } +cert_files_in() +{ + find -L "$@" -type f \( \ + -name '*.pem' -or \ + -name '*.crt' -or \ + -name '*.cer' \ + \) 2>/dev/null +} + +eolcvt() +{ + cat "$@" | tr -s '\r' '\n' +} + do_hash() { local hash @@ -93,23 +106,32 @@ get_decimal() return 0 } -create_trusted_link() +create_trusted() { local hash certhash otherfile otherhash local suffix + local link=${2:+-lrs} hash=$(do_hash "$1") || return certhash=$(openssl x509 -sha1 -in "$1" -noout -fingerprint) for otherfile in $(find $UNTRUSTDESTDIR -name "$hash.*") ; do otherhash=$(openssl x509 -sha1 -in "$otherfile" -noout -fingerprint) if [ "$certhash" = "$otherhash" ] ; then - info "Skipping untrusted certificate $1 ($otherfile)" - return 1 + info "Skipping untrusted certificate $hash ($otherfile)" + return 0 + fi + done + for otherfile in $(find $CERTDESTDIR -name "$hash.*") ; do + otherhash=$(openssl x509 -sha1 -in "$otherfile" -noout -fingerprint) + if [ "$certhash" = "$otherhash" ] ; then + verbose "Skipping duplicate entry for certificate $hash" + return 0 fi done suffix=$(get_decimal "$CERTDESTDIR" "$hash") verbose "Adding $hash.$suffix to trust store" - perform install ${INSTALLFLAGS} -lrs "$(realpath "$1")" "$CERTDESTDIR/$hash.$suffix" + perform install ${INSTALLFLAGS} -m 0444 ${link} \ + "$(realpath "$1")" "$CERTDESTDIR/$hash.$suffix" } # Accepts either dot-hash form from `certctl list` or a path to a valid cert. @@ -137,6 +159,7 @@ resolve_certname() create_untrusted() { local srcfile filename + local link=${2:+-lrs} set -- $(resolve_certname "$1") srcfile=$1 @@ -147,12 +170,13 @@ create_untrusted() fi verbose "Adding $filename to untrusted list" - perform install ${INSTALLFLAGS} -lrs "$srcfile" "$UNTRUSTDESTDIR/$filename" + perform install ${INSTALLFLAGS} -m 0444 ${link} \ + "$srcfile" "$UNTRUSTDESTDIR/$filename" } do_scan() { - local CFUNC CSEARCH CPATH CFILE + local CFUNC CSEARCH CPATH CFILE CERT SPLITDIR local oldIFS="$IFS" CFUNC="$1" CSEARCH="$2" @@ -160,14 +184,25 @@ do_scan() IFS=: set -- $CSEARCH IFS="$oldIFS" - for CPATH in "$@"; do - [ -d "$CPATH" ] || continue - info "Scanning $CPATH for certificates..." - for CFILE in $(ls -1 "${CPATH}" | grep -Ee "${FILEPAT}") ; do - [ -e "$CPATH/$CFILE" ] || continue - verbose "Reading $CFILE" - "$CFUNC" "$CPATH/$CFILE" - done + for CFILE in $(cert_files_in "$@") ; do + verbose "Reading $CFILE" + case $(eolcvt "$CFILE" | egrep -c '^-+BEGIN CERTIFICATE-+$') in + 0) + ;; + 1) + "$CFUNC" "$CFILE" link + ;; + *) + verbose "Multiple certificates found, splitting..." + SPLITDIR=$(mktemp -d) + eolcvt "$CFILE" | egrep '^(---|[0-9A-Za-z/+=]+$)' | \ + split -p '^-+BEGIN CERTIFICATE-+$' - "$SPLITDIR/x" + for CERT in $(find "$SPLITDIR" -type f) ; do + "$CFUNC" "$CERT" + done + rm -rf "$SPLITDIR" + ;; + esac done } @@ -175,43 +210,39 @@ do_list() { local CFILE subject - if [ -e "$1" ] ; then - cd "$1" - for CFILE in *.[0-9] ; do - if [ ! -s "$CFILE" ] ; then - info "Unable to read $CFILE" - ERRORS=$((ERRORS + 1)) - continue - fi - subject= - if [ $VERBOSE -eq 0 ] ; then - subject=$(openssl x509 -noout -subject -nameopt multiline -in "$CFILE" | - sed -n '/commonName/s/.*= //p') - fi - [ "$subject" ] || - subject=$(openssl x509 -noout -subject -in "$CFILE") - printf "%s\t%s\n" "$CFILE" "$subject" - done - cd - - fi + for CFILE in $(find "$@" \( -type f -or -type l \) -name '*.[0-9]') ; do + if [ ! -s "$CFILE" ] ; then + info "Unable to read $CFILE" + ERRORS=$((ERRORS + 1)) + continue + fi + subject= + if ! "$VERBOSE" ; then + subject=$(openssl x509 -noout -subject -nameopt multiline -in "$CFILE" | sed -n '/commonName/s/.*= //p') + fi + if [ -z "$subject" ] ; then + subject=$(openssl x509 -noout -subject -in "$CFILE") + fi + printf "%s\t%s\n" "${CFILE##*/}" "$subject" + done } cmd_rehash() { if [ -e "$CERTDESTDIR" ] ; then - perform find "$CERTDESTDIR" -type link -delete + perform find "$CERTDESTDIR" \( -type f -or -type l \) -delete else perform install -d -m 0755 "$CERTDESTDIR" fi if [ -e "$UNTRUSTDESTDIR" ] ; then - perform find "$UNTRUSTDESTDIR" -type link -delete + perform find "$UNTRUSTDESTDIR" \( -type f -or -type l \) -delete else perform install -d -m 0755 "$UNTRUSTDESTDIR" fi do_scan create_untrusted "$UNTRUSTPATH" - do_scan create_trusted_link "$TRUSTPATH" + do_scan create_trusted "$TRUSTPATH" } cmd_list() From nobody Fri May 30 13:16:06 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b83dy3D1Cz5xg4F; Fri, 30 May 2025 13:16:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b83dy2dcsz3cfx; Fri, 30 May 2025 13:16:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748610966; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pTWJ/AhjfAEZ+Bn7+zMezEIYITNWL9nXrXSCcUBbVVI=; b=T4k2ms98GtaQD75MtUc7eZVJHfdUwmE+ERmBDX21pWDYvAw6OyCTthoLh7luOBZfq2Y0gT n1yMbbNE3/AEcFPRrNtnIcCFgRsPKFN7P+tRPbEN8SIBIWJg6D8U72eJgORD5MxYpr9MJx 4LUdVftIqsDi8hdR6u+ULCOYhHrUiIlTIPhaauDazOFEsfyKsYTBQXp1NK+9Qv6qKZ29C0 Gxf3ktz1ZBftTtLof1w1tkwY1Drzgl1Dl5/kH1JoLMMe1YRXKWnsG9HhVnmFl6jlB82qsy 0SYtAGq0n8pzB98fRFkiiYSyGBKw/F7S9wrxq6cuu505drFrsScXMO2VNOZf5Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748610966; a=rsa-sha256; cv=none; b=fQTl+VwIBF24+xDdWrfR958gRO0eMZrYs7IuLhqmBAVFu0rjZxqfOcpGLaRFVHs4v1Diby I/L9AlgDkx41YG7bZk1rGGnb31h5KU3/zWYMXRua7b/kAZZFZ3+BhmYFRMeFsk0Kpzvi86 +DD0H8MVej4MxEle3M/2f/RAWTE7eZt8efxP5wfTQiCwMgw1w4D2PgLuPcWmDYt2wtsfaB hWilEQqNjk4Tq9bGadcnqqIdSrEF1oIGGZywquNCfJVzmBXZSzCnr8L/OVw4bR6RU+NsT2 4/AzJmoQIy8tmXoX2hkhOv6G7WC5bycSmjC5h28iKO+Hqlll0L78sxk3stgPfA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748610966; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pTWJ/AhjfAEZ+Bn7+zMezEIYITNWL9nXrXSCcUBbVVI=; b=ZpGUNnr3/UwU/pmTJsb/xSMf4g7kmewrWzgq3xynExLdWvE3mXMOwfuSTSHGj/s4LFE+ft /U1HJuasdUWsZNSBN+tOzI3O7rLvIEaWPYTleYSmNV0Col/Y34wuyDtzWPmX0LadwDAkve AxSzx16CtUSwdrzv9S/geiNJAoSDe/3PWD+jIuS/PyZfKLWNrm32MGPTz5FuATYXRZDjds eyT00eiulG/HESxD2ZWVntOfn5etL5mmuidUioR/dENpt8xxcU4iNF46njOeAL1vOgAgyz 0Fwiy/21t4mzh/ywZYX5naell4RkpffNipznKWjYLwVE/32R3NnWL6ci6s0tAw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b83dy2B0jztrX; Fri, 30 May 2025 13:16: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 54UDG6nV080479; Fri, 30 May 2025 13:16:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54UDG6kZ080476; Fri, 30 May 2025 13:16:06 GMT (envelope-from git) Date: Fri, 30 May 2025 13:16:06 GMT Message-Id: <202505301316.54UDG6kZ080476@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: 581e064ddeb4 - main - libpfctl: clear out source nodes before retrieving them List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 581e064ddeb431d1ac304c48c176c88a14424fd9 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=581e064ddeb431d1ac304c48c176c88a14424fd9 commit 581e064ddeb431d1ac304c48c176c88a14424fd9 Author: Kristof Provost AuthorDate: 2025-05-30 08:10:18 +0000 Commit: Kristof Provost CommitDate: 2025-05-30 13:15:54 +0000 libpfctl: clear out source nodes before retrieving them Zero out the struct pfctl_src_node before we read the next one. Avoid having stray stack information (or the previous source node) influence our result. Sponsored by: Rubicon Communications, LLC ("Netgate") --- lib/libpfctl/libpfctl.c | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/libpfctl/libpfctl.c b/lib/libpfctl/libpfctl.c index a4afa26f0afe..cbc193268505 100644 --- a/lib/libpfctl/libpfctl.c +++ b/lib/libpfctl/libpfctl.c @@ -3060,6 +3060,7 @@ pfctl_get_srcnodes(struct pfctl_handle *h, pfctl_get_srcnode_fn fn, void *arg) return (ENXIO); while ((hdr = snl_read_reply_multi(&h->ss, seq_id, &e)) != NULL) { + bzero(&sn, sizeof(sn)); if (!snl_parse_nlmsg(&h->ss, hdr, &srcnode_parser, &sn)) continue; From nobody Fri May 30 14:49:57 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b85kF4p79z5xlMn; Fri, 30 May 2025 14:49: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b85kF44wgz3k4P; Fri, 30 May 2025 14:49:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748616597; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nGDuJXPjXpn/SW5OOJEeqjocTopelaFwoetrhFs2PDE=; b=bytfpmLE1CqD2kecPmAf070dPxTgmsv8Nyrlz/lCc5o6O9LSOQnt8ncpCQlLbcrOnmAUwW fWJUbEczfYOOHQX/98gH7lMg7wXFiEBd3ugrp21qCvconWU2orRnek+hJHNC1DwT+GLABM 0tbHI32bk9dbeyCrpsnZBfB0OICDA5jBxqDJzwE2K6Ms/2lePgGEdEfll/v7dIjV5iwseu 0Kz8oLRRIj1FZ1YBASFPN5LY8ir0ZIe/A+F/wlws3HqiTxmwtj0i63iilSH9QhCMnMIyhT Pyurvqo0xkG+/0VeHkhNWUUavGfrXIfQx2BNj7OtWnXvIgYrn2HbkKQdlWZh2w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748616597; a=rsa-sha256; cv=none; b=RW/Ylu6XUBEErkeCI+cwQJgxyCCtuF1wkhK2Q8LbW2/PRAsnQZn1UU4deCUm9GxbUX/QBS bQsqnO/rMcDfC3EmA674BZfoW3ckztPqDaFTr2P6Wr5yQ5ZXexPyzX0Kwxa7Q+lc7xqO5+ xXbbsYk1wB5qxEdah+gWuJRFDu5LcoSpwQ5/yfHrCyMLfjX+SxQMxfKGmQDu2WqRNFF1I9 Vg0tHwT3AenJiy6j3TdltDywwfrh7yjXKwui94UPYqBJEWQh2dkpn7YG8iFvQjWI0q3w2e BaZGc8F3/0OCL1pqQapdPKd7vCcxoi82voX9vMTrYy5J5cSwns/21i3WIU+Gvw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748616597; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nGDuJXPjXpn/SW5OOJEeqjocTopelaFwoetrhFs2PDE=; b=lVqIeDyMkk/T0azYUHDNI160ehUOH6r9EoU7Il4LeZXB4SMEdSCOopvJCJmseVpEQEc4Ab GKTuCt1WlSzTzonfLV1vlpImlpmQeprDyl5B6ar4bQRQYi0yRpasJEs5Z0n7pB8nHJtxxa UVuBFXD9JdYoQoPedK4ttNiavMDM4x438JypotFmt3w4CeGz+YRLwDJOaKMuSiDP2bNYMb eDnC+AclLsAdeHWalnVBk73Od69iOKkUA6iH5SQwkilTMFpqP/wVZdsG9my+bgyCux3x5A P7jLcvZXjnUOOEJavenxFI7fjukuG/nsHgNUh99hqJ36APxPOEiDujJkWWOt6w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b85kF3X4qzwdt; Fri, 30 May 2025 14:49: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 54UEnvv0049016; Fri, 30 May 2025 14:49:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54UEnvP0049013; Fri, 30 May 2025 14:49:57 GMT (envelope-from git) Date: Fri, 30 May 2025 14:49:57 GMT Message-Id: <202505301449.54UEnvP0049013@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Pierre Pronchery Subject: git: 046800313ab6 - main - bsdinstall: implement rootpass with bsddialog List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: khorben X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 046800313ab64ea058fe7e63f56b6134d6cf00ef Auto-Submitted: auto-generated The branch main has been updated by khorben: URL: https://cgit.FreeBSD.org/src/commit/?id=046800313ab64ea058fe7e63f56b6134d6cf00ef commit 046800313ab64ea058fe7e63f56b6134d6cf00ef Author: Pierre Pronchery AuthorDate: 2025-05-20 11:14:49 +0000 Commit: Pierre Pronchery CommitDate: 2025-05-30 14:45:48 +0000 bsdinstall: implement rootpass with bsddialog This provides a more consistent user experience to the FreeBSD installer. Tested by: thj Approved by: philip (mentor) Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D44280 --- usr.sbin/bsdinstall/scripts/rootpass | 90 ++++++++++++++++++++++++++++++++---- 1 file changed, 81 insertions(+), 9 deletions(-) diff --git a/usr.sbin/bsdinstall/scripts/rootpass b/usr.sbin/bsdinstall/scripts/rootpass index 93523a9880d3..9d25569ae946 100755 --- a/usr.sbin/bsdinstall/scripts/rootpass +++ b/usr.sbin/bsdinstall/scripts/rootpass @@ -1,6 +1,7 @@ #!/bin/sh #- # Copyright (c) 2011 Nathan Whitehorn +# Copyright (c) 2024 The FreeBSD Foundation # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -27,18 +28,89 @@ BSDCFG_SHARE="/usr/share/bsdconfig" . $BSDCFG_SHARE/common.subr || exit 1 -clear -echo "$OSNAME Installer" -echo "========================" -echo if [ -n "$ROOTPASS_ENC" ]; then printf '%s\n' "$ROOTPASS_ENC" | pw -R $BSDINSTALL_CHROOT usermod root -H 0 + exit $? elif [ -n "$ROOTPASS_PLAIN" ]; then printf '%s\n' "$ROOTPASS_PLAIN" | pw -R $BSDINSTALL_CHROOT usermod root -h 0 -else - echo "Please select a password for the system management account (root):" - echo "Typed characters will not be visible." - - chroot $BSDINSTALL_CHROOT passwd root 2>&1 + exit $? fi + +: ${BSDDIALOG_OK:=0} + +error_get_message() +{ + case $1 in + 62) + echo "The password cannot be empty" + ;; + 63) + echo "The passwords do not match" + ;; + 64) #EX_USAGE + echo "Command used incorrectly" + ;; + 65) #EX_DATAERR + echo "Incorrect input data" + ;; + 67) #EX_NOUSER + echo "User not found" + ;; + 70) #EX_SOFTWARE + echo "Internal software error" + ;; + 71) #EX_OSERR + echo "Operating System error detected" + ;; + 72) #EX_OSFILE + echo "Error in a system file" + ;; + 74) #EX_IOERR + echo "I/O error" + ;; + 77) #EX_NOPERM + echo "Insufficient permissions" + ;; + 78) #EX_CONFIG + echo "Configuration error" + ;; + 0) + ;; + *) + echo "An unknown error occurred (code $1)" + return 1 + ;; + esac + return $1 +} + +errormsg= +username="root" +while true; do + exec 5>&1 + output=$(bsddialog --backtitle "$OSNAME Installer" \ + --title "Set $username password" \ + --cancel-label "Skip" \ + --passwordform --insecure \ + "Please select a password for the system management account ($username) +$errormsg" \ + 0 0 2 \ + "Password" 0 0 '' 0 17 32 32 \ + "Repeat password" 1 0 '' 1 17 32 32 \ + 2>&1 1>&5) + res=$? + exec 5>&- + [ $res -eq $BSDDIALOG_OK ] || exit 0 + + echo -n "$output" | (read password1 + read password2 + [ -n "$password1" -o -n "$password2" ] || exit 62 + [ "$password1" = "$password2" ] || exit 63 + echo "$password1" | chroot $BSDINSTALL_CHROOT \ + /usr/sbin/pw usermod "$username" -h 0 + ) + err=$? + [ $err -eq 0 ] && exit 0 + errormsg=$(error_get_message $err) +done From nobody Fri May 30 15:44:55 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b86xh3w1jz5xpPZ; Fri, 30 May 2025 15:44:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b86xh1Qsrz3Jts; Fri, 30 May 2025 15:44:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748619896; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MxHCn4cc9U4+tWBDs7c7sTGd2cAcThGiXnrfqJ6SmE4=; b=idtYlGkwH95CyRWCzZ+w5WVrQ/b/uHVcbxlFsr9Zys5rU3Ru0imPe1lW4ZAZup/AKPgRUZ 6yv4p9C25hGeZBSr229MVTD9TxmM56GHYLR14nJJoc/CCjvOFxP3p9/9AtFZH6pGR22e9F G28a4BCuFqHSeOZvXjHDrL+nFdiWPScOewKRaQX/QHHKmsv/QquDJ2RRnxJqncrr72lJCz OQGwy6jEDPi4t3hsmvrQsIZzFJpQQLOxyaZtc2jwnm18+lYORkaV61Cq0pBrB2iJT/8eNL RCZMstaACOsur+dn3mmmiWcTuH66gwZVzZcmTszroZrF/NIvVUk7q8917IkRDw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748619896; a=rsa-sha256; cv=none; b=isiHKn1lx3Hy/Qr2ItgG35h+cgMHX7mJSEvQN6JbQnKORlsyrLvsDP3kLiCTVbPTsfodmH ObApALhPUZ8jafoPHzYQCdiy4ePoM1y/3bpa8HSZyklANh1tzmYSn/IQinSEz5H7u4fmbT Qmj8Qw92NpxQrZ7smNtn6K3IgwQ7xh4KM+r56yT1K1CdO2vt2PJBsxRDQp+lQaiJOMZP0U QCyJsQ7q94Ge09CEuKBHkj/dGqoGV2QLoYXODPDNafD/EzMdbdlis6WwjK5juE2Tk5g/L3 hvWAAFdvAgvr+qLmvgu+4CfQMuKo2Q6naqbEy1+esLkqvv79Z1N3ThH91/VcSg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748619896; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MxHCn4cc9U4+tWBDs7c7sTGd2cAcThGiXnrfqJ6SmE4=; b=SitdVewtQxumOCXwC8xsRDaYwSI/DtU4LCoW6GxfKr3qGHco9Oiu6TZ46K1Uhe60bA9Xi8 QWUEPQ/1K6cI4leks/pN67U6ZN2z9Sgiis+vFZrROPh9/j2ug5lNDRS988r3phXkWPwWkb eNOQ85suzLjjZFvIiJ3V4uVPzbzKr3XuXpidfCnCarLlvD0jOf8A9RI8HcOzmH6sy2naIW kjNDEtkIXDREWlzImfz/t0hBO453Yj3Mri/tmuRCUPDd1XHaWc8jL2FbvPRF9j0DjBcFhQ R0TPDTZxiKFUy/cy7Qrr/UP/umIsLUVH4L076K7w95o6vg+8uN03S77VSfgArw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b86xh0d0fzym7; Fri, 30 May 2025 15:44: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 54UFitFm060196; Fri, 30 May 2025 15:44:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54UFitx2060193; Fri, 30 May 2025 15:44:55 GMT (envelope-from git) Date: Fri, 30 May 2025 15:44:55 GMT Message-Id: <202505301544.54UFitx2060193@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: 537fbf70f12b - main - cp: Fix copying to root directory. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 537fbf70f12b014d68fc087ee6e254523c73d489 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=537fbf70f12b014d68fc087ee6e254523c73d489 commit 537fbf70f12b014d68fc087ee6e254523c73d489 Author: Dag-Erling Smørgrav AuthorDate: 2025-05-30 15:44:20 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-05-30 15:44:39 +0000 cp: Fix copying to root directory. The trailing-slash logic would strip the target down to an empty string, which we would then fail to stat, and subsequently attempt (and fail) to create. Fixes: 82fc0d09e862 Sponsored by: Klara, Inc. Reviewed by: allanjude Differential Revision: https://reviews.freebsd.org/D50604 --- bin/cp/cp.c | 12 +++++++----- bin/cp/tests/cp_test.sh | 22 ++++++++++++++++++++++ 2 files changed, 29 insertions(+), 5 deletions(-) diff --git a/bin/cp/cp.c b/bin/cp/cp.c index 03b3a7a7bf41..94a22c1cccc5 100644 --- a/bin/cp/cp.c +++ b/bin/cp/cp.c @@ -179,9 +179,9 @@ main(int argc, char *argv[]) target = dot; } else if ((sep = strrchr(target, '/')) != NULL && sep[1] == '\0') { have_trailing_slash = true; - while (sep > target + 1 && *(sep - 1) == '/') + while (sep > target && *sep == '/') sep--; - *sep = '\0'; + sep[1] = '\0'; } /* * Copy target into to.base, leaving room for a possible separator @@ -293,9 +293,11 @@ copy(char *argv[], enum op type, int fts_options, struct stat *root_stat) /* * We have previously made sure there is room for this. */ - sep = strchr(to.base, '\0'); - sep[0] = '/'; - sep[1] = '\0'; + if (strcmp(to.base, "/") != 0) { + sep = strchr(to.base, '\0'); + sep[0] = '/'; + sep[1] = '\0'; + } } else { /* * We will create the destination directory imminently. diff --git a/bin/cp/tests/cp_test.sh b/bin/cp/tests/cp_test.sh index bb45cc2484f5..8511904a0e33 100755 --- a/bin/cp/tests/cp_test.sh +++ b/bin/cp/tests/cp_test.sh @@ -570,6 +570,27 @@ dstmode_body() atf_check cmp dir/file dst/file } +atf_test_case to_root cleanup +to_root_head() +{ + atf_set "require.user" "root" +} +to_root_body() +{ + dst="$(atf_get ident).$$" + echo "$dst" >dst + echo "foo" >"$dst" + atf_check cp "$dst" / + atf_check cmp -s "$dst" "/$dst" + atf_check rm "/$dst" + atf_check cp "$dst" // + atf_check cmp -s "$dst" "/$dst" +} +to_root_cleanup() +{ + (dst=$(cat dst) && [ -n "/$dst" ] && [ -f "/$dst" ] && rm "/$dst") || true +} + atf_init_test_cases() { atf_add_test_case basic @@ -607,4 +628,5 @@ atf_init_test_cases() atf_add_test_case to_deaddirlink atf_add_test_case to_link_outside atf_add_test_case dstmode + atf_add_test_case to_root } From nobody Fri May 30 15:54:39 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b878v4T25z5xply; Fri, 30 May 2025 15:54: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b878v3yQ8z3Q7w; Fri, 30 May 2025 15:54:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748620479; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Gd73C9YIhiIosmcoec4rInXtCgqpiRtmPzdNp5k7PlY=; b=sJs6H0WOEPF+3fh8kdHnIP8Q6xYg72lL8wBYGpfWGpiRgZFAHcyuvIrcVb9ho9OcXI0heR aXuL6RHL5PpMAET1S5diYRChNEnbJfwJqhR6PZyyLCVlyhEZFQ2UPpdbfARKOBUiqr5iVD kSanRGC6KpI0ycpAjjKBn2G+TBcVW+NJQvCbxeXkMaHEzPoNM2sj8G1O7DZtt7xweMg0GZ IBDLPI6zH8Co7Yvm+cc/68z5C+IcTPPb4/uEc3/gEV6HqCp5z8xQG0ZtDe5zs/SEX+MbRB DX8TajBeG054EebXquo/QkfQi3/9IduQZ8xHY4qP8eJttUw4e/UN8Z+rrByzyg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748620479; a=rsa-sha256; cv=none; b=X3GcKeiwemOBrOy9FEzUnytbh2YuMqF5o2j8y9PEU6K3exmwIIkSgULG5dIy7sL1eWjzKn F3okx3c4Ds0npHaZdl53Vv9/BAUvcg8G5OYgxEUQIe7pcIc5FEbmCLgNusqMSsVT/zdGkB ktLMje0J794jWKJIU14doUPcJ3Ur33Sh8a3Ff8ypFpg/thmNSErGXYlCU5SxFFzJIrsq9m KBN3MkrGxrWW0CRKzS4rjXj5F6FFWPr6B9Pdn6hCHED5w9fwQoaq2uvZw7cZtzj7ga0v0k WvOM6vT2qjPMD208v93kgJV4DKJP10zBblSpaD01dZHO6BFavXMMg/GOSFyIig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748620479; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Gd73C9YIhiIosmcoec4rInXtCgqpiRtmPzdNp5k7PlY=; b=uZp6h7sFZjaMx+Kd/YsAtb7M+MbmAr6N1lms8RLiuabhmvHNM2RycW+y39TGUSXvPJg5Wg AmecW7P9fNypwv6Ey8kyFfp9ru+dwXZoPqM7VlJIoSYIDZE44QT/kty02rJiIbvynXf1Hq 90MtXCJhzTHRYcRWXdjNfR+AB+ybk8jbY1+LYc40UN03Ok2LVzFPmSrZJHDxP49lvJuO8S pnMbtVof7UyQJtP5uWtLzG0X8mdVofpSGuEUvRpWWa7UAh7iUrtr/4Hd+xLT9F17KANMPh ebZD1eL5/IqId4hyKAaJVi1Wo63thm7Ki6EvtyCx0+EkfOOfI3lkNgGlH4UNDQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b878v3LWqz104F; Fri, 30 May 2025 15:54: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 54UFsdZN078367; Fri, 30 May 2025 15:54:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54UFsdV7078364; Fri, 30 May 2025 15:54:39 GMT (envelope-from git) Date: Fri, 30 May 2025 15:54:39 GMT Message-Id: <202505301554.54UFsdV7078364@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: c5db8f65622a - releng/14.3 - Revert "14.3: Update to RC1" List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.3 X-Git-Reftype: branch X-Git-Commit: c5db8f65622ae0be9c65bc57326f787a1b3994f7 Auto-Submitted: auto-generated The branch releng/14.3 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=c5db8f65622ae0be9c65bc57326f787a1b3994f7 commit c5db8f65622ae0be9c65bc57326f787a1b3994f7 Author: Colin Percival AuthorDate: 2025-05-30 15:53:05 +0000 Commit: Colin Percival CommitDate: 2025-05-30 15:53:21 +0000 Revert "14.3: Update to RC1" Postponing RC1 slightly to allow one more critical bug fix. This reverts commit 3383279318c0564d405c64516cdd127bc2a0dd9f. Approved by: re (cperciva) --- sys/conf/newvers.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index 1ebacc6cc176..8c988150f902 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -53,7 +53,7 @@ TYPE="FreeBSD" REVISION="14.3" -BRANCH="RC1" +BRANCH="BETA4" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi From nobody Fri May 30 15:57:21 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b87D21drNz5xq8T; Fri, 30 May 2025 15:57: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b87D14RFHz3RVl; Fri, 30 May 2025 15:57:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748620641; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PC0GS4zLg/SnjW4pcdXf3JkWlXKz69/D8McXWbfXUGI=; b=Di6uCCM4wlXupPEniliGEzkj7ob9qROSk/KPWfKdkkFJwGkbSfOsu/Cd9e2udZqJCMusEe Qv8TnRHsUM/evBNexp4cLTnolCc/FMwy2Wxrhll7QlyhfKaqNKcT+fdUn7pA8Gvmi7lr/F RJfzZ2/Nm/lb4iLcEKr3ZS7WBtgeKH2J/qL/iPqhvyJRYJn5mbbToas413XtZcgLnavaZn rZd8ArYfFPcbcnHtsgaLRvIPeLKuZQGDRW/lxGlxbjgGqe6fo6VQt1OKeDPgxcJ08ZhNBg nY6AhAJSzFDwru1ZmXPvpyRXoscfRSKgTWsY8plDhrfV1BPxwjmvEmZWFLX1DA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748620641; a=rsa-sha256; cv=none; b=WFA6BOW8m1wu4h3hVasqFbEWAmwMquQdr0kf2NRGvuB3lGDgBg/m5T7dxnr0vTVwBEIKtG KAL1yMpg4aTdSVtxEre91i4MxoF9nsm+ARfTvOtckK7k6pngLUaFP6+4oJDucshsr80h6m eTjXJ62TizWfsYIGe6X7RWHrWkwAJQ+rBiPfEqjA8tfnwX6cf9CUuWefIL5VzFsHbFr3ao 72I+FANBJeC9WUwM6KMVHGhfeWM0mPKQ+fstOa7Lp6k6lC4f7/FjQwz4gR4ZNkMOEXew8D 5vbY2CLyVnf5A7dJlo5wBrXkbaHFN0hfRDqmOTWG2rPC29G4uoNwHXTxB/B5Kg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748620641; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PC0GS4zLg/SnjW4pcdXf3JkWlXKz69/D8McXWbfXUGI=; b=xJ4dA09cU9W2epuPyf4lQ8m/jXiq5+3ASi+iWBC6iZi4VQwedl5apJVtDIuWa6mdsSqd6b OHQAh2RicO2LEV6fe3ul9eCeEKm6klkuuHk0JrodoX18aiAXoK1zNuYZWMYkanNIf68rED dAyUKNbeQp5kjFXC5vu5AreNfZVYLQCPVJjRceVEdTP0s13qIKnsKXPXsM56U56IuGBbnt 5Nct3LFAoPs8TfWTiJ2PGFmsJ4d3KqXbhJwWc1Zg5ScMT6F4VbgHZQ0jGfp26bQ9pq+oja XSPHtUSfk3H44x2QoEze0Hw2AFWBOVXgjMvlIfawqVQgRnQh58bwS+nPV6YRpQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b87D13v7Nzyyn; Fri, 30 May 2025 15:57: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 54UFvLM4079292; Fri, 30 May 2025 15:57:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54UFvLQk079289; Fri, 30 May 2025 15:57:21 GMT (envelope-from git) Date: Fri, 30 May 2025 15:57:21 GMT Message-Id: <202505301557.54UFvLQk079289@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: 700a2c08dcea - main - stand/efi: Use EFI_PAGE_SIZE here, it's more appropriate List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 700a2c08dceab4dc41859e5c1501ec3b186f6cbd Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=700a2c08dceab4dc41859e5c1501ec3b186f6cbd commit 700a2c08dceab4dc41859e5c1501ec3b186f6cbd Author: Warner Losh AuthorDate: 2025-05-30 14:14:15 +0000 Commit: Warner Losh CommitDate: 2025-05-30 15:56:50 +0000 stand/efi: Use EFI_PAGE_SIZE here, it's more appropriate No functional change: We're allocating a page from EFI, which is always 4k on amd64. So, this should always be 4k. PAGE_SIZE usually is this, but might not be in some cases. For the end of the stack pointer in the ist1, it should point the architecture's physical page past where we've allocated. EFI_PAGE_SIZE more faithfully reflects that here since PAGE_SIZE might not be exactly that in the future (if we had a larger logical page than physical page). Since the AllocPage interface is in EFI_PAGE_SIZE pages always, this seems safer. No functional change since they are both 2096 today. Sponsored by: Netflix Reviewed by: tsoome Differential Revision: https://reviews.freebsd.org/D50584 --- stand/efi/loader/arch/amd64/trap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stand/efi/loader/arch/amd64/trap.c b/stand/efi/loader/arch/amd64/trap.c index 95a42a18f719..61feb76e2dca 100644 --- a/stand/efi/loader/arch/amd64/trap.c +++ b/stand/efi/loader/arch/amd64/trap.c @@ -356,7 +356,7 @@ efi_redirect_exceptions(void) PREPARE_EXCEPTION(19); PREPARE_EXCEPTION(20); - exc_rsp = exc_stack_pa + PAGE_SIZE - + exc_rsp = exc_stack_pa + EFI_PAGE_SIZE - (6 /* hw exception frame */ + 3 /* scratch regs */) * 8; /* Find free IST and use it */ @@ -376,7 +376,7 @@ efi_redirect_exceptions(void) if (intercepted[i]) loader_idt_e->gd_ist = ist; } - (&(tss->tss_ist1))[ist - 1] = exc_stack_pa + PAGE_SIZE; + (&(tss->tss_ist1))[ist - 1] = exc_stack_pa + EFI_PAGE_SIZE; /* Switch to new IDT */ rfl = intr_disable(); From nobody Fri May 30 15:57:22 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b87D32RZgz5xqBc; Fri, 30 May 2025 15:57: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b87D25Fpkz3RVq; Fri, 30 May 2025 15:57:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748620642; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=n2KFMScQkaC4qiOLcmDkwS+08YfkaVA0ReUGp0sZk/Y=; b=CF/Y5QWfDn6soIKCC8U9GUVxNSWF4HF/xAMQdUGSiZCMNJrrDdymrkEN6uSoakkvGFiC3e A+96GWUh7L69QkkBTXf7o1l2L/7icPQArTMQ6OSOeWDW46HYhcstMnP4b807tUjATji37r g+oBe+mjeQrigot9efGwpoe/bXr22vq5GU8C0u/0gLORgKpHBijEk+hlD2WfmJcVBaJ86p YvHCO9CxZDGD5Kl0xnp7Q7ZhO21SY63SVcWo8G5mYFZc1S2X00coUU+/sglRPSTze6hRkQ kMsq/jQXd8YvxRdXMZsxBSjVE1YhRBXbho2efAXFdDRIODv4IRChmksS8AAT5w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748620642; a=rsa-sha256; cv=none; b=Gwrau70yEgb046PgamJlh2jCkfusNQHOVr+V0PMTskKs/E8m9pHyC23zaRFSnOBOWZ43vd t4IiBdJeydKHleCQQnOK6MLCf972cotVSd7+8x20ZvV1BDJStas3eToJ0CtLEFQ8e1NsOP igRTRLQasA1It5xHli+xWOBD4aD3AtKRHQvahZjoPcwfE2Pg5kwWaLLVCk23uBH+NIYo5k SZS4umKUdXdPjF8RBFqWOWuNk4kfOP9cqU2Yu46TmTbbMkq6VT6DJwVic7avv2zWwlEGbs WoZ1wMkVHKRdymXW29gzbv7jQpcgeEFvlzJDgG5abbjLeYEqRU9bGo1/nyqeBQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748620642; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=n2KFMScQkaC4qiOLcmDkwS+08YfkaVA0ReUGp0sZk/Y=; b=onsYbCzs1VV22Q1N3jVQTAOdN3zZCWiKtZCIlMvmgAad/DipsjT4QWJgr5GA+1FFjP2cUF 7jT3K7gsNuAL4TqDcXFtpIXKE8NcHUTm9o+31HzhU6129N/zMqIrWsD8yejAGskS1Y3qUT JO8/uvvbrxJENpFSCetBct6xacxAWqTJDcJWDWzUcPSZSyLRh8XF5RopxH3W4z/gpL8oHs 1b6QqZ6MgKpW6OuklXV8joky9k2TaTblp7wcQmDbqxnY0rZQLcwnoqIf5iPlGvM73fw+5Y j8EV9kDtyBGT/CpgP3FpeRYaS/88sv0kVqlIJATUud5Gc74mu0dAMtAhgQgyIQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b87D24sKCz101q; Fri, 30 May 2025 15:57: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 54UFvMPB079328; Fri, 30 May 2025 15:57:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54UFvMdO079325; Fri, 30 May 2025 15:57:22 GMT (envelope-from git) Date: Fri, 30 May 2025 15:57:22 GMT Message-Id: <202505301557.54UFvMdO079325@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: a3bdf33f3e46 - main - stand: Introduce md_align List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: a3bdf33f3e46d37a2288faa0391e59ce65d430cb Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=a3bdf33f3e46d37a2288faa0391e59ce65d430cb commit a3bdf33f3e46d37a2288faa0391e59ce65d430cb Author: Warner Losh AuthorDate: 2025-05-30 14:14:29 +0000 Commit: Warner Losh CommitDate: 2025-05-30 15:56:50 +0000 stand: Introduce md_align When we're loading metadata, we need to align it in a certain way. Right now that way is hard-coded to be PAGE_SIZE. Rather than do the actual physical thing in all these places, move this into a wrapper routine. We may want to load a 16k kernel and align all these on 16k or a 4k kernel and align on 4k on aarch64 (today you have to compile the loader with the right page size). This will also reduce the number of places we might have to touch to do that. Sponsored by: Netflix Reviewed by: tsoome, jhibbits Differential Revision: https://reviews.freebsd.org/D50585 --- stand/common/metadata.c | 8 ++++---- stand/common/modinfo.c | 22 ++++++++++++++++++++++ stand/common/modinfo.h | 1 + stand/efi/loader/bootinfo.c | 12 ++++++------ stand/i386/libi386/bootinfo32.c | 6 +++--- stand/i386/libi386/bootinfo64.c | 6 +++--- stand/userboot/userboot/bootinfo32.c | 6 +++--- stand/userboot/userboot/bootinfo64.c | 6 +++--- 8 files changed, 45 insertions(+), 22 deletions(-) diff --git a/stand/common/metadata.c b/stand/common/metadata.c index 715354aedd04..3b2ba3e4d790 100644 --- a/stand/common/metadata.c +++ b/stand/common/metadata.c @@ -123,14 +123,14 @@ md_load_dual(char *args, vm_offset_t *modulep, vm_offset_t *dtb, int kern64) addr = xp->f_addr + xp->f_size; } /* Pad to a page boundary */ - addr = roundup(addr, PAGE_SIZE); + addr = md_align(addr); /* Copy our environment */ envp = addr; addr = md_copyenv(addr); /* Pad to a page boundary */ - addr = roundup(addr, PAGE_SIZE); + addr = md_align(addr); #if defined(LOADER_FDT_SUPPORT) /* Copy out FDT */ @@ -141,7 +141,7 @@ md_load_dual(char *args, vm_offset_t *modulep, vm_offset_t *dtb, int kern64) { size = fdt_copy(addr); fdtp = addr; - addr = roundup(addr + size, PAGE_SIZE); + addr = md_align(addr + size); } #endif @@ -176,7 +176,7 @@ md_load_dual(char *args, vm_offset_t *modulep, vm_offset_t *dtb, int kern64) *modulep = addr; size = md_copymodules(0, kern64); - kernend = roundup(addr + size, PAGE_SIZE); + kernend = md_align(addr + size); md = file_findmetadata(kfp, MODINFOMD_KERNEND); if (kern64) { diff --git a/stand/common/modinfo.c b/stand/common/modinfo.c index d00548c91c57..100f2c704d8f 100644 --- a/stand/common/modinfo.c +++ b/stand/common/modinfo.c @@ -194,3 +194,25 @@ md_copyenv(vm_offset_t start) last = start; return(last); } + +/* + * Take the ending address and round it up to the currently required + * alignment. This typically is the page size, but is the larger of the compiled + * kernel page size, the loader page size, and the typical page size on the + * platform. + * + * XXX For the moment, it's just PAGE_SIZE to make the refactoring go faster, + * but needs to hook-in arch_loadaddr (or its replacement) functionality. + * + * Also, we may need other logical things when dealing with different types of + * page sizes and/or masking or sizes. This works well for addr and sizes, but + * not for masks. + * + * Also, this is different than the MOD_ALIGN macro above, which is used for + * aligning elements in the metadata lists, not for whare modules can begin. + */ +vm_offset_t +md_align(vm_offset_t addr) +{ + return (roundup(addr, PAGE_SIZE)); +} diff --git a/stand/common/modinfo.h b/stand/common/modinfo.h index d26129089fb6..d613d8e27f1f 100644 --- a/stand/common/modinfo.h +++ b/stand/common/modinfo.h @@ -16,5 +16,6 @@ int md_load64(char *args, vm_offset_t *modulep, vm_offset_t *dtb); vm_offset_t md_copymodules(vm_offset_t addr, bool kern64); vm_offset_t md_copyenv(vm_offset_t addr); +vm_offset_t md_align(vm_offset_t addr); #endif /* COMMON_MODINFO_H */ diff --git a/stand/efi/loader/bootinfo.c b/stand/efi/loader/bootinfo.c index 75d755686658..b8f1a2ffd56c 100644 --- a/stand/efi/loader/bootinfo.c +++ b/stand/efi/loader/bootinfo.c @@ -389,18 +389,18 @@ bi_load(char *args, vm_offset_t *modulep, vm_offset_t *kernendp, bool exit_bs) } /* Pad to a page boundary. */ - addr = roundup(addr, PAGE_SIZE); + addr = md_align(addr); #ifdef EFI addr = build_font_module(addr); /* Pad to a page boundary. */ - addr = roundup(addr, PAGE_SIZE); + addr = md_align(addr); addr = build_splash_module(addr); /* Pad to a page boundary. */ - addr = roundup(addr, PAGE_SIZE); + addr = md_align(addr); #endif /* Copy our environment. */ @@ -408,7 +408,7 @@ bi_load(char *args, vm_offset_t *modulep, vm_offset_t *kernendp, bool exit_bs) addr = md_copyenv(addr); /* Pad to a page boundary. */ - addr = roundup(addr, PAGE_SIZE); + addr = md_align(addr); #if defined(LOADER_FDT_SUPPORT) /* Handle device tree blob */ @@ -417,7 +417,7 @@ bi_load(char *args, vm_offset_t *modulep, vm_offset_t *kernendp, bool exit_bs) /* Pad to a page boundary */ if (dtb_size) - addr += roundup(dtb_size, PAGE_SIZE); + addr += md_align(dtb_size); #endif kfp = file_findfile(NULL, md_kerntype); @@ -461,7 +461,7 @@ bi_load(char *args, vm_offset_t *modulep, vm_offset_t *kernendp, bool exit_bs) #endif size = md_copymodules(0, is64); /* Find the size of the modules */ - kernend = roundup(addr + size, PAGE_SIZE); + kernend = md_align(addr + size); *kernendp = kernend; /* patch MODINFOMD_KERNEND */ diff --git a/stand/i386/libi386/bootinfo32.c b/stand/i386/libi386/bootinfo32.c index 37b227b913bd..6655e62f8065 100644 --- a/stand/i386/libi386/bootinfo32.c +++ b/stand/i386/libi386/bootinfo32.c @@ -118,7 +118,7 @@ bi_load32(char *args, int *howtop, int *bootdevp, vm_offset_t *bip, vm_offset_t addr = xp->f_addr + xp->f_size; } /* pad to a page boundary */ - addr = roundup(addr, PAGE_SIZE); + addr = md_align(addr); addr = build_font_module(addr); @@ -127,7 +127,7 @@ bi_load32(char *args, int *howtop, int *bootdevp, vm_offset_t *bip, vm_offset_t addr = md_copyenv(addr); /* pad to a page boundary */ - addr = roundup(addr, PAGE_SIZE); + addr = md_align(addr); kfp = file_findfile(NULL, md_kerntype); if (kfp == NULL) @@ -145,7 +145,7 @@ bi_load32(char *args, int *howtop, int *bootdevp, vm_offset_t *bip, vm_offset_t /* Figure out the size and location of the metadata */ *modulep = addr; size = md_copymodules(0, false); - kernend = roundup(addr + size, PAGE_SIZE); + kernend = md_align(addr + size); *kernendp = kernend; /* patch MODINFOMD_KERNEND */ diff --git a/stand/i386/libi386/bootinfo64.c b/stand/i386/libi386/bootinfo64.c index f7181dcd599f..7d74a865ff40 100644 --- a/stand/i386/libi386/bootinfo64.c +++ b/stand/i386/libi386/bootinfo64.c @@ -136,7 +136,7 @@ bi_load64(char *args, vm_offset_t *modulep, addr = xp->f_addr + xp->f_size; } /* pad to a page boundary */ - addr = roundup(addr, PAGE_SIZE); + addr = md_align(addr); addr = build_font_module(addr); @@ -161,11 +161,11 @@ bi_load64(char *args, vm_offset_t *modulep, size = md_copymodules(0, true); /* copy our environment */ - envp = roundup(addr + size, PAGE_SIZE); + envp = md_align(addr + size); addr = md_copyenv(envp); /* set kernend */ - kernend = roundup(addr, PAGE_SIZE); + kernend = md_align(addr); *kernendp = kernend; /* patch MODINFOMD_KERNEND */ diff --git a/stand/userboot/userboot/bootinfo32.c b/stand/userboot/userboot/bootinfo32.c index 750574912172..6ba76cc56479 100644 --- a/stand/userboot/userboot/bootinfo32.c +++ b/stand/userboot/userboot/bootinfo32.c @@ -99,14 +99,14 @@ bi_load32(char *args, int *howtop, int *bootdevp, vm_offset_t *bip, vm_offset_t addr = xp->f_addr + xp->f_size; } /* pad to a page boundary */ - addr = roundup(addr, PAGE_SIZE); + addr = md_align(addr); /* copy our environment */ envp = addr; addr = md_copyenv(addr); /* pad to a page boundary */ - addr = roundup(addr, PAGE_SIZE); + addr = md_align(addr); kfp = file_findfile(NULL, md_kerntype); if (kfp == NULL) @@ -123,7 +123,7 @@ bi_load32(char *args, int *howtop, int *bootdevp, vm_offset_t *bip, vm_offset_t /* Figure out the size and location of the metadata */ *modulep = addr; size = md_copymodules(0, false); - kernend = roundup(addr + size, PAGE_SIZE); + kernend = md_align(addr + size); *kernendp = kernend; /* patch MODINFOMD_KERNEND */ diff --git a/stand/userboot/userboot/bootinfo64.c b/stand/userboot/userboot/bootinfo64.c index d20202bf4fbb..3e289bbebba0 100644 --- a/stand/userboot/userboot/bootinfo64.c +++ b/stand/userboot/userboot/bootinfo64.c @@ -131,14 +131,14 @@ bi_load64(char *args, vm_offset_t *modulep, vm_offset_t *kernendp) addr = xp->f_addr + xp->f_size; } /* pad to a page boundary */ - addr = roundup(addr, PAGE_SIZE); + addr = md_align(addr); /* copy our environment */ envp = addr; addr = md_copyenv(addr); /* pad to a page boundary */ - addr = roundup(addr, PAGE_SIZE); + addr = md_align(addr); kfp = file_findfile(NULL, md_kerntype); if (kfp == NULL) @@ -152,7 +152,7 @@ bi_load64(char *args, vm_offset_t *modulep, vm_offset_t *kernendp) /* Figure out the size and location of the metadata */ *modulep = addr; size = md_copymodules(0, true); - kernend = roundup(addr + size, PAGE_SIZE); + kernend = md_align(addr + size); *kernendp = kernend; /* patch MODINFOMD_KERNEND */ From nobody Fri May 30 15:57:23 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b87D432l5z5xq8V; Fri, 30 May 2025 15:57: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b87D36Fmcz3RFr; Fri, 30 May 2025 15:57:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748620643; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=so45R1EyO1I3t2G5TTB1PRlyWYm8rWa9zvurSPzd08U=; b=XOEyCxKVIENiINtZwcgh1Xs8dO+xqEJVl0f5lDNfdpTtm7YamrPbn3JQ+FQ5tLPgeX/Vac wqtdArbVsEONv5gPNKdrW6rV8wzeejUoDq7UG2RuqPsF2AjofD3Mk5wFM/2GI8vMDXuhJc wRksFkytRxW90uk6J/GhD8tgfSEKOmHrDF76Ifz+rRL6LJTC9eFhn06jij3n1U8vBWw7gN bwULdCqYXporMT3dZY8qm0pSCSqP0IqxtoOqPJaYb+5jXjFov+T7BnFllUAPTK8Cenz/1c cPBemVvi8q27grVw8BzhCFyaOtSCS177G7wfqsWIyKuo6hTq5aiv2CxrkU3Gtw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748620643; a=rsa-sha256; cv=none; b=D1jOjRkMEsSe/eBSozxS7Y5bxvDS97PcqZuUB3uYq7jsiFbIejqubFfDGuVbkBwCjvh0zh Ox5dNCv6YCRMuZG5LutMXxH6MRg/khk+O+5IR+sJXzfhTKyYM9eGXauW5Xk4cAQ4+fQ3H1 mLcP7qdVmjJ9BKhtNhx/EpWe80JHOE9gWpDYKygNCxeGqEFrFjc6mJjoHzly31vaC3phNp WdjoYZNftWkIUYU1kA9Rb2ogtkHsxtf4gzyHuKT/GJSyhc64SUcB67qRyXxTiIu7IRWtws AkPEJr5iqx+B43nlQMKzSlo8jXJ9hDkKfbBq+degPhL2w8G4yqgzrBC6EoxSVA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748620643; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=so45R1EyO1I3t2G5TTB1PRlyWYm8rWa9zvurSPzd08U=; b=bOhQ1/vu3vqPbK3X+4mxEV7Xh6/abATGR+xMC1E5Q1YaKKMqFmkmLPX6s8GGp2AUiB55Wr nocJujA64B0nzXGfBueLLgpTreHMKFFXKwPzkI9AYHLDCqzAwCh4TbUMSbZ7VGzsfbWusH rAONZXbeyOdwp1a4s3eQ7npkN0m43grs9LdP17iihg9twT4XhU8M2PJIgDeeYX9KNtrvDI FFBSrzt7kk+rr23C1idBGTQXRMOvk1UZdLkzZTEdW9FCiYOxzNTvUVdJSl6NQHxHM4ETXE 6I8em5yyIWvxqxnqLFin7I2AY84Vkn2T1VgxPWMZkYdbtmFWa/eD5WRtMp7yow== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b87D35nZWzyyp; Fri, 30 May 2025 15:57: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 54UFvN3Y079361; Fri, 30 May 2025 15:57:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54UFvNZY079358; Fri, 30 May 2025 15:57:23 GMT (envelope-from git) Date: Fri, 30 May 2025 15:57:23 GMT Message-Id: <202505301557.54UFvNZY079358@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: 18582d3542ad - main - stand: Style nit List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 18582d3542adfac6ac3e3d9107ae7442d961951b Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=18582d3542adfac6ac3e3d9107ae7442d961951b commit 18582d3542adfac6ac3e3d9107ae7442d961951b Author: Warner Losh AuthorDate: 2025-05-30 14:14:37 +0000 Commit: Warner Losh CommitDate: 2025-05-30 15:56:50 +0000 stand: Style nit Sponsored by: Netflix Reviewed by: chs, tsoome Differential Revision: https://reviews.freebsd.org/D50586 --- stand/common/module.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/stand/common/module.c b/stand/common/module.c index 0c9dbcb53c2e..ce6d095d4315 100644 --- a/stand/common/module.c +++ b/stand/common/module.c @@ -454,7 +454,8 @@ command_pnpload(int argc, char *argv[]) #if defined(LOADER_FDT_SUPPORT) static void -pnpautoload_fdt_bus(const char *busname) { +pnpautoload_fdt_bus(const char *busname) +{ const char *pnpstring; const char *compatstr; char *pnpinfo = NULL; From nobody Fri May 30 15:57:24 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b87D53DxRz5xqBd; Fri, 30 May 2025 15:57: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b87D470Fbz3RHp; Fri, 30 May 2025 15:57:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748620645; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GEC/x2X3Aa/kouAkeckW76xYLBeIN+J2tIIi9X3jAEk=; b=la+coovGx7eoAdCzsreaq09/wCRXWYLHwCidPxdSoDH6F1Gh9Q/PCUzxDNIgM9AYXn2eZS 6vWA8F9d2qPW8xxoA2mh6J4EYUfQ+Z8q7j5pcf28m43/bPWAI8d0hUExk71PIzyG79xbcQ YW6zQeDGSgAAxr5Ts3Jo50tY4wswCIsz3BmNpesTO6wq/BhuAxrTYPpCI+BmH2bPR3urYm r6rZOFyc8/FVZBXsBEPWOx6aia42LYSMBlpoCwuIy8HKom0w68kSLYfHuRdUtrJUJ95ffN nscEBHZgWzMYDXcqSx9Vffy4U8HpJsIJKnzIod84pOr5J6elshl714Zx5Bs42g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748620645; a=rsa-sha256; cv=none; b=crMkGQW29QFTYdJYonPXbTVzCUYMcqGG2bQsuxwJwEN41HxPKm1z/kBonuhcF8Y0B2W8oe 6Ri2fqrNy7RMv3iS3frMQuU8eGDTTm3PAEjpKeE2hGqSZ3fpkK7DGiGF6wLAfqg4eNgW9e drm/L7jlTl5BOBs2zDvrhDMW9j0yuzmyfkKOUjKakVuDWZGUTl08NyIzcqufjXfdPexbRG HnfLc5V5tBD88Dg1BVlmKPOvVy3OaKW4axTLqFU+uYLcecbfNSUGRveQKaigSXKkzfsdxR bvyOG1Mv5TPLgBhYd4O1dzZ0XB20Aw9p4eqHHJnE7Q6bix/ZGzZqN0T5DjkS/w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748620645; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GEC/x2X3Aa/kouAkeckW76xYLBeIN+J2tIIi9X3jAEk=; b=yOPeDRcm+JuLmwy18GG+gvUUAEqfJi9Snm54cwn6e4/5fP/fDqfJRBMy2CFbrcu70rVAhW DeHnAjVLT3I4+BgQvvUfw0rTYAoicNKJPZ1Q1+tjPasd0cWmsTmxiC6yOtN97ORInRUioE AQ5QiS9ySLXhniLIfWHQevosL3aO1Xgg18jztwDbjHNmbgFU+tDGlF5+GwzPYZpB6biCDe 3xOqg/rJRYGcGxPKxRwqhJSOLcAGFXV6wt+GstM8BVVEiBvuLbECG8/gTLcQ4t2hWOgtHx lBZZC18dZ8OJGk/SrMWCiFS27pUmGROCAj0yTiX3EvvnADNg17v7znumJpM2lg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b87D46SrZz104G; Fri, 30 May 2025 15:57: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 54UFvODn079394; Fri, 30 May 2025 15:57:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54UFvOke079391; Fri, 30 May 2025 15:57:24 GMT (envelope-from git) Date: Fri, 30 May 2025 15:57:24 GMT Message-Id: <202505301557.54UFvOke079391@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: 6aea7b224a34 - main - stand: Retire arch_loadaddr using md_align, pending its replacement List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 6aea7b224a34ccc800f9598f034838af7e47eb62 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=6aea7b224a34ccc800f9598f034838af7e47eb62 commit 6aea7b224a34ccc800f9598f034838af7e47eb62 Author: Warner Losh AuthorDate: 2025-05-30 14:14:44 +0000 Commit: Warner Losh CommitDate: 2025-05-30 15:56:50 +0000 stand: Retire arch_loadaddr using md_align, pending its replacement arch_loadaddr() is inconsistently used. In fact, I removed it entirely from kboot because its interface wasn't wide enough (though I broke powerpc kboot several years ago, and this commit might fix that). For now, modify uboot to put it into copyin like all the other loaders do. This might break arm ubldr. In its place, use the new md_align() and any replacement will be called from there, or via some explicit init() function. These changes allow me to load a amd64 kernel via UEFI with all the modules aligned to 16k. Sponsored by: Netflix Reviewed by: jhibbits Differential Revision: https://reviews.freebsd.org/D50587 --- stand/common/bootstrap.h | 8 -- stand/common/load_elf.c | 6 +- stand/common/load_elf_obj.c | 5 +- stand/common/modinfo.c | 2 +- stand/common/module.c | 11 +- stand/kboot/kboot/arch/aarch64/exec.c | 6 +- stand/kboot/kboot/arch/amd64/elf64_freebsd.c | 6 +- .../kboot/kboot/arch/powerpc64/ppc64_elf_freebsd.c | 17 +-- stand/uboot/copy.c | 149 ++++++++++----------- stand/uboot/libuboot.h | 1 - stand/uboot/main.c | 1 - 11 files changed, 95 insertions(+), 117 deletions(-) diff --git a/stand/common/bootstrap.h b/stand/common/bootstrap.h index 88ee6de2e520..dca0cf6bb2d5 100644 --- a/stand/common/bootstrap.h +++ b/stand/common/bootstrap.h @@ -351,14 +351,6 @@ struct arch_switch int (*arch_isainb)(int port); void (*arch_isaoutb)(int port, int value); - /* - * Interface to adjust the load address according to the "object" - * being loaded. - */ - uint64_t (*arch_loadaddr)(u_int type, void *data, uint64_t addr); -#define LOAD_ELF 1 /* data points to the ELF header. */ -#define LOAD_RAW 2 /* data points to the file name. */ - /* * Interface to inform MD code about a loaded (ELF) segment. This * can be used to flush caches and/or set up translations. diff --git a/stand/common/load_elf.c b/stand/common/load_elf.c index 537692e7d745..b9f55a21e403 100644 --- a/stand/common/load_elf.c +++ b/stand/common/load_elf.c @@ -403,6 +403,7 @@ __elfN(loadfile_raw)(char *filename, uint64_t dest, * in the elf header (an ARM kernel can be loaded at any 2MB * boundary), so we leave dest set to the value calculated by * archsw.arch_loadaddr() and passed in to this function. + * XXX This comment is obsolete, but it still seems to work */ #ifndef __arm__ if (ehdr->e_type == ET_EXEC) @@ -445,10 +446,7 @@ __elfN(loadfile_raw)(char *filename, uint64_t dest, goto oerr; } - if (archsw.arch_loadaddr != NULL) - dest = archsw.arch_loadaddr(LOAD_ELF, ehdr, dest); - else - dest = roundup(dest, PAGE_SIZE); + dest = md_align(dest); /* * Ok, we think we should handle this. diff --git a/stand/common/load_elf_obj.c b/stand/common/load_elf_obj.c index c20da80eb602..9e32daa53696 100644 --- a/stand/common/load_elf_obj.c +++ b/stand/common/load_elf_obj.c @@ -157,10 +157,7 @@ __elfN(obj_loadfile)(char *filename, uint64_t dest, goto oerr; } - if (archsw.arch_loadaddr != NULL) - dest = archsw.arch_loadaddr(LOAD_ELF, hdr, dest); - else - dest = roundup(dest, PAGE_SIZE); + dest = md_align(dest); /* * Ok, we think we should handle this. diff --git a/stand/common/modinfo.c b/stand/common/modinfo.c index 100f2c704d8f..313469d32f35 100644 --- a/stand/common/modinfo.c +++ b/stand/common/modinfo.c @@ -202,7 +202,7 @@ md_copyenv(vm_offset_t start) * platform. * * XXX For the moment, it's just PAGE_SIZE to make the refactoring go faster, - * but needs to hook-in arch_loadaddr (or its replacement) functionality. + * but needs to hook-in the replacement of arch_loadaddr. * * Also, we may need other logical things when dealing with different types of * page sizes and/or masking or sizes. This works well for addr and sizes, but diff --git a/stand/common/module.c b/stand/common/module.c index ce6d095d4315..ed57ebf0caf8 100644 --- a/stand/common/module.c +++ b/stand/common/module.c @@ -43,6 +43,7 @@ #endif #include "bootstrap.h" +#include "modinfo.h" #define MDIR_REMOVED 0x0001 #define MDIR_NOHINTS 0x0002 @@ -562,8 +563,7 @@ file_load(char *filename, vm_offset_t dest, struct preloaded_file **result) int i; TSENTER2(filename); - if (archsw.arch_loadaddr != NULL) - dest = archsw.arch_loadaddr(LOAD_RAW, filename, dest); + dest = md_align(dest); error = EFTYPE; for (i = last_file_format, fp = NULL; @@ -713,8 +713,7 @@ file_loadraw(const char *fname, const char *type, int insert) #endif #endif - if (archsw.arch_loadaddr != NULL) - loadaddr = archsw.arch_loadaddr(LOAD_RAW, name, loadaddr); + loadaddr = md_align(loadaddr); if (module_verbose > MODULE_VERBOSE_SILENT) printf("%s ", name); @@ -1015,9 +1014,7 @@ file_addbuf(const char *name, const char *type, size_t len, void *buf) } /* Figure out where to load the data. */ - dest = loadaddr; - if (archsw.arch_loadaddr != NULL) - dest = archsw.arch_loadaddr(LOAD_RAW, (void *)name, dest); + dest = md_align(loadaddr); /* Create & populate control structure */ fp = file_alloc(); diff --git a/stand/kboot/kboot/arch/aarch64/exec.c b/stand/kboot/kboot/arch/aarch64/exec.c index 40eb57f371a9..df3e922dfe11 100644 --- a/stand/kboot/kboot/arch/aarch64/exec.c +++ b/stand/kboot/kboot/arch/aarch64/exec.c @@ -188,9 +188,9 @@ elf64_exec(struct preloaded_file *fp) /* * Figure out where to put it. * - * Linux does not allow us to kexec_load into any part of memory. Ask - * arch_loadaddr to resolve the first available chunk of physical memory - * where loading is possible (load_addr). + * Linux does not allow us to kexec_load into any part of memory. Find + * the first available chunk of physical memory where loading is + * possible (staging). * * The kernel is loaded at the 'base' address in continguous physical * memory. We use the 2MB in front of the kernel as a place to put our diff --git a/stand/kboot/kboot/arch/amd64/elf64_freebsd.c b/stand/kboot/kboot/arch/amd64/elf64_freebsd.c index 330646715289..576839e29734 100644 --- a/stand/kboot/kboot/arch/amd64/elf64_freebsd.c +++ b/stand/kboot/kboot/arch/amd64/elf64_freebsd.c @@ -178,9 +178,9 @@ elf64_exec(struct preloaded_file *fp) /* * Figure out where to put it. * - * Linux does not allow to do kexec_load into any part of memory. Ask - * arch_loadaddr to resolve the first available chunk of physical memory - * where loading is possible (load_addr). + * Linux does not allow us to do kexec_load into any part of memory. Ask + * kboot_get_phys_load_segment to resolve the first available chunk of + * physical memory where loading is possible (staging). * * The kernel is loaded at the 'base' address in continguous physical * pages (using 2MB super pages). The first such page is unused by the diff --git a/stand/kboot/kboot/arch/powerpc64/ppc64_elf_freebsd.c b/stand/kboot/kboot/arch/powerpc64/ppc64_elf_freebsd.c index ffa00e151661..ae398e357df2 100644 --- a/stand/kboot/kboot/arch/powerpc64/ppc64_elf_freebsd.c +++ b/stand/kboot/kboot/arch/powerpc64/ppc64_elf_freebsd.c @@ -89,21 +89,18 @@ ppc64_elf_exec(struct preloaded_file *fp) /* * Figure out where to put it. * - * Linux does not allow to do kexec_load into - * any part of memory. Ask arch_loadaddr to - * resolve the first available chunk of physical - * memory where loading is possible (load_addr). + * Linux does not allow us to do kexec_load into any part of memory. Ask + * kboot_get_phys_load_segment to resolve the first available chunk of + * physical memory where loading is possible (load_addr). * - * Memory organization is shown below. - * It is assumed, that text segment offset of - * kernel ELF (KERNPHYSADDR) is non-zero, - * which is true for PPC/PPC64 architectures, - * where default is 0x100000. + * Memory organization is shown below. It is assumed, that text segment + * offset of kernel ELF (KERNPHYSADDR) is non-zero, which is true for + * PPC/PPC64 architectures, where default is 0x100000. * * load_addr: trampoline code * load_addr + KERNPHYSADDR: kernel text segment */ - trampolinebase = archsw.arch_loadaddr(LOAD_RAW, NULL, 0); + trampolinebase = kboot_get_phys_load_segment(); printf("Load address at %#jx\n", (uintmax_t)trampolinebase); printf("Relocation offset is %#jx\n", (uintmax_t)elf64_relocation_offset); diff --git a/stand/uboot/copy.c b/stand/uboot/copy.c index e5e985c85b27..7758e754666b 100644 --- a/stand/uboot/copy.c +++ b/stand/uboot/copy.c @@ -1,6 +1,6 @@ /*- * Copyright (c) 1998 Michael Smith - * Copyright (c) 2007 Semihalf, Rafal Jaworowski + * Copyright (c) 2007 Semihalf, Rafal Jaworowski * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -35,7 +35,7 @@ #include "libuboot.h" /* - * MD primitives supporting placement of module data + * MD primitives supporting placement of module data */ #ifdef __arm__ @@ -51,20 +51,17 @@ extern void _start(void); /* ubldr entry point address. */ +uint64_t loadbase; +bool loadbase_set = false; + /* * This is called for every object loaded (kernel, module, dtb file, etc). The * expected return value is the next address at or after the given addr which is * appropriate for loading the given object described by type and data. On each * call the addr is the next address following the previously loaded object. - * - * The first call is for loading the kernel, and the addr argument will be zero, - * and we search for a big block of ram to load the kernel and modules. - * - * On subsequent calls the addr will be non-zero, and we just round it up so - * that each object begins on a page boundary. */ -uint64_t -uboot_loadaddr(u_int type, void *data, uint64_t addr) +static uint64_t +uboot_loadaddr(void) { struct sys_info *si; uint64_t sblock, eblock, subldr, eubldr; @@ -73,87 +70,89 @@ uboot_loadaddr(u_int type, void *data, uint64_t addr) int i; char *envstr; - if (addr == 0) { - /* - * If the loader_kernaddr environment variable is set, blindly - * honor it. It had better be right. We force interpretation - * of the value in base-16 regardless of any leading 0x prefix, - * because that's the U-Boot convention. - */ - envstr = ub_env_get("loader_kernaddr"); - if (envstr != NULL) - return (strtoul(envstr, NULL, 16)); - - /* - * Find addr/size of largest DRAM block. Carve our own address - * range out of the block, because loading the kernel over the - * top ourself is a poor memory-conservation strategy. Avoid - * memory at beginning of the first block of physical ram, - * since u-boot likes to pass args and data there. Assume that - * u-boot has moved itself to the very top of ram and - * optimistically assume that we won't run into it up there. - */ - if ((si = ub_get_sys_info()) == NULL) - panic("could not retrieve system info"); - - biggest_block = 0; - biggest_size = 0; - subldr = rounddown2((uintptr_t)_start, KERN_ALIGN); - eubldr = roundup2((uint64_t)uboot_heap_end, KERN_ALIGN); - for (i = 0; i < si->mr_no; i++) { - if (si->mr[i].flags != MR_ATTR_DRAM) - continue; - sblock = roundup2((uint64_t)si->mr[i].start, - KERN_ALIGN); - eblock = rounddown2((uint64_t)si->mr[i].start + - si->mr[i].size, KERN_ALIGN); - if (biggest_size == 0) - sblock += KERN_MINADDR; - if (subldr >= sblock && subldr < eblock) { - if (subldr - sblock > eblock - eubldr) { - this_block = sblock; - this_size = subldr - sblock; - } else { - this_block = eubldr; - this_size = eblock - eubldr; - } - } else if (subldr < sblock && eubldr < eblock) { - /* Loader is below or engulfs the sblock */ - this_block = (eubldr < sblock) ? sblock : eubldr; - this_size = eblock - this_block; + /* + * If the loader_kernaddr environment variable is set, blindly + * honor it. It had better be right. We force interpretation + * of the value in base-16 regardless of any leading 0x prefix, + * because that's the U-Boot convention. + */ + envstr = ub_env_get("loader_kernaddr"); + if (envstr != NULL) + return (strtoul(envstr, NULL, 16)); + + /* + * Find addr/size of largest DRAM block. Carve our own address + * range out of the block, because loading the kernel over the + * top ourself is a poor memory-conservation strategy. Avoid + * memory at beginning of the first block of physical ram, + * since u-boot likes to pass args and data there. Assume that + * u-boot has moved itself to the very top of ram and + * optimistically assume that we won't run into it up there. + */ + if ((si = ub_get_sys_info()) == NULL) + panic("could not retrieve system info"); + + biggest_block = 0; + biggest_size = 0; + subldr = rounddown2((uintptr_t)_start, KERN_ALIGN); + eubldr = roundup2((uint64_t)uboot_heap_end, KERN_ALIGN); + for (i = 0; i < si->mr_no; i++) { + if (si->mr[i].flags != MR_ATTR_DRAM) + continue; + sblock = roundup2((uint64_t)si->mr[i].start, + KERN_ALIGN); + eblock = rounddown2((uint64_t)si->mr[i].start + + si->mr[i].size, KERN_ALIGN); + if (biggest_size == 0) + sblock += KERN_MINADDR; + if (subldr >= sblock && subldr < eblock) { + if (subldr - sblock > eblock - eubldr) { + this_block = sblock; + this_size = subldr - sblock; } else { - this_block = 0; - this_size = 0; - } - if (biggest_size < this_size) { - biggest_block = this_block; - biggest_size = this_size; + this_block = eubldr; + this_size = eblock - eubldr; } + } else if (subldr < sblock && eubldr < eblock) { + /* Loader is below or engulfs the sblock */ + this_block = (eubldr < sblock) ? sblock : eubldr; + this_size = eblock - this_block; + } else { + this_block = 0; + this_size = 0; } - if (biggest_size == 0) - panic("Not enough DRAM to load kernel"); + if (biggest_size < this_size) { + biggest_block = this_block; + biggest_size = this_size; + } + } + if (biggest_size == 0) + panic("Not enough DRAM to load kernel"); #if 0 - printf("Loading kernel into region 0x%08jx-0x%08jx (%ju MiB)\n", - (uintmax_t)biggest_block, - (uintmax_t)biggest_block + biggest_size - 1, - (uintmax_t)biggest_size / 1024 / 1024); + printf("Loading kernel into region 0x%08jx-0x%08jx (%ju MiB)\n", + (uintmax_t)biggest_block, + (uintmax_t)biggest_block + biggest_size - 1, + (uintmax_t)biggest_size / 1024 / 1024); #endif - return (biggest_block); - } - return roundup2(addr, PAGE_SIZE); + return (biggest_block); } ssize_t uboot_copyin(const void *src, vm_offset_t dest, const size_t len) { - bcopy(src, (void *)dest, len); + if (!loadbase_set) { + loadbase = uboot_loadaddr(); + loadbase_set = true; + } + + bcopy(src, (void *)(dest + loadbase), len); return (len); } ssize_t uboot_copyout(const vm_offset_t src, void *dest, const size_t len) { - bcopy((void *)src, dest, len); + bcopy((void *)(src + loadbase), dest, len); return (len); } diff --git a/stand/uboot/libuboot.h b/stand/uboot/libuboot.h index 4723600b0cee..49bfff3ada6f 100644 --- a/stand/uboot/libuboot.h +++ b/stand/uboot/libuboot.h @@ -57,7 +57,6 @@ extern struct devsw uboot_storage; extern uintptr_t uboot_heap_start; extern uintptr_t uboot_heap_end; -uint64_t uboot_loadaddr(u_int type, void *data, uint64_t addr); ssize_t uboot_copyin(const void *src, vm_offset_t dest, const size_t len); ssize_t uboot_copyout(const vm_offset_t src, void *dest, const size_t len); ssize_t uboot_readin(readin_handle_t fd, vm_offset_t dest, const size_t len); diff --git a/stand/uboot/main.c b/stand/uboot/main.c index 61b691f7edfa..6f53c83543ba 100644 --- a/stand/uboot/main.c +++ b/stand/uboot/main.c @@ -41,7 +41,6 @@ struct uboot_devdesc currdev; struct arch_switch archsw = { /* MI/MD interface boundary */ - .arch_loadaddr = uboot_loadaddr, .arch_getdev = uboot_getdev, .arch_copyin = uboot_copyin, .arch_copyout = uboot_copyout, From nobody Fri May 30 15:57:25 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b87D65Vyrz5xpqC; Fri, 30 May 2025 15:57: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b87D60sBRz3RLb; Fri, 30 May 2025 15:57:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748620646; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tsbhP3dNLXoMdrzhTbQYs7RFwYwHoXYDpUXc4ajQngY=; b=ifNNMd2xLD7Pqtcn5MKwPPcC6OButaBXg0ePALXnojOKLq/5dDby/eUbj8MB7nOOHfp0SL wQqPwuMAYn5O5bjgX6Pe4hPwQFX9LN7KLydrljb9pXpiqoseVBMFH5m9XyRhBZ8T9n9KFX QoDaB2uv3UDoj68AonSYSFC2FjYrUGRmcPZFMqUR172TJuASh+V91I61mDH74FD0DxMfXp qWyIS/LWq+B+48LTFz2w5DHG5FuMxFRgjkKiZniIpb3Rqf1NOzvfhdqFT7nA3tBYvyfaVH nD9rFZaaMUfCLMmnRh6BoTuQvaJCmGq9grL0YcnlfATFbl5mENlXeYr2pHI8tg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748620646; a=rsa-sha256; cv=none; b=sdc1CIKgrElFrMZHtgUGDTw04ceS+zQKT+X55rgMEfZGoSQRkw6A9OSIwsqoIIRlpPItMP aT5VR4qDhP0yZhJWX91qj52a8ooEiNEUNcvBa6oNYd9H+nXMrwIUQsRc5pk9am+XDHNoDD tIFjxJHTORY1+TUf+5aN6/1DWWRfJTUbzZlWO2fXlgxfRSEuJ+8dxLEHYQc191JiOncJmy s9MYQWz6dgUQ/NYLs9XocitnXtX9kF3UEBbq3fQrjedIAfbGKGqWcy+eSZ6O+ixvOVcbgH YSck8jggh7+Jz/ezCy83yMMhAGCgb9VgYPC3e6XuqnDKL0kr2FLsGNh239lvlw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748620646; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tsbhP3dNLXoMdrzhTbQYs7RFwYwHoXYDpUXc4ajQngY=; b=tnM47JjbtzH0I8atrcFts35CMP+/fLLhoV4S8ZErIpvkWNHL4LkyNubf6z0IRVPiCvRlWb 5pDY7eBhn15YhSQZfJtAGrjsN5iJFW2w4EtgQVqenpaBEyPg7UuwdhdEreqcSWqTrXQHz8 myj/ms2rtcTxDI4IVR8r6GOx/p/XEScw1FMs203k8u3qKirdza/+YZIjHQ8x7+oyI/hTvo bsV4n3U5eolGlJC8EEq8d8LQgIWwVCkzfibcjT9lXOM7i1bFMaADByONheVXaVellxGr3q c5GAu1dyWdrzAcKDoABtYgOh6udVerfxAyoGjJcAkTH5LU6doAtsvbhbWTBKTQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b87D60HFXzyh8; Fri, 30 May 2025 15:57: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 54UFvP29079434; Fri, 30 May 2025 15:57:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54UFvPEr079431; Fri, 30 May 2025 15:57:25 GMT (envelope-from git) Date: Fri, 30 May 2025 15:57:25 GMT Message-Id: <202505301557.54UFvPEr079431@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: aeb446be4ea2 - main - style: Use static consistently List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: aeb446be4ea2d214ee48b82bcefd1828c7c256c5 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=aeb446be4ea2d214ee48b82bcefd1828c7c256c5 commit aeb446be4ea2d214ee48b82bcefd1828c7c256c5 Author: Warner Losh AuthorDate: 2025-05-30 14:14:50 +0000 Commit: Warner Losh CommitDate: 2025-05-30 15:56:50 +0000 style: Use static consistently C doesn't require that we have static on both the declaration and definition of a function. But stylistically, FreeBSD does. Make that so. Also make a function static that wasn't because, it seems, that static and struct look a lot alike in a column of text. Sponsored by: Netflix Reviewed by: tsoome, jhibbits Differential Revision: https://reviews.freebsd.org/D50588 --- stand/common/module.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/stand/common/module.c b/stand/common/module.c index ed57ebf0caf8..bc06ba01fa06 100644 --- a/stand/common/module.c +++ b/stand/common/module.c @@ -66,7 +66,7 @@ static char * mod_searchmodule_pnpinfo(const char *bus, const char *pnpinfo); static void file_insert_tail(struct preloaded_file *mp); static void file_remove(struct preloaded_file *fp); static void file_remove_tail(struct preloaded_file *fp); -struct file_metadata* metadata_next(struct file_metadata *base_mp, int type); +static struct file_metadata * metadata_next(struct file_metadata *base_mp, int type); static void moduledir_readhints(struct moduledir *mdp); static void moduledir_rebuild(void); @@ -554,7 +554,7 @@ command_pnpautoload(int argc, char *argv[]) /* * File level interface, functions file_* */ -int +static int file_load(char *filename, vm_offset_t dest, struct preloaded_file **result) { static int last_file_format = 0; @@ -915,7 +915,7 @@ file_findfile(const char *name, const char *type) * Find a module matching (name) inside of given file. * NULL may be passed as a wildcard. */ -struct kernel_module * +static struct kernel_module * file_findmodule(struct preloaded_file *fp, char *modname, struct mod_depend *verinfo) { @@ -1047,7 +1047,7 @@ file_addbuf(const char *name, const char *type, size_t len, void *buf) return(0); } -struct file_metadata * +static struct file_metadata * metadata_next(struct file_metadata *md, int type) { From nobody Fri May 30 15:57:27 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b87D75g4xz5xqFq; Fri, 30 May 2025 15: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b87D72W6Vz3RT4; Fri, 30 May 2025 15: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=1748620647; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NOrFIZPjKXjD1Z1lX1E/9opzQ5FfQAxQQdycffWbxGk=; b=iMMPND/6lTll61bGaWl08pQ4gbZAuwe1BFMyOFlu0Sv/xWAE38RpZXXIMyK5HM7SJEmDqF OlHQJ4A41Z8Ksv7rf5YMmLMGj5YRRZlQaufQEWhRJwhGNpnqmuqRgQPVvnQddG+GvTBSwd 69PDi2ofaKHlNJc5MxlgESlVY6f7ulxztKrgx6J6VQVsrlLeUzfzTHDcPY5jIkNxmnH6VL ZWTmUMP+hZ3+FzuoF/FYmFGQ3JW+6oXS9a0qrIhv7Z0ylWA24FFTbesILdynpwk7/DsnZM qzF5Kd0kxsOhD4FHlpEUi+dP6k0zUo4r4jBTXa0Y3UeyR6L3lPyiWURPBhS00A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748620647; a=rsa-sha256; cv=none; b=aQd9utUSlLZCNWsjYfYnecSX4M07s3EiGdnZSXoah/TNyPYfnc+IyzfbV/uNbMLpPl6FRU J1T5XTpVPbInzjr/T9DF8kywzHHk4KZZN9lbR0+O5nPJiTLGbWpyDv7qsKfICPT1lVHDCA AgY+OHrAw7rmTvwSBW9rD6cXOJ2YkYJOWrCmjqq3/EYbaC2prs0FrZd+7t7zh9CPF7Nfsb XNIvf6kJO1vJWu2jD/PfErHXjcoXL1v4gyESCj0FCxsY0mvBZJEXNiWlum7ah4yKHG+qPI wvDJVaoy3MMWrfK5lXONqjZlVcynvqAwyfm6C12KOXXGlQKCB1SxBRpZcKygVA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748620647; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NOrFIZPjKXjD1Z1lX1E/9opzQ5FfQAxQQdycffWbxGk=; b=pBxCgIYhEVlVRMwvGVeAgto7CPMbe7GFWF3raAbaEXogLhU5wIcuwCxnkmgYz/x/PolAxp FXtX7ICqRqSqULOpgVPSJGtLUfaeZMsmcAvLOkNs9NVL1JgbcgnJoKQdVeyfubr9k2zIqC Rk/pO6gGLRGdDy+wdMro0X9I+h4qy8zW35KLM6sc6LO61pVgRDzPHlHS19zui1kmiCsM1F WoZ23nbSZ6C0vVswKdSD4moUjT15PxnRsGZp0PuAmv2CeHcC7GkTLMgukOxoKzMyWYKAQp C0xdQ34QsjiMAOdklGm4Ke/t3DCVSQOw8glB2kpYC9Pid0D4M43aBBvL4REAIg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b87D71FLtzyyq; Fri, 30 May 2025 15: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 54UFvRvB079467; Fri, 30 May 2025 15: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 54UFvR49079464; Fri, 30 May 2025 15:57:27 GMT (envelope-from git) Date: Fri, 30 May 2025 15:57:27 GMT Message-Id: <202505301557.54UFvR49079464@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: 1145891d07ed - main - kboot: Create quit command List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 1145891d07ed04db76c1e5f85650ac665699b1bc Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=1145891d07ed04db76c1e5f85650ac665699b1bc commit 1145891d07ed04db76c1e5f85650ac665699b1bc Author: Warner Losh AuthorDate: 2025-05-30 14:15:04 +0000 Commit: Warner Losh CommitDate: 2025-05-30 15:56:51 +0000 kboot: Create quit command Create a command that just quits out of the loader. Useful for debugging. Sponsored by: Netflix Reviewed by: tsoome Differential Revision: https://reviews.freebsd.org/D50589 --- stand/kboot/kboot/main.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/stand/kboot/kboot/main.c b/stand/kboot/kboot/main.c index 3f1a4e6a86c2..a8c725a514be 100644 --- a/stand/kboot/kboot/main.c +++ b/stand/kboot/kboot/main.c @@ -655,3 +655,15 @@ command_fdt(int argc, char *argv[]) COMMAND_SET(fdt, "fdt", "flattened device tree handling", command_fdt); #endif + +/* + * Support quitting. + */ +static int +command_quit(int argc, char *argv[]) +{ + exit(0); + return (CMD_OK); +} + +COMMAND_SET(quit, "quit", "exit the program", command_quit); From nobody Fri May 30 16:00:00 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b87H53Vsvz5xq6X; Fri, 30 May 2025 16:00: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b87H45psfz3Vnc; Fri, 30 May 2025 16:00:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748620800; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LK73FXtAE3PP67xcpKJl2iq4Afqot4Hi/o0U0/R4KlQ=; b=PzckkYXsKtSVxn5jVb9pQ7PscTsn7IxNom1h5sybVAhXNNgh0LmOJsSflhswyVW9+OXCrt 6Y7QKZlBpm8Vcdi6gnlQHGwpsJS1coaKUaPdp5TWOcAf2+QZXIhOcUFtsGV7KVmomvhWfq jmDtXVXYzDQZm2eVBvlRp0yECjVltmnAW8S6kPGRTwjBH2Epb3mau7cIKYAIgApqQqjPpD bG/dA8k+/WTEP/6ejP+hE8bTUAOQeBrky8uzkpqEEW/wa3XL9U2Kj+kc299OgjW5MHbhOw zUL6U2UXfGyGiUtim/oHqLqImXF3A65Iv7AW9CyXnt4NTFpEDqY8ykJ7B56A1w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748620800; a=rsa-sha256; cv=none; b=QjsZ5v/e8rArKxch4izMHU6hW69MsaUcPW+pzTdpYHKQ7qeIlyz5It680SP/amsk8ZxYoj FVGcCZHcVgo269k4Ly6c9RfZZ4yfW1A9i6hBK+omh738x/qxSJWYZHsCcF5m2RuICk8Ant rwg2LalvNI9KlU7NwDPWE/jIIu6hj2xHZdKlXFgXcCJ45UiytIzxwpof+2jFciC3C2oulo Ymv6z6ChhKk7L95qpI6Rw3p9SJQpQxQVBHIF1s1TC/FIqgWf0RUfhWr23t4q/ZwB93eO0C NI8H40hBA73m6ij4VAq/1PGoVJaIRTO0qhxUFsEG2V9/55rFJxYtrQzevhYJvA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748620800; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LK73FXtAE3PP67xcpKJl2iq4Afqot4Hi/o0U0/R4KlQ=; b=oTGZLfw900APyNZDWzN71dmvCvzf0JhsARaSxfelmlXGrNA5PODRMz+G35l1YOsgHecTRO K4gXzxKZAdQodNoxm3KgsOaVh7IR9Xo2BzJrmFLbBF/EVN20QrNZCHE86wRJA4yUk2PrA/ hKi437lYd7u33+KkKV80WmUaz5tPeZAs2b7ej0Qp9/tx1pAMoCE1MdO42l/ZUR6DJdv62T f5SqjaYZ7Eprr8Ztq3Xj+JWnRmfIIaya+kLgc0m3aGvYn+ZvUpGiOxelcznKyrMZRphU20 fbxPyQDxOSj413qSUeaQ/82Xgo7ExbgaIed6+JOT2bXQ9IzqVomUVn86vCjUmg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b87H45HQQzykK; Fri, 30 May 2025 16:00: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 54UG00qT081891; Fri, 30 May 2025 16:00:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54UG004c081869; Fri, 30 May 2025 16:00:00 GMT (envelope-from git) Date: Fri, 30 May 2025 16:00:00 GMT Message-Id: <202505301600.54UG004c081869@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: fb33dd91ae8a - releng/14.3 - certctl: Split certificate bundles before processing. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/releng/14.3 X-Git-Reftype: branch X-Git-Commit: fb33dd91ae8a5a3cc07e2eac5637b96e88e11bd7 Auto-Submitted: auto-generated The branch releng/14.3 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=fb33dd91ae8a5a3cc07e2eac5637b96e88e11bd7 commit fb33dd91ae8a5a3cc07e2eac5637b96e88e11bd7 Author: Dag-Erling Smørgrav AuthorDate: 2023-10-05 14:50:01 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-05-30 15:59:32 +0000 certctl: Split certificate bundles before processing. This allows 'certctl rehash' to do the right thing when ca_root_nss is installed, instead of linking the entire bundle to the hash of the first certificate it contains. MFC after: 3 days Reviewed by: allanjude Differential Revision: https://reviews.freebsd.org/D42087 (cherry picked from commit a401c8cb26b22688087ad7c5ee527718459df15a) certctl: Fix recent regressions. - If an untrusted certificate is also found in the list of trusted certificate, issue a warning and skip it, but don't fail. - Split on -+BEGIN CERTIFICATE-+ instead of "Certificate:" since that's what we're really looking for. Also fix a long-standing bug: .crl files are not certificates, so we should not include them when searching for certificates. Reported by: madpilot, netchild, tijl Reviewed by: netchild, allanjude Differential Revision: https://reviews.freebsd.org/D42276 (cherry picked from commit 87945a082980260b52507ad5bfb3a0ce773a80da) certctl: Convert line endings before inspecting files. This ensures that certificate files or bundles with DOS or Mac line endings are recognized as such and handled identically to those with Unix line endings. PR: 274952 Reviewed by: allanjude Differential Revision: https://reviews.freebsd.org/D42490 (cherry picked from commit f7d16a627efa8ba610eb9b8a12dd67b6cdbb2542) certctl: Revert to symlinks. Unfortunately tar will not be able to extract base.txz to a system where /etc and /usr are not on the same filesystem if the certificates are hard links. PR: 277828 Reviewed by: mp Differential Revision: https://reviews.freebsd.org/D44496 (cherry picked from commit 3fed4f0db53a66a0135bea5c491431eb3348cf51) (cherry picked from commit 9c34a6876a60dc10fda6ad6a0cbe8f99a372aadc) Approved by: re (cperciva) --- usr.sbin/certctl/certctl.sh | 105 ++++++++++++++++++++++++++++---------------- 1 file changed, 68 insertions(+), 37 deletions(-) diff --git a/usr.sbin/certctl/certctl.sh b/usr.sbin/certctl/certctl.sh index 5af8fecb93ac..458f5c53682f 100755 --- a/usr.sbin/certctl/certctl.sh +++ b/usr.sbin/certctl/certctl.sh @@ -32,7 +32,6 @@ set -u : ${DESTDIR:=} : ${DISTBASE:=} -: ${FILEPAT:="\.pem$|\.crt$|\.cer$|\.crl$"} ############################################################ GLOBALS @@ -63,6 +62,20 @@ perform() fi } +cert_files_in() +{ + find -L "$@" -type f \( \ + -name '*.pem' -or \ + -name '*.crt' -or \ + -name '*.cer' \ + \) 2>/dev/null +} + +eolcvt() +{ + cat "$@" | tr -s '\r' '\n' +} + do_hash() { local hash @@ -93,23 +106,32 @@ get_decimal() return 0 } -create_trusted_link() +create_trusted() { local hash certhash otherfile otherhash local suffix + local link=${2:+-lrs} hash=$(do_hash "$1") || return certhash=$(openssl x509 -sha1 -in "$1" -noout -fingerprint) for otherfile in $(find $UNTRUSTDESTDIR -name "$hash.*") ; do otherhash=$(openssl x509 -sha1 -in "$otherfile" -noout -fingerprint) if [ "$certhash" = "$otherhash" ] ; then - info "Skipping untrusted certificate $1 ($otherfile)" - return 1 + info "Skipping untrusted certificate $hash ($otherfile)" + return 0 + fi + done + for otherfile in $(find $CERTDESTDIR -name "$hash.*") ; do + otherhash=$(openssl x509 -sha1 -in "$otherfile" -noout -fingerprint) + if [ "$certhash" = "$otherhash" ] ; then + verbose "Skipping duplicate entry for certificate $hash" + return 0 fi done suffix=$(get_decimal "$CERTDESTDIR" "$hash") verbose "Adding $hash.$suffix to trust store" - perform install ${INSTALLFLAGS} -lrs "$(realpath "$1")" "$CERTDESTDIR/$hash.$suffix" + perform install ${INSTALLFLAGS} -m 0444 ${link} \ + "$(realpath "$1")" "$CERTDESTDIR/$hash.$suffix" } # Accepts either dot-hash form from `certctl list` or a path to a valid cert. @@ -137,6 +159,7 @@ resolve_certname() create_untrusted() { local srcfile filename + local link=${2:+-lrs} set -- $(resolve_certname "$1") srcfile=$1 @@ -147,12 +170,13 @@ create_untrusted() fi verbose "Adding $filename to untrusted list" - perform install ${INSTALLFLAGS} -lrs "$srcfile" "$UNTRUSTDESTDIR/$filename" + perform install ${INSTALLFLAGS} -m 0444 ${link} \ + "$srcfile" "$UNTRUSTDESTDIR/$filename" } do_scan() { - local CFUNC CSEARCH CPATH CFILE + local CFUNC CSEARCH CPATH CFILE CERT SPLITDIR local oldIFS="$IFS" CFUNC="$1" CSEARCH="$2" @@ -160,14 +184,25 @@ do_scan() IFS=: set -- $CSEARCH IFS="$oldIFS" - for CPATH in "$@"; do - [ -d "$CPATH" ] || continue - info "Scanning $CPATH for certificates..." - for CFILE in $(ls -1 "${CPATH}" | grep -Ee "${FILEPAT}") ; do - [ -e "$CPATH/$CFILE" ] || continue - verbose "Reading $CFILE" - "$CFUNC" "$CPATH/$CFILE" - done + for CFILE in $(cert_files_in "$@") ; do + verbose "Reading $CFILE" + case $(eolcvt "$CFILE" | egrep -c '^-+BEGIN CERTIFICATE-+$') in + 0) + ;; + 1) + "$CFUNC" "$CFILE" link + ;; + *) + verbose "Multiple certificates found, splitting..." + SPLITDIR=$(mktemp -d) + eolcvt "$CFILE" | egrep '^(---|[0-9A-Za-z/+=]+$)' | \ + split -p '^-+BEGIN CERTIFICATE-+$' - "$SPLITDIR/x" + for CERT in $(find "$SPLITDIR" -type f) ; do + "$CFUNC" "$CERT" + done + rm -rf "$SPLITDIR" + ;; + esac done } @@ -175,43 +210,39 @@ do_list() { local CFILE subject - if [ -e "$1" ] ; then - cd "$1" - for CFILE in *.[0-9] ; do - if [ ! -s "$CFILE" ] ; then - info "Unable to read $CFILE" - ERRORS=$((ERRORS + 1)) - continue - fi - subject= - if [ $VERBOSE -eq 0 ] ; then - subject=$(openssl x509 -noout -subject -nameopt multiline -in "$CFILE" | - sed -n '/commonName/s/.*= //p') - fi - [ "$subject" ] || - subject=$(openssl x509 -noout -subject -in "$CFILE") - printf "%s\t%s\n" "$CFILE" "$subject" - done - cd - - fi + for CFILE in $(find "$@" \( -type f -or -type l \) -name '*.[0-9]') ; do + if [ ! -s "$CFILE" ] ; then + info "Unable to read $CFILE" + ERRORS=$((ERRORS + 1)) + continue + fi + subject= + if ! "$VERBOSE" ; then + subject=$(openssl x509 -noout -subject -nameopt multiline -in "$CFILE" | sed -n '/commonName/s/.*= //p') + fi + if [ -z "$subject" ] ; then + subject=$(openssl x509 -noout -subject -in "$CFILE") + fi + printf "%s\t%s\n" "${CFILE##*/}" "$subject" + done } cmd_rehash() { if [ -e "$CERTDESTDIR" ] ; then - perform find "$CERTDESTDIR" -type link -delete + perform find "$CERTDESTDIR" \( -type f -or -type l \) -delete else perform install -d -m 0755 "$CERTDESTDIR" fi if [ -e "$UNTRUSTDESTDIR" ] ; then - perform find "$UNTRUSTDESTDIR" -type link -delete + perform find "$UNTRUSTDESTDIR" \( -type f -or -type l \) -delete else perform install -d -m 0755 "$UNTRUSTDESTDIR" fi do_scan create_untrusted "$UNTRUSTPATH" - do_scan create_trusted_link "$TRUSTPATH" + do_scan create_trusted "$TRUSTPATH" } cmd_list() From nobody Fri May 30 16:04:12 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b87Mw2dX2z5xqXh; Fri, 30 May 2025 16:04: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b87Mw1srgz3XPs; Fri, 30 May 2025 16:04:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748621052; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EY1DMOuJEMTa2d3JiRf/D/PvRUkC/Cy1TiE8gyBPOOU=; b=CKcXjiskwoM9Y0YiO2CfZ2xmJeDZGVhygbwueK6CUQjdu8zylr+/YaxnZmcqCGdMIIyW5h ryfTv4Z5hnJQZQSbdQJK3hKQvnGYKBMHirLUCyN4ZtoViQQQRUV6wRFGc+uvfC2I0lw5vl 17KnRTsBtu4y86UGr3qm7Vk7iBMnVClXD2/1FbS83DkMh2uMYK3ptVjNAqsTo8t7LA3uXh ASQ9TEO4iQGuXEz5g1eks4Z0RYPddT4xi1XxqAg0/7uhLnV7UGOZKkT7fmJHaiCRGdenYo CHmGkAwcffo13EgGHOHOmv7/hey0HWSsLpG9TH9TXsZO6cS2Qh5Ut+RlOieKmg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748621052; a=rsa-sha256; cv=none; b=obQ3Ko+JgUMHa/xPsiZ7Fr8uvu6fwjgmcagHOIP9PKdhclc8yRfonzPJdYbPQdzhWxAhi0 B0YK3MGMhnNmSvN7dt+JWKQw69hsLuXorzTlkFkGIHdwRAInlixV/RSVqVtqYldlRx79oF HbH2Slyf8khffawiv6QsaE5ZZd3fz5joOhap0vgopDQgKXSS3Tg5YCODc3LtBfLQ4aeWpC VlEi6mPGsKQMBLcPuzQt+fhjUlcybIYTbuTUQMph89o2FKyEUOfTr3ENGw1eWY8CjKYfTI 2MonhC93Z0B3fi7fawbx2kPatHJRaeEjEHNxJJbvS/EYSmCcr/JrWHnnf8phBg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748621052; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EY1DMOuJEMTa2d3JiRf/D/PvRUkC/Cy1TiE8gyBPOOU=; b=tucUPITNU0nMb/A6rOoLSoD9SCi5l52nk5jeQCUjkyZ5q4XJ6W8YUe2JIHvv8KQSTl//Kj fR2Jv8DWceGt+cryobTbnnEqEh37vJnU9M73YVFX/nUAgl+KZlzVgS/qtuSVO6BtrJGaV0 nCGxK45r64Q6yWkoYWOEAAuI2UEHpv/RaME0rsagOZzncEMyxPxe9RkApqrm7SDNhSwzLC iIa+7bH+xzFGGVkrYghBhlXM5n+KXBLjsjFwKuQrAVWej7FmONd4q6EuyhSRB6Fhqh7BjT fToEWxpRqdDfOfRFMFKAeV0FXgxay46ja/HjKNeNCeB3MHqP/tEmdmd+ucPq/g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b87Mw1SxVzyhy; Fri, 30 May 2025 16:04: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 54UG4CP1098255; Fri, 30 May 2025 16:04:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54UG4Co6098252; Fri, 30 May 2025 16:04:12 GMT (envelope-from git) Date: Fri, 30 May 2025 16:04:12 GMT Message-Id: <202505301604.54UG4Co6098252@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: a7a4742156f9 - releng/14.3 - Reapply "14.3: Update to RC1" List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.3 X-Git-Reftype: branch X-Git-Commit: a7a4742156f9a00fcf7e01deebe6da60d918509a Auto-Submitted: auto-generated The branch releng/14.3 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=a7a4742156f9a00fcf7e01deebe6da60d918509a commit a7a4742156f9a00fcf7e01deebe6da60d918509a Author: Colin Percival AuthorDate: 2025-05-30 16:02:53 +0000 Commit: Colin Percival CommitDate: 2025-05-30 16:02:53 +0000 Reapply "14.3: Update to RC1" Second attempt at making 14.3-RC1 happen, now that a critical last-minute MFC has landed. This reverts commit c5db8f65622ae0be9c65bc57326f787a1b3994f7. Approved by: re (cperciva) --- sys/conf/newvers.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index 8c988150f902..1ebacc6cc176 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -53,7 +53,7 @@ TYPE="FreeBSD" REVISION="14.3" -BRANCH="BETA4" +BRANCH="RC1" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi From nobody Fri May 30 16:07:22 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b87Rb1hRkz5xqmt; Fri, 30 May 2025 16:07: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b87Rb13Jyz3YNn; Fri, 30 May 2025 16:07:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748621243; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EjJDaaANwHbVZ6NgeXsjQLRPAtIZp/700zwH5PWoYCk=; b=vLoqTJ3zxUAiktu8xy4HLdEVc0uDR/zNVFu6iLuew7GXQn2R/P4aExZ501/q6fQA0ueocV Zikprlix/luJKB90sL+OzySQPkjniW/U0/DsXmiNWJsE0zUfb5AykJiqkNvlE0J4T0Nd7A XimAkzj0hZyD1f8OzcreFWjUSyXUqyl5TSBnbazHLNfk+aqcrDRVCzVVNb/kPolUj6jxKF AmUjXvdwBpqqIKZWyZJiVtTIDeVmOVhwRCqcNDW0mchmS5iYFyHhkD0l2/kj3ul+nDikm1 UbpEEaEtO0L/L4TaUjkhY0Soj2G7gE96uE9ZAP4BBJgXc4N9PRNJgIhCH8CwUQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748621243; a=rsa-sha256; cv=none; b=vN+1vrTeRxmqDyxxlcteh4VEB5XzqMl94ca87K+17NTdbWtVSxI5E3bBFiSG4tJGIA6a0g EYSOQzthNz39BxfBhLrZ6RSnMxju6d/pFHUt7cB6p/JLxUuJHwVmsQvNRKfxNvrcj3hzTK aqeq3AnVtb51DGPznzZYyI44vUCzIo9B0J5guF/e/QXcn0GxkiLPjra9hwqA71qv2qXU4t 3Z/r2S/Xk3bB3j2z/v4SczvaRsC4bw4uQHfrYpMXix4qU2Y49fCmS7ENGx3PhKbt1IvvE2 6RCVOcCm3BwNQCPpgOh58K5teDJ7BwDI9Q2YkjyJd6wECOi58yNjAZSwjt1FVw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748621243; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EjJDaaANwHbVZ6NgeXsjQLRPAtIZp/700zwH5PWoYCk=; b=BEZy9vhbaLLspHNgiW3xUZBSw8FNw18J5eSRFxj0wf8zMd43JfmmnUo1/wbdYjm/TpTUd4 X4gyaG1DBDpIUh4/DfvJNZYM8MwPo9LAbesH8MGF6/BAwEN/IzpGGdrfKlJnEUIZw3rBGY NoQ3Fz9UeyXaVauUoXdcNngpM9CnNXTYVjnNOb6g7XZPsefaTRF2oFDqH3vK7dpBbykZ93 Kp9Wfpn4sZAqk44/kMJodCx8RPm3GOzhd2Wz/vUtKiciWdc+nPmPIAiCIcM1C7N4WGmQ4p DHZXJB9T41Bcq9nDeEfO+k6LhtsssEdRpsFWrmH4ELy1v5+RFHEfZlw4HoAK0Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b87Rb0Lg2zylG; Fri, 30 May 2025 16:07: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 54UG7MYo099270; Fri, 30 May 2025 16:07:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54UG7MNW099267; Fri, 30 May 2025 16:07:22 GMT (envelope-from git) Date: Fri, 30 May 2025 16:07:22 GMT Message-Id: <202505301607.54UG7MNW099267@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: d4f5d3a4eade - stable/14 - m4: Allow empty base argument in eval() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d4f5d3a4eade118694a537564e35c64fdd779f9a Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=d4f5d3a4eade118694a537564e35c64fdd779f9a commit d4f5d3a4eade118694a537564e35c64fdd779f9a Author: Eric Blake AuthorDate: 2025-05-23 14:37:20 +0000 Commit: Ed Maste CommitDate: 2025-05-30 12:45:56 +0000 m4: Allow empty base argument in eval() POSIX specifies "The second argument, if specified, shall set the radix for the result; if the argument is blank or unspecified, the default is 10." Previously we reported an invalid PR: 287015 Reviewed by: emaste (cherry picked from commit ac196a5845757a4d92cdfc4927170576dce5de9d) --- usr.bin/m4/eval.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.bin/m4/eval.c b/usr.bin/m4/eval.c index 82218eb9ba1c..3170d52bfe2a 100644 --- a/usr.bin/m4/eval.c +++ b/usr.bin/m4/eval.c @@ -181,7 +181,7 @@ expand_builtin(const char *argv[], int argc, int td) int maxdigits = 0; const char *errstr; - if (argc > 3) { + if (argc > 3 && *argv[3] != '\0') { base = strtonum(argv[3], 2, 36, &errstr); if (errstr) { m4errx(1, "expr: base is %s: %s.", From nobody Fri May 30 16:07:24 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b87Rc2sd8z5xqbH; Fri, 30 May 2025 16:07: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b87Rc1LVJz3YHS; Fri, 30 May 2025 16:07:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748621244; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jTKC/Zp8n0jYZ4mciNiI+q2zs3QlAKSmWn9BhRYjIFM=; b=PCuEbCIW55Tu5YTB2xX8bWS2wV9JlsjgdiG/0x/87FomS6wYzcPuYIGluhLiYB39UrsiRF p8QZvhY5HzMaKVe6DP5q+fbqUofIshfT3Djiwtkrg5rHeEEc+xTmZjHwAl3YEcPaKcU6LD OyqzuA3+KpO7BEn3MsSdcfZbuCBpPDynbRrEJAq6YWkRcI/XBiyL9PzNjm9oq6t3QqQ27Z bOjPVaGaX/fIrgzPv1sQVAVmKMUBOMc1vad3H+zUoWlSm7gXojwXs5ckO1qZ0zxp+IlB91 6HLhP9G8HRQ2EpTUkJQhMVg2zxPLzwWQ1hZ2cbaDPe9gPIOXkmegQjpQXgd1qA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748621244; a=rsa-sha256; cv=none; b=rSNlqgxnw1e7XSZqjNXq23sQKpdeNOGyzr76BAAjHxd6YEwvffHMapEi7TEm41XB8QP1hA 6U57i+fcB855ed7HWeSbtC1k85XNpzEhwktD35n+wzJCaTI+Vxk/VtSOnbqePw9M6bqURi F2xWEQeL6LPl8RPOcWhW01TzuM/MlhBwcFzUdnUuLcwOAZGz7jFv3TXWKq7qRjQpxz4kL/ UeJSEw5i4WHOAwf7M6LQThZdHkXEo0O94C5CntNDFfRnX4mf7cTMwFaVO2FVEzvRF9+Ryh GzTzd3aHfgodLJZb8oXg3Ybs0I52gCIfgx+rpoQF7z+8D1GHJFg581QVZlSp7g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748621244; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jTKC/Zp8n0jYZ4mciNiI+q2zs3QlAKSmWn9BhRYjIFM=; b=nysghT2rhloQZyOX3578jCFFlsRCxDuz+iOrUtday55Yl9M/as/5dTl0OcLetlm3onUJ9r n+Pd3aPqYaRbH50eYbP8GVi7wOPgAdCXNjjmkzNB9wIiMCwKvB3ptIpY6uhbxHJWhuhJoE +vWVj8gOXkkUk7G1Zykjqqc9gjfsQKSNN3mTKEbfyqbVk2ryJ+yfxKm5FHHoCZN50fskt/ g2Y+oTF7jmu6metz5vzxkhl7pacl4rQWRz67Xlccq+Xt2vNVdravZV3bpMuN4+w+sYdV7o KyvJ3rJApQ+v3+7xVBgr7Xx4ZQCC7X+20xKeg6VYXM/UKaq18hhTUaOJ4DvPSQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b87Rc0yFVzylH; Fri, 30 May 2025 16:07: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 54UG7OXe099303; Fri, 30 May 2025 16:07:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54UG7OI2099300; Fri, 30 May 2025 16:07:24 GMT (envelope-from git) Date: Fri, 30 May 2025 16:07:24 GMT Message-Id: <202505301607.54UG7OI2099300@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 75f7d9cbff26 - stable/14 - m4: Fix OOB access displaying MIN_INT List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 75f7d9cbff26264640fcfcd2e3c5c4ca1d0ea0a6 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=75f7d9cbff26264640fcfcd2e3c5c4ca1d0ea0a6 commit 75f7d9cbff26264640fcfcd2e3c5c4ca1d0ea0a6 Author: Eric Blake AuthorDate: 2025-05-24 17:21:38 +0000 Commit: Ed Maste CommitDate: 2025-05-30 12:45:56 +0000 m4: Fix OOB access displaying MIN_INT Previously displaying INT_MIN resulted in an out of bounds access to digits[-8]. In twos-complement -INT_MIN is still negative. PR: 287013 Reviewed by: emaste (cherry picked from commit ab4edcd552c967a400e85afc0fd3e6729fa9ee2c) --- usr.bin/m4/misc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.bin/m4/misc.c b/usr.bin/m4/misc.c index 4533e106a37f..73ced384466c 100644 --- a/usr.bin/m4/misc.c +++ b/usr.bin/m4/misc.c @@ -122,7 +122,7 @@ void pbnumbase(int n, int base, int d) { static char digits[36] = "0123456789abcdefghijklmnopqrstuvwxyz"; - int num; + unsigned int num; int printed = 0; if (base > 36) From nobody Fri May 30 16:55:28 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b88W51HwYz5xss5; Fri, 30 May 2025 16:55: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b88W50WL8z43Hd; Fri, 30 May 2025 16:55:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748624129; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eG4sF9ABwG9phrNQlUxHSBHdprUK3mOcnPLwNxLpv5g=; b=WQaSbWlYg3Fxq90kZt0JPDeguC6Xk+aZaNQwLTOwe0mjeGpxqBbim5c2ZaURRnkB+8X6Rg 8XupduWv162uIfOqrKYG7M08u9YB4XV6whIna+SxB/OkNKQfMZEmBcd/6cXqc1L3c1Dp0u BDX+hMbKEIy/nBXuBdMFsQyqxxW0ESKrYEPfZv9sxy4NjUqRxvs57EJATfl8x0VERRZ/GM yCszaf9VO2Xy/CD7A1DyW0NuEA9xN/94In1yIHEYbrAVq/7GH92fV4RNyhTyvwsmGLun+D LkIn8nI3IqqHerOh5OE88JesUJqX2lTIKQd25gXkSYv4g4/VaJsr5O4WmM3j6Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748624129; a=rsa-sha256; cv=none; b=nAw4lnQhsCPYZVY4NKOxwKpyinAUO7xhfa5+Vepy1QxJCG2hvlHKJ0SjPxqzeYVVmJA5yE oGZXfkgOQ5DwV0HTBzNRFxELDrhtuzSGwCx/G6/IAES4PYUArIlJi1dD/irnOa3lAAIwcZ nr0Tfh22VvO3KGDwizA7w8tCgwkpqw4pWyFCkq5udfRg2YLx+fhvcUXlyg8FeIGjKJqoGy x4v1d0agykr6HSHhQX2TGwyBGRNSoK3cSD7WfT3FLqgnqp0QHzSbAHrk7dqbdP+P06Fjci Iz1qwDk5XPZqv7o3F5I9RNLE2JhFkVYhspGlfpOtFq8N1emV3FJGRNMO4NjJ9g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748624129; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eG4sF9ABwG9phrNQlUxHSBHdprUK3mOcnPLwNxLpv5g=; b=Kjs3yAZ3yd4G9HM1xqljRXgDGJvw+eBnBqGswi1e6hxXWOdldVRGjHPYHm+KpjA6Xafs9V XBHdZRf4Ew/4phWkCcLG1dO39w99uMY+xY33xJOoSnQG0Y6JHcbg2ZeYG1+kmBqp4lEaSp CCtF+aoDr3yw+sOni59lY7wkhrCYOS6CLcyf39VZYjRgbbdWlH+cd/eeS6pXSUY7QsIu0z i1vFGcWZk7CO24aHtqvKtCLeWbWTyMkVVeD4CVkoWpTQTyOlw6NKHfv/9NQxZMvuecMndW NpqQdzehiT76tLxd3WpF8qfyWId+hIh9Eh34HqsnpXgqNoDxTOnkrMA2R5y0VA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b88W503n6z1137; Fri, 30 May 2025 16:55: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 54UGtSQI092227; Fri, 30 May 2025 16:55:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54UGtSqS092224; Fri, 30 May 2025 16:55:28 GMT (envelope-from git) Date: Fri, 30 May 2025 16:55:28 GMT Message-Id: <202505301655.54UGtSqS092224@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: 7f07575084a2 - main - fusefs: correct a comment in the tests List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 7f07575084a279c7f0cc330fe7e2c04d5a05a487 Auto-Submitted: auto-generated The branch main has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=7f07575084a279c7f0cc330fe7e2c04d5a05a487 commit 7f07575084a279c7f0cc330fe7e2c04d5a05a487 Author: Alan Somers AuthorDate: 2025-05-30 16:54:06 +0000 Commit: Alan Somers CommitDate: 2025-05-30 16:55:18 +0000 fusefs: correct a comment in the tests It's been wrong ever since the original commit in 2019. [skip ci] MFC after: 1 week Sponsored by: ConnectWise --- tests/sys/fs/fusefs/destroy.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/sys/fs/fusefs/destroy.cc b/tests/sys/fs/fusefs/destroy.cc index 16d50da19b9b..45acb1f99724 100644 --- a/tests/sys/fs/fusefs/destroy.cc +++ b/tests/sys/fs/fusefs/destroy.cc @@ -60,7 +60,7 @@ static void* open_th(void* arg) { * Check for any memory leaks like this: * 1) kldunload fusefs, if necessary * 2) kldload fusefs - * 3) ./destroy --gtest_filter=Destroy.unsent_operations + * 3) ./destroy --gtest_filter=Death.unsent_operations * 4) kldunload fusefs * 5) check /var/log/messages for anything like this: Freed UMA keg (fuse_ticket) was not empty (31 items). Lost 2 pages of memory. From nobody Fri May 30 17:26:11 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b89BY3rwZz5xvbL; Fri, 30 May 2025 17:26: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b89BX4H7Mz3CXK; Fri, 30 May 2025 17:26:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748625972; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JxBkd/ic5we+MeRJA72l3Y83kkiyv1bxZI/U3KJ/ErU=; b=Vwyyy/ab3Iq6nbhMRhjH8hsxuyvU5oc1y/xAP2OfHLDOnZEVl4AwVU0QR/azk644XBA/3u wCALEB9My4U3kPmWqVkIC6Ja1FludfYy+UKR9r8EEFUGC51Ta7M0sr1WzDZc0UO9qcbonW jqQ9mHvG/ECe0avFxBACCkBQnwlBp47Kk8IoB29tODjiwB+EnXj+fLklo5rzCQ4OFETl29 Z0WRhn7iDZRR/r3YLZ+srsirDs02Vylqkm3bfArTSYkJlspsNgB0GW+4VLyASIS5FY0DQJ FcXLSQPQWIzGXQqCdXTRemCPQOJwpwj8+xApi5is9PYFeQG9Ke1FCJ6MhP9tkQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748625972; a=rsa-sha256; cv=none; b=e0Mcdd+KBFiGRC0U8Ft0wnQuf+k4Mx5jGhdH6hdHy58VAOHeOmQFaA30o8wHGDsIs/Q81N 4ojEdWzsV1jWWVm6CMt4UuMBgdQ+kN/vYQH11g5U0Wm2mZiShi/Kagq4WAKwBK96jfxV8T 7cRAIErvOvDVrpScha1yFQJbgbgl6hZXbAyrT0S2N9/Ui6UPN8bOox1ALLobxBt1g2i2sU PTxTQjd/5VRPWoXMdBe2yLDkqIOMPcF6LRpbMhzmBT+sKzeGr84J0YWC6K2nWWv8fWXSLF KujCmaXRL2sh9PzkzvfH1WE7VcEIWiG0ws5I5FG7yt9vxNPZL5pDG0L1qJr9YA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748625972; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JxBkd/ic5we+MeRJA72l3Y83kkiyv1bxZI/U3KJ/ErU=; b=hXO9J1uVWyW1m6s+1R4qIH5B+KwvednWUZ3wOQ5AMPFXqPrFt57LfoQjMXEpRznVSA9X4p MgnG5gYl7AT7v4fUfSVV/RQAVBzHkDqZsqO+kyzelWkPXaN6x1pgaBFC3je1DptasUHOY0 qyKXbZ0k6fIEO6hdKOFd/DVCdReJfDbK0tl9NL3RcXmzbdoFTyFmIxP/zB/8eLLz6tqM5B AzKOCE9Mj7ZbHSNoTQ6EL6dUPV3smNkGFwBRwnX87jd9HY+Zo1Y7P8KD3Zqx2OUuyHsaiM /CJLek6jAudzMKIRiMD3y3YN8M+k0Ad6ktOuIDvlMMKJpxwzwoK9QJKsTJhN+A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b89BX0l7Kz12CH; Fri, 30 May 2025 17:26: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 54UHQBp8049529; Fri, 30 May 2025 17:26:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54UHQBPM049526; Fri, 30 May 2025 17:26:11 GMT (envelope-from git) Date: Fri, 30 May 2025 17:26:11 GMT Message-Id: <202505301726.54UHQBPM049526@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: 799105f53a96 - main - sound: Deprecate the MIDI sequencer List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 799105f53a9647f86dbf08456260d5850851b6f9 Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=799105f53a9647f86dbf08456260d5850851b6f9 commit 799105f53a9647f86dbf08456260d5850851b6f9 Author: Christos Margiolis AuthorDate: 2025-05-30 17:26:01 +0000 Commit: Christos Margiolis CommitDate: 2025-05-30 17:26:01 +0000 sound: Deprecate the MIDI sequencer The in-kernel MIDI sequencer is not used anymore, since this is done by userland applications nowadays. It also contains bugs, and we are not exactly sure how it works, or if it worked properly in the first place. Sponsored by: The FreeBSD Foundation MFC after: 1 day Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D50606 --- sys/dev/sound/midi/sequencer.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/dev/sound/midi/sequencer.c b/sys/dev/sound/midi/sequencer.c index 29e01fcaba2f..db49aa1ef259 100644 --- a/sys/dev/sound/midi/sequencer.c +++ b/sys/dev/sound/midi/sequencer.c @@ -519,6 +519,8 @@ seq_addunit(void) int ret; u_char *buf; + gone_in(15, "MIDI sequencer: no longer needed or used"); + /* Allocate the softc. */ ret = ENOMEM; scp = malloc(sizeof(*scp), M_DEVBUF, M_NOWAIT | M_ZERO); @@ -736,6 +738,8 @@ mseq_open(struct cdev *i_dev, int flags, int mode, struct thread *td) struct seq_softc *scp = i_dev->si_drv1; int i; + gone_in(15, "MIDI sequencer: no longer needed or used"); + if (scp == NULL) return ENXIO; From nobody Fri May 30 18:52:27 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b8C6C4n3Jz5y0qR; Fri, 30 May 2025 18:52: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b8C6908lvz3G8N; Fri, 30 May 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=1748631154; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kurWQAkt7etpwlTx/9OfIhoS05OCMSJbahLyc1ITIyU=; b=RN4j8mFqRsN1dsd7SAuLT5v6EH255p/7FM8jhniVlqHu/1FDsuJsqXRyigad2u5hbQoWI+ KH0Yt1XCPjna3DW/W6lxRF8vBROnS7fvPlKwh4IjkrkI5L5zO58wsV9QeuSYU8AhkAdPrM u7WsxjjQKPoc0nREeCoKNmrJgEARpoiIMAQBzySEK16dJei2BoYFWzZR8sDdk0Z61vvs89 vdZdiUmYvJv5pHAJdWjV7763i9KnG1HRevkUBFYZUjJSWEM9LWHlmM4CE5eh3XXPAcYHV5 nN6hjlT6Pif4b+Bfau801mizQqbq4ewyp1S6trcss4na/AO5PM+U84ROY/0PAQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748631154; a=rsa-sha256; cv=none; b=SJ+yhkvozKh17dqLbzFygsl97eJD0z0I5ERSUjzo9eQxvQ1PgPv94fkSrA95Jz0gkzSoNc jlQU2duqwxcG7/1wi3Vu9pJY++cGaXufZRIuyhCZHCFO/3G8F+LHPaCiw7ZJB1bCPNKAkW EYRrsmd/NXdSrF1kA382S1CSFPodmebBR5UKZ8uvQSpi3l28QeZZTqoKZLR/csLwg9l/QN RZzndmIXLiDaGRX5Sw/OskqfOY75X8kxLwqY8w07Z5z1EptwD3//cpDkQ02ctm2R1KkEt4 rPt0UhYj9eDcC8Ta++ggtl11ALkbXDF3ifl8PUiLpeRvVKuOaa0jvHx6gHFdfw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748631154; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kurWQAkt7etpwlTx/9OfIhoS05OCMSJbahLyc1ITIyU=; b=cJ/XfaoOwvry/NEM3Fsdff7z0umN6Q2dLEtZeoJ0dRnB6MVAOB8rJLvhz3Suz8KSTqGXb4 avAlOwOXk/j0x9Iq2EJuzSQSB1KsHNKoDD1Stx+WBbjW+lR6gBRLWbOe9J6Ifeq2nonMPS SF+ko2tALTjRuPom4BVbifG/6b9TRQRLVaVaL+g1W1nAdueoihcSxKAY39d4aQYxcaMmsz 25jC2AQ4cl3nxJUbWPQAZ3RhXqCvCD1ED3r40D3f2nTWW9f4vagZ+Apq3Jj9scMWCMHmpH 5n4h2p59I4YkbWvOATeYruW7FWr9Xrt+JIKByrKkgr/1ByvpGWi+ik4QBBEl6Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b8C632hCFz13wl; Fri, 30 May 2025 18:52: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 54UIqR2N016314; Fri, 30 May 2025 18:52:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54UIqRfQ016311; Fri, 30 May 2025 18:52:27 GMT (envelope-from git) Date: Fri, 30 May 2025 18:52:27 GMT Message-Id: <202505301852.54UIqRfQ016311@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: 6ac71c4a5234 - main - unix/stream: fix poll on a peer shutdown(2)ed socket List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 6ac71c4a52348fc2e47d7d4a5c06c5ffc45660f3 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=6ac71c4a52348fc2e47d7d4a5c06c5ffc45660f3 commit 6ac71c4a52348fc2e47d7d4a5c06c5ffc45660f3 Author: Gleb Smirnoff AuthorDate: 2025-05-30 18:51:04 +0000 Commit: Gleb Smirnoff CommitDate: 2025-05-30 18:51:04 +0000 unix/stream: fix poll on a peer shutdown(2)ed socket Add missing poll events mask that was lost while refactoring sopoll_generic(). Reported by: kevans Fixes: d15792780760ef94647af9b377b5f0a80e1826bc --- sys/kern/uipc_usrreq.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c index c411f22970e7..95d857b2625d 100644 --- a/sys/kern/uipc_usrreq.c +++ b/sys/kern/uipc_usrreq.c @@ -1685,7 +1685,8 @@ uipc_sopoll_stream_or_seqpacket(struct socket *so, int events, so->so_error || so->so_rerror) revents |= events & (POLLIN | POLLRDNORM); if (so->so_rcv.sb_state & SBS_CANTRCVMORE) - revents |= events & POLLRDHUP; + revents |= events & + (POLLIN | POLLRDNORM | POLLRDHUP); if (!(revents & (POLLIN | POLLRDNORM | POLLRDHUP))) { selrecord(td, &so->so_rdsel); so->so_rcv.sb_flags |= SB_SEL; From nobody Fri May 30 20:35:16 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b8FNh3BYfz5wsMR; Fri, 30 May 2025 20:35: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b8FNh2HTvz3c8P; Fri, 30 May 2025 20:35:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748637316; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kOroIHkH+1Uc5qUE24h2hQHPLR0JIZMNC66UMaRcygA=; b=f1JEoFSjCRRt77UgKFuDQw0EZ+T2pzWw/zUc21RUnFUcAupOVE6oLmi8Q/iq4XK3ofMFWu zRfgQ+duJqU1G1hdeTDlnHHGVLJ4FBpNmCKCkfxngHjQoQnQdMewADHVq1+fO0JXT1N/bk jRZhDM+gSBPJ6oIgcU2m7o7OKN2vdTikw2JC+bwU8FpQ/FnXJStctTO18poEUXDDlNMNC4 3O57ZXztVg9lqvQevdaUDaeOrLnQpwaAsIZrL5fhfdhQ9oZVwLX9PVxoLhas3ex94zJrd2 qs4sceRTi4ZnLw/TyR18hJDPgNg/RT5eZKmlZMxBVk0r+/FyFUPEESD7+2w8ag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748637316; a=rsa-sha256; cv=none; b=s58J75IEwdTlS+XPnPngiAHzu/QYdYEXbG2LcWGlOmu/+Nw4L65RPKyWiMMe5UbbzjMUIa 2LWQ5wyBSu72LrVKnpTschuT7WCIcTexzYM6xNwx6NApazm2pR02BnRvKx2nugXKXJhnze ikRmapZyYqI2MjEdVKkLcdoTHTGvaV4+AAjL3693NxsOCrJI5PqFobG7tB843WUWujqQCU vnpAD7CmoLMZZFgxSQngb19XG994IZN1y6TTIAWyCDkHPLhgtFveZvrOX4lUrho8K9oAQm vuW6B7hGr3Zd1ljjoHCdIXASRDA4F0hB9wYEMWmg37ButMy+7yuo+pzHuWZMmw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748637316; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kOroIHkH+1Uc5qUE24h2hQHPLR0JIZMNC66UMaRcygA=; b=SAVyB3n7di3LBirZ2xDjM3Cg8eJB+VbUav8llmoZ0aykn14PdhvDHLMQUBLS8cQrUMx5gy xhuc0cgn0MGeERLx1dHYNzzgDncGWoUazSW1ZJyR17I3JU1AoaQHC4bsjstAOopc+tpODH 1b6P60KM0D66qCw6Cd8HxftDmfQff4cNOVnfSVyyxjO56SjUwgcAngO0Jq3ULo+SlEqqPD ZZKTzMfIVHIP4fE0flz9VXvm8/PXVgDrmIDVZuUGvaOKiGjBqYp82DlguClKU1JC09urKb uRPRXTwaEMUMx0AJM1Xch4ce5R53NpHIVbiPOTjbxSUptYffjhfKsn4arncvIg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b8FNh1hndz16L5; Fri, 30 May 2025 20:35: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 54UKZGUQ004018; Fri, 30 May 2025 20:35:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54UKZGLf004015; Fri, 30 May 2025 20:35:16 GMT (envelope-from git) Date: Fri, 30 May 2025 20:35:16 GMT Message-Id: <202505302035.54UKZGLf004015@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: e5c544f95ab4 - stable/14 - nfs_clrpcops.c: Fix acquisition of post-op attributes for link List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/stable/14 X-Git-Reftype: branch X-Git-Commit: e5c544f95ab4d56d7b8ee73415c40135db84579b Auto-Submitted: auto-generated The branch stable/14 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=e5c544f95ab4d56d7b8ee73415c40135db84579b commit e5c544f95ab4d56d7b8ee73415c40135db84579b Author: Rick Macklem AuthorDate: 2025-05-16 00:27:14 +0000 Commit: Rick Macklem CommitDate: 2025-05-30 20:32:32 +0000 nfs_clrpcops.c: Fix acquisition of post-op attributes for link Without this patch, the link RPC (done by nfsrpc_link()) did not acquire post link operation attributes for the file object for NFSv4. For some recent Linux NFSv4 servers that support delegations, this would result in the client's cached attribute for st_nlinks not being increased right away, because the delegation would indicate that the now stale cached attributes were still valid. This patch fixes the problem by acquiring post link attributes and updating the client's cached copy in the same manner as the NFSv3 RPC did. Detected at the recent NFSv4 Bakeathon testing event. Applications will only be affected if they examine st_nlinks after a new hard link is created for a file object. (cherry picked from commit 772258c89f28501546844a60616211f44f55f4ce) --- sys/fs/nfs/nfs_commonsubs.c | 2 +- sys/fs/nfsclient/nfs_clrpcops.c | 40 +++++++++++++++++++++++++++------------- 2 files changed, 28 insertions(+), 14 deletions(-) diff --git a/sys/fs/nfs/nfs_commonsubs.c b/sys/fs/nfs/nfs_commonsubs.c index ffd6d3e50654..c593264ef63e 100644 --- a/sys/fs/nfs/nfs_commonsubs.c +++ b/sys/fs/nfs/nfs_commonsubs.c @@ -252,7 +252,7 @@ static struct { { NFSV4OP_REMOVE, 1, "Remove", 6, }, { NFSV4OP_REMOVE, 1, "Remove", 6, }, { NFSV4OP_SAVEFH, 5, "Rename", 6, }, - { NFSV4OP_SAVEFH, 4, "Link", 4, }, + { NFSV4OP_SAVEFH, 6, "Link", 4, }, { NFSV4OP_READDIR, 2, "Readdir", 7, }, { NFSV4OP_READDIR, 2, "Readdir", 7, }, { NFSV4OP_GETATTR, 1, "Getattr", 7, }, diff --git a/sys/fs/nfsclient/nfs_clrpcops.c b/sys/fs/nfsclient/nfs_clrpcops.c index 76aa3b102962..d37bffc5ad2e 100644 --- a/sys/fs/nfsclient/nfs_clrpcops.c +++ b/sys/fs/nfsclient/nfs_clrpcops.c @@ -3112,15 +3112,20 @@ nfsrpc_link(vnode_t dvp, vnode_t vp, char *name, int namelen, (void)nfsm_fhtom(VFSTONFS(dvp->v_mount), nd, VTONFS(dvp)->n_fhp->nfh_fh, VTONFS(dvp)->n_fhp->nfh_len, 0); if (nd->nd_flag & ND_NFSV4) { - NFSM_BUILD(tl, u_int32_t *, NFSX_UNSIGNED); - *tl = txdr_unsigned(NFSV4OP_GETATTR); - NFSWCCATTR_ATTRBIT(&attrbits); - (void) nfsrv_putattrbit(nd, &attrbits); - nd->nd_flag |= ND_V4WCCATTR; NFSM_BUILD(tl, u_int32_t *, NFSX_UNSIGNED); *tl = txdr_unsigned(NFSV4OP_LINK); } (void) nfsm_strtom(nd, name, namelen); + if (nd->nd_flag & ND_NFSV4) { + NFSM_BUILD(tl, uint32_t *, NFSX_UNSIGNED); + *tl = txdr_unsigned(NFSV4OP_GETATTR); + NFSGETATTR_ATTRBIT(&attrbits); + (void)nfsrv_putattrbit(nd, &attrbits); + NFSM_BUILD(tl, uint32_t *, 2 * NFSX_UNSIGNED); + *tl++ = txdr_unsigned(NFSV4OP_RESTOREFH); + *tl = txdr_unsigned(NFSV4OP_GETATTR); + (void)nfsrv_putattrbit(nd, &attrbits); + } error = nfscl_request(nd, vp, p, cred); if (error) return (error); @@ -3129,19 +3134,28 @@ nfsrpc_link(vnode_t dvp, vnode_t vp, char *name, int namelen, if (!error) error = nfscl_wcc_data(nd, dvp, dnap, dattrflagp, NULL, NULL); - } else if ((nd->nd_flag & (ND_NFSV4 | ND_NOMOREDATA)) == ND_NFSV4) { + } else if (nd->nd_repstat == 0 && (nd->nd_flag & ND_NFSV4) != 0) { /* - * First, parse out the PutFH and Getattr result. + * First and parse out the PutFH and Link results. */ - NFSM_DISSECT(tl, u_int32_t *, 2 * NFSX_UNSIGNED); - if (!(*(tl + 1))) - NFSM_DISSECT(tl, u_int32_t *, 2 * NFSX_UNSIGNED); - if (*(tl + 1)) + NFSM_DISSECT(tl, uint32_t *, 5 * NFSX_UNSIGNED + + 2 * NFSX_HYPER); + if (*(tl + 3)) nd->nd_flag |= ND_NOMOREDATA; /* - * Get the pre-op attributes. + * Get the directory post-op attributes. */ - error = nfscl_wcc_data(nd, dvp, dnap, dattrflagp, NULL, NULL); + if ((nd->nd_flag & ND_NOMOREDATA) == 0) + error = nfscl_postop_attr(nd, dnap, dattrflagp); + if (error == 0 && (nd->nd_flag & ND_NOMOREDATA) == 0) { + /* Get rid of the RestoreFH reply. */ + NFSM_DISSECT(tl, uint32_t *, 2 * NFSX_UNSIGNED); + if (*(tl + 1)) + nd->nd_flag |= ND_NOMOREDATA; + } + /* Get the file's post-op attributes. */ + if (error == 0 && (nd->nd_flag & ND_NOMOREDATA) == 0) + error = nfscl_postop_attr(nd, nap, attrflagp); } if (nd->nd_repstat && !error) error = nd->nd_repstat; From nobody Fri May 30 20:36:37 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b8FQG1cjvz5wsd9; Fri, 30 May 2025 20:36: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b8FQF6KVzz3d7Q; Fri, 30 May 2025 20:36:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748637397; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CXH1Wam1KzGx6+UDgEH/nHGUAzfHnBSBzO8XUhH5JaU=; b=HROefXb5oevZYjYmpdNLl4/fd1vY/G11YzMHmZsOU5tgyGbFbbOZHvo/uwv5y47cpA7hVn w5m3W+T/iaTDdMAhRPCiEAkpXl4FreONr7LXEuxq+OQkLV4NEvwmMCybVllGfDOmoauci0 kZ0Y3XJIcOd1f73xtBKJQ18UL5x362qUmhmZ4TUYcIeEZd8CgHkgCSLNN+EK+l8nosxFim eCxF2Csdhw/MhHjpdKwzo/1hywUAJdWy+GxVTn99tCPvy0yP+GZUzCg4i5OVXoNB7PPjfZ 5AfJfDg7O2Ctz2QnxTRZmRfzeqJahO9tRKqaZa7Syv22aqCrtPr+291uwJKMdw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748637397; a=rsa-sha256; cv=none; b=VeGI+Dd4xfdUBk5SSAJewbxUGqK1u7t/XMNqqEHbMj2snrTIR7l69tsgXhm0v5JigGUpYd ujbOs/tJ440GR2cHoYVMFuov44QRP+eY7wVS6LT5PRXMPq8Hx0pNnIvlvqhz8jG28ik9BF ms1OC1mIKhEf0Zzn6XyS2VrzyPuVCxB8wnjAZgRN7XrK+gb5oHlDGqp5NhZTTNy1EFm68b spsaLRpdstRTwGqdzF7RNnKQygR99yIvNa01xPA84jvfjIXVYNVR3mfsZR9b0LdJrWaW7G H6uHupvojKSqhP9vh9tP407se38gT4zHU8rnKLDKa8CuZfEuHLwNQthmABt0FA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748637397; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CXH1Wam1KzGx6+UDgEH/nHGUAzfHnBSBzO8XUhH5JaU=; b=PlhWn3gupd+u3hNvs4xHiJUL0yP2hQOXGtz6mQ2kzws8ch52qphwt6GRRJTe2LOiefAWNj 8ZXJNxdbJgujkqLpnuWgKo66jY0noxNBxI95mMxpwiycZzx1B5vEHu7+WqhMlFQTNY4LFc oaBeOa5mlu/Yo7GaxE94EhzHriWOhRNgLAFFKP4zCmigXxLSbLsTdLJmHuToLGOwhifJEc wBUxuVgHgY8645yeFPHleY/8MOMkyB+aGEUWJeO5A6jnbIjhwsMpwovDtxWexZNz9C8z9f kn9i589/ogXqMq2d4gxNOJ8eapu7oRdoR9uQns/Dasm5PQVTziPo1Qx97xWfqg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b8FQF5nNKz16bN; Fri, 30 May 2025 20:36: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 54UKabDC004509; Fri, 30 May 2025 20:36:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54UKabQB004506; Fri, 30 May 2025 20:36:37 GMT (envelope-from git) Date: Fri, 30 May 2025 20:36:37 GMT Message-Id: <202505302036.54UKabQB004506@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: 6f9b2071b843 - stable/14 - nfs_clrpcops.c: Fix handling of a CreateLayGet reply List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 6f9b2071b8435ed366310a16cf0cb8f2e2797ae5 Auto-Submitted: auto-generated The branch stable/14 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=6f9b2071b8435ed366310a16cf0cb8f2e2797ae5 commit 6f9b2071b8435ed366310a16cf0cb8f2e2797ae5 Author: Rick Macklem AuthorDate: 2025-05-16 19:36:39 +0000 Commit: Rick Macklem CommitDate: 2025-05-30 20:34:07 +0000 nfs_clrpcops.c: Fix handling of a CreateLayGet reply Without this patch, the CreateLayGet RPC did not handle a NFSv4.1/4.2 reply for a pNFS server that also issued delegations. This patch fixes the problem. Detected at the recent NFSv4 Bakeathon testing event. This bug would only affect the rare case where the FreeBSD client is mounted to a pNFS server that issues delegations, where the "pnfs" mount option is specified. (cherry picked from commit e647a222a1a74bd3b2bbdd7903fb30e4e30b6b09) --- sys/fs/nfsclient/nfs_clrpcops.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sys/fs/nfsclient/nfs_clrpcops.c b/sys/fs/nfsclient/nfs_clrpcops.c index d37bffc5ad2e..5722810191b4 100644 --- a/sys/fs/nfsclient/nfs_clrpcops.c +++ b/sys/fs/nfsclient/nfs_clrpcops.c @@ -8584,6 +8584,13 @@ nfsrpc_createlayout(vnode_t dvp, char *name, int namelen, struct vattr *vap, &ret, &acesize, p); if (error != 0) goto nfsmout; + } else if (deleg == NFSV4OPEN_DELEGATENONEEXT && + NFSHASNFSV4N(nmp)) { + NFSM_DISSECT(tl, uint32_t *, NFSX_UNSIGNED); + deleg = fxdr_unsigned(uint32_t, *tl); + if (deleg == NFSV4OPEN_CONTENTION || + deleg == NFSV4OPEN_RESOURCE) + NFSM_DISSECT(tl, uint32_t *, NFSX_UNSIGNED); } else if (deleg != NFSV4OPEN_DELEGATENONE) { error = NFSERR_BADXDR; goto nfsmout; From nobody Fri May 30 21:09:21 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b8G830GHwz5wvdZ; Fri, 30 May 2025 21:09: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b8G824mDxz439Y; Fri, 30 May 2025 21:09:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748639362; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iAG4uhb9myjcGxvY7dMbOS9ytPQ6wqaNZcyvuKEtd+s=; b=AV3yhMJR6zztGQ36er7La1n8cnkUKD2T3vqP0sTWy4EUe8cV/BxDkD8bquwI4z0wQRU9KQ QaQU8SK4dKogW7jU1Xq/1lBIbWinLXpLLNtBxEgwVI/yZhU7HxBXRVJFd/K+WKkLGUTCTl 4MYWSnSYVq0tkdocQBvdaJGHY8Ss68mImt2HnZR0zglGI6uT8/w78az8GApk2eOf2jY7+v Sa3D2mwzyhAwtDzH/qqLDlK/wnmtrV9zg7WBeKQtQ40hrTdoc6NtVS7mLbPbwIG4/Xs+aJ vsTKzpaFTzuE/9cw9mV/NKJ7bP5P5sIvy6d0PgZAAzSjV7ZYbft4tex1eU7cEg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748639362; a=rsa-sha256; cv=none; b=coibSq1vIHhkFL7B2RzKya9a+sukfTj3pDvxioJPT37aShjm0mbI5opdnZY+kuZcK0xtPJ 5oRZ8ueNd3tnPRrkXrxxMq3Tk/vWPS52BSdY0yQK/5y2QdBx1wIaitjpjqe4a9pMbj/StR JUi7dPsERofZY49jQ8ZROnQ4hqG/gbhssJx/abnlnz/VbhQMLVLxsTm4k99k1uB40Ck8Zd 7HUxO0xFncjo8AFVUeIoVz8ZKHX2aK/y5K8/JJFzlKMczHFxLJq5/IIrahvs+Hu3syNYXR g9SiLK9qqM0/03O61q3lbV8KaBFCY0r+NeH+WIroT5MIbF2o46qHuP17B/dlPA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748639362; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iAG4uhb9myjcGxvY7dMbOS9ytPQ6wqaNZcyvuKEtd+s=; b=rOmk+bxzgEItG3NOIKiadWPoc84Eq1B78GZycpUYs0WDagYqP9Z8N+3SZNwW4DGfr12u89 xXgPqEQeTWzmQi/hlhzCoKo2/oVf+XsqmLfWyA6Uw4K4H2MrcoIdOaX2zmwJLByxNo8YDJ uvHOwIoZ8rFAk5+WJJL35CosDFVDLyoYUaJO/E5lg1NT24UPqS4A5gmSaerdBvwLhWBYX1 WkelSxamwXuGiFMOdZVhGKYCD+zTACMJGEzb9JAMx2uMY+BBZY4BH9zO40B6a/U/knCHUr wz92e/1PRsXFmWM+sQVG1sB3CK9wJQdUV32i7/lRIyUhwcg7raUxW92hL6dlJA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b8G815JfXz16ML; Fri, 30 May 2025 21:09: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 54UL9LWc062141; Fri, 30 May 2025 21:09:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54UL9LMO062137; Fri, 30 May 2025 21:09:21 GMT (envelope-from git) Date: Fri, 30 May 2025 21:09:21 GMT Message-Id: <202505302109.54UL9LMO062137@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Doug Moore Subject: git: f2a193a967e3 - main - vm_pageout: reduce number of flush() params List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dougm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f2a193a967e3457e9fb5acb918106a71853b4249 Auto-Submitted: auto-generated The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=f2a193a967e3457e9fb5acb918106a71853b4249 commit f2a193a967e3457e9fb5acb918106a71853b4249 Author: Doug Moore AuthorDate: 2025-05-30 21:07:39 +0000 Commit: Doug Moore CommitDate: 2025-05-30 21:07:39 +0000 vm_pageout: reduce number of flush() params vm_pageout_flush is called in two places, and in both, the mreq parameter is 0. Drop that parameter, and simplify the calculations that use it. The prunlen and eio parameters are either both NULL, or neither NULL. Drop the prunlen parameter and, when eio is NULL, return the runlen value instead of the numpagedout parameter, which the caller ignores. Change a param from boolean_t* to bool*. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D50568 --- sys/vm/vm_object.c | 8 ++++---- sys/vm/vm_pageout.c | 30 ++++++++++++++---------------- sys/vm/vm_pageout.h | 2 +- 3 files changed, 19 insertions(+), 21 deletions(-) diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c index 1d372ba04488..0e429b58aa1c 100644 --- a/sys/vm/vm_object.c +++ b/sys/vm/vm_object.c @@ -1000,7 +1000,7 @@ vm_object_page_remove_write(vm_page_t p, int flags, boolean_t *allclean) static int vm_object_page_clean_flush(struct pctrie_iter *pages, vm_page_t p, - int pagerflags, int flags, boolean_t *allclean, boolean_t *eio) + int pagerflags, int flags, boolean_t *allclean, bool *eio) { vm_page_t ma[vm_pageout_page_count]; int count, runlen; @@ -1020,8 +1020,7 @@ vm_object_page_clean_flush(struct pctrie_iter *pages, vm_page_t p, } } - vm_pageout_flush(ma, count, pagerflags, 0, &runlen, eio); - return (runlen); + return (vm_pageout_flush(ma, count, pagerflags, eio)); } /* @@ -1054,7 +1053,8 @@ vm_object_page_clean(vm_object_t object, vm_ooffset_t start, vm_ooffset_t end, vm_page_t np, p; vm_pindex_t pi, tend, tstart; int curgeneration, n, pagerflags; - boolean_t eio, res, allclean; + boolean_t res, allclean; + bool eio; VM_OBJECT_ASSERT_WLOCKED(object); diff --git a/sys/vm/vm_pageout.c b/sys/vm/vm_pageout.c index 704f1046d727..624184d57442 100644 --- a/sys/vm/vm_pageout.c +++ b/sys/vm/vm_pageout.c @@ -438,7 +438,7 @@ vm_pageout_cluster(vm_page_t m) } return (vm_pageout_flush(&mc[page_base], pageout_count, - VM_PAGER_PUT_NOREUSE, 0, NULL, NULL)); + VM_PAGER_PUT_NOREUSE, NULL)); } /* @@ -450,19 +450,19 @@ vm_pageout_cluster(vm_page_t m) * the parent to do more sophisticated things we may have to change * the ordering. * - * Returned runlen is the count of pages between mreq and first - * page after mreq with status VM_PAGER_AGAIN. - * *eio is set to TRUE if pager returned VM_PAGER_ERROR or VM_PAGER_FAIL - * for any page in runlen set. + * If eio is not NULL, returns the count of pages between 0 and first page + * with status VM_PAGER_AGAIN. *eio is set to true if pager returned + * VM_PAGER_ERROR or VM_PAGER_FAIL for any page in that set. + * + * Otherwise, returns the number of paged-out pages. */ int -vm_pageout_flush(vm_page_t *mc, int count, int flags, int mreq, int *prunlen, - boolean_t *eio) +vm_pageout_flush(vm_page_t *mc, int count, int flags, bool *eio) { vm_object_t object = mc[0]->object; int pageout_status[count]; int numpagedout = 0; - int i, runlen; + int i; VM_OBJECT_ASSERT_WLOCKED(object); @@ -488,9 +488,8 @@ vm_pageout_flush(vm_page_t *mc, int count, int flags, int mreq, int *prunlen, vm_pager_put_pages(object, mc, count, flags, pageout_status); - runlen = count - mreq; if (eio != NULL) - *eio = FALSE; + *eio = false; for (i = 0; i < count; i++) { vm_page_t mt = mc[i]; @@ -540,12 +539,11 @@ vm_pageout_flush(vm_page_t *mc, int count, int flags, int mreq, int *prunlen, numpagedout++; } else vm_page_activate(mt); - if (eio != NULL && i >= mreq && i - mreq < runlen) - *eio = TRUE; + if (eio != NULL) + *eio = true; break; case VM_PAGER_AGAIN: - if (i >= mreq && i - mreq < runlen) - runlen = i - mreq; + count = i; break; } @@ -560,8 +558,8 @@ vm_pageout_flush(vm_page_t *mc, int count, int flags, int mreq, int *prunlen, vm_page_sunbusy(mt); } } - if (prunlen != NULL) - *prunlen = runlen; + if (eio != NULL) + return (count); return (numpagedout); } diff --git a/sys/vm/vm_pageout.h b/sys/vm/vm_pageout.h index a6cdfafe743b..5cfb6e5ca198 100644 --- a/sys/vm/vm_pageout.h +++ b/sys/vm/vm_pageout.h @@ -100,7 +100,7 @@ void vm_wait_domain(int domain); void vm_wait_min(void); void vm_wait_severe(void); -int vm_pageout_flush(vm_page_t *, int, int, int, int *, boolean_t *); +int vm_pageout_flush(vm_page_t *mc, int count, int flags, bool *eio); void vm_pageout_oom(int shortage); #endif /* _KERNEL */ From nobody Fri May 30 23:30:04 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b8KGP3LF3z5x4wD; Fri, 30 May 2025 23:30: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b8KGP0PxYz3sgw; Fri, 30 May 2025 23:30:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748647805; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RREbje9HGA16HZ70QVXZMoL1ytqhgq5gJWG+4IwbjrU=; b=AOtBV7qIwmqisZzeQVSRQA5CrVCp2Y5skg/8zlDinPdyatgP/7ARvcBY0/BEvMc9Phb4Tt IvDbFmeqTWub9LeitOHbaEViyrafLTIlLKK4XmGnS/Uoooj9gwSo3mJljM5J5R4eyHnEqb QRWvIt8xI4MevZZBksFR+F+cJIvCGBHuJ3YZCaKZnCCvIT0hrJTC+ZPdYe1hRgvKhXjFSB 1NPNd19COPZ5JUF+bYsvbDHrsfOGHaLC896gkNnxgoFTYs7JTo6Ff3BoJrGBCBdu29dK9u lq440BM7YZLaDIH8OftL+waCTzw2eH1xYnjn8ih7MH8R+Y1fMc5l0dnB47+ZBg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748647805; a=rsa-sha256; cv=none; b=Lzlqn8ED6onRyN0JLMr9olDuMkS3izPiERBH6bunhL0o3TQwe+ikrUYSA6s/gqtm2EkdYR WCi1/00qqz/7T9b2Ug8EtoETefiwg24SK1avadFjDmtAl2disjTEzkU2uzcSbBAzyNypZC QRreyG7+CxA+JOucmrpLGFkCxTDE39/64wR4dwCbEZ/eUAfvGsSN4XmhKY/3g0mC6bHTFG hzHeiSUW5UfKhY1llO3fGeL0Rf+8WQTEM7bf6DWJkQPHygoviRLO2E3zd669Xj8hS4BJ5K JuKMyNz2zzAWTbfzMwibLTG+Wwq3h1lbhRzZGNt3aWEZGZNz8Ld1xi9Rnmlhmg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748647805; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RREbje9HGA16HZ70QVXZMoL1ytqhgq5gJWG+4IwbjrU=; b=v4mZyDDMhKmBea36CatDNom/arP3a384SioFx5nZwdLwLng9l4Xpmktpz6MwtX5SNAaIET RX61rcLtsg/Z7qDjeAoK6UJyqkhkCLHUw2tcEEy16WJV0bv23N+v36v4Qn0zTV2SSE4fdz PwfvJVxEJQB4HClgjUvnkuBuZXjGHf8ehW/TvrWZTCn4d4dsATNl77H1yOtQtMAUWfHPk9 XUeLSDXJdzEBR0vSJUk0ZxiLqmZRwWd006oQ1o0v642xhnQjeQ37LL/WMkwk4BpavjZSwA B3yilIeqq7KFclcHPHS1xBWnh28TpSZTVPErafBfnflsBc6yP6LIQCqC1CDcvw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b8KGN6sV0z1CFM; Fri, 30 May 2025 23:30: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 54UNU4Z0026147; Fri, 30 May 2025 23:30:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54UNU4gm026143; Fri, 30 May 2025 23:30:04 GMT (envelope-from git) Date: Fri, 30 May 2025 23:30:04 GMT Message-Id: <202505302330.54UNU4gm026143@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: 0d48d1ffe044 - main - nvmft: Fix a resource leak for SET_FEATURES/ASYNC_EVENT_CONFIGURATION List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 0d48d1ffe0446cd2f87ce02555e3d17772ae7284 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=0d48d1ffe0446cd2f87ce02555e3d17772ae7284 commit 0d48d1ffe0446cd2f87ce02555e3d17772ae7284 Author: John Baldwin AuthorDate: 2025-05-30 23:18:19 +0000 Commit: John Baldwin CommitDate: 2025-05-30 23:29:57 +0000 nvmft: Fix a resource leak for SET_FEATURES/ASYNC_EVENT_CONFIGURATION The received command capsule was not freed after sending the success response. Fixes: a15f7c96a276 ("nvmft: The in-kernel NVMe over Fabrics controller") Sponsored by: Chelsio Communications --- sys/dev/nvmf/controller/nvmft_controller.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/dev/nvmf/controller/nvmft_controller.c b/sys/dev/nvmf/controller/nvmft_controller.c index 96c9fee47357..390467534ca2 100644 --- a/sys/dev/nvmf/controller/nvmft_controller.c +++ b/sys/dev/nvmf/controller/nvmft_controller.c @@ -787,6 +787,7 @@ handle_set_features(struct nvmft_controller *ctrlr, ctrlr->aer_mask = aer_mask; mtx_unlock(&ctrlr->lock); nvmft_send_success(ctrlr->admin, nc); + nvmf_free_capsule(nc); return; } default: From nobody Fri May 30 23:30:03 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b8KGN5KDtz5x4yw; Fri, 30 May 2025 23:30: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b8KGN2Jygz3stm; Fri, 30 May 2025 23:30:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748647804; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rcYZCUi/shQ/+2Z1cC4HFtg6zA96M/fvM8V06AUbf2M=; b=BT9Z96aCM9HzrHD21g7uquiodh1dpbNeeXdUVcKLUwu8hfNPyzIk6fZwGT6PjoaaRUjkjU VNsbxjB3yWks2oFy0MQNXFB5cNuyeSqD2sNkKpUSrixkKucshDCHf0x+y47cTHMvQKH80W 8kdcZN4SYSsRu/kwvjmgphLZg/NWehkIdU/UjEZPYpgiUcHSgUZei5bVji3S6iDrJnuGA+ w7dLsV+Ds84jXsCRHIdGuJHrQFTaUwXcy8C/xaVxULA4TT4geivJ0r4zJYdkiYGSpBeB4x j6Gb1pNQvroW9Ws8AkAqMhQcq9u+pJwUrKCUJ93n4cbER5oOkYd2+xy94RvNXw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748647804; a=rsa-sha256; cv=none; b=JFGFuOmrUSfgdwt8Wdtd+EV/IhMMBJlRHoYKElDm4svLzFxelyF2UopRPc7lp5aYgCJ6RK 5F88Br7+jPVFj8mBfx60Z1GNpjo3Oj0jbkeUkRnTPg14QlPI8ce4veXegWVke9cOxf+UTf DRfpzxhaE/TmCeeYmx4ttDZ6REirqxBuS3x09cDC2mIV5pAFG4d3c3qowsV+KwBGvZ5Ufk m12QoUUqQGCzdn7oGyVdSoDgzJqiINui3ebwa+/CxmdA6v5G1s2Q/CnBSuzOz8oS9XKKZk xwpgZ1swnFCM/MZHRt9pAqbvXGA9HVmlmu95d04Glv3BIP8kIoCCUpjvK3ZqoA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748647804; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rcYZCUi/shQ/+2Z1cC4HFtg6zA96M/fvM8V06AUbf2M=; b=dI23WsFFKZ9J5ehKUQT+MMZq/kdRcRH40jwO+6aF8pAHbT0+XbcnlBXGCkFeavxcCeFGGy WbSz7RhTbBkfyRYu9nxNg/nASmyKwVvEYoq7mzQ6U9PBt2GpOFiiZj5oxE5RN9QAfwgwO8 P8geAqumesKllkH1nrLBDJ6z1lnIHGIGLXVz3T0iprmrN310Ze56VVBCA68iePU8B5g4km hjIuSiKnFQnsTVn115lnSVu1Sny0LQiTCp5WNUbDb4l/FmweohQen3D5vBEploM8dnLhF5 H6R6UvMFQ/KckO4fLtpWckLeIVGl3B/8ykmzQDemfft7BRhg74uoCoe8OwcyFw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b8KGN0Vcfz1C0k; Fri, 30 May 2025 23:30: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 54UNU33T025883; Fri, 30 May 2025 23:30:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54UNU3Pv025880; Fri, 30 May 2025 23:30:03 GMT (envelope-from git) Date: Fri, 30 May 2025 23:30:03 GMT Message-Id: <202505302330.54UNU3Pv025880@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: 54f8c44ecf4a - main - cxgbe nic TLS: Correct IPv6 payload length List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 54f8c44ecf4a28a649d75ad6d0daaf3206ae9247 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=54f8c44ecf4a28a649d75ad6d0daaf3206ae9247 commit 54f8c44ecf4a28a649d75ad6d0daaf3206ae9247 Author: John Baldwin AuthorDate: 2025-05-30 23:17:45 +0000 Commit: John Baldwin CommitDate: 2025-05-30 23:29:42 +0000 cxgbe nic TLS: Correct IPv6 payload length Sponsored by: Chelsio Communications --- sys/dev/cxgbe/crypto/t6_kern_tls.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/sys/dev/cxgbe/crypto/t6_kern_tls.c b/sys/dev/cxgbe/crypto/t6_kern_tls.c index 897773d2d867..04bb6c944050 100644 --- a/sys/dev/cxgbe/crypto/t6_kern_tls.c +++ b/sys/dev/cxgbe/crypto/t6_kern_tls.c @@ -1167,7 +1167,8 @@ ktls_write_tcp_options(struct sge_txq *txq, void *dst, struct mbuf *m, } else { ip6 = (void *)((char *)eh + m->m_pkthdr.l2hlen); newip6 = *ip6; - newip6.ip6_plen = htons(pktlen - m->m_pkthdr.l2hlen); + newip6.ip6_plen = htons(pktlen - m->m_pkthdr.l2hlen - + sizeof(*ip6)); copy_to_txd(&txq->eq, (caddr_t)&newip6, &out, sizeof(newip6)); MPASS(m->m_pkthdr.l3hlen == sizeof(*ip6)); ctrl1 = V_TXPKT_CSUM_TYPE(TX_CSUM_TCPIP6) | @@ -1267,7 +1268,8 @@ ktls_write_tunnel_packet(struct sge_txq *txq, void *dst, struct mbuf *m, } else { ip6 = (void *)((char *)eh + m->m_pkthdr.l2hlen); newip6 = *ip6; - newip6.ip6_plen = htons(pktlen - m->m_pkthdr.l2hlen); + newip6.ip6_plen = htons(pktlen - m->m_pkthdr.l2hlen - + sizeof(*ip6)); copy_to_txd(&txq->eq, (caddr_t)&newip6, &out, sizeof(newip6)); MPASS(m->m_pkthdr.l3hlen == sizeof(*ip6)); ctrl1 = V_TXPKT_CSUM_TYPE(TX_CSUM_TCPIP6) | @@ -1911,7 +1913,8 @@ ktls_write_tcp_fin(struct sge_txq *txq, void *dst, struct mbuf *m, } else { ip6 = (void *)((char *)eh + m->m_pkthdr.l2hlen); newip6 = *ip6; - newip6.ip6_plen = htons(pktlen - m->m_pkthdr.l2hlen); + newip6.ip6_plen = htons(pktlen - m->m_pkthdr.l2hlen - + sizeof(*ip6)); copy_to_txd(&txq->eq, (caddr_t)&newip6, &out, sizeof(newip6)); MPASS(m->m_pkthdr.l3hlen == sizeof(*ip6)); ctrl1 = V_TXPKT_CSUM_TYPE(TX_CSUM_TCPIP6) | From nobody Sat May 31 00:04:57 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b8L2f24N2z5x6nT; Sat, 31 May 2025 00:04: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b8L2d6Bbkz3PmJ; Sat, 31 May 2025 00:04:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748649897; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VVIIL4Cp+tj3YZzYy2TIG+G4KgwAgMDyBfJeXM497TU=; b=qgDT2lShh3JkKLp0pgSOxmNnc7swEqIKZXKBOINfxApJ59X0Dm1Qu4GnrwksR43Y68le2v CJZv8n6Sh0FDOqEVN3YvPPxI15xodZanJAYc9U/+Wc+NEhvBgvNOgDahs1Fj6YZj5vumDl jCQZ1IKSlwh0iz4jee8ExTnF/mtnxYrYCcx/krC7T8JTO0xDpJU7h4a2pLfGU62/W8O7Lw 5KXfbtQTNRrl3sB5fRbMRBYNg7cOX9znS9pugSZLP0niDpVKOEJ6er3j61fLJonUh3W7sd /UeFv1UPboMvNB4j2ibVG42RV6gd94A1e2UoXR+ED/NJgWeKV+gZBGgotswuUw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748649897; a=rsa-sha256; cv=none; b=bR5o0UwS74BXMw1tSbL4yE4EuqN1P8BKMOGgl289ih1M91asiX5GL4eW6SKM2xXH6W8HjF J9j90Ej5xZW12Nps9lpO87IN2C2sB86TWzyb+/3d6Tr5OxeE+2cY0L2TmHpMO9H3/lkAMc jc7m5fLW63JvoV69Mf8YfSr0rincjPyfOqh+06NMjZFPORfoOYUedUFq0DFh6xpe2TRBbS /bAv2f5OU8PQh6ZR/ymnFQraemEYqLr4J6FpgLl0IJ6XfW2+mM07gC6n2Ctcvsw1766nMC ThiEHXU7fikG5ztOFl+tC3YmVq2MUK9Qb/R27V7wZJ4Ol1dgB/Zygjz2kXp8qg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748649897; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VVIIL4Cp+tj3YZzYy2TIG+G4KgwAgMDyBfJeXM497TU=; b=maDx0dCaaH+kiQwnAxs0cgwnpXnQu+VzXEc0KH7/N8gAf4AuvwnGO8cIvyHhiIsnBUxZJ7 E7muMW9DbIy8s3SsWOoTWg9CNP74Sj88cRVod/I4ylJLf++YLqCziGrYq/swQL358sEyl/ iDB8Z7egIk1JfHVQDNAA2Zs1iJq0TrQaz10E1qKk/IkWscOeWtchOpgoikT57o+bE6kV+T w+nQy1fEOYpUwMpapG77AVKpyveiNfJNszg2Z3G50yyEw9XH6XpD5HSk9SkwBql/qRbI9i nnrzE2InSjg2qgX3TNPJrsXE4OKodMUs54xKhowp5wJM3dSPkFdjWMglip2mRw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b8L2d5lf4z5R; Sat, 31 May 2025 00:04: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 54V04vMg097155; Sat, 31 May 2025 00:04:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54V04vTl097152; Sat, 31 May 2025 00:04:57 GMT (envelope-from git) Date: Sat, 31 May 2025 00:04:57 GMT Message-Id: <202505310004.54V04vTl097152@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: 6b90209aaf80 - main - tests: ensure that unix/stream raises POLLIN after a shutdown(2) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 6b90209aaf809204c62e2a252c931e7240f60374 Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=6b90209aaf809204c62e2a252c931e7240f60374 commit 6b90209aaf809204c62e2a252c931e7240f60374 Author: Kyle Evans AuthorDate: 2025-05-31 00:04:33 +0000 Commit: Kyle Evans CommitDate: 2025-05-31 00:04:33 +0000 tests: ensure that unix/stream raises POLLIN after a shutdown(2) This tests for the bug fixed in 6ac71c4a52348 ("unix/stream: fix poll on a peer shutdown(2)ed socket"), where-in the remote side has shutdown writes on their side and the other end fails to return from select(2)/poll(2) because we weren't surfacing it as readable. Reviewed by: adrian, kib Differential Revision: https://reviews.freebsd.org/D50602 --- tests/sys/kern/unix_stream.c | 56 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/tests/sys/kern/unix_stream.c b/tests/sys/kern/unix_stream.c index 9f750967ebf8..f8ba288308bd 100644 --- a/tests/sys/kern/unix_stream.c +++ b/tests/sys/kern/unix_stream.c @@ -28,6 +28,7 @@ #include #include #include +#include #include #include #include @@ -101,6 +102,20 @@ ATF_TC_BODY(send_0, tc) close(sv[1]); } +static void +check_readable_select(int fd, int expect, bool timeout) +{ + fd_set rdfds; + int nfds; + + FD_ZERO(&rdfds); + FD_SET(fd, &rdfds); + nfds = select(fd + 1, &rdfds, NULL, NULL, timeout ? + &(struct timeval){.tv_usec = 1000} : NULL); + ATF_REQUIRE_MSG(nfds == expect, + "select() returns %d errno %d", nfds, errno); +} + static void check_writable_select(int fd, int expect, bool timeout) { @@ -115,6 +130,21 @@ check_writable_select(int fd, int expect, bool timeout) "select() returns %d errno %d", nfds, errno); } +static void +check_readable_poll(int fd, int expect, bool timeout) +{ + struct pollfd pfd[1]; + int nfds; + + pfd[0] = (struct pollfd){ + .fd = fd, + .events = POLLIN | POLLRDNORM, + }; + nfds = poll(pfd, 1, timeout ? 1 : INFTIM); + ATF_REQUIRE_MSG(nfds == expect, + "poll() returns %d errno %d", nfds, errno); +} + static void check_writable_poll(int fd, int expect, bool timeout) { @@ -325,6 +355,31 @@ ATF_TC_BODY(peershutdown_writability, tc) close(sv[1]); } +ATF_TC_WITHOUT_HEAD(peershutdown_readability); +ATF_TC_BODY(peershutdown_readability, tc) +{ + ssize_t readsz; + int sv[2]; + char c; + + do_socketpair(sv); + shutdown(sv[1], SHUT_WR); + + /* + * The other side should flag as readable in select(2) to allow it to + * read(2) and observe EOF. Ensure that both poll(2) and select(2) + * are consistent here. + */ + check_readable_select(sv[0], 1, false); + check_readable_poll(sv[0], 1, false); + + readsz = read(sv[0], &c, sizeof(c)); + ATF_REQUIRE_INTEQ(0, readsz); + + close(sv[0]); + close(sv[1]); +} + ATF_TP_ADD_TCS(tp) { ATF_TP_ADD_TC(tp, getpeereid); @@ -336,6 +391,7 @@ ATF_TP_ADD_TCS(tp) ATF_TP_ADD_TC(tp, full_writability_kevent); ATF_TP_ADD_TC(tp, peerclosed_writability); ATF_TP_ADD_TC(tp, peershutdown_writability); + ATF_TP_ADD_TC(tp, peershutdown_readability); return atf_no_error(); } From nobody Sat May 31 02:37:54 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b8PR66pNVz5xH9c; Sat, 31 May 2025 02:37: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b8PR668lNz4Lgb; Sat, 31 May 2025 02:37:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748659074; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ErV4J0266g+Yh2NyhfVfNaE04VQHWj46FpfqOSvu3pE=; b=aYIsg1m3bJBj/BWWqqK8AkIB6pHCa5LpdTqKpUO1vUuuw6b+2ReI8oLjlZxKBDcn+dLhJ9 OczmJ5YVQ941G3uuSrW8m//zCXyzHPuXuPPEF3dISo48musiVJBHK0tZsp+i3YnmNZoF10 IutKKSaaNHX8jRWF7HmvQZzMTJvaHgPqewO3sL501HebtbEf64t3lJVK01Aw/HEChLRIi1 4b0npS4in5VJKzxIVP+2yQpjdrN/nxsoAZGu9CL9zYKqQdZQRux1sWRAxpXwiuQ5SvCaHx QitW6IvUj4o+61KaO21KbMf7WfXjG+0mh5+iFqP5V/6B8mrM2k29vE4E3QwTHg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748659074; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ErV4J0266g+Yh2NyhfVfNaE04VQHWj46FpfqOSvu3pE=; b=laXBPpyn6APC8sbpYPBImm+Vp5SSiC4NTEolCJ+qSlMgP3G4K4KPLaSNEzhb4OwVtieEHI Y/cqpHWIN4Mo9DLJoZU0BBuSt2GKbLrS+JBBm2lHc2yo5ww9FsyX3lv11HkLvpO2rokkLH pDO3xSOwvYpIdbr93ymeyivZ/Pp4vGZdvyg+J9zDJz46ij/MNzoK+Kuea8QlXhhD8Iu4zN yFyeQ13WM0QgrWkc6GnbD7ItJyUN2CTikw169QoJVwbzZGn0DWFPAW9J93faFPwb4nfY/O 3nvoMChEjO/tsaSXzV6m2DxICEWg54tvagKInQSrCG8NuRHdnsLogxWwjUnuWg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748659074; a=rsa-sha256; cv=none; b=RyLlgHR58bstS0TlQJQC7HUonMh4ZxSECn7Fh3l9tftkCQvF517IBE12pM9geQUTiwHyBX Kog+tu/RI++PXFAxjPSqUMb94kZhUwampLylNL7kyeDnPJJjhuT31vyUjzeCocVfhqQkxL bhsSe67L4UQkI9bJUJHjZKVBIu1PdrJJJanSrtcO6+iO0jiMqznUVThKxWKLTKVnl/yK6w FyvTO9M5g+Bx3Bj4ZA0pDKhQyXh3nOhZ74/qMdhhz2nnpwnEit7VJxyveKexccX744Dps7 BRkcvmyNkJnUpWRkfQcgKXyIDPym8Uy89O3fUVKuolwuabJiIhOMhdc7dz1mUA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b8PR65HWZz3t0; Sat, 31 May 2025 02:37: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 54V2bsBR078210; Sat, 31 May 2025 02:37:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54V2bs68078207; Sat, 31 May 2025 02:37:54 GMT (envelope-from git) Date: Sat, 31 May 2025 02:37:54 GMT Message-Id: <202505310237.54V2bs68078207@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 1e8f26125fe8 - stable/14 - libc: set close-on-exec for temp socket used to detect IPv6 support List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 1e8f26125fe8442ebf499b2bb25d78d779ddb574 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=1e8f26125fe8442ebf499b2bb25d78d779ddb574 commit 1e8f26125fe8442ebf499b2bb25d78d779ddb574 Author: Konstantin Belousov AuthorDate: 2025-05-24 11:27:29 +0000 Commit: Konstantin Belousov CommitDate: 2025-05-31 02:37:35 +0000 libc: set close-on-exec for temp socket used to detect IPv6 support (cherry picked from commit eba403923626f2ecfd724e131da992a7c3cb7240) --- lib/libc/gen/sysconf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libc/gen/sysconf.c b/lib/libc/gen/sysconf.c index 3024cae47c85..4b43cb48840c 100644 --- a/lib/libc/gen/sysconf.c +++ b/lib/libc/gen/sysconf.c @@ -569,7 +569,7 @@ yesno: case _SC_IPV6: #if _POSIX_IPV6 == 0 sverrno = errno; - value = _socket(PF_INET6, SOCK_DGRAM, 0); + value = _socket(PF_INET6, SOCK_CLOEXEC | SOCK_DGRAM, 0); errno = sverrno; if (value >= 0) { _close(value); From nobody Sat May 31 06:20:25 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b8VMs5bSJz5xXP9; Sat, 31 May 2025 06:20: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b8VMs2w9cz3m04; Sat, 31 May 2025 06:20:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748672425; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1TK6bHEZEyKt+Vq3EjdEns1ZJ6pqUWXiIvAI0knkE10=; b=bP8w5jDA9IaohHsf03JgM2JlZibRHTxhlmw3nFJ9mJfeJdKhuI3VrncUbvco6HVgJG47SI VI4nFzIjdksPTJOaZlOs6yiSkbLniLRZX40SeM6lTdVBsenRQNdKagtyjwd2P/lzLPUIx0 sPRMXxmzGUZ3RNNC12n5Eg4KyQMz0A4XZ1TfiQdKtUIcLx2jzRrs3Wo/FFJVKopz3dEwOQ so2jBtiQVmfSBXTKT+f21gzWmq2g+W29ZGJcgooTnDjfzrNDICrHX2YVaDJamxbs7DQ+FK Sbc+mkalJloVs2OFTh/C8cXNKriZLezpc/zBNM9ciiAs2eYL9ANUjzgA9TZTfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748672425; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1TK6bHEZEyKt+Vq3EjdEns1ZJ6pqUWXiIvAI0knkE10=; b=p1AzFkhvpOe5/zDnkTtrt6Z/C85h9zQjsv9dnztyd/O1YQClCYlr3ssncR8Cicy6uO2H3P 4428N/jTejjCxg9lon5kJl1yEKyEVdqij9gD0axsow2jPwTLGRzX6twNJuP4569rkvJQJM ZmRwWNrOnBGaejiFffELs+Rl7/ffnk9Mn21/BgRSaR//YO52gUWvKGXfz3gF7hLdTIMMRV iTDREhUlrixkxTYjlZS/Owdpe9oxsfWJrOVw1V9VX7lZDIOh+L882hnnzSDRsYhJBFIQ4F mjC4Z5LhafrqJc5Z3vQ5aVADb5wi2gHMI+nrPQDa9ko/goYK543U+L0+SOR3Ig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748672425; a=rsa-sha256; cv=none; b=D6XpdMD4QUwVnGpnTKKix5Z+gsWbJagaBf++5osgYrUlO70NbMe8Kk269WHhAATuN2UMY8 0c+ljI6ALn2I8LzEcpF/axlGgnBlVfR9QDGUM43rrtYFzBafm8KMYd7XUULnU/lBqiDelC +cYfuxDiH2VvoEnWT/+zXb2BTCsc4ou/JX5fXQRXI85XjPmCNIw139m2xDjbze+D/DRaX1 3n1jT7ha5cwNK/pn6T2zcB5djWGfqiaK1ufAyUenFlWzGRb0O+cHxlzpPbfmHdhfoivbSO ++q/sbled384PskipgpmchkCWZIcfvpOBp3Do9qUCNfaNSrngTgOnTgHhoiYGQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b8VMs2TshzB4j; Sat, 31 May 2025 06:20: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 54V6KPZ6002441; Sat, 31 May 2025 06:20:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54V6KP98002436; Sat, 31 May 2025 06:20:25 GMT (envelope-from git) Date: Sat, 31 May 2025 06:20:25 GMT Message-Id: <202505310620.54V6KP98002436@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: 6ab70fbec423 - main - ifconfig tests: remove incorrect #! List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 6ab70fbec4236a940275a42e301f76ade7faacbf Auto-Submitted: auto-generated The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=6ab70fbec4236a940275a42e301f76ade7faacbf commit 6ab70fbec4236a940275a42e301f76ade7faacbf Author: Lexi Winter AuthorDate: 2025-05-31 06:19:45 +0000 Commit: Lexi Winter CommitDate: 2025-05-31 06:19:45 +0000 ifconfig tests: remove incorrect #! Fixes: 59ee9260e6bb ("ifconfig: reject netmask and broadcast for inet6") Reviewed by: des Differential Revision: https://reviews.freebsd.org/D50566 --- sbin/ifconfig/tests/inet6.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/sbin/ifconfig/tests/inet6.sh b/sbin/ifconfig/tests/inet6.sh index cf7f97e01d79..edfd88d93af7 100644 --- a/sbin/ifconfig/tests/inet6.sh +++ b/sbin/ifconfig/tests/inet6.sh @@ -1,4 +1,3 @@ -#! /bin/sh # SPDX-License-Identifier: ISC # # Copyright (c) 2025 Lexi Winter From nobody Sat May 31 09:00:46 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b8Ywt6lSNz5xhpW; Sat, 31 May 2025 09:00: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b8Ywt3wZVz3ClM; Sat, 31 May 2025 09:00:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748682046; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zhWzU3PrluZs+JMp0IiN5fQSb9b78dSQr+vzcyJzqMw=; b=xnqbr8aIZBt2XlO+9o2J5pJhMGtBKWR/swjFupJKAIMa3RqAoqNii/dmhh7JtnCZq1GgvX L6gFeaV3Sa2T/5iv66uNxLuaHSjGOBYE6t+xNvOjz/4WWzh86mdQXR5cxhnviRtWavJ12J HiNGoToic+Ia+UyNdZ7+P8hTb+fxS/KuZPOtrRBREVfrwHs0I+W5umlxX6fArqA5pyphaT xnZcKVZnanz0k9rO2ar6tT94XhsZ3riV/Jy7TEAsVg2sFhWtSHdaQJvT9V5rKEKTbOg7y3 jSMUjOzkMHhHhKB0M9oRkt/QCHht1ch6y7pM/6Zu99gaYt0pjblA+4Vw9beKlw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748682046; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zhWzU3PrluZs+JMp0IiN5fQSb9b78dSQr+vzcyJzqMw=; b=hzMde8B3WRAa6+e1+Bc23oWbx6i3heB6xrZBTLQpF7UONqnVaFdX6WcoRg18a4ft9GL9PU MGXpVWcXiO3kmajccFMCW02oNK+BnxWlVbtWbOtEypJRfEWjW1+PQhger9wUVylVj2yKdV 9piIiZpaHnxHutk5i5+//d59FopoTRW5xZlAgRsOMa68q9Bw26ouaBGEqmd6dOZ9jyiRyK PagtJZ1a//cI+5NAwwldcVQddZbkcHZuWXE38o3zvrSlbM8jwhn/YhV6B916bsqJ2PG43E HfgHZXX7JdNdfzT0QWGxOdiPD7+AZ+bF+RRdsMoD/5WMP+Zl+Lw7uNvcK8NHiA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748682046; a=rsa-sha256; cv=none; b=OZzEGC1kkHwPIpaNjp6Xy65pWBc8hyo2a4zM8VrBXyzYtdd7kEYOJek9uiZ/bFlTZnXk1v ec3i9Mjy2zs5ed3hSgN4geDlo3DBP3nh14L1LAC4OlLnGDKhuoYcUECFdaM+JloENDXbqc tmBBtK27sdsVcJBB67RYpWKlCZQDCFzRNg2yhw9aXx28OLzdGgdjjKt/hrx4DkNEP2T3fs O38sSdhF8MKpJickrrOhWtEW6mz/oyrYNKplXawsnnobwcJAUln6b8JUFQQI2mwRtV5Ojc pPtIK894un+zqV9LJhpPvXFGs2KtTjkNkKBgzrFjxzW4Fb7lClL93mQk4wZ7Ag== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b8Ywt3MdJzWff; Sat, 31 May 2025 09:00: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 54V90km4001928; Sat, 31 May 2025 09:00:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54V90kKI001925; Sat, 31 May 2025 09:00:46 GMT (envelope-from git) Date: Sat, 31 May 2025 09:00:46 GMT Message-Id: <202505310900.54V90kKI001925@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: 56a9d245eb16 - main - ipsec(4): Fix a typo in a source code comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 56a9d245eb16e774fece0334fcf0761058d59a0c Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=56a9d245eb16e774fece0334fcf0761058d59a0c commit 56a9d245eb16e774fece0334fcf0761058d59a0c Author: Gordon Bergling AuthorDate: 2025-05-31 08:59:09 +0000 Commit: Gordon Bergling CommitDate: 2025-05-31 08:59:09 +0000 ipsec(4): Fix a typo in a source code comment - s/limitiation/limitation/ MFC after: 3 days --- sys/netipsec/ipsec.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netipsec/ipsec.h b/sys/netipsec/ipsec.h index 3acb6a4044f1..44e7d9667d5b 100644 --- a/sys/netipsec/ipsec.h +++ b/sys/netipsec/ipsec.h @@ -102,7 +102,7 @@ struct secpolicy { uint32_t id; /* It's unique number on the system. */ /* * lifetime handler. - * the policy can be used without limitiation if both lifetime and + * the policy can be used without limitation if both lifetime and * validtime are zero. * "lifetime" is passed by sadb_lifetime.sadb_lifetime_addtime. * "validtime" is passed by sadb_lifetime.sadb_lifetime_usetime. From nobody Sat May 31 09:03:31 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b8Z035VDmz5xjD2; Sat, 31 May 2025 09:03: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b8Z0351G4z3Dm3; Sat, 31 May 2025 09:03:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748682211; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GTCk4KZsKc1VQgTgk4ixRXFEFbSer1llQBfvryfQrrA=; b=JXSVsTST4mOEy3bqWMHgrE2iWskgEgbXn0phYKNF7hs2IUWxFCl4rULvNcaElNm6jlMWoO RJaBNpRJufLd6cp2lcMmT3IyTeG2cdz5mj8HMJvPuI9wAelsqsYiHL4r1vtdx3mfBBZ5SU 5DMfGp+CLkKPW0Nl4lOUBKu3TZez20oW4aJG6oBN84H88YHP1GZntoMS7whSu2BVtDXNqp 4V9jKENmjYhHHYJoDWjBy/uieEKHkHYh9I4GyLs/MQan6NoT98bRAi0izroXZfSKAyzml1 Db5tlv3R5yrJMUMcklZdZvGLKlNpiXPq2Hn2uXqekyL4JnW7G5dv7bnB/uleeg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748682211; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GTCk4KZsKc1VQgTgk4ixRXFEFbSer1llQBfvryfQrrA=; b=i6Hl/Pbv8x3Jjrmaltq8Hd8NuISo8YfheK1P9sKT7oHwph8t8kEss8D1QjxuuiSsGgHzXd DiWr5dj82Z9U07exdl/5geyKKBtda6P7SOVLqH1+WqMrk1QNPv1BdCiQUdbkgBnCxZ7gBu XdxaiiN2n1CiTyVVEV+PXoHQDOrjpv+KviILT+TfM/DhCnFITvZAjiq3nIsT0hNa2VWh+W VjKyso/w4FrbrWKfysF1+mKPhLlX2fVehNYas+/dQFNwJRJxIdulpeUlrfvhk7uHAG9nVI q5uLAhV2KlILgybJhX9YnCSP2szB7TGLHXAbwcRaqNCxw+i3S84n30seZXmhvA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748682211; a=rsa-sha256; cv=none; b=bTrH7yLOFgLEjNz7kRxX+unHf5MtIAdo+ANnvc2Wbv/UO4CUA6/5l8MAVDriMRnRMMulkk Yz1BHffi4s4tYjrShG2Y0IpwIuj0sFMHlV8YHyUYAAZnQyz/gSl04vPGNkfEGz3yDkaUJR FdETTXfIwgEGwI/IO+dscNps9ziWkUlWqtV/uh4v35Vz1YtytmSQIGOzvCq/iPIltge9lO Dt7SiwydNZbyk8Alq9ah6nMLSs0iwlJZlZYPrCuLvNGPNFFIAmmIs7pBtu6k0q3Ko2w8iD RHXHcH9M3+Shfdao2FUJceElBd2fbLaKqSaMp2Kfu8UhHricrAkoHGLGu5CilA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b8Z034X7QzWtw; Sat, 31 May 2025 09:03: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 54V93VXx009948; Sat, 31 May 2025 09:03:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54V93VYo009945; Sat, 31 May 2025 09:03:31 GMT (envelope-from git) Date: Sat, 31 May 2025 09:03:31 GMT Message-Id: <202505310903.54V93VYo009945@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: 62b3bac1a280 - main - syscons(4): Fix a typo in a source code comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 62b3bac1a280e765f86901926c9e8d5f5b431bff Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=62b3bac1a280e765f86901926c9e8d5f5b431bff commit 62b3bac1a280e765f86901926c9e8d5f5b431bff Author: Gordon Bergling AuthorDate: 2025-05-31 09:01:57 +0000 Commit: Gordon Bergling CommitDate: 2025-05-31 09:01:57 +0000 syscons(4): Fix a typo in a source code comment - s/contants/constants/ MFC after: 3 days --- sys/dev/syscons/syscons.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c index 0985f03e1cb7..fd204491f8fc 100644 --- a/sys/dev/syscons/syscons.c +++ b/sys/dev/syscons/syscons.c @@ -3571,7 +3571,7 @@ sc_alloc_scr_buffer(scr_stat *scp, int wait, int discard) old = scp->vtb; sc_vtb_init(&new, VTB_MEMORY, scp->xsize, scp->ysize, NULL, wait); if (!discard && (old.vtb_flags & VTB_VALID)) { - /* retain the current cursor position and buffer contants */ + /* retain the current cursor position and buffer constants */ scp->cursor_oldpos = scp->cursor_pos; /* * This works only if the old buffer has the same size as or From nobody Sat May 31 09:06:09 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b8Z353dVTz5xjHm; Sat, 31 May 2025 09:06: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b8Z352shdz3G0X; Sat, 31 May 2025 09:06:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748682369; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KJClX3rN6T/vR54+303eJ1dUsS3SLtmmxMi6bgX3spo=; b=PK+dJQ581vTe6FgcFzvFYs+Llbw4tHG+I5/dMfw6XkfAqFbsY0z7+N3dFeccT4K6GZVwdg aM0Sr/3WbUEFBdUFS41HAh84fDeRJOpeSn9t/uG36vwK7JEICwhrkAWYBxFl7d8BsYl+9x gY53AEe7rgeC18AgzgUuBcNDg2y8p3mkSZYYsFMffH8TBU6m4tMwVqIz+EkGddADoAjbSd A/KJRMyImIHkDtU1ctWVD+upuSCs/2buNFsc3QeIC3Hy3on+TIZOf2bBz3AUw8EKSwVKi0 EFnwTUbomzKzWzwllwtIcZ/nx+/RpqYZV/R2PBAkiK5wR5yniVhCz48E0rGghQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748682369; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KJClX3rN6T/vR54+303eJ1dUsS3SLtmmxMi6bgX3spo=; b=yGXXuwvatnY4VgMQFcC6QHYr7Mtc3ajj5yBINTBuav2Ixl+NzHcARs9TA8gxglXJiz0lqk wjUAsTkEIkFiqk7jdys3a3C6lgibyCEs5aBwgsBFUtt4F4LZCWJEs9WbAFGaXgDLuVp5LY WoT7iPLtPivWPLvZBCMAZX51X/qp68GciesrjYWyl0soobncBFgo5AHytURIBDyN7qTpxS FRyYBoKhntek/XD6b8qTFm4kDWaQjJirwoxCJm7tWD+BVc7qKT5PrArYW+ua+Z0wDxjCr/ zkcQ3JhPsSm7XhSm5QrBvoIGdXpzZz3DY1rL5ZWEoc2EbM9Yh/GBYf4+5UkrAA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748682369; a=rsa-sha256; cv=none; b=rT0UONY92SeT2feXLDD8j9QLbQdHMObecV0pyi4ziOE3+bhW+UNlzPkYW2COyOD4rZ5OGA XSgp/EWW9ksl6qWPcRH11ALlFJUaFX3JSfVsE9uQ60iN6L+pLNrDI0fYraaYxqLMY1Nce3 SFhsHxSv0ksTGWNQbBwGOTv2sWpWY5BMoRX1MgFftPtwNMaTq04ZVj+AAPhLDxBXzCY9M6 k0IVa9OHv1Dd+08ZvAbJ3cb7CtLl/pBGGn74K2g4O4JZ7NXRzQx/ipJlIIM1jMuZkTNpE/ Jz4C1Nd3oZITDYbGzsgycdeRR1OhvsOtkvX5K9SwHuujE1HrkbfzHPr07Ulgkg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b8Z352911zXbq; Sat, 31 May 2025 09:06: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 54V9699h010825; Sat, 31 May 2025 09:06:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54V969Oj010822; Sat, 31 May 2025 09:06:09 GMT (envelope-from git) Date: Sat, 31 May 2025 09:06:09 GMT Message-Id: <202505310906.54V969Oj010822@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: e86d9dd6cee1 - main - cxgb(4): Fix two typos in a source code comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: e86d9dd6cee18b035a34d54dbab93fc1ad6b527e Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=e86d9dd6cee18b035a34d54dbab93fc1ad6b527e commit e86d9dd6cee18b035a34d54dbab93fc1ad6b527e Author: Gordon Bergling AuthorDate: 2025-05-31 09:04:41 +0000 Commit: Gordon Bergling CommitDate: 2025-05-31 09:04:41 +0000 cxgb(4): Fix two typos in a source code comment - s/cotaining/containing/ MFC after: 3 days --- sys/dev/cxgb/cxgb_sge.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/cxgb/cxgb_sge.c b/sys/dev/cxgb/cxgb_sge.c index 52ffa5cdaffa..85e92b0e06ff 100644 --- a/sys/dev/cxgb/cxgb_sge.c +++ b/sys/dev/cxgb/cxgb_sge.c @@ -1924,7 +1924,7 @@ again: reclaim_completed_tx_imm(q); /** * restart_ctrlq - restart a suspended control queue - * @qs: the queue set cotaining the control queue + * @qs: the queue set containing the control queue * * Resumes transmission on a suspended Tx control queue. */ @@ -2299,7 +2299,7 @@ again: reclaim_completed_tx(qs, 16, TXQ_OFLD); /** * restart_offloadq - restart a suspended offload queue - * @qs: the queue set cotaining the offload queue + * @qs: the queue set containing the offload queue * * Resumes transmission on a suspended Tx offload queue. */ From nobody Sat May 31 11:49:59 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b8dh80d5zz5wvHq for ; Sat, 31 May 2025 11:50:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b8dh774Lfz45XY; Sat, 31 May 2025 11:49:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748692200; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Jh9Ym7Ni9dwzFu5iA22SpfD9EUWhnbDIzqAyCeeYRq4=; b=NTTx5txTOBdLO9r7rhEzJS7YHjjqGdVy5HX/J9x0IgA4V8+T5v+Chwyp0eUdZRYoFnuCeo vDHa09cazXxo1Zqnkmbb9jB/U1rH/h0we+p46NKWa2G3TEh11W/nD6wi7J5CaF/APBun0t DDuyqhbYCBkWNw39S8YJgWZu/0eq3v11KJRyUNCcXCqZouqcX9o0T/5aOyzRQzNIn4gDSK EywyWvZnC0XKBQsFSiu1TXtHIa6b4+kYT+HaINqSLqkZS82qN5zi0HehfVfzKFXM+/TefE 2ShZx9N4mkA9TPjUcrlkxEYssXDpdqiDEAUIJmEo4ij+xi/bWVGO5LUji5IA1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748692200; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Jh9Ym7Ni9dwzFu5iA22SpfD9EUWhnbDIzqAyCeeYRq4=; b=oqcJeaJn2zYzgvjGyByTIf34DRlUmLRfjn+nsj0VR2Yi1QT0kqAeK9ucKOqqS7W4xyv9bT MSmRGDk0zQdETsZYzGVjV5p4skdik1ODpd/2N4o0OMLA6DVUbvaqakjWG7tCFjGbZXSR5x H8OWZTC/UJIRbAxnEikjDJxZ4/DEpfB9M9EpAtITtz5D25SuYawzyoU0wZGKEqtdjVMMqf 2LIhNWZg1HX7cathNVDUplrX8woDrP/QoQyv41/G3VNedvw90e6xfNZdWcAdiob9QUi1+L SiTviKSXucO1n09SOUxcG/y9/KkpwMqTj8UUETi2c9Mvmybelz29FurM1qFmHw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748692200; a=rsa-sha256; cv=none; b=f/x9ILb5JU4sbr5XyvM4fRcxH7kgwMTASG2G+hK8jh0ZcDLQ6c0oonAWXyZXoctWIqYCMK Kl4Y8c952UxJXFgA1icosPEMIBEumIwvpEMT5OGF9TW7o8Wuqm97UfDKNhSA8ubhp+PWxz OnjFeuUgMwNp/V0ymIltZfAMmZOgG/49SqsvbNOdYcLZnBWpA5hTDFlAjcwUzB+10e4/yQ hAN4OVYzLqfZkbbVuIwr3kWOSS4PqP2X1XOQ1mo/N+3MtGCc3yXYzkcrsajS220sgCOHZI IyXrWvy70VwFMo8jgFk6UMoDxyuywClA95MgYH+FkJuEFsTRzQ2he9vxPFvBIQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b8dh76Gr2zd71; Sat, 31 May 2025 11:49: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 54VBnx4a011073; Sat, 31 May 2025 11:49:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54VBnx0t011072; Sat, 31 May 2025 11:49:59 GMT (envelope-from git) Date: Sat, 31 May 2025 11:49:59 GMT Message-Id: <202505311149.54VBnx0t011072@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: =?utf-8?Q?Dag-Erling Sm=C3=B8rgrav?= Subject: git: 5894a4142a9d..86fa5d2f787d - vendor/openpam - vendor branch updated List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/vendor/openpam X-Git-Reftype: branch X-Git-Commit: 86fa5d2f787d1501ec2ef61f19151d4a386baa83 X-Git-Oldrev: 5894a4142a9d5ae5f7f6bee1f46237a3d20d0b5b X-Git-Newrev: 86fa5d2f787d1501ec2ef61f19151d4a386baa83 Auto-Submitted: auto-generated The branch vendor/openpam has been updated by des: URL: https://cgit.FreeBSD.org/src/log/?id=5894a4142a9d..86fa5d2f787d 86fa5d2f787d Vendor import of OpenPAM Zingiber. From nobody Sat May 31 11:51:38 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b8dk339dZz5wv55 for ; Sat, 31 May 2025 11: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b8dk30mWpz46bR; Sat, 31 May 2025 11: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=1748692299; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=caSbB55W2QTiq/qd7yukeYP4EWYoR6lqOMLoZhN0k4g=; b=l9XNm7nKON2EWvAy5693W6zY5m0y3W7SgjUQZ29whYr8pEskzTmc16y05Xz39j3ZbHlraE f+6xNHBajIl0ys85vKf0xNU5rrdpkEedBZStSCg0jez3ysRnoPtfGYVHT+paaQ82TUUwcN fGD9SLmzZcx4C8NWYZMj9gs+eqqpW9nVP/up/g65QKe/qg7j8ESjcla/DQjzUWS6djG5QZ D39vlCZW6hjNOrm5eoo8bG4ttFG99P+34SO9BEOLNUpL20EcTNus0HgIz4T5WxMNmpuB2h 5Dt1ES3XMxbASox4kcZGylImrRCaAudzWbtv9LiqADJ0li1vNh6ELUQ+th3qBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748692299; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=caSbB55W2QTiq/qd7yukeYP4EWYoR6lqOMLoZhN0k4g=; b=vIdWkSWzg7PGuf+gfZZ5EYtFz9J3aKaqSUQo/NsIGUKtbSPsak80F/tV3tMbzSigYnF5+x JFJrLP2uWpH5Vt+ThyGgwk46yxaqKa5ccwZfqzdib18RJCPox5VRfwgfndPuFiUd4c4XoM obCCy3upZGC2Cw7/A2Jl8g+nlh2DbYksaL/DXeODg5qixqgXf4NP6X7uSrhQpx0evyjdyJ QKNz5o7M8a7EmHxiKN6F7SvN5AaJafs+mCyNhVOEfxWErPnYQZV2kLL3WM5uXhiN+eoVPi RH7A6S9X+GGirhylJpz04xs/qNaZB4+n3S1PmWlyoExMMiThTWbJLz/0ekC5yg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748692299; a=rsa-sha256; cv=none; b=VS13R24bW3yO0A3H75qTdKDoPB9FrwWnppcUBWmHGWXE6gI7c/uhwoM3DGV430Hn0tyxVq /PInWyAg5AUAx7HMbixXvabzjgXltmsPHrx29kv7vQnbgGtq0QXauQRTbQrN7BQsdmtAg6 BPkFyE4jyA/c9YbXayeOJ/EcfjgTpHwjI9QWPDLxsBTrxC/vA3geFpv4PKJUrOkmeZhiAL NPhq3EAEOydxbESqtmU9+AsCkYl+MF7u8i4n1zfCnOEGikv8tv1IfEoNxla0Du+iYlMEdM th4F4Pol8NT/7osaBH6C7JUADv4xzxgj3QAU2l69Z50CAIJDdIU9P+OlOhxSGA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b8dk30JPWzch1; Sat, 31 May 2025 11: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 54VBpcL6024777; Sat, 31 May 2025 11:51:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54VBpcWm024776; Sat, 31 May 2025 11:51:38 GMT (envelope-from git) Date: Sat, 31 May 2025 11:51:38 GMT Message-Id: <202505311151.54VBpcWm024776@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: =?utf-8?Q?Dag-Erling Sm=C3=B8rgrav?= Subject: git: 6fe4946154e3 - Create tag vendor/openpam/ZINGIBER List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/tags/vendor/openpam/ZINGIBER X-Git-Reftype: annotated tag X-Git-Commit: 6fe4946154e33929ac201235b17d63e892f5fce4 Auto-Submitted: auto-generated The annotated tag vendor/openpam/ZINGIBER has been created by des: URL: https://cgit.FreeBSD.org/src/tag/?h=vendor/openpam/ZINGIBER tag vendor/openpam/ZINGIBER Tagger: Dag-Erling Smørgrav TaggerDate: 2025-05-31 11:49:39 +0000 Tag OpenPAM Zingiber. commit 86fa5d2f787d1501ec2ef61f19151d4a386baa83 Author: Dag-Erling Smørgrav AuthorDate: 2025-05-31 11:49:06 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-05-31 11:49:06 +0000 Vendor import of OpenPAM Zingiber. From nobody Sat May 31 12:16:56 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b8fHD3NBVz5wwvZ; Sat, 31 May 2025 12:16: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b8fHD2z31z3Tyx; Sat, 31 May 2025 12:16:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748693816; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WDqKGT7lDLUwXrTyyuUQTleOf2ygf6nEf2aVnHWY7Ik=; b=HnBCXNhbucAONVvwo0QqREwhrkR45O/Ka2Y7OnmTGItBAtv0nUX/SOQsLgKsqlmM+w/uzI d366t4Rc0IF2i2WdDpv3B/SL87nZmSfRTZ2xAi1G9/J+yRk0aqNqIsYxcRcvEbeqmAAyGh OdH7XhWcy7mvFl+henf4gmUmNDIamXUGcruIYVr4riEUvrlHtxJLlRp6fgSUekA4xFgS/d /ZWdQBd92XG7exQlyrcDMzAIZEYDt+psWASFT5LOL8vcp0H303Tn/kfGYDWrBqNzeYCvcP O+qXvE1gXUY7MKo73YCDEhefCNW4WSBLkbdTt06eWCc4rT3pmYTma+f6izChRA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748693816; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WDqKGT7lDLUwXrTyyuUQTleOf2ygf6nEf2aVnHWY7Ik=; b=hshsXuuqUuU0Whxf0ssR2Vemh0cH8PkwO0IwKgtoNmXDurlFUd/ALpQRSpZoz9l8Rn52hy ObiseQHtGlxcX/Ht+qi0oLazgOnjS3zkfm9brNrzesB6nlypj+jQxXy1FiS8pTAY0DiQDL 84Rn5nvMVpGz2SRCd6ndlmtj6tg2ykQqXUtV+PaZjx8VxXBVVxR4zvCmrK6S+B6wmw4IP3 IDHSzXZOQ4/NZo4VPMqBCkBtbEozAeTeQ2UqeOTAT6UZh8AEJhMAAz4p90/XHB6pvqOoDS BZ+khGOYwBi2WAQi6rBjrFpCi2jsjqIH3tcj0p9bdKfudDXec4DOvkyUlZrmeA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748693816; a=rsa-sha256; cv=none; b=yjWk047jumHCI36JAX8RkRxrgT9e9UJFKMgYvQO0fmKCJPMCUM2nSiAiN14D6zNq+ssKbT iPgDrBUCRrhh6+Ee/ygCcJyP5zJMaXNC7+MHmdIN1AORW/qM1/pmJtffLwivIb8AjDedf+ TJYrZmS8GWaJ2NF3Ipj34PgR1+j0oJOmYnsB/CgJF3tFv/hxwFupwYxWvvDDltqZgj65/T 7l+QaWLRVEQavroP8rgiXrICFVCZIpUxI6KyPfq58yXcxbPfIqDNkXsBix3LjF8GMc2fCH wD/awXyaaQJMDA1xA6RT5BcljOPzvXsFXZdtEf69MJOUZ9HlcFhSJj13h9sw+g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b8fHD2RJSzdhx; Sat, 31 May 2025 12:16: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 54VCGut1067030; Sat, 31 May 2025 12:16:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54VCGuOO067022; Sat, 31 May 2025 12:16:56 GMT (envelope-from git) Date: Sat, 31 May 2025 12:16:56 GMT Message-Id: <202505311216.54VCGuOO067022@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: 45538173c120 - main - Upgrade to OpenPAM Zingiber. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 45538173c120eadca115fd7e56c657905bf73771 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=45538173c120eadca115fd7e56c657905bf73771 commit 45538173c120eadca115fd7e56c657905bf73771 Author: Dag-Erling Smørgrav AuthorDate: 2025-05-31 11:52:41 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-05-31 12:15:55 +0000 Upgrade to OpenPAM Zingiber. Merge commit '86fa5d2f787d1501ec2ef61f19151d4a386baa83' into des/phab --- contrib/openpam/CREDITS | 3 +- contrib/openpam/HISTORY | 12 + contrib/openpam/INSTALL | 10 + contrib/openpam/LICENSE | 2 +- contrib/openpam/Makefile.in | 47 +- contrib/openpam/README | 2 +- contrib/openpam/RELNOTES | 6 +- contrib/openpam/aclocal.m4 | 448 +- contrib/openpam/bin/Makefile.in | 19 +- .../openpam/bin/openpam_dump_policy/Makefile.in | 34 +- contrib/openpam/bin/pamtest/Makefile.in | 43 +- contrib/openpam/bin/pamtest/pamtest.1 | 4 +- contrib/openpam/bin/su/Makefile.in | 43 +- contrib/openpam/bin/su/su.1 | 4 +- contrib/openpam/compile | 11 +- contrib/openpam/config.h.in | 43 +- contrib/openpam/configure | 7452 +++++++++++++------- contrib/openpam/configure.ac | 37 +- contrib/openpam/depcomp | 15 +- contrib/openpam/doc/Makefile.in | 19 +- contrib/openpam/doc/man/Makefile.in | 28 +- contrib/openpam/doc/man/openpam.3 | 4 +- contrib/openpam/doc/man/openpam_borrow_cred.3 | 4 +- contrib/openpam/doc/man/openpam_free_data.3 | 4 +- contrib/openpam/doc/man/openpam_free_envlist.3 | 4 +- contrib/openpam/doc/man/openpam_get_feature.3 | 4 +- contrib/openpam/doc/man/openpam_get_option.3 | 4 +- contrib/openpam/doc/man/openpam_log.3 | 4 +- contrib/openpam/doc/man/openpam_nullconv.3 | 4 +- contrib/openpam/doc/man/openpam_readline.3 | 4 +- contrib/openpam/doc/man/openpam_readlinev.3 | 4 +- contrib/openpam/doc/man/openpam_readword.3 | 4 +- contrib/openpam/doc/man/openpam_restore_cred.3 | 4 +- contrib/openpam/doc/man/openpam_set_feature.3 | 4 +- contrib/openpam/doc/man/openpam_set_option.3 | 4 +- contrib/openpam/doc/man/openpam_straddch.3 | 4 +- contrib/openpam/doc/man/openpam_subst.3 | 4 +- contrib/openpam/doc/man/openpam_ttyconv.3 | 4 +- contrib/openpam/doc/man/pam.3 | 4 +- contrib/openpam/doc/man/pam.conf.5 | 23 +- contrib/openpam/doc/man/pam_acct_mgmt.3 | 4 +- contrib/openpam/doc/man/pam_authenticate.3 | 4 +- contrib/openpam/doc/man/pam_chauthtok.3 | 4 +- contrib/openpam/doc/man/pam_close_session.3 | 4 +- contrib/openpam/doc/man/pam_conv.3 | 4 +- contrib/openpam/doc/man/pam_end.3 | 4 +- contrib/openpam/doc/man/pam_error.3 | 4 +- contrib/openpam/doc/man/pam_get_authtok.3 | 4 +- contrib/openpam/doc/man/pam_get_data.3 | 4 +- contrib/openpam/doc/man/pam_get_item.3 | 4 +- contrib/openpam/doc/man/pam_get_user.3 | 4 +- contrib/openpam/doc/man/pam_getenv.3 | 4 +- contrib/openpam/doc/man/pam_getenvlist.3 | 4 +- contrib/openpam/doc/man/pam_info.3 | 4 +- contrib/openpam/doc/man/pam_open_session.3 | 4 +- contrib/openpam/doc/man/pam_prompt.3 | 4 +- contrib/openpam/doc/man/pam_putenv.3 | 4 +- contrib/openpam/doc/man/pam_set_data.3 | 4 +- contrib/openpam/doc/man/pam_set_item.3 | 4 +- contrib/openpam/doc/man/pam_setcred.3 | 4 +- contrib/openpam/doc/man/pam_setenv.3 | 4 +- contrib/openpam/doc/man/pam_sm_acct_mgmt.3 | 4 +- contrib/openpam/doc/man/pam_sm_authenticate.3 | 4 +- contrib/openpam/doc/man/pam_sm_chauthtok.3 | 4 +- contrib/openpam/doc/man/pam_sm_close_session.3 | 4 +- contrib/openpam/doc/man/pam_sm_open_session.3 | 4 +- contrib/openpam/doc/man/pam_sm_setcred.3 | 4 +- contrib/openpam/doc/man/pam_start.3 | 4 +- contrib/openpam/doc/man/pam_strerror.3 | 4 +- contrib/openpam/doc/man/pam_verror.3 | 4 +- contrib/openpam/doc/man/pam_vinfo.3 | 4 +- contrib/openpam/doc/man/pam_vprompt.3 | 4 +- contrib/openpam/include/Makefile.in | 19 +- contrib/openpam/include/security/Makefile.in | 26 +- contrib/openpam/include/security/openpam_version.h | 4 +- contrib/openpam/lib/Makefile.in | 19 +- contrib/openpam/lib/libpam/Makefile.in | 40 +- contrib/openpam/lib/libpam/openpam_borrow_cred.c | 4 +- contrib/openpam/lib/libpam/openpam_configure.c | 91 +- contrib/openpam/lib/libpam/openpam_constants.c | 12 +- contrib/openpam/ltmain.sh | 736 +- contrib/openpam/m4/libtool.m4 | 462 +- contrib/openpam/m4/ltoptions.m4 | 106 +- contrib/openpam/m4/ltsugar.m4 | 2 +- contrib/openpam/m4/ltversion.m4 | 12 +- contrib/openpam/m4/lt~obsolete.m4 | 2 +- contrib/openpam/misc/Makefile.in | 19 +- contrib/openpam/misc/gendoc.pl | 6 +- contrib/openpam/missing | 75 +- contrib/openpam/modules/Makefile.in | 19 +- contrib/openpam/modules/pam_deny/Makefile.in | 40 +- contrib/openpam/modules/pam_permit/Makefile.in | 40 +- contrib/openpam/modules/pam_return/Makefile.in | 40 +- contrib/openpam/modules/pam_unix/Makefile.in | 40 +- contrib/openpam/t/Makefile.in | 103 +- lib/libpam/libpam/Makefile | 1 + 96 files changed, 6829 insertions(+), 3594 deletions(-) diff --git a/contrib/openpam/CREDITS b/contrib/openpam/CREDITS index 7dd4356fa824..f2eeb7a76794 100644 --- a/contrib/openpam/CREDITS +++ b/contrib/openpam/CREDITS @@ -8,7 +8,7 @@ Network Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035 Principal design and development by: - Dag-Erling Smørgrav + Dag-Erling Smørgrav The following persons (in alphabetical order) have contributed, directly or indirectly, with patches, criticism, suggestions, or @@ -30,6 +30,7 @@ ideas: Espen Grøndahl Gary Winiger Gavin Atkinson + Gleb Popov Gleb Smirnoff Hubert Feyrer Jason Evans diff --git a/contrib/openpam/HISTORY b/contrib/openpam/HISTORY index 659c2ec430ff..7c2897adf23e 100644 --- a/contrib/openpam/HISTORY +++ b/contrib/openpam/HISTORY @@ -1,3 +1,15 @@ +OpenPAM Zingiber 2025-05-31 + + - BUGFIX: In openpam_borrow_cred(3), the wrong debugging macro was + being used, which resulted in an attempt to interpret the target + UID as an item identifier. + + - ENHANCE: Allow missing modules or subpolicies to be ignored. + + - ENHANCE: Previously, OpenPAM was hardcoded to look for policies in + /usr/local/etc in addition to /etc and modules in /usr/local/lib in + addition to /usr/lib. This is now configurable at compile time. +============================================================================ OpenPAM Ximenia 2023-06-27 - BUGFIX: Fix race condition in openpam_ttyconv(3) when used with diff --git a/contrib/openpam/INSTALL b/contrib/openpam/INSTALL index a88a8a4ab76b..c117ece3ee7a 100644 --- a/contrib/openpam/INSTALL +++ b/contrib/openpam/INSTALL @@ -24,6 +24,16 @@ This option should not be used if you intend to install PAM modules in the system library directory. + --with-localbase=DIR + Search for additional policies and modules in DIR/etc and + DIR/lib respectively. Defaults to the installation prefix if + one was set, otherwise to the default installation prefix + (usually /usr/local). + + --without-localbase + Do not search for policies and modules anywhere else than /etc + and /usr/lib. + --without-doc Skips the documentation. diff --git a/contrib/openpam/LICENSE b/contrib/openpam/LICENSE index 8c7e42564955..a79d8a485a64 100644 --- a/contrib/openpam/LICENSE +++ b/contrib/openpam/LICENSE @@ -1,6 +1,6 @@ Copyright (c) 2002-2003 Networks Associates Technology, Inc. -Copyright (c) 2004-2023 Dag-Erling Smørgrav +Copyright (c) 2004-2025 Dag-Erling Smørgrav All rights reserved. This software was developed for the FreeBSD Project by ThinkSec AS and diff --git a/contrib/openpam/Makefile.in b/contrib/openpam/Makefile.in index 50e7b492db11..90338fbca626 100644 --- a/contrib/openpam/Makefile.in +++ b/contrib/openpam/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.17 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2024 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -69,6 +69,8 @@ am__make_running_with_option = \ test $$has_opt = yes am__make_dryrun = (target_option=n; $(am__make_running_with_option)) am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) +am__rm_f = rm -f $(am__rm_f_notfound) +am__rm_rf = rm -rf $(am__rm_f_notfound) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -161,14 +163,14 @@ am__define_uniq_tagged_files = \ DIST_SUBDIRS = misc include lib bin modules doc t am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \ $(top_srcdir)/freebsd/Makefile.in INSTALL README TODO compile \ - config.guess config.sub depcomp install-sh ltmain.sh missing + config.guess config.sub install-sh ltmain.sh missing DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) am__remove_distdir = \ if test -d "$(distdir)"; then \ - find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ - && rm -rf "$(distdir)" \ + find "$(distdir)" -type d ! -perm -700 -exec chmod u+rwx {} ';' \ + ; rm -rf "$(distdir)" \ || { sleep 5 && rm -rf "$(distdir)"; }; \ else :; fi am__post_remove_distdir = $(am__remove_distdir) @@ -198,14 +200,16 @@ am__relativize = \ done; \ reldir="$$dir2" DIST_ARCHIVES = $(distdir).tar.gz -GZIP_ENV = --best +GZIP_ENV = -9 DIST_TARGETS = dist-gzip # Exists only to be overridden by the user if desired. AM_DISTCHECK_DVI_TARGET = dvi distuninstallcheck_listfiles = find . -type f -print am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' -distcleancheck_listfiles = find . -type f -print +distcleancheck_listfiles = \ + find . \( -type f -a \! \ + \( -name .nfs* -o -name .smb* -o -name .__afs* \) \) -print ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ @@ -298,8 +302,10 @@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ +am__rm_f_notfound = @am__rm_f_notfound@ am__tar = @am__tar@ am__untar = @am__untar@ +am__xargs_n = @am__xargs_n@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -400,12 +406,12 @@ config.h: stamp-h1 @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status - @rm -f stamp-h1 - cd $(top_builddir) && $(SHELL) ./config.status config.h + $(AM_V_at)rm -f stamp-h1 + $(AM_V_GEN)cd $(top_builddir) && $(SHELL) ./config.status config.h $(srcdir)/config.h.in: $(am__configure_deps) - ($(am__cd) $(top_srcdir) && $(AUTOHEADER)) - rm -f stamp-h1 - touch $@ + $(AM_V_GEN)($(am__cd) $(top_srcdir) && $(AUTOHEADER)) + $(AM_V_at)rm -f stamp-h1 + $(AM_V_at)touch $@ distclean-hdr: -rm -f config.h stamp-h1 @@ -531,7 +537,7 @@ distdir: $(BUILT_SOURCES) distdir-am: $(DISTFILES) $(am__remove_distdir) - test -d "$(distdir)" || mkdir "$(distdir)" + $(AM_V_at)$(MKDIR_P) "$(distdir)" @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -642,7 +648,7 @@ dist dist-all: distcheck: dist case '$(DIST_ARCHIVES)' in \ *.tar.gz*) \ - eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\ + eval GZIP= gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ *.tar.lz*) \ @@ -652,7 +658,7 @@ distcheck: dist *.tar.Z*) \ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ *.shar.gz*) \ - eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\ + eval GZIP= gzip -dc $(distdir).shar.gz | unshar ;;\ *.zip*) \ unzip $(distdir).zip ;;\ *.tar.zst*) \ @@ -752,8 +758,8 @@ mostlyclean-generic: clean-generic: distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + -$(am__rm_f) $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || $(am__rm_f) $(CONFIG_CLEAN_VPATH_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -874,3 +880,10 @@ uninstall-am: # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: + +# Tell GNU make to disable its built-in pattern rules. +%:: %,v +%:: RCS/%,v +%:: RCS/% +%:: s.% +%:: SCCS/s.% diff --git a/contrib/openpam/README b/contrib/openpam/README index 7ea31b03d04a..00a9c5107a37 100644 --- a/contrib/openpam/README +++ b/contrib/openpam/README @@ -7,4 +7,4 @@ implementations disagree, OpenPAM tries to remain compatible with Solaris, at the expense of XSSO conformance and Linux-PAM compatibility. -Please direct bug reports and inquiries to . +Please direct bug reports and inquiries to . diff --git a/contrib/openpam/RELNOTES b/contrib/openpam/RELNOTES index 3bbd7bb19721..2316b256da3b 100644 --- a/contrib/openpam/RELNOTES +++ b/contrib/openpam/RELNOTES @@ -1,6 +1,6 @@ - Release notes for OpenPAM Ximenia - ================================= + Release notes for OpenPAM Zingiber + ================================== OpenPAM is developed primarily on FreeBSD, but is expected to work on almost any POSIX-like platform that has GNU autotools, GNU make and @@ -18,4 +18,4 @@ The OpenPAM distribution consists of the following components: - Unit tests for limited portions of the library. -Please direct bug reports and inquiries to . +Please direct bug reports and inquiries to . diff --git a/contrib/openpam/aclocal.m4 b/contrib/openpam/aclocal.m4 index 109e73063233..7156a8dcc91a 100644 --- a/contrib/openpam/aclocal.m4 +++ b/contrib/openpam/aclocal.m4 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.16.5 -*- Autoconf -*- +# generated automatically by aclocal 1.17 -*- Autoconf -*- -# Copyright (C) 1996-2021 Free Software Foundation, Inc. +# Copyright (C) 1996-2024 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,13 +14,13 @@ m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.71],, -[m4_warning([this file was generated for autoconf 2.71. +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.72],, +[m4_warning([this file was generated for autoconf 2.72. You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically 'autoreconf'.])]) -# Copyright (C) 2002-2021 Free Software Foundation, Inc. +# Copyright (C) 2002-2024 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -32,10 +32,10 @@ To do so, use the procedure documented by the package, typically 'autoreconf'.]) # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.16' +[am__api_version='1.17' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.16.5], [], +m4_if([$1], [1.17], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -51,14 +51,14 @@ m4_define([_AM_AUTOCONF_VERSION], []) # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.16.5])dnl +[AM_AUTOMAKE_VERSION([1.17])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001-2021 Free Software Foundation, Inc. +# Copyright (C) 2001-2024 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -110,7 +110,7 @@ am_aux_dir=`cd "$ac_aux_dir" && pwd` # AM_COND_IF -*- Autoconf -*- -# Copyright (C) 2008-2021 Free Software Foundation, Inc. +# Copyright (C) 2008-2024 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -147,7 +147,7 @@ fi[]dnl # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997-2021 Free Software Foundation, Inc. +# Copyright (C) 1997-2024 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -178,7 +178,7 @@ AC_CONFIG_COMMANDS_PRE( Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999-2021 Free Software Foundation, Inc. +# Copyright (C) 1999-2024 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -310,7 +310,7 @@ AC_CACHE_CHECK([dependency style of $depcc], # icc doesn't choke on unknown options, it will just issue warnings # or remarks (even with -Werror). So we grep stderr for any message # that says an option was ignored or not supported. - # When given -MP, icc 7.0 and 7.1 complain thusly: + # When given -MP, icc 7.0 and 7.1 complain thus: # icc: Command line warning: ignoring option '-M'; no argument required # The diagnosis changed in icc 8.0: # icc: Command line remark: option '-MP' not supported @@ -369,7 +369,7 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999-2021 Free Software Foundation, Inc. +# Copyright (C) 1999-2024 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -437,7 +437,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996-2021 Free Software Foundation, Inc. +# Copyright (C) 1996-2024 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -571,7 +571,7 @@ if test -z "$CSCOPE"; then fi AC_SUBST([CSCOPE]) -AC_REQUIRE([AM_SILENT_RULES])dnl +AC_REQUIRE([_AM_SILENT_RULES])dnl dnl The testsuite driver may need to know about EXEEXT, so add the dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below. @@ -579,47 +579,9 @@ AC_CONFIG_COMMANDS_PRE(dnl [m4_provide_if([_AM_COMPILER_EXEEXT], [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl -# POSIX will say in a future version that running "rm -f" with no argument -# is OK; and we want to be able to make that assumption in our Makefile -# recipes. So use an aggressive probe to check that the usage we want is -# actually supported "in the wild" to an acceptable degree. -# See automake bug#10828. -# To make any issue more visible, cause the running configure to be aborted -# by default if the 'rm' program in use doesn't match our expectations; the -# user can still override this though. -if rm -f && rm -fr && rm -rf; then : OK; else - cat >&2 <<'END' -Oops! - -Your 'rm' program seems unable to run without file operands specified -on the command line, even when the '-f' option is present. This is contrary -to the behaviour of most rm programs out there, and not conforming with -the upcoming POSIX standard: - -Please tell bug-automake@gnu.org about your system, including the value -of your $PATH and any error possibly output before this message. This -can help us improve future automake versions. +AC_REQUIRE([_AM_PROG_RM_F]) +AC_REQUIRE([_AM_PROG_XARGS_N]) -END - if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then - echo 'Configuration will proceed anyway, since you have set the' >&2 - echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 - echo >&2 - else - cat >&2 <<'END' -Aborting the configuration process, to ensure you take notice of the issue. - -You can download and install GNU coreutils to get an 'rm' implementation -that behaves properly: . - -If you want to complete the configuration process using your problematic -'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM -to "yes", and re-run configure. - -END - AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) - fi -fi dnl The trailing newline in this macro's definition is deliberate, for dnl backward compatibility and to allow trailing 'dnl'-style comments dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841. @@ -652,7 +614,7 @@ for _am_header in $config_headers :; do done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001-2021 Free Software Foundation, Inc. +# Copyright (C) 2001-2024 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -673,7 +635,7 @@ if test x"${install_sh+set}" != xset; then fi AC_SUBST([install_sh])]) -# Copyright (C) 2003-2021 Free Software Foundation, Inc. +# Copyright (C) 2003-2024 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -694,7 +656,7 @@ AC_SUBST([am__leading_dot])]) # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001-2021 Free Software Foundation, Inc. +# Copyright (C) 2001-2024 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -737,7 +699,7 @@ AC_SUBST([am__quote])]) # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997-2021 Free Software Foundation, Inc. +# Copyright (C) 1997-2024 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -769,38 +731,9 @@ else fi ]) -# -*- Autoconf -*- -# Obsolete and "removed" macros, that must however still report explicit -# error messages when used, to smooth transition. -# -# Copyright (C) 1996-2021 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -AC_DEFUN([AM_CONFIG_HEADER], -[AC_DIAGNOSE([obsolete], -['$0': this macro is obsolete. -You should use the 'AC][_CONFIG_HEADERS' macro instead.])dnl -AC_CONFIG_HEADERS($@)]) - -AC_DEFUN([AM_PROG_CC_STDC], -[AC_PROG_CC -am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc -AC_DIAGNOSE([obsolete], -['$0': this macro is obsolete. -You should simply use the 'AC][_PROG_CC' macro instead. -Also, your code should no longer depend upon 'am_cv_prog_cc_stdc', -but upon 'ac_cv_prog_cc_stdc'.])]) - -AC_DEFUN([AM_C_PROTOTYPES], - [AC_FATAL([automatic de-ANSI-fication support has been removed])]) -AU_DEFUN([fp_C_PROTOTYPES], [AM_C_PROTOTYPES]) - # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001-2021 Free Software Foundation, Inc. +# Copyright (C) 2001-2024 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -829,7 +762,7 @@ AC_DEFUN([_AM_SET_OPTIONS], AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Copyright (C) 1999-2021 Free Software Foundation, Inc. +# Copyright (C) 1999-2024 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -876,7 +809,23 @@ AC_LANG_POP([C])]) # For backward compatibility. AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) -# Copyright (C) 2001-2021 Free Software Foundation, Inc. +# Copyright (C) 2022-2024 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# _AM_PROG_RM_F +# --------------- +# Check whether 'rm -f' without any arguments works. +# https://bugs.gnu.org/10828 +AC_DEFUN([_AM_PROG_RM_F], +[am__rm_f_notfound= +AS_IF([(rm -f && rm -fr && rm -rf) 2>/dev/null], [], [am__rm_f_notfound='""']) +AC_SUBST(am__rm_f_notfound) +]) + +# Copyright (C) 2001-2024 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -895,16 +844,169 @@ AC_DEFUN([AM_RUN_LOG], # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996-2021 Free Software Foundation, Inc. +# Copyright (C) 1996-2024 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. +# _AM_SLEEP_FRACTIONAL_SECONDS +# ---------------------------- +AC_DEFUN([_AM_SLEEP_FRACTIONAL_SECONDS], [dnl +AC_CACHE_CHECK([whether sleep supports fractional seconds], + am_cv_sleep_fractional_seconds, [dnl +AS_IF([sleep 0.001 2>/dev/null], [am_cv_sleep_fractional_seconds=yes], + [am_cv_sleep_fractional_seconds=no]) +])]) + +# _AM_FILESYSTEM_TIMESTAMP_RESOLUTION +# ----------------------------------- +# Determine the filesystem's resolution for file modification +# timestamps. The coarsest we know of is FAT, with a resolution +# of only two seconds, even with the most recent "exFAT" extensions. +# The finest (e.g. ext4 with large inodes, XFS, ZFS) is one +# nanosecond, matching clock_gettime. However, it is probably not +# possible to delay execution of a shell script for less than one +# millisecond, due to process creation overhead and scheduling +# granularity, so we don't check for anything finer than that. (See below.) +AC_DEFUN([_AM_FILESYSTEM_TIMESTAMP_RESOLUTION], [dnl +AC_REQUIRE([_AM_SLEEP_FRACTIONAL_SECONDS]) +AC_CACHE_CHECK([filesystem timestamp resolution], + am_cv_filesystem_timestamp_resolution, [dnl +# Default to the worst case. +am_cv_filesystem_timestamp_resolution=2 + +# Only try to go finer than 1 sec if sleep can do it. +# Don't try 1 sec, because if 0.01 sec and 0.1 sec don't work, +# - 1 sec is not much of a win compared to 2 sec, and +# - it takes 2 seconds to perform the test whether 1 sec works. +# +# Instead, just use the default 2s on platforms that have 1s resolution, +# accept the extra 1s delay when using $sleep in the Automake tests, in +# exchange for not incurring the 2s delay for running the test for all +# packages. +# +am_try_resolutions= +if test "$am_cv_sleep_fractional_seconds" = yes; then + # Even a millisecond often causes a bunch of false positives, + # so just try a hundredth of a second. The time saved between .001 and + # .01 is not terribly consequential. + am_try_resolutions="0.01 0.1 $am_try_resolutions" +fi + +# In order to catch current-generation FAT out, we must *modify* files +# that already exist; the *creation* timestamp is finer. Use names +# that make ls -t sort them differently when they have equal +# timestamps than when they have distinct timestamps, keeping +# in mind that ls -t prints the *newest* file first. +rm -f conftest.ts? +: > conftest.ts1 +: > conftest.ts2 +: > conftest.ts3 + +# Make sure ls -t actually works. Do 'set' in a subshell so we don't +# clobber the current shell's arguments. (Outer-level square brackets +# are removed by m4; they're present so that m4 does not expand +# ; be careful, easy to get confused.) +if ( + set X `[ls -t conftest.ts[12]]` && + { + test "$[]*" != "X conftest.ts1 conftest.ts2" || + test "$[]*" != "X conftest.ts2 conftest.ts1"; + } +); then :; else + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + _AS_ECHO_UNQUOTED( + ["Bad output from ls -t: \"`[ls -t conftest.ts[12]]`\""], + [AS_MESSAGE_LOG_FD]) + AC_MSG_FAILURE([ls -t produces unexpected output. +Make sure there is not a broken ls alias in your environment.]) +fi + +for am_try_res in $am_try_resolutions; do + # Any one fine-grained sleep might happen to cross the boundary + # between two values of a coarser actual resolution, but if we do + # two fine-grained sleeps in a row, at least one of them will fall + # entirely within a coarse interval. + echo alpha > conftest.ts1 + sleep $am_try_res + echo beta > conftest.ts2 + sleep $am_try_res + echo gamma > conftest.ts3 + + # We assume that 'ls -t' will make use of high-resolution + # timestamps if the operating system supports them at all. + if (set X `ls -t conftest.ts?` && + test "$[]2" = conftest.ts3 && + test "$[]3" = conftest.ts2 && + test "$[]4" = conftest.ts1); then + # + # Ok, ls -t worked. If we're at a resolution of 1 second, we're done, + # because we don't need to test make. + make_ok=true + if test $am_try_res != 1; then + # But if we've succeeded so far with a subsecond resolution, we + # have one more thing to check: make. It can happen that + # everything else supports the subsecond mtimes, but make doesn't; + # notably on macOS, which ships make 3.81 from 2006 (the last one + # released under GPLv2). https://bugs.gnu.org/68808 + # + # We test $MAKE if it is defined in the environment, else "make". + # It might get overridden later, but our hope is that in practice + # it does not matter: it is the system "make" which is (by far) + # the most likely to be broken, whereas if the user overrides it, + # probably they did so with a better, or at least not worse, make. + # https://lists.gnu.org/archive/html/automake/2024-06/msg00051.html + # + # Create a Makefile (real tab character here): + rm -f conftest.mk + echo 'conftest.ts1: conftest.ts2' >conftest.mk + echo ' touch conftest.ts2' >>conftest.mk + # + # Now, running + # touch conftest.ts1; touch conftest.ts2; make + # should touch ts1 because ts2 is newer. This could happen by luck, + # but most often, it will fail if make's support is insufficient. So + # test for several consecutive successes. + # + # (We reuse conftest.ts[12] because we still want to modify existing + # files, not create new ones, per above.) + n=0 + make=${MAKE-make} + until test $n -eq 3; do + echo one > conftest.ts1 + sleep $am_try_res + echo two > conftest.ts2 # ts2 should now be newer than ts1 + if $make -f conftest.mk | grep 'up to date' >/dev/null; then + make_ok=false + break # out of $n loop + fi + n=`expr $n + 1` + done + fi + # + if $make_ok; then + # Everything we know to check worked out, so call this resolution good. + am_cv_filesystem_timestamp_resolution=$am_try_res + break # out of $am_try_res loop + fi + # Otherwise, we'll go on to check the next resolution. + fi +done +rm -f conftest.ts? +# (end _am_filesystem_timestamp_resolution) +])]) + # AM_SANITY_CHECK # --------------- AC_DEFUN([AM_SANITY_CHECK], -[AC_MSG_CHECKING([whether build environment is sane]) +[AC_REQUIRE([_AM_FILESYSTEM_TIMESTAMP_RESOLUTION]) +# This check should not be cached, as it may vary across builds of +# different projects. +AC_MSG_CHECKING([whether build environment is sane]) # Reject unsafe characters in $srcdir or the absolute working directory # name. Accept space and tab only in the latter. am_lf=' @@ -923,49 +1025,40 @@ esac # symlink; some systems play weird games with the mod time of symlinks # (eg FreeBSD returns the mod time of the symlink's containing # directory). -if ( - am_has_slept=no - for am_try in 1 2; do - echo "timestamp, slept: $am_has_slept" > conftest.file - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` - if test "$[*]" = "X"; then - # -L didn't work. - set X `ls -t "$srcdir/configure" conftest.file` - fi - if test "$[*]" != "X $srcdir/configure conftest.file" \ - && test "$[*]" != "X conftest.file $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken - alias in your environment]) - fi - if test "$[2]" = conftest.file || test $am_try -eq 2; then - break - fi - # Just in case. - sleep 1 - am_has_slept=yes - done - test "$[2]" = conftest.file - ) -then - # Ok. - : -else - AC_MSG_ERROR([newly created file is older than distributed files! +am_build_env_is_sane=no +am_has_slept=no +rm -f conftest.file +for am_try in 1 2; do + echo "timestamp, slept: $am_has_slept" > conftest.file + if ( + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + if test "$[]*" = "X"; then + # -L didn't work. + set X `ls -t "$srcdir/configure" conftest.file` + fi + test "$[]2" = conftest.file + ); then + am_build_env_is_sane=yes + break + fi + # Just in case. + sleep "$am_cv_filesystem_timestamp_resolution" + am_has_slept=yes +done + +AC_MSG_RESULT([$am_build_env_is_sane]) +if test "$am_build_env_is_sane" = no; then + AC_MSG_ERROR([newly created file is older than distributed files! Check your system clock]) fi -AC_MSG_RESULT([yes]) + # If we didn't sleep, we still need to ensure time stamps of config.status and # generated files are strictly newer. am_sleep_pid= -if grep 'slept: no' conftest.file >/dev/null 2>&1; then - ( sleep 1 ) & +AS_IF([test -e conftest.file || grep 'slept: no' conftest.file >/dev/null 2>&1],, [dnl + ( sleep "$am_cv_filesystem_timestamp_resolution" ) & am_sleep_pid=$! -fi +]) AC_CONFIG_COMMANDS_PRE( [AC_MSG_CHECKING([that generated files are newer than configure]) if test -n "$am_sleep_pid"; then @@ -976,18 +1069,18 @@ AC_CONFIG_COMMANDS_PRE( rm -f conftest.file ]) -# Copyright (C) 2009-2021 Free Software Foundation, Inc. +# Copyright (C) 2009-2024 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# AM_SILENT_RULES([DEFAULT]) -# -------------------------- -# Enable less verbose build rules; with the default set to DEFAULT -# ("yes" being less verbose, "no" or empty being verbose). -AC_DEFUN([AM_SILENT_RULES], -[AC_ARG_ENABLE([silent-rules], [dnl +# _AM_SILENT_RULES +# ---------------- +# Enable less verbose build rules support. +AC_DEFUN([_AM_SILENT_RULES], +[AM_DEFAULT_VERBOSITY=1 +AC_ARG_ENABLE([silent-rules], [dnl AS_HELP_STRING( [--enable-silent-rules], [less verbose build output (undo: "make V=1")]) @@ -995,11 +1088,6 @@ AS_HELP_STRING( [--disable-silent-rules], [verbose build output (undo: "make V=0")])dnl ]) -case $enable_silent_rules in @%:@ ((( - yes) AM_DEFAULT_VERBOSITY=0;; - no) AM_DEFAULT_VERBOSITY=1;; - *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; -esac dnl dnl A few 'make' implementations (e.g., NonStop OS and NextStep) dnl do not support nested variable expansions. @@ -1018,14 +1106,6 @@ am__doit: else am_cv_make_support_nested_variables=no fi]) -if test $am_cv_make_support_nested_variables = yes; then - dnl Using '$V' instead of '$(V)' breaks IRIX make. - AM_V='$(V)' - AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' -else - AM_V=$AM_DEFAULT_VERBOSITY - AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY -fi AC_SUBST([AM_V])dnl AM_SUBST_NOTMAKE([AM_V])dnl AC_SUBST([AM_DEFAULT_V])dnl @@ -1034,9 +1114,33 @@ AC_SUBST([AM_DEFAULT_VERBOSITY])dnl AM_BACKSLASH='\' AC_SUBST([AM_BACKSLASH])dnl _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl +dnl Delay evaluation of AM_DEFAULT_VERBOSITY to the end to allow multiple calls +dnl to AM_SILENT_RULES to change the default value. +AC_CONFIG_COMMANDS_PRE([dnl +case $enable_silent_rules in @%:@ ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; +esac +if test $am_cv_make_support_nested_variables = yes; then + dnl Using '$V' instead of '$(V)' breaks IRIX make. + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi +])dnl ]) -# Copyright (C) 2001-2021 Free Software Foundation, Inc. +# AM_SILENT_RULES([DEFAULT]) +# -------------------------- +# Set the default verbosity level to DEFAULT ("yes" being less verbose, "no" or +# empty being verbose). +AC_DEFUN([AM_SILENT_RULES], +[AC_REQUIRE([_AM_SILENT_RULES]) +AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1])]) + +# Copyright (C) 2001-2024 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1064,7 +1168,7 @@ fi INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006-2021 Free Software Foundation, Inc. +# Copyright (C) 2006-2024 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1083,7 +1187,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) # Check how to create a tarball. -*- Autoconf -*- *** 17674 LINES SKIPPED *** From nobody Sat May 31 12:28:25 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b8fXT6Qngz5wxpk; Sat, 31 May 2025 12:28: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b8fXT489hz3fWV; Sat, 31 May 2025 12:28:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748694505; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mZWBqET4KzMTpyOX34F9FFC0thFwvWHluwSxSWBMLpI=; b=oIHlVS8TFedxVUiXe28Nuzd1MgiMfgikrYvsn2lB/yVTowEDx8rCU2HMu0EJ4+zW0lQAZW 3mHVme+u1Yjs6zvjcId1q1+AK0q+fOQ0dRMGI4A5Jh5lRUGl384cl1pS4jEnRlVS2Uro0h ePRCL/9LOknwTK19prEs/SazdGbuhSFpYyMXRnGyU5+yNouJbN9ANb1rxbFEA5z8y5mmyi cJSP+8/N3Q/9iDgczXvlCAKbXZduY92ftMY1TzJb2fKHSv/th3YVqAr8G7qOOs2YK51koN f4eEQX0yKQNMniQ/sYAsaRIEIbdASkSZrEQZv34YBPKBjniz4xT9p16fFOHqEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748694505; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mZWBqET4KzMTpyOX34F9FFC0thFwvWHluwSxSWBMLpI=; b=odiXJv6YcerSkdyWibWqh2NN74q6VLej+C/+7Ww7CFUmwz5Zwpa7PuRN6z24ShEXMjBmSN XhmdDUPXLqV5nLi94lIQZr43gRGeZWHaBQA3nuEF8CPhwrZjMfm79Ze4XznXsV3ZeJq9st uY5H7CENWbzpHva9Xm8xCV7xpRBYpNbsjKj4I/zD7LWm+73YHRmnCGNyUsg44mJZ9xbnMB MWYfJe02WimysBT/DICMqmANAiyQJdoMB2o8A6nl1dLTKVmH5Qf/LFbs9SD8E/dEt0r1D9 FYpmZ7J0HUbfrWX7eOWklQr5vlJ7kWBc2cgBOhqGUzeiyC19NOaMQqjnzXEyPA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748694505; a=rsa-sha256; cv=none; b=E2/OS7SuMxzwBtfvpcHvwfCHvFe8W9Fk+hkYU2fvvtvZPBZ1+DCVNhRy2YXdvmeYEX/Hi+ AD7sw48yEuKOOoba7aT4GlH+Sd5Q6QsabvMYjhHJDOlIdHLafsXCFzwsfSE6UJNBQqb7oR VP8r4tP4ZcK9t1bpCVgiFx/tFZb6XAWy8rh2EL6Sn6BRTVRl6v1HxeS01e/woj32GhRCpX yhWAmp0lAEzo+dsKrkKxKNZSlgwUWUIkb8FqJ3mbvLEPkzh9JRJOEnE+Gj7/+nB0Iq5ap2 iRVhMlofQa8POLO3qDKj6cIUNRN4+OwOtSaHoB3phjlQLdWg3zeMFyHD35lmZg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b8fXT39Vrzdk0; Sat, 31 May 2025 12:28: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 54VCSPpG086033; Sat, 31 May 2025 12:28:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54VCSP78086030; Sat, 31 May 2025 12:28:25 GMT (envelope-from git) Date: Sat, 31 May 2025 12:28:25 GMT Message-Id: <202505311228.54VCSP78086030@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: 83a1ee578c9d - main - atf, kyua: Implement require.kmods. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 83a1ee578c9d1ab7013e997289c7cd470c0e6902 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=83a1ee578c9d1ab7013e997289c7cd470c0e6902 commit 83a1ee578c9d1ab7013e997289c7cd470c0e6902 Author: Dag-Erling Smørgrav AuthorDate: 2025-05-31 12:27:30 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-05-31 12:27:30 +0000 atf, kyua: Implement require.kmods. This adds a metadata variable, require.kmods, and corresponding functions or methods in C, C++, and shell, which allow a test to specify that it requires particular kernel modules to run. If the kernel modules are not present, the test is skipped. One might want to consider a kyua option which makes it attempt to load the modules instead. Differential Revision: https://reviews.freebsd.org/D47470 --- contrib/atf/atf-c++/atf-c++.3 | 10 +++++- contrib/atf/atf-c++/tests.cpp | 7 +++++ contrib/atf/atf-c++/tests.hpp | 1 + contrib/atf/atf-c/atf-c.3 | 14 ++++++++- contrib/atf/atf-c/tc.c | 61 ++++++++++++++++++++++++++++++++++++ contrib/atf/atf-c/tc.h | 3 ++ contrib/atf/atf-sh/atf-sh.3 | 13 +++++++- contrib/atf/atf-sh/libatf-sh.subr | 12 +++++++ contrib/atf/doc/atf-test-case.4 | 10 +++++- contrib/kyua/engine/atf_list.cpp | 4 +++ contrib/kyua/engine/requirements.cpp | 30 ++++++++++++++++++ contrib/kyua/model/metadata.cpp | 22 +++++++++++++ contrib/kyua/model/metadata.hpp | 6 ++++ lib/atf/libatf-c/Makefile | 2 ++ libexec/atf/atf-sh/Makefile | 1 + tests/sys/fs/tarfs/tarfs_test.sh | 18 ++++++++++- tests/sys/net/if_wg.sh | 15 +++------ usr.bin/kyua/Makefile | 2 +- 18 files changed, 214 insertions(+), 17 deletions(-) diff --git a/contrib/atf/atf-c++/atf-c++.3 b/contrib/atf/atf-c++/atf-c++.3 index fead776755af..bb83e6214622 100644 --- a/contrib/atf/atf-c++/atf-c++.3 +++ b/contrib/atf/atf-c++/atf-c++.3 @@ -22,7 +22,7 @@ .\" 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 March 6, 2017 +.Dd May 11, 2025 .Dt ATF-C++ 3 .Os .Sh NAME @@ -277,6 +277,14 @@ It is possible to get the path to the test case's source directory from any of its three components by querying the .Sq srcdir configuration variable. +.Ss Requiring kernel modules +Aside from the +.Va require.kmods +meta-data variable available in the header only, one can also check for +additional kernel modules in the test case's body by using the +.Fn require_kmod +function, which takes the name of a single module. +If it is not found, the test case will be automatically skipped. .Ss Requiring programs Aside from the .Va require.progs diff --git a/contrib/atf/atf-c++/tests.cpp b/contrib/atf/atf-c++/tests.cpp index ede9609e32d6..a9f5d4a5fe2c 100644 --- a/contrib/atf/atf-c++/tests.cpp +++ b/contrib/atf/atf-c++/tests.cpp @@ -318,6 +318,13 @@ impl::tc::cleanup(void) { } +void +impl::tc::require_kmod(const std::string& kmod) + const +{ + atf_tc_require_kmod(kmod.c_str()); +} + void impl::tc::require_prog(const std::string& prog) const diff --git a/contrib/atf/atf-c++/tests.hpp b/contrib/atf/atf-c++/tests.hpp index a03cc852dcf8..8fdf15a9f05d 100644 --- a/contrib/atf/atf-c++/tests.hpp +++ b/contrib/atf/atf-c++/tests.hpp @@ -80,6 +80,7 @@ protected: virtual void body(void) const = 0; virtual void cleanup(void) const; + void require_kmod(const std::string&) const; void require_prog(const std::string&) const; friend struct tc_impl; diff --git a/contrib/atf/atf-c/atf-c.3 b/contrib/atf/atf-c/atf-c.3 index c38e068bb380..6369cb5697f8 100644 --- a/contrib/atf/atf-c/atf-c.3 +++ b/contrib/atf/atf-c/atf-c.3 @@ -22,7 +22,7 @@ .\" 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 February 23, 2021 +.Dd May 11, 2025 .Dt ATF-C 3 .Os .Sh NAME @@ -77,6 +77,8 @@ .Nm atf_tc_fail , .Nm atf_tc_fail_nonfatal , .Nm atf_tc_pass , +.Nm atf_tc_require_kmod , +.Nm atf_tc_require_prog , .Nm atf_tc_skip , .Nm atf_utils_cat_file , .Nm atf_utils_compare_file , @@ -145,6 +147,8 @@ .Fn atf_tc_fail "reason" .Fn atf_tc_fail_nonfatal "reason" .Fn atf_tc_pass +.Fn atf_tc_require_kmod "kmod" +.Fn atf_tc_require_prog "prog" .Fn atf_tc_skip "reason" .Ft void .Fo atf_utils_cat_file @@ -362,6 +366,14 @@ It is possible to get the path to the test case's source directory from any of its three components by querying the .Sq srcdir configuration variable. +.Ss Requiring kernel modules +Aside from the +.Va require.kmods +meta-data variable available in the header only, one can also check for +additional kernel modules in the test case's body by using the +.Fn atf_tc_require_kmod +function, which takes the name of a single kernel module. +If it is not found, the test case will be automatically skipped. .Ss Requiring programs Aside from the .Va require.progs diff --git a/contrib/atf/atf-c/tc.c b/contrib/atf/atf-c/tc.c index 84a8beb4fa13..1cef6adbd82d 100644 --- a/contrib/atf/atf-c/tc.c +++ b/contrib/atf/atf-c/tc.c @@ -26,6 +26,10 @@ #include "atf-c/tc.h" #include +#ifdef __FreeBSD__ +#include +#include +#endif #include #include @@ -103,6 +107,9 @@ static void format_reason_fmt(atf_dynstr_t *, const char *, const size_t, static void errno_test(struct context *, const char *, const size_t, const int, const char *, const bool, void (*)(struct context *, atf_dynstr_t *)); +#ifdef __FreeBSD__ +static atf_error_t check_kmod(struct context *, const char *); +#endif static atf_error_t check_prog_in_dir(const char *, void *); static atf_error_t check_prog(struct context *, const char *); @@ -460,6 +467,39 @@ errno_test(struct context *ctx, const char *file, const size_t line, } } +#ifdef __FreeBSD__ +static atf_error_t +check_kmod(struct context *ctx, const char *kmod) +{ + struct kld_file_stat fstat = { .version = sizeof(fstat) }; + struct module_stat mstat = { .version = sizeof(mstat) }; + atf_dynstr_t reason; + size_t len = strlen(kmod); + int fid, mid; + + for (fid = kldnext(0); fid > 0; fid = kldnext(fid)) { + if (kldstat(fid, &fstat) != 0) + continue; + if (strcmp(fstat.name, kmod) == 0) + goto done; + if (strncmp(fstat.name, kmod, len) == 0 && + strcmp(fstat.name + len, ".ko") == 0) + goto done; + for (mid = kldfirstmod(fid); mid > 0; mid = modfnext(mid)) { + if (modstat(mid, &mstat) != 0) + continue; + if (strcmp(mstat.name, kmod) == 0) + goto done; + } + } + format_reason_fmt(&reason, NULL, 0, "The required kmod %s " + "is not loaded", kmod); + fail_requirement(ctx, &reason); +done: + return atf_no_error(); +} +#endif + struct prog_found_pair { const char *prog; bool found; @@ -829,6 +869,9 @@ static void _atf_tc_fail_check(struct context *, const char *, const size_t, static void _atf_tc_fail_requirement(struct context *, const char *, const size_t, const char *, va_list) ATF_DEFS_ATTRIBUTE_NORETURN; static void _atf_tc_pass(struct context *) ATF_DEFS_ATTRIBUTE_NORETURN; +#ifdef __FreeBSD__ +static void _atf_tc_require_kmod(struct context *, const char *); +#endif static void _atf_tc_require_prog(struct context *, const char *); static void _atf_tc_skip(struct context *, const char *, va_list) ATF_DEFS_ATTRIBUTE_NORETURN; @@ -908,6 +951,14 @@ _atf_tc_pass(struct context *ctx) UNREACHABLE; } +#ifdef __FreeBSD__ +static void +_atf_tc_require_kmod(struct context *ctx, const char *kmod) +{ + check_fatal_error(check_kmod(ctx, kmod)); +} +#endif + static void _atf_tc_require_prog(struct context *ctx, const char *prog) { @@ -1154,6 +1205,16 @@ atf_tc_pass(void) _atf_tc_pass(&Current); } +#ifdef __FreeBSD__ +void +atf_tc_require_kmod(const char *kmod) +{ + PRE(Current.tc != NULL); + + _atf_tc_require_kmod(&Current, kmod); +} +#endif + void atf_tc_require_prog(const char *prog) { diff --git a/contrib/atf/atf-c/tc.h b/contrib/atf/atf-c/tc.h index 3fb695562ac8..5109102750c7 100644 --- a/contrib/atf/atf-c/tc.h +++ b/contrib/atf/atf-c/tc.h @@ -106,6 +106,9 @@ void atf_tc_fail_nonfatal(const char *, ...) ATF_DEFS_ATTRIBUTE_FORMAT_PRINTF(1, 2); void atf_tc_pass(void) ATF_DEFS_ATTRIBUTE_NORETURN; +#ifdef __FreeBSD__ +void atf_tc_require_kmod(const char *); +#endif void atf_tc_require_prog(const char *); void atf_tc_skip(const char *, ...) ATF_DEFS_ATTRIBUTE_FORMAT_PRINTF(1, 2) diff --git a/contrib/atf/atf-sh/atf-sh.3 b/contrib/atf/atf-sh/atf-sh.3 index c3080c296826..5e53ceb45a06 100644 --- a/contrib/atf/atf-sh/atf-sh.3 +++ b/contrib/atf/atf-sh/atf-sh.3 @@ -22,7 +22,7 @@ .\" 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 January 27, 2021 +.Dd May 11, 2025 .Dt ATF-SH 3 .Os .Sh NAME @@ -43,6 +43,7 @@ .Nm atf_get_srcdir , .Nm atf_init_test_cases , .Nm atf_pass , +.Nm atf_require_kmod , .Nm atf_require_prog , .Nm atf_set , .Nm atf_skip , @@ -90,6 +91,8 @@ .Nm atf_init_test_cases .Qq name .Nm atf_pass +.Nm atf_require_kmod +.Qq kmod_name .Nm atf_require_prog .Qq prog_name .Nm atf_set @@ -205,6 +208,14 @@ function. It is interesting to note that this can be used inside .Nm atf_init_test_cases to silently include additional helper files from the source directory. +.Ss Requiring kernel modules +Aside from the +.Va require.kmods +meta-data variable available in the header only, one can also check for +additional kernel modules in the test case's body by using the +.Nm atf_require_kmod +function, which takes the name of a single kernel module. +If it is not found, the test case will be automatically skipped. .Ss Requiring programs Aside from the .Va require.progs diff --git a/contrib/atf/atf-sh/libatf-sh.subr b/contrib/atf/atf-sh/libatf-sh.subr index af2b75e5fe34..b89060f8b00b 100644 --- a/contrib/atf/atf-sh/libatf-sh.subr +++ b/contrib/atf/atf-sh/libatf-sh.subr @@ -353,6 +353,18 @@ atf_require_prog() esac } +# +# atf_require_kmod kmod +# +# Checks that the given kmod is loaded. If it is not, automatically +# skips the test case with an appropriate message. +# +atf_require_kmod() +{ + kldstat -q "${1}" || \ + atf_skip "The required kmod ${1} is not loaded" +} + # # atf_set varname val1 [.. valN] # diff --git a/contrib/atf/doc/atf-test-case.4 b/contrib/atf/doc/atf-test-case.4 index 46690bdcb0ef..020d7035d198 100644 --- a/contrib/atf/doc/atf-test-case.4 +++ b/contrib/atf/doc/atf-test-case.4 @@ -22,7 +22,7 @@ .\" 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 March 6, 2017 +.Dd May 11, 2025 .Dt ATF-TEST-CASE 4 .Os .Sh NAME @@ -223,6 +223,14 @@ The value can have a size suffix such as or .Sq T to make the amount of bytes easier to type and read. +.It require.kmods +Type: textual. +Optional. +.Pp +A whitespace separated list of kernel modules that must be present to +execute the test case. +If any of the required kernel modules is not found, the test case is +.Em skipped . .It require.progs Type: textual. Optional. diff --git a/contrib/kyua/engine/atf_list.cpp b/contrib/kyua/engine/atf_list.cpp index f6ec20d7709a..e0c4170605d1 100644 --- a/contrib/kyua/engine/atf_list.cpp +++ b/contrib/kyua/engine/atf_list.cpp @@ -133,6 +133,10 @@ engine::parse_atf_metadata(const model::properties_map& props) mdbuilder.set_string("required_disk_space", value); } else if (name == "require.files") { mdbuilder.set_string("required_files", value); +#ifdef __FreeBSD__ + } else if (name == "require.kmods") { + mdbuilder.set_string("required_kmods", value); +#endif } else if (name == "require.machine") { mdbuilder.set_string("allowed_platforms", value); } else if (name == "require.memory") { diff --git a/contrib/kyua/engine/requirements.cpp b/contrib/kyua/engine/requirements.cpp index a6a4cae7511c..dff43e531a57 100644 --- a/contrib/kyua/engine/requirements.cpp +++ b/contrib/kyua/engine/requirements.cpp @@ -41,6 +41,10 @@ #include "utils/sanity.hpp" #include "utils/units.hpp" +#ifdef __FreeBSD__ +#include +#endif + namespace config = utils::config; namespace fs = utils::fs; namespace passwd = utils::passwd; @@ -220,6 +224,26 @@ check_required_programs(const model::paths_set& required_programs) } +#ifdef __FreeBSD__ +/// Checks if all required kmods are loaded. +/// +/// \param required_programs Set of kmods. +/// +/// \return Empty if the required kmods are all loaded or an error +/// message otherwise. +static std::string +check_required_kmods(const model::strings_set& required_kmods) +{ + for (model::strings_set::const_iterator iter = required_kmods.begin(); + iter != required_kmods.end(); iter++) { + if (!kld_isloaded((*iter).c_str())) + return F("Required kmod '%s' not loaded") % *iter; + } + return ""; +} +#endif + + /// Checks if the current system has the specified amount of memory. /// /// \param required_memory Amount of required physical memory, or zero if not @@ -312,6 +336,12 @@ engine::check_reqs(const model::metadata& md, const config::tree& cfg, if (!reason.empty()) return reason; +#ifdef __FreeBSD__ + reason = check_required_kmods(md.required_kmods()); + if (!reason.empty()) + return reason; +#endif + reason = check_required_memory(md.required_memory()); if (!reason.empty()) return reason; diff --git a/contrib/kyua/model/metadata.cpp b/contrib/kyua/model/metadata.cpp index 85248d596727..a5a9a1315964 100644 --- a/contrib/kyua/model/metadata.cpp +++ b/contrib/kyua/model/metadata.cpp @@ -256,6 +256,9 @@ init_tree(config::tree& tree) tree.define< bytes_node >("required_disk_space"); tree.define< paths_set_node >("required_files"); tree.define< bytes_node >("required_memory"); +#ifdef __FreeBSD__ + tree.define< config::strings_set_node >("required_kmods"); +#endif tree.define< paths_set_node >("required_programs"); tree.define< user_node >("required_user"); tree.define< delta_node >("timeout"); @@ -282,6 +285,9 @@ set_defaults(config::tree& tree) tree.set< bytes_node >("required_disk_space", units::bytes(0)); tree.set< paths_set_node >("required_files", model::paths_set()); tree.set< bytes_node >("required_memory", units::bytes(0)); +#ifdef __FreeBSD__ + tree.set< config::strings_set_node >("required_kmods", model::strings_set()); +#endif tree.set< paths_set_node >("required_programs", model::paths_set()); tree.set< user_node >("required_user", ""); // TODO(jmmv): We shouldn't be setting a default timeout like this. See @@ -597,6 +603,22 @@ model::metadata::required_memory(void) const } +#ifdef __FreeBSD__ +/// Returns the list of kmods needed by the test. +/// +/// \return Set of strings. +const model::strings_set& +model::metadata::required_kmods(void) const +{ + if (_pimpl->props.is_set("required_kmods")) { + return _pimpl->props.lookup< config::strings_set_node >("required_kmods"); + } else { + return get_defaults().lookup< config::strings_set_node >("required_kmods"); + } +} +#endif + + /// Returns the list of programs needed by the test. /// /// \return Set of paths. diff --git a/contrib/kyua/model/metadata.hpp b/contrib/kyua/model/metadata.hpp index 263ecc86106d..8af6c7c161af 100644 --- a/contrib/kyua/model/metadata.hpp +++ b/contrib/kyua/model/metadata.hpp @@ -76,6 +76,9 @@ public: const utils::units::bytes& required_disk_space(void) const; const paths_set& required_files(void) const; const utils::units::bytes& required_memory(void) const; +#ifdef __FreeBSD__ + const strings_set& required_kmods(void) const; +#endif const paths_set& required_programs(void) const; const std::string& required_user(void) const; const utils::datetime::delta& timeout(void) const; @@ -121,6 +124,9 @@ public: metadata_builder& set_required_disk_space(const utils::units::bytes&); metadata_builder& set_required_files(const paths_set&); metadata_builder& set_required_memory(const utils::units::bytes&); +#ifdef __FreeBSD__ + metadata_builder& set_required_kmods(const strings_set&); +#endif metadata_builder& set_required_programs(const paths_set&); metadata_builder& set_required_user(const std::string&); metadata_builder& set_string(const std::string&, const std::string&); diff --git a/lib/atf/libatf-c/Makefile b/lib/atf/libatf-c/Makefile index 9fd36dc913f3..4cfee2ed824f 100644 --- a/lib/atf/libatf-c/Makefile +++ b/lib/atf/libatf-c/Makefile @@ -119,6 +119,8 @@ MLINKS+= atf-c.3 ATF_CHECK.3 \ atf-c.3 atf_tc_fail.3 \ atf-c.3 atf_tc_fail_nonfatal.3 \ atf-c.3 atf_tc_pass.3 \ + atf-c.3 atf_tc_require_kmod.3 \ + atf-c.3 atf_tc_require_prog.3 \ atf-c.3 atf_tc_skip.3 \ atf-c.3 atf_utils_cat_file.3 \ atf-c.3 atf_utils_compare_file.3 \ diff --git a/libexec/atf/atf-sh/Makefile b/libexec/atf/atf-sh/Makefile index ba949fd3072e..2e821684d8a8 100644 --- a/libexec/atf/atf-sh/Makefile +++ b/libexec/atf/atf-sh/Makefile @@ -54,6 +54,7 @@ MLINKS+= \ atf-sh.3 atf_get_srcdir.3 \ atf-sh.3 atf_init_test_cases.3 \ atf-sh.3 atf_pass.3 \ + atf-sh.3 atf_require_kmod.3 \ atf-sh.3 atf_require_prog.3 \ atf-sh.3 atf_set.3 \ atf-sh.3 atf_skip.3 \ diff --git a/tests/sys/fs/tarfs/tarfs_test.sh b/tests/sys/fs/tarfs/tarfs_test.sh index f1322033fbad..20baadfea5c5 100644 --- a/tests/sys/fs/tarfs/tarfs_test.sh +++ b/tests/sys/fs/tarfs/tarfs_test.sh @@ -48,7 +48,6 @@ tarsum() { } tarfs_setup() { - kldload -n tarfs || atf_skip "This test requires tarfs and could not load it" mkdir "${mnt}" } @@ -60,6 +59,7 @@ atf_test_case tarfs_basic cleanup tarfs_basic_head() { atf_set "descr" "Basic function test" atf_set "require.user" "root" + atf_set "require.kmods" "tarfs" } tarfs_basic_body() { tarfs_setup @@ -87,6 +87,7 @@ atf_test_case tarfs_basic_gnu cleanup tarfs_basic_gnu_head() { atf_set "descr" "Basic function test using GNU tar" atf_set "require.user" "root" + atf_set "require.kmods" "tarfs" atf_set "require.progs" "gtar" } tarfs_basic_gnu_body() { @@ -101,6 +102,7 @@ atf_test_case tarfs_notdir_device cleanup tarfs_notdir_device_head() { atf_set "descr" "Regression test for PR 269519 and 269561" atf_set "require.user" "root" + atf_set "require.kmods" "tarfs" } tarfs_notdir_device_body() { tarfs_setup @@ -121,6 +123,7 @@ atf_test_case tarfs_notdir_device_gnu cleanup tarfs_notdir_device_gnu_head() { atf_set "descr" "Regression test for PR 269519 and 269561 using GNU tar" atf_set "require.user" "root" + atf_set "require.kmods" "tarfs" atf_set "require.progs" "gtar" } tarfs_notdir_device_gnu_body() { @@ -135,6 +138,7 @@ atf_test_case tarfs_notdir_dot cleanup tarfs_notdir_dot_head() { atf_set "descr" "Regression test for PR 269519 and 269561" atf_set "require.user" "root" + atf_set "require.kmods" "tarfs" } tarfs_notdir_dot_body() { tarfs_setup @@ -155,6 +159,7 @@ atf_test_case tarfs_notdir_dot_gnu cleanup tarfs_notdir_dot_gnu_head() { atf_set "descr" "Regression test for PR 269519 and 269561 using GNU tar" atf_set "require.user" "root" + atf_set "require.kmods" "tarfs" atf_set "require.progs" "gtar" } tarfs_notdir_dot_gnu_body() { @@ -169,6 +174,7 @@ atf_test_case tarfs_notdir_dotdot cleanup tarfs_notdir_dotdot_head() { atf_set "descr" "Regression test for PR 269519 and 269561" atf_set "require.user" "root" + atf_set "require.kmods" "tarfs" } tarfs_notdir_dotdot_body() { tarfs_setup @@ -189,6 +195,7 @@ atf_test_case tarfs_notdir_dotdot_gnu cleanup tarfs_notdir_dotdot_gnu_head() { atf_set "descr" "Regression test for PR 269519 and 269561 using GNU tar" atf_set "require.user" "root" + atf_set "require.kmods" "tarfs" atf_set "require.progs" "gtar" } tarfs_notdir_dotdot_gnu_body() { @@ -203,6 +210,7 @@ atf_test_case tarfs_notdir_file cleanup tarfs_notdir_file_head() { atf_set "descr" "Regression test for PR 269519 and 269561" atf_set "require.user" "root" + atf_set "require.kmods" "tarfs" } tarfs_notdir_file_body() { tarfs_setup @@ -223,6 +231,7 @@ atf_test_case tarfs_notdir_file_gnu cleanup tarfs_notdir_file_gnu_head() { atf_set "descr" "Regression test for PR 269519 and 269561 using GNU tar" atf_set "require.user" "root" + atf_set "require.kmods" "tarfs" atf_set "require.progs" "gtar" } tarfs_notdir_file_gnu_body() { @@ -237,6 +246,7 @@ atf_test_case tarfs_emptylink cleanup tarfs_emptylink_head() { atf_set "descr" "Regression test for PR 277360: empty link target" atf_set "require.user" "root" + atf_set "require.kmods" "tarfs" } tarfs_emptylink_body() { tarfs_setup @@ -256,6 +266,7 @@ atf_test_case tarfs_linktodir cleanup tarfs_linktodir_head() { atf_set "descr" "Regression test for PR 277360: link to directory" atf_set "require.user" "root" + atf_set "require.kmods" "tarfs" } tarfs_linktodir_body() { tarfs_setup @@ -276,6 +287,7 @@ atf_test_case tarfs_linktononexistent cleanup tarfs_linktononexistent_head() { atf_set "descr" "Regression test for PR 277360: link to nonexistent target" atf_set "require.user" "root" + atf_set "require.kmods" "tarfs" } tarfs_linktononexistent_body() { tarfs_setup @@ -293,6 +305,7 @@ atf_test_case tarfs_checksum cleanup tarfs_checksum_head() { atf_set "descr" "Verify that the checksum covers header padding" atf_set "require.user" "root" + atf_set "require.kmods" "tarfs" } tarfs_checksum_body() { tarfs_setup @@ -313,6 +326,7 @@ atf_test_case tarfs_long_names cleanup tarfs_long_names_head() { atf_set "descr" "Verify that tarfs supports long file names" atf_set "require.user" "root" + atf_set "require.kmods" "tarfs" } tarfs_long_names_body() { tarfs_setup @@ -337,6 +351,7 @@ atf_test_case tarfs_long_paths cleanup tarfs_long_paths_head() { atf_set "descr" "Verify that tarfs supports long paths" atf_set "require.user" "root" + atf_set "require.kmods" "tarfs" } tarfs_long_paths_body() { tarfs_setup @@ -361,6 +376,7 @@ atf_test_case tarfs_git_archive cleanup tarfs_git_archive_head() { atf_set "descr" "Verify that tarfs supports archives created by git" atf_set "require.user" "root" + atf_set "require.kmods" "tarfs" atf_set "require.progs" "git" } tarfs_git_archive_body() { diff --git a/tests/sys/net/if_wg.sh b/tests/sys/net/if_wg.sh index e5df6afface1..6d2f56dc8f2e 100644 --- a/tests/sys/net/if_wg.sh +++ b/tests/sys/net/if_wg.sh @@ -34,6 +34,7 @@ wg_basic_head() { atf_set descr 'Create a wg(4) tunnel over an epair and pass traffic between jails' atf_set require.user root + atf_set require.kmods if_wg } wg_basic_body() @@ -41,8 +42,6 @@ wg_basic_body() local epair pri1 pri2 pub1 pub2 wg1 wg2 local endpoint1 endpoint2 tunnel1 tunnel2 - kldload -n if_wg || atf_skip "This test requires if_wg and could not load it" - pri1=$(wg genkey) pri2=$(wg genkey) @@ -175,6 +174,7 @@ wg_basic_netmap_head() { atf_set descr 'Create a wg(4) tunnel over an epair and pass traffic between jails with netmap' atf_set require.user root + atf_set require.kmods if_wg netmap } wg_basic_netmap_body() @@ -183,9 +183,6 @@ wg_basic_netmap_body() local endpoint1 endpoint2 tunnel1 tunnel2 tunnel3 tunnel4 local pid status - kldload -n if_wg || atf_skip "This test requires if_wg and could not load it" - kldload -n netmap || atf_skip "This test requires netmap and could not load it" - pri1=$(wg genkey) pri2=$(wg genkey) @@ -268,6 +265,7 @@ wg_key_peerdev_shared_head() { atf_set descr 'Create a wg(4) interface with a shared pubkey between device and a peer' atf_set require.user root + atf_set require.kmods if_wg } wg_key_peerdev_shared_body() @@ -275,8 +273,6 @@ wg_key_peerdev_shared_body() local epair pri1 pub1 wg1 local endpoint1 tunnel1 - kldload -n if_wg || atf_skip "This test requires if_wg and could not load it" - pri1=$(wg genkey) endpoint1=192.168.2.1 @@ -316,8 +312,6 @@ wg_key_peerdev_makeshared_body() local epair pri1 pub1 pri2 wg1 wg2 local endpoint1 tunnel1 - kldload -n if_wg || atf_skip "This test requires if_wg and could not load it" - pri1=$(wg genkey) pri2=$(wg genkey) @@ -361,6 +355,7 @@ wg_vnet_parent_routing_head() { atf_set descr 'Create a wg(4) tunnel without epairs and pass traffic between jails' atf_set require.user root + atf_set require.kmods if_wg } wg_vnet_parent_routing_body() @@ -368,8 +363,6 @@ wg_vnet_parent_routing_body() local pri1 pri2 pub1 pub2 wg1 wg2 local tunnel1 tunnel2 - kldload -n if_wg - pri1=$(wg genkey) pri2=$(wg genkey) diff --git a/usr.bin/kyua/Makefile b/usr.bin/kyua/Makefile index 24ceba841ba4..d3a7b9b61f64 100644 --- a/usr.bin/kyua/Makefile +++ b/usr.bin/kyua/Makefile @@ -13,7 +13,7 @@ KYUA_SRCDIR= ${SRCTOP}/contrib/kyua PACKAGE= tests PROG_CXX= kyua SRCS= main.cpp -LIBADD= lutok sqlite3 +LIBADD= lutok sqlite3 util MAN= kyua-about.1 \ kyua-config.1 \ From nobody Sat May 31 12:28:31 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b8fXc64fkz5wxpl; Sat, 31 May 2025 12:28:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b8fXb6p45z3fqS; Sat, 31 May 2025 12:28:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748694512; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fBF/3f+w3DMWIseazgawKP6jDehnoOcfQ5YjbW1lJLM=; b=AcSx/j6AVuWrXo8JMAtmWxdZ//PA3G9tWu3uCCx//opY3ZNjYIAR3wtOBr19XQ/bf+3EN0 7jDZ3sjwkOnPjGID86oxy7GOsS3tHRc7ZE9AEMoTNQW4of3cXiPhT+9AbPoixch1adYKw2 C0ECoFyCrCgolkbN6iZYklKzNwrfHSpK1n3Znj/BjcwuQHpCIePhglIKdEUNYlBjqs3lL5 3nZWRslU+jU9ae2vGVUdWCAzF9iuBG4zIkL8jowPgy04BfNkAm3fjwVCoWTkSY6iUsNbqt liBLwRFBy3eTvjVokcrth5d6FkDeKLPBZtOCR5VBbQVw5qzSANxI/lqkKgX/qg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748694512; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fBF/3f+w3DMWIseazgawKP6jDehnoOcfQ5YjbW1lJLM=; b=ebMde67TjZ/S+fVEOQlfX2FkdO4atUVFSWDua9ep1EfNuvsueucjnl94CHgESlcYNZPzkG 3vHpEiVL7JBztXM8vbSmYTYoOqqJA0WUeFRbDS/NYC/uVKXeeD3nxD0MgMuqr/wLiYf+sd 4GwX3ZZQV3exjXsC4fxu0A+EkcOTEtdoVtBj0AWZf/6q1xntKoO0rYoqlCfqny7tmtDLUX BRSqJBe1YKwxnhJhEo9vLLA+ujB6KZoiWk8y9D0NYyaNYit56rWtsgagf9EsK0cGq4h7RX WOtM4O7BsNCOiayMcEG6+HWEVERTyLCFnSifJH+ie3gBqRY9Lc8ne12m6vv9Gg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748694512; a=rsa-sha256; cv=none; b=cdpsVQxBK/FqQdCh2/tc1Hz7MeD0qQ6GKSp5rANVtrARkSDEt66OpcfNplVSAX1iATDBrF TQgKJ5vzLYW6KsI0kIdW/p/mdvLfL/FBNZAKIsxfrsEK33y2RE/xmBGLtMbeJ8j401ypxx 910lG7F3qab+3AuQxdla4FOpNXknL8yNNTbn9BhrUKfOAHYEAP5NwW9EegCAbVMPokLR37 9dglLhNeAjbb1ldtx5OL0584E/PkmCLPoaxSaMfOixMhMBHEdnFan08ELVQ6SJSNFzNGsq hGixa/DWpzePQhmW4wTekui1kn/bBFdFOVgkqsF5JAnnWLF/KHvmuaXI1OcX7w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b8fXb38Yrzdxm; Sat, 31 May 2025 12:28: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 54VCSVi9086182; Sat, 31 May 2025 12:28:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54VCSVZd086179; Sat, 31 May 2025 12:28:31 GMT (envelope-from git) Date: Sat, 31 May 2025 12:28:31 GMT Message-Id: <202505311228.54VCSVZd086179@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 93aeb68a8933 - stable/14 - atf: Don't be deterred by weird umasks. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 93aeb68a8933e7458c795b31589900cbeae49e38 Auto-Submitted: auto-generated The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=93aeb68a8933e7458c795b31589900cbeae49e38 commit 93aeb68a8933e7458c795b31589900cbeae49e38 Author: Dag-Erling Smørgrav AuthorDate: 2025-05-24 10:03:22 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-05-31 12:28:28 +0000 atf: Don't be deterred by weird umasks. If the current umask is weird, ATF goes to great lengths to tell us that it can't possibly work in these conditions, instead of just dealing with it. This makes it unreasonably hard to use ATF to test how our own code handles unusual umasks. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: igoro, kevans, ngie Differential Revision: https://reviews.freebsd.org/D50267 (cherry picked from commit 1a6a36a98ad5dc86862541b91686b00cf88e9f76) --- contrib/atf/atf-c/check_test.c | 8 +--- contrib/atf/atf-c/detail/fs.c | 91 ++++-------------------------------- contrib/atf/atf-c/detail/fs_test.c | 44 ++++++++--------- contrib/atf/atf-sh/atf-check_test.sh | 24 +++++----- 4 files changed, 43 insertions(+), 124 deletions(-) diff --git a/contrib/atf/atf-c/check_test.c b/contrib/atf/atf-c/check_test.c index adaca649be25..06e2fad2d9a4 100644 --- a/contrib/atf/atf-c/check_test.c +++ b/contrib/atf/atf-c/check_test.c @@ -458,8 +458,7 @@ ATF_TC(exec_umask); ATF_TC_HEAD(exec_umask, tc) { atf_tc_set_md_var(tc, "descr", "Checks that atf_check_exec_array " - "correctly reports an error if the umask is too " - "restrictive to create temporary files"); + "works regardless of umask"); } ATF_TC_BODY(exec_umask, tc) { @@ -473,10 +472,7 @@ ATF_TC_BODY(exec_umask, tc) argv[2] = NULL; umask(0222); - atf_error_t err = atf_check_exec_array(argv, &result); - ATF_CHECK(atf_is_error(err)); - ATF_CHECK(atf_error_is(err, "invalid_umask")); - atf_error_free(err); + RE(atf_check_exec_array(argv, &result)); atf_fs_path_fini(&process_helpers); } diff --git a/contrib/atf/atf-c/detail/fs.c b/contrib/atf/atf-c/detail/fs.c index 5ff7648c3c7e..6ea825aa8e56 100644 --- a/contrib/atf/atf-c/detail/fs.c +++ b/contrib/atf/atf-c/detail/fs.c @@ -54,71 +54,13 @@ * Prototypes for auxiliary functions. * --------------------------------------------------------------------- */ -static bool check_umask(const mode_t, const mode_t); static atf_error_t copy_contents(const atf_fs_path_t *, char **); -static mode_t current_umask(void); static atf_error_t do_mkdtemp(char *); static atf_error_t normalize(atf_dynstr_t *, char *); static atf_error_t normalize_ap(atf_dynstr_t *, const char *, va_list); static void replace_contents(atf_fs_path_t *, const char *); static const char *stat_type_to_string(const int); -/* --------------------------------------------------------------------- - * The "invalid_umask" error type. - * --------------------------------------------------------------------- */ - -struct invalid_umask_error_data { - /* One of atf_fs_stat_*_type. */ - int m_type; - - /* The original path causing the error. */ - /* XXX: Ideally this would be an atf_fs_path_t, but if we create it - * from the error constructor, we cannot delete the path later on. - * Can't remember why atf_error_new does not take a hook for - * deletion. */ - char m_path[1024]; - - /* The umask that caused the error. */ - mode_t m_umask; -}; -typedef struct invalid_umask_error_data invalid_umask_error_data_t; - -static -void -invalid_umask_format(const atf_error_t err, char *buf, size_t buflen) -{ - const invalid_umask_error_data_t *data; - - PRE(atf_error_is(err, "invalid_umask")); - - data = atf_error_data(err); - snprintf(buf, buflen, "Could not create the temporary %s %s because " - "it will not have enough access rights due to the current " - "umask %05o", stat_type_to_string(data->m_type), - data->m_path, (unsigned int)data->m_umask); -} - -static -atf_error_t -invalid_umask_error(const atf_fs_path_t *path, const int type, - const mode_t failing_mask) -{ - atf_error_t err; - invalid_umask_error_data_t data; - - data.m_type = type; - - strncpy(data.m_path, atf_fs_path_cstring(path), sizeof(data.m_path)); - data.m_path[sizeof(data.m_path) - 1] = '\0'; - - data.m_umask = failing_mask; - - err = atf_error_new("invalid_umask", &data, sizeof(data), - invalid_umask_format); - - return err; -} - /* --------------------------------------------------------------------- * The "unknown_file_type" error type. * --------------------------------------------------------------------- */ @@ -162,14 +104,6 @@ unknown_type_error(const char *path, int type) * Auxiliary functions. * --------------------------------------------------------------------- */ -static -bool -check_umask(const mode_t exp_mode, const mode_t min_mode) -{ - const mode_t actual_mode = (~current_umask() & exp_mode); - return (actual_mode & min_mode) == min_mode; -} - static atf_error_t copy_contents(const atf_fs_path_t *p, char **buf) @@ -189,15 +123,6 @@ copy_contents(const atf_fs_path_t *p, char **buf) return err; } -static -mode_t -current_umask(void) -{ - const mode_t current = umask(0); - (void)umask(current); - return current; -} - static atf_error_t do_mkdtemp(char *tmpl) @@ -794,11 +719,10 @@ atf_fs_mkdtemp(atf_fs_path_t *p) { atf_error_t err; char *buf; + mode_t mask; - if (!check_umask(S_IRWXU, S_IRWXU)) { - err = invalid_umask_error(p, atf_fs_stat_dir_type, current_umask()); - goto out; - } + mask = umask(0); + umask(mask & 077); err = copy_contents(p, &buf); if (atf_is_error(err)) @@ -814,6 +738,7 @@ atf_fs_mkdtemp(atf_fs_path_t *p) out_buf: free(buf); out: + umask(mask); return err; } @@ -823,11 +748,10 @@ atf_fs_mkstemp(atf_fs_path_t *p, int *fdout) atf_error_t err; char *buf; int fd; + mode_t mask; - if (!check_umask(S_IRWXU, S_IRWXU)) { - err = invalid_umask_error(p, atf_fs_stat_reg_type, current_umask()); - goto out; - } + mask = umask(0); + umask(mask & 077); err = copy_contents(p, &buf); if (atf_is_error(err)) @@ -844,6 +768,7 @@ atf_fs_mkstemp(atf_fs_path_t *p, int *fdout) out_buf: free(buf); out: + umask(mask); return err; } diff --git a/contrib/atf/atf-c/detail/fs_test.c b/contrib/atf/atf-c/detail/fs_test.c index 7812be0334b8..a9cc34a4f48b 100644 --- a/contrib/atf/atf-c/detail/fs_test.c +++ b/contrib/atf/atf-c/detail/fs_test.c @@ -896,25 +896,25 @@ ATF_TC_BODY(mkdtemp_err, tc) static void do_umask_check(atf_error_t (*const mk_func)(atf_fs_path_t *), - atf_fs_path_t *path, const mode_t test_mask, - const char *str_mask, const char *exp_name) + atf_error_t (*const rm_func)(const atf_fs_path_t *), + atf_fs_path_t *tmpl, const mode_t test_mask, + const char *exp_name) { - char buf[1024]; - int old_umask; + atf_fs_path_t path; + int pre_mask, post_mask; atf_error_t err; - printf("Creating temporary %s with umask %s\n", exp_name, str_mask); + printf("Creating temporary %s with umask %05o\n", exp_name, test_mask); - old_umask = umask(test_mask); - err = mk_func(path); - (void)umask(old_umask); + RE(atf_fs_path_copy(&path, tmpl)); - ATF_REQUIRE(atf_is_error(err)); - ATF_REQUIRE(atf_error_is(err, "invalid_umask")); - atf_error_format(err, buf, sizeof(buf)); - ATF_CHECK(strstr(buf, exp_name) != NULL); - ATF_CHECK(strstr(buf, str_mask) != NULL); - atf_error_free(err); + pre_mask = umask(test_mask); + err = mk_func(&path); + post_mask = umask(pre_mask); + + ATF_REQUIRE(!atf_is_error(err)); + ATF_CHECK_EQ(post_mask, test_mask); + RE(rm_func(&path)); } ATF_TC(mkdtemp_umask); @@ -929,11 +929,11 @@ ATF_TC_BODY(mkdtemp_umask, tc) RE(atf_fs_path_init_fmt(&p, "testdir.XXXXXX")); - do_umask_check(atf_fs_mkdtemp, &p, 00100, "00100", "directory"); - do_umask_check(atf_fs_mkdtemp, &p, 00200, "00200", "directory"); - do_umask_check(atf_fs_mkdtemp, &p, 00400, "00400", "directory"); - do_umask_check(atf_fs_mkdtemp, &p, 00500, "00500", "directory"); - do_umask_check(atf_fs_mkdtemp, &p, 00600, "00600", "directory"); + do_umask_check(atf_fs_mkdtemp, atf_fs_rmdir, &p, 00100, "directory"); + do_umask_check(atf_fs_mkdtemp, atf_fs_rmdir, &p, 00200, "directory"); + do_umask_check(atf_fs_mkdtemp, atf_fs_rmdir, &p, 00400, "directory"); + do_umask_check(atf_fs_mkdtemp, atf_fs_rmdir, &p, 00500, "directory"); + do_umask_check(atf_fs_mkdtemp, atf_fs_rmdir, &p, 00600, "directory"); atf_fs_path_fini(&p); } @@ -1039,9 +1039,9 @@ ATF_TC_BODY(mkstemp_umask, tc) RE(atf_fs_path_init_fmt(&p, "testfile.XXXXXX")); - do_umask_check(mkstemp_discard_fd, &p, 00100, "00100", "regular file"); - do_umask_check(mkstemp_discard_fd, &p, 00200, "00200", "regular file"); - do_umask_check(mkstemp_discard_fd, &p, 00400, "00400", "regular file"); + do_umask_check(mkstemp_discard_fd, atf_fs_unlink, &p, 00100, "regular file"); + do_umask_check(mkstemp_discard_fd, atf_fs_unlink, &p, 00200, "regular file"); + do_umask_check(mkstemp_discard_fd, atf_fs_unlink, &p, 00400, "regular file"); atf_fs_path_fini(&p); } diff --git a/contrib/atf/atf-sh/atf-check_test.sh b/contrib/atf/atf-sh/atf-check_test.sh index 9542dfb0bd9f..91d024a85bcd 100644 --- a/contrib/atf/atf-sh/atf-check_test.sh +++ b/contrib/atf/atf-sh/atf-check_test.sh @@ -389,21 +389,19 @@ stdin_body() atf_fail "atf-check does not seem to respect stdin" } -atf_test_case invalid_umask -invalid_umask_head() +atf_test_case unusual_umask +unusual_umask_head() { - atf_set "descr" "Tests for a correct error condition if the umask is" \ - "too restrictive" + atf_set "descr" "Tests that atf-check doesn't care about unusual umasks" } -invalid_umask_body() +unusual_umask_body() { - umask 0222 - ${Atf_Check} false 2>stderr && \ - atf_fail "atf-check returned 0 but it should have failed" - cat stderr - grep 'temporary.*current umask.*0222' stderr >/dev/null || \ - atf_fail "atf-check did not report an error related to the" \ - "current umask" + for mask in 022 027 0222 0177 0777 ; do + umask $mask + ${Atf_Check} true || \ + atf_fail "atf-check failed with umask $mask" + done + umask 022 } atf_init_test_cases() @@ -435,7 +433,7 @@ atf_init_test_cases() atf_add_test_case stdin - atf_add_test_case invalid_umask + atf_add_test_case unusual_umask } # vim: syntax=sh:expandtab:shiftwidth=4:softtabstop=4 From nobody Sat May 31 12:30:05 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b8fZP4j47z5wy8C for ; Sat, 31 May 2025 12:30: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b8fZP3KzBz3hJR; Sat, 31 May 2025 12:30:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748694605; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+qry5Jv8tp/lZp3csZmGEZehmAsSM5beo0NOr3xzXzA=; b=wDnoBNfXwhrH4hboNZ0nWWb9F0f4NXfuIGHcl1Nc5HTg2OheK/AaFnXjpM5UJOoH8+nVgx 1jncu+C47xVcW2RTh1ywr0XvnKhs+d3IVyuYgAJdFPixxG6xL6iBCEWJiT1EoNrDprF7AO pgMmBy9RUFYSEG6sLjntbFT5wIYAga4UewBZ0tVKOa2Jop8W/boGlhkTSV4DuwkqnGEprT D4j4wgxRzB7nJbtN3pktJxxil+7bdlWLODMKsYks+Q07scq0hpb3Y5/X8vlF5YqOWRo3qO OISM6SE3K1eYFdgGNSJ0Ddfb2ZJqNnmeFLEsySQKWyFsEK8wCQjp24/Dgi0k9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748694605; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+qry5Jv8tp/lZp3csZmGEZehmAsSM5beo0NOr3xzXzA=; b=M+QxR3uEdFb/PSjZw+rXhzJlxAFs87OKwPm7KrEeTVq2Ir/3UkiJayRF4/zek62k1MlCx0 8ixOal9zy5vHNLJQcDqxKFxxgknuQg7uBaO1LWgQRzGzJVYehJU3pGD7Om3KbYmxLXhUcV enQRTpT4SSILyToasUIHGfFd4mXU94yauf0C5rQQIZTtLNJyzA5saP05C+SIPKHMLfqa4g wrsP7BZYkYNSKTxATFvkAc5QWt5gkQ271Y18rQ+SeQBCjONZlv5YmT/6WBQ9PNacmCXhjE 7TKm5hF863y9sf4+MQR0LMixVFUfEXMMV0s3W3hcW6Fqj8C2VfNi18xnulmkmw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748694605; a=rsa-sha256; cv=none; b=wV4VWcBwMJTfLH6vzvLwufUTWu+DeWwghMv77k1MvXawEdKLERc0/ydy7ryRfWFNdM+4qg s2Y/O5YbwkF1trAhKoWVvS9c+0hbKVF8yT0nXG001/Bysv6EKT5YayQY/BMpgGTbXAVfJG k3FmYricaU0jceHtO++dyd7lntdxcjOklD711WPy1X+JK2G7KBozeQ3jhiPDRiyYg3K4D0 lM59L4aOj0Ter1BwOChF7/uQQ4jmry0USjbyXy8KclFI7WvkKAJdB6+T0AaMDOr2pq9WVl qt/KvpSIdbAtsq5Qkg1PxoXANTDppO7iZe+wBl9gvbdeMTbsrPXmf6BwtT1fDg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b8fZP1CvZzdRX; Sat, 31 May 2025 12:30: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 54VCU5VK089457; Sat, 31 May 2025 12:30:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54VCU5ua089454; Sat, 31 May 2025 12:30:05 GMT (envelope-from git) Date: Sat, 31 May 2025 12:30:05 GMT Message-Id: <202505311230.54VCU5ua089454@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Martin Matuska Subject: git: 3084336ae4a4..e8e602d987b0 - vendor/openzfs/master - vendor branch updated List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/vendor/openzfs/master X-Git-Reftype: branch X-Git-Commit: e8e602d987b01e7940f698d5fa2b00754609c74b X-Git-Oldrev: 3084336ae4a4e114e41be3177a3f5c779d66e93c X-Git-Newrev: e8e602d987b01e7940f698d5fa2b00754609c74b Auto-Submitted: auto-generated The branch vendor/openzfs/master has been updated by mm: URL: https://cgit.FreeBSD.org/src/log/?id=3084336ae4a4..e8e602d987b0 0c94d3838def linux/zvol_os: don't try to set disk ops if alloc fails 44e326689421 events: include zio type in IO error reports 5764e218bad0 vdev_disk: remove classic IO submission 1d482ca6e37b CI: Retire Ubuntu 20.04 builder b3b3cd1e4fdb vdev: skip faulting disks pending removal f5a6dd8b703e zpool: clarify ZPOOL_STATUS_REMOVED_DEV status message 008c9666efb3 Set spa_final_txg in spa_unload() 1bd225ed8ae2 abd_os: move headers from libzpool to libspl a38376b37a31 Rename zvol kernel module parameters sysctls on FreeBSD side 08bf660ac452 ZTS: Add AlmaLinux 10 f03f9c9bde70 ZTS: Enable io_uring support on el9/el10 2d33c8edb67e Make rewrite use Uncached I/O 90011644ce4c CI: Retire Fedora 40 builder e8e602d987b0 zio_add_child: collapse into a single function From nobody Sat May 31 12:49:08 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b8g0N4TyNz5x034; Sat, 31 May 2025 12:49: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b8g0N3tKvz3xTj; Sat, 31 May 2025 12:49:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748695748; h=from:from:reply-to:subject:subject: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+Cn5ViBeDbKCEBXFst6hovNDG1cXUb+TlZlkP4SNGc=; b=R+0cqLHUjWz/ZhZwy5kKAAjl4k4E2/edbO8B3sAbPH3x5j4qyeh13qHUMryL0jThVWl1Or 9zFWTKH3jv1OAKoDL3CQkfr9K9a//SkzHw/Z5opkBQGLxVznEhVbNn7i/UDzSbJuujfAnV /xuIZ5D11Ejc8yKhPZg7nhlosC9kONZdYJCamLJyt2jWJ3ZhzGPX8HOJh2rF4nz1jJG8vi aTLiUud7odhIRMNVbLBF/+Wv2sgMhCLGuPTU7m6psWiMLWCx1fd3HbqIEVx099dhKG9fq2 e2jddgFlJDLWMbfGjc9jct5VVT4+/Xc9220ZvgHAvM/A780tQe96qu8JwbEq8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748695748; h=from:from:reply-to:subject:subject: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+Cn5ViBeDbKCEBXFst6hovNDG1cXUb+TlZlkP4SNGc=; b=PiqZsdTv+ICp5ZdKJV2Z4iwO5gQhFJUMnOAKuIXsOFeb5g/1RWSUotFJDDys16s/gdKLZe 6U4i8H96CCfE4uzAiWigTSW3zgEpdQ/gbmZD8BLEIUkf4ML2UmLlj9xQS9GvzpHChbGBSj vT9hOcr7TMZeaTbF2d4foE62z13m0bN/LPZqK6n0jm1d7hSCNdtp+jrAG7eINwH+kBrBkf UzLddMN/Dxz2CcmhZN7C3ngFMo/ULnsCQyjNWiLJNOGBwY/vBuWMDZUiSeo+KgzAdZHil0 8rEfJ/VKi2+POGFsy+jH9w9EWkSDEULHwILVWb39OCtM1IzE/CJkMzZwaXy1PA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748695748; a=rsa-sha256; cv=none; b=GDBTlfyzcBw8uAdqy2BrPh5EXnIOb+61QhIqlehCmkUUoKs7DMxlUy6oTcw1LXBiDuYxKJ SZmstSX+o4MfAkyM77GGnC+zDt9v+Fuh2JfKWJqvxVCqrtj+RDKsEuIs9peFW/dXEPIe8P C1UnzSZVj/tnADQD2Fg9bVOB1dX7bR2KLFrD9pPqsJ5hi4hOwicQU5jI9AI2112uoZqPyl YpSzG4zj/+QILk8cXi1KRrohdB9H+SQDqCXaZDllkqh3eIt+MPFUbDz6J5QyFaN7NSjWdz CWh1EWlRXpM2SY0T75yuVsUR6eh09NPXzIFA9OUpFnAZwfOjeHj1C3C8e99OWQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b8g0N3QjkzfRl; Sat, 31 May 2025 12:49: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 54VCn8na024546; Sat, 31 May 2025 12:49:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54VCn83Z024543; Sat, 31 May 2025 12:49:08 GMT (envelope-from git) Date: Sat, 31 May 2025 12:49:08 GMT Message-Id: <202505311249.54VCn83Z024543@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: d00a98d639ca - main - libpam: Tweak libcompat case. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: d00a98d639ca2e977d6f3396d7c429cb2f836c49 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=d00a98d639ca2e977d6f3396d7c429cb2f836c49 commit d00a98d639ca2e977d6f3396d7c429cb2f836c49 Author: Dag-Erling Smørgrav AuthorDate: 2025-05-31 12:48:34 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-05-31 12:48:34 +0000 libpam: Tweak libcompat case. Fixes: 45538173c120 --- contrib/openpam/lib/libpam/openpam_constants.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/contrib/openpam/lib/libpam/openpam_constants.c b/contrib/openpam/lib/libpam/openpam_constants.c index 7129fc0db43b..a608cf87c7eb 100644 --- a/contrib/openpam/lib/libpam/openpam_constants.c +++ b/contrib/openpam/lib/libpam/openpam_constants.c @@ -179,7 +179,9 @@ const char *openpam_module_path[] = { OPENPAM_MODULES_DIRECTORY, #elif defined(COMPAT_libcompat) "/usr/lib" COMPAT_libcompat, - "/usr/local/lib" COMPAT_libcompat, +#ifdef LOCALBASE + LOCALBASE "/lib" COMPAT_libcompat, +#endif #else "/usr/lib", #ifdef LOCALBASE From nobody Sat May 31 13:44:06 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b8hCq6SqWz5x49g; Sat, 31 May 2025 13:44: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b8hCq2FbWz3R3F; Sat, 31 May 2025 13:44:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748699047; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RdrNooZxIqgaP72NnFBThb2Fr5Tb3NO0+RkK1e8RLOg=; b=XrB4/dfiz/49qAwdTNBKY7unH7ey87EW++01ylkJmad4lTC6YqFX865rdNjtPjCjlviddf 0pFe/6zg7V1mxykjWHO/5v2dBJwzYAwJx2sjlUdnnKgiVdzlE7V0CWAwPP5ouNzCWyXBWf t67qc8zhqoeB4ceHBzpRFfk3NTKH0dlBHSLgtl90WDMw+pfYECOVzJxli4gsYsIxrrhHLt d2cfoQIf9O9mQah65cbaMN/Q1H6VdhYbEVqtjilCZ9tr1n+lSkooMGU0hn1OKUCt5TZain xhZb5jgY2ETqnndZemUJ+bhqmFbkMemo+2cu/15Nxc2K9Lf6bienzoS+Y0nXzA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748699047; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RdrNooZxIqgaP72NnFBThb2Fr5Tb3NO0+RkK1e8RLOg=; b=usmoFGtHFcGoLsLzEzRqfptMjEbuhAq9fTJVD5Pl6RXNCYpmKCn+vbrJGEJ2FRwsnGs9KC tLoY1pegNv7N+apife7uJrKkaqlJ9L8RbD1IRqS52csgt1IpSrI7qdF06TAWdecOvrROou /mvSFtDfpSOAH/Qcyh+xnLIdfH839tNNhOMWLAGiDuP//mAAdNWRIAEF/Zj01wdlHbXygF WlUEJFdBEYiH1HDL+znOHSDHkZHvPGenIIzFOfJ9vhLMXUyHqyUYkpBYwdDQiGEoiyhrl0 erwFE0XtaLGGGE9zecCmuSt8TLAvrYQHYfkNg4unsKFa8cZLsQmGmAeSjUJhbA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748699047; a=rsa-sha256; cv=none; b=sZ3QQJdeYlkmmoN4iiAUeHBkMnIjSIFX5kw+DuO40N6cA14fBmuT214lkUfK+hK9Uh6uZG oVVw8uKmrYXEODavH5fKwsV4OUTxz340Je+dTgIbKa5+7jkA9+dBcjNjhVFpi9NUi9jqq7 tYZquEnI4o+jLofDAwsUF4f/Qg1mrFIewvWL9oRncmoQ8u5yMyeqfm1X6w3WeKlizaobPt BnuP5KEBIS9+aGM9KfM5RraM71IUv7xcqy3XIfBMaey4+pFt4q+dkRgcNC64OhgBYOOkQW OCg5T0eoSS0U83zrsxHIWa+4byokHo75Bm6wfD90YgGaJvVEjV9xnAKMVkbrYQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b8hCq1W05zgn2; Sat, 31 May 2025 13:44: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 54VDi71T034996; Sat, 31 May 2025 13:44:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54VDi6Wt034993; Sat, 31 May 2025 13:44:06 GMT (envelope-from git) Date: Sat, 31 May 2025 13:44:06 GMT Message-Id: <202505311344.54VDi6Wt034993@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Martin Matuska Subject: git: 3747329b7864 - main - zfs: merge openzfs/zfs@e8e602d98 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3747329b7864d0f98a0e34dda0113804ab3a2dce Auto-Submitted: auto-generated The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=3747329b7864d0f98a0e34dda0113804ab3a2dce commit 3747329b7864d0f98a0e34dda0113804ab3a2dce Merge: d00a98d639ca e8e602d987b0 Author: Martin Matuska AuthorDate: 2025-05-31 15:41:12 +0000 Commit: Martin Matuska CommitDate: 2025-05-31 15:41:12 +0000 zfs: merge openzfs/zfs@e8e602d98 Notable upstream pull request merges: #17381 44e326689 events: include zio type in IO error reports #17395 008c9666e Set spa_final_txg in spa_unload() #17394 1bd225ed8 abd_os: move headers from libzpool to libspl #17399 5764e218b vdev_disk: remove classic IO submission #17400 b3b3cd1e4 vdev: skip faulting disks pending removal #17406 a38376b37 Rename zvol kernel module parameters sysctls on FreeBSD side #17407 2d33c8edb Make rewrite use Uncached I/O Obtained from: OpenZFS OpenZFS commit: e8e602d987b01e7940f698d5fa2b00754609c74b .../.github/workflows/scripts/qemu-2-start.sh | 15 +- .../.github/workflows/scripts/qemu-3-deps-vm.sh | 6 +- .../.github/workflows/scripts/qemu-4-build-vm.sh | 2 +- .../.github/workflows/scripts/qemu-6-tests.sh | 7 + .../.github/workflows/zfs-qemu-packages.yml | 2 +- sys/contrib/openzfs/.github/workflows/zfs-qemu.yml | 8 +- sys/contrib/openzfs/cmd/zpool/zpool_main.c | 12 +- sys/contrib/openzfs/config/Rules.am | 3 +- sys/contrib/openzfs/include/sys/fm/fs/zfs.h | 1 + sys/contrib/openzfs/include/sys/zio.h | 1 - sys/contrib/openzfs/include/zfs_valstr.h | 1 + sys/contrib/openzfs/lib/libspl/include/Makefile.am | 2 + .../{libzpool => libspl}/include/sys/abd_impl_os.h | 0 .../lib/{libzpool => libspl}/include/sys/abd_os.h | 0 sys/contrib/openzfs/lib/libzfs/libzfs.abi | 7 + sys/contrib/openzfs/lib/libzpool/Makefile.am | 2 - .../openzfs/lib/libzpool/include/Makefile.am | 4 - sys/contrib/openzfs/man/man4/zfs.4 | 18 +- sys/contrib/openzfs/man/man8/zpool-events.8 | 59 ++++- .../openzfs/module/os/linux/zfs/vdev_disk.c | 281 +-------------------- sys/contrib/openzfs/module/os/linux/zfs/zvol_os.c | 6 +- sys/contrib/openzfs/module/zcommon/zfs_valstr.c | 11 + sys/contrib/openzfs/module/zfs/spa.c | 6 + sys/contrib/openzfs/module/zfs/vdev.c | 5 +- sys/contrib/openzfs/module/zfs/zfs_fm.c | 2 + sys/contrib/openzfs/module/zfs/zfs_vnops.c | 2 +- sys/contrib/openzfs/module/zfs/zio.c | 52 ++-- sys/contrib/openzfs/module/zfs/zvol.c | 6 +- sys/contrib/openzfs/tests/zfs-tests/cmd/ereports.c | 1 + .../openzfs/tests/zfs-tests/include/tunables.cfg | 2 +- .../functional/direct/dio_async_fio_ioengines.ksh | 25 +- .../zfs-tests/tests/functional/io/io_uring.ksh | 7 - 32 files changed, 156 insertions(+), 400 deletions(-) From nobody Sat May 31 14:27:24 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b8j9m4jf3z5x6Gm; Sat, 31 May 2025 14:27: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b8j9m4CXxz4101; Sat, 31 May 2025 14:27:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748701644; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=D2GvnSZ1wymcgwKHcUCW3dmpCIS1/vyeVX2ygEgBu/I=; b=jhZOZf48OWMO5L6d3eFCCZOmCUwntbbawIr2bZ/lpbVsHP1XrX+k5qw0uJmiZ/SCfQFvLo gm87TEgCkx78uzepLTCmjxQQZpu+JNL8Boy6FYGuDqJscSIR4Vhuzz/k6wW8RtD7BN46GM a831cdR+nbz2dbWiY1bAUjLJwPnmv1R+/0UfQdvlZVkJsyEq0NKb8oF1Dc00NBBIPEJGs0 b75kVbbtSUdHHFDkRk/n0YBQFnQInEVPn6ZOyFEq7Qf/FW0fEdaQbYQFNv358gmWP5+eq1 2b0bYI4DSb9yAv38ygHyrPYohe+n8jpSMJ9GYMPXAYT5UJ7EW9L2zTsFA8PubA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748701644; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=D2GvnSZ1wymcgwKHcUCW3dmpCIS1/vyeVX2ygEgBu/I=; b=LQezz9KMVnY9t4NkZPUqtUFyvRgPgF0SDmF2ZIYAB1vtXYjZkACPwdQiyjBuU40BxbE8wS T/ZH0fhUf0v3nXnjV3Yjue375AIc+ibdHjMp2L8O79sqYY2gs7k1WgCy7+SMQIRXfMWAWl srVciSE1dGtRdXkiw3QQW6bGKfhpTaLZSLT7q1hbWHeqRaZ/sxtLmGpe/x/DDMnz8IFdbH nURBMGyp/gFVUVvGdmiFI/Ni1M4BQC1UsksfCSuPiSnXbvGrV8KUuy62tdNEtjpkEuWTTp 3AIEJzPzFLWtwOpiEJpp/tyXQsYPWPEp/Om1fpXxpJ6qdDJ99hZ2OPeqqWFhrQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748701644; a=rsa-sha256; cv=none; b=ddBZHTpXK2son3Qfp7XuOwXpxvX1eO0EaQ1CW5YHmM062CJYn/WqhmUrtemDuwVfWUfEHw NmNBKZmZzHRaSNMY+ZsaIuiqGpkIejcHmmKN9J5yfS8W3/86kzXe3Q61jUd3T9QF+MUiQ/ at2LiS/V+IrcEkZ8ZCe90eUQhycbLaFy6BkIWoTzMsJ+n4QfeOcrh9Fh96aoSYnpKke7dW WqU5UTsxFKpsckLudM+0IH2Y1WmOYPt39fxlrao/tXWesNYgLbPGDJR1UVKEDHheOudrDA jNuRi7lNJ7rMLylnlPmYNWN5cDOFua/Zc8u6F6QbpAnMivuULI1AVA3zHBM78A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b8j9m3mwnzj14; Sat, 31 May 2025 14:27: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 54VEROc4011290; Sat, 31 May 2025 14:27:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54VEROih011287; Sat, 31 May 2025 14:27:24 GMT (envelope-from git) Date: Sat, 31 May 2025 14:27:24 GMT Message-Id: <202505311427.54VEROih011287@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: bb625fc2ac80 - main - libpam: Additional module directory. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: bb625fc2ac801d0a06ef0edab37a9bdaf209f008 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=bb625fc2ac801d0a06ef0edab37a9bdaf209f008 commit bb625fc2ac801d0a06ef0edab37a9bdaf209f008 Author: Dag-Erling Smørgrav AuthorDate: 2025-05-31 14:26:50 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-05-31 14:27:17 +0000 libpam: Additional module directory. Many if not most ports that install PAM modules install them into ${LOCALBASE}/lib/security instead of just ${LOCALBASE}/lib, because all the world is Linux. Rather than try to fix the ports, add that directory to the search path. MFC after: 1 week Relnotes: yes Reviewed by: delphij Differential Revision: https://reviews.freebsd.org/D50626 --- contrib/openpam/lib/libpam/openpam_constants.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contrib/openpam/lib/libpam/openpam_constants.c b/contrib/openpam/lib/libpam/openpam_constants.c index a608cf87c7eb..b34364b13888 100644 --- a/contrib/openpam/lib/libpam/openpam_constants.c +++ b/contrib/openpam/lib/libpam/openpam_constants.c @@ -181,11 +181,13 @@ const char *openpam_module_path[] = { "/usr/lib" COMPAT_libcompat, #ifdef LOCALBASE LOCALBASE "/lib" COMPAT_libcompat, + LOCALBASE "/lib" COMPAT_libcompat "/security", #endif #else "/usr/lib", #ifdef LOCALBASE LOCALBASE "/lib", + LOCALBASE "/lib/security", #endif #endif NULL From nobody Sat May 31 14:55:57 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b8jpn1TGqz5x8Fj; Sat, 31 May 2025 14:56:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b8jpk5bbjz3Nqm; Sat, 31 May 2025 14:55:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748703359; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=StI2utNT8xn3BIHv0uP9ZTcLSpQAvmNlrkDy4NgilIs=; b=pHVxuRzT2Vm6QH5l9P9ueJHlbzusCIeDLv4uxc/88PBB2zBHfhCgiwlVOzRe/fkrUqOkMI Wfwsdm587XMUtnrpnWC+2DGpYw282lTXd8NW1QYTssgPgJB3O7PfRKgjulYthjjpWRg4vf 7Kbrkm6+v8N8ecxszICci2oK/A05XP2nYyy56WxJnLZw07YNnwCPaZesusljoV3Vq1gA4G IMn5qhTdXyeiwfXmDfcqjw43xcAbxESTaGrLDx9/Brx/U06dgUbwPVyngotDShd+jQ+iTh TtphwytTG7p6Evh+lUm95ZPW9ByFs1bT79XMW3W5buYK7KIXa5vvlBYyvSXwVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748703359; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=StI2utNT8xn3BIHv0uP9ZTcLSpQAvmNlrkDy4NgilIs=; b=ZH3HWv2ocSu6pE1ihUx2bI2osHg+HgBdWVtO597u2oEVrlNGXIYc1b3NHZMf/nxHsBe9ax fvMeiJ/ZWhQPCmL+LIW+jPChsvtbOIh4Yhmxj8pT6xRtu+nY08T2ozE4Hp2MZTFBf6BqNg YmUxwuy/VNbdqnD4H2k76nTVpn3/Q4V4k4pCu44UImrGwbIxo51LtRnu/admk9NeaWhKSG vP7E5Jq9ENTKKRmuPQasfRkaT9/0aGyvjlaQPEF3R+JsjR4RztxXJfgnsgPpZ6B35UDjmi zwdQXt6eWz881MwUk9UqCo/ubNUVreHDl7B80D4scUT+Mq7RMS1dIJ8AyIE3Tg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748703359; a=rsa-sha256; cv=none; b=UY1z+8GK3i59USSvnzkmNHKMDW72CtTDas6gz0BHsuvh7Y5aGAnmxk3yxO3w9Sxj6aqOb8 NFzW9XTL/IYqsOlf+sFXj5/bjjlmZXL18HVhQtHQol0fzOR2yywttQOZPEPimSHo3LKBPJ Hl9z9cT/9hj6MzkyoKIeyADTqIwl3CDgNrMCbX4vUYd6hB1ezqABHiUSz7W2aYNRFqKPBe HHkHPEownHB915d6ROUEPRJgDjXg4svPNqlcMlsAduH42rAbV5X6HTHT9k7fyhCwOuPS4G gvM6dLGwotjSWrXvc7t4hmMiMyrYwX9sJGI6KUEpFKqULCnC325+7zGo4U/W7w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b8jpk1KKHzjnH; Sat, 31 May 2025 14:55: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 54VEtvXI067160; Sat, 31 May 2025 14:55:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54VEtv4G067157; Sat, 31 May 2025 14:55:57 GMT (envelope-from git) Date: Sat, 31 May 2025 14:55:57 GMT Message-Id: <202505311455.54VEtv4G067157@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: 2b8b37c8f516 - main - thr_new: pass params.flags to cpu_set_user_tls() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 2b8b37c8f516a5955f81a6fc35c7aac01ddf4a3a Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=2b8b37c8f516a5955f81a6fc35c7aac01ddf4a3a commit 2b8b37c8f516a5955f81a6fc35c7aac01ddf4a3a Author: Konstantin Belousov AuthorDate: 2025-05-30 11:24:12 +0000 Commit: Konstantin Belousov CommitDate: 2025-05-31 14:55:24 +0000 thr_new: pass params.flags to cpu_set_user_tls() Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/amd64/amd64/vm_machdep.c | 2 +- sys/arm/arm/vm_machdep.c | 2 +- sys/arm64/arm64/vm_machdep.c | 2 +- sys/arm64/linux/linux_machdep.c | 2 +- sys/i386/i386/vm_machdep.c | 2 +- sys/kern/kern_thr.c | 2 +- sys/powerpc/powerpc/exec_machdep.c | 2 +- sys/riscv/riscv/vm_machdep.c | 2 +- sys/sys/proc.h | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/sys/amd64/amd64/vm_machdep.c b/sys/amd64/amd64/vm_machdep.c index 4001f40554af..275ab1a54e52 100644 --- a/sys/amd64/amd64/vm_machdep.c +++ b/sys/amd64/amd64/vm_machdep.c @@ -655,7 +655,7 @@ cpu_set_upcall(struct thread *td, void (*entry)(void *), void *arg, } int -cpu_set_user_tls(struct thread *td, void *tls_base) +cpu_set_user_tls(struct thread *td, void *tls_base, int thr_flags) { struct pcb *pcb; diff --git a/sys/arm/arm/vm_machdep.c b/sys/arm/arm/vm_machdep.c index d31d36ba807d..5f478b54cd66 100644 --- a/sys/arm/arm/vm_machdep.c +++ b/sys/arm/arm/vm_machdep.c @@ -228,7 +228,7 @@ cpu_set_upcall(struct thread *td, void (*entry)(void *), void *arg, } int -cpu_set_user_tls(struct thread *td, void *tls_base) +cpu_set_user_tls(struct thread *td, void *tls_base, int thr_flags __unused) { td->td_pcb->pcb_regs.sf_tpidrurw = (register_t)tls_base; diff --git a/sys/arm64/arm64/vm_machdep.c b/sys/arm64/arm64/vm_machdep.c index 9869ce6cae0b..38a126ff602f 100644 --- a/sys/arm64/arm64/vm_machdep.c +++ b/sys/arm64/arm64/vm_machdep.c @@ -225,7 +225,7 @@ cpu_set_upcall(struct thread *td, void (*entry)(void *), void *arg, } int -cpu_set_user_tls(struct thread *td, void *tls_base) +cpu_set_user_tls(struct thread *td, void *tls_base, int thr_flags __unused) { struct pcb *pcb; diff --git a/sys/arm64/linux/linux_machdep.c b/sys/arm64/linux/linux_machdep.c index 3bc2923b9d4d..9f370f04b5c5 100644 --- a/sys/arm64/linux/linux_machdep.c +++ b/sys/arm64/linux/linux_machdep.c @@ -64,7 +64,7 @@ linux_set_cloned_tls(struct thread *td, void *desc) if ((uint64_t)desc >= VM_MAXUSER_ADDRESS) return (EPERM); - return (cpu_set_user_tls(td, desc)); + return (cpu_set_user_tls(td, desc, 0)); } void diff --git a/sys/i386/i386/vm_machdep.c b/sys/i386/i386/vm_machdep.c index c64f19a30cbd..80b45070d896 100644 --- a/sys/i386/i386/vm_machdep.c +++ b/sys/i386/i386/vm_machdep.c @@ -501,7 +501,7 @@ cpu_set_upcall(struct thread *td, void (*entry)(void *), void *arg, } int -cpu_set_user_tls(struct thread *td, void *tls_base) +cpu_set_user_tls(struct thread *td, void *tls_base, int thr_flags __unused) { struct segment_descriptor sd; uint32_t base; diff --git a/sys/kern/kern_thr.c b/sys/kern/kern_thr.c index 0ab4cb5f7970..afd016ec9e75 100644 --- a/sys/kern/kern_thr.c +++ b/sys/kern/kern_thr.c @@ -169,7 +169,7 @@ thr_new_initthr(struct thread *td, void *thunk) if (error != 0) return (error); /* Setup user TLS address and TLS pointer register. */ - return (cpu_set_user_tls(td, param->tls_base)); + return (cpu_set_user_tls(td, param->tls_base, param->flags)); } int diff --git a/sys/powerpc/powerpc/exec_machdep.c b/sys/powerpc/powerpc/exec_machdep.c index 3586c01d6652..1893d79f29a8 100644 --- a/sys/powerpc/powerpc/exec_machdep.c +++ b/sys/powerpc/powerpc/exec_machdep.c @@ -1091,7 +1091,7 @@ cpu_thread_free(struct thread *td) } int -cpu_set_user_tls(struct thread *td, void *tls_base) +cpu_set_user_tls(struct thread *td, void *tls_base, int thr_flags __unused) { if (SV_PROC_FLAG(td->td_proc, SV_LP64)) diff --git a/sys/riscv/riscv/vm_machdep.c b/sys/riscv/riscv/vm_machdep.c index cf9b85493e39..e5a5cf31af15 100644 --- a/sys/riscv/riscv/vm_machdep.c +++ b/sys/riscv/riscv/vm_machdep.c @@ -200,7 +200,7 @@ cpu_set_upcall(struct thread *td, void (*entry)(void *), void *arg, } int -cpu_set_user_tls(struct thread *td, void *tls_base) +cpu_set_user_tls(struct thread *td, void *tls_base, int thr_flags __unused) { if ((uintptr_t)tls_base >= VM_MAXUSER_ADDRESS) diff --git a/sys/sys/proc.h b/sys/sys/proc.h index eb0b66618a9d..fcacfec4442b 100644 --- a/sys/sys/proc.h +++ b/sys/sys/proc.h @@ -1236,7 +1236,7 @@ int cpu_procctl(struct thread *td, int idtype, id_t id, int com, void cpu_set_syscall_retval(struct thread *, int); int cpu_set_upcall(struct thread *, void (*)(void *), void *, stack_t *); -int cpu_set_user_tls(struct thread *, void *tls_base); +int cpu_set_user_tls(struct thread *, void *tls_base, int flags); void cpu_thread_alloc(struct thread *); void cpu_thread_clean(struct thread *); void cpu_thread_exit(struct thread *); From nobody Sat May 31 14:56:00 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b8jpn6hX9z5x8Jv; Sat, 31 May 2025 14:56:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b8jpn3NHHz3P9K; Sat, 31 May 2025 14:56:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748703361; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=L3xaTxTQXmIxImIV/twGC+0ZlDHl4bWdYxMZki/qIpU=; b=tUxy4qKsoB8CTy7R+AQKtITjORLI4D3SluWRI/CbhrTfxQEIF+V0QFms4Othu46LpTtNyq bzX/qc2yViFouvDhOpBRcp2+nwRbX523wb00kXEeiQ0zF1J2FyE6AmVsvIjl6efoYVWVpo SgSMgjWwUDwuvAZCUEGB0KTGjVfccD+VYWqwCVPsrxmfFTU+RQNxjA5dyyCRZfhwUeeXUE DvPwZ8tjhtFBpp4D+pvCv3aXEX90T6DELcAtLeg3gXas1Tc8Ju3OWUN2GO+ETAaqMTU8vt kFU3XMYjgXsh/auX7C0xDQnfnHh0YCHj6R+trRTg7OaHFuiESWEXeaT+5t93Cw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748703361; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=L3xaTxTQXmIxImIV/twGC+0ZlDHl4bWdYxMZki/qIpU=; b=qO82BqUVrBJNCevePFooFR2jZn8QQGGayBXlv/en+Z1g4yTuJ9dVm28e1cQvk9hyviQ4wM ju7bq6zfd7iZ6FggiBnnTHOcpBZRjg8eNMnRKsLLk1g41zTZWFZ4iK24NUFPZld9PraU0N oeMkkeboFl3PPUelHTL9yC+VQPJyrjXEzMxjhbfYrnkKQ9V55PI8lnfwC9R9nqWl45ypYS 5IQU2lpwb8JQ896el1SWMdDrtKigDjCpuo08JxNeSxgfph0hJE/OkCZxhPLInhZEPfWAY9 eX76wfUvKEcc6ktVnQ0473et31PYhwpUffpDK3l4LafT5JY5GiAuDj8A7wsK8w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748703361; a=rsa-sha256; cv=none; b=Q18t6AQzH9ppR6ugclVVS48zX+qMkM+M0hBEeGQVTRO6wFlx5QQdRp0qDtZdwHWHKd4PF5 4OYJSwJP+ClA/RAGrA+1EuFwd/2SpvuFdo1paYN3fgPShUCwObsiukjo766Db5dxW8Z4Cg 36ZPV/A4gFOdX/wMJTehwF4w3T5Z7FevaA6KojhaliXBjdsvwr0xP1b7lBiCsGdoxccFv0 p/1l+wSJwnZ81q5QlKj3zHAeqLUcHwXBX9Yx2qf/alHFXoTxyGukbafb09VQ9KnZj0t5u7 vAVLqBOuCUYpNle0tlZ4G3mzZ1XXxOVmbp4BxS7DXXBa4twdCV0hD+iuohOrDQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b8jpm1tk8zk24; Sat, 31 May 2025 14:56: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 54VEu0om067235; Sat, 31 May 2025 14:56:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54VEu0KB067232; Sat, 31 May 2025 14:56:00 GMT (envelope-from git) Date: Sat, 31 May 2025 14:56:00 GMT Message-Id: <202505311456.54VEu0KB067232@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: 89ca5cddec22 - main - thr_new: add a flag indicating that the thread is created by C runtime List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 89ca5cddec22f5676e9f9a91c2adfdbc574c78ca Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=89ca5cddec22f5676e9f9a91c2adfdbc574c78ca commit 89ca5cddec22f5676e9f9a91c2adfdbc574c78ca Author: Konstantin Belousov AuthorDate: 2025-05-30 11:25:17 +0000 Commit: Konstantin Belousov CommitDate: 2025-05-31 14:55:24 +0000 thr_new: add a flag indicating that the thread is created by C runtime Sponsored by: The FreeBSD Foundation MFC after: 1 week --- lib/libthr/thread/thr_create.c | 2 +- sys/sys/thr.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/libthr/thread/thr_create.c b/lib/libthr/thread/thr_create.c index 2ae7cf0cd7b2..84bbd36ed28d 100644 --- a/lib/libthr/thread/thr_create.c +++ b/lib/libthr/thread/thr_create.c @@ -160,7 +160,7 @@ _pthread_create(pthread_t * __restrict thread, param.tls_size = sizeof(struct tcb); param.child_tid = &new_thread->tid; param.parent_tid = &new_thread->tid; - param.flags = 0; + param.flags = THR_C_RUNTIME; if (new_thread->attr.flags & PTHREAD_SCOPE_SYSTEM) param.flags |= THR_SYSTEM_SCOPE; if (new_thread->attr.sched_inherit == PTHREAD_INHERIT_SCHED) diff --git a/sys/sys/thr.h b/sys/sys/thr.h index 5e83ec208f07..54766668c929 100644 --- a/sys/sys/thr.h +++ b/sys/sys/thr.h @@ -43,6 +43,7 @@ typedef __size_t size_t; #define THR_SUSPENDED 0x0001 /* Create the system scope thread. */ #define THR_SYSTEM_SCOPE 0x0002 +#define THR_C_RUNTIME 0x0004 struct thr_param { void (*start_func)(void *); /* thread entry function. */ From nobody Sat May 31 14:55:58 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b8jpn1VSPz5x8BV; Sat, 31 May 2025 14:56:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b8jpm0Cffz3P8s; Sat, 31 May 2025 14:55:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748703360; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=V1NVuKhYgn/2Qo2hUmfutkm0vwiUcAl2roDW2UoOAq4=; b=Y4d/ATv9xPQBIm7EW2N3+jR6886y4a+iNTApHjxeBBZ5ZAI4KOnD9w1RyPEMe74nBJankL AJcn7ZHn9dlx80lgp1NMM0IZYQlcZ4Nuq0GQeaUhNhPtkE03C0DirCOCiEIFFZrHqcSR1A zbffYaYJxiA0DfqCGvq93waSm9Eq+cvoSNpePG4z6SBWqlgINEm2qBgU7UvQ+skee8qdEn tiBiupuHjfc0yh2KJ5Lq0Z9OM6fueBjQzpDW92tJS048tagQdfeF1wMAeN6SGfi8KRnJZ7 eXn7gd9AchPVvjElvMH6hFFIKOCIxwFFYR+i5nNFq6P8i1Acr5I0d7q52Jd54g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748703360; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=V1NVuKhYgn/2Qo2hUmfutkm0vwiUcAl2roDW2UoOAq4=; b=SeWWxziVsc/rf9tx40zxIJ1Ui4MS6TdTUVggHjksE3L5jRg19L46NgOMPZgcHowDSsmBqb iBCTxIU9GoZSS6QlOLewDyDND+6RKURf/1Sk1JDdaeNu2cpkKDUVRmuoy4VsAGgjslZ/e9 uUpyQ5E2cyvtobMla2O2K+xqNBPHf37caXsl2yJo+1m0jCSv3uHxhTsZBNZBiCD2JyN3cx iHX+dce5J0f6vz2vXV6O47ny4BE7NQKhOx+N6YDDxV9YntSJkDXdqOusAemz0ESLnF0QWh bXWunGDqBDh81xrLLGcFvqepC1XPVpiKSiSe5cwEXAAAhXrgyqZkWWx4CZ66qg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748703360; a=rsa-sha256; cv=none; b=cg2iT8pX0LZaZ1ageo+M6s43a+UmEo+b+kkEhE/o50/zd+syHGiSar79awjMQIyWoJ8Kbj 0zvNL/TPRMnuJFmTgHhFdlOLR7XZFslYTr/35OslzoiOM+agA+iGR1xtIGrSlJipE56G8B hR/Ao/z32W7jr83hQSHxDw2sdySJ9ZRCxRK+hos3UkD5R5M5npuUuq4rgVEYrU/FIL9a/E B/lbVfjR7Wh9uba5Ypx+sp1wfv4RwLe79G7N0TphThwmnoDpcEJNgCte+JBAjVfJOLAYOL bMj/WMm3aHygrUzAObr3ZVMRZQqekdYcZPFO8Lpq1AFrgWnnFsz6fa2PhobirQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b8jpl0lm9zjqc; Sat, 31 May 2025 14:55: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 54VEtwhD067194; Sat, 31 May 2025 14:55:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54VEtw9w067191; Sat, 31 May 2025 14:55:58 GMT (envelope-from git) Date: Sat, 31 May 2025 14:55:58 GMT Message-Id: <202505311455.54VEtw9w067191@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: 461afb106107 - main - cpu_machdep.9: update documentation for cpu_set_user_tls() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 461afb106107f38b4af23f42f5f99470ceef0877 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=461afb106107f38b4af23f42f5f99470ceef0877 commit 461afb106107f38b4af23f42f5f99470ceef0877 Author: Konstantin Belousov AuthorDate: 2025-05-30 18:28:22 +0000 Commit: Konstantin Belousov CommitDate: 2025-05-31 14:55:24 +0000 cpu_machdep.9: update documentation for cpu_set_user_tls() Sponsored by: The FreeBSD Foundation MFC after: 1 week --- share/man/man9/cpu_machdep.9 | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/share/man/man9/cpu_machdep.9 b/share/man/man9/cpu_machdep.9 index 30ac5ea36642..415d86a8b766 100644 --- a/share/man/man9/cpu_machdep.9 +++ b/share/man/man9/cpu_machdep.9 @@ -70,7 +70,7 @@ .Fa "struct thread *td" "void (*entry)(void *)" "void *arg" "stack_t *stack" .Fc .Ft int -.Fn cpu_set_user_tls "struct thread *td" "void *tls_base" +.Fn cpu_set_user_tls "struct thread *td" "void *tls_base" "int thr_flags" .Ft void .Fn cpu_switch "struct thread *old" "struct thread *new" "struct mtx *mtx" .Ft void @@ -185,6 +185,15 @@ as the sole argument using the user stack described in sets a new thread's initial user thread pointer register to reference the user TLS base pointer .Fa tls_base . +The +.Fa thr_flags +argument provides flags bits, from the same namespace as +.Va flags +member of the +.Vt struct thr_param +argument to the +.Xr thr_new 2 +syscall. .Pp .Fn cpu_update_pcb updates the pcb of the current thread with current user register values. From nobody Sat May 31 14:56:02 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b8jpq5yJgz5x8Fk; Sat, 31 May 2025 14:56: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b8jpp5s0Tz3P83; Sat, 31 May 2025 14:56:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748703362; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YU9cZ5HFn9+Ojh8xgCF4IXmEsNNF04KPAwzKVIXWqtk=; b=vaBCP0KDvwJf2CgdMRpn9Ny5QnM0CBVwGgBoEqyY20uGcyLxrEKHdc6IbSQmrFcYKOXbos sZox+UB5LedNpY4L6yNHyAq1T4szdsbGLKctIcXTcyizwnuT7Dwk62kptmmrywZBw1hnkN t6K+vzfqx8l/B62KTQfnIZZ68FyGZ1C3vnMkSqGthdaJ4HwooVXKd+I2c7g0nf3p3oGaC+ opTzql+E9DuC5gL4kWX3m7mQgXYhQQArwKi8m1DLFrIl/+Tnglvlkr2tG+JqAF1IzDWbFS lr35YOmYDKstRL/b6DUtSWFYkGtyAE3dMGSiAe1z/BoKjR0XU6CP8ator0vZrw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748703362; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YU9cZ5HFn9+Ojh8xgCF4IXmEsNNF04KPAwzKVIXWqtk=; b=R9/AdcnS90A0H6eP4cM0DdF5P/EGhFGs2qMHSgVTc5bx8yMNwyM+B9AKjSNRl+qEM0P1t5 DT1z6vVv8rMuaK5OK39TE5/qYUBaqnuJ30hG9vurPwDGcMy8EPCOUDwcTMO4W6ms27L9Uk SCpynvNZ9kw39qAmFYa4iYVO9qwrvPxTZqnsJRtPZQVNQatS8a3tOL/6pDQCKxTXrlzreg 2fR8Vec3rJrjdTrpTllm9taOzxcr7yHKLTFRXGmOdcu4Yg3KJ9VOAS+w8ZO96DV+f8BpSF lskPQFOmhgPZXAFmqdiWLMJmvt2H/d9uvbvRm+Zkg0wKgjQK8V3J0iALRZRnNQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748703362; a=rsa-sha256; cv=none; b=g5QWxkDzlchDoOoP498ANJeyY9PY3gzFVzcuhf5bipGTGe3ZuqHe422LTNpNC65cTzgaGR aJBo5xUXTVS6f4pdUmt10yz6x7DoVUMl0mCWR8XBrMb+VSVQj0uTnCU50NH2DR+iPOLhCx ySYtVpLXktEIx+r2OBYaVIax/ygu9cg39zmGWzhjhNZ0za4bz+el/2p1o7IyhpwHRpk4Oz /FOttxZGRl+O4/xZlsEuywu9M9GsN3S68LaaQcjrr+lttMHud/VIz1yGvRsNZW5uvW04rM D0Fm289IlPA7qwgIw7eJB2tbOpioDME+7erudXUxF9Joz8ivEZ8/uOwyNgd0lA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b8jpp3bgqzjSM; Sat, 31 May 2025 14:56: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 54VEu2ST067311; Sat, 31 May 2025 14:56:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54VEu2ut067308; Sat, 31 May 2025 14:56:02 GMT (envelope-from git) Date: Sat, 31 May 2025 14:56:02 GMT Message-Id: <202505311456.54VEu2ut067308@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: 16ce7f1a3603 - main - amd64: set PCB_TLSBASE pcb flag only for new C runtime threads List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 16ce7f1a3603fce5262cf0656a01c4177c75fa50 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=16ce7f1a3603fce5262cf0656a01c4177c75fa50 commit 16ce7f1a3603fce5262cf0656a01c4177c75fa50 Author: Konstantin Belousov AuthorDate: 2025-05-30 11:25:50 +0000 Commit: Konstantin Belousov CommitDate: 2025-05-31 14:55:24 +0000 amd64: set PCB_TLSBASE pcb flag only for new C runtime threads where the runtime does want the pcb_tlsbase to be set in fsbase in signal handlers. This way, other runtimes that are not aware of pcb_tlsbase get the old behavior of preserving fsbase on calling signal handler. For instance, this fixes Go runtime that wants to handle fsbase in its own way. Reported by: Herbert J. Skuhra Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/amd64/amd64/vm_machdep.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sys/amd64/amd64/vm_machdep.c b/sys/amd64/amd64/vm_machdep.c index 275ab1a54e52..c763ff58680e 100644 --- a/sys/amd64/amd64/vm_machdep.c +++ b/sys/amd64/amd64/vm_machdep.c @@ -60,6 +60,7 @@ #include #include #include +#include #include #include #include @@ -164,6 +165,7 @@ copy_thread(struct thread *td1, struct thread *td2) MPASS((pcb2->pcb_flags & (PCB_KERNFPU | PCB_KERNFPU_THR)) == 0); bcopy(get_pcb_user_save_td(td1), get_pcb_user_save_pcb(pcb2), cpu_max_ext_state_size); + clear_pcb_flags(pcb2, PCB_TLSBASE); } td2->td_frame = (struct trapframe *)td2->td_md.md_stack_base - 1; @@ -663,7 +665,8 @@ cpu_set_user_tls(struct thread *td, void *tls_base, int thr_flags) return (EINVAL); pcb = td->td_pcb; - set_pcb_flags(pcb, PCB_FULL_IRET | PCB_TLSBASE); + set_pcb_flags(pcb, PCB_FULL_IRET | ((thr_flags & + THR_C_RUNTIME) != 0 ? PCB_TLSBASE : 0)); #ifdef COMPAT_FREEBSD32 if (SV_PROC_FLAG(td->td_proc, SV_ILP32)) { pcb->pcb_gsbase = (register_t)tls_base; From nobody Sat May 31 14:56:01 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b8jpq5sC2z5x7r7; Sat, 31 May 2025 14:56: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b8jpn62vbz3Nr1; Sat, 31 May 2025 14:56:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748703362; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ilDo9Hde8MZGcUsHofJ8tAdTXQLoXv4VyLgu3vlHJik=; b=ePgCdJVOtuBri2Oix/W+n+cF+RPh1L68Gv2NGYtf1xgiLsisbmL+ERq169h2zKTtHH8mi1 CIw6HbdtHg66YHdidMqFEiOL1WZMtS78G6QqLxcB82z/8QTPx8IKt0QC1QF963KSD/tcPY xRKZum6JToe5NYjO3cFp4Skka1DrPqvpo3i3IddXqA3ARzwSLmvo6I+q8OhQ2v5VJOmplC gL0qQsbaKzNRHjho8PWLEh9d6V33LVdH4pqHVOYH1qI0v//07zSOIxKJBmef63c1ORXMMs QZ9jlkakDFOW5stuj0OwDmo/nQvHo6JAO9FQ4xBzPk+Jq8zVhK38zeVM2GUErA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748703362; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ilDo9Hde8MZGcUsHofJ8tAdTXQLoXv4VyLgu3vlHJik=; b=COYabVI3Mexcdj1LSJLe747TB6yVhc4i1izZ+3etO2efBMOQrRVhNTEtEGmtZ1xEPgZ7v1 sHSUIhislZmYRiFY/CdHoNzLhLC2dgkRd3I553JUANrKxvaAPE/6Bz4W/QniSW4ob7eC0j c8YM78FODPv3n7T9dir/DzIzsKDnj+sN+Gj42d9xZNKE35V0rmLvHEy0ntS/T8m/adGIAy CYbf1L1T1A4hod6rqp+42SVl9bd4aqrP5FM905VaoPoKp9gXPSlKP067JuTfect3iaMyA8 0hwxNrB5YeHL3sbKnrHirEBeh415xI89jjUMsp56/kcpwAeUzVjns209YzpZPQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748703362; a=rsa-sha256; cv=none; b=VliwjHC4QaxodImzpGTky5ZMcNDUxxT+mflEyP6PGn5ZiYY3vVjkJur6Gwpzc4w4nBTIiZ UhPLViv41XtMQcVUIDr5rk4rBH3Nc7eZmHyGWuyHjylRddn3HFNvgfTlg/4gIoiRV6mgqW cuwy9+nFdML0TtUFyfJRH7hWCs1wzkqyvjrScDT/awvudrswv5nT9HzhmINZr/LBAczpNG EhWEv7fLVxrr2kE8PgUeaYWv03Qvr9EVQ7yL3F3Va3m/g5n+2jPilTNhNa/KKnoo1Y6vAj NrQ1D87YDg2e9mKYWeh45pN61CTJ32wIa+Llz/mYmzHn6qDTaz5vU0WS2xaPYQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b8jpn2HBwzk25; Sat, 31 May 2025 14:56:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54VEu1u8067269; Sat, 31 May 2025 14:56:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54VEu14Q067266; Sat, 31 May 2025 14:56:01 GMT (envelope-from git) Date: Sat, 31 May 2025 14:56:01 GMT Message-Id: <202505311456.54VEu14Q067266@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: 6fd3288c39c4 - main - thr_new.2: document THR_C_RUNTIME List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 6fd3288c39c493c4f252b715e8354e0d27d5ef90 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=6fd3288c39c493c4f252b715e8354e0d27d5ef90 commit 6fd3288c39c493c4f252b715e8354e0d27d5ef90 Author: Konstantin Belousov AuthorDate: 2025-05-30 18:31:57 +0000 Commit: Konstantin Belousov CommitDate: 2025-05-31 14:55:24 +0000 thr_new.2: document THR_C_RUNTIME Sponsored by: The FreeBSD Foundation MFC after: 1 week --- lib/libsys/thr_new.2 | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/lib/libsys/thr_new.2 b/lib/libsys/thr_new.2 index c0bcc8bbc7c2..a04327723c34 100644 --- a/lib/libsys/thr_new.2 +++ b/lib/libsys/thr_new.2 @@ -133,6 +133,15 @@ The flag is not currently implemented. .It Dv THR_SYSTEM_SCOPE Create the system scope thread. The flag is not currently implemented. +.It Dv THR_C_RUNTIME +Indicate that the new thread is created by the C language runtime. +It has architecture-specific meaning. +.Pp +On amd64, the flag requests that the specified +.Fa tls_base +was loaded into the +.Va %fsbase +register before calling a signal handler. .El .It Va rtp Real-time scheduling priority for the new thread. From nobody Sat May 31 14:56:03 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b8jps44Stz5x8Fn; Sat, 31 May 2025 14:56: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b8jpr1ybLz3P89; Sat, 31 May 2025 14:56:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748703364; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XrHvgNZSRSTLNeV2ZGnIfItd2nPqsrBLxSgRqCwU1J0=; b=jSoHaxKQhIL5R7wvbIr8RZNgniThzT8h3vrj80QuXCqaF41VVwQgcT6nDmj8JKQRF/2xen yvItnulpFdlMTPnqGQN7mWZUXKqO6DNlXSOSpy2uGwy+ZAO3ksjZ6fRUFbJbl63xWt93Fd r63scVks+KxiQpL01+4oPEc4EZ3VJYVncQC1Obn51iImcSDIPDB9aXO0b3oupppRslkcjZ c2cMvgqNxVtybOrT5KJaYSaQKAAoifbuByPcNblD4oSE6nHRROvZkkf/z5NLWlgu3i3s0X o3Tav9YcwIpAbnIlTxlnVEQ+au7kge2Gkm2ZWoOZ9iQvY/P06fq8mohqdfx0FA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748703364; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XrHvgNZSRSTLNeV2ZGnIfItd2nPqsrBLxSgRqCwU1J0=; b=CwyP+vujWh8BL0qA/kzNoBa64cg8PGMmaONKd1jHXSksrRm7CiTnBTbWfT4MQv4797mfCo d1M/4uwMmd+POhhpfxTsU9fDRIx93M5dmuCEk3yCzUgJKB3sM7Z6BEx5PtRyzifa/9Jhcl aHKAcIedq6GZvyePxDXKvo0Eoa2pKsJeUDNkfvykDvdYHr3tRKohUVAC6i0B2Fu60XyshL Xqn/EaniCUTLDVc+mJHDxeo4H+Eztgh+cHwcAmmbPgVIAN//U3m4DXjJo7+U+4SLXoEL9I dV+l+jnpD5o6DDpbxGOLSysy2vi0dItoO01B77DLpgvSUlPvTWrGRP7QwlMs3w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748703364; a=rsa-sha256; cv=none; b=ifaraYQVjJsV249Gy7OerkOkA87JXgPN+UKHXqhz8P4EFvzSKLYcdpvSU8luFFrK0rkoNA WDxjkIEQk2VgGHnINkm+U4HBzohzNMsZXjT77rftoe3KVJDU3qa7+NRItNt4I/TAFpjQW0 yTLHXuYhGGeOXQ0uP2mde3GbOCAOo1d+tazHgrVoHZyrOWMlF901KLOkZ6LB9e7Of0YeUb 7vTyN9TDWTS78vVGhiqVRmht2zvwXmwI9GsgU9CRmlb8XApkjXzx/CtzvmrCz2Ttqw9ar6 PpByGAwne0XhyxUtSCx3vAyfp7/bOsC04FgmMU3Lj85NjlO7oR9Zf4N6daS5ZA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b8jpq5S5zzk1C; Sat, 31 May 2025 14:56: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 54VEu3w2067346; Sat, 31 May 2025 14:56:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54VEu32i067343; Sat, 31 May 2025 14:56:03 GMT (envelope-from git) Date: Sat, 31 May 2025 14:56:03 GMT Message-Id: <202505311456.54VEu32i067343@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: 3a94bbfdcd09 - main - amd64: Add AMD64_DISABLE_TLSBASE List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 3a94bbfdcd09c655031e2a1ae343af6292d97d5d Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=3a94bbfdcd09c655031e2a1ae343af6292d97d5d commit 3a94bbfdcd09c655031e2a1ae343af6292d97d5d Author: Konstantin Belousov AuthorDate: 2025-05-30 21:58:33 +0000 Commit: Konstantin Belousov CommitDate: 2025-05-31 14:55:24 +0000 amd64: Add AMD64_DISABLE_TLSBASE Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/amd64/amd64/sys_machdep.c | 6 ++++++ sys/x86/include/sysarch.h | 1 + 2 files changed, 7 insertions(+) diff --git a/sys/amd64/amd64/sys_machdep.c b/sys/amd64/amd64/sys_machdep.c index 6deebba5babc..51f55687bbcf 100644 --- a/sys/amd64/amd64/sys_machdep.c +++ b/sys/amd64/amd64/sys_machdep.c @@ -208,6 +208,7 @@ sysarch(struct thread *td, struct sysarch_args *uap) case AMD64_CLEAR_PKRU: case AMD64_GET_TLSBASE: case AMD64_SET_TLSBASE: + case AMD64_DISABLE_TLSBASE: break; case I386_SET_IOPERM: @@ -395,6 +396,11 @@ sysarch(struct thread *td, struct sysarch_args *uap) vm_map_unlock_read(map); break; + case AMD64_DISABLE_TLSBASE: + clear_pcb_flags(pcb, PCB_TLSBASE); + update_pcb_bases(pcb); + break; + default: error = EINVAL; break; diff --git a/sys/x86/include/sysarch.h b/sys/x86/include/sysarch.h index a67e5c2265a3..cf7ee9ee5518 100644 --- a/sys/x86/include/sysarch.h +++ b/sys/x86/include/sysarch.h @@ -63,6 +63,7 @@ #define AMD64_CLEAR_PKRU 134 #define AMD64_GET_TLSBASE 135 #define AMD64_SET_TLSBASE 136 +#define AMD64_DISABLE_TLSBASE 137 /* Flags for AMD64_SET_PKRU */ #define AMD64_PKRU_EXCL 0x0001 From nobody Sat May 31 14:56:04 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b8jpv3Z7Wz5x7wX; Sat, 31 May 2025 14:56: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b8jpt0ktKz3PLX; Sat, 31 May 2025 14:56:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748703366; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=K22FQ/EpZNzWJBA3yGLf0q3GpMpbdCknlqhLhfvf47s=; b=X8e830RqIkwtPFBkR11OE+aP3Nyb2zKbAJ8KiW8tGMatsZoRIXAadCswDB8t809xgI/L3A YZx4yujS+g34YZngeKFkHEfiOOMh/gTEvM+SUMHtFCSpNazWc49gUWyeyqeLz9uKeC5fc0 AQPfJySNTItWi4lzXA4FRhjEs6MTkLvf1a4vaNQ2chbQIbnfA5kyRcMyLJ55sEnbRjKyg6 fuOSaX2TLBaovsuM0qJnUrp2ZqTHytynwInLicIj+EeS3VK1WNaILV2xF6gMf6zFOSpG1w /3KMV9/fB67fO+RXQrnkN0ksryTIj7JT1TqBE4FkSSdDEVPv9GA2pel2Aag4eg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748703366; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=K22FQ/EpZNzWJBA3yGLf0q3GpMpbdCknlqhLhfvf47s=; b=MhDQmGhufOJayXkBpWNPNt1H0cLhLcb7WJkY2LhaYMWw0HMABbbLnq8Qh/s0Ab45M0t3GO opLiIKpveUfvub8M99H3FSXnj1uiZPRHEe5cLTyeEJXGH9T0sbib6+U2y6QRoVz8FJB6W8 9l5N/2KgCRtO/M50BwymCmeI32YJp/P/ACf3iiolRb/2wfUqLM2DDKxwHBN2Rxf7OgWm5M A0jKLoLyLsyxjMjo98HQDVnfnR1SWsGQ8yKDCYhSG2DGy7O1aDVRl4XpDk+fBwo/cEjmKx y5BPeUDlzPars/9euR8uBQIdkQPKFx1nc74n7qbVcMq8JhJaDP08o/eyHY6r0w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748703366; a=rsa-sha256; cv=none; b=jjnX1OVkT6PVvIP985Voy03p10+0lc4TBUPHzJmHdBFRJ5VZ3uug6I5M8Pc6Onn/CylsPV DL8M6hOojaP52kPxHvaUf81uVpuxlLY9a4jlVeYVT5G/V6gRko98OW6yyPq9GMpbs4iNzP o2y34PCIRvsqhR1UZVcl93BU0Y9m/fR3dCEhwH0nDgEL4p+/oFR2ETEPhO4/6Roowo7KaL kvoZYqptxRJT0IiQshQopw/QvVnRfbHIyNa+3M1vnQ5f8PJDZUHtbkKZD+HLKYfvV8pa27 eRDeFunLHhajrWtPZfs95tJYJFEtdv/9KD6cAHax95JtlSgQCJu8pCqSNHQf1w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b8jpr6flXzjSN; Sat, 31 May 2025 14:56: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 54VEu45V067381; Sat, 31 May 2025 14:56:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54VEu4GS067378; Sat, 31 May 2025 14:56:04 GMT (envelope-from git) Date: Sat, 31 May 2025 14:56:04 GMT Message-Id: <202505311456.54VEu4GS067378@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: c25ddffc51a1 - main - thr_new(2): check param.flags for reserved bits List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: c25ddffc51a1e2c0e03fa6f168abc022955d598f Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=c25ddffc51a1e2c0e03fa6f168abc022955d598f commit c25ddffc51a1e2c0e03fa6f168abc022955d598f Author: Konstantin Belousov AuthorDate: 2025-05-30 22:40:47 +0000 Commit: Konstantin Belousov CommitDate: 2025-05-31 14:55:24 +0000 thr_new(2): check param.flags for reserved bits Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/kern/kern_thr.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/kern/kern_thr.c b/sys/kern/kern_thr.c index afd016ec9e75..6266dec27700 100644 --- a/sys/kern/kern_thr.c +++ b/sys/kern/kern_thr.c @@ -178,6 +178,9 @@ kern_thr_new(struct thread *td, struct thr_param *param) struct rtprio rtp, *rtpp; int error; + if ((param->flags & (THR_SUSPENDED | THR_SYSTEM_SCOPE | + THR_C_RUNTIME)) != 0) + return (EINVAL); rtpp = NULL; if (param->rtp != 0) { error = copyin(param->rtp, &rtp, sizeof(struct rtprio)); From nobody Sat May 31 15:37:58 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b8klC1kxRz5xBFY; Sat, 31 May 2025 15:37: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b8klC19MFz40jb; Sat, 31 May 2025 15:37:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748705879; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uNkMmtbZu/VbRFAvQtlY7FyrdQN9O294LbiDIiJ46uo=; b=Pygka4oY+IKmU80MmpOzLkUFtRgvGVrbwGukFw8am3VmnseXm8AuN9cYosdIM7YNHNs/oY dXlwTCKfrqJ25dpuq1coJ6PuEsCH4+y9PnHlu2e7L2kJYEp4g2XMLY717Pah8Ib3/WLXkO J5LXvdugI4PGuWIHU3X78pvIf65y2TvBUa8UxCJD5a24BLIPLXqipMUhrp5SWbsjRiNmUk SlW6aU0AYQ78c1l18KjZPpwr1GBnyNMTMpXWFW7CIwf6XbbN1zN7VDCJOi8gP+Rw0AtB3d tWHx7pfBhbdD1x3cdLVNnlG2quIzL+NvOFK/mb0VznIGhxB7jMGe9zD7Mxzcbg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748705879; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uNkMmtbZu/VbRFAvQtlY7FyrdQN9O294LbiDIiJ46uo=; b=nXjds/+re+jj4etzuQuOnD0BdhQOkQdSEvvMt19uk5xBm+hmmTQCTjQdqmfRu3fxQJND8O It6hpDr1z/0I/lbueRykPFjuWkMGle74D5maYcnYkqFLESj9sH3t9Fq0xJ1zaHLwMTd3zz 3IJDb7n6g9YtnxQoc8wmWSGnTbZmrF/JoCtHYhPeJlDBrAFnzCdheP0WPtbC+vEfLmZbri ad5E8CPkQic5sQVJymBTiFSfdrcZw8/64cV6mhdJBZrrUBFTP2wbKNDgc357xGVXkGKXy6 86kTQFTGP0BoqbkDWKyTL0Ny84CbpIHCuCXHz2yqX8E36wDGe+F8Mcc0K44E7g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748705879; a=rsa-sha256; cv=none; b=qyZ3WgSP58co5+R+CPV+bgN+UmOmrBh48D/Ex2SptE5M403D4E6TaCnex82Zw/adHs2Hvj HyVWVVap7BOt0H1+i/97ANIyo2XKoUUAbmqEnbZVuaKoTIKuiuSVYhFi/HS5i09gMKG6R5 v0Zg9PeiNh7uUtnaaiti8/nENGZBwwEnCMWZ/9kSOi8ewmPxw9h3htg34V9FbBL0R1FRYT lUtzwWyTUamoquDCCFKjDcQDEUuHHxLl074xioF2vtoRVwqxjfwpTArOwcDmTirKHVOGPf 9Z4nuDcExUh3pdYx1N6ctvjjiZXnPdWhKu5EVyfhHBsxAx2Z4VrFh5AbsBTtgQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b8klC0JZdzkyy; Sat, 31 May 2025 15:37: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 54VFbwsH043016; Sat, 31 May 2025 15:37:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54VFbw7w043013; Sat, 31 May 2025 15:37:58 GMT (envelope-from git) Date: Sat, 31 May 2025 15:37:58 GMT Message-Id: <202505311537.54VFbw7w043013@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: 3556ffa6adff - main - kern_thr.c: fix typo List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 3556ffa6adff34ed689185ac8c68a2fc9432741a Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=3556ffa6adff34ed689185ac8c68a2fc9432741a commit 3556ffa6adff34ed689185ac8c68a2fc9432741a Author: Konstantin Belousov AuthorDate: 2025-05-31 15:31:07 +0000 Commit: Konstantin Belousov CommitDate: 2025-05-31 15:34:10 +0000 kern_thr.c: fix typo Fixes: c25ddffc51a1e2c0e03fa Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/kern/kern_thr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/kern_thr.c b/sys/kern/kern_thr.c index 6266dec27700..7863e40e73af 100644 --- a/sys/kern/kern_thr.c +++ b/sys/kern/kern_thr.c @@ -178,7 +178,7 @@ kern_thr_new(struct thread *td, struct thr_param *param) struct rtprio rtp, *rtpp; int error; - if ((param->flags & (THR_SUSPENDED | THR_SYSTEM_SCOPE | + if ((param->flags & ~(THR_SUSPENDED | THR_SYSTEM_SCOPE | THR_C_RUNTIME)) != 0) return (EINVAL); rtpp = NULL; From nobody Sat May 31 18:03:59 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b8nzh1wmLz5xN8V; Sat, 31 May 2025 18:04: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b8nzg629mz3nf1; Sat, 31 May 2025 18:03:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748714639; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UGUGHwJ5rOnZD+AbtajLOtX+CK1TxBxg49fQBSZjIZY=; b=M/XDHHgpgRda5851xC8gmLZUaGUxECVpDkZ+5Qp2XzmXCXQBAcnXU6Iv1Nbfnt06+f6W2l +8JUe18a7cGraHkWkm1IjJpstRtAXq9Q294Q03FCrmemLfKBscWPVs9a7fickoaG4XgKFI 70jkcFhqyLap77nD5zrj2fZdA9znU7ygibUdBxbuiD6gHGsFJqMHpNf9JOInmyNXPxO5II +CX9glTWm72N/hiEzmC3oe+xjKbG+fOAVPzn7+sQppqGl8870zg/Kot0UwXI+ezEhiu9at ZX2xnD0savevad5/b5teqY3g0BMV/0IFEFCSSAsp1mH193aRriYgx9bG8eDlOA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748714639; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UGUGHwJ5rOnZD+AbtajLOtX+CK1TxBxg49fQBSZjIZY=; b=YNjDvzkULUaAI+1WkAghyo3VEzShMD45EwxFvMqIENimCeDeCsRb1R2GCczC1UHmTNfjhF tKMD2wRkqGcmOgOJiuHOzFggryotAzO/1Mw1drwXQtnSuf1VT91wvOwvB+8RUq6/k4YfRG IxFdoCz+MtYcJzzHUg7aeQKIYw+QkfvMR+r0nuEKaX6MnXZhbsHhuM+5f7bHjXKt6Lz5ZD fu0F49OMluDDVKuKauyhFkQN8hoS4rANEx92cwUJUz3NPRF5T7O2FvVG/fuQLXZiS7imWP Y0J1fHlTB42Uos/mobmADaWMfz/xa/KOnAl6ajcT8N7vY1yoE5z5gIEVjqSuGA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748714639; a=rsa-sha256; cv=none; b=u7rcG5eoNagIaSsioV3Upn2SOUDJ4EQsG84VhTrDzwVigRBgTttQzT9Fzdkz9TQ/kp139x qRuX1et1HfKyvYDd2F+wBEagKFOQPwopzIu2wZ5HeZRXl7o9yqOwNXAcqm+YYszSo+k/+C RFgdtANkoOuG78bvJekziOJU7Vq+AIchwUfUhQEcNSmL9tZPFQ4WhJnQkYA6Y+G+rvx8vP yU5a7IdFxi5Yw/FSJYyA1Wphd6s0TD6jvdJ4lO7fsT5cDnwtgqPSGyi5i0epE3aCW7jFUG U94njJY+rf6SczZZASj8HoC3IimD+qQn/baN9c5C20BYqMhucOBhnLUjoSUnHQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b8nzg5TMjznW4; Sat, 31 May 2025 18:03: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 54VI3x1u023847; Sat, 31 May 2025 18:03:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54VI3xnZ023844; Sat, 31 May 2025 18:03:59 GMT (envelope-from git) Date: Sat, 31 May 2025 18:03:59 GMT Message-Id: <202505311803.54VI3xnZ023844@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Doug Moore Subject: git: e3bc87ab1b66 - main - vm_pageout: fix pageout_flush List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dougm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e3bc87ab1b66e8fff1cd3a069e858461349a0cab Auto-Submitted: auto-generated The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=e3bc87ab1b66e8fff1cd3a069e858461349a0cab commit e3bc87ab1b66e8fff1cd3a069e858461349a0cab Author: Doug Moore AuthorDate: 2025-05-31 18:02:08 +0000 Commit: Doug Moore CommitDate: 2025-05-31 18:02:08 +0000 vm_pageout: fix pageout_flush A change just made to vm_pageout_flush wrongly dismissed the variable 'runlen' and used 'count' in its place, with the unintended consequence of terminating the main loop of the function prematurely when the first VM_PAGER_AGAIN pageout status was encountered. Reintroduce that variable, so that the loop runs to completion. Reported by: alc Reviewed by: alc Fixes: f2a193a967e3 ("vm_pageout: reduce number of flush() params") Differential Revision: https://reviews.freebsd.org/D50622 --- sys/vm/vm_pageout.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/sys/vm/vm_pageout.c b/sys/vm/vm_pageout.c index 624184d57442..6d3139e58c5a 100644 --- a/sys/vm/vm_pageout.c +++ b/sys/vm/vm_pageout.c @@ -462,7 +462,7 @@ vm_pageout_flush(vm_page_t *mc, int count, int flags, bool *eio) vm_object_t object = mc[0]->object; int pageout_status[count]; int numpagedout = 0; - int i; + int i, runlen; VM_OBJECT_ASSERT_WLOCKED(object); @@ -488,6 +488,7 @@ vm_pageout_flush(vm_page_t *mc, int count, int flags, bool *eio) vm_pager_put_pages(object, mc, count, flags, pageout_status); + runlen = count; if (eio != NULL) *eio = false; for (i = 0; i < count; i++) { @@ -543,7 +544,8 @@ vm_pageout_flush(vm_page_t *mc, int count, int flags, bool *eio) *eio = true; break; case VM_PAGER_AGAIN: - count = i; + if (runlen == count) + runlen = i; break; } @@ -559,7 +561,7 @@ vm_pageout_flush(vm_page_t *mc, int count, int flags, bool *eio) } } if (eio != NULL) - return (count); + return (runlen); return (numpagedout); } From nobody Sat May 31 18:08:38 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b8p5244zfz5xNYs; Sat, 31 May 2025 18:08: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b8p52310Mz3sTf; Sat, 31 May 2025 18:08:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748714918; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=D2jd6AReDu4ELQ/LY+4HBvDIolRKdLH2eKGeU3T6gSg=; b=X7VhQIydHAC4/SQ0Ch+5iwXBIPeAQl82077Qj55oT9DrMePUJzjSdSAvRb1T0lr9eeRVID vTBsOKdBkp8rgJGwC9xBZZdKEcr7P1Rdh0eDKgqvwuCuPHsu/B+oQcn8vfJqM6M2+jD5w+ jSks9PDNSMKlk4Hff/PgPWRUomW7qmRVM2gN9GaZrazpKinFR3isHYlVaw6eWWBk6aks53 C5KM/MkU3UL4FC86r5YFCv/HQn1Fgc0wQ5HY31Ni6e/c1SIxoSB+FtoEnm0X8/aomaFga8 VyDvXmtyojJpnMd7OoZyiq/WVz3iLdiwmV3PL1DHBfzRbWqoA6GVPggPIxj+mw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748714918; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=D2jd6AReDu4ELQ/LY+4HBvDIolRKdLH2eKGeU3T6gSg=; b=BZ8AQHD591h6iJpvjRmNCaJ3o9zOXT1m4M1WEAZ8qPUTFoZDcaiC3LpPYdT9jE0rrfvA0I 2tTjTFGkzzaXMOfFYYln6nkeVBTE6/VZOe9L7mDyYMGOKfAgMhM1WzZi2ciGpm5/yR4rt7 jq2E4Uwfw+BJ+1696VAmAoAwikwC6Al8SSRSXM229EZYCRJ2fXI6seXmkPAb/4lHhf6lyE E17lQABVP4J4Gv7WBnzsXhkkCRKbulDA2voKyPvU8GLdHkxZ0s3kTczhhedGG3NTwLaMPX kt4azFWFf1hDs5/ZGwArjXB2VUrXaiTqIyCNxGRuATyLUeUlzVUS8Pte7irn6g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748714918; a=rsa-sha256; cv=none; b=s3aQNKkrVLdUDAe6PsKayvWlHIc9BExPCRA4qSc3N29WgFGCh0xHkk0os1Tjob1oJJuWnm HB5vMVV2M5GWKBeYhfcxXN4K/sMzt1aYnqPWOj3I7SonP3OcSNorb+ox5W32nPWvZ9VezE VGSQIsNr7V3zMJDanBjk4gviNqn+FeQVej8VuH+L/Rdo8d2lXLEGyiK56+jdZfbeGdBNh2 x037/iV4201gEavYlTEVCPJRvIsGedxIgaRjH8NR1J9OTmR67ZAy1LW8iOqAS9KsEfSSwN 5XEMxEK/99+oWTPL1QUwt88W1a/AcaMc8qd8iZZbvGfePkgCKzriwq5pd/CGfA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b8p522VPjzpX8; Sat, 31 May 2025 18:08: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 54VI8cu6025580; Sat, 31 May 2025 18:08:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54VI8cdn025577; Sat, 31 May 2025 18:08:38 GMT (envelope-from git) Date: Sat, 31 May 2025 18:08:38 GMT Message-Id: <202505311808.54VI8cdn025577@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: 6d3d1fc3a304 - main - netcat: Allow service names to be used. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 6d3d1fc3a30453be19831f79399bcba0ae822ad1 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=6d3d1fc3a30453be19831f79399bcba0ae822ad1 commit 6d3d1fc3a30453be19831f79399bcba0ae822ad1 Author: Dag-Erling Smørgrav AuthorDate: 2025-05-31 18:07:46 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-05-31 18:08:12 +0000 netcat: Allow service names to be used. Someone should really do a vendor import, but it's non-trivial, as we have local modifications. In the meantime, here's a nine-year-old upstream patch which allows service names to be used instead of port numbers. MFC after: 1 week Obtained from: OpenBSD Reviewed by: allanjude Differential Revision: https://reviews.freebsd.org/D50348 --- contrib/netcat/nc.1 | 6 +++--- contrib/netcat/netcat.c | 42 +++++++++++++++++++++++++++++------------- 2 files changed, 32 insertions(+), 16 deletions(-) diff --git a/contrib/netcat/nc.1 b/contrib/netcat/nc.1 index 5801c6fa00e3..1519ed7b64d2 100644 --- a/contrib/netcat/nc.1 +++ b/contrib/netcat/nc.1 @@ -27,7 +27,7 @@ .\" .\" $FreeBSD$ .\" -.Dd January 20, 2025 +.Dd May 14, 2025 .Dt NC 1 .Os .Sh NAME @@ -351,8 +351,8 @@ sockets, a destination is required and is the socket path to connect to option is given). .Pp .Ar port -can be a single integer or a range of ports. -Ranges are in the form nn-mm. +can be a specified as a numeric port number, or as a service name. +Ports may be specified in a range of the form nn-mm. In general, a destination port must be specified, unless the diff --git a/contrib/netcat/netcat.c b/contrib/netcat/netcat.c index 7035fdf68961..ff4031fc2bd0 100644 --- a/contrib/netcat/netcat.c +++ b/contrib/netcat/netcat.c @@ -119,6 +119,7 @@ char *portlist[PORT_MAX+1]; char *unix_dg_tmp_socket; void atelnet(int, unsigned char *, unsigned int); +int strtoport(char *portstr, int udp); void build_ports(char *); void help(void); int local_listen(char *, char *, struct addrinfo); @@ -1197,6 +1198,26 @@ atelnet(int nfd, unsigned char *buf, unsigned int size) } } +int +strtoport(char *portstr, int udp) +{ + struct servent *entry; + const char *errstr; + char *proto; + int port = -1; + + proto = udp ? "udp" : "tcp"; + + port = strtonum(portstr, 1, PORT_MAX, &errstr); + if (errstr == NULL) + return port; + if (errno != EINVAL) + errx(1, "port number %s: %s", errstr, portstr); + if ((entry = getservbyname(portstr, proto)) == NULL) + errx(1, "service \"%s\" unknown", portstr); + return ntohs(entry->s_port); +} + /* * build_ports() * Build an array of ports in portlist[], listing each port @@ -1205,7 +1226,6 @@ atelnet(int nfd, unsigned char *buf, unsigned int size) void build_ports(char *p) { - const char *errstr; char *n; int hi, lo, cp; int x = 0; @@ -1215,13 +1235,8 @@ build_ports(char *p) n++; /* Make sure the ports are in order: lowest->highest. */ - hi = strtonum(n, 1, PORT_MAX, &errstr); - if (errstr) - errx(1, "port number %s: %s", errstr, n); - lo = strtonum(p, 1, PORT_MAX, &errstr); - if (errstr) - errx(1, "port number %s: %s", errstr, p); - + hi = strtoport(n, uflag); + lo = strtoport(p, uflag); if (lo > hi) { cp = hi; hi = lo; @@ -1250,11 +1265,12 @@ build_ports(char *p) } } } else { - hi = strtonum(p, 1, PORT_MAX, &errstr); - if (errstr) - errx(1, "port number %s: %s", errstr, p); - portlist[0] = strdup(p); - if (portlist[0] == NULL) + char *tmp; + + hi = strtoport(p, uflag); + if (asprintf(&tmp, "%d", hi) != -1) + portlist[0] = tmp; + else err(1, NULL); } } From nobody Sat May 31 18:08:39 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b8p534kJbz5xNYt; Sat, 31 May 2025 18:08: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b8p533Wgfz3scF; Sat, 31 May 2025 18:08:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748714919; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5kXwWQ/Q9fFhOvU5GsAv/n9uVNLt1Nd3tLoO19vy2dU=; b=miiHDqtioOAz8Ch5j0sZX1pBZjS8lCJmZsk9/IkxevG2a8pduywspyBbN+2Y8QAbttwu2i phppRtPWZ8JIygS/58LuOT9JEhQkRBYHpw9NvQSjCGjSr44jojFyQs9vWNhYJAdeOG+GmW TyAau286EHwbvUUifex0Ub6cg0kyTFyp+oF8Pkjksb9MgTm9NsQk42leUDA5VbptF+6ZLe 7GhIyVVrvnK/gx8H7TAWtJD3ru+53ObKh3XlQsqDkD8tANnkpqKYI+fuO7VOQBVTLo80Yb K9lANjLFWCoz6k/qGFL97Hj7BS1dLZdFZ+7k4Q4WFfDFVdLY9iiG3c/4i7/E0w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748714919; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5kXwWQ/Q9fFhOvU5GsAv/n9uVNLt1Nd3tLoO19vy2dU=; b=haRN1k746+iN8+TUbe/sj9ZrbKQFdHSSYi0m8fZRyaCvfIz8+eV3P3sb8CA3HYa0foi92a sYV28S9Rml8q/KZA7BxHTf5eBdUX6VaIbsXK8KFETjatHqErhyRgIRq4jZ9/D0kkvoMRdm yKW1pG88Fn2vjSr8yQVJoFBgpdDPgCDTTltJtCUibCrd0cyI3X6G7DTDmnxaW6oVe+WDTx HM9qZ2Km1NxQpQATaVDgNoh7ZuPoOqGWnShyKVo+s/6fxkOMP4pv2kgnrg/0Xhzk5FOZF2 2OfO/JdRf7I/CNiETtZgq3Xjw1o4gHWnjlagowEiC2UeKEkYS0V67If4ypuwTw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748714919; a=rsa-sha256; cv=none; b=Y7wBKEeRP8y6BvdptMa0X+A6N+4dNCKCno4rwbaF7keCP0bBpICP1JL6VUOMjCcbD50sf9 g9xUdsF0ZcIf3igB9n9adZNyaJKttS7lVgPI6hWIdR+x/6e3ZO2BqxzgjxZMO3El/MXTtD /3q61TeJf9ePeibCWhlriwzES2Wi6hc+qDjXKI71ebFWMzOJCZLg7/AlSfPwOgSAMLtjWp LIZCORLIrYZ8JW77xukIgCNFcidkEzx42cnC5OaE8ex5PMKFQA++FFo9VoynrIC3Dwq6dv nOFHqUzH9lrs0ThM8YXv0mT3Q4i5BdxbBKQ157bVGmbw85eajEVLj3H9v3idsw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b8p5336Wdzpdp; Sat, 31 May 2025 18:08: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 54VI8dLf025617; Sat, 31 May 2025 18:08:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54VI8d6t025614; Sat, 31 May 2025 18:08:39 GMT (envelope-from git) Date: Sat, 31 May 2025 18:08:39 GMT Message-Id: <202505311808.54VI8d6t025614@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: 81df03281359 - main - cp: Improve to_root test case. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 81df032813595a7c79e55bcba0c4e5d660451b58 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=81df032813595a7c79e55bcba0c4e5d660451b58 commit 81df032813595a7c79e55bcba0c4e5d660451b58 Author: Dag-Erling Smørgrav AuthorDate: 2025-05-31 18:07:57 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-05-31 18:08:12 +0000 cp: Improve to_root test case. Since the bug we're testing involved path name construction, we don't need to be root to test it; we can simply check the error message. Fixes: 537fbf70f12b Sponsored by: Klara, Inc. Reviewed by: allanjude Differential Revision: https://reviews.freebsd.org/D50628 --- bin/cp/tests/cp_test.sh | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/bin/cp/tests/cp_test.sh b/bin/cp/tests/cp_test.sh index 8511904a0e33..5e9a1899ff75 100755 --- a/bin/cp/tests/cp_test.sh +++ b/bin/cp/tests/cp_test.sh @@ -573,22 +573,23 @@ dstmode_body() atf_test_case to_root cleanup to_root_head() { - atf_set "require.user" "root" + atf_set "require.user" "unprivileged" } to_root_body() { - dst="$(atf_get ident).$$" + dst="test.$(atf_get ident).$$" echo "$dst" >dst echo "foo" >"$dst" - atf_check cp "$dst" / - atf_check cmp -s "$dst" "/$dst" - atf_check rm "/$dst" - atf_check cp "$dst" // - atf_check cmp -s "$dst" "/$dst" + atf_check -s not-exit:0 \ + -e match:"^cp: /$dst: (Permission|Read-only)" \ + cp "$dst" / + atf_check -s not-exit:0 \ + -e match:"^cp: /$dst: (Permission|Read-only)" \ + cp "$dst" // } to_root_cleanup() { - (dst=$(cat dst) && [ -n "/$dst" ] && [ -f "/$dst" ] && rm "/$dst") || true + (dst=$(cat dst) && rm "/$dst") 2>/dev/null || true } atf_init_test_cases() From nobody Sat May 31 18:40:36 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b8pnw5thQz5xQcF; Sat, 31 May 2025 18:40: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b8pnw5682z3Kyj; Sat, 31 May 2025 18:40:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748716836; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uSdnzAfddzrh1R/W4n9fvIeQTmAcoqGEbS7gjE1LATc=; b=YxR5Yg/ZMTSauUbtLrNerExLA5SfbIlwuGGd6q/ZB/4UgR8+4qdcQkyXUjHDP8We7mdJAp iOAdkfUv+aBu7/ajVkJEo3MNEoq3h+fKNEvqAaCT5ZlsaZF/fPjiB2iTl/R19uI6QoFRxf lC0TVkkMBcNiMuNTPTDJdMB+knSilkn49EgCHPd3lW7zbORRB5l2CAu512wJsuPXjVkRBo 9U/xiczKhy6kF/Sq3SpZNOJ28YaimChHqzNDj3KUCRjMAj9LJgmY5U86es43kuFBQm1zU6 4pnb9QZvUjB5XQU9p/FrCNecDqaOALqWuKjOnm9kve+zdjhmHhst1dhtoiy1Fw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748716836; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uSdnzAfddzrh1R/W4n9fvIeQTmAcoqGEbS7gjE1LATc=; b=jMf1TnSuzYSkVgJYV3WgwvkoNI2Oj1P/P4ysRChEhOvTu6lxyQCqVoFd/dGYWLw+FmUGF6 tge70Bsc7qBbMWsvQYYGStw8kGNvow9RHWEvFpJKg+j/YQdcpPZCjHhDj2OQPstuBwOMI6 2e54qrQRWpx4nopLvIKsJ+l4ksNiSwgmI1f6bPMs/f/HXViPoSVVCcF6a2JhtpuXkOYJ/h f5uoDjEFBbiRJ6+71gEITGaa3AFskr6u8COC9f7zsK5sp9LnxmGkmknQN8EFn8xICOA/u9 qbLZVvEX72Irqhuw0n1fPYEYQ+0RwZ582PeYBtkKbJqaxIfKHxKOTpiCbFMxbw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748716836; a=rsa-sha256; cv=none; b=o2opkEaUEyWSpEBjEGHbO3I4LUqY5pgR6F2hxqF9E/3dNGPL7H4ueA+my0la6GIqk9RMaq UEHLnQ62ANo9VwOxN91N2Q7JSLaQgJnmtYQu638zjHEFQdgDgCE4cXXFdh/VN69rLFkj2o AODULfFRfKqoVWlplZ8vQrGVyJ4Xd85oidh2oZEM71Y73MMl14ajlHV/Je9XteZBmS5OND 6//D1IQpKq0ekKm/21/KKm5PhLrVHh85fwCJZOS4h9Y0Xog2UmBNqTILQJZ+SApVjixVfN 3mUuSGhceC1btkP5uB/9hlfVxNvMVInwfibYiQn/3IDxHYx+IVRfrHY8x5eW9Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b8pnw4Z0hzqVF; Sat, 31 May 2025 18:40: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 54VIeaa7091631; Sat, 31 May 2025 18:40:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54VIeaPT091628; Sat, 31 May 2025 18:40:36 GMT (envelope-from git) Date: Sat, 31 May 2025 18:40:36 GMT Message-Id: <202505311840.54VIeaPT091628@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Doug Moore Subject: git: 6dd1c0643e9c - main - vm_page: use lookup_ge in grab_valid_iter() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dougm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6dd1c0643e9c5562d8b09c41fc792129a8081f06 Auto-Submitted: auto-generated The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=6dd1c0643e9c5562d8b09c41fc792129a8081f06 commit 6dd1c0643e9c5562d8b09c41fc792129a8081f06 Author: Doug Moore AuthorDate: 2025-05-31 18:37:33 +0000 Commit: Doug Moore CommitDate: 2025-05-31 18:37:33 +0000 vm_page: use lookup_ge in grab_valid_iter() To improve performance slightly, use vm_radix_iter_lookup_ge to skip over several missing pages at once in grab_valid_iter(). Fix a case in which the function could return with the iterator argument not reset after a lock release/reacquire. Reviewed by: alc, markj Differential Revision: https://reviews.freebsd.org/D50601 --- sys/vm/vm_page.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c index a3ebc92175f8..79eaf8563208 100644 --- a/sys/vm/vm_page.c +++ b/sys/vm/vm_page.c @@ -4882,7 +4882,7 @@ vm_page_grab_valid_iter(vm_page_t *mp, vm_object_t object, vm_pindex_t pindex, { vm_page_t m; vm_page_t ma[VM_INITIAL_PAGEIN]; - int after, i, pflags, rv; + int after, ahead, i, pflags, rv; KASSERT((allocflags & VM_ALLOC_SBUSY) == 0 || (allocflags & VM_ALLOC_IGN_SBUSY) != 0, @@ -4942,13 +4942,18 @@ retrylookup: ma[0] = m; pctrie_iter_reset(pages); for (i = 1; i < after; i++) { - m = vm_radix_iter_lookup(pages, pindex + i); - if (m == NULL) { - m = vm_page_alloc_iter(object, pindex + i, + m = vm_radix_iter_lookup_ge(pages, pindex + i); + ahead = after; + if (m != NULL) + ahead = MIN(ahead, m->pindex - pindex); + for (; i < ahead; i++) { + ma[i] = vm_page_alloc_iter(object, pindex + i, VM_ALLOC_NORMAL, pages); - if (m == NULL) + if (ma[i] == NULL) break; - } else if (vm_page_any_valid(m) || !vm_page_tryxbusy(m)) + } + if (m == NULL || m->pindex != pindex + i || + vm_page_any_valid(m) || !vm_page_tryxbusy(m)) break; ma[i] = m; } @@ -4956,6 +4961,7 @@ retrylookup: vm_object_pip_add(object, after); VM_OBJECT_WUNLOCK(object); rv = vm_pager_get_pages(object, ma, after, NULL, NULL); + pctrie_iter_reset(pages); VM_OBJECT_WLOCK(object); vm_object_pip_wakeupn(object, after); /* Pager may have replaced a page. */ @@ -4975,8 +4981,8 @@ retrylookup: MPASS(vm_page_all_valid(m)); } else { vm_page_zero_invalid(m, TRUE); + pctrie_iter_reset(pages); } - pctrie_iter_reset(pages); out: if ((allocflags & VM_ALLOC_WIRED) != 0) vm_page_wire(m); From nobody Sat May 31 19:01:58 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b8qGZ6PZNz5xRTj; Sat, 31 May 2025 19:01: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b8qGZ5q1Vz3bCg; Sat, 31 May 2025 19:01:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748718118; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7bLEvbEbBy4UPvQ6mEIRw71ybzk3Qz3RZ5PODubZNZQ=; b=VKzka6M+rhpaaEVYgnkefwN6SaZx935sOwXe8YZz8fftBc3IrdHbzfDjT2+FLUbL3Wv0V4 Qxx7eRXxkzoRL0QPu5abIwC5E1HCVEmNztpUr0sFafdxgyED8VHMW1+itg9UvpHiNoNPsz 7ul/aAZ5puo8D/W04lN73KlDbmiSheG0YXkdYbJqpogq6do8pDCBMkA/pinUBBD67681/+ lrwM20qSxh6mDzaqYv1cZbkfBP8GRTusENsMnJSKv++s1nYZRL4Mh7Uu8+cdL/RfyEyTC1 /ILqVwINrOmgKgEsw9d6991uCSFTa5UdO+2U3Rqwm5pxzjnv1QzdMIZqvLcj7g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748718118; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7bLEvbEbBy4UPvQ6mEIRw71ybzk3Qz3RZ5PODubZNZQ=; b=myxDMJO3m71zYBgnMiLwaKaSS1O3L2u9GOSG3FLagEPRlOJGJGj4E1cn3NjcNN6w5sq/G9 7QAceF26BIs9JoraxIikmAKLJRNdViKVhpwYyQ+MlNs6LPAGidmIQuQVsP+j4JEVt15tYN S1vlifyPMTwGEfQBgxnabOCxBKMca/KTLk7lNy/YM1yUX6kEuxi0I10FegR9lHU1bsnq3N NhUpy5MH2bQTVxw7sVcbOFJMJ7BxvAM89fBm0O10RJjyhnc6iptcySqS89T7xuG+i0n3Jv wEBe+XSlyss73L9W1DfniWlq4BfIeSBT9yYqlRq8lglnEizQjNYRcqO7WrjwdA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748718118; a=rsa-sha256; cv=none; b=nIMW7wgliqfWmy2Us8l1BZu/oRHW9LImpBc/HfqvaQpadAmYfABPiWdWjLK6J+8vaVfNbi wtBw8FxOcokCZnc79i6JHDF4f0WqHPGjxXNfdOWxdpAzKunp+IZWigNvtuCe5GNWk2oSJy TN/Zefff1ynsxp+4gTaRFQ/6eEa/m3x9Js+U4gApJZPQOfAxLE5d9+bcOIbitlGTdk54si qg/2rIu8/ToCDvlywUWlXDO5kult2dXzB1lzqwVV3EwziFwBs1x0+4VhcfrHNS8uYB/bfK s4OIFZeNW1Z2fACPSXLkCO77sJITG+H5cTBdzvR/O8RaY4UgikOzpAoqb5CcXA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b8qGZ5Q1WzqmM; Sat, 31 May 2025 19:01: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 54VJ1wcP033138; Sat, 31 May 2025 19:01:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54VJ1w1H033135; Sat, 31 May 2025 19:01:58 GMT (envelope-from git) Date: Sat, 31 May 2025 19:01:58 GMT Message-Id: <202505311901.54VJ1w1H033135@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 7944a87dce93 - main - drm2/ttm: Add missing includes to fix arm TEGRA124 build List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7944a87dce9355bea07b7cbd005cf5107fac61d2 Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=7944a87dce9355bea07b7cbd005cf5107fac61d2 commit 7944a87dce9355bea07b7cbd005cf5107fac61d2 Author: Jessica Clarke AuthorDate: 2025-05-31 19:01:39 +0000 Commit: Jessica Clarke CommitDate: 2025-05-31 19:01:39 +0000 drm2/ttm: Add missing includes to fix arm TEGRA124 build Fixes: bcd85e0150c9 ("vm_page: make iter_insert() public") --- sys/dev/drm2/ttm/ttm_bo_vm.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/dev/drm2/ttm/ttm_bo_vm.c b/sys/dev/drm2/ttm/ttm_bo_vm.c index b10c5f87a394..a30205358540 100644 --- a/sys/dev/drm2/ttm/ttm_bo_vm.c +++ b/sys/dev/drm2/ttm/ttm_bo_vm.c @@ -35,7 +35,8 @@ * under sponsorship from the FreeBSD Foundation. */ -#include +#include +#include #include "opt_vm.h" #include @@ -46,6 +47,7 @@ #include #include #include +#include #define TTM_BO_VM_NUM_PREFAULT 16 From nobody Sat May 31 19:30:00 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b8qtx69J6z5xSrw; Sat, 31 May 2025 19:30: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b8qtx1Ptkz3xNH; Sat, 31 May 2025 19:30:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748719801; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6sSwFx89QRe/lQW6bCC7Gp2zSFELYrKNA2rNZM7kt6M=; b=WXpXdiz7Z914ENHUTrZ4NcV5IvX3O5qkZWy4DDJ8QaihnxLk1KyiaEAwVTW25/LSizG/yA MiuYSV4bbAY0ZB3wd5Rb5huguG6EVPBvZgJD+IO8C+hUOz6wa9qXrHy475guKXv/FHLSe/ rvLZrkrmKKYd07C8vtXgphGKtJ4jur/f2o6NkuJP3z9T1Rahq4hCHqDTvsPKg5HsMEWXjR SFtl1gVMTwxzo6O9tTtTUSn29u79aMeYmru38nYCe6M8YiUzCNWMysniffs+pfc/6n1Kqs M/cEBWv1SZHgNtx6wuDgruDoSeJKDOqifaOQlM56+dYTF1gd/MOmlySYA+fBVQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748719801; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6sSwFx89QRe/lQW6bCC7Gp2zSFELYrKNA2rNZM7kt6M=; b=X9dLoBc4PmdZUrQOJ9PjL0/Alc3mPZJIXeOrIWOlQf6gJwL7AFAer9UGPwYrL2SdreScKJ /7ibbfGjtxC+kW6eRnnuKZwWjVh8haUAhs314TdhRaMYoKvuxr1WtLqdCYUMx8vx5Ad8dB lD1Ii6t78T4Hivc4CYHfKuvxYg2vKGzXEn8TnMIhU6ARrJ3xwU4QxFf7loq908VFcbDAA6 uRW+GIncIwiLwvzENaDQ1mFk/zfmP3FRl+6sYzJrr+i9L070DkcfxTqu/8HAwMxNLO2Y6i wW5W5vs/RxN4TBm7U/cp+cQx5gFbbmB+mbZH1zYtU+qDvi4I/UQ/+6VI5OFm1Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748719801; a=rsa-sha256; cv=none; b=lFaNVbUk8DP9S9z3tP5jdcMMNfaXTnTozE+Hyr4ds7+FOj0hdRZLuoOubhM8VGMxQFSGal FMwoWN2jtHZdmgOghpXeCkIUuKPdsQvGsfVklPRTmecZxsohI7Di0Sh68M9pTJiqCG+YjN /FwpOxeieK5M2ShqK/6qzT6oLSSsh7AV0rEGt30xUuopoO33No1d5bl0ws7QcmQFMC22Os VxjjRHEXHHewH5IoOM5HdOXL9ZA1gTaexGkHzEhKQ18aPda5p5OPRjJJjZEx8Lrrs+mkeO tiWMnyGxVa6DSnx/OjTBX1sR68oijIOXQKL31r3PnNNfpuBm5YoMctfGPTv2Sg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b8qtx0KkWzrly; Sat, 31 May 2025 19:30: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 54VJU0L9077465; Sat, 31 May 2025 19:30:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54VJU0hQ077440; Sat, 31 May 2025 19:30:00 GMT (envelope-from git) Date: Sat, 31 May 2025 19:30:00 GMT Message-Id: <202505311930.54VJU0hQ077440@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: ab9c9443eec5 - stable/14 - sound: Deprecate the MIDI sequencer List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: ab9c9443eec582265c288dc46d2c2144f0f81188 Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=ab9c9443eec582265c288dc46d2c2144f0f81188 commit ab9c9443eec582265c288dc46d2c2144f0f81188 Author: Christos Margiolis AuthorDate: 2025-05-30 17:26:01 +0000 Commit: Christos Margiolis CommitDate: 2025-05-31 19:29:38 +0000 sound: Deprecate the MIDI sequencer The in-kernel MIDI sequencer is not used anymore, since this is done by userland applications nowadays. It also contains bugs, and we are not exactly sure how it works, or if it worked properly in the first place. Sponsored by: The FreeBSD Foundation MFC after: 1 day Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D50606 (cherry picked from commit 799105f53a9647f86dbf08456260d5850851b6f9) --- sys/dev/sound/midi/sequencer.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/dev/sound/midi/sequencer.c b/sys/dev/sound/midi/sequencer.c index e4ea1e208356..9c4089debf4c 100644 --- a/sys/dev/sound/midi/sequencer.c +++ b/sys/dev/sound/midi/sequencer.c @@ -520,6 +520,8 @@ seq_addunit(void) int ret; u_char *buf; + gone_in(15, "MIDI sequencer: no longer needed or used"); + /* Allocate the softc. */ ret = ENOMEM; scp = malloc(sizeof(*scp), M_DEVBUF, M_NOWAIT | M_ZERO); @@ -737,6 +739,8 @@ mseq_open(struct cdev *i_dev, int flags, int mode, struct thread *td) struct seq_softc *scp = i_dev->si_drv1; int i; + gone_in(15, "MIDI sequencer: no longer needed or used"); + if (scp == NULL) return ENXIO; From nobody Sat May 31 19:52:48 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b8rPF3Hpzz5xV5Z; Sat, 31 May 2025 19:52: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b8rPF18Ncz3JDQ; Sat, 31 May 2025 19:52:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748721169; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HWgGceWuX9Qt+zSr7K0GNOex5FyXAFWDYny3+nHvdD4=; b=N6nj8IObfhOvSI2Ld9rzqNsSIOvG5HBrVaetBTVvAak06pkEno95ESgvBipOPX31gPQquf EQlBgekGPbnNMqwPNkyg6erLNMwxyo/CsIJzCBR7wV48p3sf4henFIlOLMve2eCzfPlKau tCJGcxh5Exs+NjGv96OnGSZaQee976ZxZLGEL372d9eiwFsn7iZiNRueJjsU1FxXdMTolw aqmXTG/GX68JtYl0eoa6PmKE2jK4vzZWZZJ0/aqrwr2q4Ma9spbvcAXdiA6uWym8l1dCZA 1q+XicU8dOqprP9d5SaWXORKjd0m5rbmwqbEoOQW9owGx3m/LLGmkqUhivfMOg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748721169; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HWgGceWuX9Qt+zSr7K0GNOex5FyXAFWDYny3+nHvdD4=; b=ith6YvzuCJ+ocp8Z7aB/L7L/pIsXwgKhjCMSZN5px0otb7gucLjYJtIM8hz+jFDb56HJWI c7ctpnTu9t19Q6eK2t3jbXZ1elRhvok5uCidTNQbtLT79EDObbtP9beOhXIAeeesPyZFC0 AoIZpO3xKi7FB3busBf7faT3WQKbeicusYGF+2kfze4DON6EjB70liv8mm7CHP6EhHtAwh bCJOeSUGuG1mX1mOEKn7sv8t1D7ygePFqq/PcUJke+eYExBBuJIPmv1DkF2hL9hSIXVpqB fP5JMPVFZ+NTSJWKtPn/e9dnhdLL1ljNnIzO4dLA9HH0/VtVHlVAsoeY3TNrJA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748721169; a=rsa-sha256; cv=none; b=EXYSPh5oicEIIMJcqkuIrOpU+2HY1hxv6uoEa6cZ44VdMN20MQ88ADWe0UBQ2H4CGlcilF GwqVzodVeQq+Wi6w4CEcyXLAEYBdNjK0ysy/QPuzgTgaGvgHGdpp2xGjFTSokjCKk/Wupq APQk7sPcWkehEk4Zx3T9aYh9izf8nHPHeueAK36AWNQwtqoEd5BnQE0PITickalHYcKz6L cfVS7+ZVHzh95OGTkvzWsYLV0AHvCoskUh0IivCQm07jZ1VRbuEy348oi6xVSk/1uIFQxO SACLMyZlRYQqmExZKrxlVAt4dAba3626WyDfZH32nXaqLEWjY0PnOb3j4PxCjw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b8rPF0Y4nzsSL; Sat, 31 May 2025 19:52: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 54VJqm3P029622; Sat, 31 May 2025 19:52:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54VJqmqt029619; Sat, 31 May 2025 19:52:48 GMT (envelope-from git) Date: Sat, 31 May 2025 19:52:48 GMT Message-Id: <202505311952.54VJqmqt029619@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: 2761de0832c1 - main - kern: add extended errors support List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 2761de0832c1c4342e2f8cca60c794815fda01e3 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=2761de0832c1c4342e2f8cca60c794815fda01e3 commit 2761de0832c1c4342e2f8cca60c794815fda01e3 Author: Konstantin Belousov AuthorDate: 2025-05-23 06:39:50 +0000 Commit: Konstantin Belousov CommitDate: 2025-05-31 19:52:41 +0000 kern: add extended errors support Reviewed by: brooks Sponsored by: The FreeBSD Foundation MFC after: 2 weeks Differential revision: https://reviews.freebsd.org/D50483 --- sys/conf/options | 1 + sys/kern/kern_thread.c | 8 +++---- sys/sys/_exterr.h | 25 ++++++++++++++++++++++ sys/sys/exterr_cat.h | 18 ++++++++++++++++ sys/sys/exterrvar.h | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++ sys/sys/proc.h | 3 +++ 6 files changed, 109 insertions(+), 4 deletions(-) diff --git a/sys/conf/options b/sys/conf/options index 48018e3b6adf..b5e8971dfa54 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -53,6 +53,7 @@ DDB_CAPTURE_MAXBUFSIZE opt_ddb.h DDB_CTF opt_ddb.h DDB_NUMSYM opt_ddb.h EARLY_PRINTF opt_global.h +BLOW_KERNEL_WITH_EXTERR opt_global.h FULL_BUF_TRACKING opt_global.h GDB KDB opt_global.h diff --git a/sys/kern/kern_thread.c b/sys/kern/kern_thread.c index 4ccd6b26528e..2dff461e932a 100644 --- a/sys/kern/kern_thread.c +++ b/sys/kern/kern_thread.c @@ -86,9 +86,9 @@ _Static_assert(offsetof(struct thread, td_flags) == 0x108, "struct thread KBI td_flags"); _Static_assert(offsetof(struct thread, td_pflags) == 0x114, "struct thread KBI td_pflags"); -_Static_assert(offsetof(struct thread, td_frame) == 0x4b8, +_Static_assert(offsetof(struct thread, td_frame) == 0x4e8, "struct thread KBI td_frame"); -_Static_assert(offsetof(struct thread, td_emuldata) == 0x6c0, +_Static_assert(offsetof(struct thread, td_emuldata) == 0x6f0, "struct thread KBI td_emuldata"); _Static_assert(offsetof(struct proc, p_flag) == 0xb8, "struct proc KBI p_flag"); @@ -106,9 +106,9 @@ _Static_assert(offsetof(struct thread, td_flags) == 0x9c, "struct thread KBI td_flags"); _Static_assert(offsetof(struct thread, td_pflags) == 0xa8, "struct thread KBI td_pflags"); -_Static_assert(offsetof(struct thread, td_frame) == 0x318, +_Static_assert(offsetof(struct thread, td_frame) == 0x33c, "struct thread KBI td_frame"); -_Static_assert(offsetof(struct thread, td_emuldata) == 0x35c, +_Static_assert(offsetof(struct thread, td_emuldata) == 0x380, "struct thread KBI td_emuldata"); _Static_assert(offsetof(struct proc, p_flag) == 0x6c, "struct proc KBI p_flag"); diff --git a/sys/sys/_exterr.h b/sys/sys/_exterr.h new file mode 100644 index 000000000000..4423d6a34bdb --- /dev/null +++ b/sys/sys/_exterr.h @@ -0,0 +1,25 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2025 The FreeBSD Foundation + * All rights reserved. + * + * This software were developed by Konstantin Belousov + * under sponsorship from the FreeBSD Foundation. + */ + +#ifndef _SYS__EXTERR_H_ +#define _SYS__EXTERR_H_ + +#include + +struct kexterr { + int error; + const char *msg; + __uint64_t p1; + __uint64_t p2; + unsigned cat; + unsigned src_line; +}; + +#endif diff --git a/sys/sys/exterr_cat.h b/sys/sys/exterr_cat.h new file mode 100644 index 000000000000..d16faa9cc2e5 --- /dev/null +++ b/sys/sys/exterr_cat.h @@ -0,0 +1,18 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2025 The FreeBSD Foundation + * All rights reserved. + * + * This software were developed by Konstantin Belousov + * under sponsorship from the FreeBSD Foundation. + */ + +#ifndef _SYS_EXTERR_CAT_H_ +#define _SYS_EXTERR_CAT_H_ + +#define EXTERR_CAT_MMAP 1 +#define EXTERR_CAT_FILEDESC 2 + +#endif + diff --git a/sys/sys/exterrvar.h b/sys/sys/exterrvar.h new file mode 100644 index 000000000000..6e392ff2c18c --- /dev/null +++ b/sys/sys/exterrvar.h @@ -0,0 +1,58 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2025 The FreeBSD Foundation + * All rights reserved. + * + * This software were developed by Konstantin Belousov + * under sponsorship from the FreeBSD Foundation. + */ + +#ifndef _SYS_EXTERRVAR_H_ +#define _SYS_EXTERRVAR_H_ + +#include +#include +#include + +struct uexterror { + uint32_t ver; + uint32_t error; + uint32_t cat; + uint32_t src_line; + uint64_t p1; + uint64_t p2; + uint64_t rsrv1[4]; + char msg[128]; +}; + +#ifdef _KERNEL + +#ifndef EXTERR_CATEGORY +#error "Specify error category before including sys/exterrvar.h" +#endif + +#ifdef BLOW_KERNEL_WITH_EXTERR +#define SET_ERROR_MSG(mmsg) _Td->td_kexterr.msg = mmsg +#else +#define SET_ERROR_MSG(mmsg) _Td->td_kexterr.msg = NULL +#endif + +#define SET_ERROR2(eerror, mmsg, pp1, pp2) do { \ + struct thread *_Td = curthread; \ + if ((_Td->td_pflags2 & TDP2_UEXTERR) != 0) { \ + _Td->td_pflags2 |= TDP2_EXTERR; \ + _Td->td_kexterr.error = eerror; \ + _Td->td_kexterr.cat = EXTERR_CATEGORY; \ + SET_ERROR_MSG(mmsg); \ + _Td->td_kexterr.p1 = (uintptr_t)pp1; \ + _Td->td_kexterr.p2 = (uintptr_t)pp2; \ + _Td->td_kexterr.src_line = __LINE__; \ + } \ +} while (0) +#define SET_ERROR0(eerror, mmsg) SET_ERROR2(eerror, mmsg, 0, 0) +#define SET_ERROR1(eerror, mmsg, pp1) SET_ERROR2(eerror, mmsg, pp1, 0) + +#endif /* _KERNEL */ + +#endif diff --git a/sys/sys/proc.h b/sys/sys/proc.h index fcacfec4442b..cab487719c31 100644 --- a/sys/sys/proc.h +++ b/sys/sys/proc.h @@ -42,6 +42,7 @@ #ifdef _KERNEL #include #endif +#include #include #ifndef _KERNEL #include @@ -322,6 +323,7 @@ struct thread { size_t td_vslock_sz; /* (k) amount of vslock-ed space */ struct kcov_info *td_kcov_info; /* (*) Kernel code coverage data */ long td_ucredref; /* (k) references on td_realucred */ + struct kexterr td_kexterr; #define td_endzero td_sigmask /* Copied during fork1(), thread_create(), or kthread_add(). */ @@ -569,6 +571,7 @@ enum { #define TDP2_COMPAT32RB 0x00000002 /* compat32 ABI for robust lists */ #define TDP2_ACCT 0x00000004 /* Doing accounting */ #define TDP2_SAN_QUIET 0x00000008 /* Disable warnings from K(A|M)SAN */ +#define TDP2_EXTERR 0x00000010 /* Kernel reported ext error */ /* * Reasons that the current thread can not be run yet. From nobody Sat May 31 19:52:50 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b8rPG74Ktz5xVVl; Sat, 31 May 2025 19:52: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b8rPG32bxz3J3N; Sat, 31 May 2025 19:52:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748721170; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iroCqjDyzF8oHMqOSqdDW0HXEe9FQlMHHWHuN7K95Tw=; b=vHDb9+ccO3cyK7cH2GVJPSZ3UwDlHLGV/xXZlntG4/avWRkwLTNbwM2mekOvHs3gWKbQsT 2nnEcezVLAvm+s4Zsk2E28xTL/jwjQG8JK7gg4cv3ex54F+fGVIRLLfCNfAFfqYwXL+vV9 bHRJQqPoCMgVauxJzPlbpnetBYuI0vSBwGdRYnfLNnPcsqXdrVuFNpqdY4Kp0ZgEnclVxf G1gbHhp2837zsdakz6sdvQpAkuHRCk2Dxa/Qkr6mcqc79PU9M+4ABf/RlDABUaSZerxAd5 V5c46xYWFVjupELsTE7BGydhlhi0zd29wbAAxhUs1h1ZGZDP0Flj5etuhmhtuw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748721170; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iroCqjDyzF8oHMqOSqdDW0HXEe9FQlMHHWHuN7K95Tw=; b=BwWYBEJgCOwzwmlWAt9g3dP2ZXSp0Ce6el4mbO0F9pUelAC/+dZTCZiwP+EXS/JMNGN2tz 8sJR+sXSeOC3+P+SwVGvMXIBU0e0DlOMnfg8PiGcaYTCKU/nLg/+zPZzRUC0/YTsUtGUBL WiIuYO+irFwRZy0sx45frtLIdo7705eiKEyhNiJYKD4q7OadhuxihIv+QUWbezerGoSa4a YzMO6vqw1qDpcgLfPZGCKJBvX0EdpRwp+qmEEn4asacTbZn15FrxXFCkmLdxTbeNIObhrq tXaNrqnTnY+JaTY/6Tv+eFZrGNn1QXsP4+R/qA9fJddspYqYq6+u2WAej8xAXg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748721170; a=rsa-sha256; cv=none; b=IRz/Ro+X3vEfu/QKrT3iir8XdkN4ddK5tyPpdxPHD3gHcGoFToXK66kcngFzN3ee6M/jxK H2fjLSgXWIdDeOiYz0iBdfa72ZrSKX1rRMKw+b+YNSMxiA1gKCMW1CUdj2BH4/Gj1tgXyf 4VEYiJ6NcjO6b8lJ7D1CncVfseMJxTsCiptGQkdFZPbpSKy2rLIEso+HchNmykNfcgz7G8 6xESqVB1V6lAu91bplAmrW9UOFjtRMEoDFY1i1mp7aVa9hqZICQjld57R1bHKAay3Sdkbh 2AbuFmNLciBXtPuHsKhqeLo0qidsl+BXbitPVELg7lijNcpTwtjOmULwm6PomQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b8rPG2DxTzsDk; Sat, 31 May 2025 19:52: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 54VJqoRd029656; Sat, 31 May 2025 19:52:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54VJqoDh029653; Sat, 31 May 2025 19:52:50 GMT (envelope-from git) Date: Sat, 31 May 2025 19:52:50 GMT Message-Id: <202505311952.54VJqoDh029653@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: 09dfe066f00c - main - kernel: copyout extended errors to userspace and add exterrctl(2) to control it List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 09dfe066f00c927e88c23265387d432e6d9f0c5e Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=09dfe066f00c927e88c23265387d432e6d9f0c5e commit 09dfe066f00c927e88c23265387d432e6d9f0c5e Author: Konstantin Belousov AuthorDate: 2025-05-23 05:01:39 +0000 Commit: Konstantin Belousov CommitDate: 2025-05-31 19:52:41 +0000 kernel: copyout extended errors to userspace and add exterrctl(2) to control it Reviewed by: brooks Sponsored by: The FreeBSD Foundation MFC after: 2 weeks Differential revision: https://reviews.freebsd.org/D50483 --- sys/kern/kern_exec.c | 1 + sys/kern/kern_fork.c | 1 + sys/kern/subr_syscall.c | 4 +++ sys/kern/sys_generic.c | 73 +++++++++++++++++++++++++++++++++++++++++++++++- sys/kern/syscalls.master | 8 +++++- sys/sys/exterrvar.h | 13 +++++++++ sys/sys/proc.h | 2 ++ sys/sys/uio.h | 1 + 8 files changed, 101 insertions(+), 2 deletions(-) diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c index a943ec339e75..cf067527237e 100644 --- a/sys/kern/kern_exec.c +++ b/sys/kern/kern_exec.c @@ -809,6 +809,7 @@ interpret: * it that it now has its own resources back */ p->p_flag |= P_EXEC; + td->td_pflags2 &= ~TDP2_UEXTERR; if ((p->p_flag2 & P2_NOTRACE_EXEC) == 0) p->p_flag2 &= ~P2_NOTRACE; if ((p->p_flag2 & P2_STKGAP_DISABLE_EXEC) == 0) diff --git a/sys/kern/kern_fork.c b/sys/kern/kern_fork.c index 494f06cc0621..2ab9b363f8b5 100644 --- a/sys/kern/kern_fork.c +++ b/sys/kern/kern_fork.c @@ -609,6 +609,7 @@ do_fork(struct thread *td, struct fork_req *fr, struct proc *p2, struct thread * */ p2->p_flag |= p1->p_flag & P_SUGID; td2->td_pflags |= td->td_pflags & (TDP_ALTSTACK | TDP_SIGFASTBLOCK); + td2->td_pflags2 |= td->td_pflags2 & TDP2_UEXTERR; SESS_LOCK(p1->p_session); if (p1->p_session->s_ttyvp != NULL && p1->p_flag & P_CONTROLT) p2->p_flag |= P_CONTROLT; diff --git a/sys/kern/subr_syscall.c b/sys/kern/subr_syscall.c index 16fa47c5605a..d5b3b62f0821 100644 --- a/sys/kern/subr_syscall.c +++ b/sys/kern/subr_syscall.c @@ -74,6 +74,8 @@ syscallenter(struct thread *td) td->td_dbgflags |= TDB_SCE; PROC_UNLOCK(p); } + if ((td->td_pflags2 & TDP2_UEXTERR) != 0) + td->td_pflags2 &= ~TDP2_EXTERR; error = (p->p_sysent->sv_fetch_syscall_args)(td); se = sa->callp; #ifdef KTRACE @@ -207,6 +209,8 @@ syscallenter(struct thread *td) PROC_UNLOCK(p); } (p->p_sysent->sv_set_syscall_retval)(td, error); + if (error != 0 && (td->td_pflags2 & TDP2_UEXTERR) != 0) + exterr_copyout(td); } static inline void diff --git a/sys/kern/sys_generic.c b/sys/kern/sys_generic.c index dd9c28e81388..91bf3e93fa7c 100644 --- a/sys/kern/sys_generic.c +++ b/sys/kern/sys_generic.c @@ -34,10 +34,10 @@ * SUCH DAMAGE. */ -#include #include "opt_capsicum.h" #include "opt_ktrace.h" +#define EXTERR_CATEGORY EXTERR_CAT_FILEDESC #include #include #include @@ -46,6 +46,7 @@ #include #include #include +#include #include #include #include @@ -2200,3 +2201,73 @@ file_kcmp_generic(struct file *fp1, struct file *fp2, struct thread *td) return (3); return (kcmp_cmp((uintptr_t)fp1->f_data, (uintptr_t)fp2->f_data)); } + +void +exterr_copyout(struct thread *td) +{ + struct uexterror ue; + ksiginfo_t ksi; + void *uloc; + size_t sz; + int error; + + MPASS((td->td_pflags2 & TDP2_UEXTERR) != 0); + + uloc = (char *)td->td_exterr_ptr + __offsetof(struct uexterror, + error); + if ((td->td_pflags2 & TDP2_EXTERR) == 0) { + ue.error = 0; + sz = sizeof(ue.error); + } else { + memset(&ue, 0, sizeof(ue)); + ue.error = td->td_kexterr.error; + ue.cat = td->td_kexterr.cat; + ue.src_line = td->td_kexterr.src_line; + ue.p1 = td->td_kexterr.p1; + ue.p2 = td->td_kexterr.p2; + if (td->td_kexterr.msg != NULL) + strlcpy(ue.msg, td->td_kexterr.msg, sizeof(ue.msg)); + sz = sizeof(ue) - __offsetof(struct uexterror, error); + } + error = copyout(&ue.error, uloc, sz); + if (error != 0) { + td->td_pflags2 &= ~TDP2_UEXTERR; + ksiginfo_init_trap(&ksi); + ksi.ksi_signo = SIGSEGV; + ksi.ksi_code = SEGV_ACCERR; + ksi.ksi_addr = uloc; + trapsignal(td, &ksi); + } +} + +int +sys_exterrctl(struct thread *td, struct exterrctl_args *uap) +{ + uint32_t ver; + int error; + + if ((uap->flags & ~(EXTERRCTLF_FORCE)) != 0) + return (EINVAL); + switch (uap->op) { + case EXTERRCTL_ENABLE: + if ((td->td_pflags2 & TDP2_UEXTERR) != 0 && + (uap->flags & EXTERRCTLF_FORCE) == 0) + return (EBUSY); + td->td_pflags2 &= ~TDP2_UEXTERR; + error = copyin(uap->ptr, &ver, sizeof(ver)); + if (error != 0) + return (error); + if (ver != UEXTERROR_VER) + return (EINVAL); + td->td_pflags2 |= TDP2_UEXTERR; + td->td_exterr_ptr = uap->ptr; + return (0); + case EXTERRCTL_DISABLE: + if ((td->td_pflags2 & TDP2_UEXTERR) == 0) + return (EINVAL); + td->td_pflags2 &= ~TDP2_UEXTERR; + return (0); + default: + return (EINVAL); + } +} diff --git a/sys/kern/syscalls.master b/sys/kern/syscalls.master index 67396a4cabc5..08b557a7a540 100644 --- a/sys/kern/syscalls.master +++ b/sys/kern/syscalls.master @@ -3349,5 +3349,11 @@ size_t size ); } - +592 AUE_NULL STD { + int exterrctl( + u_int op, + u_int flags, + _In_reads_bytes_(4) void *ptr + ); + } ; vim: syntax=off diff --git a/sys/sys/exterrvar.h b/sys/sys/exterrvar.h index 6e392ff2c18c..5afcd82b136a 100644 --- a/sys/sys/exterrvar.h +++ b/sys/sys/exterrvar.h @@ -26,6 +26,13 @@ struct uexterror { char msg[128]; }; +#define UEXTERROR_VER 0x10010001 + +#define EXTERRCTL_ENABLE 1 +#define EXTERRCTL_DISABLE 2 + +#define EXTERRCTLF_FORCE 0x00000001 + #ifdef _KERNEL #ifndef EXTERR_CATEGORY @@ -53,6 +60,12 @@ struct uexterror { #define SET_ERROR0(eerror, mmsg) SET_ERROR2(eerror, mmsg, 0, 0) #define SET_ERROR1(eerror, mmsg, pp1) SET_ERROR2(eerror, mmsg, pp1, 0) +#else /* _KERNEL */ + +__BEGIN_DECLS +int exterrctl(u_int op, u_int flags, void *ptr); +__END_DECLS + #endif /* _KERNEL */ #endif diff --git a/sys/sys/proc.h b/sys/sys/proc.h index cab487719c31..b48681420028 100644 --- a/sys/sys/proc.h +++ b/sys/sys/proc.h @@ -343,6 +343,7 @@ struct thread { void *td_sigblock_ptr; /* (k) uptr for fast sigblock. */ uint32_t td_sigblock_val; /* (k) fast sigblock value read at td_sigblock_ptr on kern entry */ + void *td_exterr_ptr; #define td_endcopy td_pcb /* @@ -572,6 +573,7 @@ enum { #define TDP2_ACCT 0x00000004 /* Doing accounting */ #define TDP2_SAN_QUIET 0x00000008 /* Disable warnings from K(A|M)SAN */ #define TDP2_EXTERR 0x00000010 /* Kernel reported ext error */ +#define TDP2_UEXTERR 0x00000020 /* User set ext error reporting ptr */ /* * Reasons that the current thread can not be run yet. diff --git a/sys/sys/uio.h b/sys/sys/uio.h index ec4e92d852a6..05c1ed640b63 100644 --- a/sys/sys/uio.h +++ b/sys/sys/uio.h @@ -84,6 +84,7 @@ int copyiniov(const struct iovec *iovp, u_int iovcnt, struct iovec **iov, int copyinuio(const struct iovec *iovp, u_int iovcnt, struct uio **uiop); int copyout_map(struct thread *td, vm_offset_t *addr, size_t sz); int copyout_unmap(struct thread *td, vm_offset_t addr, size_t sz); +void exterr_copyout(struct thread *td); int physcopyin(void *src, vm_paddr_t dst, size_t len); int physcopyout(vm_paddr_t src, void *dst, size_t len); int physcopyin_vlist(struct bus_dma_segment *src, off_t offset, From nobody Sat May 31 19:52:51 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b8rPJ3W3Tz5xV3f; Sat, 31 May 2025 19:52: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b8rPH59xwz3J5g; Sat, 31 May 2025 19:52:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748721171; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FxtM7XVcP+Jhx/D+VSh86lBPIo1uC1+LPGtLsiMBHdw=; b=e0tKmq1x6SUkxKDh9Hdrpip+UwrBWDSLrSQYLlooSl3Qr4L3lcAUXRBw8X8lKJyl+dqdpw RuF/fpu3louL8O3JsiHC1YgUNnH3zETWRb7zxPAI+REj3LG1aj6LwR9Ty9gU9aRTzeIR0x fXzA7Wxi78st5xcKdROEt6rtCIerJxahgKt2rnHZ4+xtiyzQL/T6N0UBsyUroGFRAxyGUx 7MXcfgHe+wJxO0T5J1ESbEW9VlgJNFirEZPxj2KLEiUFzD9lV/2LrPRnEt/u95q5WnbqKw E+bW1m61JouZx6HvkpJVViYOMrDncJuo4KpZq2bvfsx2gV7ZS/o061K81b+QTw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748721171; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FxtM7XVcP+Jhx/D+VSh86lBPIo1uC1+LPGtLsiMBHdw=; b=LRA9BtuJk2jzuwmzvqR2Nhz8jnyDLf5tvv+jGR6E2lIEaAY86y0GmmaBohyR2rySrD5sKM JT5iDiD80c8jTSDQBcM0V19kQveZ1O2SKpBnc/DGPW7roO0V+GAgi0cBgB1dwMt15TAefR n7tTcSU+wD4tlxYRM52iqNKWyujzaVFdgpVHtQeUlYMKdHHtckNa4N3oLA88udsJZvpJZh 3J5vrySJ4fccNmsfQwpCiP/YdqbWWtN5/q3V7VrVySC3IV+1t1/qV+EN6GS56jDp+ZUlel eaYa4GYUonFjdF43KzS/J0pHzohVb+/Apffq1ip3C8rhEVu04djEC9qnFUbS/w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748721171; a=rsa-sha256; cv=none; b=a+KHMmrOhDeWnzkjmShXY8VQ8Q/wZ8W56OZj1G5fVGN960aY2P1II9iyG/cD5+HF5T+Bbz EH7mY6qx5GKQufne5r3JQ5OCyLwDTf2qCsk2BNen7cQ1S8xS+2I6NZE30vv4Zno7uO4Ief Am3luzUSJX769YEHKqg0yo5UKqMJmL+zetX90MRNYxiZ0tTv1naDMkVf3pA/ILUDedqOhN 5UOp6yjsyVUo++MCCpNo6l1qLdC49zEBnr4thzqGQI/LT46YZjfJBDEwcEXu/MT74blr26 lLINlm1cCOZkBxwG/P9SXRe5G9VsfCZfvHtgvEzCF2ZULDYqu9Ucz8YoclSvwQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b8rPH2rDYzsSM; Sat, 31 May 2025 19:52: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 54VJqpCA029690; Sat, 31 May 2025 19:52:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54VJqpr3029687; Sat, 31 May 2025 19:52:51 GMT (envelope-from git) Date: Sat, 31 May 2025 19:52:51 GMT Message-Id: <202505311952.54VJqpr3029687@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: 92b393c0d287 - main - libsys: export exterrctl symbol List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 92b393c0d28749b25efb6ad43632a7e80edd129b Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=92b393c0d28749b25efb6ad43632a7e80edd129b commit 92b393c0d28749b25efb6ad43632a7e80edd129b Author: Konstantin Belousov AuthorDate: 2025-05-23 05:23:37 +0000 Commit: Konstantin Belousov CommitDate: 2025-05-31 19:52:41 +0000 libsys: export exterrctl symbol Reviewed by: brooks Sponsored by: The FreeBSD Foundation MFC after: 2 weeks Differential revision: https://reviews.freebsd.org/D50483 --- lib/libsys/Symbol.sys.map | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/libsys/Symbol.sys.map b/lib/libsys/Symbol.sys.map index 225eca2fc0de..7fac1ed6160d 100644 --- a/lib/libsys/Symbol.sys.map +++ b/lib/libsys/Symbol.sys.map @@ -378,6 +378,7 @@ FBSD_1.7 { }; FBSD_1.8 { + exterrctl; fchroot; getrlimitusage; kcmp; From nobody Sat May 31 19:52:52 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b8rPK21ZCz5xV7y; Sat, 31 May 2025 19:52: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b8rPJ5s1Wz3JGn; Sat, 31 May 2025 19:52:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748721172; h=from:from:reply-to:subject:subject: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/44ROvKJQgy0VVQKfMX9e71/FrkWBbmgK0jqN+bP94=; b=S1ASLc4/pmG5mDmGvLKPGpT6Ig9Hqul09mOTTJoGwTX6cp7N9gwVsC/TxJc/7ThdwgUPhQ V8NVX//m1H/eBV/jo7apSC7lzm6+Bb356iRCqnj6a4qxk3TZJoCM7g0OCrCIWy0NNsU8kb b3Fdmy6v8zLcGHCoCEc+U9zEAapii40T0s0YRnr7Rl5Tg7Tb9OTrinZXptXit0Ph5EWxNo uP3RXVxMbWzSw4gZmRjMACyYtYaMjVsgNMUmWK0RIs0HFBAOzChTJI0xQSfEJcvmbKRgwD oGJsfz0zdOs1CYgQdogKFxfF9tX7Sski/jlkZqbI9WtLWv1MAiSLjPJsicVgqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748721172; h=from:from:reply-to:subject:subject: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/44ROvKJQgy0VVQKfMX9e71/FrkWBbmgK0jqN+bP94=; b=wAtyKNYLT0JtunwH1PDREi4G49lj54QjhyebCajSQrDJQYRK30ZApMbusUtR+YA6cuooIl k/Ug9eXn52YYphaWPtqequpQo34fh2w3s1/xOREmjzjbz9/CZYVE3SV8DuAsDPOi+FDy51 97JrxSPHN86ifhu2e7s9rb3cCO0l72bapfEx0OnzyYMpNCr7+HC5tKwyy6Ar7bdaiR8nbw MJcEMlVRQWFu9ob+C1CW8lpJPpYg6hEud0YgpV32JDy+w02auePF4bEuvbB0RYDRJxmJ/w b43qPAoLtJI67427hS0XB3ua6v7daJnLeA/8TrC7JWkOolIms1VbgGZtl7OwQg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748721172; a=rsa-sha256; cv=none; b=cKOu2jeN56IsV/B4NDYbYw3C0Wv02CP+GB+m76Bs5egqqM/X4/W2icy0O7v8b62Up8lUqn 228eOOCeDZ+DA+mvAVAlQINV+Q1WEfzINdkm4NJP7YaiATO6JCO8T4T/TTEpeNMZzwx3uq AS/cwAZ4ggyg7FIC5YA7U8R3s400ELcoyUQWClOr80BGwFEQ4noKlaSVGVvT/zgZPV2E6K tSm833n1yxdmvm3qIz251wVeH3lpa04NW8VM68SqfBHyxdjTXaLEeqrpCmxcEUBHvZ70Cc Cxao9TwkvcZxzc5/UGSehQhZ+G7CaAAFdmprOdlDmWvObIyxjDKgLgQb0AAKww== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b8rPJ4MxBzs0D; Sat, 31 May 2025 19:52: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 54VJqqnv029732; Sat, 31 May 2025 19:52:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54VJqqpC029729; Sat, 31 May 2025 19:52:52 GMT (envelope-from git) Date: Sat, 31 May 2025 19:52:52 GMT Message-Id: <202505311952.54VJqqpC029729@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: d995dc937a3c - main - vm/vm_mmap.c: add two examples of using exterrors List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: d995dc937a3c999daa8e0675d1ec45f9ab422cb5 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=d995dc937a3c999daa8e0675d1ec45f9ab422cb5 commit d995dc937a3c999daa8e0675d1ec45f9ab422cb5 Author: Konstantin Belousov AuthorDate: 2025-05-23 05:36:13 +0000 Commit: Konstantin Belousov CommitDate: 2025-05-31 19:52:41 +0000 vm/vm_mmap.c: add two examples of using exterrors Reviewed by: brooks Sponsored by: The FreeBSD Foundation MFC after: 2 weeks Differential revision: https://reviews.freebsd.org/D50483 --- sys/vm/vm_mmap.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/sys/vm/vm_mmap.c b/sys/vm/vm_mmap.c index afc25965d73c..492233215d4b 100644 --- a/sys/vm/vm_mmap.c +++ b/sys/vm/vm_mmap.c @@ -40,13 +40,14 @@ * Mapped file (mmap) interface to VM */ -#include #include "opt_hwpmc_hooks.h" #include "opt_vm.h" +#define EXTERR_CATEGORY EXTERR_CAT_MMAP #include #include #include +#include #include #include #include @@ -190,12 +191,16 @@ kern_mmap(struct thread *td, const struct mmap_req *mrp) pos = mrp->mr_pos; check_fp_fn = mrp->mr_check_fp_fn; - if ((prot & ~(_PROT_ALL | PROT_MAX(_PROT_ALL))) != 0) + if ((prot & ~(_PROT_ALL | PROT_MAX(_PROT_ALL))) != 0) { + SET_ERROR0(EINVAL, "unknown PROT bits"); return (EINVAL); + } max_prot = PROT_MAX_EXTRACT(prot); prot = PROT_EXTRACT(prot); - if (max_prot != 0 && (max_prot & prot) != prot) + if (max_prot != 0 && (max_prot & prot) != prot) { + SET_ERROR0(ENOTSUP, "prot is not subset of max_prot"); return (ENOTSUP); + } p = td->td_proc; From nobody Sat May 31 19:52:53 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b8rPL4n71z5xVQ3; Sat, 31 May 2025 19:52: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b8rPK5yRVz3J3p; Sat, 31 May 2025 19:52:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748721173; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xw7BUwjZXnLelD1PblH2RRM+hZ/2v3Afox3rMiQYYXQ=; b=Ple9aYW/b4TNnEQHvUcdjj1C2sIM1xDK44YYACIIIoueo2mo4ZUMduSbKgo+aNeNBR34I5 yOlGBFmX676vAxyvR6GUS8/8X47ju5udgzBQYTQn54lboBszS4iNh8rOPMW1cfzjGaXDh8 pi3S+JTW5exuOZfEUdG6HtlJH2m4AaGAG54qRi/zGWA6N5xQzEBa+OB3CBTD5CotelNg87 dxQe8nDRa9RDPEqXjAJ+h7e/dfHMjl9CqDQtCuFSuhq4iVdAdtz3mLWEqOwLCXTlB2WOwE 0SdK5GPNwDaD/20zPnoZD8SBKqVwPAGcaHljPZYQm/u+TpmHIEjF7hPjB/oT/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748721173; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xw7BUwjZXnLelD1PblH2RRM+hZ/2v3Afox3rMiQYYXQ=; b=pDDoGfcPg+16wb/a9cwUd5prBNF1rFs6nhopee+GC+la5ylzmq2hajrO1SB5Tzm6Ci5h4M TQq++RPeAVIF1CIgskpccJR7GAbpviB8EbcY1I4WjiRBwVPAabO3K43mQWWsr3GboLkJL4 Wjgm6n2sdz0Ft/1xSqWCK7Oaf4Ixw8SWsjBQGtVcPS6wanEF5qKRbPqMpMdwMoQbTo6MSB QuJcBQc9xv9PMpCF/vXHJClXL6DK3QoycUQObeUI3bglVYYFUOggdbVJ6PsJ2wbvglgtlt lV0H7Qj0+GmTtqOcC673YDN89BQP+y1Qyvl0tkIzhnvq8QxoYFC3cpHreEh7lg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748721173; a=rsa-sha256; cv=none; b=hOhCcxSh4GDV4vDSewkLhkYdK4sT4NELaLOXnFleBNBY8Svk77UwTAD45IvBpb0O0H4ka8 H+9B0hcM2KRthww4YRtfi7Qr6WgfwCmo1jvOCS09a1y0OL/zBrZv1LSzVqLLHtVL+Of+6i /HL9Pg+ZpirD72RFLSTFN+sEIphE+6DxP3OJaLz4UyOLjFCgZ4NvbNina5XQ44K57XRCBR zOA2l7hdxgqbOPu2/t/uV49mh7OkrDGvb9n3mCxc256WhPfvzURtzvEhTvgVWGGBXL+H2Z d8bucUCJ1RH4G4xxUccPAD2JAJgJP4SpXxyVu4Wd+6fclQw4MK5YGUEHq5GAFw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b8rPK4Cygzs5p; Sat, 31 May 2025 19:52: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 54VJqr3P029767; Sat, 31 May 2025 19:52:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54VJqrKO029764; Sat, 31 May 2025 19:52:53 GMT (envelope-from git) Date: Sat, 31 May 2025 19:52:53 GMT Message-Id: <202505311952.54VJqrKO029764@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: 7212b3734593 - main - kinfo_proc: report address of extended kernel error structure List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 7212b37345936899e979c63d0b054e114576faa0 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=7212b37345936899e979c63d0b054e114576faa0 commit 7212b37345936899e979c63d0b054e114576faa0 Author: Konstantin Belousov AuthorDate: 2025-05-24 03:37:00 +0000 Commit: Konstantin Belousov CommitDate: 2025-05-31 19:52:41 +0000 kinfo_proc: report address of extended kernel error structure Reviewed by: brooks Sponsored by: The FreeBSD Foundation MFC after: 2 weeks Differential revision: https://reviews.freebsd.org/D50483 --- sys/compat/freebsd32/freebsd32.h | 1 + sys/kern/kern_proc.c | 4 ++++ sys/sys/user.h | 3 ++- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/sys/compat/freebsd32/freebsd32.h b/sys/compat/freebsd32/freebsd32.h index 9d7a99535288..9d724c93fee7 100644 --- a/sys/compat/freebsd32/freebsd32.h +++ b/sys/compat/freebsd32/freebsd32.h @@ -419,6 +419,7 @@ struct kinfo_proc32 { uint32_t ki_kstack; uint32_t ki_udata; uint32_t ki_tdaddr; + uint32_t ki_uerrmsg; uint32_t ki_spareptrs[KI_NSPARE_PTR]; /* spare room for growth */ int ki_sparelongs[KI_NSPARE_LONG]; int ki_sflag; diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c index 191143443d42..379fbda619c0 100644 --- a/sys/kern/kern_proc.c +++ b/sys/kern/kern_proc.c @@ -1348,6 +1348,9 @@ fill_kinfo_thread(struct thread *td, struct kinfo_proc *kp, int preferthread) thread_unlock(td); if (preferthread) PROC_STATUNLOCK(p); + + if ((td->td_pflags & TDP2_UEXTERR) != 0) + kp->ki_uerrmsg = td->td_exterr_ptr; } /* @@ -1503,6 +1506,7 @@ freebsd32_kinfo_proc_out(const struct kinfo_proc *ki, struct kinfo_proc32 *ki32) PTRTRIM_CP(*ki, *ki32, ki_tdaddr); CP(*ki, *ki32, ki_sflag); CP(*ki, *ki32, ki_tdflags); + PTRTRIM_CP(*ki, *ki32, ki_uerrmsg); } #endif diff --git a/sys/sys/user.h b/sys/sys/user.h index 0c443672a3b1..f94a91ca1238 100644 --- a/sys/sys/user.h +++ b/sys/sys/user.h @@ -86,7 +86,7 @@ */ #define KI_NSPARE_INT 2 #define KI_NSPARE_LONG 12 -#define KI_NSPARE_PTR 5 +#define KI_NSPARE_PTR 4 #ifndef _KERNEL #ifndef KINFO_PROC_SIZE @@ -212,6 +212,7 @@ struct kinfo_proc { * That way the spare room from both arrays will remain contiguous. */ struct pwddesc *ki_pd; /* pointer to process paths info */ + void *ki_uerrmsg; /* address of the ext err msg place */ void *ki_spareptrs[KI_NSPARE_PTR]; /* spare room for growth */ long ki_sparelongs[KI_NSPARE_LONG]; /* spare room for growth */ long ki_sflag; /* PS_* flags */ From nobody Sat May 31 19:52:54 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b8rPN2qxDz5xVQ4; Sat, 31 May 2025 19:52: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b8rPL6DQhz3J94; Sat, 31 May 2025 19:52:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748721175; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Y5D/aok3tOoHlFEX99LEMMkuzMZBx/nNBDCF/y+KGXU=; b=WKoVgyheoHLmbymkUvc1OQDEZHgn4l+OkZOxNxU5fz5QPpnktCtzDOlQOUujwvcgdhGRcT hHqJTXQgOd2NtE4U+FNyY7X79grvbagsA0E/qRhw1JAZ9sxdxcp93V19va+OcoI9qiu4D5 A8/hyPhvbqsAhhLankAJQVGswKvBk+vUtzqSLa1yy6oVRsBhKxKenrPVNkHrMjwd/C6rfw IZ6LxJdmFFAbFzFMpRKtTKaX1oAO/SkS49HMlg0xkyt6FnBe5+O5A+G8SLWOlW1we90J5X pWXtygDpW+aSs+QrWkLog6Hb7y/QIArbc9Qr5nJ0Y/2BaZ0s8efRMGAYjLrsJg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748721175; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Y5D/aok3tOoHlFEX99LEMMkuzMZBx/nNBDCF/y+KGXU=; b=R2hEVFQMmYLsKZrP9Xx+TnPsXPVEHmJ5DBCAYJke5N5oU/Lj41vk2q6G7jXEXLaT2dHhZK rb4Fh9R15BGw/KAuJKiBmQ4u1uccYIw1SU038sB0Dul7II0kozov/co2Te8zvtm7c//rnn Ayx9YMfY9TeJxDplJUpXXbLYxIkYgx0+9Hay8GosxpZrCx969AlY/7XKw+59yHN/30Zb3t +7FVmgv7xk3ZkxD5TuZa7KVUC64lK7uTUlrCUGH6WrBADKoKwhdieOv1yc3QM83r6Pliii Z3F9J13Lw0peCB2T0cGKDhc5bIdP3KM2V9FPsyDqtcrVdydDvQ3Zezd+YKi8xA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748721175; a=rsa-sha256; cv=none; b=aBnIVhWNE53LTkWw0OAJFMjUIvSxWTo+9D5wffThL0+wYn96LS1iofLU0aezRTvPwGiygT TlKksfa3cFNC0ynUyYkF8SxTYWdlI4Bhk3cI2NrPLdkKNbN1+DrZaLIQAqfDkjDQYLs4qK kYPfFu4VUO53EIgcZAzukizSFiivk/5qYXonFPMZd0qBkdWDG6Wmi8RaDmLYrNyHiOpdnL KlYU14F6OUW6AikC55d5mAnzwQ00noL7Z00GAee80BcI/4JwfkeLjH1VR3WoxKbS1xOY9o XKdQ4GVCJpGtW7vHDhvdEDSWINQMctl/B79C573si9zKEE2OVGc2IQ7Q1IdZiw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b8rPL55B4zs36; Sat, 31 May 2025 19:52: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 54VJqsmq029806; Sat, 31 May 2025 19:52:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54VJqsmm029803; Sat, 31 May 2025 19:52:54 GMT (envelope-from git) Date: Sat, 31 May 2025 19:52:54 GMT Message-Id: <202505311952.54VJqsmm029803@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: b9c8a07d4dd9 - main - C runtime: enable extended error reporting from kernel List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: b9c8a07d4dd932aaa43a4ed4c2fe07ac3d901544 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=b9c8a07d4dd932aaa43a4ed4c2fe07ac3d901544 commit b9c8a07d4dd932aaa43a4ed4c2fe07ac3d901544 Author: Konstantin Belousov AuthorDate: 2025-05-23 05:02:41 +0000 Commit: Konstantin Belousov CommitDate: 2025-05-31 19:52:42 +0000 C runtime: enable extended error reporting from kernel Reviewed by: brooks Sponsored by: The FreeBSD Foundation MFC after: 2 weeks Differential revision: https://reviews.freebsd.org/D50483 --- lib/libc/gen/Makefile.inc | 1 + lib/libc/gen/uexterr_gettext.c | 15 +++++++++++++++ lib/libthr/thread/thr_create.c | 4 ++++ lib/libthr/thread/thr_init.c | 3 +++ lib/libthr/thread/thr_private.h | 3 +++ 5 files changed, 26 insertions(+) diff --git a/lib/libc/gen/Makefile.inc b/lib/libc/gen/Makefile.inc index 9a223f2f69e8..6416effeb568 100644 --- a/lib/libc/gen/Makefile.inc +++ b/lib/libc/gen/Makefile.inc @@ -159,6 +159,7 @@ SRCS+= \ ttyname.c \ ttyslot.c \ ualarm.c \ + uexterr_gettext.c \ ulimit.c \ uname.c \ unvis-compat.c \ diff --git a/lib/libc/gen/uexterr_gettext.c b/lib/libc/gen/uexterr_gettext.c new file mode 100644 index 000000000000..1ee295556a4e --- /dev/null +++ b/lib/libc/gen/uexterr_gettext.c @@ -0,0 +1,15 @@ +#include +#include +#include +#include + +static struct uexterror uexterr = { + .ver = UEXTERROR_VER, +}; + +static void uexterr_ctr(void) __attribute__((constructor)); +static void +uexterr_ctr(void) +{ + exterrctl(EXTERRCTL_ENABLE, 0, &uexterr); +} diff --git a/lib/libthr/thread/thr_create.c b/lib/libthr/thread/thr_create.c index 84bbd36ed28d..ba2575d461e5 100644 --- a/lib/libthr/thread/thr_create.c +++ b/lib/libthr/thread/thr_create.c @@ -31,6 +31,7 @@ #include #include #include +#include #include #include #include @@ -285,6 +286,9 @@ thread_start(struct pthread *curthread) curthread->attr.stacksize_attr; #endif + curthread->uexterr.ver = UEXTERROR_VER; + exterrctl(EXTERRCTL_ENABLE, 0, &curthread->uexterr); + /* Run the current thread's start routine with argument: */ _pthread_exit(curthread->start_routine(curthread->arg)); diff --git a/lib/libthr/thread/thr_init.c b/lib/libthr/thread/thr_init.c index 8855491b91cb..aef2281c5f22 100644 --- a/lib/libthr/thread/thr_init.c +++ b/lib/libthr/thread/thr_init.c @@ -433,6 +433,9 @@ init_main_thread(struct pthread *thread) thread->unwind_stackend = _usrstack; #endif + thread->uexterr.ver = UEXTERROR_VER; + exterrctl(EXTERRCTL_ENABLE, EXTERRCTLF_FORCE, &thread->uexterr); + /* Others cleared to zero by thr_alloc() */ } diff --git a/lib/libthr/thread/thr_private.h b/lib/libthr/thread/thr_private.h index dc5be08a0760..11afd74eea16 100644 --- a/lib/libthr/thread/thr_private.h +++ b/lib/libthr/thread/thr_private.h @@ -40,6 +40,7 @@ #include #include #include +#include #include #include #include @@ -576,6 +577,8 @@ struct pthread { /* pthread_set/get_name_np */ char *name; + + struct uexterror uexterr; }; #define THR_SHOULD_GC(thrd) \ From nobody Sat May 31 19:52:55 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b8rPQ3mw0z5xVSK; Sat, 31 May 2025 19:52: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b8rPP1VyXz3JC8; Sat, 31 May 2025 19:52:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748721177; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CRY80odlCMdZuRGFTf6L77ljG3pFcJJXaWB5HMJbDgo=; b=LMi7oDXDZYZQjMrsXfkJPEDZ2WGIM2v8FESDHykElwMPOg9aqLcaPGYlIbHQYRPHaKZEBA jHbHazr7YmIkb/qXQnbgN/VK1rOgYFS8om5ZrY4pCkdbPqUM1UebSZlsosp/Zr4oAL+SqE unXNLQe6KI9GR1p1u5Z0/OiU8EN2/RadgbtyPWaalSXR3kOVRiE+0qC/iKTpY7kU1tETrx lQRJzRRUk2Ya2b1FtfZJuNBkPUVyB26XNRMohK1pwHo3YLb5eHKbsNMm/jGz03Lbx7i4lT uZh9sJn8RiG2twYWRlYwxwfjumm5dpHKBW65nSKZ52oQKrvRYZLzZXkuHFwuJg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748721178; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CRY80odlCMdZuRGFTf6L77ljG3pFcJJXaWB5HMJbDgo=; b=hUhaO2br2cImuQSHW3YCod6NCDSUpsH66vA5+v9biXNXHsu72srmlPSCAICy95nyQF1ywS f4Ivkuudwxn0lmhQWoUjkmiv7oY94ypLaE9Pb+RGF30yiqb5lLmDzxmLzO2+fwgon1paTR QnVMobVTnrPHwlQ4jwJEWrWUyrqZp8N9KiT+klkJ4xBNH2qWhoI+gk7yixIbUS3hUkgI1j EOA8J9fBjV25UAtu4G1XvWb2vQGe8YGGMMLGG+q31MryCUeg/0DVo8nQYhICLgHODbqhul 821TNW5+BwBihywO0GW+jpBzGlf/4hzSPynUKUhhsDQSSEZbLjqEDtCCt2hJAA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748721178; a=rsa-sha256; cv=none; b=mSNn0LRH+UrnOLQ229hoHf4rkKYYzTUJ/HF1JAgBv3RIpl0kbGkHSC9IFhWlcULGxSAZnc T0dSYcqVrPT2H0cbQ0pcoDoEMWa9BD8aN0EFOJY/2rgmDMf0SdPb9s7G11GDTex4G+bfOA AKvZI4Ke7UHvKTw5PlVCTOIE3/ulrE+N/bfl3E7GuDxyR3YUMTwaNiNVPVW+UZKr5d7R2N NEYyzVAQAcFIbFb2VAVwH5eBtFT/AgM6bAx4gzML08/oRan+Mt4WJCyR4w4n5iytFh2iUY tfbnrUkdlg2mhlgpzwUuS39rxX+/Ik+tvzcE5TcS5Lmvxdyw42isCK15XpFXng== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b8rPM710Gzs5q; Sat, 31 May 2025 19:52: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 54VJqtrN029841; Sat, 31 May 2025 19:52:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54VJqtAI029838; Sat, 31 May 2025 19:52:55 GMT (envelope-from git) Date: Sat, 31 May 2025 19:52:55 GMT Message-Id: <202505311952.54VJqtAI029838@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: 98af94cae78a - main - sysconf(3): add _SC_UEXTERR_LEN, the max length of the extended error string List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 98af94cae78a01a62d1094e4f255f50af2e1269a Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=98af94cae78a01a62d1094e4f255f50af2e1269a commit 98af94cae78a01a62d1094e4f255f50af2e1269a Author: Konstantin Belousov AuthorDate: 2025-05-24 11:10:48 +0000 Commit: Konstantin Belousov CommitDate: 2025-05-31 19:52:42 +0000 sysconf(3): add _SC_UEXTERR_LEN, the max length of the extended error string Reviewed by: brooks Sponsored by: The FreeBSD Foundation MFC after: 2 weeks Differential revision: https://reviews.freebsd.org/D50483 --- include/unistd.h | 1 + lib/libc/gen/sysconf.c | 3 +++ sys/sys/exterrvar.h | 2 ++ 3 files changed, 6 insertions(+) diff --git a/include/unistd.h b/include/unistd.h index 8574b2ba9915..33dd983eb11a 100644 --- a/include/unistd.h +++ b/include/unistd.h @@ -292,6 +292,7 @@ typedef __useconds_t useconds_t; #define _SC_NPROCESSORS_CONF 57 #define _SC_NPROCESSORS_ONLN 58 #define _SC_CPUSET_SIZE 122 +#define _SC_UEXTERR_MAXLEN 123 /* user */ #endif /* Extensions found in Solaris and Linux. */ diff --git a/lib/libc/gen/sysconf.c b/lib/libc/gen/sysconf.c index 6a838ddd58d8..d20b70590fb6 100644 --- a/lib/libc/gen/sysconf.c +++ b/lib/libc/gen/sysconf.c @@ -34,6 +34,7 @@ #include "namespace.h" #include +#include #include #include #include @@ -602,6 +603,8 @@ yesno: return (-1); return ((long)value); #endif + case _SC_UEXTERR_MAXLEN: + return (UEXTERROR_MAXLEN); default: errno = EINVAL; diff --git a/sys/sys/exterrvar.h b/sys/sys/exterrvar.h index 5afcd82b136a..6eb08d63aa48 100644 --- a/sys/sys/exterrvar.h +++ b/sys/sys/exterrvar.h @@ -26,6 +26,8 @@ struct uexterror { char msg[128]; }; +#define UEXTERROR_MAXLEN 256 + #define UEXTERROR_VER 0x10010001 #define EXTERRCTL_ENABLE 1 From nobody Sat May 31 19:52:56 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b8rPQ3mwjz5xVQ6; Sat, 31 May 2025 19:52: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b8rPP6rrGz3JHm; Sat, 31 May 2025 19:52:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748721178; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7GOJ8Nu5a3TUM0hNuN0AvTjoya32no/FepnRU4UMSos=; b=Ygzm+pQ8bGDhVdQfWGGFI23TIYS4uuBb+JRAff4fXiqY5yjd5dPAVpxrjfVJdvASTD4RGj 5e7vOUuCIuboqm2geZS75dfu7ncJl51qrLLUQAZOVM0/pRheoVr3md09Mps5ZAFKxmXp4G LNJGyTQUIct2aFLqnZWN0IQ/9wOkULsPoo9B4ezd3cqU4ws5QP31dMRjsNLdsauVxGZpQw tmrfajLJB/ohuRuqB2pZRmSqug9kHY3R5HkbNg387I1HUL9jiMeijtcBclz0v5/lTkBjET m0Ln6i/HJD5PloAvfCJh5LsKmC2DAePoQvclyRt3ylRdy8B5yHYYRSU3Ae8vAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748721178; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7GOJ8Nu5a3TUM0hNuN0AvTjoya32no/FepnRU4UMSos=; b=UfEdeEFlRw+DgpCaQQvc1EMsdAoMqBE8GaPBTBwSi0OW46wHNQL+aUBbKnhzk5icJ42C7H UorBRL0OAm3pExWRUE4rdk36Dh3HaNQOk/ELhS8vuyykSlva8OClAwmDt7tYSUMHwX1+SM EXxx6tX0IurgardjQs90S33apxoxB2KRb3om0xvYYpC5l3d/YOJGxQ16RZJo9fsPoapczU 8LQS1bZU8YFE3jUyLqMRFiv6oCylVI5gFRiNzLLe7xC416Ka2zcjvUEkCOSg880RHFEYb5 AZS4fMkbeLOzi5yo1uwRmCKCJcrQ+zEsDOpu1xH4kwvKmKdI9mZrz8hpYgukhw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748721178; a=rsa-sha256; cv=none; b=Z8fFvvRIrju6oqs+ZlxBORgn5AWO4jxMkQHHN+ei3jgxNxmbNoYlyqNLnK8itiXpk3+HxE 8o1kBzSU8NpXEclfSUg+KLZZLAJQ0l2X5m7VTH9Q8J+L7CYSKEXLBBQnyfoaLHn9CdQvLf u2gNu/G0Q2arF0HhYNpzJXtyuUFD+dWEC3Re+707IDO6t1vknzHt0dU943mfSPIIPukaq4 7BI/XHGs0d2R9XWN3rVxX+AOQdQreZDdLtMDDo9vWaOgHvYfDLI1OtS8mX7vYF9KogKxuQ 22KAjtLeE8PuosmmwT5FqVH3aYnjfRQTFzHAvjZFVZ2g3um3QZe+snPpFF6GTg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b8rPN6cCDzsDl; Sat, 31 May 2025 19:52: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 54VJquXf029876; Sat, 31 May 2025 19:52:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54VJqu3b029873; Sat, 31 May 2025 19:52:56 GMT (envelope-from git) Date: Sat, 31 May 2025 19:52:56 GMT Message-Id: <202505311952.54VJqu3b029873@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: a56fe703c206 - main - Provide user interface to retrieve reported extended errors List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: a56fe703c2065069cf756bbafcb3dc35c25f5343 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=a56fe703c2065069cf756bbafcb3dc35c25f5343 commit a56fe703c2065069cf756bbafcb3dc35c25f5343 Author: Konstantin Belousov AuthorDate: 2025-05-23 05:03:12 +0000 Commit: Konstantin Belousov CommitDate: 2025-05-31 19:52:42 +0000 Provide user interface to retrieve reported extended errors Reviewed by: brooks Sponsored by: The FreeBSD Foundation MFC after: 2 weeks Differential revision: https://reviews.freebsd.org/D50483 --- include/Makefile | 3 ++- include/exterr.h | 21 +++++++++++++++++++++ lib/libc/gen/Makefile.inc | 1 + lib/libc/gen/Symbol.map | 2 ++ lib/libc/gen/libc_interposing_table.c | 1 + lib/libc/gen/uexterr_format.c | 31 +++++++++++++++++++++++++++++++ lib/libc/gen/uexterr_gettext.c | 24 ++++++++++++++++++++++++ lib/libc/include/libc_private.h | 5 +++++ lib/libthr/thread/thr_syscalls.c | 14 ++++++++++++-- 9 files changed, 99 insertions(+), 3 deletions(-) diff --git a/include/Makefile b/include/Makefile index 16d641b42a90..09b16d1f029e 100644 --- a/include/Makefile +++ b/include/Makefile @@ -17,7 +17,8 @@ SUBDIR_PARALLEL= INCS= a.out.h ar.h assert.h bitstring.h byteswap.h \ complex.h cpio.h _ctype.h ctype.h \ db.h \ - dirent.h dlfcn.h elf.h elf-hints.h endian.h err.h fmtmsg.h fnmatch.h \ + dirent.h dlfcn.h elf.h elf-hints.h endian.h err.h exterr.h \ + fmtmsg.h fnmatch.h \ fstab.h fts.h ftw.h getopt.h glob.h grp.h \ ieeefp.h ifaddrs.h \ inttypes.h iso646.h kenv.h langinfo.h libgen.h limits.h link.h \ diff --git a/include/exterr.h b/include/exterr.h new file mode 100644 index 000000000000..c0273d72ce03 --- /dev/null +++ b/include/exterr.h @@ -0,0 +1,21 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2025 The FreeBSD Foundation + * All rights reserved. + * + * This software were developed by Konstantin Belousov + * under sponsorship from the FreeBSD Foundation. + */ + +#ifndef _EXTERR_H_ +#define _EXTERR_H_ + +#include +#include + +__BEGIN_DECLS +int uexterr_gettext(char *buf, size_t bufsz); +__END_DECLS + +#endif diff --git a/lib/libc/gen/Makefile.inc b/lib/libc/gen/Makefile.inc index 6416effeb568..302fd3a004d1 100644 --- a/lib/libc/gen/Makefile.inc +++ b/lib/libc/gen/Makefile.inc @@ -159,6 +159,7 @@ SRCS+= \ ttyname.c \ ttyslot.c \ ualarm.c \ + uexterr_format.c \ uexterr_gettext.c \ ulimit.c \ uname.c \ diff --git a/lib/libc/gen/Symbol.map b/lib/libc/gen/Symbol.map index 1683b3e42425..2ddca1f20e00 100644 --- a/lib/libc/gen/Symbol.map +++ b/lib/libc/gen/Symbol.map @@ -462,6 +462,7 @@ FBSD_1.8 { psiginfo; rtld_get_var; rtld_set_var; + uexterr_gettext; }; FBSDprivate_1.0 { @@ -592,4 +593,5 @@ FBSDprivate_1.0 { __fillcontextx2; __getcontextx_size; __makecontext; + __uexterr_format; }; diff --git a/lib/libc/gen/libc_interposing_table.c b/lib/libc/gen/libc_interposing_table.c index d15d32711910..8eae6c7f5d95 100644 --- a/lib/libc/gen/libc_interposing_table.c +++ b/lib/libc/gen/libc_interposing_table.c @@ -43,6 +43,7 @@ interpos_func_t __libc_interposing[INTERPOS_MAX] = { SLOT(spinunlock, __libc_spinunlock_stub), SLOT(map_stacks_exec, __libc_map_stacks_exec), SLOT(distribute_static_tls, __libc_distribute_static_tls), + SLOT(uexterr_gettext, __libc_uexterr_gettext), }; #undef SLOT diff --git a/lib/libc/gen/uexterr_format.c b/lib/libc/gen/uexterr_format.c new file mode 100644 index 000000000000..32b57ffb6e1a --- /dev/null +++ b/lib/libc/gen/uexterr_format.c @@ -0,0 +1,31 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2025 The FreeBSD Foundation + * All rights reserved. + * + * This software were developed by Konstantin Belousov + * under sponsorship from the FreeBSD Foundation. + */ + +#include +#include +#include +#include +#include + +int +__uexterr_format(const struct uexterror *ue, char *buf, size_t bufsz) +{ + if (bufsz > UEXTERROR_MAXLEN) + bufsz = UEXTERROR_MAXLEN; + if (ue->error == 0) { + strlcpy(buf, "No error", bufsz); + return (0); + } + snprintf(buf, bufsz, + "errno %d category %u (src line %u) p1 %#jx p2 %#jx %s", + ue->error, ue->cat, ue->src_line, + (uintmax_t)ue->p1, (uintmax_t)ue->p2, ue->msg); + return (0); +} diff --git a/lib/libc/gen/uexterr_gettext.c b/lib/libc/gen/uexterr_gettext.c index 1ee295556a4e..b4bb93cfdb50 100644 --- a/lib/libc/gen/uexterr_gettext.c +++ b/lib/libc/gen/uexterr_gettext.c @@ -1,7 +1,18 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2025 The FreeBSD Foundation + * All rights reserved. + * + * This software were developed by Konstantin Belousov + * under sponsorship from the FreeBSD Foundation. + */ + #include #include #include #include +#include "libc_private.h" static struct uexterror uexterr = { .ver = UEXTERROR_VER, @@ -13,3 +24,16 @@ uexterr_ctr(void) { exterrctl(EXTERRCTL_ENABLE, 0, &uexterr); } + +int +__libc_uexterr_gettext(char *buf, size_t bufsz) +{ + return (__uexterr_format(&uexterr, buf, bufsz)); +} + +int +uexterr_gettext(char *buf, size_t bufsz) +{ + return (((int (*)(char *, size_t)) + __libc_interposing[INTERPOS_uexterr_gettext])(buf, bufsz)); +} diff --git a/lib/libc/include/libc_private.h b/lib/libc/include/libc_private.h index 41b44456b6ee..1bc22f3931a5 100644 --- a/lib/libc/include/libc_private.h +++ b/lib/libc/include/libc_private.h @@ -251,6 +251,7 @@ enum { INTERPOS_clock_nanosleep, INTERPOS_distribute_static_tls, INTERPOS_pdfork, + INTERPOS_uexterr_gettext, INTERPOS_MAX }; @@ -380,4 +381,8 @@ struct __nl_cat_d *__catopen_l(const char *name, int type, int __strerror_rl(int errnum, char *strerrbuf, size_t buflen, struct _xlocale *locale); +struct uexterror; +int __uexterr_format(const struct uexterror *ue, char *buf, size_t bufsz); +int __libc_uexterr_gettext(char *buf, size_t bufsz); + #endif /* _LIBC_PRIVATE_H_ */ diff --git a/lib/libthr/thread/thr_syscalls.c b/lib/libthr/thread/thr_syscalls.c index 22f9c1f68ec2..188374a30070 100644 --- a/lib/libthr/thread/thr_syscalls.c +++ b/lib/libthr/thread/thr_syscalls.c @@ -66,9 +66,9 @@ */ #include "namespace.h" -#include -#include #include +#include +#include #include #include #include @@ -620,6 +620,15 @@ __thr_writev(int fd, const struct iovec *iov, int iovcnt) return (ret); } +static int +__thr_uexterr_gettext(char *buf, size_t bufsz) +{ + struct pthread *curthread; + + curthread = _get_curthread(); + return (__uexterr_format(&curthread->uexterr, buf, bufsz)); +} + void __thr_interpose_libc(void) { @@ -675,6 +684,7 @@ __thr_interpose_libc(void) SLOT(fdatasync); SLOT(clock_nanosleep); SLOT(pdfork); + SLOT(uexterr_gettext); #undef SLOT *(__libc_interposing_slot( INTERPOS__pthread_mutex_init_calloc_cb)) = From nobody Sat May 31 19:52:57 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b8rPR1jsFz5xVQ7; Sat, 31 May 2025 19:52: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b8rPQ2Tzpz3JKw; Sat, 31 May 2025 19:52:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748721178; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4kcqPEoBrfYSUQhc9bB6JhINAYGJUBaWSWr7vZDeaO8=; b=nOYTKDhSj4KMIdyjlHUlWWYjdLbO+k1x8b/isI9GFcKouHWff0QBjb1oO9HgyhyVY0k+LU 6R+Aye7JRyf7Elj+PFGoDs2k4WzpkuiQ6QpIcVdYiDMUrtZ+YlCHwUIsYgIJCs+qf3UaVV gmbd6LZCi/2y1vj9U3awW8vPSRe9tELvVpsl7S5zFLjuJqMBNGhyYAy4nusgwSgsitFjCS Pnzt/6PFGqwY4Kf4opleYrvPw8Rp//r/bPeBOTvt9XGotTj7Wro4n8UPUlJFrLkYjqAWyK hKU2eJ49AOFBXqOGncHsCdBER3+EDPs631bJbqM1KLM4JTqQLRSIUzTg9iKYFg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748721178; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4kcqPEoBrfYSUQhc9bB6JhINAYGJUBaWSWr7vZDeaO8=; b=nh0z0Bi7SSzs8Lz6txjCA/akKW3gvxSFnSvJWxmOaz5Xdo9H1mN5cchzvokQEDcKF6oUls sD7UaRfu3HtGy5k8oY9cQG1v6NrEyAcgph+iRIB3ztfE8iIYKZxQ7G/tZs9FbEAV15jVwl bh4z8yhPL0bG4a7/E0zgPuOSVrZBKg3SlLAvTOCFalO1ERWCFE4q6XGvmF8/9xKgBS5b6F /RfHgDbWmxLCmdRFu5TE2pXw70BgV8LNOTP8qsitmh5CNTfq8dFAWynBY50RIyKdJVGRdg wIJex9Ngh+qyo4VPxuEoaC/a9ggxiSdF9qj6VnFvl+0KbC/MEXESjhl7cMa6Lg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748721178; a=rsa-sha256; cv=none; b=ogdAhWhxkGUzdThl+1l8nWSGuH/Gt7/jGIoVdkDbk+xXfH3BP+eC/VX+GHzj6TLgHdc0nJ nCK9V1GPdmetkZbDrpxmET9ZpAJYMhrH4WzUIDMz8U+ZhMhKif3nTFP3JtbJmNwN6IufiR UUKGQ33+/3/w7Icz8RKtLNIOFX+17LwB5OkVxVSBy7MV9kzHMaGKMKKRFK/kK8sxL8jydH VF11brBa3Iu1hhMqcwB8roqLCCyz99PmaiAUgck3HCHewZ1HIMnQ8U0Tdf2i2OcFj2auDl AxrpHcDOnELRNOQ2gKWUozomg/yvk+Dx8nhbQcnfF9PVa0+m4/cwE6+ygjjZOg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b8rPQ0CvqzsDm; Sat, 31 May 2025 19:52: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 54VJqvEr029910; Sat, 31 May 2025 19:52:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54VJqvpi029907; Sat, 31 May 2025 19:52:57 GMT (envelope-from git) Date: Sat, 31 May 2025 19:52:57 GMT Message-Id: <202505311952.54VJqvpi029907@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: 8e8d3068dcbe - main - amd64 GENERIC: enable bloating kernel with ext errors strings List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 8e8d3068dcbe0dce4b028666c6cf8dc151c63353 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=8e8d3068dcbe0dce4b028666c6cf8dc151c63353 commit 8e8d3068dcbe0dce4b028666c6cf8dc151c63353 Author: Konstantin Belousov AuthorDate: 2025-05-23 05:03:45 +0000 Commit: Konstantin Belousov CommitDate: 2025-05-31 19:52:42 +0000 amd64 GENERIC: enable bloating kernel with ext errors strings Reviewed by: brooks Sponsored by: The FreeBSD Foundation MFC after: 2 weeks Differential revision: https://reviews.freebsd.org/D50483 --- sys/amd64/conf/GENERIC | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index 1c44bc54376b..e32483f457c9 100644 --- a/sys/amd64/conf/GENERIC +++ b/sys/amd64/conf/GENERIC @@ -26,6 +26,7 @@ makeoptions WITH_CTF=1 # Run ctfconvert(1) for DTrace support options SCHED_ULE # ULE scheduler options NUMA # Non-Uniform Memory Architecture support options PREEMPTION # Enable kernel thread preemption +options BLOW_KERNEL_WITH_EXTERR options VIMAGE # Subsystem virtualization, e.g. VNET options INET # InterNETworking options INET6 # IPv6 communications protocols From nobody Sat May 31 19:52:59 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b8rPS6ZnCz5xVMt; Sat, 31 May 2025 19:53: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b8rPR50Tdz3JHx; Sat, 31 May 2025 19:52:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748721180; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UQb9Bx0denXx/rqX2qIeVqVrgO2w5+usK4t0xd9heeA=; b=qxyvNvGuyTVkbv64XM8eD7yUdWTeFyTIRziFm2iDMaQmQOhsPTV3SLiF5RlU4tzLbu1K6+ 01m2GNVuyS0lslT1awdBAUOM55uofb3ITNZDJov2+qxZoS352OZmzbrV0u2tEM0+2bE4g5 yNH2kN4yNZMZN0gzxoEs19ULcKHub1PNy8lL+ALh4hq4fYzf82KZhnqsu4hPsnAzWB14On zdaeAvjrwsbkExmtpTF2fGTocPchDQE9SLhjF1wB2yYKIWEoDvNrH/oVFvbrjZ5F/UuUqP /H5nRLYFBi2mHXcXJt/2b11UPLcM9ebjQK7Z8p4Zca3x7+yFXTcpKbUOLRG5ug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748721180; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UQb9Bx0denXx/rqX2qIeVqVrgO2w5+usK4t0xd9heeA=; b=l2bvTvzyvG3x4ANzVVqNeprXI2O8vBJg8pdto3kD7Ca1/zkhYLcXY5ShPU3OvTQKgme7bw inVCWt9ZwlU8Rk5U0O2Zx17IwCdXj9ETnDuiP4y2ej+LKrD3C7loDEPaCou3VOAU5z4TtK GWoXMNYbimKWpdeuCWB8An5Lqm1cqIHVy2nbctrv9hHBvbswOzZNNHZxkmZeZJ53E2X0Es uuRBUfb+Y9w+T3ZDXgvzyKvO8i9CaeszwPfjcC5YkvzpM3+lVzlby9kPCYymkEHgF6oOrK FvWvDYmDsdFUwBP9V5AVfo35RW+IXZrkSbiAy79dU8V5JQx7w2VezYuFKXe+vQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748721180; a=rsa-sha256; cv=none; b=SF1Ch+elkXMGp8la9FbeiG3N2t5phUNpuDasaWl7ak2wZT7ah38enECGIf1j3jGliWcitX V+0rT3/aTik+mYQxErt0b+UGgI64ln3CkScJRzQHObPShLkKFIPE1BC2qm0SdTSbpZ7U7A fuSqEznVbg+FYlV6gTPfOQKE/vxWGSAS3Kz7bRhCEhN+rtK1CN6YhJE2zAQk0rfCD0/Oya GyCw9iZ6llHZcrdiez0YZikJOjsgV1msyJFxx3VgTGeZJaIZfVssCUwJ5X1MqbmTKDwn1o bHY4CbDIqP4PQUlXHj9I/PWg4SU49fCC8AnBbjW2PgNwinzQhXC1aQPwVuRMcg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b8rPR1bjmzsDn; Sat, 31 May 2025 19:52: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 54VJqxfB029944; Sat, 31 May 2025 19:52:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54VJqxrA029941; Sat, 31 May 2025 19:52:59 GMT (envelope-from git) Date: Sat, 31 May 2025 19:52:59 GMT Message-Id: <202505311952.54VJqxrA029941@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: bfe9e97a23af - main - Regen List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: bfe9e97a23af40f9d6343c92f6adf137b2ca23f1 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=bfe9e97a23af40f9d6343c92f6adf137b2ca23f1 commit bfe9e97a23af40f9d6343c92f6adf137b2ca23f1 Author: Konstantin Belousov AuthorDate: 2025-05-23 05:07:21 +0000 Commit: Konstantin Belousov CommitDate: 2025-05-31 19:52:42 +0000 Regen --- lib/libsys/_libsys.h | 2 ++ lib/libsys/syscalls.map | 2 ++ sys/compat/freebsd32/freebsd32_syscall.h | 3 ++- sys/compat/freebsd32/freebsd32_syscalls.c | 1 + sys/compat/freebsd32/freebsd32_sysent.c | 1 + sys/compat/freebsd32/freebsd32_systrace_args.c | 30 ++++++++++++++++++++++++++ sys/kern/init_sysent.c | 1 + sys/kern/syscalls.c | 1 + sys/kern/systrace_args.c | 30 ++++++++++++++++++++++++++ sys/sys/syscall.h | 3 ++- sys/sys/syscall.mk | 3 ++- sys/sys/sysproto.h | 7 ++++++ 12 files changed, 81 insertions(+), 3 deletions(-) diff --git a/lib/libsys/_libsys.h b/lib/libsys/_libsys.h index d06017edf6d9..e2a8f2253814 100644 --- a/lib/libsys/_libsys.h +++ b/lib/libsys/_libsys.h @@ -465,6 +465,7 @@ typedef int (__sys_kcmp_t)(pid_t, pid_t, int, uintptr_t, uintptr_t); typedef int (__sys_getrlimitusage_t)(u_int, int, rlim_t *); typedef int (__sys_fchroot_t)(int); typedef int (__sys_setcred_t)(u_int, const struct setcred *, size_t); +typedef int (__sys_exterrctl_t)(u_int, u_int, void *); void __sys_exit(int rval); int __sys_fork(void); @@ -866,6 +867,7 @@ int __sys_kcmp(pid_t pid1, pid_t pid2, int type, uintptr_t idx1, uintptr_t idx2) int __sys_getrlimitusage(u_int which, int flags, rlim_t * res); int __sys_fchroot(int fd); int __sys_setcred(u_int flags, const struct setcred * wcred, size_t size); +int __sys_exterrctl(u_int op, u_int flags, void * ptr); __END_DECLS #endif /* __LIBSYS_H_ */ diff --git a/lib/libsys/syscalls.map b/lib/libsys/syscalls.map index 474df2cd8b1c..51be88203c17 100644 --- a/lib/libsys/syscalls.map +++ b/lib/libsys/syscalls.map @@ -807,4 +807,6 @@ FBSDprivate_1.0 { __sys_fchroot; _setcred; __sys_setcred; + _exterrctl; + __sys_exterrctl; }; diff --git a/sys/compat/freebsd32/freebsd32_syscall.h b/sys/compat/freebsd32/freebsd32_syscall.h index 37be6137289e..eaa086188b5f 100644 --- a/sys/compat/freebsd32/freebsd32_syscall.h +++ b/sys/compat/freebsd32/freebsd32_syscall.h @@ -510,4 +510,5 @@ #define FREEBSD32_SYS_getrlimitusage 589 #define FREEBSD32_SYS_fchroot 590 #define FREEBSD32_SYS_freebsd32_setcred 591 -#define FREEBSD32_SYS_MAXSYSCALL 592 +#define FREEBSD32_SYS_exterrctl 592 +#define FREEBSD32_SYS_MAXSYSCALL 593 diff --git a/sys/compat/freebsd32/freebsd32_syscalls.c b/sys/compat/freebsd32/freebsd32_syscalls.c index 45d5563d6660..989f32a5c6f0 100644 --- a/sys/compat/freebsd32/freebsd32_syscalls.c +++ b/sys/compat/freebsd32/freebsd32_syscalls.c @@ -597,4 +597,5 @@ const char *freebsd32_syscallnames[] = { "getrlimitusage", /* 589 = getrlimitusage */ "fchroot", /* 590 = fchroot */ "freebsd32_setcred", /* 591 = freebsd32_setcred */ + "exterrctl", /* 592 = exterrctl */ }; diff --git a/sys/compat/freebsd32/freebsd32_sysent.c b/sys/compat/freebsd32/freebsd32_sysent.c index 321d2264b65e..476fe2ac3f80 100644 --- a/sys/compat/freebsd32/freebsd32_sysent.c +++ b/sys/compat/freebsd32/freebsd32_sysent.c @@ -659,4 +659,5 @@ struct sysent freebsd32_sysent[] = { { .sy_narg = AS(getrlimitusage_args), .sy_call = (sy_call_t *)sys_getrlimitusage, .sy_auevent = AUE_NULL, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 589 = getrlimitusage */ { .sy_narg = AS(fchroot_args), .sy_call = (sy_call_t *)sys_fchroot, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 590 = fchroot */ { .sy_narg = AS(freebsd32_setcred_args), .sy_call = (sy_call_t *)freebsd32_setcred, .sy_auevent = AUE_SETCRED, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 591 = freebsd32_setcred */ + { .sy_narg = AS(exterrctl_args), .sy_call = (sy_call_t *)sys_exterrctl, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 592 = exterrctl */ }; diff --git a/sys/compat/freebsd32/freebsd32_systrace_args.c b/sys/compat/freebsd32/freebsd32_systrace_args.c index 6ffb00784d10..cf08938cd5de 100644 --- a/sys/compat/freebsd32/freebsd32_systrace_args.c +++ b/sys/compat/freebsd32/freebsd32_systrace_args.c @@ -3386,6 +3386,15 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) *n_args = 3; break; } + /* exterrctl */ + case 592: { + struct exterrctl_args *p = params; + uarg[a++] = p->op; /* u_int */ + uarg[a++] = p->flags; /* u_int */ + uarg[a++] = (intptr_t)p->ptr; /* void * */ + *n_args = 3; + break; + } default: *n_args = 0; break; @@ -9147,6 +9156,22 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) break; }; break; + /* exterrctl */ + case 592: + switch (ndx) { + case 0: + p = "u_int"; + break; + case 1: + p = "u_int"; + break; + case 2: + p = "userland void *"; + break; + default: + break; + }; + break; default: break; }; @@ -11040,6 +11065,11 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) if (ndx == 0 || ndx == 1) p = "int"; break; + /* exterrctl */ + case 592: + if (ndx == 0 || ndx == 1) + p = "int"; + break; default: break; }; diff --git a/sys/kern/init_sysent.c b/sys/kern/init_sysent.c index f34fae00f532..a48a513aa3b5 100644 --- a/sys/kern/init_sysent.c +++ b/sys/kern/init_sysent.c @@ -658,4 +658,5 @@ struct sysent sysent[] = { { .sy_narg = AS(getrlimitusage_args), .sy_call = (sy_call_t *)sys_getrlimitusage, .sy_auevent = AUE_NULL, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 589 = getrlimitusage */ { .sy_narg = AS(fchroot_args), .sy_call = (sy_call_t *)sys_fchroot, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 590 = fchroot */ { .sy_narg = AS(setcred_args), .sy_call = (sy_call_t *)sys_setcred, .sy_auevent = AUE_SETCRED, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 591 = setcred */ + { .sy_narg = AS(exterrctl_args), .sy_call = (sy_call_t *)sys_exterrctl, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 592 = exterrctl */ }; diff --git a/sys/kern/syscalls.c b/sys/kern/syscalls.c index f8543cfa611d..fa36cc824078 100644 --- a/sys/kern/syscalls.c +++ b/sys/kern/syscalls.c @@ -597,4 +597,5 @@ const char *syscallnames[] = { "getrlimitusage", /* 589 = getrlimitusage */ "fchroot", /* 590 = fchroot */ "setcred", /* 591 = setcred */ + "exterrctl", /* 592 = exterrctl */ }; diff --git a/sys/kern/systrace_args.c b/sys/kern/systrace_args.c index d1877f3c9333..15789d3eb5fa 100644 --- a/sys/kern/systrace_args.c +++ b/sys/kern/systrace_args.c @@ -3473,6 +3473,15 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) *n_args = 3; break; } + /* exterrctl */ + case 592: { + struct exterrctl_args *p = params; + uarg[a++] = p->op; /* u_int */ + uarg[a++] = p->flags; /* u_int */ + uarg[a++] = (intptr_t)p->ptr; /* void * */ + *n_args = 3; + break; + } default: *n_args = 0; break; @@ -9292,6 +9301,22 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) break; }; break; + /* exterrctl */ + case 592: + switch (ndx) { + case 0: + p = "u_int"; + break; + case 1: + p = "u_int"; + break; + case 2: + p = "userland void *"; + break; + default: + break; + }; + break; default: break; }; @@ -11275,6 +11300,11 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) if (ndx == 0 || ndx == 1) p = "int"; break; + /* exterrctl */ + case 592: + if (ndx == 0 || ndx == 1) + p = "int"; + break; default: break; }; diff --git a/sys/sys/syscall.h b/sys/sys/syscall.h index 1e1a36c8951b..68406a2dfc29 100644 --- a/sys/sys/syscall.h +++ b/sys/sys/syscall.h @@ -528,4 +528,5 @@ #define SYS_getrlimitusage 589 #define SYS_fchroot 590 #define SYS_setcred 591 -#define SYS_MAXSYSCALL 592 +#define SYS_exterrctl 592 +#define SYS_MAXSYSCALL 593 diff --git a/sys/sys/syscall.mk b/sys/sys/syscall.mk index d1f2b0e2dbb7..9a90a63f35a3 100644 --- a/sys/sys/syscall.mk +++ b/sys/sys/syscall.mk @@ -433,4 +433,5 @@ MIASM = \ kcmp.o \ getrlimitusage.o \ fchroot.o \ - setcred.o + setcred.o \ + exterrctl.o diff --git a/sys/sys/sysproto.h b/sys/sys/sysproto.h index 55f91424d16f..94da81c84d25 100644 --- a/sys/sys/sysproto.h +++ b/sys/sys/sysproto.h @@ -1886,6 +1886,11 @@ struct setcred_args { char wcred_l_[PADL_(const struct setcred *)]; const struct setcred * wcred; char wcred_r_[PADR_(const struct setcred *)]; char size_l_[PADL_(size_t)]; size_t size; char size_r_[PADR_(size_t)]; }; +struct exterrctl_args { + char op_l_[PADL_(u_int)]; u_int op; char op_r_[PADR_(u_int)]; + char flags_l_[PADL_(u_int)]; u_int flags; char flags_r_[PADR_(u_int)]; + char ptr_l_[PADL_(void *)]; void * ptr; char ptr_r_[PADR_(void *)]; +}; int sys_exit(struct thread *, struct exit_args *); int sys_fork(struct thread *, struct fork_args *); int sys_read(struct thread *, struct read_args *); @@ -2287,6 +2292,7 @@ int sys_kcmp(struct thread *, struct kcmp_args *); int sys_getrlimitusage(struct thread *, struct getrlimitusage_args *); int sys_fchroot(struct thread *, struct fchroot_args *); int sys_setcred(struct thread *, struct setcred_args *); +int sys_exterrctl(struct thread *, struct exterrctl_args *); #ifdef COMPAT_43 @@ -3268,6 +3274,7 @@ int freebsd13_swapoff(struct thread *, struct freebsd13_swapoff_args *); #define SYS_AUE_getrlimitusage AUE_NULL #define SYS_AUE_fchroot AUE_NULL #define SYS_AUE_setcred AUE_SETCRED +#define SYS_AUE_exterrctl AUE_NULL #undef PAD_ #undef PADL_ From nobody Sat May 31 23:03:53 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b8wdk4G0lz5xh6h; Sat, 31 May 2025 23:03: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b8wdk0rLfz3vc8; Sat, 31 May 2025 23:03:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748732634; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BB8tkOa91uGeLa8wr/bItStUZ64iNpmUFH09zv7DEqs=; b=N0qwB/OlH2V0CDnpHaXZAlP9cEvWYTu9xdrkPE+iMYI+jgyAvNlme5rkEwJ3vaWGuOZsVP szJhQ1H6Bu3lKQ8lIp8puuNQY6tuE2O2uNwGO0fKg8xZDaA9jQOtdD0dwDlghispww1Bks km6GhtlCZmFHQTmHrYYbikoX/03PXzjbm7blwdVx0yeIzJuZuGc1tjQVv4aUNNlzkZhKX2 b8dB5JeMliLm1r2x5zD4rxdyI/o+2ww9lJr101REcnxKL3f+VL8I+2/EaY9WYjBb+IlNSz ltSJUxzoAVD4XpoiR97lgw64V6/i/qhXvldFFQQzdByZkK31ebMnbma2+IZCyw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748732634; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BB8tkOa91uGeLa8wr/bItStUZ64iNpmUFH09zv7DEqs=; b=EgQeoIq20P+3WvSzG8qWLUCDL7M8qv+OHz8N2xBptaYT8in1nfiUmOZFhMwfBERcbLyoDh 14DxR2LYyaB2r/4D6hOzYY2qm1XsDlMmK3wMXD+jlSZxcFO7sdV/0MR8r3mDi1aDxzW/Io PEUqac/+BZE7sLn57CPR6mn4DB9VKaDvJgNSmV9pskUJe6+Ef8vGckcROKpv83MQzH796U PXNboKeXh0PdqrDU7UK6v5dCkTpwGaCl6JQH3G60JiXOfWtDax4ORgWdk8ki1GErh7Y2aN QQqp+nKarXSReHFoZodabqkjLq3L2Jf940m9MSnhuRN/g0HmDtYjeleMOzKGhQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748732634; a=rsa-sha256; cv=none; b=cpIPtDMezrL/ZorZ8f2lYHxPNe63g+DcygQpoZU+9Qjo2kT8aaahzTANGNJgEqykaxdkgq 5sRdnhsp1BlLwpE7+405Yo9rSEHmICCI9ST7R0ReiVT2Aq8AHvaKt6/glIcJnMhqe/EP9d 3NjqopOP0Kc/ruixZkrWeadHr7jb23Zbb/mJYpu/+TSCxcwk+E2v9ucOlv3LOYUicAUUvu xUCW/KoYN6Jt9lA7kGGTCmidjcnLOVOOgT3HVl6lTOYZSxs9ORxH4SJsLNK9hLtXWvF8X1 gQ6PDjTIP8mesretAfOcUMx6HEsrawU4mUKwvvKEVrLiC1aI7A7fjWjzC7/U7w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b8wdk0DcWzxjy; Sat, 31 May 2025 23:03: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 54VN3rko087439; Sat, 31 May 2025 23:03:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54VN3rQt087436; Sat, 31 May 2025 23:03:53 GMT (envelope-from git) Date: Sat, 31 May 2025 23:03:53 GMT Message-Id: <202505312303.54VN3rQt087436@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: 970a71e1ef9a - main - Rename BLOW_KERNEL_WITH_EXTERR to BLOAT_KERNEL_WITH_EXTERR List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 970a71e1ef9a9792059c7c824a0106abb4fddcec Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=970a71e1ef9a9792059c7c824a0106abb4fddcec commit 970a71e1ef9a9792059c7c824a0106abb4fddcec Author: Konstantin Belousov AuthorDate: 2025-05-31 22:06:46 +0000 Commit: Konstantin Belousov CommitDate: 2025-05-31 22:59:55 +0000 Rename BLOW_KERNEL_WITH_EXTERR to BLOAT_KERNEL_WITH_EXTERR Guessed by: alc Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/amd64/conf/GENERIC | 2 +- sys/conf/options | 2 +- sys/sys/exterrvar.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index e32483f457c9..385eb9667652 100644 --- a/sys/amd64/conf/GENERIC +++ b/sys/amd64/conf/GENERIC @@ -26,7 +26,7 @@ makeoptions WITH_CTF=1 # Run ctfconvert(1) for DTrace support options SCHED_ULE # ULE scheduler options NUMA # Non-Uniform Memory Architecture support options PREEMPTION # Enable kernel thread preemption -options BLOW_KERNEL_WITH_EXTERR +options BLOAT_KERNEL_WITH_EXTERR options VIMAGE # Subsystem virtualization, e.g. VNET options INET # InterNETworking options INET6 # IPv6 communications protocols diff --git a/sys/conf/options b/sys/conf/options index b5e8971dfa54..b218226b4126 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -53,7 +53,7 @@ DDB_CAPTURE_MAXBUFSIZE opt_ddb.h DDB_CTF opt_ddb.h DDB_NUMSYM opt_ddb.h EARLY_PRINTF opt_global.h -BLOW_KERNEL_WITH_EXTERR opt_global.h +BLOAT_KERNEL_WITH_EXTERR opt_global.h FULL_BUF_TRACKING opt_global.h GDB KDB opt_global.h diff --git a/sys/sys/exterrvar.h b/sys/sys/exterrvar.h index 6eb08d63aa48..5f55e377239a 100644 --- a/sys/sys/exterrvar.h +++ b/sys/sys/exterrvar.h @@ -41,7 +41,7 @@ struct uexterror { #error "Specify error category before including sys/exterrvar.h" #endif -#ifdef BLOW_KERNEL_WITH_EXTERR +#ifdef BLOAT_KERNEL_WITH_EXTERR #define SET_ERROR_MSG(mmsg) _Td->td_kexterr.msg = mmsg #else #define SET_ERROR_MSG(mmsg) _Td->td_kexterr.msg = NULL From nobody Sun Jun 1 00:42:29 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b8yqT6pfpz5xnZM; Sun, 01 Jun 2025 00:42: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b8yqT38lGz3TLb; Sun, 01 Jun 2025 00:42:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748738549; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MQ9b1yLP+foQUrpQdKKlg75kCWdu8tK6XT+wg6/W44s=; b=kCT/PLQtX0eWE0IQfUUUuOAblLfS5bPp0MQW1sbqEA2eNjUPwvfDP0v996kt/KJgyVTFnK IXIEqy0LZ5O8lqof25+U35DF1qtqqUCWQYMWsNiYgxLGHoeZMtuiSwl4Q+XcbpAne77hUW BCbWBRDx5UA5FLLwmhqa6T/zquaQq0/wL8/o5W6zmmeq6v+msKX4NUQormWO4J1qQnGFTw PHOb1drAilAu2BGa0acQv+TqYnUfBR92qcbAclMvw0u7JU//H6BOVTV8dal5Xu8wxFX9Pi cN8uSbQ6S4IrraErO+V7qW2oGsx6lcIYJc7ty+cBKaQ8DbO647jtK+Jr2PJbHg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748738549; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MQ9b1yLP+foQUrpQdKKlg75kCWdu8tK6XT+wg6/W44s=; b=Qi72pSsnTxIXGmBEIg7p3ntftsj8SDSHbV5TC5QJAHmXavX+uwIQYKe8ZfZ1zBWB3PUh9k y7DN0eR487k6SOoY4xGT0+2RlvSnU187Pj8dwRs1WGpBiQc6uxivErEMpmxXJWYkz3ZHzp MogkxQNx2ritpKgwWMehLSAEQp+hiMYVS7hDbQuAarRJH0TKfybC/cIaTKPpOqqKaxHfzT kK+/FlHrM7ATP4dfsJpiiH2qkkoS3uzhaQeaRE4LXALFb+A65DnXAwNiFQIW8f1SdeSWjo hQ2/ZwtCoBzD8LTfVoa9iF1s9YmVOjWwj8Sa3aSyCQtv+dTMbv0UB/XVgzxDBw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748738549; a=rsa-sha256; cv=none; b=FnBgbyzJSs6qf0u8LQbSZ8NO1OrOGzx7vqWElEfYi9GjJZ1QRo8VY9W9B2vYYdA2vPiOly 8wsd5q31zrWy6A4QBd/MamNtXSNZ5mRI1qruLYrQlaUnlG4ZiAmhqozKqYFHH2OghYCsT5 5IIcJtSYCCM/+Gdunha59MhwHQgRJBgRjcC9wFRqFzFba57TiyWALQxev3Z79hqj+jmXB1 2A4EPcDGzngMjimnH2Omwd6A77LEU202GEcIQbFt7NOpJxgJOHhFiuTYoMm6M8mISRcrZk lGLSK4AqUtyQYfy7YTHYxMLUEzH3Mf6DVMeXWO9137ze1AgOc6AGX6Eeza2Zvg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b8yqT2HwXz11hR; Sun, 01 Jun 2025 00:42: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 5510gTV0073728; Sun, 1 Jun 2025 00:42:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5510gT8k073725; Sun, 1 Jun 2025 00:42:29 GMT (envelope-from git) Date: Sun, 1 Jun 2025 00:42:29 GMT Message-Id: <202506010042.5510gT8k073725@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: c6f345bda517 - stable/14 - pkg/FreeBSD.conf: Fix comments to reflect -kmods List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c6f345bda5171ce879caa2d588d24ffb5aff37d2 Auto-Submitted: auto-generated The branch stable/14 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=c6f345bda5171ce879caa2d588d24ffb5aff37d2 commit c6f345bda5171ce879caa2d588d24ffb5aff37d2 Author: Colin Percival AuthorDate: 2025-05-29 23:40:30 +0000 Commit: Colin Percival CommitDate: 2025-06-01 00:42:17 +0000 pkg/FreeBSD.conf: Fix comments to reflect -kmods Now that this file lists two repositories, the text "to disable *this* repository" no longer makes sense. Also, expand the example to list how to disable both FreeBSD and FreeBSD-kmods repositories. Reported by: Graham Perrin MFC after: 3 days (cherry picked from commit 955ab1a8f21ec1a662a87fc5e76e6d5690e09085) --- usr.sbin/pkg/FreeBSD.conf.latest | 5 +++-- usr.sbin/pkg/FreeBSD.conf.quarterly | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/usr.sbin/pkg/FreeBSD.conf.latest b/usr.sbin/pkg/FreeBSD.conf.latest index b7b528bc3756..2175a3387437 100644 --- a/usr.sbin/pkg/FreeBSD.conf.latest +++ b/usr.sbin/pkg/FreeBSD.conf.latest @@ -1,9 +1,10 @@ # -# To disable this repository, instead of modifying or removing this file, -# create a /usr/local/etc/pkg/repos/FreeBSD.conf file: +# To disable a repository, instead of modifying or removing this file, +# create a /usr/local/etc/pkg/repos/FreeBSD.conf file, e.g.: # # mkdir -p /usr/local/etc/pkg/repos # echo "FreeBSD: { enabled: no }" > /usr/local/etc/pkg/repos/FreeBSD.conf +# echo "FreeBSD-kmods: { enabled: no }" >> /usr/local/etc/pkg/repos/FreeBSD.conf # FreeBSD: { diff --git a/usr.sbin/pkg/FreeBSD.conf.quarterly b/usr.sbin/pkg/FreeBSD.conf.quarterly index 2050350baa1f..bd0ee13b9b43 100644 --- a/usr.sbin/pkg/FreeBSD.conf.quarterly +++ b/usr.sbin/pkg/FreeBSD.conf.quarterly @@ -1,9 +1,10 @@ # -# To disable this repository, instead of modifying or removing this file, -# create a /usr/local/etc/pkg/repos/FreeBSD.conf file: +# To disable a repository, instead of modifying or removing this file, +# create a /usr/local/etc/pkg/repos/FreeBSD.conf file, e.g.: # # mkdir -p /usr/local/etc/pkg/repos # echo "FreeBSD: { enabled: no }" > /usr/local/etc/pkg/repos/FreeBSD.conf +# echo "FreeBSD-kmods: { enabled: no }" >> /usr/local/etc/pkg/repos/FreeBSD.conf # FreeBSD: { From nobody Sun Jun 1 02:10:19 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b90mr1lVwz5xtFP; Sun, 01 Jun 2025 02:10: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b90mq6NKKz3R3R; Sun, 01 Jun 2025 02:10:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748743820; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HKz+HrHWhheXzVnrKxiT/+Y7MCoxr4bKIYGV/crjx+U=; b=idWsgp4hl3oun7oa+8RY5BX+M0oo6cuEsW6VjHtow9NQPuvmn6IP4G0hcbKHmXSLnkGoi6 2PJlH6X4lgNKrV4zmPtoH9ItsLjRv0pvcvDAxgZcHF5n1nAuC+Dv7vq4D3iuff4gySPhlt S2RuVVKqeaQ3iesh6dRgncL4oad7RRxetwNGf42XBfrzSYO+OAzCHkREkfkAsgig67msOS eavZc8pNgiyrVqFcN6BH1Gz0UXsp3rPhxZCChW1ZIzW+/45bq6HTDPOKruOzTFkz+KopLX iTNXAxDXed1j4pgdVYO73olcmXBaEQTRE/YiTjpLMh7qFSLLzletbARvHLzqNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748743819; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HKz+HrHWhheXzVnrKxiT/+Y7MCoxr4bKIYGV/crjx+U=; b=BCrzi+bB/0pouWSFh3OWWEMLZTiTGBc+BoWpXTAIeeBV1uQ0XFY0Mm6b1NH7CtOSxLB2t0 3FXMyCSiofuhZlxHw0ghSlkaA6DRKD1D5Rb+y9ur5cYxzumLjphOzvJfcrec9cEpIMyEud xSPrfiA2q6PKLw/fd/0y48X05VjMvnXXAuP3yVcJpa/zEbUHhygOI2enyF/N81sNH6mcDP kyHnpOOlInO6F64QptH4GoOSML8OlRaLig+Mu3RXgXMiSkOCC7mjEkKoRIFxkaPFRF0pfS tmEOY8dvorh+/wfcLk0dlMbAKLH0JiPc3nZNPJS0+KBOqIlR/eeZmRQzIaANmg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748743819; a=rsa-sha256; cv=none; b=f8DpIsc8BRFsaR3fqGuvTlyuLE7kByUTDu6MMJSLwxKVVWeP7IC3oTvuC/FASd/lo9IOdb rY/9SpiLJ7sPnvb2zQzudUyAw2VRt5+6BRC3NJ1zgcOfyHR3RA0iXfeU30kHgroHbIgtL3 p7R8nqWh9dPPIex9b6//lQw8B7G922raTHGG6xgr9L38+gbxhTXE9xaLm2BcYe996xW3sg NBFqB9mvi1kw7B2T4qvOJMvygs80hdflfhCVgVuFWpAgDVRlFZ8dIdfZgGH/S7ZjYsj5ny QK6tzJ7gCFnSYzCQNECJqATngvKHP9CY8mrgsbWVAvZjwkl+WvfBQ4FixTiLxA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b90mq5Lkhz13Z0; Sun, 01 Jun 2025 02:10: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 5512AJl4034564; Sun, 1 Jun 2025 02:10:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5512AJx9034558; Sun, 1 Jun 2025 02:10:19 GMT (envelope-from git) Date: Sun, 1 Jun 2025 02:10:19 GMT Message-Id: <202506010210.5512AJx9034558@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: 08419bf19469 - main - don't gate ctl{d,adm} behind MK_ISCSI List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 08419bf194697d08837b0e0cd7ea30e911eec4bf Auto-Submitted: auto-generated The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=08419bf194697d08837b0e0cd7ea30e911eec4bf commit 08419bf194697d08837b0e0cd7ea30e911eec4bf Author: Lexi Winter AuthorDate: 2025-06-01 02:04:37 +0000 Commit: Lexi Winter CommitDate: 2025-06-01 02:08:40 +0000 don't gate ctl{d,adm} behind MK_ISCSI These are no longer specific to iSCSI; always build them. Reviewed by: kevans, jhb Approved by: kevans (mentor) Differential Revision: https://reviews.freebsd.org/D50625 --- libexec/rc/rc.d/Makefile | 8 ++++---- usr.sbin/Makefile | 4 +++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/libexec/rc/rc.d/Makefile b/libexec/rc/rc.d/Makefile index d463a0732c52..4696ef223378 100644 --- a/libexec/rc/rc.d/Makefile +++ b/libexec/rc/rc.d/Makefile @@ -114,6 +114,10 @@ CONFGROUPS+= CRON CRON+= cron CRONPACKAGE= cron +CONFGROUPS+= CTL +CTL= ctld +CTLPACKAGE= ctl + CONFGROUPS+= NFS NFS= lockd \ mountd \ @@ -263,10 +267,6 @@ CONFGROUPS+= ISCSI ISCSI= iscsictl \ iscsid ISCSIPACKAGE= iscsi - -CONFGROUPS+= CTL -CTL= ctld -CTLPACKAGE= ctl .endif .if ${MK_JAIL} != "no" diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile index 4b3223df9f1d..c361c1e5866d 100644 --- a/usr.sbin/Makefile +++ b/usr.sbin/Makefile @@ -14,6 +14,8 @@ SUBDIR= adduser \ clear_locks \ crashinfo \ cron \ + ctld \ + ctladm \ daemon \ dconschat \ devctl \ @@ -153,7 +155,7 @@ SUBDIR.${MK_INET6}+= rtsold SUBDIR.${MK_INET6}+= traceroute6 SUBDIR.${MK_INETD}+= inetd SUBDIR.${MK_IPFW}+= ipfwpcap -SUBDIR.${MK_ISCSI}+= ctladm ctld iscsid +SUBDIR.${MK_ISCSI}+= iscsid SUBDIR.${MK_JAIL}+= jail SUBDIR.${MK_JAIL}+= jexec SUBDIR.${MK_JAIL}+= jls From nobody Sun Jun 1 08:15:12 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b98ss3CvXz5xHsh; Sun, 01 Jun 2025 08:15: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b98ss13DVz3xLX; Sun, 01 Jun 2025 08:15:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748765713; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KcRAIAVuBvLrmFzhvqHSX8Q/6+mgI/AIaGcGpoDDKkU=; b=NVktk6e9s+lHGj24ugXCgJl3ovqbzudJ14tzHzi+odhzGqWkhjz0kt4rYNWsc1OxCSYfpp Xt2lUJnodmgdmXA0J4ZMq0yZLsR7n25q423mevAGQ3KwL3YPkKq76yLtFooJXMAOJK2sUj V5TIrEYQhqrHCxkm7RzlcpBNCVsw8lMC8zLHKRLp/5exRFpKFKTt4k/TgTOS3fmXyCPsbk ECllr9lTr8FC4NT3FfMN9TFfdsSbBYl54AuUwCjzjEs9hVle//PyOnMdXz8lzcQv/UwHdD EUUkY+aZP0kEKsLRaMPEXycJfmWRoJwMB3G9FwP1zB9UCe04Dz/lp1b7fOL5Fw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748765713; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KcRAIAVuBvLrmFzhvqHSX8Q/6+mgI/AIaGcGpoDDKkU=; b=I3/wlSpOYGmSskrKBmBItXkQBJx/SsZJ/b2DaZgAh8dVqGWBdSdIi0GcARi6JcfdbrgPmn FRrbFfw9RSvXqOVvBbQdGZJcnYr9xrKyyEU26N0SwFlxj9AC5YejjAt8UFffFjiSA+8gyN q/j9SV1SxGXB0sHvMcAIa0+DWJ0f4uqqbRdOWsByTqB0Fx5GbqlSU3ydJqA7rco4KZtlX3 EpPaJZx3jS8GsgLYWeLgN7eanafGpfpODne6kJn8auXRN9QmILZE3eqsU4YXQsbFUfu3q5 6y1ffClSmoYji6w/T524AMVh9AZONiqAx4K6GasUSRm3l9PA7HcJUD8giPZQAw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748765713; a=rsa-sha256; cv=none; b=m4ddzAJXNutIIywE6gMPl1SJgyQwYkMcwLvzc7278hYZIMOnPwwKGbkQdv79gz6s7MJAgo hv0EV8oc3pqCJyhqvwS3TUGLVKHpBqopStZw+hMVC7N14uKGX+VynjZan9Q7j9Bsf+nRnP vSgeMWyprqwjKfQwMsqlznieLsqhVM4x6V4AZAPz/CAISdlTdosX7kLdmrGXhIFyJ+orrj yqMqACpBoQWG7pljCkGApy11BEC0W+NzphzSFaAlhYwGBOquxOM4eoYXYG/y11aQC7+n8o 5OkctWZNk8Yqr1tEzJGxRk/+2IZ+miVuClwJslCO/DA6BeptATQkuNGd8CkOUQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b98sr6v8bzmw; Sun, 01 Jun 2025 08:15: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 5518FCQb019219; Sun, 1 Jun 2025 08:15:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5518FCJ1019216; Sun, 1 Jun 2025 08:15:12 GMT (envelope-from git) Date: Sun, 1 Jun 2025 08:15:12 GMT Message-Id: <202506010815.5518FCJ1019216@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Peter Holm Subject: git: 66c2e68076bd - main - stress2: Added a regression test List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pho X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 66c2e68076bd85d6a73084fb74e16be81a712c6e Auto-Submitted: auto-generated The branch main has been updated by pho: URL: https://cgit.FreeBSD.org/src/commit/?id=66c2e68076bd85d6a73084fb74e16be81a712c6e commit 66c2e68076bd85d6a73084fb74e16be81a712c6e Author: Peter Holm AuthorDate: 2025-06-01 08:14:51 +0000 Commit: Peter Holm CommitDate: 2025-06-01 08:14:51 +0000 stress2: Added a regression test --- tools/test/stress2/misc/pager_read_error.sh | 36 +++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/tools/test/stress2/misc/pager_read_error.sh b/tools/test/stress2/misc/pager_read_error.sh new file mode 100755 index 000000000000..9a2f3c7cc380 --- /dev/null +++ b/tools/test/stress2/misc/pager_read_error.sh @@ -0,0 +1,36 @@ +#!/bin/sh + +# +# Copyright (c) 2025 Peter Holm +# +# SPDX-License-Identifier: BSD-2-Clause +# + +# Hunt for "vm_fault: pager read error, pid 32939 (mmap)" + +# "panic: namei: unexpected flags: 0x10000000" seen: +# https://people.freebsd.org/~pho/stress/log/log0585.txt +# Fixed by: 58b2bd33aff7 + +. ../default.cfg + +md=$mdstart +mp=$mntpoint +mdconfig -l | grep -q md$md && mdconfig -d -u $md +mount | grep -q "on $mp " && umount -f $mp + +mdconfig -a -t swap -s 1g -u $md +newfs -U /dev/md$md > /dev/null +mount /dev/md$md $mp + +export RUNDIR=$mp/stressX +../testcases/swap/swap -t 5m -i 20 -l 100 > /dev/null & +sleep 5 +../testcases/mmap/mmap -t 5m -i 20 -l 100 > /dev/null 2>&1 & +sleep 5 +umount -f $mp +pkill swap mmap +wait + +mdconfig -d -u $md +exit 0 From nobody Sun Jun 1 09:22:21 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b9BMK57cjz5xP6V; Sun, 01 Jun 2025 09:22: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b9BMK4Sy1z3cGZ; Sun, 01 Jun 2025 09:22:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748769741; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EjcQtKaWgVpKP8FR+jxLGap5ceY3XeQOQiN6MDBjF00=; b=InmsJwS2H50Y+kk5wLpR9x4Sbko51vKh7IX/qiVAVYBHDzXYLLg0zb9t6bOmOt32d/EfVr Lr+ow88fm9+0rZlt7WEdoDjMPpGhKBNLPlu6DfivSutNEdcL2xXDrRpR2Zr8FkDr0fWDNA so1qx8k41wA1iCzH8z0DW1zGC6Ouh2nyzIjJkE0vKSDZfKcgdhxVs7KIUoI3hZykqrCs8W t6T0y1DiTN40AOuuL7uktyisCKPg5IRy3O9MO2BaOWXxbY7Qx4qNDtPAvRpYHIYTYxU6En nr6u/UpJ84mdmcrUnGBCr6sDE2KtPx5VZHvLsUeFrbPpd9qbRccQ5qLQPqqoQQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748769741; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EjcQtKaWgVpKP8FR+jxLGap5ceY3XeQOQiN6MDBjF00=; b=MrBaUSU5P7k3u1/yvMxfuFunj0ajpbDiTrDn7nLkAr5M+0ZxAmCjFiuUtC5h0b5hbS0fCS j9qf8Me8nIMC3I6rZI/ImLS11Yw7/26PZdCZdPdazGqlqm+PriCyueAbQqkSfl9vcMzniV R2I3ef8bi35dEgUarXPtzXw+FDFHsfdlDXFPgLu6EOWcgxeS8G8ZeAYmHcr4PbtAkjo0uD H9nAO9Udmpx2f3GZA9WVsjio0us0SpzMQ40Lz8/z5aoCUsCLTylIcO/Aj+zflwzK6XWyei xX9Oy6DjqDMwsh0TaIzkiTtDkqU69/6vNnPXY56tfENHJP0X7pS7hwJsSdaCtA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748769741; a=rsa-sha256; cv=none; b=KBN3YXck/K1ZluyDHor2vIBK0uiHQ1YD5j5kAZuiAFPCSuptoWsOCbYHTt/Lczv8gyLGWC /zzYuYjxLIop7jnueJ3xodRKg9gZykOJS6WtwKjfNXs1Wyljk6Kl3TkqQFTCyxMuQt1bSr CrAXF8EQv1STAcaylObLr8yw+/QRQuwBAsk70XVKvc+qW2Gl6zZ6ZtHPVKwPH8cjaMWavG ZmmE1RAwc94EE4+RcCwG89WRYjs+wOwIcxBDktgeCC52t0Mms6hoOwc+grYl4ZamPWz5bM OzXSDyNMhTspIuCXrqQldpyID1dtRadECcCG+Ek54NRsD+4Cn6ZyxnoW1EHkFg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b9BMK419vz2qp; Sun, 01 Jun 2025 09:22: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 5519ML86049116; Sun, 1 Jun 2025 09:22:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5519MLXn049113; Sun, 1 Jun 2025 09:22:21 GMT (envelope-from git) Date: Sun, 1 Jun 2025 09:22:21 GMT Message-Id: <202506010922.5519MLXn049113@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: 1b9a53e3805d - stable/14 - zfsboot: fix misuse of the phrase zpool List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 1b9a53e3805deb0b95760fd34025d4d0a4f96f41 Auto-Submitted: auto-generated The branch stable/14 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=1b9a53e3805deb0b95760fd34025d4d0a4f96f41 commit 1b9a53e3805deb0b95760fd34025d4d0a4f96f41 Author: Graham Perrin AuthorDate: 2025-01-10 18:02:25 +0000 Commit: Lexi Winter CommitDate: 2025-06-01 09:14:51 +0000 zfsboot: fix misuse of the phrase zpool A pool is not a zpool. Reviewed by: jbh, ivy Approved by: des (mentor) MFC after: 1 week Pull Request: https://github.com/freebsd/freebsd-src/pull/1569 (cherry picked from commit f69afe4201ff33da0b3c3ca464a92e2e0b07ac43) --- usr.sbin/bsdinstall/scripts/zfsboot | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/usr.sbin/bsdinstall/scripts/zfsboot b/usr.sbin/bsdinstall/scripts/zfsboot index 6c6c81a7f010..59e6359d311e 100755 --- a/usr.sbin/bsdinstall/scripts/zfsboot +++ b/usr.sbin/bsdinstall/scripts/zfsboot @@ -121,7 +121,7 @@ f_include $BSDCFG_SHARE/variable.subr : ${ZFSBOOT_BOOT_TYPE:=} # -# How much swap to put on each block device in the boot zpool +# How much swap to put on each block device in the boot pool # NOTE: Value passed to gpart(8); which supports SI unit suffixes. # : ${ZFSBOOT_SWAP_SIZE:=2g} @@ -137,7 +137,7 @@ f_include $BSDCFG_SHARE/variable.subr : ${ZFSBOOT_SWAP_MIRROR=} # -# Default ZFS datasets for root zpool +# Default ZFS datasets for root pool # # NOTE: Requires /tmp, /var/tmp, /$ZFSBOOT_BEROOT_NAME/$ZFSBOOT_BOOTFS_NAME # NOTE: Anything after pound/hash character [#] is ignored as a comment. @@ -285,12 +285,12 @@ msg_odd_disk_selected="An even number of disks must be selected to create a RAID msg_ok="OK" msg_partition_scheme="Partition Scheme" msg_partition_scheme_help="Select partitioning scheme. GPT is recommended." -msg_please_enter_a_name_for_your_zpool="Please enter a name for your zpool:" +msg_please_enter_a_name_for_your_pool="Please enter a name for your pool:" msg_please_enter_amount_of_swap_space="Please enter amount of swap space (SI-Unit suffixes\nrecommended; e.g., \`2g' for 2 Gigabytes):" -msg_please_select_one_or_more_disks="Please select one or more disks to create a zpool:" +msg_please_select_one_or_more_disks="Please select one or more disks to create a pool:" msg_pool_name="Pool Name" msg_pool_name_cannot_be_empty="Pool name cannot be empty." -msg_pool_name_help="Customize the name of the zpool to be created (Required)" +msg_pool_name_help="Customize the name of the pool to be created (Required)" msg_pool_type_disks="Pool Type/Disks:" msg_pool_type_disks_help="Choose type of ZFS Virtual Device and disks to use (Required)" msg_processing_selection="Processing selection..." @@ -323,9 +323,9 @@ msg_unsupported_partition_scheme="%s is an unsupported partition scheme" msg_user_cancelled="User Cancelled." msg_yes="YES" msg_zfs_configuration="ZFS Configuration" -msg_please_enter_options_for_your_zpool="Please enter options for your zpool" +msg_please_enter_options_for_your_pool="Please enter options for your pool" msg_zfs_options_name="ZFS Pool Options" -msg_zfs_options_name_help="Customize ZFS options for the zpool to be created" +msg_zfs_options_name_help="Customize ZFS options for the pool to be created" ############################################################ FUNCTIONS @@ -748,8 +748,8 @@ dialog_menu_layout() # zfs_create_diskpart $disk $index # -# For each block device to be used in the zpool, rather than just create the -# zpool with the raw block devices (e.g., da0, da1, etc.) we create partitions +# For each block device to be used in the pool, rather than just create the +# pool with the raw block devices (e.g., da0, da1, etc.) we create partitions # so we can have some real swap. This also provides wiggle room incase your # replacement drivers do not have the exact same sector counts. # @@ -905,7 +905,7 @@ zfs_create_diskpart() fi fi - # NB: zpool will use the `zfs#' GPT labels + # NB: ZFS pools will use `zfs#' GPT labels if [ "$ZFSBOOT_BOOT_TYPE" = "BIOS+UEFI" ]; then if [ "$ZFSBOOT_BOOT_POOL" ]; then bootpart=p3 swappart=p4 targetpart=p4 @@ -1006,7 +1006,7 @@ zfs_create_diskpart() f_eval_catch $funcname gpart "$GPART_CREATE" BSD ${disk}s1 || return $FAILURE - # NB: zpool will use s1a (no labels) + # NB: ZFS pools will use s1a (no labels) bootpart=s1a swappart=s1b targetpart=s1d mbrindex=4 # @@ -1594,7 +1594,7 @@ dialog_menu_diskinfo() return $SUCCESS } -dialog_zpool_name() +dialog_pool_name() { local prompt="$* is already taken, please enter a name for the ZFS pool \ (Or confirm using the same name by just pressing enter)" @@ -1639,7 +1639,7 @@ for pool in ${pools}; do f_dprintf "Checking ${pool} against ${ZFSBOOT_POOL_NAME}" if [ "${pool}" = "${ZFSBOOT_POOL_NAME}" ]; then f_dprintf "Pool ${pool} already taken" - ZFSBOOT_POOL_NAME=$(dialog_zpool_name "${ZFSBOOT_POOL_NAME}") + ZFSBOOT_POOL_NAME=$(dialog_pool_name "${ZFSBOOT_POOL_NAME}") break fi done @@ -1771,7 +1771,7 @@ while :; do ?" $msg_pool_name") # Prompt the user to input/change the name for the new pool f_dialog_input input \ - "$msg_please_enter_a_name_for_your_zpool" \ + "$msg_please_enter_a_name_for_your_pool" \ "$ZFSBOOT_POOL_NAME" && ZFSBOOT_POOL_NAME="$input" ;; @@ -1860,7 +1860,7 @@ while :; do ?" $msg_zfs_options_name") # Prompt the user to input/change the pool options f_dialog_input input \ - "$msg_please_enter_options_for_your_zpool" \ + "$msg_please_enter_options_for_your_pool" \ "$ZFSBOOT_POOL_CREATE_OPTIONS" && ZFSBOOT_POOL_CREATE_OPTIONS="$input" ;; From nobody Sun Jun 1 09:22:22 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b9BML6dZHz5xPP8; Sun, 01 Jun 2025 09:22: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b9BML5TqKz3c7r; Sun, 01 Jun 2025 09: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=1748769742; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Av7XPPA1n5jOI7GifszawBfT2NcH9X1Hnyk79bnUxoE=; b=Dh0jMWAtC1XtmE6EpJ5r6Xk9CwZ2X7HjwJ6RLnmOk686g6p1Px8tCxifx/wQG+Fi+pu0cj /p5/kRd1KcRlvxMAVIBmvyMPHng/Wr4P4RAioziPnsOY/v8YDjMMo7SFDlNNAuFEvCwSEo XONJua5vejVaUacsrJ+amCeioB4vw7zm5H8dNUvrs69Cu2aFkc+vdUX5lcT9ro2dfzdcPg SsPCsX2SV+I0O2q0Gqyk6Ax8+AC+ejMQzAn5U+ZuxYiwhLCvTwzVvguH60+rBKL4Yq0L/U D1g23X3GvzqQv67rE0Zs7GyExeMuXlwamMDNeG3s0ZB1bR9iWqpyuEo2ukweEw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748769742; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Av7XPPA1n5jOI7GifszawBfT2NcH9X1Hnyk79bnUxoE=; b=HpsVYZGyY9CaTLmq4JjMqxy/y6fRvwSEk8dgjoDDKmBZjF5KdxWfu4JYspHlzQBBl95Kqy QD9mkq5HvwtAbhkIQrLTz5Q7oN9zVIBjVMGqWKjAfzBMka5kTqG8IauHd2v6M7x3BfZd4V 5RB32+WeryA5AcRqBBXx9SwkaphCyhoqgdDKzxDVn03CdbpuO6f3m1A/YHbl36TJMcfGsy Qc6s5XMwe1B4RM/b6dfHFYKDrorVHm2ZfBwdlM5UwLbahXbh0TAARJmCLklqw6rQabzhnR 8qplJlmP9gC3Qk4ye/XQaJ+LljQTMa4Mi4fW9ckBmQqkHMI7ZcwVdFR0YmCEyA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748769742; a=rsa-sha256; cv=none; b=PQLrAhmD6n0XYkHHW7Vpy8ht4CKfOrsEZb1pUPN0sgt6jZGKtjek1UTEIAuDk2HQ3dqIc6 Z1PoEljHWMrUhUX/vTM5bS5GpMyz3A/YwKmju+2FVMMG1gHdKIRPMvQreIfBKDZjKIq8Z3 4wt9P84rMz3y5DhWZkO8Q5v1ld7Av5xxcQbEKQTKu7jjjX8Nx2uUV7Kw1ab1tvs2/TSOUp Junw66dYoou4417qinAKhWLoaiGTcegYC63YRf5NIn2WsLb4MFcRNAVCzOwCLR531fnOT7 1Bc+LZFe6hLsY6qggDVmuPgxu5juI5wkt03HBH9r+B+VcsGh5w0rLXHV0uymuw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b9BML53FWz2qq; Sun, 01 Jun 2025 09: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 5519MMPE049149; Sun, 1 Jun 2025 09: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 5519MMk7049146; Sun, 1 Jun 2025 09:22:22 GMT (envelope-from git) Date: Sun, 1 Jun 2025 09:22:22 GMT Message-Id: <202506010922.5519MMk7049146@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: 56da5c5ed35a - stable/14 - mac_do(4): allow compiling into kernel List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 56da5c5ed35ad297538395b07654e31ac425ca30 Auto-Submitted: auto-generated The branch stable/14 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=56da5c5ed35ad297538395b07654e31ac425ca30 commit 56da5c5ed35ad297538395b07654e31ac425ca30 Author: Lexi Winter AuthorDate: 2025-05-22 16:59:32 +0000 Commit: Lexi Winter CommitDate: 2025-06-01 09:14:51 +0000 mac_do(4): allow compiling into kernel The manual page says this is possible, but it's not. Make it possible. Reviewed by: olce, kevans Approved by: kevans (mentor) Differential Revision: https://reviews.freebsd.org/D50451 (cherry picked from commit c8d8cac2a8479009bcdca6c0cb9852af514896f2) --- sys/conf/NOTES | 1 + sys/conf/files | 3 ++- sys/conf/options | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/sys/conf/NOTES b/sys/conf/NOTES index 55c1798bbffc..8dff052258a6 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -1245,6 +1245,7 @@ options MAC options MAC_BIBA options MAC_BSDEXTENDED options MAC_DDB +options MAC_DO options MAC_IFOFF options MAC_IPACL options MAC_LOMAC diff --git a/sys/conf/files b/sys/conf/files index c793c0814fde..6412e84d9f70 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -5164,10 +5164,11 @@ security/mac/mac_sysv_sem.c optional mac security/mac/mac_sysv_shm.c optional mac security/mac/mac_vfs.c optional mac security/mac_biba/mac_biba.c optional mac_biba -security/mac_ddb/mac_ddb.c optional mac_ddb security/mac_bsdextended/mac_bsdextended.c optional mac_bsdextended security/mac_bsdextended/ugidfw_system.c optional mac_bsdextended security/mac_bsdextended/ugidfw_vnode.c optional mac_bsdextended +security/mac_ddb/mac_ddb.c optional mac_ddb +security/mac_do/mac_do.c optional mac_do security/mac_ifoff/mac_ifoff.c optional mac_ifoff security/mac_ipacl/mac_ipacl.c optional mac_ipacl security/mac_lomac/mac_lomac.c optional mac_lomac diff --git a/sys/conf/options b/sys/conf/options index 1d156ca41a49..7314a58a6a4f 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -154,6 +154,7 @@ MAC opt_global.h MAC_BIBA opt_dontuse.h MAC_BSDEXTENDED opt_dontuse.h MAC_DDB opt_dontuse.h +MAC_DO opt_dontuse.h MAC_IFOFF opt_dontuse.h MAC_IPACL opt_dontuse.h MAC_LOMAC opt_dontuse.h From nobody Sun Jun 1 09:22:24 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b9BMP4TzVz5xNyn; Sun, 01 Jun 2025 09:22: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b9BMP0507z3c13; Sun, 01 Jun 2025 09: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=1748769745; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3vrN3rGvd6CZqD2eaGzJcEw8FNiXwSpcGLtMbvPOq44=; b=XKgn/XD3JQQnEkD2o4uZKfWF7PkemyRGrcB7dIsd231SDVyFIfWsViFu2f8MgLYus4yJEO TbSzMxGYUt7I6dci3szY/4nxuA/S0h0UyNM2WFnPJE5FjCsppqhfz7pUUSTwqnzIsV2oNS 3aUkPby3ofcTuG0Sx4fMDH3rRHMhX+9NkuKwEaIUnM0jBBY7qFNAvhDceC1NnySrIg8hD/ Ql2pK7veyoW+31irBBn29LvevXqPI4ZWLaSsPZpxzVO6leSkkO/MSxQl2cLprWzVsLnXeV fPhsL7+Osz69b44TistnF467uwuH4IPwWVS3BxOtyB1aIE6jlLfgPnHxLfYEfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748769745; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3vrN3rGvd6CZqD2eaGzJcEw8FNiXwSpcGLtMbvPOq44=; b=VVwNOi1p6wjczJmrp4qOqxnosjr7+6cRyRIm2z8kmyn3nioN9qPN05oqDI7m8ZD/DLYUr1 s8ixQLEOB2Y8przHgpIX9kNbwctwtI/MLpoAbkevgmhByCdH5+/z8ts6Xm59sxwTajMTTz lZ9LujPYIpMd8Q4OItEhxzyHR+TtCsUqa3w6n0gNFFMR/JbUIHCMcAdV09l5sLeothCAzx 4N/86q2fC6hE9oPHygzI9JRuywR/xiCCDNNrOwaOdzgL70baJI9iHHPUADHpjpNbIvib5k c59lUR5U4kh8ILM8ZtcXHBbskDsUfJ3uKS8SgbZOBN/I+y9ViVaQVNMl+INQoA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748769745; a=rsa-sha256; cv=none; b=JsfhWyrdbX3+Vajb7VdlsZf+IV+rRPcLdqi7L4MJDzjHrg7sulHB6LmewNLK0KwMQUNiU6 RC718iyATgijpOutbljEZiGGYhOV/axWt65C5NeMeNh/gpeGiYEJfETszwQx/V1mbxqkb2 +5eHtcziOMy17dewjPti4K3aU3RdT+Hsf7zh6d7SKjveUMV/Jx/jqHiZI/l2bY7/HvpTJQ 6aOWIoB3tZhDm52S9ZBLewod3innKdFvnDDyFH7Et6TygqrjU5HIxd7jPoUsxozOCZKNYM 1DhN/vTdCZuoN7xw5BjF+e+Yxjm1jfN03HOlM8rK2Y7oxI0Rfnqy21nC5ZGAkg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b9BMN6jdkz32k; Sun, 01 Jun 2025 09:22: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 5519MOxG049217; Sun, 1 Jun 2025 09:22:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5519MOtk049214; Sun, 1 Jun 2025 09:22:24 GMT (envelope-from git) Date: Sun, 1 Jun 2025 09:22:24 GMT Message-Id: <202506010922.5519MOtk049214@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: cf624ffa812c - stable/14 - ifconfig: reject netmask and broadcast for inet6 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/stable/14 X-Git-Reftype: branch X-Git-Commit: cf624ffa812c90f8bd4b37f42488db1e782be883 Auto-Submitted: auto-generated The branch stable/14 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=cf624ffa812c90f8bd4b37f42488db1e782be883 commit cf624ffa812c90f8bd4b37f42488db1e782be883 Author: Lexi Winter AuthorDate: 2025-05-21 03:59:59 +0000 Commit: Lexi Winter CommitDate: 2025-06-01 09:14:52 +0000 ifconfig: reject netmask and broadcast for inet6 We don't support setting netmask or broadcast address for INET6 addresses, and trying to do crashes ifconfig. Handle this the same way as af_link, by rejecting attempts to configure these parameters. PR: 286910 Reported by: Hayzam Sherif MFC after: 3 days Reviewed by: zlei, kevans, des, cy Approved by: kevans (mentor) Differential Revision: https://reviews.freebsd.org/D50413 (cherry picked from commit 59ee9260e6bbcc3b5654126eed6e9490315c81f1) ifconfig tests: remove incorrect #! Fixes: 59ee9260e6bb ("ifconfig: reject netmask and broadcast for inet6") Reviewed by: des Differential Revision: https://reviews.freebsd.org/D50566 (cherry picked from commit 6ab70fbec4236a940275a42e301f76ade7faacbf) --- sbin/ifconfig/af_inet6.c | 5 +++ sbin/ifconfig/tests/Makefile | 6 ++-- sbin/ifconfig/tests/inet6.sh | 83 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 92 insertions(+), 2 deletions(-) diff --git a/sbin/ifconfig/af_inet6.c b/sbin/ifconfig/af_inet6.c index fcd04139a8c1..17dc068ee875 100644 --- a/sbin/ifconfig/af_inet6.c +++ b/sbin/ifconfig/af_inet6.c @@ -428,6 +428,11 @@ in6_getaddr(const char *addr_str, int which) { struct in6_px *px = sin6tab_nl[which]; + if (which == MASK) + errx(1, "netmask: invalid option for inet6"); + if (which == BRDADDR) + errx(1, "broadcast: invalid option for inet6"); + px->set = true; px->plen = 128; if (which == ADDR) { diff --git a/sbin/ifconfig/tests/Makefile b/sbin/ifconfig/tests/Makefile index 9b29983afc7c..e902f262552a 100644 --- a/sbin/ifconfig/tests/Makefile +++ b/sbin/ifconfig/tests/Makefile @@ -1,6 +1,8 @@ +NETBSD_ATF_TESTS_SH= nonexistent_test +ATF_TESTS_SH+= inet6 -NETBSD_ATF_TESTS_SH= nonexistent_test +TEST_METADATA+= execenv="jail" +TEST_METADATA+= execenv_jail_params="vnet allow.raw_sockets" .include - .include diff --git a/sbin/ifconfig/tests/inet6.sh b/sbin/ifconfig/tests/inet6.sh new file mode 100644 index 000000000000..edfd88d93af7 --- /dev/null +++ b/sbin/ifconfig/tests/inet6.sh @@ -0,0 +1,83 @@ +# SPDX-License-Identifier: ISC +# +# Copyright (c) 2025 Lexi Winter + +. $(atf_get_srcdir)/../../sys/common/vnet.subr + +# Bug 286910: adding 'netmask' or 'broadcast' to an IPv6 address crashed +# ifconfig. + +atf_test_case "netmask" "cleanup" +netmask_head() +{ + atf_set descr "Test invalid 'netmask' option" + atf_set require.user root +} + +netmask_body() +{ + vnet_init + + ep=$(vnet_mkepair) + vnet_mkjail ifcjail ${ep}a + + # Add the address the wrong way + atf_check -s exit:1 \ + -e match:"ifconfig: netmask: invalid option for inet6" \ + jexec ifcjail ifconfig ${ep}a inet6 2001:db8:1::1 netmask 64 + + # Add the address the correct way + atf_check -s exit:0 \ + jexec ifcjail ifconfig ${ep}a inet6 2001:db8:1::1/64 + atf_check -s exit:0 -o match:"2001:db8:1::1 prefixlen 64" \ + jexec ifcjail ifconfig ${ep}a + + # Remove the address the wrong way + atf_check -s exit:1 \ + -e match:"ifconfig: netmask: invalid option for inet6" \ + jexec ifcjail ifconfig ${ep}a inet6 2001:db8:1::1 netmask 64 -alias +} + +netmask_cleanup() +{ + vnet_cleanup +} + +atf_test_case "broadcast" "cleanup" +broadcast_head() +{ + atf_set descr "Test invalid 'broadcast' option" + atf_set require.user root +} + +broadcast_body() +{ + vnet_init + + ep=$(vnet_mkepair) + vnet_mkjail ifcjail ${ep}a + + atf_check -s exit:1 \ + -e match:"ifconfig: broadcast: invalid option for inet6" \ + jexec ifcjail ifconfig ${ep}a \ + inet6 2001:db8:1::1 broadcast 2001:db8:1::ffff + + atf_check -s exit:0 \ + jexec ifcjail ifconfig ${ep}a inet6 2001:db8:1::1/64 + + atf_check -s exit:1 \ + -e match:"ifconfig: broadcast: invalid option for inet6" \ + jexec ifcjail ifconfig ${ep}a \ + inet6 2001:db8:1::1 broadcast 2001:db:1::ffff -alias +} + +broadcast_cleanup() +{ + vnet_cleanup +} + +atf_init_test_cases() +{ + atf_add_test_case netmask + atf_add_test_case broadcast +} From nobody Sun Jun 1 09:22:25 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b9BMR2wm1z5xP1K; Sun, 01 Jun 2025 09:22: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b9BMQ19pcz3cGg; Sun, 01 Jun 2025 09:22:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748769746; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MIMA6McTTk3I/dOIqRBt/quUAmgA9fnsR8NiDLvsaq8=; b=VEhIppTTRDfFdpufD9s1qEPtWNbcD3zGQCKUrqaCaqT35FTeSwxHC/Pv4dS89lysC3/mFO sPyjeRSRdzQfxqB9qonFMoXt1tpCTHJcQPYRdGnJyyiJIqQOsiNyRENN0PUWIoulkmGAxX xeW6XlloRgyuVRV48NcSiusepqWqru7RZGNfNhpAal04g5a6wwCTlqN7I/nFyknJHYZ8XZ P9VBkmBsaT00iVK5DRWpZzPvbBAjINAJCvQpzMPARZLh8k49kXd/C89V5kOIV0sayPzTqF swuNux2DpVjoON5T1gBw9352bjE/2QTMkevzLwTFj8lJZCxzCA2E90PGbSyFAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748769746; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MIMA6McTTk3I/dOIqRBt/quUAmgA9fnsR8NiDLvsaq8=; b=Z2IkWddJyj028KnNwiQGOeTTjqxbIa7c3DiYHXstParzTEza4+MZe5ON30LzosQbDFYHVv nr5Gmfy5kWS3zSPPc6tTSEWEYNI7IXUE2DlQ/myHVmYWXQ2PUeOa72mfxgezSzBWncmFAI 8FkbKNb0zds27GX9PoIpdYCVwa1OhbiVu0qq2S7VAajULVVuvi8Nca1os0iFfUgsoQcRMq HUfXB4wz76qyqMWWpm9eZdsDQwULxPf1b7bcfYLLDsn/OQKhwbDWT5ppQQ1XZOUWOtu5tR meoH5fRjoHj1xZVmK6ZEu1EeNRXUjRVgwSY3asenYXCRX4r7rCGll3vZFOKe/w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748769746; a=rsa-sha256; cv=none; b=EMhD1k9Xdao5FecWHEjDBs/GfXqpU3n2KylicNzGEQsCLWwPyciIk0zoERAWdwrtQSohBV rVS2GjMyomiggBSs7yqhIGuWE7tgjT85wuzxgGotfhaMRZISIBEqtNj5B+Mqp6IdJwkDJw ftlfS5/3YbnTxOBAGxIxegx/UJGYLqgHIoNWn5Xn8yYrC74IJOE8Sac4pLxEunm4XNE12m Q1MZJIXkUkJ25q3CimRPXxg7bk6lIKn5vObmXY8wxzuH/ZOhCxN87BWGe1GlPJ9NMKV/Pj crdV/p8RJ58upAN0z/SaJjL/FOpFjHAq5whM+7sxFSBbvR1nVIgp5pZQwxFLdw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b9BMQ0TsPz1hj; Sun, 01 Jun 2025 09:22: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 5519MPBd049259; Sun, 1 Jun 2025 09: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 5519MP8u049256; Sun, 1 Jun 2025 09:22:25 GMT (envelope-from git) Date: Sun, 1 Jun 2025 09:22:25 GMT Message-Id: <202506010922.5519MP8u049256@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: 7d88b0e3dbe4 - stable/14 - rc.subr: remove the dependency on bsdconfig List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 7d88b0e3dbe46da939bd9f95164b2d332e9fd53d Auto-Submitted: auto-generated The branch stable/14 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=7d88b0e3dbe46da939bd9f95164b2d332e9fd53d commit 7d88b0e3dbe46da939bd9f95164b2d332e9fd53d Author: Lexi Winter AuthorDate: 2025-05-14 14:33:36 +0000 Commit: Lexi Winter CommitDate: 2025-06-01 09:14:52 +0000 rc.subr: remove the dependency on bsdconfig rc.subr uses sysrc(8) for the 'enable' and 'disable' commands, which means the entire rc(8) stack depends on bsdconfig. Instead, provide a minimal amount of rc.conf-editing functionality in rc.subr and use it to implement these commands. Reviewed by: des, bapt Approved by: des (mentor) Differential Revision: https://reviews.freebsd.org/D50325 (cherry picked from commit f6328f052518d56c01f10e14cd9ef1f2675c01a4) --- libexec/rc/rc.subr | 102 ++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 86 insertions(+), 16 deletions(-) diff --git a/libexec/rc/rc.subr b/libexec/rc/rc.subr index 5140f2a1addc..c6bc6d1a1395 100644 --- a/libexec/rc/rc.subr +++ b/libexec/rc/rc.subr @@ -53,6 +53,9 @@ PS="/bin/ps -ww" JID=0 CPUSET="/bin/cpuset" +# Cache the services that we loaded with load_rc_config. +_loaded_services="" + # rc_service provides the path to the service script that we are executing. # This is not being set here in an execution context, necessarily, so it's # really just a reasonable guess, and it will get overwritten later if @@ -1102,28 +1105,17 @@ run_rc_command() ;; enable) - _out=$(/usr/sbin/sysrc -vs "$name" "$rcvar=YES") && - echo "$name enabled in ${_out%%:*}" + _out=$(write_rcvar "$rcvar" "YES") && + echo "$name enabled in $_out" ;; disable) - _out=$(/usr/sbin/sysrc -vs "$name" "$rcvar=NO") && - echo "$name disabled in ${_out%%:*}" + _out=$(write_rcvar "$rcvar" "NO") && + echo "$name disabled in $_out" ;; delete) - _files= - for _file in $(/usr/sbin/sysrc -lEs "$name"); do - _out=$(/usr/sbin/sysrc -Fif $_file "$rcvar") && _files="$_files $_file" - done - /usr/sbin/sysrc -x "$rcvar" && echo "$rcvar deleted in ${_files# }" - # delete file in rc.conf.d if desired and empty. - checkyesno service_delete_empty || _files= - for _file in $_files; do - [ "$_file" = "${_file#*/rc.conf.d/}" ] && continue - [ $(/usr/bin/stat -f%z $_file) -gt 0 ] && continue - /bin/rm "$_file" && echo "Empty file $_file removed" - done + delete_rcvar "$rcvar" ;; status) @@ -1540,6 +1532,7 @@ load_rc_config() # If a service name was specified, attempt to load # service-specific configuration if [ -n "$_name" ] ; then + _loaded_services="${_loaded_services} ${_name}" for _d in /etc ${local_startup}; do _d=${_d%/rc.d} if [ -f ${_d}/rc.conf.d/"$_name" ]; then @@ -2293,6 +2286,83 @@ _echoonce() esac } +# _find_rcvar var +# Find the rc.conf file (other than /etc/defaults/rc.conf) that sets $var. +_find_rcvar() +{ + local _var _dir _files + + [ -n "$1" ] || return 1 + _var="$1"; shift + + _files="/etc/rc.conf" + for _dir in /etc ${local_startup}; do + for _name in $_loaded_services; do + _files="${_dir%/rc.d}/rc.conf.d/${_name} ${_files}" + done + done + + /usr/bin/grep 2>/dev/null -rl "^${_var}=" $_files | /usr/bin/head -1 +} + +# write_rcvar var value +# Add or replace the rc var $var with the value $value. +# Look for a current setting of $var in /etc/rc.conf or /etc/rc.conf.d/$name, +# and if found, modify it there; otherwise, append to /etc/rc.conf. +write_rcvar() +{ + local _var _value _file _dir + + [ -n "$1" ] || return 1 + _var="$1"; shift + [ -n "$1" ] || return 1 + _value="$1"; shift + + _file="$(_find_rcvar "$_var")" + if [ -n "$_file" ]; then + local _=$'\01' + /usr/bin/sed -i '' "s${_}^${_var}=.*${_}${_var}=\"$_value\"${_}" "$_file" + echo $_file + return + fi + + for _dir in /etc ${local_startup}; do + _file="${_dir%/rc.d}/rc.conf.d/${name}" + if [ -f "$_file" ]; then + echo "${_var}=\"${_value}\"" >>"$_file" + echo "$_file" + return + fi + done + + echo "${_var}=\"${_value}\"" >>/etc/rc.conf + echo "/etc/rc.conf" +} + +# delete_rcvar var +# Remove the rc var $var. +# Look for a current setting of $var in /etc/rc.conf or /etc/rc.conf.d/$name, +# and if found, remove it. If service_delete_empty is enabled, and the +# resulting file is empty, also delete the file. +delete_rcvar() +{ + local _var _files + + [ -n "$1" ] || return 1 + _var="$1"; shift + + _file="$(_find_rcvar "$_var")" + if [ -n "$_file" ]; then + /usr/bin/sed -i '' "/^${_var}=/d" "$_file" + echo "$_var deleted in $_file" + + if checkyesno service_delete_empty && [ ! -s "$_file" ]; then + /bin/rm -f "$_file" + echo "Empty file $_file removed" + fi + fi +} + # If the loader env variable rc.debug is set, turn on debugging. rc.conf will # still override this, but /etc/defaults/rc.conf can't unconditionally set this # since it would undo what we've done here. From nobody Sun Jun 1 09:22:23 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b9BMN6J47z5xP6W; Sun, 01 Jun 2025 09: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b9BMM6Xf3z3c11; Sun, 01 Jun 2025 09:22:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748769743; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fiOHG0QdTSGTsbbUg2lVbXzI8UCr7MxnTPETljS975s=; b=RcfrIKWlF6J7DABs5plq197xib2Xn0gabXevnQJrolHvw2sugWCzSAexZukiorbkfxb9lR StV1fRhROrXJNX/s945GFnNeo52hC694LrPVYqXRwDNncSK/YAJ4HmtHYVBS+RMfUiPrI+ dJU9zrLRCNcSLc1t4ASfhWymvXbQtQ8DDiLOvTAXnZ5/a5LJxoZk2u614sd0Cp7QjmVG/T iznuhCM9QaquCwOmx2TQ9++Bkzq3XwEE2lbdfuMdDJ/9BaLN5AYSiZx9juip+Rmhycohha +CXQQGdWd7sZLqeUOtwbykG6ShexRLTJLwHwdmDE7Ccpg4pownaMFkaPSo0MAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748769743; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fiOHG0QdTSGTsbbUg2lVbXzI8UCr7MxnTPETljS975s=; b=r/ZnJI786h1FP+gFi2J48N4im17AAZKZSzAxTe+sVkXHgca3dA1+Wwd4AQ8gTOXyJyj8YY UOdZHULHrepl4WmcfrtiM/nuLglAeHC4iE2Qmw1l6CpxpG9aYQtu3cVfychtK+JG5ZK9Em 2sTT/dfa6JQg5opjhNY3p+lQ5BmeHe0y9q8LdZBknArwJeqfdMDTF2c2R48L0JZLkr4NHg Iwmz+ESqqBLctH30enSRlkDEKLznYmAeovsACd4VTUgZnco+IQQjZOYHRtsRDsvRZ6BQui mLBSHsyR6KZajZcxYwh7C6+yIRI6uirQROx5EMfu+nAs4DoBMNKN5OVa8g1oRg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748769743; a=rsa-sha256; cv=none; b=wEwkHdmVKA0/iPBxa5Tp5lBmxoYa+Z0DZkRU+BktNioqd+9jv8dtmHV+vS2h5JB9qjNDaC l4SvKgSg5II9JIBpWvY6z/pm30pPTntBt/R+M28ybg01nR90yBQP78Rh2RB8ww32iTl3jc dVWJflm/HlLpyYiboCxmzqR00pVVX7okfh5qw8ttXjQtQAtXvAaK1+SEezK+aIBh34wVq7 B7caKp9V0f9D/PgjM+rJj27Xr4aW135HmhAkTtwHYUuW7rgtaSy6an5hNJ/Cp7e2P6zCax DEzfeeiyWHH/YM1GyLACcwUlEJ3nk6cXvbUKTPybcQVmLpRixA+JhrpJprY3/w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b9BMM60smz316; Sun, 01 Jun 2025 09:22: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 5519MNPp049184; Sun, 1 Jun 2025 09:22:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5519MNVE049181; Sun, 1 Jun 2025 09:22:23 GMT (envelope-from git) Date: Sun, 1 Jun 2025 09:22:23 GMT Message-Id: <202506010922.5519MNVE049181@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: 59f18f852c7e - stable/14 - bridge: check allow_llz_overlap before member_ifaddrs List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 59f18f852c7e665e609341f87c862e83966eec67 Auto-Submitted: auto-generated The branch stable/14 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=59f18f852c7e665e609341f87c862e83966eec67 commit 59f18f852c7e665e609341f87c862e83966eec67 Author: Lexi Winter AuthorDate: 2025-05-23 18:08:14 +0000 Commit: Lexi Winter CommitDate: 2025-06-01 09:14:52 +0000 bridge: check allow_llz_overlap before member_ifaddrs When adding a new interface to a bridge and allow_llz_overlap=0, which is the default value, if_bridge checks if the interface has IPv6 link local addresses assigned, and if it does, it calls in6_ifdetach() to remove all IPv6 addresses from the interface. This means it was possible to do this: % ifconfig bridge1 create inet6 -ifdisabled auto_linklocal up % ifconfig epair20 create inet6 -ifdisabled auto_linklocal up % ifconfig bridge1 addm epair20a ... with the result that the link-local address on epair20a would be removed, then the interface would be added to the bridge. If member_ifaddrs=0, which is also the default value, this no longer works: % ifconfig bridge1 addm epair20a ifconfig: BRDGADD epair20a: Invalid argument This is because the member_ifaddrs check runs before allow_llz_overlap does its thing, and returns EINVAL since the new interface has IP addresses on it. To restore the previous behaviour, reverse the order of these two checks, so the IPv6 addresses are removed before we check whether the interface has IPv6 addresses. MFC after: 1 week Reviewed by: kevans, kp Approved by: kevans (mentor) Differential Revision: https://reviews.freebsd.org/D50477 (cherry picked from commit da2dbdc297c948d5923812e3d3b777b790d3bf43) --- sys/net/if_bridge.c | 39 ++++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/sys/net/if_bridge.c b/sys/net/if_bridge.c index b4e4c5fb2f4c..7246d5a8e7c3 100644 --- a/sys/net/if_bridge.c +++ b/sys/net/if_bridge.c @@ -1289,25 +1289,6 @@ bridge_ioctl_add(struct bridge_softc *sc, void *arg) return (EINVAL); } - /* - * If member_ifaddrs is disabled, do not allow an interface with - * assigned IP addresses to be added to a bridge. - */ - if (!V_member_ifaddrs) { - struct ifaddr *ifa; - - CK_STAILQ_FOREACH(ifa, &ifs->if_addrhead, ifa_link) { -#ifdef INET - if (ifa->ifa_addr->sa_family == AF_INET) - return (EINVAL); -#endif -#ifdef INET6 - if (ifa->ifa_addr->sa_family == AF_INET6) - return (EINVAL); -#endif - } - } - #ifdef INET6 /* * Two valid inet6 addresses with link-local scope must not be @@ -1346,6 +1327,26 @@ bridge_ioctl_add(struct bridge_softc *sc, void *arg) } } #endif + + /* + * If member_ifaddrs is disabled, do not allow an interface with + * assigned IP addresses to be added to a bridge. + */ + if (!V_member_ifaddrs) { + struct ifaddr *ifa; + + CK_STAILQ_FOREACH(ifa, &ifs->if_addrhead, ifa_link) { +#ifdef INET + if (ifa->ifa_addr->sa_family == AF_INET) + return (EINVAL); +#endif +#ifdef INET6 + if (ifa->ifa_addr->sa_family == AF_INET6) + return (EINVAL); +#endif + } + } + /* Allow the first Ethernet member to define the MTU */ if (CK_LIST_EMPTY(&sc->sc_iflist)) sc->sc_ifp->if_mtu = ifs->if_mtu; From nobody Sun Jun 1 13:07:20 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b9HLw5ZGsz5xf3y; Sun, 01 Jun 2025 13:07: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b9HLw4gXpz49y0; Sun, 01 Jun 2025 13:07:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748783240; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aanBzAwn/X1QPE5ZDWT1PtIOkx4R8ZTraA6CP3qRB1U=; b=rdmzsKgYG9BX3xh3pvthiToxT8ELGENXMye1XBWcK5iiOnGKrIB7+60EZso5LQdHcdSgn9 WDaowMucOpTh5G1nUPD25xsJHFh3r2G6SywQC5tadwIQFyrghYAUksL3J/5qIPJVmwnup/ LzoGQGfrtDrTRCt+v5V3Krb3mHwnftSvNuj2fTOYADRSyX8txvTOZUJyh1tqLMHjitU/Cu VMNYnUOhgC4KvXsjIni5CxRhoPiKl38fPCe+UFAF5CJGgE1pQMUWzyPfLPRse9kY6K7l6i ZGVgbzZdto4O2VySzfCpBuxf3PRGTAU7/dWorsSU1VIDCy9nBcfbdUsBEQUw/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748783240; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aanBzAwn/X1QPE5ZDWT1PtIOkx4R8ZTraA6CP3qRB1U=; b=H3BnvELiik2Kr0UyfEOK88vQ3Jq8b9dbOsnQUJrnr32v4dqaKoWKHhaslN6ujCEQHPzitd 145Eo7DDX9IuClhjlGkV4GU0JrHRFk9TXxJlDPAn7VWZW6ZJpkNTK5TjUQi1dMGoTsJVlJ f/DxsBMguGTVTUjqKO7LY8OQB9ZQ99fhwlGNAAIrTuhnbPTLBQPYoLhhWHUrqLYf16Qo1m qUxY9AZdTOGHNMoa93NIcyKsW9TXg3Dbu7nH1uHaJTK6jpcIVP59XDfgwF9LF5zCJsR6XP B/HWpZJTLhuMl/H/ljXFu5R9zhade3Ffu3SueWJmkdfgqjC2UueSulb/cRKMQQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748783240; a=rsa-sha256; cv=none; b=BgHXAw76SurBIAJf/MqObeBsUvrYMjcay5oyMvoVY8m6NADkFM/b/kp2gI0gbasiarzy85 aRZ2eiwJcmldKN20GyC+8FBpk/k0MFBKkSezrYc8S+LRE8+LKuqGTdYLwkSLroC6DAtWKp w1PZp3fxHEHA0pZx4XDXBfb2vrbf1xJxpax58PC14peUcuZhouLEPz3wnJEvyP4mLNukqN IiRgGAGfUojpXlHOyh+/6G9vEzQIKrle/hjFw1S5O3W6O+lFOmBFZ261em8gtgGzDuGZgb seH2/2MpAN+bCyn55817sf+SS/uSOH8V5J95enUIvoMsOdThON6C0HzlpTAs8w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b9HLw3g07z7rQ; Sun, 01 Jun 2025 13:07: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 551D7KOT066417; Sun, 1 Jun 2025 13:07:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 551D7Kt9066414; Sun, 1 Jun 2025 13:07:20 GMT (envelope-from git) Date: Sun, 1 Jun 2025 13:07:20 GMT Message-Id: <202506011307.551D7Kt9066414@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Pierre Pronchery Subject: git: 9de72af2cceb - main - bsdinstall: restore the environment when restarting List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: khorben X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9de72af2cceb6fc4aead0990cccdf565531bc248 Auto-Submitted: auto-generated The branch main has been updated by khorben: URL: https://cgit.FreeBSD.org/src/commit/?id=9de72af2cceb6fc4aead0990cccdf565531bc248 commit 9de72af2cceb6fc4aead0990cccdf565531bc248 Author: Pierre Pronchery AuthorDate: 2025-05-23 15:50:42 +0000 Commit: Pierre Pronchery CommitDate: 2025-06-01 12:53:16 +0000 bsdinstall: restore the environment when restarting It is possible to restart the installation process upon errors, when installing normally through the `auto` script, or when installing a jail with the `jail` script. However, some values obtained interactively from the user or guessed by some scripts were kept in the environment when restarting the process; this made it impossible to re-run some steps as expected after the restart. For instance, if a bad choice of mirror was made in the `mirrorselect` phase, restarting the installer remembered the choice made, and would never prompt for a different one again. Rebooting was then the only easy way out of this situation. This change restores a pre-defined list of environment variables when restarting the installation process. PR: 266987 Reviewed by: emaste Approved by: philip (mentor) Sponsored by: The FreeBSD Foundation Differential revision: https://reviews.freebsd.org/D42281 --- usr.sbin/bsdinstall/scripts/auto | 33 ++++++++++++++++++++++++++ usr.sbin/bsdinstall/scripts/jail | 50 ++++++++++++++++++++++++++++++++++++---- 2 files changed, 79 insertions(+), 4 deletions(-) diff --git a/usr.sbin/bsdinstall/scripts/auto b/usr.sbin/bsdinstall/scripts/auto index fa67dbf671cc..d5ac14864d6b 100755 --- a/usr.sbin/bsdinstall/scripts/auto +++ b/usr.sbin/bsdinstall/scripts/auto @@ -34,6 +34,13 @@ f_include $BSDCFG_SHARE/dialog.subr ############################################################ GLOBALS +# +# List of environment variables that may be defined by the user, but modified +# during the installation process. They are then restored when restarting this +# script. +# +user_env_vars="BSDINSTALL_DISTSITE DISTRIBUTIONS WORKAROUND_GPTACTIVE WORKAROUND_LENOVO ZFSBOOT_PARTITION_SCHEME" + # # Strings that should be moved to an i18n file and loaded with f_include_lang() # @@ -90,6 +97,7 @@ error() --yes-label "$msg_restart" \ --yesno "$prompt" $height $width then + environment_restore exec $0 # NOTREACHED fi @@ -138,10 +146,35 @@ dialog_workaround() --yesno "$prompt" $height $width } +# environment_restore +# +# Restore a list of environment variables when this script is restarted. +# +environment_restore() +{ + for var in $user_env_vars; do + eval "if [ -n \"\${ORIG_$var}\" -o -z \"\${ORIG_$var-z}\" ]; then $var=\${ORIG_$var}; else unset $var; fi" + done +} + +# environment_save +# +# Save any user-defined environment variable that may be modified during the +# installation process. They are then restored when restarting this script. +# +environment_save() +{ + for var in $user_env_vars; do + eval "if [ -n \"\${$var}\" -o -z \"\${$var-z}\" ]; then ORIG_$var=\${$var}; else unset ORIG_$var; fi" + done +} + ############################################################ MAIN f_dprintf "Began Installation at %s" "$( date )" +environment_save + rm -rf $BSDINSTALL_TMPETC mkdir $BSDINSTALL_TMPETC diff --git a/usr.sbin/bsdinstall/scripts/jail b/usr.sbin/bsdinstall/scripts/jail index 641c9f8a22bc..4b2882dad477 100755 --- a/usr.sbin/bsdinstall/scripts/jail +++ b/usr.sbin/bsdinstall/scripts/jail @@ -31,12 +31,23 @@ BSDCFG_SHARE="/usr/share/bsdconfig" . $BSDCFG_SHARE/common.subr || exit 1 -############################################################ MAIN +############################################################ GLOBALS -: ${BSDDIALOG_OK=0} +# +# List of environment variables that may be defined by the user, but modified +# during the installation process. They are then restored when restarting this +# script. +# +user_env_vars="BSDINSTALL_DISTSITE DISTRIBUTIONS" -f_dprintf "Began Installation at %s" "$( date )" +############################################################ FUNCTIONS +# error [$msg] +# +# Display generic error message when a script fails. An optional message +# argument can preceed the generic message. User is given the choice of +# restarting the installer or exiting. +# error() { local msg if [ -n "$1" ]; then @@ -48,7 +59,7 @@ error() { if [ $? -ne $BSDDIALOG_OK ]; then exit else - [ -z "$MIRROR_BUTTON" ] || unset BSDINSTALL_DISTSITE + environment_restore exec $0 $BSDINSTALL_CHROOT fi } @@ -111,11 +122,42 @@ distbase() { bsdinstall distextract || error "Distribution extract failed" } +# environment_restore +# +# Restore a list of environment variables when this script is restarted. +# +environment_restore() +{ + for var in $user_env_vars; do + eval "if [ -n \"\${ORIG_$var}\" -o -z \"\${ORIG_$var-z}\" ]; then $var=\${ORIG_$var}; else unset $var; fi" + done +} + +# environment_save +# +# Save any user-defined environment variable that may be modified during the +# installation process. They are then restored when restarting this script. +# +environment_save() +{ + for var in $user_env_vars; do + eval "if [ -n \"\${$var}\" -o -z \"\${$var-z}\" ]; then ORIG_$var=\${$var}; else unset ORIG_$var; fi" + done +} + +############################################################ MAIN + +: ${BSDDIALOG_OK=0} + +f_dprintf "Began Installation at %s" "$( date )" + if [ -z "$1" ]; then error "Directory can not be empty\n\nUsage:\nbsdinstall jail directory" fi export BSDINSTALL_CHROOT=$1 +environment_save + rm -rf $BSDINSTALL_TMPETC mkdir $BSDINSTALL_TMPETC mkdir -p $1 || error "mkdir failed for $1" From nobody Sun Jun 1 14:48:29 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b9Kbf2HJDz5xlL9; Sun, 01 Jun 2025 14: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b9Kbd51Wdz3hZv; Sun, 01 Jun 2025 14: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=1748789309; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MVIhHDXjHolOKAyvIa4v9ZJZF5ICrD0gDILpZGegldY=; b=bJoIIXebdgj2k1NLMSBC5XgTBd+d1It7A30odNaXhHFtD7TT5BHKwsTtP7WC51IhVV+vFo uLf2mvbY92YcZtZU0qXhrzZF7ABExcQRmsitRBq56ZHCckxk7uQkd3C8MQQzLvthLHBB8T uheImsH0+ZumOIB0IpwkDhPk0DWynvRyqd9BFsG2ZiPl0XX+oWIcjNsrUm+dcWc51UWy6N zCe6QFtmUgiJzVgP9atYGiA/TGicdIImSjCTOzdcAWxJG6fUnujr+xyhEX+4b4xvFvy/+V eVPUHt9UDcTNjKAB8IsUB9Jqfoac+fr0bjUw9mOtVCUSo/NBf+KeZeamgMpcQQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748789309; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MVIhHDXjHolOKAyvIa4v9ZJZF5ICrD0gDILpZGegldY=; b=Az2QbbweWA8cpiqRsiJNc+Px5EKRKmZtwFPt93zgcbhl1zCTiMr/SPCtsIS9Gs+l4iAphM aCzdkW26wgIhFba+oWabsLL31KskZmcoLxCXtVg61oprGkF0CfP5hw3d6o2ILeFKhSvOcZ NnC4CIt1UCUQyu7jbr8J2E0dKlMNH0EbMTo8BlyCbUuChUmbP1zUJd7Fxbw9HRDelzT0KH 6r5Ykg/3VmyP4YaT2mJhXreOL5KaUnic9J7VfqI7UxsWHfTrLR4xel+5gN+CUbVYzG1x/C AEYPBHhEO9Md7dOPIF/VVU4iR299Qv4om6gi3Nzn/XJnuqRj96HSBG5dgKX6Qw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748789309; a=rsa-sha256; cv=none; b=GSdjgW+/DEGbl/aJ8/vsW6PiU0nAHSEXS7zheUBUVzpTyMALdSKb1BeN+IGaonSBtA4BPi hqUr76+Rj0NlYiFzsXAw1KbewIJk23yod1VcCtCTxbvz4d0mZVefNnhu5FEOB0jDGWlJz6 72irDV5abUhJfNEnsa6azZpQEW2d5S/euf1stssjy9mJc34oprWllSh/La6n4o24leRyft AODeOVJfgQxJoIxj6GERGXXJ68B6Bva0VoYxDE1CIvlcnRVIaiQRtkEJcRFi7HRWR1O9+E iSK3lnFbU1zabIvsObDGfgf3zLl9uGYTeGySkq3Vy6krpdteJRUzLU9I3rujkA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b9Kbd4YyjzBkx; Sun, 01 Jun 2025 14: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 551EmTxn053156; Sun, 1 Jun 2025 14: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 551EmTSN053153; Sun, 1 Jun 2025 14:48:29 GMT (envelope-from git) Date: Sun, 1 Jun 2025 14:48:29 GMT Message-Id: <202506011448.551EmTSN053153@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: 517eb20e54e5 - main - if_firewire: Make firewire_broadcastaddr static const List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 517eb20e54e59173b9dbede0bb3356f6197b5aa9 Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=517eb20e54e59173b9dbede0bb3356f6197b5aa9 commit 517eb20e54e59173b9dbede0bb3356f6197b5aa9 Author: Zhenlei Huang AuthorDate: 2025-06-01 14:47:24 +0000 Commit: Zhenlei Huang CommitDate: 2025-06-01 14:47:24 +0000 if_firewire: Make firewire_broadcastaddr static const This global variable is used only in this file. While here, constify it since it is only used to read. No functional change intended. MFC after: 1 week --- sys/net/if_fwsubr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/net/if_fwsubr.c b/sys/net/if_fwsubr.c index bf3362fc975c..ceac93d31d56 100644 --- a/sys/net/if_fwsubr.c +++ b/sys/net/if_fwsubr.c @@ -67,7 +67,7 @@ static MALLOC_DEFINE(M_FWCOM, "fw_com", "firewire interface internals"); -struct fw_hwaddr firewire_broadcastaddr = { +static const struct fw_hwaddr firewire_broadcastaddr = { 0xffffffff, 0xffffffff, 0xff, @@ -777,7 +777,7 @@ firewire_ifattach(struct ifnet *ifp, struct fw_hwaddr *llc) ifp->if_mtu = 1500; /* XXX */ ifp->if_output = firewire_output; ifp->if_resolvemulti = firewire_resolvemulti; - ifp->if_broadcastaddr = (u_char *) &firewire_broadcastaddr; + ifp->if_broadcastaddr = (const u_char *) &firewire_broadcastaddr; ifa = ifp->if_addr; KASSERT(ifa != NULL, ("%s: no lladdr!\n", __func__)); From nobody Sun Jun 1 15:12:37 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b9L7T42KNz5xmtr; Sun, 01 Jun 2025 15:12: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b9L7T38j2z41rJ; Sun, 01 Jun 2025 15:12:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748790757; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6Im05SBYQLBzw4hpA2ufmFfk8A6goUbbiZGz8h6RjZA=; b=Cpin0Oh5Xka3fP1GSlP6dp6c8tNP7LYzxdvJuv7Ei7Ao+BCrXmRUqgqwBP5MzKAgolXRaN MAryXQbKfkE7jTIX+h6t8OXad5QNnVzwQZdvmEseXarzXILrpsRJ+jei3vjVNLe4FBhsxI 8SxCTcZxz1WvMgjGTdwhIWR3Yr4mt/mIEp7LoqMjboWj6xkxH9emvCyEXhSdmQLJE1BWIR mcs3jewXZmLstNkkkECRmaeYECYZd1VyK2b1zb2+OCsLkxSs5CJLF0u3fcAmgsEG4RpjWD hbbWt7z6TV2XHNfUDnqjUnVAAvT7Fzr3cbN2ZJCKWPgV45VtqxVHtBmtJZAyWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748790757; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6Im05SBYQLBzw4hpA2ufmFfk8A6goUbbiZGz8h6RjZA=; b=J8DhmkWZhPBEQddPJAZua2OSaPClTm+x/kesTeODRC0rAihS79TORSBMv0QqXMb8NxMOfh 72+tvB4wqxSUHC052Ltysv3WF6/wHth4cds5jaXgUWXTFU78vaG/cMrox3MSRZRFtkJbM3 EJ01xndxCnOn5i1PjJ152pMNM0asgK2uGArvIxK1YQ1SyF6N8ZvasV0nxjF0O9YL6gaUY+ AhAw2jT/S549t2fvtBKKKTyEZGSiqtE6wvSOmr7BV4svBdR4SIuQGhNoen90DXg+qrvAZu NdsoZllCvm6ArN3OkxO4N05Zyy/aXfXEGzTS6YIwjITZSj/k4mW43i8DmOEszQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748790757; a=rsa-sha256; cv=none; b=jbUKlYQRHgTH5pNd2iRCz4nyrZINAHKYa6+oB4BJg/mH7c2WXHHIw6Bn7rQO5BBkZcHZfQ b8d+zwq3AviZ1LN1TUVhqQcgOfXZoIH0XkmhTeYNOB+1P+oTUGDEa0gE1DBeb+391xEdKy k1l9RL3GYA1utL92PYoySlK65SnQVF+RcOXfRTRd9QRfGrCatvzWHFlX/MjeD22uwO0eAr 4yokPYvedDdovu5Cn7ciBnxmXQZSnjnHS0nqKl9jodOoNLoZg9vGs8Nd/U0pZviXsDWO55 bSjQZocq4sI1jmWq1DW857zgLckJQu9pq6vrCVkZa/1xbHuCIz2n7hKcYP2o+w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b9L7T2RR7zCcC; Sun, 01 Jun 2025 15:12: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 551FCbMW008026; Sun, 1 Jun 2025 15:12:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 551FCbXu008023; Sun, 1 Jun 2025 15:12:37 GMT (envelope-from git) Date: Sun, 1 Jun 2025 15:12:37 GMT Message-Id: <202506011512.551FCbXu008023@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 4bf049bfeefd - main - net80211: fix VHT160 and VHT80P80 selection and enable in LinuxKPI 802.11 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4bf049bfeefd988fed93149138c422b05d38251b Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=4bf049bfeefd988fed93149138c422b05d38251b commit 4bf049bfeefd988fed93149138c422b05d38251b Author: Bjoern A. Zeeb AuthorDate: 2025-04-11 01:44:50 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-06-01 15:12:27 +0000 net80211: fix VHT160 and VHT80P80 selection and enable in LinuxKPI 802.11 Between 802.11ac-2013 and 802.11-2020 some fields were deprecated and the way VHT160 and VHT80P80 are selected has changed. In order to get onto VHT160 with modern APs adopt and support both the deprecated as well as the new logic. For simplicity of blocks we pull out the non-HT40 handling early on, followed by the "use HT", followed by the deprectaed options and then the 80Mhz channel width. In all cases keep checking (a) what is locally supported, (b) what the user has locally allowed (FVHT flags, [-]vht160 [-]vht80p80 [-]vht80 [-]vht40), as well as (c) what is announced. Provide possible fallbacks to lower channel widths in all cases (but VHT20, which means VHT is disabled). With this enable VHT160 and VHT80P80 in the LinuxKPI 802.11 driver compat code as well. Sponsored by: The FreeBSD Foundation MFC after: 3 days Reviewed by: thj Differential Revision: https://reviews.freebsd.org/D49773 --- sys/compat/linuxkpi/common/src/linux_80211.c | 9 +- sys/net80211/ieee80211.h | 9 +- sys/net80211/ieee80211_ht.c | 178 ++++++++++++++++++--------- 3 files changed, 129 insertions(+), 67 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index 4540c1aaf1c1..42d23629bc0f 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -547,19 +547,15 @@ lkpi_sta_sync_vht_from_ni(struct ieee80211_vif *vif, struct ieee80211_sta *sta, width = (sta->deflink.vht_cap.cap & IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_MASK); switch (width) { -#if 0 case IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160MHZ: case IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160_80PLUS80MHZ: sta->deflink.bandwidth = IEEE80211_STA_RX_BW_160; break; -#endif default: /* Check if we do support 160Mhz somehow after all. */ -#if 0 if ((sta->deflink.vht_cap.cap & IEEE80211_VHT_CAP_EXT_NSS_BW_MASK) != 0) sta->deflink.bandwidth = IEEE80211_STA_RX_BW_160; else -#endif sta->deflink.bandwidth = IEEE80211_STA_RX_BW_80; } skip_bw: @@ -2112,14 +2108,11 @@ lkpi_sta_scan_to_auth(struct ieee80211vap *vap, enum ieee80211_state nstate, int #endif #ifdef LKPI_80211_VHT if (IEEE80211_IS_CHAN_VHT_5GHZ(ni->ni_chan)) { -#ifdef __notyet__ if (IEEE80211_IS_CHAN_VHT80P80(ni->ni_chan)) chanctx_conf->def.width = NL80211_CHAN_WIDTH_80P80; else if (IEEE80211_IS_CHAN_VHT160(ni->ni_chan)) chanctx_conf->def.width = NL80211_CHAN_WIDTH_160; - else -#endif - if (IEEE80211_IS_CHAN_VHT80(ni->ni_chan)) + else if (IEEE80211_IS_CHAN_VHT80(ni->ni_chan)) chanctx_conf->def.width = NL80211_CHAN_WIDTH_80; } #endif diff --git a/sys/net80211/ieee80211.h b/sys/net80211/ieee80211.h index 1e685eb094f9..90b329500128 100644 --- a/sys/net80211/ieee80211.h +++ b/sys/net80211/ieee80211.h @@ -945,12 +945,15 @@ struct ieee80211_vht_cap { struct ieee80211_vht_mcs_info supp_mcs; } __packed; -/* 802.11ac-2013, Table 8-183x-VHT Operation Information subfields */ +/* + * 802.11ac-2013, Table 8-183x-VHT Operation Information subfields. + * 802.11-2020, Table 9-274-VHT Operation Information subfields (for deprecations) + */ enum ieee80211_vht_chanwidth { IEEE80211_VHT_CHANWIDTH_USE_HT = 0, /* 20 MHz or 40 MHz */ IEEE80211_VHT_CHANWIDTH_80MHZ = 1, /* 80MHz */ - IEEE80211_VHT_CHANWIDTH_160MHZ = 2, /* 160MHz */ - IEEE80211_VHT_CHANWIDTH_80P80MHZ = 3, /* 80+80MHz */ + IEEE80211_VHT_CHANWIDTH_160MHZ = 2, /* 160MHz (deprecated) */ + IEEE80211_VHT_CHANWIDTH_80P80MHZ = 3, /* 80+80MHz (deprecated) */ /* 4..255 reserved. */ }; diff --git a/sys/net80211/ieee80211_ht.c b/sys/net80211/ieee80211_ht.c index d4e84ce92531..5ec80e3646b8 100644 --- a/sys/net80211/ieee80211_ht.c +++ b/sys/net80211/ieee80211_ht.c @@ -1931,66 +1931,132 @@ ieee80211_ht_updateparams(struct ieee80211_node *ni, static uint32_t ieee80211_vht_get_vhtflags(struct ieee80211_node *ni, uint32_t htflags) { - struct ieee80211vap *vap = ni->ni_vap; - uint32_t vhtflags = 0; +#define _RETURN_CHAN_BITS(_cb) \ +do { \ + IEEE80211_NOTE(ni->ni_vap, IEEE80211_MSG_11N, ni, \ + "%s:%d: selected %b", __func__, __LINE__, \ + (_cb), IEEE80211_CHAN_BITS); \ + return (_cb); \ +} while(0) + struct ieee80211vap *vap; + const struct ieee80211_ie_htinfo *htinfo; + uint32_t vhtflags; + bool can_vht160, can_vht80p80, can_vht80; + bool ht40; + + vap = ni->ni_vap; + + /* If we do not support VHT or VHT is disabled just return. */ + if ((ni->ni_flags & IEEE80211_NODE_VHT) == 0 || + (vap->iv_vht_flags & IEEE80211_FVHT_VHT) == 0) + _RETURN_CHAN_BITS(0); + + /* + * The original code was based on + * 802.11ac-2013, Table 8-183x-VHT Operation Information subfields. + * 802.11-2020, Table 9-274-VHT Operation Information subfields + * has IEEE80211_VHT_CHANWIDTH_160MHZ and + * IEEE80211_VHT_CHANWIDTH_80P80MHZ deprecated. + * For current logic see + * 802.11-2020, 11.38.1 Basic VHT BSS functionality. + */ + + htinfo = (const struct ieee80211_ie_htinfo *)ni->ni_ies.htinfo_ie; + ht40 = ((htinfo->hi_byte1 & IEEE80211_HTINFO_TXWIDTH) == + IEEE80211_HTINFO_TXWIDTH_2040); + can_vht160 = can_vht80p80 = can_vht80 = false; + + /* 20 Mhz */ + if (!ht40) { + /* Check for the full valid combination -- other fields be 0. */ + if (ni->ni_vht_chanwidth != IEEE80211_VHT_CHANWIDTH_USE_HT || + ni->ni_vht_chan2 != 0) + IEEE80211_NOTE(ni->ni_vap, IEEE80211_MSG_11N, ni, + "%s: invalid VHT BSS bandwidth 0/%d/%d/%d", + __func__, ni->ni_vht_chanwidth, + ni->ni_vht_chan1, ni->ni_vht_chan2); + + _RETURN_CHAN_BITS(IEEE80211_CHAN_VHT20 | IEEE80211_CHAN_HT20); + } vhtflags = 0; - if (ni->ni_flags & IEEE80211_NODE_VHT && vap->iv_vht_flags & IEEE80211_FVHT_VHT) { - if ((ni->ni_vht_chanwidth == IEEE80211_VHT_CHANWIDTH_160MHZ) && - IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_IS_160MHZ(vap->iv_vht_cap.vht_cap_info) && - (vap->iv_vht_flags & IEEE80211_FVHT_USEVHT160)) { - vhtflags = IEEE80211_CHAN_VHT160; - /* Mirror the HT40 flags */ - if (htflags == IEEE80211_CHAN_HT40U) { - vhtflags |= IEEE80211_CHAN_HT40U; - } else if (htflags == IEEE80211_CHAN_HT40D) { - vhtflags |= IEEE80211_CHAN_HT40D; - } - } else if ((ni->ni_vht_chanwidth == IEEE80211_VHT_CHANWIDTH_80P80MHZ) && - IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_IS_160_80P80MHZ(vap->iv_vht_cap.vht_cap_info) && - (vap->iv_vht_flags & IEEE80211_FVHT_USEVHT80P80)) { - vhtflags = IEEE80211_CHAN_VHT80P80; - /* Mirror the HT40 flags */ - if (htflags == IEEE80211_CHAN_HT40U) { - vhtflags |= IEEE80211_CHAN_HT40U; - } else if (htflags == IEEE80211_CHAN_HT40D) { - vhtflags |= IEEE80211_CHAN_HT40D; - } - } else if ((ni->ni_vht_chanwidth == IEEE80211_VHT_CHANWIDTH_80MHZ) && - (vap->iv_vht_flags & IEEE80211_FVHT_USEVHT80)) { - vhtflags = IEEE80211_CHAN_VHT80; - /* Mirror the HT40 flags */ - if (htflags == IEEE80211_CHAN_HT40U) { - vhtflags |= IEEE80211_CHAN_HT40U; - } else if (htflags == IEEE80211_CHAN_HT40D) { - vhtflags |= IEEE80211_CHAN_HT40D; - } - } else if (ni->ni_vht_chanwidth == IEEE80211_VHT_CHANWIDTH_USE_HT) { - /* Mirror the HT40 flags */ - /* - * XXX TODO: if ht40 is disabled, but vht40 isn't - * disabled then this logic will get very, very sad. - * It's quite possible the only sane thing to do is - * to not have vht40 as an option, and just obey - * 'ht40' as that flag. - */ - if ((htflags == IEEE80211_CHAN_HT40U) && - (vap->iv_vht_flags & IEEE80211_FVHT_USEVHT40)) { - vhtflags = IEEE80211_CHAN_VHT40U - | IEEE80211_CHAN_HT40U; - } else if (htflags == IEEE80211_CHAN_HT40D && - (vap->iv_vht_flags & IEEE80211_FVHT_USEVHT40)) { - vhtflags = IEEE80211_CHAN_VHT40D - | IEEE80211_CHAN_HT40D; - } else if (htflags == IEEE80211_CHAN_HT20) { - vhtflags = IEEE80211_CHAN_VHT20 - | IEEE80211_CHAN_HT20; - } - } else { - vhtflags = IEEE80211_CHAN_VHT20; + + /* We know we can at least do 40Mhz, so mirror the HT40 flags. */ + if (htflags == IEEE80211_CHAN_HT40U) + vhtflags |= IEEE80211_CHAN_HT40U; + else if (htflags == IEEE80211_CHAN_HT40D) + vhtflags |= IEEE80211_CHAN_HT40D; + + /* 40 MHz */ + if (ni->ni_vht_chanwidth == IEEE80211_VHT_CHANWIDTH_USE_HT) { + if (ni->ni_vht_chan2 != 0) + IEEE80211_NOTE(ni->ni_vap, IEEE80211_MSG_11N, ni, + "%s: invalid VHT BSS bandwidth 1/%d/%d/%d", + __func__, ni->ni_vht_chanwidth, + ni->ni_vht_chan1, ni->ni_vht_chan2); + + if ((vap->iv_vht_flags & IEEE80211_FVHT_USEVHT40) != 0) { + if (htflags == IEEE80211_CHAN_HT40U) + _RETURN_CHAN_BITS(IEEE80211_CHAN_VHT40U | vhtflags); + if (htflags == IEEE80211_CHAN_HT40D) + _RETURN_CHAN_BITS(IEEE80211_CHAN_VHT40D | vhtflags); } + + /* If we get here VHT40 is not supported or disabled. */ + _RETURN_CHAN_BITS(IEEE80211_CHAN_VHT20 | IEEE80211_CHAN_HT20); + } + + /* Deprecated check for 160. */ + if ((ni->ni_vht_chanwidth == IEEE80211_VHT_CHANWIDTH_160MHZ) && + IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_IS_160MHZ(vap->iv_vht_cap.vht_cap_info) && + (vap->iv_vht_flags & IEEE80211_FVHT_USEVHT160) != 0) + _RETURN_CHAN_BITS(IEEE80211_CHAN_VHT160 | vhtflags); + + /* Deprecated check for 80P80. */ + if ((ni->ni_vht_chanwidth == IEEE80211_VHT_CHANWIDTH_80P80MHZ) && + IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_IS_160_80P80MHZ(vap->iv_vht_cap.vht_cap_info) && + (vap->iv_vht_flags & IEEE80211_FVHT_USEVHT80P80) != 0) + _RETURN_CHAN_BITS(IEEE80211_CHAN_VHT80P80 | vhtflags); + + if (ni->ni_vht_chanwidth != IEEE80211_VHT_CHANWIDTH_80MHZ) { + IEEE80211_NOTE(ni->ni_vap, IEEE80211_MSG_11N, ni, + "%s: invalid VHT BSS bandwidth %d/%d/%d", __func__, + ni->ni_vht_chanwidth, ni->ni_vht_chan2); + + _RETURN_CHAN_BITS(0); } - return (vhtflags); + + /* CCFS1 > 0 and | CCFS1 - CCFS0 | = 8 */ + if (ni->ni_vht_chan2 > 0 && (ni->ni_vht_chan2 - ni->ni_vht_chan1) == 8) + can_vht160 = can_vht80 = true; + + /* CCFS1 > 0 and | CCFS1 - CCFS0 | > 16 */ + if (ni->ni_vht_chan2 > 0 && (ni->ni_vht_chan2 - ni->ni_vht_chan1) > 16) + can_vht80p80 = can_vht80 = true; + + /* CFFS1 == 0 */ + if (ni->ni_vht_chan2 == 0) + can_vht80 = true; + + if (can_vht160 && (vap->iv_vht_flags & IEEE80211_FVHT_USEVHT160) != 0) + _RETURN_CHAN_BITS(IEEE80211_CHAN_VHT160 | vhtflags); + + if (can_vht80p80 && (vap->iv_vht_flags & IEEE80211_FVHT_USEVHT80P80) != 0) + _RETURN_CHAN_BITS(IEEE80211_CHAN_VHT80P80 | vhtflags); + + if (can_vht80 && (vap->iv_vht_flags & IEEE80211_FVHT_USEVHT80) != 0) + _RETURN_CHAN_BITS(IEEE80211_CHAN_VHT80 | vhtflags); + + if (ht40 && (vap->iv_vht_flags & IEEE80211_FVHT_USEVHT40) != 0) { + if (htflags == IEEE80211_CHAN_HT40U) + _RETURN_CHAN_BITS(IEEE80211_CHAN_VHT40U | vhtflags); + if (htflags == IEEE80211_CHAN_HT40D) + _RETURN_CHAN_BITS(IEEE80211_CHAN_VHT40D | vhtflags); + } + + /* Either we disabled support or got an invalid setting. */ + _RETURN_CHAN_BITS(IEEE80211_CHAN_VHT20 | IEEE80211_CHAN_HT20); +#undef _RETURN_CHAN_BITS } /* From nobody Sun Jun 1 15:41:04 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b9LmK0d3Pz5xpdn; Sun, 01 Jun 2025 15:41: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b9LmJ6BfNz3D3d; Sun, 01 Jun 2025 15:41:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748792464; h=from:from:reply-to:subject:subject: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+QYQvRo/XFKKd+WxFr5jQG1oeehx8IEf6WoBCiYy7o=; b=n4vUF/Dk4cd5FEEQ6jW4Z5EgF1LvMCQu95vbdKMzQKcEh9sJaH1+gLifVzzSzHpqiZ0IiR NuX8z4a9DaZrSVMAsWolBLtq0Bw56WXlNfxGjM1U+OUzDNc4AAVh9IG+uKCrw8W1OvB7CH LSqGQ297rDc3x4eOVr8M90BnuBheude9Zyf7y0NVEaEugCMvupsRnKtcX8zplzr+xS2TV1 l9G/XiB1ilMOSwGDndb0qHtQ2v/x+dZTtuhy8+nVgzoG4NWPFLvpCGzxQjVC64KNAvaLb9 LLTIOeA5R2OBqZWY6CU5mD958TOArs1f3wpmbMhoCKmV+mtDH6fgM+cUXLF2gw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748792464; h=from:from:reply-to:subject:subject: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+QYQvRo/XFKKd+WxFr5jQG1oeehx8IEf6WoBCiYy7o=; b=kvS1/oBJPtxvNNT1jeaePvOYkbg/edgDj0hEuwAyll3l8lWSwapVGgxwrtDE3HnD7BlIF/ lX3an54woP1LLBAxS9yUCpL2Gsk/apMRn4o0ko/ZU3taDfR1r56qiJBHrUZ/yI3D2kIbbF tLfhNAUQRLvrlNKGfljiOCu/a2bgvB4e6mQmQRKz6r73UYkPqCOQOcTUuVPEbsF8ktsLQ6 3f+8mOxaKOYFISUb2FZdsCC5VXljZhi3WgQZzIOl9DbPpuMycW+nLqaB97bwxbDA6ldrV5 Z8YNomFaTzRRg/boo3nCldKjpUKRmaOs6Eb4F7mgdUpI3myAPt3nVXDxi2Qwjw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748792464; a=rsa-sha256; cv=none; b=b5FSiFLhWkdyody98VRxGmFk5oJ1eY78hMYGbZx6tgOFHT8c9O8BKaTZA5XBMVybg+N+Im xWM766GGntWXS7PRNT+JwkETU9VhGJpHOZqfCR/uKaRcWvwTNfWFPjQNxLWeovnIOSOu3J hTest5s4QCajABoB8YksYmqKzzbGv32D7uWyyweBiC0DPMZkMhEz1P7yhyBVUxA5oG5f4Y LjNEIDA5Dyb3pv62xahdoQtkm2wdl+vIygsKFTu+NrvBikfI1jOuU/Y89Jv7N0nJtGpgHy vg75i4E86Xdw0rbD52xI52r+djRRCQmXUdJqgIiES8PEYD4ZXsUGpp+/8QH1TA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b9LmJ5mYZzD9C; Sun, 01 Jun 2025 15:41: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 551Ff4JQ056265; Sun, 1 Jun 2025 15:41:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 551Ff4Qr056262; Sun, 1 Jun 2025 15:41:04 GMT (envelope-from git) Date: Sun, 1 Jun 2025 15:41:04 GMT Message-Id: <202506011541.551Ff4Qr056262@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: c20e7eb53d47 - stable/14 - ifnet: Fix a typo in a source code comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c20e7eb53d47fb0359e393fab08aef793ce614b3 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=c20e7eb53d47fb0359e393fab08aef793ce614b3 commit c20e7eb53d47fb0359e393fab08aef793ce614b3 Author: Zhenlei Huang AuthorDate: 2025-05-19 04:35:55 +0000 Commit: Zhenlei Huang CommitDate: 2025-06-01 15:40:06 +0000 ifnet: Fix a typo in a source code comment - s/possiable/possible MFC after: 3 days (cherry picked from commit ad2d7e594f6d519be6e9674c8048a406a453fef9) --- sys/net/if.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/net/if.c b/sys/net/if.c index cf8df9a05d86..fc39c1ffcff0 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -873,7 +873,7 @@ if_attach_internal(struct ifnet *ifp, bool vmove) */ namelen = strlen(ifp->if_xname); /* - * Always save enough space for any possiable name so we + * Always save enough space for any possible name so we * can do a rename in place later. */ masklen = offsetof(struct sockaddr_dl, sdl_data[0]) + IFNAMSIZ; From nobody Sun Jun 1 15:41:05 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b9LmL2zPNz5xpPv; Sun, 01 Jun 2025 15:41:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b9LmL0m5Mz3ChH; Sun, 01 Jun 2025 15:41:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748792466; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=H1ciYGEm50qX+7hILr7LjwYFD68nU9q3tl8PlDJIYBs=; b=fnLwNsvo384tInqunIevpiJPaIWUTHvVwD5PQavy31EABv5I/Gh6IbpcqFEzldn8/G6KQM fnGZpZqWQ8KZEDhIZE6y48ErYqx19fHcCXYLOxxvyJQ69i43Xons58lUT++xgkHXhM+E3q fzZFPp6bbrkZ7UHrUa/+j/SKGgsdJKfvB6x1+pge7/odOeUJUSEcSfMQuUneitN3K7wyHg 2fylt4GRf2VXoWfhJWjZHDxg8HVxj+Vtj3Uh8HcToyOMfeNhLBNw/n5m9xJwBD2wdzD2jG CxjYVAmNz/4vGVhjD+rKrKtQRXiR/blcz1XXImMQ4mPsbojZB/JtD9mALzpztg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748792466; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=H1ciYGEm50qX+7hILr7LjwYFD68nU9q3tl8PlDJIYBs=; b=MAmXTlw+J5p17+yyKEo9ROiSB3luZ5YG8ED1cll2yg7YftY1rFVPrsEVbDaoTSs4vv0dpp qnhhMAOFGHz6oNxNs3jF50C+kbw4Aqk8xpYymHVAacp2rZGAD8O8L5o3KP0NkJcIzHLr6H Qs1eZNLN7oC2RPrg/8blUDNHaeufDZAPVX1bbJsyGok25jkrTB0ivd4tYrZmg9g7yhoVdO wFqDZRUXqiBpkwdFxW5puMHBGd0Y3mlZNJL0idpWRlEIJi66+7cszZtXGBPI+kDE6yhcCf xX0XpWIEljKw0kypstGznEOoLFwZtOKkrRaFPI7WyeL9oMPFFKf8xlDiDZu8pg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748792466; a=rsa-sha256; cv=none; b=b/6jtzlLUXqYN1T7EScsRMy6TDzz/BKUAE7On9up+t7kfEdzOBYN47gy9/m/k1xEqyv4rJ jecOD90VLHmk0t2KTpV72Y/SpLsy3IO3LvxKtOUeCCArfy/VQd8q/B/WmW64348EcSafsx lEpiFYb1Bc2pTRhDGyA8YicECf2gU+XGI9Ci5x13roMgMThbG1Mw2GnQwn3dojywMo9Ckl 2AaUC69DOKVzlTRdGSGa+hkk9P5B58CcjZypmSVOH47C+1ieaDWdB+omrX702omu85cYrx JZVTDZHhPra/zPmrmEW9bo++q3nz06XjfvlBYJQxfbn3pLKFJRcnaC/hyxGb5w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b9LmK709vzCgq; Sun, 01 Jun 2025 15:41: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 551Ff5GI056298; Sun, 1 Jun 2025 15:41:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 551Ff5mo056295; Sun, 1 Jun 2025 15:41:05 GMT (envelope-from git) Date: Sun, 1 Jun 2025 15:41:05 GMT Message-Id: <202506011541.551Ff5mo056295@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: ad5eecbfca54 - stable/14 - ifnet: Integrate if_unroute() into if_down() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: ad5eecbfca54cfd2247c8fb3799ba292bf9668ed Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=ad5eecbfca54cfd2247c8fb3799ba292bf9668ed commit ad5eecbfca54cfd2247c8fb3799ba292bf9668ed Author: Zhenlei Huang AuthorDate: 2025-05-20 15:45:20 +0000 Commit: Zhenlei Huang CommitDate: 2025-06-01 15:40:07 +0000 ifnet: Integrate if_unroute() into if_down() if_unroute() is static since 2004 and is not used anywhere except for if_down(). This also makes it easier to grep by the pattern `if_flags &= ~IFF_UP`. No functional change intended. Reviewed by: glebius MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D49356 (cherry picked from commit 0693c3f7cb3d9e5389863a0c131ddef799c77091) --- sys/net/if.c | 29 ++++++++--------------------- 1 file changed, 8 insertions(+), 21 deletions(-) diff --git a/sys/net/if.c b/sys/net/if.c index fc39c1ffcff0..b4ffa9883efc 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -280,7 +280,6 @@ static void if_input_default(struct ifnet *, struct mbuf *); static int if_requestencap_default(struct ifnet *, struct if_encap_req *); static int if_setflag(struct ifnet *, int, int, int *, int); static int if_transmit_default(struct ifnet *ifp, struct mbuf *m); -static void if_unroute(struct ifnet *, int flag, int fam); static int if_delmulti_locked(struct ifnet *, struct ifmultiaddr *, int); static void do_link_state_change(void *, int); static int if_getgroup(struct ifgroupreq *, struct ifnet *); @@ -2098,25 +2097,6 @@ link_init_sdl(struct ifnet *ifp, struct sockaddr *paddr, u_char iftype) return (sdl); } -/* - * Mark an interface down and notify protocols of - * the transition. - */ -static void -if_unroute(struct ifnet *ifp, int flag, int fam) -{ - - KASSERT(flag == IFF_UP, ("if_unroute: flag != IFF_UP")); - - ifp->if_flags &= ~flag; - getmicrotime(&ifp->if_lastchange); - ifp->if_qflush(ifp); - - if (ifp->if_carp) - (*carp_linkstate_p)(ifp); - rt_ifmsg(ifp, IFF_UP); -} - void (*vlan_link_state_p)(struct ifnet *); /* XXX: private from if_vlan */ void (*vlan_trunk_cap_p)(struct ifnet *); /* XXX: private from if_vlan */ struct ifnet *(*vlan_trunkdev_p)(struct ifnet *); @@ -2191,7 +2171,14 @@ if_down(struct ifnet *ifp) { EVENTHANDLER_INVOKE(ifnet_event, ifp, IFNET_EVENT_DOWN); - if_unroute(ifp, IFF_UP, AF_UNSPEC); + + ifp->if_flags &= ~IFF_UP; + getmicrotime(&ifp->if_lastchange); + ifp->if_qflush(ifp); + + if (ifp->if_carp) + (*carp_linkstate_p)(ifp); + rt_ifmsg(ifp, IFF_UP); } /* From nobody Sun Jun 1 19:53:59 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b9SN84lSsz5y6BC; Sun, 01 Jun 2025 19:54: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b9SN814ydz3smv; Sun, 01 Jun 2025 19:54:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748807640; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=il6uE0n4C1d3PUX/t/nGKKGpTlr0ThtDy2GUDVejUtM=; b=CXIAfeECbCRMMpp0p16L9Q5MJqhXZrgK9uJnXqxWm5wAOUQS2SleFoM20A0Awu16YiEKDz e5H7rgvMXygDfqilnOU3yjaHFPW8DOKf/3FeN7OR8IEo6qom7pekuOYzEcP7EZx9SFA9S2 JEOquCun3pTOStDbMtvEMSbgSb4vliva661yLEt1txy4ohyxgay5/nXNu61v9YGdZvtlbp FPHFGXUEhDRY82woUFO8NUfD/KHFVcJMh+yxlpKsXu0ZlYLkv1abJlNlXiwVmCweBBqz/6 svaTLiTmppDsVzNNrooJxIRZXTbMpj46ssJEr87eDGNwzgb/pzTr6IsOjlEuww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748807640; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=il6uE0n4C1d3PUX/t/nGKKGpTlr0ThtDy2GUDVejUtM=; b=X1Ir2RC6RvDOfACrRwjalmMK5hyGpYCx96/2b6/62LVjRxuCQmHUyfVCDpsFyHOc/EmQAh HVt/AnDbCLZPGlrHpohYF8c9vR6R1anJR7XK16xZiAjCq2yYTOJ6cDciTPKhMGmklHBurB kthvHNyOZWfHo6ukrC73tXBAK7itexArQF+a/cWx4UDrCChrWqjgH1eac2L+S8YO+FhcD1 8R6eoEoTUAIzI/aas4yloIJq3oPpITwKAZoViF8DVIhVap60FB8Fr888FjjWHmhSK0+g5C 77EzctjmxOluimfClr1vPYhAdQabtMqULZhi0fFsXco84ruv9oqlp9QtWLWMZw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748807640; a=rsa-sha256; cv=none; b=DEoQSk5oGAWqStjyv1G07bscrE5bNeqoGewhfpyQ02nN36ReRQ3Y+hUhjnVqBt8TxGoCLX FmVHk1MphmDsotjI2ve3PAelq93AJ4Q43bZCOv2JLT3uHVT0za5e2eqYxv+hbKudTQFy9I 9SnZNKJtkNiJHO5cl8xPnRGiE39tix3g8xT90R4VopD+Vi33bnVRQSAc+pfXMJRvYQiRNd I77AgvH5YV4ex1Dop/B1aroLTk5clQsz/wnrek6b7GVPV0VCqLyh3ZVsELvbPsqbMoz7NT lqXvH79DxXL590GLJxHfSx/tLWVIkAgieMQnZtBwDYD/moPN5aBVOCUy+aOg7w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b9SN80RQjzdWd; Sun, 01 Jun 2025 19:54: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 551Js0xo046037; Sun, 1 Jun 2025 19:54:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 551Jrxu9046033; Sun, 1 Jun 2025 19:53:59 GMT (envelope-from git) Date: Sun, 1 Jun 2025 19:53:59 GMT Message-Id: <202506011953.551Jrxu9046033@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 12effd95c300 - stable/14 - vfs cache: Move hash row lookup loops into a subroutine List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 12effd95c300eca04c8b2ec68c6c1d20f983a8ce Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=12effd95c300eca04c8b2ec68c6c1d20f983a8ce commit 12effd95c300eca04c8b2ec68c6c1d20f983a8ce Author: Mark Johnston AuthorDate: 2025-05-02 21:35:04 +0000 Commit: Mark Johnston CommitDate: 2025-06-01 19:53:28 +0000 vfs cache: Move hash row lookup loops into a subroutine No functional change intended. Reviewed by: olce, kib MFC after: 2 weeks Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D50106 (cherry picked from commit cc25864d4568079cadef46291ddf7d501c81d60a) --- sys/kern/vfs_cache.c | 129 +++++++++++++++++++++++++-------------------------- sys/sys/vnode.h | 1 + 2 files changed, 65 insertions(+), 65 deletions(-) diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c index 9b2b246d234f..284e23f3d1e8 100644 --- a/sys/kern/vfs_cache.c +++ b/sys/kern/vfs_cache.c @@ -498,6 +498,24 @@ VP2VNODELOCK(struct vnode *vp) return (&vnodelocks[(((uintptr_t)(vp) >> 8) & ncvnodehash)]); } +/* + * Search the hash table for a namecache entry. Either the corresponding bucket + * must be locked, or the caller must be in an SMR read section. + */ +static struct namecache * +cache_ncp_find(struct vnode *dvp, struct componentname *cnp, uint32_t hash) +{ + struct namecache *ncp; + + KASSERT(mtx_owned(HASH2BUCKETLOCK(hash)) || VFS_SMR_ENTERED(), + ("%s: hash %u not locked", __func__, hash)); + CK_SLIST_FOREACH(ncp, NCHHASH(hash), nc_hash) { + if (cache_ncp_match(ncp, dvp, cnp)) + break; + } + return (ncp); +} + static void cache_out_ts(struct namecache *ncp, struct timespec *tsp, int *ticksp) { @@ -1789,12 +1807,7 @@ retry: goto out_no_entry; mtx_lock(blp); - - CK_SLIST_FOREACH(ncp, (NCHHASH(hash)), nc_hash) { - if (cache_ncp_match(ncp, dvp, cnp)) - break; - } - + ncp = cache_ncp_find(dvp, cnp, hash); if (ncp == NULL) { mtx_unlock(blp); goto out_no_entry; @@ -1990,11 +2003,7 @@ retry: blp = HASH2BUCKETLOCK(hash); mtx_lock(blp); - CK_SLIST_FOREACH(ncp, (NCHHASH(hash)), nc_hash) { - if (cache_ncp_match(ncp, dvp, cnp)) - break; - } - + ncp = cache_ncp_find(dvp, cnp, hash); if (__predict_false(ncp == NULL)) { mtx_unlock(blp); SDT_PROBE2(vfs, namecache, lookup, miss, dvp, cnp->cn_nameptr); @@ -2084,11 +2093,7 @@ cache_lookup(struct vnode *dvp, struct vnode **vpp, struct componentname *cnp, hash = cache_get_hash(cnp->cn_nameptr, cnp->cn_namelen, dvp); vfs_smr_enter(); - CK_SLIST_FOREACH(ncp, (NCHHASH(hash)), nc_hash) { - if (cache_ncp_match(ncp, dvp, cnp)) - break; - } - + ncp = cache_ncp_find(dvp, cnp, hash); if (__predict_false(ncp == NULL)) { vfs_smr_exit(); SDT_PROBE2(vfs, namecache, lookup, miss, dvp, cnp->cn_nameptr); @@ -2406,7 +2411,6 @@ cache_enter_time(struct vnode *dvp, struct vnode *vp, struct componentname *cnp, struct celockstate cel; struct namecache *ncp, *n2, *ndd; struct namecache_ts *ncp_ts; - struct nchashhead *ncpp; uint32_t hash; int flag; int len; @@ -2483,45 +2487,46 @@ cache_enter_time(struct vnode *dvp, struct vnode *vp, struct componentname *cnp, * with this name. This can happen with concurrent lookups of * the same path name. */ - ncpp = NCHHASH(hash); - CK_SLIST_FOREACH(n2, ncpp, nc_hash) { - if (cache_ncp_match(n2, dvp, cnp)) { - MPASS(cache_ncp_canuse(n2)); - if ((n2->nc_flag & NCF_NEGATIVE) != 0) - KASSERT(vp == NULL, - ("%s: found entry pointing to a different vnode (%p != %p) ; name [%s]", - __func__, NULL, vp, cnp->cn_nameptr)); - else - KASSERT(n2->nc_vp == vp, - ("%s: found entry pointing to a different vnode (%p != %p) ; name [%s]", - __func__, n2->nc_vp, vp, cnp->cn_nameptr)); - /* - * Entries are supposed to be immutable unless in the - * process of getting destroyed. Accommodating for - * changing timestamps is possible but not worth it. - * This should be harmless in terms of correctness, in - * the worst case resulting in an earlier expiration. - * Alternatively, the found entry can be replaced - * altogether. - */ - MPASS((n2->nc_flag & (NCF_TS | NCF_DTS)) == (ncp->nc_flag & (NCF_TS | NCF_DTS))); + n2 = cache_ncp_find(dvp, cnp, hash); + if (n2 != NULL) { + MPASS(cache_ncp_canuse(n2)); + if ((n2->nc_flag & NCF_NEGATIVE) != 0) + KASSERT(vp == NULL, + ("%s: found entry pointing to a different vnode " + "(%p != %p); name [%s]", + __func__, NULL, vp, cnp->cn_nameptr)); + else + KASSERT(n2->nc_vp == vp, + ("%s: found entry pointing to a different vnode " + "(%p != %p); name [%s]", + __func__, n2->nc_vp, vp, cnp->cn_nameptr)); + /* + * Entries are supposed to be immutable unless in the + * process of getting destroyed. Accommodating for + * changing timestamps is possible but not worth it. + * This should be harmless in terms of correctness, in + * the worst case resulting in an earlier expiration. + * Alternatively, the found entry can be replaced + * altogether. + */ + MPASS((n2->nc_flag & (NCF_TS | NCF_DTS)) == + (ncp->nc_flag & (NCF_TS | NCF_DTS))); #if 0 - if (tsp != NULL) { - KASSERT((n2->nc_flag & NCF_TS) != 0, - ("no NCF_TS")); - n2_ts = __containerof(n2, struct namecache_ts, nc_nc); - n2_ts->nc_time = ncp_ts->nc_time; - n2_ts->nc_ticks = ncp_ts->nc_ticks; - if (dtsp != NULL) { - n2_ts->nc_dotdottime = ncp_ts->nc_dotdottime; - n2_ts->nc_nc.nc_flag |= NCF_DTS; - } + if (tsp != NULL) { + KASSERT((n2->nc_flag & NCF_TS) != 0, + ("no NCF_TS")); + n2_ts = __containerof(n2, struct namecache_ts, nc_nc); + n2_ts->nc_time = ncp_ts->nc_time; + n2_ts->nc_ticks = ncp_ts->nc_ticks; + if (dtsp != NULL) { + n2_ts->nc_dotdottime = ncp_ts->nc_dotdottime; + n2_ts->nc_nc.nc_flag |= NCF_DTS; } -#endif - SDT_PROBE3(vfs, namecache, enter, duplicate, dvp, ncp->nc_name, - vp); - goto out_unlock_free; } +#endif + SDT_PROBE3(vfs, namecache, enter, duplicate, dvp, ncp->nc_name, + vp); + goto out_unlock_free; } if (flag == NCF_ISDOTDOT) { @@ -2587,7 +2592,7 @@ cache_enter_time(struct vnode *dvp, struct vnode *vp, struct componentname *cnp, * Insert the new namecache entry into the appropriate chain * within the cache entries table. */ - CK_SLIST_INSERT_HEAD(ncpp, ncp, nc_hash); + CK_SLIST_INSERT_HEAD(NCHHASH(hash), ncp, nc_hash); atomic_thread_fence_rel(); /* @@ -3017,12 +3022,10 @@ cache_validate(struct vnode *dvp, struct vnode *vp, struct componentname *cnp) return; blp = HASH2BUCKETLOCK(hash); mtx_lock(blp); - CK_SLIST_FOREACH(ncp, (NCHHASH(hash)), nc_hash) { - if (cache_ncp_match(ncp, dvp, cnp)) { - if (ncp->nc_vp != vp) - panic("%s: mismatch (%p != %p); ncp %p [%s] dvp %p\n", - __func__, vp, ncp->nc_vp, ncp, ncp->nc_name, ncp->nc_dvp); - } + ncp = cache_ncp_find(dvp, cnp, hash); + if (ncp != NULL && ncp->nc_vp != vp) { + panic("%s: mismatch (%p != %p); ncp %p [%s] dvp %p\n", + __func__, vp, ncp->nc_vp, ncp, ncp->nc_name, ncp->nc_dvp); } mtx_unlock(blp); } @@ -5462,11 +5465,7 @@ cache_fplookup_next(struct cache_fpl *fpl) MPASS(!cache_fpl_isdotdot(cnp)); - CK_SLIST_FOREACH(ncp, (NCHHASH(hash)), nc_hash) { - if (cache_ncp_match(ncp, dvp, cnp)) - break; - } - + ncp = cache_ncp_find(dvp, cnp, hash); if (__predict_false(ncp == NULL)) { return (cache_fplookup_noentry(fpl)); } diff --git a/sys/sys/vnode.h b/sys/sys/vnode.h index ba9f43cd0af5..e32756b906ab 100644 --- a/sys/sys/vnode.h +++ b/sys/sys/vnode.h @@ -1191,6 +1191,7 @@ vn_get_state(struct vnode *vp) #define vfs_smr_exit() smr_exit(VFS_SMR()) #define vfs_smr_synchronize() smr_synchronize(VFS_SMR()) #define vfs_smr_entered_load(ptr) smr_entered_load((ptr), VFS_SMR()) +#define VFS_SMR_ENTERED() SMR_ENTERED(VFS_SMR()) #define VFS_SMR_ASSERT_ENTERED() SMR_ASSERT_ENTERED(VFS_SMR()) #define VFS_SMR_ASSERT_NOT_ENTERED() SMR_ASSERT_NOT_ENTERED(VFS_SMR()) #define VFS_SMR_ZONE_SET(zone) uma_zone_set_smr((zone), VFS_SMR()) From nobody Sun Jun 1 19:53:58 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b9SN71brGz5y5nj; Sun, 01 Jun 2025 19:53:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b9SN70xCDz3t3m; Sun, 01 Jun 2025 19:53:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748807639; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JSVPhUDEqDS2Iipj1EcYM11gIl73Gys1nGB7ASvCBv4=; b=atLVUiK3lMEG1zB4tgniZFyEZLVO66QFqFVnSY7wvzWeGv0CDHnSSqBHs8dxt9ebH3en7E V0v88ip9IRLpq9Vnd+MRMLg4e4N2f86YGB7BPeYt5e6r7Dw9+Q8XjgsnRbIPRmr1AZnt1G zB9gAz7byJS1NPVdJ++n1mmoIBN2KBRcjVnMa6ce3hKrxneM67wWihdFNRTW7z5KlaF86P LU/AYBxkHoai9VzEFq5aAr1rVXYwpYbxDyKhreQBaabpJisHUFINY+pDACUdcT0EmPAgP5 WM8qwFpPF3RE/wbTuPjoPoLkAkZZuK5Fi7kLDOG7mMx9gTq5KvtBA1CDUHRoqg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748807639; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JSVPhUDEqDS2Iipj1EcYM11gIl73Gys1nGB7ASvCBv4=; b=gRcSUeo4dL8EnbSKG5IcADsQLX/45O2nj9QiVFlFi2UUKrepcdGCu3Vtu7cSMLWSLC/ImG mjsYz9nLQirHpnOTg36lOa50KCAypaaSZzhJsFVJzXvfaQLBGn4BqmaGJhzrdYQrXI4cVM pgyVA+9eET7a4i9uu+QiY+3kZlN1s+k9P7zVMeMA0LV/p13ntIW4CJgXD6DLSoLIZEthgn iJwsJyf5rs+rsmTwNLOxWnwKB6mFiK2zvaLzImFViyEAchA6P4k+7Ivjt9+uxXJG15tPVB Fp9FBqbWsrSnt5HkgQdKOGiEaYFu/oxCbD0UwWlvSAoWVZwzqp8/Ttrp1t6c2g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748807639; a=rsa-sha256; cv=none; b=WU3KEJWVoP0vbXPxEXTGUguJH9XDWy1rH60Xhb8d5HH0bcGDJE2Bl0+ySNsGAc1sw6nGDU 4ttxjAx+pO0KfYU1hi/z+W+QVkF0olyUA2nj7q5GaLk9/z3CfKqO38B2w5vjZfgC9koWw8 y+KIIEu1UvPK2houisFLMei/VDMQOPNdhg7HtYQbxfASr5zgv13iSbuhlwGDA1nVVo/9Ce IGMmisnO7Hup4X3bvjet0/eko60lNS/5imdGP68WePAd+ztCuW+PkcGrG4Rn62xWvDtd3X UPWDvVFGLZjIOn3i9P2qmr1TFj2ZNhNcJYjF6ngQ7uAdBggkxLnc5YoVbvBppg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b9SN67524zdrf; Sun, 01 Jun 2025 19:53: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 551JrwcJ045996; Sun, 1 Jun 2025 19:53:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 551Jrwrj045993; Sun, 1 Jun 2025 19:53:58 GMT (envelope-from git) Date: Sun, 1 Jun 2025 19:53:58 GMT Message-Id: <202506011953.551Jrwrj045993@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: b080a04e2511 - stable/14 - vfs cache: Add a predicate for testing cache entries List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b080a04e25113112e0d94a20c8d1c1241a3387e9 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=b080a04e25113112e0d94a20c8d1c1241a3387e9 commit b080a04e25113112e0d94a20c8d1c1241a3387e9 Author: Mark Johnston AuthorDate: 2025-05-02 21:34:16 +0000 Commit: Mark Johnston CommitDate: 2025-06-01 19:53:28 +0000 vfs cache: Add a predicate for testing cache entries No functional change intended. Reviewed by: olce, kib MFC after: 2 weeks Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D50105 (cherry picked from commit 029ed5f574f61443fd12e0e70c7ab4dc296b81e5) --- sys/kern/vfs_cache.c | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c index 300173347401..9b2b246d234f 100644 --- a/sys/kern/vfs_cache.c +++ b/sys/kern/vfs_cache.c @@ -34,7 +34,6 @@ * @(#)vfs_cache.c 8.5 (Berkeley) 3/22/95 */ -#include #include "opt_ddb.h" #include "opt_ktrace.h" @@ -372,6 +371,18 @@ cache_ncp_invalidate(struct namecache *ncp) atomic_thread_fence_rel(); } +/* + * Does this entry match the given directory and name? + */ +static bool +cache_ncp_match(struct namecache *ncp, struct vnode *dvp, + struct componentname *cnp) +{ + return (ncp->nc_dvp == dvp && + ncp->nc_nlen == cnp->cn_namelen && + bcmp(ncp->nc_name, cnp->cn_nameptr, cnp->cn_namelen) == 0); +} + /* * Check whether the entry can be safely used. * @@ -1325,8 +1336,7 @@ cache_neg_promote_cond(struct vnode *dvp, struct componentname *cnp, /* * The newly found entry may be something different... */ - if (!(ncp->nc_dvp == dvp && ncp->nc_nlen == cnp->cn_namelen && - !bcmp(ncp->nc_name, cnp->cn_nameptr, ncp->nc_nlen))) { + if (!cache_ncp_match(ncp, dvp, cnp)) { goto out_abort; } @@ -1672,12 +1682,9 @@ cache_zap_unlocked_bucket(struct namecache *ncp, struct componentname *cnp, cache_lock_vnodes(dvlp, vlp); mtx_lock(blp); CK_SLIST_FOREACH(rncp, (NCHHASH(hash)), nc_hash) { - if (rncp == ncp && rncp->nc_dvp == dvp && - rncp->nc_nlen == cnp->cn_namelen && - !bcmp(rncp->nc_name, cnp->cn_nameptr, rncp->nc_nlen)) + if (rncp == ncp && cache_ncp_match(rncp, dvp, cnp)) break; } - if (rncp == NULL) goto out_mismatch; @@ -1784,8 +1791,7 @@ retry: mtx_lock(blp); CK_SLIST_FOREACH(ncp, (NCHHASH(hash)), nc_hash) { - if (ncp->nc_dvp == dvp && ncp->nc_nlen == cnp->cn_namelen && - !bcmp(ncp->nc_name, cnp->cn_nameptr, ncp->nc_nlen)) + if (cache_ncp_match(ncp, dvp, cnp)) break; } @@ -1985,8 +1991,7 @@ retry: mtx_lock(blp); CK_SLIST_FOREACH(ncp, (NCHHASH(hash)), nc_hash) { - if (ncp->nc_dvp == dvp && ncp->nc_nlen == cnp->cn_namelen && - !bcmp(ncp->nc_name, cnp->cn_nameptr, ncp->nc_nlen)) + if (cache_ncp_match(ncp, dvp, cnp)) break; } @@ -2080,8 +2085,7 @@ cache_lookup(struct vnode *dvp, struct vnode **vpp, struct componentname *cnp, vfs_smr_enter(); CK_SLIST_FOREACH(ncp, (NCHHASH(hash)), nc_hash) { - if (ncp->nc_dvp == dvp && ncp->nc_nlen == cnp->cn_namelen && - !bcmp(ncp->nc_name, cnp->cn_nameptr, ncp->nc_nlen)) + if (cache_ncp_match(ncp, dvp, cnp)) break; } @@ -2481,9 +2485,7 @@ cache_enter_time(struct vnode *dvp, struct vnode *vp, struct componentname *cnp, */ ncpp = NCHHASH(hash); CK_SLIST_FOREACH(n2, ncpp, nc_hash) { - if (n2->nc_dvp == dvp && - n2->nc_nlen == cnp->cn_namelen && - !bcmp(n2->nc_name, cnp->cn_nameptr, n2->nc_nlen)) { + if (cache_ncp_match(n2, dvp, cnp)) { MPASS(cache_ncp_canuse(n2)); if ((n2->nc_flag & NCF_NEGATIVE) != 0) KASSERT(vp == NULL, @@ -3016,8 +3018,7 @@ cache_validate(struct vnode *dvp, struct vnode *vp, struct componentname *cnp) blp = HASH2BUCKETLOCK(hash); mtx_lock(blp); CK_SLIST_FOREACH(ncp, (NCHHASH(hash)), nc_hash) { - if (ncp->nc_dvp == dvp && ncp->nc_nlen == cnp->cn_namelen && - !bcmp(ncp->nc_name, cnp->cn_nameptr, ncp->nc_nlen)) { + if (cache_ncp_match(ncp, dvp, cnp)) { if (ncp->nc_vp != vp) panic("%s: mismatch (%p != %p); ncp %p [%s] dvp %p\n", __func__, vp, ncp->nc_vp, ncp, ncp->nc_name, ncp->nc_dvp); @@ -5462,8 +5463,7 @@ cache_fplookup_next(struct cache_fpl *fpl) MPASS(!cache_fpl_isdotdot(cnp)); CK_SLIST_FOREACH(ncp, (NCHHASH(hash)), nc_hash) { - if (ncp->nc_dvp == dvp && ncp->nc_nlen == cnp->cn_namelen && - !bcmp(ncp->nc_name, cnp->cn_nameptr, ncp->nc_nlen)) + if (cache_ncp_match(ncp, dvp, cnp)) break; } From nobody Sun Jun 1 19:54:01 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b9SNB2Jmyz5y5qn; Sun, 01 Jun 2025 19:54: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b9SN94PTZz3st3; Sun, 01 Jun 2025 19:54:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748807641; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TbmdUE7IN6CLXkT4Ev6VPdaI3nT5Hvvocjw5Zdkr454=; b=cKTvmyfhRmtYwQmNcBeO3lE/dyrKxT9MAS4T5g19qW8uC4spRNQaWqi2mwM5TP1rtFrmPU uWxDB00JWY2Vmve9r2GqCw/3lunAr/WPfHs/gURqd9fsIyeHFdsXIAoupxSuYkd9HwkUY/ VZLcYEl+NUkE5pp+eFpseg2cagxmoBDEqaxhch6nxhBoy+lrHuSLLSbKMS8gNMERdj2YZ3 m3Po5e3hR9UZ1qCnw8Kk0jaxG3E5EETvkUNNsJXNbRWO0XmpBsL4Qb/8UUYji29p53LtaB OseNLM7FTDUJIAe/Watr9vuAirtBXFzmby9Z1lWDXmkieGXpmUwBa7rU7U4+OQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748807641; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TbmdUE7IN6CLXkT4Ev6VPdaI3nT5Hvvocjw5Zdkr454=; b=j5mnFlo48zf2vGG4hc6PCPaDdWveRPIyT6OtOX54L+qkmMmlp9NzLySOhF/Luyvdqz1Dd3 TSP7YKIICFbu3IqkPojyXTqDVMEsFThOc/ju0iiIpw4Co9u8nB2INWbVECC3VKFPd0XNGl Eg6IBeQo7AMEvE3UQ+HC3jzei2lCQ9m4pzQrg1E1vya77kwgc9Vr6VfBWejsWa1QGqsqr5 YpErU/xEf2AUODlWt5U2P0tXGeiasJgni9SJxf9Vx6EA3AtZoXZB1/EhMtKHqeevxuM59e k1uamk6TSWUDQcrZ22OUznw7rs1rtWg8DwglIFf/BO17ZrESVHLONUvwr5U7DQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748807641; a=rsa-sha256; cv=none; b=mng0gMHwOOrtopsyOQvDCpmFBbh3E6RfkHfuP9mN2hPCEgWMFiPyZYqoU1C6oYGkMLSLCN xmojek66ZVaXtVjKtR0jXMN0iCmfkKOScLfqINfSkXsEvyPbKT2mVkV3RZQ4R2eQEaaVV2 1SrKLyUks21uaZyKRx/aO5wGOl+ZpILToEj7TMoIjROyS5dOzVF6BD8VuPBIc1j/Je4gTb FPrGn8wdnY6DYB/dc0+7CXtr2sgniRZtirB4K1ku71fhrM40P/GZYk8Bujjxgfs3Xtcvra kJLeH0AWvCZTwMzoRcIG/P2kMeNKw2IYuNvwT0twBB2J4As+PKerTjjNc+0LyQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b9SN920MPzddb; Sun, 01 Jun 2025 19:54: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 551Js1Hv046080; Sun, 1 Jun 2025 19:54:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 551Js14q046076; Sun, 1 Jun 2025 19:54:01 GMT (envelope-from git) Date: Sun, 1 Jun 2025 19:54:01 GMT Message-Id: <202506011954.551Js14q046076@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 1a03846b4050 - stable/14 - vfs cache: Simplify cache_enter_time() a bit List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 1a03846b405093048324ea2783a19d88a469d5e6 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=1a03846b405093048324ea2783a19d88a469d5e6 commit 1a03846b405093048324ea2783a19d88a469d5e6 Author: Mark Johnston AuthorDate: 2025-05-02 21:35:18 +0000 Commit: Mark Johnston CommitDate: 2025-06-01 19:53:29 +0000 vfs cache: Simplify cache_enter_time() a bit The condition `flag == NFC_ISDOTDOT && vp != NULL && vp->v_type != VDIR` is never true at this point in the function. This is asserted slightly earlier. So, remove some dead code and simplify control flow. N.B. we set v_cache_dd for all vnode types, not just VDIR. This seems to be intentional, see commit ce575cd0e2f9069. For regular files it appears to effectively represent the most recently entered cache entry for the vnode. No functional change intended. Reviewed by: olce, kib MFC after: 2 weeks Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D50107 (cherry picked from commit 01435e28211220f985c66569f60939e440f0887f) --- sys/kern/vfs_cache.c | 34 +++++++++++++--------------------- 1 file changed, 13 insertions(+), 21 deletions(-) diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c index 284e23f3d1e8..a61a684e396e 100644 --- a/sys/kern/vfs_cache.c +++ b/sys/kern/vfs_cache.c @@ -2540,28 +2540,20 @@ cache_enter_time(struct vnode *dvp, struct vnode *vp, struct componentname *cnp, ("wrong vnode type %p", vp)); atomic_thread_fence_rel(); atomic_store_ptr(&dvp->v_cache_dd, ncp); - } - - if (vp != NULL) { - if (flag != NCF_ISDOTDOT) { - /* - * For this case, the cache entry maps both the - * directory name in it and the name ".." for the - * directory's parent. - */ - if ((ndd = vp->v_cache_dd) != NULL) { - if ((ndd->nc_flag & NCF_ISDOTDOT) != 0) - cache_zap_locked(ndd); - else - ndd = NULL; - } - atomic_thread_fence_rel(); - atomic_store_ptr(&vp->v_cache_dd, ncp); - } else if (vp->v_type != VDIR) { - if (vp->v_cache_dd != NULL) { - atomic_store_ptr(&vp->v_cache_dd, NULL); - } + } else if (vp != NULL) { + /* + * For this case, the cache entry maps both the + * directory name in it and the name ".." for the + * directory's parent. + */ + if ((ndd = vp->v_cache_dd) != NULL) { + if ((ndd->nc_flag & NCF_ISDOTDOT) != 0) + cache_zap_locked(ndd); + else + ndd = NULL; } + atomic_thread_fence_rel(); + atomic_store_ptr(&vp->v_cache_dd, ncp); } if (flag != NCF_ISDOTDOT) { From nobody Sun Jun 1 19:54:02 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b9SNB4CMPz5y5lt; Sun, 01 Jun 2025 19:54: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b9SNB33Gkz3t66; Sun, 01 Jun 2025 19:54:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748807642; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=h0+9HEclfSyN+Ag/Dv3u6peIdC/v7TgV6dByoVBOKhk=; b=ADBlqFVo/occRTtzyXMduea3SzCqBGmNbBEQ0+vtXTpYq5wGfbsdMt0evjH7FC0+403sS3 mPUSpqL4LrxqZnzx+tvjtj/nHsHN22DLvHhh9nwQvPKEp8yAOIkw17Bp2lH6hnb3lniA3S Tm74cI311QnDBGNt1irn3eQkuE/nwugYFnfsn9NVwJ3WU98nP2ZF6KOASzW8AoCOBnJWWS ynRXIC2sIfcentgg4sQVu8d8pC453ULNaeoLxfTafpKKxNctsrT+Gt8mRZrdpca9h7vN0y 5SVqyq6hjtvNiH2wIBGRt4Jt+66Dpy//zVgFnz8r4kIVMnt1C1r/QVZVGMRpWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748807642; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=h0+9HEclfSyN+Ag/Dv3u6peIdC/v7TgV6dByoVBOKhk=; b=G3LrzXUUiXtDWHQCkGh6ST4+HanIHhUjinUqYd+vjba2vB5ylvmaxa/bRRHs5tFI8nrLHx H5cKFGL5i+L7NKtv5U9E+a9I6NnKuitLaleWocMJe6CX7Tn/7D/TQ+x9HPu/++cqtgp3q8 SJDRnOSpXMLAYhJBRetLD206pEfpRKWGxTmIPdkU7ztc8lIOKPamuPeYkmCXUqv+F92rJ0 wHDzUPLhtkqRaq6ALevWXsBRz5h2Apie5njP/CTLUiNNf+FNxqPDrxIXZDy4aHvDg8kZuC HEitGNQNoD7VLRxHiYr739RvI7BFCMY2mJFJIVqgU2VJl2GM0Yhvicl1h77Y2Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748807642; a=rsa-sha256; cv=none; b=x0MHzbmq54lWlqbVH9wBGLdZHjFzj3ieiw5jiE9SaJA+woHpknqWAOtZk7Q+mmhhVoReBv a6y12fPTLeo45PiU3sYT5dOI5/qnzyvEdJdKMRhxu3WERku/4xoxn3iJS53grNKRXwremj T6jLgez6etEM7E3nAngO2yPZznq+bMnopw3XoLZNIxEUS6Kwa3wPZa6QeLhClaWk9YxJiD wcx0flwcEh/mASYkV8mRe9RGmNH8rUR/p0ST02ZbrIhmwV4IO/i/6wEx1LEbs/yzGMYjPD xrZbvDNiyK9mbz2PiDaztMYZeybD+c8ijVomQC3v34+SL0L52A9H3V7eXDVSSw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b9SNB2SdFzdy1; Sun, 01 Jun 2025 19:54: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 551Js2hj046116; Sun, 1 Jun 2025 19:54:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 551Js2nS046113; Sun, 1 Jun 2025 19:54:02 GMT (envelope-from git) Date: Sun, 1 Jun 2025 19:54:02 GMT Message-Id: <202506011954.551Js2nS046113@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 001fc46caa54 - stable/14 - file: Simplify an INVARIANTS check in _fdrop() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 001fc46caa5469c1693f5f64c801815cb0dedbf1 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=001fc46caa5469c1693f5f64c801815cb0dedbf1 commit 001fc46caa5469c1693f5f64c801815cb0dedbf1 Author: Mark Johnston AuthorDate: 2025-05-13 23:26:49 +0000 Commit: Mark Johnston CommitDate: 2025-06-01 19:53:29 +0000 file: Simplify an INVARIANTS check in _fdrop() No functional change intended. MFC after: 1 week Sponsored by: Klara, Inc. (cherry picked from commit a2e22ed3420d92d9d98a1e9681b5c9b1fbe40fca) --- sys/kern/kern_descrip.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c index 2d1c0d4aea5f..56e8a14f71b3 100644 --- a/sys/kern/kern_descrip.c +++ b/sys/kern/kern_descrip.c @@ -3701,13 +3701,10 @@ int __noinline _fdrop(struct file *fp, struct thread *td) { int error; -#ifdef INVARIANTS - int count; - count = refcount_load(&fp->f_count); - if (count != 0) - panic("fdrop: fp %p count %d", fp, count); -#endif + KASSERT(refcount_load(&fp->f_count) == 0, + ("fdrop: fp %p count %d", fp, refcount_load(&fp->f_count))); + error = fo_close(fp, td); atomic_subtract_int(&openfiles, 1); crfree(fp->f_cred); From nobody Sun Jun 1 19:54:03 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b9SND531Tz5y5nn; Sun, 01 Jun 2025 19:54: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b9SNC3n50z3t1q; Sun, 01 Jun 2025 19:54:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748807643; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jyPcPfGUGs0/fDDjK0wDUcb2IXBlaudngd8TL+FEvj4=; b=w9QNSLUMm2rnMPEfsx5aYmAcDNJg94fGAcuuBEG4s//qASkrHLBeEopWrlVpfXcZLS/uJX nhlsxwaDUr9YOalxx/IPgotjLen32goNnl2ll/40/Ng6Pd3x7gIhwzaVFKr1+C6rGtM4uM VV/hqMvsaaVuHbZfeqqZGfPOi1LwkFdFPmiEC0DITVOrX4HvKOUCPaQjrDRuLCPenY27Bw N2gNstVzy8No8zq+xZpVFuzMjmS8FXrLtxrBRlpUlsh/u89jmKbbdULi+INSaVcNq08pSN Y8huxO9IYjlLCrW8yrKASG/E5SYeBEfd+u8LR/RYYu0Cl4d5/3C0AwTrq/sugQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748807643; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jyPcPfGUGs0/fDDjK0wDUcb2IXBlaudngd8TL+FEvj4=; b=NbK1gOcS1LplVJTRZ4xZ0PPKQPJNwQYdQPjOzKGIZq7FwDyiTYdKHj/0TBgX/C3kBGvm9M iTEsXCC3PgdnzkJD+Sc65skBtomS23BqjOSgIc9df9U4gcUx8665Y99hNUTLYqmqF6Aua5 kdAwGqvd3SY09g4mP9FQT2Jtpl8ehEVmaG6r+vt9b4Nd8i3ZyCcIXWZmj8xJi242JJfkvq AitT6vNq7dgfmsxlaaTNTTRaPMFAsfAQII7ZH+uef1fImKQp9Hu4iahKf4S2ojEOql2ioJ AYLcIMoGKfsBpo+dnEnaIDi87CUvAyXqHcZ1jfg84ufwU1Cqs3XIhb4zXAE6QA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748807643; a=rsa-sha256; cv=none; b=C7lY8HL1/VCNnMRTVq0/1+HZ9FvfkWNAZ6acBVbC9OPbnKYIoYw2B01Fjz5wNsG93s00a6 3UHqQcxw8Yw2Fmwv04duKdurAnL+AKa5trKW9vfyR3yplZ5Ha3Ay8MR7CZDrKe8xTerRBc nad8B9a05AMW4GQx+/5HVAUOPk4dO35BVT/e2MO0AwVsq5H2U+pM6Lbmf6mu5v1M4gCsrm NcZQVVOOFprmDGi5F8Yuo8LWLaZa1qY+KjKEufEIXPjT8063rX4Y6Ex5QmJIIBThfwz5qq KosTmn/3RT/eI1mfF5JKGN6gplFEPn2ojnfcRWVXFZVRPMNknWLzXahc1XVvRA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b9SNC3DfvzdWf; Sun, 01 Jun 2025 19:54: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 551Js3Nw046156; Sun, 1 Jun 2025 19:54:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 551Js3Ww046153; Sun, 1 Jun 2025 19:54:03 GMT (envelope-from git) Date: Sun, 1 Jun 2025 19:54:03 GMT Message-Id: <202506011954.551Js3Ww046153@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 8ba7ac5a15e7 - stable/14 - makefs: Ensure that FFS superblocks are reproducible List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 8ba7ac5a15e7b5276c6b75934bb604ff5c98ce67 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=8ba7ac5a15e7b5276c6b75934bb604ff5c98ce67 commit 8ba7ac5a15e7b5276c6b75934bb604ff5c98ce67 Author: Mark Johnston AuthorDate: 2025-05-08 15:49:53 +0000 Commit: Mark Johnston CommitDate: 2025-06-01 19:53:29 +0000 makefs: Ensure that FFS superblocks are reproducible The superblock structure has space reserved for a pointer to an in-memory structure that gets created at mount time. makefs populates it since that simplifies code elsewhere. However, the pointer value ends up in the output file, which breaks reproducibility. Zero the field when writing the superblock instead, as its on-disk value is ignored. Reviewed by: emaste MFC after: 2 weeks Sponsored by: Klara, Inc. Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D50196 (cherry picked from commit 764ccf410c3c5453c4656113d75cd81fcf01828d) --- usr.sbin/makefs/ffs/mkfs.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/usr.sbin/makefs/ffs/mkfs.c b/usr.sbin/makefs/ffs/mkfs.c index b579565b6a01..fd7b24a1a6fb 100644 --- a/usr.sbin/makefs/ffs/mkfs.c +++ b/usr.sbin/makefs/ffs/mkfs.c @@ -580,13 +580,21 @@ ffs_write_superblock(struct fs *fs, const fsinfo_t *fsopts) { int size, blks, i, saveflag; uint32_t cylno; - void *space; + void *info, *space; char *wrbuf; saveflag = fs->fs_flags & FS_INTERNAL; fs->fs_flags &= ~FS_INTERNAL; - memcpy(writebuf, &sblock, sbsize); + /* + * Write out the superblock. Blank out the summary info field, as it's + * a random pointer that would make the resulting image unreproducible. + */ + info = fs->fs_si; + fs->fs_si = NULL; + memcpy(writebuf, fs, sbsize); + fs->fs_si = info; + if (fsopts->needswap) ffs_sb_swap(fs, (struct fs*)writebuf); ffs_wtfs(fs->fs_sblockloc / sectorsize, sbsize, writebuf, fsopts); From nobody Sun Jun 1 19:54:04 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b9SNF4Wdqz5y5th; Sun, 01 Jun 2025 19:54: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b9SND6tFzz3swh; Sun, 01 Jun 2025 19:54:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748807645; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UVVqSi5xkitmStrsHHlCb7CtGXc33EG5gK8pxqBtkEM=; b=Na6nQNpJkPr2gGfQ7n48O2UfUycj9Dj8blTn/GfcRO1u9guMiTmUzEQ7i14c9o4sUfTGXQ SyJePpBWIfTaPTd1Vacfbz4vK8ybug0/06ZFLJobFbmbkZc+47DM3W4W2CW3bWaFG3cF0T VssIvkuddDRxRB3zi+i1QqCkTEpM4De6CAFkyd9FrElLByo5c65/Ef62S3uiIZG4qFV+mQ JX32nufgtJ9sYKHWqVjf2c9U/7Xc9TcefEQV0CY8/SVynn//WPN35DvH71H2UxR0BU6tXo e6EnkpIyXdk1BCBSulHXGypVDRICE3+ILBHxTZ3qe7q8291Ppfh8eXkoy0OLeg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748807645; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UVVqSi5xkitmStrsHHlCb7CtGXc33EG5gK8pxqBtkEM=; b=uKrsBMlSB282MoJ1sw4wmN+1bHWNfPLMXV7SKIgMLL9vgtFW1dyOsKepBrcCaN4Ot8qz4H nVWd6zmkniIZv9/1W20hOdGette5GBZ8mQaehSIe7JTBIg/Fg9EbQHjze22n0GqVA6kWTK 59EcHyNck9SHxztdJcHIjYe5L1FVeR1nBifgqHTYrcE0DkGMb5saPUBH9oPXYaKeilHfTe +5T6EDQq0PI8upPHw4qhbuaLXXHlBewrsJqMIvF9tY+PyNxRU3D9j1gXDq8igH+5vp3sk/ FuplMgw3IJ4tBwzIBsi9ctcgK7Akgpn51qgN3tf5VcmR6jUIDGkaH6t1Z71UGA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748807645; a=rsa-sha256; cv=none; b=Pu5IN8eFFCPa1ouCcXl1R48Et8SyreksRMNwLiT1JTfREauli0jki/bVJtZy+L3sJb9qwh 28akiY359V+KvX9NL3gAdbnZqJTGbHSBjjL2C3dXqlj/ZtPXL5OjO/s8KXNdO04XqhkN0w 1DoS/ctcqJ7gNfdY+zCTXxOD8qH1/PIPkf2X6Mi6z9lErwq7AIEPSYi/i80wbhXS1OEu3f b8gxZig7WLK2wmfEgnJCOaenFhzQQJRIm3iEf19Qw5rz6p8rHvA5mk6mMuJwFD2zr42Vh7 SbWBFq7OCGIfN8Vtb82kAKrUmi+BBoHt17U76FsPdmq8PDEbjHtLeHrm02aKVw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b9SND4tTDzf0K; Sun, 01 Jun 2025 19:54: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 551Js4wl046189; Sun, 1 Jun 2025 19:54:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 551Js4KT046186; Sun, 1 Jun 2025 19:54:04 GMT (envelope-from git) Date: Sun, 1 Jun 2025 19:54:04 GMT Message-Id: <202506011954.551Js4KT046186@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 226076aa20f3 - stable/14 - netinet6: Do not forward or send ICMPv6 messages to the unspec address List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 226076aa20f311f7c2d21aa862ce14441db5d078 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=226076aa20f311f7c2d21aa862ce14441db5d078 commit 226076aa20f311f7c2d21aa862ce14441db5d078 Author: Mark Johnston AuthorDate: 2025-04-22 14:54:37 +0000 Commit: Mark Johnston CommitDate: 2025-06-01 19:53:29 +0000 netinet6: Do not forward or send ICMPv6 messages to the unspec address As in f7174eb2b4c4 ("netinet: Do not forward or ICMP response to INADDR_ANY"), the IPv6 stack should avoid sending packets to the unspecified address. In particular: - Make sure that we do not forward received packets to the unspecified address; the check in ip6_input() catches this in the common case, but after commit 40faf87894ff it's possible for a pfil hook to bypass this check and pass the packet to ip6_forward() using the PACKET_TAG_IPFORWARD tag. - Make sure that we do not reflect packets back to the unspecified address; RFC 4443 section 2.4 states that we must not generate error messages in response to packets from the unspecified address. Reviewed by: zlei, glebius Reported by: Franco Fichtner MFC after: 1 month Sponsored by: Klara, Inc. Sponsored by: OPNsense Differential Revision: https://reviews.freebsd.org/D49339 (cherry picked from commit b7a61e09e4ad5fda44b7f4b6fee14f1b53996b41) --- sys/netinet6/icmp6.c | 6 ++++++ sys/netinet6/ip6_forward.c | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/sys/netinet6/icmp6.c b/sys/netinet6/icmp6.c index 0a0ca80de721..8d6e04c926c7 100644 --- a/sys/netinet6/icmp6.c +++ b/sys/netinet6/icmp6.c @@ -2089,6 +2089,12 @@ icmp6_reflect(struct mbuf *m, size_t off) hlim = 0; srcp = NULL; + if (__predict_false(IN6_IS_ADDR_UNSPECIFIED(&ip6->ip6_src))) { + nd6log((LOG_DEBUG, + "icmp6_reflect: source address is unspecified\n")); + goto bad; + } + /* * If the incoming packet was addressed directly to us (i.e. unicast), * use dst as the src for the reply. diff --git a/sys/netinet6/ip6_forward.c b/sys/netinet6/ip6_forward.c index 44a349d1750f..ad8c95c9363c 100644 --- a/sys/netinet6/ip6_forward.c +++ b/sys/netinet6/ip6_forward.c @@ -109,7 +109,8 @@ ip6_forward(struct mbuf *m, int srcrt) */ if ((m->m_flags & (M_BCAST|M_MCAST)) != 0 || IN6_IS_ADDR_MULTICAST(&ip6->ip6_dst) || - IN6_IS_ADDR_UNSPECIFIED(&ip6->ip6_src)) { + IN6_IS_ADDR_UNSPECIFIED(&ip6->ip6_src) || + IN6_IS_ADDR_UNSPECIFIED(&ip6->ip6_dst)) { IP6STAT_INC(ip6s_cantforward); /* XXX in6_ifstat_inc(rt->rt_ifp, ifs6_in_discard) */ if (V_ip6_log_cannot_forward && ip6_log_ratelimit()) { From nobody Sun Jun 1 19:54:05 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b9SNH0Yzcz5y5wY; Sun, 01 Jun 2025 19:54: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b9SNG0Jc3z3sws; Sun, 01 Jun 2025 19:54:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748807646; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=f8+1Gw+y07NDcVHcDcWsBo0sqSxqu0ez+8SHYxmdnh0=; b=fWpFQNT3R95IGgR/EVEdGHh8bQpDEslE+AnSndcLF/Y2CxmGyMExfQL3bRjGovo6RIKI1F 3QRPR0mJdOMNNwi0qqsUAOIWQKVsQ3M/EPczGyo2BOSyOXjwMts0miisC5TOgv2R10xkHR D27FPrUzlLThUMwxFQ16UHfvFIUvKR5bIV5ZntjMFy8oyNZG46OQDe4pFbUMCeKHxRQrRP UA6P5XfMj8Qs5vl5GIwqOd1f6i4qjw0nK/t8CvgqT5H/IXPWOeso4ktE7JXLqLenmi9WPs 0G+54AeOHVk/LbQsWNlWbWUOhYROHgxe9BXRIFmtcLkLWN6E1g8guW3cqmr0Dw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748807646; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=f8+1Gw+y07NDcVHcDcWsBo0sqSxqu0ez+8SHYxmdnh0=; b=fScGIW4X3M51apxH0CGGo3RMsHN4sIOZIwMGTIlmq2KYW9Pf8b8JfNHwfEwdC/6n3YBgwH tFPKj7MubWWWdY3xy6TDXVUTce9WlcOvkFfv9RnsvKvI5UboT+cnjnKbspkDjDLbsnwinP +fuxer9MuM48kRl3H4+IKoqjKUPmqdPmIQn33Xp47nHi6Lz6wgMZZLz2Dq5Mz9BVZD6X4N wA084lrfzPT11xfK6CFg+cxFvodHZxUvq5wvVwv36MRxb8zbbzuGEv3PUqFxoBtRwIioiC at9v/1jFTe6sXATBHx3YHA9lH3vYjTc5z05AgWLJAwODLMMCe9/OEyR98A2t8g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748807646; a=rsa-sha256; cv=none; b=x051ItW5ISdX1ULTocbGfXw0kRkhOvLccg6+FHcJOJyVVfwUgm1OTeNqilWtYxYcnB7dGk Crhs6kX9m7OHldXPfmIw2tKaH44XDSEh2JfGDBVCo+jDYQCPiudHI+8QfEusKe8ttTN/iD 4vBHzkn6tdDusoka5uIisiiIADjNVJ2+ntfq0Oq1R//RufIyeFvIKdEe1CufSmN+uCmKy8 tDCEK1FTEn7aN8jUNx8X/dyQV44mpK6ESRjhg30LwMhQ8vyRNHsn5TsnKLzOG4iS0UDOE+ /9JRNIvDXrb+BSj7uokIM96dUHcvZAMtJdqf2eu/rFhE8MnryrrH67rNg2DMNA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b9SNF58FNzdy2; Sun, 01 Jun 2025 19:54: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 551Js5D9046222; Sun, 1 Jun 2025 19:54:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 551Js5R2046219; Sun, 1 Jun 2025 19:54:05 GMT (envelope-from git) Date: Sun, 1 Jun 2025 19:54:05 GMT Message-Id: <202506011954.551Js5R2046219@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: cdf6e2d9feec - stable/14 - krb5: Fix handling of transient crypto request failures List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: cdf6e2d9feec03b0995c54be46d70471c3d69e5f Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=cdf6e2d9feec03b0995c54be46d70471c3d69e5f commit cdf6e2d9feec03b0995c54be46d70471c3d69e5f Author: Mark Johnston AuthorDate: 2025-05-09 00:16:53 +0000 Commit: Mark Johnston CommitDate: 2025-06-01 19:53:29 +0000 krb5: Fix handling of transient crypto request failures - Instead of using CRYPTO_F_DONE to decide whether a request has completed, use a custom protocol of setting crp_opaque = NULL in the callback and checking that instead. CRYPTO_F_DONE is set independent of whether an error occurred, but for transient errors signaled by EAGAIN, we want to simply retry the request. - Clear CRYPTO_F_DONE before retrying the request. - Panic if the request truly failed, as we currently have no way to pass hard errors back up. Reviewed by: jhb MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D50238 (cherry picked from commit 04421fda140b92eb0d22bc4c0f81b6de05f21225) --- sys/kgssapi/krb5/kcrypto_aes.c | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/sys/kgssapi/krb5/kcrypto_aes.c b/sys/kgssapi/krb5/kcrypto_aes.c index 39d3ee1aac2b..fa871b695226 100644 --- a/sys/kgssapi/krb5/kcrypto_aes.c +++ b/sys/kgssapi/krb5/kcrypto_aes.c @@ -117,19 +117,24 @@ aes_random_to_key(struct krb5_key_state *ks, const void *in) static int aes_crypto_cb(struct cryptop *crp) { - int error; struct aes_state *as = (struct aes_state *) crp->crp_opaque; - if (CRYPTO_SESS_SYNC(crp->crp_session)) + if (CRYPTO_SESS_SYNC(crp->crp_session)) { + KASSERT(crp->crp_etype == 0, + ("%s: callback with error %d", __func__, crp->crp_etype)); return (0); + } - error = crp->crp_etype; - if (error == EAGAIN) - error = crypto_dispatch(crp); - mtx_lock(&as->as_lock); - if (error || (crp->crp_flags & CRYPTO_F_DONE)) + if (crp->crp_etype == EAGAIN) { + crp->crp_etype = 0; + crp->crp_flags &= ~CRYPTO_F_DONE; + (void)crypto_dispatch(crp); + } else { + mtx_lock(&as->as_lock); + crp->crp_opaque = NULL; wakeup(crp); - mtx_unlock(&as->as_lock); + mtx_unlock(&as->as_lock); + } return (0); } @@ -165,11 +170,12 @@ aes_encrypt_1(const struct krb5_key_state *ks, int buftype, void *buf, if (!CRYPTO_SESS_SYNC(as->as_session_aes)) { mtx_lock(&as->as_lock); - if (!error && !(crp->crp_flags & CRYPTO_F_DONE)) + if (error == 0 && crp->crp_opaque != NULL) error = msleep(crp, &as->as_lock, 0, "gssaes", 0); mtx_unlock(&as->as_lock); } - + if (crp->crp_etype != 0) + panic("%s: crypto req failed: %d", __func__, crp->crp_etype); crypto_freereq(crp); } @@ -335,11 +341,13 @@ aes_checksum(const struct krb5_key_state *ks, int usage, if (!CRYPTO_SESS_SYNC(as->as_session_sha1)) { mtx_lock(&as->as_lock); - if (!error && !(crp->crp_flags & CRYPTO_F_DONE)) + if (error == 0 && crp->crp_opaque != NULL) error = msleep(crp, &as->as_lock, 0, "gssaes", 0); mtx_unlock(&as->as_lock); } + if (crp->crp_etype != 0) + panic("%s: crypto req failed: %d", __func__, crp->crp_etype); crypto_freereq(crp); } From nobody Sun Jun 1 19:54:06 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b9SNK1Ds3z5y5tl; Sun, 01 Jun 2025 19:54: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b9SNH33ynz3t2L; Sun, 01 Jun 2025 19:54:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748807648; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WveE0NAu5vpJJ9w9E72Y+q7RJYrVVKZzjtcc3+gETis=; b=oeY+DtiZHfF+wfjHrQBAFdhqPX4FoRjYYsZGfGQgGQPhsuwMINPjwoXm197VGJJTkU+amf 3IsvEqLRi1INPCNBalc3bKYj8EAljfxSi2Kk7oMWJ33oFRfFD5WH0fhBtdiereCyGLmdgV YZ3+5IWoU7Z2Jx8ZJTVhX5zWukSnzBtOsA796NJxssXf6cMhY70l2x1mryevAyQZZ68akQ wdVJTtY4Zq59IgNLoz5wuL6umf2G5JEsN8iG/coFvD9ID8BPHRV99pzR/aXqmoBG/j5YDA tZUbpUcLJ8ett1FZo041MraW7rrURywriujum57jQvInA2zr5UqjEv1PnWPptA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748807647; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WveE0NAu5vpJJ9w9E72Y+q7RJYrVVKZzjtcc3+gETis=; b=Hy0ks+v7eSgwTu/AwkL2ZCdpj2SV7foTLn1VV2Ot6IwhnTcvScrik0FmbIR6C6Ndpz/Xqt gtl0VfOf7I+phE7EW131bajHTViuqjjFsma3ADWxlACJo35SiJzwDOV1wLKGBTLdv8tDFJ usSoDrIkrl8lItpz1+I3iaRbE2LLhkeZMwhBepMzqG0b7gtGO1oOtZvVOiKF7yVzvifRmT 8pS4ouDekDoaLBz+Zc0UwcG4c+6c+8df/pKPh1azgPv//sWMIxhMwYxYCc92XSvj5wM205 pOVnN8cObUiuYYcqFCzI8UuqZqZeZPgfh0LzBn/ZhsfFyLBT+V83IacpD4R2tQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748807647; a=rsa-sha256; cv=none; b=uR4549NGEsACESgt5GXZpemNBR/KftjVwJcBi1FkrvbbPaUrC5XSZAgqKwiIu8dJL6MFLi TwRRE1cI7kbeLDowkJuCJumNeIVQqD/ztk8qkMf1LjWD3a2OwGXGWxazp6gzdGPYDRjF51 J9QfJdaAu98TWkz/SJiknOkClwXDkMy2dW+IOkfHJRPTxVHVQGoN7cOmjSQQVvnlE1x0Ff 1q3y6+Np3OL7rRMyIJCiKJ8szSURQjmlEtWq79adPbNRy17z1EQXaJDFFL0nPvD1rc+RCB mbCXKK1OxprGIAd6Dccv0zX151r/aBhzEM8q0xxu0AIHdOBzuh8Qzqajflb6sg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b9SNG6FY4zdTc; Sun, 01 Jun 2025 19:54: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 551Js6AV046255; Sun, 1 Jun 2025 19:54:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 551Js6G3046252; Sun, 1 Jun 2025 19:54:06 GMT (envelope-from git) Date: Sun, 1 Jun 2025 19:54:06 GMT Message-Id: <202506011954.551Js6G3046252@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: f00a7faf0503 - stable/14 - sysrc: Fix check flag logic for append and subtract List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f00a7faf050370d77292cac4c622a5a8d98ab13d Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=f00a7faf050370d77292cac4c622a5a8d98ab13d commit f00a7faf050370d77292cac4c622a5a8d98ab13d Author: Michal Scigocki AuthorDate: 2025-04-14 07:01:06 +0000 Commit: Mark Johnston CommitDate: 2025-06-01 19:53:29 +0000 sysrc: Fix check flag logic for append and subtract When using sysrc with the check flag (-c), the append (+=) and subtract (-=) operations result in incorrect return values because on the check path the necessary union/difference calculation logic is not performed. However, the correct union/difference calculation is already performed when running without the check flag. We fix the issue on the check path by using the results from the existing union/difference calculation in the check logic to get the correct return values. PR: 279200 Reviewed by: markj MFC after: 1 month Pull Request: https://github.com/freebsd/freebsd-src/pull/1664 (cherry picked from commit c97460c4d97db1bd46dab9f2bdbc90cd1ed7757f) --- usr.sbin/sysrc/sysrc | 52 +++++++++++++++++++++++++--------------------------- 1 file changed, 25 insertions(+), 27 deletions(-) diff --git a/usr.sbin/sysrc/sysrc b/usr.sbin/sysrc/sysrc index 1766cf7ab835..625ff5ca4efd 100644 --- a/usr.sbin/sysrc/sysrc +++ b/usr.sbin/sysrc/sysrc @@ -764,33 +764,6 @@ while [ $# -gt 0 ]; do continue fi - # - # If `-c' is passed, simply compare and move on - # - if [ "$CHECK_ONLY" ]; then - if ! IGNORED=$( f_sysrc_get "$NAME?" ); then - status=$FAILURE - [ "$VERBOSE" ] && - echo "$NAME: not currently set" - shift 1 - continue - fi - value=$( f_sysrc_get "$NAME" ) - if [ "$value" != "${1#*=}" ]; then - status=$FAILURE - if [ "$VERBOSE" ]; then - echo -n "$( f_sysrc_find "$NAME" ): " - echo -n "$NAME: would change from " - echo "\`$value' to \`${1#*=}'" - fi - elif [ "$VERBOSE" ]; then - echo -n "$( f_sysrc_find "$NAME" ): " - echo "$NAME: already set to \`$value'" - fi - shift 1 - continue - fi - # # Determine both `before' value and appropriate `new' value # @@ -848,6 +821,31 @@ while [ $# -gt 0 ]; do new="${1#*=}" esac + # + # If `-c' is passed, simply compare and move on + # + if [ "$CHECK_ONLY" ]; then + if ! IGNORED=$( f_sysrc_get "$NAME?" ); then + status=$FAILURE + [ "$VERBOSE" ] && + echo "$NAME: not currently set" + shift 1 + continue + elif [ "$new" != "$before" ]; then + status=$FAILURE + if [ "$VERBOSE" ]; then + echo -n "$( f_sysrc_find "$NAME" ): " + echo -n "$NAME: would change from " + echo "\`$before' to \`$new'" + fi + elif [ "$VERBOSE" ]; then + echo -n "$( f_sysrc_find "$NAME" ): " + echo "$NAME: already set to \`$before'" + fi + shift 1 + continue + fi + # # If `-N' is passed, simplify the output # From nobody Sun Jun 1 19:54:07 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b9SNK1J2gz5y67v; Sun, 01 Jun 2025 19:54: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b9SNJ2phxz3tFY; Sun, 01 Jun 2025 19:54:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748807648; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bAaQCXp8Do5uCMHFhp8mHbioPXX3QkmEM78RVWjmEkc=; b=hQwKs0llGwLEUy2xgJIgngpk6eSDiADaccY0VcXzjFvsg3PXYu29mhobb3fCPfZj8WMtot RYI9AsmARiSC3Afv4Z0UccweW6gtamzg64d8qpsUE3omQQo8CbPT+mfrFZr1nOL105VfRB yZoC/kq/KoeSLP/gTNVz5SDGT8CRndT42g0hXZLb2MhxrlXFfFXVxjhW9BsI26pQZMPCcV E/qHflVzLvod8as7aNB8VrfRc67Zod+9p+jKrceFAh0/mahgB66hwpDULhWSPSHu2V3SDw vERmsFTF0/X6cKMZYmN8hMMZQlQEVU+hkd4b6gvEGZufig61dMI3YozSGKPY8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748807648; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bAaQCXp8Do5uCMHFhp8mHbioPXX3QkmEM78RVWjmEkc=; b=ey53TRIJfolEMt8+z/eAIooNTzEzq7r8yYNuuTk56MYXFUhK5P9jA0aX0gCq6/xo6eC48M SW+/iSrmnAinCPpz0/ofPhy2WyGDFDMpADIRnzPAuL31JUHaZDLfAhS2O0neOfrj5bOJus YY8NO35JKR/I9CzEo+351+6iIBcEindvET+gCeMMyQyqz8bdQN3g1HFYgHjPRZyp9by8j9 sc+VmkrwhrDVKX/5ZCsPI/UYsaSvg3aRT4gTV7KPyTY+1XmTSoNva4gxl3jU7XN47lKzet XUJouKZMJ37fnvpVS2IR1j43aJXvOIzcGeezojwdzrSnUNYT5LgGcqxA11/oCw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748807648; a=rsa-sha256; cv=none; b=UALyIKfWM4nAlZPk7q11koQyPsMFsPKpi/aRYaQQPoUugv44Q1p9p4SZYvF8MNyU9qR9NA AMu+GUAmUNHFeA6z6vubFDQJ+2DttiB5y3fd86Mmgqvb29Hz86/qAewWDRl+X7a6BfPqkR Dd+6A8JzDyLooH7GCQHkA/T3G1mNUFNybVx+axWoNjyUn1IYAeg0FRFa9/sC+TIYbvCCtm /BTR7d4VPKvcuK6dV6/uVlxUU+XrjBljfO4RafdtEXQWIsHFRzJfm8Kki1IwA3ndIsol6y d9s5glXdza3Dw2/cADFMzLx3xlzqwVPn/4vCfXZkZGSAU3FMkjkObe+UcWL3DA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b9SNJ0JQpzddc; Sun, 01 Jun 2025 19:54: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 551Js77a046288; Sun, 1 Jun 2025 19:54:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 551Js7sS046285; Sun, 1 Jun 2025 19:54:07 GMT (envelope-from git) Date: Sun, 1 Jun 2025 19:54:07 GMT Message-Id: <202506011954.551Js7sS046285@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: ea8b5e7f57dd - stable/14 - sysrc: Add some regressions tests List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: ea8b5e7f57dd0e18506cd71eb55763e466649704 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=ea8b5e7f57dd0e18506cd71eb55763e466649704 commit ea8b5e7f57dd0e18506cd71eb55763e466649704 Author: Michal Scigocki AuthorDate: 2025-04-14 07:00:07 +0000 Commit: Mark Johnston CommitDate: 2025-06-01 19:53:29 +0000 sysrc: Add some regressions tests Reviewed by: markj MFC after: 1 month Pull Request: https://github.com/freebsd/freebsd-src/pull/1664 (cherry picked from commit eeb2d4ffe95b4332811c14b56cfdf5fc6ea821b0) --- etc/mtree/BSD.tests.dist | 2 + usr.sbin/sysrc/Makefile | 4 + usr.sbin/sysrc/tests/Makefile | 3 + usr.sbin/sysrc/tests/sysrc_test.sh | 351 +++++++++++++++++++++++++++++++++++++ 4 files changed, 360 insertions(+) diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist index bf327b14c306..4e014025f623 100644 --- a/etc/mtree/BSD.tests.dist +++ b/etc/mtree/BSD.tests.dist @@ -1219,6 +1219,8 @@ .. syslogd .. + sysrc + .. traceroute .. .. diff --git a/usr.sbin/sysrc/Makefile b/usr.sbin/sysrc/Makefile index 831ce5d135bd..e1f48f2af97b 100644 --- a/usr.sbin/sysrc/Makefile +++ b/usr.sbin/sysrc/Makefile @@ -1,6 +1,10 @@ +.include SCRIPTS= sysrc MAN= sysrc.8 +HAS_TESTS= +SUBDIR.${MK_TESTS}+= tests + .include diff --git a/usr.sbin/sysrc/tests/Makefile b/usr.sbin/sysrc/tests/Makefile new file mode 100644 index 000000000000..8b4bad96f4cc --- /dev/null +++ b/usr.sbin/sysrc/tests/Makefile @@ -0,0 +1,3 @@ +ATF_TESTS_SH+= sysrc_test + +.include diff --git a/usr.sbin/sysrc/tests/sysrc_test.sh b/usr.sbin/sysrc/tests/sysrc_test.sh new file mode 100644 index 000000000000..fa79e6262c21 --- /dev/null +++ b/usr.sbin/sysrc/tests/sysrc_test.sh @@ -0,0 +1,351 @@ +#- +# SPDX-License-Identifier: BSD-2-Clause +# +# Copyright (c) 2025 Michal Scigocki +# + +readonly SYSRC_CONF="${PWD}/sysrc_test.conf" + +atf_test_case check_variable +check_variable_head() +{ + atf_set "descr" "Check rc variable" +} +check_variable_body() +{ + cat <<- EOF > "${SYSRC_CONF}" + test_enable="NO" + test_list="item1 item2" + test2_list="" + EOF + + atf_check -o inline:"test_enable: NO\n" \ + sysrc -f "${SYSRC_CONF}" test_enable + atf_check -o inline:"test2_list: \n" \ + sysrc -f "${SYSRC_CONF}" test2_list + atf_check -o inline:"test_enable: NO\ntest_list: item1 item2\n" \ + sysrc -f "${SYSRC_CONF}" test_enable test_list + atf_check -e inline:"sysrc: unknown variable 'noexist'\n" \ + -s exit:1 sysrc -f "${SYSRC_CONF}" noexist + atf_check -e inline:"sysrc: unknown variable 'noexist'\n" \ + -s exit:1 -o inline:"test_enable: NO\n" \ + sysrc -f "${SYSRC_CONF}" test_enable noexist +} + +atf_test_case set_variable +set_variable_head() +{ + atf_set "descr" "Set rc variable" +} +set_variable_body() +{ + # Previously unset variable + atf_check -o inline:"test_enable: -> YES\n" \ + sysrc -f "${SYSRC_CONF}" test_enable=YES + atf_check -o inline:'test_enable="YES"\n' cat "${SYSRC_CONF}" + # Change set variable + atf_check -o inline:"test_enable: YES -> YES\n" \ + sysrc -f "${SYSRC_CONF}" test_enable=YES + atf_check -o inline:'test_enable="YES"\n' cat "${SYSRC_CONF}" + atf_check -o inline:"test_enable: YES -> NO\n" \ + sysrc -f "${SYSRC_CONF}" test_enable=NO + atf_check -o inline:'test_enable="NO"\n' cat "${SYSRC_CONF}" + # Set an empty variable + atf_check -o inline:"test2_enable: -> \n" \ + sysrc -f "${SYSRC_CONF}" test2_enable="" + atf_check -o inline:'test_enable="NO"\ntest2_enable=""\n' \ + cat "${SYSRC_CONF}" +} + +atf_test_case remove_variable_x_flag +remove_variable_x_flag_head() +{ + atf_set "descr" "Remove rc variable (-x flag)" +} +remove_variable_x_flag_body() +{ + cat <<- EOF > "${SYSRC_CONF}" + test1_enable="YES" + test2_enable="NO" + test3_enable="" + EOF + + atf_check sysrc -f "${SYSRC_CONF}" -x test1_enable + atf_check -o inline:'test2_enable="NO"\ntest3_enable=""\n' \ + cat "${SYSRC_CONF}" + atf_check sysrc -f "${SYSRC_CONF}" -x test2_enable test3_enable + atf_check -o empty cat "${SYSRC_CONF}" + atf_check -e inline:"sysrc: unknown variable 'noexist'\n"\ + -s exit:1 sysrc -f "${SYSRC_CONF}" -x noexist +} + +atf_test_case append_list +append_list_head() +{ + atf_set "descr" "Append rc variable to list" +} +append_list_body() +{ + atf_check -o inline:"test_list: -> item1\n" \ + sysrc -f "${SYSRC_CONF}" test_list+=item1 + atf_check -o inline:'test_list="item1"\n' cat "${SYSRC_CONF}" + atf_check -o inline:"test_list: item1 -> item1\n" \ + sysrc -f "${SYSRC_CONF}" test_list+=item1 + atf_check -o inline:'test_list="item1"\n' cat "${SYSRC_CONF}" + atf_check -o inline:"test_list: item1 -> item1 item2\n" \ + sysrc -f "${SYSRC_CONF}" test_list+=item2 + atf_check -o inline:'test_list="item1 item2"\n' \ + cat "${SYSRC_CONF}" +} + +atf_test_case subtract_list +subtract_list_head() +{ + atf_set "descr" "Subtract rc variable from list" +} +subtract_list_body() +{ + echo 'test_list="item1 item2"' > "${SYSRC_CONF}" + + atf_check -o inline:"test_list: item1 item2 -> item1\n" \ + sysrc -f "${SYSRC_CONF}" test_list-=item2 + atf_check -o inline:'test_list="item1"\n' cat "${SYSRC_CONF}" + atf_check -o inline:"test_list: item1 -> \n" \ + sysrc -f "${SYSRC_CONF}" test_list-=item1 + atf_check -o inline:'test_list=""\n' cat "${SYSRC_CONF}" + atf_check -o inline:"test_list: -> \n" \ + sysrc -f "${SYSRC_CONF}" test_list-=item3 + atf_check -o inline:'test_list=""\n' cat "${SYSRC_CONF}" + + # Subtracting a non-existant rc variable results in an empty variable + # being created. This is by design, see sysrc(8). + atf_check -s exit:1 grep test2_list "${SYSRC_CONF}" + atf_check -o inline:"test2_list: -> \n" \ + sysrc -f "${SYSRC_CONF}" test2_list-=item1 + atf_check -o inline:'test_list=""\ntest2_list=""\n' \ + cat "${SYSRC_CONF}" +} + +atf_test_case multiple_operations +multiple_operations_head() +{ + atf_set "descr" "Check performing multiple operations on rc variables" +} +multiple_operations_body() +{ + atf_check -o inline:"test1_enable: -> YES\ntest1_list: -> item1\n" \ + sysrc -f "${SYSRC_CONF}" test1_enable=YES test1_list+=item1 + atf_check -o inline:'test1_enable="YES"\ntest1_list="item1"\n' \ + cat "${SYSRC_CONF}" + + # The trailing space on line "^test1_list:" is necessary. + cat <<- EOF > expected + test1_enable: YES + test1_enable: YES -> NO + test2_enable: -> YES + test1_list: item1 -> + test2_list: -> item3 + EOF + atf_check -s exit:1 -e inline:"sysrc: unknown variable 'noexist'\n" \ + -o file:expected sysrc -f "${SYSRC_CONF}" test1_enable \ + test1_enable=NO noexist test2_enable=YES test1_list-=item1 \ + test2_list+=item3 + + cat <<- EOF > expected + test1_enable="NO" + test1_list="" + test2_enable="YES" + test2_list="item3" + EOF + atf_check -o file:expected cat "${SYSRC_CONF}" +} + +atf_test_case a_flag +a_flag_head() +{ + atf_set "descr" "Verify -a behavior" +} +a_flag_body() +{ + echo 'test_enable="YES"' > "${SYSRC_CONF}" + + atf_check -o inline:"test_enable: YES\n" sysrc -f "${SYSRC_CONF}" -a +} + +atf_test_case A_flag cleanup +A_flag_head() +{ + atf_set "descr" "Verify -A behavior" +} +A_flag_body() +{ + RC_DEFAULTS="${PWD}/rc_defaults.conf" + echo "rc_conf_files=\"${SYSRC_CONF}\"" > "${RC_DEFAULTS}" + echo 'test_enable="NO"' >> "${RC_DEFAULTS}" + echo 'test_enable="YES"' > "${SYSRC_CONF}" + + export RC_DEFAULTS + + # sysrc is coupled to the "source_rc_confs" sh(1) script function in + # /etc/defaults/rc.conf. For this test we use a custom default + # rc.conf file that is missing the "source_rc_confs" function, which + # causes sysrc to print an error message. While the coupling exists, + # we assume the error message is expected behaviour instead of just + # ignoring the stderr output to make sure we don't ignore other error + # messages in case of future regressions. + atf_check -e inline:"/usr/sbin/sysrc: source_rc_confs: not found\n" \ + -o inline:"rc_conf_files: ${SYSRC_CONF}\ntest_enable: NO\n" \ + sysrc -A + # Because "source_rc_confs" does not exist in our custom default + # rc.conf file, we cannot get sysrc to load the other SYSRC_CONF file + # to compare results. We can only verify that configuration variables + # get read from the RC_DEFAULTS file. +} +A_flag_cleanup() +{ + unset RC_DEFAULTS +} + +atf_test_case c_flag +c_flag_head() +{ + atf_set "descr" "Verify -c behavior" +} +c_flag_body() +{ + echo 'test_enable="NO"' > "${SYSRC_CONF}" + echo 'test_list="item1 item2"' >> "${SYSRC_CONF}" + + # Test if rc variable is set + atf_check sysrc -f "${SYSRC_CONF}" -c test_enable + atf_check sysrc -f "${SYSRC_CONF}" -c test_list + atf_check sysrc -f "${SYSRC_CONF}" -c test_enable test_list + atf_check -e inline:"sysrc: unknown variable 'noexist'\n"\ + -s exit:1 sysrc -f "${SYSRC_CONF}" -c noexist + atf_check -e inline:"sysrc: unknown variable 'noexist'\n"\ + -s exit:1 sysrc -f "${SYSRC_CONF}" -c test_enable noexist + + cat <<- EOF > expected_err + sysrc: unknown variable 'noexist1' + sysrc: unknown variable 'noexist2' + EOF + atf_check -e file:expected_err -s exit:1 \ + sysrc -f "${SYSRC_CONF}" -c noexist1 noexist2 + + # Test rc variable assignment + atf_check sysrc -f "${SYSRC_CONF}" -c test_enable=NO + atf_check -s exit:1 sysrc -f "${SYSRC_CONF}" -c test_enable=YES + atf_check -s exit:1 sysrc -f "${SYSRC_CONF}" -c noexist=YES + + # Test appending rc variables + atf_check sysrc -f "${SYSRC_CONF}" -c test_list+=item1 + atf_check -s exit:1 sysrc -f "${SYSRC_CONF}" -c test_list+=item3 + atf_check -s exit:1 sysrc -f "${SYSRC_CONF}" -c noexist+=item1 + atf_check sysrc -f "${SYSRC_CONF}" -c test_enable=NO test_list+=item1 + atf_check -s exit:1 \ + sysrc -f "${SYSRC_CONF}" -c test_enable=YES test_list+=item1 + atf_check -s exit:1 \ + sysrc -f "${SYSRC_CONF}" -c test_enable=NO test_list+=item3 + atf_check -s exit:1 \ + sysrc -f "${SYSRC_CONF}" -c test_enable=YES test_list+=item3 + + # Test subracting rc variables + atf_check sysrc -f "${SYSRC_CONF}" -c test_list-=item3 + atf_check -s exit:1 sysrc -f "${SYSRC_CONF}" -c test_list-=item1 + atf_check -s exit:1 sysrc -f "${SYSRC_CONF}" -c noexist-=item1 + atf_check sysrc -f "${SYSRC_CONF}" -c test_enable=NO test_list-=item3 + atf_check -s exit:1 \ + sysrc -f "${SYSRC_CONF}" -c test_enable=YES test_list-=item3 + atf_check -s exit:1 \ + sysrc -f "${SYSRC_CONF}" -c test_enable=NO test_list-=item1 + atf_check -s exit:1 \ + sysrc -f "${SYSRC_CONF}" -c test_enable=YES test_list-=item1 +} + +atf_test_case d_flag cleanup +d_flag_head() +{ + atf_set "descr" "Verify -f behavior" +} +d_flag_body() +{ + echo 'test_enable="NO" # Test Description' > "${SYSRC_CONF}" + + export RC_DEFAULTS="${SYSRC_CONF}" + + atf_check -o inline:'test_enable: Test Description\n' \ + sysrc -d test_enable +} +d_flag_cleanup() +{ + unset RC_DEFAULTS +} + +atf_test_case f_flag +f_flag_head() +{ + atf_set "descr" "Verify -f behavior" +} +f_flag_body() +{ + local sysrc2_conf="${PWD}/sysrc2.conf" + echo 'test_list="item1"' > "${sysrc2_conf}" + echo 'test_enable="NO"' >> "${sysrc2_conf}" + + atf_check test ! -f "${SYSRC_CONF}" + atf_check -e inline:"sysrc: unknown variable 'noexist'\n" \ + -s exit:1 sysrc -f "${SYSRC_CONF}" noexist + atf_check test ! -f "${SYSRC_CONF}" + atf_check -o inline:"test_enable: -> YES\n" \ + sysrc -f "${SYSRC_CONF}" test_enable=YES + atf_check test -f "${SYSRC_CONF}" + atf_check -o inline:"test_enable: YES\n" \ + sysrc -f "${SYSRC_CONF}" test_enable + # -f file order impacts final settings + atf_check -o inline:"test_enable: YES\n" \ + sysrc -f "${sysrc2_conf}" -f "${SYSRC_CONF}" test_enable + atf_check -o inline:"test_enable: NO\n" \ + sysrc -f "${SYSRC_CONF}" -f "${sysrc2_conf}" test_enable + atf_check -o inline:"test_enable: YES\ntest_list: item1\n" \ + sysrc -f "${sysrc2_conf}" -f "${SYSRC_CONF}" -a +} + +atf_test_case F_flag +F_flag_head() +{ + atf_set "descr" "Verify -F behavior" +} +F_flag_body() +{ + local sysrc2_conf="${PWD}/sysrc2.conf" + echo 'test_list="item1"' > "${sysrc2_conf}" + echo 'test_enable="NO"' > "${SYSRC_CONF}" + + atf_check -o inline:"test_enable: ${SYSRC_CONF}\n" \ + sysrc -f "${SYSRC_CONF}" -F test_enable + atf_check -o inline:"test_list: ${sysrc2_conf}\n" \ + sysrc -f "${sysrc2_conf}" -F test_list + + cat <<- EOF > expected + test_enable: ${SYSRC_CONF} + test_list: ${sysrc2_conf} + EOF + atf_check -o file:expected sysrc -f "${SYSRC_CONF}" \ + -f ${sysrc2_conf} -F test_enable test_list +} + +atf_init_test_cases() +{ + atf_add_test_case check_variable + atf_add_test_case set_variable + atf_add_test_case remove_variable_x_flag + atf_add_test_case append_list + atf_add_test_case subtract_list + atf_add_test_case multiple_operations + atf_add_test_case a_flag + atf_add_test_case A_flag + atf_add_test_case c_flag + atf_add_test_case d_flag + atf_add_test_case f_flag + atf_add_test_case F_flag +} From nobody Sun Jun 1 19:54:09 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b9SNL5pyHz5y6BZ; Sun, 01 Jun 2025 19:54: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b9SNL1RhTz3tJ1; Sun, 01 Jun 2025 19:54:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748807650; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gkTWd1OarDCcXpiigWEIf9nmP960/fZnIApklFfypeA=; b=KhV1CFcFoIbDLYqCgb/NeHK+u+qVXrITEBz8QsNcJdvB89w6DmPPe4eYHwEcPfmf3aK2XA NewPyTtRSHJxwi6/cSj7A69ULTcudJdsfdEfwgclm/+5TulWX/xX4Q68UKW7u85rS3jo4a /nlaVCqr8Uc34D/z86zeV3bkXEPInkZkzgmK00ewkzuQAEJ1/SDwOh3hJfiS/D1NisLP/+ UvLIfwH1J3r/IFo1okiJJQZ8KcsTs2613oyvdIpHgPfDk+acIISuf2tBMUsVVyErci6VSF CMuACruHLzu2Lp5WXwgUYr1kEn9pegA5j3ZDFFxmIKmGUqjp3zi7sSO8Zq1mCA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748807650; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gkTWd1OarDCcXpiigWEIf9nmP960/fZnIApklFfypeA=; b=EfA+YTv6GVOvvYNsllEXDfhJhgNsvlivteeQzbrNpjs01Ld+Y3vrJiswfnyyTQnBodukj/ rP8MZNY/R5XMb/4slpkrmWhkLRxQlZEva98aK4Ul7n5alx+/TKEGJBL6xzWVMbac6HuXwl hswVDVHHIORhQr6EOqlNvGRvcp4oBPAK5Po1B2zYjbdnXWeDEffNXPCgGNRNsfZSq5W1lX aah0RGWiSwpPwfYwIfFJK0iYYxYfNCE5piAWHztSZ8Mulnn/qy4+cuha8x/GehgCMa69r0 B73z2y9I1UAOS+envaDcr7kktje7iUxWEWndE7OYmEaVQdSt5UzG2Sax+459RQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748807650; a=rsa-sha256; cv=none; b=nrRCBF6cJqeEthXad517nVAg199mBzg9bddpvpFBfVJmODTxMNr7w1efQH47QWRY5ij4ko 1Uuge0PTBkasyQpQt1SU2J/YjoGjly2mClCAIpL+i6aSpO/2yxJV4veYmiVaHoDFfGxhVx lc9xH73Hf+EFbs5ju+EM0vn0j8KJPgU2mmHH8eedU5eCZcACcSyl9OGclY07wscrwJexCD IoVhtidwrN3GpCDxGrAx6ohCqOuZwPSa19Pth/sPHQVW+98eNsTeKhN8+H2g86iMfXiIDZ R/k1OVb8kKHr1O6BGu/4d83vZqpfGLOEW6wzcl4R2z+Bh9seVijD+PSYDBHxFw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b9SNK0zzjzdWg; Sun, 01 Jun 2025 19:54: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 551Js9TT046326; Sun, 1 Jun 2025 19:54:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 551Js9Qt046323; Sun, 1 Jun 2025 19:54:09 GMT (envelope-from git) Date: Sun, 1 Jun 2025 19:54:09 GMT Message-Id: <202506011954.551Js9Qt046323@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 5ea5220d1788 - stable/14 - du: Fix threshold on non-directory files List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 5ea5220d17881015df67e4f182e337bd269b9f34 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=5ea5220d17881015df67e4f182e337bd269b9f34 commit 5ea5220d17881015df67e4f182e337bd269b9f34 Author: Michal Scigocki AuthorDate: 2025-04-07 11:14:44 +0000 Commit: Mark Johnston CommitDate: 2025-06-01 19:53:29 +0000 du: Fix threshold on non-directory files PR: 265200 Reviewed by: markj MFC after: 1 month Pull Request: https://github.com/freebsd/freebsd-src/pull/1648 (cherry picked from commit 0ae2b9e866d3aea1e9141841488561f12603f879) --- usr.bin/du/du.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/usr.bin/du/du.c b/usr.bin/du/du.c index ead3e952ce0f..90b95b3d86e9 100644 --- a/usr.bin/du/du.c +++ b/usr.bin/du/du.c @@ -320,7 +320,9 @@ main(int argc, char *argv[]) howmany(p->fts_statp->st_size, cblocksize) : howmany(p->fts_statp->st_blocks, cblocksize); - if (aflag || p->fts_level == 0) { + if ((aflag || p->fts_level == 0) && threshold <= + threshold_sign * howmany(curblocks * cblocksize, + blocksize)) { if (hflag > 0) { prthumanval(curblocks); (void)printf("\t%s\n", p->fts_path); From nobody Sun Jun 1 19:54:10 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b9SNL5pCzz5y6GB; Sun, 01 Jun 2025 19:54: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b9SNL3XWvz3tCc; Sun, 01 Jun 2025 19:54:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748807650; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=g10TOeMnhCH4xmWi03Y9/a9t1Q4D5/JkjI5FpoikwG8=; b=mepZCRIhYnLynBdhKQg+N/11BUzbAKGVYLHNZLtGKN2QjTBPvvJK3igKquC6cHWr7C7Y7f CW8Kw5zMaSG0IvPXaXMUZxEWtsv4aSZDvUhr5ZoSNZi+X1yPX9KrQS8KWIsSWNC2NB+ZAy R7nhrdEN365M/4qotjY6aCqVstznI8oSy42h9IxA+5eFx0jvnvm7VQHzj/oYdIQGG5Hj9a +59r286YK5nHSfVVkHCSPF+VFlRRg87Uwl8qQ6fdhwC8pFgM3xAkH05Lxww4YybfTu4g9H bDp6nR7D/o3xiFDzBBqUOyc3CiF8Co6pnIFg14wbmgLBTXBjYGOTzFFQCEzRhQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748807650; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=g10TOeMnhCH4xmWi03Y9/a9t1Q4D5/JkjI5FpoikwG8=; b=n62kKlutYHkCr251eD+xbNjd5A8PbDhS4fyryVPlfHSCqXRJGpYIQVrtS0aqecJ2sYMa7r zxI1Cc0gvf053/zI72M1YIe2MDKMc6oQNUnB7tSYvMa0l5+pKCR3hEQBXqr/IvU/EfRLuj CZ449BIrohzXmk+DK+LmaSTKOVuVfNpcWO5GGfOkU8pQohwbCDmGEF6bnAhufKXvpML5dT 2lAqOosIbdWJ4gC4y82CeWNoCt2oXJ3uclPDkxiqJfNfdwH0cimn6dbvFR/x0vJ78Nos3N X7izaL4MgOVaZ6ISIK4G+A2vbqI8liwdhVRPk62mYQIqhPRVMAOGDeLEI5vdcw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748807650; a=rsa-sha256; cv=none; b=kixmjBTFUPtRhefZ2h2gLCZT+UQxWOoVarbqiBWMMEfwBeQydFt8g1h/2STFXBbZdocTLQ DLoUwlGlLibvYOxgHNBZQwHz8eH+LmGCUb6FxvKGNybPS0uvgxMcHGGECqV+VfYWg4Imx/ RUY2uCjkzRdyN7z5gBzGuCDV6sOimbi3qAs4RrZ5d7zTqgJB14431JI7ctCF0uPPE2lKyw VU0UOwu122oeANWFPFRodDDcqQwT/d5lWtYbfYRHQyBM1isx2Jqi/RgicGTOdJZFziUrVJ TePiRBe4O2xrKU0i9L554Afie/RPOnmxd+xGS+3/kDWkMC1xJobbHKRIJyixeg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b9SNL1bFGzdWh; Sun, 01 Jun 2025 19:54: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 551JsAPK046358; Sun, 1 Jun 2025 19:54:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 551JsAQd046355; Sun, 1 Jun 2025 19:54:10 GMT (envelope-from git) Date: Sun, 1 Jun 2025 19:54:10 GMT Message-Id: <202506011954.551JsAQd046355@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: f7d9af32d84f - stable/14 - du: Add regression tests List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f7d9af32d84f12172da018c1a876f3b66fd9ca34 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=f7d9af32d84f12172da018c1a876f3b66fd9ca34 commit f7d9af32d84f12172da018c1a876f3b66fd9ca34 Author: Michal Scigocki AuthorDate: 2025-04-07 11:08:57 +0000 Commit: Mark Johnston CommitDate: 2025-06-01 19:53:29 +0000 du: Add regression tests Reviewed by: markj MFC after: 1 month Pull Request: https://github.com/freebsd/freebsd-src/pull/1648 (cherry picked from commit 3e5550d25c6d614f422506373f7068c6c366fa85) --- usr.bin/du/tests/du_test.sh | 130 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 129 insertions(+), 1 deletion(-) diff --git a/usr.bin/du/tests/du_test.sh b/usr.bin/du/tests/du_test.sh index 0d7fc404b437..27076be8dc3e 100755 --- a/usr.bin/du/tests/du_test.sh +++ b/usr.bin/du/tests/du_test.sh @@ -97,6 +97,47 @@ I_flag_body() atf_check diff -u du.out du_I.out } +atf_test_case L_flag +L_flag_head() +{ + atf_set "descr" "Verify -L behavior" +} +L_flag_body() +{ + atf_check mkdir -p testdir1 + atf_check truncate -s 8192 testdir1/A + atf_check ln -s A testdir1/B + atf_check -o inline:'9\ttestdir1\n' du -A testdir1 + atf_check -o inline:'17\ttestdir1\n' du -AL testdir1 +} + +atf_test_case P_flag +P_flag_head() +{ + atf_set "descr" "Verify -P behavior" +} +P_flag_body() +{ + atf_check mkdir -p testdir1 + atf_check truncate -s 8192 testdir1/A + atf_check ln -s A testdir1/B + atf_check -o inline:'9\ttestdir1\n' du -A testdir1 + atf_check -o inline:'9\ttestdir1\n' du -AP testdir1 +} + +atf_test_case a_flag +a_flag_head() +{ + atf_set "descr" "Verify -a behavior" +} +a_flag_body() +{ + atf_check mkdir -p testdir1 + atf_check truncate -s 0 testdir1/A + atf_check -o inline:'1\ttestdir1\n' du -A testdir1 + atf_check -o inline:'0\ttestdir1/A\n1\ttestdir1\n' du -Aa testdir1 +} + atf_test_case c_flag c_flag_head() { @@ -104,7 +145,23 @@ c_flag_head() } c_flag_body() { - atf_check truncate -s 0 foo bar + atf_check truncate -s 8192 foo bar + atf_check -o inline:'8\tfoo\n8\tbar\n' du -A foo bar + atf_check -o inline:'8\tfoo\n8\tbar\n16\ttotal\n' du -Ac foo bar +} + +atf_test_case d_flag +d_flag_head() +{ + atf_set "descr" "Verify -d behavior" +} +d_flag_body() +{ + atf_check mkdir -p d0/d1/d2 + atf_check -o inline:'2\td0\n' du -A -d 0 d0 + atf_check -o inline:'1\td0/d1\n2\td0\n' du -A -d 1 d0 + atf_check -o inline:'1\td0/d1/d2\n1\td0/d1\n2\td0\n' du -A -d 2 d0 + atf_check -o inline:'1\td0/d1/d2\n1\td0/d1\n2\td0\n' du -A -d 3 d0 } atf_test_case g_flag @@ -149,6 +206,19 @@ k_flag_body() atf_check -o inline:'1\tA\n1024\tB\n' du -Ak A B } +atf_test_case l_flag +l_flag_head() +{ + atf_set "descr" "Verify -l output" +} +l_flag_body() +{ + atf_check truncate -s 0 A + atf_check ln A B + atf_check -o inline:'0\tA\n' du -A A B + atf_check -o inline:'0\tA\n0\tB\n' du -Al A B +} + atf_test_case m_flag m_flag_head() { @@ -162,6 +232,36 @@ m_flag_body() atf_check -o inline:'1\tA\n1\tB\n1024\tC\n' du -Am A B C } +atf_test_case n_flag +n_flag_head() +{ + atf_set "descr" "Verify -n output" +} +n_flag_body() +{ + atf_check truncate -s 0 A + atf_check truncate -s 0 B + atf_check -o inline:'0\tA\n0\tB\n' du -An A B + atf_check chflags nodump B + atf_check -o inline:'0\tA\n' du -An A B +} + +atf_test_case s_flag +s_flag_head() +{ + atf_set "descr" "Verify -s behavior" +} +s_flag_body() +{ + atf_check mkdir -p testdir1/testdir2 + atf_check truncate -s 0 testdir1/A testdir1/testdir2/B + atf_check -o inline:'1\ttestdir1\n' du -As testdir1 + atf_check -o inline:'0\ttestdir1/A\n' du -As testdir1/A + atf_check -o inline:'1\ttestdir1/testdir2\n' du -As testdir1/testdir2 + atf_check -o inline:'0\ttestdir1/testdir2/B\n' \ + du -As testdir1/testdir2/B +} + atf_test_case si_flag si_flag_head() { @@ -176,14 +276,42 @@ si_flag_body() atf_check -o inline:'1.5M\tA\n1.6M\tB\n' du -A --si A B } +atf_add_test_case t_flag +t_flag_head() +{ + atf_set "descr" "Verify -t output" +} +t_flag_body() +{ + atf_check mkdir -p testdir1/testdir2 + atf_check truncate -s 8192 testdir1/A testdir1/testdir2/B + + atf_check -o inline:'17\ttestdir1\n' du -At 10240 testdir1 + atf_check -o inline:'9\ttestdir1/testdir2\n' du -At -10240 testdir1 + atf_check -o inline:'9\ttestdir1/testdir2\n17\ttestdir1\n' \ + du -Aat 9216 testdir1 + atf_check -o save:du.out du -Aat -9216 testdir1 + atf_check -o inline:'8\ttestdir1/A\n8\ttestdir1/testdir2/B\n' \ + sort du.out +} + atf_init_test_cases() { atf_add_test_case A_flag atf_add_test_case H_flag atf_add_test_case I_flag + atf_add_test_case L_flag + atf_add_test_case P_flag + atf_add_test_case a_flag + atf_add_test_case c_flag + atf_add_test_case d_flag atf_add_test_case g_flag atf_add_test_case h_flag atf_add_test_case k_flag + atf_add_test_case l_flag atf_add_test_case m_flag + atf_add_test_case n_flag + atf_add_test_case s_flag atf_add_test_case si_flag + atf_add_test_case t_flag } From nobody Sun Jun 1 19:54:11 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b9SNN0C7Nz5y5tp; Sun, 01 Jun 2025 19:54: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b9SNM3NfNz3t35; Sun, 01 Jun 2025 19:54:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748807651; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pxoiQIRgm9ypOwYqfhRXy3QNVtILaL2rruxfNvUjIkU=; b=gsEwbhbEebtaLfN7SIwPjBfRy3DnBLaCaPLD0tb5u5MXywSvd3syaw582pjSXDwK7fPtTt xy2TP5s2anNhAeUJEdL0KzLoXcZWQNYORWtRoCgdYEO1Pqtwh90d2PIS6mLbf+RK3BZ1vK oocqIpy6HSU0qB6Vbsjx0l4JjPVx4pCg+8hWv4dDwhnzskYlV+G/vkVAuo1t1pOmJc1deM RpLszyuxDWI4g2dB0gdJBXVYb3fia6OPhExLzVmyw864zBIZcOq+y9HWSN6QN9V8mYjEuB yTkyh0V9RCvesp5PQq5dyvN/4aRpHhv97TBzGQ+6u1EA8sYj62GuKLWe89vN0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748807651; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pxoiQIRgm9ypOwYqfhRXy3QNVtILaL2rruxfNvUjIkU=; b=tcgkCZKc/kbVZgcAsY7uOFZGuhKegOarwq0wUnhXVumv2S4GFr22I8LvDOiunfKjqeFe03 wkPYy3KVjyTYffcR5+oLDzZwad3ubHJxSQuUrJs6plQYyZC7NZHfGSLOeQUeVcwGGTYUE1 lcqnRybB6OgTJZaN83/rK28Q7PkSm+YdG+S2rLZi0btZTqRdXxzJl6rdL25erZ1fqrp9+A gTvzlcvC1Jhxq09ZTr9LN0Ogk1KQg4Q6NXT8YqcREuW4i4mAtQ8BlbkghSKuU2M+r+yWED QFlzfDPYeo8Cozv2ARdXYyO+Ov/84bHzgZxN5QxVumXAXbd3Yke9/D6Awp/PBg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748807651; a=rsa-sha256; cv=none; b=p8oi6PVaafo7lrObCTRm0fc4we+VaPYcUGgRdZEj2/nZK59/OoN5nKQeAoeSaTR85h5ujc a7V8DJWvAKe7w9ufO+sAwwQTSb3nY/iKNnjKABkgtM7E1XbRV72MMLsWmqeA8CLNlZDscE yshXmUF1b54Ja511Qfa+tcuoEZ/JXh8iYQCUROrEJ0K9nDIwIwgAksXdU30JCOulJUC8t4 xrf5tC5DTt+Mp5WJoMQsrWyEwusuAwqCMDs2Sw/WxwAnhbDj8yIJ+46wiaSKpsOgsVweMH NtzxxFit0z4WWLmI1Vj45nerWY/s2sRz3w8viLaIUXTJ8QL39KZVAmbexmwYng== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b9SNM2d3jzf0L; Sun, 01 Jun 2025 19:54: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 551JsB5m046390; Sun, 1 Jun 2025 19:54:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 551JsBMo046387; Sun, 1 Jun 2025 19:54:11 GMT (envelope-from git) Date: Sun, 1 Jun 2025 19:54:11 GMT Message-Id: <202506011954.551JsBMo046387@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: cbcfc2b37d48 - stable/14 - conf: Make sanitizer configs include the debug config List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: cbcfc2b37d481121510f65ad6cf79d938e0ee9c5 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=cbcfc2b37d481121510f65ad6cf79d938e0ee9c5 commit cbcfc2b37d481121510f65ad6cf79d938e0ee9c5 Author: Mark Johnston AuthorDate: 2025-05-28 19:54:40 +0000 Commit: Mark Johnston CommitDate: 2025-06-01 19:53:29 +0000 conf: Make sanitizer configs include the debug config This is a direct commit to stable/14. --- sys/amd64/conf/GENERIC-KASAN | 2 +- sys/amd64/conf/GENERIC-KCSAN | 2 +- sys/amd64/conf/GENERIC-KMSAN | 2 +- sys/arm64/conf/GENERIC-KASAN | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/amd64/conf/GENERIC-KASAN b/sys/amd64/conf/GENERIC-KASAN index 5aa2d50d3cca..855f2e29f119 100644 --- a/sys/amd64/conf/GENERIC-KASAN +++ b/sys/amd64/conf/GENERIC-KASAN @@ -1,5 +1,5 @@ -include GENERIC +include GENERIC-DEBUG ident GENERIC-KASAN diff --git a/sys/amd64/conf/GENERIC-KCSAN b/sys/amd64/conf/GENERIC-KCSAN index a0970f2a46a4..135f705c0c93 100644 --- a/sys/amd64/conf/GENERIC-KCSAN +++ b/sys/amd64/conf/GENERIC-KCSAN @@ -25,7 +25,7 @@ # in NOTES. # -include GENERIC +include GENERIC-DEBUG ident GENERIC-KCSAN diff --git a/sys/amd64/conf/GENERIC-KMSAN b/sys/amd64/conf/GENERIC-KMSAN index e147d8b8168b..c84241e9d50b 100644 --- a/sys/amd64/conf/GENERIC-KMSAN +++ b/sys/amd64/conf/GENERIC-KMSAN @@ -1,5 +1,5 @@ -include GENERIC +include GENERIC-DEBUG ident GENERIC-KMSAN diff --git a/sys/arm64/conf/GENERIC-KASAN b/sys/arm64/conf/GENERIC-KASAN index 232e8cb27fcd..baaf62098e95 100644 --- a/sys/arm64/conf/GENERIC-KASAN +++ b/sys/arm64/conf/GENERIC-KASAN @@ -1,4 +1,4 @@ -include GENERIC +include GENERIC-DEBUG ident GENERIC-KASAN From nobody Sun Jun 1 20:07:49 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b9Sh53kDvz5y6TC for ; Sun, 01 Jun 2025 20:07: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b9Sh5372hz49ds; Sun, 01 Jun 2025 20:07:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748808469; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EfwQ7JIVWCepCk9DoKGDlJBtSxXHAVNiwI5LAf9xPz4=; b=Mr/dULqYbLIx4OLNknfXxTD7ECdPvE2fh2qpqXGGr7fGRpXDe3ccxeCfQ08g8WwRK3UYdS EJprOJfvKS3Ps0Mnug4z8tYVpJ0lzBaMjCb22qEKWwseazGrvVY51qjf0MDuyApYu0Z/HL finmUoXHOZCF5Ga6i693anIZT7aIieCzLsh9YGV0LpbvE7lPyLS0/pFz+D6bKa7oUTsDOU Qa5FpRTw5ZcH6qbAFsaBJT6IXb9nBHahEyrAWSfqZywcdASq1F0xNpdPKvSDyX82DBJqUd 64oYSqkB4BaJeO5kxp8XCzb21yXeUs66X1Sg/qrDlkXoViKfImdRCSQin4X5rw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748808469; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EfwQ7JIVWCepCk9DoKGDlJBtSxXHAVNiwI5LAf9xPz4=; b=K7tIrf3guNVj5XE0i5CNfsaZHWHTIbnzeYWywGLoijY455UQOUijeo01V8Oa+NqYwwQQCp /x1jC/kRflvk91SQf9tnmd22xZ0sEhQX1wLNUAeCWYFYbqe7Q/5NdDvwYjCHBxXm5qajgA Q0vdfGIikEC8YZ6ZEuWEXjkzLn1Ea3+FiWQwwTIPGhqXACzNHU3qyA2LUELj1++P0+SgNO aI1nymNIFg4W9+0IQcUq7QNlJIfqu8gqHjybWJpcrkjLCcZDKcfn0hDyABMeeHURlyyXx2 DW1Gz/nT2IFwpQMJaO9TnsBZHnf0kOEAebocGzKRQAqeJNAEwXHYom0o1wCTCw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748808469; a=rsa-sha256; cv=none; b=NV4UU2KjJd+P7T48Qtl8cmdVQobC22/X5B4wUsjZfHxBavn+vzUZLf026BjoRC/xQ57gCe TvSQrE6Oqp6rFnyOwYvHv6e2E447EtzfQ91zFWRvtg76qUYmx5cH8y5YfYylFvfirl8Wmw wb9jV/ivTHnYj9ZSV9AKKuakPAuncEz3WDZ1Oqk5q/lG968NtPVwBRRnJ2BGSn483uSxA5 Y1wtgGNQSmv7/zE4Ww4zrkPbj2Umxp86gp23w7sF6NW8dJJM82sinZLa5JczZJhmqpSlbs xDnvTliRbMJtMCROVDuDmnbudawQGqk3sxpfznA953mgIdH/fYHzSUf8qT0O/w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b9Sh52KVtzf3P; Sun, 01 Jun 2025 20:07: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 551K7nO5067570; Sun, 1 Jun 2025 20:07:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 551K7n9k067569; Sun, 1 Jun 2025 20:07:49 GMT (envelope-from git) Date: Sun, 1 Jun 2025 20:07:49 GMT Message-Id: <202506012007.551K7n9k067569@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Martin Matuska Subject: git: b0ea71a8555c..76141d3306de - vendor/libarchive - vendor branch updated List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/vendor/libarchive X-Git-Reftype: branch X-Git-Commit: 76141d3306dea42228646b9a4a5e97ccba59fe2a X-Git-Oldrev: b0ea71a8555c0b726319dc2a618cc6d17a4fa4f1 X-Git-Newrev: 76141d3306dea42228646b9a4a5e97ccba59fe2a Auto-Submitted: auto-generated The branch vendor/libarchive has been updated by mm: URL: https://cgit.FreeBSD.org/src/log/?id=b0ea71a8555c..76141d3306de 76141d3306de Update vendor/libarchive to 3.8.1 From nobody Sun Jun 1 21:31:37 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b9VXp5Npfz5yCHX; Sun, 01 Jun 2025 21:31: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b9VXp2DcXz3gsV; Sun, 01 Jun 2025 21:31:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748813498; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bfhb616Wg2F2sVzJuUmrHdHmurieppWzDYNJJjJsZSc=; b=YNR7Ov08WND659tmYVxB686a6NEG7dF3wfsBGb3gVRUDOrXq4+Xvzcg+QbqR1g4VsC6GDs G+qBgmjIDLL/t2UCLBfq4OlSQlQ3rlzs67mvwur3tcHmJQCF6ln/tbhZelu8BniOubDQgJ g16hQrKxjaunuTvNgPPiV/MvOKMWr0VlQovEH+9PkCNJSSRfQ1j3BhcV+na9oVmlVpn61z /0Bmr7Quh5Q9OGxmAj9IPp0At7OWzt7h4lL2dV93Ocl8APN4I8JXes8FuM+LDoZvZiT0ec Z2FPFXqXvahGyVVOB0fmVFWN4cluuv2QTUiuzIujFqyrwQpUvJEzskE1BJ5N5A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748813498; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bfhb616Wg2F2sVzJuUmrHdHmurieppWzDYNJJjJsZSc=; b=BEknj+Tba9Bd1XY4TFkYw/mPL0RdOP09BpIalOfGtjBcVrvMOz3VAezqnW4JOdnn6fzCv+ ES+ZE3C05geMoFPPh2TWL60OgG5n92nT9iqGI3rF8HUqRMvFwuBtpo2YtIB8k5BpKOIxmK tFK0JsScUw0tjFZ5zWfIotPKd+atGWArQAlPeT7zqzCWGhjWjwVr/5WiW2Vgu5gJ49OJSn P+lrsyzecmQ1QaRg2CDltZgFR2wIRoDlo5Cc+z5/yYglnxbqFIgjy4zCxMOntTMOgQGoZL SwcNz0z80oGCXf/OUI3Q1j0lqifkLcwDIos8k0p9FzWPUY5X5s7PTecPlBHUng== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748813498; a=rsa-sha256; cv=none; b=pms7mjnOTo1YC7xh+JaZ/HRZfRneFwwndjoCEtmRkdLEahIonjD2BDA7F6ZtVKE4eEz8fB fTYbLrs2HmvOFb3usGBK4gCXRVQeA/nva/nMRU2BhgvOHSfNBoSvK5a/Rx3B+GOUIrZLeY 4MB3M5bj65MiLZX492C++jHVUKK4SAam8WcHXoF8MzvBdSETGf8UxrEUn4j2kCsdAryXdm nWo57xC9/xQ2W+5lVOlHTV0pwC/SqW064PUruqxLLDiFcetmpWL/yNE3IiKDmQBX9V+1DG Tcso7CCazrUL4FKzQgSXB66TRo4XGoRwhfRRIvpqORMcWql8q0bPUo3OhujWgg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b9VXp1lFSzh78; Sun, 01 Jun 2025 21:31: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 551LVbDn030832; Sun, 1 Jun 2025 21:31:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 551LVbYO030828; Sun, 1 Jun 2025 21:31:37 GMT (envelope-from git) Date: Sun, 1 Jun 2025 21:31:37 GMT Message-Id: <202506012131.551LVbYO030828@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Martin Matuska Subject: git: 2e113ef82465 - main - libarchive: merge from vendor branch List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2e113ef82465598b8c26e0ca415fbe90677fbd47 Auto-Submitted: auto-generated The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=2e113ef82465598b8c26e0ca415fbe90677fbd47 commit 2e113ef82465598b8c26e0ca415fbe90677fbd47 Merge: 4bf049bfeefd 76141d3306de Author: Martin Matuska AuthorDate: 2025-06-01 20:16:26 +0000 Commit: Martin Matuska CommitDate: 2025-06-01 20:54:46 +0000 libarchive: merge from vendor branch libarchive 3.8.1 New features: #2088 7-zip reader: improve self-extracting archive detection #2137 zip writer: added XZ, LZMA, ZSTD and BZIP2 support #2403 zip writer: added LZMA + RISCV BCJ filter #2601 bsdtar: support --mtime and --clamp-mtime #2602 libarchive: mbedtls 3.x compatibility Security fixes: #2422 tar reader: Handle truncation in the middle of a GNU long linkname CVE-2024-57970 #2532 tar reader: fix unchecked return value in list_item_verbose() CVE-2025-25724 #2532 unzip: fix null pointer dereference CVE-2025-1632 #2568 warc: prevent signed integer overflow #2584 rar: do not skip past EOF while reading #2588 tar: fix overflow in build_ustar_entry #2598 rar: fix double free with over 4 billion nodes #2599 rar: fix heap-buffer-overflow Important bugfixes: #2399 7-zip reader: add SPARC filter support for non-LZMA compressors #2405 tar reader: ignore ustar size when pax size is present #2435 tar writer: fix bug when -s/a/b/ used more than once with b flag #2459 7-zip reader: add POWERPC filter support for non-LZMA compressors #2519 libarchive: handle ARCHIVE_FILTER_LZOP in archive_read_append_filter #2539 libarchive: add missing seeker function to archive_read_open_FILE() #2544 gzip: allow setting the original filename for gzip compressed files #2564 libarchive: improve lseek handling #2582 rar: support large headers on 32 bit systems #2587 bsdtar: don't hardlink negative inode files together #2596 rar: support large headers on 32 bit systems #2606 libarchive: support @-prefixed Unix epoch timestamps as date strings #2634 tar: Support negative time values with pax #2637 tar: Keep block alignment after pax error #2642 libarchive: fix FILE_skip regression #2643 tar: Handle extra bytes after sparse entries #2649 compress: Prevent call stack overflow #2651 iso9660: always check archive_string_ensure return value CVE: CVE-2024-57970, CVE-2025-1632, CVE-2025-25724 PR: 286944 (exp-run, 3.8.0) MFC after: 2 weeks contrib/libarchive/COPYING | 2 +- contrib/libarchive/NEWS | 8 + contrib/libarchive/README.md | 9 +- .../github_actions/install-macos-dependencies.sh | 19 + contrib/libarchive/cpio/cpio.c | 2 +- contrib/libarchive/cpio/test/test_format_newc.c | 12 +- contrib/libarchive/cpio/test/test_option_a.c | 2 +- contrib/libarchive/cpio/test/test_option_c.c | 8 +- contrib/libarchive/libarchive/archive.h | 57 +- contrib/libarchive/libarchive/archive_acl.c | 14 +- .../libarchive/libarchive/archive_acl_private.h | 2 +- contrib/libarchive/libarchive/archive_cmdline.c | 2 +- .../libarchive/archive_cryptor_private.h | 8 + contrib/libarchive/libarchive/archive_digest.c | 344 +- .../libarchive/libarchive/archive_digest_private.h | 35 +- .../libarchive/archive_disk_acl_freebsd.c | 4 +- contrib/libarchive/libarchive/archive_entry.c | 54 +- contrib/libarchive/libarchive/archive_entry.h | 84 +- .../libarchive/archive_entry_link_resolver.c | 8 + .../libarchive/libarchive/archive_entry_locale.h | 2 +- .../libarchive/libarchive/archive_entry_private.h | 13 +- .../libarchive/libarchive/archive_hmac_private.h | 2 +- contrib/libarchive/libarchive/archive_match.c | 102 +- contrib/libarchive/libarchive/archive_options.c | 4 +- .../libarchive/archive_options_private.h | 4 +- contrib/libarchive/libarchive/archive_pack_dev.h | 2 +- .../{archive_getdate.c => archive_parse_date.c} | 65 +- contrib/libarchive/libarchive/archive_platform.h | 5 + .../libarchive/libarchive/archive_platform_acl.h | 2 +- .../libarchive/libarchive/archive_platform_xattr.h | 2 +- contrib/libarchive/libarchive/archive_ppmd7.c | 11 +- contrib/libarchive/libarchive/archive_ppmd8.c | 15 +- .../libarchive/libarchive/archive_ppmd_private.h | 18 +- .../libarchive/libarchive/archive_random_private.h | 2 +- contrib/libarchive/libarchive/archive_rb.h | 2 +- contrib/libarchive/libarchive/archive_read.c | 6 - .../libarchive/archive_read_append_filter.c | 4 + .../libarchive/archive_read_disk_entry_from_file.c | 2 +- .../libarchive/archive_read_disk_posix.c | 9 +- .../libarchive/archive_read_disk_private.h | 7 +- .../libarchive/libarchive/archive_read_format.3 | 15 + .../libarchive/libarchive/archive_read_open_fd.c | 42 +- .../libarchive/libarchive/archive_read_open_file.c | 121 +- .../libarchive/archive_read_open_filename.c | 61 +- .../archive_read_support_filter_by_code.c | 14 - .../archive_read_support_filter_compress.c | 3 +- .../libarchive/archive_read_support_filter_lz4.c | 1 - .../libarchive/archive_read_support_format_7zip.c | 445 +- .../archive_read_support_format_by_code.c | 15 - .../libarchive/archive_read_support_format_cab.c | 7 +- .../libarchive/archive_read_support_format_cpio.c | 22 +- .../archive_read_support_format_iso9660.c | 4 +- .../libarchive/archive_read_support_format_lha.c | 73 +- .../libarchive/archive_read_support_format_rar.c | 184 +- .../libarchive/archive_read_support_format_rar5.c | 101 +- .../libarchive/archive_read_support_format_tar.c | 409 +- .../libarchive/archive_read_support_format_warc.c | 7 +- .../libarchive/archive_read_support_format_xar.c | 355 +- .../libarchive/archive_read_support_format_zip.c | 33 +- contrib/libarchive/libarchive/archive_string.c | 141 +- .../libarchive/archive_string_composition.h | 3 +- .../libarchive/libarchive/archive_string_sprintf.c | 11 +- contrib/libarchive/libarchive/archive_time.c | 163 + .../{archive_getdate.h => archive_time_private.h} | 26 +- contrib/libarchive/libarchive/archive_util.c | 76 +- .../libarchive/archive_version_details.c | 405 +- contrib/libarchive/libarchive/archive_write.c | 2 +- .../archive_write_add_filter_b64encode.c | 2 +- .../libarchive/archive_write_add_filter_gzip.c | 19 +- .../libarchive/archive_write_add_filter_uuencode.c | 2 +- .../libarchive/archive_write_disk_posix.c | 15 +- .../libarchive/archive_write_open_filename.c | 8 +- .../libarchive/archive_write_set_format_7zip.c | 298 +- .../libarchive/archive_write_set_format_gnutar.c | 16 +- .../libarchive/archive_write_set_format_iso9660.c | 25 +- .../libarchive/archive_write_set_format_mtree.c | 123 +- .../libarchive/archive_write_set_format_pax.c | 6 +- .../libarchive/archive_write_set_format_xar.c | 692 +- .../libarchive/archive_write_set_format_zip.c | 986 +- .../libarchive/archive_write_set_options.3 | 43 +- contrib/libarchive/libarchive/libarchive-formats.5 | 20 +- .../libarchive/libarchive/test/read_open_memory.c | 2 +- .../libarchive/test/test_7zip_filename_encoding.c | 200 +- contrib/libarchive/libarchive/test/test_acl_pax.c | 8 +- .../libarchive/test/test_acl_platform_nfs4.c | 10 +- .../libarchive/test/test_acl_platform_posix1e.c | 3 +- .../libarchive/libarchive/test/test_acl_posix1e.c | 8 +- contrib/libarchive/libarchive/test/test_acl_text.c | 2 +- .../libarchive/test/test_archive_match_time.c | 71 +- ...archive_getdate.c => test_archive_parse_date.c} | 21 +- .../test/test_archive_string_conversion.c | 4 +- .../libarchive/test/test_compat_gtar_large.c | 224 + .../libarchive/test/test_compat_solaris_tar_acl.c | 4 +- .../libarchive/test/test_compat_star_acl.c | 6 +- contrib/libarchive/libarchive/test/test_entry.c | 2 +- .../libarchive/libarchive/test/test_open_file.c | 9 +- .../test/test_read_disk_directory_traversals.c | 2 +- .../libarchive/test/test_read_format_7zip.c | 315 +- .../test_read_format_7zip_deflate_powerpc.7z.uu | 55 + .../test_read_format_7zip_extract_second.7z.uu | 22 +- .../test/test_read_format_7zip_lzma2_powerpc.7z.uu | 48 + .../test/test_read_format_7zip_lzma2_riscv.7z.uu | 49 + .../test/test_read_format_7zip_lzma2_sparc.7z.uu | 51 + .../test/test_read_format_7zip_sfx_elf.elf.uu | 9442 ++++++++++++++++++++ .../test_read_format_7zip_sfx_modified_pe.exe.uu | 109 + .../test/test_read_format_7zip_sfx_pe.exe.uu | 4751 ++++++++++ .../test/test_read_format_7zip_zstd_sparc.7z.uu | 59 + .../test/test_read_format_gtar_redundant_L.c | 40 + .../test_read_format_gtar_redundant_L.tar.Z.uu | 16 + .../libarchive/test/test_read_format_gtar_sparse.c | 8 +- .../test/test_read_format_gtar_sparse_length.c | 53 + .../test_read_format_gtar_sparse_length.tar.Z.uu | 12 + ...est_read_format_gtar_sparse_skip_entry.tar.Z.uu | 18 +- .../libarchive/test/test_read_format_rar.c | 74 +- .../libarchive/test/test_read_format_rar5.c | 29 +- .../test/test_read_format_rar5_unicode.rar.uu | 18 +- .../test/test_read_format_rar_encryption.c | 4 +- .../test/test_read_format_rar_endarc_huge.rar.uu | 4 + .../test/test_read_format_rar_newsub_huge.rar.uu | 5 + .../test/test_read_format_rar_overflow.c | 48 + .../test/test_read_format_rar_overflow.rar.uu | 11 + .../test/test_read_format_rar_symlink_huge.rar.uu | 5 + .../test_read_format_tar_empty_with_gnulabel.c | 2 +- .../test/test_read_format_tar_mac_metadata.c | 85 + .../test_read_format_tar_mac_metadata_1.tar.uu | 231 + .../test/test_read_format_tar_pax_g_large.c | 53 + .../test/test_read_format_tar_pax_g_large.tar.uu | 49 + .../test/test_read_format_tar_pax_negative_time.c | 68 + .../test_read_format_tar_pax_negative_time.tar.uu | 60 + .../libarchive/test/test_read_format_warc.c | 24 + .../test/test_read_format_warc_incomplete.warc.uu | 10 + .../libarchive/test/test_read_format_zip.c | 5 +- .../test/test_read_pax_empty_val_no_nl.c | 65 + .../test/test_read_pax_empty_val_no_nl.tar.uu | 60 + .../libarchive/test/test_read_position.c | 2 +- .../libarchive/libarchive/test/test_sparse_basic.c | 8 +- .../libarchive/libarchive/test/test_tar_large.c | 2 +- .../libarchive/test/test_write_disk_perms.c | 8 +- .../test/test_write_disk_secure_noabsolutepaths.c | 4 +- .../libarchive/test/test_write_filter_gzip.c | 5 +- .../libarchive/test/test_write_format_7zip.c | 6 + .../libarchive/test/test_write_format_7zip_large.c | 6 + .../libarchive/test/test_write_format_gnutar.c | 29 +- .../test/test_write_format_mtree_preset_digests.c | 2107 +++++ .../libarchive/test/test_write_format_tar_sparse.c | 4 +- .../libarchive/test/test_write_format_xar.c | 39 + .../test/test_write_format_zip64_stream.c | 192 +- .../test/test_write_format_zip_compression_bzip2.c | 362 + .../test_write_format_zip_compression_lzmaxz.c | 425 + .../test/test_write_format_zip_compression_store.c | 277 +- .../test/test_write_format_zip_compression_zstd.c | 366 + .../test/test_write_format_zip_entry_size_unset.c | 150 +- .../libarchive/test/test_write_format_zip_file.c | 164 +- .../test/test_write_format_zip_file_zip64.c | 192 +- .../libarchive/test/test_write_format_zip_large.c | 35 +- .../libarchive/test/test_write_format_zip_stream.c | 156 +- contrib/libarchive/libarchive_fe/passphrase.c | 10 +- contrib/libarchive/tar/bsdtar.1 | 74 +- contrib/libarchive/tar/bsdtar.c | 35 +- contrib/libarchive/tar/bsdtar.h | 12 +- contrib/libarchive/tar/cmdline.c | 2 + contrib/libarchive/tar/subst.c | 1 + contrib/libarchive/tar/test/test_list_item.c | 63 + contrib/libarchive/tar/test/test_list_item.tar.uu | 169 + contrib/libarchive/tar/test/test_option_C_mtree.c | 4 +- .../{test_option_P.c => test_option_P_upper.c} | 0 .../libarchive/tar/test/test_option_ignore_zeros.c | 4 +- contrib/libarchive/tar/test/test_option_mtime.c | 82 + contrib/libarchive/tar/test/test_option_s.c | 14 +- contrib/libarchive/tar/test/test_stdio.c | 48 +- contrib/libarchive/tar/util.c | 57 +- contrib/libarchive/tar/write.c | 4 + contrib/libarchive/test_utils/test_common.h | 2 +- contrib/libarchive/test_utils/test_main.c | 192 +- contrib/libarchive/test_utils/test_utils.c | 48 + contrib/libarchive/test_utils/test_utils.h | 11 +- contrib/libarchive/unzip/bsdunzip.c | 21 +- contrib/libarchive/unzip/la_getline.h | 16 + lib/libarchive/Makefile | 3 +- lib/libarchive/tests/Makefile | 35 +- usr.bin/tar/tests/Makefile | 5 +- 181 files changed, 25587 insertions(+), 2345 deletions(-) diff --cc contrib/libarchive/README.md index 933de6986425,000000000000..0d63357292ec mode 100644,000000..100644 --- a/contrib/libarchive/README.md +++ b/contrib/libarchive/README.md @@@ -1,244 -1,0 +1,247 @@@ +# Welcome to libarchive! + +The libarchive project develops a portable, efficient C library that +can read and write streaming archives in a variety of formats. It +also includes implementations of the common `tar`, `cpio`, and `zcat` +command-line tools that use the libarchive library. + +## Questions? Issues? + +* https://www.libarchive.org is the home for ongoing + libarchive development, including documentation, + and links to the libarchive mailing lists. +* To report an issue, use the issue tracker at + https://github.com/libarchive/libarchive/issues +* To submit an enhancement to libarchive, please + submit a pull request via GitHub: https://github.com/libarchive/libarchive/pulls + +## Contents of the Distribution + +This distribution bundle includes the following major components: + +* **libarchive**: a library for reading and writing streaming archives +* **tar**: the 'bsdtar' program is a full-featured 'tar' implementation built on libarchive +* **cpio**: the 'bsdcpio' program is a different interface to essentially the same functionality +* **cat**: the 'bsdcat' program is a simple replacement tool for zcat, bzcat, xzcat, and such +* **unzip**: the 'bsdunzip' program is a simple replacement tool for Info-ZIP's unzip +* **examples**: Some small example programs that you may find useful. +* **examples/minitar**: a compact sample demonstrating use of libarchive. +* **contrib**: Various items sent to me by third parties; please contact the authors with any questions. + +The top-level directory contains the following information files: + +* **NEWS** - highlights of recent changes +* **COPYING** - what you can do with this +* **INSTALL** - installation instructions +* **README** - this file +* **CMakeLists.txt** - input for "cmake" build tool, see INSTALL +* **configure** - configuration script, see INSTALL for details. If your copy of the source lacks a `configure` script, you can try to construct it by running the script in `build/autogen.sh` (or use `cmake`). + +The following files in the top-level directory are used by the 'configure' script: + +* `Makefile.am`, `aclocal.m4`, `configure.ac` - used to build this distribution, only needed by maintainers +* `Makefile.in`, `config.h.in` - templates used by configure script + +## Documentation + +In addition to the informational articles and documentation +in the online [libarchive Wiki](https://github.com/libarchive/libarchive/wiki), +the distribution also includes a number of manual pages: + + * bsdtar.1 explains the use of the bsdtar program + * bsdcpio.1 explains the use of the bsdcpio program + * bsdcat.1 explains the use of the bsdcat program + * libarchive.3 gives an overview of the library as a whole + * archive_read.3, archive_write.3, archive_write_disk.3, and + archive_read_disk.3 provide detailed calling sequences for the read + and write APIs + * archive_entry.3 details the "struct archive_entry" utility class + * archive_internals.3 provides some insight into libarchive's + internal structure and operation. + * libarchive-formats.5 documents the file formats supported by the library + * cpio.5, mtree.5, and tar.5 provide detailed information about these + popular archive formats, including hard-to-find details about + modern cpio and tar variants. + +The manual pages above are provided in the 'doc' directory in +a number of different formats. + +You should also read the copious comments in `archive.h` and the +source code for the sample programs for more details. Please let us +know about any errors or omissions you find. + +## Supported Formats + +Currently, the library automatically detects and reads the following formats: + + * Old V7 tar archives + * POSIX ustar + * GNU tar format (including GNU long filenames, long link names, and sparse files) + * Solaris 9 extended tar format (including ACLs) + * POSIX pax interchange format + * POSIX octet-oriented cpio + * SVR4 ASCII cpio + * Binary cpio (big-endian or little-endian) + * PWB binary cpio + * ISO9660 CD-ROM images (with optional Rockridge or Joliet extensions) + * ZIP archives (with uncompressed or "deflate" compressed entries, including support for encrypted Zip archives) - * ZIPX archives (with support for bzip2, ppmd8, lzma and xz compressed entries) ++ * ZIPX archives (with support for bzip2, zstd, ppmd8, lzma and xz compressed entries) + * GNU and BSD 'ar' archives + * 'mtree' format + * 7-Zip archives (including archives that use zstandard compression) + * Microsoft CAB format + * LHA and LZH archives + * RAR and RAR 5.0 archives (with some limitations due to RAR's proprietary status) ++ * WARC archives + * XAR archives + +The library also detects and handles any of the following before evaluating the archive: + + * uuencoded files + * files with RPM wrapper + * gzip compression + * bzip2 compression + * compress/LZW compression + * lzma, lzip, and xz compression + * lz4 compression + * lzop compression + * zstandard compression + +The library can create archives in any of the following formats: + + * POSIX ustar + * POSIX pax interchange format + * "restricted" pax format, which will create ustar archives except for + entries that require pax extensions (for long filenames, ACLs, etc). + * Old GNU tar format + * Old V7 tar format + * POSIX octet-oriented cpio + * SVR4 "newc" cpio + * Binary cpio (little-endian) + * PWB binary cpio + * shar archives + * ZIP archives (with uncompressed or "deflate" compressed entries) ++ * ZIPX archives (with bzip2, zstd, lzma or xz compressed entries) + * GNU and BSD 'ar' archives + * 'mtree' format + * ISO9660 format - * 7-Zip archives ++ * 7-Zip archives (including archives that use zstandard compression) ++ * WARC archives + * XAR archives + +When creating archives, the result can be filtered with any of the following: + + * uuencode ++ * base64 + * gzip compression + * bzip2 compression + * compress/LZW compression + * lzma, lzip, and xz compression + * lz4 compression + * lzop compression + * zstandard compression + +## Notes about the Library Design + +The following notes address many of the most common +questions we are asked about libarchive: + +* This is a heavily stream-oriented system. That means that + it is optimized to read or write the archive in a single + pass from beginning to end. For example, this allows + libarchive to process archives too large to store on disk + by processing them on-the-fly as they are read from or + written to a network or tape drive. This also makes + libarchive useful for tools that need to produce + archives on-the-fly (such as webservers that provide + archived contents of a users account). + +* In-place modification and random access to the contents + of an archive are not directly supported. For some formats, + this is not an issue: For example, tar.gz archives are not + designed for random access. In some other cases, libarchive + can re-open an archive and scan it from the beginning quickly + enough to provide the needed abilities even without true + random access. Of course, some applications do require true + random access; those applications should consider alternatives + to libarchive. + +* The library is designed to be extended with new compression and + archive formats. The only requirement is that the format be + readable or writable as a stream and that each archive entry be + independent. There are articles on the libarchive Wiki explaining + how to extend libarchive. + +* On read, compression and format are always detected automatically. + +* The same API is used for all formats; it should be very + easy for software using libarchive to transparently handle + any of libarchive's archiving formats. + +* Libarchive's automatic support for decompression can be used + without archiving by explicitly selecting the "raw" and "empty" + formats. + +* I've attempted to minimize static link pollution. If you don't + explicitly invoke a particular feature (such as support for a + particular compression or format), it won't get pulled in to + statically-linked programs. In particular, if you don't explicitly + enable a particular compression or decompression support, you won't + need to link against the corresponding compression or decompression + libraries. This also reduces the size of statically-linked + binaries in environments where that matters. + +* The library is generally _thread safe_ depending on the platform: + it does not define any global variables of its own. However, some + platforms do not provide fully thread-safe versions of key C library + functions. On those platforms, libarchive will use the non-thread-safe + functions. Patches to improve this are of great interest to us. + +* The function `archive_write_disk_header()` is _not_ thread safe on + POSIX machines and could lead to security issue resulting in world + writeable directories. Thus it must be mutexed by the calling code. + This is due to calling `umask(oldumask = umask(0))`, which sets the + umask for the whole process to 0 for a short time frame. + In case other thread calls the same function in parallel, it might + get interrupted by it and cause the executable to use umask=0 for the + remaining execution. + This will then lead to implicitly created directories to have 777 + permissions without sticky bit. + +* In particular, libarchive's modules to read or write a directory + tree do use `chdir()` to optimize the directory traversals. This + can cause problems for programs that expect to do disk access from + multiple threads. Of course, those modules are completely + optional and you can use the rest of libarchive without them. + +* The library is _not_ thread aware, however. It does no locking + or thread management of any kind. If you create a libarchive + object and need to access it from multiple threads, you will + need to provide your own locking. + +* On read, the library accepts whatever blocks you hand it. + Your read callback is free to pass the library a byte at a time + or mmap the entire archive and give it to the library at once. + On write, the library always produces correctly-blocked output. + +* The object-style approach allows you to have multiple archive streams + open at once. bsdtar uses this in its "@archive" extension. + +* The archive itself is read/written using callback functions. + You can read an archive directly from an in-memory buffer or + write it to a socket, if you wish. There are some utility + functions to provide easy-to-use "open file," etc, capabilities. + +* The read/write APIs are designed to allow individual entries + to be read or written to any data source: You can create + a block of data in memory and add it to a tar archive without + first writing a temporary file. You can also read an entry from + an archive and write the data directly to a socket. If you want + to read/write entries to disk, there are convenience functions to + make this especially easy. + +* Note: The "pax interchange format" is a POSIX standard extended tar + format that should be used when the older _ustar_ format is not + appropriate. It has many advantages over other tar formats + (including the legacy GNU tar format) and is widely supported by + current tar implementations. - diff --cc contrib/libarchive/build/ci/github_actions/install-macos-dependencies.sh index 000000000000,2aa4823fc3d0..2aa4823fc3d0 mode 000000,100755..100755 --- a/contrib/libarchive/build/ci/github_actions/install-macos-dependencies.sh +++ b/contrib/libarchive/build/ci/github_actions/install-macos-dependencies.sh diff --cc contrib/libarchive/libarchive/archive_time.c index 000000000000,3352c809bd11..3352c809bd11 mode 000000,100644..100644 --- a/contrib/libarchive/libarchive/archive_time.c +++ b/contrib/libarchive/libarchive/archive_time.c diff --cc contrib/libarchive/libarchive/test/test_compat_gtar_large.c index 000000000000,633b20c0a9f8..633b20c0a9f8 mode 000000,100644..100644 --- a/contrib/libarchive/libarchive/test/test_compat_gtar_large.c +++ b/contrib/libarchive/libarchive/test/test_compat_gtar_large.c diff --cc contrib/libarchive/libarchive/test/test_read_format_7zip_deflate_powerpc.7z.uu index 000000000000,a7db07ca424f..a7db07ca424f mode 000000,100644..100644 --- a/contrib/libarchive/libarchive/test/test_read_format_7zip_deflate_powerpc.7z.uu +++ b/contrib/libarchive/libarchive/test/test_read_format_7zip_deflate_powerpc.7z.uu diff --cc contrib/libarchive/libarchive/test/test_read_format_7zip_lzma2_powerpc.7z.uu index 000000000000,75940eadcb99..75940eadcb99 mode 000000,100644..100644 --- a/contrib/libarchive/libarchive/test/test_read_format_7zip_lzma2_powerpc.7z.uu +++ b/contrib/libarchive/libarchive/test/test_read_format_7zip_lzma2_powerpc.7z.uu diff --cc contrib/libarchive/libarchive/test/test_read_format_7zip_lzma2_riscv.7z.uu index 000000000000,5f1e8fb7d218..5f1e8fb7d218 mode 000000,100644..100644 --- a/contrib/libarchive/libarchive/test/test_read_format_7zip_lzma2_riscv.7z.uu +++ b/contrib/libarchive/libarchive/test/test_read_format_7zip_lzma2_riscv.7z.uu diff --cc contrib/libarchive/libarchive/test/test_read_format_7zip_lzma2_sparc.7z.uu index 000000000000,2ebafa01b84b..2ebafa01b84b mode 000000,100644..100644 --- a/contrib/libarchive/libarchive/test/test_read_format_7zip_lzma2_sparc.7z.uu +++ b/contrib/libarchive/libarchive/test/test_read_format_7zip_lzma2_sparc.7z.uu diff --cc contrib/libarchive/libarchive/test/test_read_format_7zip_sfx_elf.elf.uu index 000000000000,ec859e042274..ec859e042274 mode 000000,100644..100644 --- a/contrib/libarchive/libarchive/test/test_read_format_7zip_sfx_elf.elf.uu +++ b/contrib/libarchive/libarchive/test/test_read_format_7zip_sfx_elf.elf.uu diff --cc contrib/libarchive/libarchive/test/test_read_format_7zip_sfx_modified_pe.exe.uu index 000000000000,bf558c6e275f..bf558c6e275f mode 000000,100644..100644 --- a/contrib/libarchive/libarchive/test/test_read_format_7zip_sfx_modified_pe.exe.uu +++ b/contrib/libarchive/libarchive/test/test_read_format_7zip_sfx_modified_pe.exe.uu diff --cc contrib/libarchive/libarchive/test/test_read_format_7zip_sfx_pe.exe.uu index 000000000000,fc1a745994c6..fc1a745994c6 mode 000000,100644..100644 --- a/contrib/libarchive/libarchive/test/test_read_format_7zip_sfx_pe.exe.uu +++ b/contrib/libarchive/libarchive/test/test_read_format_7zip_sfx_pe.exe.uu diff --cc contrib/libarchive/libarchive/test/test_read_format_7zip_zstd_sparc.7z.uu index 000000000000,ae94baa944a2..ae94baa944a2 mode 000000,100644..100644 --- a/contrib/libarchive/libarchive/test/test_read_format_7zip_zstd_sparc.7z.uu +++ b/contrib/libarchive/libarchive/test/test_read_format_7zip_zstd_sparc.7z.uu diff --cc contrib/libarchive/libarchive/test/test_read_format_gtar_redundant_L.c index 000000000000,167445c074f3..167445c074f3 mode 000000,100644..100644 --- a/contrib/libarchive/libarchive/test/test_read_format_gtar_redundant_L.c +++ b/contrib/libarchive/libarchive/test/test_read_format_gtar_redundant_L.c diff --cc contrib/libarchive/libarchive/test/test_read_format_gtar_redundant_L.tar.Z.uu index 000000000000,3a0e447bf78a..3a0e447bf78a mode 000000,100644..100644 --- a/contrib/libarchive/libarchive/test/test_read_format_gtar_redundant_L.tar.Z.uu +++ b/contrib/libarchive/libarchive/test/test_read_format_gtar_redundant_L.tar.Z.uu diff --cc contrib/libarchive/libarchive/test/test_read_format_gtar_sparse_length.c index 000000000000,e8f3955b3384..e8f3955b3384 mode 000000,100644..100644 --- a/contrib/libarchive/libarchive/test/test_read_format_gtar_sparse_length.c +++ b/contrib/libarchive/libarchive/test/test_read_format_gtar_sparse_length.c diff --cc contrib/libarchive/libarchive/test/test_read_format_gtar_sparse_length.tar.Z.uu index 000000000000,a8667b861569..a8667b861569 mode 000000,100644..100644 --- a/contrib/libarchive/libarchive/test/test_read_format_gtar_sparse_length.tar.Z.uu +++ b/contrib/libarchive/libarchive/test/test_read_format_gtar_sparse_length.tar.Z.uu diff --cc contrib/libarchive/libarchive/test/test_read_format_rar_endarc_huge.rar.uu index 000000000000,0a0db80e17e6..0a0db80e17e6 mode 000000,100644..100644 --- a/contrib/libarchive/libarchive/test/test_read_format_rar_endarc_huge.rar.uu +++ b/contrib/libarchive/libarchive/test/test_read_format_rar_endarc_huge.rar.uu diff --cc contrib/libarchive/libarchive/test/test_read_format_rar_newsub_huge.rar.uu index 000000000000,b2255b195985..b2255b195985 mode 000000,100644..100644 --- a/contrib/libarchive/libarchive/test/test_read_format_rar_newsub_huge.rar.uu +++ b/contrib/libarchive/libarchive/test/test_read_format_rar_newsub_huge.rar.uu diff --cc contrib/libarchive/libarchive/test/test_read_format_rar_overflow.c index 000000000000,b39ed6b2ba67..b39ed6b2ba67 mode 000000,100644..100644 --- a/contrib/libarchive/libarchive/test/test_read_format_rar_overflow.c +++ b/contrib/libarchive/libarchive/test/test_read_format_rar_overflow.c diff --cc contrib/libarchive/libarchive/test/test_read_format_rar_overflow.rar.uu index 000000000000,48fd3fd9cb0d..48fd3fd9cb0d mode 000000,100644..100644 --- a/contrib/libarchive/libarchive/test/test_read_format_rar_overflow.rar.uu +++ b/contrib/libarchive/libarchive/test/test_read_format_rar_overflow.rar.uu diff --cc contrib/libarchive/libarchive/test/test_read_format_rar_symlink_huge.rar.uu index 000000000000,7827e1b4f9bc..7827e1b4f9bc mode 000000,100644..100644 --- a/contrib/libarchive/libarchive/test/test_read_format_rar_symlink_huge.rar.uu +++ b/contrib/libarchive/libarchive/test/test_read_format_rar_symlink_huge.rar.uu diff --cc contrib/libarchive/libarchive/test/test_read_format_tar_mac_metadata.c index 000000000000,b4745a22ee3b..b4745a22ee3b mode 000000,100644..100644 --- a/contrib/libarchive/libarchive/test/test_read_format_tar_mac_metadata.c +++ b/contrib/libarchive/libarchive/test/test_read_format_tar_mac_metadata.c diff --cc contrib/libarchive/libarchive/test/test_read_format_tar_mac_metadata_1.tar.uu index 000000000000,20b2cf5efe26..20b2cf5efe26 mode 000000,100644..100644 --- a/contrib/libarchive/libarchive/test/test_read_format_tar_mac_metadata_1.tar.uu +++ b/contrib/libarchive/libarchive/test/test_read_format_tar_mac_metadata_1.tar.uu diff --cc contrib/libarchive/libarchive/test/test_read_format_tar_pax_g_large.c index 000000000000,c4771e699777..c4771e699777 mode 000000,100644..100644 --- a/contrib/libarchive/libarchive/test/test_read_format_tar_pax_g_large.c +++ b/contrib/libarchive/libarchive/test/test_read_format_tar_pax_g_large.c diff --cc contrib/libarchive/libarchive/test/test_read_format_tar_pax_g_large.tar.uu index 000000000000,c37d35547d26..c37d35547d26 mode 000000,100644..100644 --- a/contrib/libarchive/libarchive/test/test_read_format_tar_pax_g_large.tar.uu +++ b/contrib/libarchive/libarchive/test/test_read_format_tar_pax_g_large.tar.uu diff --cc contrib/libarchive/libarchive/test/test_read_format_tar_pax_negative_time.c index 000000000000,b4edc3c2d951..b4edc3c2d951 mode 000000,100644..100644 --- a/contrib/libarchive/libarchive/test/test_read_format_tar_pax_negative_time.c +++ b/contrib/libarchive/libarchive/test/test_read_format_tar_pax_negative_time.c diff --cc contrib/libarchive/libarchive/test/test_read_format_tar_pax_negative_time.tar.uu index 000000000000,fdf3fc304bc8..fdf3fc304bc8 mode 000000,100644..100644 --- a/contrib/libarchive/libarchive/test/test_read_format_tar_pax_negative_time.tar.uu +++ b/contrib/libarchive/libarchive/test/test_read_format_tar_pax_negative_time.tar.uu diff --cc contrib/libarchive/libarchive/test/test_read_format_warc_incomplete.warc.uu index 000000000000,b91b97ef32d7..b91b97ef32d7 mode 000000,100644..100644 --- a/contrib/libarchive/libarchive/test/test_read_format_warc_incomplete.warc.uu +++ b/contrib/libarchive/libarchive/test/test_read_format_warc_incomplete.warc.uu diff --cc contrib/libarchive/libarchive/test/test_read_pax_empty_val_no_nl.c index 000000000000,f985488754fd..f985488754fd mode 000000,100644..100644 --- a/contrib/libarchive/libarchive/test/test_read_pax_empty_val_no_nl.c +++ b/contrib/libarchive/libarchive/test/test_read_pax_empty_val_no_nl.c diff --cc contrib/libarchive/libarchive/test/test_read_pax_empty_val_no_nl.tar.uu index 000000000000,5de8b25ecccd..5de8b25ecccd mode 000000,100644..100644 --- a/contrib/libarchive/libarchive/test/test_read_pax_empty_val_no_nl.tar.uu +++ b/contrib/libarchive/libarchive/test/test_read_pax_empty_val_no_nl.tar.uu diff --cc contrib/libarchive/libarchive/test/test_write_format_mtree_preset_digests.c index 000000000000,cdf789b4b002..cdf789b4b002 mode 000000,100644..100644 --- a/contrib/libarchive/libarchive/test/test_write_format_mtree_preset_digests.c +++ b/contrib/libarchive/libarchive/test/test_write_format_mtree_preset_digests.c diff --cc contrib/libarchive/libarchive/test/test_write_format_zip_compression_bzip2.c index 000000000000,7ec83309ee80..7ec83309ee80 mode 000000,100644..100644 --- a/contrib/libarchive/libarchive/test/test_write_format_zip_compression_bzip2.c +++ b/contrib/libarchive/libarchive/test/test_write_format_zip_compression_bzip2.c diff --cc contrib/libarchive/libarchive/test/test_write_format_zip_compression_lzmaxz.c index 000000000000,c5bb2d659a04..c5bb2d659a04 mode 000000,100644..100644 --- a/contrib/libarchive/libarchive/test/test_write_format_zip_compression_lzmaxz.c +++ b/contrib/libarchive/libarchive/test/test_write_format_zip_compression_lzmaxz.c diff --cc contrib/libarchive/libarchive/test/test_write_format_zip_compression_zstd.c index 000000000000,002026a4c0d3..002026a4c0d3 mode 000000,100644..100644 --- a/contrib/libarchive/libarchive/test/test_write_format_zip_compression_zstd.c +++ b/contrib/libarchive/libarchive/test/test_write_format_zip_compression_zstd.c diff --cc contrib/libarchive/tar/test/test_list_item.c index 000000000000,fd131c475275..fd131c475275 mode 000000,100644..100644 --- a/contrib/libarchive/tar/test/test_list_item.c +++ b/contrib/libarchive/tar/test/test_list_item.c diff --cc contrib/libarchive/tar/test/test_list_item.tar.uu index 000000000000,f0e174793438..f0e174793438 mode 000000,100644..100644 --- a/contrib/libarchive/tar/test/test_list_item.tar.uu +++ b/contrib/libarchive/tar/test/test_list_item.tar.uu diff --cc contrib/libarchive/tar/test/test_option_mtime.c index 000000000000,75cdb8390bc0..75cdb8390bc0 mode 000000,100644..100644 --- a/contrib/libarchive/tar/test/test_option_mtime.c +++ b/contrib/libarchive/tar/test/test_option_mtime.c diff --cc contrib/libarchive/test_utils/test_main.c index 76fcd79406ff,afd077fc6d0b..fe330e5a052e --- a/contrib/libarchive/test_utils/test_main.c +++ b/contrib/libarchive/test_utils/test_main.c @@@ -3542,6 -3554,59 +3554,59 @@@ test_summarize(int failed, int skips_nu memset(failed_lines, 0, sizeof(failed_lines)); } + /* + * Set or unset environment variable. + */ + static void + set_environment(const char *key, const char *value) + { + + #if defined(_WIN32) && !defined(__CYGWIN__) + if (!SetEnvironmentVariable(key, value)) { + fprintf(stderr, "SetEnvironmentVariable failed with %d\n", + (int)GetLastError()); + } + #else + if (value == NULL) { + if (unsetenv(key) == -1) + fprintf(stderr, "unsetenv: %s\n", strerror(errno)); + } else { + if (setenv(key, value, 1) == -1) + fprintf(stderr, "setenv: %s\n", strerror(errno)); + } + #endif + } + + /* + * Enforce C locale for (sub)processes. + */ + static void -set_c_locale() ++set_c_locale(void) + { + static const char *lcs[] = { + "LC_ADDRESS", + "LC_ALL", + "LC_COLLATE", + "LC_CTYPE", + "LC_IDENTIFICATION", + "LC_MEASUREMENT", + "LC_MESSAGES", + "LC_MONETARY", + "LC_NAME", + "LC_NUMERIC", + "LC_PAPER", + "LC_TELEPHONE", + "LC_TIME", + NULL + }; + size_t i; + + setlocale(LC_ALL, "C"); + set_environment("LANG", "C"); + for (i = 0; lcs[i] != NULL; i++) + set_environment(lcs[i], NULL); + } + /* * Actually run a single test, with appropriate setup and cleanup. */ diff --cc contrib/libarchive/unzip/la_getline.h index 000000000000,d7588731943d..d7588731943d mode 000000,100644..100644 --- a/contrib/libarchive/unzip/la_getline.h +++ b/contrib/libarchive/unzip/la_getline.h diff --cc lib/libarchive/Makefile index a68b938ca978,000000000000..fed73c388318 mode 100644,000000..100644 --- a/lib/libarchive/Makefile +++ b/lib/libarchive/Makefile @@@ -1,413 -1,0 +1,414 @@@ +.include + +PACKAGE=lib${LIB} +_LIBARCHIVEDIR= ${SRCTOP}/contrib/libarchive + +LIB= archive + +# FreeBSD SHLIB_MAJOR value is managed as part of the FreeBSD system. +# It has no real relation to the libarchive version number. +SHLIB_MAJOR= 7 + +CFLAGS+= -I${.OBJDIR} +CFLAGS+= -I${SRCTOP}/sys/contrib/zstd/lib +.include "Makefile.inc" + +.if ${MACHINE_ARCH:Marm*} != "" || ${MACHINE_ARCH:Mpowerpc*} != "" +NO_WCAST_ALIGN= yes +.if ${MACHINE_ARCH:M*64*} == "" +CFLAGS+= -DPPMD_32BIT +.endif +.endif +NO_WCAST_ALIGN.clang= + +.PATH: ${_LIBARCHIVEDIR}/libarchive + +# Headers to be installed in /usr/include +INCS= archive.h archive_entry.h + +# Sources to be compiled. +SRCS= archive_acl.c \ + archive_blake2sp_ref.c \ + archive_blake2s_ref.c \ + archive_check_magic.c \ + archive_cmdline.c \ + archive_cryptor.c \ + archive_disk_acl_freebsd.c \ + archive_digest.c \ + archive_entry.c \ + archive_entry_copy_stat.c \ + archive_entry_link_resolver.c \ + archive_entry_sparse.c \ + archive_entry_stat.c \ + archive_entry_strmode.c \ + archive_entry_xattr.c \ - archive_getdate.c \ + archive_hmac.c \ + archive_match.c \ + archive_options.c \ + archive_pack_dev.c \ ++ archive_parse_date.c \ + archive_pathmatch.c \ + archive_ppmd7.c \ + archive_ppmd8.c \ + archive_random.c \ + archive_rb.c \ + archive_read.c \ + archive_read_add_passphrase.c \ + archive_read_append_filter.c \ + archive_read_data_into_fd.c \ + archive_read_disk_entry_from_file.c \ + archive_read_disk_posix.c \ + archive_read_disk_set_standard_lookup.c \ + archive_read_extract.c \ + archive_read_extract2.c \ + archive_read_open_fd.c \ + archive_read_open_file.c \ + archive_read_open_filename.c \ + archive_read_open_memory.c \ + archive_read_set_format.c \ + archive_read_set_options.c \ + archive_read_support_filter_all.c \ + archive_read_support_filter_bzip2.c \ + archive_read_support_filter_by_code.c \ + archive_read_support_filter_compress.c \ + archive_read_support_filter_gzip.c \ + archive_read_support_filter_grzip.c \ + archive_read_support_filter_lrzip.c \ + archive_read_support_filter_lz4.c \ + archive_read_support_filter_lzop.c \ + archive_read_support_filter_none.c \ + archive_read_support_filter_program.c \ + archive_read_support_filter_rpm.c \ + archive_read_support_filter_uu.c \ + archive_read_support_filter_xz.c \ + archive_read_support_filter_zstd.c \ + archive_read_support_format_7zip.c \ + archive_read_support_format_all.c \ + archive_read_support_format_ar.c \ + archive_read_support_format_by_code.c \ + archive_read_support_format_cab.c \ + archive_read_support_format_cpio.c \ + archive_read_support_format_empty.c \ + archive_read_support_format_iso9660.c \ + archive_read_support_format_lha.c \ + archive_read_support_format_mtree.c \ + archive_read_support_format_rar.c \ + archive_read_support_format_rar5.c \ + archive_read_support_format_raw.c \ + archive_read_support_format_tar.c \ + archive_read_support_format_warc.c \ + archive_read_support_format_xar.c \ + archive_read_support_format_zip.c \ + archive_string.c \ + archive_string_sprintf.c \ ++ archive_time.c \ + archive_util.c \ + archive_version_details.c \ + archive_virtual.c \ + archive_write.c \ + archive_write_add_filter.c \ + archive_write_disk_set_standard_lookup.c \ + archive_write_disk_posix.c \ + archive_write_open_fd.c \ + archive_write_open_file.c \ + archive_write_open_filename.c \ + archive_write_open_memory.c \ + archive_write_add_filter_b64encode.c \ + archive_write_add_filter_by_name.c \ + archive_write_add_filter_bzip2.c \ + archive_write_add_filter_compress.c \ + archive_write_add_filter_grzip.c \ + archive_write_add_filter_gzip.c \ + archive_write_add_filter_lrzip.c \ + archive_write_add_filter_lz4.c \ + archive_write_add_filter_lzop.c \ + archive_write_add_filter_none.c \ + archive_write_add_filter_program.c \ + archive_write_add_filter_uuencode.c \ + archive_write_add_filter_xz.c \ + archive_write_add_filter_zstd.c \ + archive_write_set_format.c \ + archive_write_set_format_7zip.c \ + archive_write_set_format_ar.c \ + archive_write_set_format_by_name.c \ + archive_write_set_format_cpio.c \ + archive_write_set_format_cpio_binary.c \ + archive_write_set_format_cpio_newc.c \ + archive_write_set_format_cpio_odc.c \ + archive_write_set_format_filter_by_ext.c \ + archive_write_set_format_gnutar.c \ + archive_write_set_format_iso9660.c \ + archive_write_set_format_mtree.c \ + archive_write_set_format_pax.c \ + archive_write_set_format_raw.c \ + archive_write_set_format_shar.c \ + archive_write_set_format_ustar.c \ + archive_write_set_format_v7tar.c \ + archive_write_set_format_warc.c \ + archive_write_set_format_xar.c \ + archive_write_set_format_zip.c \ + archive_write_set_passphrase.c \ + archive_write_set_options.c \ + filter_fork_posix.c + +# Man pages to be installed. +MAN= archive_entry.3 \ + archive_entry_acl.3 \ + archive_entry_linkify.3 \ + archive_entry_misc.3 \ + archive_entry_paths.3 \ + archive_entry_perms.3 \ + archive_entry_stat.3 \ + archive_entry_time.3 \ + archive_read.3 \ + archive_read_data.3 \ + archive_read_disk.3 \ + archive_read_extract.3 \ + archive_read_filter.3 \ + archive_read_format.3 \ + archive_read_free.3 \ + archive_read_header.3 \ + archive_read_new.3 \ + archive_read_open.3 \ + archive_read_set_options.3 \ + archive_util.3 \ + archive_write.3 \ + archive_write_blocksize.3 \ + archive_write_data.3 \ + archive_write_disk.3 \ + archive_write_filter.3 \ + archive_write_finish_entry.3 \ + archive_write_format.3 \ + archive_write_free.3 \ + archive_write_header.3 \ + archive_write_new.3 \ + archive_write_open.3 \ + archive_write_set_options.3 \ + cpio.5 \ + libarchive.3 \ + libarchive_changes.3 \ + libarchive_internals.3 \ + libarchive-formats.5 \ + tar.5 + +# Symlink the man pages under each function name. +MLINKS+= archive_entry.3 archive_entry_clear.3 +MLINKS+= archive_entry.3 archive_entry_clone.3 +MLINKS+= archive_entry.3 archive_entry_free.3 +MLINKS+= archive_entry.3 archive_entry_new.3 +MLINKS+= archive_entry_acl.3 archive_entry_acl_add_entry.3 +MLINKS+= archive_entry_acl.3 archive_entry_acl_add_entry_w.3 +MLINKS+= archive_entry_acl.3 archive_entry_acl_clear.3 +MLINKS+= archive_entry_acl.3 archive_entry_acl_count.3 +MLINKS+= archive_entry_acl.3 archive_entry_acl_next.3 +MLINKS+= archive_entry_acl.3 archive_entry_acl_next_w.3 +MLINKS+= archive_entry_acl.3 archive_entry_acl_reset.3 +MLINKS+= archive_entry_acl.3 archive_entry_acl_text_w.3 +MLINKS+= archive_entry_linkify.3 archive_entry_linkresolver.3 +MLINKS+= archive_entry_linkify.3 archive_entry_linkresolver_new.3 +MLINKS+= archive_entry_linkify.3 archive_entry_linkresolver_set_strategy.3 +MLINKS+= archive_entry_linkify.3 archive_entry_linkresolver_free.3 +MLINKS+= archive_entry_paths.3 archive_entry_copy_hardlink.3 +MLINKS+= archive_entry_paths.3 archive_entry_copy_hardlink_w.3 +MLINKS+= archive_entry_paths.3 archive_entry_copy_link.3 +MLINKS+= archive_entry_paths.3 archive_entry_copy_link_w.3 +MLINKS+= archive_entry_paths.3 archive_entry_copy_pathname.3 +MLINKS+= archive_entry_paths.3 archive_entry_copy_pathname_w.3 +MLINKS+= archive_entry_paths.3 archive_entry_copy_sourcepath.3 +MLINKS+= archive_entry_paths.3 archive_entry_copy_symlink.3 +MLINKS+= archive_entry_paths.3 archive_entry_copy_symlink_w.3 +MLINKS+= archive_entry_paths.3 archive_entry_hardlink.3 +MLINKS+= archive_entry_paths.3 archive_entry_hardlink_w.3 +MLINKS+= archive_entry_paths.3 archive_entry_pathname.3 +MLINKS+= archive_entry_paths.3 archive_entry_pathname_w.3 +MLINKS+= archive_entry_paths.3 archive_entry_set_hardlink.3 +MLINKS+= archive_entry_paths.3 archive_entry_set_link.3 +MLINKS+= archive_entry_paths.3 archive_entry_set_pathname.3 +MLINKS+= archive_entry_paths.3 archive_entry_set_symlink.3 +MLINKS+= archive_entry_paths.3 archive_entry_symlink.3 +MLINKS+= archive_entry_paths.3 archive_entry_symlink_w.3 +MLINKS+= archive_entry_paths.3 archive_entry_update_symlink_utf8.3 +MLINKS+= archive_entry_paths.3 archive_entry_update_hardlink_utf8.3 *** 1073 LINES SKIPPED ***