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 <dougm@FreeBSD.org> Subject: git: 68e3875b623b - main - vm_object: drop reverse walk from collect_flush List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <dougm@FreeBSD.org> AuthorDate: 2025-05-26 03:02:37 +0000 Commit: Doug Moore <dougm@FreeBSD.org> 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" <sjg@FreeBSD.org> Subject: git: b0ada425efb3 - main - safe_eval allow : and + in values List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <sjg@FreeBSD.org> AuthorDate: 2025-05-26 03:05:53 +0000 Commit: Simon J. Gerraty <sjg@FreeBSD.org> 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 <rmacklem@FreeBSD.org> Subject: git: 0596b4a3d42f - main - vfs_cache.c: Use CACHE_FPL_SUPPORTED_CN_FLAGS List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <rmacklem@FreeBSD.org> AuthorDate: 2025-05-26 03:27:17 +0000 Commit: Rick Macklem <rmacklem@FreeBSD.org> 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 <kevans@FreeBSD.org> Subject: git: 9ce5410b9094 - main - src.conf: regen List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <kevans@FreeBSD.org> AuthorDate: 2025-05-26 04:20:44 +0000 Commit: Kyle Evans <kevans@FreeBSD.org> 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 <kib@FreeBSD.org> Subject: git: 39f442502167 - stable/14 - pthread_switch_add_np(3): remove List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <kib@FreeBSD.org> AuthorDate: 2025-05-16 13:25:34 +0000 Commit: Konstantin Belousov <kib@FreeBSD.org> 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 <sys/param.h> #include <sys/cpuset.h> -/* - * 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 <phantom@FreeBSD.org> -.\" 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 <kib@FreeBSD.org> Subject: git: b3188948394e - stable/14 - libthr: add stable user interface for sigfastblock(2) List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <kib@FreeBSD.org> AuthorDate: 2025-05-16 13:18:21 +0000 Commit: Konstantin Belousov <kib@FreeBSD.org> 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 <stdlib.h> #include <string.h> #include <pthread.h> +#include <pthread_np.h> #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 <kib@FreeBSD.org> Subject: git: e57eeaf54cb8 - stable/14 - pthread_signals_block_np(3): document List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <kib@FreeBSD.org> AuthorDate: 2025-05-16 13:24:27 +0000 Commit: Konstantin Belousov <kib@FreeBSD.org> 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 <kib@FreeBSD.org> 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 <kib@FreeBSD.org> Subject: git: c200e184cc39 - stable/14 - kern_fork.c: style List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <kib@FreeBSD.org> AuthorDate: 2025-05-24 11:03:50 +0000 Commit: Konstantin Belousov <kib@FreeBSD.org> 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 <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <emaste@freebsd.org> Date: Mon, 26 May 2025 08:10:41 -0400 X-Gm-Features: AX0GCFsP7R3GAqExUN4DcxFUclFL069_CWG9WVx9HR85V9W-k-BfExrchuJGn2s Message-ID: <CAPyFy2DDuJ5QdDNVNvzsH_ByUBwiJPoiBFLq+f=yHYqS=vCjRg@mail.gmail.com> Subject: Re: git: 9ce5410b9094 - main - src.conf: regen To: Kyle Evans <kevans@freebsd.org> 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 <kevans@freebsd.org> wrote: > > The branch main has been updated by kevans: > > URL: https://cgit.FreeBSD.org/src/commit/?id=9ce5410b9094f9a2dce72e86a70fd086acdb3ff6 > > commit 9ce5410b9094f9a2dce72e86a70fd086acdb3ff6 > Author: Kyle Evans <kevans@FreeBSD.org> > AuthorDate: 2025-05-26 04:20:44 +0000 > Commit: Kyle Evans <kevans@FreeBSD.org> > 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 <markj@FreeBSD.org> Subject: git: a40e695a5dfe - main - socket_splice tests: Explicitly bind to the loopback address List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <markj@FreeBSD.org> AuthorDate: 2025-05-26 14:13:36 +0000 Commit: Mark Johnston <markj@FreeBSD.org> 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 <kevans@FreeBSD.org> Subject: git: 07b7bcf1e555 - main - Revert "src.conf: regen" List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <kevans@FreeBSD.org> AuthorDate: 2025-05-26 15:10:06 +0000 Commit: Kyle Evans <kevans@FreeBSD.org> 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 <glebius@FreeBSD.org> Subject: git: 3ea0fa86f6a4 - main - buildkernel: fix build for kernels without VIMAGE List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <glebius@FreeBSD.org> AuthorDate: 2025-05-26 15:23:37 +0000 Commit: Gleb Smirnoff <glebius@FreeBSD.org> 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 <imp@FreeBSD.org> Subject: git: 06a894ca9b41 - main - stand/uboot: Remove unneeded nitems definition List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <imp@FreeBSD.org> AuthorDate: 2025-05-26 03:39:02 +0000 Commit: Warner Losh <imp@FreeBSD.org> 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 <imp@FreeBSD.org> Subject: git: 81336653be4c - main - stand/uboot: Remove unneeded _etext and _edata List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <imp@FreeBSD.org> AuthorDate: 2025-05-26 03:44:50 +0000 Commit: Warner Losh <imp@FreeBSD.org> 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 <imp@FreeBSD.org> Subject: git: c4270ea8849d - main - stand/powerpc/ofw: Remove bogus end decl List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <imp@FreeBSD.org> AuthorDate: 2025-05-26 03:29:51 +0000 Commit: Warner Losh <imp@FreeBSD.org> 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 <imp@FreeBSD.org> Subject: git: 62d1ec7889a8 - main - stand/i386: Initialize archsw at compile time List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <imp@FreeBSD.org> AuthorDate: 2025-05-25 15:17:53 +0000 Commit: Warner Losh <imp@FreeBSD.org> 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 <imp@FreeBSD.org> Subject: git: 7429d6158ca9 - main - kboot: Initialize archsw at compile time List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <imp@FreeBSD.org> AuthorDate: 2025-05-25 15:17:53 +0000 Commit: Warner Losh <imp@FreeBSD.org> 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 <smbios.h> -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 <imp@FreeBSD.org> Subject: git: e94f269cd329 - main - stand/efi: Initialize archsw at compile time List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <imp@FreeBSD.org> AuthorDate: 2025-05-26 03:25:26 +0000 Commit: Warner Losh <imp@FreeBSD.org> 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 <imp@FreeBSD.org> Subject: git: 36b05c058892 - main - stand/powerpc/ofw: Initialize archsw at compile time List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <imp@FreeBSD.org> AuthorDate: 2025-05-26 03:34:16 +0000 Commit: Warner Losh <imp@FreeBSD.org> 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 <machine/asm.h> #include <machine/psl.h> -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 <imp@FreeBSD.org> Subject: git: 5b90ffad8759 - main - stand/i386/zfsboot: Initialzie archsw at compile time. List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <imp@FreeBSD.org> AuthorDate: 2025-05-26 03:46:32 +0000 Commit: Warner Losh <imp@FreeBSD.org> 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 <imp@FreeBSD.org> Subject: git: b33f61833b29 - main - stand/uboot: Move archsw init to compile time List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <imp@FreeBSD.org> AuthorDate: 2025-05-26 03:37:16 +0000 Commit: Warner Losh <imp@FreeBSD.org> 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 <imp@FreeBSD.org> Subject: git: 26178196de73 - main - stand/userboot: Initialize archsw at compile time List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <imp@FreeBSD.org> AuthorDate: 2025-05-26 03:52:34 +0000 Commit: Warner Losh <imp@FreeBSD.org> 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 <imp@FreeBSD.org> Subject: git: 8cf4ac0c2149 - main - stand/kboot: Remove _end forward decl List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <imp@FreeBSD.org> AuthorDate: 2025-05-26 15:13:04 +0000 Commit: Warner Losh <imp@FreeBSD.org> 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 <emaste@FreeBSD.org> Subject: git: 61f46c66ddd3 - main - Remove LLVM_TARGET_SPARC descriptions List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <emaste@FreeBSD.org> AuthorDate: 2025-05-26 15:48:20 +0000 Commit: Ed Maste <emaste@FreeBSD.org> 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 <imp@FreeBSD.org> Subject: git: 8e5eacbfdef7 - main - stand: Update comment List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <imp@FreeBSD.org> AuthorDate: 2025-05-26 15:34:31 +0000 Commit: Warner Losh <imp@FreeBSD.org> 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 <emaste@FreeBSD.org> Subject: git: 79537a90dc36 - main - release: Add some comments and tidy dist set targets List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <emaste@FreeBSD.org> AuthorDate: 2025-05-21 13:36:46 +0000 Commit: Ed Maste <emaste@FreeBSD.org> 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 <bsd.obj.mk> 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 <emaste@FreeBSD.org> Subject: git: 136053f7db82 - main - elf.5: Add description of .ctors and .dtors List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <emaste@FreeBSD.org> AuthorDate: 2025-05-26 19:05:25 +0000 Commit: Ed Maste <emaste@FreeBSD.org> 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" <bz@FreeBSD.org> Subject: git: 6cbf8a04b186 - main - LinuxKPI: 802.11: mark struct ieee80211_ht_cap __packed List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <bz@FreeBSD.org> AuthorDate: 2025-05-26 23:20:20 +0000 Commit: Bjoern A. Zeeb <bz@FreeBSD.org> 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 <kib@FreeBSD.org> 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 <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <kib@FreeBSD.org> AuthorDate: 2025-05-25 18:11:58 +0000 Commit: Konstantin Belousov <kib@FreeBSD.org> 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 <rew@FreeBSD.org> Subject: git: dec24dbb29e4 - main - diskinfo: print attachment field for virtio_blk devices List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <rew@FreeBSD.org> AuthorDate: 2025-05-27 02:18:32 +0000 Commit: Robert Wing <rew@FreeBSD.org> 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 <ivy@FreeBSD.org> Subject: git: 33624770a87d - stable/14 - net/if_bridgevar.h: add include guard List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <ivy@FreeBSD.org> AuthorDate: 2025-04-04 10:59:09 +0000 Commit: Lexi Winter <ivy@FreeBSD.org> 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 <sys/types.h> #include <sys/callout.h> #include <sys/queue.h> @@ -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 <ivy@FreeBSD.org> Subject: git: 2e4014e81f6c - stable/13 - net/if_bridgevar.h: add include guard List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <ivy@FreeBSD.org> AuthorDate: 2025-04-04 10:59:09 +0000 Commit: Lexi Winter <ivy@FreeBSD.org> 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 <sys/callout.h> #include <sys/queue.h> #include <sys/condvar.h> @@ -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 <olce@FreeBSD.org> 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 <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <olce@FreeBSD.org> AuthorDate: 2025-05-27 08:20:06 +0000 Commit: Olivier Certner <olce@FreeBSD.org> 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 <olce@FreeBSD.org> Subject: git: e89d737041d1 - main - config.5: Document CONF_CFLAGS under 'makeoptions' List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <olce@FreeBSD.org> AuthorDate: 2025-05-27 07:41:19 +0000 Commit: Olivier Certner <olce@FreeBSD.org> 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 <olce@FreeBSD.org> 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 <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <olce@FreeBSD.org> AuthorDate: 2025-05-27 08:20:06 +0000 Commit: Olivier Certner <olce@FreeBSD.org> 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 <olce@FreeBSD.org> 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 <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <olce@FreeBSD.org> AuthorDate: 2025-05-27 09:31:15 +0000 Commit: Olivier Certner <olce@FreeBSD.org> 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 <kp@FreeBSD.org> Subject: git: 23d8e956fbe2 - main - icmp6: fix use-after-reference-release List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <kp@FreeBSD.org> AuthorDate: 2025-05-22 08:25:55 +0000 Commit: Kristof Provost <kp@FreeBSD.org> 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 <markj@FreeBSD.org> 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 <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <markj@FreeBSD.org> AuthorDate: 2025-05-27 13:27:49 +0000 Commit: Mark Johnston <markj@FreeBSD.org> 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 <markj@FreeBSD.org> Subject: git: 0d224af399a6 - main - namei: Fix cn_flags width in various places List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <markj@FreeBSD.org> AuthorDate: 2025-05-27 13:29:14 +0000 Commit: Mark Johnston <markj@FreeBSD.org> 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 <bofh@FreeBSD.org> Subject: git: 539f84db949a - main - tests/ci: Pre-commit CI with CIRRUS-CI List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <bofh@FreeBSD.org> AuthorDate: 2025-05-27 16:16:38 +0000 Commit: Muhammad Moinur Rahman <bofh@FreeBSD.org> 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 <markj@FreeBSD.org> Subject: git: e0267657f396 - main - e1000: Initialize helper variables in em_newitr() List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <markj@FreeBSD.org> AuthorDate: 2025-05-27 16:31:06 +0000 Commit: Mark Johnston <markj@FreeBSD.org> 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 <markj@FreeBSD.org> Subject: git: 731c145612dd - main - e1000: Fix some issues in em_newitr() List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <markj@FreeBSD.org> AuthorDate: 2025-05-27 17:08:07 +0000 Commit: Mark Johnston <markj@FreeBSD.org> 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 <np@FreeBSD.org> 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 <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <np@FreeBSD.org> AuthorDate: 2025-05-19 06:16:18 +0000 Commit: Navdeep Parhar <np@FreeBSD.org> 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 <np@FreeBSD.org> Subject: git: 9a4e5a8a714c - stable/14 - pciconf(8): Dump the correct number of bytes List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <np@FreeBSD.org> AuthorDate: 2025-05-19 06:26:46 +0000 Commit: Navdeep Parhar <np@FreeBSD.org> 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 <emaste@FreeBSD.org> 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 <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <emaste@FreeBSD.org> AuthorDate: 2025-05-14 19:39:53 +0000 Commit: Ed Maste <emaste@FreeBSD.org> 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" <bz@FreeBSD.org> 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 <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <bz@FreeBSD.org> AuthorDate: 2025-05-26 23:20:20 +0000 Commit: Bjoern A. Zeeb <bz@FreeBSD.org> 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 <otis@FreeBSD.org> Subject: git: 3d516b853179 - main - Add ts(1) command List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <otis@FreeBSD.org> AuthorDate: 2022-07-02 15:26:42 +0000 Commit: Juraj Lutter <otis@FreeBSD.org> 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 <job@openbsd.org> +.\" +.\" 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 <job@openbsd.org> + * Copyright (c) 2022 Claudio Jeker <claudio@openbsd.org> + * + * 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 <sys/types.h> +#include <sys/time.h> + +#include <err.h> +#include <stdint.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <unistd.h> +#include <time.h> + +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 <bsd.prog.mk> 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 <olce@FreeBSD.org> 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 <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <olce@FreeBSD.org> AuthorDate: 2025-05-27 08:20:06 +0000 Commit: Olivier Certner <olce@FreeBSD.org> 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 <rew@FreeBSD.org> Subject: git: 3701f500990a - main - write.2: sweep error code referencing disklabel(8) List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <rew@FreeBSD.org> AuthorDate: 2025-05-27 21:33:50 +0000 Commit: Robert Wing <rew@FreeBSD.org> 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" <bz@FreeBSD.org> 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 <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <bz@FreeBSD.org> AuthorDate: 2025-05-26 23:20:20 +0000 Commit: Bjoern A. Zeeb <bz@FreeBSD.org> 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 <rew@FreeBSD.org> Subject: git: c0f7e69d60d4 - main - tools/diag/prtblknos: fix build List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <rew@FreeBSD.org> AuthorDate: 2025-05-27 23:12:04 +0000 Commit: Robert Wing <rew@FreeBSD.org> 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 <sys/stat.h> #include <libufs.h> -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 <libufs.h> #ifdef PRTBLKNOS -union dinode { - struct ufs1_dinode dp1; - struct ufs2_dinode dp2; -}; extern struct uufsd disk; #else /* used by fsdb */ #include <fsck.h> 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 <glebius@FreeBSD.org> 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 <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <glebius@FreeBSD.org> AuthorDate: 2025-05-28 00:24:59 +0000 Commit: Gleb Smirnoff <glebius@FreeBSD.org> 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 <mav@FreeBSD.org> Subject: git: f23326ff2c7c - stable/14 - systat/top: Update ZFS sysctl names List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <mav@FreeBSD.org> AuthorDate: 2025-05-25 18:23:54 +0000 Commit: Alexander Motin <mav@FreeBSD.org> 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 <mav@FreeBSD.org> Subject: git: c92ffde748d5 - stable/13 - systat/top: Update ZFS sysctl names List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <mav@FreeBSD.org> AuthorDate: 2025-05-25 18:23:54 +0000 Commit: Alexander Motin <mav@FreeBSD.org> 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 <rew@FreeBSD.org> Subject: git: e623b0dc6552 - main - newfs: remove write-only variable List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <rew@FreeBSD.org> AuthorDate: 2025-05-28 00:55:49 +0000 Commit: Robert Wing <rew@FreeBSD.org> 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 <ivy@FreeBSD.org> 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 <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <ivy@FreeBSD.org> AuthorDate: 2025-05-27 07:17:21 +0000 Commit: Lexi Winter <ivy@FreeBSD.org> 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 <src.opts.mk> -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 <ivy@FreeBSD.org> Subject: git: f947f58ce624 - main - packages: rename elftoolchain to toolchain, add more things List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <ivy@FreeBSD.org> AuthorDate: 2025-05-27 07:21:51 +0000 Commit: Lexi Winter <ivy@FreeBSD.org> 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 <src.opts.mk> -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 <src.opts.mk> +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 <bsd.prog.mk> 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 <bsd.prog.mk> 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 <src.opts.mk> -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 <src.opts.mk> -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 <src.opts.mk> +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 <src.opts.mk> +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 <src.opts.mk> +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 <src.opts.mk> -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 <src.opts.mk> -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 <src.opts.mk> -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 <bsd.prog.mk> 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 <ivy@FreeBSD.org> Subject: git: adef3618b8a5 - main - packages: move smbfs examples to the smbutils package List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <ivy@FreeBSD.org> AuthorDate: 2025-05-27 07:30:18 +0000 Commit: Lexi Winter <ivy@FreeBSD.org> 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 <ivy@FreeBSD.org> Subject: git: 06c41801afac - main - svcj: correctly handle kernels without INET or INET6 List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <ivy@FreeBSD.org> AuthorDate: 2025-05-27 07:31:18 +0000 Commit: Lexi Winter <ivy@FreeBSD.org> 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=<new|inherit> resp. ip6=<new|inherit> 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 <ivy@FreeBSD.org> 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 <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <ivy@FreeBSD.org> AuthorDate: 2025-05-27 07:35:49 +0000 Commit: Lexi Winter <ivy@FreeBSD.org> 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 <src.opts.mk> +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 <src.opts.mk> +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 <kevans@FreeBSD.org> Subject: git: 59fc4cda1bfa - main - kern: tty: refactor TIOCSTI privilege checks slightly List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <kevans@FreeBSD.org> AuthorDate: 2025-05-28 01:19:17 +0000 Commit: Kyle Evans <kevans@FreeBSD.org> 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 <kevans@FreeBSD.org> Subject: git: d094dd9071ce - main - tests: kern: add some tests for TIOCSTI List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <kevans@FreeBSD.org> AuthorDate: 2025-05-28 01:19:18 +0000 Commit: Kyle Evans <kevans@FreeBSD.org> 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 <bsd.test.mk> 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 <kevans@FreeBSD.org> + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#include <sys/param.h> +#include <sys/ioctl.h> +#include <sys/wait.h> + +#include <assert.h> +#include <errno.h> +#include <fcntl.h> +#include <signal.h> +#include <stdbool.h> +#include <stdlib.h> +#include <termios.h> + +#include <atf-c.h> +#include <libutil.h> + +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 <mav@FreeBSD.org> Subject: git: 93839cddbd08 - releng/14.3 - systat/top: Update ZFS sysctl names List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <mav@FreeBSD.org> AuthorDate: 2025-05-25 18:23:54 +0000 Commit: Alexander Motin <mav@FreeBSD.org> 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 <dougm@FreeBSD.org> Subject: git: 18a62137df40 - main - vm_object: use lookup_range in page_clean_flush List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <dougm@FreeBSD.org> AuthorDate: 2025-05-28 05:33:43 +0000 Commit: Doug Moore <dougm@FreeBSD.org> 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 <lwhsu@FreeBSD.org> 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 <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <lwhsu@FreeBSD.org> AuthorDate: 2025-05-28 07:31:53 +0000 Commit: Li-Wen Hsu <lwhsu@FreeBSD.org> 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 <thj@FreeBSD.org> Subject: git: 28345b17efca - main - if_iwx: Make firmware load error messages clearer List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <thj@FreeBSD.org> AuthorDate: 2025-05-28 08:49:48 +0000 Commit: Tom Jones <thj@FreeBSD.org> 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 <thj@FreeBSD.org> Subject: git: 969f6c635358 - main - if_iwx: use net80211 suspend and resume methods List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <thj@FreeBSD.org> AuthorDate: 2025-05-28 09:02:54 +0000 Commit: Tom Jones <thj@FreeBSD.org> 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 <dev/iwx/if_iwx_debug.h> +#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 <kib@FreeBSD.org> 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 <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <kib@FreeBSD.org> AuthorDate: 2025-05-25 16:32:34 +0000 Commit: Konstantin Belousov <kib@FreeBSD.org> 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 <tuexen@FreeBSD.org> Subject: git: 8d4f495df465 - main - ddb: improve show tcpcb List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <tuexen@FreeBSD.org> AuthorDate: 2025-05-28 10:10:51 +0000 Commit: Michael Tuexen <tuexen@FreeBSD.org> 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 <tuexen@FreeBSD.org> Subject: git: f1430567f26b - main - ddb: add show all tcpcbs List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <tuexen@FreeBSD.org> AuthorDate: 2025-05-28 10:25:26 +0000 Commit: Michael Tuexen <tuexen@FreeBSD.org> 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" <bz@FreeBSD.org> Subject: git: 54d0e1772fb6 - main - LinuxKPI: add struct_group_tagged() List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <bz@FreeBSD.org> AuthorDate: 2025-05-02 20:10:38 +0000 Commit: Bjoern A. Zeeb <bz@FreeBSD.org> 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 <sys/stddef.h> -#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" <bz@FreeBSD.org> 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 <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <bz@FreeBSD.org> AuthorDate: 2025-05-24 17:01:59 +0000 Commit: Bjoern A. Zeeb <bz@FreeBSD.org> 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" <bz@FreeBSD.org> Subject: git: 08471a76e3d2 - main - ifconfig: 802.11: fix a warning message List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <bz@FreeBSD.org> AuthorDate: 2025-05-27 19:34:48 +0000 Commit: Bjoern A. Zeeb <bz@FreeBSD.org> 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 <kib@FreeBSD.org> 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 <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <kib@FreeBSD.org> AuthorDate: 2025-05-19 01:30:14 +0000 Commit: Konstantin Belousov <kib@FreeBSD.org> 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 <iwtcex@gmail.com> 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 <kib@FreeBSD.org> Subject: git: 68ba38dad388 - main - amd64: add pcb_tlsbase List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <kib@FreeBSD.org> AuthorDate: 2025-05-19 23:56:37 +0000 Commit: Konstantin Belousov <kib@FreeBSD.org> 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 <iwtcex@gmail.com> 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 <kib@FreeBSD.org> 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 <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <kib@FreeBSD.org> AuthorDate: 2025-05-22 04:25:05 +0000 Commit: Konstantin Belousov <kib@FreeBSD.org> 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 <kib@FreeBSD.org> Subject: git: eea3e4dd9703 - main - amd64: add mc_tlsbase member to mcontext List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <kib@FreeBSD.org> AuthorDate: 2025-05-22 06:55:50 +0000 Commit: Konstantin Belousov <kib@FreeBSD.org> 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 <kib@FreeBSD.org> Subject: git: 7171e591a4c7 - main - amd64: add ptrace PT_{GET,SET}TLSBASE requests List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <kib@FreeBSD.org> AuthorDate: 2025-05-22 06:56:24 +0000 Commit: Konstantin Belousov <kib@FreeBSD.org> 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 <kib@FreeBSD.org> 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 <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <kib@FreeBSD.org> AuthorDate: 2025-05-22 04:32:25 +0000 Commit: Konstantin Belousov <kib@FreeBSD.org> CommitDate: 2025-05-28 11:11:23 +0000 amd64: switch to amd64_set_tlsbase to set tls base Reported and tested: Alex S <iwtcex@gmail.com> 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 <kib@FreeBSD.org> Subject: git: 2e7cf772a411 - main - amd64: add amd64_set_tlsbase(3) List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <kib@FreeBSD.org> AuthorDate: 2025-05-22 04:32:03 +0000 Commit: Konstantin Belousov <kib@FreeBSD.org> 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 <sys/param.h> +#include <machine/cpufunc.h> +#include <machine/specialreg.h> +#include <machine/sysarch.h> +#include <x86/ifunc.h> +#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 <kib@FreeBSD.org> Subject: git: 71186b6eaa07 - main - amd64: revert unintended changes in ia32_exception.S List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <kib@FreeBSD.org> AuthorDate: 2025-05-28 11:58:48 +0000 Commit: Konstantin Belousov <kib@FreeBSD.org> 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 <andrew@FreeBSD.org> Subject: git: 40d2b3135204 - main - arm64: Split out the loop to wait for APs List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <andrew@FreeBSD.org> AuthorDate: 2025-05-27 19:38:04 +0000 Commit: Andrew Turner <andrew@FreeBSD.org> 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 <andrew@FreeBSD.org> Subject: git: 602c858e000d - main - arm64: Reuse aps_started to simplify SMP boot List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <andrew@FreeBSD.org> AuthorDate: 2025-05-27 19:38:29 +0000 Commit: Andrew Turner <andrew@FreeBSD.org> 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 <andrew@FreeBSD.org> Subject: git: 77d5df3b9261 - main - arm64: Move CPU feature & errata setup earlier List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <andrew@FreeBSD.org> AuthorDate: 2025-05-27 19:39:20 +0000 Commit: Andrew Turner <andrew@FreeBSD.org> 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 <andrew@FreeBSD.org> Subject: git: 8535ee063118 - main - hwpmc/arm64: Make the pmcr variable descriptive List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <andrew@FreeBSD.org> AuthorDate: 2025-05-27 19:54:44 +0000 Commit: Andrew Turner <andrew@FreeBSD.org> 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 <andrew@FreeBSD.org> Subject: git: dbb620910f15 - main - hwpmc/arm64: PMCR_EL0 is a 64-bit register List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <andrew@FreeBSD.org> AuthorDate: 2025-05-27 19:54:59 +0000 Commit: Andrew Turner <andrew@FreeBSD.org> 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 <andrew@FreeBSD.org> Subject: git: 8cad445495a1 - main - arm64: Sort the PMCR_EL0 fields List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <andrew@FreeBSD.org> AuthorDate: 2025-05-27 19:55:07 +0000 Commit: Andrew Turner <andrew@FreeBSD.org> 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<n>_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 <andrew@FreeBSD.org> Subject: git: 18db17f5ec86 - main - arm64: Make all the PMCR_EL0 fields 64-bit List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <andrew@FreeBSD.org> AuthorDate: 2025-05-27 19:55:15 +0000 Commit: Andrew Turner <andrew@FreeBSD.org> 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<n>_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 <andrew@FreeBSD.org> Subject: git: 33ec71d6c0e9 - main - arm64: Add more PMCR_EL0 fields List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <andrew@FreeBSD.org> AuthorDate: 2025-05-27 19:55:21 +0000 Commit: Andrew Turner <andrew@FreeBSD.org> 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<n>_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 <andrew@FreeBSD.org> Subject: git: 48d41181ee1d - main - hwpmc/arm64: The PMXEVCNTR_EL0 register is 64-bit List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <andrew@FreeBSD.org> AuthorDate: 2025-05-27 19:55:27 +0000 Commit: Andrew Turner <andrew@FreeBSD.org> 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 <andrew@FreeBSD.org> Subject: git: 88365ff691f1 - main - hwpmc/arm64: The counter is 64-bit List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <andrew@FreeBSD.org> AuthorDate: 2025-05-27 19:55:32 +0000 Commit: Andrew Turner <andrew@FreeBSD.org> 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 <andrew@FreeBSD.org> Subject: git: 166d8e4f4786 - main - hwpmc/arm64: Support 64-bit counters List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <andrew@FreeBSD.org> AuthorDate: 2025-05-27 19:55:38 +0000 Commit: Andrew Turner <andrew@FreeBSD.org> 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 <andrew@FreeBSD.org> Subject: git: 1bf4adf8cc9a - main - hwpmc/arm64: Hard code the initial pmcr state List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <andrew@FreeBSD.org> AuthorDate: 2025-05-27 19:55:44 +0000 Commit: Andrew Turner <andrew@FreeBSD.org> 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 <markj@FreeBSD.org> Subject: git: d6a9f4918579 - main - igc: Initialize helper variables in igc_neweitr() List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <markj@FreeBSD.org> AuthorDate: 2025-05-28 13:31:34 +0000 Commit: Mark Johnston <markj@FreeBSD.org> 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 <markj@FreeBSD.org> Subject: git: ef062029ceff - main - igc: Fix some issues in igc_neweitr() List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <markj@FreeBSD.org> AuthorDate: 2025-05-28 13:31:44 +0000 Commit: Mark Johnston <markj@FreeBSD.org> 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 <markj@FreeBSD.org> 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 <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <markj@FreeBSD.org> AuthorDate: 2025-05-28 13:35:24 +0000 Commit: Mark Johnston <markj@FreeBSD.org> 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 <markj@FreeBSD.org> Subject: git: a5dac34f6e98 - main - tests: Add a regression test for commit 7587f6d4840f8 List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <markj@FreeBSD.org> AuthorDate: 2025-05-28 15:28:36 +0000 Commit: Mark Johnston <markj@FreeBSD.org> 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 <markj@FreeBSD.org> + */ + +#include <sys/param.h> +#include <sys/jail.h> +#include <sys/mount.h> +#include <sys/stat.h> + +#include <err.h> +#include <errno.h> +#include <fcntl.h> +#include <jail.h> +#include <mntopts.h> +#include <stdio.h> +#include <stdlib.h> + +#include <atf-c.h> + +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 <dim@FreeBSD.org> Subject: git: a0d22d7934c6 - releng/14.3 - libc++: fix compiling <locale> with -fmodules List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <jgopensource@proton.me> AuthorDate: 2025-05-18 19:55:05 +0000 Commit: Dimitry Andric <dim@FreeBSD.org> CommitDate: 2025-05-28 16:26:27 +0000 libc++: fix compiling <locale> 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 <xlocale.h> +#elif defined(__FreeBSD__) +# if __has_feature(modules) +# include <stdio.h> +# include <stdlib.h> +# endif # include <xlocale.h> #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 <michaelo@FreeBSD.org> Subject: git: 87c46facc3cf - main - caroot: Update certdata URL for GitHub switch List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <michaelo@FreeBSD.org> AuthorDate: 2025-05-28 15:02:54 +0000 Commit: Michael Osipov <michaelo@FreeBSD.org> 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 <emaste@FreeBSD.org> Subject: git: cba5d7ab32fd - main - atkbd: Fix first keystroke force reset List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <aokblast@FreeBSD.org> AuthorDate: 2025-05-24 02:31:18 +0000 Commit: Ed Maste <emaste@FreeBSD.org> 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 <obiwac@freebsd.org> 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 <jrtc27@FreeBSD.org> 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 <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <jrtc27@FreeBSD.org> AuthorDate: 2025-05-28 20:22:15 +0000 Commit: Jessica Clarke <jrtc27@FreeBSD.org> 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 <jrtc27@FreeBSD.org> 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 <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <jrtc27@FreeBSD.org> AuthorDate: 2025-05-28 20:23:10 +0000 Commit: Jessica Clarke <jrtc27@FreeBSD.org> 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 <machine/tls.h> + 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 <jrtc27@FreeBSD.org> 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 <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <jrtc27@FreeBSD.org> AuthorDate: 2025-05-28 20:24:52 +0000 Commit: Jessica Clarke <jrtc27@FreeBSD.org> 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 <dev-commits-src-all@mlmmj.nyi.freebsd.org>; 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 <cy@FreeBSD.org> Subject: git: 24f0b4ca2d56 - vendor/pam-krb5 - vendor branch created List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <dev-commits-src-all@mlmmj.nyi.freebsd.org>; 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 <cy@FreeBSD.org> Subject: git: c97352eec0dd - Create tag vendor/pam-krb5/4.11 List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <cy@FreeBSD.org> TaggerDate: 2025-05-28 20:51:05 +0000 pam-krb5: Tag 4.11 commit 24f0b4ca2d565cdbb4fe7839ff28320706bf2386 Author: Cy Schubert <cy@FreeBSD.org> AuthorDate: 2025-04-17 02:13:41 +0000 Commit: Cy Schubert <cy@FreeBSD.org> 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 <ziaee@FreeBSD.org> Subject: git: 1c7f8214e92e - main - scc.4: Improve acronyms + tag SPDX List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <ziaee@FreeBSD.org> AuthorDate: 2025-05-26 06:43:17 +0000 Commit: Alexander Ziaee <ziaee@FreeBSD.org> 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 <ziaee@FreeBSD.org> Subject: git: 616bb0b23083 - main - pam_xdg.8: Improve usage and standards List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <ziaee@FreeBSD.org> AuthorDate: 2025-05-28 20:43:03 +0000 Commit: Alexander Ziaee <ziaee@FreeBSD.org> 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/<username> . +.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 <ziaee@FreeBSD.org> Subject: git: e3eae3b1e587 - main - axge.4: Create a HARDWARE section List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <ziaee@FreeBSD.org> AuthorDate: 2025-05-28 20:45:39 +0000 Commit: Alexander Ziaee <ziaee@FreeBSD.org> 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 <wpaul@windriver.com>. 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 <ziaee@FreeBSD.org> Subject: git: 7390e96107c8 - main - rtsx.4: Improve hardware, add history and spdx List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <ziaee@FreeBSD.org> AuthorDate: 2025-05-28 20:50:26 +0000 Commit: Alexander Ziaee <ziaee@FreeBSD.org> 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 <hlh@restart.be> .\" 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 <ziaee@FreeBSD.org> Subject: git: 420e58595d20 - main - aue.4: Improve HARDWARE, specificity, and tag spdx List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <ziaee@FreeBSD.org> AuthorDate: 2025-05-28 20:53:31 +0000 Commit: Alexander Ziaee <ziaee@FreeBSD.org> 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 <wpaul@ee.columbia.edu>. 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 <ziaee@FreeBSD.org> Subject: git: e8260f2cea3c - main - cdce.4: Improve HARDWARE List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <ziaee@FreeBSD.org> AuthorDate: 2025-05-28 20:55:27 +0000 Commit: Alexander Ziaee <ziaee@FreeBSD.org> 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 <markj@FreeBSD.org> 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 <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <markj@FreeBSD.org> AuthorDate: 2025-05-28 20:45:27 +0000 Commit: Mark Johnston <markj@FreeBSD.org> 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 <ziaee@FreeBSD.org> Subject: git: ca47411ea5e8 - main - usb/if_mos.c: Fix incorrect SPDX ID List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <ziaee@FreeBSD.org> AuthorDate: 2025-05-16 01:53:28 +0000 Commit: Alexander Ziaee <ziaee@FreeBSD.org> 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 <info@rickvanderzwet.nl> * * 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 <kp@FreeBSD.org> Subject: git: d321dc9783bf - main - pf.conf.5: better describe "!" List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <kp@FreeBSD.org> AuthorDate: 2025-05-26 08:02:36 +0000 Commit: Kristof Provost <kp@FreeBSD.org> 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 <jmc@openbsd.org>, 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 <kp@FreeBSD.org> Subject: git: fb7c3f0274ff - main - pf: refactor length check in pf_pull_hdr() List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <kp@FreeBSD.org> AuthorDate: 2025-05-26 08:16:20 +0000 Commit: Kristof Provost <kp@FreeBSD.org> 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 <bluhm@openbsd.org>, 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 <kp@FreeBSD.org> Subject: git: 63cc817adde5 - main - pf tests: deduplicate DelayedSend List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <kp@FreeBSD.org> AuthorDate: 2025-05-26 13:34:06 +0000 Commit: Kristof Provost <kp@FreeBSD.org> 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 <kp@FreeBSD.org> Subject: git: 8801e3adff00 - main - pfctl: don't check np->port for NULL List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <kp@FreeBSD.org> AuthorDate: 2025-05-26 09:24:39 +0000 Commit: Kristof Provost <kp@FreeBSD.org> 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 <akfaew@openbsd.org>, 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 <kp@FreeBSD.org> Subject: git: 9a445773752f - main - pf: teach pf_build_tcp() about SACK List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <kp@FreeBSD.org> AuthorDate: 2025-05-27 10:02:15 +0000 Commit: Kristof Provost <kp@FreeBSD.org> CommitDate: 2025-05-28 21:40:37 +0000 pf: teach pf_build_tcp() about SACK ok & with sashan Obtained from: OpenBSD, henning <henning@openbsd.org>, 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 <ngie@FreeBSD.org> Subject: git: 9b37d84c87e6 - main - Mark several getaddrinfo tests as XFAIL List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <ngie@FreeBSD.org> AuthorDate: 2025-04-01 04:51:50 +0000 Commit: Enji Cooper <ngie@FreeBSD.org> 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 <ngie@FreeBSD.org> Subject: git: 5c6ad1a2d175 - main - libarchive: update documentation for suggested `git pull` List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <ngie@FreeBSD.org> AuthorDate: 2025-05-22 18:16:15 +0000 Commit: Enji Cooper <ngie@FreeBSD.org> 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 <ngie@FreeBSD.org> Subject: git: 19fb56b19244 - main - Revert "Mark several getaddrinfo tests as XFAIL" List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: <mailto:dev-commits-src-all+help@freebsd.org> List-Post: <mailto:dev-commits-src-all@freebsd.org> List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org> 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 <ngie@FreeBSD.org> AuthorDate: 2025-05-28 22:18:51 +0000 Commit: Enji Cooper <ngie@FreeBSD.org> 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)",