From nobody Mon Oct 20 02:35:18 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cqffb0Vh3z6D11R; Mon, 20 Oct 2025 02:35:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cqffZ6skvz42B0; Mon, 20 Oct 2025 02:35:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760927719; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oMePEV6N1FnVLuM1EeIkHgUTcxeNHuHyEHIGrqWrrw4=; b=v+RfqIiiDCkAXxUERtT0s40tIGG4EGUssBbj5aSII0wcJd4Bq6rTsgppljFR3HSeXJBHRc a8h7mXW61Km2c71kaUw2VH8do0M6I+TlQxdCThvtJlGiNUjxKXsZ0MSYyW43MgNAeTRIKs 6n+ELyUd0zUFpEQp6xSU/iebUlOs4MMRWSDqiAGv0kJKFwtvX7gKV+6Hc37PpCwaqRJpN0 QTFDlEbXmLUDTmTjFRW6rk4QOJbmSxExNnsR7mGtK+3y36viK12ZLZdMW75/ouwplLLuWR f7soBzUrh64i+sa5ttvqrD3aiNQOqyj1CVUk3n1HVJzZ1yGRDSyh3B0bG4SpNQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760927719; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oMePEV6N1FnVLuM1EeIkHgUTcxeNHuHyEHIGrqWrrw4=; b=s/z+rcljbIS1PwK6xXe/GPLv9SA4G16OMYjGf0bmVmF0JPYv0mXWvqPH6FMnytg/YZoUpU 9QCl1K7abJ/egmD4KHbz+TbIOv6W2RIBfpu/QRHhUVJ87yvxxfb/4AJ0MBhiJ2vwaJlXmd Cq6NU8fq3OZAxm1FydTLDuDYZbjyh9iSMT1ZVPDi4WuTW1WXHK+zlN6yZ4uNV4ee9H7RY1 rb36PKe0+/DQsX5LIBdP0aTrXBf9levq9upjkDhGVTgDl6T3Q35Nn7DF8LwV8pAsDtWlt5 Q3y/cTbqa2ZgcMAZ9f3qoqHId67XoeAfuFs66FOpfNUp127K/aymoyi2vfZhWw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760927719; a=rsa-sha256; cv=none; b=lfrf6ZCVxd2EPrnfBV5zZDe0oHD5tK4rsnm9/+EGt2G0kwWb7+ch1P0N4Wq+o94GN6DQPm FZlIM+JZsh0ikdBxy+2bLR8yFABCitgJBAQxlYQUdvNRBwEv5oFfsfpaSx90Kq+t+MXrDT rgPDOE7Lr06iZjqAS/oP6iJ5o3dRRQyq28kgQadeFTi4laQYwOUwpl78yaQF/XC0Ml8jUZ 0OnaGtR7156C2GIhmA9r/X9D/GYE6zresbb6+PM5cXPWTOYrB0kUQSd3GVp/8eVX2FZeaV bMgtQEk12eiLOrDKd/v9MIJC9eNi5mKXj/a5HOPAXuS8koboObw8s67r5wiiAQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cqffZ6PFszv87; Mon, 20 Oct 2025 02:35: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 59K2ZIIP091886; Mon, 20 Oct 2025 02:35:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59K2ZINV091883; Mon, 20 Oct 2025 02:35:18 GMT (envelope-from git) Date: Mon, 20 Oct 2025 02:35:18 GMT Message-Id: <202510200235.59K2ZINV091883@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brad Davis Subject: git: 2f461ddd784b - main - geom: fix glabel status not showing components List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brd X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2f461ddd784b4abdb7f88701d20fc45f658c42f5 Auto-Submitted: auto-generated The branch main has been updated by brd: URL: https://cgit.FreeBSD.org/src/commit/?id=2f461ddd784b4abdb7f88701d20fc45f658c42f5 commit 2f461ddd784b4abdb7f88701d20fc45f658c42f5 Author: Brad Davis AuthorDate: 2025-10-18 00:31:12 +0000 Commit: Brad Davis CommitDate: 2025-10-20 02:35:06 +0000 geom: fix glabel status not showing components Also fix some typos and move a couple NULL checks earlier. Reviewed by: mckusick, Johan Söllvander, markj, kevans, adrian Fixes: 0d4642a67e59f8da5e00a05001c342bdad2a806f MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D53180 --- sbin/geom/core/geom.c | 37 ++++++++++++++++++++++--------------- 1 file changed, 22 insertions(+), 15 deletions(-) diff --git a/sbin/geom/core/geom.c b/sbin/geom/core/geom.c index 1a4f7e1f061a..2de696ce6a43 100644 --- a/sbin/geom/core/geom.c +++ b/sbin/geom/core/geom.c @@ -1189,10 +1189,11 @@ status_one_geom(struct ggeom *gp, int script, int name_len, int status_len) gotone = len = 0; xo_open_instance("status"); LIST_FOREACH(cp, &gp->lg_consumer, lg_consumer) { + if (cp->lg_provider == NULL) + continue; + cstate = status_one_consumer(cp, "state"); csyncr = status_one_consumer(cp, "synchronized"); - if (cstate == NULL && csyncr == NULL) - continue; if (!gotone || script) { if (!gotone) { xo_emit("{:name/%*s} {:status/%*s} ", @@ -1206,14 +1207,17 @@ status_one_geom(struct ggeom *gp, int script, int name_len, int status_len) xo_open_instance("components"); if (cstate != NULL && csyncr != NULL) { - xo_emit("{P:/%*s}{:compontent} ({:state}, {:synchronized})\n", + xo_emit("{P:/%*s}{:component} ({:state}, {:synchronized})\n", len, "", cp->lg_provider->lg_name, cstate, csyncr); } else if (cstate != NULL) { - xo_emit("{P:/%*s}{:compontent} ({:state})\n", + xo_emit("{P:/%*s}{:component} ({:state})\n", len, "", cp->lg_provider->lg_name, cstate); - } else { - xo_emit("{P:/%*s}{:compontent} ({:synchronized})\n", + } else if (csyncr != NULL) { + xo_emit("{P:/%*s}{:component} ({:synchronized})\n", len, "", cp->lg_provider->lg_name, csyncr); + } else { + xo_emit("{P:/%*s}{:component}\n", + len, "", cp->lg_provider->lg_name); } xo_close_instance("components"); gotone = 1; @@ -1224,7 +1228,7 @@ status_one_geom(struct ggeom *gp, int script, int name_len, int status_len) xo_emit("{:name/%*s} {:status/%*s} ", name_len, name, status_len, status); xo_open_list("components"); xo_open_instance("components"); - xo_emit("{P:/%*s}{d:compontent}\n", len, "", "N/A"); + xo_emit("{P:/%*s}{d:component}\n", len, "", "N/A"); xo_close_instance("components"); } xo_close_list("components"); @@ -1258,11 +1262,11 @@ status_one_geom_prs(struct ggeom *gp, int script, int name_len, int status_len) } gotone = len = 0; LIST_FOREACH(cp, &gp->lg_consumer, lg_consumer) { - cstate = status_one_consumer(cp, "state"); - csyncr = status_one_consumer(cp, "synchronized"); - if (cstate == NULL && csyncr == NULL) + if (cp->lg_provider == NULL) continue; + cstate = status_one_consumer(cp, "state"); + csyncr = status_one_consumer(cp, "synchronized"); if (!gotone || script) { if (!gotone) { xo_emit("{:name/%*s} {:status/%*s} ", @@ -1276,14 +1280,17 @@ status_one_geom_prs(struct ggeom *gp, int script, int name_len, int status_len) xo_open_instance("component"); if (cstate != NULL && csyncr != NULL) { - xo_emit("{P:/%*s}{:compontent} ({:state}, {:synchronized})\n", + xo_emit("{P:/%*s}{:component} ({:state}, {:synchronized})\n", len, "", cp->lg_provider->lg_name, cstate, csyncr); } else if (cstate != NULL) { - xo_emit("{P:/%*s}{:compontent} ({:state})\n", + xo_emit("{P:/%*s}{:component} ({:state})\n", len, "", cp->lg_provider->lg_name, cstate); - } else { - xo_emit("{P:/%*s}{:compontent} ({:synchronized})\n", + } else if (csyncr != NULL) { + xo_emit("{P:/%*s}{:component} ({:synchronized})\n", len, "", cp->lg_provider->lg_name, csyncr); + } else { + xo_emit("{P:/%*s}{:component}\n", + len, "", cp->lg_provider->lg_name); } xo_close_instance("component"); gotone = 1; @@ -1294,7 +1301,7 @@ status_one_geom_prs(struct ggeom *gp, int script, int name_len, int status_len) xo_emit("{:name/%*s} {:status/%*s} ", name_len, name, status_len, status); xo_open_list("components"); xo_open_instance("components"); - xo_emit("{P:/%*s}{d:compontent}\n", len, "", "N/A"); + xo_emit("{P:/%*s}{d:component}\n", len, "", "N/A"); xo_close_instance("components"); } xo_close_list("components"); From nobody Mon Oct 20 04:29:12 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cqjB10gY0z6D99V; Mon, 20 Oct 2025 04:29:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cqjB074M5z3Cs5; Mon, 20 Oct 2025 04:29:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760934553; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=N0mHy0AWxPnvuEjCnZOShUqCqJik1EcnROJhcYUoj2I=; b=NL+rSQEDtc5rK6WvU5Eru2KKsL4+nQsOI4YLjwJc5kqcDIdsyMCG64pVXqgDKOqrT0O3xP ab0ey40UYZaf1+FmMVn4lKHS2vIV7pWHyYhiOzXlXrD8RHzwi2uig1ONFTGXnD5OhyQsKy BWH+DjgwVAwMah1mB07nramWoF+WgnEd276q+9QAvikRw+GJWM3BzkmgVuUFl72yYpdUez 7lizV0mxk70sSATghQoU862oc8bgIV0rGH3WADCOufLjJRAh9TqnosIgPLtyP8tsrlswFZ KdIz3MVkR77yRL+Ks8g6d7ZIj7k+I7saOPPJRFV73tP4TN3XCdpW+eLF2y+YtQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760934553; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=N0mHy0AWxPnvuEjCnZOShUqCqJik1EcnROJhcYUoj2I=; b=yssr7ylr86bXsYoERzlc0LMedWi4Zsv8nreeJMjy9cVhrq/pOuRatTZrmFc/vcUOEvLbXu LzWNYiiDZOz8apVgqNo7ac1PVqiGyn4N8tBWZB/BSu3RtCU6omRhgfkU6BDaO+a59v10BQ ghaYP9/k2mg8ni6zgXTlvF3hRIYEy7ILasgsBeGqdhSWNLXqgHL+gaWUTVot0yltnsfbDq hIYLc3eLbhRidC3pe757G/1/K7UrX+w4JXc3KMzZTnI54lD/gro3LIzXNNdBFzR3CivvWl 2PMxcWdLJ7FkE5tm7vHXpvNUySRz+eE6HCQLCHC64tO+zSJKoXyUysLzeWU5JQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760934553; a=rsa-sha256; cv=none; b=Y8C/Qmxi+i4ZeH10UextbfNFa30jmYp9ufwTLLLmLRyQyZ/rdphJtEiQCzyI7hYlaV3+ZN Mx9BUjaXhpKuiXZvDyc2c37/X6aZeZ77Ohia2QzPRLFLjX8zXZoBCSxZ979m+gKJOGJ+Ys O7EFl9sooC6PNCaUvk8LejmnTZdJfg00Jj0cbTvFoGJYBYtVmTqdC/AU2SOKQKT3QY8jlE EU/mVXhNGsyTr1mGWN1Q/SJ0Dazo7m2F1vEzBJbAWPlVcHaWVIrAxor7AsnAW/d+bZrBwu WG20oQ6khUaZMLihJw2k3doBlIJXoDWDrRjZw4acAzUaFUXJ4wsQ37W9gl5aww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cqjB06byxzy97; Mon, 20 Oct 2025 04:29: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 59K4TCi2001835; Mon, 20 Oct 2025 04:29:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59K4TCqI001832; Mon, 20 Oct 2025 04:29:12 GMT (envelope-from git) Date: Mon, 20 Oct 2025 04:29:12 GMT Message-Id: <202510200429.59K4TCqI001832@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: 790c27317ec1 - main - linux: Make the macro LINUX_IOCTL_SET public List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 790c27317ec1a997a4e5c2bdee9e4acc610c8e3c Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=790c27317ec1a997a4e5c2bdee9e4acc610c8e3c commit 790c27317ec1a997a4e5c2bdee9e4acc610c8e3c Author: Zhenlei Huang AuthorDate: 2025-10-20 04:28:41 +0000 Commit: Zhenlei Huang CommitDate: 2025-10-20 04:28:41 +0000 linux: Make the macro LINUX_IOCTL_SET public There're some other drivers want to register and unregister linux ioctl handler. Move the macro LINUX_IOCTL_SET from tdfx_linux.h to linux_ioctl.h so that they can also benefit it. While here, rename the declaration of linux ioctl function to be consistent with the name of the handler. Meanwhile, drop a comment about the macro, since its function is obvious. Reviewed by: markj MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D53158 --- sys/compat/linux/linux_ioctl.h | 12 ++++++++++++ sys/dev/tdfx/tdfx_linux.c | 2 +- sys/dev/tdfx/tdfx_linux.h | 12 ------------ 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/sys/compat/linux/linux_ioctl.h b/sys/compat/linux/linux_ioctl.h index ccc25bc919ab..8345b7e4b719 100644 --- a/sys/compat/linux/linux_ioctl.h +++ b/sys/compat/linux/linux_ioctl.h @@ -823,4 +823,16 @@ int linux32_ioctl_register_handler(struct linux_ioctl_handler *h); int linux32_ioctl_unregister_handler(struct linux_ioctl_handler *h); #endif +#define LINUX_IOCTL_SET(n, low, high) \ +static linux_ioctl_function_t n##_linux_ioctl; \ +static struct linux_ioctl_handler n##_linux_handler = { \ + n##_linux_ioctl, \ + low, \ + high \ +}; \ +SYSINIT(n##_ioctl_register, SI_SUB_KLD, SI_ORDER_MIDDLE, \ + linux_ioctl_register_handler, &n##_linux_handler); \ +SYSUNINIT(n##_ioctl_unregister, SI_SUB_KLD, SI_ORDER_MIDDLE, \ + linux_ioctl_unregister_handler, &n##_linux_handler) + #endif /* !_LINUX_IOCTL_H_ */ diff --git a/sys/dev/tdfx/tdfx_linux.c b/sys/dev/tdfx/tdfx_linux.c index f3410106bad2..777144d21bb6 100644 --- a/sys/dev/tdfx/tdfx_linux.c +++ b/sys/dev/tdfx/tdfx_linux.c @@ -42,7 +42,7 @@ LINUX_IOCTL_SET(tdfx, LINUX_IOCTL_TDFX_MIN, LINUX_IOCTL_TDFX_MAX); * Linux emulation IOCTL for /dev/tdfx */ static int -linux_ioctl_tdfx(struct thread *td, struct linux_ioctl_args* args) +tdfx_linux_ioctl(struct thread *td, struct linux_ioctl_args* args) { cap_rights_t rights; int error = 0; diff --git a/sys/dev/tdfx/tdfx_linux.h b/sys/dev/tdfx/tdfx_linux.h index b87cb41f38fe..9d012c12274b 100644 --- a/sys/dev/tdfx/tdfx_linux.h +++ b/sys/dev/tdfx/tdfx_linux.h @@ -35,18 +35,6 @@ #include #include -/* - * This code was donated by Vladimir N. Silynaev to allow for defining - * ioctls within modules - */ -#define LINUX_IOCTL_SET(n,low,high) \ -static linux_ioctl_function_t linux_ioctl_##n; \ -static struct linux_ioctl_handler n##_handler = {linux_ioctl_##n, low, high}; \ -SYSINIT(n##register, SI_SUB_KLD, SI_ORDER_MIDDLE,\ -linux_ioctl_register_handler, &n##_handler); \ -SYSUNINIT(n##unregister, SI_SUB_KLD, SI_ORDER_MIDDLE,\ -linux_ioctl_unregister_handler, &n##_handler); - /* Values for /dev/3dfx */ /* Query IOCTLs */ #define LINUX_IOCTL_TDFX_QUERY_BOARDS 0x3302 From nobody Mon Oct 20 04:29:13 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cqjB21Dlrz6D9Pb; Mon, 20 Oct 2025 04:29:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cqjB20fNvz3DCX; Mon, 20 Oct 2025 04:29:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760934554; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WAgWT00uP7+ubUtl/STwGG2WSW30j4VqWtOxWMJsOws=; b=FQEDXOqDBTlfbabXU4y2fYrRGIZDiZSn6xgkR6Vq+8uSBHCbbLmKYX7WBlAiZd0au57xAG nWaDRKIbLbMygGIXBTE9hmYF0z9jZDgHTnphMmkwKiiLfEWGRbzr+UgOcJFej8wz8iLFgv SRYB3bA/R60cHTSsd8JTHDOdgocfXcLAKSmS2Ko/5fB3ujOact9gR/sFBOcZy/OLvQgDWE jGE8blsRzd6HlxNa99i0CpxTpwKkIVp/DZa+JnjiCIcQcB3vU6f0ikvCoh2GLAh/Q8C5uZ r2Pl0yGZynWDdRZgasJuB+UTtwYVdPmLCvJhJBnWbSlOKZ2LA0SV3PfuoJdSeg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760934554; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WAgWT00uP7+ubUtl/STwGG2WSW30j4VqWtOxWMJsOws=; b=HSY26CqpZy6wuOSPL4F1YpsfnIZicTjW2sCGjG/JnB1Hd5akja9u/EpkBEzsNICfmc5XW3 zTk/g6IVZpRx3/LMjaj9ICYsQWSP29MWTZEFyiEzVL2s82drnj/FpCzN0iVGG8E5FvzgeC p5o5tnNvIk2vZJG3ygc6qZuWpFHRNLa9RxiT2hcRvO+o/pxLZUFn1vcSBOi8nqvyKUl4LY 9DtVW44EzSLrWPy+bcEee/67Dq+Rjf9lzFqW5RwWx1v+B6Kjl1LsnJ+GNsk8rHNkJW1riF U3ZHTRR448Ysv775KZXLrhsajj1J9cNe3Bd1p9RNFVC8sVPmLyLEzX9fiVibbg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760934554; a=rsa-sha256; cv=none; b=f8jsie6AgBclRNvpcnX5YW4JqAzgy7b+2CFUPB8Ne6ECoD8Lrx3/eGXgYI9vvPS3G+MWo8 Ve0Wpb/3G3yFRwlIJ2mXpxXdLvpbhTh1LAAb/Su8B5cp1yY37cWf/YhOqD9aHw/CYuvADr B85pjJ34xwbj+oAWttzzJ0mvwfEtpyoLZqjLOGgSoi7+svcbDnstRCkuMT7J6/4dt98+5G 0AM5jdURTItk2Cf0C8yPFljMukHuALiqIelZcsukV/qSDsRLQmC0voDCacpHJ8wMt5D1ZE 6D1l9SnF5YnUBTzMyRJKt2rNZzuFUkeqPcGfJsIeU/eC/jwWnFRgRXv2ebqHWA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cqjB206fWzy98; Mon, 20 Oct 2025 04:29:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59K4TD4B001875; Mon, 20 Oct 2025 04:29:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59K4TDCl001870; Mon, 20 Oct 2025 04:29:13 GMT (envelope-from git) Date: Mon, 20 Oct 2025 04:29:13 GMT Message-Id: <202510200429.59K4TDCl001870@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: 8350f46d9808 - main - sgx: Migrate to use macro LINUX_IOCTL_SET to register linux ioctl handler List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8350f46d9808e6183d5f6bd4aa73d4d4e563b574 Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=8350f46d9808e6183d5f6bd4aa73d4d4e563b574 commit 8350f46d9808e6183d5f6bd4aa73d4d4e563b574 Author: Zhenlei Huang AuthorDate: 2025-10-20 04:28:41 +0000 Commit: Zhenlei Huang CommitDate: 2025-10-20 04:28:41 +0000 sgx: Migrate to use macro LINUX_IOCTL_SET to register linux ioctl handler Reviewed by: markj MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D53158 --- sys/amd64/sgx/sgx_linux.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/sys/amd64/sgx/sgx_linux.c b/sys/amd64/sgx/sgx_linux.c index 6ecef9207a38..d389edc1b2b0 100644 --- a/sys/amd64/sgx/sgx_linux.c +++ b/sys/amd64/sgx/sgx_linux.c @@ -92,16 +92,7 @@ out: return (error); } -static struct linux_ioctl_handler sgx_linux_handler = { - sgx_linux_ioctl, - SGX_LINUX_IOCTL_MIN, - SGX_LINUX_IOCTL_MAX, -}; - -SYSINIT(sgx_linux_register, SI_SUB_KLD, SI_ORDER_MIDDLE, - linux_ioctl_register_handler, &sgx_linux_handler); -SYSUNINIT(sgx_linux_unregister, SI_SUB_KLD, SI_ORDER_MIDDLE, - linux_ioctl_unregister_handler, &sgx_linux_handler); +LINUX_IOCTL_SET(sgx, SGX_LINUX_IOCTL_MIN, SGX_LINUX_IOCTL_MAX); static int sgx_linux_modevent(module_t mod, int type, void *data) From nobody Mon Oct 20 04:29:15 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cqjB33c8qz6D99X; Mon, 20 Oct 2025 04:29:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cqjB32NZ7z3DJB; Mon, 20 Oct 2025 04:29:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760934555; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iW+QnajdAKQxTvfhAz7D0XwA0++dN15g6hCeaVIbbHA=; b=ixR7ysIPj2n2bOPlxwKXapBzqIMy/MkVSHqxMyYhniayJ2yxOrPriEiAEi3BF+uqAECKfY m5o9xo6mZtBYcOWFtruKXBTaSawsg1ZCIGnNd24avprE40emLfDBzYMlyfTs+0gstHHZrY GcVtVN9gxKLRfpE3DnVD88so+XGJT74Yj6wYhPRgGLMxvZtd3Zt3Us6vcWN/lEa6vW6YhZ kPOet9yb4M7UxOT/eRAf4HoBVOgcn8QIx6OhQ179zQb09XWqlSQj29VIIJNCl1T0KEjt5I ZW0RHyJDNkRYlMooDfiVupc0CxU836VgObhRMpGh4DiKQGUDcbejKDOkM9ozdA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760934555; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iW+QnajdAKQxTvfhAz7D0XwA0++dN15g6hCeaVIbbHA=; b=cX3V6Cce5Lqmieew2gSBRKsU98Mm0rFMoVhv/jITxRJDTSCPSKcTgpYqivSffMkDHVGv55 NnPDsUj+ql4hogHMAx1qvU2G10nCWbtnOB+JVKH4iDTcHuuhxPHgKP09bn5q/AgrzVOGHE a7U7/1yYkpVcUmDDor5ta/Ib0d8vCVWWhfaGR4tloiY3WcoCl6t+G+jeZAZrYme5XSg2fq qgx1pr6JeJKp2I/g2ZHPA/+2tr+qKU/Ct/UN2fpGTlXOFLcIVmVxcz/Osrn/Xa1d9RLcMg rMY5eY6JvPlsUC9pLsoupm2x5PpedaE5OYkwfmtJr+ogETUKhHrETJrx7iSlkw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760934555; a=rsa-sha256; cv=none; b=ddKHkRudTF8to4HgUVeMdSv8/Jicr3BLIHZi1Kngaj+WopRQL69pmE6bDT1jGtBJ+41pKE lXMAnGRmyaNmNNQtfWe3YpKB+z5As832ggYr75XC6yFkt8GaArkbR+pVZeng8Vg1KpKT75 yykW0cu9PsZjRLQdPjvKr7Tbv7am29BUU54zFlDrY78bqwo7gHy6vvMzPzYVboqIikMcJl 4r6/u3yi7+TN7lIdWN3wNuUQU5ddKypoX3ENvIgrOm6OtGaDfRnrKpAdzeXjbqnG1i0JpR bsst/7gJaiy6Bn2OZI5SHfVjKJNwlx7R4E2gHeJudBn8IU0XaPYQf0zlVE9HFA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cqjB314R5zy0K; Mon, 20 Oct 2025 04:29: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 59K4TF5u001924; Mon, 20 Oct 2025 04:29:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59K4TF4U001921; Mon, 20 Oct 2025 04:29:15 GMT (envelope-from git) Date: Mon, 20 Oct 2025 04:29:15 GMT Message-Id: <202510200429.59K4TF4U001921@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: db1844a0e1bc - main - aac: Migrate to use macro LINUX_IOCTL_SET to register linux ioctl handler List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: db1844a0e1bcafeb974215033ed682e7fa18cac8 Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=db1844a0e1bcafeb974215033ed682e7fa18cac8 commit db1844a0e1bcafeb974215033ed682e7fa18cac8 Author: Zhenlei Huang AuthorDate: 2025-10-20 04:28:42 +0000 Commit: Zhenlei Huang CommitDate: 2025-10-20 04:28:42 +0000 aac: Migrate to use macro LINUX_IOCTL_SET to register linux ioctl handler Reviewed by: markj MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D53158 --- sys/dev/aac/aac_linux.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/sys/dev/aac/aac_linux.c b/sys/dev/aac/aac_linux.c index 609315f50939..65008c562342 100644 --- a/sys/dev/aac/aac_linux.c +++ b/sys/dev/aac/aac_linux.c @@ -52,15 +52,7 @@ #define AAC_LINUX_IOCTL_MIN 0x0000 #define AAC_LINUX_IOCTL_MAX 0x21ff -static linux_ioctl_function_t aac_linux_ioctl; -static struct linux_ioctl_handler aac_linux_handler = {aac_linux_ioctl, - AAC_LINUX_IOCTL_MIN, - AAC_LINUX_IOCTL_MAX}; - -SYSINIT (aac_linux_register, SI_SUB_KLD, SI_ORDER_MIDDLE, - linux_ioctl_register_handler, &aac_linux_handler); -SYSUNINIT(aac_linux_unregister, SI_SUB_KLD, SI_ORDER_MIDDLE, - linux_ioctl_unregister_handler, &aac_linux_handler); +LINUX_IOCTL_SET(aac, AAC_LINUX_IOCTL_MIN, AAC_LINUX_IOCTL_MAX); static int aac_linux_modevent(module_t mod, int type, void *data) From nobody Mon Oct 20 04:29:16 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cqjB44tGjz6D9MJ; Mon, 20 Oct 2025 04:29:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cqjB42VNqz3DJJ; Mon, 20 Oct 2025 04:29:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760934556; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=u9bbQ2GQAG2C+zD7tXr4byYL7R3HKnupcy2HQuQN9Uo=; b=yxqOpOUmJHJ5Q4SKlBY/YtnRQ7yzj3v1Kc9npZw1PfTaJGwiA5f4LHObFNVflCx79sK1g9 RCHZ57XSrjCoiALHDczZaTRmT4zKLietCSeCm7cyqXMUcUuMUpBmVy3F8ZZySxfDIqtySh PWr5NER7WD9CgLM0zFIV5R8RsowbEZCUZVXoYGibBmXz8nA0hGz1ahxZKr9fLl+5md/HnX PKwEEq2verLZGTph7uzJ6azFXgYOA8aF30Q/PFOzjdzK42tL9CNr+++qxChp2JjZFt+oDn L6eMprIIE7We2UY+U176KKJPco26eaoylvsUzlmZwtFp410jtfqYjttdR1UxWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760934556; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=u9bbQ2GQAG2C+zD7tXr4byYL7R3HKnupcy2HQuQN9Uo=; b=Jqtk6+cKWG0T4MGEDGBmv/B8O6cTYZFBsFYJi9ZhS9BIaXOKgUPDgYRXR8sBIFgulxb7N8 KZ0zx60w/zbwxgcYkkfBd9/7TiQJr1mKO870Wbd5tv6wEU/Z0oIJIl9KkcTMtcGLKW17Ox E9c1DRgEJ2clUldxEZCU3dyIAX4ulPL/oXmwujX1eCHHknOmXV/Ly1gRmomK3bU8+i7732 DKCwB4VsEoQdqbzq4KmzDUGQFFI4FmXzBGhc9VFZrnUGcv2cYezxLvkJh88TRLv1so+pHR KudRhjLTnb6N4/o/QKTVMSj1MpdHTeQQ2X6T44sKG514Kd0cKFuWRhG/frmlVg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760934556; a=rsa-sha256; cv=none; b=TCTKMNG1Yw+ubuydo27zR7eVcQx9wMW6C+7XwI/2a0BGLna/8pyRWLHqTlDpnOR+dUTOq0 2L1UQwmA+hv9Dfby12P5ZxL6FFAP0hj4qciu4qQdwxpwUm1Gh1DI0ULvVLcGBXqb7hf8vp sZIw058UBRxdtrAzWmB/mKXeeDrPiMNIzIoeKuKLi68JeQAcOHhnEWowTaYz9WMtv4UEnR PgZcIlySBBIzkVJB168Kv5t6ASIHbcbYyty7cUHnvuOTVRn/OYKTWZ1LiIitEKHa5VHAj4 EXh+djm5S3Yj9djafjFR8/fVFmc/kGQ3DQ7CkF0xurNykgLot4KrJBKmWie9yA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cqjB424dDzy0L; Mon, 20 Oct 2025 04:29:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59K4TGWQ001959; Mon, 20 Oct 2025 04:29:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59K4TGhJ001955; Mon, 20 Oct 2025 04:29:16 GMT (envelope-from git) Date: Mon, 20 Oct 2025 04:29:16 GMT Message-Id: <202510200429.59K4TGhJ001955@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: ff29e5bc53e6 - main - aacraid: Migrate to use macro LINUX_IOCTL_SET to register linux ioctl handler List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ff29e5bc53e6fafc49d1caceed88cbc9e9223189 Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=ff29e5bc53e6fafc49d1caceed88cbc9e9223189 commit ff29e5bc53e6fafc49d1caceed88cbc9e9223189 Author: Zhenlei Huang AuthorDate: 2025-10-20 04:28:42 +0000 Commit: Zhenlei Huang CommitDate: 2025-10-20 04:28:42 +0000 aacraid: Migrate to use macro LINUX_IOCTL_SET to register linux ioctl handler Reviewed by: markj MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D53158 --- sys/dev/aacraid/aacraid_linux.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/sys/dev/aacraid/aacraid_linux.c b/sys/dev/aacraid/aacraid_linux.c index 267dd84c65d5..6b6259ed7059 100644 --- a/sys/dev/aacraid/aacraid_linux.c +++ b/sys/dev/aacraid/aacraid_linux.c @@ -54,15 +54,7 @@ #define AAC_LINUX_IOCTL_MIN 0x0000 #define AAC_LINUX_IOCTL_MAX 0x21ff -static linux_ioctl_function_t aacraid_linux_ioctl; -static struct linux_ioctl_handler aacraid_linux_handler = {aacraid_linux_ioctl, - AAC_LINUX_IOCTL_MIN, - AAC_LINUX_IOCTL_MAX}; - -SYSINIT (aacraid_linux_register, SI_SUB_KLD, SI_ORDER_MIDDLE, - linux_ioctl_register_handler, &aacraid_linux_handler); -SYSUNINIT(aacraid_linux_unregister, SI_SUB_KLD, SI_ORDER_MIDDLE, - linux_ioctl_unregister_handler, &aacraid_linux_handler); +LINUX_IOCTL_SET(aacraid, AAC_LINUX_IOCTL_MIN, AAC_LINUX_IOCTL_MAX); static int aacraid_linux_modevent(module_t mod, int type, void *data) From nobody Mon Oct 20 04:29:17 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cqjB56yWcz6D9Ps; Mon, 20 Oct 2025 04:29:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cqjB54GfNz3D6s; Mon, 20 Oct 2025 04:29:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760934557; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=K1D8xKEzlQse0ggufJYREATxaUFCpPsyeuZorbtiSbk=; b=viVcsoRQ0s6B2WrOxpHOCwpFi6ecSEYq76HnigjS+dx1O306yVv9joKVsw3U99Fx0gnL1P ZZ269XnIrQaTlX8FgETOw/qFwyoDR8hddP4rFdb0VKbpVxKCvZdx7RdWEBIP5kMU/LT/Xh bkURa8lOVnE+6KYZFZMjA6VYxnNiakjXH2/X5RNameoDR+G7Yla7HkjwqJdCTx8zkO2+tJ N3mbLEy07dCmeqo538jSeEhMk/NOA7tykWPzUQkyOWSrQyAdmuMK9OY/D9G2zIQdymJ0by nTv1+rWW/nVm2OZ+W/1MvcEot3r6d9YF/jfuTwIyEJOt0nnBoQde8IbBx7MFIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760934557; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=K1D8xKEzlQse0ggufJYREATxaUFCpPsyeuZorbtiSbk=; b=ex5mtUlwbqTWgAb/ISKlrwIcKE6XSwsLWSzSZKRYCZXgsPlc4eCVTwR+rjk3EFtxLFt99x V2kaCXC8m8111bFj622Tk3xwrZ1QiRichcO403HhdrV/DIsFBYFc+d9reSLbogW2sqtPdE UE9JN/gLuFlOsP7XbJbthMlcHhCtQC4KnrCu1i9s/hQXyYN5z5clso3XWYX6U/5MeylTqX NO81kPBux8fyi2jHij3prC9l4+x3w+yFa5h7OjNr/pNnkT0n0qeZqAY691swRjOnhE9JFu vse/khf+YNUelVrVbFHBflfut1nrqRGYb6rTvCKiQ3lmXmeQNX3MEshjHPjHTg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760934557; a=rsa-sha256; cv=none; b=bS2BjlI7rTf/bgzh3cjfHU8SKUQn4Z/b61AdpnPoO1+3Q7Dd0/rE+ErANOH/Fwf+XV+qCe Kwl2djlDZMycXiXdQzx6NCzBahVyipUB19Iay4nV+n1XklTfZRHBATL4jgxZ2j2OwjavCu yd8GKwsxT2uWRtHUeQeimK9F9GcZU24t9gipIXyCgmnsjeSQC+VYNRSKlbBiwrMyM7UH6+ lVZZR/d0bK61C5t9eEKRROesr+I9DRZtM6nwd0AqP/Qk6iQB6D1lTOaYV2Xy31qvaBAw6W doxQtajRoN2OgrL3dwO1vGNVcHtPxfwaRY8ZD1JopsAYEmXCVEAnLZ80U5TF7Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cqjB52phRzy0M; Mon, 20 Oct 2025 04:29: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 59K4THG3001993; Mon, 20 Oct 2025 04:29:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59K4TH1b001990; Mon, 20 Oct 2025 04:29:17 GMT (envelope-from git) Date: Mon, 20 Oct 2025 04:29:17 GMT Message-Id: <202510200429.59K4TH1b001990@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: cb0116af7ac7 - main - ipmi: Migrate to use macro LINUX_IOCTL_SET to register linux ioctl handler List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cb0116af7ac794238b0fa569f2722607924fcad6 Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=cb0116af7ac794238b0fa569f2722607924fcad6 commit cb0116af7ac794238b0fa569f2722607924fcad6 Author: Zhenlei Huang AuthorDate: 2025-10-20 04:28:42 +0000 Commit: Zhenlei Huang CommitDate: 2025-10-20 04:28:42 +0000 ipmi: Migrate to use macro LINUX_IOCTL_SET to register linux ioctl handler Reviewed by: markj MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D53158 --- sys/dev/ipmi/ipmi_linux.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/sys/dev/ipmi/ipmi_linux.c b/sys/dev/ipmi/ipmi_linux.c index 05eb30a0aa77..58872de12003 100644 --- a/sys/dev/ipmi/ipmi_linux.c +++ b/sys/dev/ipmi/ipmi_linux.c @@ -66,15 +66,7 @@ #define L_IPMICTL_SET_MY_LUN_CMD _IOW(IPMI_IOC_MAGIC, 19, unsigned int) #define L_IPMICTL_GET_MY_LUN_CMD _IOW(IPMI_IOC_MAGIC, 20, unsigned int) -static linux_ioctl_function_t ipmi_linux_ioctl; -static struct linux_ioctl_handler ipmi_linux_handler = {ipmi_linux_ioctl, - IPMI_LINUX_IOCTL_MIN, - IPMI_LINUX_IOCTL_MAX}; - -SYSINIT (ipmi_linux_register, SI_SUB_KLD, SI_ORDER_MIDDLE, - linux_ioctl_register_handler, &ipmi_linux_handler); -SYSUNINIT(ipmi_linux_unregister, SI_SUB_KLD, SI_ORDER_MIDDLE, - linux_ioctl_unregister_handler, &ipmi_linux_handler); +LINUX_IOCTL_SET(ipmi, IPMI_LINUX_IOCTL_MIN, IPMI_LINUX_IOCTL_MAX); static int ipmi_linux_modevent(module_t mod, int type, void *data) From nobody Mon Oct 20 04:29:18 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cqjB66Gbbz6D9MM; Mon, 20 Oct 2025 04:29:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cqjB64c6Mz3DM8; Mon, 20 Oct 2025 04:29:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760934558; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wzRJIMBzDQIBj2uaxZHe6KeLaJdGmjMG4zviaB1JEhY=; b=jhEVKoOnQTYytT7TpupPdEl87YTQV8e5O1bW50zS4UEtsYY53AAO5R7h+1Z1q4JsEFfhdG qPB2hzt89k7O+Ojap/97gniwTz+m4hXJNZUdqCvrNx57RdU29MMlI3g+hhS6AepON4+fTy aOkaW5H6GcMUCWD1I/yTUvAepRo05f1fX2OpIbm0JGv6btacNBWskyvrMqfqpkPVE2qwWF RfPo2dwCSOR/eYf+pot3BOVsbOX3TBblTVH0flIJNjIa4BxeqZG9ljAdoeEpH1YVlZXpu8 m9apHdU/upn8UUThtDhM5ZIQEhLlme5DiBAz7tq8NkCDwRTeShAuF36Gt9zoDA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760934558; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wzRJIMBzDQIBj2uaxZHe6KeLaJdGmjMG4zviaB1JEhY=; b=xtsEE7hdg9zpm1r6TvIuhynFbPxORGdZdDfUAWNbWGLwe8na4dnJKTqCZ0cPFpCzgbaQXn EfiQy+9JUPcgYSxXoU+SsNmOjgl3zeg69qgQy+HBPsKG8QEtyDhTCHfCSdNRPJCG2/C8/5 jO2lVcBmglAHhfTcES4eqxGgxidM5tbVzxGij2NBRk8kyXYVzBn2Ns2EyPjiBnu1Eeawyp WCU138g1CG2oAbT+qRqW/zXsJFGOMA+52cuH1lAkdeDt/CZKI/lKZ6vgFKiW5suNlVSS9K FflwwBGehwHEiobYcnKG/C4qlJEy2NwBESs9FncauIs5kV/8Rf17rMsyiqnnjg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760934558; a=rsa-sha256; cv=none; b=CAzl1p+GTubx9mF+4Rzgk6yBI8G05iW4zT6sUbuO7UcDKj6qmwU/gvwuEgQOzIPwbZSgoE Xyek1GnIJvoau/3ZO61xC195dOeMUQYrPev2VRDoU0afwkTiRwYAz9+WqjYD1G262wZ8y8 QT+5BC0qvfm3PUSqdFICvfmhAitMrj/I7EFJbfDHCzaPjlxhmLDGzpjEMb6UGyg9grgDx6 3qimXUXfvdnEOwgCRqWcvofQOWFp40hNPh46qnxwHYIDx+l+2vckWGGzA7tDLS0ujZIDiI y9clp6RCzKDo8su2sg8u+3XnHQA1AX/sKtug1RW9zQBzM6Ayftr9X5q7UZ3JPQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cqjB63twRzxlv; Mon, 20 Oct 2025 04:29: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 59K4TIAE002025; Mon, 20 Oct 2025 04:29:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59K4TIB0002022; Mon, 20 Oct 2025 04:29:18 GMT (envelope-from git) Date: Mon, 20 Oct 2025 04:29:18 GMT Message-Id: <202510200429.59K4TIB0002022@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: d12ce84b0d33 - main - mfi: Migrate to use macro LINUX_IOCTL_SET to register linux ioctl handler List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d12ce84b0d338958b26f6eec86b4967fca8d3bd6 Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=d12ce84b0d338958b26f6eec86b4967fca8d3bd6 commit d12ce84b0d338958b26f6eec86b4967fca8d3bd6 Author: Zhenlei Huang AuthorDate: 2025-10-20 04:28:42 +0000 Commit: Zhenlei Huang CommitDate: 2025-10-20 04:28:42 +0000 mfi: Migrate to use macro LINUX_IOCTL_SET to register linux ioctl handler Reviewed by: markj MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D53158 --- sys/dev/mfi/mfi_linux.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/sys/dev/mfi/mfi_linux.c b/sys/dev/mfi/mfi_linux.c index 8ed8baa3858a..9541ff37336a 100644 --- a/sys/dev/mfi/mfi_linux.c +++ b/sys/dev/mfi/mfi_linux.c @@ -53,15 +53,7 @@ #define MFI_LINUX_IOCTL_MIN 0x4d00 #define MFI_LINUX_IOCTL_MAX 0x4d04 -static linux_ioctl_function_t mfi_linux_ioctl; -static struct linux_ioctl_handler mfi_linux_handler = {mfi_linux_ioctl, - MFI_LINUX_IOCTL_MIN, - MFI_LINUX_IOCTL_MAX}; - -SYSINIT (mfi_register, SI_SUB_KLD, SI_ORDER_MIDDLE, - linux_ioctl_register_handler, &mfi_linux_handler); -SYSUNINIT(mfi_unregister, SI_SUB_KLD, SI_ORDER_MIDDLE, - linux_ioctl_unregister_handler, &mfi_linux_handler); +LINUX_IOCTL_SET(mfi, MFI_LINUX_IOCTL_MIN, MFI_LINUX_IOCTL_MAX); static struct linux_device_handler mfi_device_handler = { "mfi", "megaraid_sas", "mfi0", "megaraid_sas_ioctl_node", -1, 0, 1}; From nobody Mon Oct 20 04:29:19 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cqjB76sXhz6D9GX; Mon, 20 Oct 2025 04:29:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cqjB74tbzz3D9n; Mon, 20 Oct 2025 04:29:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760934559; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3QlKwzicAEUstD9l6txDTFsCJaYkmapneoTmYIyLTbQ=; b=KDUxgNUnuPudpbO0N/XSktCkWoIN4BQGgPngaG/iPFx4dksQLu4w3HwA9H7U+2V4TveUXx mmJRPSfKPUJmlvvtHPQV2xX1z7bZoiEVWB6x/ra6xLgPnM4D9JHSc1z00onz3UwTrztdeY uoDsS3QKeczXyaOsKRs5LbpBultT/6AvQklmj6I2ikwCIoHSn5F17Nj5Z3f9B0dmaxyXpp AkCnGKIq/rgJjVGPNDKOFdilFQiikfWcwEgl6RU0D4Jy4a8lbuvuthJ9WOJYHUeR2R9jTt xyAORy8E79zTEkFCJ3rDtmZaUTZzc0AeTVa6cNR//QY3237OoV1ZWssk8g3WXw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760934559; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3QlKwzicAEUstD9l6txDTFsCJaYkmapneoTmYIyLTbQ=; b=H10JI5wggZM/9690t1RkmCf1qH4aA/V8EyIhT+6Ghev5H2aJcYZ5YPM5lZHguK1ChOVUVv 0/6ibHN52QLPOaG16sIYPVGM15xEcaYU8kdsemph5iHciEyH20DCNIireMqPUu4KY0D/nM f3hf1iXrhJH8NqcZ2Lca6GfGyWbi/LNL2ZrmLhfla2RH3HtL7ZELtydnICtjdaXkL7R+0g AOaOxffY+uaNvpAiAAMFQs3kcMnSdtDf5YnxPToOE2SkWg1Xq0YjvLrX0b8wbEv8qCjwg7 HKANQuFRJwmK+coo06pxJ9Ek44f2vBoRfeIbPxmLcmapki8eU5/FZUphl1cGEQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760934559; a=rsa-sha256; cv=none; b=Rz8MRYrkSpE4BaqgR60Zy1GbvZNTleI5GXFMavqsrx1cGX+KMcbajFnrnNw44UITYm/6V4 Uddyt4CkV334yn6RwB6UNrxgV8NxYhR6l0UZaQ92vb3uSM40UZpkHz9P3UJ6O6CpsIHkhu fCFlUUjbrc0xxrLjlNYMcpt+K4yKw+C9Mgf6xkG27jZlvvED/GegWkYfYjCtAMAINSie3e pAQ0hxVLEpB5BaDRciLklXEv4xM4Q8XlAcUgA4Y92drEbTVBwApj5HzWU22r8acLzjJXTS DyZfofoX0ueZ9T7uVXsUtjBu4RWAV9iCnX6E2795gVnoCLT3GiyAi3sA4ylVdg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cqjB74TJLzy0N; Mon, 20 Oct 2025 04:29: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 59K4TJUf002058; Mon, 20 Oct 2025 04:29:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59K4TJPE002055; Mon, 20 Oct 2025 04:29:19 GMT (envelope-from git) Date: Mon, 20 Oct 2025 04:29:19 GMT Message-Id: <202510200429.59K4TJPE002055@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: 0a2fb63b4954 - main - mrsas: Migrate to use macro LINUX_IOCTL_SET to register linux ioctl handler List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0a2fb63b4954c540686d387254b65cc6878bd19e Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=0a2fb63b4954c540686d387254b65cc6878bd19e commit 0a2fb63b4954c540686d387254b65cc6878bd19e Author: Zhenlei Huang AuthorDate: 2025-10-20 04:28:43 +0000 Commit: Zhenlei Huang CommitDate: 2025-10-20 04:28:43 +0000 mrsas: Migrate to use macro LINUX_IOCTL_SET to register linux ioctl handler Reviewed by: markj MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D53158 --- sys/dev/mrsas/mrsas_linux.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/sys/dev/mrsas/mrsas_linux.c b/sys/dev/mrsas/mrsas_linux.c index d7d48740a204..b06788fffc82 100644 --- a/sys/dev/mrsas/mrsas_linux.c +++ b/sys/dev/mrsas/mrsas_linux.c @@ -67,15 +67,7 @@ #define MRSAS_LINUX_IOCTL_MIN 0x4d00 #define MRSAS_LINUX_IOCTL_MAX 0x4d01 -static linux_ioctl_function_t mrsas_linux_ioctl; -static struct linux_ioctl_handler mrsas_linux_handler = {mrsas_linux_ioctl, - MRSAS_LINUX_IOCTL_MIN, -MRSAS_LINUX_IOCTL_MAX}; - -SYSINIT(mrsas_register, SI_SUB_KLD, SI_ORDER_MIDDLE, - linux_ioctl_register_handler, &mrsas_linux_handler); -SYSUNINIT(mrsas_unregister, SI_SUB_KLD, SI_ORDER_MIDDLE, - linux_ioctl_unregister_handler, &mrsas_linux_handler); +LINUX_IOCTL_SET(mrsas, MRSAS_LINUX_IOCTL_MIN, MRSAS_LINUX_IOCTL_MAX); static struct linux_device_handler mrsas_device_handler = {"mrsas", "megaraid_sas", "mrsas0", "megaraid_sas_ioctl_node", -1, 0, 1}; From nobody Mon Oct 20 09:37:43 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cqr1z5F1wz6DXVM; Mon, 20 Oct 2025 09:37:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cqr1z4T15z3hTJ; Mon, 20 Oct 2025 09:37:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760953063; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XtkijOCDWQ1mtQOIzranbNhOxTh+kmqE8MUzLc62kMY=; b=rJQJRulyuyL6jlz0yE2PU8jN6lBpN/5R26pZuNjwoi16OSNBzcyyYDx47m1K9u886FTQ2D KNhzKOJtweYVYYO0fX6il40w9XnR3TQBxSkf1wsQSc3Pul0RzqQ71Xi1TgNsijSSRRWmbx WUI4JmA/tb4jHYX04r6XxJ2VxF1hWIo03EYfC037NnKXfb86q6Edn23F75BqhCJqO3dU9T LCKKolkwe+5s7G4prpQXL8rpSWmvbwnSn6qyhSZL2W5TqRts8MVTXJrgafCEPAGJI3SMWN zFA54pPvaPr+/04zVbhddXHDAKWqBne7H6PWJ288NcrHsbDa3yOaDBo8ITeWRA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760953063; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XtkijOCDWQ1mtQOIzranbNhOxTh+kmqE8MUzLc62kMY=; b=j95Yr41zddRLdjuxrnHgnza6Yu52ArROmvEKDDRsxBbTNYXxKPM3IBINoyWSZvTKF5UcOd RP2nWl8KBoq5eBdP6RPZ1JhRqvXvjI6OP7ykss9LZe2r/0QRylbbkvV/RzdApFpFLPYk8C P3+PRFLwgVER3lzlUD0GNZLOON7SJcprAL/e6Q3nswHIEcRuXc0OTkM4Md6CwV9DCcxNi5 Yr08UeHqjPdt92vdwVdrnPD1C8TuQTyfo6GErVvu5R5VjI0JzuI82XBLMfJJyGwh7qZ3NR pvkM38BkwuL4kQuLwLUNtzuZykALhtN6j4R3if1D5i7KO3Aelng0ECAprwUa2Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760953063; a=rsa-sha256; cv=none; b=yU1MxAYOzlNG4mIIYV6NXUINtWi7NleJixGwWMUzj7tTVfbXz0+14b6QTh7jIsYkLG5cxk aqdu0EsCeoLUq2P4hD9LQok5NfMph3D0QEfqc+cNcUx8idL5lsZcvEvH3H4hcImyGK5QH+ BhiXdtj0Etl9hGjUk/LoiwAxe4Nt41/LiTsRSfBWYWEBDZSGAOiyWyw5RW9uBVN4j59mvm o7SWB5JZDYbW6kU1E3R17J9A3FdJlI9C4NUFhw4FtyHY0nBkbyXZXKz0cINH7+h3PvQCCy Amrdb8b4Z6VsCcFR/KRyqyPF4ygS5yx3zL+LbXHB4XIPHSZxA+3m2k4vlIiW6A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cqr1z3nD0z16Bt; Mon, 20 Oct 2025 09:37: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 59K9bhYx084862; Mon, 20 Oct 2025 09:37:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59K9bhuh084859; Mon, 20 Oct 2025 09:37:43 GMT (envelope-from git) Date: Mon, 20 Oct 2025 09:37:43 GMT Message-Id: <202510200937.59K9bhuh084859@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dave Cottlehuber Subject: git: 81d807a90611 - main - release: split up Oracle Cloudware tools List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dch X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 81d807a90611a4980cae843b404d99c27edc1893 Auto-Submitted: auto-generated The branch main has been updated by dch: URL: https://cgit.FreeBSD.org/src/commit/?id=81d807a90611a4980cae843b404d99c27edc1893 commit 81d807a90611a4980cae843b404d99c27edc1893 Author: Dave Cottlehuber AuthorDate: 2025-10-20 09:35:37 +0000 Commit: Dave Cottlehuber CommitDate: 2025-10-20 09:37:01 +0000 release: split up Oracle Cloudware tools Sometimes one or the other but not both tools are present; this ensures that all cases are correctly handled. Reported by: cperciva Approved by: cperciva (re) Sponsored by: SkunkWerks, GmbH Reviewed by: cperciva Differential Revision: https://reviews.freebsd.org/D53186 MFC after: 2 days --- release/Makefile.oracle | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/release/Makefile.oracle b/release/Makefile.oracle index 3573f29b96c1..6d792cc9fd30 100644 --- a/release/Makefile.oracle +++ b/release/Makefile.oracle @@ -24,21 +24,28 @@ # Syncing to all sites should take 2-3 hours after this final step. ORACLE_BASENAME= ${OSRELEASE}-${BUILDDATE}${GITREV:C/^(.+)/-\1/} -ORACLE_PORTS_LIST= ftp/curl emulators/qemu@tools CLEANFILES+= cw-oracle-portinstall cw-oracle-portinstall: .PHONY -.if !exists(/usr/local/bin/curl) || !exists(/usr/local/bin/qemu-img) -. if !exists(${PORTSDIR}/Makefile) -. if !exists(/usr/local/sbin/pkg-static) +.if (!exists(/usr/local/bin/curl) || !exists(/usr/local/bin/qemu-img)) && !exists(${PORTSDIR}/Makefile) +. if !exists(/usr/local/sbin/pkg-static) env ASSUME_ALWAYS_YES=yes pkg bootstrap -yf -. endif - env ASSUME_ALWAYS_YES=yes pkg install -y ${ORACLE_PORTS_LIST} +. endif +.endif +.if !exists(/usr/local/bin/curl) +. if !exists(${PORTSDIR}/Makefile) + env ASSUME_ALWAYS_YES=yes pkg install -y ftp/curl . else env UNAME_r=${UNAME_r} make -C \ ${PORTSDIR}/ftp/curl \ BATCH=1 WRKDIRPREFIX=/tmp/ports DISTDIR=/tmp/distfiles \ all install clean +. endif +.endif +.if !exists(/usr/local/bin/qemu-img) +. if !exists(${PORTSDIR}/Makefile) + env ASSUME_ALWAYS_YES=yes pkg install -y emulators/qemu@tools +. else env UNAME_r=${UNAME_r} FLAVOR=tools make -C \ ${PORTSDIR}/emulators/qemu \ BATCH=1 WRKDIRPREFIX=/tmp/ports DISTDIR=/tmp/distfiles \ From nobody Mon Oct 20 10:59:03 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cqsqx5W7Rz6DdRn; Mon, 20 Oct 2025 10:59:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cqsqx5Gqmz3rYG; Mon, 20 Oct 2025 10:59:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760957949; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UJgeC+gx9kXSqRxKyGJXzgK21OgoWNYoOJuMdgPjyr8=; b=osq72AnNtWSDPpaua2TLHK3HgrjCUZlvbSRqI4zhHvkmunm3Vd+hXu1i0Fc+CYTzBNEH1w sSkO1hq3OjErJZPVAoSMk4j7BjW6IsRFHPWi1NbFaG53zywL2Oo6WMVEIilcVY3RA04QM8 ZyaXFIzMRKBDkbJNPFvJM/qCplLBKuD7zoNArDt+SDmtvA5t9QQVROQiyUBWwkC42RBZQW 2dQ2wgHB7nJnhJPMnVesZW1UuNKxobd9aXZAvvvqVU6LoT04FVstGi70Q9zYkhpMLJB6GQ 99NiLMBiU+yQlHG1hO49p3EXzpAvrOHKdUfKQsT7SUkULM0vTMf+KC8bG6BCRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760957949; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UJgeC+gx9kXSqRxKyGJXzgK21OgoWNYoOJuMdgPjyr8=; b=WekUX/yU9B3HzN512u8EKk/+9teQK7JJDMaV0WeTrV8V9BCcATfnhfQ6w/p1xyI60PSncQ ycipHsIZvA6MgqnUuk1tXofP+pa3xxeA2Kybp8IlECtsuIjnwVHAtNPBCpkqof9wTPtWod ruNQiOZj4WZLjQozi+n5CedKWBL0UqDXmiT/iC/D3SDmnQVPkPTlhqFO/5q57Udenh6dCA 6/9Dfj3O8VEz7YSADCguyhl4eH8wsm9Skprm2921HYzpOTCxOPC48hH8qDmPjz2DNxT505 MPwrsKXEgMMHRlV45a6Nc59OLnLW13WwBVfmz6H1RDPTrvetyD76sEItmpYWxQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760957949; a=rsa-sha256; cv=none; b=xjCBsd3er7UUYIsDId5baBYp81k/Lay4dbz+ukB4mN00q/+h+wgaqxGuT9G4fILCqjSYrz JqegAsZLjDN5waZKg2UXnZEYHQRbqPQG3fYDdnxOuJmvVeug+dc9Zgw57586XzLZqSy8g6 Hn0ZwvpWDE/YiERj4XGq42vf1izfq5SvIKEhquZqkDtfOVOenjQ9HqvmG1bzTqefGGiJdU bXw3sP2pBo02klbJfD8ObogXN6vQxj+5eYpqwTP7FRirMXrvTYNr3azpRnAkukGFlSqDCr ODdMx4CZKyMUn1vJgX18owebPV8z8HBqFT8fB3b8iiSYDyW6xlB5pQEDVX1Upg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cqsqx4kM9z18Vs; Mon, 20 Oct 2025 10:59: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 59KAx9aU037168; Mon, 20 Oct 2025 10:59:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59KAx3OR037143; Mon, 20 Oct 2025 10:59:03 GMT (envelope-from git) Date: Mon, 20 Oct 2025 10:59:03 GMT Message-Id: <202510201059.59KAx3OR037143@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Martin Matuska Subject: git: 6e6cde8f2bdb - main - zfs: merge openzfs/zfs@6ae99d269 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6e6cde8f2bdb235b741061e3c6ee664752f25c18 Auto-Submitted: auto-generated The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=6e6cde8f2bdb235b741061e3c6ee664752f25c18 commit 6e6cde8f2bdb235b741061e3c6ee664752f25c18 Merge: 81d807a90611 6ae99d26924d Author: Martin Matuska AuthorDate: 2025-10-20 10:18:26 +0000 Commit: Martin Matuska CommitDate: 2025-10-20 10:30:00 +0000 zfs: merge openzfs/zfs@6ae99d269 Notable upstream pull request merges: #17750 6e5b836e9 FreeBSD: Correct _PC_MIN_HOLE_SIZE #17803 1861a329f zvol: verify IO type is supported #17826 51de2d76f Explicit set ashift for non-leaf vdevs #17830 f4276479c Suppress some ashift warnings #17843 6ae99d269 mmap_seek: print error code and text on failure Obtained from: OpenZFS OpenZFS commit: 6ae99d26924decb5f618b596ec7663e6a26d2e5f .../.github/workflows/scripts/qemu-2-start.sh | 11 +- sys/contrib/openzfs/.github/workflows/zfs-qemu.yml | 2 +- sys/contrib/openzfs/cmd/zdb/zdb.c | 185 +++++++++++++++++++-- sys/contrib/openzfs/cmd/zpool/zpool_vdev.c | 64 +++---- sys/contrib/openzfs/lib/libspl/include/sys/uio.h | 1 + sys/contrib/openzfs/lib/libzfs/libzfs_status.c | 78 +++++---- sys/contrib/openzfs/lib/libzpool/kernel.c | 79 ++++++--- sys/contrib/openzfs/man/man8/zdb.8 | 14 ++ .../openzfs/module/os/freebsd/zfs/zfs_ctldir.c | 3 +- .../openzfs/module/os/freebsd/zfs/zfs_vnops_os.c | 17 +- sys/contrib/openzfs/module/os/linux/zfs/zvol_os.c | 77 +++++---- sys/contrib/openzfs/module/zfs/arc.c | 16 +- .../openzfs/tests/zfs-tests/cmd/mmap_seek.c | 35 ++-- .../cli_root/zpool_reopen/zpool_reopen_004_pos.ksh | 2 + .../functional/zvol/zvol_misc/zvol_misc_trim.ksh | 7 + sys/modules/zfs/zfs_config.h | 4 +- sys/modules/zfs/zfs_gitrev.h | 2 +- 17 files changed, 443 insertions(+), 154 deletions(-) diff --cc sys/modules/zfs/zfs_config.h index db1b6f33a8ef,000000000000..3a17ed289235 mode 100644,000000..100644 --- a/sys/modules/zfs/zfs_config.h +++ b/sys/modules/zfs/zfs_config.h @@@ -1,882 -1,0 +1,882 @@@ +/* + */ + +/* zfs_config.h. Generated from zfs_config.h.in by configure. */ +/* zfs_config.h.in. Generated from configure.ac by autoheader. */ + +/* Define to 1 if translation of program messages to the user's native + language is requested. */ +/* #undef ENABLE_NLS */ + +/* __assign_str() has one arg */ +/* #undef HAVE_1ARG_ASSIGN_STR */ + +/* lookup_bdev() wants 1 arg */ +/* #undef HAVE_1ARG_LOOKUP_BDEV */ + +/* kernel has access_ok with 'type' parameter */ +/* #undef HAVE_ACCESS_OK_TYPE */ + +/* add_disk() returns int */ +/* #undef HAVE_ADD_DISK_RET */ + +/* Define if host toolchain supports AES */ +#define HAVE_AES 1 + +/* Define if you have [rt] */ +#define HAVE_AIO_H 1 + +#ifdef __amd64__ +#ifndef RESCUE +/* Define if host toolchain supports AVX */ +#define HAVE_AVX 1 +#endif + +/* Define if host toolchain supports AVX2 */ +#define HAVE_AVX2 1 + +/* Define if host toolchain supports AVX512BW */ +#define HAVE_AVX512BW 1 + +/* Define if host toolchain supports AVX512CD */ +#define HAVE_AVX512CD 1 + +/* Define if host toolchain supports AVX512DQ */ +#define HAVE_AVX512DQ 1 + +/* Define if host toolchain supports AVX512ER */ +#define HAVE_AVX512ER 1 + +/* Define if host toolchain supports AVX512F */ +#define HAVE_AVX512F 1 + +/* Define if host toolchain supports AVX512IFMA */ +#define HAVE_AVX512IFMA 1 + +/* Define if host toolchain supports AVX512PF */ +#define HAVE_AVX512PF 1 + +/* Define if host toolchain supports AVX512VBMI */ +#define HAVE_AVX512VBMI 1 + +/* Define if host toolchain supports AVX512VL */ +#define HAVE_AVX512VL 1 +#endif + +/* backtrace() is available */ +/* #undef HAVE_BACKTRACE */ + +/* bdevname() is available */ +/* #undef HAVE_BDEVNAME */ + +/* bdev_check_media_change() exists */ +/* #undef HAVE_BDEV_CHECK_MEDIA_CHANGE */ + +/* bdev_file_open_by_path() exists */ +/* #undef HAVE_BDEV_FILE_OPEN_BY_PATH */ + +/* bdev_*_io_acct() available */ +/* #undef HAVE_BDEV_IO_ACCT_63 */ + +/* bdev_*_io_acct() available */ +/* #undef HAVE_BDEV_IO_ACCT_OLD */ + +/* bdev_kobj() exists */ +/* #undef HAVE_BDEV_KOBJ */ + +/* bdev_max_discard_sectors() is available */ +/* #undef HAVE_BDEV_MAX_DISCARD_SECTORS */ + +/* bdev_max_secure_erase_sectors() is available */ +/* #undef HAVE_BDEV_MAX_SECURE_ERASE_SECTORS */ + +/* bdev_nr_bytes() is available */ +/* #undef HAVE_BDEV_NR_BYTES */ + +/* bdev_open_by_path() exists */ +/* #undef HAVE_BDEV_OPEN_BY_PATH */ + +/* bdev_release() exists */ +/* #undef HAVE_BDEV_RELEASE */ + +/* block_device_operations->submit_bio() returns void */ +/* #undef HAVE_BDEV_SUBMIT_BIO_RETURNS_VOID */ + +/* bdev_whole() is available */ +/* #undef HAVE_BDEV_WHOLE */ + +/* bio_alloc() takes 4 arguments */ +/* #undef HAVE_BIO_ALLOC_4ARG */ + +/* bio->bi_bdev->bd_disk exists */ +/* #undef HAVE_BIO_BDEV_DISK */ + +/* bio_*_io_acct() available */ +/* #undef HAVE_BIO_IO_ACCT */ + +/* bio_max_segs() is implemented */ +/* #undef HAVE_BIO_MAX_SEGS */ + +/* bio_set_dev() GPL-only */ +/* #undef HAVE_BIO_SET_DEV_GPL_ONLY */ + +/* bio_set_dev() is a macro */ +/* #undef HAVE_BIO_SET_DEV_MACRO */ + +/* bio_set_op_attrs is available */ +/* #undef HAVE_BIO_SET_OP_ATTRS */ + +/* blkdev_get_by_path() exists and takes 4 args */ +/* #undef HAVE_BLKDEV_GET_BY_PATH_4ARG */ + +/* blkdev_get_by_path() handles ERESTARTSYS */ +/* #undef HAVE_BLKDEV_GET_ERESTARTSYS */ + +/* __blkdev_issue_discard(flags) is available */ +/* #undef HAVE_BLKDEV_ISSUE_DISCARD_ASYNC_FLAGS */ + +/* __blkdev_issue_discard() is available */ +/* #undef HAVE_BLKDEV_ISSUE_DISCARD_ASYNC_NOFLAGS */ + +/* blkdev_issue_discard(flags) is available */ +/* #undef HAVE_BLKDEV_ISSUE_DISCARD_FLAGS */ + +/* blkdev_issue_discard() is available */ +/* #undef HAVE_BLKDEV_ISSUE_DISCARD_NOFLAGS */ + +/* blkdev_issue_secure_erase() is available */ +/* #undef HAVE_BLKDEV_ISSUE_SECURE_ERASE */ + +/* blkdev_put() exists */ +/* #undef HAVE_BLKDEV_PUT */ + +/* blkdev_put() accepts void* as arg 2 */ +/* #undef HAVE_BLKDEV_PUT_HOLDER */ + +/* struct queue_limits has a features field */ +/* #undef HAVE_BLKDEV_QUEUE_LIMITS_FEATURES */ + +/* blkdev_reread_part() exists */ +/* #undef HAVE_BLKDEV_REREAD_PART */ + +/* blkg_tryget() is available */ +/* #undef HAVE_BLKG_TRYGET */ + +/* blkg_tryget() GPL-only */ +/* #undef HAVE_BLKG_TRYGET_GPL_ONLY */ + +/* blk_alloc_disk() exists */ +/* #undef HAVE_BLK_ALLOC_DISK */ + +/* blk_alloc_disk() exists and takes 2 args */ +/* #undef HAVE_BLK_ALLOC_DISK_2ARG */ + +/* blk_alloc_queue() expects request function */ +/* #undef HAVE_BLK_ALLOC_QUEUE_REQUEST_FN */ + +/* blk_alloc_queue_rh() expects request function */ +/* #undef HAVE_BLK_ALLOC_QUEUE_REQUEST_FN_RH */ + +/* blk_cleanup_disk() exists */ +/* #undef HAVE_BLK_CLEANUP_DISK */ + +/* blk_mode_t is defined */ +/* #undef HAVE_BLK_MODE_T */ + +/* block multiqueue hardware context is cached in struct request */ +/* #undef HAVE_BLK_MQ_RQ_HCTX */ + +/* blk queue backing_dev_info is dynamic */ +/* #undef HAVE_BLK_QUEUE_BDI_DYNAMIC */ + +/* blk_queue_discard() is available */ +/* #undef HAVE_BLK_QUEUE_DISCARD */ + +/* backing_dev_info is available through queue gendisk */ +/* #undef HAVE_BLK_QUEUE_DISK_BDI */ + +/* blk_queue_secure_erase() is available */ +/* #undef HAVE_BLK_QUEUE_SECURE_ERASE */ + +/* blk_queue_update_readahead() exists */ +/* #undef HAVE_BLK_QUEUE_UPDATE_READAHEAD */ + +/* BLK_STS_RESV_CONFLICT is defined */ +/* #undef HAVE_BLK_STS_RESV_CONFLICT */ + +/* Define if release() in block_device_operations takes 1 arg */ +/* #undef HAVE_BLOCK_DEVICE_OPERATIONS_RELEASE_1ARG */ + +/* Define if revalidate_disk() in block_device_operations */ +/* #undef HAVE_BLOCK_DEVICE_OPERATIONS_REVALIDATE_DISK */ + +/* Define to 1 if you have the Mac OS X function + CFLocaleCopyPreferredLanguages in the CoreFoundation framework. */ +/* #undef HAVE_CFLOCALECOPYPREFERREDLANGUAGES */ + +/* Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in + the CoreFoundation framework. */ +/* #undef HAVE_CFPREFERENCESCOPYAPPVALUE */ + +/* check_disk_change() exists */ +/* #undef HAVE_CHECK_DISK_CHANGE */ + +/* copy_splice_read exists */ +/* #undef HAVE_COPY_SPLICE_READ */ + +/* cpu_has_feature() is GPL-only */ +/* #undef HAVE_CPU_HAS_FEATURE_GPL_ONLY */ + +/* Define if the GNU dcgettext() function is already present or preinstalled. + */ +/* #undef HAVE_DCGETTEXT */ + +/* DECLARE_EVENT_CLASS() is available */ +/* #undef HAVE_DECLARE_EVENT_CLASS */ + +/* 3-arg dequeue_signal() takes a type argument */ +/* #undef HAVE_DEQUEUE_SIGNAL_3ARG_TYPE */ + +/* dequeue_signal() takes 4 arguments */ +/* #undef HAVE_DEQUEUE_SIGNAL_4ARG */ + +/* lookup_bdev() wants dev_t arg */ +/* #undef HAVE_DEVT_LOOKUP_BDEV */ + +/* disk_check_media_change() exists */ +/* #undef HAVE_DISK_CHECK_MEDIA_CHANGE */ + +/* disk_*_io_acct() available */ +/* #undef HAVE_DISK_IO_ACCT */ + +/* disk_update_readahead() exists */ +/* #undef HAVE_DISK_UPDATE_READAHEAD */ + +/* Define to 1 if you have the header file. */ +#define HAVE_DLFCN_H 1 + +/* dops->d_revalidate() takes 4 args */ +/* #undef HAVE_D_REVALIDATE_4ARGS */ + +/* Define if d_set_d_op() is available */ +/* #undef HAVE_D_SET_D_OP */ + +/* Define to 1 if you have the 'execvpe' function. */ +#define HAVE_EXECVPE 1 + +/* fault_in_iov_iter_readable() is available */ +/* #undef HAVE_FAULT_IN_IOV_ITER_READABLE */ + +/* file->f_version exists */ +/* #undef HAVE_FILE_F_VERSION */ + +/* flush_dcache_page() is GPL-only */ +/* #undef HAVE_FLUSH_DCACHE_PAGE_GPL_ONLY */ + +/* Define if compiler supports -Wformat-overflow */ +/* #undef HAVE_FORMAT_OVERFLOW */ + +/* fsync_bdev() is declared in include/blkdev.h */ +/* #undef HAVE_FSYNC_BDEV */ + +/* yes */ +/* #undef HAVE_GENERIC_FADVISE */ + +/* generic_fillattr requires struct mnt_idmap* */ +/* #undef HAVE_GENERIC_FILLATTR_IDMAP */ + +/* generic_fillattr requires struct mnt_idmap* and u32 request_mask */ +/* #undef HAVE_GENERIC_FILLATTR_IDMAP_REQMASK */ + +/* generic_fillattr requires struct user_namespace* */ +/* #undef HAVE_GENERIC_FILLATTR_USERNS */ + +/* generic_*_io_acct() 4 arg available */ +/* #undef HAVE_GENERIC_IO_ACCT_4ARG */ + +/* GENHD_FL_EXT_DEVT flag is available */ +/* #undef HAVE_GENHD_FL_EXT_DEVT */ + +/* GENHD_FL_NO_PART flag is available */ +/* #undef HAVE_GENHD_FL_NO_PART */ + +/* Define if the GNU gettext() function is already present or preinstalled. */ +/* #undef HAVE_GETTEXT */ + +/* Define to 1 if you have the 'gettid' function. */ +/* #undef HAVE_GETTID */ + +/* iops->get_acl() exists */ +/* #undef HAVE_GET_ACL */ + +/* iops->get_acl() takes rcu */ +/* #undef HAVE_GET_ACL_RCU */ + +/* has iops->get_inode_acl() */ +/* #undef HAVE_GET_INODE_ACL */ + +/* iattr->ia_vfsuid and iattr->ia_vfsgid exist */ +/* #undef HAVE_IATTR_VFSID */ + +/* Define if you have the iconv() function and it works. */ +#define HAVE_ICONV 1 + +/* iops->getattr() takes struct mnt_idmap* */ +/* #undef HAVE_IDMAP_IOPS_GETATTR */ + +/* iops->setattr() takes struct mnt_idmap* */ +/* #undef HAVE_IDMAP_IOPS_SETATTR */ + +/* APIs for idmapped mount are present */ +/* #undef HAVE_IDMAP_MNT_API */ + +/* mnt_idmap does not have user_namespace */ +/* #undef HAVE_IDMAP_NO_USERNS */ + +/* Define if compiler supports -Wimplicit-fallthrough */ +/* #undef HAVE_IMPLICIT_FALLTHROUGH */ + +/* Define if compiler supports -Winfinite-recursion */ +/* #undef HAVE_INFINITE_RECURSION */ + +/* inode_get_atime() exists in linux/fs.h */ +/* #undef HAVE_INODE_GET_ATIME */ + +/* inode_get_ctime() exists in linux/fs.h */ +/* #undef HAVE_INODE_GET_CTIME */ + +/* inode_get_mtime() exists in linux/fs.h */ +/* #undef HAVE_INODE_GET_MTIME */ + +/* inode_owner_or_capable() exists */ +/* #undef HAVE_INODE_OWNER_OR_CAPABLE */ + +/* inode_owner_or_capable() takes mnt_idmap */ +/* #undef HAVE_INODE_OWNER_OR_CAPABLE_IDMAP */ + +/* inode_owner_or_capable() takes user_ns */ +/* #undef HAVE_INODE_OWNER_OR_CAPABLE_USERNS */ + +/* inode_set_atime_to_ts() exists in linux/fs.h */ +/* #undef HAVE_INODE_SET_ATIME_TO_TS */ + +/* inode_set_ctime_to_ts() exists in linux/fs.h */ +/* #undef HAVE_INODE_SET_CTIME_TO_TS */ + +/* inode_set_mtime_to_ts() exists in linux/fs.h */ +/* #undef HAVE_INODE_SET_MTIME_TO_TS */ + +/* timestamp_truncate() exists */ +/* #undef HAVE_INODE_TIMESTAMP_TRUNCATE */ + +/* Define to 1 if you have the header file. */ +#define HAVE_INTTYPES_H 1 + +/* iops->create() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_CREATE_IDMAP */ + +/* iops->create() takes struct user_namespace* */ +/* #undef HAVE_IOPS_CREATE_USERNS */ + +/* iops->mkdir() returns struct dentry* */ +/* #undef HAVE_IOPS_MKDIR_DENTRY */ + +/* iops->mkdir() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_MKDIR_IDMAP */ + +/* iops->mkdir() takes struct user_namespace* */ +/* #undef HAVE_IOPS_MKDIR_USERNS */ + +/* iops->mknod() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_MKNOD_IDMAP */ + +/* iops->mknod() takes struct user_namespace* */ +/* #undef HAVE_IOPS_MKNOD_USERNS */ + +/* iops->permission() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_PERMISSION_IDMAP */ + +/* iops->permission() takes struct user_namespace* */ +/* #undef HAVE_IOPS_PERMISSION_USERNS */ + +/* iops->rename() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_RENAME_IDMAP */ + +/* iops->rename() takes struct user_namespace* */ +/* #undef HAVE_IOPS_RENAME_USERNS */ + +/* iops->symlink() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_SYMLINK_IDMAP */ + +/* iops->symlink() takes struct user_namespace* */ +/* #undef HAVE_IOPS_SYMLINK_USERNS */ + +/* iov_iter_get_pages2() is available */ +/* #undef HAVE_IOV_ITER_GET_PAGES2 */ + +/* iov_iter_type() is available */ +/* #undef HAVE_IOV_ITER_TYPE */ + +/* Define to 1 if you have the 'issetugid' function. */ +#define HAVE_ISSETUGID 1 + +/* iter_iov() is available */ +/* #undef HAVE_ITER_IOV */ + +/* iter_is_ubuf() is available */ +/* #undef HAVE_ITER_IS_UBUF */ + +/* kernel has kernel_fpu_* functions */ +/* #undef HAVE_KERNEL_FPU */ + +/* kernel has asm/fpu/api.h */ +/* #undef HAVE_KERNEL_FPU_API_HEADER */ + +/* kernel fpu internal */ +/* #undef HAVE_KERNEL_FPU_INTERNAL */ + +/* kernel has asm/fpu/internal.h */ +/* #undef HAVE_KERNEL_FPU_INTERNAL_HEADER */ + +/* Define if compiler supports -Winfinite-recursion */ +/* #undef HAVE_KERNEL_INFINITE_RECURSION */ + +/* kernel defines intptr_t */ +/* #undef HAVE_KERNEL_INTPTR_T */ + +/* kernel has kernel_neon_* functions */ +/* #undef HAVE_KERNEL_NEON */ + +/* kernel does stack verification */ +/* #undef HAVE_KERNEL_OBJTOOL */ + +/* kernel has linux/objtool.h */ +/* #undef HAVE_KERNEL_OBJTOOL_HEADER */ + +/* strlcpy() exists */ +/* #undef HAVE_KERNEL_STRLCPY */ + +/* kernel has kmap_local_page */ +/* #undef HAVE_KMAP_LOCAL_PAGE */ + +/* Define if you have [aio] */ +/* #undef HAVE_LIBAIO */ + +/* Define if you have [blkid] */ +/* #undef HAVE_LIBBLKID */ + +/* Define if you have [crypto] */ +#define HAVE_LIBCRYPTO 1 + +/* Define if you have [tirpc] */ +/* #undef HAVE_LIBTIRPC */ + +/* Define if you have [udev] */ +/* #undef HAVE_LIBUDEV */ + +/* Define if you have [unwind] */ +/* #undef HAVE_LIBUNWIND */ + +/* libunwind has unw_get_elf_filename */ +/* #undef HAVE_LIBUNWIND_ELF */ + +/* Define if you have [uuid] */ +/* #undef HAVE_LIBUUID */ + +/* building against unsupported kernel version */ +/* #undef HAVE_LINUX_EXPERIMENTAL */ + +/* makedev() is declared in sys/mkdev.h */ +/* #undef HAVE_MAKEDEV_IN_MKDEV */ + +/* makedev() is declared in sys/sysmacros.h */ +/* #undef HAVE_MAKEDEV_IN_SYSMACROS */ + +/* Noting that make_request_fn() returns blk_qc_t */ +/* #undef HAVE_MAKE_REQUEST_FN_RET_QC */ + +/* Define to 1 if you have the 'mlockall' function. */ +#define HAVE_MLOCKALL 1 + +/* PG_error flag is available */ +/* #undef HAVE_MM_PAGE_FLAG_ERROR */ + +/* page_mapping() is available */ +/* #undef HAVE_MM_PAGE_MAPPING */ + +/* page_size() is available */ +/* #undef HAVE_MM_PAGE_SIZE */ + +/* Define if host toolchain supports MOVBE */ +#define HAVE_MOVBE 1 + +/* folio_wait_bit() exists */ +/* #undef HAVE_PAGEMAP_FOLIO_WAIT_BIT */ + +/* readahead_page() exists */ +/* #undef HAVE_PAGEMAP_READAHEAD_PAGE */ + +/* part_to_dev() exists */ +/* #undef HAVE_PART_TO_DEV */ + +/* iops->getattr() takes a path */ +/* #undef HAVE_PATH_IOPS_GETATTR */ + +/* Define if host toolchain supports PCLMULQDQ */ +#define HAVE_PCLMULQDQ 1 + +/* pin_user_pages_unlocked() is available */ +/* #undef HAVE_PIN_USER_PAGES_UNLOCKED */ + +/* proc_handler ctl_table arg is const */ +/* #undef HAVE_PROC_HANDLER_CTL_TABLE_CONST */ + +/* proc_ops structure exists */ +/* #undef HAVE_PROC_OPS_STRUCT */ + +/* If available, contains the Python version number currently in use. */ +/* #undef HAVE_PYTHON */ + +/* qat is enabled and existed */ +/* #undef HAVE_QAT */ + +/* struct reclaim_state has reclaimed */ +/* #undef HAVE_RECLAIM_STATE_RECLAIMED */ + +/* register_shrinker is vararg */ +/* #undef HAVE_REGISTER_SHRINKER_VARARG */ + +/* register_sysctl_sz exists */ +/* #undef HAVE_REGISTER_SYSCTL_SZ */ + +/* register_sysctl_table exists */ +/* #undef HAVE_REGISTER_SYSCTL_TABLE */ + +/* iops->rename() wants flags */ +/* #undef HAVE_RENAME_WANTS_FLAGS */ + +/* revalidate_disk() is available */ +/* #undef HAVE_REVALIDATE_DISK */ + +/* revalidate_disk_size() is available */ +/* #undef HAVE_REVALIDATE_DISK_SIZE */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SECURITY_PAM_MODULES_H 1 + +/* setattr_prepare() accepts mnt_idmap */ +/* #undef HAVE_SETATTR_PREPARE_IDMAP */ + +/* setattr_prepare() is available, doesn't accept user_namespace */ +/* #undef HAVE_SETATTR_PREPARE_NO_USERNS */ + +/* setattr_prepare() accepts user_namespace */ +/* #undef HAVE_SETATTR_PREPARE_USERNS */ + +/* iops->set_acl() takes 4 args, arg1 is struct mnt_idmap * */ +/* #undef HAVE_SET_ACL_IDMAP_DENTRY */ + +/* iops->set_acl() takes 4 args */ +/* #undef HAVE_SET_ACL_USERNS */ + +/* iops->set_acl() takes 4 args, arg2 is struct dentry * */ +/* #undef HAVE_SET_ACL_USERNS_DENTRY_ARG2 */ + +/* Define if set_default_d_op() is available */ +/* #undef HAVE_SET_DEFAULT_D_OP */ + +/* shrinker_register exists */ +/* #undef HAVE_SHRINKER_REGISTER */ + +/* kernel_siginfo_t exists */ +/* #undef HAVE_SIGINFO */ + +/* sops->free_inode() exists */ +/* #undef HAVE_SOPS_FREE_INODE */ + +#if defined(__amd64__) || defined(__i386__) +/* Define if host toolchain supports SSE */ +#define HAVE_SSE 1 + +/* Define if host toolchain supports SSE2 */ +#define HAVE_SSE2 1 + +/* Define if host toolchain supports SSE3 */ +#define HAVE_SSE3 1 + +/* Define if host toolchain supports SSE4.1 */ +#define HAVE_SSE4_1 1 + +/* Define if host toolchain supports SSE4.2 */ +#define HAVE_SSE4_2 1 + +/* Define if host toolchain supports SSSE3 */ +#define HAVE_SSSE3 1 +#endif + +/* STACK_FRAME_NON_STANDARD is defined */ +/* #undef HAVE_STACK_FRAME_NON_STANDARD */ + +/* STACK_FRAME_NON_STANDARD asm macro is defined */ +/* #undef HAVE_STACK_FRAME_NON_STANDARD_ASM */ + +/* standalone exists */ +/* #undef HAVE_STANDALONE_LINUX_STDARG */ + +/* statx() is available */ +/* #undef HAVE_STATX */ + +/* STATX_MNT_ID is available */ +/* #undef HAVE_STATX_MNT_ID */ + +/* Define to 1 if you have the header file. */ +#define HAVE_STDINT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDIO_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRINGS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if you have the 'strlcat' function. */ +#define HAVE_STRLCAT 1 + +/* Define to 1 if you have the 'strlcpy' function. */ +#define HAVE_STRLCPY 1 + +/* submit_bio is member of struct block_device_operations */ +/* #undef HAVE_SUBMIT_BIO_IN_BLOCK_DEVICE_OPERATIONS */ + +/* have super_block s_shrink */ +/* #undef HAVE_SUPER_BLOCK_S_SHRINK */ + +/* have super_block s_shrink pointer */ +/* #undef HAVE_SUPER_BLOCK_S_SHRINK_PTR */ + +/* have super_block s_wb_err */ +/* #undef HAVE_SUPER_BLOCK_S_WB_ERR */ + +/* sync_blockdev() is declared in include/blkdev.h */ +/* #undef HAVE_SYNC_BLOCKDEV */ + +/* struct kobj_type has default_groups */ +/* #undef HAVE_SYSFS_DEFAULT_GROUPS */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* timer_delete_sync is available */ +/* #undef HAVE_TIMER_DELETE_SYNC */ + +/* i_op->tmpfile() uses old dentry signature */ +/* #undef HAVE_TMPFILE_DENTRY */ + +/* i_op->tmpfile() has mnt_idmap */ +/* #undef HAVE_TMPFILE_IDMAP */ + +/* i_op->tmpfile() has userns */ +/* #undef HAVE_TMPFILE_USERNS */ + +/* totalhigh_pages() exists */ +/* #undef HAVE_TOTALHIGH_PAGES */ + +/* kernel has totalram_pages() */ +/* #undef HAVE_TOTALRAM_PAGES_FUNC */ + +/* Define to 1 if you have the 'udev_device_get_is_initialized' function. */ +/* #undef HAVE_UDEV_DEVICE_GET_IS_INITIALIZED */ + +/* kernel has __kernel_fpu_* functions */ +/* #undef HAVE_UNDERSCORE_KERNEL_FPU */ + +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 + +/* iops->getattr() takes struct user_namespace* */ +/* #undef HAVE_USERNS_IOPS_GETATTR */ + +/* iops->setattr() takes struct user_namespace* */ +/* #undef HAVE_USERNS_IOPS_SETATTR */ + +#ifdef __amd64__ +/* Define if host toolchain supports VAES */ +#define HAVE_VAES 1 +#endif + +/* fops->clone_file_range() is available */ +/* #undef HAVE_VFS_CLONE_FILE_RANGE */ + +/* fops->dedupe_file_range() is available */ +/* #undef HAVE_VFS_DEDUPE_FILE_RANGE */ + +/* filemap_dirty_folio exists */ +/* #undef HAVE_VFS_FILEMAP_DIRTY_FOLIO */ + +/* generic_copy_file_range() is available */ +/* #undef HAVE_VFS_GENERIC_COPY_FILE_RANGE */ + +/* migratepage exists */ +/* #undef HAVE_VFS_MIGRATEPAGE */ + +/* migrate_folio exists */ +/* #undef HAVE_VFS_MIGRATE_FOLIO */ + +/* address_space_operations->readpages exists */ +/* #undef HAVE_VFS_READPAGES */ + +/* read_folio exists */ +/* #undef HAVE_VFS_READ_FOLIO */ + +/* fops->remap_file_range() is available */ +/* #undef HAVE_VFS_REMAP_FILE_RANGE */ + +/* __set_page_dirty_nobuffers exists */ +/* #undef HAVE_VFS_SET_PAGE_DIRTY_NOBUFFERS */ + +/* splice_copy_file_range() is available */ +/* #undef HAVE_VFS_SPLICE_COPY_FILE_RANGE */ + +/* address_space_operations->writepage exists */ +/* #undef HAVE_VFS_WRITEPAGE */ + +/* __vmalloc page flags exists */ +/* #undef HAVE_VMALLOC_PAGE_KERNEL */ + +#ifdef __amd64__ +/* Define if host toolchain supports VPCLMULQDQ */ +#define HAVE_VPCLMULQDQ 1 +#endif + +/* int (*writepage_t)() takes struct folio* */ +/* #undef HAVE_WRITEPAGE_T_FOLIO */ + +/* xattr_handler->get() wants dentry and inode and flags */ +/* #undef HAVE_XATTR_GET_DENTRY_INODE_FLAGS */ + +/* xattr_handler->set() wants both dentry and inode */ +/* #undef HAVE_XATTR_SET_DENTRY_INODE */ + +/* xattr_handler->set() takes mnt_idmap */ +/* #undef HAVE_XATTR_SET_IDMAP */ + +/* xattr_handler->set() takes user_namespace */ +/* #undef HAVE_XATTR_SET_USERNS */ + +/* Define if host toolchain supports XSAVE */ +#define HAVE_XSAVE 1 + +/* Define if host toolchain supports XSAVEOPT */ +#define HAVE_XSAVEOPT 1 + +/* Define if host toolchain supports XSAVES */ +#define HAVE_XSAVES 1 + +/* ZERO_PAGE() is GPL-only */ +/* #undef HAVE_ZERO_PAGE_GPL_ONLY */ + +/* Define if you have [z] */ +#define HAVE_ZLIB 1 + +/* libunwind is llvm libunwind */ +/* #undef IS_LIBUNWIND_LLVM */ + +/* kernel exports FPU functions */ +/* #undef KERNEL_EXPORTS_X86_FPU */ + +/* TBD: fetch(3) support */ +#if 0 +/* whether the chosen libfetch is to be loaded at run-time */ +#define LIBFETCH_DYNAMIC 1 + +/* libfetch is fetch(3) */ +#define LIBFETCH_IS_FETCH 1 + +/* libfetch is libcurl */ +#define LIBFETCH_IS_LIBCURL 0 + +/* soname of chosen libfetch */ +#define LIBFETCH_SONAME "libfetch.so.6" +#endif + +/* Define to the sub-directory where libtool stores uninstalled libraries. */ +#define LT_OBJDIR ".libs/" + +/* make_request_fn() return type */ +/* #undef MAKE_REQUEST_FN_RET */ + +/* using complete_and_exit() instead */ +/* #undef SPL_KTHREAD_COMPLETE_AND_EXIT */ + +/* Defined for legacy compatibility. */ +#define SPL_META_ALIAS ZFS_META_ALIAS + +/* Defined for legacy compatibility. */ +#define SPL_META_RELEASE ZFS_META_RELEASE + +/* Defined for legacy compatibility. */ +#define SPL_META_VERSION ZFS_META_VERSION + +/* pde_data() is PDE_DATA() */ +/* #undef SPL_PDE_DATA */ + +/* Define to 1 if all of the C89 standard headers exist (not just the ones + required in a freestanding environment). This macro is provided for + backward compatibility; new code need not use it. */ +#define SYSTEM_FREEBSD 1 + +/* True if ZFS is to be compiled for a Linux system */ +/* #undef SYSTEM_LINUX */ + +/* Version number of package */ +/* #undef ZFS_DEBUG */ + +/* /dev/zfs minor */ +/* #undef ZFS_DEVICE_MINOR */ + +/* Define the project alias string. */ - #define ZFS_META_ALIAS "zfs-2.4.99-95-FreeBSD_g5605a6d79" ++#define ZFS_META_ALIAS "zfs-2.4.99-113-FreeBSD_g6ae99d269" + +/* Define the project author. */ +#define ZFS_META_AUTHOR "OpenZFS" + +/* Define the project release date. */ +/* #undef ZFS_META_DATA */ + +/* Define the maximum compatible kernel version. */ +#define ZFS_META_KVER_MAX "6.17" + +/* Define the minimum compatible kernel version. */ +#define ZFS_META_KVER_MIN "4.18" + +/* Define the project license. */ +#define ZFS_META_LICENSE "CDDL" + +/* Define the libtool library 'age' version information. */ +/* #undef ZFS_META_LT_AGE */ + +/* Define the libtool library 'current' version information. */ +/* #undef ZFS_META_LT_CURRENT */ + +/* Define the libtool library 'revision' version information. */ +/* #undef ZFS_META_LT_REVISION */ + +/* Define the project name. */ +#define ZFS_META_NAME "zfs" + +/* Define the project release. */ - #define ZFS_META_RELEASE "95-FreeBSD_g5605a6d79" ++#define ZFS_META_RELEASE "113-FreeBSD_g6ae99d269" + +/* Define the project version. */ +#define ZFS_META_VERSION "2.4.99" + +/* count is located in percpu_ref.data */ +/* #undef ZFS_PERCPU_REF_COUNT_IN_DATA */ diff --cc sys/modules/zfs/zfs_gitrev.h index 8a1802f5480b,000000000000..6f568754f61d mode 100644,000000..100644 --- a/sys/modules/zfs/zfs_gitrev.h +++ b/sys/modules/zfs/zfs_gitrev.h @@@ -1,1 -1,0 +1,1 @@@ - #define ZFS_META_GITREV "zfs-2.4.99-95-g5605a6d79" ++#define ZFS_META_GITREV "zfs-2.4.99-113-g6ae99d269" From nobody Mon Oct 20 13:30:21 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cqxBQ1Pl5z6BfKN; Mon, 20 Oct 2025 13:30:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cqxBP6BVsz4Dv3; Mon, 20 Oct 2025 13:30:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760967021; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZN0I32UEYYkyJn+wJKlgCfbwe82FuEKxrWs/vkT8O/E=; b=gh8fdZe7TP0LYC4Zr8ceoUMWw4bK1CkR2OnZKQqH4NefhZfvTHQHSBKjFtDZuxVaUU2srM ZDCwNFqttGKUKj+zBSaNCIkYdw3RaLS2NhvELuOS9ydTSm75y+Ep/kB9i1iAJXduVE5Pba n05yT4HUaxu9GFIaRhcaQf3RfG5zU+rwRMJlGSzpTzESWw3sywX9RWxrz5f2+U11eP6Gw0 VGs5linzWVpWur2HOHPCe0sTUPyv62CGQUVbqGx8KAzIsEMM2E2yAJ3h1yiHkIUM2NDX03 OVkXBTCsssJIoeeg1og6OuzwxOuKy4Z1CuE6eYDarVS+JufKlbWG3WxxZeB/ug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760967021; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZN0I32UEYYkyJn+wJKlgCfbwe82FuEKxrWs/vkT8O/E=; b=WFSwI2EIzjHnlwr+xXJt/KtDBmtZDRhxz2SjD/fZf0Jkmqc4P4I1evrxZVVLTc5YnBJBuE FTMGXjIvQTAd3+p5kemKoUa3f1T46TDZir9nnYe7DDycCnL5Vlcf6zv8c05lnLDVc920My z1lO3dTkFixbNIS+dEdNhxhNrPvLwN5WCWv6bZBc8dM4pbmqQ+6I5KH9uqi5OrMT+LR3eV Ky42P6Mo4btCb5/k0FKsBA2W5oQTcgajgECvzTDehLXV/nxkKtYeQts/l/7TZI7avNJ70i ZpSU2reKgbKw69QVluA/okMcOD8JyuihsPE0dEfSc8Ia7Ip3FAiUEhSuFWG79Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760967021; a=rsa-sha256; cv=none; b=R8pSk+82Qjbxb7C+OrH1OivQ968/sXhkazUjX8yjnK3y3oArFjmg5Mnug7ZXr6zszDtgcU B+wJ8OHgmxWvxQW0MCpnab6XnJ9l58ja/Yrqucy+MwtBOdRAjG45TfAu2qzFjnxzT3m3d5 zWw9hKFy2fDtuXBcuPdoEeuW6TcHnhYly+8BC2xMJKmOmdQN6tOnic/Y/tLIXUybHuFuYR SJpkXkV9T3idt7QBKsaXe36NqX70T+ZPZ9Oo/cs1xcWe/kfE+CqGBQzYsmEaHIEm1IeOSt bwIj+8/7GboJt7/HlCbD4DDHUPBsN1e4704XX1Gh7OhQ7cCG9IRokcByGCmEFg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cqxBP5T6PzXL; Mon, 20 Oct 2025 13:30: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 59KDUL7L031207; Mon, 20 Oct 2025 13:30:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59KDULkG031204; Mon, 20 Oct 2025 13:30:21 GMT (envelope-from git) Date: Mon, 20 Oct 2025 13:30:21 GMT Message-Id: <202510201330.59KDULkG031204@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: b0c64ce0ea51 - main - bsdinstall: Use pkgbase release URL for BETA/RC List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b0c64ce0ea51dc9774ddb972d28a5cfaeb34465d Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=b0c64ce0ea51dc9774ddb972d28a5cfaeb34465d commit b0c64ce0ea51dc9774ddb972d28a5cfaeb34465d Author: Ed Maste AuthorDate: 2025-10-20 12:38:03 +0000 Commit: Ed Maste CommitDate: 2025-10-20 13:28:49 +0000 bsdinstall: Use pkgbase release URL for BETA/RC PR: 290238 Reviewed by: ivy Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D53214 --- usr.sbin/bsdinstall/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/usr.sbin/bsdinstall/Makefile b/usr.sbin/bsdinstall/Makefile index e5bb3197fa05..5d7be97ed7cf 100644 --- a/usr.sbin/bsdinstall/Makefile +++ b/usr.sbin/bsdinstall/Makefile @@ -22,7 +22,8 @@ REVISION?= ${_REVISION} .if ${BRANCH} == CURRENT || ${BRANCH} == STABLE SUBURL= base_latest -.elif ${BRANCH} == RELEASE +.elif ${BRANCH} == RELEASE || ${BRANCH:C/[0-9]+$//} == BETA || \ + ${BRANCH:C/[0-9]+$//} == RC SUBURL= base_release_${REVISION:C/[0-9]+\.//} .else .warning Invalid branch "${BRANCH}" From nobody Mon Oct 20 14:06:11 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cqxzl5Fvyz6CS9X; Mon, 20 Oct 2025 14:06:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cqxzl32Ypz4MN9; Mon, 20 Oct 2025 14:06:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760969171; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pCj5cElTIA/zIAPo/vpkufoFW2DLIcgPAOGRSNySaic=; b=FYfcLL2Em1dqFWcNWPS0RGwgZaR663s/3qKWMUSihvsoqJsCtaHRiVYb1hyX3lZdMhqn5Q kQ7x69BNOBOkb3K9Uqiz06kF1/KP/oCp3R14cPyZIyiss+tppiYUoGxRgsiyyMeh5HH5+P prMWWa6zzW8uAShtfUStCzWL8EyvKh7iTgp2XsnpUKCY1ZI07ublEg77+p+exHFa33nzMv dt4SxmoBZaArHCf+ovqD1xvJfSAU4k3fQVrOxTu85U65qSEkTyeejmpboy3K2vrT/iFrYf XzLu1qVAFwSRzi4T7gcA8st/HMbrv4RhtriNN7VCxUnu4+muHKLlvOrcasOV0g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760969171; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pCj5cElTIA/zIAPo/vpkufoFW2DLIcgPAOGRSNySaic=; b=VRAtHkLljlh5PDIBTlbJtsXQg5ZtQKGhnLwxG/akaQT3wGEBQX5E5yi0ga0dFf7s1MWla8 S8u9E87fd24DxUd51o4sb2+kLJYve9y/+hJn+y3jgovjmMPapBx+BQhLZr2Wk/ar6H6fVq Y40F/JifFfZ4U0dBILzv0QZwHh3V5UvsMwOb6pqhJNYbZ7POLv/f2leHqY2+rYlXJCRxFt pkPjmw+/kFi2zLbEF27yfIBa3exd/iAHxbnB5Fm/btjcljZNqqnWFjmaSuge3n7y3Nvwfs oukIlFdNSuBcsi8NI3aEGQwt8KXNrigToU3+2Zvl+UchvThP+Pg4wa+W6vZhLw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760969171; a=rsa-sha256; cv=none; b=Umi8Ikufyf8uVRmMAsRtaPvZqZG12IJWUhrl+Nc1+0MNW1TS5k+1cWXWqz0NbSUjjfnSOr 1exyxdWMh+k8M4XB+8B/Wvu3B7c41V2WVZhXP4V4l6UyzY60+hCap2pfJf6Qd0jLbtpm2J 4aBzgJyLJ8IZTJ3QDYWKWSPHSjGdyLVPQa4NvW0Nk5yB+Rll5Je72Lo5HmyX6sC35O7yjt 8qMBAobpj8s5hFHPRaiaurJqMT79yc5xU+vY0a0nzJyhaRAZlV+Ds3/kzrBEGcY6iuUDjY gNfzryjehyL7uSk65QSUSuHduWiYjbvF/4erjLPH9IpFoTpqRHPOez8AII2L7g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cqxzl2dv9z1RS; Mon, 20 Oct 2025 14:06: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 59KE6BUZ096685; Mon, 20 Oct 2025 14:06:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59KE6BIE096682; Mon, 20 Oct 2025 14:06:11 GMT (envelope-from git) Date: Mon, 20 Oct 2025 14:06:11 GMT Message-Id: <202510201406.59KE6BIE096682@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Motin Subject: git: a2838e818cfe - main - ehci(4): Add ID for Realtek RTL811x USB 2.0 controller List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mav X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a2838e818cfe5b150725776cc9ab45bb8f65c390 Auto-Submitted: auto-generated The branch main has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=a2838e818cfe5b150725776cc9ab45bb8f65c390 commit a2838e818cfe5b150725776cc9ab45bb8f65c390 Author: Dmitry Luhtionov AuthorDate: 2025-10-20 14:05:05 +0000 Commit: Alexander Motin CommitDate: 2025-10-20 14:05:05 +0000 ehci(4): Add ID for Realtek RTL811x USB 2.0 controller --- sys/dev/usb/controller/ehci_pci.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sys/dev/usb/controller/ehci_pci.c b/sys/dev/usb/controller/ehci_pci.c index d7298ab89df7..9550002e3b70 100644 --- a/sys/dev/usb/controller/ehci_pci.c +++ b/sys/dev/usb/controller/ehci_pci.c @@ -88,6 +88,7 @@ #define PCI_EHCI_VENDORID_NEC 0x1033 #define PCI_EHCI_VENDORID_OPTI 0x1045 #define PCI_EHCI_VENDORID_PHILIPS 0x1131 +#define PCI_EHCI_VENDORID_REALTEK 0x10ec #define PCI_EHCI_VENDORID_SIS 0x1039 #define PCI_EHCI_VENDORID_NVIDIA 0x12D2 #define PCI_EHCI_VENDORID_NVIDIA2 0x10DE @@ -218,6 +219,9 @@ ehci_pci_match(device_t self) case 0x15621131: return "Philips ISP156x USB 2.0 controller"; + case 0x816d10ec: + return ("Realtek RTL811x USB 2.0 controller"); + case 0x70021039: return "SiS 968 USB 2.0 controller"; @@ -402,6 +406,9 @@ ehci_pci_attach(device_t self) case PCI_EHCI_VENDORID_PHILIPS: sprintf(sc->sc_vendor, "Philips"); break; + case PCI_EHCI_VENDORID_REALTEK: + sprintf(sc->sc_vendor, "Realtek"); + break; case PCI_EHCI_VENDORID_SIS: sprintf(sc->sc_vendor, "SiS"); break; From nobody Mon Oct 20 14:30:28 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cqyWm50Tvz6CVtY; Mon, 20 Oct 2025 14:30:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cqyWm4NpNz3Cj6; Mon, 20 Oct 2025 14:30:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760970628; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=evYNlDkamZTVLSArhV+aXjUzeTzoauj/jdKIXfjj+Rk=; b=avA+YXQ0x85ZmkH9j4sawhyveuSSYd+9hVYOvZfQp1yo/qzDrWF7ef/atgxEmx4Mn2JsST 9jjDu4Sh/KPxNw9yrgVFEHMvSZ86FD6bRVce/qj2uGfg8hJKumJVbuWYr+0htbMvF+t9NR Pr9aUwNjDLEMYrq+A7Q5xl6YJ1zC2yfKLLeYuIeNdFeW/Zl9qHd6V7vhwecGY80lp5F18T hvPqk7OA/i0fepXAWb4WiPON8v570XHjQqZn/wSHFG+L+Ku1L1crpXRkWKPMJ4jbHdEWfS x9KkNv8JnWXg8SAIxmJwZ9/jezMJu+apT2Iw7LQCahqy3HhWwB6p7rybRwpYpA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760970628; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=evYNlDkamZTVLSArhV+aXjUzeTzoauj/jdKIXfjj+Rk=; b=Knyshilk1vhWPCJY/wOuOcoGEfnGvtkg0nC2u+62Ch4RL6ci4WhRBg37SSFlFDsjUyhpSD JK7JQBLCKXtwGP6G4vAas6rhFP9MXH0KhG8dtvaIS4jy4XmjjcqyP1xDS0p0x1bikMguOb WugD/N0mjTzCi8k9eBV1SiUnar+W4CZEofGIZGxftCfjAXjZcNKYmRH9MwjdqdLD5cYtnw feds2rhSBfU2+Uc3S9mEGbO4YpFtFzkiw0SYW0RflJstpfWfBp0vWsvjeiMdIOvU0W0nUb VCE0shzARuHcXkHuZqMy+TvkVhsgznYRG5uJKYVXVyHJQu844TfNZ4GxucBLjw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760970628; a=rsa-sha256; cv=none; b=mOfU9UD+xxvvua8AblMNJ2u0WyTv1kPNsPjY4wMXklUcqZQF2p5cJkoQ+b9gUAdj5i5ttR B32mjt9f2/Bf9HqKxryHHUi8cNemmu0CytzSb8EjNQQkdij/MD190Juu7KHzSkc/lKvUQo 1RIracUHGxzR2Smrz4HaupMS71fsJe6Xa+Dfk8rnaGf4Kd4rrgta0nNNdlIPBCnj7p6n6v 4PzjnT29Gxv0nKBx/nApuzQ3bkhRjKUHWrOWf75ij/X5K0LeISWFlLzovMUX0aC1/NWzaA Ipy0jWEn9C19mMvASteQqhwj4AfNYHMLC+MRODtIMH3Wsjs8COroYX/ZFGP9iw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cqyWm3WJGz1hc; Mon, 20 Oct 2025 14:30: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 59KEUSbs043356; Mon, 20 Oct 2025 14:30:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59KEUSVJ043353; Mon, 20 Oct 2025 14:30:28 GMT (envelope-from git) Date: Mon, 20 Oct 2025 14:30:28 GMT Message-Id: <202510201430.59KEUSVJ043353@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: 4ee0ddae1dab - main - sockstat: fix column length for PROTO List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4ee0ddae1dab05dd8e3f273d861043c3e2919f23 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=4ee0ddae1dab05dd8e3f273d861043c3e2919f23 commit 4ee0ddae1dab05dd8e3f273d861043c3e2919f23 Author: Michael Tuexen AuthorDate: 2025-10-20 14:26:52 +0000 Commit: Michael Tuexen CommitDate: 2025-10-20 14:26:52 +0000 sockstat: fix column length for PROTO The computation of the length was not taking into account that IPv6 endpoints, which are not IPv6 only, have a suffix of 46. For UDP and TCP this bug was not relevant, since tcp46 and udp46 has the same length as PROTO, but sctp46 is longer. Upcoming udplite support will also be affected. Reviewed by: asomers MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D53212 --- usr.bin/sockstat/main.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/usr.bin/sockstat/main.c b/usr.bin/sockstat/main.c index d1ea6b1bc958..abb73acafc2f 100644 --- a/usr.bin/sockstat/main.c +++ b/usr.bin/sockstat/main.c @@ -1196,7 +1196,9 @@ calculate_sock_column_widths(struct col_widths *cw, struct sock *s) first = true; len = strlen(s->protoname); - if (s->vflag & (INP_IPV4 | INP_IPV6)) + if (s->vflag & INP_IPV4) + len += 1; + if (s->vflag & INP_IPV6) len += 1; cw->proto = MAX(cw->proto, len); From nobody Mon Oct 20 14:33:55 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cqybm6fmFz6CWCB; Mon, 20 Oct 2025 14:33:56 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cqybm6BBCz3DLN; Mon, 20 Oct 2025 14:33:56 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760970836; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=DNsBe0BYS6GmfGCDI+L2Tj1p00b1++UDPPFz5LexMtA=; b=s0mPPD5ODum+azbZT+emeGGph/0tG12br604RY0e90jfq67TEndUkZ9hw7fPYsDKWTqhDr X6mFxS2KsyCm2WajLKJ/6MS8Yfx9xXO8uP3NRgNo07s/boETjogGFIln33zPkUz7byM9FZ kzJy/WeWwgELHzDGOvU6HAEtaNERtpbkQO7TQ8sde2gtHN6uOyq4/wCUcQMWB5vnxkEseO ea9pa479dPPFlimcerM+Vj72W1U5ARHf8rnOBeOJg6O3Qd9IWbRAY0GhRkcgy+BuagUm80 f4BabpfSFdO/m0rNLafI3485D8Bxcnqo1lFWMGs8zXBBvFYZ3rnvBcuPOonfew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760970836; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=DNsBe0BYS6GmfGCDI+L2Tj1p00b1++UDPPFz5LexMtA=; b=fbDlTSmodTfmrnM/0nORAlyWkUerZIaMtglujYqqbOFzC/p17rbgH0frZG9J7hg8Hlp1li YeFi8g8/El94O4TujvoqFglitCOYop9bmsATaLDp8Cp2Ob1LV6PguSiQgDYIUAl/jdRxTc vy9Mo4eD1S1EoIk1T1osYOt5VKuGjoh0ZF5fD99jYcRQdcLO9DiTKlbRw22mvaOKck1T2k xYDYf5U0fIUQMUsOtIQ74k+n2C2oVhiG0zqsJ4MP5qf7nNZEnxrMJ3gujT5S3E0bqHvskn 3IvCLdqLK00a0bku/PRBJ1FlZ1WgIPvgFlAhgQIiL+p63UbtBq5AemLE1MM88w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760970836; a=rsa-sha256; cv=none; b=XS7f0PPxLdSg75EIvg27/33p66POLgjNdLmST1Z67JVnzqPyD2OuPHSyeuD/yQj3dG71Nu YOsFQ5H6NmdxuPr7Z/Lusqel39chItnm2zquFSfOAGQf7wKzVNGgraBpdIXRVyq5zzFGan tCL+xF+ghNfDZQiJdCAfdFk6L8seDbwfRv9awHKg+aIEs7T6OBT06dOeFbZa++ufMM9PUM i1ykV0xlXO4HxAZyvLSDgVXeDZE9U+WQNvuszHZMeKy8TUiRJsbDiojDIN2g8Ln/APyWVp 3VfXwCk3Dfx/yfs3fNZfH8G46idaKrUUoI8XE4hk3EZ8YfyOIXP5NUEICw8x6g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from [IPV6:2601:5c0:4202:5670:ecba:d7d9:9ea9:ce3c] (unknown [IPv6:2601:5c0:4202:5670:ecba:d7d9:9ea9:ce3c]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id 4cqybm46rzz176p; Mon, 20 Oct 2025 14:33:56 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: <228220a0-c819-4c51-92d3-5357e925c81d@FreeBSD.org> Date: Mon, 20 Oct 2025 10:33:55 -0400 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 74a6bb524e5b - main - Makefile: Don't allow install{world,kernel} with pkgbase Content-Language: en-US To: Lexi Winter , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202510171914.59HJE0uo036247@gitrepo.freebsd.org> From: John Baldwin In-Reply-To: <202510171914.59HJE0uo036247@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 10/17/25 15:14, Lexi Winter wrote: > The branch main has been updated by ivy: > > URL: https://cgit.FreeBSD.org/src/commit/?id=74a6bb524e5b9ad654a9acc5da5c195f406717b5 > > commit 74a6bb524e5b9ad654a9acc5da5c195f406717b5 > Author: Lexi Winter > AuthorDate: 2025-10-17 19:06:17 +0000 > Commit: Lexi Winter > CommitDate: 2025-10-17 19:13:13 +0000 > > Makefile: Don't allow install{world,kernel} with pkgbase > > Using these targets on a pkgbase system will cause the installed system > to become out of sync with the package database, which is almost certain > to cause issues the next time pkg(8) is used. > > To prevent users doing this accidentally, disallow install* if we detect > that FreeBSD-runtime is installed in the target. The check can be > overridden with DESTDIR=/ for users who are sure they want to do this. > > MFC after: 3 days > Reviewed by: emaste > Sponsored by: https://www.patreon.com/bsdivy > Differential Revision: https://reviews.freebsd.org/D52879 Can we document how users who want to build from source can do so from a new installation that uses pkgbase? I guess it is something like: - pkg install sources if not already (or git clone the right branch/tag) - etcupdate bootstrap - (clearly can't just use pkg delete with a glob, so need something else) -- John Baldwin From nobody Mon Oct 20 14:41:49 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cqyn43vN5z6CWxG; Mon, 20 Oct 2025 14:42:00 +0000 (UTC) (envelope-from ivy@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cqyn43QYGz3FQJ; Mon, 20 Oct 2025 14:42:00 +0000 (UTC) (envelope-from ivy@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760971320; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=+jZkHjz6bm2ql6JnlIFhT+OFMEfDQpnxyhMcTp+jjVk=; b=u6zg4GvpPo/LbNDDvhCtX9LCRhRqBp/O4AW1deZhUSsKOi+oBZuQRWEwDj8JAuMuIwyQCF aNkEVlmhvEQphUZBTw1nPq6gcYnGIdRoNkJiS7E2EWAz47sYZ5+zJyltzEh5E2fyLF8RAg QoCGdQyNEkH6VvoMRzB3j7UJtj3psBvlmj91q/MG8Oz5KKvIvtc54RpYyzEKpLXysUdYxU hqipV6Lrrwa5eVvhOQFLNgp8GRgEEuOvyzc8+OI/H4H7QIzyYldfYIyF+m30q95QRXQQjp wbyP+PFRaBrWEyRWeOLcfqXc9eLHbztd9dA3Jb+KFAScre1CqAyc43P9Y7sKuA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760971320; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=+jZkHjz6bm2ql6JnlIFhT+OFMEfDQpnxyhMcTp+jjVk=; b=D+H0HoUbbJ74juLMfobDMoAIpr+Ybh9/1gSu7oLnNUzH7NXPIPmIp+xOjvfST07yXFi0z4 wdpirE2mUFdGJ/QxE42UUcSsgTQ09XwLcStJ6PuiOoAcx4UOV4Rgfeo4DAKnYeIWJLVo4V +5hRD23udgShu3K5mDYCk28WebyHqynYEiVa88ud1ausNdtatESsnquBdqArul0VPeVAiK SFK3u1xTnTLOhccpJwyI7xcmHEuiSp+aJjDHl1XAneszCd/9EbXoLSUCPj6h6oMK8DwJwV Fh+cjAl00nWWKy2dGi9jtP/l4bmRkUjbQkU+1k3LbPqJfcgR22rIGcdK+6utMg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760971320; a=rsa-sha256; cv=none; b=tsPylvdZBG4d5MaxjaTLW8E8NrYNHxuAdadf88RLjgQkwQz3UPNRaKqVYEXbh2pPjdIwye zfOe80068fnfgkcnCrgayOT+C3J3e+gaWfqoVrLkcP1J+V03CdlFHs07NsuzzP3TU/uCuU NYI1tvsO3KRJ3Yrgt+fJ6biaI79SNyuSaiDebDGbBCPSjNMk9XxktHUGKTPlPDzXabUzF4 /x8fn2NQa+YstJssaX0SPf22jf2+wXgrc55PlCRkeRhopT7HHHWBMfw/gpCDlreVolQepJ tv04faXTx3sNAQGMnBs00hnWXy51ZC0FW5nfOztDpg1mCRzQk1MYSlodF8lrFg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from amaryllis.le-fay.org (amaryllis.le-fay.org [IPv6:2a00:1098:6b:400::9]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: ivy/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4cqyn36jlMz176q; Mon, 20 Oct 2025 14:41:59 +0000 (UTC) (envelope-from ivy@freebsd.org) Date: Mon, 20 Oct 2025 15:41:49 +0100 From: Lexi Winter To: John Baldwin Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 74a6bb524e5b - main - Makefile: Don't allow install{world,kernel} with pkgbase Message-ID: Mail-Followup-To: John Baldwin , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org References: <202510171914.59HJE0uo036247@gitrepo.freebsd.org> <228220a0-c819-4c51-92d3-5357e925c81d@FreeBSD.org> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="7mOlDylaQmYhxJXx" Content-Disposition: inline In-Reply-To: <228220a0-c819-4c51-92d3-5357e925c81d@FreeBSD.org> --7mOlDylaQmYhxJXx Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable John Baldwin wrote in <228220a0-c819-4c51-92d3-5357e925c81d@FreeBSD.org>: > On 10/17/25 15:14, Lexi Winter wrote: > > Makefile: Don't allow install{world,kernel} with pkgbase >=20 > Can we document how users who want to build from source can do so from a = new installation > that uses pkgbase? I guess it is something like: >=20 > - pkg install sources if not already (or git clone the right branch/tag) > - etcupdate bootstrap > - (clearly can't just use pkg delete with a gl= ob, so need > something else) this should eventually be in the Handbook. i'm not sure what the current state of that documentation is right now, but i know there are at least some important bits missing, probably including this. for 15.0, you should simply not use pkgbase to install the new system, since dists are still supported. if you *have* to use pkgbase, e.g. you're using media that doesn't include dist sets and can't do an online installation, then you can delete /var/db/pkg immediately after booting into the new system, before installing any ports. the system will then be more-or-less identical to one installed from dist sets, so you can follow the usual instructions for updating from source. for 16.0, the plan is to remove support for dist sets from the release media[0], so we'll probably want a way to do this automatically in the installer. that's TBD, but i'm planning on doing some work on this part of the release media once 15.0-RELEASE is out. (right now, we want to minimise differences between main and releng/15.0 for release.) [0] dist sets will still be supported for downstream consumers, but they won't be an installation option for FreeBSD. --7mOlDylaQmYhxJXx Content-Type: application/pgp-signature; name=signature.asc -----BEGIN PGP SIGNATURE----- iHUEABYKAB0WIQSyjTg96lp3RifySyn1nT63mIK/YAUCaPZKKgAKCRD1nT63mIK/ YFYpAQDtqQn7dhFKx8q96T7L1rx/+oZ6QLPTwc5fxv7XkW0otwEArJPWhqEJEZH2 GWFuRJ0quU9dM7PAJOtOameNnUm7IQ0= =SI7i -----END PGP SIGNATURE----- --7mOlDylaQmYhxJXx-- From nobody Mon Oct 20 14:59:36 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cqz9h1SX4z6CYY6 for ; Mon, 20 Oct 2025 14:59:52 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-pj1-x102b.google.com (mail-pj1-x102b.google.com [IPv6:2607:f8b0:4864:20::102b]) (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 4cqz9g2wK3z3GWJ for ; Mon, 20 Oct 2025 14:59:51 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20230601.gappssmtp.com header.s=20230601 header.b=LhUCcuqC; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2607:f8b0:4864:20::102b) smtp.mailfrom=wlosh@bsdimp.com Received: by mail-pj1-x102b.google.com with SMTP id 98e67ed59e1d1-33067909400so3401706a91.2 for ; Mon, 20 Oct 2025 07:59:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1760972388; x=1761577188; darn=freebsd.org; h=to:subject:message-id:date:from:in-reply-to:references:mime-version :from:to:cc:subject:date:message-id:reply-to; bh=UqG0SavFajylZ/ofWN/tOTtrwbNkON+gqs759iT1I1o=; b=LhUCcuqCNNxzNRzpx0YxrH5AcBBAEiwOWLqeJjGEXxLo/gf/xUixyjAvNrX5jd6xvv WAjBRm+ctfFJtpibYORIZHvQ2QA8R8XRAFJxQ3onZi3ArLuHd1mbvE5UEUtGR+SJW8pR GZkzEN5fTAyLwu9Xv7s3VDadzTdmRgDO2ok8b4hJe3BKC1v5Q0jlJ19/BULw+rAosMmd 7gE+tDqo7s2QXMS//NJACUdVMb/W5iLBL+lxDxEf21L9zcVt9WL4SUsgffahYZ15ktty izLUGuNQpCXkqHxUKu4Aq62TwM8tBUHBsN9qqF1rVGR1Pwm4qquAc5Tl/0VKqaw/sqL6 OLng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760972388; x=1761577188; h=to:subject:message-id:date:from:in-reply-to:references:mime-version :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=UqG0SavFajylZ/ofWN/tOTtrwbNkON+gqs759iT1I1o=; b=r2cuBMAw4MIQlWvx7Cl4s7BRENyesLzVpJVU42/GV+K+ZsPi40JK+lLty4tEgwLcz8 mvF4VbX3ltLrDILcYMiKh8rfBAlwDOF71D59FrMY9LL6ymB5oLRyStU61/LJt3/blQwm gryJJrJrq/gkW3g7vReXTCGfbOT4DtKC5Yi0dxe+ugOnJqAOESlpUGsxtebDX+46LjGD h+nJjpMSCDsNH69yLyRxobvQKUpZE5mWINErIpmzAJ83V3aJPbvptLw6IpFCKi4XDVZJ 15isoebY52jC2ALK5L+z/XW6U5r5NaxwOBJOLYQV1RqmTVyLpzC3g2hyl2zZryRTzAd7 iyYA== X-Forwarded-Encrypted: i=1; AJvYcCXXkzKcHqAvMNXpFDoMKI9fmmiVr/bq7CK4h2Ck/oUgErGJHbtwDj/HizzNEVyIKWOTmX+Br+4oLTUkK2mTp7Adze19jw==@freebsd.org X-Gm-Message-State: AOJu0Ywh9iveIGSrDXknaesW/6XCsInuLHlvpPM7IQnBhQahOKOI4Ayk 7fEiQQZB8tT6sA9tIJzwQh0SgppJHMKzYbeBXafiQcJnao1eqbDVURxs66gAhj7Q2e1d+SlOmDH 9O5SW55ixsQwxi1/0lJ2FroAV1DQTjIhdv/JFh4GryTkJ8p/fachd X-Gm-Gg: ASbGncthHrP1CyifVK0JYvoj6WwF7zvr8OsMaxgnAi5ZMZCmlVUyyIcywZbd3zRCaub Gau0Bk0qtfTzw0hIyj5L8DBEIsiB7enLZl9BcmsufR4NUc8FGiqK16xc55GXBCVybhKIXIJtiQY KXX78IRy0YYYtX3GeoK2ewmHI9DU2VLyvw1fwbcoNassfm+knsif8SFVJJa8b6iFZcrTrdqd5vO Sm8AfjmAJASlaPrju9x3owucE7n0rejgV3U1BWe5SFsAh+/S+gMIxHh7STB1nWxT6ymDuEqMuWU 8oUuvWd4nLuAksjS0uc= X-Google-Smtp-Source: AGHT+IEvbbnIix7P8hgRVE4bQVmzqXE7M6uJ5ibpur2cQCkLjYbwG1AHP5YDybdlVCgv7BbcOZqVCPvjJflGJkX/lus= X-Received: by 2002:a17:90b:4c8d:b0:339:9a71:efd8 with SMTP id 98e67ed59e1d1-33bcf955a5emr16178480a91.37.1760972388312; Mon, 20 Oct 2025 07:59:48 -0700 (PDT) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 References: <202510171914.59HJE0uo036247@gitrepo.freebsd.org> <228220a0-c819-4c51-92d3-5357e925c81d@FreeBSD.org> In-Reply-To: From: Warner Losh Date: Mon, 20 Oct 2025 08:59:36 -0600 X-Gm-Features: AS18NWCGoOtByFnQ9tLVIvZR8OqpzxVRIuy3zZHHAk_TLb3tL1XbxBr-EOtizoM Message-ID: Subject: Re: git: 74a6bb524e5b - main - Makefile: Don't allow install{world,kernel} with pkgbase To: John Baldwin , src-committers , "" , "" Content-Type: multipart/alternative; boundary="000000000000aa3aa80641985598" X-Spamd-Bar: -- X-Spamd-Result: default: False [-3.00 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; FORGED_SENDER(0.30)[imp@bsdimp.com,wlosh@bsdimp.com]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20230601.gappssmtp.com:s=20230601]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; RCVD_COUNT_ONE(0.00)[1]; MIME_TRACE(0.00)[0:+,1:+,2:~]; ARC_NA(0.00)[]; MISSING_XM_UA(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::102b:from]; R_SPF_NA(0.00)[no SPF record]; DMARC_NA(0.00)[bsdimp.com]; RCVD_TLS_LAST(0.00)[]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; TO_MATCH_ENVRCPT_SOME(0.00)[]; TO_DN_ALL(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[dev-commits-src-main@freebsd.org]; MLMMJ_DEST(0.00)[dev-commits-src-main@freebsd.org]; DKIM_TRACE(0.00)[bsdimp-com.20230601.gappssmtp.com:+] X-Rspamd-Queue-Id: 4cqz9g2wK3z3GWJ --000000000000aa3aa80641985598 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Mon, Oct 20, 2025, 8:42=E2=80=AFAM Lexi Winter wrote: > John Baldwin wrote in <228220a0-c819-4c51-92d3-5357e925c81d@FreeBSD.org>: > > On 10/17/25 15:14, Lexi Winter wrote: > > > Makefile: Don't allow install{world,kernel} with pkgbase > > > > Can we document how users who want to build from source can do so from = a > new installation > > that uses pkgbase? I guess it is something like: > > > > - pkg install sources if not already (or git clone the right branch/tag= ) > > - etcupdate bootstrap > > - (clearly can't just use pkg delete with a > glob, so need > > something else) > > this should eventually be in the Handbook. Install* should eventually just do the right thing like ports: stage the packages, make the packages and the install from the packages. 16 time frame, though. Warner i'm not sure what the current > state of that documentation is right now, but i know there are at least > some important bits missing, probably including this. > > for 15.0, you should simply not use pkgbase to install the new system, > since dists are still supported. if you *have* to use pkgbase, e.g. > you're using media that doesn't include dist sets and can't do an online > installation, then you can delete /var/db/pkg immediately after booting > into the new system, before installing any ports. the system will then > be more-or-less identical to one installed from dist sets, so you can > follow the usual instructions for updating from source. > > for 16.0, the plan is to remove support for dist sets from the release > media[0], so we'll probably want a way to do this automatically in the > installer. that's TBD, but i'm planning on doing some work on this part > of the release media once 15.0-RELEASE is out. (right now, we want to > minimise differences between main and releng/15.0 for release.) > > [0] dist sets will still be supported for downstream consumers, but they > won't be an installation option for FreeBSD. > --000000000000aa3aa80641985598 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


=
i'm not sure what the current
state of that documentation is right now, but i know there are at least
some important bits missing, probably including this.

for 15.0, you should simply not use pkgbase to install the new system,
since dists are still supported.=C2=A0 if you *have* to use pkgbase, e.g. you're using media that doesn't include dist sets and can't do = an online
installation, then you can delete /var/db/pkg immediately after booting
into the new system, before installing any ports.=C2=A0 the system will the= n
be more-or-less identical to one installed from dist sets, so you can
follow the usual instructions for updating from source.

for 16.0, the plan is to remove support for dist sets from the release
media[0], so we'll probably want a way to do this automatically in the<= br> installer.=C2=A0 that's TBD, but i'm planning on doing some work on= this part
of the release media once 15.0-RELEASE is out.=C2=A0 (right now, we want to=
minimise differences between main and releng/15.0 for release.)

[0] dist sets will still be supported for downstream consumers, but they won't be an installation option for FreeBSD.
--000000000000aa3aa80641985598-- From nobody Mon Oct 20 15:09:20 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cqzNr39xTz6CZQW for ; Mon, 20 Oct 2025 15:09:32 +0000 (UTC) (envelope-from shawn.webb@hardenedbsd.org) Received: from mail-io1-xd2c.google.com (mail-io1-xd2c.google.com [IPv6:2607:f8b0:4864:20::d2c]) (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 4cqzNq6lZxz3HS0 for ; Mon, 20 Oct 2025 15:09:26 +0000 (UTC) (envelope-from shawn.webb@hardenedbsd.org) Authentication-Results: mx1.freebsd.org; none Received: by mail-io1-xd2c.google.com with SMTP id ca18e2360f4ac-940e06b4184so55522739f.1 for ; Mon, 20 Oct 2025 08:09:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hardenedbsd.org; s=google; t=1760972961; x=1761577761; darn=freebsd.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=zzQ+DY+WFYmmWiHbkXwabNiiZQEaVVP5YjvSmbY5xIc=; b=PAqvsp875h+13JizAQ9zmXjwgF4ab8oNYLsIuTi7dCgN4HQ+TZZWUa2WFYteq2mJl8 hw/yhu3VETaW057WyhVlN/QJ9/6SRZTika8VjsV0n45IFW5emUTyOsU1CVur1lofzbfL oVhqEnyefqd8AxxEu7DodngvnS6ujhU4dVoFI4oGPdTp7b52pw9MFpdBWhJQRhUz6tG6 7xrqIslTxzBXRifkKoWwYrLL3KRaJ0bKfyRMVpxuHYoUYeA0+KW/fIG8v08QPqnm7cQ+ 6CPBdkHqxCEBX6MOVGN6bkUY+X3BhapTzudgt6BYHgLqccU59IQk36eJRmDsX0csq413 MZiQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760972961; x=1761577761; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=zzQ+DY+WFYmmWiHbkXwabNiiZQEaVVP5YjvSmbY5xIc=; b=He8cMFY3+cVPFy4Z6Se/+xmCpVMLKjElNnTGFgqJtfahRqXNjKJ76SxUhVTMfhzzmy 80kSldARUlHU6GAE4jcRoFGi6hGIhisedjtAtqCXu9IP1pu2cr+zsQc1cVxBbUYEqVoS kD22fW95tZPw27050uUTlTmhiRUEGX/HlvazyUMKcUrM8QPti01B5wkxxRxGdnsOrBiI noLUhpCvAKoWAjFH7G+ZRuR4IzMrXxU7DS6eB/tER+HpP9gZzVBPfaeqoJxRJF7kAcNc M3YSoSiDYs2h2BnDLHNgUl2V6EzERt0HYeK9LUxZV16UWFyBEH2hmQ7UA/81lMFHjM1z n3kQ== X-Forwarded-Encrypted: i=1; AJvYcCXlvomIYQ9VXITXThhjeTk9wxz32H58s+bmw+NvWXhgZzGRi3tIib6jWjWW/Cdyau3Y6aKTi/wvQuTm7gZ5tRF2W/pCYw==@freebsd.org X-Gm-Message-State: AOJu0YxhpuFQDimcw+aeeLzP3biS8rQ69G8sVgYBg15lkSsu1GYSlDvn 2z3vNb7pBoIJZ7CuQAIZD2eNFW4qgaYesTMXajx9HDhfv88NDam1Qx+ihdwCHMas+IYnVZ0qyAv MUmHAmS4= X-Gm-Gg: ASbGncttTf0GoI3n7vdDqDo9ib1X6UVBz+wWTmk/Qu59pawIQurzgystD+gcdCAbkDW cFZ13ak23EOAWZZ82PXYqSbmRvpWr5uux91/BjZ3ppuyNQJGfA8KmHa5rvIkPouTGPoZXCAA/nN 91+t8/yRAFGVaeTcSEmFx6hj3PFtYZ84LiQuYuOcTTcdiqqU3kSQA6PO/+JktJTVn16zwrzdobl B6zvw5tRVSWew7aalsw4qcXbhjfqlSZL+y+6UIXUvKfDqbLINXh4/dPjaHr9taxwLdRGQkkpU/j gCv9njGZWPqFOfadYp3Yyzn9EtaD2PgBmWL9JZFm2Hedw6zYLph2g52zd9wbDQFa/P58bUekTWD NvZxFm28x/ZrLtKBB4L9WtOU/bHTV8J217sdMa9X6/rt5oF/h74qQpzmBsZWps5vCgMt5 X-Google-Smtp-Source: AGHT+IGsrSnyob95QtrNSSFyr41nhno7Lzhwp05xWbB+Fg2g0nwqOsFpAOCQ4ogrqzPZlukaPKx41g== X-Received: by 2002:a05:6e02:188b:b0:430:afe4:6a4b with SMTP id e9e14a558f8ab-430c5294d91mr195036295ab.19.1760972961060; Mon, 20 Oct 2025 08:09:21 -0700 (PDT) Received: from mutt-hbsd ([2001:470:4001:1::95]) by smtp.gmail.com with ESMTPSA id 8926c6da1cb9f-5a8a9795b62sm2937868173.60.2025.10.20.08.09.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Oct 2025 08:09:20 -0700 (PDT) Date: Mon, 20 Oct 2025 15:09:20 +0000 From: Shawn Webb To: Warner Losh Cc: John Baldwin , src-committers , "" , "" Subject: Re: git: 74a6bb524e5b - main - Makefile: Don't allow install{world,kernel} with pkgbase Message-ID: X-Operating-System: FreeBSD mutt-hbsd 14.3-STABLE-HBSD FreeBSD 14.3-STABLE-HBSD HARDENEDBSD-14-STABLE amd64 X-PGP-Key: https://git.hardenedbsd.org/hardenedbsd/pubkeys/-/blob/master/Shawn_Webb/03A4CBEBB82EA5A67D9F3853FF2E67A277F8E1FA.pub.asc References: <202510171914.59HJE0uo036247@gitrepo.freebsd.org> <228220a0-c819-4c51-92d3-5357e925c81d@FreeBSD.org> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="ivtx2jzqxojhfcre" Content-Disposition: inline In-Reply-To: X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4cqzNq6lZxz3HS0 --ivtx2jzqxojhfcre Content-Type: text/plain; protected-headers=v1; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Subject: Re: git: 74a6bb524e5b - main - Makefile: Don't allow install{world,kernel} with pkgbase MIME-Version: 1.0 On Mon, Oct 20, 2025 at 08:59:36AM -0600, Warner Losh wrote: > On Mon, Oct 20, 2025, 8:42=E2=80=AFAM Lexi Winter wrote: >=20 > > John Baldwin wrote in <228220a0-c819-4c51-92d3-5357e925c81d@FreeBSD.org= >: > > > On 10/17/25 15:14, Lexi Winter wrote: > > > > Makefile: Don't allow install{world,kernel} with pkgbase > > > > > > Can we document how users who want to build from source can do so fro= m a > > new installation > > > that uses pkgbase? I guess it is something like: > > > > > > - pkg install sources if not already (or git clone the right branch/t= ag) > > > - etcupdate bootstrap > > > - (clearly can't just use pkg delete with a > > glob, so need > > > something else) > > > > this should eventually be in the Handbook. >=20 >=20 > Install* should eventually just do the right thing like ports: stage the > packages, make the packages and the install from the packages. 16 time > frame, though. Agreed with Warner here. If pkgbase is being used, it seems logical that installworld/installkernel would create a new (or update) pkgbase repo. Otherwise, I can imagine a sceneario for HardenedBSD users specifically who have used pkgbase in the past, but now wish to do a src-based update. I feel like I myself am going to be answering an unending stream of "why doesn't install{kernel,world} work on HardenedBSD like it has always in the past?" I'm somewhat thinking of reverting this commit until install{kernel,world} are taught the notion of pkgbase. It just seems like the kind of thing that's gonna surprise our users (in a not-so-fun way.) Thanks, --=20 Shawn Webb Cofounder / Security Engineer HardenedBSD Signal Username: shawn_webb.74 Tor-ified Signal: +1 303-901-1600 / shawn_webb_opsec.50 https://git.hardenedbsd.org/hardenedbsd/pubkeys/-/raw/master/Shawn_Webb/03A= 4CBEBB82EA5A67D9F3853FF2E67A277F8E1FA.pub.asc --ivtx2jzqxojhfcre Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEA6TL67gupaZ9nzhT/y5nonf44foFAmj2UJQACgkQ/y5nonf4 4fobPg//cpCYvlCzp039NYVtPTY9G/3+FmwAj34S39CWMTN3coOXC7Xy9ZFs4m5W i/eO4woTDtf/TtGf9FvqMAL/lDtFPDXQ4/zpsLSHV6gVfu885el7wNesQVh7h2U2 QeKbOoRqXT+xF4MGR8AzZKr1YPxAtq7ncAGlAcI6+dg32b+6fAOVQHg6Fg6t5hYp g/fsqLM4B2abRIjjZN5/1cmthXz76Rzqh1gV9PFM5kpd0NGBWrB873J/XyryRNIi 2PcJ5eHuOey33378zNEYyyhtpOYG+IIZ3S34xNs5ljZG1KaMomzRWfuTxGTg4vIJ FazcM6OvSvfSFEJW4Xoure0619EkkKwVT5x9HKXSnTMpD1kmDtdhZlu/E7ywlxS7 8LluP1zqWUvfcw2bWxFgnvogN7uKviO64m4ODhrapiF7ozmIPSIAvU/3mQ4aWBwU 4n67JBGMXBSROUuxMadSm/gCINpWzyXh8JYKYYLaXbDije7Vt0aodwU7mqX/O89w KAbDjoeh/oExbkuqwKffCvz2rjsYV7lh1jZjSwHJM6uvi3I4Awd4UayVgtDDJyD5 +4z0dyc7o16xtVQliKDauHW02s4rUy1uZkCeNhyEA3oEhampnirI0IeDWDpJ3pif x8ryL9K0HHaTO54DR316lZZWZ4eqfZEhsVwk9/Gha9Au8AnDIeI= =PKK1 -----END PGP SIGNATURE----- --ivtx2jzqxojhfcre-- From nobody Mon Oct 20 15:09:41 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cqzPB34Llz6CZQY; Mon, 20 Oct 2025 15:09:50 +0000 (UTC) (envelope-from ivy@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cqzPB28Mjz3HbD; Mon, 20 Oct 2025 15:09:50 +0000 (UTC) (envelope-from ivy@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760972990; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=Sl68a8Bcmh47gZVW7YBLETJVhOxfBPkxN5CG00WheDE=; b=WoJjZ8Ux7DDbl5WWBEVzh8hHLm5ex9VkMYj5UVWd/SXIQN3fJJwOJMPM94CNU8MiCP/AVJ MXfIN/iqPpjsTXZIsSg8d6bJLe4UaLayueDW7mXWzVSa/zanwRgprrZtWGKYfZ8RJtrIP0 AFpcwvNWvOJ9YY+Ey/ndjn2w77QR/BKOIP788Ti2T4qXcFWtQv9Q8lcyVEPxoyvzTlUw6M LiJxnDKHgaJYvGpO1uKbNswlAv1kS/5HaCuNVA9l1IHRrqPhEB5EZOnaOoc5GSaDfFIXJP 1IMWUFfAXZQM/EsMrye2MRwl9WtaqkYak5cHHBpJJgMDjeYzV3Xd3SCpQbtnmQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760972990; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=Sl68a8Bcmh47gZVW7YBLETJVhOxfBPkxN5CG00WheDE=; b=nOghoVWRhIumJ1A6Ox85HqRk6coIWhCY6F8CzEI+YfN+mrv3zjqeqjcDxt5fSfQ9lKpwN1 RHcsArAG9qf4TGWndfz31DWBJnupKI/rxNmE8Hx/xdVWO71GS+wvfuPCDbTw8yCG4ScB/i kaLh/fDHmVu2ZxIO6ZH3rYd5Dx7qrhgsLyOOlrM3aEWvkWN3El8uqZ3tpnTyT1ixy95SP3 iQ2KTF3D6zdz5JjbaOuxVMyhlqkJdUpjn8K4yPLCiNvfw3QEc/S6HcyhWU/kURaEwyb26S 1dccY+uzvmUYlyTHgvKYLKg6eqqjxbxg2rCGCCQGVwa+eOZWOsahZ4LJalLOvQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760972990; a=rsa-sha256; cv=none; b=qfhBgMKp18HzNYIpzP15Fo7YI3Uima0KfDF89KmSlYSco8c0ZioSQeKA9xkT/2Sw3Qr8Jy TpjRTVR8SXR4uh9cX3im9TR+hsIFKvOgzqgyQAjBNFDc7nNYJLUTt+41unlTOaUCr3Fr16 H5tYFo3UIIDfnfZHHon6ddCtWAyfPZzXCyPdfcOzHk2/+MDK5q0w8E1lM5Fiysy3TugKXZ AoSZw5D/FnoQP4UBpxdUnvkMbSa0MOVxP9AVd/8R/MTQNidbByFzxn5/5mphKoPF7ibaln K43XokiJsn5tu8YBNBmuc3u9778nhqBsUMIs9sGuhUBA1/BJiFGH31AvbyW/jw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from amaryllis.le-fay.org (amaryllis.le-fay.org [IPv6:2a00:1098:6b:400::9]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: ivy/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4cqzP95y57z17PW; Mon, 20 Oct 2025 15:09:49 +0000 (UTC) (envelope-from ivy@freebsd.org) Date: Mon, 20 Oct 2025 16:09:41 +0100 From: Lexi Winter To: "" , "" Subject: Re: git: 74a6bb524e5b - main - Makefile: Don't allow install{world,kernel} with pkgbase Message-ID: Mail-Followup-To: "" , "" References: <202510171914.59HJE0uo036247@gitrepo.freebsd.org> <228220a0-c819-4c51-92d3-5357e925c81d@FreeBSD.org> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="ItlTkUt7Z8Q0JuXP" Content-Disposition: inline In-Reply-To: --ItlTkUt7Z8Q0JuXP Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Warner Losh wrote in : > On Mon, Oct 20, 2025, 8:42=E2=80=AFAM Lexi Winter wrote: > > John Baldwin wrote in <228220a0-c819-4c51-92d3-5357e925c81d@FreeBSD.org= >: > > > On 10/17/25 15:14, Lexi Winter wrote: > > > > Makefile: Don't allow install{world,kernel} with pkgbase > > > Can we document how users who want to build from source can do so > > > from a new installation that uses pkgbase?=20 >=20 > Install* should eventually just do the right thing like ports: stage the > packages, make the packages and the install from the packages. 16 time > frame, though. we'll see how things go, but i'm not sure this is the right approach. "make installworld" does one thing, and overloading it to do two things seems like it might be more confusing than helpful. i'd rather people who want to update pkgbase from source just learn the right way to do that, which is make update-packages followed by pkg upgrade. --ItlTkUt7Z8Q0JuXP Content-Type: application/pgp-signature; name=signature.asc -----BEGIN PGP SIGNATURE----- iHUEABYKAB0WIQSyjTg96lp3RifySyn1nT63mIK/YAUCaPZQsgAKCRD1nT63mIK/ YJvvAQDHvFcY1AdEX6BFcL1o4lmnimYZj2Emaxs2umis6wZJRgD8Ds2JPWK3Jk4Z tB+bRcNnM8DTSQa34v/d8hlLGqZO0g4= =R49i -----END PGP SIGNATURE----- --ItlTkUt7Z8Q0JuXP-- From nobody Mon Oct 20 15:13:39 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cqzTm1Cspz6CZJM; Mon, 20 Oct 2025 15:13:48 +0000 (UTC) (envelope-from ivy@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cqzTm0Rs6z3Jg3; Mon, 20 Oct 2025 15:13:48 +0000 (UTC) (envelope-from ivy@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760973228; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=kCE2pgg8O5MdtAQhl9dWZsyUSjdM5tcvFneESQoyo6k=; b=xhqhJiMTgKv3AhL/BvRw5doKYm18Fv4sYdZOsPani6IkSv5vwwBEjvhV0NuyJeAFvIqGsA Os2Z2yM1s0q9fwbnXD/Z/L5xUDbaCBG/HHQ42e7oeSeaiuuzbKt0wr637Bu2JxQked3vOv /jnmcboYuFLgTbxALqCWh4N+KTDbh7jR+r3i5SMH7CJ1/4qzeVicRRpWClKKUd1hrNeBh0 cUGKwAy8++UlsxGmyYzOsCPwHjRJ+bAetl7InNmGQZR9czG50qd7U2Xvg3p1rWNoVbMuvJ KuCiEjQRwwCltMgcaIReeM0qaYaFtf/eHnSWVLm+Lfq9m7NkFOpX+FRyF6Kf7g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760973228; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=kCE2pgg8O5MdtAQhl9dWZsyUSjdM5tcvFneESQoyo6k=; b=EP9gSVCz3xMjAggvFYXbQxPJqzfkd8AyeuZoSS8bDRB+XuBvsA7XbeaJ2M6ynuIA1qrWfP /ttQGxvyDpDzwnOO0+2Yoxcdm0Jvej0jWcRgTzzKQLWpT/kRBE9whT9Xp1juglYZYh4fel jgkA37oAYWWPDYWpbk3NW/6wQSbfr/LLgiKKclHwaLtpMn2ZedHpL17EyPd/XU3sZF5X9q E4voTq4KSmI9SNx5w5Jh3+kIFX8kdBLEgIQC+rlK4vJ3XlryQHEy7HbwFluen3+PJYsZlz WC7Wbsx72m911Uj91JLJW1ZAOPDAJ9JTnuVgye2VitgaPTgHdZ/RS9TleuJxbw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760973228; a=rsa-sha256; cv=none; b=xiCPVCa/B63DMUPgJq6TTwHpxO3tP7+e4eaV7BZNVIz5AGSC8ejrSF8tbCUcWkdw8Gq1QT Cx7vUVcPVbI0VpCtQWgf1NME39ssbqd1UMbyi0wy+vlZHgJUjuZt8EQru68vyNwZKQZg7W /eD7B5G1RPoVeDx97pzbMiWFKj6Ha+B60TmlJx01mAob3HyuTmbkzQ96DOwfOZPt+nCoO6 PkZ5hI++RDLYzRcnW3VbZ6v3dFmpeUV9NDO8tCW3Hfa/E1TwsLN8td7+ZgSOrsIP+SM5YP nznm4gwQaXp3SllUZbQHx7Iq/bNhlsejv5/HFh4jBkIjucWFSz1+VuMR9o+E6A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from amaryllis.le-fay.org (amaryllis.le-fay.org [IPv6:2a00:1098:6b:400::9]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: ivy/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4cqzTl4qDYz17bd; Mon, 20 Oct 2025 15:13:47 +0000 (UTC) (envelope-from ivy@freebsd.org) Date: Mon, 20 Oct 2025 16:13:39 +0100 From: Lexi Winter To: "" , "" Subject: Re: git: 74a6bb524e5b - main - Makefile: Don't allow install{world,kernel} with pkgbase Message-ID: Mail-Followup-To: "" , "" References: <202510171914.59HJE0uo036247@gitrepo.freebsd.org> <228220a0-c819-4c51-92d3-5357e925c81d@FreeBSD.org> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="eehyQcRPdTIwDTFF" Content-Disposition: inline In-Reply-To: --eehyQcRPdTIwDTFF Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Shawn Webb wrote in : > On Mon, Oct 20, 2025, 8:42=E2=80=AFAM Lexi Winter wrote: > > Makefile: Don't allow install{world,kernel} with pkgbase >=20 > I'm somewhat thinking of reverting this commit until > install{kernel,world} are taught the notion of pkgbase. It just seems > like the kind of thing that's gonna surprise our users (in a > not-so-fun way.) if you revert this commit, your users will end up with a broken system because the pkg(8) database will be out of sync with the installed system. this will cause issues when running pkg(8), for example overwriting files from the source installation with files from packages. if you want to switch from pkgbase to not-pkgbase (regardless of whether you update from source or not), you *must* unregister the installed base system packages first. currently we don't have a good way to do that for an installed system, other than removing all ports, deleting the package database, then reinstalling ports. however, that doesn't change the fact that *not* doing that is a very bad idea. --eehyQcRPdTIwDTFF Content-Type: application/pgp-signature; name=signature.asc -----BEGIN PGP SIGNATURE----- iHUEABYKAB0WIQSyjTg96lp3RifySyn1nT63mIK/YAUCaPZRowAKCRD1nT63mIK/ YPECAQCYoZjcT+rZSt0SQ/Az9pKIMslB1H2CrgL3agwegROmrwEA9wZuD46lFwTR hIO5Pq5CKc5dmsr3QK8qiBWGyTsOoA8= =hwGg -----END PGP SIGNATURE----- --eehyQcRPdTIwDTFF-- From nobody Mon Oct 20 15:17:35 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cqzZN5RyJz6Cb3R for ; Mon, 20 Oct 2025 15:17:48 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-il1-f172.google.com (mail-il1-f172.google.com [209.85.166.172]) (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 4cqzZN3hJVz3Jt7 for ; Mon, 20 Oct 2025 15:17:48 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-il1-f172.google.com with SMTP id e9e14a558f8ab-430c773eec6so31417945ab.0 for ; Mon, 20 Oct 2025 08:17:48 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760973467; x=1761578267; 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=fdlBMvj74dIEQzTz5ECGsVkz1zgfI9Eb1U77XUYOxIk=; b=OvI3GyT9x5CyhEeqC7btS46wjcOuQJlQpB/8ro1cQy1hfuQI7EbbPeO3tQEL2cXrtC 6PD47zt3AkXI8D51fHjK6dywUTHDZrgo3R2kDrJdd6VgJWskW7rB6WhgGX1SMQzvFvFO YPaQ9yfsUqTgHJwA7SmADjv1jjtBT3CmJlZpdU82w0u1IXhbhNLwpqP96LG7rajIqtqs Og69ZvJFOhJWy2plHr4jIRadymoJFOtWv+IRFNAWTsunVkEHLSXRDDkkliXt/7U8O5/m XS5INv1NB8RE7QNgqh13Y6jOZoI9nKoQefW2ILNkQg59OyGA9gfbEaggnNXTYW2lBecs khsg== X-Forwarded-Encrypted: i=1; AJvYcCU+bzkNYl8sQEJ1kHGf0s2I0xFKaYdS/+uV7AwHqMkWN5ginoo3wsYtKeV+7Pgymm07alJFxAa0xHj4cSvWNwOVu0jx5Q==@freebsd.org X-Gm-Message-State: AOJu0YzXwCf7UWVN70UGg4WY70p9MS/PsLEkSu2NdjxmYyc5gbejhLX7 7WXoKsfmH+ZfMZsszNPQPCa1YeWUxFaPylMmvy2V6b/W5QJODlF8cbldRt2VZtA4JCBw6S41PMj LrBTIEz8WLZmWheg/LAR5BOEjwrPlxss= X-Gm-Gg: ASbGncu36/Ab8RMwq/MP/sgReDI1EvI+/hZIJ6nf4w9/BfyY9hkibpQhtiKiOhTD8u2 KyD9xDUB47rWu1AhA51SLadppMrf/U4QskkyxEw4ic8g5eEBs17a5+HcBQeZ/UUnn7XDDeoy4wj tFeWpoNfTp+tdhUaJEu4bJHwOwbGmJgb1mY9chA6PLZlSg/uj9JvaZd/ZD1qXb4dxUNBrnW4kYZ U7vgP0Lfsoy2bBmq213X6j7lC59ankw2McYMH+0GJitq+dpmvqUIHlgleUiY/e+Uqdg1QE= X-Google-Smtp-Source: AGHT+IFggbPuXm2ijLflgE9X6a9+m6VqTTVuyBrHF28L5x4B7/TNDGzcGviiHu/piFhTR16xfIigqp+WS7MHce6XCO8= X-Received: by 2002:a05:6e02:190c:b0:430:ab4e:7e3 with SMTP id e9e14a558f8ab-430c5268de7mr196306245ab.16.1760973467409; Mon, 20 Oct 2025 08:17:47 -0700 (PDT) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 References: <202510171914.59HJE0uo036247@gitrepo.freebsd.org> <228220a0-c819-4c51-92d3-5357e925c81d@FreeBSD.org> In-Reply-To: From: Ed Maste Date: Mon, 20 Oct 2025 11:17:35 -0400 X-Gm-Features: AS18NWDhSTKssApGZciCQzomMbWF4OY1xqJ86bQCTjppNgfMTDS-7A0WWPtlw9Y Message-ID: Subject: Re: git: 74a6bb524e5b - main - Makefile: Don't allow install{world,kernel} with pkgbase To: Shawn Webb Cc: Warner Losh , John Baldwin , src-committers , "" , "" Content-Type: text/plain; charset="UTF-8" X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4cqzZN3hJVz3Jt7 On Mon, 20 Oct 2025 at 11:09, Shawn Webb wrote: > > I'm somewhat thinking of reverting this commit until > install{kernel,world} are taught the notion of pkgbase. It just seems > like the kind of thing that's gonna surprise our users (in a > not-so-fun way.) This commit is intended to avoid surprises; trying to use a mix of pkgbase and installkernel/installworld on the same system is not likely to end with a good result. This check is easily overridden if one is doing it intentionally and is willing to accept the consequences. From nobody Mon Oct 20 16:42:06 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cr1Rj0X6Mz6CjyN; Mon, 20 Oct 2025 16:42:09 +0000 (UTC) (envelope-from des@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cr1Rh6ybjz3drb; Mon, 20 Oct 2025 16:42:08 +0000 (UTC) (envelope-from des@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760978529; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=meAnI7BpmFRbArsWHXtdeDs30VXf6aGNSah0Yfnoouo=; b=XnqDpZU9f9DSCJf7px+WGYw+KH8ZVmjrWwE6lRFB8+bzgzs5hhNirw8K7wiOS5NCO08E+J rd0NCQAlfJT2+E40heEUNMNqOvEeJgBnky8myPl+PhDu9BRAqsWLQvyehIeoD5Qi928J2Q FBT4gu2iXAIMSYg2j42kSu6/WWES8eZ9ra4ji56TuaoXmvWDuM1Xib2AP/G2FX44SAFZ6i VUF3u8iyC3fd4A0/CKi572ld3J5yqAT/344XwZA07YuhbjeNCJ+QFmM7gTh0qxPWNU2mGZ NIeOIHpPetvn47xU8TjzFEGBF2CqQGCj1+kHA2J8HIsk37v7lQuie5YoUnJf5w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760978529; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=meAnI7BpmFRbArsWHXtdeDs30VXf6aGNSah0Yfnoouo=; b=rGZS97JFlG09tsbVQQbaIBT/McJ+gxA0OTFEhK6VSb22aaGEhmOo9HTJgyHb88Yl3SYwgo Ep4H94vtveAkzj8lVHEtvLszJtkOx6Pd5mEExh9x8Lc6nipHZt8thOile+dH+OOsNaiuU2 PkqAAaszx17PKcvBsfa4SI8USR6WfJjWsLOSWkaLcmmUyaQmxyCAvyW0ql5R0WX7VDW00u jzmFwW8LlwGEhNy54bKu+1/03Bj7zdJYqlh+kmj4ow5cyUX96xJCeKSwNtQUMx/TMwzvhY pQQ29Jrm2l+w1Vsh6/qUqAki4MVxUNGXOipX2MsfbMyn32uMc2N3HJG6ObLrZQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760978529; a=rsa-sha256; cv=none; b=FPhOJRYzYVXY3F/VYCkH4nmsVoV9iFOPOyi+ji9MBGiGKFH6JA8cB1LGKHRD5XCwjP16Zi tHStKXRqYdpNBvRbNZlecxf17Q5p2P4uOKcjnGjUB4zEHPpcKo0QK2QQ9ExHDQaz41M3NW yqmNpkH7k/FOQ5CVvNzixQOnEP2QgovxeBLKw5kZtJgMJEKZgmiVoajj4HQmkJygHxTciS xO6sWpf66fABbO0wkAKWH7WXAs5yvIM8UCPIBF0Y0TZauBh+hzCdq8IYq5FJ65jOq4H2j4 NqykjBDKhbfB6xxlv2234BFnmfNdyre9zl+fapUW/ttmaJM8B5FJzXb9I2R2hw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from ltc.des.dev (unknown [IPv6:2a01:e0a:c54:bed0:922e:16ff:fef1:acef]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: des) by smtp.freebsd.org (Postfix) with ESMTPSA id 4cr1Rh5n6qz19Qk; Mon, 20 Oct 2025 16:42:08 +0000 (UTC) (envelope-from des@freebsd.org) Received: by ltc.des.dev (Postfix, from userid 1001) id E41A7883FC; Mon, 20 Oct 2025 18:42:06 +0200 (CEST) From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= To: Ryan Libby Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 195b00ec45e5 - main - quot: Clean up In-Reply-To: (Ryan Libby's message of "Fri, 17 Oct 2025 15:01:04 -0700") References: <202510171155.59HBtMCp004658@gitrepo.freebsd.org> User-Agent: Gnus/5.13 (Gnus v5.13) Date: Mon, 20 Oct 2025 18:42:06 +0200 Message-ID: <86h5vt4ja9.fsf@ltc.des.dev> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Ryan Libby writes: > Dag-Erling Sm=C3=B8rgrav writes: >> In function 'usrrehash', >> inlined from 'user' at /workspace/src/usr.sbin/quot/quot.c:244:3: >> /workspace/src/usr.sbin/quot/quot.c:210:22: error: argument 1 range [184= 46744071562067968, 18446744073709551615] exceeds maximum object size 922337= 2036854775807 [-Werror=3Dalloc-size-larger-than=3D] >> 210 | if ((users =3D calloc(nusers, sizeof(*users))) =3D=3D NU= LL) >> | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ >> In file included from /workspace/src/usr.sbin/quot/quot.c:51: >> /tmp/obj/workspace/src/amd64.amd64/tmp/usr/include/stdlib.h: In function= 'user': >> /tmp/obj/workspace/src/amd64.amd64/tmp/usr/include/stdlib.h:92:10: >> note: in a call to allocation function 'calloc' declared here >> 92 | void *calloc(size_t, size_t) __malloc_like __result_use_check >> | ^~~~~~ > > Probably it is from > -WARNS?=3D 2 > > I think gcc is saying that it thinks nusers may be negative. It's saying nusers may be large enough that the result of multiplying it by sizeof(*users) exceeds an arbitrary threshold, which is technically true but completely unhelpful. This gcc option should not be used. DES --=20 Dag-Erling Sm=C3=B8rgrav - des@FreeBSD.org From nobody Mon Oct 20 16:54:28 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cr1jw4wlKz6Cl5d; Mon, 20 Oct 2025 16:54:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cr1jw4DGqz3h42; Mon, 20 Oct 2025 16:54:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760979268; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dTJLarUbh8XQcEWUjQzQM2hNuGEE67g4cCopSOZlqLM=; b=xHXiRNm3EkFjcksNiJOXswxbLKv2PYw+3KFkJG0baKzh3wEThTRcpz0c8/+QcPRY9BBawj tl6E9J3O7dFCoNIHqZQriv7Lfj0Y2M5cEeK0k3Q/bEkh0ukgE2UZxMfOjL4/o/I+7378B1 Ll1GR8OEy803pfDZz2z4o+GSgPNm12Yp6dH6bc9/BXYCPZRWaUVoQiyBAOaTKt6a3Nckn6 KjUfUU8SmwAeubXm+NMv6oTuGBXwWjcUtcq/MxnRBbTtyYWTa61RWYFIQz27pWRccTVjsz QzKmTvxVsk2eJlwqNL7VP4JVhFzWQ4Re3471UwKjp5JNhjjZzN4spWJpzU7aYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760979268; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dTJLarUbh8XQcEWUjQzQM2hNuGEE67g4cCopSOZlqLM=; b=bNgWVayXs15fU5E3u9gqoyXHOeLHXndCPj7xumeZyqjrI9haMOsi7sJ4cXhfzB1uSoHk0j +NIlEmfrMVC9c99GjAVfACrF9y+PLvje/qRECkkzL6m+VTwUTTYvgYyocVYyY7UcvoDDz9 CC8p1rxSU3DfKUPnjvH72E2qQPs/b3HoTDlDa44tSzi5PJ9ZpNXeWJEe4bsNHK5TbNZo2+ X1oCkPlHxUM07jwff3ZshStVsQaO9oid6NOBQH6U6FLFEduePCj8s36ihvgBBqccJfWWcb V/mOSyjJEmIqDErTUpT+UElB9L81FKm0sZIVGDWJOV5usaRiFKGo8D9B+5ZtRw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760979268; a=rsa-sha256; cv=none; b=LGUhl2ZaTyYTG1IKOHeo9gxyFdVmoMRhxAD4z9A0/YputKSomXDI6ar2rRrQNfjdMpM5nk Txqz5d10dRpXuVaYF1jNMv78RnjOLZV/lEIpv1Uj0hyD8JDPM+dPN5I24UXgxmqR6cHk82 jgmdOZ5nnLX1/DHS3tAw0q8fsQt62WNGDxo2POdEC7GyYy3Mi4V+JIZHLmXW+WH0sJ4DGU oD/gVEIaj2dc2g87Q7CH3mkORQ4EHBLiPtt6xtRDThGpG6F6HsIILjJJrybH642tiDhDNs KXa5BKKdIv7hzU658KkvOBCWtM0rOAMwbdAz+IRd7N1/EW3oTa+TBegUHWXScQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cr1jw3mBmz5n6; Mon, 20 Oct 2025 16:54: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 59KGsS6O017502; Mon, 20 Oct 2025 16:54:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59KGsS4p017499; Mon, 20 Oct 2025 16:54:28 GMT (envelope-from git) Date: Mon, 20 Oct 2025 16:54:28 GMT Message-Id: <202510201654.59KGsS4p017499@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jamie Gritton Subject: git: 78f70d4ff9dd - main - jail: fix a regression that creates zombies when removing dying jails List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jamie X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 78f70d4ff9dd4af2318b25023a7f55be7402ec60 Auto-Submitted: auto-generated The branch main has been updated by jamie: URL: https://cgit.FreeBSD.org/src/commit/?id=78f70d4ff9dd4af2318b25023a7f55be7402ec60 commit 78f70d4ff9dd4af2318b25023a7f55be7402ec60 Author: Jamie Gritton AuthorDate: 2025-10-20 16:49:14 +0000 Commit: Jamie Gritton CommitDate: 2025-10-20 16:49:14 +0000 jail: fix a regression that creates zombies when removing dying jails When adding jail descriptors, I split sys_jail remove in two, and didn't properly track jail held between them when a jail was dying. This fixes that as well as cleaning up the logic behind it. PR: 290217 Reported by: David 'equinox' Lamparter Reviewed by: markj MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D53200 --- sys/kern/kern_jail.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/sys/kern/kern_jail.c b/sys/kern/kern_jail.c index 3697d95fe0e5..00732d55cd46 100644 --- a/sys/kern/kern_jail.c +++ b/sys/kern/kern_jail.c @@ -2909,12 +2909,6 @@ prison_remove(struct prison *pr) { sx_assert(&allprison_lock, SA_XLOCKED); mtx_assert(&pr->pr_mtx, MA_OWNED); - if (!prison_isalive(pr)) { - /* Silently ignore already-dying prisons. */ - mtx_unlock(&pr->pr_mtx); - sx_xunlock(&allprison_lock); - return; - } prison_deref(pr, PD_KILL | PD_DEREF | PD_LOCKED | PD_LIST_XLOCKED); } @@ -3461,12 +3455,17 @@ prison_deref(struct prison *pr, int flags) /* Kill the prison and its descendents. */ KASSERT(pr != &prison0, ("prison_deref trying to kill prison0")); - if (!(flags & PD_DEREF)) { - prison_hold(pr); - flags |= PD_DEREF; + if (!prison_isalive(pr)) { + /* Silently ignore already-dying prisons. */ + flags &= ~PD_KILL; + } else { + if (!(flags & PD_DEREF)) { + prison_hold(pr); + flags |= PD_DEREF; + } + flags = prison_lock_xlock(pr, flags); + prison_deref_kill(pr, &freeprison); } - flags = prison_lock_xlock(pr, flags); - prison_deref_kill(pr, &freeprison); } if (flags & PD_DEUREF) { /* Drop a user reference. */ From nobody Mon Oct 20 17:15:42 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cr2Bg5VxBz6Cn3d for ; Mon, 20 Oct 2025 17:15:55 +0000 (UTC) (envelope-from rlibby@gmail.com) Received: from mail-yx1-f42.google.com (mail-yx1-f42.google.com [74.125.224.42]) (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 4cr2Bg3WDpz3n6P for ; Mon, 20 Oct 2025 17:15:55 +0000 (UTC) (envelope-from rlibby@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-yx1-f42.google.com with SMTP id 956f58d0204a3-63e0dd765a0so4093601d50.3 for ; Mon, 20 Oct 2025 10:15:55 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760980554; x=1761585354; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=1w789M6mhs/jjZ1l89TZzozgf+PqRLTBz/FbwemtXeI=; b=tph/LAJQMVaX508xA9lZ5Nyw4f6/+WTmFXAav0JygbK0+Al+LMKzm6Q2HCAGal0TmB 6lWYZdjD5Sk8b2TUWoSqZVm4TMyEcFpNDg2MLVnUhYwjqsRBg1fdRgRv0zU5hY5Q4Q2R fnM92gqvpeWsEzUYNKh2zJA6WTyFnrsT9UgKLBQPm3JB0Q9syHHpvvoOL9ztJt6KHxZ8 Cgc8shkMyEEJ++C0eEITVe9aBhOOI59LUtP5fG5B6Vclbr2wpXTjbqg26dgSvBH1/TpT DjL/Uj40qprEtd0mGdEnkp70886ULspirHgrRTlr4jlzUizfcjY47GzONT9Ro8znGUW7 1wXQ== X-Forwarded-Encrypted: i=1; AJvYcCUgK4nORRKx39UW/0MhA9bAzY4Fi1BhbVMde7p2oqzNdOTj71A+gDBOw15M4YPREtc5+jkVhwKgEYwdYrxTxQn7XZgAdA==@freebsd.org X-Gm-Message-State: AOJu0Yyn2WgqbLnkelk0QjN0jp090S92V+G8kS+NO/UZkn8bj/oqB7yj 0uSJUGrsZBCvs9LA2+cfYCf2qd/6kOXbWVPChFrqMALlZTkLBTJhxHMy5BoyZw== X-Gm-Gg: ASbGncvkp4BQq0xwtYNHp1nB8bPII2Q4D958LxIv3tzSb9MIGwLNHEzG0GkQR5aofu1 +/OV+uJpp44H7w1TbI16+fwoMUueFyA3ZqsIh7hCCXhZ9yJYw6njU1dEilSBpU6ujrpk0xxtx+S r+2zooTarRFH6hO6Y5C5Y98lWIy/SyYN/Z9WjkAfQq49JVsdE8hhhl+7sCCtvIS2BWl097HM5QW 889UzL7w67c5UvQr7wgnjFfKEbxfDDXyVXapNVZPSRb6UqqK9SXa/n2PirsMcTstYUYzRWVjul9 OrXBQIMP9DQdUVEssvq+xQaVC4d9Mz7KPoET41j6qwmtVaxlxeNwj2/H0hU9+0GvWFlS/aCwsMb /i1xxL5SOnzqytFYlTvMTvtK1iYk+aM7Lk+DU7St6HjnoEQaarMgvA5U93vqKs0h3IxeG7QWjsK 9DmqJq9SLZQCMET78W4EUXjNf0omDY+cc2k4qjAJk= X-Google-Smtp-Source: AGHT+IFK8jYPMn8IwYwZYpRw4qrHwfG5ClY/zAZnh1d8DagQamJ6CijdctRmSVhjOMLxV4vzJJ7/ZA== X-Received: by 2002:a05:690c:3804:b0:784:731e:c7bc with SMTP id 00721157ae682-784731ec8b0mr152532947b3.43.1760980554320; Mon, 20 Oct 2025 10:15:54 -0700 (PDT) Received: from mail-yw1-f170.google.com (mail-yw1-f170.google.com. [209.85.128.170]) by smtp.gmail.com with ESMTPSA id 00721157ae682-7846a6c70easm22719237b3.59.2025.10.20.10.15.53 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 20 Oct 2025 10:15:53 -0700 (PDT) Received: by mail-yw1-f170.google.com with SMTP id 00721157ae682-781421f5bf5so51525457b3.3 for ; Mon, 20 Oct 2025 10:15:53 -0700 (PDT) X-Forwarded-Encrypted: i=1; AJvYcCUkrqM9vJJbWn1tKUZZq0WPV5Tnxkj3zLe80kvPXQrUsml058fkIMjfq2LvSxHBoT6GWomV0Yb7HD1tWrY7N1BvQthhSQ==@freebsd.org X-Received: by 2002:a05:690c:314:b0:780:f794:6e21 with SMTP id 00721157ae682-7836d1ece75mr226854937b3.24.1760980553166; Mon, 20 Oct 2025 10:15:53 -0700 (PDT) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 References: <202510171155.59HBtMCp004658@gitrepo.freebsd.org> <86h5vt4ja9.fsf@ltc.des.dev> In-Reply-To: <86h5vt4ja9.fsf@ltc.des.dev> From: Ryan Libby Date: Mon, 20 Oct 2025 10:15:42 -0700 X-Gmail-Original-Message-ID: X-Gm-Features: AS18NWDwoFrYxXv405e3oJXZtwD1pt731dpI2CHcxaVXb9q3H3IVI0a8pTG6XB0 Message-ID: Subject: Re: git: 195b00ec45e5 - main - quot: Clean up To: =?UTF-8?Q?Dag=2DErling_Sm=C3=B8rgrav?= Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4cr2Bg3WDpz3n6P On Mon, Oct 20, 2025 at 9:42=E2=80=AFAM Dag-Erling Sm=C3=B8rgrav wrote: > > Ryan Libby writes: > > Dag-Erling Sm=C3=B8rgrav writes: > >> In function 'usrrehash', > >> inlined from 'user' at /workspace/src/usr.sbin/quot/quot.c:244:3: > >> /workspace/src/usr.sbin/quot/quot.c:210:22: error: argument 1 range [1= 8446744071562067968, 18446744073709551615] exceeds maximum object size 9223= 372036854775807 [-Werror=3Dalloc-size-larger-than=3D] > >> 210 | if ((users =3D calloc(nusers, sizeof(*users))) =3D=3D = NULL) > >> | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > >> In file included from /workspace/src/usr.sbin/quot/quot.c:51: > >> /tmp/obj/workspace/src/amd64.amd64/tmp/usr/include/stdlib.h: In functi= on 'user': > >> /tmp/obj/workspace/src/amd64.amd64/tmp/usr/include/stdlib.h:92:10: > >> note: in a call to allocation function 'calloc' declared here > >> 92 | void *calloc(size_t, size_t) __malloc_like __result_use_che= ck > >> | ^~~~~~ > > > > Probably it is from > > -WARNS?=3D 2 > > > > I think gcc is saying that it thinks nusers may be negative. > > It's saying nusers may be large enough that the result of multiplying it > by sizeof(*users) exceeds an arbitrary threshold, which is technically > true but completely unhelpful. This gcc option should not be used. > > DES > -- > Dag-Erling Sm=C3=B8rgrav - des@FreeBSD.org The message is poor but the limit is not so arbitrary, it is PTRDIFF_MAX. It's saying that (size_t)nusers may be huge, because it infers that nusers, being signed, may be negative -- though in reality it will not be negative. It says the range that will result in huge values, (size_t)INT_MIN through (size_t)-1. Sure, you could disable the warning, kern.mk does that and one other user make file does too. Or you could convince gcc with a type constraint, or somehow else. In any case, we should fix the gcc build. Ryan From nobody Mon Oct 20 17:44:56 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cr2r95yRlz6Cq8r; Mon, 20 Oct 2025 17:44:57 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cr2r95G77z3tSK; Mon, 20 Oct 2025 17:44:57 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760982297; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=V7xYiLgkn0QVvEC8E/poAYVUtfSgsnXO/bhgcpAVCnQ=; b=hBEZ/5o3o/2yEf1AVcpfWKEU23yPAfGMX5U5ZSOAgSDxFBHsNrWwDPGOnwLvToHyuTjMzU 8Q+8QDbA9T8XGhiivQscw5iqtUY23mVOititB6wDNULfyPXytMHWrwBwHlBqSHc52aotQZ +rwnx6X8og0HuZ7em8rmkW+R0WnQZO/KyMblEXul9YjIowlokHUmgwrMV2nORYkx4BoWI0 KA5dPwxUFSaZKEP5H3r+iOfsKL8eCBkm+LEyfy8IveZbIooxFcYDNjxd4A9ZmC7sGc0K+P UTN5PL2dUmLQUs/UsgjMY0fS8FwekDLk3JolBsjEQvuA9yFlruOA7OB0IJsCvQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760982297; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=V7xYiLgkn0QVvEC8E/poAYVUtfSgsnXO/bhgcpAVCnQ=; b=airWAYJAQCfq1cDiWhUesNkYvYyweRfIPaApda/GW/yG1x+dkYo15xDeHypD+qvIJO2F2m xvjVHB7JGSu59FzrFJbwJGJ2AZB4FYPHacBbQxknCRRLAciwYuWYcyeD+ofDQd+7wUkCQ4 1nYh7Aj+bJvECbtt8fB0HM2sNGYU1YB7mZ6DtfsvBfmUWfJfmNT6/+9M3u/IvT5CwGXW/z /aazpXncQA7S+NkcJWt20h90w3OkbqXLiXfXjZc4pkp02DcEkuwCdZJ2onXp+DIIpBanvM RB78P2VovQ1ZJ3Y6nWog9qMG+cJMVBVlLRySuyANGlKauZymuuCT26oTFoP2IA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760982297; a=rsa-sha256; cv=none; b=mf0j/6S2iD9BXCQLaLPibdbzIyHr146KjIi+4C89RevMgOhhGnYhxXiPJteZeYSeABpN4U hYxvPqDw5Y3ncPrLsnhtYYDvnCJGkLJJP4xPBHWThNjn/+uoTHIou5zn5dRVU37RRRPrUa jwrxH4C6xcVTEYecjC7ZnMcy4Gu7mQYYmq7bZEphQRM1pOnNauqlaNyeeYQMv1iYskgBKE 6EWRvDXTqWYopY+8y1lcDOeW2yTlEIEgH7ER/8mBeeeg8pJxFasZrmVSrE5sem+cUnWKFe C1kHxlaXUkkPsDDqLg+t7p/L4qEotaEOAZZuVVYAvIN9Pe1PKLcl2zFVcVvrqQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from [IPV6:2601:5c0:4202:5670:ecba:d7d9:9ea9:ce3c] (unknown [IPv6:2601:5c0:4202:5670:ecba:d7d9:9ea9:ce3c]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id 4cr2r93GnFz1Bkq; Mon, 20 Oct 2025 17:44:57 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: Date: Mon, 20 Oct 2025 13:44:56 -0400 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 74a6bb524e5b - main - Makefile: Don't allow install{world,kernel} with pkgbase Content-Language: en-US To: Warner Losh , src-committers , dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org References: <202510171914.59HJE0uo036247@gitrepo.freebsd.org> <228220a0-c819-4c51-92d3-5357e925c81d@FreeBSD.org> From: John Baldwin In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit On 10/20/25 10:59, Warner Losh wrote: > On Mon, Oct 20, 2025, 8:42 AM Lexi Winter wrote: > >> John Baldwin wrote in <228220a0-c819-4c51-92d3-5357e925c81d@FreeBSD.org>: >>> On 10/17/25 15:14, Lexi Winter wrote: >>>> Makefile: Don't allow install{world,kernel} with pkgbase >>> >>> Can we document how users who want to build from source can do so from a >> new installation >>> that uses pkgbase? I guess it is something like: >>> >>> - pkg install sources if not already (or git clone the right branch/tag) >>> - etcupdate bootstrap >>> - (clearly can't just use pkg delete with a >> glob, so need >>> something else) >> >> this should eventually be in the Handbook. > > > Install* should eventually just do the right thing like ports: stage the > packages, make the packages and the install from the packages. 16 time > frame, though. Hmm, 'make installkernel' needs to still create kernel.old for those of us doing development (or really, just running main. The tb(4) driver turned my laptop into a brick recently and I needed kernel.old so I could recover). AFAIK, pkgbase doesn't have any provision for doing that. Also, `make installkernel INSTKERNNAME=test; nextboot -k test` is a key part of my workflow for testing kernels. I'm fine with using packages to ship updates to users running stock sources, but please do not make it harder to do development. When hacking on userspace components I often need to be able to do just 'make install' of a single binary or library onto an installed system knowing that a future installworld or `make install` will revert to "stock" binaries later. Please don't break that. It's like when I work on changes to GDB or LLVM, I use the native build system to build the modified version, I don't try to hack up a port to build a package with the extra changes I have either in a working tree or committed on a feature branch. -- John Baldwin From nobody Mon Oct 20 18:10:28 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cr3Pf2g3Wz6CsbF; Mon, 20 Oct 2025 18:10:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cr3Pd1xmDz40pK; Mon, 20 Oct 2025 18:10:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760983830; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eS9DISTkW2WW7tTvMSncZugxhO7JZjgHbiXROUP4k6I=; b=xfOI97gKI7zXMdUUMiL3Vjmpb94hnlcgWJtrtVh80iav4klmvCeVHBlPRCd9/qWyCv1uxH EEQPSO+c2aMZ1yKJxfUFL5EzXMxg4NsVh+qiPSuO12qLXG6mAOzZOkcF5b2PLYOZflSwuy GwILUN9+772Sginh+kO35onSHMjJAMC23SLvkCeoTDyBDPnZ6MHKKyEI9ww6HaUEEhnikp DjbJ0hC21NBSwrwh8imTA+GreXKewIuTKn23w7ea3iYBeDjQPWysl3IvNi5isjpyr0yHow g+La50vCtRdBat/8eNUktIwWRjLvCTZ6XdedUL3mX/Uuov9kelTj0kOKMkaeow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760983829; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eS9DISTkW2WW7tTvMSncZugxhO7JZjgHbiXROUP4k6I=; b=A7N9wcbpFeMRGFNlx+Nfbshqzz9FaRbZb8S+t39Kz1/zXAvosWD+2Sqw54BWlXYYGJiwTV vIaYriy105Bxse1SteMWW1u4t4VXjs+VKxHuI6lA7R9AvvRvRkuxDIiZLdh3Zo6LqybjVR +oPDzxYHzvH1LwRMcm9C8/nWhjlrnDeX7RtI/Tod4mznxhbA8zoF7koGFooAlvuf1Hv1TN qU5uxpy37jzyW1tVuLmJMJgz/LWPE8X+PV7Hfr560VleutQEHfcox/rDpuTqsTBiwne6Kk AQt83EmwgzyveSlwX75yTCKmss5wTKwpMe8BieRUX0qEa/PxbQrHzZZa3n1yqw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760983829; a=rsa-sha256; cv=none; b=hypkw274IjpLBsOvKjmqZVUmzv+tNQQubMlQL4ikgNRPFOU2InI1qCBpDx0H08Kvr2vpp/ wnEN+riQGO7SKYAllFpxpGzQde+ZCf6niMfXpeATJycujTVaZD0awDZB8fl6c/uDr69OTf OTxOY3KGndIkAQ4V/eMpfjr5n7kgwP5mJmp4VyqzNZJyvLBXd8QY24S1qHh6Bp3tJOmpT9 VSE1e/KfRfVGnoZwAEOilbGRWBLaIJoEufNymLXLbzcOA4PP2y4pZ9ROgn/vgQsur4R2GP byXzFZ81jziIHHL4eKFa7ITwsGliPKWl0zLQplpCIOuLtiM34BXd/ynJR+aK+w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cr3Pd1Gjlz85F; Mon, 20 Oct 2025 18:10: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 59KIASSX061145; Mon, 20 Oct 2025 18:10:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59KIASGL061142; Mon, 20 Oct 2025 18:10:28 GMT (envelope-from git) Date: Mon, 20 Oct 2025 18:10:28 GMT Message-Id: <202510201810.59KIASGL061142@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Randall Stewart Subject: git: a8e4399fc6a2 - main - Move bbr and rack to use inline per C99 (TCP Sub-system) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rrs X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a8e4399fc6a27b4f8ab828231ede75743ba28a58 Auto-Submitted: auto-generated The branch main has been updated by rrs: URL: https://cgit.FreeBSD.org/src/commit/?id=a8e4399fc6a27b4f8ab828231ede75743ba28a58 commit a8e4399fc6a27b4f8ab828231ede75743ba28a58 Author: Randall Stewart AuthorDate: 2025-10-20 18:09:11 +0000 Commit: Randall Stewart CommitDate: 2025-10-20 18:09:11 +0000 Move bbr and rack to use inline per C99 (TCP Sub-system) This is a small change as suggested by Gleb to move all __inline -> inline aka C99 style. This covers both BBR and Rack and makes no real changes to the code functionality Reviewed by: tuexen Differential Revision: --- sys/netinet/tcp_stacks/bbr.c | 8 ++++---- sys/netinet/tcp_stacks/rack.c | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/sys/netinet/tcp_stacks/bbr.c b/sys/netinet/tcp_stacks/bbr.c index 66983edcdd73..10383bc0801e 100644 --- a/sys/netinet/tcp_stacks/bbr.c +++ b/sys/netinet/tcp_stacks/bbr.c @@ -477,7 +477,7 @@ bbr_log_rtt_shrinks(struct tcp_bbr *bbr, uint32_t cts, uint32_t applied, uint16_t set); static struct bbr_sendmap * bbr_find_lowest_rsm(struct tcp_bbr *bbr); -static __inline uint32_t +static inline uint32_t bbr_get_rtt(struct tcp_bbr *bbr, int32_t rtt_type); static void bbr_log_to_start(struct tcp_bbr *bbr, uint32_t cts, uint32_t to, int32_t pacing_delay, @@ -1841,7 +1841,7 @@ bbr_counter_destroy(void) } -static __inline void +static inline void bbr_fill_in_logging_data(struct tcp_bbr *bbr, struct tcp_log_bbr *l, uint32_t cts) { memset(l, 0, sizeof(union tcp_log_stackspecific)); @@ -4206,7 +4206,7 @@ bbr_calc_thresh_tlp(struct tcpcb *tp, struct tcp_bbr *bbr, /* * Return one of three RTTs to use (in microseconds). */ -static __inline uint32_t +static inline uint32_t bbr_get_rtt(struct tcp_bbr *bbr, int32_t rtt_type) { uint32_t f_rtt; @@ -4370,7 +4370,7 @@ bbr_timeout_rack(struct tcpcb *tp, struct tcp_bbr *bbr, uint32_t cts) return (0); } -static __inline void +static inline void bbr_clone_rsm(struct tcp_bbr *bbr, struct bbr_sendmap *nrsm, struct bbr_sendmap *rsm, uint32_t start) { int idx; diff --git a/sys/netinet/tcp_stacks/rack.c b/sys/netinet/tcp_stacks/rack.c index 0320479e882e..50077abdfd86 100644 --- a/sys/netinet/tcp_stacks/rack.c +++ b/sys/netinet/tcp_stacks/rack.c @@ -4730,7 +4730,7 @@ rack_make_timely_judgement(struct tcp_rack *rack, uint32_t rtt, int32_t rtt_diff return (timely_says); } -static __inline int +static inline int rack_in_gp_window(struct tcpcb *tp, struct rack_sendmap *rsm) { if (SEQ_GEQ(rsm->r_start, tp->gput_seq) && @@ -4767,7 +4767,7 @@ rack_in_gp_window(struct tcpcb *tp, struct rack_sendmap *rsm) return (0); } -static __inline void +static inline void rack_mark_in_gp_win(struct tcpcb *tp, struct rack_sendmap *rsm) { @@ -4784,7 +4784,7 @@ rack_mark_in_gp_win(struct tcpcb *tp, struct rack_sendmap *rsm) rsm->r_flags &= ~RACK_IN_GP_WIN; } -static __inline void +static inline void rack_clear_gp_marks(struct tcpcb *tp, struct tcp_rack *rack) { /* A GP measurement is ending, clear all marks on the send map*/ @@ -4802,7 +4802,7 @@ rack_clear_gp_marks(struct tcpcb *tp, struct tcp_rack *rack) } -static __inline void +static inline void rack_tend_gp_marks(struct tcpcb *tp, struct tcp_rack *rack) { struct rack_sendmap *rsm = NULL; @@ -7017,7 +7017,7 @@ rack_setup_offset_for_rsm(struct tcp_rack *rack, struct rack_sendmap *src_rsm, s rsm->orig_t_space = M_TRAILINGROOM(rsm->m); } -static __inline void +static inline void rack_clone_rsm(struct tcp_rack *rack, struct rack_sendmap *nrsm, struct rack_sendmap *rsm, uint32_t start) { From nobody Mon Oct 20 18:32:12 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cr3th4VwTz6Ctyt; Mon, 20 Oct 2025 18:32:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cr3th3splz43dt; Mon, 20 Oct 2025 18:32:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760985132; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iT7ccAFVTpUebj4ovDV5xQ0ZKEcTEFyEeOMAAetYvEA=; b=QtiYz0LqJPQiZHAtEx04u3+D5qMid7XppyY/NKRn8cKH6EUZ5WdzXGR7+m/Er8wBybdSYN D1HSel/Lv9L5gJVixNtyVKTjfjYjaZljgsqrgDfJOqhH800Y5ZJMn2ccfG9aczicxeC/Za +Pvy1R8bEVcXuh/LbjkKb/ypqWmHyZIWVzKM8M5AsyIeuqWMu8esNFfamwQ/A85dqlyG6C JM3eY9Om+/q/nIuFqBJ+Bog9RrRgzJxcZwVt8D+X1m1PwBZqrisuQ2hsT46K/RpDIj1Unz qx3Zkc2vfLfDcbfaiE5S4apUauLvtPanMlZ9ZgaFncLICSgsFfDnk5VkN39kjA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760985132; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iT7ccAFVTpUebj4ovDV5xQ0ZKEcTEFyEeOMAAetYvEA=; b=a6I0lF7w2QSs2sPzxpV2TA5lT606rRYEjjcXyyXjEOEs/bGe534BDUUKGzpls43clZhcLa AwLHKIHF7XEVRFdk492LplLE+ZHshYESeEMpRNEvpTOwKoYIz6DAPjrIwhRsqk+Yu6eCUa nQt7bc608yhSth7HCscWTwe4JFQKdNF0B5O2DaCnkWvQMfltd0V1kpyrpHq//bXVR1Kvtr DDa/eux+bsG9Wl2f3x8QSNs1T2PWD5C32KRFUIOkIYp4rFZeS3jvh7dHSILujOT7jkQVP1 JVsojVuiEQZQZxl9eU8AiAGr7zynd+K5qUiY8akMLf8pJn8z3+cXd8A3bZSgZw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760985132; a=rsa-sha256; cv=none; b=VKHHHJGcviIRhb5F0ZjsOXVoxT8svqa6kSFYPmbN8jJ42HmpSaBzGHWKb1mg3YnuuJh11s 9AsOMhf7WZ/ZMc7JKNpEA+Hgsp0ci3IX3/eB5SyxKXWDO6FPfR65T1QJ3tSh6/hQrfTCnw j8+tDIRSVq77dumuTLHpsJAJ3bxjkjMtO74AOorfvJa6OzkZjje+7V9c4vOH49UsxxNOsu PmVsj66g4QL1E7tsZn4PvjZ6kFiG+BT4AGYt9zuV9UHoduW0BraUs8po8RZdlMLCddhydD XqBbmz0eV4pz+tRcJlGLnzPrdx6S5Wz99KiAn7O8lS/nwkVJbuCE1GjP4akjAA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cr3th3Qwsz7Xq; Mon, 20 Oct 2025 18:32: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 59KIWCaL006627; Mon, 20 Oct 2025 18:32:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59KIWCG0006624; Mon, 20 Oct 2025 18:32:12 GMT (envelope-from git) Date: Mon, 20 Oct 2025 18:32:12 GMT Message-Id: <202510201832.59KIWCG0006624@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: e1aeb58cbbc3 - main - inet_net_test: Use int to hold expected return values from inet_net_pton List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e1aeb58cbbc3839db93ec38ce491b7b9383d5649 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=e1aeb58cbbc3839db93ec38ce491b7b9383d5649 commit e1aeb58cbbc3839db93ec38ce491b7b9383d5649 Author: John Baldwin AuthorDate: 2025-10-20 18:31:41 +0000 Commit: John Baldwin CommitDate: 2025-10-20 18:31:41 +0000 inet_net_test: Use int to hold expected return values from inet_net_pton GCC warns about the sign mismatch in comparisons: lib/libc/tests/net/inet_net_test.cc: In member function 'virtual void {anonymous}::atfu_tc_inet_net_inet4::body() const': lib/libc/tests/net/inet_net_test.cc:86:17: error: comparison of integer expressions of different signedness: 'int' and 'const unsigned int' [-Werror=sign-compare] 86 | ATF_REQUIRE_EQ(bits, addr.bits); | ^~~~~~~~~~~~~~ lib/libc/tests/net/inet_net_test.cc: In member function 'virtual void {anonymous}::atfu_tc_inet_net_inet6::body() const': lib/libc/tests/net/inet_net_test.cc:205:17: error: comparison of integer expressions of different signedness: 'int' and 'const unsigned int' [-Werror=sign-compare] 205 | ATF_REQUIRE_EQ(bits, addr.bits); | ^~~~~~~~~~~~~~ Fixes: 8f4a0d2f7b96 ("libc: Import OpenBSD's inet_net_{ntop,pton}") --- lib/libc/tests/net/inet_net_test.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/libc/tests/net/inet_net_test.cc b/lib/libc/tests/net/inet_net_test.cc index 4ecf5a3de492..c4411373165e 100644 --- a/lib/libc/tests/net/inet_net_test.cc +++ b/lib/libc/tests/net/inet_net_test.cc @@ -50,7 +50,7 @@ ATF_TEST_CASE_BODY(inet_net_inet4) struct test_addr { std::string input; - unsigned bits; + int bits; std::string output; }; @@ -134,7 +134,7 @@ ATF_TEST_CASE_BODY(inet_net_inet6) struct test_addr { std::string input; - unsigned bits; + int bits; std::string output; }; From nobody Mon Oct 20 18:32:13 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cr3tk0D58z6Ctwm; Mon, 20 Oct 2025 18:32:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cr3tj58PVz43qk; Mon, 20 Oct 2025 18:32:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760985133; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hHUHKZxplxy5U5G8AMonBVKLFdUNdP9ndirIA2Lf1Ys=; b=Og4tMEf72ZSY8B191jPnLDhCSciMGKWf4Mb3W0XMjeWA/cpHz90BPL3MplxBrTEHMxmuAp YzLk8aQkOn7BCXcpUqWJImn/502/BmXt/mcNwwytiUdSaldIiol+nqI5b4w/jZykjWJc0r o3CZgmEYGyjByy9zkBK0JP/x5tTCTaog29jQO1fF0THrGumptEipVNYxltKUuS848RyxZ+ UxGkf/iEl+C9lgwbBi592ITpF6xXzU57m28Xdxj11IM6ZU7S9tL0b1Dauw1Ji0mdlmzVlZ G6T1xHQa+NgdHY8OJdYFKIx/HEZl6M2mYVia4D9ytFq/kqoR5gY75cnMmleD7w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760985133; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hHUHKZxplxy5U5G8AMonBVKLFdUNdP9ndirIA2Lf1Ys=; b=HJ6/KrNBtvynXzm0XUoz8IXve1ReXyj4oo0wP3SORrEf8tCmVx2QogmbHAfPEnH28vON4v SDDOR1wWeGcn9Ut4cOjlh3ky884/r29N3xNhRgd/NkJMy2qx3GLrr8ALZhxdqg15BAe5Ta noBJHyeM4fQ2iMFmeioNmZ7P03vHsLnKAxboingEhiO/xrdkcF2/Flt7EQcM68j38UyASo EKqjYHdSsD22C4BfD/WCQL3slKZuf+Do9bU8rUw/4pTj9GjOZetDqgKcdkZWuGVoSrBdUf Z2qgGVp4Ml6LLyZ6i3zd/oe/R0Bk0TDzdQwhtfNnNreQz579RrT6UCYS04mEXg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760985133; a=rsa-sha256; cv=none; b=jw4VZWkk7n/Zi3e34IxHuXcvMl956VYVs3mHW+jbOnNhKgeXEUv0WNlrOvyuAyX/jJBEl/ N84ZF7Wg5km8hTX/fLEErRaqR83TwLmHaoyvsxC5qNg6n4PlSvpipnQ3vaFkGKrYGNlUBY nxoX9g+nwKO6rPfwrva3eHuOElpciFoWH8mc2zHIaWcIok1KJxPVcsP//p3N6wud9PeRLl KhAuYd8HxnPN6rn9tMkMd4itzxuWyDxDyxGNHRSkoG6M/zSdjxDLxgDx8x/K8cpo5vuqqf pKDwR0YQMO//w3NSi3FHi48mldOtL4qx5h7yThrp13cqyDxcfekfuoaoO+jaZQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cr3tj4Mvnz8xH; Mon, 20 Oct 2025 18:32:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59KIWDZk006659; Mon, 20 Oct 2025 18:32:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59KIWD3H006656; Mon, 20 Oct 2025 18:32:13 GMT (envelope-from git) Date: Mon, 20 Oct 2025 18:32:13 GMT Message-Id: <202510201832.59KIWD3H006656@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: aa358ce3ca8e - main - inet_net_test: Compare pointers against nullptr List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: aa358ce3ca8e1fcfb305025fd00beb2a119c7c77 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=aa358ce3ca8e1fcfb305025fd00beb2a119c7c77 commit aa358ce3ca8e1fcfb305025fd00beb2a119c7c77 Author: John Baldwin AuthorDate: 2025-10-20 18:31:41 +0000 Commit: John Baldwin CommitDate: 2025-10-20 18:31:41 +0000 inet_net_test: Compare pointers against nullptr GCC does not like passing NULL (__null) to std::ostringstream::operator<< inside of ATF_REQUIRE_EQ: lib/libc/tests/net/inet_net_test.cc: In member function 'virtual void {anonymous}::atfu_tc_inet_net_ntop_invalid::body() const': lib/libc/tests/net/inet_net_test.cc:306:9: error: passing NULL to non-pointer argument 1 of 'std::__1::basic_ostream<_CharT, _Traits>& std::__1::basic_ostream<_CharT, _Traits>::operator<<(long int) [with _CharT = char; _Traits = std::__1::char_traits]' [-Werror=conversion-null] 306 | ATF_REQUIRE_EQ(ret, NULL); | ^~~~~~~~~~~~~~ In file included from /usr/obj/.../amd64.amd64/tmp/usr/include/c++/v1/sstream:317, from /usr/obj/.../amd64.amd64/tmp/usr/include/atf-c++/macros.hpp:29, from /usr/obj/.../amd64.amd64/tmp/usr/include/atf-c++.hpp:29, from lib/libc/tests/net/inet_net_test.cc:33: /usr/obj/.../amd64.amd64/tmp/usr/include/c++/v1/__ostream/basic_ostream.h:338:81: note: declared here 338 | basic_ostream<_CharT, _Traits>& basic_ostream<_CharT, _Traits>::operator<<(long __n) { | ~~~~~^~~ ... Fixes: 8f4a0d2f7b96 ("libc: Import OpenBSD's inet_net_{ntop,pton}") --- lib/libc/tests/net/inet_net_test.cc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/libc/tests/net/inet_net_test.cc b/lib/libc/tests/net/inet_net_test.cc index c4411373165e..60b60b152eca 100644 --- a/lib/libc/tests/net/inet_net_test.cc +++ b/lib/libc/tests/net/inet_net_test.cc @@ -303,25 +303,25 @@ ATF_TEST_CASE_BODY(inet_net_ntop_invalid) std::ranges::fill(strbuf, 'Z'); auto ret = inet_net_ntop(AF_INET6, &addr6, 128, strbuf.data(), 1); - ATF_REQUIRE_EQ(ret, NULL); + ATF_REQUIRE_EQ(ret, nullptr); ATF_REQUIRE_EQ(strbuf[1], 'Z'); std::ranges::fill(strbuf, 'Z'); ret = inet_net_ntop(AF_INET, &addr4, 32, strbuf.data(), 1); - ATF_REQUIRE_EQ(ret, NULL); + ATF_REQUIRE_EQ(ret, nullptr); ATF_REQUIRE_EQ(strbuf[1], 'Z'); /* Check that invalid prefix lengths return an error */ ret = inet_net_ntop(AF_INET6, &addr6, 129, strbuf.data(), strbuf.size()); - ATF_REQUIRE_EQ(ret, NULL); + ATF_REQUIRE_EQ(ret, nullptr); ret = inet_net_ntop(AF_INET6, &addr6, -1, strbuf.data(), strbuf.size()); - ATF_REQUIRE_EQ(ret, NULL); + ATF_REQUIRE_EQ(ret, nullptr); ret = inet_net_ntop(AF_INET, &addr4, 33, strbuf.data(), strbuf.size()); - ATF_REQUIRE_EQ(ret, NULL); + ATF_REQUIRE_EQ(ret, nullptr); ret = inet_net_ntop(AF_INET, &addr4, -1, strbuf.data(), strbuf.size()); - ATF_REQUIRE_EQ(ret, NULL); + ATF_REQUIRE_EQ(ret, nullptr); } ATF_INIT_TEST_CASES(tcs) From nobody Mon Oct 20 18:36:08 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cr3zF6sTtz6CvWT; Mon, 20 Oct 2025 18:36:09 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cr3zF6J5Mz45qh; Mon, 20 Oct 2025 18:36:09 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760985369; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=haNunGXZzSflF9+yDPMpefczDjq/Mo2GKBQk6PNJ/zY=; b=kcQeUjRQDHiwHkvDyJoSCxY9CHb1VSABzokZsihN0OfkkG898QupPAH0jAkICW2b5sMqYk +6RAKg0figowWzE/QRs33HHqaD7nmCGNOGV1AUxubrDCxZW5lk+Nf43hb6a726hYTQoD34 r5Z/gnudUsduftNFXIcHnf7IAOIsHpEXXaJnMCo/iexyNyGAn4sqeCdF2MSeWT55FhAar4 0NnhjA5V3eM1NppQK9Dqpi7/lg2XhwNXsS0SqrxDP9Tpsi7H75pQ3trstgqVwo8yfTJw4v OOfOGsxoepkQPnObfiT+gQzNxx5RTD9iN9PI4hKp6vE/tjVxYgm0autld1Isxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760985369; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=haNunGXZzSflF9+yDPMpefczDjq/Mo2GKBQk6PNJ/zY=; b=KbUaS/NoaJ6NcNnBQ24OZLXJKzR64xWtfiJxE07yYa97Z7ogVm4U8C67mLvUL5Hb/LfeFp Fc6yYSLjUbcMW+OM7AhMLxVYFn0mgLCsZSJnoJyFjbIxoPBR+wEL3WYkPEpW4TR44zHuFT rNyRbzje8VhRaWKJHW2z5A8uyB1LGEYFW1RjAAh1Akwowhl5c8BlUezYha9HfDNpxtPZNN RUQJg1SE23mRxh2E0XzIy+rLiNo3Wkdy3B702wUcOz2cfzAfkiSsp/mLONrNIf11rEByZ1 5FeMRA2AmfxxbdSCkkQY/94zCLr1iYYMKi95Q4bVebwqIlUt1EmXwIRB9CCQCw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760985369; a=rsa-sha256; cv=none; b=VxWab6N8V6TCYpRPy1fL7OcjAdonx84fgU6vgoBW060yADcR8ieewmDK0SL2MJQi7r+ctf 4AZx6rKfBy/eTtm/Ip7r1nZWLVqSyYVxZx6utaM8Tfclxe7JBoXcukN3OnTFQeNfWsP/bi Jgd4/t6kPZphSNWS1cXTK1PSm9AdqbLyaN5rlwwUw2zzbjcsC2L8HipkGRUgUD6RXjxHAc lm0C0H9qMwcugIEXXz9UIIFAj5UoShrfDNdDrP1PpWIQ+Or1lofC8Urx5grC5rYc0fTAl3 pZ3YeqcaSMgreL5b5cRGxQHey/FZpyKJf9cMF3awaKNZZc8KKmPebsmpTbAMHg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from [IPV6:2601:5c0:4202:5670:ecba:d7d9:9ea9:ce3c] (unknown [IPv6:2601:5c0:4202:5670:ecba:d7d9:9ea9:ce3c]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id 4cr3zF46nbz1BlP; Mon, 20 Oct 2025 18:36:09 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: <7af6661d-bcb1-440a-9497-92e2d0c214f8@FreeBSD.org> Date: Mon, 20 Oct 2025 14:36:08 -0400 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 195b00ec45e5 - main - quot: Clean up Content-Language: en-US To: Ryan Libby , =?UTF-8?Q?Dag-Erling_Sm=C3=B8rgrav?= Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org References: <202510171155.59HBtMCp004658@gitrepo.freebsd.org> <86h5vt4ja9.fsf@ltc.des.dev> From: John Baldwin In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit On 10/20/25 13:15, Ryan Libby wrote: > On Mon, Oct 20, 2025 at 9:42 AM Dag-Erling Smørgrav wrote: >> >> Ryan Libby writes: >>> Dag-Erling Smørgrav writes: >>>> In function 'usrrehash', >>>> inlined from 'user' at /workspace/src/usr.sbin/quot/quot.c:244:3: >>>> /workspace/src/usr.sbin/quot/quot.c:210:22: error: argument 1 range [18446744071562067968, 18446744073709551615] exceeds maximum object size 9223372036854775807 [-Werror=alloc-size-larger-than=] >>>> 210 | if ((users = calloc(nusers, sizeof(*users))) == NULL) >>>> | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ >>>> In file included from /workspace/src/usr.sbin/quot/quot.c:51: >>>> /tmp/obj/workspace/src/amd64.amd64/tmp/usr/include/stdlib.h: In function 'user': >>>> /tmp/obj/workspace/src/amd64.amd64/tmp/usr/include/stdlib.h:92:10: >>>> note: in a call to allocation function 'calloc' declared here >>>> 92 | void *calloc(size_t, size_t) __malloc_like __result_use_check >>>> | ^~~~~~ >>> >>> Probably it is from >>> -WARNS?= 2 >>> >>> I think gcc is saying that it thinks nusers may be negative. >> >> It's saying nusers may be large enough that the result of multiplying it >> by sizeof(*users) exceeds an arbitrary threshold, which is technically >> true but completely unhelpful. This gcc option should not be used. >> >> DES >> -- >> Dag-Erling Smørgrav - des@FreeBSD.org > > The message is poor but the limit is not so arbitrary, it is > PTRDIFF_MAX. It's saying that (size_t)nusers may be huge, because it > infers that nusers, being signed, may be negative -- though in reality > it will not be negative. It says the range that will result in huge > values, (size_t)INT_MIN through (size_t)-1. > > Sure, you could disable the warning, kern.mk does that and one other > user make file does too. Or you could convince gcc with a type > constraint, or somehow else. In any case, we should fix the gcc build. Also, the GCC option is not intentionally used, it is just enabled by -Wall. I think disabling it the way we do for krb5 is ok. The only debate I guess is if we should just disable it in userland globally instead of only for quot(8). -- John Baldwin From nobody Mon Oct 20 19:17:59 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cr4vX2LZvz6CyHZ; Mon, 20 Oct 2025 19:18:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cr4vW5c00z487J; Mon, 20 Oct 2025 19:17:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760987879; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DpCa7JHbkgx1HyBsiqEp8xlzjz5o0s3Y3pvf+XqU5R4=; b=FTlp3//RO94E6pEGhwuCR3KNdXZNaSs7jatFYTojf9hw7vF0HH379cGO28rzEIPUoOsRud eHGjp4Nv4PC3JddBbyxqbyL4f+2R1JS1QHdFjITfeLMlmqFvXD+xUpqya8aDN2BQkdgj2y cIfVQ62Lu60elpaokt/SIA1ywz2ZSkpvO+cRjzH5Mursv4ZG0jzGVn1dSzA92c28pz+VZp qz8YaapMgPubGG96ReamM6LPNnA6/N/94WqFcn4xXOL9iFyUuNqGG7g1c3i1iGPpoZR01L o8hHhdJWtwOsvRO48lZcGbP6rIxNPzKRpHKPykdX92Lk4EHFWEUCLWQ822bZxg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760987879; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DpCa7JHbkgx1HyBsiqEp8xlzjz5o0s3Y3pvf+XqU5R4=; b=Fmb7PMRi8mkwCxFE2442s8B4g9wbmUe9yf9VKqm4nnbyyn6Lez+R9ZS/StzjFRVt1T7hgq ewylZRxkD4UJ31zyFA1Sth73qfIVl4a1CWCEsTkgxnSjC26w6UO+Gu89Gm4bDe5EWN2fLI WxA4wsjoJ+mJmJA6ugpEqbaMJCPTU9Uj7PmJ9YqWzmsQypogA29N0RUt4w+k1FMbSHcGXl ig8pLwuegw4kJSFPB/fSfpRcmuOTfOr5SqX+LGRIGqqkmWO8SJWSFoH7s+Z2+xQhNfs2xn KwCaaS0/c79ZFULj9OCS9kXXCuiPpok98npUm+vkfNj4KK3Sn/SFO5FAS+7ROw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760987879; a=rsa-sha256; cv=none; b=ELDObQwRT/DFbOqyUIiNVIZxVT0dD4lUY5/UoCui0iQeL5SaFhEctojQG9yZUhqfeQEa+9 TB34+DeCbffyjd1O754I1E/v0TI5ie1lTf+VQMveUIwP5R5s+YZVX5X0OfFfEzMICSPU2d YVkHH8K5CnnbY8+usdEf1r1dpZcsfk6AAnjsonoT1kI1ImejLbMuTnkw3dXkBHfwNRbwI8 VwB8SwUezSqianvHcsmnmHpC5WZ0fcuiEkKw+hbmQaYsy/iolGOxyQzFPx0Jh25omEWApF qojF6SvokwCbprB0FqiyglZBmSS4q5bI7tpUyt6Wg19BgX3/upPYDYDgcaflqQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cr4vW4r1Sz9nd; Mon, 20 Oct 2025 19:17: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 59KJHxCq084204; Mon, 20 Oct 2025 19:17:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59KJHxup084201; Mon, 20 Oct 2025 19:17:59 GMT (envelope-from git) Date: Mon, 20 Oct 2025 19:17:59 GMT Message-Id: <202510201917.59KJHxup084201@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Jean-S=C3=A9bastien?= =?utf-8?Q?P=C3=A9dron?= Subject: git: b596b4496568 - main - zfs: zfs_getpages: Don't zero freshly allocated pages List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dumbbell X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b596b4496568c21e1e8f9c21be913cfc5b71bd9b Auto-Submitted: auto-generated The branch main has been updated by dumbbell: URL: https://cgit.FreeBSD.org/src/commit/?id=b596b4496568c21e1e8f9c21be913cfc5b71bd9b commit b596b4496568c21e1e8f9c21be913cfc5b71bd9b Author: Jean-Sébastien Pédron AuthorDate: 2025-10-16 08:16:18 +0000 Commit: Jean-Sébastien Pédron CommitDate: 2025-10-20 19:16:43 +0000 zfs: zfs_getpages: Don't zero freshly allocated pages Initially, `zfs_getpages()` is provided with an array of busy pages by the vnode pager. It then tries to acquire the range lock, but if there is a concurrent `zfs_write()` running and fails to acquire that range lock, it "unbusies" the pages to avoid a deadlock with `zfs_write()`. After that, it grabs the pages again and retries to acquire the range lock, and so on. Once it got the range lock, it filters out valid pages, then copy DMU data to the remaining invalid pages. The problem is that freshly allocated zero'd pages it grabbed itself are marked as valid. Therefore they are skipped by the second part of the function and DMU data is never copied to these pages. This causes mapped pages to contain zeros instead of the expected file content. This was discovered while working on RabbitMQ on FreeBSD. I could reproduce the problem easily with the following commands: git clone https://github.com/rabbitmq/rabbitmq-server.git cd rabbitmq-server/deps/rabbit gmake distclean-ct RABBITMQ_METADATA_STORE=mnesia \ ct-amqp_client t=cluster_size_3:leader_transfer_stream_send The testsuite fails because there is a sendfile(2) that can happen concurrently to a write(2) on the same file. This leads to sendfile(2) or read(2) (after the sendfile) sending/returning data with zeros, which causes a function to crash. The patch consists of not setting the `VM_ALLOC_ZERO` flag when `zfs_getpages()` grabs pages again. Then, the last page is zero'd if it is invalid, in case it would be partially filled with the end of the file content. Other pages are either valid (and will be skipped) or they will be entirely overwritten by the file content. This patch was submitted to OpenZFS as openzfs/zfs#17851 which was approved. Reviewed by: avg, mav Obtained from: OpenZFS OpenZFS commit: 8a3533a366e6df2ea770ad7d80b7b68a94a81023 MFC after: 3 days Differential revision: https://reviews.freebsd.org/D53219 --- sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c index e5344497f1be..f34a2fd37a77 100644 --- a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c +++ b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c @@ -4223,8 +4223,20 @@ zfs_getpages(struct vnode *vp, vm_page_t *ma, int count, int *rbehind, zfs_vmobject_wlock(object); (void) vm_page_grab_pages(object, OFF_TO_IDX(start), - VM_ALLOC_NORMAL | VM_ALLOC_WAITOK | VM_ALLOC_ZERO, + VM_ALLOC_NORMAL | VM_ALLOC_WAITOK, ma, count); + if (!vm_page_all_valid(ma[count - 1])) { + /* + * Later in this function, we copy DMU data to + * invalid pages only. The last page may not be + * entirely filled though, if the file does not + * end on a page boundary. Therefore, we zero + * that last page here to make sure it does not + * contain garbage after the end of file. + */ + ASSERT(vm_page_none_valid(ma[count - 1])); + vm_page_zero_invalid(ma[count - 1], FALSE); + } zfs_vmobject_wunlock(object); } if (blksz == zp->z_blksz) From nobody Mon Oct 20 21:00:37 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cr79x5JMgz6D7WV; Mon, 20 Oct 2025 21:00:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cr79x4mjxz3TYl; Mon, 20 Oct 2025 21:00:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760994037; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QwQlQDQaCvgckeeWVhz2FRfJUC6iG+3uYlMtLqwQlFs=; b=EEJbo5ddN6gUXwKt/UOSag+KQWTZLE77AZjviBR+so20Y7ALiZmiln8sWt4yeLTfSyex4k oWzqz6YBHQYymv6TtfMME4WMY8EFln8urucZuiNJuUJhJt5S+NDR6sKWrOD84UWgSSF7qp oJjRBZ5fKdgFw7JuCMCtINFFl4sURUa4QaMY8l+wQ5y44yULNYYfRahymS7Fq/Dt7+CYGu YK5/IZeFp0pmqMjXBtabDNjlGJ1gSEN76/zHk++bgFK1jpAWfIzDuXSMGN4WfmOURWq+7G XXuOx/e26cO6xFvQvthwwafAozUAg2zQ39nkpBJSTg4hnVEw8wtlFJW+oUVEuQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760994037; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QwQlQDQaCvgckeeWVhz2FRfJUC6iG+3uYlMtLqwQlFs=; b=qalFeNp2d0ZcsIcPFzeq1l2UmGOHV5Vu20tfiIEegubrCirxOnZr8S6UBgPrHU1Jrma4+M 8CAUiTB3rWriJn+roasoHMOzliq+Iqa3DvDPb6HsjJCYmeGHBobpUilQ8ezTFzyPA9YDy/ KK3f7LST8HwZ4PW5c/HufwhoIif4JOQ+VdoWvbklQKMkcgQnyZ7WME/Sosb8w+LFYtyCBE Ur7HTvFWPtCG6Gt1aPxfhk9o4R1WxXHJcK6htsJ4bVBnE2xSRYeMZ4cvX8t5HnBqpQ7f9J cKt4BE45oMeuX+Rv8pKX6Vtdg+B8hOAQ5KohYwLYqKG7pd01uLr2qXxLO9doMg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760994037; a=rsa-sha256; cv=none; b=Ag+4TxP9G/M69spQVzX2YPxh9An0eFLZli9HDYODIICY5cl8/u3suEfD7rgxICA4wBrtWX f0lixV/gV/pmTYPb/dVSPh1ZK1JFfYqTNQ0pY3KKu7R5wHvNmMja/DH2Nl5DqGqle238BY 48x5GBd8SHkcu5roORADJQQ60g/DN9EScOldfnb31VHL1TW1+bXLnRsJrvH4A6mIFR3/iZ RrBGbFqiGKRugKSj9vU2uhwopRK/sSAAdKxgixZ56kq0UVJ/UF8BQkIvkKk1Owm1eUoiuP S9Vx5eRmo78rsKwslBBYxsivjDYHGXo/dR3oH1ik6ZWtgl9Bap09uYizeeU7tA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cr79x3xJMzDTs; Mon, 20 Oct 2025 21:00: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 59KL0bSx082806; Mon, 20 Oct 2025 21:00:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59KL0bET082803; Mon, 20 Oct 2025 21:00:37 GMT (envelope-from git) Date: Mon, 20 Oct 2025 21:00:37 GMT Message-Id: <202510202100.59KL0bET082803@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: 2b5c62494df9 - main - release: Add pkg .conf to METALOG on dvd List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2b5c62494df95cdb844b5f6f852412f2178f66dd Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=2b5c62494df95cdb844b5f6f852412f2178f66dd commit 2b5c62494df95cdb844b5f6f852412f2178f66dd Author: Colin Percival AuthorDate: 2025-10-19 16:59:08 +0000 Commit: Colin Percival CommitDate: 2025-10-20 21:00:26 +0000 release: Add pkg .conf to METALOG on dvd We're correctly recording all of the packages in the dvd METALOG file, but if we don't record ./packages/repos/FreeBSD_install_cdrom.conf then users won't be able to install them very easily. Reviewed by: markj Reported by: Lars Tunkrans MFC after: 3 days Sponsored by: https://www.patreon.com/cperciva Differential Revision: https://reviews.freebsd.org/D53199 --- release/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/release/Makefile b/release/Makefile index 13532097d56c..a777ded3c429 100644 --- a/release/Makefile +++ b/release/Makefile @@ -430,6 +430,8 @@ pkg-stage: dvd mkdir -p ${.OBJDIR}/dvd/packages/repos/ cp ${.CURDIR}/scripts/FreeBSD_install_cdrom.conf \ ${.OBJDIR}/dvd/packages/repos/ + echo "./packages/repos type=dir uname=root gname=wheel mode=0755" >> dvd/METALOG + echo "./packages/repos/FreeBSD_install_cdrom.conf type=file uname=root gname=wheel mode=0644" >> dvd/METALOG .endif touch ${.TARGET} From nobody Mon Oct 20 21:08:14 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cr7Lk2vLWz6D7xm; Mon, 20 Oct 2025 21:08:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cr7Lk2JSSz3VCN; Mon, 20 Oct 2025 21:08:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760994494; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NRfO8uaBTuyyoitHe/CxsFvi4cPoD3YG2Z08Ye/rsOY=; b=xnnaO18qjeURMx6jV6JlLv7w43I5T0pTio+bfQKFbtQzyEMIp6x7j83zwdbuU84GmCpcCM Y1SHv407TPYySktRxt1IPXx+uChYia42/LSmF/LMJegJ/45lQQqJs4XLk1UcMUGA7poCRe 4Sna7/h+5PNT21XeNptnwy3PwFXlDbo7aUVEFM3NCTWrD2istN+GUcncwzcItn2w+dDAhd OHL6KmKobZ9nYyZVtWz0OWZac08Yue9Jjb7veiN/gnvVt8jlF+HhhDtHOwfHg7n0L1KlP1 q/YccYX6gEuKsHVmJIDPsPsx0Al3YMDEt2uFNVnNwjVQQqvk8ERdu1lnN1uk0g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760994494; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NRfO8uaBTuyyoitHe/CxsFvi4cPoD3YG2Z08Ye/rsOY=; b=I6A6yF5Oh6qJAym9UlfyITEz+5+4GOCiPaUGAzbe/XWEKvzyOS6VncbnxMEMM3xsAHiWiZ fwYw2HTHc19di2stlvMV3kI7qGhn4lXBWD0aKDRj76TqM+wLYC2bK6UwsHZOX41/6FWUg6 5A2jhZop0WvpcSDLAjhoUrZQEqViEsi+BCZdbULFlMkm6e3AaaWLskkrjNBDnvLjls2FwP pEYBZIQ8Gw+sCiuLVvM9ulYTgj7hLmxCsZawwMd1J1X3SsN6izvz2Olhb0Fo8LVbZZyyMX Jwuih3Oxz5oqEkn9o83NGZq2N10hUOX8f4DzhdVy0BohUJT3QGUNmdB6sW+XRA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760994494; a=rsa-sha256; cv=none; b=mcYI7HHT7K3ZpB5uTOPODsM2L57m7Nsyws7CW7D5e5fF5yPDNkSLH7FkSoN4WTlhG7hbhh yIwgqAZoQ9ojHQa9vKIPD11OmWGs7eyMyV4G8CyQOKPDwyL4P7zDtOKDEIdIYVH/Kppk5I 4/2qClh64mtfGhndDCex2gF9ryLCDj/JjI8f1bNUrmRHfZtTS4aOzOc3sY2GK7xmgDcPio yAhULQJTz1ar8Q+mdkGA4EeNjajZpJI63bte5NWz/D8T9EoKk7whLF/b4s83gLyLRkC95k jtCq5iGKAMAxN45eR6JAZgV+9HifCtKSwhZELhwcHzt0CclzmkBer7DKL1EAkA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cr7Lk1pQzzTVv; Mon, 20 Oct 2025 21:08:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59KL8Ena092060; Mon, 20 Oct 2025 21:08:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59KL8EmS092056; Mon, 20 Oct 2025 21:08:14 GMT (envelope-from git) Date: Mon, 20 Oct 2025 21:08:14 GMT Message-Id: <202510202108.59KL8EmS092056@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Jason A. Harmening" Subject: git: 35170408a7b8 - main - AMD IOMMU: fix per-device IOMMU bypass when IR is enabled List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jah X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 35170408a7b86a879d7e2ffb5ddb70fe75951d89 Auto-Submitted: auto-generated The branch main has been updated by jah: URL: https://cgit.FreeBSD.org/src/commit/?id=35170408a7b86a879d7e2ffb5ddb70fe75951d89 commit 35170408a7b86a879d7e2ffb5ddb70fe75951d89 Author: Jason A. Harmening AuthorDate: 2025-10-20 01:53:08 +0000 Commit: Jason A. Harmening CommitDate: 2025-10-20 21:06:47 +0000 AMD IOMMU: fix per-device IOMMU bypass when IR is enabled When interrupt remapping (IR) is enabled, the device table entry (DTE) for a given device will likely be initialized by amdiommu_ir_find() during MSI configuration. This function directly calls amdiommu_get_ctx_for_dev() with id_mapped=false, which means that any attempt to disable DMA remapping for the device (e.g. by setting hw.busdma.pciD.B.S.F='bounce' in the loader tunables) will effectively be ignored as the paging mode field in the DTE will not be set to 0 as required for identity mapping. This will ultimately produce an unusable device, because busdma will later observe the bounce configuration through iommu_instantiate_ctx() and will employ the non-translated 'bounce' busdma methods for the device, while the DTE remains configured to enable translation. Fix this by tweaking iommu_instantiate_ctx() to always return the relevant per-device context object even if translation is disabled, and adopt it in amdiommu_ir_find() instead of directly calling amdiommu_get_ctx_for_dev(). Reviewed by: kib MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D53209 --- sys/dev/iommu/busdma_iommu.c | 7 +++++-- sys/x86/iommu/amd_intrmap.c | 9 ++++----- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/sys/dev/iommu/busdma_iommu.c b/sys/dev/iommu/busdma_iommu.c index 668ccf056463..82f73d469585 100644 --- a/sys/dev/iommu/busdma_iommu.c +++ b/sys/dev/iommu/busdma_iommu.c @@ -295,7 +295,6 @@ iommu_instantiate_ctx(struct iommu_unit *unit, device_t dev, bool rmrr) } else { iommu_free_ctx_locked(unit, ctx); } - ctx = NULL; } return (ctx); } @@ -303,6 +302,7 @@ iommu_instantiate_ctx(struct iommu_unit *unit, device_t dev, bool rmrr) struct iommu_ctx * iommu_get_dev_ctx(device_t dev) { + struct iommu_ctx *ctx; struct iommu_unit *unit; unit = iommu_find(dev, bootverbose); @@ -313,7 +313,10 @@ iommu_get_dev_ctx(device_t dev) return (NULL); iommu_unit_pre_instantiate_ctx(unit); - return (iommu_instantiate_ctx(unit, dev, false)); + ctx = iommu_instantiate_ctx(unit, dev, false); + if (ctx != NULL && (ctx->flags & IOMMU_CTX_DISABLED) != 0) + ctx = NULL; + return (ctx); } bus_dma_tag_t diff --git a/sys/x86/iommu/amd_intrmap.c b/sys/x86/iommu/amd_intrmap.c index f8900fe0561f..cce4f57ca323 100644 --- a/sys/x86/iommu/amd_intrmap.c +++ b/sys/x86/iommu/amd_intrmap.c @@ -223,9 +223,9 @@ static struct amdiommu_ctx * amdiommu_ir_find(device_t src, uint16_t *ridp, bool *is_iommu) { devclass_t src_class; - device_t requester; struct amdiommu_unit *unit; struct amdiommu_ctx *ctx; + struct iommu_ctx *ioctx; uint32_t edte; uint16_t rid; uint8_t dte; @@ -255,10 +255,9 @@ amdiommu_ir_find(device_t src, uint16_t *ridp, bool *is_iommu) error = amdiommu_find_unit(src, &unit, &rid, &dte, &edte, bootverbose); if (error == 0) { - error = iommu_get_requester(src, &requester, &rid); - MPASS(error == 0); - ctx = amdiommu_get_ctx_for_dev(unit, src, - rid, 0, false /* XXXKIB */, false, dte, edte); + ioctx = iommu_instantiate_ctx(AMD2IOMMU(unit), src, false); + if (ioctx != NULL) + ctx = IOCTX2CTX(ioctx); } } if (ridp != NULL) From nobody Mon Oct 20 21:10:40 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cr7PY0llWz6D81B; Mon, 20 Oct 2025 21:10:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cr7PX75Dzz3Vhd; Mon, 20 Oct 2025 21:10:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760994641; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kTxd3qYvwvkQfb30JO1S1rG//Hk5cnZRCZrX93b+MhM=; b=j9bi4jhd3IlZux/HyJxh+Y1/CtXCXpzGShXWl/PncoG4NrETiOgb93jflhDDFN/mjY87I4 OfrXPuYFcdeiCf5f22L/PsLAzx4P1RG5t2OOwsQxgg1qvyLy9UwX5ZIQLnLA/Q0kJlbN9A L73Ab+dsb5QR/6RJ8GEgD6YH8HBXX32mqAD01MRQ4efTEoSH0Uu9qPlB5Y6JaS6bw3Pq86 l+5t9cBPYvTvDVyVruLB3/uL0E0RndT2frLItlkbIC5xqO/3amhOnMtN8yT7aMpTnqcXrx n7DF7hGsizdlmVfYWiEYM/8oxQsZrDCUOfFPGdi9mA8xsQH+TZmZcHo6J+zWqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760994641; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kTxd3qYvwvkQfb30JO1S1rG//Hk5cnZRCZrX93b+MhM=; b=W5V560syuRx2jz65kYjp97KjhhD3h0r7dySvYlFJTgEzQ41bbGGV2h9LLU7ZUdArDbfeIn MjUNLznfUAa9slpbhQN/nWUNj8GCv1EEKyuglWf/JFNF+88WlbyDDcYd1vEYRwwhvKlCfS eNMastR+ayHf+fOtA0c3OrCfFZ3+BvFy9SjR9PPf8nDgg2XjrSixSeFtWjsaNteZM+S4k/ A4xZirSsZ6meuRHBWIineeKI2MMwbkUy9AeXVk9ge8OJBp8kLI0/L3lJxJMJVyyPsyEZLv POs19D3+D7NivuvBQrnmPam0JQO/458Pom4livd2LRue2B05nUqea4fDhjtQWA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760994641; a=rsa-sha256; cv=none; b=hWxiFaB/y1cqTD/2s29M/98NwVCkyymrfppu9aRjvaF4g5L5wfkIPbAXlrKZ6uREHKR78h kpeoeYZRituc7/K9YjwqMp6A6GESyhjZL4gxYiuxmLTucqus3FPR2DGM6jFrCtcHBKRWtB CMC4XVlvmcqpW6pd5HX2Tse+ccMnfJC5hy28VurvBIN1FjLpzaYiXMWTxAa/27gDcuS7Ad 9f/aiQrODp/obx3/hVFhz0q0pz/PtHzjpepxlU2Hby0Rmx0YICodUx0g8jAYcvu+ZTW1af i/buoKJunu7pzaYCT+L9c6qJDzQvh6/CJga4QVPFA98xH74JrdZh4UAGXJPT7w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cr7PX6MXszTkR; Mon, 20 Oct 2025 21:10: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 59KLAecU001661; Mon, 20 Oct 2025 21:10:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59KLAeFZ001658; Mon, 20 Oct 2025 21:10:40 GMT (envelope-from git) Date: Mon, 20 Oct 2025 21:10:40 GMT Message-Id: <202510202110.59KLAeFZ001658@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: 5f6f2c3fa25b - main - UDP: let udp_pcblist() support UDP and UDP-Lite List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5f6f2c3fa25b3f37936b564b433251c33b27a8b3 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=5f6f2c3fa25b3f37936b564b433251c33b27a8b3 commit 5f6f2c3fa25b3f37936b564b433251c33b27a8b3 Author: Michael Tuexen AuthorDate: 2025-10-20 21:07:38 +0000 Commit: Michael Tuexen CommitDate: 2025-10-20 21:10:34 +0000 UDP: let udp_pcblist() support UDP and UDP-Lite Provide the IPPROTO_UDP in the arg2 parameter of udp_pcblist() and use this to determine the inpcbinfo. This allows the same function to be used in an upcoming commit to provide the list of pcbs for UDP-Lite just by providing IPPROTO_UDPLITE in the arg2 parameter. Reviewed by: rrs MFC after: 3 days Pull Request: https://reviews.freebsd.org/D53218 --- sys/netinet/udp_usrreq.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c index cea8a916679b..0a89d91dfc37 100644 --- a/sys/netinet/udp_usrreq.c +++ b/sys/netinet/udp_usrreq.c @@ -787,7 +787,8 @@ udplite_ctlinput(struct icmp *icmp) static int udp_pcblist(SYSCTL_HANDLER_ARGS) { - struct inpcb_iterator inpi = INP_ALL_ITERATOR(&V_udbinfo, + struct inpcbinfo *pcbinfo = udp_get_inpcbinfo(arg2); + struct inpcb_iterator inpi = INP_ALL_ITERATOR(pcbinfo, INPLOOKUP_RLOCKPCB); struct xinpgen xig; struct inpcb *inp; @@ -799,7 +800,7 @@ udp_pcblist(SYSCTL_HANDLER_ARGS) if (req->oldptr == 0) { int n; - n = V_udbinfo.ipi_count; + n = pcbinfo->ipi_count; n += imax(n / 8, 10); req->oldidx = 2 * (sizeof xig) + n * sizeof(struct xinpcb); return (0); @@ -810,8 +811,8 @@ udp_pcblist(SYSCTL_HANDLER_ARGS) bzero(&xig, sizeof(xig)); xig.xig_len = sizeof xig; - xig.xig_count = V_udbinfo.ipi_count; - xig.xig_gen = V_udbinfo.ipi_gencnt; + xig.xig_count = pcbinfo->ipi_count; + xig.xig_gen = pcbinfo->ipi_gencnt; xig.xig_sogen = so_gencnt; error = SYSCTL_OUT(req, &xig, sizeof xig); if (error) @@ -838,9 +839,9 @@ udp_pcblist(SYSCTL_HANDLER_ARGS) * that something happened while we were processing this * request, and it might be necessary to retry. */ - xig.xig_gen = V_udbinfo.ipi_gencnt; + xig.xig_gen = pcbinfo->ipi_gencnt; xig.xig_sogen = so_gencnt; - xig.xig_count = V_udbinfo.ipi_count; + xig.xig_count = pcbinfo->ipi_count; error = SYSCTL_OUT(req, &xig, sizeof xig); } @@ -848,7 +849,7 @@ udp_pcblist(SYSCTL_HANDLER_ARGS) } SYSCTL_PROC(_net_inet_udp, UDPCTL_PCBLIST, pcblist, - CTLTYPE_OPAQUE | CTLFLAG_RD | CTLFLAG_MPSAFE, NULL, 0, + CTLTYPE_OPAQUE | CTLFLAG_RD | CTLFLAG_MPSAFE, NULL, IPPROTO_UDP, udp_pcblist, "S,xinpcb", "List of active UDP sockets"); From nobody Mon Oct 20 21:19:53 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cr7c940DJz6D8kb; Mon, 20 Oct 2025 21:19:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cr7c93Mtwz3Wgd; Mon, 20 Oct 2025 21:19:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760995193; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wAk2MD0Z7IfmviNiItbBFPfeRn3CzEHKzeE++knDv74=; b=EiOmgrODXxrYRtzCAwUM6UkwLX2e1moTolI1bYFOeQAMdic3nN0xh94Mp/x9WAvqL5YclS 0RlifA6f6ud4XJL2kjgdird3X8bK6+rbsDG+Jz/kRm/c/xEXFmX5psucsj7G0NOXTaKRHf jcTn29VaSDtnC8MICA5CS5F2a74vEphZWMh1Fab7c68+uxt3qLgrKsBxXHw27Ja+qRnkqY Bal1ttC+ZvV/Kk1d56uFU+6DFHYemD7AAjPiI5lHy22zQE83oKyOL1Yk6UlzNhktO3uQcO e/odLH8vi0J2+t4gFUwcqtfVxkVzsLGPzDS2pAMFOhARVI63B0TShaAOQwro4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760995193; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wAk2MD0Z7IfmviNiItbBFPfeRn3CzEHKzeE++knDv74=; b=EBMBSAW30Me5Xm2ASqP9AhiU7+nsMEPB5G3d83etxe49yiyQ9GjYhzI+fySuVzxgUpz8Hp Dtti0CqfU3dSmthCuoFQixqT7n0J2CmEI1fskswTsUNa7tZyNidr9NI/WVe8+sT12wbOXq YFb5Nb7tWmKDBnCEg3cEhuH+l42WxW74ygmiRdTQZYW6oLR6tlcnukgEWGwu+nKeGZy3VX 3y6VkhHD+CosgnkyrRqj0/IDiwSrRk0K1bQRxDDgXnPAiECbLAvfmQkxkAJGFyDFuyq9jm +Z1+zHQdk9DxuLqP8Vmc6q867znM+MqS7F4v8t7D+xBKizjHwFb8H93aKH8zbA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760995193; a=rsa-sha256; cv=none; b=dU7YZkudAQ7TSswvjsKdCzwGqIpuUwcRlM/8cHIzEGKrgq91hq8O7rpqT1tLYIn7KT5u51 logwDXNwl5YB1Mi4bP6Gk7KNW16/FJDhSIgU1YDoysmAsa+C2k6L6BxmeELyuy3zsBGn5A 8D7Vg6wI5kmS/TMQiqKPl7x/VdyGZRtSUWp6947uDv+9HOcddKtA6jkNDK3sUQd08nJ5JL 0FpAYM8ufIk92bxwxVIqSc8VDV7Jom4oUGNSMynIrVO5blIhDNcJmDPvV8OX5juGp0+7m9 bTHMP8seiCBZU5Ra7xEo/danHazkQxme+LQboWAFS5XRhSQH3ryXYr7XJz2IAA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cr7c92hJPzTsq; Mon, 20 Oct 2025 21:19: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 59KLJrir012274; Mon, 20 Oct 2025 21:19:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59KLJr7w012271; Mon, 20 Oct 2025 21:19:53 GMT (envelope-from git) Date: Mon, 20 Oct 2025 21:19:53 GMT Message-Id: <202510202119.59KLJr7w012271@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: 7294d2601f3a - main - Revert "UDP: let udp_pcblist() support UDP and UDP-Lite" List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7294d2601f3a605dac3e86e232b43f29a0f5298d Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=7294d2601f3a605dac3e86e232b43f29a0f5298d commit 7294d2601f3a605dac3e86e232b43f29a0f5298d Author: Michael Tuexen AuthorDate: 2025-10-20 21:19:29 +0000 Commit: Michael Tuexen CommitDate: 2025-10-20 21:19:29 +0000 Revert "UDP: let udp_pcblist() support UDP and UDP-Lite" This reverts commit 5f6f2c3fa25b3f37936b564b433251c33b27a8b3. Missing link to review. --- sys/netinet/udp_usrreq.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c index 0a89d91dfc37..cea8a916679b 100644 --- a/sys/netinet/udp_usrreq.c +++ b/sys/netinet/udp_usrreq.c @@ -787,8 +787,7 @@ udplite_ctlinput(struct icmp *icmp) static int udp_pcblist(SYSCTL_HANDLER_ARGS) { - struct inpcbinfo *pcbinfo = udp_get_inpcbinfo(arg2); - struct inpcb_iterator inpi = INP_ALL_ITERATOR(pcbinfo, + struct inpcb_iterator inpi = INP_ALL_ITERATOR(&V_udbinfo, INPLOOKUP_RLOCKPCB); struct xinpgen xig; struct inpcb *inp; @@ -800,7 +799,7 @@ udp_pcblist(SYSCTL_HANDLER_ARGS) if (req->oldptr == 0) { int n; - n = pcbinfo->ipi_count; + n = V_udbinfo.ipi_count; n += imax(n / 8, 10); req->oldidx = 2 * (sizeof xig) + n * sizeof(struct xinpcb); return (0); @@ -811,8 +810,8 @@ udp_pcblist(SYSCTL_HANDLER_ARGS) bzero(&xig, sizeof(xig)); xig.xig_len = sizeof xig; - xig.xig_count = pcbinfo->ipi_count; - xig.xig_gen = pcbinfo->ipi_gencnt; + xig.xig_count = V_udbinfo.ipi_count; + xig.xig_gen = V_udbinfo.ipi_gencnt; xig.xig_sogen = so_gencnt; error = SYSCTL_OUT(req, &xig, sizeof xig); if (error) @@ -839,9 +838,9 @@ udp_pcblist(SYSCTL_HANDLER_ARGS) * that something happened while we were processing this * request, and it might be necessary to retry. */ - xig.xig_gen = pcbinfo->ipi_gencnt; + xig.xig_gen = V_udbinfo.ipi_gencnt; xig.xig_sogen = so_gencnt; - xig.xig_count = pcbinfo->ipi_count; + xig.xig_count = V_udbinfo.ipi_count; error = SYSCTL_OUT(req, &xig, sizeof xig); } @@ -849,7 +848,7 @@ udp_pcblist(SYSCTL_HANDLER_ARGS) } SYSCTL_PROC(_net_inet_udp, UDPCTL_PCBLIST, pcblist, - CTLTYPE_OPAQUE | CTLFLAG_RD | CTLFLAG_MPSAFE, NULL, IPPROTO_UDP, + CTLTYPE_OPAQUE | CTLFLAG_RD | CTLFLAG_MPSAFE, NULL, 0, udp_pcblist, "S,xinpcb", "List of active UDP sockets"); From nobody Mon Oct 20 21:23:30 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cr7hL5WH6z6D9LZ; Mon, 20 Oct 2025 21:23:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cr7hL4yGbz3Xcg; Mon, 20 Oct 2025 21:23:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760995410; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wMrFTEtIOXYgJraDr1iP561YjReHQixgdWyUDL0Itpc=; b=oCQvoGgNdqOJ31UXqQp32hodWJTZuWUiASVbx4eEhq2hwUNIGd1o9zND+F9cvZ5d1A/2Nf 25oC0HkiHEDaaDl3IRgkJirABV8PiAX32v5up8aTMbCkohyDflSpKRIc167BlhHwJzL1AR P7VyiHzyBgA4TUFJlvnB9db2X2apy6VhqOeGVv6WGy20tqbNjXlHElKBSXm4DkXfwjRWa2 aFmPsJtndVthglQBW2Cg1LxK3K3J4REK8/fB2S5CCFTenv9PLBlJYiV9mQLW5jJsdYMFWv ntuvwIaMnonJWSVIAyR7jj2s88Xb++GlWLeSCWc40jF7mt+kUU0TGvGJhgH3bg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760995410; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wMrFTEtIOXYgJraDr1iP561YjReHQixgdWyUDL0Itpc=; b=uoBBDPXmETBpXeJ7udoUIq/D/E6jRBT/eUh31Zyin5rdCXaKYN5x2UlzXnEFsV1kHaRVrm ad21S+Nax3AqMMnLT+metANj/Q8f63A7/ge9gOppO/Llr+qkslS3/JrtSXKzPJl8fdOSX1 6Zm1zZidm0HQGOs6JFBX0iR+e3kUg+jrKOielntyW4U+2Wo434suEkCuRnQhYcKfxJJawd Xy8Ese3yQjGhrXgOE89z+U0T56RM8XYwaIe5OkXkEecw1VAVyrYtbzW65mTuHgx4b4o0+o 5/8dKJLoZYkLGWeGXYSvJJelVJ0T3jq6kWlB52oPFEwN2RJ0/Ouqni7f19Oosw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760995410; a=rsa-sha256; cv=none; b=EhQdhWUCBaMsxuTyVjF7RiAoCBnM217PtBZg1FPjPqiK+3hpQsCM4GbMfsNE5ZvrPbe4lk pnKtM8deZxmaF3qhK2lyHyf1SL7jSMz/cS0ibYL+SS/b6ns8IKNTmUEZLL2tkecseiipmu FUaOMCNhxOMtncqSHKmXN430rmKyaaONxG0DqzBn1mE+anSjc/E2MRNGTc+XtsAIaSODRI YyxqjR+i7sFiJRRRJf20LSF/0sb3JWJlJlH8Y5zzSahHFtCSvP1g6YEpqL0TDrbrhx2nZv lCYj2rlYyk1lByCz6jcZZ505y8Qo/G469cOFEkbd31ohZuC25dhJoGOJKBdWpw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cr7hL42DSzVXP; Mon, 20 Oct 2025 21:23: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 59KLNUFt028620; Mon, 20 Oct 2025 21:23:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59KLNUrG028617; Mon, 20 Oct 2025 21:23:30 GMT (envelope-from git) Date: Mon, 20 Oct 2025 21:23:30 GMT Message-Id: <202510202123.59KLNUrG028617@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: be3c59ff5082 - main - UDP: let udp_pcblist() support UDP and UDP-Lite List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: be3c59ff508204dbab9e3616dc82ed7620f05d0c Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=be3c59ff508204dbab9e3616dc82ed7620f05d0c commit be3c59ff508204dbab9e3616dc82ed7620f05d0c Author: Michael Tuexen AuthorDate: 2025-10-20 21:21:47 +0000 Commit: Michael Tuexen CommitDate: 2025-10-20 21:21:47 +0000 UDP: let udp_pcblist() support UDP and UDP-Lite Provide the IPPROTO_UDP in the arg2 parameter of udp_pcblist() and use this to determine the inpcbinfo. This allows the same function to be used in an upcoming commit to provide the list of pcbs for UDP-Lite just by providing IPPROTO_UDPLITE in the arg2 parameter. Reviewed by: rrs MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D53218 --- sys/netinet/udp_usrreq.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c index cea8a916679b..0a89d91dfc37 100644 --- a/sys/netinet/udp_usrreq.c +++ b/sys/netinet/udp_usrreq.c @@ -787,7 +787,8 @@ udplite_ctlinput(struct icmp *icmp) static int udp_pcblist(SYSCTL_HANDLER_ARGS) { - struct inpcb_iterator inpi = INP_ALL_ITERATOR(&V_udbinfo, + struct inpcbinfo *pcbinfo = udp_get_inpcbinfo(arg2); + struct inpcb_iterator inpi = INP_ALL_ITERATOR(pcbinfo, INPLOOKUP_RLOCKPCB); struct xinpgen xig; struct inpcb *inp; @@ -799,7 +800,7 @@ udp_pcblist(SYSCTL_HANDLER_ARGS) if (req->oldptr == 0) { int n; - n = V_udbinfo.ipi_count; + n = pcbinfo->ipi_count; n += imax(n / 8, 10); req->oldidx = 2 * (sizeof xig) + n * sizeof(struct xinpcb); return (0); @@ -810,8 +811,8 @@ udp_pcblist(SYSCTL_HANDLER_ARGS) bzero(&xig, sizeof(xig)); xig.xig_len = sizeof xig; - xig.xig_count = V_udbinfo.ipi_count; - xig.xig_gen = V_udbinfo.ipi_gencnt; + xig.xig_count = pcbinfo->ipi_count; + xig.xig_gen = pcbinfo->ipi_gencnt; xig.xig_sogen = so_gencnt; error = SYSCTL_OUT(req, &xig, sizeof xig); if (error) @@ -838,9 +839,9 @@ udp_pcblist(SYSCTL_HANDLER_ARGS) * that something happened while we were processing this * request, and it might be necessary to retry. */ - xig.xig_gen = V_udbinfo.ipi_gencnt; + xig.xig_gen = pcbinfo->ipi_gencnt; xig.xig_sogen = so_gencnt; - xig.xig_count = V_udbinfo.ipi_count; + xig.xig_count = pcbinfo->ipi_count; error = SYSCTL_OUT(req, &xig, sizeof xig); } @@ -848,7 +849,7 @@ udp_pcblist(SYSCTL_HANDLER_ARGS) } SYSCTL_PROC(_net_inet_udp, UDPCTL_PCBLIST, pcblist, - CTLTYPE_OPAQUE | CTLFLAG_RD | CTLFLAG_MPSAFE, NULL, 0, + CTLTYPE_OPAQUE | CTLFLAG_RD | CTLFLAG_MPSAFE, NULL, IPPROTO_UDP, udp_pcblist, "S,xinpcb", "List of active UDP sockets"); From nobody Mon Oct 20 21:42:23 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cr867696bz6DBJG; Mon, 20 Oct 2025 21:42:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cr8675fQlz3YkL; Mon, 20 Oct 2025 21:42:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760996543; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=w7+Nx6/4JfKr6wXWqlywmtCVxqm1AkFpnT8FaUJl53s=; b=Pe9sAw0hcgkJqTkVqvAL7gwhJs2k66xk3jVfH9wWnLc0bTFHMkHqTScnUDW3vUm5d2JOOG mZUg4lazha8TgvpEblZ6lZEsSPXj5pFRN323KbPqH0Cogkb8F4yl+GvdJrZE0Ilm+Iwf6J sizNgUECTH7woQzYrC5QDcR+NR9uzEbmiN/IKUo+hcsq+5PwtrV3sXeHUTneJBbuExWKLm Zey5NZSZ7RgTml5GggJQ5JJiHDYbTd9GrzzwUoNbvHLV+pl+o/zSjO/SHn1xosyGJyHyh3 jY6K0PhfTOYwlYAENZkhnGXBNbBKluyZuwSKykCiIOA+aLI4vZbNPKrp+OO/Eg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760996543; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=w7+Nx6/4JfKr6wXWqlywmtCVxqm1AkFpnT8FaUJl53s=; b=gzLdZRIXK9mnWskC0KJctCoRIj21OjGGEO4h/vlf0czKaN/lJ94wIBB3137kB55Us5m47b 8e3gdQmmsMZXK28Z9fa5UgV0n+M/nxGw/U7L7biBPemuHAxMDipXTrPMkecF6q/JhaOg9E eW/rMvuXWscrjOB0MKvLPI6kBV+/F6E8puW4m+ibXYneMGHozOt98lTTFQg3zo0E+nXCR7 +N8WO5RgJaX932IN2XFZ01xflwZeepguwLHMbH2eY2X3fTfD85BUyw3CTayabs1kIUH3rF 4KHjMUO65LF5wVYaOjSndSXY7HbwTbPE+sQ/Z0+1hU6ELknNRnQdeJMts0l7Rg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760996543; a=rsa-sha256; cv=none; b=YGKB/Iro/9JncvEjbKbb+bM/7T/SF4D+ondlBg3ptIz/caY/tKLqADT2nFVqmeHnwPg6qp wjmbbL0lCZ9IW03P5zDA+lQhYBBid2UJY/PordVZEH0tAEAuDu/Dbv8lWCzc9O58AKAoUE j25YKZMOygYXHaNKv9SoqFwY5fWpP+sPQblDeKnOEUZmD1Aqtf+hmBEigzzmV1Cy5HrAEI mA1nY62SCtySdzTefaj7FY909fnQzuWmf0cmV/TZtgo13Rx6B1JqBGu+Kmv8MnCWq3dH4V XEpVff6thB9h331Bluoaf4XQOLdRZAXVMJ0+NtIuhMgDPvJ9XzZypD/fvq0Lug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cr8675ClwzWn3; Mon, 20 Oct 2025 21:42: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 59KLgNdF065637; Mon, 20 Oct 2025 21:42:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59KLgNoW065634; Mon, 20 Oct 2025 21:42:23 GMT (envelope-from git) Date: Mon, 20 Oct 2025 21:42:23 GMT Message-Id: <202510202142.59KLgNoW065634@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: fa347930f89d - main - quot: Make nusers unsigned List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fa347930f89d4f9d1956573c3bd4b5987127bc12 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=fa347930f89d4f9d1956573c3bd4b5987127bc12 commit fa347930f89d4f9d1956573c3bd4b5987127bc12 Author: Dag-Erling Smørgrav AuthorDate: 2025-10-20 21:41:53 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-10-20 21:42:13 +0000 quot: Make nusers unsigned Fixes: 195b00ec45e5 ("quot: Clean up") Reviewed by: rlibby Differential Revision: https://reviews.freebsd.org/D53224 --- usr.sbin/quot/quot.c | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/usr.sbin/quot/quot.c b/usr.sbin/quot/quot.c index 879580f649b9..5dda36ac8499 100644 --- a/usr.sbin/quot/quot.c +++ b/usr.sbin/quot/quot.c @@ -178,20 +178,20 @@ static struct user { daddr_t spc60; daddr_t spc90; } *users; -static int nusers; +static unsigned int nusers; static void inituser(void) { - int i; struct user *usr; + unsigned int i; if (nusers == 0) { nusers = 8; if ((users = calloc(nusers, sizeof(*users))) == NULL) errx(1, "allocate users"); } else { - for (usr = users, i = nusers; --i >= 0; usr++) { + for (usr = users, i = nusers; i-- > 0; usr++) { usr->space = usr->spc30 = usr->spc60 = usr->spc90 = 0; usr->count = 0; } @@ -201,15 +201,15 @@ inituser(void) static void usrrehash(void) { - int i; struct user *usr, *usrn; struct user *svusr; + unsigned int i; svusr = users; nusers *= 2; if ((users = calloc(nusers, sizeof(*users))) == NULL) errx(1, "allocate users"); - for (usr = svusr, i = nusers / 2; --i >= 0; usr++) { + for (usr = svusr, i = nusers / 2; i-- > 0; usr++) { for (usrn = users + usr->uid % nusers; usrn->name; usrn--) { if (usrn <= users) usrn += nusers; @@ -223,10 +223,10 @@ user(uid_t uid) { struct user *usr; struct passwd *pwd; - int i; + unsigned int i; while (1) { - for (usr = users + uid % nusers, i = nusers; --i >= 0; usr--) { + for (usr = users + uid % nusers, i = nusers; i-- > 0; usr--) { if (usr->name == NULL) { usr->uid = uid; if (noname || (pwd = getpwuid(uid)) == NULL) @@ -280,7 +280,7 @@ uses(uid_t uid, daddr_t blks, time_t act) usr->spc30 += blks; } -#define FSZCNT 512 +#define FSZCNT 512U static struct fsizes { struct fsizes *fsz_next; daddr_t fsz_first, fsz_last; @@ -292,10 +292,10 @@ static void initfsizes(void) { struct fsizes *fp; - int i; + unsigned int i; for (fp = fsizes; fp; fp = fp->fsz_next) { - for (i = FSZCNT; --i >= 0;) { + for (i = FSZCNT; i-- > 0;) { fp->fsz_count[i] = 0; fp->fsz_sz[i] = 0; } @@ -309,13 +309,12 @@ dofsizes(int fd, struct fs *super) union dinode *dp; daddr_t sz, ksz; struct fsizes *fp, **fsp; - int i; + unsigned int i; maxino = super->fs_ncg * super->fs_ipg - 1; for (inode = 0; inode < maxino; inode++) { if ((dp = get_inode(fd, super, inode)) != NULL && - !isfree(super, dp) - ) { + !isfree(super, dp)) { sz = DIP(super, dp, di_blocks); ksz = SIZE(sz); for (fsp = &fsizes; (fp = *fsp); fsp = &fp->fsz_next) { @@ -329,7 +328,7 @@ dofsizes(int fd, struct fs *super) *fsp = fp; fp->fsz_first = rounddown(ksz, FSZCNT); fp->fsz_last = fp->fsz_first + FSZCNT; - for (i = FSZCNT; --i >= 0;) { + for (i = FSZCNT; i-- > 0;) { fp->fsz_count[i] = 0; fp->fsz_sz[i] = 0; } From nobody Mon Oct 20 23:42:14 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4crBmQ2VdBz6DLYT; Mon, 20 Oct 2025 23:42:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4crBmQ1xM1z3qJ4; Mon, 20 Oct 2025 23:42:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761003734; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kaJEYTd/+PpzP0d73Q+KePySCSA/Ie6+TQFB0GFXl5M=; b=jt9/hYg9iL4ewhVxHWTWuHzZDHEjoXD607JkUs3pCeD07GBb/5c1o39p92XcO7lkobaGdo hdgmag5M8egKWFsP6jZWrB84Ry2NcFEeDBZVo0QzlaJwLrUXO9s6VnwAg42zTk7viL3wHh Pmwsmggy4zYtB6omDwIS00p8LKzzjIbCpYYZd/fQgj5YZ9ev4K0GOKNTSrUFFCabX7IOFQ v5KpkTqoYaOv0BODkGivd2SNXrO/HX5YJEkoMw/Je7bQ8QEb0JenGHO4DPLnDfv3oGCXWo kP9unYDUm9KqlKbUcs7zf1Qs/CNgJ1i/3dRa2sKjh/B6xAgkckdikJkssvJrDQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761003734; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kaJEYTd/+PpzP0d73Q+KePySCSA/Ie6+TQFB0GFXl5M=; b=DQh4hOVNKxsOL6i3zqZmNxb2ri/znrZ9Ql/e4PIPH4weCNBIIyYTwygr443RlXKpF1b5gu 3DvUo5ONyhqRHyOEyZ0zEdTbYAiK/inYPpYsnFj8lmJIoWlGRZWIl1l0XIcCkmXF4n/bW1 VEaxZ2qztTHgHHMKdGPWl3SPLs5NROYxp4Ei7v5iMcAMSeXXm+SHk3j2cuk8Iy4eme07F9 uTv6H/+wseW0LZA/eciYM2IkubzMaY9Q4JCXmDFQdEhwsLbHWE1L20C/kLLaDifVOQMQbi 4LDqjnLDzUJ5RlLkK+EGG0bR6xibNsRy+w6YDfytLyP+nVgRmC9BaAbkMSej+A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761003734; a=rsa-sha256; cv=none; b=xoxM4oW1Hzmz2+F9yO17VhRkVI8tOlMtqOnDuuaA5/adFOgzpb3I10h3HlbcQIU6D33LNM wvpv2YoXN/wkWa9+glPh4Y9oz276b48EeQD3/0vTZBiQae/qSSPLMhHxP88XLzetdOnMtr X3qu1aJstivB4cfW1fw882GUIhqxN6HBzQgn5881z0HjjjC3xMUZV+XlXbgfprcby1AfSF hN1QjQ6v/ssTEJOQfn3Dr1WgVlbjczRzzImqPOXKyYWP9E07FQ42cToIKG57pbSiNEY2iT 9ZK32ykQ7WFBSQToEYXeLh/4iofiKotlz1Ya+UVG9xpFUi/9C43bajp3VFL4DA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4crBmQ1XS1zbk2; Mon, 20 Oct 2025 23:42:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59KNgElF090314; Mon, 20 Oct 2025 23:42:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59KNgEPY090311; Mon, 20 Oct 2025 23:42:14 GMT (envelope-from git) Date: Mon, 20 Oct 2025 23:42:14 GMT Message-Id: <202510202342.59KNgEPY090311@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: cf202819af23 - main - dtb: sort by vendor on riscv List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cf202819af2337c0b652ac9290964c2ef7a1ae3c Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=cf202819af2337c0b652ac9290964c2ef7a1ae3c commit cf202819af2337c0b652ac9290964c2ef7a1ae3c Author: Mitchell Horne AuthorDate: 2025-10-20 14:24:45 +0000 Commit: Mitchell Horne CommitDate: 2025-10-20 23:37:13 +0000 dtb: sort by vendor on riscv Just like arm64, our DTS comes from Linux and is correctly sorted into subdirectories by vendor. Enable the logic to preserve these directories in the installation, for example: /boot/dtb/sifive/hifive-unmatched-a00.dtb MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D53116 --- sys/conf/dtb.build.mk | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/sys/conf/dtb.build.mk b/sys/conf/dtb.build.mk index 7eb0db5e8b80..f0cd8f8d515c 100644 --- a/sys/conf/dtb.build.mk +++ b/sys/conf/dtb.build.mk @@ -15,9 +15,10 @@ SYSDIR= ${S} .endif .for _dts in ${DTS} -# DTB for aarch64 needs to preserve the immediate parent of the .dts, because -# these DTS are vendored and should be installed into their vendored directory. -.if ${MACHINE_CPUARCH} == "aarch64" +# DTBs for aarch64 and riscv need to preserve the immediate parent of the .dts, +# because these DTS are vendored and should be installed into their vendored +# directories. +.if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "riscv" DTB+= ${_dts:R:S/$/.dtb/} .else DTB+= ${_dts:T:R:S/$/.dtb/} @@ -54,7 +55,7 @@ _dtbinstall: # entries in the NO_ROOT case. test -d ${DESTDIR}${DTBDIR} || ${INSTALL} -d -o ${DTBOWN} -g ${DTBGRP} ${DESTDIR}${DTBDIR} .for _dtb in ${DTB} -.if ${MACHINE_CPUARCH} == "aarch64" +.if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "riscv" # :H:T here to grab the vendor component of the DTB path in a way that # allows out-of-tree DTS builds, too. We make the assumption that # out-of-tree DTS will have a similar directory structure to in-tree, From nobody Mon Oct 20 23:42:15 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4crBmR6Yfsz6DLfS; Mon, 20 Oct 2025 23:42:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4crBmR3G4wz3q03; Mon, 20 Oct 2025 23:42:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761003735; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S1x2T1BNwPYJNUcNZXRkbWcyDJf+j5/ilF+tG2aMT74=; b=UqcNrUgxQh++tVGhSiqmUqlCOj6xpu1wVFPHCWzXftFGCJyTlXMQz32y7bfhmyT6//m7N4 xXPNRpu5i3Rh2L3199QRyX5udmZHW6KQGL2T94+Tmelb1YhZOliLe4p+XqaXUsDOLhPlsc mL2veqWA5fVUgYTg6GzLx3OUXRlQAdeIvCiVEB6uapsYHgkTcxlpKnWA02ZKk7tTBD+rnM MjM5BySPqfdhJRzLXBG7sgNgURAOX/VOJfm32cq8uSen20KKBZgLpyiIDccChxRBdKnv4B P/W4a/d0aKtIFPrDUisIc+28nymmm42tXudVxI6s6S2PFgWddd/BXo9NipVbNg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761003735; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S1x2T1BNwPYJNUcNZXRkbWcyDJf+j5/ilF+tG2aMT74=; b=NCsaa9H4XP2vXr5uYkr5JGvdO0lxk4CnOLcL+ETqETOMXfWZ6jRD+Pa1A4oLp40vw+56ZL MZEckIAy6CgetbdHuDdSa+4AU5st+HdjB0FfOqRo12OULzd+jAkX5pnCPIaCCT4O5W/Z+Z UW9ga6HnSs/Eew2bfVNR9YGUgRbUHiUoIHyWKxxgagWMhW0Y1XuOzqZeQvWm9Nv0eXCNKS aczYIgyFLgC3l0FCOJkus01/LV08DXvrkwADFC+zfD1sXeExZfnR5cNbIuHAA3qimi4YGZ VFRI9baTLgaPlDLZ3wgcruUXQl9Yro0JVm3hv48Izx0QaydncaihbZmc2UOUIA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761003735; a=rsa-sha256; cv=none; b=VAzx2QR1zLtmraH6peNVfLmuwXxsqmZjxrF9aVrjEKCJgSz3RT6nABGcou/OuRP6Qa6ECI YMV/+tvI80roqYyxvUVDqzpsOtmMNx0AO+4ymDm4U645wT1WVLz1yiVOXIyffR53BpsobT RBCtCbX65VRnQq5Bou7k5+Q+fKv4NIsu7XZL7VOa4kCtSRaVSuoxwdNI2iWmHKrThM1nSD d+8BaIAgY3m5WF+utJCLsjwXESpHv10vFpbzvFO8G8AvDhwjldvKuIfSCTk9Ew+N49D2OK pX8vtqql1YlYtj1pmcxGhtfa8CV+gn3FQRXMF2+czu1r5vijyvwKLc9uV2jOkA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4crBmR2dWFzbk3; Mon, 20 Oct 2025 23:42: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 59KNgFPs090348; Mon, 20 Oct 2025 23:42:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59KNgFh3090345; Mon, 20 Oct 2025 23:42:15 GMT (envelope-from git) Date: Mon, 20 Oct 2025 23:42:15 GMT Message-Id: <202510202342.59KNgFh3090345@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: 96b137c044d8 - main - riscv: build starfive JH7110 DTBs List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 96b137c044d8f7266757e95ff134119f3ac51be5 Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=96b137c044d8f7266757e95ff134119f3ac51be5 commit 96b137c044d8f7266757e95ff134119f3ac51be5 Author: Mitchell Horne AuthorDate: 2025-10-20 14:24:58 +0000 Commit: Mitchell Horne CommitDate: 2025-10-20 23:37:13 +0000 riscv: build starfive JH7110 DTBs These are known to work if loaded manually by loader(8) (for VF2 at least). If nothing else, it is useful to provide a DTB closely tied to the kernel version. MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D53117 --- sys/modules/dtb/starfive/Makefile | 7 +++++++ sys/riscv/conf/std.starfive | 3 +++ 2 files changed, 10 insertions(+) diff --git a/sys/modules/dtb/starfive/Makefile b/sys/modules/dtb/starfive/Makefile new file mode 100644 index 000000000000..2da30f0985c7 --- /dev/null +++ b/sys/modules/dtb/starfive/Makefile @@ -0,0 +1,7 @@ +DTS= \ + starfive/jh7110-pine64-star64.dts \ + starfive/jh7110-milkv-mars.dts \ + starfive/jh7110-starfive-visionfive-2-v1.3b.dts \ + starfive/jh7110-starfive-visionfive-2-v1.2a.dts + +.include diff --git a/sys/riscv/conf/std.starfive b/sys/riscv/conf/std.starfive index 9bdb1af9e79c..6a0e56cc84bd 100644 --- a/sys/riscv/conf/std.starfive +++ b/sys/riscv/conf/std.starfive @@ -10,4 +10,7 @@ device eqos device dwmmc device dwmmc_starfive +# DTBs +makeoptions MODULES_EXTRA+="dtb/starfive" + files "../starfive/files.starfive" From nobody Mon Oct 20 23:42:16 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4crBmS6XpVz6DLNR; Mon, 20 Oct 2025 23:42:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4crBmS3h2bz3q2T; Mon, 20 Oct 2025 23:42:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761003736; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aA1kPLom9nYMoIeZkVo4X0aIh4oixN+muJOEcoclFbU=; b=qE7lxVnr7/Z0vr0MD6LNRWRGr24uTC2+PWtRasvjTm4UoTjqsbJ/p3+ckO/6IO3W9yVUpk xCe4u2a18B4Kl2bb697SqdJnWc6HEqmlpf29g4LEwXvHdIFwZo+tjqBcMMHQm37UX7kcj7 Tn3Qp9/SxKFrG6CtsUxE2ZFda1e2TFNrOhMy46oQXvp6FUHGKtyWCPWYvr8qMe/LKqJPa9 +3c/WKHH0Wb0NlHOvYwSOmjKCsaLwb+cpLsz3wOLerW8CqgOAOaJEaqtAD1K0wNG38Pqiy 2KsUFOJ8Ti0ZUn69iVWBCvA3ppCg+86yl6bhhduQoMVjXCq4XKId47xqO14ikg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761003736; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aA1kPLom9nYMoIeZkVo4X0aIh4oixN+muJOEcoclFbU=; b=aNMUSSMVCs9u/8/uLbUPhVvxJ2h9Bo+UK2D9KYcRMGVO21NW0lkivjZvpbn/Y5EwLgiphT 8veIHfh6ospL/ib+kst0TlRtpDJjLHfyX0bpFjuE4t8CjQ3tHA+8IVxoVvJPl4xIEjU+0g JvA55KSylbGBGrTAt9uUhw4bFL220BtW546RliMLRna8/ypOlmHDojjpfKDBVrkA7cFXGK UFs4aARSui2ruJjhl78jl3u5jqgyq6l7DNaXWm9Gr2HIKQkTMD7VOMTvWAiZfHAbWCHpHO /Z0T9sdw70wbbszgtzbwhlceBk3/CfYHlas23VUqDuiEmFIo5Uv5gDyqHJE1iw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761003736; a=rsa-sha256; cv=none; b=go+stxKl/iIUgePszhq+o7uhvsYTpF9Th8JM0LJZ9n0t4q9cXeNrgH+FbhOSQKJW+/hG4v 8qYM8NeDzeu3fnEee9s8xlpEGMK+BNsQGjgiNdW8hMKNsTBCRdoRvKQ4I5XUXqgxGlOCfQ qA60/R8+KMs+xVCuym6WEscFMuncO7R61QrK+PZ2+z2OAKEhWw/SRD8C/8RUy5PgcXZm0l tFkoukapG11qbsE+zqtsDFywBpvO4bb7mUTYBLs6NhsoYcHkUtFm8W9IjC6TEqoXgpvQYd 3GSBwCfdF+wJz89qr1MbHUEZHbWn6Wc/fbufu3xpy+mTaVOthAVqT4T2QTAgYA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4crBmS3J48zb7W; Mon, 20 Oct 2025 23:42:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59KNgG2o090381; Mon, 20 Oct 2025 23:42:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59KNgGaQ090378; Mon, 20 Oct 2025 23:42:16 GMT (envelope-from git) Date: Mon, 20 Oct 2025 23:42:16 GMT Message-Id: <202510202342.59KNgGaQ090378@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: 3ed48eb085f7 - main - riscv: build allwinner DTBs List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3ed48eb085f7c4ae5c019ee882e694b432d43911 Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=3ed48eb085f7c4ae5c019ee882e694b432d43911 commit 3ed48eb085f7c4ae5c019ee882e694b432d43911 Author: Mitchell Horne AuthorDate: 2025-10-20 14:25:08 +0000 Commit: Mitchell Horne CommitDate: 2025-10-20 23:37:13 +0000 riscv: build allwinner DTBs These are known to work if loaded manually by loader(8) (for the Nezha board at least). If nothing else, it is useful to provide a DTB closely tied to the kernel version. MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D53118 --- sys/modules/dtb/allwinner/Makefile | 7 ++++++- sys/riscv/conf/std.allwinner | 3 +++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/sys/modules/dtb/allwinner/Makefile b/sys/modules/dtb/allwinner/Makefile index 242ee5d974ad..2666e786a9df 100644 --- a/sys/modules/dtb/allwinner/Makefile +++ b/sys/modules/dtb/allwinner/Makefile @@ -65,7 +65,12 @@ DTSO= sun50i-a64-mmc0-disable.dtso \ sun50i-a64-timer.dtso \ sun50i-h5-opp.dtso \ sun50i-h5-nanopi-neo2-opp.dtso - +.elif ${MACHINE_CPUARCH} == "riscv" +DTS= \ + allwinner/sun20i-d1-dongshan-nezha-stu.dts \ + allwinner/sun20i-d1-lichee-rv.dts \ + allwinner/sun20i-d1-mangopi-mq-pro.dts \ + allwinner/sun20i-d1-nezha.dts .endif .include diff --git a/sys/riscv/conf/std.allwinner b/sys/riscv/conf/std.allwinner index 34fe195b01ba..ecd789f39963 100644 --- a/sys/riscv/conf/std.allwinner +++ b/sys/riscv/conf/std.allwinner @@ -17,4 +17,7 @@ device awg # Allwinner EMAC Gigabit Ethernet device musb # Mentor Graphics USB OTG controller +# DTBs +makeoptions MODULES_EXTRA+="dtb/allwinner" + files "../allwinner/files.allwinner" From nobody Mon Oct 20 23:42:17 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4crBmT6dBjz6DLNS; Mon, 20 Oct 2025 23:42:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4crBmT4fxWz3qLc; Mon, 20 Oct 2025 23:42:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761003737; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9qn8W4+KKylEHaBfnCz23WWqtdMIqz6+rBuUgoHaHBE=; b=Ej6WE1S15pUG9UpAxDB4xl1R7wVFmi6fmOqdZ5BMpHQlwtI8hqubgRCppc769vqg0ltKjT did9QQziZFHzy7NlQd0FfRprutYInfxd1j+5/R12rMW8djOtkLqXYrM4pFehczSzXh9HE4 FyimkZc4Aoz3MESK43HfJ8MGwgmLLQpbwZgoKOegDuco5y3eNTI/D/0qrSaBTUWaN1gMKV UcpZ4YyjvToittEoXiS98v7+001BJyhDriAAWF3zbWD2dlxc65w7qhcHLHMwaOBAP0eEVj G6V8nGP8xQ6ixs4eI9F3sBgiNyl/zJqI2l3TWMayGy6K9uUbt79o67rBbnwCSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761003737; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9qn8W4+KKylEHaBfnCz23WWqtdMIqz6+rBuUgoHaHBE=; b=G4HovtsBoptWbySB79W+2qOf3zAfw3cpbTWfJSLgkBngQzrMch/RSGDK9EMwsTW+YHc7lH zvnr0DVTma+1IkZMPggq5tC7XOVEg8p2Z1M5TV4Op2Q8L+fz95ggzwv7QazbkFXt0QDmD9 Kuzi+ImoJ6h/a0h8fIcn+FpuBhA0YS5p2hM/u4RtWIBLPHZ6AVxJJrnlag0q7odvc3YKbu 1iASZH5nM05Wg5m25RvAYV56n666A9m/oPxMK2sgF0u7dR/B8693qgFLSEImQrNCdlQawV XJ55T4J4zr9uW8HqcWZzT0IVefS9bWOjGmOhGyBSxl80CPLZupJBe+3Ye/0qfg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761003737; a=rsa-sha256; cv=none; b=qjYPNxLvFa9Si0bXe2dLeI9nJI/tGVyvqU6h6W2Um/zh8B0dHfWiLIpn0eqivo5bj1FGJF loePWHl3RbkkSf20fJvdvvqNH7k1v4NxwXRyjXbv5+2GRyfipg6gkZ6lB+XdmUIFSTwUu9 t4MneLZ3bmBkmMDwIdOVG/5cWXagvStjfTce5CnTQ2g4Z6oKVbtXBYKw6iyXzfyXFfEMUf JFTY5lA6PViB3YzghQOA0G/DPpoc2q3JtmZSER2hz0LmlK9iPL+2ldD+PUmfKcOLW1/Y6x 2Mcqk0u6QI0JJFMa//YXQNQlxFu6yVE/tlH9aHMc3soMpzlCQRMUpbeZXNsWHw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4crBmT45CPzb1Y; Mon, 20 Oct 2025 23:42:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59KNgHWq091170; Mon, 20 Oct 2025 23:42:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59KNgHDl091154; Mon, 20 Oct 2025 23:42:17 GMT (envelope-from git) Date: Mon, 20 Oct 2025 23:42:17 GMT Message-Id: <202510202342.59KNgHDl091154@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: 5522519731b7 - main - modules: enable allwinner kmods on riscv List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5522519731b74e7b56c710ec5ea4d34065f3ed32 Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=5522519731b74e7b56c710ec5ea4d34065f3ed32 commit 5522519731b74e7b56c710ec5ea4d34065f3ed32 Author: Mitchell Horne AuthorDate: 2024-09-18 17:19:16 +0000 Commit: Mitchell Horne CommitDate: 2025-10-20 23:37:13 +0000 modules: enable allwinner kmods on riscv While here, standardize the place they are enabled in the Makefile. For armv7 the module subdirectory was added explicitly in the config file, but this is not idiomatic. MFC after: 3 days Sponsored by: The FreeBSD Foundation --- sys/arm/conf/GENERIC | 1 - sys/arm/conf/NOTES | 1 - sys/modules/Makefile | 2 +- 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/sys/arm/conf/GENERIC b/sys/arm/conf/GENERIC index 7394f3842d43..9607b16756ea 100644 --- a/sys/arm/conf/GENERIC +++ b/sys/arm/conf/GENERIC @@ -272,5 +272,4 @@ makeoptions MODULES_EXTRA+="dtb/rpi" makeoptions MODULES_EXTRA+="dtb/zynq" # SOC-specific modules -makeoptions MODULES_EXTRA+="allwinner" makeoptions MODULES_EXTRA+="imx" diff --git a/sys/arm/conf/NOTES b/sys/arm/conf/NOTES index 920d721dc3ba..0a5d34c3849a 100644 --- a/sys/arm/conf/NOTES +++ b/sys/arm/conf/NOTES @@ -94,7 +94,6 @@ nodevice bnxt # Build SOC-specific modules... -makeoptions MODULES_EXTRA+="allwinner" makeoptions MODULES_EXTRA+="imx" # Build dtb files... diff --git a/sys/modules/Makefile b/sys/modules/Makefile index 63a0b3260e6d..9ec7c33465f3 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -680,6 +680,7 @@ _irdma= irdma .if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "arm" || \ ${MACHINE_CPUARCH} == "riscv" .if !empty(OPT_FDT) +_allwinner= allwinner _if_cgem= if_cgem .endif .endif @@ -713,7 +714,6 @@ _hyperv= hyperv _vf_i2c= vf_i2c .if !empty(OPT_FDT) -_allwinner= allwinner _dwwdt= dwwdt _enetc= enetc _felix= felix From nobody Mon Oct 20 23:42:18 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4crBmW1cwwz6DLTl; Mon, 20 Oct 2025 23:42:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4crBmV5dBSz3qPb; Mon, 20 Oct 2025 23:42:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761003738; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MxdD8gDDz9eQRKX43Isgg/I3XMpLvJAtd/LDN/s3M8M=; b=l+JuJPp4bc8SCagucB9mTdgaGp+CDuK8HTPgHBJi7AdPcmRi9Ay9w0Z8lkmiW+mPy7+1KF gV53VBXZF0avwz3W46DDELj20GQqfYB1KKIUIpRlRdV5tA+JnA6VTtLalXZ/yq/YXJGdYa r0UC8tufgtUrz81bPZFdIHcTz+07miiwY7SMZH526DvOppPn7NxcSTcUhlMXaKsDU/xlA/ kbMCvwd5fXN1HG+OPrziEMPrc/lv24MQj37CIHd76/2jeOPgJiCc2wgHKO3iNdbWyGpsrT fLYkCVUNBBnN+C+//LjT0aAaGhw2butJx1Gb+/Py1zPquSYYa2MOrguBnGUQgg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761003738; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MxdD8gDDz9eQRKX43Isgg/I3XMpLvJAtd/LDN/s3M8M=; b=PleWO61r05CnyGvgOGQiF0Mq88xlk24BWmYuAJjKoIozcq9AGyb5fKqIJLPP7gZYshLU+D f6lM8ZcKO9Tqf7Nnu0twqMqWuEnkqsNv50sgIMMgKbAaGiMUm8TtqEBcscmjx9q3LAel0O pKxa3uBi3EPfqBt0oJ0Gc4bRDSS8qJ5OOX5Se21x3UgD73j8fdunCSspAgvxyesKH+9UQj 6Wd3hkLZYqsjQPWcS/9cIuAdWWl8iaPczACNW2nm1CsXlHqdG4Iv3iIr2UlZZgQ6FmWycH iE5DaMBGpjRZkyMTpu9sjRwddPKpRjPp5Iv8txg1ANtP193f1/VH0521vMcqyw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761003738; a=rsa-sha256; cv=none; b=XU9HAPQsdUX+XW/m2gZE1qBVW3wtP+dfkClcGIFPpTus8xag7sKz4TtO63il/oVlltiK+A hF8RUVMHF+hLexPXFp+d1bZR8JdKoGzEiq/cmMdOUcEKqUqsoKDx1Ugr9BILBJV3Przpss 6V1j0A9rZPC6o6PBM4R72rr/8lTlBoxSu27H741ddTu3JFj2F+1YtawnwM6T+NBmAsH3/w +Z41aKIXYlwyB940LmtPPbOE2LHR2U04wTXFhnaQ3bwxCY46xgDvVyva6FeDJz/9Gx4wSP mPp2I18tW+RDNomfV8OvPtc1mTwK4PRRKVZ7WkYp0RICxUiWrkqXwnjwY89dVA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4crBmV55Pbzbk6; Mon, 20 Oct 2025 23:42:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59KNgIp1091749; Mon, 20 Oct 2025 23:42:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59KNgIeW091746; Mon, 20 Oct 2025 23:42:18 GMT (envelope-from git) Date: Mon, 20 Oct 2025 23:42:18 GMT Message-Id: <202510202342.59KNgIeW091746@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: 5aefe9f16f24 - main - arm: tweak imx module build logic List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5aefe9f16f240696142894bdeabcebbb057c7053 Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=5aefe9f16f240696142894bdeabcebbb057c7053 commit 5aefe9f16f240696142894bdeabcebbb057c7053 Author: Mitchell Horne AuthorDate: 2025-10-20 23:06:26 +0000 Commit: Mitchell Horne CommitDate: 2025-10-20 23:37:13 +0000 arm: tweak imx module build logic Add the subdirectory in the Makefile, not the config. No functional change intended. MFC after: 3 days Sponsored by: The FreeBSD Foundation --- sys/arm/conf/GENERIC | 3 --- sys/arm/conf/NOTES | 4 ---- sys/modules/Makefile | 5 +++++ 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/sys/arm/conf/GENERIC b/sys/arm/conf/GENERIC index 9607b16756ea..22bb75993834 100644 --- a/sys/arm/conf/GENERIC +++ b/sys/arm/conf/GENERIC @@ -270,6 +270,3 @@ makeoptions MODULES_EXTRA+="dtb/nvidia" makeoptions MODULES_EXTRA+="dtb/rockchip" makeoptions MODULES_EXTRA+="dtb/rpi" makeoptions MODULES_EXTRA+="dtb/zynq" - -# SOC-specific modules -makeoptions MODULES_EXTRA+="imx" diff --git a/sys/arm/conf/NOTES b/sys/arm/conf/NOTES index 0a5d34c3849a..2bd41d911124 100644 --- a/sys/arm/conf/NOTES +++ b/sys/arm/conf/NOTES @@ -92,10 +92,6 @@ nodevice mps nodevice bnxt -# Build SOC-specific modules... - -makeoptions MODULES_EXTRA+="imx" - # Build dtb files... makeoptions MODULES_EXTRA+="dtb/allwinner" diff --git a/sys/modules/Makefile b/sys/modules/Makefile index 9ec7c33465f3..02ed6a0480e6 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -173,6 +173,7 @@ SUBDIR= \ iflib \ ${_igc} \ imgact_binmisc \ + ${_imx} \ ${_intelspi} \ ${_io} \ ${_ioat} \ @@ -721,6 +722,10 @@ _rockchip= rockchip .endif .endif +.if ${MACHINE_CPUARCH} == "arm" +_imx= imx +.endif + .if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "arm" || \ ${MACHINE_CPUARCH} == "riscv" .if !empty(OPT_FDT) From nobody Mon Oct 20 23:42:19 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4crBmX5S2Hz6DLYX; Mon, 20 Oct 2025 23:42:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4crBmW6XTsz3qPr; Mon, 20 Oct 2025 23:42:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761003739; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4EgNUUyUwCX96azvNk4a6HYXxR8q6v531MCtWGmStW0=; b=W6Cy3gg9rMqTpGA+b4456lToGUPfExGGXTxf0CoPvQbIjMiUnz/VDo7IMAFyDH/nE3tNMZ djmkueC1qZ8padskmw9hX+H8ceY3EuD2d4K9ePpIot/pFchbiCiBPnzDj9TgZvh7wRCjYA EYYUoJHFSVoDZBgCZE4Wvr7q+G3KxEetiTkUdgAS6ch4y7pic46zt8WnaSL7G2lzQJ4ZSy qkySxCWq7p2vwiV8/KwC7SUcvqAl6y0K5r13qv+mzPfkS3IX0tpz2B4v4IE9ARjaGOrkRp ca6meu7HbcL5lVzThQePefikerY1bNsx8lutg28ah9jWnbI2anpZkNfL0gBiNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761003739; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4EgNUUyUwCX96azvNk4a6HYXxR8q6v531MCtWGmStW0=; b=D5gy5sI3IJimJ5W2XzF00mgx5eMga2diE3kw+/gj4n8QTo9xjm4IGXvQ5N+O8syFgbfXXN K+1g6Ce4Zig0aAJ4wyr20TodGdfne/mxDkEYWHiM8CsTo70CTdGxiCyiHrQfE6bNmBymMg 4BVvU1I48yp8ZfyeQP8d/Xxleow2salkrj45uh9Atm5JLEn99TSMZ89VC9RX449nsdSOi4 GqYL85CaTffpKjEb21HCut3+299uMV1+/bw18l5VSOl6Tl0vHEkzxUr/HPsbI6ezVGh35A Bl32USPxr4/gt2ilVn+T3dPqfsH/p32KvvkqAlOoowp+yMxdAMMbhfW+4aMM+w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761003739; a=rsa-sha256; cv=none; b=J9XDUg2yVBg3G3VICqx1DKfNh5qtPlTw6a6QkPtA1mc50J/2dY6ff0wqbnfjP7qXQs/itj VQi2/I7jklz/SbdUYURF3eh9b6d/3B0OVH6ghifl3wDk5htUleXaXGuA+pfC9JeMX1kYF6 4ZTWmWp1lQtBWxWSYB5EsuZRkpMPaDlPBRbK0TlsngUtHO4jXVZnc9MEjju1mkDUFT1gld 1/Z19W7Q3iQe/nnE92bispiWpjUbL2zqxCaCnmgIZPdZOhrwk+56+OCzCEs0E9AwkXrv/H qpXTPmDjwpXzvOm9MeIYZDWTcmV9uXKYw6TSLJSQKzaSdr2ZJ3LG09e05c/+tg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4crBmW608Fzb47; Mon, 20 Oct 2025 23:42:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59KNgJEO091788; Mon, 20 Oct 2025 23:42:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59KNgJof091785; Mon, 20 Oct 2025 23:42:19 GMT (envelope-from git) Date: Mon, 20 Oct 2025 23:42:19 GMT Message-Id: <202510202342.59KNgJof091785@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: ddc1d4b0722b - main - modules: fix some riscv module logic List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ddc1d4b0722bd63934f503c43a5ee35d871355ee Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=ddc1d4b0722bd63934f503c43a5ee35d871355ee commit ddc1d4b0722bd63934f503c43a5ee35d871355ee Author: Mitchell Horne AuthorDate: 2025-10-20 23:11:53 +0000 Commit: Mitchell Horne CommitDate: 2025-10-20 23:37:13 +0000 modules: fix some riscv module logic The change which enabled the sdhci_fdt module build on riscv inadvertently enabled the neta module as well. This driver is not needed on this platform. Move each entry to a respective identical conditional blocks. MFC after: 3 days Sponsored by: The FreeBSD Foundation Fixes: e9dd9f95f82f ("riscv: Add the sdhci_fdt driver to the build") --- sys/modules/Makefile | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/sys/modules/Makefile b/sys/modules/Makefile index 02ed6a0480e6..3086be864307 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -683,6 +683,7 @@ _irdma= irdma .if !empty(OPT_FDT) _allwinner= allwinner _if_cgem= if_cgem +_sdhci_fdt= sdhci_fdt .endif .endif @@ -726,14 +727,6 @@ _rockchip= rockchip _imx= imx .endif -.if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "arm" || \ - ${MACHINE_CPUARCH} == "riscv" -.if !empty(OPT_FDT) -_sdhci_fdt= sdhci_fdt -.endif -_neta= neta -.endif - .if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64" _agp= agp .if ${MACHINE_CPUARCH} == "i386" || !empty(COMPAT_FREEBSD32_ENABLED) @@ -928,7 +921,8 @@ _nvram+= powermac_nvram .if ${MACHINE_CPUARCH} == "arm" || ${MACHINE_CPUARCH} == "aarch64" _bcm283x_clkman= bcm283x_clkman -_bcm283x_pwm= bcm283x_pwm +_bcm283x_pwm= bcm283x_pwm +_neta= neta .endif .if ${MACHINE_CPUARCH} == "amd64" From nobody Mon Oct 20 23:42:20 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4crBmZ01RRz6DLsw; Mon, 20 Oct 2025 23:42:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4crBmY0q47z3qZq; Mon, 20 Oct 2025 23:42:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761003741; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xH7yKJXT2bvo8dpcVWPxDH7FyKKllvd0ZszaFJcTC94=; b=xUVxk9TvdLToeMvY4QSB5hu4d0GUdhCVm1tQrtOEOa4kilYK0f6PgF2yCZXQfArGUIwtKP yiy3Wx7+fLaBQfRWQiiUhmSwT18uoGW2TDnLKL4egSG2I5HAtQABPlWct4ZDhAemfrHi10 WGOi4L/m3/GmqzzYirvmK3fdnljcBGV5iWsvw0Sq7fHtAHdU+elKdOVFF6cshQRezgRU08 H5tW8hhdecRoO2BFgn71c9yxS3WmH83BlWml6SbXQS36FfuoODPvdVJWs9nw9oSCXAFv/2 jLwJcyXJcvcXFnTEOH8AQHieysZidYq2QDJXrBLlesuzI0s9lr92ni7nJNpRuA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761003741; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xH7yKJXT2bvo8dpcVWPxDH7FyKKllvd0ZszaFJcTC94=; b=qE5ELehj4SQMPS402ZX03ANHTxbamYCa8vnrTvNKl1qrMDxsE+GIlZtvjuh/CueYw9+auC Vh45LMCp2cmTvy/3iS/1fwCQ8THLkUgjCd7dXDQM3+maUolCgB4BwBYHjace4OW64ulHt4 i6F5umn6CPXcRu6dgtu7fAcuJnWARJf23DNJHdFa6VzE7lFZpuScKBUH71z3Wb5OIlgL65 7JFFb24W0G4cdLn8FfY5cznh+dKgreoS+jpRvEl8BHPikw97kVCybHstSWHvhww2LfrDIM Es1SidHcqknjP7+dJHizmvVYvuE4WfEDPSbAyXYV02U73nOmmGlK5UxHZ9rhHA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761003741; a=rsa-sha256; cv=none; b=msqJX0v39uKTZJzTDOIeBjRSSFOBxG+F6RAwQkO4K9UlseYyhDN8WERUErV3mGq/pq2eRK Pb5Z09d+9RvFhAU8jnoxc9/aZhQUJgPa0bXroEH44lCZKvjfOwUtwdqCmzt4pjqpachKFe 9vCmcRNrLyIH/cex4ebikDzyZqoCWMRnoXoRoPzbnp0bvNrYjTmD/JhL27IOSXlkKZbQ61 6kMW4HZ2eIAy3jCNLSEKvbPjEsXmOKhn/vQJ7AW3mNcB0OiG0GkESEbICTU8f2haNQCbxI RfHQ8Vb26IY4j5d9FRgDkdTNgkEFtPXBMSdu766oKMjctkyVnu9XgKFJI6hBCw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4crBmX6zC8zb48; Mon, 20 Oct 2025 23:42:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59KNgK39091822; Mon, 20 Oct 2025 23:42:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59KNgKOl091819; Mon, 20 Oct 2025 23:42:20 GMT (envelope-from git) Date: Mon, 20 Oct 2025 23:42:20 GMT Message-Id: <202510202342.59KNgKOl091819@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: 15c79c6fa608 - main - man4: move allwinner pages and logic to a standard place List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 15c79c6fa60809a9dc627e5051704cf2a556c6db Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=15c79c6fa60809a9dc627e5051704cf2a556c6db commit 15c79c6fa60809a9dc627e5051704cf2a556c6db Author: Mitchell Horne AuthorDate: 2025-07-11 20:24:42 +0000 Commit: Mitchell Horne CommitDate: 2025-10-20 23:37:13 +0000 man4: move allwinner pages and logic to a standard place They are shared by arm, arm64, and now riscv. Note that they are always installed by default, where MAN_ARCH=all. MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D52585 --- share/man/man4/Makefile | 12 ++++++++++++ share/man/man4/{man4.arm => }/aw_gpio.4 | 2 +- share/man/man4/{man4.arm => }/aw_mmc.4 | 2 +- share/man/man4/{man4.arm => }/aw_rtc.4 | 2 +- share/man/man4/{man4.arm => }/aw_sid.4 | 2 +- share/man/man4/{man4.arm => }/aw_spi.4 | 2 +- share/man/man4/{man4.arm => }/aw_syscon.4 | 2 +- share/man/man4/man4.aarch64/Makefile | 6 ------ share/man/man4/man4.arm/Makefile | 6 ------ 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index 6e076722c786..e94e832a3f94 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -69,6 +69,12 @@ MAN= aac.4 \ audit.4 \ auditpipe.4 \ aue.4 \ + ${_aw_gpio.4} \ + ${_aw_mmc.4} \ + ${_aw_rtc.4} \ + ${_aw_sid.4} \ + ${_aw_spi.4} \ + ${_aw_syscon.4} \ axe.4 \ axge.4 \ axp.4 \ @@ -962,6 +968,12 @@ _vmx.4= vmx.4 .if ${MACHINE_CPUARCH} == "arm" || ${MACHINE_CPUARCH} == "aarch64" || \ ${MACHINE_CPUARCH} == "riscv" +_aw_gpio.4= aw_gpio.4 +_aw_mmc.4= aw_mmc.4 +_aw_rtc.4= aw_rtc.4 +_aw_sid.4= aw_sid.4 +_aw_spi.4= aw_spi.4 +_aw_syscon.4= aw_syscon.4 _cgem.4= cgem.4 MLINKS+=cgem.4 if_cgem.4 .endif diff --git a/share/man/man4/man4.arm/aw_gpio.4 b/share/man/man4/aw_gpio.4 similarity index 99% rename from share/man/man4/man4.arm/aw_gpio.4 rename to share/man/man4/aw_gpio.4 index ef9fc1fe2733..5cbc7562d9bd 100644 --- a/share/man/man4/man4.arm/aw_gpio.4 +++ b/share/man/man4/aw_gpio.4 @@ -23,7 +23,7 @@ .\" SUCH DAMAGE. .\" .Dd October 8, 2024 -.Dt AW_GPIO 4 arm +.Dt AW_GPIO 4 .Os .Sh NAME .Nm aw_gpio diff --git a/share/man/man4/man4.arm/aw_mmc.4 b/share/man/man4/aw_mmc.4 similarity index 99% rename from share/man/man4/man4.arm/aw_mmc.4 rename to share/man/man4/aw_mmc.4 index e3f961fa5067..eb7fc9ce020a 100644 --- a/share/man/man4/man4.arm/aw_mmc.4 +++ b/share/man/man4/aw_mmc.4 @@ -23,7 +23,7 @@ .\" SUCH DAMAGE. .\" .Dd Dec 25, 2017 -.Dt AW_MMC 4 arm +.Dt AW_MMC 4 .Os .Sh NAME .Nm aw_mmc diff --git a/share/man/man4/man4.arm/aw_rtc.4 b/share/man/man4/aw_rtc.4 similarity index 99% rename from share/man/man4/man4.arm/aw_rtc.4 rename to share/man/man4/aw_rtc.4 index 87212d85116c..1296cd41da68 100644 --- a/share/man/man4/man4.arm/aw_rtc.4 +++ b/share/man/man4/aw_rtc.4 @@ -23,7 +23,7 @@ .\" SUCH DAMAGE. .\" .Dd December 10, 2024 -.Dt AW_RTC 4 arm +.Dt AW_RTC 4 .Os .Sh NAME .Nm aw_rtc diff --git a/share/man/man4/man4.arm/aw_sid.4 b/share/man/man4/aw_sid.4 similarity index 99% rename from share/man/man4/man4.arm/aw_sid.4 rename to share/man/man4/aw_sid.4 index 8b3691259f22..5cd2f3d5e072 100644 --- a/share/man/man4/man4.arm/aw_sid.4 +++ b/share/man/man4/aw_sid.4 @@ -25,7 +25,7 @@ .\" SUCH DAMAGE. .\" .Dd October 8, 2024 -.Dt AW_SID 4 arm +.Dt AW_SID 4 .Os .Sh NAME .Nm aw_sid diff --git a/share/man/man4/man4.arm/aw_spi.4 b/share/man/man4/aw_spi.4 similarity index 99% rename from share/man/man4/man4.arm/aw_spi.4 rename to share/man/man4/aw_spi.4 index d0566a45b54b..f8985e1c16bb 100644 --- a/share/man/man4/man4.arm/aw_spi.4 +++ b/share/man/man4/aw_spi.4 @@ -23,7 +23,7 @@ .\" SUCH DAMAGE. .\" .Dd May 17, 2018 -.Dt AW_SPI 4 arm +.Dt AW_SPI 4 .Os .Sh NAME .Nm aw_spi diff --git a/share/man/man4/man4.arm/aw_syscon.4 b/share/man/man4/aw_syscon.4 similarity index 99% rename from share/man/man4/man4.arm/aw_syscon.4 rename to share/man/man4/aw_syscon.4 index 97f01196a8a6..e32f329e489a 100644 --- a/share/man/man4/man4.arm/aw_syscon.4 +++ b/share/man/man4/aw_syscon.4 @@ -25,7 +25,7 @@ .\" SUCH DAMAGE. .\" .Dd November 11, 2024 -.Dt AW_SYSCON 4 arm +.Dt AW_SYSCON 4 .Os .Sh NAME .Nm aw_syscon diff --git a/share/man/man4/man4.aarch64/Makefile b/share/man/man4/man4.aarch64/Makefile index 0e85aab8b770..f35558d69a33 100644 --- a/share/man/man4/man4.aarch64/Makefile +++ b/share/man/man4/man4.aarch64/Makefile @@ -14,12 +14,6 @@ MAN= \ # for all architectures, otherwise arm takes care of installing them. .if !empty(MAN_ARCH) && ${MAN_ARCH} != "all" MAN+= \ - aw_gpio.4 \ - aw_mmc.4 \ - aw_rtc.4 \ - aw_sid.4 \ - aw_spi.4 \ - aw_syscon.4 \ bcm283x_pwm.4 \ .endif diff --git a/share/man/man4/man4.arm/Makefile b/share/man/man4/man4.arm/Makefile index 6b046a1002a2..2be255ad913f 100644 --- a/share/man/man4/man4.arm/Makefile +++ b/share/man/man4/man4.arm/Makefile @@ -1,11 +1,5 @@ MAN= \ ar40xx.4 \ - aw_gpio.4 \ - aw_mmc.4 \ - aw_rtc.4 \ - aw_sid.4 \ - aw_spi.4 \ - aw_syscon.4 \ bcm283x_pwm.4 \ devcfg.4 \ imx6_ahci.4 \ From nobody Mon Oct 20 23:42:21 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4crBmZ3MsVz6DLt0; Mon, 20 Oct 2025 23:42:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4crBmZ151Wz3qH0; Mon, 20 Oct 2025 23:42:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761003742; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AGYDvGmrOY7Rv3mjDrXx+zed9lzfUztIIbG4EvYhxBE=; b=ptITgIqDO6hZUCHPaWfQlfXYAQ/0CisbL2QpWaLPul3zkgoZ0FmTNZGtItfZpZ7+rXzpjB UIjTlWqXnScHO3/khD1BAkUeBF5OaBiQv9PcN52QHHAi7Bbcv3TB/wnXSTDH0v8Fief1a9 PHPRq0HrPjYlPBENsDo7KLown6TxOZOXPj/rK/CdqbNAIeWK84INBnqzXp8OPR+/S2xZiw qh4egRKNzShRLzHb8CQKFCRcw/FA5Hi9ljnDj38EcuFxfzi+qoUIdoCIu2tNPXmnxyR8lp lujE5qIQNGM148H3AyWFyIKTn4kwBVxo7bfPmovhqdEAhqDMiLmtw3KsGaeXmw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761003742; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AGYDvGmrOY7Rv3mjDrXx+zed9lzfUztIIbG4EvYhxBE=; b=abQavHtDgBfx1Geqgs/re51A/uiAWBj0fhL5DbO4V0EMY765ang/laeCOs6kqh/M9Ty2C5 VqmS7UcsRNDdO7MNr3TY7wEuhmvmB9FIttCM6Vbuf3dwcHRg1Y5Yw4OCVMFCNY/hOPIKBE O8PPhC225/fmseQWGOul+09SScXNADjPsGczSKUQp8clbaHOWrlvYs2h7hDPCC/SCxvQJU kGMnK3Xqgv0I+X0RC/Q/NmO3CXywekVoQeAhYOb/e6C6c2O0nb0qLqOx2oimJ+o5zUOFk+ TUz0X5f6mkR5R23uKN7nVwtYKcwYpsdFgDeabbdHEvdZoOWrPUbhzJykc+M/5Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761003742; a=rsa-sha256; cv=none; b=ucIwKedm4IgjKsFN3zat32EzlvcOPB3xg5WRkrzUmEXbfHwMaP3XbUXRoGhfUG6G7CbOYk R6UdemSyX6k3yF8H6SU5+pyXylHs08aeoylWyGDW2Hb1YjJlMXTRFJDPZeVQQUlSRlNVZV EH4buXYNKadiD0i5kfPUHI988OxyEgn4POSR/YJkCGg3NsThhXiNuJ9KBntZa6978O+wsy GTHLVDwQD8++oC3C9y1fEbhwxJUPDH/17xeVgWpC1gerqu+Pv28b7IPi8ofyc7xtCVLgXS K7Lyxzyh0VXK75/V/n747Q5biqkhYKb7zleHkEJJpspMJLHpj2WUhY8b/RNqiQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4crBmZ0dVzzbS0; Mon, 20 Oct 2025 23:42: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 59KNgLWI091855; Mon, 20 Oct 2025 23:42:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59KNgLjG091852; Mon, 20 Oct 2025 23:42:21 GMT (envelope-from git) Date: Mon, 20 Oct 2025 23:42:21 GMT Message-Id: <202510202342.59KNgLjG091852@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: 67bc0e34594d - main - aw_mmc.4: add D1 compatible List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 67bc0e34594d69acd14e5d08e426fdd26f5b7e5a Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=67bc0e34594d69acd14e5d08e426fdd26f5b7e5a commit 67bc0e34594d69acd14e5d08e426fdd26f5b7e5a Author: Mitchell Horne AuthorDate: 2025-07-11 20:58:39 +0000 Commit: Mitchell Horne CommitDate: 2025-10-20 23:37:14 +0000 aw_mmc.4: add D1 compatible MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D52586 --- share/man/man4/aw_mmc.4 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/share/man/man4/aw_mmc.4 b/share/man/man4/aw_mmc.4 index eb7fc9ce020a..072835cce7c0 100644 --- a/share/man/man4/aw_mmc.4 +++ b/share/man/man4/aw_mmc.4 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd Dec 25, 2017 +.Dd October 20, 2025 .Dt AW_MMC 4 .Os .Sh NAME @@ -48,6 +48,8 @@ allwinner,sun5i-a13-mmc allwinner,sun7i-a20-mmc .It allwinner,sun50i-a64-mmc +.It +allwinner,sun20i-d1-mmc .El .Sh SYSCTL VARIABLES The following read-only variables are available via From nobody Mon Oct 20 23:43:46 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4crBpB287fz6DLNx; Mon, 20 Oct 2025 23:43:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4crBpB1d2nz3sjN; Mon, 20 Oct 2025 23:43:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761003826; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=isCEJMDwPFKAxeKBWmpR4/AKr72YD/WYuiI7iYGi/9A=; b=yDMrkJ6/x+nMdpvzJguMN0oAXMjUscoRGlkHjlIdv72bj1Us85wectO67y2ix6KK63f43k oUhG3TOQiD6HmeS7VDYyypNawjTjic6I9yE+eMKTa9gybfaqiXc1hJrmeCiUSm2z2u0w+8 vC0b+Zcr3Jup2JxrNpP5STGi4pQgOQvX/Syo3PvWXQ+A15wbsuPBEEGo72ofXAaEyKlNK6 p7OHeljnmVVmvio1t91Z7ce6968hwEvriunUAd/E9xC5Y6dpgI2tKmjeeY0hDmse0Gyi5F 1cGf23C9g6e4ynRW5UHsE0aCxsTOHRqg4ffoycyK1GcqTlGj03hOV4fjZEckbg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761003826; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=isCEJMDwPFKAxeKBWmpR4/AKr72YD/WYuiI7iYGi/9A=; b=GUNIA4p/gdWJwL8VTvxJ/4ptw9pmFjhrTC0kmHJ0FKbobmvubOG0d4zBpuXC+8JJFlGRQ+ lCGhy6AnWVQEFpCWznAzy6ocMvK8LB5z2E04VcTbcpDQFh0KteSUcwXRjRKFfijNJgLVeY bbZqRnD0Tn82QNeRi9BEWfixmmEKey7wYijDCBopuGx5vgzRonBVylPXL1AZVCuxuBhbOc a/HwwDgzRQ0hCf8I90QnjUEYgEkqMTvT1tB1tM3juUPRcpgCaUDwL3sBJr0uYFT5mfK4d+ 2fawYKIvrPcDajDsUtOkkoSR6QgWS2MvqmAJ/6PglCayxSzl1bCZ7VSXAxZBgg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761003826; a=rsa-sha256; cv=none; b=yxow//TOGzO681o4xOh8DuOXx5N46bS0gw+J2mOOjCZznhMUm2ebXQXaEc8e9PynDkLH3N n0b4rzu5SC898QtC1JcOpjoprU5kqAy+dAXAdsuqmWtPgv1BhEzX6yOwEODTf2TFh00a6o opPA9BMDjHOuPMrkN00nEOnESj5c+Koayw+Fwl7amDyC/socuNyYVEeqt0/Rz7zCEJEgET G1gFqUxTuX+/JYNkGioUP2ySYcxt/g05F33FFWAizudej5d5NHUqm2AR5swjew2Sh7iHrO VHfQ++Lf6ona//UHfLTljFGoftQbBtpUTiIWCnemu1M6M9fSX1d9k6xqIPZujA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4crBpB1B7wzb7c; Mon, 20 Oct 2025 23:43: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 59KNhkAD092402; Mon, 20 Oct 2025 23:43:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59KNhkZh092399; Mon, 20 Oct 2025 23:43:46 GMT (envelope-from git) Date: Mon, 20 Oct 2025 23:43:46 GMT Message-Id: <202510202343.59KNhkZh092399@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: f34e152e025e - main - ti_clkctrl.c: fix paths in comment List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f34e152e025e47b53b4a90464c49d09cadb3bbfc Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=f34e152e025e47b53b4a90464c49d09cadb3bbfc commit f34e152e025e47b53b4a90464c49d09cadb3bbfc Author: Mitchell Horne AuthorDate: 2025-05-16 15:47:51 +0000 Commit: Mitchell Horne CommitDate: 2025-10-20 23:43:28 +0000 ti_clkctrl.c: fix paths in comment Now under sys/contrib/device-tree. --- sys/arm/ti/clk/ti_clkctrl.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/arm/ti/clk/ti_clkctrl.c b/sys/arm/ti/clk/ti_clkctrl.c index 72fa8548d4f8..06e558d140f2 100644 --- a/sys/arm/ti/clk/ti_clkctrl.c +++ b/sys/arm/ti/clk/ti_clkctrl.c @@ -284,9 +284,9 @@ create_clkctrl(struct ti_clkctrl_softc *sc, cell_t *reg, uint32_t index, uint32_ /* * Check out XX_CLKCTRL-INDEX(offset)-macro dance in - * sys/gnu/dts/dts/include/dt-bindings/clock/am3.h - * sys/gnu/dts/dts/include/dt-bindings/clock/am4.h - * sys/gnu/dts/dts/include/dt-bindings/clock/dra7.h + * sys/contrib/device-tree/include/dt-bindings/clock/am3.h + * sys/contrib/device-tree/include/dt-bindings/clock/am4.h + * sys/contrib/device-tree/include/dt-bindings/clock/dra7.h * reg[0] are in practice the same as the offset described in the dts. */ /* special_gdbclk_reg are 0 or 1 */ From nobody Tue Oct 21 00:10:25 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4crCNy1Vbsz6DNv6; Tue, 21 Oct 2025 00:10:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4crCNy0s9Dz3wZR; Tue, 21 Oct 2025 00:10:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761005426; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XoGiXVhi2PNvAtblmrp/Dz3SRMGrOugK4U0QH1qZ0oE=; b=eyEnYRXNIfeaw1EoU3Ahk/w+aZGlh5XPpdG4bimtVwk2GMQ9ywu9IGSjfqjNJ0KAsu5hT8 YiJxcnf9JHzDr+N8rPKJFBms3Au6Pa3SDYvP+cdC5TZamqRhuuDyb740g2Il+Jb4mhop+E 6wqL4rCuYQKMnJCPP828wttwhbtuALeh0FCWpCwx46ziCawM8Kfw5Cj8oNva6n4V93L/hB EMBrKMXywNLGyVgYQK3mV3lI7EQXIqq5OgqAAnd/KeSRMqF/L3MPDBpNiV6ol5/eYJmu1i M2i2ojyK6ej5ltT5sLuClJRjNs0NQ2toBumk6cAaZqGCe4qMLTAPYse9Buhiqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761005426; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XoGiXVhi2PNvAtblmrp/Dz3SRMGrOugK4U0QH1qZ0oE=; b=QdwWOMczR5yPPbb95JC4zL5XlY2JmKKBF3z1sLdmWbvlZ2aBuKCDVcNsjro3JVZYQsh5CH u7X0ad6o0745jOhXyHfZVLN007pMtoM95GmZUWD9ABNelWsaxfeHq1yVOg1FMSDu4KpoSu 1wXuUOFRzhdn2fjr4TZ0KrZTo0QyZKCbIVt63afJpeEuZRvvtO7TtxgZiBthUVy8r2efOG yyFPgDxqsz8DxtE1sYkNWuN/IMW33MRMd8wUOpTRn7egwSXR7TtgdnkuSnwnfH1ZTkBSR4 x9N/HgoPar08XyG2lYSGN6kXLPCcHTEw5bSQCcxURNiGczJjxzH23IhcHEDlVw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761005426; a=rsa-sha256; cv=none; b=OeSvllCiPDfRrTjvKOtii4dmCgqgf2xBzEHhTToTNC74UImYMcH64/LZ2GDWHNVZX10Ba8 udEKfpjro+QvnG2w3CaiPQMBQOTVyuiJ8UOuSxkNWhG6rSiepeJlfAqB2l03EZOU7tey6h NYnlA6co2svlw0Szqp1c1Wub8vkWmsLp4zNfgTXHLagM658+BnYPI2Qq0jyDpB1Wk5pZ6b kj2c5dyovB6015mB75zBpA7cMf+UxQfwnTg6aBfEaD/Rsvgc0mh/ncXD6mYiUvTp3lEmi/ UYYdbfBgWIldj+zPvTfXmcXGbQsWOLFJz4VKppfK7RRphaZv4pQ9Lqp8wG9gpg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4crCNy0S41zc1n; Tue, 21 Oct 2025 00:10: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 59L0APnc041387; Tue, 21 Oct 2025 00:10:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59L0APTK041384; Tue, 21 Oct 2025 00:10:25 GMT (envelope-from git) Date: Tue, 21 Oct 2025 00:10:25 GMT Message-Id: <202510210010.59L0APTK041384@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jamie Gritton Subject: git: 5f7d5709e0c2 - main - jail: fix an error condition that was returned without setting errno. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jamie X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5f7d5709e0c242d5a5fa5516d6079433ee06c347 Auto-Submitted: auto-generated The branch main has been updated by jamie: URL: https://cgit.FreeBSD.org/src/commit/?id=5f7d5709e0c242d5a5fa5516d6079433ee06c347 commit 5f7d5709e0c242d5a5fa5516d6079433ee06c347 Author: Jamie Gritton AuthorDate: 2025-10-21 00:09:39 +0000 Commit: Jamie Gritton CommitDate: 2025-10-21 00:09:39 +0000 jail: fix an error condition that was returned without setting errno. MFC after: 3 days --- sys/kern/kern_jail.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/kern/kern_jail.c b/sys/kern/kern_jail.c index 00732d55cd46..267b60ffb5bc 100644 --- a/sys/kern/kern_jail.c +++ b/sys/kern/kern_jail.c @@ -1088,6 +1088,7 @@ kern_jail_set(struct thread *td, struct uio *optuio, int flags) else { if (!(flags & (JAIL_USE_DESC | JAIL_AT_DESC | JAIL_GET_DESC | JAIL_OWN_DESC))) { + error = EINVAL; vfs_opterror(opts, "unexpected desc"); goto done_errmsg; } @@ -2518,6 +2519,7 @@ kern_jail_get(struct thread *td, struct uio *optuio, int flags) } else if (error == 0) { if (!(flags & (JAIL_USE_DESC | JAIL_AT_DESC | JAIL_GET_DESC | JAIL_OWN_DESC))) { + error = EINVAL; vfs_opterror(opts, "unexpected desc"); goto done; } From nobody Tue Oct 21 04:20:19 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4crJxd3LY5z6DmPG for ; Tue, 21 Oct 2025 04:20:37 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-pj1-x1030.google.com (mail-pj1-x1030.google.com [IPv6:2607:f8b0:4864:20::1030]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4crJxd0cQkz3Qfm for ; Tue, 21 Oct 2025 04:20:37 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-pj1-x1030.google.com with SMTP id 98e67ed59e1d1-33ba5d8f3bfso4458481a91.3 for ; Mon, 20 Oct 2025 21:20:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1761020430; x=1761625230; darn=freebsd.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=xBqpHbGLK+cwVpL/17YSug7JJJDysBFnlQTXKHN0gQo=; b=tpRo9Br2HpV7iDxzfCPytZAUpLH+J1135DC0ToeTvXsq8hnC5ATRlYrhZQZdQSClUu IUMRRnzq3tV/JHiuH9sDiwU8xUmxUPh85H6llBA9P93FDMErNAk9EXiW1F354UlSlORp eoKTCHwOQvanytvjDyY4cV/uMwpoa9lrU6DVrb2ZMw9EyZanMLkRV4ljKu5Ez//9cL5Z hOLLM7h5TGpaa7Y6/hIUd8igEMAU7k+67V2d4Ap1iijMzrinX99L07k5VOnhq2KTc7oa qzgtBBhAzvDAq99GvYgiMhCGobVpMkrY4kC8Brjq7M5TGz0G/3zlAzpaZqPLAh/RgV/q CT8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761020430; x=1761625230; 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=xBqpHbGLK+cwVpL/17YSug7JJJDysBFnlQTXKHN0gQo=; b=icXZsVN3l3LzBMZzBhY4nqkLau9WGl5ORpHsgs+ahUgMIRddCFzl+nvZixNwovz5wp rbpA+xE4RLUjYU97wU67dJdYbMbCWBa3L5WQ15RxMBDonEgGJQ5ze5yMfQ06a5sI3cKs BCbN7uzPSdgrouThQKdG2/z5R8q6oqqcWeEGJyPPTkynDnwnfetujoTiJhM1q5KAAye7 RyeSvCyiA5WdbS+Nw9n+ALsbFSmPBVKSuLhs+anWhGhV6edXdlCSy1cAo1Dn9oxjTlEz KVuOtIgkFVyEBV07ThUJZ/zhzMeYNdRchMeby0n2dG9fW8pPvApHddlMT/A+WGdONtiX suqQ== X-Forwarded-Encrypted: i=1; AJvYcCXVwnm4g57zCds55fg1Wr2tgo4ZC974sz8W/5rjmyXg8qA4Ymc4uPJNRVSBEErbZ2rmF0y2dZ1TCbV1gthuB9CMgctkfA==@freebsd.org X-Gm-Message-State: AOJu0YyxMdWqvxW415R7SqhCD6yYca3l72Y4WNbvujMKwj+SoBiydbt6 wUqh68USZdpW48e2nfHoVFlC+KWe7JWI1hf5JbUOurlElp+SnjfVl53566/DQr1v30q9V5MkTLR SVZNkqWtARXnI2Hd9mk9rgAUB65yDU/ogfhG+9VpxZw== X-Gm-Gg: ASbGncsEXSIg0TmAiecOH73e+G/b38FtqRj0eZ5maO0H2ZAdzMPOywYJbDakAtnRPRq 7h2/ExCQ7PZ26mACJOSVOrAQiZF5Cls1yz/DhyYk36mQvS5UFaSflOOdz7nVDgZXrhcx1DGL+Yp KXdVtlVdwesoquy7E5Kjb8mjnFRKS/CGRde7HBIF9qSzcb36rWeJTRUZrkfiduoRNRNISKJh02u 9qA73pAF6ETu7fo+KQqltW+XD4Q8EqowyFwQrF66XMK2loGQMb4JSJTdWOAAljyyHl7JmtXe2s6 mnN4VFc= X-Google-Smtp-Source: AGHT+IGH1+5PA9vxf2AXU0/4+gOqTgE3Df5FkEs/BS40E8e5mfwQHPJ7GKkk3HLhBd/gedG5mN34zJLglBzOqWcGAvQ= X-Received: by 2002:a17:90a:d60f:b0:32b:dfdb:b27f with SMTP id 98e67ed59e1d1-33bcf8e4539mr21012779a91.17.1761020430341; Mon, 20 Oct 2025 21:20:30 -0700 (PDT) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 References: <202510171914.59HJE0uo036247@gitrepo.freebsd.org> <228220a0-c819-4c51-92d3-5357e925c81d@FreeBSD.org> In-Reply-To: From: Warner Losh Date: Tue, 21 Oct 2025 00:20:19 -0400 X-Gm-Features: AS18NWCt3kPyOh3NFMy3RNzlGyHOAGfZd__KpX45HK-vdhCHzM-DuniPy7RLx7o Message-ID: Subject: Re: git: 74a6bb524e5b - main - Makefile: Don't allow install{world,kernel} with pkgbase To: John Baldwin Cc: src-committers , dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: multipart/alternative; boundary="0000000000003168f90641a38512" X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4crJxd0cQkz3Qfm --0000000000003168f90641a38512 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Mon, Oct 20, 2025 at 1:44=E2=80=AFPM John Baldwin wrot= e: > On 10/20/25 10:59, Warner Losh wrote: > > On Mon, Oct 20, 2025, 8:42=E2=80=AFAM Lexi Winter wro= te: > > > >> John Baldwin wrote in <228220a0-c819-4c51-92d3-5357e925c81d@FreeBSD.or= g > >: > >>> On 10/17/25 15:14, Lexi Winter wrote: > >>>> Makefile: Don't allow install{world,kernel} with pkgbase > >>> > >>> Can we document how users who want to build from source can do so fro= m > a > >> new installation > >>> that uses pkgbase? I guess it is something like: > >>> > >>> - pkg install sources if not already (or git clone the right > branch/tag) > >>> - etcupdate bootstrap > >>> - (clearly can't just use pkg delete with = a > >> glob, so need > >>> something else) > >> > >> this should eventually be in the Handbook. > > > > > > Install* should eventually just do the right thing like ports: stage th= e > > packages, make the packages and the install from the packages. 16 time > > frame, though. > > Hmm, 'make installkernel' needs to still create kernel.old for those > of us doing development (or really, just running main. The tb(4) driver > turned my laptop into a brick recently and I needed kernel.old so I could > recover). AFAIK, pkgbase doesn't have any provision for doing that. Als= o, > `make installkernel INSTKERNNAME=3Dtest; nextboot -k test` is a key part = of > my workflow for testing kernels. I'm fine with using packages to ship > updates to users running stock sources, but please do not make it harder > to do development. > Yes. Though I'd hope we'd get slightly better BE integration. Then it doesn't matter... unless you're running UFS root... so something needs to happen. But it's not clear to me if the stagekernel stuff should do that, or if *ANY* update from pkg to /boot/kernel (or the booted kernel) shouldn't do the /boot/kernel -> /boot/kernel.old rename, sysctl tweaks so ps can still fine the kernel if it needs it. > When hacking on userspace components I often need to be able to do > just 'make install' of a single binary or library onto an installed > system knowing that a future installworld or `make install` will revert > to "stock" binaries later. Please don't break that. It's like when > I work on changes to GDB or LLVM, I use the native build system to build > the modified version, I don't try to hack up a port to build a package > with the extra changes I have either in a working tree or committed on a > feature branch. > Oh yes. I was thinking that only install{world,kernel} would change to depend on the staging + packaging and then accomplish this by doing a pkg update. The per-directory stuff I didn't think should change (though I honestly wish we'd have the 'stating' just be a metafile creation with a contents=3D tag in the METALOG instead of so much copying. Warner --0000000000003168f90641a38512 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


On Mon, Oct 20,= 2025 at 1:44=E2=80=AFPM John Baldwin <jhb@freebsd.org> wrote:
On 10/20/25 10:59, Warner Losh wrote:
> On Mon, Oct 20, 2025, 8:42=E2=80=AFAM Lexi Winter <ivy@freebsd.org> wrote:
>
>> John Baldwin wrote in <228220a0-c819-4c51-92d3-5357e925c81d@Fre= eBSD.org>:
>>> On 10/17/25 15:14, Lexi Winter wrote:
>>>>=C2=A0 =C2=A0 =C2=A0 =C2=A0Makefile: Don't allow instal= l{world,kernel} with pkgbase
>>>
>>> Can we document how users who want to build from source can do= so from a
>> new installation
>>> that uses pkgbase?=C2=A0 I guess it is something like:
>>>
>>> - pkg install sources if not already (or git clone the right b= ranch/tag)
>>> - etcupdate bootstrap
>>> - <destroy the pkgbase repo> (clearly can't just use= pkg delete with a
>> glob, so need
>>>=C2=A0 =C2=A0 something else)
>>
>> this should eventually be in the Handbook.
>
>
> Install* should eventually just do the right thing like ports: stage t= he
> packages, make the packages and the install from the packages.=C2=A0 1= 6 time
> frame, though.

Hmm, 'make installkernel' needs to still create kernel.old for thos= e
of us doing development (or really, just running main.=C2=A0 The tb(4) driv= er
turned my laptop into a brick recently and I needed kernel.old so I could recover).=C2=A0 AFAIK, pkgbase doesn't have any provision for doing tha= t.=C2=A0 Also,
`make installkernel INSTKERNNAME=3Dtest; nextboot -k test` is a key part of=
my workflow for testing kernels.=C2=A0 I'm fine with using packages to = ship
updates to users running stock sources, but please do not make it harder to do development.

Yes. Though I'd = hope we'd get slightly better BE integration. Then it doesn't matte= r... unless you're running UFS root... so something needs to happen. Bu= t it's not clear to me if the stagekernel=C2=A0stuff should do that, or= if *ANY* update from pkg to /boot/kernel (or the booted kernel) shouldn= 9;t do the /boot/kernel -> /boot/kernel.old rename, sysctl tweaks so ps = can still fine the kernel if it needs it.
=C2=A0
When hacking on userspace components I often need to be able to do
just 'make install' of a single binary or library onto an installed=
system knowing that a future installworld or `make install` will revert
to "stock" binaries later.=C2=A0 Please don't break that.=C2= =A0 It's like when
I work on changes to GDB or LLVM, I use the native build system to build the modified version, I don't try to hack up a port to build a package<= br> with the extra changes I have either in a working tree or committed on a feature branch.

Oh yes. I was thinking = that only install{world,kernel} would change to depend on the staging + pac= kaging and then=C2=A0 accomplish this by doing a pkg update. The per-direct= ory stuff I didn't think should change (though I honestly wish we'd= have the 'stating' just be a metafile creation with a contents=3D = tag in the METALOG instead of so much copying.

War= ner
--0000000000003168f90641a38512-- From nobody Tue Oct 21 07:53:10 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4crPfv0hTbz6F3SL; Tue, 21 Oct 2025 07:53:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4crPft5rC2z3mBS; Tue, 21 Oct 2025 07:53:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761033190; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0EEX0kiMRVVJ/mYIYAxFTqb1Qp/nRR2rbpH+ZMf+7Ig=; b=dc5uYAaD5Z76AmfiX4K0GSe86Y7UNWiDXll4T5vaQLdpT15yNBNWhRzgxo1dxP1f398mmU 0xwnR42nhHIWXFIxwHkZ87R9wqxLgQV7faGlW1tSUi41+Ih22/ojTtpOYis2wvP75rXfGC RVFqwxJfUeXYkRm2dadBfRvXQY88ik9HeiUxIXALnbcj2rhXd/zSJNPiUMEqe6KmoYnVDv xVM1U9IL5bgSfxy3RqmT1bTGnMa0jnA/EMeTDRo4O8pZzqevEMqM+CHJLzvjCCnqLuxaA9 pEyMXrACcW3pvokqBu19nuQMCr0SaMC3VoRkJS9sdSDTdAPxhkbfnuEm7SX5Cg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761033190; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0EEX0kiMRVVJ/mYIYAxFTqb1Qp/nRR2rbpH+ZMf+7Ig=; b=GlMvQNPouOhLs1fL+tbJCepr8EVXPC8ENBK6JdZbw29MDRMC825E5rL5WrpNwmkEFa9pHN +4Rk4Y17QBcuYjba4dc2RS+ETxf9IJhwnkw3/uoSzFwv0XxaQeoemSvm0A+DeVCGLZDcwX buZq8qFqx7I7x+UAwlA5FJSH3bMewEEo0krR/uFU1kUVBJBGEaDgmpoKRkxDQltjwItl8m /WiXyeLcLdWKq+vGqzPBqBgVI3MZVQ/W+vALWF4WuDZvdHQF/zK2AaEphyeB7ENdJE9LLm B8veErur2A6wM7pRQlocXa0ABfcf9UGwXeEWx/gHttRdrytt/PKZ9zIZ3x6dEg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761033190; a=rsa-sha256; cv=none; b=doNQBIqtu/jvuvjoKhQcnesR+LAy+CNFNJa+E8t/Y726loWZPmvRp4rggo8EPjwy/FmvP1 6xgtJjx2eYak9qB0vztxxcdtuVifJdpeiIp64TRGyMTRz6ruOqT/YDl+YKmG+gZTyMxT2k e2zmT3Tg5oiaEHz5y+6un09KRn76jrxJXEHMfGCh35moFggYUGF6L3EiPg5PfgdRcd0LQl VJMatdarpRf3or8fyuMmiIUv+yT04GTnMF+SLh+TslOaBAWf2TpVi/6NWc50WJ6MdRF1oC uSqvPtOsXdxNrEfyF/A8QRU5kR/Ig+ib80RTilWf6fmGiK0afQKMXz+5dAWPug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4crPft5MWhzr74; Tue, 21 Oct 2025 07:53:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59L7rAv1014453; Tue, 21 Oct 2025 07:53:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59L7rAaS014450; Tue, 21 Oct 2025 07:53:10 GMT (envelope-from git) Date: Tue, 21 Oct 2025 07:53:10 GMT Message-Id: <202510210753.59L7rAaS014450@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 8ea366f40084 - main - LinuxKPI: device_driver add (*coredump)() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8ea366f40084010c14fe40b3aebb42b459b195cc Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=8ea366f40084010c14fe40b3aebb42b459b195cc commit 8ea366f40084010c14fe40b3aebb42b459b195cc Author: Bjoern A. Zeeb AuthorDate: 2025-10-11 09:23:43 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-10-21 07:49:39 +0000 LinuxKPI: device_driver add (*coredump)() Needed by multiple wireless driver for the v6.17 update (likely earlier versions already). MFC after: 3 days Reviewed by: dumbbell Differential Revision: https://reviews.freebsd.org/D53206 --- sys/compat/linuxkpi/common/include/linux/device.h | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/compat/linuxkpi/common/include/linux/device.h b/sys/compat/linuxkpi/common/include/linux/device.h index 7dd6340746d2..c291133e2e0b 100644 --- a/sys/compat/linuxkpi/common/include/linux/device.h +++ b/sys/compat/linuxkpi/common/include/linux/device.h @@ -92,6 +92,7 @@ struct device_driver { const struct dev_pm_ops *pm; void (*shutdown) (struct device *); + void (*coredump) (struct device *); }; struct device_type { From nobody Tue Oct 21 07:53:07 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4crPfq4dtlz6F3V3; Tue, 21 Oct 2025 07:53:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4crPfq33fNz3mS5; Tue, 21 Oct 2025 07:53:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761033187; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=33bGpX8jwkJWEh64RMLwvonnifsKPnl0DGY7umJqyK8=; b=nTQT3izzoR5Nn0Luqp8kCdiFna6VxOvJZcXq4IwTrERVfjGU3WLtknbetSP3IfvE6bSrZh t/l/YEug8u4aoksGhSeGHqMkK4xUNMMCtDkH9jimJXJH9DrggCd1LKJWuPMb1iAHCWfVzM sEAtEFqnGL5F7GPhNBchsMcB8zbYksPiSmPHqBikqzTFVki47gwsu6Dds1KOrShihoP21E QPywDKftqwHOqPoEm+AGZdu+Yane48WornaurlLgwyamjOaz4PP1WF3qsUvhByHif4nM3s lVPcbc6vPhcpjwPysxe8e4gZrqbiUD+wUYusQN97Z5H7HNNa7XQwjMEkqMHinw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761033187; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=33bGpX8jwkJWEh64RMLwvonnifsKPnl0DGY7umJqyK8=; b=Iq/89DccOKq2rDfhW11taJNI2zuqzmif8Ih3FjkH3A5hAVNETgdYVrxBe880z+OAyL4bAg GIAhqX+H3zUkYcTXrH4SDadCMNHy9EMiCJoiNHVi8YNQWGIsz1mb02vkBv7hjuHKkPcmEM JVcJeQA85/Ov7h3feAk7ul+cqadw9VBk5d2/zK/8UXff5IMlV89NfdPQSe5S4OojuqH9kp 4KhsMy2964gQ/iXQOFPjI+oF7p9jaMWhBe5xAueWflCfkjdXJzYvN1k1PaO+ZKJO1aVAEc ENFs9sENuADyz6Iwx3cIUPnxQ1zz/6vBbWf+jDh2qrrfhwXiR682g4RxucAcuQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761033187; a=rsa-sha256; cv=none; b=OCJopl1h/J+4Hv6R+zsGC1OpkuTCIsoFFYxGfqTY+2hdWD0bbn/JLVqZz1JpZJiZp/009j cLTkx9dnPJC/UgoTnAYHw3KFV3fSK+todHnY0p/sfZb1CuEuk/0jY+sBTQ79/xaankOVWP o3HK6xhLe+1ZpruBjzKdhoAk70AK0TbyRMN34lI6DmI+tOQ9/Wt8Ua6lhcn5T0MTIpZDCU FpOvnoThYBYVCRRpmHyOQFSckqOs0I+IAuIHDRRx2j4p6DDAvYZohfNU8BqbQltNLRzZIh Jt1eXG+5IBcPcfjVVKPOzFFO0cgzA0w4i2eSr+poKVIvUYYWnDtvoM6FlPB5dw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4crPfq2dcYzrQP; Tue, 21 Oct 2025 07:53: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 59L7r7Hq014338; Tue, 21 Oct 2025 07:53:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59L7r7dG014335; Tue, 21 Oct 2025 07:53:07 GMT (envelope-from git) Date: Tue, 21 Oct 2025 07:53:07 GMT Message-Id: <202510210753.59L7r7dG014335@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 0a4b11ddb298 - main - LinuxKPI: add __counted_by_le() and __counted_by_be() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0a4b11ddb298fa08e1a81af7337995a3769552bf Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=0a4b11ddb298fa08e1a81af7337995a3769552bf commit 0a4b11ddb298fa08e1a81af7337995a3769552bf Author: Bjoern A. Zeeb AuthorDate: 2025-10-11 09:22:26 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-10-21 07:49:38 +0000 LinuxKPI: add __counted_by_le() and __counted_by_be() The former is needed by a wireless driver at v6.17. MFC after: 3 days Reviewed by: dumbbell, emaste Differential Revision: https://reviews.freebsd.org/D53203 --- sys/compat/linuxkpi/common/include/linux/compiler.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/compiler.h b/sys/compat/linuxkpi/common/include/linux/compiler.h index 948396144ad6..4146c829b936 100644 --- a/sys/compat/linuxkpi/common/include/linux/compiler.h +++ b/sys/compat/linuxkpi/common/include/linux/compiler.h @@ -31,6 +31,7 @@ #define _LINUXKPI_LINUX_COMPILER_H_ #include +#include #define __user #define __kernel @@ -79,6 +80,13 @@ #else #define __counted_by(_x) #endif +#if BYTE_ORDER == LITTLE_ENDIAN +#define __counted_by_le(_x) __counted_by(_x) +#define __counted_by_be(_x) +#else +#define __counted_by_le(_x) +#define __counted_by_be(_x) __counted_by(_x) +#endif #define likely(x) __builtin_expect(!!(x), 1) #define unlikely(x) __builtin_expect(!!(x), 0) From nobody Tue Oct 21 07:53:18 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4crPg25kRTz6F3kC; Tue, 21 Oct 2025 07:53:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4crPg253xnz3mZp; Tue, 21 Oct 2025 07:53:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761033198; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AbiGvsL/USmNhN5LkjPfVphOhbP7B6wlIwBKcM2NRXE=; b=m3n6cCKFWtPsnv2v564RLb+dh50wfOjsaCurrAhhEAHphiKxgWIL9cwZP4QlWsrI6mnYQB UUiIkhzoiLCbeHrB+3ZgNez6nSxPcWPtiigpiRtfceMaSYMmfcsX0paqjh7yKJnmMHdDnJ 1m06UZtT4kXAqX11GAesXJU6awp3/kPkP7VS2l+APjwaZQOhjZ5351kWLo8q4SZsBA/rD1 Hq5uwLyu3HPPqTJgTz307uHAbqby6C4EqgNTKq30q82PWoyXUnSDZRsMLPcDPojLtPV+WY Q7LEMngsDiIJzNELh4hQ8B0jMAOUQr6fqU2ooUZYh45DMaMB3CBrree5S3we+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761033198; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AbiGvsL/USmNhN5LkjPfVphOhbP7B6wlIwBKcM2NRXE=; b=Tpky7gW2KcQBv32R9BX8r9C3jYQ1DlHE3GETLxYVQ7Ww9DMHhWBqBsSKT2LLBK8jL98qNp 52cTYj1g6O5J+5OvUhROtGOpXGP80TszPZfDEGaMaxVhFoAprXGufs/WO9G0eXLfnml9HD Kqp2TwX31Dnh0V3kn9QbP6m0IYQu5T3o9eDX2XuQqOMnisDSxwtWQInEiB8gqmTWz56dWY +3HMdX4uPOSz/b6Icg9tbNFmKZxYZe5vyxT7WLvXwFUVXiCquj0Cqu4fN/O71cVPG7JIbY 9XmKcQ1vv95ybTRVHZUPEn168v0Rrdg8wIGr/inmFG1wtoUgx8Ie9cfJ56tcdA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761033198; a=rsa-sha256; cv=none; b=e/btrCOBBV9PXMGZkughxuqrbjOMQTB+oJF97C+rYhQLZhGbkpgmlq9hBqi7sugebfDr4m 9QOgHIylmq7jQJGCObwoyaAQLZZUKcLa01T1e9jPR7LgP/HGeWjaM7VGvhZhWttVqElBNe sU0uobYyKeO3mtWd54jzXqXTyemtKQtKJXJ5fQigqW55TjsNQtHmukcbj/5aaMSn3icv5h solUcUE2DVYWrs+XeSY3Hn+5iXHu6eaLkTuXgxkg2+e4w4BlyoYZhfPxW4APvv4khcb77Z KmMsD0xioDmM1dIOg+ZuxYXxjfN1WRJDhR3t+TRBV4IyYtKYmx6geDf4f6HAGA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4crPg24gQ1zrP1; Tue, 21 Oct 2025 07:53: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 59L7rILY014704; Tue, 21 Oct 2025 07:53:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59L7rIuF014701; Tue, 21 Oct 2025 07:53:18 GMT (envelope-from git) Date: Tue, 21 Oct 2025 07:53:18 GMT Message-Id: <202510210753.59L7rIuF014701@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 0567484734ad - main - LinuxKPI: 802.11: additions for Linux v6.17 based wireless drivers List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0567484734ad9732978e189ebed042f6320e2471 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=0567484734ad9732978e189ebed042f6320e2471 commit 0567484734ad9732978e189ebed042f6320e2471 Author: Bjoern A. Zeeb AuthorDate: 2025-10-11 09:21:55 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-10-21 07:52:21 +0000 LinuxKPI: 802.11: additions for Linux v6.17 based wireless drivers This includes some type cleanups as well as some shuffling of structs and functions to sort dependencies out. Few new functions and defines as well as new struct members. Minor fixes to style and debug logging. This is the majority of changes. None of these should conflict with current in-tree drivers. The final bit of changes will come along with the driver updates adding an extra argument to function pointers. MFC after: 3 days --- .../linuxkpi/common/include/linux/ieee80211.h | 2 + sys/compat/linuxkpi/common/include/linux/nl80211.h | 10 + sys/compat/linuxkpi/common/include/net/cfg80211.h | 320 ++++++++++++++------- sys/compat/linuxkpi/common/include/net/mac80211.h | 37 +-- sys/compat/linuxkpi/common/src/linux_80211.c | 12 +- .../linuxkpi/common/src/linux_80211_macops.c | 2 +- 6 files changed, 247 insertions(+), 136 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/ieee80211.h b/sys/compat/linuxkpi/common/include/linux/ieee80211.h index 17041bb03ce8..ea8c0fc8ef5e 100644 --- a/sys/compat/linuxkpi/common/include/linux/ieee80211.h +++ b/sys/compat/linuxkpi/common/include/linux/ieee80211.h @@ -312,6 +312,7 @@ enum ieee80211_ac_numbers { #define IEEE80211_MLD_CAP_OP_MAX_SIMUL_LINKS 0xf #define IEEE80211_MLD_CAP_OP_TID_TO_LINK_MAP_NEG_SUPP 0x0060 #define IEEE80211_MLD_CAP_OP_TID_TO_LINK_MAP_NEG_SUPP_SAME 1 +#define IEEE80211_MLD_CAP_OP_LINK_RECONF_SUPPORT 0x2000 struct ieee80211_mcs_info { uint8_t rx_mask[IEEE80211_HT_MCS_MASK_LEN]; @@ -365,6 +366,7 @@ enum ieee80211_chanctx_change_flags { IEEE80211_CHANCTX_CHANGE_CHANNEL = BIT(4), IEEE80211_CHANCTX_CHANGE_PUNCTURING = BIT(5), IEEE80211_CHANCTX_CHANGE_MIN_DEF = BIT(6), + IEEE80211_CHANCTX_CHANGE_AP = BIT(7), }; enum ieee80211_frame_release_type { diff --git a/sys/compat/linuxkpi/common/include/linux/nl80211.h b/sys/compat/linuxkpi/common/include/linux/nl80211.h index f3979d3a2abc..845ffec4bcba 100644 --- a/sys/compat/linuxkpi/common/include/linux/nl80211.h +++ b/sys/compat/linuxkpi/common/include/linux/nl80211.h @@ -50,6 +50,7 @@ enum nl80211_feature_flags { NL80211_FEATURE_WFA_TPC_IE_IN_PROBES = BIT(15), NL80211_FEATURE_AP_SCAN = BIT(16), NL80211_FEATURE_ACTIVE_MONITOR = BIT(17), + NL80211_FEATURE_SAE = BIT(18), }; enum nl80211_pmsr_ftm_failure_flags { @@ -85,6 +86,7 @@ enum nl80211_reg_rule_flags { NL80211_RRF_NO_6GHZ_AFC_CLIENT = BIT(15), NL80211_RRF_PSD = BIT(16), NL80211_RRF_ALLOW_6GHZ_VLP_AP = BIT(17), + NL80211_RRF_ALLOW_20MHZ_ACTIVITY = BIT(18), }; #define NL80211_RRF_NO_HT40 (NL80211_RRF_NO_HT40MINUS|NL80211_RRF_NO_HT40PLUS) @@ -434,6 +436,14 @@ enum nl80211_hidden_ssid { NL80211_HIDDEN_SSID_NOT_IN_USE, }; +enum nl80211_external_auth_action { + NL80211_EXTERNAL_AUTH_START, +}; + +enum nl80211_rxmgmt_flags { + NL80211_RXMGMT_FLAG_EXTERNAL_AUTH = BIT(1), +}; + #define NL80211_TKIP_DATA_OFFSET_TX_MIC_KEY 16 #define NL80211_TKIP_DATA_OFFSET_RX_MIC_KEY 24 diff --git a/sys/compat/linuxkpi/common/include/net/cfg80211.h b/sys/compat/linuxkpi/common/include/net/cfg80211.h index 239b4a5ae7b8..f769cfdd4075 100644 --- a/sys/compat/linuxkpi/common/include/net/cfg80211.h +++ b/sys/compat/linuxkpi/common/include/net/cfg80211.h @@ -56,7 +56,7 @@ extern int linuxkpi_debug_80211; #define D80211_IMPROVE 0x2 #endif #define TODO(fmt, ...) if (linuxkpi_debug_80211 & D80211_TODO) \ - printf("%s:%d: XXX LKPI80211 TODO " fmt "\n", __func__, __LINE__, ##__VA_ARGS__) + printf("%s:%d: XXX LKPI80211 TODO " fmt "\n", __func__, __LINE__, ##__VA_ARGS__) #define IMPROVE(fmt, ...) if (linuxkpi_debug_80211 & D80211_IMPROVE) \ printf("%s:%d: XXX LKPI80211 IMPROVE " fmt "\n", __func__, __LINE__, ##__VA_ARGS__) @@ -260,6 +260,19 @@ enum ieee80211_vht_opmode { IEEE80211_OPMODE_NOTIF_RX_NSS_SHIFT = 4, }; +struct cfg80211_bss_ies { + uint8_t *data; + size_t len; +}; + +struct cfg80211_bss { + /* XXX TODO */ + struct cfg80211_bss_ies *ies; + struct cfg80211_bss_ies *beacon_ies; + uint64_t ts_boottime; + int32_t signal; +}; + struct cfg80211_connect_resp_params { /* XXX TODO */ uint8_t *bssid; @@ -267,7 +280,13 @@ struct cfg80211_connect_resp_params { const uint8_t *resp_ie; uint32_t req_ie_len; uint32_t resp_ie_len; - int status; + int status; + struct { + const uint8_t *addr; + const uint8_t *bssid; + struct cfg80211_bss *bss; + uint16_t status; + } links[IEEE80211_MLD_MAX_NUM_LINKS]; }; struct cfg80211_inform_bss { @@ -284,19 +303,12 @@ struct cfg80211_roam_info { uint32_t req_ie_len; uint32_t resp_ie_len; struct linuxkpi_ieee80211_channel *channel; -}; - -struct cfg80211_bss_ies { - uint8_t *data; - size_t len; -}; - -struct cfg80211_bss { - /* XXX TODO */ - struct cfg80211_bss_ies *ies; - struct cfg80211_bss_ies *beacon_ies; - - int32_t signal; + struct { + const uint8_t *addr; + const uint8_t *bssid; + struct cfg80211_bss *bss; + struct linuxkpi_ieee80211_channel *channel; + } links[IEEE80211_MLD_MAX_NUM_LINKS]; }; struct cfg80211_chan_def { @@ -404,6 +416,7 @@ struct cfg80211_scan_request { bool no_cck; bool scan_6ghz; bool duration_mandatory; + bool first_part; int8_t tsf_report_link_id; uint16_t duration; uint32_t flags; @@ -463,6 +476,24 @@ struct cfg80211_beacon_data { uint32_t assocresp_ies_len; }; +struct cfg80211_ap_update { + /* XXX TODO */ + struct cfg80211_beacon_data beacon; +}; + +struct cfg80211_crypto_settings { + /* XXX TODO */ + enum nl80211_wpa_versions wpa_versions; + uint32_t cipher_group; /* WLAN_CIPHER_SUITE_* */ + uint32_t *akm_suites; + uint32_t *ciphers_pairwise; + const uint8_t *sae_pwd; + const uint8_t *psk; + int n_akm_suites; + int n_ciphers_pairwise; + int sae_pwd_len; +}; + struct cfg80211_ap_settings { /* XXX TODO */ int auth_type, beacon_interval, dtim_period, hidden_ssid, inactivity_timeout; @@ -470,6 +501,7 @@ struct cfg80211_ap_settings { size_t ssid_len; struct cfg80211_beacon_data beacon; struct cfg80211_chan_def chandef; + struct cfg80211_crypto_settings crypto; }; struct cfg80211_bss_selection { @@ -484,23 +516,12 @@ struct cfg80211_bss_selection { } param; }; -struct cfg80211_crypto { /* XXX made up name */ - /* XXX TODO */ - enum nl80211_wpa_versions wpa_versions; - uint32_t cipher_group; /* WLAN_CIPHER_SUITE_* */ - uint32_t *akm_suites; - uint32_t *ciphers_pairwise; - const uint8_t *sae_pwd; - const uint8_t *psk; - int n_akm_suites; - int n_ciphers_pairwise; - int sae_pwd_len; -}; - struct cfg80211_connect_params { /* XXX TODO */ struct linuxkpi_ieee80211_channel *channel; + struct linuxkpi_ieee80211_channel *channel_hint; uint8_t *bssid; + uint8_t *bssid_hint; const uint8_t *ie; const uint8_t *ssid; uint32_t ie_len; @@ -509,7 +530,7 @@ struct cfg80211_connect_params { uint32_t key_len; int auth_type, key_idx, privacy, want_1x; struct cfg80211_bss_selection bss_select; - struct cfg80211_crypto crypto; + struct cfg80211_crypto_settings crypto; }; enum bss_param_flags { /* Used as bitflags. XXX FIXME values? */ @@ -538,6 +559,14 @@ struct cfg80211_mgmt_tx_params { int wait; }; +struct cfg80211_external_auth_params { + uint8_t bssid[ETH_ALEN]; + uint16_t status; + enum nl80211_external_auth_action action; + unsigned int key_mgmt_suite; + struct cfg80211_ssid ssid; +}; + struct cfg80211_pmk_conf { /* XXX TODO */ const uint8_t *pmk; @@ -548,6 +577,8 @@ struct cfg80211_pmksa { /* XXX TODO */ const uint8_t *bssid; const uint8_t *pmkid; + const uint8_t *ssid; + size_t ssid_len; }; struct station_del_parameters { @@ -961,6 +992,27 @@ struct cfg80211_set_hw_timestamp { bool enable; }; +struct survey_info { /* net80211::struct ieee80211_channel_survey */ + /* TODO FIXME */ + uint32_t filled; +#define SURVEY_INFO_TIME 0x0001 +#define SURVEY_INFO_TIME_RX 0x0002 +#define SURVEY_INFO_TIME_SCAN 0x0004 +#define SURVEY_INFO_TIME_TX 0x0008 +#define SURVEY_INFO_TIME_BSS_RX 0x0010 +#define SURVEY_INFO_TIME_BUSY 0x0020 +#define SURVEY_INFO_IN_USE 0x0040 +#define SURVEY_INFO_NOISE_DBM 0x0080 + uint32_t noise; + uint64_t time; + uint64_t time_bss_rx; + uint64_t time_busy; + uint64_t time_rx; + uint64_t time_scan; + uint64_t time_tx; + struct linuxkpi_ieee80211_channel *channel; +}; + enum wiphy_vendor_cmd_need_flags { WIPHY_VENDOR_CMD_NEED_NETDEV = 0x01, WIPHY_VENDOR_CMD_NEED_RUNNING = 0x02, @@ -1118,49 +1170,53 @@ struct wireless_dev { struct cfg80211_ops { /* XXX TODO */ struct wireless_dev *(*add_virtual_intf)(struct wiphy *, const char *, unsigned char, enum nl80211_iftype, struct vif_params *); - int (*del_virtual_intf)(struct wiphy *, struct wireless_dev *); - s32 (*change_virtual_intf)(struct wiphy *, struct net_device *, enum nl80211_iftype, struct vif_params *); - s32 (*scan)(struct wiphy *, struct cfg80211_scan_request *); - s32 (*set_wiphy_params)(struct wiphy *, u32); - s32 (*join_ibss)(struct wiphy *, struct net_device *, struct cfg80211_ibss_params *); - s32 (*leave_ibss)(struct wiphy *, struct net_device *); - s32 (*get_station)(struct wiphy *, struct net_device *, const u8 *, struct station_info *); - int (*dump_station)(struct wiphy *, struct net_device *, int, u8 *, struct station_info *); - s32 (*set_tx_power)(struct wiphy *, struct wireless_dev *, enum nl80211_tx_power_setting, s32); - s32 (*get_tx_power)(struct wiphy *, struct wireless_dev *, s32 *); - s32 (*add_key)(struct wiphy *, struct net_device *, u8, bool, const u8 *, struct key_params *); - s32 (*del_key)(struct wiphy *, struct net_device *, u8, bool, const u8 *); - s32 (*get_key)(struct wiphy *, struct net_device *, u8, bool, const u8 *, void *, void(*)(void *, struct key_params *)); - s32 (*set_default_key)(struct wiphy *, struct net_device *, u8, bool, bool); - s32 (*set_default_mgmt_key)(struct wiphy *, struct net_device *, u8); - s32 (*set_power_mgmt)(struct wiphy *, struct net_device *, bool, s32); - s32 (*connect)(struct wiphy *, struct net_device *, struct cfg80211_connect_params *); - s32 (*disconnect)(struct wiphy *, struct net_device *, u16); - s32 (*suspend)(struct wiphy *, struct cfg80211_wowlan *); - s32 (*resume)(struct wiphy *); - s32 (*set_pmksa)(struct wiphy *, struct net_device *, struct cfg80211_pmksa *); - s32 (*del_pmksa)(struct wiphy *, struct net_device *, struct cfg80211_pmksa *); - s32 (*flush_pmksa)(struct wiphy *, struct net_device *); - s32 (*start_ap)(struct wiphy *, struct net_device *, struct cfg80211_ap_settings *); - int (*stop_ap)(struct wiphy *, struct net_device *); - s32 (*change_beacon)(struct wiphy *, struct net_device *, struct cfg80211_beacon_data *); - int (*del_station)(struct wiphy *, struct net_device *, struct station_del_parameters *); - int (*change_station)(struct wiphy *, struct net_device *, const u8 *, struct station_parameters *); + int (*del_virtual_intf)(struct wiphy *, struct wireless_dev *); + int (*change_virtual_intf)(struct wiphy *, struct net_device *, enum nl80211_iftype, struct vif_params *); + int (*scan)(struct wiphy *, struct cfg80211_scan_request *); + int (*set_wiphy_params)(struct wiphy *, int, uint32_t); + int (*join_ibss)(struct wiphy *, struct net_device *, struct cfg80211_ibss_params *); + int (*leave_ibss)(struct wiphy *, struct net_device *); + int (*get_station)(struct wiphy *, struct net_device *, const uint8_t *, struct station_info *); + int (*dump_station)(struct wiphy *, struct net_device *, int, uint8_t *, struct station_info *); + int (*set_tx_power)(struct wiphy *, struct wireless_dev *, int, enum nl80211_tx_power_setting, int); + int (*get_tx_power)(struct wiphy *, struct wireless_dev *, int, unsigned int, int *); + int (*add_key)(struct wiphy *, struct net_device *, int, uint8_t, bool, const uint8_t *, struct key_params *); + int (*del_key)(struct wiphy *, struct net_device *, int, uint8_t, bool, const uint8_t *); + int (*get_key)(struct wiphy *, struct net_device *, int, uint8_t, bool, const uint8_t *, void *, void(*)(void *, struct key_params *)); + int (*set_default_key)(struct wiphy *, struct net_device *, int, uint8_t, bool, bool); + int (*set_default_mgmt_key)(struct wiphy *, struct net_device *, int, uint8_t); + int (*set_power_mgmt)(struct wiphy *, struct net_device *, bool, int); + int (*connect)(struct wiphy *, struct net_device *, struct cfg80211_connect_params *); + int (*disconnect)(struct wiphy *, struct net_device *, uint16_t); + int (*suspend)(struct wiphy *, struct cfg80211_wowlan *); + int (*resume)(struct wiphy *); + int (*set_pmksa)(struct wiphy *, struct net_device *, struct cfg80211_pmksa *); + int (*del_pmksa)(struct wiphy *, struct net_device *, struct cfg80211_pmksa *); + int (*flush_pmksa)(struct wiphy *, struct net_device *); + int (*start_ap)(struct wiphy *, struct net_device *, struct cfg80211_ap_settings *); + int (*stop_ap)(struct wiphy *, struct net_device *, unsigned int); + int (*change_beacon)(struct wiphy *, struct net_device *, struct cfg80211_ap_update *); + int (*del_station)(struct wiphy *, struct net_device *, struct station_del_parameters *); + int (*change_station)(struct wiphy *, struct net_device *, const uint8_t *, struct station_parameters *); int (*sched_scan_start)(struct wiphy *, struct net_device *, struct cfg80211_sched_scan_request *); - int (*sched_scan_stop)(struct wiphy *, struct net_device *, u64); + int (*sched_scan_stop)(struct wiphy *, struct net_device *, uint64_t); void (*update_mgmt_frame_registrations)(struct wiphy *, struct wireless_dev *, struct mgmt_frame_regs *); - int (*mgmt_tx)(struct wiphy *, struct wireless_dev *, struct cfg80211_mgmt_tx_params *, u64 *); - int (*cancel_remain_on_channel)(struct wiphy *, struct wireless_dev *, u64); - int (*get_channel)(struct wiphy *, struct wireless_dev *, struct cfg80211_chan_def *); - int (*crit_proto_start)(struct wiphy *, struct wireless_dev *, enum nl80211_crit_proto_id, u16); + int (*mgmt_tx)(struct wiphy *, struct wireless_dev *, struct cfg80211_mgmt_tx_params *, uint64_t *); + int (*cancel_remain_on_channel)(struct wiphy *, struct wireless_dev *, uint64_t); + int (*get_channel)(struct wiphy *, struct wireless_dev *, unsigned int, struct cfg80211_chan_def *); + int (*crit_proto_start)(struct wiphy *, struct wireless_dev *, enum nl80211_crit_proto_id, uint16_t); void (*crit_proto_stop)(struct wiphy *, struct wireless_dev *); - int (*tdls_oper)(struct wiphy *, struct net_device *, const u8 *, enum nl80211_tdls_operation); - int (*update_connect_params)(struct wiphy *, struct net_device *, struct cfg80211_connect_params *, u32); - int (*set_pmk)(struct wiphy *, struct net_device *, const struct cfg80211_pmk_conf *); - int (*del_pmk)(struct wiphy *, struct net_device *, const u8 *); - int (*remain_on_channel)(struct wiphy *, struct wireless_dev *, struct linuxkpi_ieee80211_channel *, unsigned int, u64 *); - int (*start_p2p_device)(struct wiphy *, struct wireless_dev *); - void (*stop_p2p_device)(struct wiphy *, struct wireless_dev *); + int (*tdls_oper)(struct wiphy *, struct net_device *, const uint8_t *, enum nl80211_tdls_operation); + int (*update_connect_params)(struct wiphy *, struct net_device *, struct cfg80211_connect_params *, uint32_t); + int (*set_pmk)(struct wiphy *, struct net_device *, const struct cfg80211_pmk_conf *); + int (*del_pmk)(struct wiphy *, struct net_device *, const uint8_t *); + int (*remain_on_channel)(struct wiphy *, struct wireless_dev *, struct linuxkpi_ieee80211_channel *, unsigned int, uint64_t *); + int (*start_p2p_device)(struct wiphy *, struct wireless_dev *); + void (*stop_p2p_device)(struct wiphy *, struct wireless_dev *); + int (*dump_survey)(struct wiphy *, struct net_device *, int, struct survey_info *); + int (*external_auth)(struct wiphy *, struct net_device *, struct cfg80211_external_auth_params *); + int (*set_cqm_rssi_range_config)(struct wiphy *, struct net_device *, int, int); + }; @@ -1179,6 +1235,8 @@ void linuxkpi_wiphy_delayed_work_queue(struct wiphy *, struct wiphy_delayed_work *, unsigned long); void linuxkpi_wiphy_delayed_work_cancel(struct wiphy *, struct wiphy_delayed_work *); +void linuxkpi_wiphy_delayed_work_flush(struct wiphy *, + struct wiphy_delayed_work *); int linuxkpi_regulatory_set_wiphy_regd_sync(struct wiphy *wiphy, struct linuxkpi_ieee80211_regdomain *regd); @@ -1247,6 +1305,21 @@ wiphy_rfkill_set_hw_state_reason(struct wiphy *wiphy, bool blocked, /* -------------------------------------------------------------------------- */ +static inline int +cfg80211_register_netdevice(struct net_device *ndev) +{ + TODO(); + return (-ENXIO); +} + +static inline void +cfg80211_unregister_netdevice(struct net_device *ndev) +{ + TODO(); +} + +/* -------------------------------------------------------------------------- */ + static inline struct cfg80211_bss * cfg80211_get_bss(struct wiphy *wiphy, struct linuxkpi_ieee80211_channel *chan, const uint8_t *bssid, const uint8_t *ssid, size_t ssid_len, @@ -1309,15 +1382,15 @@ reg_query_regdb_wmm(uint8_t *alpha2, uint32_t center_freq, return (-ENODATA); } -static __inline const u8 * -cfg80211_find_ie_match(uint32_t f, const u8 *ies, size_t ies_len, - const u8 *match, int x, int y) +static __inline const uint8_t * +cfg80211_find_ie_match(uint32_t f, const uint8_t *ies, size_t ies_len, + const uint8_t *match, int x, int y) { TODO(); return (NULL); } -static __inline const u8 * +static __inline const uint8_t * cfg80211_find_ie(uint8_t eid, const uint8_t *ie, uint32_t ielen) { TODO(); @@ -1339,6 +1412,36 @@ cfg80211_pmsr_report(struct wireless_dev *wdev, TODO(); } +static inline int +nl80211_chan_width_to_mhz(enum nl80211_chan_width width) +{ + switch (width) { + case NL80211_CHAN_WIDTH_5: + return (5); + break; + case NL80211_CHAN_WIDTH_10: + return (10); + break; + case NL80211_CHAN_WIDTH_20_NOHT: + case NL80211_CHAN_WIDTH_20: + return (20); + break; + case NL80211_CHAN_WIDTH_40: + return (40); + break; + case NL80211_CHAN_WIDTH_80: + case NL80211_CHAN_WIDTH_80P80: + return (80); + break; + case NL80211_CHAN_WIDTH_160: + return (160); + break; + case NL80211_CHAN_WIDTH_320: + return (320); + break; + } +} + static inline void cfg80211_chandef_create(struct cfg80211_chan_def *chandef, struct linuxkpi_ieee80211_channel *chan, enum nl80211_channel_type chan_type) @@ -1377,6 +1480,12 @@ cfg80211_chandef_valid(const struct cfg80211_chan_def *chandef) return (false); } +static inline int +cfg80211_chandef_get_width(const struct cfg80211_chan_def *chandef) +{ + return (nl80211_chan_width_to_mhz(chandef->width)); +} + static __inline bool cfg80211_chandef_dfs_usable(struct wiphy *wiphy, const struct cfg80211_chan_def *chandef) { @@ -1688,8 +1797,8 @@ cfg80211_disconnected(struct net_device *ndev, uint16_t reason, } static __inline int -cfg80211_get_p2p_attr(const u8 *ie, u32 ie_len, - enum ieee80211_p2p_attr_ids attr, u8 *p, size_t p_len) +cfg80211_get_p2p_attr(const uint8_t *ie, uint32_t ie_len, + enum ieee80211_p2p_attr_ids attr, uint8_t *p, size_t p_len) { TODO(); return (-1); @@ -1725,13 +1834,13 @@ cfg80211_inform_bss_data(struct wiphy *wiphy, static __inline void cfg80211_mgmt_tx_status(struct wireless_dev *wdev, uint64_t cookie, - const u8 *buf, size_t len, bool ack, gfp_t gfp) + const uint8_t *buf, size_t len, bool ack, gfp_t gfp) { TODO(); } static __inline void -cfg80211_michael_mic_failure(struct net_device *ndev, const uint8_t *addr, +cfg80211_michael_mic_failure(struct net_device *ndev, const uint8_t addr[ETH_ALEN], enum nl80211_key_type key_type, int _x, void *p, gfp_t gfp) { TODO(); @@ -1751,8 +1860,8 @@ cfg80211_del_sta(struct net_device *ndev, const uint8_t *addr, gfp_t gfp) } static __inline void -cfg80211_port_authorized(struct net_device *ndev, const uint8_t *bssid, - gfp_t gfp) +cfg80211_port_authorized(struct net_device *ndev, const uint8_t *addr, + const uint8_t *bitmap, uint8_t len, gfp_t gfp) { TODO(); } @@ -1935,7 +2044,7 @@ cfg80211_background_radar_event(struct wiphy *wiphy, TODO(); } -static __inline const u8 * +static __inline const uint8_t * cfg80211_find_ext_ie(uint8_t eid, const uint8_t *p, size_t len) { TODO(); @@ -2033,6 +2142,14 @@ cfg80211_get_iftype_ext_capa(struct wiphy *wiphy, enum nl80211_iftype iftype) return (NULL); } +static inline int +cfg80211_external_auth_request(struct net_device *ndev, + struct cfg80211_external_auth_params *params, gfp_t gfp) +{ + TODO(); + return (-ENXIO); +} + static inline uint16_t ieee80211_get_he_6ghz_capa(const struct ieee80211_supported_band *sband, enum nl80211_iftype iftype) @@ -2041,36 +2158,6 @@ ieee80211_get_he_6ghz_capa(const struct ieee80211_supported_band *sband, return (0); } -static inline int -nl80211_chan_width_to_mhz(enum nl80211_chan_width width) -{ - switch (width) { - case NL80211_CHAN_WIDTH_5: - return (5); - break; - case NL80211_CHAN_WIDTH_10: - return (10); - break; - case NL80211_CHAN_WIDTH_20_NOHT: - case NL80211_CHAN_WIDTH_20: - return (20); - break; - case NL80211_CHAN_WIDTH_40: - return (40); - break; - case NL80211_CHAN_WIDTH_80: - case NL80211_CHAN_WIDTH_80P80: - return (80); - break; - case NL80211_CHAN_WIDTH_160: - return (160); - break; - case NL80211_CHAN_WIDTH_320: - return (320); - break; - } -} - static __inline ssize_t wiphy_locked_debugfs_read(struct wiphy *wiphy, struct file *file, char *buf, size_t bufsize, const char __user *userbuf, size_t count, @@ -2093,6 +2180,13 @@ wiphy_locked_debugfs_write(struct wiphy *wiphy, struct file *file, return (-ENXIO); } +static inline void +cfg80211_cqm_rssi_notify(struct net_device *dev, + enum nl80211_cqm_rssi_threshold_event rssi_te, int32_t rssi, gfp_t gfp) +{ + TODO(); +} + /* -------------------------------------------------------------------------- */ static inline void @@ -2140,6 +2234,12 @@ wiphy_delayed_work_cancel(struct wiphy *wiphy, struct wiphy_delayed_work *wdwk) linuxkpi_wiphy_delayed_work_cancel(wiphy, wdwk); } +static inline void +wiphy_delayed_work_flush(struct wiphy *wiphy, struct wiphy_delayed_work *wdwk) +{ + linuxkpi_wiphy_delayed_work_flush(wiphy, wdwk); +} + /* -------------------------------------------------------------------------- */ #define wiphy_err(_wiphy, _fmt, ...) \ diff --git a/sys/compat/linuxkpi/common/include/net/mac80211.h b/sys/compat/linuxkpi/common/include/net/mac80211.h index 8de03410c6b6..523836b52a40 100644 --- a/sys/compat/linuxkpi/common/include/net/mac80211.h +++ b/sys/compat/linuxkpi/common/include/net/mac80211.h @@ -166,7 +166,7 @@ enum ieee80211_bss_changed { #define WLAN_AKM_SUITE_PSK_SHA256 WLAN_AKM_SUITE(6) /* TDLS 7 */ #define WLAN_AKM_SUITE_SAE WLAN_AKM_SUITE(8) -/* FToSAE 9 */ +#define WLAN_AKM_SUITE_FT_OVER_SAE WLAN_AKM_SUITE(9) /* AP peer key 10 */ /* 802.1x suite B 11 */ /* 802.1x suite B 384 12 */ @@ -857,7 +857,8 @@ struct ieee80211_vif_chanctx_switch { }; struct ieee80211_prep_tx_info { - u16 duration; + uint16_t duration; + uint16_t subtype; bool success; bool was_assoc; int link_id; @@ -904,27 +905,6 @@ struct linuxkpi_ieee80211_tim_ie { }; #define ieee80211_tim_ie linuxkpi_ieee80211_tim_ie -struct survey_info { /* net80211::struct ieee80211_channel_survey */ - /* TODO FIXME */ - uint32_t filled; -#define SURVEY_INFO_TIME 0x0001 -#define SURVEY_INFO_TIME_RX 0x0002 -#define SURVEY_INFO_TIME_SCAN 0x0004 -#define SURVEY_INFO_TIME_TX 0x0008 -#define SURVEY_INFO_TIME_BSS_RX 0x0010 -#define SURVEY_INFO_TIME_BUSY 0x0020 -#define SURVEY_INFO_IN_USE 0x0040 -#define SURVEY_INFO_NOISE_DBM 0x0080 - uint32_t noise; - uint64_t time; - uint64_t time_bss_rx; - uint64_t time_busy; - uint64_t time_rx; - uint64_t time_scan; - uint64_t time_tx; - struct ieee80211_channel *channel; -}; - enum ieee80211_iface_iter { IEEE80211_IFACE_ITER_NORMAL = BIT(0), IEEE80211_IFACE_ITER_RESUME_ALL = BIT(1), @@ -1552,6 +1532,15 @@ ieee80211_iter_chan_contexts_atomic(struct ieee80211_hw *hw, linuxkpi_ieee80211_iterate_chan_contexts(hw, iterfunc, arg); } +static __inline void +ieee80211_iter_chan_contexts_mtx(struct ieee80211_hw *hw, + void (*iterfunc)(struct ieee80211_hw *, struct ieee80211_chanctx_conf *, void *), + void *arg) +{ + IMPROVE("XXX LKPI80211 TODO MTX\n"); + linuxkpi_ieee80211_iterate_chan_contexts(hw, iterfunc, arg); +} + static __inline void ieee80211_iterate_stations_atomic(struct ieee80211_hw *hw, void (*iterfunc)(void *, struct ieee80211_sta *), void *arg) @@ -2063,7 +2052,7 @@ ieee80211_tx_dequeue_ni(struct ieee80211_hw *hw, struct ieee80211_txq *txq) static __inline void ieee80211_update_mu_groups(struct ieee80211_vif *vif, - u_int _i, uint8_t *ms, uint8_t *up) + u_int link_id, const uint8_t *ms, const uint8_t *up) { TODO(); } diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index bc4b334de28e..0dc3b2631804 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -7833,7 +7833,7 @@ lkpi_wiphy_delayed_work_timer(struct timer_list *tl) struct wiphy_delayed_work *wdwk; wdwk = timer_container_of(wdwk, tl, timer); - wiphy_work_queue(wdwk->wiphy, &wdwk->work); + wiphy_work_queue(wdwk->wiphy, &wdwk->work); } void @@ -7858,6 +7858,16 @@ linuxkpi_wiphy_delayed_work_cancel(struct wiphy *wiphy, wiphy_work_cancel(wiphy, &wdwk->work); } +void +linuxkpi_wiphy_delayed_work_flush(struct wiphy *wiphy, + struct wiphy_delayed_work *wdwk) +{ + lockdep_assert_held(&wiphy->mtx); + + del_timer_sync(&wdwk->timer); + wiphy_work_flush(wiphy, &wdwk->work); +} + /* -------------------------------------------------------------------------- */ struct wiphy * diff --git a/sys/compat/linuxkpi/common/src/linux_80211_macops.c b/sys/compat/linuxkpi/common/src/linux_80211_macops.c index 1046b753574f..04f9f6d7e7fc 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211_macops.c +++ b/sys/compat/linuxkpi/common/src/linux_80211_macops.c @@ -42,7 +42,7 @@ if (linuxkpi_debug_80211 & D80211_TRACE_MO) \ printf("LKPI_80211_TRACE_MO %s:%d: %d %d %lu: " fmt "\n", \ __func__, __LINE__, curcpu, curthread->td_tid, \ - jiffies, __VA_ARGS__) + jiffies, ##__VA_ARGS__) #else #define LKPI_80211_TRACE_MO(...) do { } while(0) #endif From nobody Tue Oct 21 07:53:14 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4crPfy33Mtz6F3rs; Tue, 21 Oct 2025 07:53:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4crPfy1g4Lz3mJM; Tue, 21 Oct 2025 07:53:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761033194; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VfN+M27lOt+VVkOz83PvBrLQ68otos2NijLXH857CiU=; b=gD1aJYWv+NitMzN/mOVmhJu3VKS0DJH76xmmDs6VAfOrW+K+YFaQxdKEabTnjnJj/Finz+ 9C0uycJ6fZ83FZUgAHjyNWwI1DGS6GQg91cr1mt/y7SHeu2XrS9+6c7+N4A1T4awq7a+r7 C7SbK4giClN4wps0Msy4cQd7zcDlQDUFrvMJdXIN8OV8jBoQ4P7hqnVWe4FM9cWGnnroQE LYEvtU/aFsOnzpsPEGJ+iBDdZJjsYGPWSqUTpwSHqL6pXvKkhnOoKNPlV8CKg1yWGtSeRY xYdOfw2nBjq/NGycbezHQUjYuuL+4Vq7F9i4xp3OTcjxs7gXi5pDmse703gl3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761033194; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VfN+M27lOt+VVkOz83PvBrLQ68otos2NijLXH857CiU=; b=ZI+c1JoulMQ/Khg7uzTcJ2SIYbd8ZWuYDCfQQOeaRCAmAEhRUB2iT3A4lsfz6rofH1SJcB IwuMIl5Y5CTMZQ7dwFxQTYyt3e9bMB45Ls+Janak+QFykJLIpqiOQhAZZcOpghuVt49V/n NUGGIfXIaPDm84AEb6oluEvOlMS3YIXi55+GkCl7byNcyNyNjkudJ5B4LQ8AU7JU5vp/io thxp6/pC0tyDFQy+/0guuhiGuoFruFeMCMgJbYp1tStAxCT6Y9zKfJFgd13yl987mkyzW2 C5FphZ4VhowBgaofxutxUKbtfRNeimuQnsFoS3HJqgewc0uRQPyZ/4g5fROoVA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761033194; a=rsa-sha256; cv=none; b=qTFiLRkDIp0rPueWLzMT+qLTbVc8XOs3DFU9xpeeMzWGEnTMyGkkEI/42sqQnsoJRV6b4b S2CNv+ovW7vIm7BbDgWyW8MzSVpT8mBFwfZoVS8RF/x1gQERuZru2HnvMILJW+eggoMwgp twuT6Dhc9macpLZ9a2x32/R7d8GMdP/oqwDAwAvjf3C1I75Q+8HVr2w+QWDWLCSZGleYjd VhU89M2MlELRIyV5NFTHxY2Cie8oFwDTx06Y6YRQG+J2WD193uuHysuXh3ZOGiqPm6ftWn GnVRhRa42xRaydVx53qDDhZjWCqDaUJLpNIy8yi825kHfPTSacRBYPVd3uccfw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4crPfy15kJzrB9; Tue, 21 Oct 2025 07:53:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59L7rEsx014558; Tue, 21 Oct 2025 07:53:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59L7rEhh014555; Tue, 21 Oct 2025 07:53:14 GMT (envelope-from git) Date: Tue, 21 Oct 2025 07:53:14 GMT Message-Id: <202510210753.59L7rEhh014555@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 7c31cdfa408a - main - LinuxKPI: page_pool headers moved; add netmem.h List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7c31cdfa408a4ebce7a3e10d29056a15c28bc092 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=7c31cdfa408a4ebce7a3e10d29056a15c28bc092 commit 7c31cdfa408a4ebce7a3e10d29056a15c28bc092 Author: Bjoern A. Zeeb AuthorDate: 2025-10-19 22:57:13 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-10-21 07:49:40 +0000 LinuxKPI: page_pool headers moved; add netmem.h page_pool headers were not used yet; they were created for mt76 but are without functionality. Upstream has migrated them for v6.17 and split them up into multiple files. Also add netmem.h which the little needed is directly related to page pools. MFC after: 3 days --- sys/compat/linuxkpi/common/include/net/netmem.h | 21 ++++ sys/compat/linuxkpi/common/include/net/page_pool.h | 119 --------------------- .../common/include/net/page_pool/helpers.h | 79 ++++++++++++++ .../linuxkpi/common/include/net/page_pool/types.h | 36 +++++++ 4 files changed, 136 insertions(+), 119 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/net/netmem.h b/sys/compat/linuxkpi/common/include/net/netmem.h new file mode 100644 index 000000000000..c8de09a2e8c2 --- /dev/null +++ b/sys/compat/linuxkpi/common/include/net/netmem.h @@ -0,0 +1,21 @@ +/*- + * Copyright (c) 2023-2025 Bjoern A. Zeeb + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#ifndef _LINUXKPI_NET_NETMEM_H +#define _LINUXKPI_NET_NETMEM_H + +struct page_pool; + +struct netmem_desc { + struct page_pool *pp; +}; + +#define pp_page_to_nmdesc(page) \ + (_Generic((page), \ + const struct page *: (const struct netmem_desc *)(page), \ + struct page *: (struct netmem_desc *)(page))) + +#endif /* _LINUXKPI_NET_NETMEM_H */ diff --git a/sys/compat/linuxkpi/common/include/net/page_pool.h b/sys/compat/linuxkpi/common/include/net/page_pool.h deleted file mode 100644 index 2dc8f74b31f3..000000000000 --- a/sys/compat/linuxkpi/common/include/net/page_pool.h +++ /dev/null @@ -1,119 +0,0 @@ -/*- - * Copyright (c) 2023 Bjoern A. Zeeb - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#ifndef _LINUXKPI_NET_PAGE_POOL_H -#define _LINUXKPI_NET_PAGE_POOL_H - -#include /* pr_debug */ -#include -#include -#include - -struct device; - -struct page_pool_params { - struct device *dev; - uint32_t flags; - uint32_t order; - uint32_t pool_size; - uint32_t max_len; - uint32_t offset; - int nid; /* NUMA */ - enum dma_data_direction dma_dir; - struct napi_struct *napi; -}; - -struct page_pool { -}; - -#define PP_FLAG_DMA_MAP BIT(0) -#define PP_FLAG_DMA_SYNC_DEV BIT(1) -#define PP_FLAG_PAGE_FRAG BIT(2) - -static inline struct page_pool * -page_pool_create(const struct page_pool_params *ppparams) -{ - - pr_debug("%s: TODO\n", __func__); - return (NULL); -} - -static inline void -page_pool_destroy(struct page_pool *ppool) -{ - - pr_debug("%s: TODO\n", __func__); -} - -static inline struct page * -page_pool_dev_alloc_frag(struct page_pool *ppool, uint32_t *offset, - size_t size) -{ - - pr_debug("%s: TODO\n", __func__); - return (NULL); -} - -static inline dma_addr_t -page_pool_get_dma_addr(struct page *page) -{ - - pr_debug("%s: TODO\n", __func__); - return (0); -} - -static inline enum dma_data_direction -page_pool_get_dma_dir(const struct page_pool *ppool) -{ - - pr_debug("%s: TODO\n", __func__); - return (DMA_BIDIRECTIONAL); -} - -static inline void -page_pool_put_full_page(struct page_pool *ppool, struct page *page, - bool allow_direct) -{ - - pr_debug("%s: TODO\n", __func__); -} - -static inline int -page_pool_ethtool_stats_get_count(void) -{ - - pr_debug("%s: TODO\n", __func__); - return (0); -} - -static inline uint8_t * -page_pool_ethtool_stats_get_strings(uint8_t *x) -{ - - pr_debug("%s: TODO\n", __func__); - return (x); -} - -#endif /* _LINUXKPI_NET_PAGE_POOL_H */ diff --git a/sys/compat/linuxkpi/common/include/net/page_pool/helpers.h b/sys/compat/linuxkpi/common/include/net/page_pool/helpers.h new file mode 100644 index 000000000000..3469c39c7757 --- /dev/null +++ b/sys/compat/linuxkpi/common/include/net/page_pool/helpers.h @@ -0,0 +1,79 @@ +/*- + * Copyright (c) 2023-2025 Bjoern A. Zeeb + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#ifndef _LINUXKPI_NET_PAGE_POOL_HELPERS_H +#define _LINUXKPI_NET_PAGE_POOL_HELPERS_H + +#include /* pr_debug */ +#include +#include +#include + +static inline struct page_pool * +page_pool_create(const struct page_pool_params *ppparams) +{ + + pr_debug("%s: TODO\n", __func__); + return (NULL); +} + +static inline void +page_pool_destroy(struct page_pool *ppool) +{ + + pr_debug("%s: TODO\n", __func__); +} + +static inline struct page * +page_pool_dev_alloc_frag(struct page_pool *ppool, uint32_t *offset, + size_t size) +{ + + pr_debug("%s: TODO\n", __func__); + return (NULL); +} + +static inline dma_addr_t +page_pool_get_dma_addr(struct page *page) +{ + + pr_debug("%s: TODO\n", __func__); + return (0); +} + +static inline enum dma_data_direction +page_pool_get_dma_dir(const struct page_pool *ppool) +{ + + pr_debug("%s: TODO\n", __func__); + return (DMA_BIDIRECTIONAL); +} + +static inline void +page_pool_put_full_page(struct page_pool *ppool, struct page *page, + bool allow_direct) +{ + + pr_debug("%s: TODO\n", __func__); +} + +static inline int +page_pool_ethtool_stats_get_count(void) +{ + + pr_debug("%s: TODO\n", __func__); + return (0); +} + +static inline uint8_t * +page_pool_ethtool_stats_get_strings(uint8_t *x) +{ + + pr_debug("%s: TODO\n", __func__); + return (x); +} + +#endif /* _LINUXKPI_NET_PAGE_POOL_HELPERS_H */ diff --git a/sys/compat/linuxkpi/common/include/net/page_pool/types.h b/sys/compat/linuxkpi/common/include/net/page_pool/types.h new file mode 100644 index 000000000000..6747be50b9b2 --- /dev/null +++ b/sys/compat/linuxkpi/common/include/net/page_pool/types.h @@ -0,0 +1,36 @@ +/*- + * Copyright (c) 2023-2025 Bjoern A. Zeeb + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#ifndef _LINUXKPI_NET_PAGE_POOL_TYPES_H +#define _LINUXKPI_NET_PAGE_POOL_TYPES_H + +#include +#include +#include + +struct device; +struct napi_struct; + +struct page_pool_params { + struct device *dev; + uint32_t flags; + uint32_t order; + uint32_t pool_size; + uint32_t max_len; + uint32_t offset; + int nid; /* NUMA */ + enum dma_data_direction dma_dir; + struct napi_struct *napi; +}; + +struct page_pool { +}; + +#define PP_FLAG_DMA_MAP BIT(0) +#define PP_FLAG_DMA_SYNC_DEV BIT(1) +#define PP_FLAG_PAGE_FRAG BIT(2) + +#endif /* _LINUXKPI_NET_PAGE_POOL_TYPES_H */ From nobody Tue Oct 21 07:53:15 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4crPfz3v6jz6F3kB; Tue, 21 Oct 2025 07:53:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4crPfz29VSz3mTn; Tue, 21 Oct 2025 07:53:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761033195; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7SnG91x55v6VRHCH322FzHbI9u6ud57mvlJiGzh3LLw=; b=vg+hQKNQExVsenVtttN8HxOJ0Ps+jKYkUPi1WjThf/MF9SdhUZTQB+X4svbPyeMyD/kg5O VvZk0QA1Vw1mvTu821kOGBbiMZ7snWm4qsOURmOOIucF0njITxrRJ46navdbdHXOCXbpK0 cV/D2NLI74LtcV1WTVquivr1mPaQodmyIEP0VFNfchK3Iy7hrfIlWj9SV+qPzxCJcLN8KP YGGzkozzaewRfflchx9/deFtY0i3EkfbvawXymi0DK9R5NUPPSallUhKGKpMxwL9O9xJlG TZ9RSsnzORydxmJgdD0XPaqUw5rDbpn55kZgXFl1oCq/PI70Za3RZTZ32mKhYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761033195; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7SnG91x55v6VRHCH322FzHbI9u6ud57mvlJiGzh3LLw=; b=C+h7amhG9TBcP9MkUxek9rCTs/eidbU60fgp002anyiogX2ySMyIrJeqSIkDmV6ODTb36z fvN/KZUr2GL8gcYX3vFtLHo+ThOmBFNVmCEHi+drlF1skRhIFtzdcBSb1JNtgwzTZ5e04I X45kfCfaQzy2Eoax4Z8wXlps4lVzQoHcqzHjtyT3lTGjYa3Q7eK+RE6hGOBLvM5DcpWqNR eFFpJabfZtwksN4/8iX8Uc+p8dYIwYZ8i4icprW4XakGjFBsnjznMvyH+WxRf53m+jMKHd 4Gdc/uvwq0S1c69wmLNN9ACDK2bSaM7ef/6ZO9B9jYPOBe2RlR+h6xetqb20Yw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761033195; a=rsa-sha256; cv=none; b=pgeG+e432kH7xa9vV7ND+coN21/3hnUq2rP5JarQxtbHbSaG/ocUHPdE4JSvGKgCFJKaT/ pVHnPbk9m/w7svFhxevh7bMImY3/pWY7FTX+pwwzBD0dbxwRpuGLGQFm/N+UTOCrzSgnK6 rVuDUC5wscmoGqW0EfWVVfyUE4m2aHiwYjGkLXzYJdW0XkqK0caC6fcp1szW+CWR7XCq1a beldb+cey89ewcTKcucwkylFMdBn3/Y8btMXpLfRKP07pFTYjDOhVGUHh133kJakuOVCxG r04cNTuMzBIQNZLBjz69nmGMFFxlSBimbeYM0zbPE7b9U+oAyw+OXm7YMOL0Pw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4crPfz1n6lzqxT; Tue, 21 Oct 2025 07:53: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 59L7rFRZ014595; Tue, 21 Oct 2025 07:53:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59L7rFEG014591; Tue, 21 Oct 2025 07:53:15 GMT (envelope-from git) Date: Tue, 21 Oct 2025 07:53:15 GMT Message-Id: <202510210753.59L7rFEG014591@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 224ac9d2a030 - main - LinuxKPI: soc/mediatek add pr_debug calls List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 224ac9d2a030f85924e44a507ddc412797c3fe87 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=224ac9d2a030f85924e44a507ddc412797c3fe87 commit 224ac9d2a030f85924e44a507ddc412797c3fe87 Author: Bjoern A. Zeeb AuthorDate: 2025-10-19 15:28:30 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-10-21 07:49:40 +0000 LinuxKPI: soc/mediatek add pr_debug calls We do not support Wireless Ethernet Dispatch (wed) on the mt76 (yet). Add pr_debug calls with TODO in case we run into the calls anyway so we could deal with them. MFC after: 3 days --- .../common/include/linux/soc/mediatek/mtk_wed.h | 47 +++++++--------------- 1 file changed, 15 insertions(+), 32 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/soc/mediatek/mtk_wed.h b/sys/compat/linuxkpi/common/include/linux/soc/mediatek/mtk_wed.h index 903053e7f6e8..9f3a1ee4c139 100644 --- a/sys/compat/linuxkpi/common/include/linux/soc/mediatek/mtk_wed.h +++ b/sys/compat/linuxkpi/common/include/linux/soc/mediatek/mtk_wed.h @@ -1,54 +1,36 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause - * - * Copyright (c) 2022-2023 Bjoern A. Zeeb - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. + * Copyright (c) 2022-2025 Bjoern A. Zeeb * - * 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. + * SPDX-License-Identifier: BSD-2-Clause */ #ifndef _LINUXKPI_LINUX_SOC_MEDIATEK_MTK_WED_H #define _LINUXKPI_LINUX_SOC_MEDIATEK_MTK_WED_H +#include /* pr_debug */ + struct mtk_wed_device { }; #define WED_WO_STA_REC 0x6 -#define mtk_wed_device_start(_dev, _mask) do { } while(0) -#define mtk_wed_device_detach(_dev) do { } while(0) +#define mtk_wed_device_start(_dev, _mask) do { pr_debug("%s: TODO\n", __func__); } while(0) +#define mtk_wed_device_detach(_dev) do { pr_debug("%s: TODO\n", __func__); } while(0) #define mtk_wed_device_irq_get(_dev, _mask) 0 -#define mtk_wed_device_irq_set_mask(_dev, _mask) do { } while(0) -#define mtk_wed_device_update_msg(_dev, _id, _msg, _len) (-ENODEV) -#define mtk_wed_device_dma_reset(_dev) do {} while (0) +#define mtk_wed_device_irq_set_mask(_dev, _mask) do { pr_debug("%s: TODO\n", __func__); } while(0) +#define mtk_wed_device_update_msg(_dev, _id, _msg, _len) ({ pr_debug("%s: TODO\n", __func__); -ENODEV; }) +#define mtk_wed_device_dma_reset(_dev) do { pr_debug("%s: TODO\n", __func__); } while (0) #define mtk_wed_device_ppe_check(_dev, _skb, _reason, _entry) \ - do {} while (0) -#define mtk_wed_device_stop(_dev) do { } while(0) -#define mtk_wed_device_start_hw_rro(_dev, _mask, _b) do { } while(0) -#define mtk_wed_device_setup_tc(_dev, _ndev, _type, _tdata) (-EOPNOTSUPP) + do { pr_debug("%s: TODO\n", __func__); } while (0) +#define mtk_wed_device_stop(_dev) do { pr_debug("%s: TODO\n", __func__); } while(0) +#define mtk_wed_device_start_hw_rro(_dev, _mask, _b) do { pr_debug("%s: TODO\n", __func__); } while(0) +#define mtk_wed_device_setup_tc(_dev, _ndev, _type, _tdata) ({ pr_debug("%s: TODO\n", __func__); -EOPNOTSUPP; }) static inline bool mtk_wed_device_active(struct mtk_wed_device *dev __unused) { + pr_debug("%s: TODO\n", __func__); return (false); } @@ -56,6 +38,7 @@ static inline bool mtk_wed_get_rx_capa(struct mtk_wed_device *dev __unused) { + pr_debug("%s: TODO\n", __func__); return (false); } From nobody Tue Oct 21 07:53:16 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4crPg04rldz6F3lx; Tue, 21 Oct 2025 07:53:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4crPg03Skhz3mXJ; Tue, 21 Oct 2025 07:53:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761033196; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=o/8P4ROwIisur0jOH84d3uKs6k18AAVvh06CFBC7HBA=; b=uutThw3Wj9U1waL0js9jieGdIVN2ZCmERWWgO6AbDd0sMcUzIqQrTQc2QieLIXOxwX8HIz YsO3OIc8rUk1n8rlRqvrkTtr1qMUGw5dmJfmfxvQ1atoiZaU3p7uPjnCDs+A6paQRqAqMn 81sZFDvpXEw3Zpk4jVuF83Bp5Gvg6C/xPHcY6x1fI2JOvj+LsAz981WRmSp4jKKD0L6uxr fBTX6GO1IYtCLEkw77CALf0k2GIADn0VvzGCY97+TXwxM5LAK3xr5tZTodau7f3zLJk1P0 GdGAqZFvLo6ilP3ElE6S/4yGBLZUofiOtnoIg59vyi5T2WDiRoyIpO2fNp3RFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761033196; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=o/8P4ROwIisur0jOH84d3uKs6k18AAVvh06CFBC7HBA=; b=cQFy8sZzLIDosS2LSaWnrQaTfW7h4IgzCjXHTNcpN0QhYhMXxVeoXjz3TzF40x1+U2R0/B OtsgOH6pRJhKNY4MQVvPD/vL9eC5hF5oV0OX0T53r57biMUjUR6AgRE9DwTTVoGI+ZR5GZ 0a9KGlZFtmqh/08O4aIPNDXD3SLlYGDhhPifa8CVc62hE+1Ulx7hRECn+D4WsCUiyaYtU+ CLXqCbuWOfclaettLPoB244E8VXgnWftGv5dQLgnI8JYbkCM6LOVl1fGAwZrgHpbXUqEAy DBqVBSM60K3GJvqOVFgBIA4XS+44/swX/Xl/jtJEz+IY6QGAld+B4Wny0fgtGw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761033196; a=rsa-sha256; cv=none; b=Bq0Zk620i5aLunOXCu/siMLJjD+0NGitwdud+zyxxa+l1h0R5F4+gI9AOleIJEpJJmo17b tJLcBfgh3WuU/nTqt2R1HkybHUbIfAWQz4XOnap6i6eVx3fOfqGDdnmqnHmB/LZJr1Xvt7 llRv5uzsuJcpS7cfdF6QPHgLEQEhJa7lxbRhlUP0dJY0i13L2i8XN/iDDwJY5E7IuILTRy g7inGHWv72q5K5b09BsklR5lHuJwSYdt/gnQPNt3FkCbRa1mcsmnwF20MCN+AmOktdibiD UMFBWkhi/GiPBeUXFGqi1zhxNJz9sYc9dELhTP48E26OdX9ifA2iBZQFTKV+xA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4crPg034bwzr7d; Tue, 21 Oct 2025 07:53:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59L7rGZQ014634; Tue, 21 Oct 2025 07:53:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59L7rGQG014631; Tue, 21 Oct 2025 07:53:16 GMT (envelope-from git) Date: Tue, 21 Oct 2025 07:53:16 GMT Message-Id: <202510210753.59L7rGQG014631@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 88dbf83345fe - main - LinuxKPI: skbuff: add a misplaced socket operation to skbuff.h for now List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 88dbf83345feefa7181bd6df47786e1a8d1d304d Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=88dbf83345feefa7181bd6df47786e1a8d1d304d commit 88dbf83345feefa7181bd6df47786e1a8d1d304d Author: Bjoern A. Zeeb AuthorDate: 2025-10-11 09:25:08 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-10-21 07:49:40 +0000 LinuxKPI: skbuff: add a misplaced socket operation to skbuff.h for now This likely belongs in socket code which we do not have in LinuxKPI. Needed by a wirless driver at v6.17. MFC after: 3 days --- sys/compat/linuxkpi/common/include/linux/skbuff.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/skbuff.h b/sys/compat/linuxkpi/common/include/linux/skbuff.h index 6e41c368a8b8..2e560a120e41 100644 --- a/sys/compat/linuxkpi/common/include/linux/skbuff.h +++ b/sys/compat/linuxkpi/common/include/linux/skbuff.h @@ -1159,6 +1159,9 @@ skb_cow_head(struct sk_buff *skb, unsigned int headroom) return (-1); } +/* Misplaced here really but sock comes from skbuff. */ +#define sk_pacing_shift_update(sock, n) + #define SKB_WITH_OVERHEAD(_s) \ (_s) - ALIGN(sizeof(struct skb_shared_info), CACHE_LINE_SIZE) From nobody Tue Oct 21 07:53:12 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4crPfx12ZMz6F3lw; Tue, 21 Oct 2025 07:53:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4crPfx0KGYz3mCb; Tue, 21 Oct 2025 07:53:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761033193; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6PL6yU4fxEvboaIeZ6Ir/FIQ/yEv60eSa4e1lOuSM3Q=; b=NREMqr/8ZAGcH8DjgqttB5rs+Eg0vcua8wCtrqWXYLG2pnqZfw4qzBXQ8cvaMDiztiKm0V KECPoYiJrHnS3OryqRm4FgNL8GJf9VYzO1/nang19svZNzDNsOaHY7YyL+gJAS5E9yyGNM EeXsavRV4B0astHqhmWy37zVrxgbcQbtL8PUJAnxz0GeOIgjHWYoSooysO0cxzcn28GajT YJaQqiNIAgjmjJDmbqj6dP27B0pm6VOwmDD5S7J9cY+Vr/M6+QtRNWtXzNFbRtovgyFhvv 17BJrridt63Gb+atfNSQtIbr8nRjuMR91GBwWaBmmd1bluvbj3PuvS8/ZtvWdg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761033193; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6PL6yU4fxEvboaIeZ6Ir/FIQ/yEv60eSa4e1lOuSM3Q=; b=nag1UhahSaC6Uhj54ayFoJrYqUU+ooxJOUZf1ldo5Zn4u//FEEdXVL3kUDP/KCymb9fRw0 2JUqMS9sj07rwU/pi3B4x1sgFIprzIF0DFZHael0mBOh9t1mtBaO05+yTNIT/Hk30KuJsb JtD2kn54z5YDWGZzoCbW35ENE+Fob0HoEsdb8smpbnRTGjOoDsin3HZKnaez2NS1ZZK0nz NosE+bi/2ZcfbAO6IFmswGmUDZ4XEyIGKdvcBREsX1IdDG7XsClzR++kIZDdsclRGXz5Dk k+pCWAkVGGTuGRZuBjOeUvszU//Y+2MfyDNyP6d3o+EMefc/cZjcitA8dSoIVQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761033193; a=rsa-sha256; cv=none; b=EhLMDHcoyAijQ6eUMFnsvr+oGabpFU5PNng3wMeUih8+BQawlK8GnijlFfGywwlqR0tVNz 2gC30pEA3QPcJdvsI+8P9CviodGn6fS8mdmbG3Qpe9FVP+gwo+QYlVtWYaMO0c7PZ5AnCr EoNhcoTVihK+Z2VIuEC+Tk0P+6fSgiUDFK/jEoNCcwE+lmWTtUNEu9/IQ/uvMQajXxiS10 vwCSzyXCmPbFcRFqhY/j/UPf0u/9eCYHMZhmXDs2tZGDQ1BxJPSqduwSl5TdLR9gk87vod pe6ndMxyUncZR6sjtlJ3cI5QnOETdg6d1r9wOIkQYN/QWVS302eNNY+plt0BhQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4crPfw6xM3zr7c; Tue, 21 Oct 2025 07:53: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 59L7rCc8014523; Tue, 21 Oct 2025 07:53:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59L7rC0f014520; Tue, 21 Oct 2025 07:53:12 GMT (envelope-from git) Date: Tue, 21 Oct 2025 07:53:12 GMT Message-Id: <202510210753.59L7rC0f014520@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 885e8f272f75 - main - LinuxKPI: add skeleton pci_enable_wake() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 885e8f272f7515b0325974de72d18b73318eff07 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=885e8f272f7515b0325974de72d18b73318eff07 commit 885e8f272f7515b0325974de72d18b73318eff07 Author: Bjoern A. Zeeb AuthorDate: 2025-10-17 20:38:11 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-10-21 07:49:39 +0000 LinuxKPI: add skeleton pci_enable_wake() Given we do not yet support "wake" bits in device there is little need doing it in PCI if we cannot check if we are supposed to do the operation in first place. Once we would implement this, we would need to also do the appropriate PCI (pme) checks before enabling (disabling) it. MFC after: 3 days Reviewed by: dumbbell Differential Revision: https://reviews.freebsd.org/D53208 --- sys/compat/linuxkpi/common/include/linux/pci.h | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/pci.h b/sys/compat/linuxkpi/common/include/linux/pci.h index ffc2be600c22..06336bf963d6 100644 --- a/sys/compat/linuxkpi/common/include/linux/pci.h +++ b/sys/compat/linuxkpi/common/include/linux/pci.h @@ -831,6 +831,19 @@ lkpi_pci_restore_state(struct pci_dev *pdev) #define pci_save_state(dev) lkpi_pci_save_state(dev) #define pci_restore_state(dev) lkpi_pci_restore_state(dev) +static inline int +linuxkpi_pci_enable_wake(struct pci_dev *pdev, pci_power_t state, bool ena) +{ + /* + * We do not currently support this in device.h either to + * check if the device is allowed to wake up in first place. + */ + pr_debug("%s: TODO\n", __func__); + return (0); +} +#define pci_enable_wake(dev, state, ena) \ + linuxkpi_pci_enable_wake(dev, state, ena) + static inline int pci_reset_function(struct pci_dev *pdev) { From nobody Tue Oct 21 07:53:19 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4crPg40s2Kz6F3hd; Tue, 21 Oct 2025 07:53:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4crPg36F0Cz3mXL; Tue, 21 Oct 2025 07:53:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761033199; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XqKhO0ee5npG33+u4fh9/u4wvz8pSFB2jFdniiSIoa8=; b=Aj8nW0cKxMxWEEBZpWZGkyuFmKPHFBtPfuqLezArg2tCEY+//TJHTlok1eF4BpNglK49v4 4JUY0Af4KQW1kliC104ydmhMRDekHFjBpt+TgDKc9e/Ops8xBM+5uYZsDDWJEVzDOUk0/k lA9xDWGVQWYgc1G5SDEorjU2qNyeMqq/9+uAzMKjzEE5TQix/73jKoJaoA/xo0U1nMBhez 43Jm7bgdJM1FlaGoBBX5KjLMpxrW5njsDu+ROcqu31EXXPaAUPWBXO7jar05sN21Pifv4L /3x3ht55eARDJRUzbRPlxb01Q9tXHJol4uxzsTkMRMwNWLvPuotQbcNp3hGU8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761033199; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XqKhO0ee5npG33+u4fh9/u4wvz8pSFB2jFdniiSIoa8=; b=uLZGSlMH+uVbpeujeUUb1JtYYgG4GqQFdm9NaqASvnHWyt3aGVsOcwWFlayE2jeHBVo0U8 mO1zU1bqWTo5Y6ltnLb/R/+bj9X83IOl1AjQIPJhu6rJj6KM2Pkj7DlHEdcEY0mH6Bdm9z omoMkXwfi2J5riJuFMikOwkNuK4bPmdAOFnmm7bgp9SjF0UYUrICOPkBVXCqDRYMH9dvuN tEioWlj8CwfnTuolovU8BRC0YdfZLx+hR7q91S63rxll8zcTK5bms1vjHr+1b07nwrjNDr Oz3PgvJEbYOcHauWxGgpeksbWJOidcbXrmfKrR9mc27yQM7CiWN6P/+1rzX/1g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761033199; a=rsa-sha256; cv=none; b=l7gk9A5H2J5k8bYNXAMkz0oF5HC32HwuiDK/dNslRKfwPd5KVAgjeJTYJc5yGTFlT+xm6F 9rf4CZ+WxpyVycJWzx5QAt62suMB4ra44OFo0X/m++GuWflUFK+QpRaZVc6uzUKAPjHLTj ygyRW9ITaE3PM70ktBTG1pAW7MD/0eCBV/y22rr6DhXb2r3lNcaDEOtu4r4mukpAF+2iCF o2fHfs/B7XQxdsnpESTFucwGL0mWFPcgpvcLBkQ8Fqo/Ckjp2BVC2G8mQIC8E60PQMtOnq ZVsIQT7L0bQ8RCy0Xdup6eyxuTGIDnzXs6iC6qpHSTAm0+gEBEak3gAsNlI95g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4crPg35jNNzqvj; Tue, 21 Oct 2025 07:53: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 59L7rJDL014739; Tue, 21 Oct 2025 07:53:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59L7rJCE014736; Tue, 21 Oct 2025 07:53:19 GMT (envelope-from git) Date: Tue, 21 Oct 2025 07:53:19 GMT Message-Id: <202510210753.59L7rJCE014736@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 37ad1beaf516 - main - UPDATING: bump __FreeBSD_version for LinuxKPI changes List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 37ad1beaf516854d5e59b90a9706b09d02cc2a81 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=37ad1beaf516854d5e59b90a9706b09d02cc2a81 commit 37ad1beaf516854d5e59b90a9706b09d02cc2a81 Author: Bjoern A. Zeeb AuthorDate: 2025-10-20 20:35:13 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-10-21 07:52:46 +0000 UPDATING: bump __FreeBSD_version for LinuxKPI changes The size of an embedded struct has changed and might possibly be a problem. Allow this change to be detected by bumping __FreeBSD_version. MFC after: 3 days --- UPDATING | 4 ++++ sys/sys/param.h | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/UPDATING b/UPDATING index 02541eb4b41c..448febb5ba1a 100644 --- a/UPDATING +++ b/UPDATING @@ -27,6 +27,10 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 16.x IS SLOW: world, or to merely disable the most expensive debugging functionality at runtime, run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20251021: + Bump __FreeBSD_version to 1600002 for LinuxKPI. An embedded struct + has changed size and might possibly be an issue otherwise. + 20251016: With the migration to OpenZFS in FreeBSD 13.x a number of ZFS sysctls moved to new locations, but backwards compatibility aliases were diff --git a/sys/sys/param.h b/sys/sys/param.h index 8a71693cff3d..7cfa3c6aa4a8 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -74,7 +74,7 @@ * cannot include sys/param.h and should only be updated here. */ #undef __FreeBSD_version -#define __FreeBSD_version 1600001 +#define __FreeBSD_version 1600002 /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD, From nobody Tue Oct 21 07:53:17 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4crPg15ks8z6F3hc; Tue, 21 Oct 2025 07:53:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4crPg141ywz3mSL; Tue, 21 Oct 2025 07:53:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761033197; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DM3BrCPurkMNMUwG9Jmt4tzpZD/Hd6r7L8E3+2xig0A=; b=a8qO6hbx6MbGCt/svxl/HubJHFQixNtvBBRvNzhQwCUosn5w8nIVD3BqLqVoAVOw4j+rup 3hGd6oKMjMU6l91C05Ngn8how8Zu8dn71xP/7V6azEDr8T3qEh6+CTVl0Dn7PQz6VDSLZg jzvwW7N9FdL4ZyJForDSW8T66Rtl0LP+GBQiIRuNpF862Q/vKXg6Dcg9A2LpzoEiKkgnYE 8dZIjpI9DurUpc+L1B1xsSCNDrjeqB1P+XiRWc2kUOj505K8wEQBVIL51lTvXLwVE6T8Pf BLceehfjSOwtvkzrteKG7BdBNrsT9cviH7gYxevuZcHID1YsvIG7rqplI/fikw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761033197; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DM3BrCPurkMNMUwG9Jmt4tzpZD/Hd6r7L8E3+2xig0A=; b=LA+AbAOqfVDeOJREHETgPXdq4bcMI2XaUavNr659b6wRUInGutMGiKlnwgy83YElefM1Jt jX1H6K7U9axj+PUUFg9aRdnX2B0g9jl6A9G4JtNV/UUoN+j8rjvdyV92M6zi3xJDuv1KtK x7BqTnxiySQzXwQCr6APB7ZwAxIWCjeOXPtycEwSsF9YUvBasDsczuRDeDoJssUcBj/hR4 xiV9z2pMpoPrDQa1wo+sGlPVjsRM65EUeAydpY884Vtr3Z6NW92KFmqABi7BPj6MiZoG46 Gx5ubJIuS6CXS3IEnQPysJreg9sfcEITBRbCX0j9hQSkcGCmm0S6hGxD33W0NA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761033197; a=rsa-sha256; cv=none; b=JNoEn5N+TmYNi6o36DuCatdZe4yVsPR4FXVbUpW4KJ1G7o9RZMwYrvmBSmB+p82auYUamS QmAaW1lgi3MsNeaX/M4/W98VZx+14lBSiDwKL5MWWJNTgtRkuWtnH5Xw6pOCkj40anuGOo XfB0BZYGby4Fr44hvc7/kMW9t354MxN8YieSn30K1jsa1pJTRN91pQ7f9H5FmtP61hrGTm sl+XukXtDd5COdtxrX2+PJLqO7nFJUUI2YchWsPt0s9HgAUhMQaN4RT5Yp2/sv7+iufdxo cA/BJcMCtYKRD2Qws/RsrtkxMRV1fugvYqkr9j7360s41IYwafQsX7R9xjEL7A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4crPg13Vylzqvh; Tue, 21 Oct 2025 07:53: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 59L7rHb6014669; Tue, 21 Oct 2025 07:53:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59L7rHRd014666; Tue, 21 Oct 2025 07:53:17 GMT (envelope-from git) Date: Tue, 21 Oct 2025 07:53:17 GMT Message-Id: <202510210753.59L7rHRd014666@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 5ea941a4fbfd - main - LinuxKPI: netdevice add attach/detach skeleton functions List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5ea941a4fbfd1ba2483e47fe30ed6713fe912284 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=5ea941a4fbfd1ba2483e47fe30ed6713fe912284 commit 5ea941a4fbfd1ba2483e47fe30ed6713fe912284 Author: Bjoern A. Zeeb AuthorDate: 2025-10-17 20:28:36 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-10-21 07:49:40 +0000 LinuxKPI: netdevice add attach/detach skeleton functions For the moment add skeleton functions for netif_device_attach/detach() needed by rtw8[89] v6.17. MFC after; 3 days --- sys/compat/linuxkpi/common/include/linux/netdevice.h | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/netdevice.h b/sys/compat/linuxkpi/common/include/linux/netdevice.h index 3b808a4a1749..cf27753bcb80 100644 --- a/sys/compat/linuxkpi/common/include/linux/netdevice.h +++ b/sys/compat/linuxkpi/common/include/linux/netdevice.h @@ -485,6 +485,21 @@ netdev_priv(const struct net_device *ndev) return (__DECONST(void *, ndev->drv_priv)); } +/* -------------------------------------------------------------------------- */ + +static __inline void +netif_device_attach(struct net_device *ndev) +{ + pr_debug("%s: TODO\n", __func__); +} + +static __inline void +netif_device_detach(struct net_device *ndev) +{ + pr_debug("%s: TODO\n", __func__); +} + + /* -------------------------------------------------------------------------- */ /* This is really rtnetlink and probably belongs elsewhere. */ From nobody Tue Oct 21 13:36:50 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4crYHS3Pw4z6BXLh; Tue, 21 Oct 2025 13:36:52 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4crYHS2x4Jz4Pxk; Tue, 21 Oct 2025 13:36:52 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761053812; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=71aWx0eq+XmcFY5oofANjWspX7gXMogyHRab1g+7ZDg=; b=iXYaS7xRkZ7AVcGbY0Ki031yMr9rvbxdSiJTi9mKyv5imiZq7WNUhKko1ejJVEKd1Kj+je fIrvEvmDP0zBHb8e+Zu3k9YU+p1prKMPuK+Zr1AYxc+rx4r3apoAa5rNM7regE6rO+rQqI 2R+kf44d2Wz4lNN8OcNMXIW0bazW3N+jLoTyOU0ZWug1bUDOFE4vBQmUg8eUcRlZbomtCt HwBYGY3Foy8A1jNYkFpc47PEYHUCC2qi5XQjAEhQv9gTUe1abb4nl2n5YVbiBuDgJm0dxK YU3Aw2BeITxHgx22zquA9dqZ8BaM8nrhdkP+5kj9Y8kB/lRXFVtjf5WTzCUe6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761053812; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=71aWx0eq+XmcFY5oofANjWspX7gXMogyHRab1g+7ZDg=; b=eiyJaeVWOWydU4k+Ig1a8ppeRMEkV9dr/1+VYpNb6oNXLPYssTQndLhz7vyAXdUR89VrBD mwitbLcwg2doPGJd2LsIfk6ugVeXOwCMfKGNx0Gr70+avIg9Aynv504d443nR39zO6Sg2T qJW4OdYk48R2Wi7KJP09e7SY0mo/+nnekr7zqo7RMm8rF2TIMbwPsWoUwQ0WAf6hmQxWka vwiLhqDPck5hlcyDV3vEPegrykC/3q7kCAeIsbZwQ/h6UaVk6W2wCv2FOeHT0ar4JeVUjt t6fgp5Y17f92QyKor1BbNwuyt1jFX5CfPxKdnVsIZ+oMU9NV/EEOsU44l7101w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761053812; a=rsa-sha256; cv=none; b=K/nQKJJFHkXszAOK6RSI6DMeBsceeCvliiQCddMWhlYU+dvrOGsRaHjOuOIxCjCQjJf605 54C8IrS2hhIiEmGdpIzTqjV0Vri2jigEE5iFMUnFDrIixAUBoXUfypyqtlY6dwARGBW9n8 yXxnhllaTXICgohsmSRPS8n39uRIyku3q8GrU2zk3NgUl/fwqMh10+xHytqxsW7eL9LQa/ q/9pW1OGoP+kvCtLwCgIPed8gQC6CQepk+s2O0RihnnIK6Oi7G9P6CBhaZAMtewLB3wcyC 7J77n1nuKVDidx7/eW3piX9gqY2Abd4BJtXUfjtYnTCLBJpdqg3KUgdMco78Jw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from [IPV6:2601:5c0:4202:5670:20c2:9c23:87dd:26f7] (unknown [IPv6:2601:5c0:4202:5670:20c2:9c23:87dd:26f7]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id 4crYHS17ldzNys; Tue, 21 Oct 2025 13:36:52 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: <0548e02e-3ee1-4459-95b7-ca3b720cbe96@FreeBSD.org> Date: Tue, 21 Oct 2025 09:36:50 -0400 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 885e8f272f75 - main - LinuxKPI: add skeleton pci_enable_wake() Content-Language: en-US To: "Bjoern A. Zeeb" , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202510210753.59L7rC0f014520@gitrepo.freebsd.org> From: John Baldwin In-Reply-To: <202510210753.59L7rC0f014520@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 10/21/25 03:53, Bjoern A. Zeeb wrote: > The branch main has been updated by bz: > > URL: https://cgit.FreeBSD.org/src/commit/?id=885e8f272f7515b0325974de72d18b73318eff07 > > commit 885e8f272f7515b0325974de72d18b73318eff07 > Author: Bjoern A. Zeeb > AuthorDate: 2025-10-17 20:38:11 +0000 > Commit: Bjoern A. Zeeb > CommitDate: 2025-10-21 07:49:39 +0000 > > LinuxKPI: add skeleton pci_enable_wake() > > Given we do not yet support "wake" bits in device there is little need > doing it in PCI if we cannot check if we are supposed to do the > operation in first place. Once we would implement this, we would need > to also do the appropriate PCI (pme) checks before enabling (disabling) > it. > > MFC after: 3 days > Reviewed by: dumbbell > Differential Revision: https://reviews.freebsd.org/D53208 FWIW, we have pci_enable_pme() that this probably maps to. Similarly, pci_has_pm() is a helper routine to see if a device supports power management. The various NIC drivers supporting WOL use these helper routines to manage PME. -- John Baldwin From nobody Tue Oct 21 13:44:29 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4crYSF60kqz6BXkR; Tue, 21 Oct 2025 13:44:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4crYSF4zm8z3CLY; Tue, 21 Oct 2025 13:44:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761054269; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1VEefCFko13doTmK2uFk5dgNN8oL7xFuIS7BaeRvoTk=; b=A4KA+I9BUn0hUgC3vzXr56A5g4YmR3kR+zRFdAJ3rxhDAjjQKEdsiTD9iuv1SrbD9PLdpM 8TIW6k+172GOBZQKCnvLI18iGgHM65Ue+5G0ppkBBgDLm9jcX+3l9g0sXwNtNeKrkRPRu4 fc3vSN1uKRFQEs2G3fX0UfyNTj/muJmdMARGgzJUcLFbwXZDhqC3POBgAnF/2OBiL3Hwg0 lkAeeCBVU67TKlRHtaXpX1CfKR6jJpRzvXR7DwMmHzZrAq0tHqpUkFRo8HK9rPE1th0NQy R/Lt1LQVvHVmST5NYTQg4VVwtPS6QV54WBau5kGRSMO5ndkizEyO5ZE/SzeuhQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761054269; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1VEefCFko13doTmK2uFk5dgNN8oL7xFuIS7BaeRvoTk=; b=hd/HqsiQesIv8GbUjEyof019O5n5JQ8PxTpyhYhesah/GajqYcYcecfK1hgYvtHXRaMAIQ G+oWJvuJl3ZUH2Vp/FVecSqaCGDA+fzMLiIP3RPKopQNMjRYzxB5obGtRiWRb7vP0VHuEz fYiQi/2sgDd0YTlcma3pB4CQfBQ1I044rTJRjYspNI2MnOViPX5BHtrOlFLSJlm2i4vmT8 42GhVKCyqESKZ7dDkaSzx4aodet0toU762D/hjBV/EV8psm08nGScg1SXcsRFInrpw3jcy 6DQx8LRfQOXAoxqlEzmdc8fh6IwcP3BljoFwIcZfseziMudexiFNc1dQLiHuDQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761054269; a=rsa-sha256; cv=none; b=R+22y3rbiGML6H6IxkM+wDsfJ14dWtvkjUQFieE7kPdmIICqfV3MfLsCCHMJUcJbGBG2hC 5ECRRppLLfo0ZXDC3J4iyspSpm+tU+dCVUj4Con+Yaop6KuwKqnkssgm0ZDRzWQ44bDbQO YHu90sUUzavlODmsGsi/G2t68mU63JepDOeKv9xkCZq5oi0tdiiAotJ9XkxsVjTMJN6y1C J1fwNr92HglQSOT7IHZrqOMCROsTqfTSEJEPm2rApw1yYomDYcOu2WBQUGPMSxeXiP1G1K 9ZsPXeZlB9tsODd0B16wYsNVB6EPKxxnls6kPKl+xrIzBHM+hqIR3alcSzFr1Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4crYSF4Js9z128D; Tue, 21 Oct 2025 13:44: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 59LDiTft076440; Tue, 21 Oct 2025 13:44:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59LDiTsZ076437; Tue, 21 Oct 2025 13:44:29 GMT (envelope-from git) Date: Tue, 21 Oct 2025 13:44:29 GMT Message-Id: <202510211344.59LDiTsZ076437@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: e29f81c2adc1 - main - ata: Add error bits List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e29f81c2adc1fbe970fa5da8cc3dd6d300c76d7b Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=e29f81c2adc1fbe970fa5da8cc3dd6d300c76d7b commit e29f81c2adc1fbe970fa5da8cc3dd6d300c76d7b Author: Warner Losh AuthorDate: 2025-10-21 13:35:32 +0000 Commit: Warner Losh CommitDate: 2025-10-21 13:36:55 +0000 ata: Add error bits Add notes for other bits that we don't use in the code for error status. We report these when there's an error, and this allows people decoding it to not have to chase down these bits from the standard. Sponsored by: Netflix --- sys/sys/ata.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/sys/ata.h b/sys/sys/ata.h index 5e9c2bcb9aa0..9ce822214f6d 100644 --- a/sys/sys/ata.h +++ b/sys/sys/ata.h @@ -347,8 +347,11 @@ struct ata_params { #define ATA_STATUS_BUSY 0x80 /* ATA Error Register */ +/* COMMAND TIMEOUT 0x01 */ #define ATA_ERROR_ABORT 0x04 #define ATA_ERROR_ID_NOT_FOUND 0x10 +/* UNCORRECTABLE ERROR 0x40 */ +/* INTERFACE CRC 0x80 */ /* ATA HPA Features */ #define ATA_HPA_FEAT_MAX_ADDR 0x00 From nobody Tue Oct 21 13:51:47 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4crYch3YCxz6BYZG; Tue, 21 Oct 2025 13:51:48 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4crYch34RMz3DQ7; Tue, 21 Oct 2025 13:51:48 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761054708; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=WFeefxLm+6xbRDLtfxXL9nAJkbVzFSm6y8GZfTocfbE=; b=uUaY1bE3HUzCQnACgkzPIJbM2Au4B3kyL/2qBkIFd1+9lzmJHJN5l7kWOZfRWH+FZu6trm aDd2m6ZN/oNzmIJHKYHX/MEl2vV30EI4StXObo1Bo0RobbO48v1Su3eyzzEGKSpPcvv4PA 0YWLBy+pDAMCRriTo7VVwwzYH8I0Zwi/g+Y7bePBs+iCEp3y3hrgCyVIAIUm++a5/oxtyb ZxHgE/mmR1HvwbPqRTyWpMoTMjOpszTFB84dh2e5GOs05Oh07zoCzBELZ3U+pPN+6FnBP/ h+5bYr/mFVjeVkMhd038o9wF9Z6AJo6IUEBqxjdoyTtTMTrTBAu83vncwg+fdA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761054708; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=WFeefxLm+6xbRDLtfxXL9nAJkbVzFSm6y8GZfTocfbE=; b=M1XRH7WdGmTDNhepEj8HxpG4X6Do5Lkdm0jaVqmQcrD6owIjBukI6YGzdErxkMgWQWLu+Y m7mZcUXN3XS1+UgyJQdln4yt/j9RkGiBZkUrcXCyyeDwe/XwKqIesB60wbnctbaZOREaul NNcXc5OGfo51E4vvfSecEvvCGmRxqtU4AoW4zpNKw24ae6DHEsE8SJuRitQjk5iitxqDsQ OFi3y0Mg+JjQQGZ9hQm78qK4ML6Z21sl2No0OecnY+NjaZUod1GGmRx3Gx1JiNmrIJuzbj dmJHK9ylV9J7A/pEEFlKir4IGDjhE/2xjDw+me9yncBjLXeVAOAQh2O/vKNZJw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761054708; a=rsa-sha256; cv=none; b=VgOKZax7bXgjsF8CX+13kXnxQz20IWLNqPKpHItmxZ0smcM1ZIQWDwfBiEskmNdEQT4f4W DuJ43mUKrae3ZcBP9Rn4T/P2Tvs48EIiOUaZalWhhHIlhhTw7Isq+W54g27ElB/Ba8D4RX aPKoVG/kUJscvcUMDbFqvIt5zzgHptUVV/d5+t1radJgeuJczwU6n/XbHweKnjr4gReC4Y dygVTiil8lBsH0cSXDTb3LvvQzDVxp9wjykynwJxWAyJom+AVmlZ2JVu3VsPgn0b014ZpK cNQDcSlVQAJwEWZuwuj5bD5AKpkDfl4J1DuKY/6mBzyQnbfaQcrtKGxbUs0UMQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from [IPV6:2601:5c0:4202:5670:20c2:9c23:87dd:26f7] (unknown [IPv6:2601:5c0:4202:5670:20c2:9c23:87dd:26f7]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id 4crYch1PkFzNsk; Tue, 21 Oct 2025 13:51:47 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: <1e0fa955-a6d9-4c21-9620-3eea6d7682be@FreeBSD.org> Date: Tue, 21 Oct 2025 09:51:47 -0400 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 74a6bb524e5b - main - Makefile: Don't allow install{world,kernel} with pkgbase Content-Language: en-US To: Warner Losh Cc: src-committers , dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org References: <202510171914.59HJE0uo036247@gitrepo.freebsd.org> <228220a0-c819-4c51-92d3-5357e925c81d@FreeBSD.org> From: John Baldwin In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit On 10/21/25 00:20, Warner Losh wrote: > On Mon, Oct 20, 2025 at 1:44 PM John Baldwin wrote: > >> On 10/20/25 10:59, Warner Losh wrote: >>> Install* should eventually just do the right thing like ports: stage the >>> packages, make the packages and the install from the packages. 16 time >>> frame, though. >> >> Hmm, 'make installkernel' needs to still create kernel.old for those >> of us doing development (or really, just running main. The tb(4) driver >> turned my laptop into a brick recently and I needed kernel.old so I could >> recover). AFAIK, pkgbase doesn't have any provision for doing that. Also, >> `make installkernel INSTKERNNAME=test; nextboot -k test` is a key part of >> my workflow for testing kernels. I'm fine with using packages to ship >> updates to users running stock sources, but please do not make it harder >> to do development. >> > > Yes. Though I'd hope we'd get slightly better BE integration. Then it > doesn't matter... unless you're running UFS root... so something needs to > happen. But it's not clear to me if the stagekernel stuff should do that, > or if *ANY* update from pkg to /boot/kernel (or the booted kernel) > shouldn't do the /boot/kernel -> /boot/kernel.old rename, sysctl tweaks so > ps can still fine the kernel if it needs it. > > >> When hacking on userspace components I often need to be able to do >> just 'make install' of a single binary or library onto an installed >> system knowing that a future installworld or `make install` will revert >> to "stock" binaries later. Please don't break that. It's like when >> I work on changes to GDB or LLVM, I use the native build system to build >> the modified version, I don't try to hack up a port to build a package >> with the extra changes I have either in a working tree or committed on a >> feature branch. >> > > Oh yes. I was thinking that only install{world,kernel} would change to > depend on the staging + packaging and then accomplish this by doing a pkg > update. The per-directory stuff I didn't think should change (though I > honestly wish we'd have the 'stating' just be a metafile creation with a > contents= tag in the METALOG instead of so much copying. I think the only friction here is that 'make installkernel' is the 'make install' analog for a kernel. 'make installworld' is more obviously a meta operation, but `installkernel` is a bit different. It's also important to not break `make installworld TARGET_ARCH= DESTDIR=/path/to/rootfs` which is another use case I at least use quite frequently to build cross-arch disk images for use in QEMU (or to cross-install onto the SD card I use in SBCs). Also, I know that for cheribuild we certainly cross-build OS images (including a cross-install kernel/world into a rootfs) on Linux and macOS, so switching to packages adds another dependency (pkg) to that. This is probably easier to make work if pkg is in the base system and built as a cross-tool rather than an external tool (though an external tool can work). -- John Baldwin From nobody Tue Oct 21 15:06:11 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4crbGm0dJnz6CQ3L; Tue, 21 Oct 2025 15:06:24 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4crbGm04Qyz3M33; Tue, 21 Oct 2025 15:06:24 +0000 (UTC) (envelope-from bz@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761059184; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=SpwSHYx0W/yvqWr4I7zj+UwjUqbsEDqxwIW2SSkYZCI=; b=S4Mg1NtfEjD36ASzVeO4qoj4ncqq/Wg0D2EYr06F+Kes72Zs4+2foKjsV5nej7LBP96GuG vYGXF7M0+afOa73JoWkL272zkQ8iIXUouChsAhjSn58dhyAsSqkGPXvy1JIPKyL2fnCXhm 03764GuR4jo89QJ6IQHC1lbkcIeog+oD6QdIbySYSMb4mIJC/u1bIzcBnXByMVQF5gNozh utnG797QJr2SkqHt03VjbUR+B9/tzprNOVuw9OBYo5EmnLku+k0w6ek+hwIvkZtJaDCRws I4pSi2WFIxJml0owubehf7CO3uCjERBKuxjAW0Cpv9GQhUCDBe6HDsZvMzZ2Uw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761059184; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=SpwSHYx0W/yvqWr4I7zj+UwjUqbsEDqxwIW2SSkYZCI=; b=gJdb29Vb44SGUSGohTuO2bn1EIHX3efnb3V9tEfm7cVspBpCQ351PExDQA7yHV5f9CmVVi Cgb//MMKOk2ID3X5hHakkLeL08sImv83TOtHy0m1imQqZNLF4LEc8GP2IE92goMBJcv8g0 zDS/ySiQLLg6vp8pr7MdE3F2GC+67kujq0cJ11ITHVQBzXdcrl8g9lDX96BtxSTBWv/2jp tycbV38ehSu5cso6Rqrp1Hz90Pb5H4dN5/TgFzkPagOBtB+5nLMeZK77Rvr7Lzh7OaXMyi gaBuTtO7QeJx3A/JEfQdyd4f4IGFXpKmdgjfYj90X958KbLjdItZGKT6gR3JiQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761059184; a=rsa-sha256; cv=none; b=VVF7kQm42BGPgD02CIrSwY5QdHUL48jhRTeP+Hnxk2fKDd+gnV3gQAHnkTljDKmvGMUjN9 emdXnxNhuwy5DBppQQsbuv52/L9+WYqpXtLJ7DRhi7bLqgCqW4LjfJyLmji4jTb8YMKLeC mGwRz4bA567f9Jbl8w0e2JoV6aO18miVOS//9xkCoCPpz5wxRt5jkC9YkTa1oK53Ivw7Cg e/f3voYAqfkZEjCuvjnptsUCtcAGO0ZVtsiNzI9J4mecsshZZ0oIrXJW6IWZKzcPIvD2Q2 6c3FFVZU21rRCTBWIkGEUcgYt1FpNXYiWKq+5eo8xuOzlm/mXbLN5fM5dJnIkg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from mx-01.divo.sbone.de (mx-01.divo.sbone.de [IPv6:2003:a:140a:2200:6:594:fffe:19]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature ECDSA (prime256v1) client-digest SHA256) (Client CN "mx-01.divo.sbone.de", Issuer "E8" (verified OK)) (Authenticated sender: bz/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4crbGl5fs0zNwf; Tue, 21 Oct 2025 15:06:23 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from mail.sbone.de (mail.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:1025]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by mx-01.divo.sbone.de (Postfix) with ESMTPS id A1C34A64805; Tue, 21 Oct 2025 15:06:05 +0000 (UTC) Received: from content-filter.t4-02.sbone.de (content-filter.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:2742]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPS id 7E9222D029E6; Tue, 21 Oct 2025 15:06:16 +0000 (UTC) X-Virus-Scanned: amavisd-new at sbone.de Received: from mail.sbone.de ([IPv6:fde9:577b:c1a9:4902:0:7404:2:1025]) by content-filter.t4-02.sbone.de (content-filter.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:2742]) (amavisd-new, port 10024) with ESMTP id tSkBecJFQq0C; Tue, 21 Oct 2025 15:06:12 +0000 (UTC) Received: from nv.t4-02.sbone.de (nv.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:22]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPSA id C811B2D029D8; Tue, 21 Oct 2025 15:06:11 +0000 (UTC) Date: Tue, 21 Oct 2025 15:06:11 +0000 (UTC) From: "Bjoern A. Zeeb" To: John Baldwin cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 885e8f272f75 - main - LinuxKPI: add skeleton pci_enable_wake() In-Reply-To: <0548e02e-3ee1-4459-95b7-ca3b720cbe96@FreeBSD.org> Message-ID: <72669827-7s38-oo59-6128-rns453r8n7r6@SerrOFQ.bet> References: <202510210753.59L7rC0f014520@gitrepo.freebsd.org> <0548e02e-3ee1-4459-95b7-ca3b720cbe96@FreeBSD.org> X-OpenPGP-Key-Id: 0x14003F198FEFA3E77207EE8D2B58B8F83CCF1842 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII; format=flowed On Tue, 21 Oct 2025, John Baldwin wrote: > On 10/21/25 03:53, Bjoern A. Zeeb wrote: >> The branch main has been updated by bz: >> >> URL: >> https://cgit.FreeBSD.org/src/commit/?id=885e8f272f7515b0325974de72d18b73318eff07 >> >> commit 885e8f272f7515b0325974de72d18b73318eff07 >> Author: Bjoern A. Zeeb >> AuthorDate: 2025-10-17 20:38:11 +0000 >> Commit: Bjoern A. Zeeb >> CommitDate: 2025-10-21 07:49:39 +0000 >> >> LinuxKPI: add skeleton pci_enable_wake() >> Given we do not yet support "wake" bits in device there is little >> need >> doing it in PCI if we cannot check if we are supposed to do the >> operation in first place. Once we would implement this, we would need >> to also do the appropriate PCI (pme) checks before enabling >> (disabling) >> it. >> MFC after: 3 days >> Reviewed by: dumbbell >> Differential Revision: https://reviews.freebsd.org/D53208 > > FWIW, we have pci_enable_pme() that this probably maps to. Similarly, > pci_has_pm() > is a helper routine to see if a device supports power management. The > various NIC > drivers supporting WOL use these helper routines to manage PME. Thank you. LinuxKPI also has pci_pme_capable() already. I'll try to implement the lower device bits in LinuxKPI at some point (at least it's on my list) and this will hopefully help then to do the PCI bits quickly. /bz -- Bjoern A. Zeeb r15:7 From nobody Tue Oct 21 15:53:53 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4crcKZ2rGCz6CTKj; Tue, 21 Oct 2025 15:53:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4crcKZ2S81z3RHC; Tue, 21 Oct 2025 15:53:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761062034; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OyHlXk0Is0h8joLQSITYBA2jrDvhCtFUQShlf5aPzUY=; b=KbpOlctSJ9zEHNyPc/dkpSuHxYXOUsCh6SIoHzSgyRo8a38afs8qLAn0hKQ/6mwMEW3j6u HOffblwv/yKOV8TaFihZg6rFIJQg1zGJKLiWHM0d/cdeLri+0Fm0g8MUHN4qs1vfycsNKE AqlhhkaeE/lj/Xtu/M0JNNS+amUfoi3pYX3bh3sV39qm5QdAAw7eeFc4QFpkGWWcWEjbjh xxRj/JbqTXozazh6gdg2dajbAHLq/JY+ntc8Gsd2m/P0VzZIdxvqSXNd6G0Uu+N8GFJk53 aVTKN6E+Am40LergKDEAv17xIhv4n29y7UmqppsJEm2dQ1invfkgcE9M3/pBrw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761062034; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OyHlXk0Is0h8joLQSITYBA2jrDvhCtFUQShlf5aPzUY=; b=sP125jn8tE/vSHowlwdZAKRMAsCVqA1nWs+SUz8x5x/Sd6r5Up+uhbWHFP1FMBM3v7ZpMv 2sBVppFJa2a2r6AmR29kDMmFlR6w4p5GaMd7QlXIXITnFX10/6T9JCt8DObKF2jVCIzymf ZymoQGuXZFpOGrt8GhTatVOWeyQtYM+sY8TT5pScuEZteFuhwF/gGbjTlV1DJPqtGb2oBT hhJ/7VPS1cmdSGIdtaY47yvxByQXuF5owUNVGEvVQbUVNhoW87pkrHsa875ZZDPEUhbIEY 6WXpUOcncdedcQ+Dgaf0aVbYW0kMFRDk9EG81U7RFUIzpl2FdrFiy2j75LYivQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761062034; a=rsa-sha256; cv=none; b=Qg5VInjXW5X4nV21ZSUG4MWwJx2IVAwG2Er7dkQnR1GC2W1V0JkvKC+JXuRaZ9RXytDbsV 7MqlnIpOKN+Gh31GVBEqTre9CW/BrNz4/c2VltF309++LUWRClWFytmdeKAuxFoEvpDZ6L tlGmpyurAVj7oknRSeK8xoKT/fjAdL9yDo6frrc4UhW6Dp9bNwRsqveIyKn57k+Ny9vcZf m8WqBaug3jqOjrHJLfx+9ajALQfEvn+/ANvkrJEO916sEL+CxfHvZtaeiLx3gs52+wh3Rr 3NcUuZG44ejcKq46jAEFF9MOtAerh2JR1UssBBwFgVhM5z3b7AYLJxtNnf1AEA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4crcKZ22fXz154H; Tue, 21 Oct 2025 15:53: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 59LFrsbQ020470; Tue, 21 Oct 2025 15:53:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59LFrrW2020467; Tue, 21 Oct 2025 15:53:53 GMT (envelope-from git) Date: Tue, 21 Oct 2025 15:53:53 GMT Message-Id: <202510211553.59LFrrW2020467@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Martin Matuska Subject: git: 401026e4825a - main - libarchive: merge from vendor branch List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 401026e4825a05abba6f945cf1b74b3328876fa2 Auto-Submitted: auto-generated The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=401026e4825a05abba6f945cf1b74b3328876fa2 commit 401026e4825a05abba6f945cf1b74b3328876fa2 Merge: e29f81c2adc1 8f38cbcd9c4a Author: Martin Matuska AuthorDate: 2025-10-21 14:10:15 +0000 Commit: Martin Matuska CommitDate: 2025-10-21 15:52:44 +0000 libarchive: merge from vendor branch Update vendor/libarchive to 3.8.2 Important bugfixes: #2477 tar writer: fix replacing a regular file with a dir for ARCHIVE_EXTRACT_SAFE_WRITES #2659 lib: improve filter process handling #2664 zip writer: fix a memory leak if write callback error early #2665 lib: archive_read_data: handle sparse holes at end of file correctly #2668 7zip: Fix out of boundary access #2670 zip writer: fix writing with ZSTD compression #2672 lib: fix error checking in writing files #2678 zstd write filter: enable Zstandard's checksum feature #2679 lib: handle possible errors from system calls #2707 lib: avoid leaking file descriptors into subprocesses #2713 RAR5 reader: fix multiple issues in extra field parsing function #2716 RAR5 reader: early fail when file declares data for a dir entry #2717 bsdtar: Allow filename to have CRLF endings #2719 tar reader: fix checking the result of the strftime (CVE-2025-25724) #2737 tar reader: fix an infinite loop when parsing V headers #2742 lib: parse_date: handle dates in 2038 and beyond if time_t is big enough Obtained from: libarchive Vendor commit: 7f53fce04e4e672230f4eb80b219af17975e4f83 Security: CVE-2025-25724 PR: 290303 (exp-run) MFC after: 1 week contrib/libarchive/NEWS | 2 + contrib/libarchive/SECURITY.md | 2 +- .../github_actions/install-macos-dependencies.sh | 3 + contrib/libarchive/cat/bsdcat.c | 15 +- contrib/libarchive/cat/cmdline.c | 2 +- contrib/libarchive/cpio/cmdline.c | 2 +- contrib/libarchive/cpio/cpio.c | 14 +- contrib/libarchive/cpio/test/test_owner_parse.c | 2 +- contrib/libarchive/libarchive/archive.h | 4 +- contrib/libarchive/libarchive/archive_acl.c | 23 +++ .../libarchive/libarchive/archive_check_magic.c | 9 +- contrib/libarchive/libarchive/archive_cryptor.c | 8 +- .../libarchive/archive_cryptor_private.h | 11 +- contrib/libarchive/libarchive/archive_entry.h | 2 +- .../libarchive/libarchive/archive_entry_paths.3 | 2 +- contrib/libarchive/libarchive/archive_entry_stat.c | 6 +- contrib/libarchive/libarchive/archive_parse_date.c | 4 +- contrib/libarchive/libarchive/archive_platform.h | 10 -- .../libarchive/libarchive/archive_platform_stat.h | 45 ++++++ contrib/libarchive/libarchive/archive_private.h | 1 + contrib/libarchive/libarchive/archive_read.c | 7 +- .../libarchive/archive_read_disk_entry_from_file.c | 12 +- .../libarchive/archive_read_disk_posix.c | 157 ++------------------- .../libarchive/libarchive/archive_read_open_fd.c | 23 +-- .../libarchive/libarchive/archive_read_open_file.c | 16 ++- .../libarchive/archive_read_open_filename.c | 31 ++-- .../libarchive/archive_read_set_format.c | 32 ++--- .../archive_read_support_filter_program.c | 7 +- .../libarchive/archive_read_support_format_7zip.c | 7 +- .../libarchive/archive_read_support_format_mtree.c | 23 ++- .../libarchive/archive_read_support_format_rar.c | 8 +- .../libarchive/archive_read_support_format_rar5.c | 66 +++++++-- .../libarchive/archive_read_support_format_tar.c | 70 ++++++--- .../libarchive/archive_read_support_format_warc.c | 2 +- .../libarchive/archive_read_support_format_xar.c | 2 +- .../libarchive/archive_read_support_format_zip.c | 4 +- contrib/libarchive/libarchive/archive_string.c | 5 +- .../libarchive/libarchive/archive_string_sprintf.c | 2 +- contrib/libarchive/libarchive/archive_util.c | 38 ++++- contrib/libarchive/libarchive/archive_write.c | 30 ++-- .../libarchive/archive_write_add_filter_bzip2.c | 4 + .../libarchive/archive_write_add_filter_gzip.c | 55 +++++--- .../libarchive/archive_write_add_filter_program.c | 11 +- .../libarchive/archive_write_add_filter_zstd.c | 2 + .../libarchive/archive_write_disk_posix.c | 16 ++- .../libarchive/libarchive/archive_write_open_fd.c | 2 +- .../libarchive/archive_write_open_file.c | 14 +- .../libarchive/archive_write_open_filename.c | 3 +- .../libarchive/archive_write_set_format_7zip.c | 2 +- .../libarchive/archive_write_set_format_mtree.c | 19 ++- .../libarchive/archive_write_set_format_xar.c | 6 +- .../libarchive/archive_write_set_format_zip.c | 25 +++- contrib/libarchive/libarchive/filter_fork_posix.c | 37 ++++- contrib/libarchive/libarchive/test/test_acl_nfs4.c | 7 + .../libarchive/libarchive/test/test_acl_posix1e.c | 5 + .../libarchive/test/test_archive_parse_date.c | 2 + .../test/test_archive_string_conversion.c | 10 ++ contrib/libarchive/libarchive/test/test_entry.c | 11 ++ .../test/test_read_filter_gzip_recursive.c | 4 +- .../libarchive/test/test_read_format_7zip.c | 81 +++++++---- .../libarchive/test/test_read_format_rar5.c | 66 +++++++++ .../test/test_read_format_rar5_dirdata.rar.uu | 6 + ...rmat_rar5_invalid_hash_valid_htime_exfld.rar.uu | 6 + .../test_read_format_rar5_only_crypt_exfld.rar.uu | 7 + .../test_read_format_rar5_unsupported_exfld.rar.uu | 6 + .../test/test_read_format_tar_V_negative_size.c | 48 +++++++ .../test_read_format_tar_V_negative_size.tar.uu | 20 +++ .../libarchive/test/test_read_set_format.c | 7 +- .../libarchive/test/test_write_filter_bzip2.c | 29 ++++ .../libarchive/test/test_write_filter_gzip.c | 12 +- .../test/test_write_filter_gzip_timestamp.c | 7 +- .../libarchive/libarchive_fe/{err.c => lafe_err.c} | 2 +- .../libarchive/libarchive_fe/{err.h => lafe_err.h} | 0 contrib/libarchive/libarchive_fe/line_reader.c | 2 +- contrib/libarchive/libarchive_fe/passphrase.c | 2 +- contrib/libarchive/tar/bsdtar.c | 7 +- contrib/libarchive/tar/bsdtar.h | 8 +- contrib/libarchive/tar/cmdline.c | 2 +- contrib/libarchive/tar/creation_set.c | 2 +- contrib/libarchive/tar/read.c | 2 +- contrib/libarchive/tar/subst.c | 2 +- contrib/libarchive/tar/test/test_crlf_mtree.c | 74 ++++++++++ .../libarchive/tar/test/test_option_safe_writes.c | 5 +- contrib/libarchive/tar/util.c | 7 +- contrib/libarchive/tar/write.c | 29 +++- contrib/libarchive/test_utils/test_common.h | 10 +- contrib/libarchive/test_utils/test_main.c | 156 +++++--------------- contrib/libarchive/unzip/bsdunzip.c | 15 +- contrib/libarchive/unzip/cmdline.c | 2 +- contrib/libarchive/unzip/test/test_C.c | 4 + contrib/libarchive/unzip/test/test_L.c | 4 + contrib/libarchive/unzip/test/test_P_encryption.c | 12 +- contrib/libarchive/unzip/test/test_basic.c | 4 + contrib/libarchive/unzip/test/test_d.c | 8 ++ contrib/libarchive/unzip/test/test_doubledash.c | 4 + contrib/libarchive/unzip/test/test_glob.c | 4 + contrib/libarchive/unzip/test/test_j.c | 4 + contrib/libarchive/unzip/test/test_n.c | 4 + contrib/libarchive/unzip/test/test_o.c | 4 + contrib/libarchive/unzip/test/test_p.c | 4 + contrib/libarchive/unzip/test/test_q.c | 4 + contrib/libarchive/unzip/test/test_singlefile.c | 4 + contrib/libarchive/unzip/test/test_t.c | 4 + contrib/libarchive/unzip/test/test_x.c | 12 ++ lib/libarchive/tests/Makefile | 6 + usr.bin/bsdcat/Makefile | 2 +- usr.bin/cpio/Makefile | 2 +- usr.bin/cpio/tests/Makefile | 2 +- usr.bin/tar/Makefile | 3 +- usr.bin/tar/tests/Makefile | 1 + usr.bin/unzip/Makefile | 2 +- usr.bin/unzip/tests/Makefile | 2 +- 112 files changed, 1120 insertions(+), 546 deletions(-) diff --cc contrib/libarchive/libarchive/archive_platform_stat.h index 000000000000,5432b2f6433a..5432b2f6433a mode 000000,100644..100644 --- a/contrib/libarchive/libarchive/archive_platform_stat.h +++ b/contrib/libarchive/libarchive/archive_platform_stat.h diff --cc contrib/libarchive/libarchive/test/test_read_format_rar5_dirdata.rar.uu index 000000000000,c7928f344a80..c7928f344a80 mode 000000,100644..100644 --- a/contrib/libarchive/libarchive/test/test_read_format_rar5_dirdata.rar.uu +++ b/contrib/libarchive/libarchive/test/test_read_format_rar5_dirdata.rar.uu diff --cc contrib/libarchive/libarchive/test/test_read_format_rar5_invalid_hash_valid_htime_exfld.rar.uu index 000000000000,399acd814ae4..399acd814ae4 mode 000000,100644..100644 --- a/contrib/libarchive/libarchive/test/test_read_format_rar5_invalid_hash_valid_htime_exfld.rar.uu +++ b/contrib/libarchive/libarchive/test/test_read_format_rar5_invalid_hash_valid_htime_exfld.rar.uu diff --cc contrib/libarchive/libarchive/test/test_read_format_rar5_only_crypt_exfld.rar.uu index 000000000000,4f9faf350c11..4f9faf350c11 mode 000000,100644..100644 --- a/contrib/libarchive/libarchive/test/test_read_format_rar5_only_crypt_exfld.rar.uu +++ b/contrib/libarchive/libarchive/test/test_read_format_rar5_only_crypt_exfld.rar.uu diff --cc contrib/libarchive/libarchive/test/test_read_format_rar5_unsupported_exfld.rar.uu index 000000000000,16b456bf4873..16b456bf4873 mode 000000,100644..100644 --- a/contrib/libarchive/libarchive/test/test_read_format_rar5_unsupported_exfld.rar.uu +++ b/contrib/libarchive/libarchive/test/test_read_format_rar5_unsupported_exfld.rar.uu diff --cc contrib/libarchive/libarchive/test/test_read_format_tar_V_negative_size.c index 000000000000,d110553acfaf..d110553acfaf mode 000000,100644..100644 --- a/contrib/libarchive/libarchive/test/test_read_format_tar_V_negative_size.c +++ b/contrib/libarchive/libarchive/test/test_read_format_tar_V_negative_size.c diff --cc contrib/libarchive/libarchive/test/test_read_format_tar_V_negative_size.tar.uu index 000000000000,230d710c8f8f..230d710c8f8f mode 000000,100644..100644 --- a/contrib/libarchive/libarchive/test/test_read_format_tar_V_negative_size.tar.uu +++ b/contrib/libarchive/libarchive/test/test_read_format_tar_V_negative_size.tar.uu diff --cc contrib/libarchive/tar/test/test_crlf_mtree.c index 000000000000,5ef8811369c1..5ef8811369c1 mode 000000,100644..100644 --- a/contrib/libarchive/tar/test/test_crlf_mtree.c +++ b/contrib/libarchive/tar/test/test_crlf_mtree.c diff --cc lib/libarchive/tests/Makefile index 07c5fe24dd30,000000000000..930250d974c5 mode 100644,000000..100644 --- a/lib/libarchive/tests/Makefile +++ b/lib/libarchive/tests/Makefile @@@ -1,742 -1,0 +1,748 @@@ +.include + +PACKAGE= tests + +WARNS?= 3 + +_LIBARCHIVEDIR= ${SRCTOP}/contrib/libarchive + +ATF_TESTS_SH+= functional_test + +TEST_METADATA.functional_test+= timeout="600" + +BINDIR= ${TESTSDIR} + +PROGS+= libarchive_test + +CFLAGS+= -I${.CURDIR} -I${.CURDIR:H} -I${.OBJDIR} +CFLAGS+= -I${_LIBARCHIVEDIR}/libarchive -I${_LIBARCHIVEDIR}/libarchive/test +CFLAGS+= -I${_LIBARCHIVEDIR}/test_utils +CFLAGS+= -I${SRCTOP}/sys/contrib/zstd/lib + +CFLAGS.test_utils.c+= -Wno-cast-align + +# Uncomment to link against dmalloc +#LDADD+= -L/usr/local/lib -ldmalloc +#CFLAGS+= -I/usr/local/include -DUSE_DMALLOC + +.PATH: ${_LIBARCHIVEDIR}/libarchive/test +TESTS_SRCS= \ + test_7zip_filename_encoding.c \ + test_acl_nfs4.c \ + test_acl_pax.c \ + test_acl_platform_nfs4.c \ + test_acl_platform_posix1e.c \ + test_acl_posix1e.c \ + test_acl_text.c \ + test_ar_mode.c \ + test_archive_api_feature.c \ + test_archive_clear_error.c \ + test_archive_cmdline.c \ + test_archive_digest.c \ + test_archive_match_time.c \ + test_archive_match_owner.c \ + test_archive_match_path.c \ + test_archive_pathmatch.c \ + test_archive_parse_date.c \ + test_archive_read.c \ + test_archive_read_add_passphrase.c \ + test_archive_read_close_twice.c \ + test_archive_read_close_twice_open_fd.c \ + test_archive_read_close_twice_open_filename.c \ + test_archive_read_multiple_data_objects.c \ + test_archive_read_next_header_empty.c \ + test_archive_read_next_header_raw.c \ + test_archive_read_open2.c \ + test_archive_read_set_filter_option.c \ + test_archive_read_set_format_option.c \ + test_archive_read_set_option.c \ + test_archive_read_set_options.c \ + test_archive_read_support.c \ + test_archive_set_error.c \ + test_archive_string.c \ + test_archive_string_conversion.c \ + test_archive_write_add_filter_by_name.c \ + test_archive_write_set_filter_option.c \ + test_archive_write_set_format_by_name.c \ + test_archive_write_set_format_filter_by_ext.c \ + test_archive_write_set_format_option.c \ + test_archive_write_set_option.c \ + test_archive_write_set_options.c \ + test_archive_write_set_passphrase.c \ + test_bad_fd.c \ + test_compat_bzip2.c \ + test_compat_cpio.c \ + test_compat_gtar.c \ + test_compat_gtar_large.c \ + test_compat_gzip.c \ + test_compat_lz4.c \ + test_compat_lzip.c \ + test_compat_lzma.c \ + test_compat_lzop.c \ + test_compat_mac.c \ + test_compat_perl_archive_tar.c \ + test_compat_plexus_archiver_tar.c \ + test_compat_solaris_tar_acl.c \ + test_compat_solaris_pax_sparse.c \ + test_compat_star_acl.c \ + test_compat_tar_directory.c \ + test_compat_tar_hardlink.c \ + test_compat_uudecode.c \ + test_compat_uudecode_large.c \ + test_compat_xz.c \ + test_compat_zip.c \ + test_compat_zstd.c \ + test_empty_write.c \ + test_entry.c \ + test_entry_strmode.c \ + test_extattr_freebsd.c \ + test_filter_count.c \ + test_gnutar_filename_encoding.c \ + test_link_resolver.c \ + test_open_fd.c \ + test_open_failure.c \ + test_open_file.c \ + test_open_filename.c \ + test_pax_filename_encoding.c \ + test_pax_xattr_header.c \ + test_read_data_large.c \ + test_read_disk.c \ + test_read_disk_directory_traversals.c \ + test_read_disk_entry_from_file.c \ + test_read_extract.c \ + test_read_file_nonexistent.c \ + test_read_filter_compress.c \ + test_read_filter_grzip.c \ + test_read_filter_gzip_recursive.c \ + test_read_filter_lrzip.c \ + test_read_filter_lzop.c \ + test_read_filter_lzop_multiple_parts.c \ + test_read_filter_program.c \ + test_read_filter_program_signature.c \ + test_read_filter_uudecode.c \ + test_read_filter_uudecode_raw.c \ + test_read_format_7zip.c \ + test_read_format_7zip_encryption_data.c \ + test_read_format_7zip_encryption_header.c \ + test_read_format_7zip_encryption_partially.c \ + test_read_format_7zip_malformed.c \ + test_read_format_7zip_packinfo_digests.c \ + test_read_format_ar.c \ + test_read_format_cab.c \ + test_read_format_cab_filename.c \ + test_read_format_cpio_afio.c \ + test_read_format_cpio_bin.c \ + test_read_format_cpio_bin_Z.c \ + test_read_format_cpio_bin_be.c \ + test_read_format_cpio_bin_bz2.c \ + test_read_format_cpio_bin_gz.c \ + test_read_format_cpio_bin_le.c \ + test_read_format_cpio_bin_lzip.c \ + test_read_format_cpio_bin_lzma.c \ + test_read_format_cpio_bin_xz.c \ + test_read_format_cpio_filename.c \ + test_read_format_cpio_odc.c \ + test_read_format_cpio_svr4_gzip.c \ + test_read_format_cpio_svr4c_Z.c \ + test_read_format_cpio_svr4_bzip2_rpm.c \ + test_read_format_cpio_svr4_gzip_rpm.c \ + test_read_format_empty.c \ + test_read_format_gtar_filename.c \ + test_read_format_gtar_gz.c \ + test_read_format_gtar_lzma.c \ + test_read_format_gtar_redundant_L.c \ + test_read_format_gtar_sparse.c \ + test_read_format_gtar_sparse_length.c \ + test_read_format_gtar_sparse_skip_entry.c \ + test_read_format_huge_rpm.c \ + test_read_format_iso_Z.c \ + test_read_format_iso_multi_extent.c \ + test_read_format_iso_xorriso.c \ + test_read_format_isorr_rr_moved.c \ + test_read_format_isojoliet_bz2.c \ + test_read_format_isojoliet_long.c \ + test_read_format_isojoliet_rr.c \ + test_read_format_isojoliet_versioned.c \ + test_read_format_isorr_bz2.c \ + test_read_format_isorr_ce.c \ + test_read_format_isorr_new_bz2.c \ + test_read_format_isozisofs_bz2.c \ + test_read_format_lha.c \ + test_read_format_lha_bugfix_0.c \ + test_read_format_lha_filename.c \ + test_read_format_lha_filename_utf16.c \ + test_read_format_mtree.c \ + test_read_format_mtree_crash747.c \ + test_read_format_pax_bz2.c \ + test_read_format_rar.c \ + test_read_format_rar5.c \ + test_read_format_rar_encryption.c \ + test_read_format_rar_encryption_data.c \ + test_read_format_rar_encryption_header.c \ + test_read_format_rar_encryption_partially.c \ + test_read_format_rar_filter.c \ + test_read_format_rar_invalid1.c \ + test_read_format_rar_overflow.c \ + test_read_format_raw.c \ + test_read_format_tar.c \ ++ test_read_format_tar_V_negative_size.c \ + test_read_format_tar_concatenated.c \ + test_read_format_tar_empty_filename.c \ + test_read_format_tar_empty_pax.c \ + test_read_format_tar_empty_with_gnulabel.c \ + test_read_format_tar_filename.c \ + test_read_format_tar_invalid_pax_size.c \ + test_read_format_tar_mac_metadata.c \ + test_read_format_tar_pax_g_large.c \ + test_read_format_tar_pax_large_attr.c \ + test_read_format_tar_pax_negative_time.c \ + test_read_format_tbz.c \ + test_read_format_tgz.c \ + test_read_format_tlz.c \ + test_read_format_txz.c \ + test_read_format_tz.c \ + test_read_format_ustar_filename.c \ + test_read_format_warc.c \ + test_read_format_xar.c \ + test_read_format_xar_doublelink.c \ + test_read_format_zip.c \ + test_read_format_zip_7075_utf8_paths.c \ + test_read_format_zip_comment_stored.c \ + test_read_format_zip_encryption_data.c \ + test_read_format_zip_encryption_header.c \ + test_read_format_zip_encryption_partially.c \ + test_read_format_zip_extra_padding.c \ + test_read_format_zip_filename.c \ + test_read_format_zip_high_compression.c \ + test_read_format_zip_jar.c \ + test_read_format_zip_mac_metadata.c \ + test_read_format_zip_malformed.c \ + test_read_format_zip_msdos.c \ + test_read_format_zip_nested.c \ + test_read_format_zip_nofiletype.c \ + test_read_format_zip_padded.c \ + test_read_format_zip_sfx.c \ + test_read_format_zip_traditional_encryption_data.c \ + test_read_format_zip_winzip_aes.c \ + test_read_format_zip_winzip_aes_large.c \ + test_read_format_zip_with_invalid_traditional_eocd.c \ + test_read_format_zip_zip64.c \ + test_read_large.c \ + test_read_pax_empty_val_no_nl.c \ + test_read_pax_xattr_rht_security_selinux.c \ + test_read_pax_xattr_schily.c \ + test_read_pax_truncated.c \ + test_read_position.c \ + test_read_set_format.c \ + test_read_too_many_filters.c \ + test_read_truncated.c \ + test_read_truncated_filter.c \ + test_short_writes.c \ + test_sparse_basic.c \ + test_tar_filenames.c \ + test_tar_large.c \ + test_warn_missing_hardlink_target.c \ + test_ustar_filenames.c \ + test_ustar_filename_encoding.c \ + test_write_disk.c \ + test_write_disk_appledouble.c \ + test_write_disk_failures.c \ + test_write_disk_fixup.c \ + test_write_disk_hardlink.c \ + test_write_disk_hfs_compression.c \ + test_write_disk_lookup.c \ + test_write_disk_mac_metadata.c \ + test_write_disk_no_hfs_compression.c \ + test_write_disk_perms.c \ + test_write_disk_secure.c \ + test_write_disk_secure_noabsolutepaths.c \ + test_write_disk_secure744.c \ + test_write_disk_secure745.c \ + test_write_disk_secure746.c \ + test_write_disk_sparse.c \ + test_write_disk_symlink.c \ + test_write_disk_times.c \ + test_write_filter_b64encode.c \ + test_write_filter_bzip2.c \ + test_write_filter_compress.c \ + test_write_filter_gzip.c \ + test_write_filter_gzip_timestamp.c \ + test_write_filter_lrzip.c \ + test_write_filter_lz4.c \ + test_write_filter_lzip.c \ + test_write_filter_lzma.c \ + test_write_filter_lzop.c \ + test_write_filter_program.c \ + test_write_filter_uuencode.c \ + test_write_filter_xz.c \ + test_write_filter_zstd.c \ + test_write_format_7zip.c \ + test_write_format_7zip_empty.c \ + test_write_format_7zip_large.c \ + test_write_format_ar.c \ + test_write_format_cpio.c \ + test_write_format_cpio_empty.c \ + test_write_format_cpio_newc.c \ + test_write_format_cpio_odc.c \ + test_write_format_gnutar.c \ + test_write_format_gnutar_filenames.c \ + test_write_format_iso9660.c \ + test_write_format_iso9660_boot.c \ + test_write_format_iso9660_empty.c \ + test_write_format_iso9660_filename.c \ + test_write_format_iso9660_zisofs.c \ + test_write_format_mtree.c \ + test_write_format_mtree_absolute_path.c \ + test_write_format_mtree_classic.c \ + test_write_format_mtree_classic_indent.c \ + test_write_format_mtree_fflags.c \ + test_write_format_mtree_no_separator.c \ + test_write_format_mtree_preset_digests.c \ + test_write_format_mtree_quoted_filename.c \ + test_write_format_pax.c \ + test_write_format_raw.c \ + test_write_format_raw_b64.c \ + test_write_format_shar_empty.c \ + test_write_format_tar.c \ + test_write_format_tar_empty.c \ + test_write_format_tar_sparse.c \ + test_write_format_tar_ustar.c \ + test_write_format_tar_v7tar.c \ + test_write_format_warc.c \ + test_write_format_warc_empty.c \ + test_write_format_xar.c \ + test_write_format_xar_empty.c \ + test_write_format_zip.c \ + test_write_format_zip_compression_store.c \ + test_write_format_zip_compression_zstd.c \ + test_write_format_zip_compression_bzip2.c \ + test_write_format_zip_compression_lzmaxz.c \ + test_write_format_zip_empty.c \ + test_write_format_zip_empty_zip64.c \ + test_write_format_zip_entry_size_unset.c \ + test_write_format_zip_file.c \ + test_write_format_zip_file_zip64.c \ + test_write_format_zip_large.c \ + test_write_format_zip_zip64.c \ + test_write_format_zip64_stream.c \ + test_write_format_zip_stream.c \ + test_write_format_zip_windows_path.c \ + test_write_open_memory.c \ + test_write_read_format_zip.c \ + test_xattr_platform.c \ + test_zip_filename_encoding.c + +# Deterministic failures: +# Fails with `test_read_disk_directory_traversals.c:1094: File at has atime 886622, 1443306049 seconds ago` +BROKEN_TESTS+= test_read_disk_directory_traversals + +.if 0 +# test_fuzz.c is not a real test, but rather a simple fuzz-test using random(). +# Since this is not a regression/unit test, we don't include it by default. +# If you would still like to include it, comment out the `.if 0`. +TEST_SCRCS+= test_fuzz.c +${PACKAGE}FILES+= test_fuzz.cab.uu +${PACKAGE}FILES+= test_fuzz.lzh.uu +${PACKAGE}FILES+= test_fuzz_1.iso.Z.uu +# Non-deterministic failures: +# (Times out?) [and] crashes +BROKEN_TESTS+= test_fuzz_rar +.endif + +# Build the test program. +SRCS.libarchive_test= \ + ${TESTS_SRCS} \ + read_open_memory.c \ + list.h + +LIBADD.libarchive_test= archive + +.PATH: ${_LIBARCHIVEDIR}/test_utils +SRCS.libarchive_test+= test_main.c \ + test_utils.c + +# list.h is just a list of all tests, as indicated by DEFINE_TEST macro lines +list.h: ${TESTS_SRCS} Makefile + @(cd ${_LIBARCHIVEDIR}/libarchive/test && \ + grep -E -h ^DEFINE_TEST ${.ALLSRC:N*Makefile} | \ + egrep -v '${BROKEN_TESTS:tW:C/ /|/g}') > ${.TARGET}.tmp + @mv ${.TARGET}.tmp ${.TARGET} + +CLEANTESTS+= list.h list.h.tmp +${PACKAGE}FILES+= README +${PACKAGE}FILES+= test_acl_pax_posix1e.tar.uu +${PACKAGE}FILES+= test_acl_pax_nfs4.tar.uu +${PACKAGE}FILES+= test_archive_string_conversion.txt.Z.uu +${PACKAGE}FILES+= test_compat_bzip2_1.tbz.uu +${PACKAGE}FILES+= test_compat_bzip2_2.tbz.uu +${PACKAGE}FILES+= test_compat_cpio_1.cpio.uu +${PACKAGE}FILES+= test_compat_gtar_1.tar.uu +${PACKAGE}FILES+= test_compat_gtar_2.tar.uu +${PACKAGE}FILES+= test_compat_gzip_1.tgz.uu +${PACKAGE}FILES+= test_compat_gzip_2.tgz.uu +${PACKAGE}FILES+= test_compat_lz4_1.tar.lz4.uu +${PACKAGE}FILES+= test_compat_lz4_2.tar.lz4.uu +${PACKAGE}FILES+= test_compat_lz4_3.tar.lz4.uu +${PACKAGE}FILES+= test_compat_lz4_B4.tar.lz4.uu +${PACKAGE}FILES+= test_compat_lz4_B4BD.tar.lz4.uu +${PACKAGE}FILES+= test_compat_lz4_B4BDBX.tar.lz4.uu +${PACKAGE}FILES+= test_compat_lz4_B5.tar.lz4.uu +${PACKAGE}FILES+= test_compat_lz4_B5BD.tar.lz4.uu +${PACKAGE}FILES+= test_compat_lz4_B6.tar.lz4.uu +${PACKAGE}FILES+= test_compat_lz4_B6BD.tar.lz4.uu +${PACKAGE}FILES+= test_compat_lz4_B7.tar.lz4.uu +${PACKAGE}FILES+= test_compat_lz4_B7BD.tar.lz4.uu +${PACKAGE}FILES+= test_compat_lzip_1.tlz.uu +${PACKAGE}FILES+= test_compat_lzip_2.tlz.uu +${PACKAGE}FILES+= test_compat_lzip_3.lz.uu +${PACKAGE}FILES+= test_compat_lzip_4.tlz.uu +${PACKAGE}FILES+= test_compat_lzma_1.tlz.uu +${PACKAGE}FILES+= test_compat_lzma_2.tlz.uu +${PACKAGE}FILES+= test_compat_lzma_3.tlz.uu +${PACKAGE}FILES+= test_compat_lzop_1.tar.lzo.uu +${PACKAGE}FILES+= test_compat_lzop_2.tar.lzo.uu +${PACKAGE}FILES+= test_compat_lzop_3.tar.lzo.uu +${PACKAGE}FILES+= test_compat_mac-1.tar.Z.uu +${PACKAGE}FILES+= test_compat_mac-2.tar.Z.uu +${PACKAGE}FILES+= test_compat_perl_archive_tar.tar.uu +${PACKAGE}FILES+= test_compat_plexus_archiver_tar.tar.uu +${PACKAGE}FILES+= test_compat_solaris_pax_sparse_1.pax.Z.uu +${PACKAGE}FILES+= test_compat_solaris_pax_sparse_2.pax.Z.uu +${PACKAGE}FILES+= test_compat_solaris_tar_acl.tar.uu +${PACKAGE}FILES+= test_compat_star_acl_nfs4.tar.uu +${PACKAGE}FILES+= test_compat_star_acl_posix1e.tar.uu +${PACKAGE}FILES+= test_compat_tar_directory_1.tar.uu +${PACKAGE}FILES+= test_compat_tar_hardlink_1.tar.uu +${PACKAGE}FILES+= test_compat_uudecode_large.tar.Z.uu +${PACKAGE}FILES+= test_compat_xz_1.txz.uu +${PACKAGE}FILES+= test_compat_zip_1.zip.uu +${PACKAGE}FILES+= test_compat_zip_2.zip.uu +${PACKAGE}FILES+= test_compat_zip_3.zip.uu +${PACKAGE}FILES+= test_compat_zip_4.zip.uu +${PACKAGE}FILES+= test_compat_zip_5.zip.uu +${PACKAGE}FILES+= test_compat_zip_6.zip.uu +${PACKAGE}FILES+= test_compat_zip_7.xps.uu +${PACKAGE}FILES+= test_compat_zip_8.zip.uu +${PACKAGE}FILES+= test_compat_zstd_1.tar.zst.uu +${PACKAGE}FILES+= test_compat_zstd_2.tar.zst.uu +${PACKAGE}FILES+= test_pax_filename_encoding.tar.uu +${PACKAGE}FILES+= test_pax_xattr_header_all.tar.uu +${PACKAGE}FILES+= test_pax_xattr_header_libarchive.tar.uu +${PACKAGE}FILES+= test_pax_xattr_header_schily.tar.uu +${PACKAGE}FILES+= test_rar_multivolume_multiple_files.part1.rar.uu +${PACKAGE}FILES+= test_rar_multivolume_multiple_files.part2.rar.uu +${PACKAGE}FILES+= test_rar_multivolume_multiple_files.part3.rar.uu +${PACKAGE}FILES+= test_rar_multivolume_multiple_files.part4.rar.uu +${PACKAGE}FILES+= test_rar_multivolume_multiple_files.part5.rar.uu +${PACKAGE}FILES+= test_rar_multivolume_multiple_files.part6.rar.uu +${PACKAGE}FILES+= test_rar_multivolume_single_file.part1.rar.uu +${PACKAGE}FILES+= test_rar_multivolume_single_file.part2.rar.uu +${PACKAGE}FILES+= test_rar_multivolume_single_file.part3.rar.uu +${PACKAGE}FILES+= test_rar_multivolume_uncompressed_files.part01.rar.uu +${PACKAGE}FILES+= test_rar_multivolume_uncompressed_files.part02.rar.uu +${PACKAGE}FILES+= test_rar_multivolume_uncompressed_files.part03.rar.uu +${PACKAGE}FILES+= test_rar_multivolume_uncompressed_files.part04.rar.uu +${PACKAGE}FILES+= test_rar_multivolume_uncompressed_files.part05.rar.uu +${PACKAGE}FILES+= test_rar_multivolume_uncompressed_files.part06.rar.uu +${PACKAGE}FILES+= test_rar_multivolume_uncompressed_files.part07.rar.uu +${PACKAGE}FILES+= test_rar_multivolume_uncompressed_files.part08.rar.uu +${PACKAGE}FILES+= test_rar_multivolume_uncompressed_files.part09.rar.uu +${PACKAGE}FILES+= test_rar_multivolume_uncompressed_files.part10.rar.uu +${PACKAGE}FILES+= test_read_filter_grzip.tar.grz.uu +${PACKAGE}FILES+= test_read_filter_gzip_recursive.gz.uu +${PACKAGE}FILES+= test_read_filter_lrzip.tar.lrz.uu +${PACKAGE}FILES+= test_read_filter_lzop.tar.lzo.uu +${PACKAGE}FILES+= test_read_filter_lzop_multiple_parts.tar.lzo.uu +${PACKAGE}FILES+= test_read_filter_uudecode_base64_raw.uu +${PACKAGE}FILES+= test_read_filter_uudecode_raw.uu +${PACKAGE}FILES+= test_read_format_7zip_bcj2_bzip2.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_bcj2_copy_1.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_bcj2_copy_2.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_bcj2_copy_lzma.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_bcj2_deflate.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_deflate_arm64.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_deflate_powerpc.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_bcj2_lzma1_1.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_bcj2_lzma1_2.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_bcj2_lzma2_1.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_bcj2_lzma2_2.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_bcj_bzip2.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_bcj_copy.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_bcj_deflate.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_bcj_lzma1.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_bcj_lzma2.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_bzip2.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_copy.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_copy_2.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_deflate.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_delta_lzma1.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_delta_lzma2.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_delta4_lzma1.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_delta4_lzma2.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_empty_archive.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_empty_file.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_encryption.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_encryption_header.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_encryption_partially.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_extract_second.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_lzma1.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_lzma1_2.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_lzma1_lzma2.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_lzma2.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_lzma2_arm.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_lzma2_arm64.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_lzma2_powerpc.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_lzma2_riscv.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_lzma2_sparc.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_malformed.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_malformed2.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_packinfo_digests.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_ppmd.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_sfx_elf.elf.uu +${PACKAGE}FILES+= test_read_format_7zip_sfx_modified_pe.exe.uu +${PACKAGE}FILES+= test_read_format_7zip_sfx_pe.exe.uu +${PACKAGE}FILES+= test_read_format_7zip_solid_zstd.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_symbolic_name.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_zstd.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_zstd_arm.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_zstd_bcj.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_zstd_nobcj.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_zstd_sparc.7z.uu +${PACKAGE}FILES+= test_read_format_7zip_win_attrib.7z.uu +${PACKAGE}FILES+= test_read_format_ar.ar.uu +${PACKAGE}FILES+= test_read_format_cab_1.cab.uu +${PACKAGE}FILES+= test_read_format_cab_2.cab.uu +${PACKAGE}FILES+= test_read_format_cab_3.cab.uu +${PACKAGE}FILES+= test_read_format_cab_filename_cp932.cab.uu +${PACKAGE}FILES+= test_read_format_cpio_bin_be.cpio.uu +${PACKAGE}FILES+= test_read_format_cpio_bin_le.cpio.uu +${PACKAGE}FILES+= test_read_format_cpio_filename_cp866.cpio.uu +${PACKAGE}FILES+= test_read_format_cpio_filename_eucjp.cpio.uu +${PACKAGE}FILES+= test_read_format_cpio_filename_koi8r.cpio.uu +${PACKAGE}FILES+= test_read_format_cpio_filename_utf8_jp.cpio.uu +${PACKAGE}FILES+= test_read_format_cpio_filename_utf8_ru.cpio.uu +${PACKAGE}FILES+= test_read_format_cpio_svr4_bzip2_rpm.rpm.uu +${PACKAGE}FILES+= test_read_format_cpio_svr4_gzip_rpm.rpm.uu +${PACKAGE}FILES+= test_read_format_gtar_filename_cp866.tar.Z.uu +${PACKAGE}FILES+= test_read_format_gtar_filename_eucjp.tar.Z.uu +${PACKAGE}FILES+= test_read_format_gtar_filename_koi8r.tar.Z.uu +${PACKAGE}FILES+= test_read_format_gtar_redundant_L.tar.Z.uu +${PACKAGE}FILES+= test_read_format_gtar_sparse_1_13.tar.uu +${PACKAGE}FILES+= test_read_format_gtar_sparse_1_17.tar.uu +${PACKAGE}FILES+= test_read_format_gtar_sparse_1_17_posix00.tar.uu +${PACKAGE}FILES+= test_read_format_gtar_sparse_1_17_posix01.tar.uu +${PACKAGE}FILES+= test_read_format_gtar_sparse_1_17_posix10.tar.uu +${PACKAGE}FILES+= test_read_format_gtar_sparse_1_17_posix10_modified.tar.uu +${PACKAGE}FILES+= test_read_format_gtar_sparse_length.tar.Z.uu +${PACKAGE}FILES+= test_read_format_gtar_sparse_skip_entry.tar.Z.uu +${PACKAGE}FILES+= test_read_format_huge_rpm.rpm.uu +${PACKAGE}FILES+= test_read_format_iso.iso.Z.uu +${PACKAGE}FILES+= test_read_format_iso_2.iso.Z.uu +${PACKAGE}FILES+= test_read_format_iso_3.iso.Z.uu +${PACKAGE}FILES+= test_read_format_iso_joliet.iso.Z.uu +${PACKAGE}FILES+= test_read_format_iso_joliet_by_nero.iso.Z.uu +${PACKAGE}FILES+= test_read_format_iso_joliet_long.iso.Z.uu +${PACKAGE}FILES+= test_read_format_iso_joliet_rockridge.iso.Z.uu +${PACKAGE}FILES+= test_read_format_iso_multi_extent.iso.Z.uu +${PACKAGE}FILES+= test_read_format_iso_rockridge.iso.Z.uu +${PACKAGE}FILES+= test_read_format_iso_rockridge_ce.iso.Z.uu +${PACKAGE}FILES+= test_read_format_iso_rockridge_new.iso.Z.uu +${PACKAGE}FILES+= test_read_format_iso_rockridge_rr_moved.iso.Z.uu +${PACKAGE}FILES+= test_read_format_iso_xorriso.iso.Z.uu +${PACKAGE}FILES+= test_read_format_iso_zisofs.iso.Z.uu +${PACKAGE}FILES+= test_read_format_lha_bugfix_0.lzh.uu +${PACKAGE}FILES+= test_read_format_lha_filename_cp932.lzh.uu +${PACKAGE}FILES+= test_read_format_lha_filename_utf16.lzh.uu +${PACKAGE}FILES+= test_read_format_lha_header0.lzh.uu +${PACKAGE}FILES+= test_read_format_lha_header1.lzh.uu +${PACKAGE}FILES+= test_read_format_lha_header2.lzh.uu +${PACKAGE}FILES+= test_read_format_lha_header3.lzh.uu +${PACKAGE}FILES+= test_read_format_lha_lh0.lzh.uu +${PACKAGE}FILES+= test_read_format_lha_lh6.lzh.uu +${PACKAGE}FILES+= test_read_format_lha_lh7.lzh.uu +${PACKAGE}FILES+= test_read_format_lha_withjunk.lzh.uu +${PACKAGE}FILES+= test_read_format_mtree.mtree.uu +${PACKAGE}FILES+= test_read_format_mtree_crash747.mtree.bz2.uu +${PACKAGE}FILES+= test_read_format_mtree_nomagic.mtree.uu +${PACKAGE}FILES+= test_read_format_mtree_nomagic2.mtree.uu +${PACKAGE}FILES+= test_read_format_mtree_nomagic3.mtree.uu +${PACKAGE}FILES+= test_read_format_mtree_noprint.mtree.uu +${PACKAGE}FILES+= test_read_format_rar.rar.uu +${PACKAGE}FILES+= test_read_format_rar_binary_data.rar.uu +${PACKAGE}FILES+= test_read_format_rar_compress_best.rar.uu +${PACKAGE}FILES+= test_read_format_rar_compress_normal.rar.uu +${PACKAGE}FILES+= test_read_format_rar_encryption_data.rar.uu +${PACKAGE}FILES+= test_read_format_rar_encryption_header.rar.uu +${PACKAGE}FILES+= test_read_format_rar_encryption_partially.rar.uu +${PACKAGE}FILES+= test_read_format_rar_endarc_huge.rar.uu +${PACKAGE}FILES+= test_read_format_rar_filter.rar.uu +${PACKAGE}FILES+= test_read_format_rar_invalid1.rar.uu +${PACKAGE}FILES+= test_read_format_rar_multi_lzss_blocks.rar.uu +${PACKAGE}FILES+= test_read_format_rar_multivolume.part0001.rar.uu +${PACKAGE}FILES+= test_read_format_rar_multivolume.part0002.rar.uu +${PACKAGE}FILES+= test_read_format_rar_multivolume.part0003.rar.uu +${PACKAGE}FILES+= test_read_format_rar_multivolume.part0004.rar.uu +${PACKAGE}FILES+= test_read_format_rar_newsub_huge.rar.uu +${PACKAGE}FILES+= test_read_format_rar_noeof.rar.uu +${PACKAGE}FILES+= test_read_format_rar_overflow.rar.uu +${PACKAGE}FILES+= test_read_format_rar_ppmd_lzss_conversion.rar.uu +${PACKAGE}FILES+= test_read_format_rar_ppmd_use_after_free.rar.uu +${PACKAGE}FILES+= test_read_format_rar_ppmd_use_after_free2.rar.uu +${PACKAGE}FILES+= test_read_format_rar_sfx.exe.uu +${PACKAGE}FILES+= test_read_format_rar_subblock.rar.uu +${PACKAGE}FILES+= test_read_format_rar_symlink_huge.rar.uu +${PACKAGE}FILES+= test_read_format_rar_unicode.rar.uu +${PACKAGE}FILES+= test_read_format_rar_windows.rar.uu +${PACKAGE}FILES+= test_read_format_rar4_encrypted.rar.uu +${PACKAGE}FILES+= test_read_format_rar4_encrypted_filenames.rar.uu +${PACKAGE}FILES+= test_read_format_rar4_solid_encrypted.rar.uu +${PACKAGE}FILES+= test_read_format_rar4_solid_encrypted_filenames.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_arm.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_arm_filter_on_window_boundary.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_bad_window_sz_in_mltarc_file.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_data_ready_pointer_leak.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_blake2.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_block_size_is_too_small.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_compressed.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_decode_number_out_of_bounds_read.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_different_solid_window_size.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_different_window_size.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_different_winsize_on_merge.rar.uu ++${PACKAGE}FILES+= test_read_format_rar5_dirdata.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_distance_overflow.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_encrypted.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_encrypted_filenames.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_solid_encrypted.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_solid_encrypted_filenames.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_extra_field_version.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_fileattr.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_hardlink.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_invalid_dict_reference.rar.uu ++${PACKAGE}FILES+= test_read_format_rar5_invalid_hash_valid_htime_exfld.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_leftshift1.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_leftshift2.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_multiarchive.part01.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_multiarchive.part02.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_multiarchive.part03.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_multiarchive.part04.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_multiarchive.part05.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_multiarchive.part06.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_multiarchive.part07.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_multiarchive.part08.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_multiarchive_solid.part01.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_multiarchive_solid.part02.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_multiarchive_solid.part03.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_multiarchive_solid.part04.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_multiple_files.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_multiple_files_solid.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_nonempty_dir_stream.rar.uu ++${PACKAGE}FILES+= test_read_format_rar5_only_crypt_exfld.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_owner.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_readtables_overflow.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_sfx.exe.uu +${PACKAGE}FILES+= test_read_format_rar5_solid.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_stored.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_stored_manyfiles.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_symlink.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_truncated_huff.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_unicode.rar.uu ++${PACKAGE}FILES+= test_read_format_rar5_unsupported_exfld.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_win32.rar.uu +${PACKAGE}FILES+= test_read_format_rar5_window_buf_and_size_desync.rar.uu +${PACKAGE}FILES+= test_read_format_raw.bufr.uu +${PACKAGE}FILES+= test_read_format_raw.data.Z.uu +${PACKAGE}FILES+= test_read_format_raw.data.gz.uu +${PACKAGE}FILES+= test_read_format_raw.data.uu ++${PACKAGE}FILES+= test_read_format_tar_V_negative_size.tar.uu +${PACKAGE}FILES+= test_read_format_tar_concatenated.tar.uu +${PACKAGE}FILES+= test_read_format_tar_empty_filename.tar.uu +${PACKAGE}FILES+= test_read_format_tar_empty_with_gnulabel.tar.uu +${PACKAGE}FILES+= test_read_format_tar_empty_pax.tar.Z.uu +${PACKAGE}FILES+= test_read_format_tar_filename_koi8r.tar.Z.uu +${PACKAGE}FILES+= test_read_format_tar_invalid_pax_size.tar.uu +${PACKAGE}FILES+= test_read_format_tar_mac_metadata_1.tar.uu +${PACKAGE}FILES+= test_read_format_tar_pax_g_large.tar.uu +${PACKAGE}FILES+= test_read_format_tar_pax_large_attr.tar.Z.uu +${PACKAGE}FILES+= test_read_format_tar_pax_negative_time.tar.uu +${PACKAGE}FILES+= test_read_format_ustar_filename_cp866.tar.Z.uu +${PACKAGE}FILES+= test_read_format_ustar_filename_eucjp.tar.Z.uu +${PACKAGE}FILES+= test_read_format_ustar_filename_koi8r.tar.Z.uu +${PACKAGE}FILES+= test_read_format_warc.warc.uu +${PACKAGE}FILES+= test_read_format_warc_incomplete.warc.uu +${PACKAGE}FILES+= test_read_format_xar_doublelink.xar.uu +${PACKAGE}FILES+= test_read_format_xar_duplicate_filename_node.xar.uu +${PACKAGE}FILES+= test_read_format_zip.zip.uu +${PACKAGE}FILES+= test_read_format_zip_7075_utf8_paths.zip.uu +${PACKAGE}FILES+= test_read_format_zip_7z_deflate.zip.uu +${PACKAGE}FILES+= test_read_format_zip_7z_lzma.zip.uu +${PACKAGE}FILES+= test_read_format_zip_bz2_hang.zip.uu +${PACKAGE}FILES+= test_read_format_zip_bzip2.zipx.uu +${PACKAGE}FILES+= test_read_format_zip_bzip2_multi.zipx.uu +${PACKAGE}FILES+= test_read_format_zip_comment_stored_1.zip.uu +${PACKAGE}FILES+= test_read_format_zip_comment_stored_2.zip.uu +${PACKAGE}FILES+= test_read_format_zip_encryption_data.zip.uu +${PACKAGE}FILES+= test_read_format_zip_encryption_header.zip.uu +${PACKAGE}FILES+= test_read_format_zip_encryption_partially.zip.uu +${PACKAGE}FILES+= test_read_format_zip_extra_padding.zip.uu +${PACKAGE}FILES+= test_read_format_zip_filename_cp866.zip.uu +${PACKAGE}FILES+= test_read_format_zip_filename_cp932.zip.uu +${PACKAGE}FILES+= test_read_format_zip_filename_koi8r.zip.uu +${PACKAGE}FILES+= test_read_format_zip_filename_utf8_jp.zip.uu +${PACKAGE}FILES+= test_read_format_zip_filename_utf8_ru.zip.uu +${PACKAGE}FILES+= test_read_format_zip_filename_utf8_ru2.zip.uu +${PACKAGE}FILES+= test_read_format_zip_high_compression.zip.uu +${PACKAGE}FILES+= test_read_format_zip_jar.jar.uu +${PACKAGE}FILES+= test_read_format_zip_length_at_end.zip.uu +${PACKAGE}FILES+= test_read_format_zip_lzma_alone_leak.zipx.uu +${PACKAGE}FILES+= test_read_format_zip_lzma.zipx.uu +${PACKAGE}FILES+= test_read_format_zip_lzma_multi.zipx.uu +${PACKAGE}FILES+= test_read_format_zip_lzma_stream_end.zipx.uu +${PACKAGE}FILES+= test_read_format_zip_mac_metadata.zip.uu +${PACKAGE}FILES+= test_read_format_zip_malformed1.zip.uu +${PACKAGE}FILES+= test_read_format_zip_msdos.zip.uu +${PACKAGE}FILES+= test_read_format_zip_nested.zip.uu +${PACKAGE}FILES+= test_read_format_zip_nofiletype.zip.uu +${PACKAGE}FILES+= test_read_format_zip_padded1.zip.uu +${PACKAGE}FILES+= test_read_format_zip_padded2.zip.uu +${PACKAGE}FILES+= test_read_format_zip_padded3.zip.uu +${PACKAGE}FILES+= test_read_format_zip_ppmd8.zipx.uu +${PACKAGE}FILES+= test_read_format_zip_ppmd8_crash_1.zipx.uu +${PACKAGE}FILES+= test_read_format_zip_ppmd8_crash_2.zipx.uu +${PACKAGE}FILES+= test_read_format_zip_ppmd8_multi.zipx.uu +${PACKAGE}FILES+= test_read_format_zip_sfx.uu +${PACKAGE}FILES+= test_read_format_zip_symlink.zip.uu +${PACKAGE}FILES+= test_read_format_zip_traditional_encryption_data.zip.uu +${PACKAGE}FILES+= test_read_format_zip_ux.zip.uu +${PACKAGE}FILES+= test_read_format_zip_with_invalid_traditional_eocd.zip.uu +${PACKAGE}FILES+= test_read_format_zip_winzip_aes128.zip.uu +${PACKAGE}FILES+= test_read_format_zip_winzip_aes256.zip.uu +${PACKAGE}FILES+= test_read_format_zip_winzip_aes256_large.zip.uu +${PACKAGE}FILES+= test_read_format_zip_winzip_aes256_stored.zip.uu +${PACKAGE}FILES+= test_read_format_zip_xz_multi.zipx.uu +${PACKAGE}FILES+= test_read_format_zip_zip64a.zip.uu +${PACKAGE}FILES+= test_read_format_zip_zip64b.zip.uu +${PACKAGE}FILES+= test_read_format_zip_zstd.zipx.uu +${PACKAGE}FILES+= test_read_format_zip_zstd_multi.zipx.uu +${PACKAGE}FILES+= test_read_large_splitted_rar_aa.uu +${PACKAGE}FILES+= test_read_large_splitted_rar_ab.uu +${PACKAGE}FILES+= test_read_large_splitted_rar_ac.uu +${PACKAGE}FILES+= test_read_large_splitted_rar_ad.uu +${PACKAGE}FILES+= test_read_large_splitted_rar_ae.uu +${PACKAGE}FILES+= test_read_pax_empty_val_no_nl.tar.uu +${PACKAGE}FILES+= test_read_pax_xattr_rht_security_selinux.tar.uu +${PACKAGE}FILES+= test_read_pax_xattr_schily.tar.uu +${PACKAGE}FILES+= test_read_splitted_rar_aa.uu +${PACKAGE}FILES+= test_read_splitted_rar_ab.uu +${PACKAGE}FILES+= test_read_splitted_rar_ac.uu +${PACKAGE}FILES+= test_read_splitted_rar_ad.uu +${PACKAGE}FILES+= test_read_too_many_filters.gz.uu +${PACKAGE}FILES+= test_splitted_rar_seek_support_aa.uu +${PACKAGE}FILES+= test_splitted_rar_seek_support_ab.uu +${PACKAGE}FILES+= test_splitted_rar_seek_support_ac.uu +${PACKAGE}FILES+= test_write_disk_appledouble.cpio.gz.uu +${PACKAGE}FILES+= test_write_disk_appledouble_zip.zip.uu +${PACKAGE}FILES+= test_write_disk_hfs_compression.tgz.uu +${PACKAGE}FILES+= test_write_disk_mac_metadata.tar.gz.uu +${PACKAGE}FILES+= test_write_disk_no_hfs_compression.tgz.uu + +.include diff --cc usr.bin/bsdcat/Makefile index 032207217be6,000000000000..06081fc2b2f8 mode 100644,000000..100644 --- a/usr.bin/bsdcat/Makefile +++ b/usr.bin/bsdcat/Makefile @@@ -1,29 -1,0 +1,29 @@@ +.include + +_LIBARCHIVEDIR= ${SRCTOP}/contrib/libarchive +_LIBARCHIVECONFDIR= ${SRCTOP}/lib/libarchive + +PROG= bsdcat +BSDCAT_VERSION_STRING!= sed -n '/define.*ARCHIVE_VERSION_ONLY_STRING/{s,[^0-9.],,gp;q;}' \ + ${_LIBARCHIVEDIR}/libarchive/archive.h + +.PATH: ${_LIBARCHIVEDIR}/cat +SRCS= bsdcat.c cmdline.c + +.PATH: ${_LIBARCHIVEDIR}/libarchive_fe - SRCS+= err.c ++SRCS+= lafe_err.c + +CFLAGS+= -DBSDCAT_VERSION_STRING=\"${BSDCAT_VERSION_STRING}\" +CFLAGS+= -DPLATFORM_CONFIG_H=\"${_LIBARCHIVECONFDIR}/config_freebsd.h\" +CFLAGS+= -I${_LIBARCHIVEDIR}/cat -I${_LIBARCHIVEDIR}/libarchive_fe + +LIBADD= archive + +.if ${MK_ICONV} != "no" +CFLAGS+= -DHAVE_ICONV=1 -DHAVE_ICONV_H=1 -DICONV_CONST=const +.endif + +HAS_TESTS= +SUBDIR.${MK_TESTS}+= tests + +.include diff --cc usr.bin/cpio/Makefile *** 477 LINES SKIPPED *** From nobody Tue Oct 21 17:31:29 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4crfVB0Jdkz6Cdhg; Tue, 21 Oct 2025 17:31:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4crfV96tNzz3b53; Tue, 21 Oct 2025 17:31:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761067890; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e6yiIj6X/7itVoaAztqyJ0woIPbgswjP+7nLIq7z8HM=; b=ARFJN5QKdzoKBTnrErA7UELQEqxuHiUnKvKB8cu10wkwY7e7bFDhYpzT6Vg33DvYncVKTJ lhZGYt0eBVWrO8qkPQuwlfkg5ODAFg2vS+hC2AYKNNaTK9qv3L+Q1I2T749dXPPuBdP3sp xJTsLw/x09RAlsT7XjHGRFPktQ5E6pOg4/m0thlBrSYM5ibWAyKejsVLgF2Nbf9pQingfi qSa408Z3Y0PC54HX1xFNv7TYSgygAA2JynivPwsbfVFi0C4E+7zr+86XIkEm+xQbeje6nK 6UO4+n2UDA3qvSoCGhHnpmG6xt/993REib/cukk5Y4CZ3vlYP3d3S7DgpJ5cZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761067890; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e6yiIj6X/7itVoaAztqyJ0woIPbgswjP+7nLIq7z8HM=; b=exWzj6xccAVV3wxA3SAbGxUxOYKn/hEVz26SHVd2v1n+ER1O8ss1XTCOWhPCw3WCA7YyCR GmLVifpEVSfCIAUiRx4IiBOIXwV3ZQAkO1jbKz97IDct/cZgAJmWZvJd365VIxgZ8SvU17 ax7YasjlbBzigQoZ/jkOiXf8wAtoKMnrG0aHfPlYgnILSfL+oiCE/palsyK2ZpU/D616In Cx+bTsH/FW+JNYR+kC87lYKOISu88ui64eFIibOMxk7LAIDUkn2B0PHi/YlJkTpKEx5dVZ F7/62eiSgh5SGkvk6S4XrjH9mdd4uCQ3AcOXekH3lHRQDPK+POfi/DDWcUKQBg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761067890; a=rsa-sha256; cv=none; b=j+zlg6CzVx7SJNNdh1UXjEpZDuotQ9hgQ04h06cuwqqpFgxKNcb8Kb6izMP/Pu4pxEk1KB OWnYoXKX+4vTaMBMAZfCo8RE8dZHzRXWrigEq+jaXNv+MpJRZ+1U2sTul3Cqiv6rjH2gZd x2+6wthM9/t6AS2ONZ0ksp8vKOFi8IkVL/8Ls5Jh3xdmsk7rVwyBF9b1DT4iL2wDINg03k Y0B67Dm08mBYfDWiRcCdfSrhguBqMFB68AHYJFYrclsP0S6LKh9LBXIHStG3uF/SadcYJV rr4a+3uHQm0igBoUYra1uA8PpZuwkC+AwAehakN4+Djv2H0YCdsoBrS4iHP/yw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4crfV969htz17r3; Tue, 21 Oct 2025 17:31: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 59LHVTAb005414; Tue, 21 Oct 2025 17:31:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59LHVTph005411; Tue, 21 Oct 2025 17:31:29 GMT (envelope-from git) Date: Tue, 21 Oct 2025 17:31:29 GMT Message-Id: <202510211731.59LHVTph005411@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cy Schubert Subject: git: 05637c82243e - main - rc: Chase 052211e08c0e and bfb202c4554a, remove ifconfig down/up List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 05637c82243e681b5db5d7e9829e699515456524 Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=05637c82243e681b5db5d7e9829e699515456524 commit 05637c82243e681b5db5d7e9829e699515456524 Author: Cy Schubert AuthorDate: 2025-10-21 17:28:39 +0000 Commit: Cy Schubert CommitDate: 2025-10-21 17:31:23 +0000 rc: Chase 052211e08c0e and bfb202c4554a, remove ifconfig down/up bfb202c4554a addresses the CTRL-EVENT-SCAN-FAILED. Upstream d807e289d caused FreeBSD regression in driver_bsd.c, which this rc.d patch worked around. As of bfb202c4554a this workaround is no longer needed. 052211e08c0e implemented this change for wpa_supplicant but not for hostapd. Reported by: avg MFC after: 3 days --- libexec/rc/rc.d/hostapd | 9 --------- 1 file changed, 9 deletions(-) diff --git a/libexec/rc/rc.d/hostapd b/libexec/rc/rc.d/hostapd index 264cb4ef476b..15b20c95c488 100755 --- a/libexec/rc/rc.d/hostapd +++ b/libexec/rc/rc.d/hostapd @@ -11,15 +11,6 @@ name="hostapd" desc="Authenticator for IEEE 802.11 networks" command=${hostapd_program} -start_postcmd="hostapd_poststart" - -hostapd_poststart() { - if [ -n "$ifn" ]; then - ifconfig ${ifn} down - sleep 2 - ifconfig ${ifn} up - fi -} ifn="$2" if [ -z "$ifn" ]; then From nobody Tue Oct 21 17:49:18 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4crftl0Yr0z6CgCg; Tue, 21 Oct 2025 17:49:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4crftk6zDTz3d7B; Tue, 21 Oct 2025 17:49:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761068959; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SNC5od+BBSOw/hX/etMoe2of9MiesX8b0PxHXGyQVug=; b=G3npate9oPHP67NQ5/CoexTpUI7j72B1m87B/xkZpoTTYoODU7TdOtfaFqACZ6Tl9cpUoy euk9fL8VMVPYW0XayWWio2Sz58LFNY8qI6aMCDHzz6bwhslELjdIleHwyxCaOi9qgL09iD YZuXIIgUnvuao2eYGrMLWZP+CJxQq5uHU53K87by0/E10wJPSiwuVxH42wwYoYU43UH2ng hTD7F9nPjm23JSdlsybSNK4EDWMH70jhzCTLM1t6HjsxGhkIxb2Y4M9f04HrQjquZsYAo3 5KY6uzW47SYBNMKjHF5e2uZ6I3lkUcCqtwNZjjj/PY9//3C4gPZ7eFjA8KqRSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761068959; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SNC5od+BBSOw/hX/etMoe2of9MiesX8b0PxHXGyQVug=; b=qQbyMj2J/RHoyb6P0IcGIbSZ1qY3mlJ/ItID++wHk8yAys1CcjlqLgqdhgxFh+e1wJUeDn tfT1AD1+7iAEVTUFN1LQpaxHMb8y7IQ2pawgKQCCNpKH2YVMONPiv5xpBXaEgsHl+5tbGh gwNQZkEyXHXw0O2a1A9MBmE58z+1arQCkMkfseU9AphdNmsIhVG8XSy1ohwylUl27PqLA8 8UyFf7qJynZ7aVvLhfgPjLF0HWTrwcKZsHKBY1VXNdRdCWMa5B7+C2wUJ7inev/oAKs1eR u20fH3vVUCiA8++V/rneBmDMDZAzHCPHYuKu9dNYqpZcaRA4O3/dHEcRjjBbfQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761068959; a=rsa-sha256; cv=none; b=ArZXbF4Kq6S5AJrNbiTNLnubdO2gMjdUU9UADP+DkCOM03xDzoXrqGwwsFUdUA344G+iNT mLi+y0L2w/v0oXj9jW2V0TVZdQ6hhB2ujgtNxhH1qvr0+5y8YGPMzNn9ZM37z74oIa0Oj1 tpV+kx5qanR1o+JZvGxW50kphjM/olFlJ/Lw/Z8fIJN5jyZDKlNMYlKDTIUbjj+dla56hl ve7i14Kil1ryGfCWLI7v49QeSVxkzbG6WyEfTlVnx8HAeuvrw3hAA/G0GhflSRvnynyrjU unG/StEmNp5cTeonJOVW1pQpNyDaGB4UukaUmoYoD29DDKZqS9Ou/wwfm96YSw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4crftk6Z3Zz186S; Tue, 21 Oct 2025 17:49: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 59LHnIDS029304; Tue, 21 Oct 2025 17:49:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59LHnIWY029301; Tue, 21 Oct 2025 17:49:18 GMT (envelope-from git) Date: Tue, 21 Oct 2025 17:49:18 GMT Message-Id: <202510211749.59LHnIWY029301@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 14133abfe9c2 - main - vmm: Improve register get/set handling a bit List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 14133abfe9c218b97e888edf04d2ec4a86e7ab4b Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=14133abfe9c218b97e888edf04d2ec4a86e7ab4b commit 14133abfe9c218b97e888edf04d2ec4a86e7ab4b Author: Mark Johnston AuthorDate: 2025-10-21 17:34:11 +0000 Commit: Mark Johnston CommitDate: 2025-10-21 17:34:11 +0000 vmm: Improve register get/set handling a bit On non-amd64 platforms, check for negative register indices. This isn't required today since we match against individual register indices, but we might as well check it. On amd64, add a comment explaining why we permit negative register indices. Use mallocarray() for allocating register arrays in the ioctl layer. No functional change intended. Reviewed by: corvink MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D53143 --- sys/amd64/vmm/vmm.c | 3 ++- sys/arm64/vmm/vmm.c | 5 ++--- sys/dev/vmm/vmm_dev.c | 16 ++++++++-------- sys/riscv/vmm/vmm.c | 5 ++--- 4 files changed, 14 insertions(+), 15 deletions(-) diff --git a/sys/amd64/vmm/vmm.c b/sys/amd64/vmm/vmm.c index f7c59847140b..473887240b9b 100644 --- a/sys/amd64/vmm/vmm.c +++ b/sys/amd64/vmm/vmm.c @@ -870,7 +870,7 @@ vm_assign_pptdev(struct vm *vm, int bus, int slot, int func) int vm_get_register(struct vcpu *vcpu, int reg, uint64_t *retval) { - + /* Negative values represent VM control structure fields. */ if (reg >= VM_REG_LAST) return (EINVAL); @@ -882,6 +882,7 @@ vm_set_register(struct vcpu *vcpu, int reg, uint64_t val) { int error; + /* Negative values represent VM control structure fields. */ if (reg >= VM_REG_LAST) return (EINVAL); diff --git a/sys/arm64/vmm/vmm.c b/sys/arm64/vmm/vmm.c index bf52dc0fe916..14ea26c3668c 100644 --- a/sys/arm64/vmm/vmm.c +++ b/sys/arm64/vmm/vmm.c @@ -1279,8 +1279,7 @@ vcpu_get_state(struct vcpu *vcpu, int *hostcpu) int vm_get_register(struct vcpu *vcpu, int reg, uint64_t *retval) { - - if (reg >= VM_REG_LAST) + if (reg < 0 || reg >= VM_REG_LAST) return (EINVAL); return (vmmops_getreg(vcpu->cookie, reg, retval)); @@ -1291,7 +1290,7 @@ vm_set_register(struct vcpu *vcpu, int reg, uint64_t val) { int error; - if (reg >= VM_REG_LAST) + if (reg < 0 || reg >= VM_REG_LAST) return (EINVAL); error = vmmops_setreg(vcpu->cookie, reg, val); if (error || reg != VM_REG_GUEST_PC) diff --git a/sys/dev/vmm/vmm_dev.c b/sys/dev/vmm/vmm_dev.c index 4961b21180e1..27bd115a4fd3 100644 --- a/sys/dev/vmm/vmm_dev.c +++ b/sys/dev/vmm/vmm_dev.c @@ -656,10 +656,10 @@ vmmdev_ioctl(struct cdev *cdev, u_long cmd, caddr_t data, int fflag, error = EINVAL; break; } - regvals = malloc(sizeof(regvals[0]) * vmregset->count, M_VMMDEV, - M_WAITOK); - regnums = malloc(sizeof(regnums[0]) * vmregset->count, M_VMMDEV, - M_WAITOK); + regvals = mallocarray(vmregset->count, sizeof(regvals[0]), + M_VMMDEV, M_WAITOK); + regnums = mallocarray(vmregset->count, sizeof(regnums[0]), + M_VMMDEV, M_WAITOK); error = copyin(vmregset->regnums, regnums, sizeof(regnums[0]) * vmregset->count); if (error == 0) @@ -682,10 +682,10 @@ vmmdev_ioctl(struct cdev *cdev, u_long cmd, caddr_t data, int fflag, error = EINVAL; break; } - regvals = malloc(sizeof(regvals[0]) * vmregset->count, M_VMMDEV, - M_WAITOK); - regnums = malloc(sizeof(regnums[0]) * vmregset->count, M_VMMDEV, - M_WAITOK); + regvals = mallocarray(vmregset->count, sizeof(regvals[0]), + M_VMMDEV, M_WAITOK); + regnums = mallocarray(vmregset->count, sizeof(regnums[0]), + M_VMMDEV, M_WAITOK); error = copyin(vmregset->regnums, regnums, sizeof(regnums[0]) * vmregset->count); if (error == 0) diff --git a/sys/riscv/vmm/vmm.c b/sys/riscv/vmm/vmm.c index 4c9b1fa53f7a..24b4be89af48 100644 --- a/sys/riscv/vmm/vmm.c +++ b/sys/riscv/vmm/vmm.c @@ -954,8 +954,7 @@ vcpu_get_state(struct vcpu *vcpu, int *hostcpu) int vm_get_register(struct vcpu *vcpu, int reg, uint64_t *retval) { - - if (reg >= VM_REG_LAST) + if (reg < 0 || reg >= VM_REG_LAST) return (EINVAL); return (vmmops_getreg(vcpu->cookie, reg, retval)); @@ -966,7 +965,7 @@ vm_set_register(struct vcpu *vcpu, int reg, uint64_t val) { int error; - if (reg >= VM_REG_LAST) + if (reg < 0 || reg >= VM_REG_LAST) return (EINVAL); error = vmmops_setreg(vcpu->cookie, reg, val); if (error || reg != VM_REG_GUEST_SEPC) From nobody Tue Oct 21 17:49:19 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4crftm1SBWz6CgJW; Tue, 21 Oct 2025 17:49:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4crftm0pSKz3dCy; Tue, 21 Oct 2025 17:49:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761068960; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nrYjhdvrbQLCU8/E4E6w1w+/89826jdHx//790z0JMU=; b=qGzsXL1Wp4FFn6MjIXrexNspkGI8panacG7IGYl3tl1psCsnYLDqVM6u62NszOf8qBe8ZA ZxkZRNbw3cNv+2TJ85RUGqIEb+fyuz9xEto0UA8cDWD1+YQjXaB8b7mkNKpcmjEOQmVhc+ PWxcwiyXjqAbH83KlfrBIB1fUn9Cwk96aDFoq6XKGVlW+nwGNc/dljWO71gPyNuJlQoo30 EJWpEwH9PxkZcNHy94ylB8H2vjLYNx6l2JRjvlgXSZifDknCP8KElgNsMj+VxbOOo4pppR L6ATTThIFGuMb1o2mLhZgIOi54jWTZLmZ0rjA0MiT0W4JVFn5xC2hqbNejQMaw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761068960; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nrYjhdvrbQLCU8/E4E6w1w+/89826jdHx//790z0JMU=; b=OSOF/j+vbEYIMmua5pXHAAi33UmGxRq9bog6Vxm27y0N4e2O5S23uF4zMwHddBO6PvfehY T4ighvpEMnOxK1x0pZZu4fwNMdYdsaxBAX+dG8TphVQYVoc7NG5vhjVOELXrNB2/iMSqma +UWj+NmIIhKUx/yxk9s6JAiUTsgLfVjcDwnBVhFpyxc/O2NQ/soY6GVia4CH0pIny8BQ86 4xR/FHrgpj7kcFqv4FCjENV6qeuBgD8cgaaiTFnN44zJpTv5Ir7DkBAGIvauGnLRce2fUd 7TvObezXjx48xDPTboN0Sw/m+xyWqf8AntQlyUXNE6E0lJFobm5L7NHGAHiu8w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761068960; a=rsa-sha256; cv=none; b=ba6t6D41CgJmh9JOQ/2UDXJ9tWmF8xU0XmNkMarwaX1VzGfgwRIwB0cMADlhtAR8xDmoUm tnepMttdSNeu0vB2tbP9hFWLgb7nTZGrxXR0+KO9sEMSmujedDYZnoxhkJyvGFlggajCxu dkNjw8x1HABfznIX8qG53NCR4dIGAHXKzdqAHVeY98C5ht8NjIzu4Nx4xWJfTICoKWORN7 rE62zyGJUG1OR+OVvZnGM89gE/4QWfP3c1ClAgujJGfyP572ewuWRMLrxY+XmPmheRjBxh HA2Eoqb8+aRxOVemm1HMZK2/qxt4aZXZkmD3PkFCrC4IbWzl70QpRkpD+sw97A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4crftm0MGgz188r; Tue, 21 Oct 2025 17:49:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59LHnJ4A029337; Tue, 21 Oct 2025 17:49:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59LHnJ49029334; Tue, 21 Oct 2025 17:49:19 GMT (envelope-from git) Date: Tue, 21 Oct 2025 17:49:19 GMT Message-Id: <202510211749.59LHnJ49029334@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: e11768e94787 - main - vmm: Add PRIV_DRIVER checks for passthru ioctls List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e11768e94787bef2866486ba8616353716a10447 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=e11768e94787bef2866486ba8616353716a10447 commit e11768e94787bef2866486ba8616353716a10447 Author: Mark Johnston AuthorDate: 2025-10-21 17:34:29 +0000 Commit: Mark Johnston CommitDate: 2025-10-21 17:34:29 +0000 vmm: Add PRIV_DRIVER checks for passthru ioctls In preparation for allowing non-root users to create and access bhyve VMs, add privilege checks for ioctls which operate on passthru devices. Reviewed by: corvink MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D53144 --- sys/amd64/vmm/vmm_dev_machdep.c | 18 +++++++++++------- sys/dev/vmm/vmm_dev.c | 7 +++++++ sys/dev/vmm/vmm_dev.h | 1 + 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/sys/amd64/vmm/vmm_dev_machdep.c b/sys/amd64/vmm/vmm_dev_machdep.c index dfebc9dcadbf..347f739d53ec 100644 --- a/sys/amd64/vmm/vmm_dev_machdep.c +++ b/sys/amd64/vmm/vmm_dev_machdep.c @@ -124,12 +124,16 @@ const struct vmmdev_ioctl vmmdev_machdep_ioctls[] = { VMMDEV_IOCTL(VM_SET_KERNEMU_DEV, VMMDEV_IOCTL_LOCK_ONE_VCPU), VMMDEV_IOCTL(VM_BIND_PPTDEV, - VMMDEV_IOCTL_XLOCK_MEMSEGS | VMMDEV_IOCTL_LOCK_ALL_VCPUS), + VMMDEV_IOCTL_XLOCK_MEMSEGS | VMMDEV_IOCTL_LOCK_ALL_VCPUS | + VMMDEV_IOCTL_PRIV_CHECK_DRIVER), VMMDEV_IOCTL(VM_UNBIND_PPTDEV, - VMMDEV_IOCTL_XLOCK_MEMSEGS | VMMDEV_IOCTL_LOCK_ALL_VCPUS), + VMMDEV_IOCTL_XLOCK_MEMSEGS | VMMDEV_IOCTL_LOCK_ALL_VCPUS | + VMMDEV_IOCTL_PRIV_CHECK_DRIVER), - VMMDEV_IOCTL(VM_MAP_PPTDEV_MMIO, VMMDEV_IOCTL_LOCK_ALL_VCPUS), - VMMDEV_IOCTL(VM_UNMAP_PPTDEV_MMIO, VMMDEV_IOCTL_LOCK_ALL_VCPUS), + VMMDEV_IOCTL(VM_MAP_PPTDEV_MMIO, VMMDEV_IOCTL_LOCK_ALL_VCPUS | + VMMDEV_IOCTL_PRIV_CHECK_DRIVER), + VMMDEV_IOCTL(VM_UNMAP_PPTDEV_MMIO, VMMDEV_IOCTL_LOCK_ALL_VCPUS | + VMMDEV_IOCTL_PRIV_CHECK_DRIVER), #ifdef BHYVE_SNAPSHOT #ifdef COMPAT_FREEBSD13 VMMDEV_IOCTL(VM_SNAPSHOT_REQ_13, VMMDEV_IOCTL_LOCK_ALL_VCPUS), @@ -147,9 +151,9 @@ const struct vmmdev_ioctl vmmdev_machdep_ioctls[] = { VMMDEV_IOCTL(VM_LAPIC_LOCAL_IRQ, VMMDEV_IOCTL_MAYBE_ALLOC_VCPU), - VMMDEV_IOCTL(VM_PPTDEV_MSI, 0), - VMMDEV_IOCTL(VM_PPTDEV_MSIX, 0), - VMMDEV_IOCTL(VM_PPTDEV_DISABLE_MSIX, 0), + VMMDEV_IOCTL(VM_PPTDEV_MSI, VMMDEV_IOCTL_PRIV_CHECK_DRIVER), + VMMDEV_IOCTL(VM_PPTDEV_MSIX, VMMDEV_IOCTL_PRIV_CHECK_DRIVER), + VMMDEV_IOCTL(VM_PPTDEV_DISABLE_MSIX, VMMDEV_IOCTL_PRIV_CHECK_DRIVER), VMMDEV_IOCTL(VM_LAPIC_MSI, 0), VMMDEV_IOCTL(VM_IOAPIC_ASSERT_IRQ, 0), VMMDEV_IOCTL(VM_IOAPIC_DEASSERT_IRQ, 0), diff --git a/sys/dev/vmm/vmm_dev.c b/sys/dev/vmm/vmm_dev.c index 27bd115a4fd3..ebbceb25b69e 100644 --- a/sys/dev/vmm/vmm_dev.c +++ b/sys/dev/vmm/vmm_dev.c @@ -14,6 +14,7 @@ #include #include #include +#include #include #include #include @@ -470,6 +471,12 @@ vmmdev_ioctl(struct cdev *cdev, u_long cmd, caddr_t data, int fflag, if (ioctl == NULL) return (ENOTTY); + if ((ioctl->flags & VMMDEV_IOCTL_PRIV_CHECK_DRIVER) != 0) { + error = priv_check(td, PRIV_DRIVER); + if (error != 0) + return (error); + } + if ((ioctl->flags & VMMDEV_IOCTL_XLOCK_MEMSEGS) != 0) vm_xlock_memsegs(sc->vm); else if ((ioctl->flags & VMMDEV_IOCTL_SLOCK_MEMSEGS) != 0) diff --git a/sys/dev/vmm/vmm_dev.h b/sys/dev/vmm/vmm_dev.h index 410066c49cf2..2881a7063565 100644 --- a/sys/dev/vmm/vmm_dev.h +++ b/sys/dev/vmm/vmm_dev.h @@ -44,6 +44,7 @@ struct vmmdev_ioctl { #define VMMDEV_IOCTL_LOCK_ALL_VCPUS 0x08 #define VMMDEV_IOCTL_ALLOC_VCPU 0x10 #define VMMDEV_IOCTL_MAYBE_ALLOC_VCPU 0x20 +#define VMMDEV_IOCTL_PRIV_CHECK_DRIVER 0x40 int flags; }; From nobody Tue Oct 21 17:49:21 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4crftn2qzVz6Cg4y; Tue, 21 Oct 2025 17:49:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4crftn1Pb4z3d2p; Tue, 21 Oct 2025 17:49:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761068961; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e17aPHSIW29iSMJqXM+yRMzcD5ULeLmptXr58ttegGQ=; b=gHot7mmJphJMWL7+lQIXU9ziLp7f95cgl5MT1nzoiA/twYjbZNXUv/UL8r5i7TMUKGpCGl Lcp/DhLQf08L1N+giIe1wTE51nsmK3rwI+ebLmbL6gXYTlBK8bXYU0VW9lklbPrw+5bXIS 8nQSfdENB9eFdaVkeZjf06zCzc22mu7GyWgyZk7UvuerCsN6B4B7ae9Mc3YfOJzhv650rd s7yq+j7XCTM2DkcApx4gmUFI36vU0+ZocG/CHLHV/Xql9tCStePRkldBcu13WYOCG9u04O kCRAYxrzNLLhR728quEcrkXgBYNzVkFTGMNtbbDq8R2ijra7tpO9d7OeAIrSiQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761068961; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e17aPHSIW29iSMJqXM+yRMzcD5ULeLmptXr58ttegGQ=; b=wqPyUvf4YF4taviuWZUWydgvql8O2smlk4/8+tzergGHy0RdrK63ZXuBHhyJpIZUO+n5gM SUKAsZ3+jlTtxk9FRFsyz8YYVcj8SbaI0stFXsgqx+wC6QYvB/Uf9GcVvxJm2LVohGzEqe xx6V749v6b7jVniysn8FDzs9HkN1wgob2G0+bFilsoEMplOVxu1rJCm7X3CvZEP64Hsk8Y uTZTo6TN0V37e3WZ+zIc8eXUrWxmplRHp1tog2HzHouhge9/i4h8rn8jcIEw9pnynz/tRB xY31tuB7LQZBgus6A9YC4cfo/jpXlpBmbBvdhAnRXv7UeGLI/j1lDGkrCZn73g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761068961; a=rsa-sha256; cv=none; b=lYNa0/MEa/hDyo9MIIMVX9RtyQJgA3qjaqsHrbtObqMt36ktD6tXItJfEUqa9XIwK5SmpP /54MxfdkZTeAnX+nQWuZc4v7dRmZ0lGTykfpWa0RnyUx/qmfh5FObZY1Erk+oKSlHrKgc4 fMjewhygKrrV9K/B8FJJ6v3ONjFSgZ/L8A7kWKCWgkV6atr+C4HsUisfVNHS9PtXjY4ahj xDswGIFjhOL7VVwrBAk+Kvwn3RMIHSTP7IhTwPb6mGHqp8vaXe0oPJJFAbsc7IKrzZntVl NovXe7Id+egQoL8AEzoyY33ohWDfraVUJXlE68fHDf0qAnkdHsnyH6mGKQ3TOw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4crftn0lRDz18NQ; Tue, 21 Oct 2025 17:49: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 59LHnLgp029373; Tue, 21 Oct 2025 17:49:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59LHnLOT029370; Tue, 21 Oct 2025 17:49:21 GMT (envelope-from git) Date: Tue, 21 Oct 2025 17:49:21 GMT Message-Id: <202510211749.59LHnLOT029370@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 0225c6d85d0d - main - vmm: Move local variables into ioctl handlers List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0225c6d85d0d4250ed304b31e6ce855fc5d93f15 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=0225c6d85d0d4250ed304b31e6ce855fc5d93f15 commit 0225c6d85d0d4250ed304b31e6ce855fc5d93f15 Author: Mark Johnston AuthorDate: 2025-10-21 17:34:48 +0000 Commit: Mark Johnston CommitDate: 2025-10-21 17:34:48 +0000 vmm: Move local variables into ioctl handlers Make the ioctl handlers easy to read by moving local variables into per-ioctl blocks. No functional change intended. Reviewed by: corvink, emaste MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D53145 --- sys/amd64/vmm/vmm_dev_machdep.c | 237 +++++++++++++++++++++++++--------------- sys/arm64/vmm/vmm_dev_machdep.c | 43 +++++--- sys/riscv/vmm/vmm_dev_machdep.c | 37 +++++-- 3 files changed, 205 insertions(+), 112 deletions(-) diff --git a/sys/amd64/vmm/vmm_dev_machdep.c b/sys/amd64/vmm/vmm_dev_machdep.c index 347f739d53ec..b84be809ea24 100644 --- a/sys/amd64/vmm/vmm_dev_machdep.c +++ b/sys/amd64/vmm/vmm_dev_machdep.c @@ -176,40 +176,13 @@ int vmmdev_machdep_ioctl(struct vm *vm, struct vcpu *vcpu, u_long cmd, caddr_t data, int fflag, struct thread *td) { - struct vm_seg_desc *vmsegdesc; - struct vm_run *vmrun; -#ifdef COMPAT_FREEBSD13 - struct vm_run_13 *vmrun_13; -#endif - struct vm_exception *vmexc; - struct vm_lapic_irq *vmirq; - struct vm_lapic_msi *vmmsi; - struct vm_ioapic_irq *ioapic_irq; - struct vm_isa_irq *isa_irq; - struct vm_isa_irq_trigger *isa_irq_trigger; - struct vm_pptdev *pptdev; - struct vm_pptdev_mmio *pptmmio; - struct vm_pptdev_msi *pptmsi; - struct vm_pptdev_msix *pptmsix; - struct vm_x2apic *x2apic; - struct vm_gpa_pte *gpapte; - struct vm_gla2gpa *gg; - struct vm_intinfo *vmii; - struct vm_rtc_time *rtctime; - struct vm_rtc_data *rtcdata; - struct vm_readwrite_kernemu_device *kernemu; -#ifdef BHYVE_SNAPSHOT - struct vm_snapshot_meta *snapshot_meta; -#ifdef COMPAT_FREEBSD13 - struct vm_snapshot_meta_13 *snapshot_13; -#endif -#endif int error; error = 0; switch (cmd) { case VM_RUN: { struct vm_exit *vme; + struct vm_run *vmrun; vmrun = (struct vm_run *)data; vme = vm_exitinfo(vcpu); @@ -247,6 +220,7 @@ vmmdev_machdep_ioctl(struct vm *vm, struct vcpu *vcpu, u_long cmd, caddr_t data, case VM_RUN_13: { struct vm_exit *vme; struct vm_exit_13 *vme_13; + struct vm_run_13 *vmrun_13; vmrun_13 = (struct vm_run_13 *)data; vme_13 = &vmrun_13->vm_exit; @@ -285,85 +259,123 @@ vmmdev_machdep_ioctl(struct vm *vm, struct vcpu *vcpu, u_long cmd, caddr_t data, break; } #endif - case VM_PPTDEV_MSI: + case VM_PPTDEV_MSI: { + struct vm_pptdev_msi *pptmsi; + pptmsi = (struct vm_pptdev_msi *)data; - error = ppt_setup_msi(vm, - pptmsi->bus, pptmsi->slot, pptmsi->func, - pptmsi->addr, pptmsi->msg, - pptmsi->numvec); + error = ppt_setup_msi(vm, pptmsi->bus, pptmsi->slot, + pptmsi->func, pptmsi->addr, pptmsi->msg, pptmsi->numvec); break; - case VM_PPTDEV_MSIX: + } + case VM_PPTDEV_MSIX: { + struct vm_pptdev_msix *pptmsix; + pptmsix = (struct vm_pptdev_msix *)data; - error = ppt_setup_msix(vm, - pptmsix->bus, pptmsix->slot, - pptmsix->func, pptmsix->idx, - pptmsix->addr, pptmsix->msg, - pptmsix->vector_control); + error = ppt_setup_msix(vm, pptmsix->bus, pptmsix->slot, + pptmsix->func, pptmsix->idx, pptmsix->addr, pptmsix->msg, + pptmsix->vector_control); break; - case VM_PPTDEV_DISABLE_MSIX: + } + case VM_PPTDEV_DISABLE_MSIX: { + struct vm_pptdev *pptdev; + pptdev = (struct vm_pptdev *)data; error = ppt_disable_msix(vm, pptdev->bus, pptdev->slot, - pptdev->func); + pptdev->func); break; - case VM_MAP_PPTDEV_MMIO: + } + case VM_MAP_PPTDEV_MMIO: { + struct vm_pptdev_mmio *pptmmio; + pptmmio = (struct vm_pptdev_mmio *)data; error = ppt_map_mmio(vm, pptmmio->bus, pptmmio->slot, - pptmmio->func, pptmmio->gpa, pptmmio->len, - pptmmio->hpa); + pptmmio->func, pptmmio->gpa, pptmmio->len, pptmmio->hpa); break; - case VM_UNMAP_PPTDEV_MMIO: + } + case VM_UNMAP_PPTDEV_MMIO: { + struct vm_pptdev_mmio *pptmmio; + pptmmio = (struct vm_pptdev_mmio *)data; error = ppt_unmap_mmio(vm, pptmmio->bus, pptmmio->slot, - pptmmio->func, pptmmio->gpa, pptmmio->len); + pptmmio->func, pptmmio->gpa, pptmmio->len); break; - case VM_BIND_PPTDEV: + } + case VM_BIND_PPTDEV: { + struct vm_pptdev *pptdev; + pptdev = (struct vm_pptdev *)data; error = vm_assign_pptdev(vm, pptdev->bus, pptdev->slot, - pptdev->func); + pptdev->func); break; - case VM_UNBIND_PPTDEV: + } + case VM_UNBIND_PPTDEV: { + struct vm_pptdev *pptdev; + pptdev = (struct vm_pptdev *)data; error = vm_unassign_pptdev(vm, pptdev->bus, pptdev->slot, - pptdev->func); + pptdev->func); break; - case VM_INJECT_EXCEPTION: + } + case VM_INJECT_EXCEPTION: { + struct vm_exception *vmexc; + vmexc = (struct vm_exception *)data; error = vm_inject_exception(vcpu, vmexc->vector, vmexc->error_code_valid, vmexc->error_code, vmexc->restart_instruction); break; + } case VM_INJECT_NMI: error = vm_inject_nmi(vcpu); break; - case VM_LAPIC_IRQ: + case VM_LAPIC_IRQ: { + struct vm_lapic_irq *vmirq; + vmirq = (struct vm_lapic_irq *)data; error = lapic_intr_edge(vcpu, vmirq->vector); break; - case VM_LAPIC_LOCAL_IRQ: + } + case VM_LAPIC_LOCAL_IRQ: { + struct vm_lapic_irq *vmirq; + vmirq = (struct vm_lapic_irq *)data; error = lapic_set_local_intr(vm, vcpu, vmirq->vector); break; - case VM_LAPIC_MSI: + } + case VM_LAPIC_MSI: { + struct vm_lapic_msi *vmmsi; + vmmsi = (struct vm_lapic_msi *)data; error = lapic_intr_msi(vm, vmmsi->addr, vmmsi->msg); break; - case VM_IOAPIC_ASSERT_IRQ: + } + case VM_IOAPIC_ASSERT_IRQ: { + struct vm_ioapic_irq *ioapic_irq; + ioapic_irq = (struct vm_ioapic_irq *)data; error = vioapic_assert_irq(vm, ioapic_irq->irq); break; - case VM_IOAPIC_DEASSERT_IRQ: + } + case VM_IOAPIC_DEASSERT_IRQ: { + struct vm_ioapic_irq *ioapic_irq; + ioapic_irq = (struct vm_ioapic_irq *)data; error = vioapic_deassert_irq(vm, ioapic_irq->irq); break; - case VM_IOAPIC_PULSE_IRQ: + } + case VM_IOAPIC_PULSE_IRQ: { + struct vm_ioapic_irq *ioapic_irq; + ioapic_irq = (struct vm_ioapic_irq *)data; error = vioapic_pulse_irq(vm, ioapic_irq->irq); break; + } case VM_IOAPIC_PINCOUNT: *(int *)data = vioapic_pincount(vm); break; case VM_SET_KERNEMU_DEV: case VM_GET_KERNEMU_DEV: { + struct vm_readwrite_kernemu_device *kernemu; mem_region_write_t mwrite; mem_region_read_t mread; int size; @@ -400,60 +412,86 @@ vmmdev_machdep_ioctl(struct vm *vm, struct vcpu *vcpu, u_long cmd, caddr_t data, error = mread(vcpu, kernemu->gpa, &kernemu->value, size, &arg); break; - } - case VM_ISA_ASSERT_IRQ: + } + case VM_ISA_ASSERT_IRQ: { + struct vm_isa_irq *isa_irq; + isa_irq = (struct vm_isa_irq *)data; error = vatpic_assert_irq(vm, isa_irq->atpic_irq); if (error == 0 && isa_irq->ioapic_irq != -1) error = vioapic_assert_irq(vm, isa_irq->ioapic_irq); break; - case VM_ISA_DEASSERT_IRQ: + } + case VM_ISA_DEASSERT_IRQ: { + struct vm_isa_irq *isa_irq; + isa_irq = (struct vm_isa_irq *)data; error = vatpic_deassert_irq(vm, isa_irq->atpic_irq); if (error == 0 && isa_irq->ioapic_irq != -1) error = vioapic_deassert_irq(vm, isa_irq->ioapic_irq); break; - case VM_ISA_PULSE_IRQ: + } + case VM_ISA_PULSE_IRQ: { + struct vm_isa_irq *isa_irq; + isa_irq = (struct vm_isa_irq *)data; error = vatpic_pulse_irq(vm, isa_irq->atpic_irq); if (error == 0 && isa_irq->ioapic_irq != -1) error = vioapic_pulse_irq(vm, isa_irq->ioapic_irq); break; - case VM_ISA_SET_IRQ_TRIGGER: + } + case VM_ISA_SET_IRQ_TRIGGER: { + struct vm_isa_irq_trigger *isa_irq_trigger; + isa_irq_trigger = (struct vm_isa_irq_trigger *)data; error = vatpic_set_irq_trigger(vm, isa_irq_trigger->atpic_irq, isa_irq_trigger->trigger); break; - case VM_SET_SEGMENT_DESCRIPTOR: + } + case VM_SET_SEGMENT_DESCRIPTOR: { + struct vm_seg_desc *vmsegdesc; + vmsegdesc = (struct vm_seg_desc *)data; - error = vm_set_seg_desc(vcpu, - vmsegdesc->regnum, - &vmsegdesc->desc); + error = vm_set_seg_desc(vcpu, vmsegdesc->regnum, + &vmsegdesc->desc); break; - case VM_GET_SEGMENT_DESCRIPTOR: + } + case VM_GET_SEGMENT_DESCRIPTOR: { + struct vm_seg_desc *vmsegdesc; + vmsegdesc = (struct vm_seg_desc *)data; - error = vm_get_seg_desc(vcpu, - vmsegdesc->regnum, - &vmsegdesc->desc); + error = vm_get_seg_desc(vcpu, vmsegdesc->regnum, + &vmsegdesc->desc); break; - case VM_SET_X2APIC_STATE: + } + case VM_SET_X2APIC_STATE: { + struct vm_x2apic *x2apic; + x2apic = (struct vm_x2apic *)data; error = vm_set_x2apic_state(vcpu, x2apic->state); break; - case VM_GET_X2APIC_STATE: + } + case VM_GET_X2APIC_STATE: { + struct vm_x2apic *x2apic; + x2apic = (struct vm_x2apic *)data; error = vm_get_x2apic_state(vcpu, &x2apic->state); break; - case VM_GET_GPA_PMAP: + } + case VM_GET_GPA_PMAP: { + struct vm_gpa_pte *gpapte; + gpapte = (struct vm_gpa_pte *)data; - pmap_get_mapping(vmspace_pmap(vm_vmspace(vm)), - gpapte->gpa, gpapte->pte, &gpapte->ptenum); - error = 0; + pmap_get_mapping(vmspace_pmap(vm_vmspace(vm)), gpapte->gpa, + gpapte->pte, &gpapte->ptenum); break; + } case VM_GET_HPET_CAPABILITIES: error = vhpet_getcap((struct vm_hpet_cap *)data); break; case VM_GLA2GPA: { + struct vm_gla2gpa *gg; + CTASSERT(PROT_READ == VM_PROT_READ); CTASSERT(PROT_WRITE == VM_PROT_WRITE); CTASSERT(PROT_EXEC == VM_PROT_EXECUTE); @@ -464,50 +502,76 @@ vmmdev_machdep_ioctl(struct vm *vm, struct vcpu *vcpu, u_long cmd, caddr_t data, ("%s: vm_gla2gpa unknown error %d", __func__, error)); break; } - case VM_GLA2GPA_NOFAULT: + case VM_GLA2GPA_NOFAULT: { + struct vm_gla2gpa *gg; + gg = (struct vm_gla2gpa *)data; error = vm_gla2gpa_nofault(vcpu, &gg->paging, gg->gla, gg->prot, &gg->gpa, &gg->fault); KASSERT(error == 0 || error == EFAULT, ("%s: vm_gla2gpa unknown error %d", __func__, error)); break; - case VM_SET_INTINFO: + } + case VM_SET_INTINFO: { + struct vm_intinfo *vmii; + vmii = (struct vm_intinfo *)data; error = vm_exit_intinfo(vcpu, vmii->info1); break; - case VM_GET_INTINFO: + } + case VM_GET_INTINFO: { + struct vm_intinfo *vmii; + vmii = (struct vm_intinfo *)data; error = vm_get_intinfo(vcpu, &vmii->info1, &vmii->info2); break; - case VM_RTC_WRITE: + } + case VM_RTC_WRITE: { + struct vm_rtc_data *rtcdata; + rtcdata = (struct vm_rtc_data *)data; error = vrtc_nvram_write(vm, rtcdata->offset, rtcdata->value); break; - case VM_RTC_READ: + } + case VM_RTC_READ: { + struct vm_rtc_data *rtcdata; + rtcdata = (struct vm_rtc_data *)data; error = vrtc_nvram_read(vm, rtcdata->offset, &rtcdata->value); break; - case VM_RTC_SETTIME: + } + case VM_RTC_SETTIME: { + struct vm_rtc_time *rtctime; + rtctime = (struct vm_rtc_time *)data; error = vrtc_set_time(vm, rtctime->secs); break; - case VM_RTC_GETTIME: - error = 0; + } + case VM_RTC_GETTIME: { + struct vm_rtc_time *rtctime; + rtctime = (struct vm_rtc_time *)data; rtctime->secs = vrtc_get_time(vm); break; + } case VM_RESTART_INSTRUCTION: error = vm_restart_instruction(vcpu); break; #ifdef BHYVE_SNAPSHOT - case VM_SNAPSHOT_REQ: + case VM_SNAPSHOT_REQ: { + struct vm_snapshot_meta *snapshot_meta; + snapshot_meta = (struct vm_snapshot_meta *)data; error = vm_snapshot_req(vm, snapshot_meta); break; + } #ifdef COMPAT_FREEBSD13 - case VM_SNAPSHOT_REQ_13: + case VM_SNAPSHOT_REQ_13: { + struct vm_snapshot_meta *snapshot_meta; + struct vm_snapshot_meta_13 *snapshot_13; + /* * The old structure just has an additional pointer at * the start that is ignored. @@ -517,6 +581,7 @@ vmmdev_machdep_ioctl(struct vm *vm, struct vcpu *vcpu, u_long cmd, caddr_t data, (struct vm_snapshot_meta *)&snapshot_13->dev_data; error = vm_snapshot_req(vm, snapshot_meta); break; + } #endif case VM_RESTORE_TIME: error = vm_restore_time(vm); diff --git a/sys/arm64/vmm/vmm_dev_machdep.c b/sys/arm64/vmm/vmm_dev_machdep.c index 926a74fa528b..29d14e1ba952 100644 --- a/sys/arm64/vmm/vmm_dev_machdep.c +++ b/sys/arm64/vmm/vmm_dev_machdep.c @@ -68,19 +68,13 @@ int vmmdev_machdep_ioctl(struct vm *vm, struct vcpu *vcpu, u_long cmd, caddr_t data, int fflag, struct thread *td) { - struct vm_run *vmrun; - struct vm_vgic_version *vgv; - struct vm_vgic_descr *vgic; - struct vm_irq *vi; - struct vm_exception *vmexc; - struct vm_gla2gpa *gg; - struct vm_msi *vmsi; int error; error = 0; switch (cmd) { case VM_RUN: { struct vm_exit *vme; + struct vm_run *vmrun; vmrun = (struct vm_run *)data; vme = vm_exitinfo(vcpu); @@ -94,41 +88,62 @@ vmmdev_machdep_ioctl(struct vm *vm, struct vcpu *vcpu, u_long cmd, caddr_t data, break; break; } - case VM_INJECT_EXCEPTION: + case VM_INJECT_EXCEPTION: { + struct vm_exception *vmexc; + vmexc = (struct vm_exception *)data; error = vm_inject_exception(vcpu, vmexc->esr, vmexc->far); break; - case VM_GLA2GPA_NOFAULT: + } + case VM_GLA2GPA_NOFAULT: { + struct vm_gla2gpa *gg; + gg = (struct vm_gla2gpa *)data; error = vm_gla2gpa_nofault(vcpu, &gg->paging, gg->gla, gg->prot, &gg->gpa, &gg->fault); KASSERT(error == 0 || error == EFAULT, ("%s: vm_gla2gpa unknown error %d", __func__, error)); break; - case VM_GET_VGIC_VERSION: + } + case VM_GET_VGIC_VERSION: { + struct vm_vgic_version *vgv; + vgv = (struct vm_vgic_version *)data; /* TODO: Query the vgic driver for this */ vgv->version = 3; vgv->flags = 0; error = 0; break; - case VM_ATTACH_VGIC: + } + case VM_ATTACH_VGIC: { + struct vm_vgic_descr *vgic; + vgic = (struct vm_vgic_descr *)data; error = vm_attach_vgic(vm, vgic); break; - case VM_RAISE_MSI: + } + case VM_RAISE_MSI: { + struct vm_msi *vmsi; + vmsi = (struct vm_msi *)data; error = vm_raise_msi(vm, vmsi->msg, vmsi->addr, vmsi->bus, vmsi->slot, vmsi->func); break; - case VM_ASSERT_IRQ: + } + case VM_ASSERT_IRQ: { + struct vm_irq *vi; + vi = (struct vm_irq *)data; error = vm_assert_irq(vm, vi->irq); break; - case VM_DEASSERT_IRQ: + } + case VM_DEASSERT_IRQ: { + struct vm_irq *vi; + vi = (struct vm_irq *)data; error = vm_deassert_irq(vm, vi->irq); break; + } default: error = ENOTTY; break; diff --git a/sys/riscv/vmm/vmm_dev_machdep.c b/sys/riscv/vmm/vmm_dev_machdep.c index ba15d8dcd79e..c736b10dc9c0 100644 --- a/sys/riscv/vmm/vmm_dev_machdep.c +++ b/sys/riscv/vmm/vmm_dev_machdep.c @@ -67,18 +67,13 @@ int vmmdev_machdep_ioctl(struct vm *vm, struct vcpu *vcpu, u_long cmd, caddr_t data, int fflag, struct thread *td) { - struct vm_run *vmrun; - struct vm_aplic_descr *aplic; - struct vm_irq *vi; - struct vm_exception *vmexc; - struct vm_gla2gpa *gg; - struct vm_msi *vmsi; int error; error = 0; switch (cmd) { case VM_RUN: { struct vm_exit *vme; + struct vm_run *vmrun; vmrun = (struct vm_run *)data; vme = vm_exitinfo(vcpu); @@ -90,34 +85,52 @@ vmmdev_machdep_ioctl(struct vm *vm, struct vcpu *vcpu, u_long cmd, caddr_t data, error = copyout(vme, vmrun->vm_exit, sizeof(*vme)); break; } - case VM_INJECT_EXCEPTION: + case VM_INJECT_EXCEPTION: { + struct vm_exception *vmexc; + vmexc = (struct vm_exception *)data; error = vm_inject_exception(vcpu, vmexc->scause); break; - case VM_GLA2GPA_NOFAULT: + } + case VM_GLA2GPA_NOFAULT: { + struct vm_gla2gpa *gg; + gg = (struct vm_gla2gpa *)data; error = vm_gla2gpa_nofault(vcpu, &gg->paging, gg->gla, gg->prot, &gg->gpa, &gg->fault); KASSERT(error == 0 || error == EFAULT, ("%s: vm_gla2gpa unknown error %d", __func__, error)); break; - case VM_ATTACH_APLIC: + } + case VM_ATTACH_APLIC: { + struct vm_aplic_descr *aplic; + aplic = (struct vm_aplic_descr *)data; error = vm_attach_aplic(vm, aplic); break; - case VM_RAISE_MSI: + } + case VM_RAISE_MSI: { + struct vm_msi *vmsi; + vmsi = (struct vm_msi *)data; error = vm_raise_msi(vm, vmsi->msg, vmsi->addr, vmsi->bus, vmsi->slot, vmsi->func); break; - case VM_ASSERT_IRQ: + } + case VM_ASSERT_IRQ: { + struct vm_irq *vi; + vi = (struct vm_irq *)data; error = vm_assert_irq(vm, vi->irq); break; - case VM_DEASSERT_IRQ: + } + case VM_DEASSERT_IRQ: { + struct vm_irq *vi; + vi = (struct vm_irq *)data; error = vm_deassert_irq(vm, vi->irq); break; + } default: error = ENOTTY; break; From nobody Tue Oct 21 18:31:34 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4crgqV32whz6CkdB; Tue, 21 Oct 2025 18:31:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4crgqV2VLVz3jr0; Tue, 21 Oct 2025 18:31:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761071494; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bA1EaW539/56kWscYnVHnsOWXo7VMkotqlphMw/sgxM=; b=Np7WEbDaxOHkc7p+eLyRAt8/0aEVJmp7aW6QdstAcyVLXLeC94zZW2YlDOxHEak9G0CDtD 7GbpslMAiU77m9M43Ge7tTmU2+/MWhKRl4DsGLi/HlrsMneWSvY812L2MslXy3Zg6t94tW ocO7dtkMe3oCVq2MsbNVJ438kB7uDlssHoMSnj1Lt46+KFExbU4Q8DD+eXT+TIJcQ7FVmN vTZW3Inxx6WkMKHUQZ7HGkw3tP3zKLQNzBm287owcyxOH6jfYDV0/PPeSHrZppHXOKMkHB fzwznAdl9qvhhyTh3rA5sK6wRe43dFmM3FgBzaVwcjfm/gF4kC8C4tXW4Ds5Gg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761071494; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bA1EaW539/56kWscYnVHnsOWXo7VMkotqlphMw/sgxM=; b=ww/7layRb8TEoLJm1PdPjcfRAbHMtNHPiNul3b9eMOMlfLtOw2pOEF8jx9OGGhUUnWxXDN MWoQbbuRLzLHw+KTw86xMz64fEhB2tS95pPX9UWNauM0WHsIwpDNB6lSD6qDkJ+Xkmkt/8 D0BDpwrg0XY/3slBFAG9dhgSuQFUkwRfzdj5oTUX7w2ONXZuP/0M8rejfGQpvAZywvZV3d AGbtJnoHEDah5xCn9iALGp2Qunl6tsuNnS6R9PH8z99cTYPbKFogveNz9swm/B59SOsvho 07rVpAN+i5C6ZR0Wv04d8ujhXscKWEd7ynHdwk22OCuG5vgbIZs9UY/0b4N5Qw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761071494; a=rsa-sha256; cv=none; b=kn0dn++Nr4wHSIhUNi4XZ+QRgxqpuWcYN+fCZpyo2HevJTSiLZtm2PMQ7dBTBvZnp9bdo5 S5Dz0/tpzveFudGYwj1B+EC37DtkbidB8IWQBac60ySS5DM5zdGxiwtjLPJhr54mLUw/lI 0wI81ZThBy23+k+Rcna0F1+g2xlnKS2GYLVlRZ6TWbWhy4l36RKXAL5PyE9mHC9ehqhOMb 39Zto7L8kR1FBrrFERZ1cxIChWA4ulvKVP+azVKgL0UUTTX3YrbZQyx8xARv/GgTKpvUPk 7jycMQMHC/GOtu8j5knUWaPzlKzr3tudLHt52dGiIOV4yCQkw0+p9gWDnuLI2A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4crgqV243Hz19Qg; Tue, 21 Oct 2025 18:31: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 59LIVYDE022298; Tue, 21 Oct 2025 18:31:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59LIVY86022294; Tue, 21 Oct 2025 18:31:34 GMT (envelope-from git) Date: Tue, 21 Oct 2025 18:31:34 GMT Message-Id: <202510211831.59LIVY86022294@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "David E. O'Brien" Subject: git: d78da1ea01b2 - main - man9: Provide SYSCTL_BOOL & SYSCTL_ADD_BOOL man pages List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: obrien X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d78da1ea01b21f3be6011bea174f9ee3ece623ed Auto-Submitted: auto-generated The branch main has been updated by obrien: URL: https://cgit.FreeBSD.org/src/commit/?id=d78da1ea01b21f3be6011bea174f9ee3ece623ed commit d78da1ea01b21f3be6011bea174f9ee3ece623ed Author: David E. O'Brien AuthorDate: 2025-10-21 18:18:18 +0000 Commit: David E. O'Brien CommitDate: 2025-10-21 18:31:01 +0000 man9: Provide SYSCTL_BOOL & SYSCTL_ADD_BOOL man pages Updates: 84e717c4c & 9a593520 --- share/man/man9/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/share/man/man9/Makefile b/share/man/man9/Makefile index 3bccc92572d6..52ec9be3ae02 100644 --- a/share/man/man9/Makefile +++ b/share/man/man9/Makefile @@ -2207,6 +2207,7 @@ MLINKS+=syscall_helper_register.9 syscall_helper_unregister.9 \ syscall_helper_register.9 SYSCALL_INIT_HELPER_COMPAT_F.9 \ syscall_helper_register.9 SYSCALL_INIT_HELPER_F.9 MLINKS+=sysctl.9 SYSCTL_DECL.9 \ + sysctl.9 SYSCTL_ADD_BOOL.9 \ sysctl.9 SYSCTL_ADD_CONST_STRING.9 \ sysctl.9 SYSCTL_ADD_INT.9 \ sysctl.9 SYSCTL_ADD_LONG.9 \ @@ -2233,6 +2234,7 @@ MLINKS+=sysctl.9 SYSCTL_DECL.9 \ sysctl.9 SYSCTL_ADD_UMA_CUR.9 \ sysctl.9 SYSCTL_ADD_UMA_MAX.9 \ sysctl.9 SYSCTL_ADD_UQUAD.9 \ + sysctl.9 SYSCTL_BOOL.9 \ sysctl.9 SYSCTL_CHILDREN.9 \ sysctl.9 SYSCTL_STATIC_CHILDREN.9 \ sysctl.9 SYSCTL_NODE_CHILDREN.9 \ From nobody Tue Oct 21 19:46:53 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4crjVQ1TtDz6CsGl; Tue, 21 Oct 2025 19:46:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4crjVQ0z42z3qKS; Tue, 21 Oct 2025 19:46:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761076014; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yVCFDYPVWiIHEaJRa3gWbUv6m3LlAbxCs6U7BWOPOX0=; b=dS9wsmBBwGhpSZd2aW0s/ZQf5V10clfcf2TjV+bqFpsnBpBYXH92gSWPoEcJlwrroeiN6k fJfngCk2Qh61W49BAC5gWNbXhUuvCHPeRuyFoPRnBiczbFGXfRLjbmVi/ZqvxFJan1LICr GLuzkeutASNw+Jx29tR5BjWFxjs8zTCE0JS20Whyh6xHGLqCaqdYXYX2CsBv8n65B+etLD sniy3CgUVf0/7ne3M3acvfgUhjWIS2SYcqRIvagM5YdozEt0oDUFoMyHMcLfa3m3J7Ep9o LNW523MRsjhJPSeIw4KgU7KOm8BMj3RNb6zrM5AF5NEyRwas5w3EMsvJ5A1gvg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761076014; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yVCFDYPVWiIHEaJRa3gWbUv6m3LlAbxCs6U7BWOPOX0=; b=J6GmUqwAniZJis15KWcssb0Bvr3/wRuQB/+eHjKUw1Ruz5AxtEkUQOTj2WJ0sdA0FQ7Csp OWi9fPUlinIUIimRcWVCUCaiEfh0IRF3Fwqh0pw5WriPUt2jDPvV/RfsVDA4Hk5xH5n2eY WEo876UtWzJJduO0iPKM6Fyj2UmygLnByEDxvxj1S/KI9gKhYWbMy9C6AzLLoIidGd4fLc St7iRWOcnn/1bwh01H9qhtc2aPX5bTqVcHNHx8Y5Jkcw0TllLZKwGB2cErQcevQxNn756N zOf2jRxe/XcbHK+yXXUGI9pBSNrBPZikjeZyEo1SRA9YHqyEeeobe11lvlPtgA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761076014; a=rsa-sha256; cv=none; b=xjrAAeunfxAPALByVQw1IvHBjxzupdRpVVPR8bGw/md+v9hiVUJySsx4z9l++zjOec3lIB gWGZE0nQobOxxuPxohx5g2SlooB+ZQx8KdH8Sm6q6cvy1sdI0eA29otnhFypvstymuowHP nC0r62S6ZYD78MBaQ+6DSR51QX7GIimxIBof+qmRwtatP1NMlsoXiM8dvjzu/wN+fUKa9k 6xKZq9QR4JZmeWGaExEaUOPleRdq067ojHMzgmwbNAL5VkUAnyFn32HLBUawwh9XRNUynx LJ94W2na2EsPsj8zjJZe68R+BCzSsQjSuPYggCgBUHWXu+WUWWw6vYKIg/gEtw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4crjVQ0J7kz1C5s; Tue, 21 Oct 2025 19:46: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 59LJkr27055617; Tue, 21 Oct 2025 19:46:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59LJkrNa055614; Tue, 21 Oct 2025 19:46:53 GMT (envelope-from git) Date: Tue, 21 Oct 2025 19:46:53 GMT Message-Id: <202510211946.59LJkrNa055614@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alan Somers Subject: git: 7648d2ebda22 - main - tests/sys/netpfil/pf/sctp: make use of required.kmods List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7648d2ebda22fe21ed385cc7d76813a1a9c17c99 Auto-Submitted: auto-generated The branch main has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=7648d2ebda22fe21ed385cc7d76813a1a9c17c99 commit 7648d2ebda22fe21ed385cc7d76813a1a9c17c99 Author: Alan Somers AuthorDate: 2025-10-20 13:52:41 +0000 Commit: Alan Somers CommitDate: 2025-10-21 19:46:26 +0000 tests/sys/netpfil/pf/sctp: make use of required.kmods This greatly speeds up skipping a test that can't be run. MFC after: 2 weeks Sponsored by: ConnectWise Reviewed by: kp Differential Revision: https://reviews.freebsd.org/D53215 --- tests/sys/netpfil/pf/sctp.sh | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/tests/sys/netpfil/pf/sctp.sh b/tests/sys/netpfil/pf/sctp.sh index 78055f5a9dd2..47bf40181b1b 100644 --- a/tests/sys/netpfil/pf/sctp.sh +++ b/tests/sys/netpfil/pf/sctp.sh @@ -29,9 +29,6 @@ sctp_init() { pft_init - if ! kldstat -q -m sctp; then - atf_skip "This test requires SCTP" - fi } atf_test_case "basic_v4" "cleanup" @@ -39,6 +36,7 @@ basic_v4_head() { atf_set descr 'Basic SCTP connection over IPv4 passthrough' atf_set require.user root + atf_set require.kmods sctp } basic_v4_body() @@ -112,6 +110,7 @@ basic_v6_head() { atf_set descr 'Basic SCTP connection over IPv6' atf_set require.user root + atf_set require.kmods sctp } basic_v6_body() @@ -186,6 +185,7 @@ reuse_head() { atf_set descr 'Test handling dumb clients that reuse source ports' atf_set require.user root + atf_set require.kmods sctp } reuse_body() @@ -244,6 +244,7 @@ abort_v4_head() { atf_set descr 'Test sending ABORT messages' atf_set require.user root + atf_set require.kmods sctp } abort_v4_body() @@ -302,6 +303,7 @@ abort_v6_head() { atf_set descr 'Test sending ABORT messages over IPv6' atf_set require.user root + atf_set require.kmods sctp } abort_v6_body() @@ -360,6 +362,7 @@ nat_v4_head() { atf_set descr 'Test NAT-ing SCTP over IPv4' atf_set require.user root + atf_set require.kmods sctp } nat_v4_body() @@ -412,6 +415,7 @@ nat_v6_head() { atf_set descr 'Test NAT-ing SCTP over IPv6' atf_set require.user root + atf_set require.kmods sctp } nat_v6_body() @@ -464,6 +468,7 @@ rdr_v4_head() { atf_set descr 'Test rdr SCTP over IPv4' atf_set require.user root + atf_set require.kmods sctp } rdr_v4_body() @@ -531,6 +536,7 @@ pfsync_head() { atf_set descr 'Test pfsync-ing SCTP connections' atf_set require.user root + atf_set require.kmods carp sctp } pfsync_body() @@ -563,10 +569,6 @@ pfsync_body() sctp_init pfsynct_init vnet_init_bridge - if ! kldstat -q -m carp - then - atf_skip "This test requires carp" - fi j="sctp:pfsync" @@ -722,6 +724,7 @@ timeout_head() { atf_set descr 'Test setting and retrieving timeout values' atf_set require.user root + atf_set require.kmods sctp } timeout_body() @@ -753,6 +756,7 @@ related_icmp_head() { atf_set descr 'Verify that ICMP messages related to an SCTP connection are allowed' atf_set require.user root + atf_set require.kmods sctp } related_icmp_body() From nobody Tue Oct 21 20:01:05 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4crjpn6KkKz6CtvD; Tue, 21 Oct 2025 20:01:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4crjpn5bs5z3rnF; Tue, 21 Oct 2025 20:01:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761076865; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HSXW8LtzuCwSuJnl5Zmvwjs1TofAITvSqwCiJ+U7MLA=; b=kANNC+wpJrcEa4atKQv9tLsYxflOj7/Q/u7cqztU1//U+h9FvbBVN5f2Xkhh+Aujtnq98C 7ETji9JrDJLEqt3Zu6DQRqRVG0VrRoiw6GQVaKLXehqPIWx5zo7t9BHRqvDy5u7TaYaMG7 qpleY50Q5L+QtHC5qqZCiA302qn0ea+gTbw9I+3KST5HyCxytqtpu2JFHFajtoqmkVJe6o MSwHUrcmBk2d/vk7NnPd9sEwfjiiAFgqrSFPMzPzGt+keYawSxFjS0CEoX6HNw7xf0hEGW zBGrOI5DZQMygh7OOn9kdGm2h7nl0j4HoDvRJFR6kGJacOkx+3ALarWQSRYiXw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761076865; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HSXW8LtzuCwSuJnl5Zmvwjs1TofAITvSqwCiJ+U7MLA=; b=tf0eb6s2EUVHlJwdPUpqzicOGd9lE5WK78Vt7sLfYJRvI4MY+zSI8HXdATf3+kNMU6XSMk AKjlVEtb0R9EAEhhwT9Db/EWU6fR1F+0ca8lawmwX1hApEdkw/AfXaMZWmYZFg3dTDeJP9 /GwWFl51XXAR62LnbniMA/xukrtg0/WZNIJKIgYQ71i7Cu9vlhT9u3f19Pafobar97td9A QMg+BnubgRpLzEczkX0eMc4JLu82s1ADGRAF3WRxyzwga87zOAJtB+UbFXE2UZs5441ZiG 2Yklm2XSCMQIdkpVdQdSW17Cd++HmAIqM3gEQBZ+2F37MJ335qxy5PMUqD5cDQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761076865; a=rsa-sha256; cv=none; b=EztsNp4Vz5CwItK+bkIFJXLserJo+VzfJwTVy2TO60+Ysq1ZaSU58KXu4am3uO1lFnGYpj lXjEmBr+FbFA6JuonZ6DaSnSE+CpZ9qcljn0PFLkJWEOIrcEJR4lBp+qkAK7UqGKJX4ZVP lrErXOz7XvVQKPEPW9TwPkJkxhBfJjQtVhH9NemW0MV/4BmONh4TlKFLdxa3kmjEO8NZlF ivkiSCo8s8TE11On1QuO7EJehE+5I2l7oJvWYmymU9WWNyOKglD1PUXqAXJn/RKUXiBEbC 8P7q4F+FdR+Jozue/UMP87jl7GJFhLZdSRGhU1rKlTR8Q2Obb9yNjpWHbee8Sw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4crjpn587Dz1CQ1; Tue, 21 Oct 2025 20:01: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 59LK15DP084788; Tue, 21 Oct 2025 20:01:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59LK15Zd084785; Tue, 21 Oct 2025 20:01:05 GMT (envelope-from git) Date: Tue, 21 Oct 2025 20:01:05 GMT Message-Id: <202510212001.59LK15Zd084785@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 1cc316727eba - main - if_vxlan: fix byteorder of source port List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1cc316727ebae157b3d035d9fb1ad38310a80698 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=1cc316727ebae157b3d035d9fb1ad38310a80698 commit 1cc316727ebae157b3d035d9fb1ad38310a80698 Author: Seyed Pouria Mousavizadeh Tehrani AuthorDate: 2025-10-21 18:58:26 +0000 Commit: Kristof Provost CommitDate: 2025-10-21 20:00:27 +0000 if_vxlan: fix byteorder of source port Fix the htons byteorder of vxlan packets after `vxlan_pick_source_port` picks a source port during encapsulation. Reviewed by: zlei, kp, adrian Differential Revision: https://reviews.freebsd.org/D53022 --- sys/net/if_vxlan.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/net/if_vxlan.c b/sys/net/if_vxlan.c index 03184c1fb678..f3a8410a2258 100644 --- a/sys/net/if_vxlan.c +++ b/sys/net/if_vxlan.c @@ -2533,7 +2533,7 @@ vxlan_encap4(struct vxlan_softc *sc, const union vxlan_sockaddr *fvxlsa, ifp = sc->vxl_ifp; srcaddr = sc->vxl_src_addr.in4.sin_addr; - srcport = vxlan_pick_source_port(sc, m); + srcport = htons(vxlan_pick_source_port(sc, m)); dstaddr = fvxlsa->in4.sin_addr; dstport = fvxlsa->in4.sin_port; @@ -2644,7 +2644,7 @@ vxlan_encap6(struct vxlan_softc *sc, const union vxlan_sockaddr *fvxlsa, ifp = sc->vxl_ifp; srcaddr = &sc->vxl_src_addr.in6.sin6_addr; - srcport = vxlan_pick_source_port(sc, m); + srcport = htons(vxlan_pick_source_port(sc, m)); dstaddr = &fvxlsa->in6.sin6_addr; dstport = fvxlsa->in6.sin6_port; From nobody Tue Oct 21 21:02:59 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4crlBS49Yxz6D0fY; Tue, 21 Oct 2025 21:03:12 +0000 (UTC) (envelope-from bzeeb-lists@lists.zabbadoz.net) Received: from mx-01.divo.sbone.de (mx-01.divo.sbone.de [IPv6:2003:a:140a:2200:6:594:fffe:19]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature ECDSA (prime256v1) client-digest SHA256) (Client CN "mx-01.divo.sbone.de", Issuer "E8" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4crlBS1qwdz42d7; Tue, 21 Oct 2025 21:03:12 +0000 (UTC) (envelope-from bzeeb-lists@lists.zabbadoz.net) Authentication-Results: mx1.freebsd.org; none Received: from mail.sbone.de (mail.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:1025]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by mx-01.divo.sbone.de (Postfix) with ESMTPS id 8897BA64805; Tue, 21 Oct 2025 21:02:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=zabbadoz.net; s=20240622; t=1761080571; bh=yOiyWLlDQzKCfUGy9ZEwneVL7vQ8EXh5awZGgmuToEg=; h=Date:From:To:cc:Subject:In-Reply-To:References; b=J8fRx9CpkN1ZOTAfxC9h+3wmCUh7J0wCQAmSmmYO2ZJiiNSTpnF3bFWCmXyBK8qsE z8hW2t5IvzWKugrAGt8fS+0aRIqFkIOjcz/SRZDh1gTgxu9tOfals2gfGBTqSQ9Eqn JfotlgzMyGd+I7SVb3xefUXPZaKpQP2Ze0TK/OhdM98yYBlj+IvDN7LjlCbPNQ+Wbn 2/XTEck48ttYvuBJ5fEybEngRVWVykQKosthwnPBGHzNB0Ladh5Wf616eDvy/gVoAx Wquazvi1Xd5wU8Bx+iQp8RhQYsd93DzVZrtXi0hsCdjNP5n4cUNCWGafxTLjVlqz6S 5ctXWsXwK82H7gcEZlylZnw+dOl3SZ5UUFNAYs24IqTi46eZ65ug+vi5G6eABzcxCM MdKwPe+vHmV/C3e8xUdlKfVsslnXScR/PcbhkmEMm2IHEYP6aZnrMGVf7kZz3po156 6SwIwh7I6rJDo8JRksyUv5bWvsYsHyMLYsttaeKEQ9tysjrr41pC2Qemd+49hfhDzC NW0R+BsBmLpeY2Z1hSgXisiG3yjpjd7XnYhQjeaI9xM9d++R3ziwqe0EfuHfxiZs5p yduMgIKkjnM1+xoPg8j2yVBt7525dHb1nDeZ9gwJKJlmppwdt5OwDto4ibJwary1rN OBL6ugdv48aluBeuAY16LHdg= Received: from content-filter.t4-02.sbone.de (content-filter.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:2742]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPS id 66B2C2D029E6; Tue, 21 Oct 2025 21:03:02 +0000 (UTC) X-Virus-Scanned: amavisd-new at sbone.de Received: from mail.sbone.de ([IPv6:fde9:577b:c1a9:4902:0:7404:2:1025]) by content-filter.t4-02.sbone.de (content-filter.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:2742]) (amavisd-new, port 10024) with ESMTP id 4CJRKkTUYD6f; Tue, 21 Oct 2025 21:03:01 +0000 (UTC) Received: from nv.t4-02.sbone.de (nv.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:22]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPSA id 4C1852D029D8; Tue, 21 Oct 2025 21:03:01 +0000 (UTC) Date: Tue, 21 Oct 2025 21:02:59 +0000 (UTC) From: "Bjoern A. Zeeb" To: Mark Johnston cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: e11768e94787 - main - vmm: Add PRIV_DRIVER checks for passthru ioctls In-Reply-To: <202510211749.59LHnJ49029334@gitrepo.freebsd.org> Message-ID: <5pr96847-3p44-6043-50o4-4np23n9022q3@mnoonqbm.arg> References: <202510211749.59LHnJ49029334@gitrepo.freebsd.org> X-OpenPGP-Key-Id: 0x14003F198FEFA3E77207EE8D2B58B8F83CCF1842 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII; format=flowed X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:3320, ipnet:2003::/19, country:DE] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4crlBS1qwdz42d7 On Tue, 21 Oct 2025, Mark Johnston wrote: > The branch main has been updated by markj: > > URL: https://cgit.FreeBSD.org/src/commit/?id=e11768e94787bef2866486ba8616353716a10447 > > commit e11768e94787bef2866486ba8616353716a10447 > Author: Mark Johnston > AuthorDate: 2025-10-21 17:34:29 +0000 > Commit: Mark Johnston > CommitDate: 2025-10-21 17:34:29 +0000 > > vmm: Add PRIV_DRIVER checks for passthru ioctls > > In preparation for allowing non-root users to create and access bhyve > VMs, add privilege checks for ioctls which operate on passthru devices. Does this mean we need to have a way to give a user a priveledge in order to also use pssthru (likely not easily possible currently; different longer topic I am happy to talk about as it came up elsewhere recently). That said if we go there I think DRIVER may be a dangerous priveledge but then again the user may need to setup interfaces for networking just as well which is kind of orthotognal to the system administration concept. Giving a user PRIV_DRIVER is likely never ever going to be a good idea given the catchall it is used as so we one day might need a more flexible, more finegrained system ... So in conclusion what your commit message is saying (if I understand it right): a user will be allowed to start bhyve but not be allowed to use certain features, like passthru? > Reviewed by: corvink > MFC after: 2 weeks > Sponsored by: The FreeBSD Foundation > Sponsored by: Klara, Inc. > Differential Revision: https://reviews.freebsd.org/D53144 > --- > sys/amd64/vmm/vmm_dev_machdep.c | 18 +++++++++++------- > sys/dev/vmm/vmm_dev.c | 7 +++++++ > sys/dev/vmm/vmm_dev.h | 1 + > 3 files changed, 19 insertions(+), 7 deletions(-) -- Bjoern A. Zeeb r15:7 From nobody Tue Oct 21 22:18:34 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4crmsY36Y5z6D6DC for ; Tue, 21 Oct 2025 22:18:41 +0000 (UTC) (envelope-from markjdb@gmail.com) Received: from mail-qt1-x835.google.com (mail-qt1-x835.google.com [IPv6:2607:f8b0:4864:20::835]) (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 4crmsY1Cdsz3FQt for ; Tue, 21 Oct 2025 22:18:41 +0000 (UTC) (envelope-from markjdb@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-qt1-x835.google.com with SMTP id d75a77b69052e-4e8a25d96ecso6093741cf.0 for ; Tue, 21 Oct 2025 15:18:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1761085119; x=1761689919; darn=freebsd.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:sender:from:to:cc:subject:date:message-id :reply-to; bh=wuXORG2bAoeV/UCX4A3LHwY2OsSKt5lEjCEc0FFrBQQ=; b=SjPSCDaZp4Zq2ON1ToDI3RxxnqUp6jlEZ62ih45CNsRGEmzAQt8CI30Q0SW/SVu2+y 92wPU/LZIw0KYgH5Jn76JwbtzZCy7Oi+KgoVgOQSjJBxcgX3qSuUxpV2B8JgDdXH84vA Cs9GEXqlbIFsedkfKthrDNhA/tfwAYLGKgfxwnESLDXDFsQAqlTBcLItzLHbqXSogVQH UAgy4cRP/RHMXPOx6Z3kG/aYfrBeteW7XuAfaKROER1BQi1JH9Bz7/iooPldSzSZvR+v GFYY9x6gmMGq7Rai3rQwF4OpHeDA7+sAuMyK5rmQovSFjLo38SMsMT1cTSLtT5o8S2ek NX8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761085119; x=1761689919; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:sender:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=wuXORG2bAoeV/UCX4A3LHwY2OsSKt5lEjCEc0FFrBQQ=; b=q9D3UKuZegPl3Z9/q1kCcdLzuFU3bScpXwkk7Jrb90pI8WjKD2inBYFrS05OSafCE9 ldBA7mgW4WXUI3jSGq1jR3hjlT6TO1vyXI5izQFe97BOMimvVKjJpq+U0XS2ISgl2jKR QlwnWyGVDEp5RiMYcDtcTSbrRpLlqruz9pPmdEVCcyvzRBbBcgba7Y4jjR+TyXEVtsi2 nrgAEdGZVJawkZLc94r+5pYZIIu+cGCjS5FyHbV7+TL2kuAY2MYhu4vKDXLA6CLlAlb6 nBd8A2Aili//HXiIe8O+ypr8wufkoJy8pGy1gHEUGUwLAQFHTQmc2BdJQjPODRIHmWgh rjLw== X-Forwarded-Encrypted: i=1; AJvYcCXuNQPd/9Th/WMMmcp4Y2QFRpDjPh+WNRreErEknh0ptgIrKso2o23ZZLp0Rc6jW+8AHRiQtugeInC1P53Df8PgphyhJQ==@freebsd.org X-Gm-Message-State: AOJu0YyF4lERMDz5ke4za+lOfhdhhJ4IXHKpeD/Zy1I9RuN8zX8qIvlu t/DHl+TrXT2Muds8ik0DalfP2pFAG2XvokoG5qX+khxF1NNOO+IR/xxm7Z4CWja0uIE= X-Gm-Gg: ASbGncsmlzrNaIlMKv3CSLURwMYOMD/mgowGIQHAuux5Dje+7cI0rHIx6kfUJc+Mh0E yzNKDsMFbl74FE2m0lsmUCDOdYsjZ0Ze7Vhs0dfONOEnZdUFW3dHUovPkJKMoO3qsCK6N6xehxi 3h6A1/ZmAWTxDrCaak6upHJ8nuDLPM04w8o6sxjco0LN54KGSas03gcXC2mGOLD2GqAWIWpD87P tlx0mpEXkrZFdq0B7fM+xMugIri7suuFbiwTZyYJUwpkoP6tg9tWWeJrT5ifPhKjqhpn7fPpJzy s7eNIhWcbmOPE70e1Vb/ITej5zi44xLTnf/sNWJO+mAi/ZwfdxhHYlePRg30C9RvQKWVnHcudIG Pnf7+ek/uVDeSxz2/CDw+FODq/uX3j5iDmK5ODSuzkB2LjRqswixaUIksb2lXt8KLLRDtuw10uW gro0fknV14LJ6qwlKGEA== X-Google-Smtp-Source: AGHT+IFm6vIF7dxAQRbzeaeBovGWt8Vts2kVLJbeK2QG2YEUP1ZIji5L9+NJ2FwaONI01i694KiHmA== X-Received: by 2002:ac8:5646:0:b0:4e8:9f18:6e5e with SMTP id d75a77b69052e-4e89f187138mr160277451cf.33.1761085118655; Tue, 21 Oct 2025 15:18:38 -0700 (PDT) Received: from nuc (192-0-220-237.cpe.teksavvy.com. [192.0.220.237]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-4e8af0126a9sm77979121cf.12.2025.10.21.15.18.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Oct 2025 15:18:37 -0700 (PDT) Date: Tue, 21 Oct 2025 18:18:34 -0400 From: Mark Johnston To: "Bjoern A. Zeeb" Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: e11768e94787 - main - vmm: Add PRIV_DRIVER checks for passthru ioctls Message-ID: References: <202510211749.59LHnJ49029334@gitrepo.freebsd.org> <5pr96847-3p44-6043-50o4-4np23n9022q3@mnoonqbm.arg> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <5pr96847-3p44-6043-50o4-4np23n9022q3@mnoonqbm.arg> X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4crmsY1Cdsz3FQt On Tue, Oct 21, 2025 at 09:02:59PM +0000, Bjoern A. Zeeb wrote: > On Tue, 21 Oct 2025, Mark Johnston wrote: > > > The branch main has been updated by markj: > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=e11768e94787bef2866486ba8616353716a10447 > > > > commit e11768e94787bef2866486ba8616353716a10447 > > Author: Mark Johnston > > AuthorDate: 2025-10-21 17:34:29 +0000 > > Commit: Mark Johnston > > CommitDate: 2025-10-21 17:34:29 +0000 > > > > vmm: Add PRIV_DRIVER checks for passthru ioctls > > > > In preparation for allowing non-root users to create and access bhyve > > VMs, add privilege checks for ioctls which operate on passthru devices. > > Does this mean we need to have a way to give a user a priveledge in order > to also use pssthru (likely not easily possible currently; different longer > topic I am happy to talk about as it came up elsewhere recently). > > That said if we go there I think DRIVER may be a dangerous priveledge > but then again the user may need to setup interfaces for networking just > as well which is kind of orthotognal to the system administration concept. > > Giving a user PRIV_DRIVER is likely never ever going to be a good idea given > the catchall it is used as so we one day might need a more flexible, more > finegrained system ... > > > So in conclusion what your commit message is saying (if I understand it right): > a user will be allowed to start bhyve but not be allowed to use certain features, > like passthru? That's right. I'd like to make it possible to create and run bhyve VMs as an unprivileged user (provided that they belong to an as-yet uncreated "vmm" group), but passthru functionality will remain root-only. > > Reviewed by: corvink > > MFC after: 2 weeks > > Sponsored by: The FreeBSD Foundation > > Sponsored by: Klara, Inc. > > Differential Revision: https://reviews.freebsd.org/D53144 > > --- > > sys/amd64/vmm/vmm_dev_machdep.c | 18 +++++++++++------- > > sys/dev/vmm/vmm_dev.c | 7 +++++++ > > sys/dev/vmm/vmm_dev.h | 1 + > > 3 files changed, 19 insertions(+), 7 deletions(-) > > -- > Bjoern A. Zeeb r15:7 From nobody Wed Oct 22 03:06:02 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4crvF66Cvfz6DVdd; Wed, 22 Oct 2025 03:06:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4crvF65SL1z3pWV; Wed, 22 Oct 2025 03:06:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761102362; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cFwPD/XsmOwgzIn8TW4CkbELuUDrdC/fzj3KQj8lo1Y=; b=qxPYazVDan1VS0sPzN3R2nUZz5ypxfoNVm9To1fZ1JNhAVmavv3nS7PFF5RwhaDIFRB2cT 2mr6+fnajpa9z1g6ARUg0vt5eC6h1L9pB/o6PYbx8kFgyurSo/uwKMf/kQjySGpCaYzgJb L9zisf1bEzGnz8jg8Ys7wo4Y0IluneL2QOHoyEjldJczgeyGwibxIxL1qd+S0GqVCizY6U BO07b0WMmOJwg0Yu0Rm3pz4n1s4YfYsae3ceYgyd6wefxt+MUjeMdTwn5qfvCiKIRdWXa8 XnZa1IHMopngOmZ+iO/i/rF//MwPe3/cXGZENGGLeEeifaPj6NOO+LOHsSKDRw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761102362; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cFwPD/XsmOwgzIn8TW4CkbELuUDrdC/fzj3KQj8lo1Y=; b=FtPkw4M7zARSomMLK1yBZlkoQFw/1RIs3OrehJ9CGdvPPYktaFEOYZQvmiKBlIISU56+k0 EWTCEqZEzbMLsDH7IKvVQS0iWcQElEWjWJofEXlYoqRiCEb41MgdXaagtMmhtgFECnvN03 +q2SoGZXpNPbpbpQbuIQcKPRLhp4hfSEEbyP3N+ap0IgGI92YKfDiDd3kNuqcqcHEJDpUq vd87UOTI1F1nbIR192gcL3hwfYOJM92GZBZMvIdWdbEJeNMgPsJIL8bgx83bxfn4AkWwP8 tj594ScO07vk282V0DPlRhQOwqi3NNyt2J7XYW+h/j7KzM+PB4kLCLHuf9WMPg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761102362; a=rsa-sha256; cv=none; b=Md2d2ZeRh1q8Xm3Qd0WOrHcprPm22Isvo7A5GGjtVGxRpmP7zfpOlP79hi54EK6XqTEhjl teHGbaQhUIOBpSbWDI97U45rs5bBpGaNKVS5PhHrOoXxjFQZMSitX5nbvjw3PniXVqtwBW 4b5G6dVwI70mhRPY7PYMnfFUuRxlK6Pi4C2aoTkdLsevrFAOsWiArus57gfXjPhNjDSBdu ts4Kl8JUDIdQGUZSJVGknRoowntf2+YsVvNzCFs8jcHkSro6/lXYp2vQHrdwlIAllGFcrx BQBqeQt5QGjAqwiXLXzflDnlT8zuRNJEtO7039OkvcrgriOmLA9HYUtFe/EjwQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4crvF653xwz1QPp; Wed, 22 Oct 2025 03:06: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 59M362N1085767; Wed, 22 Oct 2025 03:06:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59M362l0085764; Wed, 22 Oct 2025 03:06:02 GMT (envelope-from git) Date: Wed, 22 Oct 2025 03:06:02 GMT Message-Id: <202510220306.59M362l0085764@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Maxim Konovalov Subject: git: cdc199039308 - main - bsd-family-tree: add OpenBSD 7.8 release List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: maxim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cdc1990393084fb00a85abc7557f9a92a2059ea2 Auto-Submitted: auto-generated The branch main has been updated by maxim: URL: https://cgit.FreeBSD.org/src/commit/?id=cdc1990393084fb00a85abc7557f9a92a2059ea2 commit cdc1990393084fb00a85abc7557f9a92a2059ea2 Author: Maxim Konovalov AuthorDate: 2025-10-22 03:05:23 +0000 Commit: Maxim Konovalov CommitDate: 2025-10-22 03:05:23 +0000 bsd-family-tree: add OpenBSD 7.8 release --- share/misc/bsd-family-tree | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/share/misc/bsd-family-tree b/share/misc/bsd-family-tree index b1614c7eb409..b0502dfc7925 100644 --- a/share/misc/bsd-family-tree +++ b/share/misc/bsd-family-tree @@ -479,7 +479,7 @@ FreeBSD 5.2 | | | | | | | | | DragonFly 6.4.1 | | | | | DragonFly 6.4.2 | FreeBSD | | | | - | 14.3 | | | | + | 14.3 | | OpenBSD 7.8 | | | | | | FreeBSD 16 -current | NetBSD -current OpenBSD -current DragonFly -current | | | | | @@ -925,6 +925,7 @@ OpenBSD 7.7 2025-04-28 [OBD] DragonFly 6.4.1 2025-04-30 [DFB] DragonFly 6.4.2 2025-05-09 [DFB] FreeBSD 14.3 2025-06-10 [FBD] +OpenBSD 7.8 2025-10-22 [OBD] Bibliography ------------------------ From nobody Wed Oct 22 05:15:52 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cry763HTcz6Dfxd; Wed, 22 Oct 2025 05:16:02 +0000 (UTC) (envelope-from zlei@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cry762SHTz42Fy; Wed, 22 Oct 2025 05:16:02 +0000 (UTC) (envelope-from zlei@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761110162; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Ft2hCunLZtxDJ881mn9Vupq1/h/Mj5dH4Y+swu7gGBI=; b=qeoaxVKhKJfb1yNaAjYMbqYQ4vNcP4s084FkVqzz+0sP80xrGTvyWOIhf1HVDh1TLASoYo vTDB4jEJuu0orXChUyjEjtc15tYLV5Yb3VZkYrjeF3knYUC5Rs4r0HdvoA1U4/FOccQrMz uI8w9H9scyuM/9CoYchUamy/W2mXR3XVesr7Msn3jr7ZGmkz6kTcBUYO+I8GCivrQfv1ck 3cjJYxSDAK2fh8phGJi77/a59d/KMNLENis7ZLpCOSyQHoKnGh7QUN4uAh7cVqI9fKqYnj FJ5zkU3lrcIw+jKCiQ8allZpunRbN07hP0Nyh58bMKVGE2hvr7ZdbhMFG6VcBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761110162; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Ft2hCunLZtxDJ881mn9Vupq1/h/Mj5dH4Y+swu7gGBI=; b=PJ8adEosI2mK598FmXtzrKPig9iAN4wlsogQLJArxc+Mpf+fS7spVZjgVNp4ZlNSdsZfak 3pVNGB6LzvN/mYQwzerEssGL9Ztivgj2NUYuRoOi3Nm6T53bGzMjqokgqSdj83wRxuXsw+ tT+3nVOlFm4hfNtKDjnOPP2VyAPuzaw6X/rFEUEeONRC1c0ikr1sWG9WH68DVrUdaHIk83 nis9oRcABds+KnRLqKnNstcrHR7J0cAJHmNch+IswVAiSYC4W+Zfb1Ebc3uikLrbg8bOIU Zb6wKyyVOTSNnzTYxzxISyf4+6c5OBCYaMb2yQToLXzpXYUEFpsEracqwMw/AQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761110162; a=rsa-sha256; cv=none; b=X0goCxS+Accl5AGC75+j7obadJioYaPkR2vA/uM1HlNqDN0Hx5yspwjtNSMjBViIYyWRdQ E/7EuMCjJEgFZREFWOUsw25kUqwFJgryn1W5BhG4VjmMrqiHIRX4ty++/XzDhmp/is16xm hGq182EJ7l8XoyRcT1gEEJGJeHOM8dOZCpWwCZNSx6jo4C4Vb6XUrtk1OEpAKHAKR0fAoH qCzWa9INvdoaQulaH685zsPGiiwFAizP2TWZBVIXKAXhNdJJhB2eMkEG6VNx2ekryKi0Jr MwkobcLo5VnMEZt7x4CXQjfiIbf/exsL/VylDL4z1WNjoFZr2i8W73XF9Z/uEw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from smtpclient.apple (ns1.oxydns.net [45.32.91.63]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: zlei/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4cry7500lkz10MV; Wed, 22 Oct 2025 05:16:00 +0000 (UTC) (envelope-from zlei@FreeBSD.org) Content-Type: text/plain; charset=us-ascii List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3696.120.41.1.10\)) Subject: Re: git: 5522519731b7 - main - modules: enable allwinner kmods on riscv From: Zhenlei Huang In-Reply-To: <202510202342.59KNgHDl091154@gitrepo.freebsd.org> Date: Wed, 22 Oct 2025 13:15:52 +0800 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: <8FF166A8-80E3-461C-88E8-2BE0BD6239A9@FreeBSD.org> References: <202510202342.59KNgHDl091154@gitrepo.freebsd.org> To: Mitchell Horne X-Mailer: Apple Mail (2.3696.120.41.1.10) Hi Mitchell, The riscv LINT kernel build fails with this change, ``` $ make buildkernel TARGET_ARCH=3Driscv64 KERNCONF=3DLINT =3D=3D=3D> allwinner/aw_sid (all) cc -target riscv64-unknown-freebsd16.0 = --sysroot=3D/usr/obj/home/zlei/freebsd-src/riscv.riscv64/tmp = -B/usr/obj/home/zlei/freebsd-src/riscv.riscv64/tmp/usr/bin -O2 -pipe = -fno-common -march=3Drv64imafdc -mabi=3Dlp64d -fno-strict-aliasing = -Werror -D_KERNEL -DKLD_MODULE -DKLD_TIED -nostdinc = -DHAVE_KERNEL_OPTION_HEADERS -include = /usr/obj/home/zlei/freebsd-src/riscv.riscv64/sys/LINT/opt_global.h -I. = -I/home/zlei/freebsd-src/sys = -I/home/zlei/freebsd-src/sys/contrib/ck/include -fno-common -g = -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -fPIC = -fdebug-prefix-map=3D./machine=3D/home/zlei/freebsd-src/sys/riscv/include = -I/usr/obj/home/zlei/freebsd-src/riscv.riscv64/sys/LINT -fno-builtin = -MD -MF.depend.aw_sid.o -MTaw_sid.o -march=3Drv64imafdch -mabi=3Dlp64 = -mno-relax -ffreestanding -fwrapv -fstack-protector -gdwarf-4 -Wall = -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Wcast-qual = -Wundef -Wno-pointer-sign -D__printf__=3D__freebsd_kprintf__ = -Wmissing-include-dirs -fdiagnostics-show-option -Wno-unknown-pragmas = -Wswitch -Wno-error=3Dtautological-compare -Wno-error=3Dempty-body = -Wno-error=3Dparentheses-equality -Wno-error=3Dunused-function = -Wno-error=3Dpointer-sign -Wno-error=3Dshift-negative-value = -Wno-address-of-packed-member -Wno-format-zero-length -mcmodel=3Dmedium = -std=3Dgnu17 -c /home/zlei/freebsd-src/sys/arm/allwinner/aw_sid.c -o = aw_sid.o /home/zlei/freebsd-src/sys/arm/allwinner/aw_sid.c:48:10: fatal error: = 'nvmem_if.h' file not found 48 | #include "nvmem_if.h" | ^~~~~~~~~~~~ 1 error generated. *** Error code 1 ``` Best regards, Zhenlei > On Oct 21, 2025, at 7:42 AM, Mitchell Horne = wrote: >=20 > The branch main has been updated by mhorne: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3D5522519731b74e7b56c710ec5ea4d340= 65f3ed32 >=20 > commit 5522519731b74e7b56c710ec5ea4d34065f3ed32 > Author: Mitchell Horne > AuthorDate: 2024-09-18 17:19:16 +0000 > Commit: Mitchell Horne > CommitDate: 2025-10-20 23:37:13 +0000 >=20 > modules: enable allwinner kmods on riscv >=20 > While here, standardize the place they are enabled in the Makefile. = For > armv7 the module subdirectory was added explicitly in the config = file, > but this is not idiomatic. >=20 > MFC after: 3 days > Sponsored by: The FreeBSD Foundation > --- > sys/arm/conf/GENERIC | 1 - > sys/arm/conf/NOTES | 1 - > sys/modules/Makefile | 2 +- > 3 files changed, 1 insertion(+), 3 deletions(-) >=20 > diff --git a/sys/arm/conf/GENERIC b/sys/arm/conf/GENERIC > index 7394f3842d43..9607b16756ea 100644 > --- a/sys/arm/conf/GENERIC > +++ b/sys/arm/conf/GENERIC > @@ -272,5 +272,4 @@ makeoptions MODULES_EXTRA+=3D"dtb/rpi" > makeoptions MODULES_EXTRA+=3D"dtb/zynq" >=20 > # SOC-specific modules > -makeoptions MODULES_EXTRA+=3D"allwinner" > makeoptions MODULES_EXTRA+=3D"imx" > diff --git a/sys/arm/conf/NOTES b/sys/arm/conf/NOTES > index 920d721dc3ba..0a5d34c3849a 100644 > --- a/sys/arm/conf/NOTES > +++ b/sys/arm/conf/NOTES > @@ -94,7 +94,6 @@ nodevice bnxt >=20 > # Build SOC-specific modules... >=20 > -makeoptions MODULES_EXTRA+=3D"allwinner" > makeoptions MODULES_EXTRA+=3D"imx" >=20 > # Build dtb files... > diff --git a/sys/modules/Makefile b/sys/modules/Makefile > index 63a0b3260e6d..9ec7c33465f3 100644 > --- a/sys/modules/Makefile > +++ b/sys/modules/Makefile > @@ -680,6 +680,7 @@ _irdma=3D irdma > .if ${MACHINE_CPUARCH} =3D=3D "aarch64" || ${MACHINE_CPUARCH} =3D=3D = "arm" || \ > ${MACHINE_CPUARCH} =3D=3D "riscv" > .if !empty(OPT_FDT) > +_allwinner=3D allwinner > _if_cgem=3D if_cgem > .endif > .endif > @@ -713,7 +714,6 @@ _hyperv=3D hyperv > _vf_i2c=3D vf_i2c >=20 > .if !empty(OPT_FDT) > -_allwinner=3D allwinner > _dwwdt=3D dwwdt > _enetc=3D enetc > _felix=3D felix From nobody Wed Oct 22 07:07:12 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cs0bN5gXNz6DpBY; Wed, 22 Oct 2025 07:07:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cs0bN3R6bz3F3d; Wed, 22 Oct 2025 07:07:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761116832; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EHWOmqlYzdgTNaJ4blZdF8gxSNIEe5hTVfVbpQfZeao=; b=DmWr6Hc3J+q3TonTMuaF/NAruF3LFEsUGf9PoE8304N2ANBynuf7pNjvVbGRgrMw3VNrdp cYDJ4KTQlrFOobc+O723ftWfXCXaHWfX7B364P9TeWPU04Yw4iw9fEn4nEqi0ItlU5S6C1 Ta60bH1bFsfoPJgOfC7ogIM9bXTPtyndKjOT6o9IiqLSZhaw9D1Y3ufMV5AyUR0APUZIK3 VCGQCwRBggJlj/6rEI3ltj/wPE0wclcUxYuFNRx7tFlsvYJvVWyxuGH2M2nJc19Sc8BXm5 b3x03/rLFLzcnCkbFGd84d2JCUxDOlC/OaE+pCzkR3vMGXmmEyZl0mRI6o3EKA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761116832; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EHWOmqlYzdgTNaJ4blZdF8gxSNIEe5hTVfVbpQfZeao=; b=NwS1rF28z7fnlLCfFGLVl/UWAfPW0fmUhGo8VP1m4nGIV1Yuu4XSrJMu9E6rXSp9OwpKvT 117yMCDvy1+IbDM4fSPi4rkkt7qWCioArPGx1W657kl+5+E+MGRELDAJKE9O7qIsodC07f HbpUcudv1YFXQ65AgXAYR5fHzlLVvRhSLHd2JwOR4SlvuzUtHqYfaR0Xk9pgnA1dvxA4Sq OHZZloj2ybKb/j/pFy8MyFvlBoj5b8wsPmMPbwXr6DaDyRxkE1U2mbSDR6yAlRCDwJzVej 0tjVMj6ZXDPTU7tUIT/FAlsVknx4mVOVJLTvGAmKNQyd7fOQki1nGueQ0WJsCQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761116832; a=rsa-sha256; cv=none; b=rtbBIlQzHaTbGI/TJr5zRdVvTCCtjrEv4dkXnpirX5X/qSLdGyIPDkQTOsGYAylUYzBf9m W2usy5Cp4iwsjPSxbGsgLv5GHnftMwdBBNLt1xgpJZmL7OquJi+4+evUrkgkcUs1nFW4+N 2ltmSXAFQCWXEHCOOj8T9DNCCoSAObmRvj58t0L0z8hvSpt5vwyJcWNnkTnMZm6Tecf4RZ 3RUiEhLMp3zsrUaEMOHGgpiSj53tXZvMLrpTDXft5VQ7gdo8Ump6Gd1MSGVg2bNHQNjnIg RFPmG2h/qNqfzSXYeUgfqPqx0Mv6n/FsPuZlbQok4SbxZ4Mez19pAFUkqnaQyg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cs0bN2pFlz3nP; Wed, 22 Oct 2025 07:07: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 59M77C9K038504; Wed, 22 Oct 2025 07:07:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59M77CHp038501; Wed, 22 Oct 2025 07:07:12 GMT (envelope-from git) Date: Wed, 22 Oct 2025 07:07:12 GMT Message-Id: <202510220707.59M77CHp038501@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "David E. O'Brien" Subject: git: 3a12982962ce - main - random: add RDSEED as a provably unique entropy source List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: obrien X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3a12982962ce330c37c154bb2eb8ae0539fc6f48 Auto-Submitted: auto-generated The branch main has been updated by obrien: URL: https://cgit.FreeBSD.org/src/commit/?id=3a12982962ce330c37c154bb2eb8ae0539fc6f48 commit 3a12982962ce330c37c154bb2eb8ae0539fc6f48 Author: David E. O'Brien AuthorDate: 2025-10-17 03:20:23 +0000 Commit: David E. O'Brien CommitDate: 2025-10-22 06:59:59 +0000 random: add RDSEED as a provably unique entropy source NIST SP800-90B allows for only a single entropy source to be claimed in a FIPS-140-3 certificate. In addition, only hardware sources that have a NIST Entropy Source Validation (ESV) certificate, backed by a SP800-90B Entropy Assessment Report, are usable. Intel has obtained ESV certificates for several of their processors, so RDSEED is a FIPS-140-3 suitable entropy source. However, even though RDRAND is seeded by RDSEED internally, RDRAND would need a RBG certificate and CAVP testing run on the DRBG in order to use it for FIPS-140-3 (SP800-90B) purposes. So we need to know down in the CSPRNG-subsystem which source the entropy came from. In light of the potential issues surrounding AMD Zen 5 CPU's RDSEED implementation[*], allow RDSEED to be disabled in loader.conf. [*] https://www.phoronix.com/news/AMD-EPYC-Turin-RDSEED-Bug Reviewed by: cem MFC after: 3 days Sponsored by: Juniper Networks Differential Revision: https://reviews.freebsd.org/D53150 --- sys/conf/files.x86 | 1 + sys/dev/random/ivy.c | 69 +++++----------- sys/dev/random/random_harvestq.c | 1 + sys/dev/random/rdseed.c | 169 +++++++++++++++++++++++++++++++++++++++ sys/modules/Makefile | 2 + sys/modules/rdrand_rng/Makefile | 5 -- sys/modules/rdseed_rng/Makefile | 9 +++ sys/sys/random.h | 1 + 8 files changed, 202 insertions(+), 55 deletions(-) diff --git a/sys/conf/files.x86 b/sys/conf/files.x86 index 953da7dd1284..21a1b8046f12 100644 --- a/sys/conf/files.x86 +++ b/sys/conf/files.x86 @@ -311,6 +311,7 @@ dev/ntb/test/ntb_tool.c optional ntb_tool dev/nvram/nvram.c optional nvram isa dev/random/ivy.c optional rdrand_rng !random_loadable dev/random/nehemiah.c optional padlock_rng !random_loadable +dev/random/rdseed.c optional rdrand_rng !random_loadable dev/qat_c2xxx/qat.c optional qat_c2xxx dev/qat_c2xxx/qat_ae.c optional qat_c2xxx dev/qat_c2xxx/qat_c2xxx.c optional qat_c2xxx diff --git a/sys/dev/random/ivy.c b/sys/dev/random/ivy.c index fa1e4831f1b9..3eb0f261e6dc 100644 --- a/sys/dev/random/ivy.c +++ b/sys/dev/random/ivy.c @@ -1,6 +1,6 @@ /*- + * Copyright (c) 2013, 2025, David E. O'Brien * Copyright (c) 2013 The FreeBSD Foundation - * Copyright (c) 2013 David E. O'Brien * Copyright (c) 2012 Konstantin Belousov * All rights reserved. * @@ -48,7 +48,6 @@ #define RETRY_COUNT 10 -static bool has_rdrand, has_rdseed; static u_int random_ivy_read(void *, u_int); static const struct random_source random_ivy = { @@ -57,13 +56,7 @@ static const struct random_source random_ivy = { .rs_read = random_ivy_read }; -SYSCTL_NODE(_kern_random, OID_AUTO, rdrand, CTLFLAG_RW | CTLFLAG_MPSAFE, 0, - "rdrand (ivy) entropy source"); static bool acquire_independent_seed_samples = false; -SYSCTL_BOOL(_kern_random_rdrand, OID_AUTO, rdrand_independent_seed, - CTLFLAG_RWTUN, &acquire_independent_seed_samples, 0, - "If non-zero, use more expensive and slow, but safer, seeded samples " - "where RDSEED is not present."); static bool x86_rdrand_store(u_long *buf) @@ -99,45 +92,6 @@ x86_rdrand_store(u_long *buf) return (true); } -static bool -x86_rdseed_store(u_long *buf) -{ - u_long rndval; - int retry; - - retry = RETRY_COUNT; - __asm __volatile( - "1:\n\t" - "rdseed %1\n\t" /* read randomness into rndval */ - "jc 2f\n\t" /* CF is set on success, exit retry loop */ - "dec %0\n\t" /* otherwise, retry-- */ - "jne 1b\n\t" /* and loop if retries are not exhausted */ - "2:" - : "+r" (retry), "=r" (rndval) : : "cc"); - *buf = rndval; - return (retry != 0); -} - -static bool -x86_unimpl_store(u_long *buf __unused) -{ - - panic("%s called", __func__); -} - -DEFINE_IFUNC(static, bool, x86_rng_store, (u_long *buf)) -{ - has_rdrand = (cpu_feature2 & CPUID2_RDRAND); - has_rdseed = (cpu_stdext_feature & CPUID_STDEXT_RDSEED); - - if (has_rdseed) - return (x86_rdseed_store); - else if (has_rdrand) - return (x86_rdrand_store); - else - return (x86_unimpl_store); -} - /* It is required that buf length is a multiple of sizeof(u_long). */ static u_int random_ivy_read(void *buf, u_int c) @@ -148,7 +102,7 @@ random_ivy_read(void *buf, u_int c) KASSERT(c % sizeof(*b) == 0, ("partial read %d", c)); b = buf; for (count = c; count > 0; count -= sizeof(*b)) { - if (!x86_rng_store(&rndval)) + if (!x86_rdrand_store(&rndval)) break; *b++ = rndval; } @@ -158,18 +112,33 @@ random_ivy_read(void *buf, u_int c) static int rdrand_modevent(module_t mod, int type, void *unused) { + struct sysctl_ctx_list ctx; + struct sysctl_oid *o; + bool has_rdrand, has_rdseed; int error = 0; + has_rdrand = (cpu_feature2 & CPUID2_RDRAND); + has_rdseed = (cpu_stdext_feature & CPUID_STDEXT_RDSEED); + switch (type) { case MOD_LOAD: - if (has_rdrand || has_rdseed) { + if (has_rdrand && !has_rdseed) { + sysctl_ctx_init(&ctx); + o = SYSCTL_ADD_NODE(&ctx, SYSCTL_STATIC_CHILDREN(_kern_random), + OID_AUTO, "rdrand", CTLFLAG_RW | CTLFLAG_MPSAFE, 0, + "rdrand (ivy) entropy source"); + SYSCTL_ADD_BOOL(&ctx, SYSCTL_CHILDREN(o), OID_AUTO, + "rdrand_independent_seed", CTLFLAG_RDTUN, + &acquire_independent_seed_samples, 0, + "If non-zero, use more expensive and slow, but safer, seeded samples " + "where RDSEED is not present."); random_source_register(&random_ivy); printf("random: fast provider: \"%s\"\n", random_ivy.rs_ident); } break; case MOD_UNLOAD: - if (has_rdrand || has_rdseed) + if (has_rdrand && !has_rdseed) random_source_deregister(&random_ivy); break; diff --git a/sys/dev/random/random_harvestq.c b/sys/dev/random/random_harvestq.c index 2d7af254c52c..96676e8694bf 100644 --- a/sys/dev/random/random_harvestq.c +++ b/sys/dev/random/random_harvestq.c @@ -666,6 +666,7 @@ static const char *random_source_descr[ENTROPYSOURCE] = { [RANDOM_PURE_GLXSB] = "PURE_GLXSB", [RANDOM_PURE_HIFN] = "PURE_HIFN", [RANDOM_PURE_RDRAND] = "PURE_RDRAND", + [RANDOM_PURE_RDSEED] = "PURE_RDSEED", [RANDOM_PURE_NEHEMIAH] = "PURE_NEHEMIAH", [RANDOM_PURE_RNDTEST] = "PURE_RNDTEST", [RANDOM_PURE_VIRTIO] = "PURE_VIRTIO", diff --git a/sys/dev/random/rdseed.c b/sys/dev/random/rdseed.c new file mode 100644 index 000000000000..af084aab4ed9 --- /dev/null +++ b/sys/dev/random/rdseed.c @@ -0,0 +1,169 @@ +/*- + * Copyright (c) 2013, 2025, David E. O'Brien + * Copyright (c) 2013 The FreeBSD Foundation + * Copyright (c) 2012 Konstantin Belousov + * All rights reserved. + * + * Portions of this software were 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 + * in this position and unchanged. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include + +#include + +#define RETRY_COUNT 10 + +static u_int random_rdseed_read(void *, u_int); + +static struct random_source random_rdseed = { + .rs_ident = "Intel Secure Key Seed", + .rs_source = RANDOM_PURE_RDSEED, + .rs_read = random_rdseed_read +}; + +SYSCTL_NODE(_kern_random, OID_AUTO, rdseed, CTLFLAG_RW, 0, + "rdseed (x86) entropy source"); +/* XXX: kern.random.rdseed.enabled=0 also disables RDRAND */ +static bool enabled = true; +SYSCTL_BOOL(_kern_random_rdseed, OID_AUTO, enabled, CTLFLAG_RDTUN, &enabled, 0, + "If zero, disable the use of RDSEED."); + +static bool +x86_rdseed_store(u_long *buf) +{ + u_long rndval; + int retry; + + retry = RETRY_COUNT; + __asm __volatile( + "1:\n\t" + "rdseed %1\n\t" /* read randomness into rndval */ + "jc 2f\n\t" /* CF is set on success, exit retry loop */ + "dec %0\n\t" /* otherwise, retry-- */ + "jne 1b\n\t" /* and loop if retries are not exhausted */ + "2:" + : "+r" (retry), "=r" (rndval) : : "cc"); + *buf = rndval; + return (retry != 0); +} + +/* It is required that buf length is a multiple of sizeof(u_long). */ +static u_int +random_rdseed_read(void *buf, u_int c) +{ + u_long *b, rndval; + u_int count; + + KASSERT(c % sizeof(*b) == 0, ("partial read %d", c)); + b = buf; + for (count = c; count > 0; count -= sizeof(*b)) { + if (!x86_rdseed_store(&rndval)) + break; + *b++ = rndval; + } + return (c - count); +} + +static int +rdseed_modevent(module_t mod, int type, void *unused) +{ + bool has_rdseed; + int error = 0; + + has_rdseed = (cpu_stdext_feature & CPUID_STDEXT_RDSEED); + + switch (type) { + case MOD_LOAD: + if (has_rdseed && enabled) { + random_source_register(&random_rdseed); + printf("random: fast provider: \"%s\"\n", random_rdseed.rs_ident); + } + break; + + case MOD_UNLOAD: + if (has_rdseed) + random_source_deregister(&random_rdseed); + break; + + case MOD_SHUTDOWN: + break; + + default: + error = EOPNOTSUPP; + break; + + } + + return (error); +} + +static moduledata_t rdseed_mod = { + "rdseed", + rdseed_modevent, + 0 +}; + +DECLARE_MODULE(rdseed, rdseed_mod, SI_SUB_RANDOM, SI_ORDER_FOURTH); +MODULE_VERSION(rdseed, 1); +MODULE_DEPEND(rdseed, random_harvestq, 1, 1, 1); + +/* + * Intel's RDSEED Entropy Assessment Report min-entropy claim is 0.6 Shannons + * per bit of data output. Rrefer to the following Entropy Source Validation + * (ESV) certificates: + * + * E#87: Junos OS Physical Entropy Source - Broadwell EP 10-Core Die + * Broadwell-EP-10 FCLGA2011 Intel(R) Xeon(R) E5-2620 V4 Processor + * https://csrc.nist.gov/projects/cryptographic-module-validation-program/entropy-validations/certificate/87 + * (URLs below omitted for brevity but follow same format.) + * + * E#121: Junos OS Physical Entropy Source - Intel Atom C3000 Series + * (Denverton) 16 Core Die with FCBGA1310 Package + * + * E#122: Junos OS Physical Entropy Source - Intel Xeon D-1500 Family + * (Broadwell) 8 Core Die with FCBGA1667 Package + * + * E#123: Junos OS Physical Entropy Source - Intel Xeon D-2100 Series + * (Skylake) 18 Core Die with FCBGA2518 Package + * + * E#141: Junos OS Physical Entropy Source - Intel Xeon D-10 Series + * (Ice Lake-D-10) Die with FCBGA2227 Package + * + * E#169: Junos OS Physical Entropy Source - Intel Xeon AWS-1000 v4 and + * E5 v4 (Broadwell EP) 15 Core Die with FCLGA2011 Package + */ diff --git a/sys/modules/Makefile b/sys/modules/Makefile index 3086be864307..9bc743c0c6d1 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -347,6 +347,7 @@ SUBDIR= \ rc4 \ ${_rdma} \ ${_rdrand_rng} \ + ${_rdseed_rng} \ re \ rl \ ${_rockchip} \ @@ -820,6 +821,7 @@ _nvram= nvram _padlock= padlock _padlock_rng= padlock_rng _rdrand_rng= rdrand_rng +_rdseed_rng= rdseed_rng .endif _pchtherm = pchtherm _s3= s3 diff --git a/sys/modules/rdrand_rng/Makefile b/sys/modules/rdrand_rng/Makefile index 7fa7a8bb8fb9..496fc863033f 100644 --- a/sys/modules/rdrand_rng/Makefile +++ b/sys/modules/rdrand_rng/Makefile @@ -6,9 +6,4 @@ SRCS+= bus_if.h device_if.h CFLAGS+= -I${SRCTOP}/sys -# ld.bfd doesn't support ifuncs invoked non-PIC -.if ${MACHINE_CPUARCH} == "i386" -CFLAGS.gcc= -fPIC -.endif - .include diff --git a/sys/modules/rdseed_rng/Makefile b/sys/modules/rdseed_rng/Makefile new file mode 100644 index 000000000000..6593505546dd --- /dev/null +++ b/sys/modules/rdseed_rng/Makefile @@ -0,0 +1,9 @@ +.PATH: ${SRCTOP}/sys/dev/random + +KMOD= rdseed_rng +SRCS= rdseed.c +SRCS+= bus_if.h device_if.h + +CFLAGS+= -I${SRCTOP}/sys + +.include diff --git a/sys/sys/random.h b/sys/sys/random.h index 2a68f0c99b6d..dca30dc8fde4 100644 --- a/sys/sys/random.h +++ b/sys/sys/random.h @@ -94,6 +94,7 @@ enum random_entropy_source { RANDOM_PURE_GLXSB, RANDOM_PURE_HIFN, RANDOM_PURE_RDRAND, + RANDOM_PURE_RDSEED, RANDOM_PURE_NEHEMIAH, RANDOM_PURE_RNDTEST, RANDOM_PURE_VIRTIO, From nobody Wed Oct 22 07:36:43 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cs1FR6bQjz6DrJ1; Wed, 22 Oct 2025 07:36:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cs1FR63DYz3HlD; Wed, 22 Oct 2025 07:36:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761118603; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/387AhbtAqRReT+Y2+n4wDGyhn95MBtMlJFQQjfKwgQ=; b=BoxSocOcNH9NTLlbAblFdmymj3yy0iM4oLotV4HN/dcFYgL0Fsa1rdwoBPeUce3V9yHwGv TUtOsbvrujiqOrmG56BhDywec0GCTILoV8QDpp/ppld4mghdNW54DOGAmncXrecnPShdgf Tc60gUEdri1CiyRs5DMG3/LRtSpzmvRna/WN21QUcvXXwmrISiKxJSm7xkTEaWIt9o3qog LO2edMi5tqByNZ9oUvlvjYijZkcdpAKvKfIV5a53UIc1RiZOFEHeLXCfFnypMEmERLLWC2 4FwJ1FKeWq0NnkFRGxHNoPLpnVrQeYv8+uo/5fxyEpobdGLE77bF+wUlCsXcMQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761118603; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/387AhbtAqRReT+Y2+n4wDGyhn95MBtMlJFQQjfKwgQ=; b=yhlGV7OIMwBwPc80DTDWDImw2ch7p1xN6LrXGjF6kcpjeqB4p0U45r70Kmt+UcVtfOc1We sSvDyPwLEd7HClyaO2Jf+bpt+QaR3dpxWPQnJSPBCteKtDNu62ekSQXA4Q81DL2uBHDY+b siyQR623qts6+SSVJs2jPbi854HBxUkx8jztJ2nALbX46rOlQyZZdhrQYkT5YfY0EoIXH0 h+ZeSjIEWmLY41lPOLZk2EdskxM3RGQB4md/pjrwKAQQskSr5qq2qQj5+nNsJ9CHDaPXhr cwR0MwOF9ayyNL5NL541MVSkElMBLsLnlyKk5R+Ei4i39D1uPjkGanfEpwxHgA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761118603; a=rsa-sha256; cv=none; b=tA9tW1IRij2x/QHf/XV2EGPyrioAN/dldcQglkaE1ZFRSfdPeYQjVdHlKCOYuWrILahVwk C7CBm+VHEcX8HJbv0sAYLRfahG3wYZEMgOWEuHUnYJt22anB+qfTmkphm7+HhjO5ObSp7h Tb7z6iXElkZ4111poXEfl2jktmIHF3GLP8hyzB2NU+yghA2oB0412UZb/C3SZHN2uPB9NK hzHWO1gG4cok/NG3VtwnXD/nE/zL7z07Sa5qHSvgMWuaNYXOqAS7cugfLxs6wPkK56b9XO HUYEZQqyM3WVGqqZWlfZSqAhsbfFEdpfqpAlvh5Hz3tIqwu8yO+3xfHKN59o6g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cs1FR5bbKz3m9; Wed, 22 Oct 2025 07:36: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 59M7ahpl094546; Wed, 22 Oct 2025 07:36:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59M7ahv9094543; Wed, 22 Oct 2025 07:36:43 GMT (envelope-from git) Date: Wed, 22 Oct 2025 07:36:43 GMT Message-Id: <202510220736.59M7ahv9094543@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: daac364e6115 - main - tcp: fix typo in comment List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: daac364e611532c7bfd4bb20f9fea8d365496aa1 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=daac364e611532c7bfd4bb20f9fea8d365496aa1 commit daac364e611532c7bfd4bb20f9fea8d365496aa1 Author: Peter Lei AuthorDate: 2025-10-21 09:18:32 +0000 Commit: Michael Tuexen CommitDate: 2025-10-21 09:20:00 +0000 tcp: fix typo in comment Reviewed by: tuexen MFC after: 3 days Sponsored by: Netflix, Inc. --- sys/netinet/tcp_syncache.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/tcp_syncache.c b/sys/netinet/tcp_syncache.c index be20fb44a820..3cb538f7054d 100644 --- a/sys/netinet/tcp_syncache.c +++ b/sys/netinet/tcp_syncache.c @@ -1168,7 +1168,7 @@ syncache_expand(struct in_conninfo *inc, struct tcpopt *to, struct tcphdr *th, /* * If listening socket requested TCP digests, check that * received ACK has signature and it is correct. - * If not, drop the ACK and leave sc entry in th cache, + * If not, drop the ACK and leave sc entry in the cache, * because SYN was received with correct signature. */ if (sc->sc_flags & SCF_SIGNATURE) { From nobody Wed Oct 22 11:51:33 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cs6vT3xRjz6F98W; Wed, 22 Oct 2025 11:51:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cs6vT3CxWz3dX0; Wed, 22 Oct 2025 11:51:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761133893; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MxuNO9vH7bdkMw4CJVOokWG3kE/da2c2MtzBG30faac=; b=gL4GoBq/dHcb8jbOfxoAZ5FezgwgMDTRJ76kcm819q6K2Wxy31KU4I7OV/rRxMO3bCYXW9 vASQ2e2IGe5XFTd0TW2MIpR4qKK+Uf+Uh5I1Q1pMaAkk3KpzE9pJC6Zx6JP99UzoP8DxgY SMdtgWUPrAL+ySJLDpzWfu3318udzm5MJFM+hBGNngn2SKpWvErDX7QXR0qwSllXmmiCcW eirr2/J2PxhBQfPf/SOe8wMnKuwQhDSknSG6kWKrc+yzIlgvDMjP8naAjYS253y0CXKS7S 7WhmZTIm0uH7r+38ctaIvYePXg3Iv5sedPnifatOrbY2aEkzbrHtp9jX9s1XTA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761133893; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MxuNO9vH7bdkMw4CJVOokWG3kE/da2c2MtzBG30faac=; b=HV+fntSAVlmsYiEvPuaHpF5AV4PsdpWstTVlRoRJBlfPr/anJzbi0inR84XwFJtpEsNN36 84bw+JDgDNLSDqLv0sMZrpX1DHtKzI+jgmddTE6UB9kwdb3j8hMxmu+Mwg3kmRX3gu2dN5 bQuPxlhNDbrWT6uaFo9IUZpq4ZVyD8qyOA4u2TctBLhlS8Zx0AzYD828UMZObC47eESfYY fLk6XTvqi6TabSqm4i2se4zfEOISA81CU5zb0WO9aFHg4pBS2ei4xumeU6QaMgK+Q42Rny MN8VX9gFmpNwSEXfuBrzlbL1vUnC7CJSKDaXdU5/vgDtyXGiECrcAo8msUSIzg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761133893; a=rsa-sha256; cv=none; b=S4HTT9LIlYsmrR9bkm4oiWBM9p4ZnL76f4ucZZPIVWz5wIJt65eTQZIdOVtkwFv/KRS41v pcpPLRTbSyqnR7hAg+nYyWSpjQ7oUvlUohb0OxppCTBxUvaWmDHC5ihK0/6l2phWxFftyv wxl1x67l548BDZn5FwtzS5tEhR9bh6svwUdeWpoax2d0ZhaE6JGl+y0Jyq84HNbGFg/XWl grbW6BwMyuk91dCc9Lrcvk+aqdY31MhD4u7x74MCVf55apCcKzSc84L3fI5JGrRZHxqQw3 24PHU4a0nwnIzUGpsxle2jhJ+LWs0PgVK7vu9L1mRjNHIW60F1U/mulDzPWDgg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cs6vT2mJgzCNg; Wed, 22 Oct 2025 11:51:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59MBpXdx075890; Wed, 22 Oct 2025 11:51:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MBpXKT075887; Wed, 22 Oct 2025 11:51:33 GMT (envelope-from git) Date: Wed, 22 Oct 2025 11:51:33 GMT Message-Id: <202510221151.59MBpXKT075887@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: 70b34fbdbea1 - main - sndctl(8): Modify vchans only on supported directions List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 70b34fbdbea13c006a724844caa53f59e0e53bd0 Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=70b34fbdbea13c006a724844caa53f59e0e53bd0 commit 70b34fbdbea13c006a724844caa53f59e0e53bd0 Author: Christos Margiolis AuthorDate: 2025-10-22 11:50:55 +0000 Commit: Christos Margiolis CommitDate: 2025-10-22 11:50:55 +0000 sndctl(8): Modify vchans only on supported directions Currently mod_play_vchans() and mod_rec_vchans() run unconditionally, even if the direction (playback, recording) is not supported by the device. This results in the "autoconv" (see mod_autoconv()) control failing when run on simplex devices, because we'll be trying to modify vchans on an unsupported direction. Test whether the direction is supported and silently move on if it isn't. Sponsored by: The FreeBSD Foundation MFC after: 4 days Differential Revision: https://reviews.freebsd.org/D53233 --- usr.sbin/sndctl/sndctl.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/usr.sbin/sndctl/sndctl.c b/usr.sbin/sndctl/sndctl.c index 156c845481c5..6977f0ab0ebe 100644 --- a/usr.sbin/sndctl/sndctl.c +++ b/usr.sbin/sndctl/sndctl.c @@ -830,6 +830,8 @@ mod_play_vchans(struct snd_dev *dp, void *arg) if (dp->from_user) return (-1); + if (!dp->play.pchans) + return (0); snprintf(buf, sizeof(buf), "dev.pcm.%d.play.vchans", dp->unit); @@ -873,6 +875,8 @@ mod_rec_vchans(struct snd_dev *dp, void *arg) if (dp->from_user) return (-1); + if (!dp->rec.pchans) + return (0); snprintf(buf, sizeof(buf), "dev.pcm.%d.rec.vchans", dp->unit); From nobody Wed Oct 22 11:51:34 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cs6vV5Npsz6F92F; Wed, 22 Oct 2025 11:51:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cs6vV4Z1vz3f0j; Wed, 22 Oct 2025 11:51:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761133894; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dY9qaqM0nfbiRxa9lmdLCBkbZ1GVPDpDDzUnsEi/RSA=; b=wqhjTRP65VKZnTpUVaQfnqIV0V9m003AI4glYWtY4iBeVkt9DH3c387DAEuYhT+R+dXp3r VQNuQSpGLN6GcANa20hNNNJWl82evjGrutXfuO5TkMclBeeqIFebUhd+9fogVBg6KvS4WN VYxrcjVUDEA+HfA9b4c763IgSnC31+drC/bg5Mpij+RXdasLKsz4WwXOR84MVzYedN2AJC ISPqpAKdxOfnQYS+QBzc8pwNsiydgogCCn2df0QIdjk8Fnvll7S95pVAL/g68OTeQh+Z7Q 3iF6Ql8tR5kdadMCpA5GwTjxnzIAzfjP8nfKwDUjTdddRGYP4SaRU3SmIytH7w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761133894; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dY9qaqM0nfbiRxa9lmdLCBkbZ1GVPDpDDzUnsEi/RSA=; b=dF0pxId9DhfYHs3tuX/4oGLIu6ktZHiKwbxJT5s48oWbUwhB07PTcZSDDFkM4I+EYFI9Cx 4TF2tmbi8EbuJ2N4Cwny/cdB1K5eBuzXPSzCHTvAH2m5+rn/om9v8iLwxm4NZd3qbhWsmA iYiFiyAIOL+TK3/4znZro+4TSavHLT1nHWaT15vXyeru+roIBaDSd7lmtPsEdj9g75gfQc SHBHHpkv7StlVL7Fk9wccDIbWSPe6+5oXlrMudrJCV89Q8wE5lNV7MqZd3uEygrpPJydG8 TZHhs3baRZjteI6VMxgamlcwnTphhH7mEariEH0LfVM+ngIkfh54qADIFl2ykA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761133894; a=rsa-sha256; cv=none; b=pZbOGatFu0ub7nbXhrzgYzGOoC5PwkMrIyVpIuODBWIAZwROEq7fXqPGCa3xXGqDaIlsQF ISacIkv8nCCi6YYaBhm11u9j56lnk5fYHe4jD1/s41rmGWHlRKddFAZU2FRFhB+j4hITiT PjJr4+kQICz/OkJmzKOTFWgZpUYsLeyJxn3XKxVLslTl7MBygVUs06Ls1X6IqKY7t2m/q3 +QP6y6RPZ//8kQS/K6lGvLwGEuVf2CKCU8UFCKEn0AbS7RxqHO5SCULCrvaU59e15bgCGX uHmXUqf/2B15Psqg265C/9uJpISEO+U2TUZKSWM99DZxOPVif3BiKoazG9R9ig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cs6vV41BxzBqs; Wed, 22 Oct 2025 11:51: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 59MBpYtp075924; Wed, 22 Oct 2025 11:51:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MBpYkF075921; Wed, 22 Oct 2025 11:51:34 GMT (envelope-from git) Date: Wed, 22 Oct 2025 11:51:34 GMT Message-Id: <202510221151.59MBpYkF075921@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: 2693d6c7c9ca - main - snd_dummy: Create device alias List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2693d6c7c9cab28967de13233342fcf9281e5636 Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=2693d6c7c9cab28967de13233342fcf9281e5636 commit 2693d6c7c9cab28967de13233342fcf9281e5636 Author: Christos Margiolis AuthorDate: 2025-10-22 11:51:01 +0000 Commit: Christos Margiolis CommitDate: 2025-10-22 11:51:01 +0000 snd_dummy: Create device alias Sponsored by: The FreeBSD Foundation MFC after: 4 days Reviewed by: emaste, ziaee Differential Revision: https://reviews.freebsd.org/D53237 --- share/man/man4/snd_dummy.4 | 12 +++++++++++- sys/dev/sound/dummy.c | 6 ++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/share/man/man4/snd_dummy.4 b/share/man/man4/snd_dummy.4 index 2b9d26d318ef..4ede8a806b6a 100644 --- a/share/man/man4/snd_dummy.4 +++ b/share/man/man4/snd_dummy.4 @@ -27,7 +27,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd July 15, 2024 +.Dd October 22, 2025 .Dt SND_DUMMY 4 .Os .Sh NAME @@ -52,6 +52,16 @@ and one recording), as well as a mixer. .Pp Playback works by discarding all input, and recording by returning silence (zeros). +.Sh FILES +.Bl -tag -width "/dev/dsp.dummy" -compact +.It Pa /dev/dsp.dummy +Alias to the device's +.Pa /dev/dsp%d +file created by +.Xr sound 4 . +This makes it easy for tests to open the dummy devic when there are more +devices present in the system. +.El .Sh SEE ALSO .Xr sound 4 , .Xr loader.conf 5 , diff --git a/sys/dev/sound/dummy.c b/sys/dev/sound/dummy.c index 4df5b112d3f4..1f2d69708eec 100644 --- a/sys/dev/sound/dummy.c +++ b/sys/dev/sound/dummy.c @@ -346,6 +346,12 @@ dummy_attach(device_t dev) return (ENXIO); mixer_init(dev, &dummy_mixer_class, sc); + /* + * Create an alias so that tests do not need to guess which one is the + * dummy device if there are more devices present in the system. + */ + make_dev_alias(sc->info.dsp_dev, "dsp.dummy"); + return (0); } From nobody Wed Oct 22 11:51:35 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cs6vX1ndVz6F98c; Wed, 22 Oct 2025 11:51:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cs6vW5sVVz3db6; Wed, 22 Oct 2025 11:51:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761133895; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tUUOZsq59HikM2DICjtUNofDAvAPOJDHrXMVsUfQ7TQ=; b=b3neXFd6FlZpf1kmZl06e7JV9t+yzwUSJ4SqDPQrB60pS+cM2c75/C41m53ButZn5vNcU/ u83nQ7WtSkKR3sWuRmjIvayh1ZAfFnmeMv2O6AUuMibim73Fubp/tFZ1K6qCChCZLkGRhO 9CZeu/83/1vB/znvVTa1w4FxZATG4g/N/YZepPSOLUZtd7rSwm5WqnEPn4dV8fpJxTJA2S v+l3S9SEY90SsetLoh9ZZmpVIsyjG4FvopqVc727GKVjGrV2dPjk7yRtBphX3r+MM6AINj uIYIufQaKxvWGZwdUrs27/3vY82YJuCEyH/6RbphP7waNOp6Npnpu+U8+RGn5Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761133895; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tUUOZsq59HikM2DICjtUNofDAvAPOJDHrXMVsUfQ7TQ=; b=dnlLnioMxjv2EdMJBD0cmCSYiRvsw3NCvt0tJ6tb9Kw59yZeld8mRGx3HgjlyIWSTtkmQI ktEIcLoFYZ+2P8t1sePfNGzyrYMTfrGOaLlQYx7via1hAETMXMxuWTU4CWNRZ4w2VFpEAz 3bYl4CEHcsyVyxFzo3934hpSqVO83VYFpU+qSCBedo6EcDYdav6oDCQDan03OLL0P4tW0F mUABMuPxjbt/Uichj8FzkdKaLPf+UbE8rQgGRpPwkYh4XGIyxRHF7zqrMUgyVNWX8U+eCD rPvh4ecrUb5tpz5z2eprWrXq38BgcgW872oCU9fCFnYdU6ufbAYugCoDdKJ5VA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761133895; a=rsa-sha256; cv=none; b=HoObbCfJj4Js9t8yJ4jAGq2Lcb7hK4Aftdjpfvoy3z6/MhprS/jYBIzmQ3XqLjAR9yDvPi /PJWOgHqwLP4sn2kCHN1Mym7qrRFs0oFsIDXHk1drCWbBpptfs7bTN3ciCh1jI8hJcubxJ ACVAqyTeiLjlu9JxOZZmVykvY1l5MGJuwIVXx+qF0OVm60RpN6bjDMINbm51mq9n4/8zyo 3jJUcYd6vL3Faw5QV7s8hUvr4/EBhBGHbOfw58CRWQuERfXBgpfjdGw6CJ+wBp5WM8bE+X 04fr4wQ4ZPMyw1Bl7zz/ksP3WtYmEPvw1jhk3iYW+u2SaYy1j3d7fnks4zTX0Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cs6vW4wmFzCNh; Wed, 22 Oct 2025 11:51: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 59MBpZtY075958; Wed, 22 Oct 2025 11:51:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MBpZ0j075955; Wed, 22 Oct 2025 11:51:35 GMT (envelope-from git) Date: Wed, 22 Oct 2025 11:51:35 GMT Message-Id: <202510221151.59MBpZ0j075955@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: d6432907f612 - main - snd_dummy.4: Use sound(4) instead of PCM List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d6432907f6120ff4993de7352ca62f6986fb910c Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=d6432907f6120ff4993de7352ca62f6986fb910c commit d6432907f6120ff4993de7352ca62f6986fb910c Author: Christos Margiolis AuthorDate: 2025-10-22 11:51:15 +0000 Commit: Christos Margiolis CommitDate: 2025-10-22 11:51:15 +0000 snd_dummy.4: Use sound(4) instead of PCM Sponsored by: The FreeBSD Foundation MFC after: 4 days Reviewed by: ziaee Differential Revision: https://reviews.freebsd.org/D53257 --- share/man/man4/snd_dummy.4 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/share/man/man4/snd_dummy.4 b/share/man/man4/snd_dummy.4 index 4ede8a806b6a..172b8ed70729 100644 --- a/share/man/man4/snd_dummy.4 +++ b/share/man/man4/snd_dummy.4 @@ -47,8 +47,9 @@ physical sound card. It is intended for testing, so that test programs do not need to rely on hardware being present in the machine in order to run. .Pp -The driver attaches as a regular PCM device, with two channels (one playback -and one recording), as well as a mixer. +The driver attaches as a regular +.Xr sound 4 +device, with two channels (one playback and one recording), as well as a mixer. .Pp Playback works by discarding all input, and recording by returning silence (zeros). From nobody Wed Oct 22 11:58:23 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cs73N26KTz6F9wC; Wed, 22 Oct 2025 11:58:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cs73N0RWgz3fpd; Wed, 22 Oct 2025 11:58:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761134304; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U881iaFlBAuUZE1UhdwN1X6UVrtozYdR0ggJcd3ZvPE=; b=Yw0GRQi8gubL3CgX6AU2Es1j44zVbPm9QyZIHkeE9qQIrNcYnW8xSs6FvzD/cLx8yi1l4o nc8EeV/tP01++n1jxbPBqCYUPdybWHcvdVU76YP+e65itM1wRwH5pV4wvGUdY2NETNASrh jpiL1EIMV6o47V4bZK/enPsDDIWxjRtuKc53Z3jQNcCx3Bb03nUnA3TGJzr6wN9BBdDB58 7C1cmPoSQjI926A8VQxYEQzkHd5uSsej7fdP7IDX/E/Y2Qp+zE3EhyVkEI5ya3G7dtrhj4 OsFJWmNhnUuH+ADDk1Jn53xrypjXd20aSHkhxk3kN2DW+dtE4Ei1ry25fbdWUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761134304; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U881iaFlBAuUZE1UhdwN1X6UVrtozYdR0ggJcd3ZvPE=; b=ZYpM5DOU1yczD4c209Aubm8RWMZ4dkouz5RfppP7VHjtWS0gqwNXgahv1rQpUTOWND2SDb DaUGndh2i+5NsMvJdYa5SPbEH3LOZV6FcYhsk9jD1r8LT6320/JIPlLevbtFdc4S67WwYb aKaOCtI7SQBKEX6d0JpVIC9DCTTf5n2u1cIRtPA7VOrK9N4bXb5+Yt0DsMdomVnHtT86yW v7CQnxY8IGhWWcRNqU1eEhEJMQ2hDFfbKcq1kNehQzjwQGVNeovk5A8w9IwHSWUuVjRAdh 4BzTbEVSejML/ZESwKJFc3p1425/mYwQbiXvFsR1NWKyOhxt3CPyCh2nR/ZRDA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761134304; a=rsa-sha256; cv=none; b=rCeGF853CBy7YCel1D6T16UAHyEFn4/FVmOrglV0KBmp36D+HtFo/sUh0fmk3E2xUqQKTi UJt5wa0/F9C6SvhmJFCTHTPBsWXpTrvfwKNEPPW/w45/G+w0kNbnjljyMfYNsPV2+Qlo8M bBER7cn1m0bqJlApRZsIc3bsCk9GPCBsV+pxGzUkR6F/LyVSF0V/UQ95o/aSM/a20CZOWT waH8ktcQQTkQYyhru8PpNs6Tr5Yk/0bxIorEpgjWr9PxYbfpJNxhlEXFAiFdzk7Y7268q9 MoN7Na2RdhXQGv4LtMw2AWaSuspgsupbz9bXNxNDgK+PjTpqHueQW5yhn2kuKg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cs73M6yZtzC5X; Wed, 22 Oct 2025 11:58:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59MBwNw7084481; Wed, 22 Oct 2025 11:58:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MBwNCK084477; Wed, 22 Oct 2025 11:58:23 GMT (envelope-from git) Date: Wed, 22 Oct 2025 11:58:23 GMT Message-Id: <202510221158.59MBwNCK084477@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: 0a53e6d8bc0b - main - kdb: Fix a typo in a source code comment List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0a53e6d8bc0b3a6332e228993d040fbf38f652fb Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=0a53e6d8bc0b3a6332e228993d040fbf38f652fb commit 0a53e6d8bc0b3a6332e228993d040fbf38f652fb Author: Gordon Bergling AuthorDate: 2025-10-22 11:57:57 +0000 Commit: Gordon Bergling CommitDate: 2025-10-22 11:57:57 +0000 kdb: Fix a typo in a source code comment - s/th/the/ MFC after: 3 days --- sys/kern/subr_kdb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/subr_kdb.c b/sys/kern/subr_kdb.c index 56264a96c9fa..909dd10a6e69 100644 --- a/sys/kern/subr_kdb.c +++ b/sys/kern/subr_kdb.c @@ -330,7 +330,7 @@ kdb_reboot(void) #define KEY_CRTLP 16 /* ^P */ #define KEY_CRTLR 18 /* ^R */ -/* States of th KDB "alternate break sequence" detecting state machine. */ +/* States of the KDB "alternate break sequence" detecting state machine. */ enum { KDB_ALT_BREAK_SEEN_NONE, KDB_ALT_BREAK_SEEN_CR, From nobody Wed Oct 22 11:59:31 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cs74g3vjLz6F9yK; Wed, 22 Oct 2025 11:59:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cs74g3CfNz3gKp; Wed, 22 Oct 2025 11:59:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761134371; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yn1bEll4/+mU56wRU4ET9268/hOB6jsaC+mBz0AzXHQ=; b=jXZLRDuBb2KDE1ZdQEp2Tiba9rSbRA8EzJG3WaYZ1NWkHHEdfruOAyoShgYDSKZA8eqhpN JO0mSksLF8pmm7T81Lm1VdZ4UU5g3wp0SejDfcF3mIDJ3639OUj4uTlWs8LEfeJUQqoQjs nmsj2CmxODCbEStH4Y7GEyHf6LAzdX3aUPWqJZR57gt8+yAldgqfNcCjxyTdSVxxc0GSdd 7OmgiXeGEnnQHW/IyCLN8mSqfL1sE5K0Pi3NIOufrZ85CfSiX+hmPaTpsROlk1r6lALvF0 zDAbA7VghfCDB9ddmSALFrmCd6FHR3gqySK7TK5g9va36SzZosq4r+w+S6di/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761134371; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yn1bEll4/+mU56wRU4ET9268/hOB6jsaC+mBz0AzXHQ=; b=izQZ4dYy1Q72IOI4T7nt2qRFJULs0uPd5oJqpvkA9b5NGax7zAl+5p9teBClOJaFpFpRz1 bZzTDm5PhgLv/BMXVHsQ23SywYEE3vP4uqpy9/0Gz8RyM0f/WMHy3Ny739rIadJu7kvnmg uaMug6V6oyHABl4N8QJ12PXmq4eLVpXlypOlgdxVkuyVMRsXc0pnJXelp0R85Av9ZEsejU iQtWHjhZNZRgkF65Hz5P3Ucy4Stv8tiOTz9gLdMYXctZF9wtYvk0BAkFK9rXBat+w/nlMO 5y7tTeIu9Y5OMEizhkNInpsQ14kkWLTwWz2CfJA9O1efI5tLduERvy/m/BLINQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761134371; a=rsa-sha256; cv=none; b=yCZlqRczRL+y8haRwGgjCjbQafcYK1HfSEF36fZk0Nco8weAZ3GZFKre58cCNRrRnPuuRA 29pdqpxzQjD9fzNlcM1aJfscHQOIxyN8tNV39kpw/6GqN4dDDht9hCkdJzMgVD8mKCSdk6 TA5zrMDv1pPvPp6udr4G7ElqYI+h8P/qhNe36m0AmUc2gDxEzBAExPAhGIgXBgJKRWG8i7 PMz5/4JTPsfwc6mNCXLRGplzH521oL4GS0ROqF91hWfLqnXvjE80NGnjwebLyh5WadPdDW WzLsAg1QxCar64U1wc2+fu1PIUJ8/OvU8UJNMHB4mTA0mOmbQCjezHR/Stnsdw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cs74g2cjgzC7g; Wed, 22 Oct 2025 11:59: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 59MBxVPP084914; Wed, 22 Oct 2025 11:59:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MBxV1Y084911; Wed, 22 Oct 2025 11:59:31 GMT (envelope-from git) Date: Wed, 22 Oct 2025 11:59:31 GMT Message-Id: <202510221159.59MBxV1Y084911@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: 2b2a4f02e087 - main - pmcstat(8): Fix a typo in a source code comment List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2b2a4f02e0872065c63baec8bf0069e3b677def7 Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=2b2a4f02e0872065c63baec8bf0069e3b677def7 commit 2b2a4f02e0872065c63baec8bf0069e3b677def7 Author: Gordon Bergling AuthorDate: 2025-10-22 11:59:13 +0000 Commit: Gordon Bergling CommitDate: 2025-10-22 11:59:13 +0000 pmcstat(8): Fix a typo in a source code comment - s/th/the/ MFC after: 3 days --- usr.sbin/pmcstat/pmcpl_callgraph.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/pmcstat/pmcpl_callgraph.c b/usr.sbin/pmcstat/pmcpl_callgraph.c index ade99464a4a3..63684f800bdc 100644 --- a/usr.sbin/pmcstat/pmcpl_callgraph.c +++ b/usr.sbin/pmcstat/pmcpl_callgraph.c @@ -362,7 +362,7 @@ pmcpl_cg_process(struct pmcstat_process *pp, struct pmcstat_pmcrecord *pmcr, * - Find the function that overlaps the return address. * - If found: use the start address of the function. * If not found (say an object's symbol table is not present or - * is incomplete), round down to th gprof bucket granularity. + * is incomplete), round down to the gprof bucket granularity. * - Convert return virtual address to an offset in the image. * - Look for a child with the same {offset,image} tuple, * inserting one if needed. From nobody Wed Oct 22 12:28:13 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cs7jn5fsjz6FCkx; Wed, 22 Oct 2025 12:28:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cs7jn53RSz3k3m; Wed, 22 Oct 2025 12:28:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761136093; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=d7JAMISd9piME7nwpMyNBZRnsuIWfK7ZyVNBMkB4m+U=; b=iuaECCeMLv7kzVX//0B06MlV4BG+ocUkYjs/BBPfzvylFBHqW3OTLvAlqFzca0GauukPiW 0EXmdiI2gyoLTNrFn4fK5PJ1pjml9QeU3QEKln9yXlsGSboflbfj/dsyBwe/gVi7I5W0yB alWS4p8w0HSuaj7AgGRHstcLMgaFRwbmocnWVeqha5GblsUYS3NWPVtFO++ftqDbBwBSCP qJ7Udiwqlgp5JYNeA/E2tbXuEdOWl/rOjgHMLCH831J8C1XdiCHjMszu8FFKvmabgoZR51 SNH+gCeiAdU5BBRHalfy+vwvp41ECJFMYATxBzfQ/kBbFcs4P7KSszPzUimU6g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761136093; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=d7JAMISd9piME7nwpMyNBZRnsuIWfK7ZyVNBMkB4m+U=; b=L06X7vV3bfn/Es3eZ+gY3WN8NBf9scKEyhQYfESy+0ZM2VLkwkjbyLqoNxSmr/YE0vDhvQ WxGTJRjczOBrJenjfBDhmlpCnUN5pxGONJ8TqI5v6ABExp0c3Wi0Epl+4JJHHaZGY+1dQM vb/S0IBrozW03gCo59b2ud7GR1QZxWXgx4IbPbjyLrVdUYc3u3+X3SFIs8qE4shXRMH0pt 7iZfOtEvUdg3i2CPPYbQPEWfc9xWt/m57gf0CmwIrKMcHLPI1j0ekJJwI0eK+IJlCJtLfJ lxocPOpnCPMluZ7gW+zLhfilZ64Hg1Fb3d+7bgVp8JBTVOiDY44vqSEGwL/B2Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761136093; a=rsa-sha256; cv=none; b=qbGvkcqijeS7ZKJIQQbzxoTxc92GPBrc+JOscayadoJVsWsBBEvNoGU2uySfHgAHKZq8+u tJmDI7gnWu1NPBkvMRaqGRCrmeVJGpuM30XlUPwA4fmfQ96fvbFnWc27Z2WbNyD0c6Nj5P UQ2fKrhDzhFriaGdERd2NE/+qZHyboN4VN187c0h7j3Wfh/VZQOuDnoOoUz8p5nlalSiEF ESLj22+9/oyiW5NlH/hsSH1ZMIgcaTZv05nou5eBKTHWowmSMCD2MR0zDAsXCYqmX7rlye BqZPr+iM1OTh3CkurvO00r4lfLaSenNddtSc8ageIqr4WVAQQQN3501njmcCrQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cs7jn4WBDzD8d; Wed, 22 Oct 2025 12:28:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59MCSDAr041264; Wed, 22 Oct 2025 12:28:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MCSDIs041261; Wed, 22 Oct 2025 12:28:13 GMT (envelope-from git) Date: Wed, 22 Oct 2025 12:28:13 GMT Message-Id: <202510221228.59MCSDIs041261@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Clausecker Subject: git: 1ca09538d942 - main - sys/arm64: fix COMPAT_FREEBSD32 __syscall() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1ca09538d94273601dac08204c1d0b3ca9115864 Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=1ca09538d94273601dac08204c1d0b3ca9115864 commit 1ca09538d94273601dac08204c1d0b3ca9115864 Author: Robert Clausecker AuthorDate: 2025-10-21 21:35:24 +0000 Commit: Robert Clausecker CommitDate: 2025-10-22 12:24:41 +0000 sys/arm64: fix COMPAT_FREEBSD32 __syscall() It seems like _QUAD_LOWWORD was incorrectly expanded into 1, which is correct for big endian but not little endian. This means we always grab the padding word for the syscall number, which is usually 0, causing SIGSYS to be delivered to the caller. Reintroduce _QUAD_LOWWORD to fix the syscall. PR: 290411 MFC after: 1 week Discussed with: jrtc27 Reviewed by: cognet, emaste Approved by: markj (mentor) Fixes: 8c9c3144ccfa3061879b8cec015ee7d1010e4766 Differential Revision: https://reviews.freebsd.org/D53250 --- sys/arm64/arm64/elf32_machdep.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm64/arm64/elf32_machdep.c b/sys/arm64/arm64/elf32_machdep.c index 8f8a934ad520..4cb8ee5f57ef 100644 --- a/sys/arm64/arm64/elf32_machdep.c +++ b/sys/arm64/arm64/elf32_machdep.c @@ -210,7 +210,7 @@ freebsd32_fetch_syscall_args(struct thread *td) sa->code = *ap++; nap--; } else if (sa->code == SYS___syscall) { - sa->code = ap[1]; + sa->code = ap[_QUAD_LOWWORD]; nap -= 2; ap += 2; } From nobody Wed Oct 22 12:31:34 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cs7ng129Rz6FCjh; Wed, 22 Oct 2025 12:31:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cs7ng0PwFz3kgG; Wed, 22 Oct 2025 12:31:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761136295; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5XpD3/J+grdWh5moHiR2aSKh2v8AYB4R8Q5980gTbIE=; b=WJmQ6HSUohDkHjQxjmsI0gD11NJ/v5KOW9qiYAfyIhtaDFdgKZCKdnQhZX2EMuAyHV6Pw/ A4LBXF83Hig7A2bwaWCuc1NZ96eFlAsyJZEI3PHIQktUxk0BuyQRYxwf4SUzkXx+o1BnPZ PQXGkwWvMyWXFT4Fwil6F0pm2PX/CdAnvk9iohU0ZfSj/d0BoQhE3uyKkESv5LcmFH9cJU pNrqIkQy6Ys232puTQtf647Gqw3/kouCoE7vAY58ZHb7/6y70XVssAMqNf68fCH2FYZowZ a6y47j6wdLuN25mTTmctDnJV8PDhd0XLGWXeKGnt+mYlcj2tfMim49aGpILA7w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761136295; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5XpD3/J+grdWh5moHiR2aSKh2v8AYB4R8Q5980gTbIE=; b=NV5xP38eZXLdW8rDsLfPD9ZTZjiBSOypOdgpw3amKSYIID/aSUIb9k6O3n/+ITWseX/ttQ 24XTGs4RAU+ekRtmIIkrZk0tXOtQcgi3OyRvAAgR80dJwN1hM2uKqsj3HjGOYYLmmpFtQQ DRWI/tsn0Xa6W2Cq7sJ5FJnXjsABpdGUREIrZzNC7ikgEA6tJ41DOBZaj49SStMuLJ+ZBQ TMpb1kBsX9s4JvGvAmqpZf0CCzKvPt5fpoU0JvHfEaB38NheKNkrl5zWpeJY3sW/XW9Ku5 PeN55lrHlcdqCh5m8Xu8KbesdqZeF0+iQdIyGeSD+9VMQiNnZ3+juQUEX+wJiQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761136295; a=rsa-sha256; cv=none; b=xxEWFCeq8q3ZIRGpp7CAqgIVPv/KmvmkPxVg7jDfVdCgDb3lqASkYcQ/AoOWZ6jot8WC2R 0WXA1jLXA7Xhg7h/kggyhDI3ZlCL7Z7dWX4//ZpE304O3+YYl/47r6DbQ3bE7ovqk+pJey fXM+al5ySgRsl0znzXhfAcupNL13ijwUgM26xzsb07Ps6UtUrrsCpUe5Mp+sgVrhAq5l91 DBY/+EMEYa910AY1Nb9O8AM7N8vqwo3b3dJEuCNrQwvKOrZICcX4Ia6ZFx4lVncf3q2qxl mqQTSzxKzxcgnn83f3KzRsqRXrGjBeI9Sju4vnjFNYQgBK79AvtIl/sXZL8+VQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cs7nf72SMzCn7; Wed, 22 Oct 2025 12:31: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 59MCVY44052337; Wed, 22 Oct 2025 12:31:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MCVYAZ052334; Wed, 22 Oct 2025 12:31:34 GMT (envelope-from git) Date: Wed, 22 Oct 2025 12:31:34 GMT Message-Id: <202510221231.59MCVYAZ052334@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: 4bab868a122b - main - sound: Improve dsp_cdevsw style List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4bab868a122b9c853865c8d89886d9354d0f242b Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=4bab868a122b9c853865c8d89886d9354d0f242b commit 4bab868a122b9c853865c8d89886d9354d0f242b Author: Christos Margiolis AuthorDate: 2025-10-22 12:31:16 +0000 Commit: Christos Margiolis CommitDate: 2025-10-22 12:31:16 +0000 sound: Improve dsp_cdevsw style Sponsored by: The FreeBSD Foundation MFC after: 4 days --- sys/dev/sound/pcm/dsp.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/sys/dev/sound/pcm/dsp.c b/sys/dev/sound/pcm/dsp.c index fe5576baf017..27d5b740b90b 100644 --- a/sys/dev/sound/pcm/dsp.c +++ b/sys/dev/sound/pcm/dsp.c @@ -83,15 +83,15 @@ static d_mmap_t dsp_mmap; static d_mmap_single_t dsp_mmap_single; struct cdevsw dsp_cdevsw = { - .d_version = D_VERSION, - .d_open = dsp_open, - .d_read = dsp_read, - .d_write = dsp_write, - .d_ioctl = dsp_ioctl, - .d_poll = dsp_poll, - .d_mmap = dsp_mmap, - .d_mmap_single = dsp_mmap_single, - .d_name = "dsp", + .d_version = D_VERSION, + .d_open = dsp_open, + .d_read = dsp_read, + .d_write = dsp_write, + .d_ioctl = dsp_ioctl, + .d_poll = dsp_poll, + .d_mmap = dsp_mmap, + .d_mmap_single = dsp_mmap_single, + .d_name = "dsp", }; static eventhandler_tag dsp_ehtag = NULL; From nobody Wed Oct 22 13:42:14 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cs9MB5yd2z6FJ3J; Wed, 22 Oct 2025 13:42:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cs9MB593mz3w8F; Wed, 22 Oct 2025 13:42:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761140534; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=T3tXiy3Xp+5GZaehvwaZsoudOdbgBIX4xqex/Z1moZI=; b=oec1k8QRFMD4xuAjZJSUSbR4mhJNT+aopu6/vvtqatr1wkZEVEaKRD3OllU7uNiKEo7U7B D8N4y6oU22dY6L9pPc2InyV7ZIIUpooaPIP3Ws9Tt60PY+POfvf2WmtwO7jIoY6sSBmMRn 8tW5N4v0WPH5eleg9YyquJspPeHX7oIP1ib/9IJGsWtQ7f2FNE2hV6/lAi5y1E7Z+ZfutN 1ApfEtKLCVDP7ZNvfkiTkhtG/Q8U4jm6qq/7KCme5zuF5DwuFZa+xVyDCCjXA1nhMSEpXJ Txy8JsUKwtp3xvB2xB1qybWZ8JhXCIN6yLNdzAhnYOM/URb8h2CA6ezGTiUlrw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761140534; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=T3tXiy3Xp+5GZaehvwaZsoudOdbgBIX4xqex/Z1moZI=; b=LRAtW+xOA9s9qwQ3AMjSVKM7zld65KXdsUY+ssOq8/Z3Mfx8u01KWOjJjrM3bQF242J/T+ 32MKb2c1dpzyCTHMGsAgfbOWL8VbxSwKsnO1AIgkG4aO+HFdKtZ0cOJyL8dOC6xYj/N9vk SG65rdSD+WiZ3ILKgGxZCYBk4D5WLH8ungWr55zpa8ZlZBwoPoef+qmewOdYsIWaFwGtaO BkzLSgtPZMX0wk5FW6KJ9awpLS2LTfrnMhQ71Udfa6qVlWL3bAIuxKfCLXAYcrCdRgPyZX LCUv01D9bassYQbLriaKemp24isoCK4k+7dvMhx49gfuED/pkb9t8DWL1yAfRA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761140534; a=rsa-sha256; cv=none; b=xZkweCcBGyVrL9Rks23i/ZmTTp8LRBtEFxzWh9TqZTM/Z9an3AU4RHuj9G61VdDZ3aXm2h UrBTTiV9BR59ZyMUHJinDqZpIOit5GNjqFTf077HCSWYMa+Tog/srqmFwFyLUes55OTIZy IdmapcOpZhH8RFi0o8z3LmbS6nGcOclxvaE5TgDKA+w1pW2vigkg2//PKH7er8SC3C/GpO pGz2NwV0rNf0Pw8XWCTG+SWS4ZTqix0vBHaS6mfl5o1CMn/WjI6TytpFPznYC7kDNzxnhN lO7crgu6BeNF1uCSIhQbGcSCgOs0x//vGwVJdGVlHY1qXIitCXNalQiM8cE6rA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cs9MB4h3XzWsN; Wed, 22 Oct 2025 13:42:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59MDgElb090826; Wed, 22 Oct 2025 13:42:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MDgEcP090823; Wed, 22 Oct 2025 13:42:14 GMT (envelope-from git) Date: Wed, 22 Oct 2025 13:42:14 GMT Message-Id: <202510221342.59MDgEcP090823@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Clausecker Subject: git: a8079d40ae7f - main - sys/arm: add fp[gs]et* prototypes to List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a8079d40ae7f3cee17c94e61e43c24780a64a010 Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=a8079d40ae7f3cee17c94e61e43c24780a64a010 commit a8079d40ae7f3cee17c94e61e43c24780a64a010 Author: Robert Clausecker AuthorDate: 2025-10-17 09:30:09 +0000 Commit: Robert Clausecker CommitDate: 2025-10-22 13:41:54 +0000 sys/arm: add fp[gs]et* prototypes to We have provided implementations for hard float of these for a while now. Add them to the header to make things official. This is required for a bunch of legacy programs in ports. Approved by: markj (mentor) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D53156 --- sys/arm/include/ieeefp.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/sys/arm/include/ieeefp.h b/sys/arm/include/ieeefp.h index 57dd058b8a95..57719b883d58 100644 --- a/sys/arm/include/ieeefp.h +++ b/sys/arm/include/ieeefp.h @@ -49,4 +49,14 @@ typedef enum { #define fp_except_t int +/* Augment the userland declarations. */ +__BEGIN_DECLS +extern fp_rnd_t fpgetround(void); +extern fp_rnd_t fpsetround(fp_rnd_t); +extern fp_except_t fpgetmask(void); +extern fp_except_t fpsetmask(fp_except_t); +extern fp_except_t fpgetsticky(void); +extern fp_except_t fpsetsticky(fp_except_t); +__END_DECLS + #endif /* _MACHINE_IEEEFP_H_ */ From nobody Wed Oct 22 13:45:21 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cs9Qn4pDQz6FJV9; Wed, 22 Oct 2025 13:45:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cs9Qn4KQsz3xjd; Wed, 22 Oct 2025 13:45:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761140721; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KTtphldp9biVXYHhsks/eoviJhBXjZaQO5nRplRJP1U=; b=pd1xsEy9FOyEJ5umjXE31x1QmisSuatt3AYArB4gmBhJHyg97bEYyGxvcV8nO1Heb3URN1 wvsUisEbEx6wStl6FSjKOOeIp8jb3WYmbrZ7v7YLMJTPGcCz2oS6a/oFCIxLSb/HhkRSHm /J+bGC6PMPzitbcFV/g3Ti4dbO4mBcl+RWdEYKdgt7QT7SffVCdEQblf4zK5u9j3UgPR3o jqGJ/Oozy4/wDLkE5VdQwkbyceRconhhpYa9Aw4xxBH+6namVeljHc3ib9QjvyuDLzGdr5 c8ipySWetAIrCeLdu1+/mo1v8s3pHFFuLESk9DDatYl6LMEwfGkabO+6zYxN2w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761140721; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KTtphldp9biVXYHhsks/eoviJhBXjZaQO5nRplRJP1U=; b=x26xHCoN5+CTwTk0QY/XAbXjVeYGMkQUgdH1HOr/aXLTqse5CPyT2RPRBG7mH7x+c1rW3L jfn9PYIVpFJxRbmFrFwHitKczZiDymhmqtTPDH3Rps90pHBPfy47JQnQi2qn2l7r6Rfiyk E6CN3Bo+LE0+DdQ2IfPcqFftl9k0EVbIUtVNDpb+QmgTj743fOaG92A/gIW4VGZ0twWYTF MQRbyuzr3jslVIl0cKxXXS7EQ+cDJLte8naUqGIKjxKKGzMllE/bH8IW+BGLdx6XgBhHQh BDmXjZUdk/STvwQXjOEZFef8UdQ1yzgHbdxDsToXawR4iuMobL1NT719B9GsUA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761140721; a=rsa-sha256; cv=none; b=ekiUd4LiLg6HmiA6ZzxOa5REDeKbVWt+ZwreuCIvLZQTyHEL7zNC7mPzVlE+etCvTkllQq hjLln8qezWBvOfzkLEqLMrPwaNj4KIy74Yixe5G+5xS8WggLtHWdsvIi0WW3zYZdfO0CpP IZQmsAhIil7WsQU8Jb8eVqsF7WzxtJEOmbLyWeP2eZWh1p7Px7ceH3ZdeRq4f9XQM3N4xQ ET4JFcwy/ayPQDKPeuHHkLMSuJDcwNUDfskhPK9cKXGO2dJDVxbbZN6zSRIEnH5LxhEuZ/ KfdherMOT84ohk1miZfywy8YUeQtOTQPQBA+1WpqvBgw40T+PDp6h1NLoF5Iew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cs9Qn3YTLzXPT; Wed, 22 Oct 2025 13:45: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 59MDjLQJ092940; Wed, 22 Oct 2025 13:45:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MDjLVE092937; Wed, 22 Oct 2025 13:45:21 GMT (envelope-from git) Date: Wed, 22 Oct 2025 13:45:21 GMT Message-Id: <202510221345.59MDjLVE092937@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 0625f470e095 - main - uio.9: Improve description of uio_rw flags List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0625f470e0956a3a337e4999f6712ec7b7d872e5 Auto-Submitted: auto-generated The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=0625f470e0956a3a337e4999f6712ec7b7d872e5 commit 0625f470e0956a3a337e4999f6712ec7b7d872e5 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2025-10-09 15:47:25 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2025-10-22 13:44:24 +0000 uio.9: Improve description of uio_rw flags The direction of the data transfer in uio(9) can be confusing, so state explicitly the difference between UIO_READ and UIO_WRITE. Reviewed by: ziaee MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D52996 --- share/man/man9/uio.9 | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/share/man/man9/uio.9 b/share/man/man9/uio.9 index e6240c4e51d3..b143eb6e8e62 100644 --- a/share/man/man9/uio.9 +++ b/share/man/man9/uio.9 @@ -23,7 +23,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd March 11, 2017 +.Dd October 22, 2025 .Dt UIO 9 .Os .Sh NAME @@ -107,10 +107,14 @@ The I/O vector points into the kernel address space. Do not copy, already in object. .El .It Va uio_rw -The direction of the desired transfer, either -.Dv UIO_READ -or -.Dv UIO_WRITE . +The direction of the desired transfer. +The supported flags are: +.Bl -tag -width "UIO_WRITE" +.It Dv UIO_READ +Transfer data from the buffers into the I/O vectors. +.It Dv UIO_WRITE +Transfer data from the I/O vectors into the buffers. +.El .It Va uio_td The pointer to a .Vt "struct thread" From nobody Wed Oct 22 14:02:37 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cs9pj2PfTz6FKHY; Wed, 22 Oct 2025 14: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cs9pj1YHqz42dq; Wed, 22 Oct 2025 14: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=1761141757; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9RnVJfRjK3fVWSnhc2fdr4lkKXkwAi3eAA2rB6rmJc8=; b=iEzWmWDnk8D8BK8Hgm4mpC/TMPKm+Xdch2wZ7zI56Um44pme9tnBflhpATAkFrzP5QftXt PjJfMqMyMV31jS63Y3BgUW4GEPpnPGGoAQtpdblycAYDo4ho8wUvvFuI1x4un3sXcQdkfb 9jhhxmV0FjEoSFtt7dMDgYWZ2s7AgJkW7bXrZNFToTlZyeL9AKIvyxR0dNuuhqNeJj08op e1K18YAyddEqnOQsuNnLG5iakNzs1OnmIfwZNMS4LShF4FsSDU3HAKiNAgprHJaT4V3xho gdiZhxEmUXKKye76U9tnsGTBl92bG8zPb/JM2Kixvdvd/pBjoJntqP1tkZwxKw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761141757; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9RnVJfRjK3fVWSnhc2fdr4lkKXkwAi3eAA2rB6rmJc8=; b=xEUAju6GLQCJVLqDmD9yoy0RIukGbVfz7IEpyYF6vdtepOxSll9Z+ORS5ZQ/5u0DQEva5z VnxRNfg8pMOZhNY5VL/T7CGuxeoMCsG/3qFbmKHzQN7emxiUWtEbo5hdXntbus+rn4vj7J gxaUq5xIu2zcnAyZZm0RmHkhpZyLsLu/n4JWhoOvkxPmA4IL43UDLE3uxByEhJ3rRM8IOM NOWSHY9kMHsGnowc8S+1QF0YCR7x7v4VeeJFXg+D3xiym8Up43NeWqg9N/yvkfpIQAmqsm +WiJcq2f9swMw52PCLQh4pcc43M3m4q54DdwICnUd8ASfPy924cdwgcFTXNGpA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761141757; a=rsa-sha256; cv=none; b=MdfXVFbZNY9MPZFwUeIFNcbLv7W0UDMfrzYSTzvdHiylq13R4RXeAoQ33hUVQDZ95YOE/0 IQvTNPMbd6OoCBGLJVri6lu4K+3teCQk/JNprralc3qAphqjhj0ABvtAYc8mKJ4MEB29Q3 lZR243qxjJ66sNbBoSQoDkRCxNvUF4aRaWtxyn4HHO1zr2VuIOdjeMVfkng1k8vt/Ga1s8 jQ0HzngSm4QQf0aOThvGnDJVveekJP0PRTNeN5GWqIBGRZD/NwQsQ5tNfzC6uJBUfrnuDb j8fhJuWVDZLzv9AIIap8p2HEnnfQ3wTdk8mOK7UZzcF2UX7hw/hjrorncuQ8qg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cs9pj0sMxzXXv; Wed, 22 Oct 2025 14: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 59ME2bZR031417; Wed, 22 Oct 2025 14: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 59ME2bc3031414; Wed, 22 Oct 2025 14:02:37 GMT (envelope-from git) Date: Wed, 22 Oct 2025 14:02:37 GMT Message-Id: <202510221402.59ME2bc3031414@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Clausecker Subject: git: 5f2df8f83128 - main - committers-src: add self List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5f2df8f83128adbd2cf22050ca078f2e46bbb227 Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=5f2df8f83128adbd2cf22050ca078f2e46bbb227 commit 5f2df8f83128adbd2cf22050ca078f2e46bbb227 Author: Robert Clausecker AuthorDate: 2025-10-22 12:41:36 +0000 Commit: Robert Clausecker CommitDate: 2025-10-22 14:01:35 +0000 committers-src: add self With big thanks to Mark Johnston for mentoring me! Approved by: markj (mentor) Differential Revision: https://reviews.freebsd.org/D53258 --- share/misc/committers-src.dot | 2 ++ 1 file changed, 2 insertions(+) diff --git a/share/misc/committers-src.dot b/share/misc/committers-src.dot index 6035dd031216..3f3e39635c55 100644 --- a/share/misc/committers-src.dot +++ b/share/misc/committers-src.dot @@ -188,6 +188,7 @@ fjoe [label="Max Khon\nfjoe@FreeBSD.org\n2001/08/06"] flz [label="Florent Thoumie\nflz@FreeBSD.org\n2006/03/30"] freqlabs [label="Ryan Moeller\nfreqlabs@FreeBSD.org\n2020/02/10"] fsu [label="Fedor Uporov\nfsu@FreeBSD.org\n2017/08/28"] +fuz [label="Robert Clausecker\nfuz@FreeBSD.org\n2025/10/21"] gabor [label="Gabor Kovesdan\ngabor@FreeBSD.org\n2010/02/02"] gad [label="Garance A. Drosehn\ngad@FreeBSD.org\n2000/10/27"] gallatin [label="Andrew Gallatin\ngallatin@FreeBSD.org\n1999/01/15"] @@ -789,6 +790,7 @@ markj -> bnovkov markj -> cem markj -> christos markj -> dougm +markj -> fuz markj -> igoro markj -> jfree markj -> lwhsu From nobody Wed Oct 22 14:07:41 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cs9wZ1MdDz6FL5L; Wed, 22 Oct 2025 14:07:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cs9wZ0njjz43vv; Wed, 22 Oct 2025 14:07:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761142062; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eUkP0w0axsrpOqF5DpgQge/N00anl9Wv7epoLO7doeE=; b=u6p8V2qVJZx7F6UzYjfU6RZGC7FuaezSEPUuQ4gx88rUWcEII76oFe4ISjkgSWjMOj+NUX mXaZhD2qaNPnsthg8H/LFvxbHpRtVVq6hqd2EI9yh1bszyySeff/pMQcqbXxZdqQGxU8Mv vJgiNpJlCbyf1UOwWg0Oz00ifjbADLwhbW14oLYsD+HEhy244/ygCOnONzKsNFbzZf+GlZ uFCswnXFgnFPT4IVX0nhB37DGJm0ksE99Qk1dQ72jqTRWr7t9TQdRxYrumx+u+rEUvQAi8 X0lgBPD+ohuBCpbBZ/3aw48pJRBO9nltm2QZNht/g35o6G2b9rPx3FDqLsh6Ow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761142062; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eUkP0w0axsrpOqF5DpgQge/N00anl9Wv7epoLO7doeE=; b=IEWhYBxwDLDx5edWS1Rc8sI4RIHhIKQf1J5+MWqHB3o7LMO0ftwCRP8vgmLxSf6u2W1Uoe 3DM38rXFP3JCRqPFb30TA/0vLsJnDOSR1JTz4U9nU3ONjS55pQRXZNFiATLrExN1WaXre/ BjW37dGL92+rZ5dRWNaq3QsEWwoZicn3HkIRQBkqxRdO6fytzcxsKVn1/fjH662RV3pO2S pbwsHYIUQES3U6snlp/rKRrIK5gbOjcwfEn7XhoN99pc2PvVyCn2f71qhE4NgS/E0dzCuE /4UsNjJwFkCuFU4BSCbrZsNnRfl2q5oPoScCyNgqj7TMiVuWigFyPJwFeRGjzg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761142062; a=rsa-sha256; cv=none; b=xAHsQMVhN9o2yv2A7i2Ogrk7zyq3LzVlcHcfOHsndlhApoiIKHQSB2nhhcsqOZX8Aiygi6 SbOOOVY0hSedcMkW8PX+rT655GYKR+Y0LdOsVPjYjDRUSnN+T+y5EjonQ2mGcc+CtCilhp d3NucagcXiSt0bYDniqsP4CmnZOXnkVP1TDa6yHdNqQahlypT2R41rU4y2ldF4dBd4HwOI r8mHh7bpQrwm5cfX4SRP+vyuD0e/Rvou1iGqP0fABCJ1zx5kVSmSokrHEIfbg3wEgqmdou A83Yz7hvx9kUHU1TBsuF+Kefc/LIJBh3SNxe+egrwTD509rwQ4HxiZsz27WaCw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cs9wZ0ML7zYMV; Wed, 22 Oct 2025 14:07: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 59ME7fcX032998; Wed, 22 Oct 2025 14:07:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59ME7fDa032995; Wed, 22 Oct 2025 14:07:41 GMT (envelope-from git) Date: Wed, 22 Oct 2025 14:07:41 GMT Message-Id: <202510221407.59ME7fDa032995@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 3e9ad70a30d9 - main - linuxkpi: Fix the definition of BITS_PER_LONG List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3e9ad70a30d93fc8bc759af7ec57aaa7e0b2d4f6 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=3e9ad70a30d93fc8bc759af7ec57aaa7e0b2d4f6 commit 3e9ad70a30d93fc8bc759af7ec57aaa7e0b2d4f6 Author: Mark Johnston AuthorDate: 2025-10-22 14:04:46 +0000 Commit: Mark Johnston CommitDate: 2025-10-22 14:04:46 +0000 linuxkpi: Fix the definition of BITS_PER_LONG Don't use __LP64__ to decide the value, as it gives the wrong result on CHERI platforms. Just define it in terms of __SIZEOF_LONG__. Make a similar adjustment for BITS_PER_LONG_LONG while here. Reviewed by: bz, dumbbell, emaste MFC after: 1 week Sponsored by: CHERI Research Centre (EPSRC grant UKRI3001) Differential Revision: https://reviews.freebsd.org/D53135 --- sys/compat/linuxkpi/common/include/linux/bitops.h | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/bitops.h b/sys/compat/linuxkpi/common/include/linux/bitops.h index 00dd1f9a1ec0..a5a7abd55287 100644 --- a/sys/compat/linuxkpi/common/include/linux/bitops.h +++ b/sys/compat/linuxkpi/common/include/linux/bitops.h @@ -37,13 +37,8 @@ #define BIT(nr) (1UL << (nr)) #define BIT_ULL(nr) (1ULL << (nr)) -#ifdef __LP64__ -#define BITS_PER_LONG 64 -#else -#define BITS_PER_LONG 32 -#endif - -#define BITS_PER_LONG_LONG 64 +#define BITS_PER_LONG (__SIZEOF_LONG__ * __CHAR_BIT__) +#define BITS_PER_LONG_LONG (__SIZEOF_LONG_LONG__ * __CHAR_BIT__) #define BITMAP_FIRST_WORD_MASK(start) (~0UL << ((start) % BITS_PER_LONG)) #define BITMAP_LAST_WORD_MASK(n) (~0UL >> (BITS_PER_LONG - (n))) From nobody Wed Oct 22 14:35:46 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4csBXz0WzMz6FMwL; Wed, 22 Oct 2025 14:35:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4csBXy5ggkz48XT; Wed, 22 Oct 2025 14:35:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761143746; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aNArLq4w1/n6Ak7VK8cKuttwwWchurJrBbZmstspOhM=; b=nHjrpuoOw38Vl41ikLJ/6S6WLyr+z7fxNK2iXKBV2vUsRQPAVspjlwDYvt+GKTV07XYZAe +58KS+seHjKGCKVmrEHyuJsWiW1i6UDQNqFafyCC662nbXJzgAtxXyWgtdaB5fRm/yWgO3 s3NsfvWngyyGQlw3q2SqtBlUbsKXc/brvCoA8oQxNlXTUU2zBC9Boxd9rDjcmijfKSoLN9 sPQd/w6+fHQw+rxAcPOezBQenED5T2QAZM2ECiC+sRDX9cB3hgjE5zW00rDj0T0gOWQL/q rkW5pSUHIWJM+QvygboT1loiV+Bhub0OEyIHlOFpJsvqTa0aAKQqq6ya4JoGPQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761143746; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aNArLq4w1/n6Ak7VK8cKuttwwWchurJrBbZmstspOhM=; b=RnbzNhEzj7Z/DDPl7MY2eK+U0Vd7YB9rjucd9UVZ9qHN/oHEczSra7aXZa9q+W1mDjpyx8 qzVby+biVa8mLFjEvYMvWXSeMFg9Xj3alAnMPdB4mGDWHwnAa2hABgBnB8ILHrd/XLOWYP GDRJjNRFWGgdArmT0iqewkqVrx5U9SMoylaPNYZrzMUr5anRKvowezOp615WbxsVcTo7Fr PmnrT3Vdv86D9Fjsn5y7bUOKw1Pg/yv1U2VQgtObc2t5Dshwn98raRUEfYWz/VCFoXSu2E hes3L16UdXRgsvPJ/Cf5d3MJUiJTZTOiqmGkxxAvfCY0yLM1/AWxpiT9WN7khQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761143746; a=rsa-sha256; cv=none; b=xdwvP1ZpTEwvjGUeaGt6Q8ZwUe+5k3U7YxKDv/d+U2Lyx/Kye0aQI4qimVTAeWh62IkjnW ml4rxvNi7f2xqNppQw6eDxDp+wHYeVvCa7720x3Thxe0puRGiOrDSGyOKSGdDj3D+r7Eo1 z8lDQXxC6dZ/NQzqtuyliha/jHxvJDFJEtT2cr9EtHs3hzsYcRny0KJ33C2b4kupXiRfZI OZM88teWnRCb8J5YXvjFuTFBLY628TRw1fBs43wGlQeshgBgYimZRMfQGZKhZRB+TrWfzh S6mnF6vww9iwcD0sMvpDvaekV4D4DTfXwFKUv+Z4dUZb0XT/lQl61wG3BfIM9w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4csBXy5GQszZ0c; Wed, 22 Oct 2025 14:35: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 59MEZkD8088939; Wed, 22 Oct 2025 14:35:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MEZkwn088936; Wed, 22 Oct 2025 14:35:46 GMT (envelope-from git) Date: Wed, 22 Oct 2025 14:35:46 GMT Message-Id: <202510221435.59MEZkwn088936@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: fe7954d723f8 - main - modules/allwinner: add nvmem_if.h to SRCS List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fe7954d723f85abd6eaf035db92a3a60a7803eb4 Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=fe7954d723f85abd6eaf035db92a3a60a7803eb4 commit fe7954d723f85abd6eaf035db92a3a60a7803eb4 Author: Mitchell Horne AuthorDate: 2025-10-22 14:29:37 +0000 Commit: Mitchell Horne CommitDate: 2025-10-22 14:35:25 +0000 modules/allwinner: add nvmem_if.h to SRCS Ensure the header is generated; it is a dependency for these drivers. This fixes standalone module builds and riscv LINT. Reported by: zlei Sponsored by: The FreeBSD Foundation Fixes: 5522519731b7 ("modules: enable allwinner kmods on riscv") --- sys/modules/allwinner/aw_sid/Makefile | 3 ++- sys/modules/allwinner/aw_thermal/Makefile | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/modules/allwinner/aw_sid/Makefile b/sys/modules/allwinner/aw_sid/Makefile index 7d3dad68acb9..2679aa83d09d 100644 --- a/sys/modules/allwinner/aw_sid/Makefile +++ b/sys/modules/allwinner/aw_sid/Makefile @@ -7,6 +7,7 @@ SRCS+= \ bus_if.h \ clknode_if.h \ device_if.h \ - ofw_bus_if.h \ + nvmem_if.h \ + ofw_bus_if.h .include diff --git a/sys/modules/allwinner/aw_thermal/Makefile b/sys/modules/allwinner/aw_thermal/Makefile index 911e6406d947..924b09a3b3c8 100644 --- a/sys/modules/allwinner/aw_thermal/Makefile +++ b/sys/modules/allwinner/aw_thermal/Makefile @@ -7,6 +7,7 @@ SRCS+= \ bus_if.h \ clknode_if.h \ device_if.h \ - ofw_bus_if.h \ + nvmem_if.h \ + ofw_bus_if.h .include From nobody Wed Oct 22 14:56:43 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4csC1D63F5z6CgDl; Wed, 22 Oct 2025 14:56:48 +0000 (UTC) (envelope-from mhorne@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4csC1D5RzFz3Dyt; Wed, 22 Oct 2025 14:56:48 +0000 (UTC) (envelope-from mhorne@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761145008; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=xK47q+n7XckegJw/lgfE69OnQ6b6ZHgWAdGcTwq+30s=; b=bo7mzx/15lRm9rYxTR+NVmzzxJLMFfCneAhg0QLBPPgO6Vt3w7KqfVXW8E6MPKA51SLv4P LMll5XtvUhMDBUV/PQacaIr/Vi4SeXqy81NuyR+Zu0TnlEIxvnZlP4XrQHKsZjEohyWjBN S31n5n1BeobVHRHQd/2uZKIA6ZWqgAxFtFbw+gH4ZE7ViqYcUYaCQtr8nNW8wxv45pihNe 11Z6vnuetOS3f1R0ojo66+IyNX2EKfEuThSW8esH9Vlk5DpanCijqqB9OIW5FfqC8RC6K3 Hod0ruSs82Mg40pms4w7dDutjpWYlD31Ygpuf1wUuncWX2cls61l678hRxAVzA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761145008; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=xK47q+n7XckegJw/lgfE69OnQ6b6ZHgWAdGcTwq+30s=; b=ozWsd4wOuCdaT++C/mxXtffzMg1OAKpq83NDd5fbkw8XbtGW7J9V7iOXhDUJy37UbVN+ew P0aPdtJA0xAjQ/rzDDxm/VwkmbptVLUqHwaWz1VeQne7S8hvmPS2cijOkya1CkUXOw6m2V YRUhKeStPyLL+donvWNVcCvFp4nhL2OCoRQZ2TJDjcAe4nw8aAnjKmf9Dt4PvJU5Hw+E/A yV7V5khS8lAlxeRv99EwuHCLgve0J+Mq1yWs2JnWRCsQnmJFVFegC5GtrXZm/vskqkFKez A3s5n1Rh7P9LdwgSPMP2C5qcmAEDjwik4Dq7czvYfrQCZKHs93dK6OjVAtEl8A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761145008; a=rsa-sha256; cv=none; b=uVPG791PTzsY2WUH6f2fGRr0ju2oYAgmVZi7AbviyY5Xzpkm5uxTm32fDZFM/OKZHeOYb0 f1e4187YyAmA923faBJjqbPR/UvPdlEP8B3+RbRdobdHcjJx5dCJFS2Dtcyeku1wPWrQsg tgsK/sWOHjmntiszsMv97lYqxRIQiGWNUndJ27/nii8jIJVv4DDUg90pAqw2onW2ecafxd OEEmUGQBwxyJEih+iPxc2nN/pDT1Wusay76sxQtWbC9wdktZ3IeFzCKYppmUvcO1WYasky 0PNh60RoKbiUHfP10l8D3qrObOZ1Nsq2GpkiMuWLmmV6rw/cVuSOd4gP3IljRw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from [192.168.2.224] (fctnnbsc38w-47-55-39-231.dhcp-dynamic.fibreop.nb.bellaliant.net [47.55.39.231]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: mhorne) by smtp.freebsd.org (Postfix) with ESMTPSA id 4csC1D436Hz1C2s; Wed, 22 Oct 2025 14:56:48 +0000 (UTC) (envelope-from mhorne@freebsd.org) Message-ID: <9ffa5243-7b9a-482f-93e9-d929569070ef@freebsd.org> Date: Wed, 22 Oct 2025 11:56:43 -0300 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 5522519731b7 - main - modules: enable allwinner kmods on riscv To: Zhenlei Huang Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" References: <202510202342.59KNgHDl091154@gitrepo.freebsd.org> <8FF166A8-80E3-461C-88E8-2BE0BD6239A9@FreeBSD.org> From: Mitchell Horne Content-Language: en-CA In-Reply-To: <8FF166A8-80E3-461C-88E8-2BE0BD6239A9@FreeBSD.org> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Thank you! Fixed in fe7954d723f. Mitchell On 10/22/25 02:15, Zhenlei Huang wrote: > Hi Mitchell, >=20 > The riscv LINT kernel build fails with this change, >=20 > ``` > $ make buildkernel TARGET_ARCH=3Driscv64 KERNCONF=3DLINT > =3D=3D=3D> allwinner/aw_sid (all) > cc -target riscv64-unknown-freebsd16.0 --sysroot=3D/usr/obj/home/zlei/f= reebsd-src/riscv.riscv64/tmp -B/usr/obj/home/zlei/freebsd-src/riscv.riscv= 64/tmp/usr/bin -O2 -pipe -fno-common -march=3Drv64imafdc -mabi=3Dlp64d = -fno-strict-aliasing -Werror -D_KERNEL -DKLD_MODULE -DKLD_TIED -nostdinc = -DHAVE_KERNEL_OPTION_HEADERS -include /usr/obj/home/zlei/freebsd-src/ri= scv.riscv64/sys/LINT/opt_global.h -I. -I/home/zlei/freebsd-src/sys -I/hom= e/zlei/freebsd-src/sys/contrib/ck/include -fno-common -g -fno-omit-frame-= pointer -mno-omit-leaf-frame-pointer -fPIC -fdebug-prefix-map=3D./machine= =3D/home/zlei/freebsd-src/sys/riscv/include -I/usr/obj/home/zlei/freebsd-= src/riscv.riscv64/sys/LINT -fno-builtin -MD -MF.depend.aw_sid.o -MTaw_= sid.o -march=3Drv64imafdch -mabi=3Dlp64 -mno-relax -ffreestanding -fwrapv= -fstack-protector -gdwarf-4 -Wall -Wstrict-prototypes -Wmissing-prototy= pes -Wpointer-arith -Wcast-qual -Wundef -Wno-pointer-sign -D__printf__=3D= __freebsd_kprintf__ -Wmissing-include-dirs -fdiagnostics-show-option -Wno= -unknown-pragmas -Wswitch -Wno-error=3Dtautological-compare -Wno-error=3D= empty-body -Wno-error=3Dparentheses-equality -Wno-error=3Dunused-function= -Wno-error=3Dpointer-sign -Wno-error=3Dshift-negative-value -Wno-address= -of-packed-member -Wno-format-zero-length -mcmodel=3Dmedium -std=3Dgnu= 17 -c /home/zlei/freebsd-src/sys/arm/allwinner/aw_sid.c -o aw_sid.o > /home/zlei/freebsd-src/sys/arm/allwinner/aw_sid.c:48:10: fatal error: '= nvmem_if.h' file not found > 48 | #include "nvmem_if.h" > | ^~~~~~~~~~~~ > 1 error generated. > *** Error code 1 > ``` >=20 > Best regards, > Zhenlei >=20 From nobody Wed Oct 22 15:41:05 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4csD0K3Gsyz6ClFS; Wed, 22 Oct 2025 15:41:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4csD0K27g4z3L9w; Wed, 22 Oct 2025 15:41:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761147665; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Yy4KtyTgZPaPks0jwu0gjoKB4gM1SW07IhLHZ1Jvelg=; b=af/l0gqsqJ/svvL8xhpqe4qUqAhWgYbnsVBYrfG411978aSVFQqmU/iWO8XcHg5ACAIf3i QKmbR98jTkDUbN7j1Wg/Ma0SnVJvZgXMowLyh4MjZbW7IWS1l2n+EdiK1//VGG8/WpujCy HBqL0mROLB0VFf7Z5dBfAjdOSZr/2eLsSEnBeUhWV3RpqH34HLvkLipMpXbLbIjsbniwJS ZCx0ft0xHCi5ODXSHJ9Lu2Ww1o9oZ1erND3huSGel5L3fn45RyL6CN3DAfJRZMq19SeTon Ge0BJrbujthNYtCkvQ2vgvskqSnqxET0qyfvx+3zA/+XN/8uy5TXMeOdyLP90Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761147665; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Yy4KtyTgZPaPks0jwu0gjoKB4gM1SW07IhLHZ1Jvelg=; b=ln+E38DNglxl3BJ2EgUeHEbzYtCeXE3Yi/Szdj0xg/g5dnlxpLAkcGrFi6dTB1u7MUBRN3 Gogr6OuM/TJEln0hQWTigLZ3v3RqjtJwwvdSE1w9tmNwWkvurCW6Uh4qTSboAo6XOLrTHz OtH6AYY6EFnGZTzDUM9rcc2MMMPPXFWSeF8Z5BfXznSM1O48F6w3QDe0qtYXAYnxInDScd BFspeRWLNneNpodECep2Qdzmt2IkUqaoheu5t2ZqRvzDQHBsw0W2QXt/OQK/VvEVf8wk2l FTzTpwCX6iMElg7en5LkPJjNy4EC0ln9+5DZaJi7TF10jQhr3u3muuLSKgZifg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761147665; a=rsa-sha256; cv=none; b=xZKhVM1ee9m/soMOPwzmhdKNTb9WQaO0k8A+uu2euCqR9Wazs4FGWWL/WVVkYp7+bqdvlw lSxAVa2suQ5j/A/VTWGTG546Q2DNpnSb0MfpzQ5rQsF/Ss4Wr2tVuiknIPEJrzdM/LL3eZ dUmtC6hN8gsbJdOOhWg9qWwh2bu70M/7Eqdse23Tf4cQtq1JeLPmg1eTLL2ge7HquqnfcR p9KUZXyu5dc3fb2VHDDgFoauonw+3xBJRUwJ5qHA+ZoAQwhUGY3m4L1EIPasDDDlXm6mpV /5T2QX3iJd+WRSHqDSNYF8sZYS5+XMNPtsen6bPRz7a62uYHcMyjVRp6uJ/RDg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4csD0K1VYszZsq; Wed, 22 Oct 2025 15:41:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59MFf5RK013921; Wed, 22 Oct 2025 15:41:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MFf599013918; Wed, 22 Oct 2025 15:41:05 GMT (envelope-from git) Date: Wed, 22 Oct 2025 15:41:05 GMT Message-Id: <202510221541.59MFf599013918@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alan Somers Subject: git: 6d0001d44490 - main - nvme: add support for DIOCGIDENT List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6d0001d44490becdd20d627ce663c72a30b9aac3 Auto-Submitted: auto-generated The branch main has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=6d0001d44490becdd20d627ce663c72a30b9aac3 commit 6d0001d44490becdd20d627ce663c72a30b9aac3 Author: Alan Somers AuthorDate: 2025-10-16 22:00:14 +0000 Commit: Alan Somers CommitDate: 2025-10-22 15:39:35 +0000 nvme: add support for DIOCGIDENT Add support for the DIOCGIDENT ioctl to both nvme controller device nodes and namespace device nodes. This information was already available via the nda(4) device node. However, mapping /dev/nvmeX to /dev/ndaY device nodes is not straightforward, so it's better to get it directly from the /dev/nvme device node. PR: 290259 MFC after: 2 weeks Sponsored by: ConnectWise Submitted by: imp (mostly) Pull Request: https://github.com/freebsd/freebsd-src/pull/1875 --- sys/dev/nvme/nvme_ctrlr.c | 24 ++++++++++++++++++++++++ sys/dev/nvme/nvme_ns.c | 5 +++++ sys/dev/nvme/nvme_private.h | 1 + 3 files changed, 30 insertions(+) diff --git a/sys/dev/nvme/nvme_ctrlr.c b/sys/dev/nvme/nvme_ctrlr.c index 3a1894bf754d..f212759a5500 100644 --- a/sys/dev/nvme/nvme_ctrlr.c +++ b/sys/dev/nvme/nvme_ctrlr.c @@ -33,6 +33,7 @@ #include #include #include +#include #include #include #include @@ -1253,6 +1254,24 @@ nvme_ctrlr_poll(struct nvme_controller *ctrlr) nvme_qpair_process_completions(&ctrlr->ioq[i]); } +/* + * Copy the NVME device's serial number to the provided buffer, which must be + * at least DISK_IDENT_SIZE bytes large. + */ +void +nvme_ctrlr_get_ident(const struct nvme_controller *ctrlr, uint8_t *sn) +{ + _Static_assert(NVME_SERIAL_NUMBER_LENGTH < DISK_IDENT_SIZE, + "NVME serial number too big for disk ident"); + + memmove(sn, ctrlr->cdata.sn, NVME_SERIAL_NUMBER_LENGTH); + sn[NVME_SERIAL_NUMBER_LENGTH] = '\0'; + for (int i = 0; sn[i] != '\0'; i++) { + if (sn[i] < 0x20 || sn[i] >= 0x80) + sn[i] = ' '; + } +} + /* * Poll the single-vector interrupt case: num_io_queues will be 1 and * there's only a single vector. While we're polling, we mask further @@ -1495,6 +1514,11 @@ nvme_ctrlr_ioctl(struct cdev *cdev, u_long cmd, caddr_t arg, int flag, case NVME_GET_CONTROLLER_DATA: memcpy(arg, &ctrlr->cdata, sizeof(ctrlr->cdata)); break; + case DIOCGIDENT: { + uint8_t *sn = arg; + nvme_ctrlr_get_ident(ctrlr, sn); + break; + } /* Linux Compatible (see nvme_linux.h) */ case NVME_IOCTL_ID: td->td_retval[0] = 0xfffffffful; diff --git a/sys/dev/nvme/nvme_ns.c b/sys/dev/nvme/nvme_ns.c index e84d2066930e..a759181a8c16 100644 --- a/sys/dev/nvme/nvme_ns.c +++ b/sys/dev/nvme/nvme_ns.c @@ -88,6 +88,11 @@ nvme_ns_ioctl(struct cdev *cdev, u_long cmd, caddr_t arg, int flag, gnsid->nsid = ns->id; break; } + case DIOCGIDENT: { + uint8_t *sn = arg; + nvme_ctrlr_get_ident(ctrlr, sn); + break; + } case DIOCGMEDIASIZE: *(off_t *)arg = (off_t)nvme_ns_get_size(ns); break; diff --git a/sys/dev/nvme/nvme_private.h b/sys/dev/nvme/nvme_private.h index 52e9fcbbebcd..04a47d799350 100644 --- a/sys/dev/nvme/nvme_private.h +++ b/sys/dev/nvme/nvme_private.h @@ -563,6 +563,7 @@ void nvme_notify_new_controller(struct nvme_controller *ctrlr); void nvme_notify_ns(struct nvme_controller *ctrlr, int nsid); void nvme_ctrlr_shared_handler(void *arg); +void nvme_ctrlr_get_ident(const struct nvme_controller *ctrlr, uint8_t *sn); void nvme_ctrlr_poll(struct nvme_controller *ctrlr); int nvme_ctrlr_suspend(struct nvme_controller *ctrlr); From nobody Wed Oct 22 15:47:44 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4csD805xKQz6CllM; Wed, 22 Oct 2025 15:47:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4csD805LVpz3Nq3; Wed, 22 Oct 2025 15:47:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761148064; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HqAjFA2fOykKoW+cEsaqiLOUt/4IP29DmHCWrJWQrK4=; b=LJe6upJvKXlwrExF4MDHpHnSHcl9a63jbxJ3WpHock8luKzFOK6NZfpXYbRQlZfpp56Vky 3Gc4Y5shDfAAyBhc9BIXdNoV2fgMGLgUSbf3nKoYvd6jo+PZCCgV/g2eZv9/D8cpA40MQS KwMpU4GDUujGNnRs8/nvdYqqlvClXJ7k9A24Vs61wXTQr7W7VFxBndYjtJXUXtI7CHp+7w Z8KntAJ+jbVP5TVTCUCL/wNim/KeodFWKB7BJQ7a1KCQUKa2f5tCB8E/7DZlnRLOiKeEM0 AvcpUvEL/1vpzOCExrAtlzBNvdLTurtLNrEAR8gp8XhoqRoXshh1aEmkXIxrng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761148064; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HqAjFA2fOykKoW+cEsaqiLOUt/4IP29DmHCWrJWQrK4=; b=M4c/FglLXSCOGmVACvnbvd5/PFgwxTA4UdmUVKcDGo7Y0KjzHW0TQd/fcFdYLXFBIVAsBs WISJHRbndZRrsxEWYf9fRY8mkRYtx26zqRwGquMDJX9r8LscWuJLGt9EN5kI3jLsK4PRwU TQZXsMhiiSHKbx7RN9HlAvAVgOBhHZlyJHZmZ63x04aNX8vJ7TKW1LDIz8HulcxSBSSACm QLWA6XhexoSBfpIZE9TSc0hsUs5jTGHFhpzSaEgOanPEwPaL8PazxqppYfv9m3/2qZ0H02 peiRLq+KSUVXVLJJWEdgqVU7yVYiDxRhIJJX1Lv0i8caBWgwCPMNbqWdT+wI0A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761148064; a=rsa-sha256; cv=none; b=cGL6SY4DM7/CBYjn2a7xFUlG+Om5I+v0Eq0Tv+0FzL+TjjbPPh+wT6s5jNVavYNYUYfrPS 3EqlJF+l7PZWoStNKXW55UfdlbwafNwJLAhJ3Ib9PUOGjLE3xsYhVEygddGNtQw9lTrw29 tYlHWMs4C9pQMdoQwi+8F80MhKyzbSuIkBLpGBIdmS4wA3ahiHxVwvAK8zPbkXzFDml8SH SsSvdvlQYXMU+XvZrC4A9mc2BtVbkA3JRC6hEFgOKT2JRxpa6uVgTPJcFrp7IaDsWfVul2 ND63Bei/0Yx5WbhJCdE5Ogb86M8KGjf4eQkRXOFRZFB/uwgiapZu1+gm1koaJg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4csD804YsFzblj; Wed, 22 Oct 2025 15:47: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 59MFliEO021821; Wed, 22 Oct 2025 15:47:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MFliDN021818; Wed, 22 Oct 2025 15:47:44 GMT (envelope-from git) Date: Wed, 22 Oct 2025 15:47:44 GMT Message-Id: <202510221547.59MFliDN021818@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 320ad3dec5ff - main - inpcb: Ignore SO_REUSEPORT_LB on connected sockets List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 320ad3dec5ff1b37f6907a47961c18b9d77e6a53 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=320ad3dec5ff1b37f6907a47961c18b9d77e6a53 commit 320ad3dec5ff1b37f6907a47961c18b9d77e6a53 Author: Mark Johnston AuthorDate: 2025-10-06 13:37:47 +0000 Commit: Mark Johnston CommitDate: 2025-10-22 15:42:49 +0000 inpcb: Ignore SO_REUSEPORT_LB on connected sockets While TCP disallows connect()ing a socket with SO_REUSEPORT_LB, UDP does not. As a result, a connected UDP socket can be placed in the lbgroup hash and thus receive datagrams from sources other than the connected host. Reported by: Amit Klein Reported by: Omer Ben Simhon Reviewed by: glebius Approved by: so Security: FreeBSD-SA-25:09.netinet Security: CVE-2025-24934 --- sys/netinet/in_pcb.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c index dbe48242381d..712ff28768dc 100644 --- a/sys/netinet/in_pcb.c +++ b/sys/netinet/in_pcb.c @@ -2665,10 +2665,13 @@ in_pcbinshash(struct inpcb *inp) INP_PCBPORTHASH(inp->inp_lport, pcbinfo->ipi_porthashmask)]; /* - * Add entry to load balance group. - * Only do this if SO_REUSEPORT_LB is set. + * Ignore SO_REUSEPORT_LB if the socket is connected. Really this case + * should be an error, but for UDP sockets it is not, and some + * applications erroneously set it on connected UDP sockets, so we can't + * change this without breaking compatibility. */ - if ((inp->inp_socket->so_options & SO_REUSEPORT_LB) != 0) { + if (!connected && + (inp->inp_socket->so_options & SO_REUSEPORT_LB) != 0) { int error = in_pcbinslbgrouphash(inp, M_NODOM); if (error != 0) return (error); @@ -2770,6 +2773,10 @@ in_pcbrehash(struct inpcb *inp) connected = !in_nullhost(inp->inp_faddr); } + /* See the comment in in_pcbinshash(). */ + if (connected && (inp->inp_flags & INP_INLBGROUP) != 0) + in_pcbremlbgrouphash(inp); + /* * When rehashing, the caller must ensure that either the new or the old * foreign address was unspecified. From nobody Wed Oct 22 15:47:45 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4csD815Zfgz6Clqd; Wed, 22 Oct 2025 15:47:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4csD814zPZz3P3Q; Wed, 22 Oct 2025 15:47:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761148065; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=E1zXXjPnVxmgiTZE4GRmY7z3rTuD4b17GSvdoGVSP+M=; b=Ie2u94E6E42cKaFWB/jl4QKnpc50W3iCAlTpuEEusHSYou3Du+j2gDr8C2WOPxDO8amrti LLikmeyxKGusg5Gx32iVkKZNTYaZK8OO/ftFaMZox5ODnAPZx9bcZV2LcCCivMCqnIVPtN ZdqftEg/N09DJJIq7eSsOycjXNAqnNl5X9fTM1t01+uyyDeEhR0tBAnmDTESP8bpG88nwx gDKgM/D8SbzgOEN6rtQ7YgGwyigkLlBaDAliWhUQQT7om7c0i2o5mFy0TwYdiDxvy834GZ CK9hQnfCUPGhfSkAyTb92ib0P9RtrITCiOzIXZ1n2hnp9zC5+Xol1dQo+hrC2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761148065; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=E1zXXjPnVxmgiTZE4GRmY7z3rTuD4b17GSvdoGVSP+M=; b=RGdxxHH0QlgLveqvIZmAc2Wfg1TIwREBMogi3bOb6FGI19tV67eJC06gwgGEtOoC1495yo dwJTDI0LfNyoVxTTOEr6/sSFnIKO77GTi/becPt7W/7CHWUGMYDBrzs10y4AjBz+zKWV5c +WBL68LfHUtPNSciOH51Kw+hnadpoWtyPlsq7Ok6iwbtngZxjFpzaUQf3tpX+QtsPvwk5K hR/QI8wbYCjxZ8m/53m/2k4zasL0FPC8LJgIKnIceBc7KnOPDIz3zUBe+s4V25sHybASil LzIh6hAABAmGY2IcIgPcEMSkSGHYZL19WGFAhPO6NFprxupCperPDWeDQ44QEQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761148065; a=rsa-sha256; cv=none; b=o+Rbr/e5zCCU7HXY2jyYe2HrdFDk3UeiYlgWWID/phytu0omTqPi9KDeEiInz7++UkFotf CCc+n33sKp7+nJBrZ3lVP/gQAqlCerQhk8O7isLgqtoU/GqydCMI6ltOEhbqTghivXB/jR b9yNIZxKc0Sm73mvKOhZmWE9LDOaPbg8YsItPg18BFCn88mJqTCmHbXtb+qT4OD9bu9VQj k0CQFpLS4X7Ysb0M3s9qW1gCdTAFWTomDojDrAWVl+HzIwRUTJKrnFVUbAJzvKArRbC0VH Hdrtzy8uRkBuXPiFfimw5XWpRFveD25TsC6jHACpNkGxpWMBQrCz5AhFPyLJRw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4csD814bS4zcGT; Wed, 22 Oct 2025 15:47: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 59MFljBU021857; Wed, 22 Oct 2025 15:47:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MFljGG021854; Wed, 22 Oct 2025 15:47:45 GMT (envelope-from git) Date: Wed, 22 Oct 2025 15:47:45 GMT Message-Id: <202510221547.59MFljGG021854@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 1dd66c6ac2c1 - main - so_reuseport_lb_test: Add a test case for connected UDP sockets List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1dd66c6ac2c146f540b2ff825fbee442354aeee5 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=1dd66c6ac2c146f540b2ff825fbee442354aeee5 commit 1dd66c6ac2c146f540b2ff825fbee442354aeee5 Author: Mark Johnston AuthorDate: 2025-10-22 14:53:28 +0000 Commit: Mark Johnston CommitDate: 2025-10-22 15:42:50 +0000 so_reuseport_lb_test: Add a test case for connected UDP sockets Approved by: so --- tests/sys/netinet/so_reuseport_lb_test.c | 148 +++++++++++++++++++++++++++++++ 1 file changed, 148 insertions(+) diff --git a/tests/sys/netinet/so_reuseport_lb_test.c b/tests/sys/netinet/so_reuseport_lb_test.c index 0479bd070ca6..393a626af5a4 100644 --- a/tests/sys/netinet/so_reuseport_lb_test.c +++ b/tests/sys/netinet/so_reuseport_lb_test.c @@ -29,6 +29,8 @@ #include #include +#include +#include #include #include @@ -556,6 +558,150 @@ ATF_TC_BODY(connect_bound, tc) close(s); } +/* + * The kernel erroneously permits calling connect() on a UDP socket with + * SO_REUSEPORT_LB set. Verify that packets sent to the bound address are + * dropped unless they come from the connected address. + */ +ATF_TC_WITHOUT_HEAD(connect_udp); +ATF_TC_BODY(connect_udp, tc) +{ + struct sockaddr_in sin = { + .sin_family = AF_INET, + .sin_len = sizeof(sin), + .sin_addr = { htonl(INADDR_LOOPBACK) }, + }; + ssize_t n; + int error, len, s1, s2, s3; + char ch; + + s1 = socket(PF_INET, SOCK_DGRAM, 0); + ATF_REQUIRE(s1 >= 0); + s2 = socket(PF_INET, SOCK_DGRAM, 0); + ATF_REQUIRE(s2 >= 0); + s3 = socket(PF_INET, SOCK_DGRAM, 0); + ATF_REQUIRE(s3 >= 0); + + error = setsockopt(s1, SOL_SOCKET, SO_REUSEPORT_LB, (int[]){1}, + sizeof(int)); + ATF_REQUIRE_MSG(error == 0, + "setsockopt(SO_REUSEPORT_LB) failed: %s", strerror(errno)); + error = bind(s1, (struct sockaddr *)&sin, sizeof(sin)); + ATF_REQUIRE_MSG(error == 0, "bind() failed: %s", strerror(errno)); + + error = bind(s2, (struct sockaddr *)&sin, sizeof(sin)); + ATF_REQUIRE_MSG(error == 0, "bind() failed: %s", strerror(errno)); + + error = bind(s3, (struct sockaddr *)&sin, sizeof(sin)); + ATF_REQUIRE_MSG(error == 0, "bind() failed: %s", strerror(errno)); + + /* Connect to an address not owned by s2. */ + error = getsockname(s3, (struct sockaddr *)&sin, + (socklen_t[]){sizeof(sin)}); + ATF_REQUIRE(error == 0); + error = connect(s1, (struct sockaddr *)&sin, sizeof(sin)); + ATF_REQUIRE_MSG(error == 0, "connect() failed: %s", strerror(errno)); + + /* Try to send a packet to s1 from s2. */ + error = getsockname(s1, (struct sockaddr *)&sin, + (socklen_t[]){sizeof(sin)}); + ATF_REQUIRE(error == 0); + + ch = 42; + n = sendto(s2, &ch, sizeof(ch), 0, (struct sockaddr *)&sin, + sizeof(sin)); + ATF_REQUIRE(n == 1); + + /* Give the packet some time to arrive. */ + usleep(100000); + + /* s1 is connected to s3 and shouldn't receive from s2. */ + error = ioctl(s1, FIONREAD, &len); + ATF_REQUIRE(error == 0); + ATF_REQUIRE_MSG(len == 0, "unexpected data available"); + + /* ... but s3 can of course send to s1. */ + n = sendto(s3, &ch, sizeof(ch), 0, (struct sockaddr *)&sin, + sizeof(sin)); + ATF_REQUIRE(n == 1); + usleep(100000); + error = ioctl(s1, FIONREAD, &len); + ATF_REQUIRE(error == 0); + ATF_REQUIRE_MSG(len == 1, "expected data available"); +} + +/* + * The kernel erroneously permits calling connect() on a UDP socket with + * SO_REUSEPORT_LB set. Verify that packets sent to the bound address are + * dropped unless they come from the connected address. + */ +ATF_TC_WITHOUT_HEAD(connect_udp6); +ATF_TC_BODY(connect_udp6, tc) +{ + struct sockaddr_in6 sin6 = { + .sin6_family = AF_INET6, + .sin6_len = sizeof(sin6), + .sin6_addr = IN6ADDR_LOOPBACK_INIT, + }; + ssize_t n; + int error, len, s1, s2, s3; + char ch; + + s1 = socket(PF_INET6, SOCK_DGRAM, 0); + ATF_REQUIRE(s1 >= 0); + s2 = socket(PF_INET6, SOCK_DGRAM, 0); + ATF_REQUIRE(s2 >= 0); + s3 = socket(PF_INET6, SOCK_DGRAM, 0); + ATF_REQUIRE(s3 >= 0); + + error = setsockopt(s1, SOL_SOCKET, SO_REUSEPORT_LB, (int[]){1}, + sizeof(int)); + ATF_REQUIRE_MSG(error == 0, + "setsockopt(SO_REUSEPORT_LB) failed: %s", strerror(errno)); + error = bind(s1, (struct sockaddr *)&sin6, sizeof(sin6)); + ATF_REQUIRE_MSG(error == 0, "bind() failed: %s", strerror(errno)); + + error = bind(s2, (struct sockaddr *)&sin6, sizeof(sin6)); + ATF_REQUIRE_MSG(error == 0, "bind() failed: %s", strerror(errno)); + + error = bind(s3, (struct sockaddr *)&sin6, sizeof(sin6)); + ATF_REQUIRE_MSG(error == 0, "bind() failed: %s", strerror(errno)); + + /* Connect to an address not owned by s2. */ + error = getsockname(s3, (struct sockaddr *)&sin6, + (socklen_t[]){sizeof(sin6)}); + ATF_REQUIRE(error == 0); + error = connect(s1, (struct sockaddr *)&sin6, sizeof(sin6)); + ATF_REQUIRE_MSG(error == 0, "connect() failed: %s", strerror(errno)); + + /* Try to send a packet to s1 from s2. */ + error = getsockname(s1, (struct sockaddr *)&sin6, + (socklen_t[]){sizeof(sin6)}); + ATF_REQUIRE(error == 0); + + ch = 42; + n = sendto(s2, &ch, sizeof(ch), 0, (struct sockaddr *)&sin6, + sizeof(sin6)); + ATF_REQUIRE(n == 1); + + /* Give the packet some time to arrive. */ + usleep(100000); + + /* s1 is connected to s3 and shouldn't receive from s2. */ + error = ioctl(s1, FIONREAD, &len); + ATF_REQUIRE(error == 0); + ATF_REQUIRE_MSG(len == 0, "unexpected data available"); + + /* ... but s3 can of course send to s1. */ + n = sendto(s3, &ch, sizeof(ch), 0, (struct sockaddr *)&sin6, + sizeof(sin6)); + ATF_REQUIRE(n == 1); + usleep(100000); + error = ioctl(s1, FIONREAD, &len); + ATF_REQUIRE(error == 0); + ATF_REQUIRE_MSG(len == 1, "expected data available"); +} + ATF_TP_ADD_TCS(tp) { ATF_TP_ADD_TC(tp, basic_ipv4); @@ -566,6 +712,8 @@ ATF_TP_ADD_TCS(tp) ATF_TP_ADD_TC(tp, bind_without_listen); ATF_TP_ADD_TC(tp, connect_not_bound); ATF_TP_ADD_TC(tp, connect_bound); + ATF_TP_ADD_TC(tp, connect_udp); + ATF_TP_ADD_TC(tp, connect_udp6); return (atf_no_error()); } From nobody Wed Oct 22 16:59:51 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4csFlD0tPmz6CrvB; Wed, 22 Oct 2025 16:59:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4csFlD0K6dz3cDW; Wed, 22 Oct 2025 16:59:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761152392; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5z/TeMl/GkFD638EmK1j2o1erBUlnyLMJqxxcDo5IO4=; b=fcOc+63F3J5m2R2lI6Iogi9m72IQBERU8KAtoXwgdvFsDYLvxalLjiv9qKonkPrBvI+HSn WhU6LrR5f9M1W1+T8YL2NdyNLU3hDbOZFlFR8a5Px3CCwQP5gJALQhdKuPByP1lwN1G/Th //HbIJfMvjXBHxDEsajMHNldurT1jaU2JyUmFaE8Ue2DFNZVILkNZPePEmj5xolqJZ39tQ fViFzVwBSgnG/ijvMdGnqG92S7CTw4TvGQJGjqtIXrIgyi/OP44iRxL0CTXRmp3Llkg/Th A5DxWY+PHEzEC29gUXAwcQAegcihy5Z89bAn+UuD9ZELbLGA0bbVor67bwto0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761152392; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5z/TeMl/GkFD638EmK1j2o1erBUlnyLMJqxxcDo5IO4=; b=qVoVafxDebeDEJAfbBGEixDxZHlR4+SLm3k8OoRzC6ITBfsyLriDAJDSs1Z1tbG+UvwUuu ID2xJxVondc6n5VT1X05fbvk3P0PWspE3x2k9vPVcl7g905mIMr+nEXdmuizcAhGqgk0YP +KcuEaasp/t5W/iv2dumZvUfpS0t3gIkSuhshbiwSgHjG5HK2TteolvCzlPoYO9wUmUxZx 0R7kCZa2TRdcLOG/6B4H9dFAiWCgZsUyid15QP3VDKkZqO/MKbDEsplNG77L2DxgOEmZ1h jRvbF1w26ejYX0FF0MYtu3VTqVCOeL6E3g6TdYsv9S2JhhZ6/DOgel4olQfp4Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761152392; a=rsa-sha256; cv=none; b=ne/RSKdrPlNaW53vmTyuEYTEpJJP2ZaTLsCbgSMGYN7K0VqRXJVYaWppWx5g4EWE3ZMICr BumO+V5yEKqW5fAJCYF/NchAH4IwwzC6fqSYIqXcSI66i0yLLe6Y2LVGxV6Gq8Rkj9P7AJ xphjDocpJpahOB1dQoXyGikGe3e7GGlXF8qPlHydLwY32vxAzrF5dS4jK07T1AniMEb5MV HktBJRYzzK1RzaJ3GuxO8yuVAFmMCm+JHC96XdEDLod2r3Frvom09O3ITk42ijlWh3cW/D 53GW9vBMn7pymAQdLSw5bEbAInkOYfHeeuS/7gkzbg7l58xv0N8pKBZIw/wo9Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4csFlC6x9Zzdc9; Wed, 22 Oct 2025 16:59: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 59MGxp0q054768; Wed, 22 Oct 2025 16:59:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MGxpsK054765; Wed, 22 Oct 2025 16:59:51 GMT (envelope-from git) Date: Wed, 22 Oct 2025 16:59:51 GMT Message-Id: <202510221659.59MGxpsK054765@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Popov Subject: git: 62aef3f73f38 - main - vfs_cluster.c: Do not propagate VOP_BMAP errors to the caller List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: arrowd X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 62aef3f73f38db9fb68bffc12cc8900fecd58f0e Auto-Submitted: auto-generated The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/src/commit/?id=62aef3f73f38db9fb68bffc12cc8900fecd58f0e commit 62aef3f73f38db9fb68bffc12cc8900fecd58f0e Author: Gleb Popov AuthorDate: 2025-07-11 07:42:09 +0000 Commit: Gleb Popov CommitDate: 2025-10-22 16:59:21 +0000 vfs_cluster.c: Do not propagate VOP_BMAP errors to the caller The code that makes this VOP_BMAP call tries to perform a read-ahead I/O operation. Failing to do that for any reason isn't fatal for `cluster_read()`, because we still can return some data to the caller. This change is consistent with other places within `cluster_read()`, where error returned by VOP_BMAP is not returned to the caller - see the `if (nblks > 1)` block above the changed lines and `if (reqbp)` at the end of the function. PR: 264196 Approved by: markj, kib Differential Revision: https://reviews.freebsd.org/D51254 --- sys/kern/vfs_cluster.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/kern/vfs_cluster.c b/sys/kern/vfs_cluster.c index 2e397b8e9e8f..b674313993c4 100644 --- a/sys/kern/vfs_cluster.c +++ b/sys/kern/vfs_cluster.c @@ -260,8 +260,10 @@ cluster_read(struct vnode *vp, u_quad_t filesize, daddr_t lblkno, long size, */ while (lblkno < (origblkno + maxra)) { error = VOP_BMAP(vp, lblkno, NULL, &blkno, &ncontig, NULL); - if (error) + if (error) { + error = 0; break; + } if (blkno == -1) break; From nobody Wed Oct 22 17:48:38 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4csGqW44tlz6D09F; Wed, 22 Oct 2025 17:48:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4csGqW1G2lz3tfk; Wed, 22 Oct 2025 17:48:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761155319; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sw5yqjA5RwGLMAqUupqaLe2dexEJjfwLhwkqols+nO4=; b=kqSoqwh0tPG55BPuu2ko7duqZwiyFRP20qIrs8So+bh7PSZ4jenPzdzLqJQp/z/U6qFitW IIMwGqWPOJW37FxLrsv591PMncYHJz4GQEMmi8Q6QUW8DuWA2/UBInspwsrmV/W/i+4Id7 BU9+4LK1tetcb+qy7/1HCPJWNvFzUGwZE2tSVqNKsWKeuunbpVDzhkMymYwMoXcHaVEg80 e57D9d951IJkBffsN/40RAHSnWFQl3QUBucBBGE2bGc9O0hni3sFal3bsYLojiN1kk72Rw 14zH7yuAwyLpcAjna/MurJihvQGjdTMGcgy0yJPCRCIHw7C9HQq3p1UVGmiD8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761155319; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sw5yqjA5RwGLMAqUupqaLe2dexEJjfwLhwkqols+nO4=; b=KKGACPS6deNP8N52ZbVwKNir/B33cVWOewPqTxDgPkP1VrS0n8TOhOuHuJbXdA4SPNEoP8 K4J4yO6yUBakWhPzAFhc4sDD3oqoY9qg80EiSq6c0uc55fRSEdNeYg7kMCraqz+90NtEN4 onIX92Cymp4aTyXNXSgWOLua8VRdpB7nnhtxzwKH0g6mN4V7ePcE3GF8ag/gIPxHiRIRAK S8okq3fOPgsQV+NhvOancO2UpmAtplGalzvpvCgtaOts9UumtkIwAh4jc4Oru+ut9f6HF3 6WXnGLgplVE4Jn6rwhRPGd3tP+XIzGv7YYjCQ8rNibj/B7M+KXeimbLI1Tg6fQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761155319; a=rsa-sha256; cv=none; b=YpMV/hHaeinVP11zHsfbGmjJvIqCjYy5uA6PkocAXioeZsSVyOSjZE5rEA+jmCM3EsenIG 9k4nnHWKt4NZsykH2t8LbdTfs0PNcQTbM0rpkUlzfF5eA0VLzviYGSCxhP6uBj5T2DQXYY XcPgj2zjZiEFOiY/VoYdbCo59rGURUmSCPFI9uLztsBvO0StQuIIXrDU6zDfPLBYQRBRZI egJdesOeIIUeB9sVwPlh5j9wQcixdAJ5OSTmyvWXGqw4FgjI9GMGmEhh8D6jJurdvFgHzN Ezw73URH81Ehxtmnt8fz52xdls/aUhHSqp4P4l/w1q+2MQzfJOLhyqeA/nkRlw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4csGqW0X6Jzg5Z; Wed, 22 Oct 2025 17:48:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59MHmckA049173; Wed, 22 Oct 2025 17:48:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MHmcwV049170; Wed, 22 Oct 2025 17:48:38 GMT (envelope-from git) Date: Wed, 22 Oct 2025 17:48:38 GMT Message-Id: <202510221748.59MHmcwV049170@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jose Luis Duran Subject: git: 8e8ee8bbe2a1 - main - mtree: Remove stray atm directory List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8e8ee8bbe2a112f7d1cc1b005dbdb8868522b640 Auto-Submitted: auto-generated The branch main has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=8e8ee8bbe2a112f7d1cc1b005dbdb8868522b640 commit 8e8ee8bbe2a112f7d1cc1b005dbdb8868522b640 Author: Jose Luis Duran AuthorDate: 2025-10-22 15:34:30 +0000 Commit: Jose Luis Duran CommitDate: 2025-10-22 17:48:01 +0000 mtree: Remove stray atm directory ATM support for netgraph was removed in af0cc0b22362 ("NgATM: Remove netgraph ATM support") Remove the directory from the mtree specification. Reviewed by: emaste Fixes: 21735dfaebdf ("include: Remove no longer existing netgraph/atm") MFC after: 5 days Differential Revision: https://reviews.freebsd.org/D53260 --- etc/mtree/BSD.include.dist | 2 -- 1 file changed, 2 deletions(-) diff --git a/etc/mtree/BSD.include.dist b/etc/mtree/BSD.include.dist index 454657183c58..1a60bbef765a 100644 --- a/etc/mtree/BSD.include.dist +++ b/etc/mtree/BSD.include.dist @@ -303,8 +303,6 @@ net80211 .. netgraph - atm - .. bluetooth include .. From nobody Wed Oct 22 18:01:58 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4csH6t41KXz6D2B4; Wed, 22 Oct 2025 18:01:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4csH6t2pG1z3xR6; Wed, 22 Oct 2025 18:01:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761156118; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M6kQwMQKYZm1+ly3e3s+W6EdvCnjU2seXKmqbL2Z6D0=; b=He+yFK4v6EmqgQxuHNDz+/XIZXXM378MC9eqnhE6EtUMUVEtz4hs4ZE77y6x1P95cR0uUs s1pNB7LoGg8g/VuFBPe/3XLDyPpHFNQ+bgR+c0ygpkHjKdY2LH8VCG5ec7seWDkIa+kT7B GpPvNtz2gN/Fr6keYnOb9EjrjvhNCEHMNWKsmiep/ti562oTJzuCF44raYMfqsUyKWMInp NJIniUEMbHIcFHRQI2K68QdA2Hy78+CVmqiO/mIjFzYd7rdjWSQiPaviS7YQ/YBKIBP8eR JeS88idmA9dOyibMC34Z6Uxi8oVywAaCzeaMCjWxGDKvrvJ0Lu01dt8sgCdUUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761156118; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M6kQwMQKYZm1+ly3e3s+W6EdvCnjU2seXKmqbL2Z6D0=; b=tSzZPftimBUHIUJKRDomJcTp2ySuGyCikrF6ossED7JoldzVuIUT2FbTj3EbA6QkegtriD jDLaU1+Fbo9t5EZ8+sEjHw8NF4ohBl1xmgfg/AYFFdEo9THeYrWfu6anZGvSqmay6pd0f8 PwmUaN//WB5fflvuAE8m9qNzONS/qQeYqn2tE/uq6OUsuLBTHI8bMH2630SYzd5LgBcB1y 4qzCYCPNWzowrR0uW86gUYxqkhp3w8g+u5xKoyrHe5s4x1zRrO7LaIvbEZW4Mk57GK64pb +zZGYPdswwhbrl5QKUnHHMU4OTq0jL2e9hRZVS5FmjF0uPe9Q2DtG2ERBilCow== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761156118; a=rsa-sha256; cv=none; b=cpWPC+caS2KeTt/tT1XCxlBC6zAIrlB9nIyu8/24i7R6nsYOp4PusO/xaYEvl85QqP0vsP c5lIscRrd9l06rc2PMuXXWAlnYQnvVJPpvlpBgwpxMVdA7paYsQ89qYDkcv9BBP2uAmbIL ia7VP+PhUv4hXcb9Bk6atlBMMMdXI/RxOD+2EpkHg7amjr5GpN8BEhVaQzvJovH5SsSlVN q5hHHaL5VlanWCMgZ4t/cmxc9+Y/syY/dovnU4f3It42tLTmGQvfHKQbjPok+q2mgNIawJ EG6iN8n8Q1Okn4lx50dPKAIBY5tr3XAl7BHSjvAn5N0m0rYGDxH0ebWRZ1dmwQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4csH6t2Nbnzgcg; Wed, 22 Oct 2025 18:01:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59MI1wNJ085940; Wed, 22 Oct 2025 18:01:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MI1ww3085937; Wed, 22 Oct 2025 18:01:58 GMT (envelope-from git) Date: Wed, 22 Oct 2025 18:01:58 GMT Message-Id: <202510221801.59MI1ww3085937@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kirk McKusick Subject: git: 99bf680a8499 - main - Fix getmntpoint(3) to operate as it is documented in its manual page. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mckusick X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 99bf680a8499dea71db5da705dfe41f4bb5e00ab Auto-Submitted: auto-generated The branch main has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=99bf680a8499dea71db5da705dfe41f4bb5e00ab commit 99bf680a8499dea71db5da705dfe41f4bb5e00ab Author: Kirk McKusick AuthorDate: 2025-10-22 18:01:03 +0000 Commit: Kirk McKusick CommitDate: 2025-10-22 18:01:37 +0000 Fix getmntpoint(3) to operate as it is documented in its manual page. The -libutil function getmntpoint(3) is documented as accepting a device name “with or without /dev/ prepended to it” but did not attempt to prepend /dev/. This patch corrects the problem by prepending /dev/ to names that do not begin with a '/'. Reported-by: Dag-Erling Smørgrav Differential Revision: https://reviews.freebsd.org/D53185 MFC-after: 1 week Sponsored-by: Netflix --- lib/libutil/mntopts.c | 53 +++++++++++++++++++++++++++++++++++---------------- 1 file changed, 37 insertions(+), 16 deletions(-) diff --git a/lib/libutil/mntopts.c b/lib/libutil/mntopts.c index 07d3dd6d98a3..4a064a086fd5 100644 --- a/lib/libutil/mntopts.c +++ b/lib/libutil/mntopts.c @@ -145,6 +145,18 @@ checkpath_allow_file(const char *path, char *resolved) return (0); } +static char * +prependdevtopath(const char *path, char *buf, u_long buflen) +{ + u_long len; + + if ((len = strlen(_PATH_DEV) + strlen(path) + 1) > buflen) + return NULL; + strncpy(buf, _PATH_DEV, len); + strncat(buf, path, len - sizeof(_PATH_DEV)); + return (buf); +} + /* * Get the mount point information for name. Name may be mount point name * or device name (with or without /dev/ preprended). @@ -153,19 +165,27 @@ struct statfs * getmntpoint(const char *name) { struct stat devstat, mntdevstat; - char device[sizeof(_PATH_DEV) - 1 + MNAMELEN]; - char *ddevname; + char *devname; struct statfs *mntbuf, *statfsp; - int i, mntsize, isdev; - u_long len; + int i, len, isdev, mntsize, mntfromnamesize; + char device[sizeof(_PATH_DEV) - 1 + MNAMELEN]; + u_long devlen; - if (stat(name, &devstat) != 0) + devlen = sizeof(device); + /* + * Note that stat(NULL, &statbuf) returns -1 (EBADF) which will + * cause us to return NULL if prependdevtopath() returns NULL. + */ + if (stat(name, &devstat) != 0 && + (name[0] != '/' && + stat(prependdevtopath(name, device, devlen), &devstat) != 0)) return (NULL); if (S_ISCHR(devstat.st_mode) || S_ISBLK(devstat.st_mode)) isdev = 1; else isdev = 0; mntsize = getmntinfo(&mntbuf, MNT_NOWAIT); + mntfromnamesize = sizeof(statfsp->f_mntfromname); for (i = 0; i < mntsize; i++) { statfsp = &mntbuf[i]; if (isdev == 0) { @@ -173,19 +193,20 @@ getmntpoint(const char *name) continue; return (statfsp); } - ddevname = statfsp->f_mntfromname; - if (*ddevname != '/') { - if ((len = strlen(_PATH_DEV) + strlen(ddevname) + 1) > - sizeof(statfsp->f_mntfromname) || - len > sizeof(device)) + devname = statfsp->f_mntfromname; + if (*devname == '/') { + if (stat(devname, &mntdevstat) != 0) + continue; + } else { + devname = prependdevtopath(devname, device, devlen); + if (devname == NULL || + (len = strlen(devname)) > mntfromnamesize) + continue; + if (stat(devname, &mntdevstat) != 0) continue; - strncpy(device, _PATH_DEV, len); - strncat(device, ddevname, len); - if (stat(device, &mntdevstat) == 0) - strncpy(statfsp->f_mntfromname, device, len); + strncpy(statfsp->f_mntfromname, devname, len); } - if (stat(ddevname, &mntdevstat) == 0 && - S_ISCHR(mntdevstat.st_mode) && + if (S_ISCHR(mntdevstat.st_mode) && mntdevstat.st_rdev == devstat.st_rdev) return (statfsp); } From nobody Wed Oct 22 18:23:37 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4csHbs3kxjz6D4Ht; Wed, 22 Oct 2025 18:23:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4csHbs2fsHz41WK; Wed, 22 Oct 2025 18: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=1761157417; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+MuydRM8hPoU7mksjwefcFQEzl7AK1Y70zAsl6+0C4E=; b=SSkn7yt/KIwzuTDknIp5lBTcHJEM1eeESrCH+vuu2N9CFBhEc5T5IniNw2KRKWR0pkyt8N hosfz6boiUoqO8Jzqj5sYg23O24YxiQ9PhgFZ8XO1P/a9TDuFxa/xM9OMzOetDpqFFiHiE SYRyphms21mojO/hlSuNObqWafQioBfDlDMDRW7jCR2igM2cQ849JwHBCL8dlAVPORIVCg ki2L1VGWU1fz31IAv4xSOsMB/9iQmnPKN4q5n02G6hCZH09YJIGKsks9I7/X+voFfrFBx8 Ayu1xvWnx2I5i8m1YZ/+EVEgIe/Vnx4Nueb+mTlQIh38JHcXJSaQ1DkdX+fMXQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761157417; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+MuydRM8hPoU7mksjwefcFQEzl7AK1Y70zAsl6+0C4E=; b=ryI77QkG32ttbb6FJKf+ldh5ddXfmx/SStSUHkYLyoAhS7NKwyFuSrYNH/40UEteZD5fN+ 3z345lauvGiDfJDFayKCEmMv+K2sLfYtMHxiSNQCkqn5uk9LAk60MaIxFzcFDNnwdzHwV/ TDgHqn7RL7fWBB3bsvU5SU1rygTcKq4M+xkA5qRcPFXCta4kXAZzamnKmiiCD82mpJERxW QUoouxUgb9q11/dfMB+hK3+zsJw/UzxD39FdN9s9eHkCv8pR+1Xw9GXsAB8CSh1XUoUC1J hW0C17g7YNT27zmZ5JLlZttRID0L5rVYbH4QsnmaemEAeRlmAZyf7DsjYtFang== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761157417; a=rsa-sha256; cv=none; b=N8VFlRxcFWR7+VXG03dPQIjHeCkXX/+dhgbbyv1aOGFSp8aZ/vjEVcTSstqh9XQxvFNTpT 03VAdKND0C854jyyh/JvJy4VTQjXzbSgMlDyP97YGT19xEDWxGJggc+MQULT4y8cEDErrd 3SW83a1eLGxecCRY6xyPaMQPvvnldUx5+H6HI8dKi5Q0hhOk18e8cYTDDTxoMmp71N0O2Y HaNFf5wp6DnO0g0GClRjvPuU92PtVNXshrcJf6YklHdLP8PHxKv8XZBJpB5BZTvtTcsOo0 16uYTeYPhxthQo9ad4SToWRqRgBv93gQ+rc++9t04Y4O6gi/jNKoIqNpFlhDtA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4csHbs24y2zgnM; Wed, 22 Oct 2025 18: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 59MINbEL023737; Wed, 22 Oct 2025 18: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 59MINbY8023734; Wed, 22 Oct 2025 18:23:37 GMT (envelope-from git) Date: Wed, 22 Oct 2025 18:23:37 GMT Message-Id: <202510221823.59MINbY8023734@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jose Luis Duran Subject: git: 74921426d552 - main - bsdinstall: jail: Fix DISTMENU items List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 74921426d552f7491c61684465f964b446379dac Auto-Submitted: auto-generated The branch main has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=74921426d552f7491c61684465f964b446379dac commit 74921426d552f7491c61684465f964b446379dac Author: Jose Luis Duran AuthorDate: 2025-10-22 18:21:04 +0000 Commit: Jose Luis Duran CommitDate: 2025-10-22 18:22:44 +0000 bsdinstall: jail: Fix DISTMENU items The menu was incorrectly using the fourth column (distname) instead of the first (dist) of the MANIFEST. The actual file name is on the first column of the MANIFEST file. Remove the .txz part of the name to build the menu options. Reviewed by: jamie MFC after: 5 days Differential Revision: https://reviews.freebsd.org/D53177 --- usr.sbin/bsdinstall/scripts/jail | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/bsdinstall/scripts/jail b/usr.sbin/bsdinstall/scripts/jail index 8e001fc4a027..e4238ac0a687 100755 --- a/usr.sbin/bsdinstall/scripts/jail +++ b/usr.sbin/bsdinstall/scripts/jail @@ -79,7 +79,7 @@ distbase() { : ${DISTRIBUTIONS="base.txz"}; export DISTRIBUTIONS if [ -f $BSDINSTALL_DISTDIR/MANIFEST ]; then - DISTMENU=`cut -f 4,5,6 $BSDINSTALL_DISTDIR/MANIFEST | grep -v -e ^kernel -e ^base` + DISTMENU=$(cut -f 1,5,6 $BSDINSTALL_DISTDIR/MANIFEST | grep -v -e ^kernel -e ^base | sed -E 's/\.txz//g') if [ ! "$nonInteractive" == "YES" ] then From nobody Wed Oct 22 18:37:43 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4csHw73lD4z6D5y8; Wed, 22 Oct 2025 18:37:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4csHw73B5lz44s3; Wed, 22 Oct 2025 18:37:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761158263; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4/cYKkTYnlFUW0moeuYHAB2m5eXnzUzxmJIfJwULGTk=; b=DFsTbB3eoXWXZzD3kWlW/XG7/XkNX3/5n1X/9wzqaIwVkZNR2JBP77y6a+LXB8HxUQcdgF KQ58DlgTusbtW6pxZ/3qj6ARrHm/+oT+UrYFi7F9FTuyxwOJg1sPi42oTuGMdKN4TBurnn 9zeaOvwRyMdSvHc7lLVWf0jZ+3AWXZh3ZsTO5ymYieixkiSCz7zqkc9DArIDmi1D7V+Bxq eqWmWWbAYZrsF+fUzZ6/vnimeWTo46bzvCQBKqxM68STkEtpvrHkD4L4UeSka4oZJDhXdT 4wy/mQbzqFKykIR9MdOUCTbFgz48iOF32J0ET8CZ9zrh24d3XH3/+vhqmeJetg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761158263; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4/cYKkTYnlFUW0moeuYHAB2m5eXnzUzxmJIfJwULGTk=; b=CHtdCpMvACgsGzljD7ofbsIoRRAYj+ZgMUPMIui4+TjoZVDKMN51uwc8XBpJnht/jItcl5 RMxjS/L1HrS1wL3yt3B7LPIcn+JP8ekVFSKdCCWmBVIjAyAnm0dxhJ5vfoixGJ2V4Wvqjl Jcrdygq9+kK9z7Q6K+lGXkEk+J7Yw5HqdbzCtg9at+1dkw4k5USe66nNGHMGopncJzwqh8 8PMPfbUM5Utz7GHGU3gomc9RKlVKvGdmn2H8gUHn3XjEkOdHSekbjmamrMFtpYoJ60DSRp N7BtgCGUzhD0VYefhSrl5VYq7QDhQEZ026DGWrqMUY5qLA9pEi8rvFk2dcerTA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761158263; a=rsa-sha256; cv=none; b=Qjy72AGmx5Tbyan+aguqS2ZB5dMXYTDZos0k6KoAB8HxzYY7oyYDTNea+vcmbhXLh64Er9 cIXshAntAissC0+5m3jq88JspRRvdVhwt1Un1SmRYH0pnfYrSbIJiaIlwcs+Qqi6NBF7BG 9kHr79smzvtGKlGGxDsjb99y03tFxqgUwzIeLbU5VaIlzl39gfXk4kYERBghJJ2f0CmYZN CUNnAkog/cuopLH0VWZKXvRQrGEmpcmPHXxtXmrmaFM9il74WWGwHc1r8B4DLXGcmrvVrG qk+jND3vNsEZ13pZHE0hAAGsU6nEuqj9uwlQk6Ycn3eQ5Bz9nJZyhBSjVZ88aw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4csHw72nBYzhY9; Wed, 22 Oct 2025 18:37: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 59MIbhIY045406; Wed, 22 Oct 2025 18:37:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MIbhUe045403; Wed, 22 Oct 2025 18:37:43 GMT (envelope-from git) Date: Wed, 22 Oct 2025 18:37:43 GMT Message-Id: <202510221837.59MIbhUe045403@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "David E. O'Brien" Subject: git: 283699338c57 - main - random: garbage collect the RANDOM_PURE_OCTEON entropy source List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: obrien X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 283699338c5724253f721f4d0e488113dd49bd17 Auto-Submitted: auto-generated The branch main has been updated by obrien: URL: https://cgit.FreeBSD.org/src/commit/?id=283699338c5724253f721f4d0e488113dd49bd17 commit 283699338c5724253f721f4d0e488113dd49bd17 Author: David E. O'Brien AuthorDate: 2025-10-17 00:55:51 +0000 Commit: David E. O'Brien CommitDate: 2025-10-22 18:37:23 +0000 random: garbage collect the RANDOM_PURE_OCTEON entropy source It was used for Octeon MIPS and all producers have been removed from the source tree. Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D53146 --- sys/dev/random/fenestrasX/fx_pool.c | 3 --- sys/dev/random/random_harvestq.c | 3 +-- sys/sys/random.h | 3 +-- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/sys/dev/random/fenestrasX/fx_pool.c b/sys/dev/random/fenestrasX/fx_pool.c index f4ad1e295d54..ec59b97a2070 100644 --- a/sys/dev/random/fenestrasX/fx_pool.c +++ b/sys/dev/random/fenestrasX/fx_pool.c @@ -167,9 +167,6 @@ static const struct fxrng_ent_char { [RANDOM_RANDOMDEV] = { .entc_cls = &fxrng_lo_push, }, - [RANDOM_PURE_OCTEON] = { - .entc_cls = &fxrng_hi_push, /* Could be made pull. */ - }, [RANDOM_PURE_SAFE] = { .entc_cls = &fxrng_hi_push, }, diff --git a/sys/dev/random/random_harvestq.c b/sys/dev/random/random_harvestq.c index 96676e8694bf..e38fd38c310b 100644 --- a/sys/dev/random/random_harvestq.c +++ b/sys/dev/random/random_harvestq.c @@ -661,8 +661,7 @@ static const char *random_source_descr[ENTROPYSOURCE] = { [RANDOM_UMA] = "UMA", [RANDOM_CALLOUT] = "CALLOUT", [RANDOM_RANDOMDEV] = "RANDOMDEV", /* ENVIRONMENTAL_END */ - [RANDOM_PURE_OCTEON] = "PURE_OCTEON", /* PURE_START */ - [RANDOM_PURE_SAFE] = "PURE_SAFE", + [RANDOM_PURE_SAFE] = "PURE_SAFE", /* PURE_START */ [RANDOM_PURE_GLXSB] = "PURE_GLXSB", [RANDOM_PURE_HIFN] = "PURE_HIFN", [RANDOM_PURE_RDRAND] = "PURE_RDRAND", diff --git a/sys/sys/random.h b/sys/sys/random.h index dca30dc8fde4..af6b1e117423 100644 --- a/sys/sys/random.h +++ b/sys/sys/random.h @@ -89,8 +89,7 @@ enum random_entropy_source { RANDOM_ENVIRONMENTAL_END = RANDOM_RANDOMDEV, /* Fast hardware random-number sources from here on. */ RANDOM_PURE_START, - RANDOM_PURE_OCTEON = RANDOM_PURE_START, - RANDOM_PURE_SAFE, + RANDOM_PURE_SAFE = RANDOM_PURE_START, RANDOM_PURE_GLXSB, RANDOM_PURE_HIFN, RANDOM_PURE_RDRAND, From nobody Wed Oct 22 19:51:53 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4csKYk024Tz6DG1q; Wed, 22 Oct 2025 19:51:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4csKYj6YXGz4FLD; Wed, 22 Oct 2025 19:51:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761162713; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tuw7pRY8DVwsRTquLRWu9XSvPAjF4LL1nTbw6qTiVas=; b=Rq5qSI3gNyBp0X5bA3DRSGK3hPExU9TxA9Qm6yrkn7yuFretp0TAxqWr9dQT8fjGgGvBCM bdXxwHLtw84TMFJva5G6Z11myXPI37ATcPjcA5hvrnN3xjmDwM6snNHVcWamHo5Aa2sxHd IN+FLeI1zmyOFx3OSx7PUyS6jvbAktlnu1hmPdwkSPOde55m+yuIKAwYfGHu7O7MERuMEh joPaYNizJAve99bb81L6QbM86BHJgMGuxT9OpJ+YmN67lpj7oxCR/MChXt9Pe1zOe4XveW YT7/6dYpxgpQr3uRJJFh+T527aegEgSskQM8FDzYHmlBvk9JHOQ+lP8MQs+OQQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761162713; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tuw7pRY8DVwsRTquLRWu9XSvPAjF4LL1nTbw6qTiVas=; b=W6sJKHI30BMWcB7G7f76GtwKSwyfcYO9rie9X4TT8n9WysPNSPKqhJCbD8yeeyJmYE5ndb 1B0CUxMY3LHVmudGewJybs9TAxOdqYjJH307/Y53hluM6YGKxFDdoU1yTbkPn2TfFewwqu 00sbjLcx+pu8/mPNiiiFCGWVlrqlfEaqzrgwKCmTSwy43Z2AYjLt8C5yrrh7qjkgJMRS6V nAbUkkZs7oIzS1dKuUDPTI3kWYJCi2daOZMF83rQdUtqPx/jKykJtf+SZAZKoh5+D9BTJD LWEZJaiplyWGXeQ2LXWJat1EwXc1vF30GISVsbinqvbW56lRXiFGzWFNWWrtSg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761162713; a=rsa-sha256; cv=none; b=Mw48fY9/KdlKgQgIT8nCzXcMpSJmrsr2kwLR6CLa4zuNEDtyqAEIXr5KgSzKU2o9jRomQN OB5rmYyVxPyh1WZ0zckLpWjSVPCcmwAObV2ao//vJ/54jM0Q5PHWNTlW/CzCrn9S2WpKL7 IJUz8SZOlI1MNu9MyDVEhjBJi2kpSNI+m5ChhtDNoNdPnbjv8Bfd95LjREW13LTqh9cQFf HeaoxTcbvwx00QS9a8skeS3GkH/n+b04q5D1w6mBkassBo3o+9t4zlYM4rryxLLJp2rs92 gxnmHC9pc/QFlXZPakdI2fxaGwz5MmqnCElle5GXPQPhc7A4QLafD4wXGnFn6Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4csKYj5rGSzjhr; Wed, 22 Oct 2025 19:51: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 59MJprp5092270; Wed, 22 Oct 2025 19:51:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MJpr1u092267; Wed, 22 Oct 2025 19:51:53 GMT (envelope-from git) Date: Wed, 22 Oct 2025 19:51:53 GMT Message-Id: <202510221951.59MJpr1u092267@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 4dd2b869cd07 - main - krb5: Fix -Wint-conversion when bootstrapping on GNU/Linux List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4dd2b869cd078ed6f40c42d1ef429222da16a58f Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=4dd2b869cd078ed6f40c42d1ef429222da16a58f commit 4dd2b869cd078ed6f40c42d1ef429222da16a58f Author: Jessica Clarke AuthorDate: 2025-10-22 19:50:50 +0000 Commit: Jessica Clarke CommitDate: 2025-10-22 19:50:50 +0000 krb5: Fix -Wint-conversion when bootstrapping on GNU/Linux This shows up in GitHub Actions as a warning, and some compilers can default to it being an error. --- krb5/include/autoconf.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/krb5/include/autoconf.h b/krb5/include/autoconf.h index ed0bf8cacc14..f1cf42d8f90f 100644 --- a/krb5/include/autoconf.h +++ b/krb5/include/autoconf.h @@ -691,7 +691,12 @@ #define STDC_HEADERS 1 /* Define to 1 if strerror_r returns char *. */ +#ifdef __GLIBC__ +/* Bootstrapping on GNU/Linux */ +#define STRERROR_R_CHAR_P 1 +#else /* #undef STRERROR_R_CHAR_P */ +#endif /* Define if sys_errlist is defined in errno.h */ #define SYS_ERRLIST_DECLARED 1 From nobody Wed Oct 22 20:04:25 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4csKr92yVsz6DGhd; Wed, 22 Oct 2025 20:04:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4csKr922kYz4GgT; Wed, 22 Oct 2025 20:04:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761163465; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1CduWD2PNRvN5wT1L+nuYFhlqzNUFUuUWGDNo5MnrXQ=; b=F5q9OSonX5zZewoASD7KXtKbRcP9U97dcNRjtAaAH1hOgHFi012OsxHSJDj449h78uS5Cp JR/f0JxgA1QjKzlAJE/jelSZK7xb9ffxsFmlqmiagVLM/TY6lGUsfKbDw25lCoA5nmDWg/ 05P7GAtx6U63xdYitPPSEP+hqKHYQTUZz6ObPy0WmXj8V4OK4YGUuWTm/G+ks55M7F2h6M dFJfU2ItE40jgC8nIzra2UF/n9oM6ZgNs2TaGeUh2qrkOjhB5vV9h8v4A5PjSbrnPUWVCL 31i+3URtBbaLdKjWsR9eO4Zj45MB1cIlQWXCFTNV/QNxpQjaSg8v7oH0dtvbug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761163465; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1CduWD2PNRvN5wT1L+nuYFhlqzNUFUuUWGDNo5MnrXQ=; b=qHc4gycXd6ySjimfNfO/1oAEuMlf76V753e3fx5aeUlQstvmFX4AcPnKzWQKZWBLF/Qrsm I1Fg0kHe9xndkF0tXSyd+2AxDZ7EJ4Uvzrq7oJvsgITAUywTtymIgNARaT+OxPuNXuwXM3 dk4md+m5AJgIDDH2dYymxeWJFdky1Ze4Al38qZ+0UOVRNTAxUe83lfqLM4zHB+YwNhN1NA 7V1B3zY1dxVEISNTkj7EK1MMfhP30xeY/qCOGP1D8NIyJ/r0KXb0sAaoQsgxKFRn9nawr6 FNtIfwYnUqw1hESkzo36gIloomTZS9QRWK58tRcilWYzWnYLRPFT4a91q6nBIQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761163465; a=rsa-sha256; cv=none; b=PgICD1edkoJqdiMhSPKFTF0bMYsbApg41Y9NMJf8teocKWKCe4Bzfo1aNbgjpm8/VFbvWa R1n1d1EmeamwXgEc3ACmUEfHfo4hEmKEGixPPeLSEzrHI6U7CdtWoOFenesdy7rJAgSZc/ jvwXd1S6HZAnqx+v5VrT61PoAIRHphtxMhOpesDnlGnPyRxI8mrRCZIzal0wNNC4sRwLXM eLwi2qukNSaghl8+qBgapZwYmPeO4XMgSj3zLOxjc/EWLTyqtsZieBk3vObLvi6g/qjTOw +SlcFxmpSaLCQPV+jKsDIy77emhWPaUq8BVje/2bWLQ29YXl10okYHprq+vSRA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4csKr91VG3zjvX; Wed, 22 Oct 2025 20:04: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 59MK4PBH014078; Wed, 22 Oct 2025 20:04:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MK4PHm014075; Wed, 22 Oct 2025 20:04:25 GMT (envelope-from git) Date: Wed, 22 Oct 2025 20:04:25 GMT Message-Id: <202510222004.59MK4PHm014075@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 69415879e9e4 - main - src.opts.mk: Enable LLDB for 32-bit arm List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 69415879e9e493cba78b3a4afb1a78d813a2eb8a Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=69415879e9e493cba78b3a4afb1a78d813a2eb8a commit 69415879e9e493cba78b3a4afb1a78d813a2eb8a Author: Ed Maste AuthorDate: 2025-09-21 14:31:05 +0000 Commit: Ed Maste CommitDate: 2025-10-22 20:03:40 +0000 src.opts.mk: Enable LLDB for 32-bit arm It was previously disabled when we built for older 32-bit arm targets which lack 64-bit atomics. As we now support armv7 at a minimum there is no need to disable LLDB. Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D52668 --- share/man/man5/src.conf.5 | 6 +++--- share/mk/src.opts.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index 1bb609336532..bab2c3d84abf 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 October 1, 2025 +.Dd October 22, 2025 .Dt SRC.CONF 5 .Os .Sh NAME @@ -956,12 +956,12 @@ Do not build LLVM's lld linker. Do not build the LLDB debugger. .Pp This is a default setting on -arm/armv7 and riscv/riscv64. +riscv/riscv64. .It Va WITH_LLDB Build the LLDB debugger. .Pp This is a default setting on -amd64/amd64, arm64/aarch64, i386/i386, powerpc/powerpc64 and powerpc/powerpc64le. +amd64/amd64, arm/armv7, arm64/aarch64, i386/i386, powerpc/powerpc64 and powerpc/powerpc64le. .It Va WITHOUT_LLD_BOOTSTRAP Do not build the LLD linker during the bootstrap phase of the build. diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index 446f78a2acf3..e10455cd4e82 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -302,7 +302,7 @@ __DEFAULT_NO_OPTIONS+=FDT __DEFAULT_YES_OPTIONS+=FDT .endif -.if ${__T:Marm*} == "" && ${__T:Mriscv64*} == "" +.if ${__T:Mriscv64*} == "" __DEFAULT_YES_OPTIONS+=LLDB .else __DEFAULT_NO_OPTIONS+=LLDB From nobody Wed Oct 22 20:07:02 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4csKvC0vmnz6DHL3; Wed, 22 Oct 2025 20:07:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4csKvC0FWqz4HKG; Wed, 22 Oct 2025 20:07:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761163623; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KaAsQ9JZKtSDu16G32bqepAr/FjMRzkZuOkFcl6uOd4=; b=d18RV978f+xZYlBjyAunmEeDgItc+WZTViW2/in2emGjySOiB88DDQWYD86oGW56IbqLRp I2W8nYI1KtrGWsw3CB5JaRmgnH04MWcUX9RLTD0pmt4ngYcQhT1OgO3UbQ5VWHl8vt793x k7FOjV2gQmM5JoMyPL7/MLKr2kkklJF/bm2Xu3dH7dxlk5hDK1aS1ez9AGntozW1+hZEh2 iSN9fSVJOzaDsxRH1WokTv8QVy45sFwZxVZ9CSN8aWKBcl6TxJEQOPqKqwzbgK8/m+Q4Hw yVdC8g5WUtbcy9lMDCLIsCULMumN+2qnTwVxSBGDI84gkuyvTYgpo9juwTpwLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761163623; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KaAsQ9JZKtSDu16G32bqepAr/FjMRzkZuOkFcl6uOd4=; b=yOzMdG9nBjuj9n4sZb1Pobmhr6mAq0/cjFheFFD8Vd7x2CAVUsJqtY0MWbYjpfja9+1fWJ evHaeSKqlqLfuMNtSUNg2q7/3LVKqWMcZXrxC406qaDtKGC7lAcslajVnUZCHGGO8eWnWg Yjz6iYOKDW4Lq6fGg7Ovw/sLojtc5xPUCuWm9isrWJsSrGWcsNCu8tkpu6TnL0KKbfgwsv 5qVYxSea/xAe3x7C1OwgbLXanYFX38/6Jf7EX60Vd6eIXV3HpZAR+NUZNwvKPW0vf+gWwL mZWE4jsYpqe0Rtm1Pj4ogQq9epYNnetSHYLm0l4gsQh7QOgL44txgevYtWA+qg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761163623; a=rsa-sha256; cv=none; b=w9YmCBYbnrdB2RPSU5HJI2UwMv2iNHxH8rP4/EbnlhCaDD5efkMp305ND8xywD1G9+klEl 9IB991pTunfOCJ/JzlxQm9e0cOLUmxLkVaUObd850FDHhH57Xym9jT/Mie3jPAVs6pAyVt M+sHWJmsPFkU9+LuETBzFLLlQG+ub+c+p6l2pzzUC7sdBH3b2RkVWbG0Mnjh+o/q6BY+uD EuUqWZjMO9I9+Te/eWUnAvyE6AkQQEdjhENeZ4icO5vKJwTiRa6ym61gOhMcL48c/h0V+3 BJac2xNRbdOtq8hLstkqyS9vRgPcVgCckk/RcACQR1OMwcNFYQkwossEhsKQDA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4csKvB6prxzkRy; Wed, 22 Oct 2025 20:07: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 59MK72fC014982; Wed, 22 Oct 2025 20:07:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MK720t014979; Wed, 22 Oct 2025 20:07:02 GMT (envelope-from git) Date: Wed, 22 Oct 2025 20:07:02 GMT Message-Id: <202510222007.59MK720t014979@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 34e7a57673c9 - main - krb5: Include on Linux so __GLIBC__ can be checked List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 34e7a57673c9730ee5d1f7ebb07e152567bd8e0b Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=34e7a57673c9730ee5d1f7ebb07e152567bd8e0b commit 34e7a57673c9730ee5d1f7ebb07e152567bd8e0b Author: Jessica Clarke AuthorDate: 2025-10-22 20:06:02 +0000 Commit: Jessica Clarke CommitDate: 2025-10-22 20:06:02 +0000 krb5: Include on Linux so __GLIBC__ can be checked __GLIBC__ is not pre-defined by the toolchain, it comes from features.h, so we need to make sure that's included by this point. Fixes: 4dd2b869cd07 ("krb5: Fix -Wint-conversion when bootstrapping on GNU/Linux") --- krb5/include/autoconf.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/krb5/include/autoconf.h b/krb5/include/autoconf.h index f1cf42d8f90f..760aca79176b 100644 --- a/krb5/include/autoconf.h +++ b/krb5/include/autoconf.h @@ -691,6 +691,9 @@ #define STDC_HEADERS 1 /* Define to 1 if strerror_r returns char *. */ +#ifdef __linux__ +#include +#endif #ifdef __GLIBC__ /* Bootstrapping on GNU/Linux */ #define STRERROR_R_CHAR_P 1 From nobody Wed Oct 22 21:20:16 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4csMWh56WZz6DQwd; Wed, 22 Oct 2025 21:20:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4csMWh4d36z3DWS; Wed, 22 Oct 2025 21:20:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761168016; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Vb5/sYpVdeyWS3HTIU0z2r0Njf2yo/xQANrnor2zRM8=; b=R2pkwwG/SNlm1ennGLjKGTnJCcKxhqgEQFW6nldrIdDNXqMfUjSy+sIpJB/BqgdJfww9tJ bNbgFMhmJklOWGoWBji0fk4Spd3mpuiqiAtY9QfbKhM4iTCZgpFIINR6bJHrp68qHpfqHs ra28svp/gt8t4V0MZb0L90DbpKlTpEsDhb7+b95mY6jBocIch1ojG3Vq02XdGPHSUMevcX wbXWg2n4P9wKvEFSScPG09ZcZGLq3+V5VgfbFU0Mi2A6j6Fr0WXZGhRihpAsAahwnJ6G8I 5dKUIUv8VYYz0QN1v5EjQlxur13hdmAvZS1oJVzRZzHf2haX2X6BHqVmvOpyGA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761168016; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Vb5/sYpVdeyWS3HTIU0z2r0Njf2yo/xQANrnor2zRM8=; b=KXE2mJqTIgTjpvUkeunPJALed52ZqiuLN7HB1er/V2mdxmSGn4tLE3KeWlK8hK8wxgEtsB t+qatxzfwPNX2/dGCBiefq2ulI/9DnRFbrPaR+D1iezMkbDnpo1GIM0ENuBtIaqR0M2ey8 vwkzNelGEecCzkAunyyUK2aA4FRhirxDRn0cgNEX7shSEMKoxN7pkwyFc4jkdiM3iWIjFs 1YA/k/IalsqApLCvQm/68B/jAHd5Qvb8vwKxI+MRO4Golct3h39sxVUfK2kFTiSIIkUEhN CR17LQuvTH8L6Of9OZo+mURzTtG6Qllr1fxoXzsuBHL73yq+9R0OBVkXLUSUSg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761168016; a=rsa-sha256; cv=none; b=N/7Wz7CaVtHGZZuuA4txre7Zo3KvwaUjguKooDP3ZoHOTxRPcieXVJifmQuY2y9+k1z/3c NFhRusR9qqV4/x0uiHloY1dmxGfOKaX0uxtQoy2km9rwCLNNIsdXTn7vsU+6wlo4GtSJSy lo+wVeUU5IHzZpBdKr8dirQNbrXTD8J0OYMDvPBktzk2acxlub/7buAgOOapEc9ukVZHJH rFU3zECTih3aqaHU2J8TYYkI2T9UDYB6gyM9+yeb4Mt7PDkRnPUjc5MwkVVimdb9Kio1qm g4Iok2ZskJBgunkvNse2h30c5xBIM9tdtTAhQYCRnAuVY1mhW7zUenNd7xxyMQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4csMWh49y2zmX1; Wed, 22 Oct 2025 21:20:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59MLKGX8055547; Wed, 22 Oct 2025 21:20:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MLKGnD055530; Wed, 22 Oct 2025 21:20:16 GMT (envelope-from git) Date: Wed, 22 Oct 2025 21:20:16 GMT Message-Id: <202510222120.59MLKGnD055530@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: 3b6d4c6cdffd - main - nfs: Add support for the NFSv4 archive attribute List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3b6d4c6cdffd6e37b8fa6e0b0fe3067210582c9c Auto-Submitted: auto-generated The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=3b6d4c6cdffd6e37b8fa6e0b0fe3067210582c9c commit 3b6d4c6cdffd6e37b8fa6e0b0fe3067210582c9c Author: Rick Macklem AuthorDate: 2025-10-22 21:16:48 +0000 Commit: Rick Macklem CommitDate: 2025-10-22 21:16:48 +0000 nfs: Add support for the NFSv4 archive attribute The archive attribute (UF_ARCHIVE) is listed as deprecated in RFC8881. However, the Windows NFSv4.1 client folk disagree with this and say they need support for it. This patch adds support for it, in a manner similar to what is done for UF_SYSTEM and UF_HIDDEN. MFC after: 2 weeks --- sys/fs/nfs/nfs_commonsubs.c | 24 +++++++++++++++++++++--- sys/fs/nfs/nfsproto.h | 4 ++++ sys/fs/nfsclient/nfs_clrpcops.c | 3 +++ sys/fs/nfsclient/nfs_clvnops.c | 8 ++++++-- sys/fs/nfsserver/nfs_nfsdport.c | 11 +++++++---- sys/fs/nfsserver/nfs_nfsdserv.c | 12 +++++++++++- 6 files changed, 52 insertions(+), 10 deletions(-) diff --git a/sys/fs/nfs/nfs_commonsubs.c b/sys/fs/nfs/nfs_commonsubs.c index ec95716ea485..8d506a5643a9 100644 --- a/sys/fs/nfs/nfs_commonsubs.c +++ b/sys/fs/nfs/nfs_commonsubs.c @@ -641,6 +641,7 @@ nfscl_fillsattr(struct nfsrv_descript *nd, struct vattr *vap, if ((flags & NFSSATTR_FULL) && vap->va_size != VNOVAL) NFSSETBIT_ATTRBIT(&attrbits, NFSATTRBIT_SIZE); if ((flags & NFSSATTR_FULL) && vap->va_flags != VNOVAL) { + NFSSETBIT_ATTRBIT(&attrbits, NFSATTRBIT_ARCHIVE); NFSSETBIT_ATTRBIT(&attrbits, NFSATTRBIT_HIDDEN); NFSSETBIT_ATTRBIT(&attrbits, NFSATTRBIT_SYSTEM); } @@ -1672,9 +1673,17 @@ nfsv4_loadattr(struct nfsrv_descript *nd, vnode_t vp, attrsum += NFSX_UNSIGNED; break; case NFSATTRBIT_ARCHIVE: - NFSM_DISSECT(tl, u_int32_t *, NFSX_UNSIGNED); - if (compare && !(*retcmpp)) - *retcmpp = NFSERR_ATTRNOTSUPP; + NFSM_DISSECT(tl, uint32_t *, NFSX_UNSIGNED); + if (compare) { + if (!(*retcmpp) && ((*tl == newnfs_true && + (nap->na_flags & UF_ARCHIVE) == 0) || + (*tl == newnfs_false && + (nap->na_flags & UF_ARCHIVE) != 0))) + *retcmpp = NFSERR_NOTSAME; + } else if (nap != NULL) { + if (*tl == newnfs_true) + nap->na_flags |= UF_ARCHIVE; + } attrsum += NFSX_UNSIGNED; break; case NFSATTRBIT_CANSETTIME: @@ -2804,6 +2813,7 @@ nfsv4_fillattr(struct nfsrv_descript *nd, struct mount *mp, vnode_t vp, if (!has_hiddensystem) { NFSCLRBIT_ATTRBIT(&attrbits, NFSATTRBIT_HIDDEN); NFSCLRBIT_ATTRBIT(&attrbits, NFSATTRBIT_SYSTEM); + NFSCLRBIT_ATTRBIT(&attrbits, NFSATTRBIT_ARCHIVE); } if (clone_blksize == 0) NFSCLRBIT_ATTRBIT(&attrbits, @@ -2888,6 +2898,14 @@ nfsv4_fillattr(struct nfsrv_descript *nd, struct mount *mp, vnode_t vp, *tl = txdr_unsigned(NFSV4ACE_SUPTYPES); retnum += NFSX_UNSIGNED; break; + case NFSATTRBIT_ARCHIVE: + NFSM_BUILD(tl, uint32_t *, NFSX_UNSIGNED); + if ((vap->va_flags & UF_ARCHIVE) != 0) + *tl = newnfs_true; + else + *tl = newnfs_false; + retnum += NFSX_UNSIGNED; + break; case NFSATTRBIT_CANSETTIME: NFSM_BUILD(tl, u_int32_t *, NFSX_UNSIGNED); if (fsinf.fs_properties & NFSV3FSINFO_CANSETTIME) diff --git a/sys/fs/nfs/nfsproto.h b/sys/fs/nfs/nfsproto.h index d628108bdc1a..13fec8a102a3 100644 --- a/sys/fs/nfs/nfsproto.h +++ b/sys/fs/nfs/nfsproto.h @@ -1135,6 +1135,7 @@ struct nfsv3_sattr { NFSATTRBM_RDATTRERROR | \ NFSATTRBM_ACL | \ NFSATTRBM_ACLSUPPORT | \ + NFSATTRBM_ARCHIVE | \ NFSATTRBM_CANSETTIME | \ NFSATTRBM_CASEINSENSITIVE | \ NFSATTRBM_CASEPRESERVING | \ @@ -1217,6 +1218,7 @@ struct nfsv3_sattr { #define NFSATTRBIT_SETABLE0 \ (NFSATTRBM_SIZE | \ NFSATTRBM_HIDDEN | \ + NFSATTRBM_ARCHIVE | \ NFSATTRBM_ACL) #define NFSATTRBIT_SETABLE1 \ (NFSATTRBM_MODE | \ @@ -1262,6 +1264,7 @@ struct nfsv3_sattr { NFSATTRBM_CHANGE | \ NFSATTRBM_SIZE | \ NFSATTRBM_FSID | \ + NFSATTRBM_ARCHIVE | \ NFSATTRBM_FILEID | \ NFSATTRBM_HIDDEN | \ NFSATTRBM_MAXREAD) @@ -1298,6 +1301,7 @@ struct nfsv3_sattr { NFSATTRBM_CHANGE | \ NFSATTRBM_SIZE | \ NFSATTRBM_FSID | \ + NFSATTRBM_ARCHIVE | \ NFSATTRBM_FILEID | \ NFSATTRBM_HIDDEN | \ NFSATTRBM_MAXREAD) diff --git a/sys/fs/nfsclient/nfs_clrpcops.c b/sys/fs/nfsclient/nfs_clrpcops.c index ad9404a18fc8..d3b83eb8b94b 100644 --- a/sys/fs/nfsclient/nfs_clrpcops.c +++ b/sys/fs/nfsclient/nfs_clrpcops.c @@ -4162,9 +4162,12 @@ nfsrpc_readdirplus(vnode_t vp, struct uio *uiop, nfsuint64 *cookiep, NFSATTRBIT_TIMECREATE)) NFSCLRBIT_ATTRBIT(&attrbits, NFSATTRBIT_TIMECREATE); if (!NFSISSET_ATTRBIT(&dnp->n_vattr.na_suppattr, + NFSATTRBIT_ARCHIVE) || + !NFSISSET_ATTRBIT(&dnp->n_vattr.na_suppattr, NFSATTRBIT_HIDDEN) || !NFSISSET_ATTRBIT(&dnp->n_vattr.na_suppattr, NFSATTRBIT_SYSTEM)) { + NFSCLRBIT_ATTRBIT(&attrbits, NFSATTRBIT_ARCHIVE); NFSCLRBIT_ATTRBIT(&attrbits, NFSATTRBIT_HIDDEN); NFSCLRBIT_ATTRBIT(&attrbits, NFSATTRBIT_SYSTEM); } diff --git a/sys/fs/nfsclient/nfs_clvnops.c b/sys/fs/nfsclient/nfs_clvnops.c index e9ae91e046e7..f80cf30669ca 100644 --- a/sys/fs/nfsclient/nfs_clvnops.c +++ b/sys/fs/nfsclient/nfs_clvnops.c @@ -1081,12 +1081,14 @@ nfs_setattr(struct vop_setattr_args *ap) #endif /* - * Only setting of UF_HIDDEN and UF_SYSTEM are supported and + * Only setting of UF_ARCHIVE, UF_HIDDEN and UF_SYSTEM are supported and * only for NFSv4 servers that support them. */ nmp = VFSTONFS(vp->v_mount); if (vap->va_flags != VNOVAL && (!NFSHASNFSV4(nmp) || - (vap->va_flags & ~(UF_HIDDEN | UF_SYSTEM)) != 0 || + (vap->va_flags & ~(UF_ARCHIVE | UF_HIDDEN | UF_SYSTEM)) != 0 || + ((vap->va_flags & UF_ARCHIVE) != 0 && + !NFSISSET_ATTRBIT(&np->n_vattr.na_suppattr, NFSATTRBIT_ARCHIVE)) || ((vap->va_flags & UF_HIDDEN) != 0 && !NFSISSET_ATTRBIT(&np->n_vattr.na_suppattr, NFSATTRBIT_HIDDEN)) || ((vap->va_flags & UF_SYSTEM) != 0 && @@ -4835,6 +4837,8 @@ nfs_pathconf(struct vop_pathconf_args *ap) break; case _PC_HAS_HIDDENSYSTEM: if (NFS_ISV4(vp) && NFSISSET_ATTRBIT(&np->n_vattr.na_suppattr, + NFSATTRBIT_ARCHIVE) && + NFSISSET_ATTRBIT(&np->n_vattr.na_suppattr, NFSATTRBIT_HIDDEN) && NFSISSET_ATTRBIT(&np->n_vattr.na_suppattr, NFSATTRBIT_SYSTEM)) diff --git a/sys/fs/nfsserver/nfs_nfsdport.c b/sys/fs/nfsserver/nfs_nfsdport.c index eb6ba285f8fe..9fe3f4426124 100644 --- a/sys/fs/nfsserver/nfs_nfsdport.c +++ b/sys/fs/nfsserver/nfs_nfsdport.c @@ -3193,7 +3193,8 @@ nfsv4_sattr(struct nfsrv_descript *nd, vnode_t vp, struct nfsvattr *nvap, bitpos = NFSATTRBIT_MAX; } else { bitpos = 0; - if (NFSISSET_ATTRBIT(attrbitp, NFSATTRBIT_HIDDEN) || + if (NFSISSET_ATTRBIT(attrbitp, NFSATTRBIT_ARCHIVE) || + NFSISSET_ATTRBIT(attrbitp, NFSATTRBIT_HIDDEN) || NFSISSET_ATTRBIT(attrbitp, NFSATTRBIT_SYSTEM)) nvap->na_flags = 0; } @@ -3226,9 +3227,11 @@ nfsv4_sattr(struct nfsrv_descript *nd, vnode_t vp, struct nfsvattr *nvap, attrsum += aclsize; break; case NFSATTRBIT_ARCHIVE: - NFSM_DISSECT(tl, u_int32_t *, NFSX_UNSIGNED); - if (!nd->nd_repstat) - nd->nd_repstat = NFSERR_ATTRNOTSUPP; + NFSM_DISSECT(tl, uint32_t *, NFSX_UNSIGNED); + if (nd->nd_repstat == 0) { + if (*tl == newnfs_true) + nvap->na_flags |= UF_ARCHIVE; + } attrsum += NFSX_UNSIGNED; break; case NFSATTRBIT_HIDDEN: diff --git a/sys/fs/nfsserver/nfs_nfsdserv.c b/sys/fs/nfsserver/nfs_nfsdserv.c index 921ea4887af1..6f3447f26620 100644 --- a/sys/fs/nfsserver/nfs_nfsdserv.c +++ b/sys/fs/nfsserver/nfs_nfsdserv.c @@ -436,6 +436,7 @@ nfsrvd_setattr(struct nfsrv_descript *nd, __unused int isdgram, /* For NFSv4, only va_uid and va_flags is used from nva2. */ NFSSETBIT_ATTRBIT(&retbits, NFSATTRBIT_OWNER); + NFSSETBIT_ATTRBIT(&retbits, NFSATTRBIT_ARCHIVE); NFSSETBIT_ATTRBIT(&retbits, NFSATTRBIT_HIDDEN); NFSSETBIT_ATTRBIT(&retbits, NFSATTRBIT_SYSTEM); preat_ret = nfsvno_getattr(vp, &nva2, nd, p, 1, &retbits); @@ -569,8 +570,15 @@ nfsrvd_setattr(struct nfsrv_descript *nd, __unused int isdgram, } } if (!nd->nd_repstat && - (NFSISSET_ATTRBIT(&attrbits, NFSATTRBIT_HIDDEN) || + (NFSISSET_ATTRBIT(&attrbits, NFSATTRBIT_ARCHIVE) || + NFSISSET_ATTRBIT(&attrbits, NFSATTRBIT_HIDDEN) || NFSISSET_ATTRBIT(&attrbits, NFSATTRBIT_SYSTEM))) { + if (NFSISSET_ATTRBIT(&attrbits, NFSATTRBIT_ARCHIVE)) { + if ((nva.na_flags & UF_ARCHIVE) != 0) + oldflags |= UF_ARCHIVE; + else + oldflags &= ~UF_ARCHIVE; + } if (NFSISSET_ATTRBIT(&attrbits, NFSATTRBIT_HIDDEN)) { if ((nva.na_flags & UF_HIDDEN) != 0) oldflags |= UF_HIDDEN; @@ -588,6 +596,8 @@ nfsrvd_setattr(struct nfsrv_descript *nd, __unused int isdgram, nd->nd_repstat = nfsvno_setattr(vp, &nva2, nd->nd_cred, p, exp); if (!nd->nd_repstat) { + if (NFSISSET_ATTRBIT(&attrbits, NFSATTRBIT_ARCHIVE)) + NFSSETBIT_ATTRBIT(&retbits, NFSATTRBIT_ARCHIVE); if (NFSISSET_ATTRBIT(&attrbits, NFSATTRBIT_HIDDEN)) NFSSETBIT_ATTRBIT(&retbits, NFSATTRBIT_HIDDEN); if (NFSISSET_ATTRBIT(&attrbits, NFSATTRBIT_SYSTEM)) From nobody Wed Oct 22 22:42:56 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4csPM44nNSz6DZv6; Wed, 22 Oct 2025 22:42:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4csPM441Hvz3McZ; Wed, 22 Oct 2025 22:42:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761172976; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WrSuMpo75JPH8oQU5bygzS7VJRfieuBGLCAW59bhygk=; b=p0J5Yn5ZXs1aKzLL8PZLfhXI0oTyL2VGV/xOr9Spl6Sf+c59pMmVsfjFMknokVfy7EKaPG c4uFiqmuY8fQLgjJErnVdLO2t5eEleLXLsqVkwX9B7DbmsJG31MqMN5sLbSXUMhVXcvke8 EjlmeZAIWib0gHakiybNqehMfy1KGZsaX0ZvyC20nxenIEzR5Ikpr6KdyBUp3ESNtK7454 IqXrP+fkj9bAuQfs+Dz+FVyWFScCwUDbSZFUuuefRapLhKe73P1K7ouFSM35uAbWi+PTqk VpdKlMF0tw1agUvRmRI7RlvnzOZ00F/cHGOfmDurYVYS7OEhVdKxsPcgbJ1kqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761172976; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WrSuMpo75JPH8oQU5bygzS7VJRfieuBGLCAW59bhygk=; b=ndPCfKJ5K2cHPU8uhmukotEynmnZxEM1EzzhIpNFHYBu2QBGde8a+uWuvazN55iDu5xjB8 z4f465C0pX0CIfHB9uxNxGOVqR9KLedurhp14B1VV8axPhG4kKj0mwtJyqcPxcwY3kv9If nNOKoFzWSv+y7XYBNyWJdUbQu+dffGm3YnRv01FFgOSwdbEKfHE/A/MkykJAcgXM6ieAZk oHJ+XOz1qkcPHDDIC0drSfmD1aPYl04yVnD7MV8eL2MkR3LLHlwH3fn38cPqkS3ewXG+kp j4XzbVXFHVjyEwvSsoG4znbbGUqfHxzRoIqltk75eMBgzTz4m/sriipjb40BgQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761172976; a=rsa-sha256; cv=none; b=h7ztq1s8PhDfNAF+jvjfr54Jg2Ksl6Rs/R36WB/F353sWFbBZ2Ew0IUTQVS9twcJmb/DJr 0XShPeZ2rhPybueSHLo6mBdj17JG4DhR2G5r1X8GobIp+EN776yJ4tqz/lDhawUig8CRNH Lnil60AU4tOF8GHxPmlhlwUdPcKkNLA2mc/QA9Q9aEGm/DTm/F9XT1G8GI3lS4ZHOPrRj/ Rl/5rQ+hE8q4+4DJc+aLKuRRVydhcIMLwiWcSpOZmIC/iUJRuUKlOHYxHiT0TCs1L4lWBz r82dFxGA87ttT9vBgcqEz5glf00fnfuRV7ObxJHpbaOpvFDRaqnIX6uQo7TpfQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4csPM43YTCzpC6; Wed, 22 Oct 2025 22:42: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 59MMguDo015322; Wed, 22 Oct 2025 22:42:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MMgu0f015319; Wed, 22 Oct 2025 22:42:56 GMT (envelope-from git) Date: Wed, 22 Oct 2025 22:42:56 GMT Message-Id: <202510222242.59MMgu0f015319@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jose Luis Duran Subject: git: f942a7465469 - main - mtree: Remove stray wi directory List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f942a7465469008f7538436a70f15a44cabecbb0 Auto-Submitted: auto-generated The branch main has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=f942a7465469008f7538436a70f15a44cabecbb0 commit f942a7465469008f7538436a70f15a44cabecbb0 Author: Jose Luis Duran AuthorDate: 2025-10-22 22:41:03 +0000 Commit: Jose Luis Duran CommitDate: 2025-10-22 22:41:03 +0000 mtree: Remove stray wi directory Reviewed by: imp, emaste Fixes: a21def4d568f ("pccard: Remove wi(4) driver") MFC after: 5 days Differential Revision: https://reviews.freebsd.org/D53264 --- etc/mtree/BSD.include.dist | 2 -- 1 file changed, 2 deletions(-) diff --git a/etc/mtree/BSD.include.dist b/etc/mtree/BSD.include.dist index 1a60bbef765a..1b0f98706245 100644 --- a/etc/mtree/BSD.include.dist +++ b/etc/mtree/BSD.include.dist @@ -191,8 +191,6 @@ .. wg .. - wi - .. .. devdctl .. From nobody Wed Oct 22 22:42:57 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4csPM56pqcz6Db79; Wed, 22 Oct 2025 22:42:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4csPM55CWBz3MJR; Wed, 22 Oct 2025 22:42:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761172977; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CsE+O/W6WVa7CZvFXhKdcCxfESVbWfvNw6Eci3NG8cQ=; b=h5yYn0EJM3ZbOXlGCrugKgFKlzKT0Jbmx3pxZtYQrefXYq2GyrBuq+w8uEgu5ipRRqCQWB 4otDNvOBY46DV3BcIZX5VG2WsADUrdHDMnaJZDVpwNbhno3Zmoqc8ueVZbGG6Mq+ga26j2 5z+yKgzaIioA1ez2+hBxFGVkmSiySZxYHSkilZoDxPiDg3qN1mubk39w3fWhyaGxOoK5zB IIyk0hJCc+jSaSg4fNxyn2drtqJS4GhdZvw0BPGD2QZnjUhPFDft0vADbg//MgUBnGOJOb PzDhjroP8pXO7PC2o0y3KRbPGz/liQxxThbDKGXIW/u3YXk6soK8Piq0SbkXzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761172977; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CsE+O/W6WVa7CZvFXhKdcCxfESVbWfvNw6Eci3NG8cQ=; b=p0LL47csIHc1DBbgXJG/EmGaGbEWzcuSv+j+N0nMWDHMpxWTtB66t6MACnhenUrIrNmGgc mpYjCz6i4/+bFBDCjB0kTTgA7jWrtB3H43J1g9JTULeSXl4jLAt49j6ASdAINUftXb4LGN c2fD68+bUYF2WHOQ5tNF4VtheOgKAZU6FR70DCT799jX8eH6JKz2Mdxf7i1wjlVi/6s+N1 pTuVi0Fsw/N0L6b1xh6HOYxfNakXr60MdL3wGhLZWuPRpk7rNZNmtArme/OQorB8kO6715 EHqHD53VX9cEaMaTzFd3yQMpvl92YdVPxfO31+BfzM9A9JUzIOT18t/Lau92qQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761172977; a=rsa-sha256; cv=none; b=w3mi7IHTV38GPtAqGacyfF6Ig4M+2nV2cnfr+Qtv+jiKmXCxNCdwYzvujPiOfNALmwUOk0 CLvwXII1BFB3eq2KDF/55uHaMq6LeF8fM9u9MIjvsJMS6QndEqiFi2vGNa9P3+MqjAGSEN DxUTAH/fStG//C8wPz1uWSOAtR8c39ttkE10D2BjZDyCPWQrQpTLiMWG+dNLQveFX2M0P/ ug01HJwMKMQdVpdy0oHGfDmcx1PypnuWEsNBCh5DE2erQs4vV5lT/CoMKWkH4ktO5Yypqk R3OiAiuK6X0kSPOXjGJUStv6DEN5CCzcSC1UZslJe5Kmc6AOtSe9J591R+WznQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4csPM54V1BzpV3; Wed, 22 Oct 2025 22:42: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 59MMgv6B015360; Wed, 22 Oct 2025 22:42:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MMgvIx015357; Wed, 22 Oct 2025 22:42:57 GMT (envelope-from git) Date: Wed, 22 Oct 2025 22:42:57 GMT Message-Id: <202510222242.59MMgvIx015357@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jose Luis Duran Subject: git: f7ccf051016f - main - mtree: Remove stray an (Aironet) directory List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f7ccf051016fe3989ef6fbf10adea3ce4131f91b Auto-Submitted: auto-generated The branch main has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=f7ccf051016fe3989ef6fbf10adea3ce4131f91b commit f7ccf051016fe3989ef6fbf10adea3ce4131f91b Author: Jose Luis Duran AuthorDate: 2025-10-22 22:41:53 +0000 Commit: Jose Luis Duran CommitDate: 2025-10-22 22:41:53 +0000 mtree: Remove stray an (Aironet) directory Reviewed by: imp Fixes: 663b174b5b53 ("an: Remove driver") MFC after: 5 days Differential Revision: https://reviews.freebsd.org/D53265 --- etc/mtree/BSD.include.dist | 2 -- 1 file changed, 2 deletions(-) diff --git a/etc/mtree/BSD.include.dist b/etc/mtree/BSD.include.dist index 1b0f98706245..ea333a38d889 100644 --- a/etc/mtree/BSD.include.dist +++ b/etc/mtree/BSD.include.dist @@ -127,8 +127,6 @@ .. agp .. - an - .. ciss .. evdev From nobody Wed Oct 22 23:16:47 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4csQ680WCJz6CQPm; Wed, 22 Oct 2025 23:16:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4csQ676ccjz3RYY; Wed, 22 Oct 2025 23:16:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761175007; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1nviLwxvnhBfximdqd7TMewJufR7hdh54XbSl0e6H4Q=; b=xZ1OHEC8lpMQlM5sFH9btg//xz+cjM1Rhf3RfmIkrZFItJjV+jHdijK7yk6H0eeG37ApKP XoJZ6BIeZdfaVdRZ6OlnS+WJ0ue9omEsBEBl9jL4DFkU02NdIXXiIIyeuDq3MYyS24AMZp 8AIKWyuOYftjTyHdyOH4NJ3VKpKadKWhoWbhlknlU5qJndEdk1pQ/SFeYcroYjfrn6VvmC qmh+5R2jyO2CuwzyoJE3tT8tCp/m1QlEnrOKZLdenA7uaBF/rn+c2eDY/AqG6ZdYEW8qyF h8wvAipLHT/r2rCmUKSqKyPdQKHJ1JvuV+etawcgwY68UoqAOrl4vE1sRMgZ9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761175007; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1nviLwxvnhBfximdqd7TMewJufR7hdh54XbSl0e6H4Q=; b=F7Kjxe0T5+ANg1uEGqpIJr8Ho/GJlk6f1AjJM6HSjrauaD6F4SpGdN7FG109dqEG0K+jLf oPnCFf1+lbIjMSC9iQCRJXb3h7I957Z63ZE5sPVuOyMY9ifiAGUYma2M9v+JzFY4kWOKg3 K8Rm9HP6BkCzpq+3+mfKuC9U1bLitK0RQF0MliF+T7iD9rGFqtb6gq5VLAm6o16a5jc5KY cOsKWpbK4BSessrwSR3d1ffQzXAdGh0xO9MwhcQL0efZoqBW1IhjKntnvIH8+uS+GmDRQ8 Tw5hJK6Hh2JmIWDkpC4ALfV8MwKivbluFlkI12/ae8js0kqhMLnDzemk52dgNQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761175007; a=rsa-sha256; cv=none; b=B9aCKbSsp38Z3Mzb/hdIn6U3DIEjiGNJe8l9ek3lSU4GY18BzlW8eqHkdxj+xHD1J1KvnL /ltwhORqogoDh3h4daPqb4rGoNX1upA2i20jXflZRvnn7XkVY1DgVmK1uOIF3ayMC/1rH4 KY9VybKiSzTFo3329gE8v9S2X+EazaseH5wwB1xmOa8JiXCqK+FVEStdoM9rbGaH9IOUee lg5+3i4JJWWSDyUVimdxGOz6mECpbtyc3wjiQnIuXjFhM3qbj72nMWQHDySyrAykndm6nD mF7uHGacX41L5QWSFCEyTYclvXFd3HGCLxMX45VPBVBORPpZPRXpHDwAsQY1Jw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4csQ676Cf5zq7r; Wed, 22 Oct 2025 23:16:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59MNGl4r073453; Wed, 22 Oct 2025 23:16:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MNGlSJ073450; Wed, 22 Oct 2025 23:16:47 GMT (envelope-from git) Date: Wed, 22 Oct 2025 23:16:47 GMT Message-Id: <202510222316.59MNGlSJ073450@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: fa240b7ff081 - main - packages: Update the METALOG when (un)installing the caroot package List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fa240b7ff081a49d44e0941b2090e5dc5838fe60 Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=fa240b7ff081a49d44e0941b2090e5dc5838fe60 commit fa240b7ff081a49d44e0941b2090e5dc5838fe60 Author: Mark Johnston AuthorDate: 2025-10-22 23:14:35 +0000 Commit: Colin Percival CommitDate: 2025-10-22 23:14:47 +0000 packages: Update the METALOG when (un)installing the caroot package There may be other issues here but this change certainly seems to be necessary. PR: 290394 Reviewed by: cperciva Differential Revision: https://reviews.freebsd.org/D53263 --- release/packages/ucl/caroot.ucl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/release/packages/ucl/caroot.ucl b/release/packages/ucl/caroot.ucl index e43c9d0771f2..f7d0dd8acb7f 100644 --- a/release/packages/ucl/caroot.ucl +++ b/release/packages/ucl/caroot.ucl @@ -4,6 +4,6 @@ deps { } } scripts: { - post-install = "/usr/sbin/certctl -D${PKG_ROOTDIR}/ rehash" - post-uninstall = "/usr/sbin/certctl -D${PKG_ROOTDIR}/ rehash" + post-install = "/usr/sbin/certctl -D${PKG_ROOTDIR}/ ${PKG_METALOG:+-U -M $PKG_METALOG} rehash" + post-uninstall = "/usr/sbin/certctl -D${PKG_ROOTDIR}/ ${PKG_METALOG:+-U -M $PKG_METALOG} rehash" } From nobody Thu Oct 23 03:17:06 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4csWRR4YHBz6DSbl; Thu, 23 Oct 2025 03:17:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4csWRQ3zsZz3vlR; Thu, 23 Oct 2025 03: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=1761189427; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=38QbaqW3gzaxCUEU6ofMx2/XTXphaBXWWiyTwe75NFc=; b=Or16jFQLAEHO5vMR3TafqSmkarGr++4GZsANPCDxlALLLR/mUiah4CYQx7bNUN93XaAkXt gQn7WUR7iKeLG828tObELI4WChUh7Yg3b62rfYlSG210pfu84mKHaPabXiXk0mc5f9hpf1 9bcSnsSyBMg0AvvGVaj5xzD7ueAjXU3ZbRGA5AnvbJ223jhT2JVzgPf+PTIr2Vx5XUujHj vLP0cRMV2+Zo0fj82QYlqmZC3/EMjFMPjiFDWamSXt4fhHapDr0Ny/wguYOVoFxMkW+cto pChaeEPllfz2nymOPPtxg/4lbUaG6dkCzFjiheR0XgqG+hKG/OV6CRBmpCIXqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761189426; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=38QbaqW3gzaxCUEU6ofMx2/XTXphaBXWWiyTwe75NFc=; b=vl9BS4k0HYnQyaNb4korp+UJMKKIj0tkL0T336qm3yszyMdx3H7JgwVvI8cCvBDt0RJH84 FRHTbVvQgg+kT7ITrBFtLwWijySmGvOcbD1+gX7sVVF3Q+hpHxfgxyYEH8wKX5slSkK/Yw Qo/4oFvV25rsh/cIejuFraSZ0/vw3AObar0FKaBvdWsvxYxEjJ3Lu6AdwSyL1IdFDEHfq+ ijixUDpSfVE+70ohhGmQbin+vQCM+df7V9kHG3wGldLBFQAuD/j1wdhRyya80YrUpP/u9D C18WqLTmN45d/Eq7wDIGKoSFw3V/TUXilYwrWOgD8zkiOyo6RWDVyDqoXj+uMQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761189426; a=rsa-sha256; cv=none; b=V5DGfOltaYtFLleI3OxJAy+HdQF0EF73SQAodF33VP5LagV6+dNFscWYxNhD9GA2jyV/lL VhNC6KB27ppK5362Zlq13HqhdrB3qenPXmDsarJCBs0oCTdBl7QTReJLKdkMfb81MUgYNn go47GH4cVInWjCl77JcxG5P3Cwq/GLa64/UoE142ZVMaWB1lStWkHi2rr8/bDi1UCXcmzo hy12kbsBenmRS2gABn04GcZutffZIHgDU/ZU/E1kZyw3vWUZ6dLOEZRYeyiwlYCFKTVzHt RzXu6KIV/qY4B+4aRSeZW5mjBPbdt5BVQzlxMBHBiTNXqCYvCy4lubdmcJCUvw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4csWRQ2TkjzxKt; Thu, 23 Oct 2025 03: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 59N3H6Do026637; Thu, 23 Oct 2025 03: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 59N3H6i9026634; Thu, 23 Oct 2025 03:17:06 GMT (envelope-from git) Date: Thu, 23 Oct 2025 03:17:06 GMT Message-Id: <202510230317.59N3H6i9026634@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jaeyoon Choi Subject: git: 131dc2b7ad1b - main - MAINTAINERS: Add myself to ufshci List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jaeyoon X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 131dc2b7ad1b147b3b2775090f9eb55a7c2112ba Auto-Submitted: auto-generated The branch main has been updated by jaeyoon: URL: https://cgit.FreeBSD.org/src/commit/?id=131dc2b7ad1b147b3b2775090f9eb55a7c2112ba commit 131dc2b7ad1b147b3b2775090f9eb55a7c2112ba Author: Jaeyoon Choi AuthorDate: 2025-10-23 03:09:38 +0000 Commit: Jaeyoon Choi CommitDate: 2025-10-23 03:14:22 +0000 MAINTAINERS: Add myself to ufshci Sponsored by: Samsung Electronics Reviewed By: imp (mentor) Differential Revision: https://reviews.freebsd.org/D53253 --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index ea9bb4195aa1..e32822f8675d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -111,6 +111,7 @@ sys/xen royger Pre-commit review recommended. tests ngie,#test Pre-commit review requested. tools/build imp Pre-commit review requested, especially to fix bootstrap issues. top(1) eadler Pre-commit review requested. +ufshci(4) jaeyoon Pre-commit review requested. usr.sbin/bsdconfig dteske Pre-commit phabricator review requested. usr.sbin/dpv dteske Pre-commit review requested. Keep in sync with libdpv. usr.sbin/pkg pkg@ Please coordinate behavior or flag changes with pkg team. From nobody Thu Oct 23 07:11:58 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cscfQ2NKxz6Dx08; Thu, 23 Oct 2025 07:11:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cscfQ1qcFz3MtT; Thu, 23 Oct 2025 07:11:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761203518; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nw0EHahih+RHwLv4/SzIugR2FwxIGezj0ihNeCRT768=; b=WN+Y0wboQY+NFxJYE+b4e+/9xlax83uF5OV+GkVzMaOzUZMm3K0nF+/daLJLHR4kHCyK5l 31Upz7NRqAd4jRC8Pd+Th5DDE1jjj7qZGud+kT/Ox3ZxFoykX/D7UDeNS6/IiUPrBZtYsl Kf9ecsJRW7Q+yj/hm0MT6bPNVnFo7oBlAxLOf3liCXxcsRzVufISWXrF3KzP6or8I+8Q26 GNrjmQZYQpRd1UldhuXhaTFZ+CfmUZ1YnCmfG8jYvowaGdMkKtIQ3baR0qSq4OYvdFtL+B GJw2NP87LySaOZvDneIvWUG5icAF5fYbBV2Ve07nGK2c8KSaf8oGHrugyLZUFQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761203518; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nw0EHahih+RHwLv4/SzIugR2FwxIGezj0ihNeCRT768=; b=etWhnKLOFku808Rn+P0ULhXeYClscDIDPOBQrezf2rNViE1zbha/kA3qwUGk69EhIVTZpz MPW/KFw6i05qDGtAZp7ERwsjkpaQKzvQkXHH4gQx7hiBrTudlj7tzqNgzkEPpKp6gGYVHM QZvS3T8PHvvjcenTjiCLhcnVby+2FVhjBgTnQeBiR8usPZynPWFtU0gzL9mMUQSiWPHjCX Ba+NMI+lkr8ZM6ObxEhozTUpqZBy0tZA6cg/Dxp66PYL1jwULceEpBs9pYjfjEWJlpUY7X hggOPETYQki7htdVH6RblgguYLTRIWT6RWxNUAhSIG7FUcdMyC8uIMceF2AIuw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761203518; a=rsa-sha256; cv=none; b=uPll5hqNzI5ak7lPSOzqF2CtolvREE1utIYjnh05ZRbhaXnRvROlrTzElI3DzjX3yRGAz9 mZw0LEvjkDBufxIx/iIsL5eySIWyEoU2zKR6hBzL9FbVdYT9sZ5eJSq0fN5L0oBSe+qRyu rwuCF/vRsNxjCpSkjDAWZtYC4AbpoCt45gRym0azm0Kegf8cR3HLb6ors3aHqQ+t4L8nT6 ngEZOweEqSkoTLyGXu/wLJIQyTuGJSS9mcbEwffe50V6mwSBTv2as4+GUdUx1DJyiO0x5F wgh2TY2eFvFclOckTyysVSxCr4/g6NxD33apX36SZ24YmDSN5pZ5VdkMg18EoA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cscfQ1QcHz13ts; Thu, 23 Oct 2025 07:11:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59N7Bwn5073100; Thu, 23 Oct 2025 07:11:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59N7Bw4t073097; Thu, 23 Oct 2025 07:11:58 GMT (envelope-from git) Date: Thu, 23 Oct 2025 07:11:58 GMT Message-Id: <202510230711.59N7Bw4t073097@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: be93b2748368 - main - UDP-Lite: export pcblist via sysctl interface List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: be93b27483680c7e741b1627cc96a131bc99436c Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=be93b27483680c7e741b1627cc96a131bc99436c commit be93b27483680c7e741b1627cc96a131bc99436c Author: Michael Tuexen AuthorDate: 2025-10-23 07:10:03 +0000 Commit: Michael Tuexen CommitDate: 2025-10-23 07:10:03 +0000 UDP-Lite: export pcblist via sysctl interface Export the list of pcbs for UDP-Lite to be consumed by sockstat and netstat. Reviewed by: Peter Lei, Nick Banks MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D53229 --- sys/netinet/in_proto.c | 2 ++ sys/netinet/udp_usrreq.c | 5 +++++ sys/netinet/udp_var.h | 1 + 3 files changed, 8 insertions(+) diff --git a/sys/netinet/in_proto.c b/sys/netinet/in_proto.c index db46da6022c5..42a6cf0b5810 100644 --- a/sys/netinet/in_proto.c +++ b/sys/netinet/in_proto.c @@ -108,6 +108,8 @@ SYSCTL_NODE(_net_inet, IPPROTO_ICMP, icmp, CTLFLAG_RW | CTLFLAG_MPSAFE, 0, "ICMP"); SYSCTL_NODE(_net_inet, IPPROTO_UDP, udp, CTLFLAG_RW | CTLFLAG_MPSAFE, 0, "UDP"); +SYSCTL_NODE(_net_inet, IPPROTO_UDPLITE, udplite, CTLFLAG_RW | CTLFLAG_MPSAFE, 0, + "UDP-Lite"); SYSCTL_NODE(_net_inet, IPPROTO_TCP, tcp, CTLFLAG_RW | CTLFLAG_MPSAFE, 0, "TCP"); #if defined(SCTP) || defined(SCTP_SUPPORT) diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c index 0a89d91dfc37..04d01099d54a 100644 --- a/sys/netinet/udp_usrreq.c +++ b/sys/netinet/udp_usrreq.c @@ -853,6 +853,11 @@ SYSCTL_PROC(_net_inet_udp, UDPCTL_PCBLIST, pcblist, udp_pcblist, "S,xinpcb", "List of active UDP sockets"); +SYSCTL_PROC(_net_inet_udplite, OID_AUTO, pcblist, + CTLTYPE_OPAQUE | CTLFLAG_RD | CTLFLAG_MPSAFE, NULL, IPPROTO_UDPLITE, + udp_pcblist, "S,xinpcb", + "List of active UDP-Lite sockets"); + #ifdef INET static int udp_getcred(SYSCTL_HANDLER_ARGS) diff --git a/sys/netinet/udp_var.h b/sys/netinet/udp_var.h index 3895f365db3c..3ae08fc0b8f0 100644 --- a/sys/netinet/udp_var.h +++ b/sys/netinet/udp_var.h @@ -147,6 +147,7 @@ void kmod_udpstat_inc(int statnum); } while (0) SYSCTL_DECL(_net_inet_udp); +SYSCTL_DECL(_net_inet_udplite); VNET_DECLARE(struct inpcbinfo, udbinfo); VNET_DECLARE(struct inpcbinfo, ulitecbinfo); From nobody Thu Oct 23 07:14:30 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cscjL3VcBz6DxCQ; Thu, 23 Oct 2025 07:14:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cscjL2MdTz3Nks; Thu, 23 Oct 2025 07:14:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761203670; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5Tlrda4WLOORE0Pzmr/M2hNxMyFG/d/czHhhL425mb8=; b=lUtxg3uQJW3aqn6xLdkzNvEl7tpR0QyCHaqiwt6UI2F5xe9WlN7t5bVW8oompWvFUeek78 Mj0VWiHLD+2rnFQiJnh4vik05Sonz6+Bbztc20TUBwIATG0iFv71rxGjwIpgCEIM8toQea PIEuFMTe9w43nqCsbQ3JS4yOxuKUPpJE2VH0YraLQxXISMd8obkKo0pyCKcGsnztSGGWP4 saIrzXw9nRrmLruCEmI5w+pqM5j4QG/c5BzbBmkT0DK1coNZ9X4elkTurLlk6UwqAmU8Xp cODJ04VewRB+r/BaYFog5+hqzTh8HZZ3dLYLqiqdSE/Mq6mCdK/5eSUVvdpXDw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761203670; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5Tlrda4WLOORE0Pzmr/M2hNxMyFG/d/czHhhL425mb8=; b=fXbnZrO2h4REppt7+si4GcbVqfq3/BrWWjmanbS1SO3ab8rq09+j2+BA4jfX9w1vno01+T yuhu98vgSuQr03o75nhVtgm3mjjzt5KEHQtwf6fdFN/JoIkp11eRSwQwY95pv1mOQWI7wk 9Rya9gwZH/ig6kd+s7i8FPGtTHW6XpPh+PwBbyeDH/4/RIeVAUMLsA2iEaKSpjS56LAUoD pWx7/jT4LL54MxybNsXWRpGhLXe2XujyBGzGyZRoH/YeHDjxPXfPtVIIzCN/50yN8BtHTk nm9ibbIF2N62fYbuUWYs/bKur+f75NMaGHT8FMIm/8bjBHhQhfaWFRQwEdEMQg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761203670; a=rsa-sha256; cv=none; b=aJGQ+S4ZTUTD33M7CIuz6oaRismRt2Y3x9S2I924StP94TV/PhE1jTzM3nBpmBTo/G+R6G SFnCKQ2203w/laT0ndH9YhykHEs9IduuqjycPtWGy/ebUTiw9gTuNjKchrbiYPVxIMfa0d NQ7ElsZziA6cZXcZ2UzGjhR74AMK/0CYdCUIvydWZbftgSdrDIxyhOtZfaZsE+VR1aEnSE 7nKs2BH8A5QrJOdbKoIbs1RdvEcCWwMT4rYmJuNsfEsrqOTSPYMg7fPlIc7Yil1K3P3jxY ZKp+nqo5dlCHiVAGvP1ZUKIpo+/2c+8l2IfAeA7qxCAlo4RqfAnhZwxX7NKG9w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cscjL1x0Bz14Dx; Thu, 23 Oct 2025 07:14: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 59N7EUgx076982; Thu, 23 Oct 2025 07:14:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59N7EUaW076978; Thu, 23 Oct 2025 07:14:30 GMT (envelope-from git) Date: Thu, 23 Oct 2025 07:14:30 GMT Message-Id: <202510230714.59N7EUaW076978@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: f48c6390dd5a - main - sockstat: add support for UDP-Lite endpoints List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f48c6390dd5a01ab2b33f26ee50f4e8cbe8ae737 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=f48c6390dd5a01ab2b33f26ee50f4e8cbe8ae737 commit f48c6390dd5a01ab2b33f26ee50f4e8cbe8ae737 Author: Michael Tuexen AuthorDate: 2025-10-23 07:12:32 +0000 Commit: Michael Tuexen CommitDate: 2025-10-23 07:12:32 +0000 sockstat: add support for UDP-Lite endpoints With this patch UDP-Lite endpoints are also show per default. Reviewed by: Peter Lei, Nick Banks MFC after: 3 days Relnotes: yes Differential Revision: https://reviews.freebsd.org/D53230 --- usr.bin/sockstat/main.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/usr.bin/sockstat/main.c b/usr.bin/sockstat/main.c index abb73acafc2f..07663e54534d 100644 --- a/usr.bin/sockstat/main.c +++ b/usr.bin/sockstat/main.c @@ -108,7 +108,8 @@ static bool show_path_state = false; /* * Default protocols to use if no -P was defined. */ -static const char *default_protos[] = {"sctp", "tcp", "udp", "divert" }; +static const char *default_protos[] = {"sctp", "tcp", "udp", "udplite", + "divert" }; static size_t default_numprotos = nitems(default_protos); static int *protos; /* protocols to use */ @@ -626,6 +627,10 @@ gather_inet(int proto) varname = "net.inet.udp.pcblist"; protoname = "udp"; break; + case IPPROTO_UDPLITE: + varname = "net.inet.udplite.pcblist"; + protoname = "udplite"; + break; case IPPROTO_DIVERT: varname = "net.inet.divert.pcblist"; protoname = "div"; @@ -674,6 +679,7 @@ gather_inet(int proto) protoname = xtp->t_flags & TF_TOE ? "toe" : "tcp"; break; case IPPROTO_UDP: + case IPPROTO_UDPLITE: case IPPROTO_DIVERT: xip = (struct xinpcb *)xig; if (!check_ksize(xip->xi_len, struct xinpcb)) From nobody Thu Oct 23 07:17:06 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cscmL6KTVz6DxVc; Thu, 23 Oct 2025 07: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cscmL5kwLz3P3p; Thu, 23 Oct 2025 07: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=1761203826; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SobqMWQXFB78yecjJEBP3X4ZgC80nrBBBNrMG8iNMvY=; b=MTT02coAkEtSz/oqim99km25bThcyHaGD3iFO/ag0+SNAybPZS4L6IWHN2mzheCgzv4fc1 OIThwiW8p/9OD7WaQUh6IwhkYUtPy1lD5xt+ExeDgQTzMsvc+h6eH3NNJQZ8+3Fu0/xBXc Tx6VBYkn4C83eUPkePJiNYDbuAr9Yhi7zFsuT5jVoc7gf2L6BjuLSh21ZyMUGtTXdk9i07 pfRSPiJ6Gh7VKgowKI4cTWS5hT3ydHiPqjThZ8ePNF4ltYlVXk0dprCIjS7QRqpr7muG3c DpAvzT29Zw1xFrBsD7gtGYltGD/QzzcPHGXI6q0rBltARMVq4X+EVET97Ch/ng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761203826; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SobqMWQXFB78yecjJEBP3X4ZgC80nrBBBNrMG8iNMvY=; b=kO+LhiruIzrUSE4/YR/Nbh39ZmRSohCK6xv+ulfPy/J/BpVFCiCPcZ/vmJQqqYr7pH9zmL WqWhNNcxQe3jrz0PIXFCxaqTXryGG8F03Uw5jQ8HyglUitaVMER+1JPMMHg3KeoY8jDgcO oX8CtDNfI2Uq7nsgvrBXefDa3vDp/smNfG346ND7C9IFJGPVzt5W87goVac+BA7VB+Ztgk aFDzwf2olJFkfLN/Z0QLqCqM5RP2+u5+tcUpBNJb5yBtB2q+/Jmqxq3JtCUFfmmdWgT+q+ mu+FOfBKdQ17ObbzFwbDirG/lp3lWVKgkgRLkUlDVBXAIr86l6mCV/1UAh8Eyg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761203826; a=rsa-sha256; cv=none; b=t+BSx9eHfO115LAyUBbbMdVTbMT4hh8Q2lBAM7epFa4CfDVMTZp7fX/Gud1nDP+RoGZqdk NVwzc2qS70R0Hw5SwPl07T0muVXvz5kGtmXXTI2apMdGrZYVMzM88kl+gRVHFrpo+N6kK5 ixq1FUWtVdAwp6x0udwAZrlTmDXgTGj3aA8w5wp5oIAMW2dOfUdeLcdPQf7+lwiL30rlLg xnVuBg6iEj0xnR2issXCHcfEMqyVXY/kAPrul27gBfeF40930ei839O6441aeKW2s4fOAs Q0s+N2vhItcaE009QVUWYuowfRKS4AI+zHML1qRdJ9DbV0zKYLaJ0uwUhntcTw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cscmL52rCz14tJ; Thu, 23 Oct 2025 07: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 59N7H6sa077853; Thu, 23 Oct 2025 07: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 59N7H6f5077850; Thu, 23 Oct 2025 07:17:06 GMT (envelope-from git) Date: Thu, 23 Oct 2025 07:17:06 GMT Message-Id: <202510230717.59N7H6f5077850@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: c2b08c13c20d - main - netstat: add support for UDP-Lite endpoints List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c2b08c13c20d44c3368bcbf738624e5fac461314 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=c2b08c13c20d44c3368bcbf738624e5fac461314 commit c2b08c13c20d44c3368bcbf738624e5fac461314 Author: Michael Tuexen AuthorDate: 2025-10-23 07:15:22 +0000 Commit: Michael Tuexen CommitDate: 2025-10-23 07:15:22 +0000 netstat: add support for UDP-Lite endpoints With this patch UDP-Lite endpoints are also shown per default. Reviewed by: Nick Banks MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D53252 --- usr.bin/netstat/inet.c | 37 ++++++++++++++++++++++++++----------- usr.bin/netstat/main.c | 4 ++++ 2 files changed, 30 insertions(+), 11 deletions(-) diff --git a/usr.bin/netstat/inet.c b/usr.bin/netstat/inet.c index 5f36b1599cad..dee245b63a87 100644 --- a/usr.bin/netstat/inet.c +++ b/usr.bin/netstat/inet.c @@ -83,7 +83,7 @@ static void inetprint(const char *, struct in_addr *, int, const char *, int, const int); #endif #ifdef INET6 -static int udp_done, tcp_done, sdp_done; +static int udp_done, udplite_done, tcp_done, sdp_done; #endif /* INET6 */ static int @@ -100,6 +100,9 @@ pcblist_sysctl(int proto, const char *name, char **bufp) case IPPROTO_UDP: mibvar = "net.inet.udp.pcblist"; break; + case IPPROTO_UDPLITE: + mibvar = "net.inet.udplite.pcblist"; + break; default: mibvar = "net.inet.raw.pcblist"; break; @@ -220,13 +223,20 @@ protopr(u_long off, const char *name, int af1, int proto) return; else udp_done = 1; +#endif + break; + case IPPROTO_UDPLITE: +#ifdef INET6 + if (udplite_done != 0) + return; + else + udplite_done = 1; #endif break; } if (!pcblist_sysctl(proto, name, &buf)) return; - if (istcp && (cflag || Cflag)) { fnamelen = strlen("Stack"); cnamelen = strlen("CC"); @@ -318,18 +328,18 @@ protopr(u_long off, const char *name, int af1, int proto) "Proto", "Listen", "Local Address"); else if (Tflag) xo_emit((Aflag && !Wflag) ? - "{T:/%-5.5s} {T:/%-6.6s} {T:/%-6.6s} {T:/%-6.6s} {T:/%-18.18s} {T:/%s}" : + "{T:/%-9.9s} {T:/%-6.6s} {T:/%-6.6s} {T:/%-6.6s} {T:/%-18.18s} {T:/%s}" : ((!Wflag || af1 == AF_INET) ? - "{T:/%-5.5s} {T:/%-6.6s} {T:/%-6.6s} {T:/%-6.6s} {T:/%-22.22s} {T:/%s}" : - "{T:/%-5.5s} {T:/%-6.6s} {T:/%-6.6s} {T:/%-6.6s} {T:/%-45.45s} {T:/%s}"), + "{T:/%-9.9s} {T:/%-6.6s} {T:/%-6.6s} {T:/%-6.6s} {T:/%-22.22s} {T:/%s}" : + "{T:/%-9.9s} {T:/%-6.6s} {T:/%-6.6s} {T:/%-6.6s} {T:/%-45.45s} {T:/%s}"), "Proto", "Rexmit", "OOORcv", "0-win", "Local Address", "Foreign Address"); else { xo_emit((Aflag && !Wflag) ? - "{T:/%-5.5s} {T:/%-6.6s} {T:/%-6.6s} {T:/%-18.18s} {T:/%-18.18s}" : + "{T:/%-9.9s} {T:/%-6.6s} {T:/%-6.6s} {T:/%-18.18s} {T:/%-18.18s}" : ((!Wflag || af1 == AF_INET) ? - "{T:/%-5.5s} {T:/%-6.6s} {T:/%-6.6s} {T:/%-22.22s} {T:/%-22.22s}" : - "{T:/%-5.5s} {T:/%-6.6s} {T:/%-6.6s} {T:/%-45.45s} {T:/%-45.45s}"), + "{T:/%-9.9s} {T:/%-6.6s} {T:/%-6.6s} {T:/%-22.22s} {T:/%-22.22s}" : + "{T:/%-9.9s} {T:/%-6.6s} {T:/%-6.6s} {T:/%-45.45s} {T:/%-45.45s}"), "Proto", "Recv-Q", "Send-Q", "Local Address", "Foreign Address"); if (!xflag && !Rflag) @@ -382,9 +392,14 @@ protopr(u_long off, const char *name, int af1, int proto) vchar = ((inp->inp_vflag & INP_IPV4) != 0) ? "4" : ""; if (istcp && (tp->t_flags & TF_TOE) != 0) - xo_emit("{:protocol/%-3.3s%-2.2s/%s%s} ", "toe", vchar); - else - xo_emit("{:protocol/%-3.3s%-2.2s/%s%s} ", name, vchar); + xo_emit("{:protocol/%-3.3s%-6.6s/%s%s} ", "toe", vchar); + else { + int len; + + len = max (2, 9 - strlen(name)); + xo_emit("{:protocol/%.7s%-*.*s/%s%s} ", name, len, len, + vchar); + } if (Lflag) { char buf1[33]; diff --git a/usr.bin/netstat/main.c b/usr.bin/netstat/main.c index e8f657006982..79830049948a 100644 --- a/usr.bin/netstat/main.c +++ b/usr.bin/netstat/main.c @@ -83,6 +83,8 @@ static struct protox { tcp_stats, NULL, "tcp", 1, IPPROTO_TCP }, { -1 , N_UDPSTAT, 1, protopr, udp_stats, NULL, "udp", 1, IPPROTO_UDP }, + { -1, -1, 1, protopr, + NULL, NULL, "udplite", 1, IPPROTO_UDPLITE }, #ifdef SCTP { -1, N_SCTPSTAT, 1, sctp_protopr, sctp_stats, NULL, "sctp", 1, IPPROTO_SCTP }, @@ -131,6 +133,8 @@ static struct protox ip6protox[] = { tcp_stats, NULL, "tcp", 1, IPPROTO_TCP }, { -1 , N_UDPSTAT, 1, protopr, udp_stats, NULL, "udp", 1, IPPROTO_UDP }, + { -1, -1, 1, protopr, + NULL, NULL, "udplite", 1, IPPROTO_UDPLITE }, { -1 , N_IP6STAT, 1, protopr, ip6_stats, ip6_ifstats, "ip6", 1, IPPROTO_RAW }, { -1 , N_ICMP6STAT, 1, protopr, From nobody Thu Oct 23 07:27:54 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4csd0p4Mxpz6DyRl; Thu, 23 Oct 2025 07:27:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4csd0p3j1Lz3QDZ; Thu, 23 Oct 2025 07:27:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761204474; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bFe19+xqK/60Gmg62Gn8rV+T3jvkEFJTkF4jhb9/HZ0=; b=TMN9ENwUUivf+Nv/kzP6/ZMcHnR6ChubI0HzS1AvBsfDPSSFfK+3/JGE7CWEMZczl3yX+J AXHOvk9AwW1zDr2JP50eivs9tTt7DxbNFZ+FHmLQiCA29agwYYy5h3nxS1j803p9I/XL+Z UNGDt/8RLxLFbHLMugy7gzz4cb77/KTBTyY6dcT1pScPNQd936aj6aQBgDi0nN+YDyKi+g 5Paog70oqH9Hm6jKqF8o/yrHfbmPdRI2XXIyFqbseJKBWTgnc+UJPldbEwSfgSVqOr9Qyj +82sw4EoiA8aG84a950C0bvniPOltWGLm+F/Gw0WrLxfLbkBvuWuxCry5bwO0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761204474; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bFe19+xqK/60Gmg62Gn8rV+T3jvkEFJTkF4jhb9/HZ0=; b=uUurG23EM79VRxbQ9/j1+1KWR8emjjl1SUyUMnc9IZ0tvCN8qbjFexThw8iiWL5k56VaSZ CPlDsav3dJZGR8fQ6n+OCoebCAeGx9tNTBy7xJjSX1PCiG2Jw0WCaux4zVcJspBQTZdA+c DJGrhC3KSR1miuXjhbOZakRyzAt3gnuuGevCFjOnm4ZwnVvhZgEUtWam3amLsHwmdWizpn zKoK/znP9ff+ut5SV6C4ct8vYxNzpsIN2jU1Pm7HFyoOxjcWsL2yxdrgcWhUspuJXlR5tc ghFRBntN5ieh/6MA6SmePlbn66CduGRuBgvMpRSqSiGWY5MWl9nfhwDzydcDDg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761204474; a=rsa-sha256; cv=none; b=XD+QX1h1lxIbwwr5yypTp0WXec08MjeugATcDTd+hUEyxJ4kMQfkWFt3rv72v+x7eQCEKB MDcI/4o1QCZ1LLJEJ+3cCcicedK54u5nCySHos4Edfxg2KNcGuoeZ6tUc3FlsyjIq4I5/v G7QEs86uqDyT83CoU46URCbtCxGarXEkkqBnvQ2mvRzmNsPspwwyHYVp4WAfRgriADtwAa kluyM/iL3EVNmkv62Bd9Brsb55ticvocjuuXgXxHBBpIFmMncFFD0wK3enw4Yt55Ml/zFE SPZL3GnQVASuw0/mWPrD8n7+ovSdDtoogQzW/qXBZqoecWO40g61RJDKNY+udA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4csd0p30wfz14Sm; Thu, 23 Oct 2025 07:27:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59N7Rs0s096415; Thu, 23 Oct 2025 07:27:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59N7RsjK096412; Thu, 23 Oct 2025 07:27:54 GMT (envelope-from git) Date: Thu, 23 Oct 2025 07:27:54 GMT Message-Id: <202510230727.59N7RsjK096412@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: bfda98a42027 - main - tcp over udp: don't copy more bytes than avaiable List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bfda98a42027417b2fa74738c63327532013e93b Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=bfda98a42027417b2fa74738c63327532013e93b commit bfda98a42027417b2fa74738c63327532013e93b Author: Michael Tuexen AuthorDate: 2025-10-23 07:24:09 +0000 Commit: Michael Tuexen CommitDate: 2025-10-23 07:24:09 +0000 tcp over udp: don't copy more bytes than avaiable When copying the data in the first mbuf to get rid of the UDP header, use the correct length. It was copying too much (8 bytes, the length of the UDP header). This only applies to handling TCP over UDP packets. The support for TCP over UDP is disabled by default. Reported by: jtl Reviewed by: Peter Lei MFC after: 3 days Sponsored by: Netflix, Inc. --- sys/netinet/tcp_subr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c index c817c79881d6..b6f428b279b3 100644 --- a/sys/netinet/tcp_subr.c +++ b/sys/netinet/tcp_subr.c @@ -607,7 +607,7 @@ tcp_recv_udp_tunneled_packet(struct mbuf *m, int off, struct inpcb *inp, } } m->m_pkthdr.tcp_tun_port = port = uh->uh_sport; - bcopy(th, uh, m->m_len - off); + bcopy(th, uh, m->m_len - off - sizeof(struct udphdr)); m->m_len -= sizeof(struct udphdr); m->m_pkthdr.len -= sizeof(struct udphdr); /* From nobody Thu Oct 23 10:29:10 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4csj1y6Kv6z6D6TW; Thu, 23 Oct 2025 10:29:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4csj1y4wH8z3pSm; Thu, 23 Oct 2025 10:29:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761215350; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fyrqfKGLFgZW3lM0KwVnVolfP7rshlm9RxXe+phRf9I=; b=ASlf7v227ZiCaOpMjg0/jSh0pUB27E+TglQrHFFgiwhy00uXeuyv9Q+weVc0DLYLj3D82o myN+J+ictxXRHIvSLEVNmbH7wApEL0or1aAfXkxrFNUrMOHkCCLKz9sPewH1fojRb/j3o1 N9Z/xLP4kyArWJsLXxFjPps/4Eld6b2BJIn2NVSF4fpITupeXzfgapJaO2NHHbeLLNKt1q +dzlU8rt2mBh9+4lVnvrxxnOJ6XGi/SgUDBJWJvhrCO/2EERcVZ7+tM4XmKZGl+YUNDnR3 SK0ZzR0wm30qP3aBkRWlfxbF4z0CA87mNwnJb1C9xRBNA7Pq6smCsxJwumBLIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761215350; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fyrqfKGLFgZW3lM0KwVnVolfP7rshlm9RxXe+phRf9I=; b=yTc17iESdJBqq3KV4G1DjMQLNzCUl78tAgrw73wpEGeq7UslfGOeLcm2Dpeml+zJicEplS 2EnYY5kUZQzVOa6ixAEDc2G8Jwgw3YnqpDibzKumR6mCaBBot9r/1VOWvDMquOx+S4QMVc g0xA3wryD9EYUtsj4Cyn8OzLBE9QpeFheIcaNk5k5Dg/rmQdmree1jj1NZF8q3XLkVQSwp yUzbQS0l7363OqEPVjUDW7al80xyXy21exEzCczPENyKd+tjcQdUnbibj+01sa8h3IIsp+ kqzsNC+7foNx5OlynJjSgppP0X0RBdlnBSBW4go76yLLzHuH7TrwM53rHagaEw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761215350; a=rsa-sha256; cv=none; b=JGUgL+0IDn4Jr+dBI/xLwbUWD2KXDGkZuEWpzOKOxSNsmiLLx45xYX9Vhv0lFuWIuATaBq 8U0yyzYFvCkKx7uAq/d9BEzDI7HPtgqTob+DzvQRfsBIjjMKaAwNX/JksqXu/n3HI/4kma Fwdxxc1OKH/re2yEU4zPNGJa757Y6U0thVKfJhoCEdx4E6/OEfdnOUZZDWoQB+XXGP3DA4 V0vD413F6z0nPOXQYbL2/NiPRlc2yfBTTq+fE5c4v306FxXb4rEF1QNlQk1EYJZb4lbRmX HSuUJKlypwiaUOjNxrTvxns0SRkO3UA4iJFPkt6TSj++L2z0T5gRXiHu3fc4XA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4csj1y4P63z19J1; Thu, 23 Oct 2025 10:29:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59NATAif037027; Thu, 23 Oct 2025 10:29:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59NATA04037024; Thu, 23 Oct 2025 10:29:10 GMT (envelope-from git) Date: Thu, 23 Oct 2025 10:29:10 GMT Message-Id: <202510231029.59NATA04037024@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 4d5789532a94 - main - w: Trim whitespace and commas from time and uptime List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4d5789532a940144c869d66505e756ce816f8a50 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=4d5789532a940144c869d66505e756ce816f8a50 commit 4d5789532a940144c869d66505e756ce816f8a50 Author: Dag-Erling Smørgrav AuthorDate: 2025-10-23 10:28:44 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-10-23 10:29:01 +0000 w: Trim whitespace and commas from time and uptime When producing formatted output, trim leading whitespace and trailing commas from the human-readable time and uptime before emitting them. The text output remains unchanged. PR: 290089 Fixes: 6e6febb54da9 ("w: Fix idle time in json output, add login/idle times to json output") Reviewed by: marius.h_lden.org Differential Revision: https://reviews.freebsd.org/D53167 --- usr.bin/w/w.c | 33 +++++++++++++++++++++++++-------- 1 file changed, 25 insertions(+), 8 deletions(-) diff --git a/usr.bin/w/w.c b/usr.bin/w/w.c index ac1df96077d3..502bf5a412b9 100644 --- a/usr.bin/w/w.c +++ b/usr.bin/w/w.c @@ -473,7 +473,7 @@ main(int argc, char *argv[]) static void pr_header(time_t *nowp, int nusers) { - char buf[64]; + char buf[64], *s, *e; struct sbuf upbuf; double avenrun[3]; struct timespec tp; @@ -484,8 +484,15 @@ pr_header(time_t *nowp, int nusers) * Print time of day. */ if (strftime(buf, sizeof(buf), - use_ampm ? "%l:%M%p" : "%k:%M", localtime(nowp)) != 0) - xo_emit("{:time-of-day/%s} ", buf); + use_ampm ? "%l:%M%p" : "%k:%M", localtime(nowp)) != 0) { + s = buf; + if (xo_get_style(NULL) != XO_STYLE_TEXT) { + /* trim leading whitespace */ + while (isspace((unsigned char)*s)) + s++; + } + xo_emit("{:time-of-day/%s} ", s); + } /* * Print how long system has been up. */ @@ -516,21 +523,31 @@ pr_header(time_t *nowp, int nusers) if (days > 0) sbuf_printf(&upbuf, " %ld day%s,", - days, days > 1 ? "s" : ""); + days, days > 1 ? "s" : ""); if (hrs > 0 && mins > 0) sbuf_printf(&upbuf, " %2ld:%02ld,", hrs, mins); else if (hrs > 0) sbuf_printf(&upbuf, " %ld hr%s,", - hrs, hrs > 1 ? "s" : ""); + hrs, hrs > 1 ? "s" : ""); else if (mins > 0) sbuf_printf(&upbuf, " %ld min%s,", - mins, mins > 1 ? "s" : ""); + mins, mins > 1 ? "s" : ""); else sbuf_printf(&upbuf, " %ld sec%s,", - secs, secs > 1 ? "s" : ""); + secs, secs > 1 ? "s" : ""); if (sbuf_finish(&upbuf) != 0) xo_err(1, "Could not generate output"); - xo_emit("{:uptime-human/%s}", sbuf_data(&upbuf)); + s = sbuf_data(&upbuf); + if (xo_get_style(NULL) != XO_STYLE_TEXT) { + e = s + sbuf_len(&upbuf) - 1; + /* trim leading whitespace */ + while (isspace((unsigned char)*s)) + s++; + /* trim trailing comma */ + if (e > s && *e == ',') + *e = '\0'; + } + xo_emit("{:uptime-human/%s}", s); sbuf_delete(&upbuf); } From nobody Thu Oct 23 11:04:34 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4csjpp6RMfz6DBfW; Thu, 23 Oct 2025 11:04:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4csjpp5NR7z3x61; Thu, 23 Oct 2025 11:04:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761217474; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gMSIe1MLXUzdTD98qP0a+uNd/7pW3by4pjfprSBJQ+o=; b=BG++MXTcPfv9p/tn/T97saEBd/eeC+kA9ZnRfZGU98yBr2EZ7zv00uGs4kUc3gvrS3n1oR RCCe92XH/n4rOR9hGEF+cSE6jWKQmf78PJ3OvC9QADEXnIh7Pt7OffXGmOYkqXZTtrGcf9 6ibo/PvPBGEr6+NhbTY+cMWgKYUAFPBExsODBjWTYkNJqqIJPSvZH6K+mk6XS0JMIc5ttU fdsh3NHrIQ570w3c83Nv1Xig1i/LHV4X0xTjkGDMNXEwKG9udQ9XTlKYsSX59Qz9O14SmB n16WSRQP3HYZUizR+Y5eJ40aBHM5eUU6saICRw4u1B0QnKkFgKN62AKntyec6g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761217474; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gMSIe1MLXUzdTD98qP0a+uNd/7pW3by4pjfprSBJQ+o=; b=eNhBWS7qMHC43DfiJPqlwCl55BRWRogC1le/kOHUt/Mjn5wILiliPfG/StDn3LvgpRFSOf glA++RM7e9joJ3SnUASTqNycs0jqhqj2mevSxeU7sqHDI/5xsUDl2k0OA4lrKkZgpuWgLq Y00zB2ZPDZhcAbQniOhCFNi0gkaCoup79yTAf+qxdU9Uh+DAUznahBRyLZMDfC0vrPNmPA 29k2swchLo5tg8tbVRhqn2A4Kf4ui8h3byG2ngcj8u2dhCpA1eXehtnKm7NBc0ccnPeIq9 c+Hh+5ovRvEsOZ52jZbH+Dkc8sG9ZQeVIhjJk0SVi7SqTXHA7H+TRfh/R8hx9w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761217474; a=rsa-sha256; cv=none; b=ZGSjgrvSsg5x9k5iFVpkyCOIpR1yJ0pr1DVEiF91YGvOom14hK6BFFo3DM0veJireSI9M7 RLtvgZweXBCBxOLazpWmUZDO0eGjkSDl6SdslfaVUDqlA9EFMQbPxVMC3tOhF2pJ7cQVdE BU6XtM6J4nvds1bxw+enXGsT+on23NY8NlCFjB3QJhQ6UOkDJEmRcPBMNyYaY+IXeHkKTg QMpAo45Nh4UZRlxcZfNEj7g27/lGqWga5zoSDQm40wCX12lVBlc6SFHitjSZY89bF4JV9l 2BXFO/1riNNd2+Am5+EbL7mkPdk5KiMzBppQqakTMjHFatLWsJ+RZXSIdF424Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4csjpp50D0z1BYT; Thu, 23 Oct 2025 11:04: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 59NB4YXK011076; Thu, 23 Oct 2025 11:04:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59NB4Yot011073; Thu, 23 Oct 2025 11:04:34 GMT (envelope-from git) Date: Thu, 23 Oct 2025 11:04:34 GMT Message-Id: <202510231104.59NB4Yot011073@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 82778970eeb2 - main - share/mk: Add opencsd to the list of private libs List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 82778970eeb24f1249945612d05923725f9baa4f Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=82778970eeb24f1249945612d05923725f9baa4f commit 82778970eeb24f1249945612d05923725f9baa4f Author: Andrew Turner AuthorDate: 2025-10-20 17:37:41 +0000 Commit: Andrew Turner CommitDate: 2025-10-23 10:47:05 +0000 share/mk: Add opencsd to the list of private libs Reported by: Sarah Walker Reviewed by: emaste Fixes: 1c52229528e7 ("lib: Move libopencsd to /usr/lib and make private") Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D53217 --- share/mk/src.libnames.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/share/mk/src.libnames.mk b/share/mk/src.libnames.mk index b2ed63759c19..fd0424a96d9b 100644 --- a/share/mk/src.libnames.mk +++ b/share/mk/src.libnames.mk @@ -29,6 +29,7 @@ _PRIVATELIBS= \ heimipcs \ kldelf \ ldns \ + opencsd \ samplerate \ sqlite3 \ ssh \ From nobody Thu Oct 23 11:04:35 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4csjpr0zm2z6DBnd; Thu, 23 Oct 2025 11:04:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4csjpq6pyLz3x62; Thu, 23 Oct 2025 11:04:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761217476; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cli+yOXRuRvjadYf2oh/zsPDE9Ccz8fwYhXzrHbAdFk=; b=KynIQPzOocjmoqVQpBaTZ6sWh55zzAHjgQAkh/6fOKkUn2kXruZl/lIwUWvm4dm0sjYRSB liqUb1qbylgcIOtaQg3S77GY/gXHtXWluvwn4pE2lraPWlDtTGjjsDNB08QqhXt8LuV5wk aukfDtR/xfhu5ebRv8/oqCQFR0i/25SmoGbshgKu4f+0QmjMjgC08K+zXtxuWTQ+siZGbR I8ceenzm1kPYkZP/vuh1otEQ/KyzrMSN/50GWp/qa5H+Y+XLqgdRwkFcdhZkyHH1nH7UHu 3gAZjejClsQxjeHl9LI5scUWrh/NFc/UJt8rNTRsT4aWdNHFEP6oWhxAf/C5uQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761217476; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cli+yOXRuRvjadYf2oh/zsPDE9Ccz8fwYhXzrHbAdFk=; b=k38lJnojymn+ZeVh1LYHchlIf+3q3PWHuig+NzGGAoHiX8KeVt5SFH6o9j6zoB72CqHaKi 73vzQFOJ+eh5IBe+lKmBOpOrM6nvbj+JNS76/wGSocuxzS1iVZ3eiBCGA7ycgPCf9iU9EY kZiwS0gtNeN5jDViMb1Z3uyn3bJfslXbsV1ZQPK6Y12MnDoK8TAuR5NQ5lpA1DeuGu/5YE 7SUpZdHYQKN3BRmgMOivt42xQq50dyt8U3sPaI6UwXkbuTuCC3jab52CyMTAfhzqfTbV+i zRPgvH49QYQrPY2n2sOQnD7yeFN8LNNC7Vuw0/QadnkIvO2kXrVfEcY/w85mRw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761217476; a=rsa-sha256; cv=none; b=GhPug07iMa/2tHs5jPCrKY1A5MiiiWkkgWqBC+u6REQDCT7bYWj4vwmLvq7hUiip9+t582 vfk1R2hF8PlGf7X54htr3R7bDI86fg893Szbe8TIBpgvfkfK9I6fic1DSQMBL+i8J+zv1a EvuBDCWgh9yN0DAhECzcuprbmjmF+qEOWYxXWynRBVdOjHSuHdsMLflpdq9fboiehbmUPk Qa/xw75kHY2/D8xZh3EEADCxYhUQrzzE0jhVCUUgoeCLOYclGEBSxc3fUY57lmrXm57r7+ WfLMP95tI5mXjrOGepXyhxjFFMUW6FUoNM3JiOA2Uhu2ywTUU+tKM9ihzEq81A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4csjpq6D4lz1BnX; Thu, 23 Oct 2025 11:04: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 59NB4ZUm011110; Thu, 23 Oct 2025 11:04:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59NB4Zca011107; Thu, 23 Oct 2025 11:04:35 GMT (envelope-from git) Date: Thu, 23 Oct 2025 11:04:35 GMT Message-Id: <202510231104.59NB4Zca011107@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: b157c28ce97b - main - modules/dtb: Add the ARM dtb module List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b157c28ce97bbabfdddde35f67e3181053ed3ffd Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=b157c28ce97bbabfdddde35f67e3181053ed3ffd commit b157c28ce97bbabfdddde35f67e3181053ed3ffd Author: Andrew Turner AuthorDate: 2025-10-20 18:49:24 +0000 Commit: Andrew Turner CommitDate: 2025-10-23 10:47:05 +0000 modules/dtb: Add the ARM dtb module fvp-base-revc.dtb works with the kernel now interrupt-maps are supported in more cases. Reviewed by: mhorne Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D51258 --- sys/arm64/conf/std.arm | 3 +++ sys/modules/dtb/arm/Makefile | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/sys/arm64/conf/std.arm b/sys/arm64/conf/std.arm index fb5561506531..309059a096eb 100644 --- a/sys/arm64/conf/std.arm +++ b/sys/arm64/conf/std.arm @@ -21,3 +21,6 @@ device arm_doorbell # ARM Message Handling Unit (MHU) options FDT device acpi + +# DTBs +makeoptions MODULES_EXTRA+="dtb/arm" diff --git a/sys/modules/dtb/arm/Makefile b/sys/modules/dtb/arm/Makefile new file mode 100644 index 000000000000..34136c78c03d --- /dev/null +++ b/sys/modules/dtb/arm/Makefile @@ -0,0 +1,6 @@ +# All the dts files for Arm systems we support. + +DTS= \ + arm/fvp-base-revc.dts + +.include From nobody Thu Oct 23 11:04:36 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4csjps2FJKz6DBfb; Thu, 23 Oct 2025 11:04:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4csjps0kYqz3wwl; Thu, 23 Oct 2025 11:04:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761217477; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=unxZONJNl08L2NvUGF2tn/MiVj8THpWo4pk0k2LIzss=; b=OJO+cNjSRqzE9Wo561cU4qg4rsMbuFpsr7FgLnAgSJXbC48/Bqk/lTrhW3Z26BMypus1XJ H8HYdDTTyi8fMFNIzULesg6mWRK0UQ1psw4I++v972X0tFt6FIwDsQJA/5LkkOaGdqXkhF M4YomrUxMyBUC0IFX2jqTx0fgZxZLI6o8Xq6YVuhD7e1jfEI68w3oxFLuzHlti4dDEik/U +APgDc/3jRct7u7HjVLmkruc3hk18P32gr0IhEVTsKqe1sp7EQZTiCahItnShy0YsIMDUS iavEtZZ7g4XUwYY3U2wsqzgmdOlr5kac7P5RVwuCkC5YMjBQubZyVFkx24sbNw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761217477; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=unxZONJNl08L2NvUGF2tn/MiVj8THpWo4pk0k2LIzss=; b=dW73JEIoESjigkPlNuh9W5z5rwpvl8gGoyRHzdAb0G9i+EdxNnGuc7xgXn30b368keqEfX D/090DlDstl3MTNAXRPlEHP6CgQKY+SCq1iq5ajgySR7qN1pCAhhCwx0hm34oaQZVgqYyk /JmUFJEmGj3yY4jKh5Z/2zDNFuSD95HT4GSY5g8vxDpyAJ2KC5b2mGaNBptu1HroZttGYy Yukyd2Mp/YqJWfTSYBBhfXJeqO/lrociSUA6XLajXnP50zwWxmaxjKUI0iiAREej/gj6nt CUjXdWxYHVGkj6IHLXgXc2CSsNWL6hLPC2cqcmFGmWCkUIgT/pCk+hN6U/4UVQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761217477; a=rsa-sha256; cv=none; b=yfIHMWdj76KiGsQwUU/XzzbwxdgzpbBsXLUg7HNabJpC60Qfo2vEhN/ICotTxm582kAhZ2 4KIyeDjeKb2ceLx/KT98BXMx0RfP3Sbpmre/MaZJlwqKFvtTYJ09VV99tCcHnAAZuR2l8v w0IGEYe2aG4hKNGVG66usQ51l3G7u3FzL+xJ3W7puLa9OoK7yLPqTCpH+11Wnj0HfmW45P DHdkT2RUpq2nhqXLWmbGKgIu9EOxZFXTH8ktvaP0NFRv80xvauGMPmq8eduOl5rOO4Xcoh K6X52Yfv/alAfkVmAToe/uqocBnoj0o9yZVCJbhlYY7wZls/osSM9/nQiRrhLg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4csjps03QTz1Bcg; Thu, 23 Oct 2025 11:04: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 59NB4atO011147; Thu, 23 Oct 2025 11:04:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59NB4aEJ011144; Thu, 23 Oct 2025 11:04:36 GMT (envelope-from git) Date: Thu, 23 Oct 2025 11:04:36 GMT Message-Id: <202510231104.59NB4aEJ011144@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: f4f638eb23d7 - main - arm64: Add additional fields for PMBSR and PMSIDR List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f4f638eb23d770e19ede167908d8145b8851f835 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=f4f638eb23d770e19ede167908d8145b8851f835 commit f4f638eb23d770e19ede167908d8145b8851f835 Author: Sarah Walker AuthorDate: 2025-10-23 10:39:33 +0000 Commit: Andrew Turner CommitDate: 2025-10-23 10:47:18 +0000 arm64: Add additional fields for PMBSR and PMSIDR Reviewed by: andrew Sponsored by: Arm Ltd --- sys/arm64/include/armreg.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/sys/arm64/include/armreg.h b/sys/arm64/include/armreg.h index 393d6d89da0c..aca3d4c07450 100644 --- a/sys/arm64/include/armreg.h +++ b/sys/arm64/include/armreg.h @@ -2278,6 +2278,11 @@ #define PMBSR_DL (UL(0x1) << PMBSR_DL_SHIFT) #define PMBSR_EC_SHIFT 26 #define PMBSR_EC_MASK (UL(0x3f) << PMBSR_EC_SHIFT) +#define PMBSR_EC_VAL(x) (((x) & PMBSR_EC_MASK) >> PMBSR_EC_SHIFT) +#define PMBSR_EC_OTHER_BUF_MGMT 0x00 +#define PMBSR_EC_GRAN_PROT_CHK 0x1e +#define PMBSR_EC_STAGE1_DA 0x24 +#define PMBSR_EC_STAGE2_DA 0x25 /* PMCCFILTR_EL0 */ #define PMCCFILTR_EL0_op0 3 @@ -2513,6 +2518,15 @@ #define PMSIDR_FnE (UL(0x1) << PMSIDR_FnE_SHIFT) #define PMSIDR_Interval_SHIFT 8 #define PMSIDR_Interval_MASK (UL(0xf) << PMSIDR_Interval_SHIFT) +#define PMSIDR_Interval_VAL(x) (((x) & PMSIDR_Interval_MASK) >> PMSIDR_Interval_SHIFT) +#define PMSIDR_Interval_256 0 +#define PMSIDR_Interval_512 2 +#define PMSIDR_Interval_768 3 +#define PMSIDR_Interval_1024 4 +#define PMSIDR_Interval_1536 5 +#define PMSIDR_Interval_2048 6 +#define PMSIDR_Interval_3072 7 +#define PMSIDR_Interval_4096 8 #define PMSIDR_MaxSize_SHIFT 12 #define PMSIDR_MaxSize_MASK (UL(0xf) << PMSIDR_MaxSize_SHIFT) #define PMSIDR_CountSize_SHIFT 16 From nobody Thu Oct 23 13:41:05 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4csnHP6F9Cz6DWqR; Thu, 23 Oct 2025 13:41:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4csnHP5bCvz3JhV; Thu, 23 Oct 2025 13:41:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761226865; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UtJ5/sRBR4jWyvNGA5/40of16N0iI/52HB0mXb6K5Vw=; b=YFhWZdJyzbyJgI3jQaiHW6jUub9nnsnws3IggLFcZwfkFal87vkBx+y6xzTG0qNWqRNLzp CoW9vLmg/JI3iX//IRg7E2Xv64bUcSe+YlhLleWp8nAaFB1CTtpT95nv2e6ZLZXGNCLoAO Oe2YTZDvUCvmrGzXQn1uh42Dq3qs7hY8XJ4Ya8WWDmev5O7NVocpLbBEjARG8IMEAcU5Xc +b5gSGffGCms/2ZbuLnfeuILUtVEJ6TXYaqFWUy3cfIz1MSm0dvl3vWLOBFZ5OlFlFvWNz YrXZzWw+twQI7mAKPt1RJUrQmnj936g1cBJjoBgDUxj8NTKOozY2BfT/gFpi1w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761226865; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UtJ5/sRBR4jWyvNGA5/40of16N0iI/52HB0mXb6K5Vw=; b=g5UtxaZ0r7QHySNKEUaYw+oHIzzithuYFIV0Ggs2hfXIzSmV3tWQimFpXMSPFqb915Ke2S ZHD8a8sWMPzDnc+PBG7Ivn6HY7QDShkLuA/ydb6uNW8q4Gmiaef4kCkElC31+Bh06ndjS0 Xp6u+UlEJykuXnCcz72fNfwK5xkW8YxHE8NdvMh89j4uXFAVrCkM0DT+R3tJQC52IUKPsc 69tXBeoYjwO8WnbtlZ16d0651VINwAMgkbO+S6zGpUAJNYsNV4qIAfMnQs+n0zdT+/PtIH 4mqQ3XSFFEvzE7RMoubwk+NXYa1sz7U2cXYDodSxfV6+C5OX1DvHrEYEBlIq9w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761226865; a=rsa-sha256; cv=none; b=d8ioKBtb7uA9hMQYrhOrK7lUO4CODzWGc4G3ztFSZS/2bPN/1Z9fBqchELud6b8JxDG721 6tWzsV2OCAUXjfcYjYxpVR/SPNtnRjhj3Vg1on4VQ+lq8VjK4CJnZkkPZzC2w1pBzTIDAx jb1/wouDOTfora91O0RCSoLLkcvkW+vPZyX8Sp/iyyuIHB4kQW+LYcsw7Anfgtsn+x4V9O 6Ifhl7UJHxIZG7sh+81wg5hDzqqPCRjRBQHVG/UcfrQcEyuQmoFqXnp0QE9eieolu00Weu M9tck7oaiibJmd4Glb/7yde5VI5whz1Cug9JQxCYLRstwiFSw0NIyhZvvdRa2g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4csnHP4wyRz2Bp; Thu, 23 Oct 2025 13:41:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59NDf5HT007413; Thu, 23 Oct 2025 13:41:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59NDf5as007410; Thu, 23 Oct 2025 13:41:05 GMT (envelope-from git) Date: Thu, 23 Oct 2025 13:41:05 GMT Message-Id: <202510231341.59NDf5as007410@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alan Somers Subject: git: 6d408ac49073 - main - fusefs: add a regression test for a cluster_read bug List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6d408ac490730614b3ed0ebd3caffcd23f303fb4 Auto-Submitted: auto-generated The branch main has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=6d408ac490730614b3ed0ebd3caffcd23f303fb4 commit 6d408ac490730614b3ed0ebd3caffcd23f303fb4 Author: Alan Somers AuthorDate: 2025-10-23 13:40:56 +0000 Commit: Alan Somers CommitDate: 2025-10-23 13:40:56 +0000 fusefs: add a regression test for a cluster_read bug VOP_BMAP is purely advisory. If VOP_BMAP returns an error during readahead, cluster_read should still succeed, because the actual data was still read just fine. Add a regression test for PR 264196, wherein cluster_read would fail if VOP_BMAP did. PR: 264196 MFC with: 62aef3f73f38db9fb68bffc12cc8900fecd58f0e Reported by: danfe Reviewed by: arrowd Differential Revision: https://reviews.freebsd.org/D51316 --- tests/sys/fs/fusefs/bmap.cc | 87 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 87 insertions(+) diff --git a/tests/sys/fs/fusefs/bmap.cc b/tests/sys/fs/fusefs/bmap.cc index 30612079657d..e61dadb6d79e 100644 --- a/tests/sys/fs/fusefs/bmap.cc +++ b/tests/sys/fs/fusefs/bmap.cc @@ -177,6 +177,93 @@ TEST_F(Bmap, default_) leak(fd); } +/* + * The server returns an error for some reason for FUSE_BMAP. fusefs should + * faithfully report that error up to the caller. + */ +TEST_F(Bmap, einval) +{ + struct fiobmap2_arg arg; + const off_t filesize = 1 << 30; + int64_t lbn = 100; + const ino_t ino = 42; + int fd; + + expect_lookup(RELPATH, 42, filesize); + expect_open(ino, 0, 1); + EXPECT_CALL(*m_mock, process( + ResultOf([=](auto in) { + return (in.header.opcode == FUSE_BMAP && + in.header.nodeid == ino); + }, Eq(true)), + _) + ).WillOnce(Invoke(ReturnErrno(EINVAL))); + + fd = open(FULLPATH, O_RDWR); + ASSERT_LE(0, fd) << strerror(errno); + + arg.bn = lbn; + arg.runp = -1; + arg.runb = -1; + ASSERT_EQ(-1, ioctl(fd, FIOBMAP2, &arg)); + EXPECT_EQ(EINVAL, errno); + + leak(fd); +} + +/* + * Even if the server returns EINVAL during VOP_BMAP, we should still be able + * to successfully read a block. This is a regression test for + * https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=264196 . The bug did not + * lie in fusefs, but this is a convenient place for a regression test. + */ +TEST_F(Bmap, spurious_einval) +{ + const off_t filesize = 4ull << 30; + const ino_t ino = 42; + int fd, r; + char buf[1]; + + expect_lookup(RELPATH, 42, filesize); + expect_open(ino, 0, 1); + EXPECT_CALL(*m_mock, process( + ResultOf([=](auto in) { + return (in.header.opcode == FUSE_BMAP && + in.header.nodeid == ino); + }, Eq(true)), + _) + ).WillRepeatedly(Invoke(ReturnErrno(EINVAL))); + EXPECT_CALL(*m_mock, process( + ResultOf([=](auto in) { + return (in.header.opcode == FUSE_READ && + in.header.nodeid == ino && + in.body.read.offset == 0 && + in.body.read.size == (uint64_t)m_maxbcachebuf); + }, Eq(true)), + _) + ).WillOnce(Invoke(ReturnImmediate([=](auto in, auto& out) { + size_t osize = in.body.read.size; + + assert(osize < sizeof(out.body.bytes)); + out.header.len = sizeof(struct fuse_out_header) + osize; + bzero(out.body.bytes, osize); + }))); + + fd = open(FULLPATH, O_RDWR); + ASSERT_LE(0, fd) << strerror(errno); + + /* + * Read the same block multiple times. On a system affected by PR + * 264196 , the second read will fail. + */ + r = read(fd, buf, sizeof(buf)); + EXPECT_EQ(r, 1) << strerror(errno); + r = read(fd, buf, sizeof(buf)); + EXPECT_EQ(r, 1) << strerror(errno); + r = read(fd, buf, sizeof(buf)); + EXPECT_EQ(r, 1) << strerror(errno); +} + /* * VOP_BMAP should not query the server for the file's size, even if its cached * attributes have expired. From nobody Thu Oct 23 16:53:05 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cssXx6CWvz6DxdP; Thu, 23 Oct 2025 16:53:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cssXx5QNpz3lln; Thu, 23 Oct 2025 16:53:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761238385; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=H0Zqr+/W1QDGd21A6Ce5wwS6T3qFr28gpwt2ECAMHCI=; b=n9F9euoX9NNSEBbOyo6sapj0M22LXTrvUtguEzeQAuCpmNQ4GGSUP8UDkcmW8d5GJLwW9t VgkrRrG+xNkyMe4OoSilmEhOqJP7jUtkK0r/dHYrusXYv2Uye6cTAxuuCStx9pGGIrWHlP 2aZAKUNaQy9ru4GTCZUSYQzig+GA+mZnQ9zjoSb5SyS7fizbMxrD5jm6NuzNnuj76Zddrn dIIkwhwZlifapC29BM+kXzZ/K0Ej2WTV4Ek16Km/u1Hwel9Q4zxXzLF7NjN0/cFYKEnpiK bRfq6c0n0TvsWMe8k1mernCF/LWjKLqGoqpxcKU4unIQolio3ornGxCeLWWChw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761238385; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=H0Zqr+/W1QDGd21A6Ce5wwS6T3qFr28gpwt2ECAMHCI=; b=sZZsaq5Cc0EpScC/XCRwIfu1enzn01PhC0CY4clFah9fczkJOwxgyFUg02S4wNBHoSc+Z3 oi4ejRbP7sIz6ZGTCVPxdLHBJQ40F0mlZXugWOV4REyIo+v2JPGXjMkb38koARyp1FN9SD 0g6seXZLZX0W1qNud/9wHI9q9UKnGhzxTF6iLc3LoQvxYYNXf6+yZIQB9xy4/72M42gVuV 9OnrSXLLAR3G/PKi6YeMk9RkDbujufyimUVYw+zANAX2D78q50sujaQ0t4SLMFHoon+0N0 d2l5OBLU1MODZxdteRhfSS8zlsbF8u+5Nf5/UAl0GI93jP6ba5SgWwg+0fZkJQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761238385; a=rsa-sha256; cv=none; b=F/rJmXvK0IZvcD9e5oDopaIuHY5dSoSLZcu/P0BE32saVDljudwskdzJ8qSNcswfrYX5PY q9wGvlNWgzwPuJWMWjYHf4YPkhdQ/uyg3CTimxlNECZKmSfWViaKH4fmqqbz+WRNqFs2iF CHAeKzpG5T0zvAPjEEgAmM2xOg24GG2OU4Jfp+OjQ70D7YXjUUVQiTYSSWqGGyCL610oaP o4GQQHqgEQZLcxIH6l/uOfkk0tV8xlnLr4OquVc+vYCsXOCxIEuV88s4e6h0VDMLtcCFVt Xrh0LvoAJF/pKJ7t3ypnLFMBqzCuU7sUfafwyLgZIzBXxRZm+jrE9SQhh5Yd8g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cssXx4qYWz7xn; Thu, 23 Oct 2025 16:53: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 59NGr5mT070310; Thu, 23 Oct 2025 16:53:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59NGr5nd070307; Thu, 23 Oct 2025 16:53:05 GMT (envelope-from git) Date: Thu, 23 Oct 2025 16:53:05 GMT Message-Id: <202510231653.59NGr5nd070307@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "David E. O'Brien" Subject: git: 38e9d282cd7d - main - random: fenestrasX: add RDSEED support List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: obrien X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 38e9d282cd7dacbf64883b45544723408cfd4d09 Auto-Submitted: auto-generated The branch main has been updated by obrien: URL: https://cgit.FreeBSD.org/src/commit/?id=38e9d282cd7dacbf64883b45544723408cfd4d09 commit 38e9d282cd7dacbf64883b45544723408cfd4d09 Author: David E. O'Brien AuthorDate: 2025-10-23 04:49:02 +0000 Commit: David E. O'Brien CommitDate: 2025-10-23 16:52:55 +0000 random: fenestrasX: add RDSEED support Reviewed by: cem Fixes: 3a1298 random: add RDSEED as a provably unique entropy source Differential Revision: https://reviews.freebsd.org/D53291 --- sys/dev/random/fenestrasX/fx_pool.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/dev/random/fenestrasX/fx_pool.c b/sys/dev/random/fenestrasX/fx_pool.c index ec59b97a2070..95c2d223e0de 100644 --- a/sys/dev/random/fenestrasX/fx_pool.c +++ b/sys/dev/random/fenestrasX/fx_pool.c @@ -179,6 +179,9 @@ static const struct fxrng_ent_char { [RANDOM_PURE_RDRAND] = { .entc_cls = &fxrng_hi_pull, }, + [RANDOM_PURE_RDSEED] = { + .entc_cls = &fxrng_hi_pull, + }, [RANDOM_PURE_NEHEMIAH] = { .entc_cls = &fxrng_hi_pull, }, From nobody Thu Oct 23 16:55:01 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cssb92FhBz6DyHc; Thu, 23 Oct 2025 16:55:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cssb91Xctz3mKX; Thu, 23 Oct 2025 16:55:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761238501; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=m+XSZjE45s7Wwsf31JbCDzrZcL7egi1V+B0oHWLrpcU=; b=nGsdfh2+XboB42X27inA5NusqY24lq1eQISxQ+haplsh1G5M/jXgnqYvfgnRpvZQKpGRc7 2U/I78oJ3rlpApKcw+CYBDtaRiu5I6D1Wtr6md33dagCX70UTPUh2z3YnTQt0FQEaxR9fP yB5+NfoCDKuwHbVVvptew71XBeuO4JVzOR1kmuStLsK1ZP9sf6NmwutC5aUKlgSyC1gDHW gbXcr5+zMrKfutXbm6s1fF8p9DTnTWB9Up/IlOAsfXcE4M8Dn6u4i4Jde8AImuLdRKTzIa DyPw4Hw/3pnr6BXhWdt/dXOiYWgEtrt6a76mSfLkuqW0X9O2AaS1yKhKD7eQhw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761238501; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=m+XSZjE45s7Wwsf31JbCDzrZcL7egi1V+B0oHWLrpcU=; b=d6e2QmIHJfaF9ps/2sZ+59EqeheajZMW6Hn9v9H1fdOH3JqfpClxrX5KitsguqNmuzUzqm yFPl+9/qIF8Lezy7FKgDeKW+jUUZFeQ8ip8kXZsJr4L8ZxuW6ZOkyuRF+dCPr70ROtYLnj kG/OdsW00xJvHw0FVO3XR8qQxNsUEE9mhQGXjk/0CYZOyVajWFon7ygbccBHZgQ9CYQ7q8 vEYJxoFpBzHn9vfGqIdTp2vKjG/9kI0ZS5l6nikuNctfu2OPxRkG+uSkDICi6F4qwLrk0i u6sofffWzxHneDq25vHlS0aN/ZQzbc67UqxmukX2eCPXH56UGmuf9v3LZfgkLg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761238501; a=rsa-sha256; cv=none; b=O6FeU7UBJw88qdU31NjW+e3TkIWNUPmHq0lI80wUIzFmp+wOqckWy95LZ4v4MP/OWfVzOS ZJ5Xt0NMNz2G1UaesSDADKcM5PvCqTLa2RcOvzrsfcqBlMQNbCFnYGGFqxGCb7HmDl1M9v TFf6PEa8j53hHaVw2yH2GZX9ImbAZEcpfhWJqWRGd1eRQBm26uX9dGqTdrPpm56BrFYXGd J4/acPO6JqTid5C7k9Ic7Nw3Fr9sn13dQKFVGpD9u8OMusFiALRsDK65tX+dG1kZv00mWb VgP0NeW4yboVqdCGaRxVFeMVu707rSGabvbTgrV7we/uFqdcN65NYYqMJtow6Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cssb90xxkz83b; Thu, 23 Oct 2025 16:55: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 59NGt17j071026; Thu, 23 Oct 2025 16:55:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59NGt1V1071023; Thu, 23 Oct 2025 16:55:01 GMT (envelope-from git) Date: Thu, 23 Oct 2025 16:55:01 GMT Message-Id: <202510231655.59NGt1V1071023@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "David E. O'Brien" Subject: git: 93b02f69a6f6 - main - random: fenestrasX: Add missing entropy sources List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: obrien X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 93b02f69a6f6ffb833227c2fd56d48daac128156 Auto-Submitted: auto-generated The branch main has been updated by obrien: URL: https://cgit.FreeBSD.org/src/commit/?id=93b02f69a6f6ffb833227c2fd56d48daac128156 commit 93b02f69a6f6ffb833227c2fd56d48daac128156 Author: David E. O'Brien AuthorDate: 2025-10-23 06:25:59 +0000 Commit: David E. O'Brien CommitDate: 2025-10-23 16:54:03 +0000 random: fenestrasX: Add missing entropy sources Reviewed by: cem Fixes: 1492c8c0d qcom_rnd: add initial qualcomm prng driver. Fixes: 9eecef052 Add an Armv8 rndr random number provider Fixes: b2f8b2dc8 sys: Add an SMCCC Random Number Generator driver Differential Revision: https://reviews.freebsd.org/D53292 --- sys/dev/random/fenestrasX/fx_pool.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/sys/dev/random/fenestrasX/fx_pool.c b/sys/dev/random/fenestrasX/fx_pool.c index 95c2d223e0de..858069035572 100644 --- a/sys/dev/random/fenestrasX/fx_pool.c +++ b/sys/dev/random/fenestrasX/fx_pool.c @@ -206,6 +206,15 @@ static const struct fxrng_ent_char { [RANDOM_PURE_VMGENID] = { .entc_cls = &fxrng_hi_push, }, + [RANDOM_PURE_QUALCOMM] = { + .entc_cls = &fxrng_hi_pull, + }, + [RANDOM_PURE_ARMV8] = { + .entc_cls = &fxrng_hi_pull, + }, + [RANDOM_PURE_ARM_TRNG] = { + .entc_cls = &fxrng_hi_pull, + }, }; /* Useful for single-bit-per-source state. */ From nobody Thu Oct 23 19:05:27 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cswTg4mqSz6DGT1; Thu, 23 Oct 2025 19:05:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cswTg3dXCz47Ks; Thu, 23 Oct 2025 19:05:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761246327; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/QHBt6T/g+jC5cfQdvfTJm2akHBkKmnXnVuwh6msvaw=; b=ZNp9yTHDYrTpqKHzzeYg/TMjNvLgcZYsAqI6f+nhk/ypgAR2ULewi0Bw1AvnrriiRRS4uK TSNOnuERIe9HfFipk4GhUvG1pzqgN6awSVq3Zt1TituxT83ikHVKrvFRnp9ecbzNUanWWm rpJlGwRrFZkH7qRaJkbOYTxBNtqrjTPLpAlrwP3CpWRbtR62XsVJIf4PyGO3yaumujCEPG O94ppXhttrMZxYM3m7n4Jl31DtTKY2G2k27hJ+RXR745GIY8OB3J48e7ApxqYOSE3on5ZX vsJIzVO+hg9sXzmtS+i3xc68do0c3nfmp0foxISkcB+32hrIrt7kmaPtl3ZBGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761246327; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/QHBt6T/g+jC5cfQdvfTJm2akHBkKmnXnVuwh6msvaw=; b=jkeclgX+JI61KuvnL0Rpc1Q5DFBoZrLgMCmzEw/A0sLU9hzdgNm6yVLrTFpya9Ex5j7U9R 6g7u/CUTruPA2Fg7o7UtREXEgnoj0taewK/AqddRvpjFa5urSnp4y21xyqaCZL1QhoMDOw YoCNjJmIbv/NZbsqhjm9AXHWXWK0o3GQ2aQdzF4ShoQFcM7K3Y8q6Jhak+nNfzAum+Y/H+ ZhISWBMIyE2b16V7REVL90UCKkjTpKV/C4/ODaLZeeKNCetN7nr136hRgaObm13aKKxsZP FmkLGZiX8woj7JQ9aUvrRn8Qsqt9cH2Y9MswvefZALp0UmdAOSXE8NxG6koq6g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761246327; a=rsa-sha256; cv=none; b=TtsZhvzkBQSwk37Yecvxw4yEmBZWtMEjPfYQsfHjuRPPmH1gGBwLTDNXm9Tuam5ohnFlJy hbr86IF60HhRXYeHNZ73YKYNOyyqb4DoxKS2AkO9M3WIGceqRP2kadFY98phdXVYp/05k5 udkg7R6JnwYZ8/6VOsSTtUjYUKS+LAHR9tyV4Wa4G/6vU7q/qvTW9xlhxoefRbKcGaGHya CPTtoQ+zyMxQLYNmAxPJIPbWWFREOK4ISiin2Dk7nlJVSdDQ1kDZ5dCVdA6F2OYs5hxcud s9ED0KPHOdn37FCwpqzc1IgACXO3twZ7yv0fFz7/M4Y441ymjp6JBD5Iyzlb5A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cswTg382XzCJC; Thu, 23 Oct 2025 19:05: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 59NJ5Rms017281; Thu, 23 Oct 2025 19:05:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59NJ5Rl6017278; Thu, 23 Oct 2025 19:05:27 GMT (envelope-from git) Date: Thu, 23 Oct 2025 19:05:27 GMT Message-Id: <202510231905.59NJ5Rl6017278@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cy Schubert Subject: git: 8b29c373e6ab - main - unbound: Vendor import 1.24.1 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8b29c373e6ab530b62122ea2adcbe637c07e06c9 Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=8b29c373e6ab530b62122ea2adcbe637c07e06c9 commit 8b29c373e6ab530b62122ea2adcbe637c07e06c9 Merge: 93b02f69a6f6 73dd92916f53 Author: Cy Schubert AuthorDate: 2025-10-23 18:56:54 +0000 Commit: Cy Schubert CommitDate: 2025-10-23 19:03:29 +0000 unbound: Vendor import 1.24.1 Release notes at https://nlnetlabs.nl/news/2025/Oct/22/unbound-1.24.1-released/ Security: CVE-2025-11411 MFC after: 3 days Merge commit '73dd92916f532cb3fe353220103babe576d30a15' contrib/unbound/aclocal.m4 | 857 +-- contrib/unbound/configure | 6073 ++++++++++---------- contrib/unbound/configure.ac | 5 +- contrib/unbound/daemon/remote.c | 1 + contrib/unbound/doc/README | 2 +- contrib/unbound/doc/example.conf.in | 6 +- contrib/unbound/doc/libunbound.3.in | 4 +- contrib/unbound/doc/unbound-anchor.8.in | 4 +- contrib/unbound/doc/unbound-checkconf.8.in | 4 +- contrib/unbound/doc/unbound-control.8.in | 5 +- contrib/unbound/doc/unbound-control.rst | 1 + contrib/unbound/doc/unbound-host.1.in | 4 +- contrib/unbound/doc/unbound.8.in | 4 +- contrib/unbound/doc/unbound.conf.5.in | 13 +- contrib/unbound/doc/unbound.conf.rst | 8 + contrib/unbound/install-sh | 178 +- contrib/unbound/iterator/iter_scrub.c | 16 + contrib/unbound/ltmain.sh | 15 +- .../09-unbound-control.conf | 31 - .../09-unbound-control.test | 493 -- .../09-unbound-control.testns | 44 - .../testdata/acl_interface.tdir/acl_interface.conf | 198 - .../acl_interface.tdir/acl_interface.test.scenario | 268 - .../auth_nsec3_ent_with_out_of_zone_data.rpl | 228 - .../auth_nsec3_wild_with_out_of_zone_data.rpl | 234 - .../unbound/testdata/auth_tls.tdir/auth_tls.pre | 48 - .../auth_tls_failcert.tdir/auth_tls_failcert.pre | 48 - contrib/unbound/testdata/cachedb_expired.crpl | 325 -- .../testdata/cachedb_expired_reply_ttl.crpl | 260 - .../unbound/testdata/cachedb_servfail_cname.crpl | 181 - contrib/unbound/testdata/cachedb_val_expired.crpl | 328 -- contrib/unbound/testdata/common.sh | 394 -- contrib/unbound/testdata/dns_error_reporting.rpl | 200 - contrib/unbound/testdata/dnstap.tdir/dnstap.conf | 43 - .../testdata/fast_reload_fwd.tdir/auth1.zone | 2 - .../testdata/fast_reload_fwd.tdir/auth2.zone | 2 - .../fast_reload_fwd.tdir/fast_reload_fwd.conf | 107 - .../fast_reload_fwd.tdir/fast_reload_fwd.conf2 | 108 - .../fast_reload_fwd.tdir/fast_reload_fwd.dsc | 16 - .../fast_reload_fwd.tdir/fast_reload_fwd.ns1 | 339 -- .../fast_reload_fwd.tdir/fast_reload_fwd.ns2 | 285 - .../fast_reload_fwd.tdir/fast_reload_fwd.post | 27 - .../fast_reload_fwd.tdir/fast_reload_fwd.pre | 56 - .../fast_reload_fwd.tdir/fast_reload_fwd.test | 320 -- .../auth.nlnetlabs.nl.zone | 3 - .../fast_reload_most_options.conf | 143 - .../fast_reload_most_options.dsc | 16 - .../fast_reload_most_options.post | 11 - .../fast_reload_most_options.pre | 33 - .../fast_reload_most_options.test | 42 - .../rpz.nlnetlabs.nl.zone | 5 - .../fast_reload_thread.conf | 20 - .../fast_reload_thread.tdir/fast_reload_thread.dsc | 16 - .../fast_reload_thread.post | 11 - .../fast_reload_thread.tdir/fast_reload_thread.pre | 34 - .../fast_reload_thread.test | 38 - contrib/unbound/testdata/fwd_0ttlservfail.rpl | 87 - contrib/unbound/testdata/iter_failreply.rpl | 131 - contrib/unbound/testdata/iter_fwdfirstequaltcp.rpl | 163 - contrib/unbound/testdata/iter_fwdstubauth.rpl | 155 - contrib/unbound/testdata/iter_minimise_chain.rpl | 623 -- contrib/unbound/testdata/iter_scrub_rr_length.rpl | 297 - .../testdata/log_servfail.tdir/log_servfail.conf | 27 - .../testdata/log_servfail.tdir/log_servfail.dsc | 16 - .../testdata/log_servfail.tdir/log_servfail.post | 10 - .../testdata/log_servfail.tdir/log_servfail.pre | 21 - .../testdata/log_servfail.tdir/log_servfail.test | 47 - .../redis_reconnect_interval.tdir/after.zone | 2 - .../redis_reconnect_interval.tdir/before.zone | 2 - .../redis_reconnect_interval.tdir/redis.conf | 583 -- .../redis_reconnect_interval.conf | 33 - .../redis_reconnect_interval.dsc | 16 - .../redis_reconnect_interval.post | 18 - .../redis_reconnect_interval.pre | 46 - .../redis_reconnect_interval.test | 121 - .../unbound_control.key | 39 - .../unbound_control.pem | 22 - .../unbound_server.key | 39 - .../unbound_server.pem | 22 - .../unbound/testdata/redis_replica.tdir/after.zone | 2 - .../testdata/redis_replica.tdir/before.zone | 2 - .../unbound/testdata/redis_replica.tdir/redis.conf | 583 -- .../testdata/redis_replica.tdir/redis_replica.conf | 31 - .../testdata/redis_replica.tdir/redis_replica.dsc | 16 - .../testdata/redis_replica.tdir/redis_replica.post | 18 - .../testdata/redis_replica.tdir/redis_replica.pre | 46 - .../testdata/redis_replica.tdir/redis_replica.test | 78 - .../redis_replica.tdir/unbound_control.key | 39 - .../redis_replica.tdir/unbound_control.pem | 22 - .../testdata/redis_replica.tdir/unbound_server.key | 39 - .../testdata/redis_replica.tdir/unbound_server.pem | 22 - contrib/unbound/testdata/rpz_cname_wild.rpl | 190 - contrib/unbound/testdata/rpz_nsdname.rpl | 471 -- contrib/unbound/testdata/rpz_val_block.rpl | 642 --- contrib/unbound/testdata/serve_expired.rpl | 126 - .../unbound/testdata/serve_expired_0ttl_nodata.rpl | 154 - .../testdata/serve_expired_0ttl_nxdomain.rpl | 154 - .../testdata/serve_expired_0ttl_servfail.rpl | 129 - .../testdata/serve_expired_cached_servfail.rpl | 130 - .../serve_expired_cached_servfail_refresh.rpl | 145 - .../serve_expired_client_timeout_servfail.rpl | 219 - .../serve_expired_client_timeout_val_bogus.rpl | 328 -- .../unbound/testdata/serve_expired_reply_ttl.rpl | 106 - contrib/unbound/testdata/serve_expired_ttl.rpl | 101 - .../unbound/testdata/serve_expired_ttl_reset.rpl | 101 - .../unbound/testdata/serve_expired_val_bogus.rpl | 389 -- contrib/unbound/testdata/serve_expired_zerottl.rpl | 157 - contrib/unbound/testdata/serve_original_ttl.rpl | 139 - .../testdata/stat_values.tdir/stat_values.conf | 44 - .../testdata/stat_values.tdir/stat_values.pre | 50 - .../testdata/stat_values.tdir/stat_values.test | 681 --- .../testdata/stat_values.tdir/stat_values.testns | 87 - .../stat_values.tdir/stat_values_cachedb.conf | 30 - .../stat_values_discard_wait_limit.conf | 36 - .../subnet_cache_lookup.conf | 36 - .../subnet_cache_lookup.dsc | 16 - .../subnet_cache_lookup.post | 15 - .../subnet_cache_lookup.pre | 42 - .../subnet_cache_lookup.test | 121 - .../subnet_cache_lookup.testns | 181 - .../unbound/testdata/subnet_cached_servfail.crpl | 168 - .../subnet_global_prefetch_always_forward.crpl | 168 - .../testdata/subnet_global_prefetch_expired.crpl | 242 - contrib/unbound/testdata/subnet_noecs_mult.crpl | 334 -- contrib/unbound/testdata/subnet_noecs_refused.crpl | 159 - contrib/unbound/testdata/subnet_noecs_support.crpl | 127 - .../unbound/testdata/subnet_scopezero_global.crpl | 280 - contrib/unbound/testdata/test_ldnsrr.4 | 80 - contrib/unbound/testdata/test_ldnsrr.5 | 178 - contrib/unbound/testdata/test_ldnsrr.c3 | 1068 ---- contrib/unbound/testdata/test_ldnsrr.c4 | 84 - contrib/unbound/testdata/test_ldnsrr.c5 | 220 - contrib/unbound/testdata/val_failure_dnskey.rpl | 347 -- contrib/unbound/testdata/val_scrub_rr_length.rpl | 163 - contrib/unbound/util/config_file.c | 3 + contrib/unbound/util/config_file.h | 3 + contrib/unbound/util/configlexer.c | 5634 +++++++++--------- contrib/unbound/util/configlexer.lex | 1 + contrib/unbound/util/configparser.c | 4130 +++++++------ contrib/unbound/util/configparser.h | 10 +- contrib/unbound/util/configparser.y | 13 +- lib/libunbound/config.h | 4 +- 142 files changed, 8618 insertions(+), 25393 deletions(-) diff --cc contrib/unbound/util/config_file.c index 1820e1dcd91b,000000000000..8bbb428290c1 mode 100644,000000..100644 --- a/contrib/unbound/util/config_file.c +++ b/contrib/unbound/util/config_file.c @@@ -1,2947 -1,0 +1,2950 @@@ +/* + * util/config_file.c - reads and stores the config file for unbound. + * + * Copyright (c) 2007, NLnet Labs. All rights reserved. + * + * This software is open source. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * + * 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. + * + * Neither the name of the NLNET LABS nor the names of its contributors may + * be used to endorse or promote products derived from this software without + * specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT + * HOLDER 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. + */ + +/** + * \file + * + * This file contains functions for the config file. + */ + +#include "config.h" +#include +#include +#include +#ifdef HAVE_TIME_H +#include +#endif +#include "util/log.h" +#include "util/configyyrename.h" +#include "util/config_file.h" +#include "configparser.h" +#include "util/net_help.h" +#include "util/data/msgparse.h" +#include "util/module.h" +#include "util/regional.h" +#include "util/fptr_wlist.h" +#include "util/data/dname.h" +#include "util/random.h" +#include "util/rtt.h" +#include "services/cache/infra.h" +#include "sldns/wire2str.h" +#include "sldns/parseutil.h" +#include "iterator/iterator.h" +#ifdef HAVE_GLOB_H +# include +#endif +#ifdef CLIENT_SUBNET +#include "edns-subnet/edns-subnet.h" +#endif +#ifdef HAVE_PWD_H +#include +#endif + +/** from cfg username, after daemonize setup performed */ +uid_t cfg_uid = (uid_t)-1; +/** from cfg username, after daemonize setup performed */ +gid_t cfg_gid = (gid_t)-1; +/** for debug allow small timeout values for fast rollovers */ +int autr_permit_small_holddown = 0; +/** size (in bytes) of stream wait buffers max */ +size_t stream_wait_max = 4 * 1024 * 1024; +size_t http2_query_buffer_max = 4 * 1024 * 1024; +size_t http2_response_buffer_max = 4 * 1024 * 1024; + +/** global config during parsing */ +struct config_parser_state* cfg_parser = 0; + +/** init ports possible for use */ +static void init_outgoing_availports(int* array, int num); + +/** init cookie with random data */ +static void init_cookie_secret(uint8_t* cookie_secret, size_t cookie_secret_len); + +struct config_file* +config_create(void) +{ + struct config_file* cfg; + cfg = (struct config_file*)calloc(1, sizeof(struct config_file)); + if(!cfg) + return NULL; + /* the defaults if no config is present */ + cfg->verbosity = 1; + cfg->stat_interval = 0; + cfg->stat_cumulative = 0; + cfg->stat_extended = 0; + cfg->stat_inhibit_zero = 1; + cfg->num_threads = 1; + cfg->port = UNBOUND_DNS_PORT; + cfg->do_ip4 = 1; + cfg->do_ip6 = 1; + cfg->do_udp = 1; + cfg->do_tcp = 1; + cfg->tcp_reuse_timeout = 60 * 1000; /* 60s in milisecs */ + cfg->max_reuse_tcp_queries = 200; + cfg->tcp_upstream = 0; + cfg->udp_upstream_without_downstream = 0; + cfg->tcp_mss = 0; + cfg->outgoing_tcp_mss = 0; + cfg->tcp_idle_timeout = 30 * 1000; /* 30s in millisecs */ + cfg->tcp_auth_query_timeout = 3 * 1000; /* 3s in millisecs */ + cfg->do_tcp_keepalive = 0; + cfg->tcp_keepalive_timeout = 120 * 1000; /* 120s in millisecs */ + cfg->sock_queue_timeout = 0; /* do not check timeout */ + cfg->ssl_service_key = NULL; + cfg->ssl_service_pem = NULL; + cfg->ssl_port = UNBOUND_DNS_OVER_TLS_PORT; + cfg->ssl_upstream = 0; + cfg->tls_cert_bundle = NULL; + cfg->tls_win_cert = 0; + cfg->tls_use_sni = 1; + cfg->https_port = UNBOUND_DNS_OVER_HTTPS_PORT; + if(!(cfg->http_endpoint = strdup("/dns-query"))) goto error_exit; + cfg->http_max_streams = 100; + cfg->http_query_buffer_size = 4*1024*1024; + cfg->http_response_buffer_size = 4*1024*1024; + cfg->http_nodelay = 1; + cfg->quic_port = UNBOUND_DNS_OVER_QUIC_PORT; + cfg->quic_size = 8*1024*1024; + cfg->use_syslog = 1; + cfg->log_identity = NULL; /* changed later with argv[0] */ + cfg->log_time_ascii = 0; + cfg->log_time_iso = 0; + cfg->log_queries = 0; + cfg->log_replies = 0; + cfg->log_tag_queryreply = 0; + cfg->log_local_actions = 0; + cfg->log_servfail = 0; + cfg->log_destaddr = 0; +#ifndef USE_WINSOCK +# ifdef USE_MINI_EVENT + /* select max 1024 sockets */ + cfg->outgoing_num_ports = 960; + cfg->num_queries_per_thread = 512; +# else + /* libevent can use many sockets */ + cfg->outgoing_num_ports = 4096; + cfg->num_queries_per_thread = 2048; +# endif + cfg->outgoing_num_tcp = 10; + cfg->incoming_num_tcp = 10; +#else + cfg->outgoing_num_ports = 48; /* windows is limited in num fds */ + cfg->num_queries_per_thread = 24; + cfg->outgoing_num_tcp = 2; /* leaves 64-52=12 for: 4if,1stop,thread4 */ + cfg->incoming_num_tcp = 2; +#endif + cfg->stream_wait_size = 4 * 1024 * 1024; + cfg->edns_buffer_size = 1232; /* from DNS flagday recommendation */ + cfg->msg_buffer_size = 65552; /* 64 k + a small margin */ + cfg->msg_cache_size = 4 * 1024 * 1024; + cfg->msg_cache_slabs = 0; + cfg->jostle_time = 200; + cfg->rrset_cache_size = 4 * 1024 * 1024; + cfg->rrset_cache_slabs = 0; + cfg->host_ttl = 900; + cfg->bogus_ttl = 60; + cfg->min_ttl = 0; + cfg->max_ttl = 3600 * 24; + cfg->max_negative_ttl = 3600; + cfg->min_negative_ttl = 0; + cfg->prefetch = 0; + cfg->prefetch_key = 0; + cfg->deny_any = 0; + cfg->infra_cache_slabs = 0; + cfg->infra_cache_numhosts = 10000; + cfg->infra_cache_min_rtt = 50; + cfg->infra_cache_max_rtt = 120000; + cfg->infra_keep_probing = 0; + cfg->delay_close = 0; + cfg->udp_connect = 1; + if(!(cfg->outgoing_avail_ports = (int*)calloc(65536, sizeof(int)))) + goto error_exit; + init_outgoing_availports(cfg->outgoing_avail_ports, 65536); + if(!(cfg->username = strdup(UB_USERNAME))) goto error_exit; +#ifdef HAVE_CHROOT + if(!(cfg->chrootdir = strdup(CHROOT_DIR))) goto error_exit; +#endif + if(!(cfg->directory = strdup(RUN_DIR))) goto error_exit; + if(!(cfg->logfile = strdup(""))) goto error_exit; + if(!(cfg->pidfile = strdup(PIDFILE))) goto error_exit; + if(!(cfg->target_fetch_policy = strdup("3 2 1 0 0"))) goto error_exit; + cfg->fast_server_permil = 0; + cfg->fast_server_num = 3; + cfg->donotqueryaddrs = NULL; + cfg->donotquery_localhost = 1; + cfg->root_hints = NULL; + cfg->use_systemd = 0; + cfg->do_daemonize = 1; + cfg->if_automatic = 0; + cfg->if_automatic_ports = NULL; + cfg->so_rcvbuf = 0; + cfg->so_sndbuf = 4*1024*1024; + cfg->so_reuseport = REUSEPORT_DEFAULT; + cfg->ip_transparent = 0; + cfg->ip_freebind = 0; + cfg->ip_dscp = 0; + cfg->num_ifs = 0; + cfg->ifs = NULL; + cfg->num_out_ifs = 0; + cfg->out_ifs = NULL; + cfg->stubs = NULL; + cfg->forwards = NULL; + cfg->auths = NULL; +#ifdef CLIENT_SUBNET + cfg->client_subnet = NULL; + cfg->client_subnet_zone = NULL; + cfg->client_subnet_opcode = LDNS_EDNS_CLIENT_SUBNET; + cfg->client_subnet_always_forward = 0; + cfg->max_client_subnet_ipv4 = 24; + cfg->max_client_subnet_ipv6 = 56; + cfg->min_client_subnet_ipv4 = 0; + cfg->min_client_subnet_ipv6 = 0; + cfg->max_ecs_tree_size_ipv4 = 100; + cfg->max_ecs_tree_size_ipv6 = 100; +#endif + cfg->views = NULL; + cfg->acls = NULL; + cfg->tcp_connection_limits = NULL; + cfg->harden_short_bufsize = 1; + cfg->harden_large_queries = 0; + cfg->harden_glue = 1; + cfg->harden_unverified_glue = 0; + cfg->harden_dnssec_stripped = 1; + cfg->harden_below_nxdomain = 1; + cfg->harden_referral_path = 0; + cfg->harden_algo_downgrade = 0; + cfg->harden_unknown_additional = 0; + cfg->use_caps_bits_for_id = 0; + cfg->caps_whitelist = NULL; + cfg->private_address = NULL; + cfg->private_domain = NULL; + cfg->unwanted_threshold = 0; + cfg->hide_identity = 0; + cfg->hide_version = 0; + cfg->hide_trustanchor = 0; + cfg->hide_http_user_agent = 0; + cfg->identity = NULL; + cfg->version = NULL; + cfg->http_user_agent = NULL; + cfg->nsid_cfg_str = NULL; + cfg->nsid = NULL; + cfg->nsid_len = 0; + cfg->auto_trust_anchor_file_list = NULL; + cfg->trust_anchor_file_list = NULL; + cfg->trust_anchor_list = NULL; + cfg->trusted_keys_file_list = NULL; + cfg->trust_anchor_signaling = 1; + cfg->root_key_sentinel = 1; + cfg->domain_insecure = NULL; + cfg->val_date_override = 0; + cfg->val_sig_skew_min = 3600; /* at least daylight savings trouble */ + cfg->val_sig_skew_max = 86400; /* at most timezone settings trouble */ + cfg->val_max_restart = 5; + cfg->val_clean_additional = 1; + cfg->val_log_level = 0; + cfg->val_log_squelch = 0; + cfg->val_permissive_mode = 0; + cfg->aggressive_nsec = 1; + cfg->ignore_cd = 0; + cfg->disable_edns_do = 0; + cfg->serve_expired = 0; + cfg->serve_expired_ttl = 86400; + cfg->serve_expired_ttl_reset = 0; + cfg->serve_expired_reply_ttl = 30; + cfg->serve_expired_client_timeout = 1800; + cfg->serve_original_ttl = 0; + cfg->zonemd_permissive_mode = 0; + cfg->add_holddown = 30*24*3600; + cfg->del_holddown = 30*24*3600; + cfg->keep_missing = 366*24*3600; /* one year plus a little leeway */ + cfg->permit_small_holddown = 0; + cfg->key_cache_size = 4 * 1024 * 1024; + cfg->key_cache_slabs = 0; + cfg->neg_cache_size = 1 * 1024 * 1024; + cfg->local_zones = NULL; + cfg->local_zones_nodefault = NULL; +#ifdef USE_IPSET + cfg->local_zones_ipset = NULL; +#endif + cfg->local_zones_disable_default = 0; + cfg->local_data = NULL; + cfg->local_zone_overrides = NULL; + cfg->unblock_lan_zones = 0; + cfg->insecure_lan_zones = 0; + cfg->python_script = NULL; + cfg->dynlib_file = NULL; + cfg->remote_control_enable = 0; + cfg->control_ifs.first = NULL; + cfg->control_ifs.last = NULL; + cfg->control_port = UNBOUND_CONTROL_PORT; + cfg->control_use_cert = 1; + cfg->minimal_responses = 1; + cfg->rrset_roundrobin = 1; + cfg->unknown_server_time_limit = 376; + cfg->discard_timeout = 1900; /* msec */ + cfg->wait_limit = 1000; + cfg->wait_limit_cookie = 10000; + cfg->wait_limit_netblock = NULL; + cfg->wait_limit_cookie_netblock = NULL; + cfg->max_udp_size = 1232; /* value taken from edns_buffer_size */ + if(!(cfg->server_key_file = strdup(RUN_DIR"/unbound_server.key"))) + goto error_exit; + if(!(cfg->server_cert_file = strdup(RUN_DIR"/unbound_server.pem"))) + goto error_exit; + if(!(cfg->control_key_file = strdup(RUN_DIR"/unbound_control.key"))) + goto error_exit; + if(!(cfg->control_cert_file = strdup(RUN_DIR"/unbound_control.pem"))) + goto error_exit; + + if(!(cfg->module_conf = strdup("validator iterator"))) goto error_exit; + if(!(cfg->val_nsec3_key_iterations = + strdup("1024 150 2048 150 4096 150"))) goto error_exit; +#if defined(DNSTAP_SOCKET_PATH) + if(!(cfg->dnstap_socket_path = strdup(DNSTAP_SOCKET_PATH))) + goto error_exit; +#endif + cfg->dnstap_bidirectional = 1; + cfg->dnstap_tls = 1; + cfg->disable_dnssec_lame_check = 0; + cfg->ip_ratelimit_cookie = 0; + cfg->ip_ratelimit = 0; + cfg->ratelimit = 0; + cfg->ip_ratelimit_slabs = 0; + cfg->ratelimit_slabs = 0; + cfg->ip_ratelimit_size = 4*1024*1024; + cfg->ratelimit_size = 4*1024*1024; + cfg->ratelimit_for_domain = NULL; + cfg->ratelimit_below_domain = NULL; + cfg->ip_ratelimit_factor = 10; + cfg->ratelimit_factor = 10; + cfg->ip_ratelimit_backoff = 0; + cfg->ratelimit_backoff = 0; + cfg->outbound_msg_retry = 5; + cfg->max_sent_count = 32; + cfg->max_query_restarts = 11; + cfg->qname_minimisation = 1; + cfg->qname_minimisation_strict = 0; + cfg->shm_enable = 0; + cfg->shm_key = 11777; + cfg->edns_client_strings = NULL; + cfg->edns_client_string_opcode = 65001; + cfg->dnscrypt = 0; + cfg->dnscrypt_port = 0; + cfg->dnscrypt_provider = NULL; + cfg->dnscrypt_provider_cert = NULL; + cfg->dnscrypt_provider_cert_rotated = NULL; + cfg->dnscrypt_secret_key = NULL; + cfg->dnscrypt_shared_secret_cache_size = 4*1024*1024; + cfg->dnscrypt_shared_secret_cache_slabs = 0; + cfg->dnscrypt_nonce_cache_size = 4*1024*1024; + cfg->dnscrypt_nonce_cache_slabs = 0; + cfg->pad_responses = 1; + cfg->pad_responses_block_size = 468; /* from RFC8467 */ + cfg->pad_queries = 1; + cfg->pad_queries_block_size = 128; /* from RFC8467 */ +#ifdef USE_IPSECMOD + cfg->ipsecmod_enabled = 1; + cfg->ipsecmod_ignore_bogus = 0; + cfg->ipsecmod_hook = NULL; + cfg->ipsecmod_max_ttl = 3600; + cfg->ipsecmod_whitelist = NULL; + cfg->ipsecmod_strict = 0; +#endif + cfg->do_answer_cookie = 0; + memset(cfg->cookie_secret, 0, sizeof(cfg->cookie_secret)); + cfg->cookie_secret_len = 16; + init_cookie_secret(cfg->cookie_secret, cfg->cookie_secret_len); + cfg->cookie_secret_file = NULL; +#ifdef USE_CACHEDB + if(!(cfg->cachedb_backend = strdup("testframe"))) goto error_exit; + if(!(cfg->cachedb_secret = strdup("default"))) goto error_exit; + cfg->cachedb_no_store = 0; + cfg->cachedb_check_when_serve_expired = 1; +#ifdef USE_REDIS + if(!(cfg->redis_server_host = strdup("127.0.0.1"))) goto error_exit; + if(!(cfg->redis_replica_server_host = strdup(""))) goto error_exit; + cfg->redis_server_path = NULL; + cfg->redis_replica_server_path = NULL; + cfg->redis_server_password = NULL; + cfg->redis_replica_server_password = NULL; + cfg->redis_timeout = 100; + cfg->redis_replica_timeout = 100; + cfg->redis_command_timeout = 0; + cfg->redis_replica_command_timeout = 0; + cfg->redis_connect_timeout = 0; + cfg->redis_replica_connect_timeout = 0; + cfg->redis_server_port = 6379; + cfg->redis_replica_server_port = 6379; + cfg->redis_expire_records = 0; + cfg->redis_logical_db = 0; + cfg->redis_replica_logical_db = 0; +#endif /* USE_REDIS */ +#endif /* USE_CACHEDB */ +#ifdef USE_IPSET + cfg->ipset_name_v4 = NULL; + cfg->ipset_name_v6 = NULL; +#endif + cfg->ede = 0; + cfg->ede_serve_expired = 0; + cfg->dns_error_reporting = 0; + cfg->iter_scrub_ns = 20; + cfg->iter_scrub_cname = 11; ++ cfg->iter_scrub_promiscuous = 1; + cfg->max_global_quota = 200; + return cfg; +error_exit: + config_delete(cfg); + return NULL; +} + +struct config_file* config_create_forlib(void) +{ + struct config_file* cfg = config_create(); + if(!cfg) return NULL; + /* modifications for library use, less verbose, less memory */ + free(cfg->chrootdir); + cfg->chrootdir = NULL; + cfg->verbosity = 0; + cfg->outgoing_num_ports = 16; /* in library use, this is 'reasonable' + and probably within the ulimit(maxfds) of the user */ + cfg->outgoing_num_tcp = 2; + cfg->msg_cache_size = 1024*1024; + cfg->msg_cache_slabs = 1; + cfg->rrset_cache_size = 1024*1024; + cfg->rrset_cache_slabs = 1; + cfg->infra_cache_slabs = 1; + cfg->use_syslog = 0; + cfg->key_cache_size = 1024*1024; + cfg->key_cache_slabs = 1; + cfg->neg_cache_size = 100 * 1024; + cfg->donotquery_localhost = 0; /* allow, so that you can ask a + forward nameserver running on localhost */ + cfg->val_log_level = 2; /* to fill why_bogus with */ + cfg->val_log_squelch = 1; + cfg->minimal_responses = 0; + cfg->harden_short_bufsize = 1; + /* Need to explicitly define the slabs from their 0 default value */ + cfg->ip_ratelimit_slabs = 1; + cfg->ratelimit_slabs = 1; + cfg->dnscrypt_shared_secret_cache_slabs = 1; + cfg->dnscrypt_nonce_cache_slabs = 1; + return cfg; +} + +/** check that the value passed is >= 0 */ +#define IS_NUMBER_OR_ZERO \ + if(atoi(val) == 0 && strcmp(val, "0") != 0) return 0 +/** check that the value passed is > 0 */ +#define IS_NONZERO_NUMBER \ + if(atoi(val) == 0) return 0 +/** check that the value passed is not 0 and a power of 2 */ +#define IS_POW2_NUMBER \ + if(atoi(val) == 0 || !is_pow2((size_t)atoi(val))) return 0 +/** check that the value passed is yes or no */ +#define IS_YES_OR_NO \ + if(strcmp(val, "yes") != 0 && strcmp(val, "no") != 0) return 0 +/** put integer_or_zero into variable */ +#define S_NUMBER_OR_ZERO(str, var) if(strcmp(opt, str) == 0) \ + { IS_NUMBER_OR_ZERO; cfg->var = atoi(val); } +/** put integer_nonzero into variable */ +#define S_NUMBER_NONZERO(str, var) if(strcmp(opt, str) == 0) \ + { IS_NONZERO_NUMBER; cfg->var = atoi(val); } +/** put integer_or_zero into unsigned */ +#define S_UNSIGNED_OR_ZERO(str, var) if(strcmp(opt, str) == 0) \ + { IS_NUMBER_OR_ZERO; cfg->var = (unsigned)atoi(val); } +/** put integer_or_zero into size_t */ +#define S_SIZET_OR_ZERO(str, var) if(strcmp(opt, str) == 0) \ + { IS_NUMBER_OR_ZERO; cfg->var = (size_t)atoi(val); } +/** put integer_nonzero into size_t */ +#define S_SIZET_NONZERO(str, var) if(strcmp(opt, str) == 0) \ + { IS_NONZERO_NUMBER; cfg->var = (size_t)atoi(val); } +/** put yesno into variable */ +#define S_YNO(str, var) if(strcmp(opt, str) == 0) \ + { IS_YES_OR_NO; cfg->var = (strcmp(val, "yes") == 0); } +/** put memsize into variable */ +#define S_MEMSIZE(str, var) if(strcmp(opt, str)==0) \ + { return cfg_parse_memsize(val, &cfg->var); } +/** put pow2 number into variable */ +#define S_POW2(str, var) if(strcmp(opt, str)==0) \ + { IS_POW2_NUMBER; cfg->var = (size_t)atoi(val); } +/** put string into variable */ +#define S_STR(str, var) if(strcmp(opt, str)==0) \ + { free(cfg->var); return (cfg->var = strdup(val)) != NULL; } +/** put string into strlist */ +#define S_STRLIST(str, var) if(strcmp(opt, str)==0) \ + { return cfg_strlist_insert(&cfg->var, strdup(val)); } +/** put string into strlist if not present yet*/ +#define S_STRLIST_UNIQ(str, var) if(strcmp(opt, str)==0) \ + { if(cfg_strlist_find(cfg->var, val)) { return 0;} \ + return cfg_strlist_insert(&cfg->var, strdup(val)); } +/** append string to strlist */ +#define S_STRLIST_APPEND(str, var) if(strcmp(opt, str)==0) \ + { return cfg_strlist_append(&cfg->var, strdup(val)); } + +/** Set PROBE_MAXRTO based on current RTT_MAX_TIMEOUT + * (USEFUL_SERVER_TOP_TIMEOUT) configuration. */ +static int +probe_maxrto(int useful_server_top_timeout) { + return + PROBE_MAXRTO > useful_server_top_timeout + ?useful_server_top_timeout + :PROBE_MAXRTO_DEFAULT; +} + +/** Apply the relevant changes that rely upon RTT_MAX_TIMEOUT */ +int config_apply_max_rtt(int max_rtt) +{ + USEFUL_SERVER_TOP_TIMEOUT = max_rtt; + BLACKLIST_PENALTY = max_rtt*4; + PROBE_MAXRTO = probe_maxrto(max_rtt); + return max_rtt; +} + +int config_set_option(struct config_file* cfg, const char* opt, + const char* val) +{ + char buf[64]; + if(!opt) return 0; + if(opt[strlen(opt)-1] != ':' && strlen(opt)+2stat_interval = 0; + else if(atoi(val) == 0) + return 0; + else cfg->stat_interval = atoi(val); + } else if(strcmp(opt, "num-threads:") == 0) { + /* not supported, library must have 1 thread in bgworker */ + return 0; + } else if(strcmp(opt, "outgoing-port-permit:") == 0) { + return cfg_mark_ports(val, 1, + cfg->outgoing_avail_ports, 65536); + } else if(strcmp(opt, "outgoing-port-avoid:") == 0) { + return cfg_mark_ports(val, 0, + cfg->outgoing_avail_ports, 65536); + } else if(strcmp(opt, "local-zone:") == 0) { + return cfg_parse_local_zone(cfg, val); + } else if(strcmp(opt, "val-override-date:") == 0) { + if(strcmp(val, "") == 0 || strcmp(val, "0") == 0) { + cfg->val_date_override = 0; + } else if(strlen(val) == 14) { + cfg->val_date_override = cfg_convert_timeval(val); + return cfg->val_date_override != 0; + } else { + if(atoi(val) == 0) return 0; + cfg->val_date_override = (uint32_t)atoi(val); + } + } else if(strcmp(opt, "local-data-ptr:") == 0) { + char* ptr = cfg_ptr_reverse((char*)opt); + return cfg_strlist_insert(&cfg->local_data, ptr); + } else if(strcmp(opt, "logfile:") == 0) { + cfg->use_syslog = 0; + free(cfg->logfile); + return (cfg->logfile = strdup(val)) != NULL; + } + else if(strcmp(opt, "log-time-ascii:") == 0) + { IS_YES_OR_NO; cfg->log_time_ascii = (strcmp(val, "yes") == 0); + log_set_time_asc(cfg->log_time_ascii); } + else if(strcmp(opt, "log-time-iso:") == 0) + { IS_YES_OR_NO; cfg->log_time_iso = (strcmp(val, "yes") == 0); + log_set_time_iso(cfg->log_time_iso); } + else S_SIZET_NONZERO("max-udp-size:", max_udp_size) + else S_YNO("use-syslog:", use_syslog) + else S_STR("log-identity:", log_identity) + else S_YNO("extended-statistics:", stat_extended) + else S_YNO("statistics-inhibit-zero:", stat_inhibit_zero) + else S_YNO("statistics-cumulative:", stat_cumulative) + else S_YNO("shm-enable:", shm_enable) + else S_NUMBER_OR_ZERO("shm-key:", shm_key) + else S_YNO("do-ip4:", do_ip4) + else S_YNO("do-ip6:", do_ip6) + else S_YNO("do-udp:", do_udp) + else S_YNO("do-tcp:", do_tcp) + else S_YNO("prefer-ip4:", prefer_ip4) + else S_YNO("prefer-ip6:", prefer_ip6) + else S_YNO("tcp-upstream:", tcp_upstream) + else S_YNO("udp-upstream-without-downstream:", + udp_upstream_without_downstream) + else S_NUMBER_NONZERO("tcp-mss:", tcp_mss) + else S_NUMBER_NONZERO("outgoing-tcp-mss:", outgoing_tcp_mss) + else S_NUMBER_NONZERO("tcp-auth-query-timeout:", tcp_auth_query_timeout) + else S_NUMBER_NONZERO("tcp-idle-timeout:", tcp_idle_timeout) + else S_NUMBER_NONZERO("max-reuse-tcp-queries:", max_reuse_tcp_queries) + else S_NUMBER_NONZERO("tcp-reuse-timeout:", tcp_reuse_timeout) + else S_YNO("edns-tcp-keepalive:", do_tcp_keepalive) + else S_NUMBER_NONZERO("edns-tcp-keepalive-timeout:", tcp_keepalive_timeout) + else S_NUMBER_OR_ZERO("sock-queue-timeout:", sock_queue_timeout) + else S_YNO("ssl-upstream:", ssl_upstream) + else S_YNO("tls-upstream:", ssl_upstream) + else S_STR("ssl-service-key:", ssl_service_key) + else S_STR("tls-service-key:", ssl_service_key) + else S_STR("ssl-service-pem:", ssl_service_pem) + else S_STR("tls-service-pem:", ssl_service_pem) + else S_NUMBER_NONZERO("ssl-port:", ssl_port) + else S_NUMBER_NONZERO("tls-port:", ssl_port) + else S_STR("ssl-cert-bundle:", tls_cert_bundle) + else S_STR("tls-cert-bundle:", tls_cert_bundle) + else S_YNO("tls-win-cert:", tls_win_cert) + else S_YNO("tls-system-cert:", tls_win_cert) + else S_STRLIST("additional-ssl-port:", tls_additional_port) + else S_STRLIST("additional-tls-port:", tls_additional_port) + else S_STRLIST("tls-additional-ports:", tls_additional_port) + else S_STRLIST("tls-additional-port:", tls_additional_port) + else S_STRLIST_APPEND("tls-session-ticket-keys:", tls_session_ticket_keys) + else S_STR("tls-ciphers:", tls_ciphers) + else S_STR("tls-ciphersuites:", tls_ciphersuites) + else S_YNO("tls-use-sni:", tls_use_sni) + else S_NUMBER_NONZERO("https-port:", https_port) + else S_STR("http-endpoint:", http_endpoint) + else S_NUMBER_NONZERO("http-max-streams:", http_max_streams) + else S_MEMSIZE("http-query-buffer-size:", http_query_buffer_size) + else S_MEMSIZE("http-response-buffer-size:", http_response_buffer_size) + else S_YNO("http-nodelay:", http_nodelay) + else S_YNO("http-notls-downstream:", http_notls_downstream) + else S_NUMBER_NONZERO("quic-port:", quic_port) + else S_MEMSIZE("quic-size:", quic_size) + else S_YNO("interface-automatic:", if_automatic) + else S_STR("interface-automatic-ports:", if_automatic_ports) + else S_YNO("use-systemd:", use_systemd) + else S_YNO("do-daemonize:", do_daemonize) + else S_NUMBER_NONZERO("port:", port) + else S_NUMBER_NONZERO("outgoing-range:", outgoing_num_ports) + else S_SIZET_OR_ZERO("outgoing-num-tcp:", outgoing_num_tcp) + else S_SIZET_OR_ZERO("incoming-num-tcp:", incoming_num_tcp) + else S_MEMSIZE("stream-wait-size:", stream_wait_size) + else S_SIZET_NONZERO("edns-buffer-size:", edns_buffer_size) + else S_SIZET_NONZERO("msg-buffer-size:", msg_buffer_size) + else S_MEMSIZE("msg-cache-size:", msg_cache_size) + else S_POW2("msg-cache-slabs:", msg_cache_slabs) + else S_SIZET_NONZERO("num-queries-per-thread:",num_queries_per_thread) + else S_SIZET_OR_ZERO("jostle-timeout:", jostle_time) + else S_MEMSIZE("so-rcvbuf:", so_rcvbuf) + else S_MEMSIZE("so-sndbuf:", so_sndbuf) + else S_YNO("so-reuseport:", so_reuseport) + else S_YNO("ip-transparent:", ip_transparent) + else S_YNO("ip-freebind:", ip_freebind) + else S_NUMBER_OR_ZERO("ip-dscp:", ip_dscp) + else S_MEMSIZE("rrset-cache-size:", rrset_cache_size) + else S_POW2("rrset-cache-slabs:", rrset_cache_slabs) + else S_YNO("prefetch:", prefetch) + else S_YNO("prefetch-key:", prefetch_key) + else S_YNO("deny-any:", deny_any) + else if(strcmp(opt, "cache-max-ttl:") == 0) + { IS_NUMBER_OR_ZERO; cfg->max_ttl = atoi(val); MAX_TTL=(time_t)cfg->max_ttl;} + else if(strcmp(opt, "cache-max-negative-ttl:") == 0) + { IS_NUMBER_OR_ZERO; cfg->max_negative_ttl = atoi(val); MAX_NEG_TTL=(time_t)cfg->max_negative_ttl;} + else if(strcmp(opt, "cache-min-negative-ttl:") == 0) + { IS_NUMBER_OR_ZERO; cfg->min_negative_ttl = atoi(val); MIN_NEG_TTL=(time_t)cfg->min_negative_ttl;} + else if(strcmp(opt, "cache-min-ttl:") == 0) + { IS_NUMBER_OR_ZERO; cfg->min_ttl = atoi(val); MIN_TTL=(time_t)cfg->min_ttl;} + else if(strcmp(opt, "infra-cache-min-rtt:") == 0) { + IS_NUMBER_OR_ZERO; cfg->infra_cache_min_rtt = atoi(val); + RTT_MIN_TIMEOUT=cfg->infra_cache_min_rtt; + } + else if(strcmp(opt, "infra-cache-max-rtt:") == 0) { + IS_NUMBER_OR_ZERO; cfg->infra_cache_max_rtt = atoi(val); + RTT_MAX_TIMEOUT=config_apply_max_rtt(cfg->infra_cache_max_rtt); + } + else S_YNO("infra-keep-probing:", infra_keep_probing) + else S_NUMBER_OR_ZERO("infra-host-ttl:", host_ttl) + else S_POW2("infra-cache-slabs:", infra_cache_slabs) + else S_SIZET_NONZERO("infra-cache-numhosts:", infra_cache_numhosts) + else S_NUMBER_OR_ZERO("delay-close:", delay_close) + else S_YNO("udp-connect:", udp_connect) + else S_STR("chroot:", chrootdir) + else S_STR("username:", username) + else S_STR("directory:", directory) + else S_STR("pidfile:", pidfile) + else S_YNO("hide-identity:", hide_identity) + else S_YNO("hide-version:", hide_version) + else S_YNO("hide-trustanchor:", hide_trustanchor) + else S_YNO("hide-http-user-agent:", hide_http_user_agent) + else S_STR("identity:", identity) + else S_STR("version:", version) + else S_STR("http-user-agent:", http_user_agent) + else if(strcmp(opt, "nsid:") == 0) { + free(cfg->nsid_cfg_str); + if (!(cfg->nsid_cfg_str = strdup(val))) + return 0; + /* Empty string is just validly unsetting nsid */ + if (*val == 0) { + free(cfg->nsid); + cfg->nsid = NULL; + cfg->nsid_len = 0; + return 1; + } + cfg->nsid = cfg_parse_nsid(val, &cfg->nsid_len); + return cfg->nsid != NULL; + } + else S_STRLIST("root-hints:", root_hints) + else S_STR("target-fetch-policy:", target_fetch_policy) + else S_YNO("harden-glue:", harden_glue) + else S_YNO("harden-unverified-glue:", harden_unverified_glue) + else S_YNO("harden-short-bufsize:", harden_short_bufsize) + else S_YNO("harden-large-queries:", harden_large_queries) + else S_YNO("harden-dnssec-stripped:", harden_dnssec_stripped) + else S_YNO("harden-below-nxdomain:", harden_below_nxdomain) + else S_YNO("harden-referral-path:", harden_referral_path) + else S_YNO("harden-algo-downgrade:", harden_algo_downgrade) + else S_YNO("harden-unknown-additional:", harden_unknown_additional) + else S_YNO("use-caps-for-id:", use_caps_bits_for_id) + else S_STRLIST("caps-whitelist:", caps_whitelist) + else S_SIZET_OR_ZERO("unwanted-reply-threshold:", unwanted_threshold) + else S_STRLIST("private-address:", private_address) + else S_STRLIST("private-domain:", private_domain) + else S_YNO("do-not-query-localhost:", donotquery_localhost) + else S_STRLIST("do-not-query-address:", donotqueryaddrs) + else S_STRLIST("auto-trust-anchor-file:", auto_trust_anchor_file_list) + else S_STRLIST("trust-anchor-file:", trust_anchor_file_list) + else S_STRLIST("trust-anchor:", trust_anchor_list) + else S_STRLIST("trusted-keys-file:", trusted_keys_file_list) + else S_YNO("trust-anchor-signaling:", trust_anchor_signaling) + else S_YNO("root-key-sentinel:", root_key_sentinel) + else S_STRLIST("domain-insecure:", domain_insecure) + else S_NUMBER_OR_ZERO("val-bogus-ttl:", bogus_ttl) + else S_YNO("val-clean-additional:", val_clean_additional) + else S_NUMBER_OR_ZERO("val-log-level:", val_log_level) + else S_YNO("val-log-squelch:", val_log_squelch) + else S_YNO("log-queries:", log_queries) + else S_YNO("log-replies:", log_replies) + else S_YNO("log-tag-queryreply:", log_tag_queryreply) + else S_YNO("log-local-actions:", log_local_actions) + else S_YNO("log-servfail:", log_servfail) + else S_YNO("log-destaddr:", log_destaddr) + else S_YNO("val-permissive-mode:", val_permissive_mode) + else S_YNO("aggressive-nsec:", aggressive_nsec) + else S_YNO("ignore-cd-flag:", ignore_cd) + else S_YNO("disable-edns-do:", disable_edns_do) + else if(strcmp(opt, "serve-expired:") == 0) + { IS_YES_OR_NO; cfg->serve_expired = (strcmp(val, "yes") == 0); + SERVE_EXPIRED = cfg->serve_expired; } + else if(strcmp(opt, "serve-expired-ttl:") == 0) + { IS_NUMBER_OR_ZERO; cfg->serve_expired_ttl = atoi(val); SERVE_EXPIRED_TTL=(time_t)cfg->serve_expired_ttl;} + else if(strcmp(opt, "serve-expired-ttl-reset:") == 0) + { IS_YES_OR_NO; cfg->serve_expired_ttl_reset = (strcmp(val, "yes") == 0); + SERVE_EXPIRED_TTL_RESET = cfg->serve_expired_ttl_reset; } + else if(strcmp(opt, "serve-expired-reply-ttl:") == 0) + { IS_NUMBER_OR_ZERO; cfg->serve_expired_reply_ttl = atoi(val); SERVE_EXPIRED_REPLY_TTL=(time_t)cfg->serve_expired_reply_ttl;} + else S_NUMBER_OR_ZERO("serve-expired-client-timeout:", serve_expired_client_timeout) + else S_YNO("ede:", ede) + else S_YNO("ede-serve-expired:", ede_serve_expired) + else S_YNO("dns-error-reporting:", dns_error_reporting) + else S_NUMBER_OR_ZERO("iter-scrub-ns:", iter_scrub_ns) + else S_NUMBER_OR_ZERO("iter-scrub-cname:", iter_scrub_cname) ++ else S_YNO("iter-scrub-promiscuous:", iter_scrub_promiscuous) + else S_NUMBER_OR_ZERO("max-global-quota:", max_global_quota) + else S_YNO("serve-original-ttl:", serve_original_ttl) + else S_STR("val-nsec3-keysize-iterations:", val_nsec3_key_iterations) + else S_YNO("zonemd-permissive-mode:", zonemd_permissive_mode) + else S_UNSIGNED_OR_ZERO("add-holddown:", add_holddown) + else S_UNSIGNED_OR_ZERO("del-holddown:", del_holddown) + else S_UNSIGNED_OR_ZERO("keep-missing:", keep_missing) + else if(strcmp(opt, "permit-small-holddown:") == 0) + { IS_YES_OR_NO; cfg->permit_small_holddown = (strcmp(val, "yes") == 0); + autr_permit_small_holddown = cfg->permit_small_holddown; } + else S_MEMSIZE("key-cache-size:", key_cache_size) + else S_POW2("key-cache-slabs:", key_cache_slabs) + else S_MEMSIZE("neg-cache-size:", neg_cache_size) + else S_YNO("minimal-responses:", minimal_responses) + else S_YNO("rrset-roundrobin:", rrset_roundrobin) + else S_NUMBER_OR_ZERO("unknown-server-time-limit:", unknown_server_time_limit) + else S_NUMBER_OR_ZERO("discard-timeout:", discard_timeout) + else S_NUMBER_OR_ZERO("wait-limit:", wait_limit) + else S_NUMBER_OR_ZERO("wait-limit-cookie:", wait_limit_cookie) + else S_STRLIST("local-data:", local_data) + else S_YNO("unblock-lan-zones:", unblock_lan_zones) + else S_YNO("insecure-lan-zones:", insecure_lan_zones) + else S_YNO("control-enable:", remote_control_enable) + else S_STRLIST_APPEND("control-interface:", control_ifs) + else S_NUMBER_NONZERO("control-port:", control_port) + else S_STR("server-key-file:", server_key_file) + else S_STR("server-cert-file:", server_cert_file) + else S_STR("control-key-file:", control_key_file) + else S_STR("control-cert-file:", control_cert_file) + else S_STR("module-config:", module_conf) + else S_STRLIST("python-script:", python_script) + else S_STRLIST("dynlib-file:", dynlib_file) + else S_YNO("disable-dnssec-lame-check:", disable_dnssec_lame_check) +#ifdef CLIENT_SUBNET + /* Can't set max subnet prefix here, since that value is used when + * generating the address tree. */ + /* No client-subnet-always-forward here, module registration depends on + * this option. */ +#endif +#ifdef USE_DNSTAP + else S_YNO("dnstap-enable:", dnstap) + else S_YNO("dnstap-bidirectional:", dnstap_bidirectional) + else S_STR("dnstap-socket-path:", dnstap_socket_path) + else S_STR("dnstap-ip:", dnstap_ip) + else S_YNO("dnstap-tls:", dnstap_tls) + else S_STR("dnstap-tls-server-name:", dnstap_tls_server_name) + else S_STR("dnstap-tls-cert-bundle:", dnstap_tls_cert_bundle) *** 3783 LINES SKIPPED *** From nobody Thu Oct 23 19:59:46 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4csxhM1DrLz6DNbb; Thu, 23 Oct 2025 19:59:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4csxhM0fqdz4Fkh; Thu, 23 Oct 2025 19:59:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761249587; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zcqtAZVIM0ZGecV459YWq2BGhRvlAfVWroLrFpITGU8=; b=jOj8aUajKOKQqWqTYnH0nbqKgKFif3pqYe73wfq+9Ey++rDwBaohozeBIVeWH+O6yImwCE SwH4Upqs75Wb73Y14kb3dbJJRGsMMVoKSsFC+QKI6vvz9YTrWmpaJM/j1MjINJgJ0ViaXE O/XWSA7VBpKGyy+FURUeWISg4AMi2nk+cW7yn2Oa38Ec0IXiOwJvMTtEA9alyPjLSPksWy 0TxfZl/wijVI2QMUTZO7b7iArCBWKiIFZAdXH/f9CcNqu+4Jy0QgI1WU/WD9rKEmsh+mm4 hP+vna4QMaCl1couomr/u3L930zC2Sy13mX4hQbQ1ikzSolJOjwW/pW7DojWJA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761249587; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zcqtAZVIM0ZGecV459YWq2BGhRvlAfVWroLrFpITGU8=; b=GRhpMZR3J1GGJH64eXJIEC8IN/6WJttkYZD2glwpmdzmKUrssEUOh+zPcw73BUD3Cv+KMv fRey2ko08w3YRuAbkT2Ft5Pt+WT0xNW+1V/ePI68vwl03JVCIWf4dMf5dvnOOzgxavTuU0 Tvl3Q4V5pl2/VBGvEMsKTpjy0GfroNYOqCQJIAN1igeCLAR4pNAjXIQ8/S6TgDjgSNevjF WnSxH1ct1MKnlQliaXFFX71TOWVg6s1yosPGGo+FN1H58Vd3134s/fJjr2ZGLPy3HX0rcN rk1BwqPNb2IT8amW0hDSOVwxQkX//jPhsAaXtntIUh0eXWZDqQFAoGJQNhfEwA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761249587; a=rsa-sha256; cv=none; b=VxiyPqWVYhmViP61ZejjlBHvQzHYKDAsfS1+wlqrLX4PgbUwYOtOF+5zgVb9/dByLhGOUH LeU/8mKaUpeszoaWkyCTWpnAQE0MvXZtwehxaNNW+tPKFjlc9F6ZuDHygMohJ4muoCPZ2z cJGau/N96VzI7xOcBaBq7UqiQZjUAofvv5sHoFyUqYoQsxJQkIOle34utK73lPiXyD+bBN KtrVYPScgqXfjVZHXDKFUIBk8xv9Vidk4x67YJtBiw4MUgNdD0pRKf/xtqVhzr0S3hLlq9 PtLMtTgmLdAVIWl2AWj9OokpwFcCBxvkOHprxn3g9HR9DhX8Gi05QqRSWTl/HA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4csxhL6mYXzD9N; Thu, 23 Oct 2025 19:59: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 59NJxkA3012061; Thu, 23 Oct 2025 19:59:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59NJxkm2012058; Thu, 23 Oct 2025 19:59:46 GMT (envelope-from git) Date: Thu, 23 Oct 2025 19:59:46 GMT Message-Id: <202510231959.59NJxkm2012058@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: b307799b5141 - main - closefrom_test: Fix the first test List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b307799b5141331effbb93d7f87dd00e9b991982 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=b307799b5141331effbb93d7f87dd00e9b991982 commit b307799b5141331effbb93d7f87dd00e9b991982 Author: John Baldwin AuthorDate: 2025-10-23 19:59:32 +0000 Commit: John Baldwin CommitDate: 2025-10-23 19:59:32 +0000 closefrom_test: Fix the first test The first test is supposed to close the new fd, but was instead not closing anything. Reviewed by: ngie, markj Fixes: 3cedbec3ee08 ("Integrate tools/regression/fifo into ...") Differential Revision: https://reviews.freebsd.org/D52799 --- tests/sys/file/closefrom_test.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/sys/file/closefrom_test.c b/tests/sys/file/closefrom_test.c index 7dccf858c772..212d048d7566 100644 --- a/tests/sys/file/closefrom_test.c +++ b/tests/sys/file/closefrom_test.c @@ -148,7 +148,7 @@ main(void) /* We'd better start up with fd's 0, 1, and 2 open. */ start = devnull(); - if (start == -1) + if (start < 3) fail("open", "bad descriptor %d", start); ok("open"); @@ -159,9 +159,9 @@ main(void) ok("highest_fd"); /* Try to use closefrom() for just closing fd 3. */ - closefrom(start + 1); + closefrom(start); fd = highest_fd(); - if (fd != start) + if (fd != start - 1) fail("closefrom", "highest fd %d", fd); ok("closefrom"); @@ -169,7 +169,7 @@ main(void) for (i = 0; i < 16; i++) (void)devnull(); fd = highest_fd(); - if (fd != start + 16) + if (fd != start + 15) fail("open 16", "highest fd %d", fd); ok("open 16"); From nobody Thu Oct 23 21:28:23 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cszfd36sMz6DZRv; Thu, 23 Oct 2025 21:28:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cszfc2lnyz4PSJ; Thu, 23 Oct 2025 21:28:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761254905; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M4xSDaz8MT11soSFBi4UnNVb2lQKPwCOReOaZfSpCek=; b=gI9aDfcbYzO/wArSpmy5uKsomUwAob0PTgJAzO4BnTPIVFfz9a6qevemRoZO9R5LRsOm+N ysMUx2hLTP6nEiM6hoog+a9AOKfL4yos6CQ6pY9o5idBK8okC7RkRvU0kEWDITLTsYrIE4 R6srRw8YBd/Ts1Nk5/DAEPjC4OmpW6z39mj1redNUwXSRm2nG7ewO79FZObUuBLYGjLuXY X83nrqCWNQY5iTjmOM8G+PnTVo9kOXVq4Fizbj9erNl4QZQirEK8Q3gd+v3gj2OILzu8k7 jHmv3Il1GfcopEJXQSA8vr5IkudcC6rgs506yIRbZLVpZ5QuOU72u6+HZdFnYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761254904; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M4xSDaz8MT11soSFBi4UnNVb2lQKPwCOReOaZfSpCek=; b=AmFa1oyl+h+1M1sLNprxhdpTmvCBs6/187en5B3cLxus7loKKO1595MoOcFwkLKT2KrpJp lTuR0cmTY2+U9YaPoYiGtaKR3M/J8/77J3P8JQiaqwryEVX+zj54XU2WcrqL6oPgiShDpO uaVHVgNF0pM2qVlIdqKcmiE6sU69/155zW/B8nV72BUGkxQMfMG1Az4jdWeQLkTZgWLFSB S02+Cp9bTOfeFrEu4d5+QInwjjT8/QUqDBmYLTS2srV1rzjILyyA4liyFd82SCAoeGe+hm gbZ8LbmhkHeDmn/8u2ZQlf+DTRs+urHpTEuDykfzgpXUEwCX9YkHLFjsauiHiQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761254904; a=rsa-sha256; cv=none; b=hIdl4Q6RF9LjOJUYy+ewUQoVMu9W8VC4GhbNn6shbmhOQ1AetJ8em02agrk5CT6GDK8wXL tox95TCtK4H0X1oWZsUZWRZ+VtuAvPnzDx5r/wmKfNRd4TW3zaKqDUWBy2YZTa4n397VQD dint1ThPIARcPrZP3GDT8sDV0eawgTjDtg2SMcRFVWrOj3ov5454mLPykrl4eTxyE5XQpz SbPxc27jO27fXsIIZTe7BUKW+tcq4Gs4wV0U6cuJiKwJDOg2SWtL38aeU1CJjQQmJE/vqd aYJjhl730jY3Tu6t/A/39s9xz7b6UwKMJVd5ECjejNzVGpYDkK7sIMY93/ntoA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cszfc26WJzYKS; Thu, 23 Oct 2025 21:28:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59NLSOgM081473; Thu, 23 Oct 2025 21:28:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59NLSNu9081469; Thu, 23 Oct 2025 21:28:23 GMT (envelope-from git) Date: Thu, 23 Oct 2025 21:28:23 GMT Message-Id: <202510232128.59NLSNu9081469@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 6b627f88584c - main - iwlwifi: update Intel's mvm/mld drivers List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6b627f88584ce13118e0a24951b503c0b1f2d5a7 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=6b627f88584ce13118e0a24951b503c0b1f2d5a7 commit 6b627f88584ce13118e0a24951b503c0b1f2d5a7 Merge: b307799b5141 69caa1cf3ce5 Author: Bjoern A. Zeeb AuthorDate: 2025-10-17 17:27:49 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-10-23 21:26:00 +0000 iwlwifi: update Intel's mvm/mld drivers This version is based on git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git e5f0a698b34ed76002dc5cff3804a61c80233a7a ( tag: v6.17 ). Some of the changes we reported upstream got incorporated in this (or the v6.16) release. This also includes a change from iwlwifi-next.git::next for missing symbols iwl_mvm_v3_rate_from_fw() and iwl_mvm_v3_rate_to_fw() were originally comitted to mvm/rs.[ch] which we do not have. That left us with unresolved symbols. For the never comitted v6.16 driver update I had started to piece these together but they have been migrated out to utils.c so take them from there until the next release hopefully ships this change. Obtained from: git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next.git branch next, 1b49af228594452206d5c50a33b6a341428edb63 MFC after: 3 days sys/contrib/dev/iwlwifi/cfg/22000.c | 397 +-- sys/contrib/dev/iwlwifi/cfg/7000.c | 173 +- sys/contrib/dev/iwlwifi/cfg/8000.c | 92 +- sys/contrib/dev/iwlwifi/cfg/9000.c | 168 +- sys/contrib/dev/iwlwifi/cfg/ax210.c | 297 +-- sys/contrib/dev/iwlwifi/cfg/bz.c | 198 +- sys/contrib/dev/iwlwifi/cfg/dr.c | 93 + sys/contrib/dev/iwlwifi/cfg/rf-fm.c | 51 + sys/contrib/dev/iwlwifi/cfg/rf-gf.c | 73 + sys/contrib/dev/iwlwifi/cfg/rf-hr.c | 89 + sys/contrib/dev/iwlwifi/cfg/rf-jf.c | 111 + sys/contrib/dev/iwlwifi/cfg/rf-pe.c | 16 + sys/contrib/dev/iwlwifi/cfg/rf-wh.c | 15 + sys/contrib/dev/iwlwifi/cfg/sc.c | 201 +- sys/contrib/dev/iwlwifi/fw/acpi.c | 253 +- sys/contrib/dev/iwlwifi/fw/acpi.h | 60 +- sys/contrib/dev/iwlwifi/fw/api/alive.h | 29 +- sys/contrib/dev/iwlwifi/fw/api/binding.h | 2 - sys/contrib/dev/iwlwifi/fw/api/coex.h | 29 +- sys/contrib/dev/iwlwifi/fw/api/commands.h | 31 +- sys/contrib/dev/iwlwifi/fw/api/context.h | 9 +- sys/contrib/dev/iwlwifi/fw/api/d3.h | 196 +- sys/contrib/dev/iwlwifi/fw/api/datapath.h | 11 +- sys/contrib/dev/iwlwifi/fw/api/dbg-tlv.h | 13 +- sys/contrib/dev/iwlwifi/fw/api/debug.h | 48 +- sys/contrib/dev/iwlwifi/fw/api/dhc.h | 230 ++ sys/contrib/dev/iwlwifi/fw/api/location.h | 179 +- sys/contrib/dev/iwlwifi/fw/api/mac-cfg.h | 394 ++- sys/contrib/dev/iwlwifi/fw/api/mac.h | 14 +- sys/contrib/dev/iwlwifi/fw/api/nvm-reg.h | 62 +- sys/contrib/dev/iwlwifi/fw/api/offload.h | 12 +- sys/contrib/dev/iwlwifi/fw/api/phy-ctxt.h | 9 +- sys/contrib/dev/iwlwifi/fw/api/phy.h | 25 +- sys/contrib/dev/iwlwifi/fw/api/power.h | 171 +- sys/contrib/dev/iwlwifi/fw/api/rs.h | 135 +- sys/contrib/dev/iwlwifi/fw/api/rx.h | 54 +- sys/contrib/dev/iwlwifi/fw/api/scan.h | 46 +- sys/contrib/dev/iwlwifi/fw/api/sta.h | 1 + sys/contrib/dev/iwlwifi/fw/api/stats.h | 17 +- sys/contrib/dev/iwlwifi/fw/api/tdls.h | 12 +- sys/contrib/dev/iwlwifi/fw/api/time-event.h | 60 +- sys/contrib/dev/iwlwifi/fw/api/tx.h | 105 +- sys/contrib/dev/iwlwifi/fw/dbg.c | 350 ++- sys/contrib/dev/iwlwifi/fw/dbg.h | 20 +- sys/contrib/dev/iwlwifi/fw/debugfs.c | 50 +- sys/contrib/dev/iwlwifi/fw/dhc-utils.h | 75 + sys/contrib/dev/iwlwifi/fw/dump.c | 44 +- sys/contrib/dev/iwlwifi/fw/error-dump.h | 9 +- sys/contrib/dev/iwlwifi/fw/file.h | 45 +- sys/contrib/dev/iwlwifi/fw/img.c | 2 + sys/contrib/dev/iwlwifi/fw/img.h | 12 +- sys/contrib/dev/iwlwifi/fw/init.c | 24 +- sys/contrib/dev/iwlwifi/fw/paging.c | 6 +- sys/contrib/dev/iwlwifi/fw/pnvm.c | 79 +- sys/contrib/dev/iwlwifi/fw/pnvm.h | 5 +- sys/contrib/dev/iwlwifi/fw/regulatory.c | 200 +- sys/contrib/dev/iwlwifi/fw/regulatory.h | 90 +- sys/contrib/dev/iwlwifi/fw/rs.c | 137 +- sys/contrib/dev/iwlwifi/fw/runtime.h | 19 +- sys/contrib/dev/iwlwifi/fw/smem.c | 4 +- sys/contrib/dev/iwlwifi/fw/uefi.c | 225 +- sys/contrib/dev/iwlwifi/fw/uefi.h | 93 +- sys/contrib/dev/iwlwifi/iwl-config.h | 508 ++-- sys/contrib/dev/iwlwifi/iwl-csr.h | 48 +- sys/contrib/dev/iwlwifi/iwl-dbg-tlv.c | 20 +- sys/contrib/dev/iwlwifi/iwl-debug.h | 14 +- sys/contrib/dev/iwlwifi/iwl-drv.c | 337 ++- sys/contrib/dev/iwlwifi/iwl-drv.h | 9 +- sys/contrib/dev/iwlwifi/iwl-fh.h | 30 +- sys/contrib/dev/iwlwifi/iwl-io.c | 42 +- sys/contrib/dev/iwlwifi/iwl-io.h | 23 +- sys/contrib/dev/iwlwifi/iwl-nvm-parse.c | 246 +- sys/contrib/dev/iwlwifi/iwl-nvm-parse.h | 16 +- sys/contrib/dev/iwlwifi/iwl-nvm-utils.c | 17 +- sys/contrib/dev/iwlwifi/iwl-op-mode.h | 106 +- sys/contrib/dev/iwlwifi/iwl-prph.h | 15 +- sys/contrib/dev/iwlwifi/iwl-trans.c | 484 +++- sys/contrib/dev/iwlwifi/iwl-trans.h | 346 ++- sys/contrib/dev/iwlwifi/iwl-utils.c | 195 ++ sys/contrib/dev/iwlwifi/iwl-utils.h | 58 + sys/contrib/dev/iwlwifi/mld/Makefile | 12 + sys/contrib/dev/iwlwifi/mld/agg.c | 680 +++++ sys/contrib/dev/iwlwifi/mld/agg.h | 127 + sys/contrib/dev/iwlwifi/mld/ap.c | 363 +++ sys/contrib/dev/iwlwifi/mld/ap.h | 45 + sys/contrib/dev/iwlwifi/mld/coex.c | 40 + sys/contrib/dev/iwlwifi/mld/coex.h | 15 + sys/contrib/dev/iwlwifi/mld/constants.h | 79 + sys/contrib/dev/iwlwifi/mld/d3.c | 1906 ++++++++++++++ sys/contrib/dev/iwlwifi/mld/d3.h | 51 + sys/contrib/dev/iwlwifi/mld/debugfs.c | 1109 ++++++++ sys/contrib/dev/iwlwifi/mld/debugfs.h | 244 ++ sys/contrib/dev/iwlwifi/mld/ftm-initiator.c | 451 ++++ sys/contrib/dev/iwlwifi/mld/ftm-initiator.h | 29 + sys/contrib/dev/iwlwifi/mld/fw.c | 554 ++++ sys/contrib/dev/iwlwifi/mld/hcmd.h | 56 + sys/contrib/dev/iwlwifi/mld/iface.c | 707 ++++++ sys/contrib/dev/iwlwifi/mld/iface.h | 253 ++ sys/contrib/dev/iwlwifi/mld/key.c | 370 +++ sys/contrib/dev/iwlwifi/mld/key.h | 39 + sys/contrib/dev/iwlwifi/mld/led.c | 100 + sys/contrib/dev/iwlwifi/mld/led.h | 29 + sys/contrib/dev/iwlwifi/mld/link.c | 895 +++++++ sys/contrib/dev/iwlwifi/mld/link.h | 129 + sys/contrib/dev/iwlwifi/mld/low_latency.c | 336 +++ sys/contrib/dev/iwlwifi/mld/low_latency.h | 68 + sys/contrib/dev/iwlwifi/mld/mac80211.c | 2672 ++++++++++++++++++++ sys/contrib/dev/iwlwifi/mld/mac80211.h | 13 + sys/contrib/dev/iwlwifi/mld/mcc.c | 285 +++ sys/contrib/dev/iwlwifi/mld/mcc.h | 17 + sys/contrib/dev/iwlwifi/mld/mld.c | 771 ++++++ sys/contrib/dev/iwlwifi/mld/mld.h | 592 +++++ sys/contrib/dev/iwlwifi/mld/mlo.c | 1225 +++++++++ sys/contrib/dev/iwlwifi/mld/mlo.h | 171 ++ sys/contrib/dev/iwlwifi/mld/notif.c | 725 ++++++ sys/contrib/dev/iwlwifi/mld/notif.h | 35 + sys/contrib/dev/iwlwifi/mld/phy.c | 198 ++ sys/contrib/dev/iwlwifi/mld/phy.h | 60 + sys/contrib/dev/iwlwifi/mld/power.c | 391 +++ sys/contrib/dev/iwlwifi/mld/power.h | 33 + sys/contrib/dev/iwlwifi/mld/ptp.c | 321 +++ sys/contrib/dev/iwlwifi/mld/ptp.h | 45 + sys/contrib/dev/iwlwifi/mld/regulatory.c | 369 +++ sys/contrib/dev/iwlwifi/mld/regulatory.h | 23 + sys/contrib/dev/iwlwifi/mld/roc.c | 265 ++ sys/contrib/dev/iwlwifi/mld/roc.h | 20 + sys/contrib/dev/iwlwifi/mld/rx.c | 2137 ++++++++++++++++ sys/contrib/dev/iwlwifi/mld/rx.h | 72 + sys/contrib/dev/iwlwifi/mld/scan.c | 2181 ++++++++++++++++ sys/contrib/dev/iwlwifi/mld/scan.h | 173 ++ sys/contrib/dev/iwlwifi/mld/session-protect.c | 222 ++ sys/contrib/dev/iwlwifi/mld/session-protect.h | 102 + sys/contrib/dev/iwlwifi/mld/sta.c | 1321 ++++++++++ sys/contrib/dev/iwlwifi/mld/sta.h | 273 ++ sys/contrib/dev/iwlwifi/mld/stats.c | 518 ++++ sys/contrib/dev/iwlwifi/mld/stats.h | 22 + sys/contrib/dev/iwlwifi/mld/tests/Makefile | 5 + sys/contrib/dev/iwlwifi/mld/tests/agg.c | 663 +++++ sys/contrib/dev/iwlwifi/mld/tests/hcmd.c | 62 + sys/contrib/dev/iwlwifi/mld/tests/link-selection.c | 339 +++ sys/contrib/dev/iwlwifi/mld/tests/link.c | 110 + sys/contrib/dev/iwlwifi/mld/tests/module.c | 11 + sys/contrib/dev/iwlwifi/mld/tests/rx.c | 353 +++ sys/contrib/dev/iwlwifi/mld/tests/utils.c | 503 ++++ sys/contrib/dev/iwlwifi/mld/tests/utils.h | 140 + sys/contrib/dev/iwlwifi/mld/thermal.c | 467 ++++ sys/contrib/dev/iwlwifi/mld/thermal.h | 36 + sys/contrib/dev/iwlwifi/mld/time_sync.c | 240 ++ sys/contrib/dev/iwlwifi/mld/time_sync.h | 26 + sys/contrib/dev/iwlwifi/mld/tlc.c | 702 +++++ sys/contrib/dev/iwlwifi/mld/tlc.h | 23 + sys/contrib/dev/iwlwifi/mld/tx.c | 1394 ++++++++++ sys/contrib/dev/iwlwifi/mld/tx.h | 77 + sys/contrib/dev/iwlwifi/mvm/binding.c | 7 +- sys/contrib/dev/iwlwifi/mvm/coex.c | 88 +- sys/contrib/dev/iwlwifi/mvm/constants.h | 8 +- sys/contrib/dev/iwlwifi/mvm/d3.c | 761 +++--- sys/contrib/dev/iwlwifi/mvm/debugfs-vif.c | 66 +- sys/contrib/dev/iwlwifi/mvm/debugfs.c | 130 +- sys/contrib/dev/iwlwifi/mvm/ftm-initiator.c | 130 +- sys/contrib/dev/iwlwifi/mvm/ftm-responder.c | 90 +- sys/contrib/dev/iwlwifi/mvm/fw.c | 308 +-- sys/contrib/dev/iwlwifi/mvm/led.c | 4 +- sys/contrib/dev/iwlwifi/mvm/link.c | 106 +- sys/contrib/dev/iwlwifi/mvm/mac-ctxt.c | 259 +- sys/contrib/dev/iwlwifi/mvm/mac80211.c | 483 ++-- sys/contrib/dev/iwlwifi/mvm/mld-key.c | 14 +- sys/contrib/dev/iwlwifi/mvm/mld-mac.c | 55 +- sys/contrib/dev/iwlwifi/mvm/mld-mac80211.c | 233 +- sys/contrib/dev/iwlwifi/mvm/mld-sta.c | 81 +- sys/contrib/dev/iwlwifi/mvm/mvm.h | 225 +- sys/contrib/dev/iwlwifi/mvm/nvm.c | 52 +- sys/contrib/dev/iwlwifi/mvm/offloading.c | 2 +- sys/contrib/dev/iwlwifi/mvm/ops.c | 394 +-- sys/contrib/dev/iwlwifi/mvm/phy-ctxt.c | 8 +- sys/contrib/dev/iwlwifi/mvm/power.c | 10 +- sys/contrib/dev/iwlwifi/mvm/ptp.c | 14 +- sys/contrib/dev/iwlwifi/mvm/quota.c | 43 +- sys/contrib/dev/iwlwifi/mvm/rs-fw.c | 36 +- sys/contrib/dev/iwlwifi/mvm/rx.c | 77 +- sys/contrib/dev/iwlwifi/mvm/rxmq.c | 236 +- sys/contrib/dev/iwlwifi/mvm/scan.c | 192 +- sys/contrib/dev/iwlwifi/mvm/sta.c | 244 +- sys/contrib/dev/iwlwifi/mvm/sta.h | 29 +- sys/contrib/dev/iwlwifi/mvm/tdls.c | 20 +- sys/contrib/dev/iwlwifi/mvm/tests/hcmd.c | 38 + sys/contrib/dev/iwlwifi/mvm/time-event.c | 61 +- sys/contrib/dev/iwlwifi/mvm/time-event.h | 8 +- sys/contrib/dev/iwlwifi/mvm/tt.c | 97 +- sys/contrib/dev/iwlwifi/mvm/tx.c | 406 ++- sys/contrib/dev/iwlwifi/mvm/utils.c | 258 +- .../pcie/{ctxt-info-gen3.c => ctxt-info-v2.c} | 213 +- sys/contrib/dev/iwlwifi/pcie/ctxt-info.c | 29 +- sys/contrib/dev/iwlwifi/pcie/drv.c | 2503 ++++++++---------- .../dev/iwlwifi/pcie/{ => gen1_2}/internal.h | 188 +- sys/contrib/dev/iwlwifi/pcie/{ => gen1_2}/rx.c | 223 +- .../dev/iwlwifi/pcie/{ => gen1_2}/trans-gen2.c | 209 +- sys/contrib/dev/iwlwifi/pcie/{ => gen1_2}/trans.c | 1216 ++++++--- .../dev/iwlwifi/pcie/{ => gen1_2}/tx-gen2.c | 88 +- sys/contrib/dev/iwlwifi/pcie/{ => gen1_2}/tx.c | 291 ++- .../iwl-context-info-v2.h} | 109 +- .../dev/iwlwifi/{ => pcie}/iwl-context-info.h | 44 +- sys/contrib/dev/iwlwifi/pcie/utils.c | 128 + sys/contrib/dev/iwlwifi/pcie/utils.h | 40 + sys/contrib/dev/iwlwifi/tests/Makefile | 2 +- sys/contrib/dev/iwlwifi/tests/devinfo.c | 229 +- sys/modules/iwlwifi/Makefile | 68 +- 207 files changed, 39858 insertions(+), 8269 deletions(-) diff --cc sys/contrib/dev/iwlwifi/cfg/dr.c index 000000000000,807f4e29d55a..807f4e29d55a mode 000000,100644..100644 --- a/sys/contrib/dev/iwlwifi/cfg/dr.c +++ b/sys/contrib/dev/iwlwifi/cfg/dr.c diff --cc sys/contrib/dev/iwlwifi/cfg/rf-fm.c index 000000000000,456a666c8dfd..456a666c8dfd mode 000000,100644..100644 --- a/sys/contrib/dev/iwlwifi/cfg/rf-fm.c +++ b/sys/contrib/dev/iwlwifi/cfg/rf-fm.c diff --cc sys/contrib/dev/iwlwifi/cfg/rf-gf.c index 000000000000,7ff5170faaa9..7ff5170faaa9 mode 000000,100644..100644 --- a/sys/contrib/dev/iwlwifi/cfg/rf-gf.c +++ b/sys/contrib/dev/iwlwifi/cfg/rf-gf.c diff --cc sys/contrib/dev/iwlwifi/cfg/rf-hr.c index 000000000000,9f408d276ce9..9f408d276ce9 mode 000000,100644..100644 --- a/sys/contrib/dev/iwlwifi/cfg/rf-hr.c +++ b/sys/contrib/dev/iwlwifi/cfg/rf-hr.c diff --cc sys/contrib/dev/iwlwifi/cfg/rf-jf.c index 000000000000,0a074e0a3bc6..0a074e0a3bc6 mode 000000,100644..100644 --- a/sys/contrib/dev/iwlwifi/cfg/rf-jf.c +++ b/sys/contrib/dev/iwlwifi/cfg/rf-jf.c diff --cc sys/contrib/dev/iwlwifi/cfg/rf-pe.c index 000000000000,483f21659eff..483f21659eff mode 000000,100644..100644 --- a/sys/contrib/dev/iwlwifi/cfg/rf-pe.c +++ b/sys/contrib/dev/iwlwifi/cfg/rf-pe.c diff --cc sys/contrib/dev/iwlwifi/cfg/rf-wh.c index 000000000000,97735175cb0e..97735175cb0e mode 000000,100644..100644 --- a/sys/contrib/dev/iwlwifi/cfg/rf-wh.c +++ b/sys/contrib/dev/iwlwifi/cfg/rf-wh.c diff --cc sys/contrib/dev/iwlwifi/fw/api/dhc.h index 000000000000,b6d79c678cd8..ddba2fc9254c mode 000000,100644..100644 --- a/sys/contrib/dev/iwlwifi/fw/api/dhc.h +++ b/sys/contrib/dev/iwlwifi/fw/api/dhc.h @@@ -1,0 -1,226 +1,230 @@@ + /* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */ + /* + * Copyright (C) 2025 Intel Corporation + */ + #ifndef __iwl_fw_api_dhc_h__ + #define __iwl_fw_api_dhc_h__ + + #define DHC_TABLE_MASK_POS (28) + + /** + * enum iwl_dhc_table_id - DHC table operations index + */ + enum iwl_dhc_table_id { + /** + * @DHC_TABLE_INTEGRATION: select the integration table + */ + DHC_TABLE_INTEGRATION = 2 << DHC_TABLE_MASK_POS, + /** + * @DHC_TABLE_TOOLS: select the tools table + */ + DHC_TABLE_TOOLS = 0, + }; + + /** + * enum iwl_dhc_umac_tools_table - tools operations + * @DHC_TOOLS_UMAC_GET_TAS_STATUS: Get TAS status. + * See @struct iwl_dhc_tas_status_resp + */ + enum iwl_dhc_umac_tools_table { + DHC_TOOLS_UMAC_GET_TAS_STATUS = 0, + }; + + /** + * enum iwl_dhc_umac_integration_table - integration operations + */ + enum iwl_dhc_umac_integration_table { + /** + * @DHC_INT_UMAC_TWT_OPERATION: trigger a TWT operation + */ + DHC_INT_UMAC_TWT_OPERATION = 4, + /** + * @DHC_INTEGRATION_TLC_DEBUG_CONFIG: TLC debug + */ + DHC_INTEGRATION_TLC_DEBUG_CONFIG = 1, + /** + * @DHC_INTEGRATION_MAX: Maximum UMAC integration table entries + */ + DHC_INTEGRATION_MAX + }; + + #define DHC_TARGET_UMAC BIT(27) + + /** + * struct iwl_dhc_cmd - debug host command + * @length: length in DWs of the data structure that is concatenated to the end + * of this struct + * @index_and_mask: bit 31 is 1 for data set operation else it's 0 + * bits 28-30 is the index of the table of the operation - + * &enum iwl_dhc_table_id * + * bit 27 is 0 if the cmd targeted to LMAC and 1 if targeted to UMAC, + * (LMAC is 0 for backward compatibility) + * bit 26 is 0 if the cmd targeted to LMAC0 and 1 if targeted to LMAC1, + * relevant only if bit 27 set to 0 + * bits 0-25 is a specific entry index in the table specified in bits 28-30 + * + * @data: the concatenated data. + */ + struct iwl_dhc_cmd { + __le32 length; + __le32 index_and_mask; ++#if defined(__linux__) + __le32 data[]; ++#elif defined(__FreeBSD__) ++ __le32 data[0]; ++#endif + } __packed; /* DHC_CMD_API_S */ + + /** + * struct iwl_dhc_payload_hdr - DHC payload header + * @version: a version of a payload + * @reserved: reserved for alignment + */ + struct iwl_dhc_payload_hdr { + u8 version; + u8 reserved[3]; + } __packed; /* DHC_PAYLOAD_HDR_API_S_VER_1 */ + + /** + * struct iwl_dhc_tas_status_per_radio - TAS status per radio + * @band: &PHY_BAND_5 for high band, PHY_BAND_24 for low band and + * &PHY_BAND_6 for ultra high band. + * @static_status: TAS statically enabled or disabled + * @static_disable_reason: TAS static disable reason, uses + * &enum iwl_tas_statically_disabled_reason + * @near_disconnection: is TAS currently near disconnection per radio + * @dynamic_status_ant_a: Antenna A current TAS status. + * uses &enum iwl_tas_dyna_status + * @dynamic_status_ant_b: Antenna B current TAS status. + * uses &enum iwl_tas_dyna_status + * @max_reg_pwr_limit_ant_a: Antenna A regulatory power limits in dBm + * @max_reg_pwr_limit_ant_b: Antenna B regulatory power limits in dBm + * @sar_limit_ant_a: Antenna A SAR limit per radio in dBm + * @sar_limit_ant_b: Antenna B SAR limit per radio in dBm + * @reserved: reserved for alignment + */ + struct iwl_dhc_tas_status_per_radio { + u8 band; + u8 static_status; + u8 static_disable_reason; + u8 near_disconnection; + u8 dynamic_status_ant_a; + u8 dynamic_status_ant_b; + __le16 max_reg_pwr_limit_ant_a; + __le16 max_reg_pwr_limit_ant_b; + __le16 sar_limit_ant_a; + __le16 sar_limit_ant_b; + u8 reserved[2]; + } __packed; /* DHC_TAS_STATUS_PER_RADIO_S_VER_1 */ + + /** + * struct iwl_dhc_tas_status_resp - Response to DHC_TOOLS_UMAC_GET_TAS_STATUS + * @header: DHC payload header, uses &struct iwl_dhc_payload_hdr + * @tas_config_info: see @struct bios_value_u32 + * @mcc_block_list: block listed country codes + * @tas_status_radio: TAS status, uses &struct iwl_dhc_tas_status_per_radio + * @curr_mcc: current mcc + * @valid_radio_mask: represent entry in tas_status_per_radio is valid. + * @reserved: reserved for alignment + */ + struct iwl_dhc_tas_status_resp { + struct iwl_dhc_payload_hdr header; + struct bios_value_u32 tas_config_info; + __le16 mcc_block_list[IWL_WTAS_BLACK_LIST_MAX]; + struct iwl_dhc_tas_status_per_radio tas_status_radio[2]; + __le16 curr_mcc; + u8 valid_radio_mask; + u8 reserved; + } __packed; /* DHC_TAS_STATUS_RSP_API_S_VER_1 */ + + /** + * struct iwl_dhc_cmd_resp_v1 - debug host command response + * @status: status of the command + * @data: the response data + */ + struct iwl_dhc_cmd_resp_v1 { + __le32 status; + __le32 data[]; + } __packed; /* DHC_RESP_API_S_VER_1 */ + + /** + * struct iwl_dhc_cmd_resp - debug host command response + * @status: status of the command + * @descriptor: command descriptor (index_and_mask) returned + * @data: the response data + */ + struct iwl_dhc_cmd_resp { + __le32 status; + __le32 descriptor; + __le32 data[]; + } __packed; /* DHC_RESP_API_S_VER_2 and DHC_RESP_API_S_VER_3 */ + + /** + * enum iwl_dhc_twt_operation_type - describes the TWT operation type + * + * @DHC_TWT_REQUEST: Send a Request TWT command + * @DHC_TWT_SUGGEST: Send a Suggest TWT command + * @DHC_TWT_DEMAND: Send a Demand TWT command + * @DHC_TWT_GROUPING: Send a Grouping TWT command + * @DHC_TWT_ACCEPT: Send a Accept TWT command + * @DHC_TWT_ALTERNATE: Send a Alternate TWT command + * @DHC_TWT_DICTATE: Send a Dictate TWT command + * @DHC_TWT_REJECT: Send a Reject TWT command + * @DHC_TWT_TEARDOWN: Send a TearDown TWT command + */ + enum iwl_dhc_twt_operation_type { + DHC_TWT_REQUEST, + DHC_TWT_SUGGEST, + DHC_TWT_DEMAND, + DHC_TWT_GROUPING, + DHC_TWT_ACCEPT, + DHC_TWT_ALTERNATE, + DHC_TWT_DICTATE, + DHC_TWT_REJECT, + DHC_TWT_TEARDOWN, + }; /* DHC_TWT_OPERATION_TYPE_E */ + + /** + * struct iwl_dhc_twt_operation - trigger a TWT operation + * + * @mac_id: the mac Id on which to trigger TWT operation + * @twt_operation: see &enum iwl_dhc_twt_operation_type + * @target_wake_time: when should we be on channel + * @interval_exp: the exponent for the interval + * @interval_mantissa: the mantissa for the interval + * @min_wake_duration: the minimum duration for the wake period + * @trigger: is the TWT triggered or not + * @flow_type: is the TWT announced or not + * @flow_id: the TWT flow identifier from 0 to 7 + * @protection: is the TWT protected + * @ndo_paging_indicator: is ndo_paging_indicator set + * @responder_pm_mode: is responder_pm_mode set + * @negotiation_type: if the responder wants to doze outside the TWT SP + * @twt_request: 1 for TWT request, 0 otherwise + * @implicit: is TWT implicit + * @twt_group_assignment: the TWT group assignment + * @twt_channel: the TWT channel + * @reserved: reserved + */ + struct iwl_dhc_twt_operation { + __le32 mac_id; + __le32 twt_operation; + __le64 target_wake_time; + __le32 interval_exp; + __le32 interval_mantissa; + __le32 min_wake_duration; + u8 trigger; + u8 flow_type; + u8 flow_id; + u8 protection; + u8 ndo_paging_indicator; + u8 responder_pm_mode; + u8 negotiation_type; + u8 twt_request; + u8 implicit; + u8 twt_group_assignment; + u8 twt_channel; + u8 reserved; + }; /* DHC_TWT_OPERATION_API_S */ + + #endif /* __iwl_fw_api_dhc_h__ */ diff --cc sys/contrib/dev/iwlwifi/fw/api/phy.h index c73d4d597857,000000000000..4c5221debbcb mode 100644,000000..100644 --- a/sys/contrib/dev/iwlwifi/fw/api/phy.h +++ b/sys/contrib/dev/iwlwifi/fw/api/phy.h @@@ -1,235 -1,0 +1,240 @@@ +/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */ +/* - * Copyright (C) 2012-2014, 2019-2022, 2024 Intel Corporation ++ * Copyright (C) 2012-2014, 2019-2022, 2024-2025 Intel Corporation + * Copyright (C) 2013-2015 Intel Mobile Communications GmbH + * Copyright (C) 2016-2017 Intel Deutschland GmbH + */ +#ifndef __iwl_fw_api_phy_h__ +#define __iwl_fw_api_phy_h__ ++#include ++#include ++#if defined(__FreeBSD__) ++#include ++#endif + +/** + * enum iwl_phy_ops_subcmd_ids - PHY group commands + */ +enum iwl_phy_ops_subcmd_ids { + /** + * @CMD_DTS_MEASUREMENT_TRIGGER_WIDE: + * Uses either &struct iwl_dts_measurement_cmd or + * &struct iwl_ext_dts_measurement_cmd + */ + CMD_DTS_MEASUREMENT_TRIGGER_WIDE = 0x0, + + /** - * @CTDP_CONFIG_CMD: &struct iwl_mvm_ctdp_cmd ++ * @CTDP_CONFIG_CMD: &struct iwl_ctdp_cmd + */ + CTDP_CONFIG_CMD = 0x03, + + /** + * @TEMP_REPORTING_THRESHOLDS_CMD: &struct temp_report_ths_cmd + */ + TEMP_REPORTING_THRESHOLDS_CMD = 0x04, + + /** + * @PER_CHAIN_LIMIT_OFFSET_CMD: &struct iwl_geo_tx_power_profiles_cmd_v1, + * &struct iwl_geo_tx_power_profiles_cmd_v2, + * &struct iwl_geo_tx_power_profiles_cmd_v3, + * &struct iwl_geo_tx_power_profiles_cmd_v4 or + * &struct iwl_geo_tx_power_profiles_cmd_v5 + */ + PER_CHAIN_LIMIT_OFFSET_CMD = 0x05, + + /** + * @PER_PLATFORM_ANT_GAIN_CMD: &union iwl_ppag_table_cmd + */ + PER_PLATFORM_ANT_GAIN_CMD = 0x07, + + /** + * @AP_TX_POWER_CONSTRAINTS_CMD: &struct iwl_txpower_constraints_cmd + */ + AP_TX_POWER_CONSTRAINTS_CMD = 0x0C, + + /** + * @CT_KILL_NOTIFICATION: &struct ct_kill_notif + */ + CT_KILL_NOTIFICATION = 0xFE, + + /** + * @DTS_MEASUREMENT_NOTIF_WIDE: + * &struct iwl_dts_measurement_notif_v1 or - * &struct iwl_dts_measurement_notif_v2 ++ * &struct iwl_dts_measurement_notif + */ + DTS_MEASUREMENT_NOTIF_WIDE = 0xFF, +}; + +/* DTS measurements */ + +enum iwl_dts_measurement_flags { + DTS_TRIGGER_CMD_FLAGS_TEMP = BIT(0), + DTS_TRIGGER_CMD_FLAGS_VOLT = BIT(1), +}; + +/** + * struct iwl_dts_measurement_cmd - request DTS temp and/or voltage measurements + * + * @flags: indicates which measurements we want as specified in + * &enum iwl_dts_measurement_flags + */ +struct iwl_dts_measurement_cmd { + __le32 flags; +} __packed; /* TEMPERATURE_MEASUREMENT_TRIGGER_CMD_S */ + +/** +* enum iwl_dts_control_measurement_mode - DTS measurement type +* @DTS_AUTOMATIC: Automatic mode (full SW control). Provide temperature read +* back (latest value. Not waiting for new value). Use automatic +* SW DTS configuration. +* @DTS_REQUEST_READ: Request DTS read. Configure DTS with manual settings, +* trigger DTS reading and provide read back temperature read +* when available. +* @DTS_OVER_WRITE: over-write the DTS temperatures in the SW until next read +* @DTS_DIRECT_WITHOUT_MEASURE: DTS returns its latest temperature result, +* without measurement trigger. +*/ +enum iwl_dts_control_measurement_mode { + DTS_AUTOMATIC = 0, + DTS_REQUEST_READ = 1, + DTS_OVER_WRITE = 2, + DTS_DIRECT_WITHOUT_MEASURE = 3, +}; + +/** +* enum iwl_dts_used - DTS to use or used for measurement in the DTS request +* @DTS_USE_TOP: Top +* @DTS_USE_CHAIN_A: chain A +* @DTS_USE_CHAIN_B: chain B +* @DTS_USE_CHAIN_C: chain C +* @XTAL_TEMPERATURE: read temperature from xtal +*/ +enum iwl_dts_used { + DTS_USE_TOP = 0, + DTS_USE_CHAIN_A = 1, + DTS_USE_CHAIN_B = 2, + DTS_USE_CHAIN_C = 3, + XTAL_TEMPERATURE = 4, +}; + +/** +* enum iwl_dts_bit_mode - bit-mode to use in DTS request read mode +* @DTS_BIT6_MODE: bit 6 mode +* @DTS_BIT8_MODE: bit 8 mode +*/ +enum iwl_dts_bit_mode { + DTS_BIT6_MODE = 0, + DTS_BIT8_MODE = 1, +}; + +/** + * struct iwl_ext_dts_measurement_cmd - request extended DTS temp measurements + * @control_mode: see &enum iwl_dts_control_measurement_mode + * @temperature: used when over write DTS mode is selected + * @sensor: set temperature sensor to use. See &enum iwl_dts_used + * @avg_factor: average factor to DTS in request DTS read mode + * @bit_mode: value defines the DTS bit mode to use. See &enum iwl_dts_bit_mode + * @step_duration: step duration for the DTS + */ +struct iwl_ext_dts_measurement_cmd { + __le32 control_mode; + __le32 temperature; + __le32 sensor; + __le32 avg_factor; + __le32 bit_mode; + __le32 step_duration; +} __packed; /* XVT_FW_DTS_CONTROL_MEASUREMENT_REQUEST_API_S */ + +/** + * struct iwl_dts_measurement_notif_v1 - measurements notification + * + * @temp: the measured temperature + * @voltage: the measured voltage + */ +struct iwl_dts_measurement_notif_v1 { + __le32 temp; + __le32 voltage; +} __packed; /* TEMPERATURE_MEASUREMENT_TRIGGER_NTFY_S_VER_1*/ + +/** - * struct iwl_dts_measurement_notif_v2 - measurements notification ++ * struct iwl_dts_measurement_notif - measurements notification + * + * @temp: the measured temperature + * @voltage: the measured voltage + * @threshold_idx: the trip index that was crossed + */ - struct iwl_dts_measurement_notif_v2 { ++struct iwl_dts_measurement_notif { + __le32 temp; + __le32 voltage; + __le32 threshold_idx; +} __packed; /* TEMPERATURE_MEASUREMENT_TRIGGER_NTFY_S_VER_2 */ + +/** + * struct iwl_dts_measurement_resp - measurements response + * + * @temp: the measured temperature + */ +struct iwl_dts_measurement_resp { + __le32 temp; +} __packed; /* CMD_DTS_MEASUREMENT_RSP_API_S_VER_1 */ + +/** + * struct ct_kill_notif - CT-kill entry notification + * This structure represent both versions of this notification. + * + * @temperature: the current temperature in celsius + * @dts: only in v2: DTS that trigger the CT Kill bitmap: + * bit 0: ToP master + * bit 1: PA chain A master + * bit 2: PA chain B master + * bit 3: ToP slave + * bit 4: PA chain A slave + * bit 5: PA chain B slave) + * bits 6,7: reserved (set to 0) + * @scheme: only for v2: scheme that trigger the CT Kill (0-SW, 1-HW) + */ +struct ct_kill_notif { + __le16 temperature; + u8 dts; + u8 scheme; +} __packed; /* CT_KILL_NOTIFICATION_API_S_VER_1, CT_KILL_NOTIFICATION_API_S_VER_2 */ + +/** - * enum iwl_mvm_ctdp_cmd_operation - CTDP command operations ++* enum iwl_ctdp_cmd_operation - CTDP command operations +* @CTDP_CMD_OPERATION_START: update the current budget +* @CTDP_CMD_OPERATION_STOP: stop ctdp +* @CTDP_CMD_OPERATION_REPORT: get the average budget +*/ - enum iwl_mvm_ctdp_cmd_operation { ++enum iwl_ctdp_cmd_operation { + CTDP_CMD_OPERATION_START = 0x1, + CTDP_CMD_OPERATION_STOP = 0x2, + CTDP_CMD_OPERATION_REPORT = 0x4, +};/* CTDP_CMD_OPERATION_TYPE_E */ + +/** - * struct iwl_mvm_ctdp_cmd - track and manage the FW power consumption budget ++ * struct iwl_ctdp_cmd - track and manage the FW power consumption budget + * - * @operation: see &enum iwl_mvm_ctdp_cmd_operation ++ * @operation: see &enum iwl_ctdp_cmd_operation + * @budget: the budget in milliwatt + * @window_size: defined in API but not used + */ - struct iwl_mvm_ctdp_cmd { ++struct iwl_ctdp_cmd { + __le32 operation; + __le32 budget; + __le32 window_size; +} __packed; + +#define IWL_MAX_DTS_TRIPS 8 + +/** + * struct temp_report_ths_cmd - set temperature thresholds + * + * @num_temps: number of temperature thresholds passed + * @thresholds: array with the thresholds to be configured + */ +struct temp_report_ths_cmd { + __le32 num_temps; + __le16 thresholds[IWL_MAX_DTS_TRIPS]; +} __packed; /* GRP_PHY_TEMP_REPORTING_THRESHOLDS_CMD */ + +#endif /* __iwl_fw_api_phy_h__ */ diff --cc sys/contrib/dev/iwlwifi/fw/api/rx.h index ec89e9576d2e,000000000000..2024b11c80d0 mode 100644,000000..100644 --- a/sys/contrib/dev/iwlwifi/fw/api/rx.h +++ b/sys/contrib/dev/iwlwifi/fw/api/rx.h @@@ -1,1033 -1,0 +1,1059 @@@ +/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */ +/* - * Copyright (C) 2012-2014, 2018-2024 Intel Corporation ++ * Copyright (C) 2012-2014, 2018-2025 Intel Corporation + * Copyright (C) 2013-2015 Intel Mobile Communications GmbH + * Copyright (C) 2015-2017 Intel Deutschland GmbH + */ +#ifndef __iwl_fw_api_rx_h__ +#define __iwl_fw_api_rx_h__ + +/* API for pre-9000 hardware */ + +#define IWL_RX_INFO_PHY_CNT 8 +#define IWL_RX_INFO_ENERGY_ANT_ABC_IDX 1 +#define IWL_RX_INFO_ENERGY_ANT_A_MSK 0x000000ff +#define IWL_RX_INFO_ENERGY_ANT_B_MSK 0x0000ff00 +#define IWL_RX_INFO_ENERGY_ANT_A_POS 0 +#define IWL_RX_INFO_ENERGY_ANT_B_POS 8 +#define IWL_RX_INFO_ENERGY_ANT_C_POS 16 + +enum iwl_mac_context_info { + MAC_CONTEXT_INFO_NONE, + MAC_CONTEXT_INFO_GSCAN, +}; + +/** + * struct iwl_rx_phy_info - phy info + * (REPLY_RX_PHY_CMD = 0xc0) + * @non_cfg_phy_cnt: non configurable DSP phy data byte count + * @cfg_phy_cnt: configurable DSP phy data byte count + * @stat_id: configurable DSP phy data set ID + * @reserved1: reserved + * @system_timestamp: GP2 at on air rise + * @timestamp: TSF at on air rise + * @beacon_time_stamp: beacon at on-air rise + * @phy_flags: general phy flags: band, modulation, ... + * @channel: channel number + * @non_cfg_phy: for various implementations of non_cfg_phy + * @rate_n_flags: RATE_MCS_* + * @byte_count: frame's byte-count + * @frame_time: frame's time on the air, based on byte count and frame rate + * calculation + * @mac_active_msk: what MACs were active when the frame was received + * @mac_context_info: additional info on the context in which the frame was + * received as defined in &enum iwl_mac_context_info + * + * Before each Rx, the device sends this data. It contains PHY information + * about the reception of the packet. + */ +struct iwl_rx_phy_info { + u8 non_cfg_phy_cnt; + u8 cfg_phy_cnt; + u8 stat_id; + u8 reserved1; + __le32 system_timestamp; + __le64 timestamp; + __le32 beacon_time_stamp; + __le16 phy_flags; + __le16 channel; + __le32 non_cfg_phy[IWL_RX_INFO_PHY_CNT]; + __le32 rate_n_flags; + __le32 byte_count; + u8 mac_active_msk; + u8 mac_context_info; + __le16 frame_time; +} __packed; + +/* + * TCP offload Rx assist info + * + * bits 0:3 - reserved + * bits 4:7 - MIC CRC length + * bits 8:12 - MAC header length + * bit 13 - Padding indication + * bit 14 - A-AMSDU indication + * bit 15 - Offload enabled + */ +enum iwl_csum_rx_assist_info { + CSUM_RXA_RESERVED_MASK = 0x000f, + CSUM_RXA_MICSIZE_MASK = 0x00f0, + CSUM_RXA_HEADERLEN_MASK = 0x1f00, + CSUM_RXA_PADD = BIT(13), + CSUM_RXA_AMSDU = BIT(14), + CSUM_RXA_ENA = BIT(15) +}; + +/** + * struct iwl_rx_mpdu_res_start - phy info + * @byte_count: byte count of the frame + * @assist: see &enum iwl_csum_rx_assist_info + */ +struct iwl_rx_mpdu_res_start { + __le16 byte_count; + __le16 assist; +} __packed; /* _RX_MPDU_RES_START_API_S_VER_2 */ + +/** + * enum iwl_rx_phy_flags - to parse %iwl_rx_phy_info phy_flags + * @RX_RES_PHY_FLAGS_BAND_24: true if the packet was received on 2.4 band + * @RX_RES_PHY_FLAGS_MOD_CCK: modulation is CCK + * @RX_RES_PHY_FLAGS_SHORT_PREAMBLE: true if packet's preamble was short + * @RX_RES_PHY_FLAGS_NARROW_BAND: narrow band (<20 MHz) receive + * @RX_RES_PHY_FLAGS_ANTENNA: antenna on which the packet was received + * @RX_RES_PHY_FLAGS_ANTENNA_POS: antenna bit position + * @RX_RES_PHY_FLAGS_AGG: set if the packet was part of an A-MPDU + * @RX_RES_PHY_FLAGS_OFDM_HT: The frame was an HT frame + * @RX_RES_PHY_FLAGS_OFDM_GF: The frame used GF preamble + * @RX_RES_PHY_FLAGS_OFDM_VHT: The frame was a VHT frame + */ +enum iwl_rx_phy_flags { + RX_RES_PHY_FLAGS_BAND_24 = BIT(0), + RX_RES_PHY_FLAGS_MOD_CCK = BIT(1), + RX_RES_PHY_FLAGS_SHORT_PREAMBLE = BIT(2), + RX_RES_PHY_FLAGS_NARROW_BAND = BIT(3), + RX_RES_PHY_FLAGS_ANTENNA = (0x7 << 4), + RX_RES_PHY_FLAGS_ANTENNA_POS = 4, + RX_RES_PHY_FLAGS_AGG = BIT(7), + RX_RES_PHY_FLAGS_OFDM_HT = BIT(8), + RX_RES_PHY_FLAGS_OFDM_GF = BIT(9), + RX_RES_PHY_FLAGS_OFDM_VHT = BIT(10), +}; + +/** + * enum iwl_mvm_rx_status - written by fw for each Rx packet + * @RX_MPDU_RES_STATUS_CRC_OK: CRC is fine + * @RX_MPDU_RES_STATUS_OVERRUN_OK: there was no RXE overflow + * @RX_MPDU_RES_STATUS_SRC_STA_FOUND: station was found + * @RX_MPDU_RES_STATUS_KEY_VALID: key was valid + * @RX_MPDU_RES_STATUS_ICV_OK: ICV is fine, if not, the packet is destroyed + * @RX_MPDU_RES_STATUS_MIC_OK: used for CCM alg only. TKIP MIC is checked + * in the driver. + * @RX_MPDU_RES_STATUS_TTAK_OK: TTAK is fine + * @RX_MPDU_RES_STATUS_MNG_FRAME_REPLAY_ERR: valid for alg = CCM_CMAC or + * alg = CCM only. Checks replay attack for 11w frames. + * @RX_MPDU_RES_STATUS_SEC_NO_ENC: this frame is not encrypted + * @RX_MPDU_RES_STATUS_SEC_WEP_ENC: this frame is encrypted using WEP + * @RX_MPDU_RES_STATUS_SEC_CCM_ENC: this frame is encrypted using CCM + * @RX_MPDU_RES_STATUS_SEC_TKIP_ENC: this frame is encrypted using TKIP + * @RX_MPDU_RES_STATUS_SEC_EXT_ENC: this frame is encrypted using extension + * algorithm + * @RX_MPDU_RES_STATUS_SEC_CMAC_GMAC_ENC: this frame is protected using + * CMAC or GMAC + * @RX_MPDU_RES_STATUS_SEC_ENC_ERR: this frame couldn't be decrypted + * @RX_MPDU_RES_STATUS_SEC_ENC_MSK: bitmask of the encryption algorithm + * @RX_MPDU_RES_STATUS_DEC_DONE: this frame has been successfully decrypted + * @RX_MPDU_RES_STATUS_CSUM_DONE: checksum was done by the hw + * @RX_MPDU_RES_STATUS_CSUM_OK: checksum found no errors + * @RX_MPDU_RES_STATUS_STA_ID_MSK: station ID mask + * @RX_MDPU_RES_STATUS_STA_ID_SHIFT: station ID bit shift + */ +enum iwl_mvm_rx_status { + RX_MPDU_RES_STATUS_CRC_OK = BIT(0), + RX_MPDU_RES_STATUS_OVERRUN_OK = BIT(1), + RX_MPDU_RES_STATUS_SRC_STA_FOUND = BIT(2), + RX_MPDU_RES_STATUS_KEY_VALID = BIT(3), + RX_MPDU_RES_STATUS_ICV_OK = BIT(5), + RX_MPDU_RES_STATUS_MIC_OK = BIT(6), + RX_MPDU_RES_STATUS_TTAK_OK = BIT(7), + RX_MPDU_RES_STATUS_MNG_FRAME_REPLAY_ERR = BIT(7), + RX_MPDU_RES_STATUS_SEC_NO_ENC = (0 << 8), + RX_MPDU_RES_STATUS_SEC_WEP_ENC = (1 << 8), + RX_MPDU_RES_STATUS_SEC_CCM_ENC = (2 << 8), + RX_MPDU_RES_STATUS_SEC_TKIP_ENC = (3 << 8), + RX_MPDU_RES_STATUS_SEC_EXT_ENC = (4 << 8), + RX_MPDU_RES_STATUS_SEC_CMAC_GMAC_ENC = (6 << 8), + RX_MPDU_RES_STATUS_SEC_ENC_ERR = (7 << 8), + RX_MPDU_RES_STATUS_SEC_ENC_MSK = (7 << 8), + RX_MPDU_RES_STATUS_DEC_DONE = BIT(11), + RX_MPDU_RES_STATUS_CSUM_DONE = BIT(16), + RX_MPDU_RES_STATUS_CSUM_OK = BIT(17), + RX_MDPU_RES_STATUS_STA_ID_SHIFT = 24, + RX_MPDU_RES_STATUS_STA_ID_MSK = 0x1f << RX_MDPU_RES_STATUS_STA_ID_SHIFT, +}; + +/* 9000 series API */ +enum iwl_rx_mpdu_mac_flags1 { + IWL_RX_MDPU_MFLG1_ADDRTYPE_MASK = 0x03, + IWL_RX_MPDU_MFLG1_MIC_CRC_LEN_MASK = 0xf0, + /* shift should be 4, but the length is measured in 2-byte + * words, so shifting only by 3 gives a byte result + */ + IWL_RX_MPDU_MFLG1_MIC_CRC_LEN_SHIFT = 3, +}; + +enum iwl_rx_mpdu_mac_flags2 { + /* in 2-byte words */ + IWL_RX_MPDU_MFLG2_HDR_LEN_MASK = 0x1f, + IWL_RX_MPDU_MFLG2_PAD = 0x20, + IWL_RX_MPDU_MFLG2_AMSDU = 0x40, +}; + +enum iwl_rx_mpdu_amsdu_info { + IWL_RX_MPDU_AMSDU_SUBFRAME_IDX_MASK = 0x7f, + IWL_RX_MPDU_AMSDU_LAST_SUBFRAME = 0x80, +}; + - #define RX_MPDU_BAND_POS 6 - #define RX_MPDU_BAND_MASK 0xC0 - #define BAND_IN_RX_STATUS(_val) \ - (((_val) & RX_MPDU_BAND_MASK) >> RX_MPDU_BAND_POS) ++enum iwl_rx_mpdu_mac_phy_band { ++ /* whether or not this is MAC or LINK depends on the API */ ++ IWL_RX_MPDU_MAC_PHY_BAND_MAC_MASK = 0x0f, ++ IWL_RX_MPDU_MAC_PHY_BAND_LINK_MASK = 0x0f, ++ IWL_RX_MPDU_MAC_PHY_BAND_PHY_MASK = 0x30, ++ IWL_RX_MPDU_MAC_PHY_BAND_BAND_MASK = 0xc0, ++}; + +enum iwl_rx_l3_proto_values { + IWL_RX_L3_TYPE_NONE, *** 27153 LINES SKIPPED *** From nobody Thu Oct 23 21:28:25 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cszff2GKTz6DZb7; Thu, 23 Oct 2025 21:28:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cszff0CtXz4PPZ; Thu, 23 Oct 2025 21:28:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761254906; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MFxtX5L8ztSiu9YDKP78m7r1PpZZbqa/3oebmtekFtc=; b=Rcuke6Xsyg9PdX591gKqMbmtZ0Xv2d062LAQo2KRyj3TnlhzF7ZsdecKg5B5RbGDkCj+IS Xh9lqdDVYhdX1HrdiA50lqD0oZT3mrhXKG28aMX36ZpfCaZVjoyi8ThZyzdbFBaVlKZSYq mpk+ZQZjnVqyTm4HgN77gnKZypJDsZgdQ2BXvjzvwbCml7fPRa/f7QSEJp42RzSextjm5i a1Rap1kz6bxS2Bb34tJ+uKA+m6lOHp7yvYM2neEJZ1vZQDkw442UG0QdVbB+EzXahJSYVH CFBQP2GzGvQT9TnfmGH3n2Li24tMWm7YdIXRHOFTg92i4/5hfHpAK/e8RP38ag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761254906; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MFxtX5L8ztSiu9YDKP78m7r1PpZZbqa/3oebmtekFtc=; b=qD2qsxEaRAT8Zw7jhn8UKnMqsif9lUHLtAlmIbKeab6Y1f+QwSUhHC5cKOLCWuc4jxVnWb a8pAp8VgAKhCF/C8Eyv6C/XK9RLsWYqLJMhjOiXTdJ/I3WelTcdSLzaSAIVuYMDgAIiypN DU0Xb3ZK2awjxVHpp6jGv+jM9EbNj5MdKLwiZqstPYOPuI64J8Ojx+7H4gpYNSIHkiF2xf 6G/MXlYLQpcXKfbKAcTqj1mEF91Yu+IPOO2UPo9ujmdVj+nhEnQ/mx9LBxvY6qD7mvXzeh HWN8C26yO/EvfUDVSJC0rRcFdGU2ZtiAl4/QkRcO0VLZ1R0jRLTQegB2wfuwlA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761254906; a=rsa-sha256; cv=none; b=o5tWdKRSWMeb9U8HgIliLGpRMjlhIRoeZf6tB43sKaO+mYuAn/AeT1c/e54+PrBO6hl7s/ pwuBns7le3Ph4wu5WgpvV0j5GF+kygrLI83Ebn3WnX+efeltBxy3M3IZOIrTzi2CJfUFWF zDpRvK9l0yyP/Pg9DxWvWbK8jTxyIdctdFDTuvEWGJb8hRIslmelyp2bx8hwowfVK1fA5Y V4ENjwmSNF5G7o/w8Usej7Eb46pqCgRm7FseivJYs00nS2dlsgZ5RqLYuaXyA/IZg9L5WZ O17QRwPJvGhCJrtZ6Q1eWr0dDLENthufl8uRc9br7egyGhMCJbmLe/HuPiQkSw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cszfd6qflzY9W; Thu, 23 Oct 2025 21:28:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59NLSPci081517; Thu, 23 Oct 2025 21:28:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59NLSPXW081514; Thu, 23 Oct 2025 21:28:25 GMT (envelope-from git) Date: Thu, 23 Oct 2025 21:28:25 GMT Message-Id: <202510232128.59NLSPXW081514@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: eb15fdb1b72d - main - rtw88: update Realtek's rtw88 driver List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: eb15fdb1b72de02e7a4c454f7eeeb1cee5cb83df Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=eb15fdb1b72de02e7a4c454f7eeeb1cee5cb83df commit eb15fdb1b72de02e7a4c454f7eeeb1cee5cb83df Merge: 6b627f88584c c1d365f39e08 Author: Bjoern A. Zeeb AuthorDate: 2025-10-17 20:22:54 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-10-23 21:26:02 +0000 rtw88: update Realtek's rtw88 driver This version is based on git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git e5f0a698b34ed76002dc5cff3804a61c80233a7a ( tag: v6.17 ). MFC after: 3 days sys/contrib/dev/rtw88/Makefile | 9 + sys/contrib/dev/rtw88/coex.c | 24 +- sys/contrib/dev/rtw88/debug.c | 57 +- sys/contrib/dev/rtw88/fw.c | 31 +- sys/contrib/dev/rtw88/fw.h | 1 + sys/contrib/dev/rtw88/hci.h | 8 + sys/contrib/dev/rtw88/mac.c | 50 +- sys/contrib/dev/rtw88/mac.h | 3 + sys/contrib/dev/rtw88/mac80211.c | 11 +- sys/contrib/dev/rtw88/main.c | 118 +- sys/contrib/dev/rtw88/main.h | 65 +- sys/contrib/dev/rtw88/pci.c | 55 +- sys/contrib/dev/rtw88/pci.h | 1 + sys/contrib/dev/rtw88/phy.c | 215 +- sys/contrib/dev/rtw88/phy.h | 20 +- sys/contrib/dev/rtw88/reg.h | 69 +- sys/contrib/dev/rtw88/rtw8703b.c | 64 +- sys/contrib/dev/rtw88/rtw8723cs.c | 2 +- sys/contrib/dev/rtw88/rtw8723d.c | 8 +- sys/contrib/dev/rtw88/rtw8723de.c | 3 +- sys/contrib/dev/rtw88/rtw8723ds.c | 2 +- sys/contrib/dev/rtw88/rtw8723du.c | 2 +- sys/contrib/dev/rtw88/rtw8723x.c | 68 +- sys/contrib/dev/rtw88/rtw8723x.h | 6 + sys/contrib/dev/rtw88/rtw8812a.c | 5 +- sys/contrib/dev/rtw88/rtw8812au.c | 2 +- sys/contrib/dev/rtw88/rtw8814a.c | 2281 +++ sys/contrib/dev/rtw88/rtw8814a.h | 62 + sys/contrib/dev/rtw88/rtw8814a_table.c | 23930 +++++++++++++++++++++++++++++++ sys/contrib/dev/rtw88/rtw8814a_table.h | 40 + sys/contrib/dev/rtw88/rtw8814ae.c | 34 + sys/contrib/dev/rtw88/rtw8814au.c | 54 + sys/contrib/dev/rtw88/rtw8821a.c | 5 +- sys/contrib/dev/rtw88/rtw8821au.c | 2 +- sys/contrib/dev/rtw88/rtw8821c.c | 21 +- sys/contrib/dev/rtw88/rtw8821ce.c | 3 +- sys/contrib/dev/rtw88/rtw8821cs.c | 2 +- sys/contrib/dev/rtw88/rtw8821cu.c | 2 +- sys/contrib/dev/rtw88/rtw8822b.c | 22 +- sys/contrib/dev/rtw88/rtw8822be.c | 3 +- sys/contrib/dev/rtw88/rtw8822bs.c | 2 +- sys/contrib/dev/rtw88/rtw8822bu.c | 8 +- sys/contrib/dev/rtw88/rtw8822c.c | 11 +- sys/contrib/dev/rtw88/rtw8822ce.c | 3 +- sys/contrib/dev/rtw88/rtw8822cs.c | 2 +- sys/contrib/dev/rtw88/rtw8822cu.c | 2 +- sys/contrib/dev/rtw88/rtw88xxa.c | 2 +- sys/contrib/dev/rtw88/rx.c | 6 + sys/contrib/dev/rtw88/sar.c | 2 +- sys/contrib/dev/rtw88/sdio.c | 37 +- sys/contrib/dev/rtw88/tx.c | 3 +- sys/contrib/dev/rtw88/usb.c | 65 +- sys/contrib/dev/rtw88/util.c | 3 +- sys/modules/rtw88/Makefile | 5 +- 54 files changed, 27180 insertions(+), 331 deletions(-) diff --cc sys/contrib/dev/rtw88/Makefile index 0cbbb366e393,000000000000..0b3da05a2938 mode 100644,000000..100644 --- a/sys/contrib/dev/rtw88/Makefile +++ b/sys/contrib/dev/rtw88/Makefile @@@ -1,104 -1,0 +1,113 @@@ +# SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause + +obj-$(CONFIG_RTW88_CORE) += rtw88_core.o +rtw88_core-y += main.o \ + mac80211.o \ + util.o \ + debug.o \ + tx.o \ + rx.o \ + mac.o \ + phy.o \ + coex.o \ + efuse.o \ + fw.o \ + ps.o \ + sec.o \ + bf.o \ + sar.o \ + regd.o + +rtw88_core-$(CONFIG_PM) += wow.o + +rtw88_core-$(CONFIG_RTW88_LEDS) += led.o + +obj-$(CONFIG_RTW88_8822B) += rtw88_8822b.o +rtw88_8822b-objs := rtw8822b.o rtw8822b_table.o + +obj-$(CONFIG_RTW88_8822BE) += rtw88_8822be.o +rtw88_8822be-objs := rtw8822be.o + +obj-$(CONFIG_RTW88_8822BS) += rtw88_8822bs.o +rtw88_8822bs-objs := rtw8822bs.o + +obj-$(CONFIG_RTW88_8822BU) += rtw88_8822bu.o +rtw88_8822bu-objs := rtw8822bu.o + +obj-$(CONFIG_RTW88_8822C) += rtw88_8822c.o +rtw88_8822c-objs := rtw8822c.o rtw8822c_table.o + +obj-$(CONFIG_RTW88_8822CE) += rtw88_8822ce.o +rtw88_8822ce-objs := rtw8822ce.o + +obj-$(CONFIG_RTW88_8822CS) += rtw88_8822cs.o +rtw88_8822cs-objs := rtw8822cs.o + +obj-$(CONFIG_RTW88_8822CU) += rtw88_8822cu.o +rtw88_8822cu-objs := rtw8822cu.o + +obj-$(CONFIG_RTW88_8723X) += rtw88_8723x.o +rtw88_8723x-objs := rtw8723x.o + +obj-$(CONFIG_RTW88_8703B) += rtw88_8703b.o +rtw88_8703b-objs := rtw8703b.o rtw8703b_tables.o + +obj-$(CONFIG_RTW88_8723CS) += rtw88_8723cs.o +rtw88_8723cs-objs := rtw8723cs.o + +obj-$(CONFIG_RTW88_8723D) += rtw88_8723d.o +rtw88_8723d-objs := rtw8723d.o rtw8723d_table.o + +obj-$(CONFIG_RTW88_8723DE) += rtw88_8723de.o +rtw88_8723de-objs := rtw8723de.o + +obj-$(CONFIG_RTW88_8723DS) += rtw88_8723ds.o +rtw88_8723ds-objs := rtw8723ds.o + +obj-$(CONFIG_RTW88_8723DU) += rtw88_8723du.o +rtw88_8723du-objs := rtw8723du.o + +obj-$(CONFIG_RTW88_8821C) += rtw88_8821c.o +rtw88_8821c-objs := rtw8821c.o rtw8821c_table.o + +obj-$(CONFIG_RTW88_8821CE) += rtw88_8821ce.o +rtw88_8821ce-objs := rtw8821ce.o + +obj-$(CONFIG_RTW88_8821CS) += rtw88_8821cs.o +rtw88_8821cs-objs := rtw8821cs.o + +obj-$(CONFIG_RTW88_8821CU) += rtw88_8821cu.o +rtw88_8821cu-objs := rtw8821cu.o + +obj-$(CONFIG_RTW88_88XXA) += rtw88_88xxa.o +rtw88_88xxa-objs := rtw88xxa.o + +obj-$(CONFIG_RTW88_8821A) += rtw88_8821a.o +rtw88_8821a-objs := rtw8821a.o rtw8821a_table.o + +obj-$(CONFIG_RTW88_8812A) += rtw88_8812a.o +rtw88_8812a-objs := rtw8812a.o rtw8812a_table.o + +obj-$(CONFIG_RTW88_8821AU) += rtw88_8821au.o +rtw88_8821au-objs := rtw8821au.o + +obj-$(CONFIG_RTW88_8812AU) += rtw88_8812au.o +rtw88_8812au-objs := rtw8812au.o + ++obj-$(CONFIG_RTW88_8814A) += rtw88_8814a.o ++rtw88_8814a-objs := rtw8814a.o rtw8814a_table.o ++ ++obj-$(CONFIG_RTW88_8814AE) += rtw88_8814ae.o ++rtw88_8814ae-objs := rtw8814ae.o ++ ++obj-$(CONFIG_RTW88_8814AU) += rtw88_8814au.o ++rtw88_8814au-objs := rtw8814au.o ++ +obj-$(CONFIG_RTW88_PCI) += rtw88_pci.o +rtw88_pci-objs := pci.o + +obj-$(CONFIG_RTW88_SDIO) += rtw88_sdio.o +rtw88_sdio-objs := sdio.o + +obj-$(CONFIG_RTW88_USB) += rtw88_usb.o +rtw88_usb-objs := usb.o diff --cc sys/contrib/dev/rtw88/debug.c index f0ee8e62da3b,000000000000..53742a3220f2 mode 100644,000000..100644 --- a/sys/contrib/dev/rtw88/debug.c +++ b/sys/contrib/dev/rtw88/debug.c @@@ -1,1362 -1,0 +1,1383 @@@ +// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause +/* Copyright(c) 2018-2019 Realtek Corporation + */ + +#include +#include +#include "main.h" +#include "coex.h" +#include "sec.h" +#include "fw.h" +#include "debug.h" +#include "phy.h" +#include "reg.h" +#include "ps.h" +#include "regd.h" + +#ifdef CONFIG_RTW88_DEBUGFS + +struct rtw_debugfs_priv { + struct rtw_dev *rtwdev; + int (*cb_read)(struct seq_file *m, void *v); + ssize_t (*cb_write)(struct file *filp, const char __user *buffer, + size_t count, loff_t *loff); + union { + u32 cb_data; + u8 *buf; + struct { + u32 page_offset; + u32 page_num; + } rsvd_page; + struct { + u8 rf_path; + u32 rf_addr; + u32 rf_mask; + }; + struct { + u32 addr; + u32 len; + } read_reg; + struct { + u8 bit; + } dm_cap; + }; +}; + +struct rtw_debugfs { + struct rtw_debugfs_priv mac_0; + struct rtw_debugfs_priv mac_1; + struct rtw_debugfs_priv mac_2; + struct rtw_debugfs_priv mac_3; + struct rtw_debugfs_priv mac_4; + struct rtw_debugfs_priv mac_5; + struct rtw_debugfs_priv mac_6; + struct rtw_debugfs_priv mac_7; + struct rtw_debugfs_priv mac_10; + struct rtw_debugfs_priv mac_11; + struct rtw_debugfs_priv mac_12; + struct rtw_debugfs_priv mac_13; + struct rtw_debugfs_priv mac_14; + struct rtw_debugfs_priv mac_15; + struct rtw_debugfs_priv mac_16; + struct rtw_debugfs_priv mac_17; + struct rtw_debugfs_priv bb_8; + struct rtw_debugfs_priv bb_9; + struct rtw_debugfs_priv bb_a; + struct rtw_debugfs_priv bb_b; + struct rtw_debugfs_priv bb_c; + struct rtw_debugfs_priv bb_d; + struct rtw_debugfs_priv bb_e; + struct rtw_debugfs_priv bb_f; + struct rtw_debugfs_priv bb_18; + struct rtw_debugfs_priv bb_19; + struct rtw_debugfs_priv bb_1a; + struct rtw_debugfs_priv bb_1b; + struct rtw_debugfs_priv bb_1c; + struct rtw_debugfs_priv bb_1d; + struct rtw_debugfs_priv bb_1e; + struct rtw_debugfs_priv bb_1f; + struct rtw_debugfs_priv bb_2c; + struct rtw_debugfs_priv bb_2d; + struct rtw_debugfs_priv bb_40; + struct rtw_debugfs_priv bb_41; + struct rtw_debugfs_priv rf_dump; + struct rtw_debugfs_priv tx_pwr_tbl; + struct rtw_debugfs_priv write_reg; + struct rtw_debugfs_priv h2c; + struct rtw_debugfs_priv rf_write; + struct rtw_debugfs_priv rf_read; + struct rtw_debugfs_priv read_reg; + struct rtw_debugfs_priv fix_rate; + struct rtw_debugfs_priv dump_cam; + struct rtw_debugfs_priv rsvd_page; + struct rtw_debugfs_priv phy_info; + struct rtw_debugfs_priv coex_enable; + struct rtw_debugfs_priv coex_info; + struct rtw_debugfs_priv edcca_enable; + struct rtw_debugfs_priv fw_crash; + struct rtw_debugfs_priv force_lowest_basic_rate; + struct rtw_debugfs_priv dm_cap; +}; + +static const char * const rtw_dm_cap_strs[] = { + [RTW_DM_CAP_NA] = "NA", + [RTW_DM_CAP_TXGAPK] = "TXGAPK", +}; + +static int rtw_debugfs_single_show(struct seq_file *m, void *v) +{ + struct rtw_debugfs_priv *debugfs_priv = m->private; + + return debugfs_priv->cb_read(m, v); +} + +static ssize_t rtw_debugfs_common_write(struct file *filp, + const char __user *buffer, + size_t count, loff_t *loff) +{ + struct rtw_debugfs_priv *debugfs_priv = filp->private_data; + + return debugfs_priv->cb_write(filp, buffer, count, loff); +} + +static ssize_t rtw_debugfs_single_write(struct file *filp, + const char __user *buffer, + size_t count, loff_t *loff) +{ + struct seq_file *seqpriv = (struct seq_file *)filp->private_data; + struct rtw_debugfs_priv *debugfs_priv = seqpriv->private; + + return debugfs_priv->cb_write(filp, buffer, count, loff); +} + +static int rtw_debugfs_single_open_rw(struct inode *inode, struct file *filp) +{ + return single_open(filp, rtw_debugfs_single_show, inode->i_private); +} + +static int rtw_debugfs_close(struct inode *inode, struct file *filp) +{ + return 0; +} + +static const struct file_operations file_ops_single_r = { + .owner = THIS_MODULE, + .open = rtw_debugfs_single_open_rw, + .read = seq_read, + .llseek = seq_lseek, + .release = single_release, +}; + +static const struct file_operations file_ops_single_rw = { + .owner = THIS_MODULE, + .open = rtw_debugfs_single_open_rw, + .release = single_release, + .read = seq_read, + .llseek = seq_lseek, + .write = rtw_debugfs_single_write, +}; + +static const struct file_operations file_ops_common_write = { + .owner = THIS_MODULE, + .write = rtw_debugfs_common_write, + .open = simple_open, + .release = rtw_debugfs_close, +}; + +static int rtw_debugfs_get_read_reg(struct seq_file *m, void *v) +{ + struct rtw_debugfs_priv *debugfs_priv = m->private; + struct rtw_dev *rtwdev = debugfs_priv->rtwdev; + u32 val, len, addr; + + len = debugfs_priv->read_reg.len; + addr = debugfs_priv->read_reg.addr; + switch (len) { + case 1: + val = rtw_read8(rtwdev, addr); + seq_printf(m, "reg 0x%03x: 0x%02x\n", addr, val); + break; + case 2: + val = rtw_read16(rtwdev, addr); + seq_printf(m, "reg 0x%03x: 0x%04x\n", addr, val); + break; + case 4: + val = rtw_read32(rtwdev, addr); + seq_printf(m, "reg 0x%03x: 0x%08x\n", addr, val); + break; + } + return 0; +} + +static int rtw_debugfs_get_rf_read(struct seq_file *m, void *v) +{ + struct rtw_debugfs_priv *debugfs_priv = m->private; + struct rtw_dev *rtwdev = debugfs_priv->rtwdev; + u32 val, addr, mask; + u8 path; + + path = debugfs_priv->rf_path; + addr = debugfs_priv->rf_addr; + mask = debugfs_priv->rf_mask; + + mutex_lock(&rtwdev->mutex); + val = rtw_read_rf(rtwdev, path, addr, mask); + mutex_unlock(&rtwdev->mutex); + + seq_printf(m, "rf_read path:%d addr:0x%08x mask:0x%08x val=0x%08x\n", + path, addr, mask, val); + + return 0; +} + +static int rtw_debugfs_get_fix_rate(struct seq_file *m, void *v) +{ + struct rtw_debugfs_priv *debugfs_priv = m->private; + struct rtw_dev *rtwdev = debugfs_priv->rtwdev; + struct rtw_dm_info *dm_info = &rtwdev->dm_info; + u8 fix_rate = dm_info->fix_rate; + + if (fix_rate >= DESC_RATE_MAX) { + seq_printf(m, "Fix rate disabled, fix_rate = %u\n", fix_rate); + return 0; + } + + seq_printf(m, "Data frames fixed at desc rate %u\n", fix_rate); + return 0; +} + +static int rtw_debugfs_copy_from_user(char tmp[], int size, + const char __user *buffer, size_t count, + int num) +{ + int tmp_len; + + memset(tmp, 0, size); + + if (count < num) + return -EFAULT; + + tmp_len = (count > size - 1 ? size - 1 : count); + + if (copy_from_user(tmp, buffer, tmp_len)) + return -EFAULT; + + tmp[tmp_len] = '\0'; + + return 0; +} + +static ssize_t rtw_debugfs_set_read_reg(struct file *filp, + const char __user *buffer, + size_t count, loff_t *loff) +{ + struct seq_file *seqpriv = (struct seq_file *)filp->private_data; + struct rtw_debugfs_priv *debugfs_priv = seqpriv->private; + struct rtw_dev *rtwdev = debugfs_priv->rtwdev; + char tmp[32 + 1]; + u32 addr, len; + int num; + int ret; + + ret = rtw_debugfs_copy_from_user(tmp, sizeof(tmp), buffer, count, 2); + if (ret) + return ret; + + num = sscanf(tmp, "%x %x", &addr, &len); + + if (num != 2) + return -EINVAL; + + if (len != 1 && len != 2 && len != 4) { + rtw_warn(rtwdev, "read reg setting wrong len\n"); + return -EINVAL; + } + debugfs_priv->read_reg.addr = addr; + debugfs_priv->read_reg.len = len; + + return count; +} + +static int rtw_debugfs_get_dump_cam(struct seq_file *m, void *v) +{ + struct rtw_debugfs_priv *debugfs_priv = m->private; + struct rtw_dev *rtwdev = debugfs_priv->rtwdev; + u32 val, command; + u32 hw_key_idx = debugfs_priv->cb_data << RTW_SEC_CAM_ENTRY_SHIFT; + u32 read_cmd = RTW_SEC_CMD_POLLING; + int i; + + seq_printf(m, "cam entry%d\n", debugfs_priv->cb_data); + seq_puts(m, "0x0 0x1 0x2 0x3 "); + seq_puts(m, "0x4 0x5\n"); + mutex_lock(&rtwdev->mutex); + for (i = 0; i <= 5; i++) { + command = read_cmd | (hw_key_idx + i); + rtw_write32(rtwdev, RTW_SEC_CMD_REG, command); + val = rtw_read32(rtwdev, RTW_SEC_READ_REG); + seq_printf(m, "%8.8x", val); + if (i < 2) + seq_puts(m, " "); + } + seq_puts(m, "\n"); + mutex_unlock(&rtwdev->mutex); + return 0; +} + +static int rtw_debugfs_get_rsvd_page(struct seq_file *m, void *v) +{ + struct rtw_debugfs_priv *debugfs_priv = m->private; + struct rtw_dev *rtwdev = debugfs_priv->rtwdev; + u16 page_size = rtwdev->chip->page_size; + u32 buf_size = debugfs_priv->rsvd_page.page_num * page_size; + u32 offset = debugfs_priv->rsvd_page.page_offset * page_size; + u8 *buf; + int i; + int ret; + + buf = vzalloc(buf_size); + if (!buf) + return -ENOMEM; + + ret = rtw_fw_dump_fifo(rtwdev, RTW_FW_FIFO_SEL_RSVD_PAGE, offset, + buf_size, (u32 *)buf); + if (ret) { + rtw_err(rtwdev, "failed to dump rsvd page\n"); + vfree(buf); + return ret; + } + + for (i = 0 ; i < buf_size ; i += 8) { + if (i % page_size == 0) + seq_printf(m, "PAGE %d\n", (i + offset) / page_size); + seq_printf(m, "%8ph\n", buf + i); + } + vfree(buf); + + return 0; +} + +static ssize_t rtw_debugfs_set_rsvd_page(struct file *filp, + const char __user *buffer, + size_t count, loff_t *loff) +{ + struct seq_file *seqpriv = (struct seq_file *)filp->private_data; + struct rtw_debugfs_priv *debugfs_priv = seqpriv->private; + struct rtw_dev *rtwdev = debugfs_priv->rtwdev; + char tmp[32 + 1]; + u32 offset, page_num; + int num; + int ret; + + ret = rtw_debugfs_copy_from_user(tmp, sizeof(tmp), buffer, count, 2); + if (ret) + return ret; + + num = sscanf(tmp, "%d %d", &offset, &page_num); + + if (num != 2) { + rtw_warn(rtwdev, "invalid arguments\n"); + return -EINVAL; + } + + debugfs_priv->rsvd_page.page_offset = offset; + debugfs_priv->rsvd_page.page_num = page_num; + + return count; +} + +static ssize_t rtw_debugfs_set_single_input(struct file *filp, + const char __user *buffer, + size_t count, loff_t *loff) +{ + struct seq_file *seqpriv = (struct seq_file *)filp->private_data; + struct rtw_debugfs_priv *debugfs_priv = seqpriv->private; + u32 input; + int ret; + + ret = kstrtou32_from_user(buffer, count, 0, &input); + if (ret) + return ret; + + debugfs_priv->cb_data = input; + + return count; +} + +static ssize_t rtw_debugfs_set_write_reg(struct file *filp, + const char __user *buffer, + size_t count, loff_t *loff) +{ + struct rtw_debugfs_priv *debugfs_priv = filp->private_data; + struct rtw_dev *rtwdev = debugfs_priv->rtwdev; + char tmp[32 + 1]; + u32 addr, val, len; + int num; + int ret; + + ret = rtw_debugfs_copy_from_user(tmp, sizeof(tmp), buffer, count, 3); + if (ret) + return ret; + + /* write BB/MAC register */ + num = sscanf(tmp, "%x %x %x", &addr, &val, &len); + + if (num != 3) + return -EINVAL; + + switch (len) { + case 1: + rtw_dbg(rtwdev, RTW_DBG_DEBUGFS, + "reg write8 0x%03x: 0x%08x\n", addr, val); + rtw_write8(rtwdev, addr, (u8)val); + break; + case 2: + rtw_dbg(rtwdev, RTW_DBG_DEBUGFS, + "reg write16 0x%03x: 0x%08x\n", addr, val); + rtw_write16(rtwdev, addr, (u16)val); + break; + case 4: + rtw_dbg(rtwdev, RTW_DBG_DEBUGFS, + "reg write32 0x%03x: 0x%08x\n", addr, val); + rtw_write32(rtwdev, addr, (u32)val); + break; + default: + rtw_dbg(rtwdev, RTW_DBG_DEBUGFS, + "error write length = %d\n", len); + break; + } + + return count; +} + +static ssize_t rtw_debugfs_set_h2c(struct file *filp, + const char __user *buffer, + size_t count, loff_t *loff) +{ + struct rtw_debugfs_priv *debugfs_priv = filp->private_data; + struct rtw_dev *rtwdev = debugfs_priv->rtwdev; + char tmp[32 + 1]; + u8 param[8]; + int num; + int ret; + + ret = rtw_debugfs_copy_from_user(tmp, sizeof(tmp), buffer, count, 3); + if (ret) + return ret; + + num = sscanf(tmp, "%hhx,%hhx,%hhx,%hhx,%hhx,%hhx,%hhx,%hhx", + ¶m[0], ¶m[1], ¶m[2], ¶m[3], + ¶m[4], ¶m[5], ¶m[6], ¶m[7]); + if (num != 8) { + rtw_warn(rtwdev, "invalid H2C command format for debug\n"); + return -EINVAL; + } + + mutex_lock(&rtwdev->mutex); + rtw_fw_h2c_cmd_dbg(rtwdev, param); + mutex_unlock(&rtwdev->mutex); + + return count; +} + +static ssize_t rtw_debugfs_set_rf_write(struct file *filp, + const char __user *buffer, + size_t count, loff_t *loff) +{ + struct rtw_debugfs_priv *debugfs_priv = filp->private_data; + struct rtw_dev *rtwdev = debugfs_priv->rtwdev; + char tmp[32 + 1]; + u32 path, addr, mask, val; + int num; + int ret; + + ret = rtw_debugfs_copy_from_user(tmp, sizeof(tmp), buffer, count, 4); + if (ret) + return ret; + + num = sscanf(tmp, "%x %x %x %x", &path, &addr, &mask, &val); + + if (num != 4) { + rtw_warn(rtwdev, "invalid args, [path] [addr] [mask] [val]\n"); + return -EINVAL; + } + + mutex_lock(&rtwdev->mutex); + rtw_write_rf(rtwdev, path, addr, mask, val); + mutex_unlock(&rtwdev->mutex); + rtw_dbg(rtwdev, RTW_DBG_DEBUGFS, + "write_rf path:%d addr:0x%08x mask:0x%08x, val:0x%08x\n", + path, addr, mask, val); + + return count; +} + +static ssize_t rtw_debugfs_set_rf_read(struct file *filp, + const char __user *buffer, + size_t count, loff_t *loff) +{ + struct seq_file *seqpriv = (struct seq_file *)filp->private_data; + struct rtw_debugfs_priv *debugfs_priv = seqpriv->private; + struct rtw_dev *rtwdev = debugfs_priv->rtwdev; + char tmp[32 + 1]; + u32 path, addr, mask; + int num; + int ret; + + ret = rtw_debugfs_copy_from_user(tmp, sizeof(tmp), buffer, count, 3); + if (ret) + return ret; + + num = sscanf(tmp, "%x %x %x", &path, &addr, &mask); + + if (num != 3) { + rtw_warn(rtwdev, "invalid args, [path] [addr] [mask] [val]\n"); + return -EINVAL; + } + + debugfs_priv->rf_path = path; + debugfs_priv->rf_addr = addr; + debugfs_priv->rf_mask = mask; + + return count; +} + +static ssize_t rtw_debugfs_set_fix_rate(struct file *filp, + const char __user *buffer, + size_t count, loff_t *loff) +{ + struct seq_file *seqpriv = (struct seq_file *)filp->private_data; + struct rtw_debugfs_priv *debugfs_priv = seqpriv->private; + struct rtw_dev *rtwdev = debugfs_priv->rtwdev; + struct rtw_dm_info *dm_info = &rtwdev->dm_info; + u8 fix_rate; + int ret; + + ret = kstrtou8_from_user(buffer, count, 0, &fix_rate); + if (ret) + return ret; + + dm_info->fix_rate = fix_rate; + + return count; +} + +static int rtw_debug_get_mac_page(struct seq_file *m, void *v) +{ + struct rtw_debugfs_priv *debugfs_priv = m->private; + struct rtw_dev *rtwdev = debugfs_priv->rtwdev; + u32 page = debugfs_priv->cb_data; + int i, n; + int max = 0xff; + + rtw_read32(rtwdev, debugfs_priv->cb_data); + for (n = 0; n <= max; ) { + seq_printf(m, "\n%8.8x ", n + page); + for (i = 0; i < 4 && n <= max; i++, n += 4) + seq_printf(m, "%8.8x ", + rtw_read32(rtwdev, (page | n))); + } + seq_puts(m, "\n"); + return 0; +} + +static int rtw_debug_get_bb_page(struct seq_file *m, void *v) +{ + struct rtw_debugfs_priv *debugfs_priv = m->private; + struct rtw_dev *rtwdev = debugfs_priv->rtwdev; + u32 page = debugfs_priv->cb_data; + int i, n; + int max = 0xff; + + rtw_read32(rtwdev, debugfs_priv->cb_data); + for (n = 0; n <= max; ) { + seq_printf(m, "\n%8.8x ", n + page); + for (i = 0; i < 4 && n <= max; i++, n += 4) + seq_printf(m, "%8.8x ", + rtw_read32(rtwdev, (page | n))); + } + seq_puts(m, "\n"); + return 0; +} + +static int rtw_debugfs_get_rf_dump(struct seq_file *m, void *v) +{ + struct rtw_debugfs_priv *debugfs_priv = m->private; + struct rtw_dev *rtwdev = debugfs_priv->rtwdev; + u32 addr, offset, data; + u8 path; + + mutex_lock(&rtwdev->mutex); + + for (path = 0; path < rtwdev->hal.rf_path_num; path++) { + seq_printf(m, "RF path:%d\n", path); + for (addr = 0; addr < 0x100; addr += 4) { + seq_printf(m, "%8.8x ", addr); + for (offset = 0; offset < 4; offset++) { + data = rtw_read_rf(rtwdev, path, addr + offset, + 0xffffffff); + seq_printf(m, "%8.8x ", data); + } + seq_puts(m, "\n"); + } + seq_puts(m, "\n"); + } + + mutex_unlock(&rtwdev->mutex); + + return 0; +} + +static void rtw_print_cck_rate_txt(struct seq_file *m, u8 rate) +{ + static const char * const + cck_rate[] = {"1M", "2M", "5.5M", "11M"}; + u8 idx = rate - DESC_RATE1M; + + seq_printf(m, " CCK_%-5s", cck_rate[idx]); +} + +static void rtw_print_ofdm_rate_txt(struct seq_file *m, u8 rate) +{ + static const char * const + ofdm_rate[] = {"6M", "9M", "12M", "18M", "24M", "36M", "48M", "54M"}; + u8 idx = rate - DESC_RATE6M; + + seq_printf(m, " OFDM_%-4s", ofdm_rate[idx]); +} + +static void rtw_print_ht_rate_txt(struct seq_file *m, u8 rate) +{ + u8 mcs_n = rate - DESC_RATEMCS0; + + seq_printf(m, " MCS%-6u", mcs_n); +} + +static void rtw_print_vht_rate_txt(struct seq_file *m, u8 rate) +{ + u8 idx = rate - DESC_RATEVHT1SS_MCS0; + u8 n_ss, mcs_n; + + /* n spatial stream */ + n_ss = 1 + idx / 10; + /* MCS n */ + mcs_n = idx % 10; + seq_printf(m, " VHT%uSMCS%u", n_ss, mcs_n); +} + +static void rtw_print_rate(struct seq_file *m, u8 rate) +{ + switch (rate) { + case DESC_RATE1M...DESC_RATE11M: + rtw_print_cck_rate_txt(m, rate); + break; + case DESC_RATE6M...DESC_RATE54M: + rtw_print_ofdm_rate_txt(m, rate); + break; - case DESC_RATEMCS0...DESC_RATEMCS15: ++ case DESC_RATEMCS0...DESC_RATEMCS31: + rtw_print_ht_rate_txt(m, rate); + break; - case DESC_RATEVHT1SS_MCS0...DESC_RATEVHT2SS_MCS9: ++ case DESC_RATEVHT1SS_MCS0...DESC_RATEVHT4SS_MCS9: + rtw_print_vht_rate_txt(m, rate); + break; + default: + seq_printf(m, " Unknown rate=0x%x\n", rate); + break; + } +} + +#define case_REGD(src) \ + case RTW_REGD_##src: return #src + +static const char *rtw_get_regd_string(u8 regd) +{ + switch (regd) { + case_REGD(FCC); + case_REGD(MKK); + case_REGD(ETSI); + case_REGD(IC); + case_REGD(KCC); + case_REGD(ACMA); + case_REGD(CHILE); + case_REGD(UKRAINE); + case_REGD(MEXICO); + case_REGD(CN); + case_REGD(WW); + default: + return "Unknown"; + } +} + +static int rtw_debugfs_get_tx_pwr_tbl(struct seq_file *m, void *v) +{ + struct rtw_debugfs_priv *debugfs_priv = m->private; + struct rtw_dev *rtwdev = debugfs_priv->rtwdev; ++ struct rtw_power_params pwr_param = {0}; + struct rtw_hal *hal = &rtwdev->hal; ++ u8 nss = rtwdev->efuse.hw_cap.nss; + u8 path, rate, bw, ch, regd; - struct rtw_power_params pwr_param = {0}; ++ u8 max_ht_rate, max_rate; + + mutex_lock(&rtwdev->mutex); + bw = hal->current_band_width; + ch = hal->current_channel; + regd = rtw_regd_get(rtwdev); + + seq_printf(m, "channel: %u\n", ch); + seq_printf(m, "bandwidth: %u\n", bw); + seq_printf(m, "regulatory: %s\n", rtw_get_regd_string(regd)); + seq_printf(m, "%-4s %-10s %-9s %-9s (%-4s %-4s %-4s) %-4s\n", + "path", "rate", "pwr", "base", "byr", "lmt", "sar", "rem"); + ++ max_ht_rate = DESC_RATEMCS0 + nss * 8 - 1; ++ ++ if (rtwdev->chip->vht_supported) ++ max_rate = DESC_RATEVHT1SS_MCS0 + nss * 10 - 1; ++ else ++ max_rate = max_ht_rate; ++ + mutex_lock(&hal->tx_power_mutex); - for (path = RF_PATH_A; path <= RF_PATH_B; path++) { ++ for (path = RF_PATH_A; path < hal->rf_path_num; path++) { + /* there is no CCK rates used in 5G */ + if (hal->current_band_type == RTW_BAND_5G) + rate = DESC_RATE6M; + else + rate = DESC_RATE1M; + - /* now, not support vht 3ss and vht 4ss*/ - for (; rate <= DESC_RATEVHT2SS_MCS9; rate++) { - /* now, not support ht 3ss and ht 4ss*/ - if (rate > DESC_RATEMCS15 && - rate < DESC_RATEVHT1SS_MCS0) ++ for (; rate <= max_rate; rate++) { ++ if (rate > max_ht_rate && rate <= DESC_RATEMCS31) + continue; + + rtw_get_tx_power_params(rtwdev, path, rate, bw, + ch, regd, &pwr_param); + + seq_printf(m, "%4c ", path + 'A'); + rtw_print_rate(m, rate); + seq_printf(m, " %3u(0x%02x) %4u %4d (%4d %4d %4d) %4d\n", + hal->tx_pwr_tbl[path][rate], + hal->tx_pwr_tbl[path][rate], + pwr_param.pwr_base, + min3(pwr_param.pwr_offset, + pwr_param.pwr_limit, + pwr_param.pwr_sar), + pwr_param.pwr_offset, pwr_param.pwr_limit, + pwr_param.pwr_sar, + pwr_param.pwr_remnant); + } + } + + mutex_unlock(&hal->tx_power_mutex); + mutex_unlock(&rtwdev->mutex); + + return 0; +} + +void rtw_debugfs_get_simple_phy_info(struct seq_file *m) +{ + struct rtw_debugfs_priv *debugfs_priv = m->private; + struct rtw_dev *rtwdev = debugfs_priv->rtwdev; + struct rtw_hal *hal = &rtwdev->hal; + struct rtw_dm_info *dm_info = &rtwdev->dm_info; + struct rtw_traffic_stats *stats = &rtwdev->stats; + + seq_printf(m, "%-40s = %ddBm/ %d\n", "RSSI/ STA Channel", + dm_info->rssi[RF_PATH_A] - 100, hal->current_channel); + + seq_printf(m, "TP {Tx, Rx} = {%u, %u}Mbps\n", + stats->tx_throughput, stats->rx_throughput); + + seq_puts(m, "[Tx Rate] = "); + rtw_print_rate(m, dm_info->tx_rate); + seq_printf(m, "(0x%x)\n", dm_info->tx_rate); + + seq_puts(m, "[Rx Rate] = "); + rtw_print_rate(m, dm_info->curr_rx_rate); + seq_printf(m, "(0x%x)\n", dm_info->curr_rx_rate); +} + *** 16222 LINES SKIPPED *** From nobody Thu Oct 23 21:28:27 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cszfh36J1z6DZg8; Thu, 23 Oct 2025 21:28:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cszfh0p9vz4PMp; Thu, 23 Oct 2025 21:28:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761254908; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=usrL5jmJMqYKULtC/5QmuxqhMRWAWXFtPf/cAQE0JU0=; b=u4zVJB6gjCXYwU4648eiXNIrbCl2x9s3GwpMI7aLmYW/PwlXmdPzzs2qqph383dehsqo9f CAjwnU6zYnGZ4um+ctSZCB4hYeYILMOXvhhqJzdYp82zpE/72ldVuvzNMWoYpOxnh7BR1q 1mCN2rODu11lIk4ljrp7r1BORhwAqivEtOdtQEcHG44sCOTLwPJ4I+w7fyNlZNCqi0qNTz njgARrKc1yqPoCvDPzy4dVAbkrv0V3oLc6lcJ8/SHYrZO+syG/0qzI4Sw96hgXCkGWKJvo q/qRGIKwEdtsKGAv0kdg7o44ksiErV+2kwxf8mmChi2NMWthvEtoVGVYX89WpA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761254908; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=usrL5jmJMqYKULtC/5QmuxqhMRWAWXFtPf/cAQE0JU0=; b=iDnL7GPcc35kxUGwAXjHUej3h6CKnGSHwMTn6kTmbK1Tm/n/A765U7B+LFTKPyeSs+NYan ax600cLCTHHEEGUs1zU7qkA2nFfgOH68HcEr8dIdkO/hQGcF28Hu2dtSOV/3nATmutfd4d Qs7dN5R6LU+cXvFJA4YElNpaqa1p/Z7KqczEhggaaY4o1v3shoorX2QvbJl0yNwK2n+cfV Yd8neIx0o5YNqY6bLPgZYfg0NEp4HMewjXBqor6daV4JR4HZ3SUEkUSgiA63hlJjrptkSC 30CgxD3yX9Xby0ved5OTkuNA7nEDs2oZUsSM0YtjT75rUOrL7IAjxvku1l45aQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761254908; a=rsa-sha256; cv=none; b=nNxVXQ9suJTMtvVonf06re2m/thP8XosWcAA899deV2HFUQmlMJqWS8HP0qWelM/nGUP02 MJsR7RltxC0TFroMpLCyw09ZEvf3+Fwq/jwVECJZXQmzWMoEQDhuLj0kY3YS3Xr9lV6iCI f0itzws4F50er8V4W+m6ObxILEe8dpbS3JYKvBldMOojTAjwGVPme3g38Th7t+ejSGoNPb txIFo1iN+MTWpN4B3vEehvB11BFi9qORtf54TI/aHjxxk+3LTynzN7c7xIn2kLkqv/AdVt dDVXsBnOlqfKEEVc9h7UvD6ZzCnhM5TDDpjlW3TkLbYtKG9Os0KFlDi60NY9vw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cszfh0MVKzY9X; Thu, 23 Oct 2025 21:28: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 59NLSR1Z081557; Thu, 23 Oct 2025 21:28:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59NLSRrb081551; Thu, 23 Oct 2025 21:28:27 GMT (envelope-from git) Date: Thu, 23 Oct 2025 21:28:27 GMT Message-Id: <202510232128.59NLSRrb081551@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 354a030185c6 - main - rtw89: update Realtek's rtw89 driver List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 354a030185c650d1465ed2035a83636b8f825d72 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=354a030185c650d1465ed2035a83636b8f825d72 commit 354a030185c650d1465ed2035a83636b8f825d72 Merge: eb15fdb1b72d b35044b38f74 Author: Bjoern A. Zeeb AuthorDate: 2025-10-17 20:46:45 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-10-23 21:26:04 +0000 rtw89: update Realtek's rtw89 driver This version is based on git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git e5f0a698b34ed76002dc5cff3804a61c80233a7a ( tag: v6.17 ). MFC after: 3 days sys/contrib/dev/rtw89/Kconfig | 28 +- sys/contrib/dev/rtw89/Makefile | 9 + sys/contrib/dev/rtw89/acpi.c | 1140 +++++++- sys/contrib/dev/rtw89/acpi.h | 223 +- sys/contrib/dev/rtw89/cam.c | 13 + sys/contrib/dev/rtw89/chan.c | 993 +++++-- sys/contrib/dev/rtw89/chan.h | 92 +- sys/contrib/dev/rtw89/coex.c | 4128 +++++++++++++++++----------- sys/contrib/dev/rtw89/coex.h | 25 +- sys/contrib/dev/rtw89/core.c | 1019 +++++-- sys/contrib/dev/rtw89/core.h | 572 +++- sys/contrib/dev/rtw89/debug.c | 2232 ++++++++------- sys/contrib/dev/rtw89/fw.c | 1464 ++++++++-- sys/contrib/dev/rtw89/fw.h | 305 +- sys/contrib/dev/rtw89/mac.c | 316 ++- sys/contrib/dev/rtw89/mac.h | 63 +- sys/contrib/dev/rtw89/mac80211.c | 420 +-- sys/contrib/dev/rtw89/mac_be.c | 12 +- sys/contrib/dev/rtw89/pci.c | 78 +- sys/contrib/dev/rtw89/pci.h | 57 +- sys/contrib/dev/rtw89/pci_be.c | 2 +- sys/contrib/dev/rtw89/phy.c | 1209 +++++--- sys/contrib/dev/rtw89/phy.h | 40 +- sys/contrib/dev/rtw89/phy_be.c | 2 +- sys/contrib/dev/rtw89/ps.c | 207 +- sys/contrib/dev/rtw89/ps.h | 6 + sys/contrib/dev/rtw89/reg.h | 95 +- sys/contrib/dev/rtw89/regd.c | 780 ++++-- sys/contrib/dev/rtw89/rtw8851b.c | 199 +- sys/contrib/dev/rtw89/rtw8851b_rfk.c | 156 +- sys/contrib/dev/rtw89/rtw8851b_rfk_table.c | 77 +- sys/contrib/dev/rtw89/rtw8851b_rfk_table.h | 2 +- sys/contrib/dev/rtw89/rtw8851b_table.c | 501 ++-- sys/contrib/dev/rtw89/rtw8851be.c | 1 + sys/contrib/dev/rtw89/rtw8851bu.c | 39 + sys/contrib/dev/rtw89/rtw8852a.c | 35 +- sys/contrib/dev/rtw89/rtw8852ae.c | 1 + sys/contrib/dev/rtw89/rtw8852b.c | 128 +- sys/contrib/dev/rtw89/rtw8852b_common.c | 46 +- sys/contrib/dev/rtw89/rtw8852b_rfk.c | 95 +- sys/contrib/dev/rtw89/rtw8852b_rfk.h | 3 + sys/contrib/dev/rtw89/rtw8852be.c | 1 + sys/contrib/dev/rtw89/rtw8852bt.c | 47 +- sys/contrib/dev/rtw89/rtw8852bt_rfk.c | 87 +- sys/contrib/dev/rtw89/rtw8852bt_rfk.h | 3 + sys/contrib/dev/rtw89/rtw8852bte.c | 1 + sys/contrib/dev/rtw89/rtw8852bu.c | 55 + sys/contrib/dev/rtw89/rtw8852c.c | 65 +- sys/contrib/dev/rtw89/rtw8852ce.c | 1 + sys/contrib/dev/rtw89/rtw8922a.c | 157 +- sys/contrib/dev/rtw89/rtw8922a_rfk.c | 57 +- sys/contrib/dev/rtw89/rtw8922ae.c | 1 + sys/contrib/dev/rtw89/sar.c | 677 ++++- sys/contrib/dev/rtw89/sar.h | 27 +- sys/contrib/dev/rtw89/ser.c | 34 +- sys/contrib/dev/rtw89/txrx.h | 32 + sys/contrib/dev/rtw89/usb.c | 1042 +++++++ sys/contrib/dev/rtw89/usb.h | 65 + sys/contrib/dev/rtw89/util.c | 220 +- sys/contrib/dev/rtw89/util.h | 13 +- sys/contrib/dev/rtw89/wow.c | 28 +- sys/contrib/dev/rtw89/wow.h | 14 +- sys/modules/rtw89/Makefile | 8 +- 63 files changed, 14320 insertions(+), 5128 deletions(-) diff --cc sys/contrib/dev/rtw89/Makefile index c751013e811e,000000000000..23e43c444f69 mode 100644,000000..100644 --- a/sys/contrib/dev/rtw89/Makefile +++ b/sys/contrib/dev/rtw89/Makefile @@@ -1,83 -1,0 +1,92 @@@ +# SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause + +obj-$(CONFIG_RTW89_CORE) += rtw89_core.o +rtw89_core-y += core.o \ + mac80211.o \ + mac.o \ + mac_be.o \ + phy.o \ + phy_be.o \ + fw.o \ + cam.o \ + efuse.o \ + efuse_be.o \ + regd.o \ + sar.o \ + coex.o \ + ps.o \ + chan.o \ + ser.o \ + acpi.o \ + util.o + +rtw89_core-$(CONFIG_PM) += wow.o + +obj-$(CONFIG_RTW89_8851B) += rtw89_8851b.o +rtw89_8851b-objs := rtw8851b.o \ + rtw8851b_table.o \ + rtw8851b_rfk.o \ + rtw8851b_rfk_table.o + +obj-$(CONFIG_RTW89_8851BE) += rtw89_8851be.o +rtw89_8851be-objs := rtw8851be.o + ++obj-$(CONFIG_RTW89_8851BU) += rtw89_8851bu.o ++rtw89_8851bu-objs := rtw8851bu.o ++ +obj-$(CONFIG_RTW89_8852A) += rtw89_8852a.o +rtw89_8852a-objs := rtw8852a.o \ + rtw8852a_table.o \ + rtw8852a_rfk.o \ + rtw8852a_rfk_table.o + +obj-$(CONFIG_RTW89_8852AE) += rtw89_8852ae.o +rtw89_8852ae-objs := rtw8852ae.o + +obj-$(CONFIG_RTW89_8852B_COMMON) += rtw89_8852b_common.o +rtw89_8852b_common-objs := rtw8852b_common.o + +obj-$(CONFIG_RTW89_8852B) += rtw89_8852b.o +rtw89_8852b-objs := rtw8852b.o \ + rtw8852b_table.o \ + rtw8852b_rfk.o \ + rtw8852b_rfk_table.o + +obj-$(CONFIG_RTW89_8852BE) += rtw89_8852be.o +rtw89_8852be-objs := rtw8852be.o + ++obj-$(CONFIG_RTW89_8852BU) += rtw89_8852bu.o ++rtw89_8852bu-objs := rtw8852bu.o ++ +obj-$(CONFIG_RTW89_8852BT) += rtw89_8852bt.o +rtw89_8852bt-objs := rtw8852bt.o \ + rtw8852bt_rfk.o \ + rtw8852bt_rfk_table.o + +obj-$(CONFIG_RTW89_8852BTE) += rtw89_8852bte.o +rtw89_8852bte-objs := rtw8852bte.o + +obj-$(CONFIG_RTW89_8852C) += rtw89_8852c.o +rtw89_8852c-objs := rtw8852c.o \ + rtw8852c_table.o \ + rtw8852c_rfk.o \ + rtw8852c_rfk_table.o + +obj-$(CONFIG_RTW89_8852CE) += rtw89_8852ce.o +rtw89_8852ce-objs := rtw8852ce.o + +obj-$(CONFIG_RTW89_8922A) += rtw89_8922a.o +rtw89_8922a-objs := rtw8922a.o \ + rtw8922a_rfk.o + +obj-$(CONFIG_RTW89_8922AE) += rtw89_8922ae.o +rtw89_8922ae-objs := rtw8922ae.o + +rtw89_core-$(CONFIG_RTW89_DEBUG) += debug.o + +obj-$(CONFIG_RTW89_PCI) += rtw89_pci.o +rtw89_pci-y := pci.o pci_be.o + ++obj-$(CONFIG_RTW89_USB) += rtw89_usb.o ++rtw89_usb-y := usb.o ++ diff --cc sys/contrib/dev/rtw89/acpi.c index f5dedb12c129,000000000000..fdba1ea46ec6 mode 100644,000000..100644 --- a/sys/contrib/dev/rtw89/acpi.c +++ b/sys/contrib/dev/rtw89/acpi.c @@@ -1,197 -1,0 +1,1289 @@@ +// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause +/* Copyright(c) 2021-2023 Realtek Corporation + */ + +#include +#include + +#include "acpi.h" +#include "debug.h" + +static const guid_t rtw89_guid = GUID_INIT(0xD2A8C3E8, 0x4B69, 0x4F00, + 0x82, 0xBD, 0xFE, 0x86, + 0x07, 0x80, 0x3A, 0xA7); + ++static u32 rtw89_acpi_traversal_object(struct rtw89_dev *rtwdev, ++ const union acpi_object *obj, u8 *pos) ++{ ++ const union acpi_object *elm; ++ unsigned int i; ++ u32 sub_len; ++ u32 len = 0; ++ u8 *tmp; ++ ++ switch (obj->type) { ++ case ACPI_TYPE_INTEGER: ++ if (pos) ++ pos[len] = obj->integer.value; ++ ++ len++; ++ break; ++ case ACPI_TYPE_BUFFER: ++ if (unlikely(obj->buffer.length == 0)) { ++ rtw89_debug(rtwdev, RTW89_DBG_ACPI, ++ "%s: invalid buffer type\n", __func__); ++ goto err; ++ } ++ ++ if (pos) ++ memcpy(pos, obj->buffer.pointer, obj->buffer.length); ++ ++ len += obj->buffer.length; ++ break; ++ case ACPI_TYPE_PACKAGE: ++ if (unlikely(obj->package.count == 0)) { ++ rtw89_debug(rtwdev, RTW89_DBG_ACPI, ++ "%s: invalid package type\n", __func__); ++ goto err; ++ } ++ ++ for (i = 0; i < obj->package.count; i++) { ++ elm = &obj->package.elements[i]; ++ tmp = pos ? pos + len : NULL; ++ ++ sub_len = rtw89_acpi_traversal_object(rtwdev, elm, tmp); ++ if (unlikely(sub_len == 0)) ++ goto err; ++ ++ len += sub_len; ++ } ++ break; ++ default: ++ rtw89_debug(rtwdev, RTW89_DBG_ACPI, "%s: unhandled type: %d\n", ++ __func__, obj->type); ++ goto err; ++ } ++ ++ return len; ++ ++err: ++ return 0; ++} ++ ++static u32 rtw89_acpi_calculate_object_length(struct rtw89_dev *rtwdev, ++ const union acpi_object *obj) ++{ ++ return rtw89_acpi_traversal_object(rtwdev, obj, NULL); ++} ++ ++static struct rtw89_acpi_data * ++rtw89_acpi_evaluate_method(struct rtw89_dev *rtwdev, const char *method) ++{ ++ struct acpi_buffer buf = {ACPI_ALLOCATE_BUFFER, NULL}; ++ struct rtw89_acpi_data *data = NULL; ++ acpi_handle root, handle; ++ union acpi_object *obj; ++ acpi_status status; ++ u32 len; ++ ++ root = ACPI_HANDLE(rtwdev->dev); ++ if (!root) { ++ rtw89_debug(rtwdev, RTW89_DBG_ACPI, ++ "acpi (%s): failed to get root\n", method); ++ return NULL; ++ } ++ ++#if defined(__linux__) ++ status = acpi_get_handle(root, (acpi_string)method, &handle); ++#elif defined(__FreeBSD__) ++ status = acpi_get_handle(root, method, &handle); ++#endif ++ if (ACPI_FAILURE(status)) { ++ rtw89_debug(rtwdev, RTW89_DBG_ACPI, ++ "acpi (%s): failed to get handle\n", method); ++ return NULL; ++ } ++ ++ status = acpi_evaluate_object(handle, NULL, NULL, &buf); ++ if (ACPI_FAILURE(status)) { ++ rtw89_debug(rtwdev, RTW89_DBG_ACPI, ++ "acpi (%s): failed to evaluate object\n", method); ++ return NULL; ++ } ++ ++ obj = buf.pointer; ++ len = rtw89_acpi_calculate_object_length(rtwdev, obj); ++ if (unlikely(len == 0)) { ++ rtw89_debug(rtwdev, RTW89_DBG_ACPI, ++ "acpi (%s): failed to traversal obj len\n", method); ++ goto out; ++ } ++ ++ data = kzalloc(struct_size(data, buf, len), GFP_KERNEL); ++ if (!data) ++ goto out; ++ ++ data->len = len; ++ rtw89_acpi_traversal_object(rtwdev, obj, data->buf); ++ ++out: ++ ACPI_FREE(obj); ++ return data; ++} ++ +static +int rtw89_acpi_dsm_get_value(struct rtw89_dev *rtwdev, union acpi_object *obj, + u8 *value) +{ + if (obj->type != ACPI_TYPE_INTEGER) { + rtw89_debug(rtwdev, RTW89_DBG_ACPI, + "acpi: expect integer but type: %d\n", obj->type); + return -EINVAL; + } + + *value = (u8)obj->integer.value; + return 0; +} + +static bool chk_acpi_policy_6ghz_sig(const struct rtw89_acpi_policy_6ghz *p) +{ + return p->signature[0] == 0x00 && + p->signature[1] == 0xE0 && + p->signature[2] == 0x4C; +} + +static +int rtw89_acpi_dsm_get_policy_6ghz(struct rtw89_dev *rtwdev, + union acpi_object *obj, + struct rtw89_acpi_policy_6ghz **policy_6ghz) +{ + const struct rtw89_acpi_policy_6ghz *ptr; + u32 expect_len; + u32 len; + + if (obj->type != ACPI_TYPE_BUFFER) { + rtw89_debug(rtwdev, RTW89_DBG_ACPI, + "acpi: expect buffer but type: %d\n", obj->type); + return -EINVAL; + } + + len = obj->buffer.length; + if (len < sizeof(*ptr)) { + rtw89_debug(rtwdev, RTW89_DBG_ACPI, "%s: invalid buffer length: %u\n", + __func__, len); + return -EINVAL; + } + + ptr = (typeof(ptr))obj->buffer.pointer; + if (!chk_acpi_policy_6ghz_sig(ptr)) { + rtw89_debug(rtwdev, RTW89_DBG_ACPI, "%s: bad signature\n", __func__); + return -EINVAL; + } + + expect_len = struct_size(ptr, country_list, ptr->country_count); + if (len < expect_len) { + rtw89_debug(rtwdev, RTW89_DBG_ACPI, "%s: expect %u but length: %u\n", + __func__, expect_len, len); + return -EINVAL; + } + + *policy_6ghz = kmemdup(ptr, expect_len, GFP_KERNEL); + if (!*policy_6ghz) + return -ENOMEM; + + rtw89_hex_dump(rtwdev, RTW89_DBG_ACPI, "policy_6ghz: ", *policy_6ghz, + expect_len); + return 0; +} + +static bool chk_acpi_policy_6ghz_sp_sig(const struct rtw89_acpi_policy_6ghz_sp *p) +{ + return p->signature[0] == 0x52 && + p->signature[1] == 0x54 && + p->signature[2] == 0x4B && + p->signature[3] == 0x07; +} + +static +int rtw89_acpi_dsm_get_policy_6ghz_sp(struct rtw89_dev *rtwdev, + union acpi_object *obj, + struct rtw89_acpi_policy_6ghz_sp **policy) +{ + const struct rtw89_acpi_policy_6ghz_sp *ptr; + u32 buf_len; + + if (obj->type != ACPI_TYPE_BUFFER) { + rtw89_debug(rtwdev, RTW89_DBG_ACPI, + "acpi: expect buffer but type: %d\n", obj->type); + return -EINVAL; + } + + buf_len = obj->buffer.length; + if (buf_len < sizeof(*ptr)) { + rtw89_debug(rtwdev, RTW89_DBG_ACPI, "%s: invalid buffer length: %u\n", + __func__, buf_len); + return -EINVAL; + } + + ptr = (typeof(ptr))obj->buffer.pointer; + if (!chk_acpi_policy_6ghz_sp_sig(ptr)) { + rtw89_debug(rtwdev, RTW89_DBG_ACPI, "%s: bad signature\n", __func__); + return -EINVAL; + } + + *policy = kmemdup(ptr, sizeof(*ptr), GFP_KERNEL); + if (!*policy) + return -ENOMEM; + + rtw89_hex_dump(rtwdev, RTW89_DBG_ACPI, "policy_6ghz_sp: ", *policy, + sizeof(*ptr)); + return 0; +} + ++static bool chk_acpi_policy_6ghz_vlp_sig(const struct rtw89_acpi_policy_6ghz_vlp *p) ++{ ++ return p->signature[0] == 0x52 && ++ p->signature[1] == 0x54 && ++ p->signature[2] == 0x4B && ++ p->signature[3] == 0x0B; ++} ++ ++static ++int rtw89_acpi_dsm_get_policy_6ghz_vlp(struct rtw89_dev *rtwdev, ++ union acpi_object *obj, ++ struct rtw89_acpi_policy_6ghz_vlp **policy) ++{ ++ const struct rtw89_acpi_policy_6ghz_vlp *ptr; ++ u32 buf_len; ++ ++ if (obj->type != ACPI_TYPE_BUFFER) { ++ rtw89_debug(rtwdev, RTW89_DBG_ACPI, ++ "acpi: expect buffer but type: %d\n", obj->type); ++ return -EINVAL; ++ } ++ ++ buf_len = obj->buffer.length; ++ if (buf_len < sizeof(*ptr)) { ++ rtw89_debug(rtwdev, RTW89_DBG_ACPI, "%s: invalid buffer length: %u\n", ++ __func__, buf_len); ++ return -EINVAL; ++ } ++ ++ ptr = (typeof(ptr))obj->buffer.pointer; ++ if (!chk_acpi_policy_6ghz_vlp_sig(ptr)) { ++ rtw89_debug(rtwdev, RTW89_DBG_ACPI, "%s: bad signature\n", __func__); ++ return -EINVAL; ++ } ++ ++ *policy = kmemdup(ptr, sizeof(*ptr), GFP_KERNEL); ++ if (!*policy) ++ return -ENOMEM; ++ ++ rtw89_hex_dump(rtwdev, RTW89_DBG_ACPI, "policy_6ghz_vlp: ", *policy, ++ sizeof(*ptr)); ++ return 0; ++} ++ ++static bool chk_acpi_policy_tas_sig(const struct rtw89_acpi_policy_tas *p) ++{ ++ return p->signature[0] == 0x52 && ++ p->signature[1] == 0x54 && ++ p->signature[2] == 0x4B && ++ p->signature[3] == 0x05; ++} ++ ++static int rtw89_acpi_dsm_get_policy_tas(struct rtw89_dev *rtwdev, ++ union acpi_object *obj, ++ struct rtw89_acpi_policy_tas **policy) ++{ ++ const struct rtw89_acpi_policy_tas *ptr; ++ u32 buf_len; ++ ++ if (obj->type != ACPI_TYPE_BUFFER) { ++ rtw89_debug(rtwdev, RTW89_DBG_ACPI, ++ "acpi: expect buffer but type: %d\n", obj->type); ++ return -EINVAL; ++ } ++ ++ buf_len = obj->buffer.length; ++ if (buf_len < sizeof(*ptr)) { ++ rtw89_debug(rtwdev, RTW89_DBG_ACPI, "%s: invalid buffer length: %u\n", ++ __func__, buf_len); ++ return -EINVAL; ++ } ++ ++ ptr = (typeof(ptr))obj->buffer.pointer; ++ if (!chk_acpi_policy_tas_sig(ptr)) { ++ rtw89_debug(rtwdev, RTW89_DBG_ACPI, "%s: bad signature\n", __func__); ++ return -EINVAL; ++ } ++ ++ *policy = kmemdup(ptr, sizeof(*ptr), GFP_KERNEL); ++ if (!*policy) ++ return -ENOMEM; ++ ++ rtw89_hex_dump(rtwdev, RTW89_DBG_ACPI, "policy_tas: ", *policy, ++ sizeof(*ptr)); ++ return 0; ++} ++ ++static ++bool chk_acpi_policy_reg_rules_sig(const struct rtw89_acpi_policy_reg_rules *p) ++{ ++ return p->signature[0] == 0x52 && ++ p->signature[1] == 0x54 && ++ p->signature[2] == 0x4B && ++ p->signature[3] == 0x0A; ++} ++ ++static ++int rtw89_acpi_dsm_get_policy_reg_rules(struct rtw89_dev *rtwdev, ++ union acpi_object *obj, ++ struct rtw89_acpi_policy_reg_rules **policy) ++{ ++ const struct rtw89_acpi_policy_reg_rules *ptr; ++ u32 buf_len; ++ ++ if (obj->type != ACPI_TYPE_BUFFER) { ++ rtw89_debug(rtwdev, RTW89_DBG_ACPI, ++ "acpi: expect buffer but type: %d\n", obj->type); ++ return -EINVAL; ++ } ++ ++ buf_len = obj->buffer.length; ++ if (buf_len < sizeof(*ptr)) { ++ rtw89_debug(rtwdev, RTW89_DBG_ACPI, "%s: invalid buffer length: %u\n", ++ __func__, buf_len); ++ return -EINVAL; ++ } ++ ++ ptr = (typeof(ptr))obj->buffer.pointer; ++ if (!chk_acpi_policy_reg_rules_sig(ptr)) { ++ rtw89_debug(rtwdev, RTW89_DBG_ACPI, "%s: bad signature\n", __func__); ++ return -EINVAL; ++ } ++ ++ *policy = kmemdup(ptr, sizeof(*ptr), GFP_KERNEL); ++ if (!*policy) ++ return -ENOMEM; ++ ++ rtw89_hex_dump(rtwdev, RTW89_DBG_ACPI, "policy_reg_rules: ", *policy, ++ sizeof(*ptr)); ++ return 0; ++} ++ +int rtw89_acpi_evaluate_dsm(struct rtw89_dev *rtwdev, + enum rtw89_acpi_dsm_func func, + struct rtw89_acpi_dsm_result *res) +{ + union acpi_object *obj; + int ret; + + obj = acpi_evaluate_dsm(ACPI_HANDLE(rtwdev->dev), &rtw89_guid, + 0, func, NULL); + if (!obj) { + rtw89_debug(rtwdev, RTW89_DBG_ACPI, + "acpi dsm fail to evaluate func: %d\n", func); + return -ENOENT; + } + + if (func == RTW89_ACPI_DSM_FUNC_6G_BP) + ret = rtw89_acpi_dsm_get_policy_6ghz(rtwdev, obj, + &res->u.policy_6ghz); + else if (func == RTW89_ACPI_DSM_FUNC_6GHZ_SP_SUP) + ret = rtw89_acpi_dsm_get_policy_6ghz_sp(rtwdev, obj, + &res->u.policy_6ghz_sp); ++ else if (func == RTW89_ACPI_DSM_FUNC_6GHZ_VLP_SUP) ++ ret = rtw89_acpi_dsm_get_policy_6ghz_vlp(rtwdev, obj, ++ &res->u.policy_6ghz_vlp); ++ else if (func == RTW89_ACPI_DSM_FUNC_TAS_EN) ++ ret = rtw89_acpi_dsm_get_policy_tas(rtwdev, obj, &res->u.policy_tas); ++ else if (func == RTW89_ACPI_DSM_FUNC_REG_RULES_EN) ++ ret = rtw89_acpi_dsm_get_policy_reg_rules(rtwdev, obj, ++ &res->u.policy_reg_rules); + else + ret = rtw89_acpi_dsm_get_value(rtwdev, obj, &res->u.value); + + ACPI_FREE(obj); + return ret; +} + +int rtw89_acpi_evaluate_rtag(struct rtw89_dev *rtwdev, + struct rtw89_acpi_rtag_result *res) +{ - struct acpi_buffer buf = {ACPI_ALLOCATE_BUFFER, NULL}; - acpi_handle root, handle; - union acpi_object *obj; - acpi_status status; ++#if defined(__linux__) ++ const struct rtw89_acpi_data *data; ++#elif defined(__FreeBSD__) ++ struct rtw89_acpi_data *data; ++#endif + u32 buf_len; + int ret = 0; + - root = ACPI_HANDLE(rtwdev->dev); - if (!root) - return -EOPNOTSUPP; - - status = acpi_get_handle(root, (acpi_string)"RTAG", &handle); - if (ACPI_FAILURE(status)) ++ data = rtw89_acpi_evaluate_method(rtwdev, "RTAG"); ++ if (!data) + return -EIO; + - status = acpi_evaluate_object(handle, NULL, NULL, &buf); - if (ACPI_FAILURE(status)) - return -EIO; ++ buf_len = data->len; ++ if (buf_len != sizeof(*res)) { ++ rtw89_debug(rtwdev, RTW89_DBG_ACPI, "%s: invalid buffer length: %u\n", ++ __func__, buf_len); ++ ret = -EINVAL; ++ goto out; ++ } + - obj = buf.pointer; - if (obj->type != ACPI_TYPE_BUFFER) { ++ *res = *(struct rtw89_acpi_rtag_result *)data->buf; ++ ++ rtw89_hex_dump(rtwdev, RTW89_DBG_ACPI, "antenna_gain: ", res, sizeof(*res)); ++ ++out: ++ kfree(data); ++ return ret; ++} ++ ++enum rtw89_acpi_sar_subband rtw89_acpi_sar_get_subband(struct rtw89_dev *rtwdev, ++ u32 center_freq) ++{ ++ switch (center_freq) { ++ default: + rtw89_debug(rtwdev, RTW89_DBG_ACPI, - "acpi: expect buffer but type: %d\n", obj->type); - ret = -EINVAL; ++ "center freq %u to ACPI SAR subband is unhandled\n", ++ center_freq); ++ fallthrough; ++ case 2412 ... 2484: ++ return RTW89_ACPI_SAR_2GHZ_SUBBAND; ++ case 5180 ... 5240: ++ return RTW89_ACPI_SAR_5GHZ_SUBBAND_1; ++ case 5250 ... 5320: ++ return RTW89_ACPI_SAR_5GHZ_SUBBAND_2; ++ case 5500 ... 5720: ++ return RTW89_ACPI_SAR_5GHZ_SUBBAND_2E; ++ case 5745 ... 5885: ++ return RTW89_ACPI_SAR_5GHZ_SUBBAND_3_4; ++ case 5955 ... 6155: ++ return RTW89_ACPI_SAR_6GHZ_SUBBAND_5_L; ++ case 6175 ... 6415: ++ return RTW89_ACPI_SAR_6GHZ_SUBBAND_5_H; ++ case 6435 ... 6515: ++ return RTW89_ACPI_SAR_6GHZ_SUBBAND_6; ++ case 6535 ... 6695: ++ return RTW89_ACPI_SAR_6GHZ_SUBBAND_7_L; ++ case 6715 ... 6855: ++ return RTW89_ACPI_SAR_6GHZ_SUBBAND_7_H; ++ ++ /* freq 6875 (ch 185, 20MHz) spans RTW89_ACPI_SAR_6GHZ_SUBBAND_7_H ++ * and RTW89_ACPI_SAR_6GHZ_SUBBAND_8, so directly describe it with ++ * struct rtw89_6ghz_span. ++ */ ++ ++ case 6895 ... 7115: ++ return RTW89_ACPI_SAR_6GHZ_SUBBAND_8; ++ } ++} ++ ++enum rtw89_band rtw89_acpi_sar_subband_to_band(struct rtw89_dev *rtwdev, ++ enum rtw89_acpi_sar_subband subband) ++{ ++ switch (subband) { ++ default: ++ rtw89_debug(rtwdev, RTW89_DBG_ACPI, ++ "ACPI SAR subband %u to band is unhandled\n", subband); ++ fallthrough; ++ case RTW89_ACPI_SAR_2GHZ_SUBBAND: ++ return RTW89_BAND_2G; ++ case RTW89_ACPI_SAR_5GHZ_SUBBAND_1: ++ return RTW89_BAND_5G; ++ case RTW89_ACPI_SAR_5GHZ_SUBBAND_2: ++ return RTW89_BAND_5G; ++ case RTW89_ACPI_SAR_5GHZ_SUBBAND_2E: ++ return RTW89_BAND_5G; ++ case RTW89_ACPI_SAR_5GHZ_SUBBAND_3_4: ++ return RTW89_BAND_5G; ++ case RTW89_ACPI_SAR_6GHZ_SUBBAND_5_L: ++ return RTW89_BAND_6G; ++ case RTW89_ACPI_SAR_6GHZ_SUBBAND_5_H: ++ return RTW89_BAND_6G; ++ case RTW89_ACPI_SAR_6GHZ_SUBBAND_6: ++ return RTW89_BAND_6G; ++ case RTW89_ACPI_SAR_6GHZ_SUBBAND_7_L: ++ return RTW89_BAND_6G; ++ case RTW89_ACPI_SAR_6GHZ_SUBBAND_7_H: ++ return RTW89_BAND_6G; ++ case RTW89_ACPI_SAR_6GHZ_SUBBAND_8: ++ return RTW89_BAND_6G; ++ } ++} ++ ++static u8 rtw89_acpi_sar_rfpath_to_hp_antidx(enum rtw89_rf_path rfpath) ++{ ++ switch (rfpath) { ++ default: ++ case RF_PATH_B: ++ return 0; ++ case RF_PATH_A: ++ return 1; ++ } ++} ++ ++static u8 rtw89_acpi_sar_rfpath_to_rt_antidx(enum rtw89_rf_path rfpath) ++{ ++ switch (rfpath) { ++ default: ++ case RF_PATH_A: ++ return 0; ++ case RF_PATH_B: ++ return 1; ++ } ++} ++ ++static s16 rtw89_acpi_sar_normalize_hp_val(u8 v) ++{ ++ static const u8 bias = 10; ++ static const u8 fct = 1; ++ u16 res; ++ ++ BUILD_BUG_ON(fct > TXPWR_FACTOR_OF_RTW89_ACPI_SAR); ++ ++ res = (bias << TXPWR_FACTOR_OF_RTW89_ACPI_SAR) + ++ (v << (TXPWR_FACTOR_OF_RTW89_ACPI_SAR - fct)); ++ ++ return min_t(s32, res, MAX_VAL_OF_RTW89_ACPI_SAR); ++} ++ ++static s16 rtw89_acpi_sar_normalize_rt_val(u8 v) ++{ ++ static const u8 fct = 3; ++ u16 res; ++ ++ BUILD_BUG_ON(fct > TXPWR_FACTOR_OF_RTW89_ACPI_SAR); ++ ++ res = v << (TXPWR_FACTOR_OF_RTW89_ACPI_SAR - fct); ++ ++ return min_t(s32, res, MAX_VAL_OF_RTW89_ACPI_SAR); ++} ++ ++static ++void rtw89_acpi_sar_load_std_legacy(struct rtw89_dev *rtwdev, ++ const struct rtw89_acpi_sar_recognition *rec, ++ const void *content, ++ struct rtw89_sar_entry_from_acpi *ent) ++{ ++ const struct rtw89_acpi_sar_std_legacy *ptr = content; ++ enum rtw89_acpi_sar_subband subband; ++ enum rtw89_rf_path path; ++ ++ for (subband = 0; subband < NUM_OF_RTW89_ACPI_SAR_SUBBAND; subband++) { ++ for (path = 0; path < NUM_OF_RTW89_ACPI_SAR_RF_PATH; path++) { ++ u8 antidx = rec->rfpath_to_antidx(path); ++ ++ if (subband < RTW89_ACPI_SAR_SUBBAND_NR_LEGACY) ++ ent->v[subband][path] = ++ rec->normalize(ptr->v[antidx][subband]); ++ else ++ ent->v[subband][path] = MAX_VAL_OF_RTW89_ACPI_SAR; ++ } ++ } ++} ++ ++static ++void rtw89_acpi_sar_load_std_has_6ghz(struct rtw89_dev *rtwdev, ++ const struct rtw89_acpi_sar_recognition *rec, ++ const void *content, ++ struct rtw89_sar_entry_from_acpi *ent) ++{ ++ const struct rtw89_acpi_sar_std_has_6ghz *ptr = content; ++ enum rtw89_acpi_sar_subband subband; ++ enum rtw89_rf_path path; ++ ++ BUILD_BUG_ON(RTW89_ACPI_SAR_SUBBAND_NR_HAS_6GHZ != NUM_OF_RTW89_ACPI_SAR_SUBBAND); ++ ++ for (subband = 0; subband < NUM_OF_RTW89_ACPI_SAR_SUBBAND; subband++) { ++ for (path = 0; path < NUM_OF_RTW89_ACPI_SAR_RF_PATH; path++) { ++ u8 antidx = rec->rfpath_to_antidx(path); ++ ++ ent->v[subband][path] = rec->normalize(ptr->v[antidx][subband]); ++ } ++ } ++} ++ ++static ++void rtw89_acpi_sar_load_sml_legacy(struct rtw89_dev *rtwdev, ++ const struct rtw89_acpi_sar_recognition *rec, ++ const void *content, ++ struct rtw89_sar_entry_from_acpi *ent) ++{ ++ const struct rtw89_acpi_sar_sml_legacy *ptr = content; ++ enum rtw89_acpi_sar_subband subband; ++ enum rtw89_rf_path path; ++ ++ for (subband = 0; subband < NUM_OF_RTW89_ACPI_SAR_SUBBAND; subband++) { ++ for (path = 0; path < NUM_OF_RTW89_ACPI_SAR_RF_PATH; path++) { ++ u8 antidx = rec->rfpath_to_antidx(path); ++ ++ if (subband < RTW89_ACPI_SAR_SUBBAND_NR_LEGACY) ++ ent->v[subband][path] = ++ rec->normalize(ptr->v[antidx][subband]); ++ else ++ ent->v[subband][path] = MAX_VAL_OF_RTW89_ACPI_SAR; ++ } ++ } ++} ++ ++static ++void rtw89_acpi_sar_load_sml_has_6ghz(struct rtw89_dev *rtwdev, ++ const struct rtw89_acpi_sar_recognition *rec, ++ const void *content, ++ struct rtw89_sar_entry_from_acpi *ent) ++{ ++ const struct rtw89_acpi_sar_sml_has_6ghz *ptr = content; ++ enum rtw89_acpi_sar_subband subband; ++ enum rtw89_rf_path path; ++ ++ BUILD_BUG_ON(RTW89_ACPI_SAR_SUBBAND_NR_HAS_6GHZ != NUM_OF_RTW89_ACPI_SAR_SUBBAND); ++ ++ for (subband = 0; subband < NUM_OF_RTW89_ACPI_SAR_SUBBAND; subband++) { ++ for (path = 0; path < NUM_OF_RTW89_ACPI_SAR_RF_PATH; path++) { ++ u8 antidx = rec->rfpath_to_antidx(path); ++ ++ ent->v[subband][path] = rec->normalize(ptr->v[antidx][subband]); ++ } ++ } ++} ++ ++static s16 rtw89_acpi_geo_sar_normalize_delta(s8 delta) ++{ ++ static const u8 fct = 1; ++ ++ BUILD_BUG_ON(fct > TXPWR_FACTOR_OF_RTW89_ACPI_SAR); ++ ++ return delta << (TXPWR_FACTOR_OF_RTW89_ACPI_SAR - fct); ++} ++ ++static enum rtw89_acpi_geo_sar_regd_hp ++rtw89_acpi_geo_sar_regd_convert_hp_idx(enum rtw89_regulation_type regd) ++{ ++ switch (regd) { ++ case RTW89_FCC: ++ case RTW89_IC: ++ case RTW89_NCC: ++ case RTW89_CHILE: ++ case RTW89_MEXICO: ++ return RTW89_ACPI_GEO_SAR_REGD_HP_FCC; ++ case RTW89_ETSI: ++ case RTW89_MKK: ++ case RTW89_ACMA: ++ return RTW89_ACPI_GEO_SAR_REGD_HP_ETSI; ++ default: ++ case RTW89_WW: ++ case RTW89_NA: ++ case RTW89_KCC: ++ return RTW89_ACPI_GEO_SAR_REGD_HP_WW; ++ } ++} ++ ++static enum rtw89_acpi_geo_sar_regd_rt ++rtw89_acpi_geo_sar_regd_convert_rt_idx(enum rtw89_regulation_type regd) ++{ ++ switch (regd) { ++ case RTW89_FCC: ++ case RTW89_NCC: ++ case RTW89_CHILE: ++ case RTW89_MEXICO: ++ return RTW89_ACPI_GEO_SAR_REGD_RT_FCC; ++ case RTW89_ETSI: ++ case RTW89_ACMA: ++ return RTW89_ACPI_GEO_SAR_REGD_RT_ETSI; ++ case RTW89_MKK: ++ return RTW89_ACPI_GEO_SAR_REGD_RT_MKK; ++ case RTW89_IC: ++ return RTW89_ACPI_GEO_SAR_REGD_RT_IC; ++ case RTW89_KCC: ++ return RTW89_ACPI_GEO_SAR_REGD_RT_KCC; ++ default: ++ case RTW89_WW: ++ case RTW89_NA: ++ return RTW89_ACPI_GEO_SAR_REGD_RT_WW; ++ } ++} ++ ++static ++void rtw89_acpi_geo_sar_load_by_hp(struct rtw89_dev *rtwdev, ++ const struct rtw89_acpi_geo_sar_hp_val *ptr, ++ enum rtw89_rf_path path, s16 *val) ++{ ++ u8 antidx = rtw89_acpi_sar_rfpath_to_hp_antidx(path); ++ s16 delta = rtw89_acpi_geo_sar_normalize_delta(ptr->delta[antidx]); ++ s16 max = rtw89_acpi_sar_normalize_hp_val(ptr->max); ++ ++ *val = clamp_t(s32, (*val) + delta, MIN_VAL_OF_RTW89_ACPI_SAR, max); ++} ++ ++static ++void rtw89_acpi_geo_sar_load_by_rt(struct rtw89_dev *rtwdev, ++ const struct rtw89_acpi_geo_sar_rt_val *ptr, ++ s16 *val) ++{ ++ s16 delta = rtw89_acpi_geo_sar_normalize_delta(ptr->delta); ++ s16 max = rtw89_acpi_sar_normalize_rt_val(ptr->max); ++ ++ *val = clamp_t(s32, (*val) + delta, MIN_VAL_OF_RTW89_ACPI_SAR, max); ++} ++ ++static ++void rtw89_acpi_geo_sar_load_hp_legacy(struct rtw89_dev *rtwdev, ++ const void *content, ++ enum rtw89_regulation_type regd, ++ struct rtw89_sar_entry_from_acpi *ent) ++{ ++ const struct rtw89_acpi_geo_sar_hp_legacy *ptr = content; ++ const struct rtw89_acpi_geo_sar_hp_legacy_entry *ptr_ent; ++ const struct rtw89_acpi_geo_sar_hp_val *ptr_ent_val; ++ enum rtw89_acpi_geo_sar_regd_hp geo_idx = ++ rtw89_acpi_geo_sar_regd_convert_hp_idx(regd); ++ enum rtw89_acpi_sar_subband subband; ++ enum rtw89_rf_path path; ++ enum rtw89_band band; ++ ++ ptr_ent = &ptr->entries[geo_idx]; ++ ++ for (subband = 0; subband < NUM_OF_RTW89_ACPI_SAR_SUBBAND; subband++) { ++ band = rtw89_acpi_sar_subband_to_band(rtwdev, subband); ++ switch (band) { ++ case RTW89_BAND_2G: ++ ptr_ent_val = &ptr_ent->val_2ghz; ++ break; ++ case RTW89_BAND_5G: ++ ptr_ent_val = &ptr_ent->val_5ghz; ++ break; ++ default: ++ case RTW89_BAND_6G: ++ ptr_ent_val = NULL; ++ break; ++ } ++ ++ if (!ptr_ent_val) ++ continue; ++ ++ for (path = 0; path < NUM_OF_RTW89_ACPI_SAR_RF_PATH; path++) ++ rtw89_acpi_geo_sar_load_by_hp(rtwdev, ptr_ent_val, path, ++ &ent->v[subband][path]); ++ } ++} ++ ++static ++void rtw89_acpi_geo_sar_load_hp_has_6ghz(struct rtw89_dev *rtwdev, ++ const void *content, ++ enum rtw89_regulation_type regd, ++ struct rtw89_sar_entry_from_acpi *ent) ++{ ++ const struct rtw89_acpi_geo_sar_hp_has_6ghz *ptr = content; ++ const struct rtw89_acpi_geo_sar_hp_has_6ghz_entry *ptr_ent; ++ const struct rtw89_acpi_geo_sar_hp_val *ptr_ent_val; ++ enum rtw89_acpi_geo_sar_regd_hp geo_idx = *** 60416 LINES SKIPPED *** From nobody Thu Oct 23 21:28:29 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cszfk45YQz6DZ83; Thu, 23 Oct 2025 21:28:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cszfj6hDSz4PjY; Thu, 23 Oct 2025 21:28:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761254910; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3o6ikAW2ShEpVMZ1b/JE3aAEjaaChS06SsxVNQivCkI=; b=hyNZeMYQq3yV2tcXY0dhmdklZhHNPg8UfpDFenIBfg8HI4O4W01Ew9VAF3Qmk+fk8Etm1+ LXLTc3oc6eJ6OQuOiDdnlrR3zAWZ9uPzu03hpHXwiX7VP7FiuuRPRRRi9ehBxiBZhnp3ki djfDIw3irOizD55CTErf6MxQNcKXRyJUreljGxNWS4o/SHKVjGY3XPBU/naujFzU8GKivy gm+tVk8HLxsSRUfckuN8iM5JgicE2Olibl/5onK8l/rHKndHn+3F/xFjCTlQEmd/20FHFO 2OgfI/SYNopXFIMd7iZlx+iS6NYiROQmrdBbue2rH5qMlpIOFa8RE190AKga5w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761254910; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3o6ikAW2ShEpVMZ1b/JE3aAEjaaChS06SsxVNQivCkI=; b=QW+CNZJ5Ue4Y+x9UO3w/u7gXu4MiOpdV0ogg8t+1lC28Wk647fT0B1G7ztRLnrYhlTgxmQ d7H8pOTsqkS3u133ff/mlHWyAhnxrb7q0CFQTwme3V/k3CQzyQ+kxUD1WHN1bcd+omvb93 /xL3O/+Vach2ijkI/AdjP+tQVQniTHFh5AMjgoRg4Pru+HjW5qE1Up0L04V4nFDf+ViIuX +AdSJX28TkSV7V0Sxz1HyTP9KRgopOThqG25Hk8JvjV4DM/nHcUece4jUUWClZmaK/9KMd heqtwle/ibgHVMDpZvCVclPMGw3htCa6cI2biirpxImAwdWgxTvNnxGnYwlf3w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761254910; a=rsa-sha256; cv=none; b=KgPQrVFq4az+rpuU8VJTnnQ36SAcUxeGUZIzJNKOQFS6IoCYoWknO0Y1e8IzFWV485CXrA xNtX29gfyfF7f/WNc+VH2LfxYp5378yGmfIoS6oerJYbC0H2oSh+ifEuMbv3fw/s5+PLAL F84O46KZsGg5wyUFzY0fFiyifVOU2m5uhxwXF6F+gGt9wE7sOE/zANIxGlE3ZRvjmxYjN2 hbvFsRLDvHlWjh+VwIzxk6FDcXt+8XM2lTUOG3aXr5aERNTVVgGaWSneLkdb7hBikFs6VX sOr54Exh1c9PsgfTKEV3jckcP1i3tYLRbN/sFti0jX3jtJXPymm2yPY4KaR+fA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cszfj6GPtzXY8; Thu, 23 Oct 2025 21:28: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 59NLST2Y081596; Thu, 23 Oct 2025 21:28:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59NLSTW6081590; Thu, 23 Oct 2025 21:28:29 GMT (envelope-from git) Date: Thu, 23 Oct 2025 21:28:29 GMT Message-Id: <202510232128.59NLSTW6081590@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 14b53301e8d4 - main - mt76: update Mediatek's mt76 driver List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 14b53301e8d482654f94c23e6884fe96b3d26825 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=14b53301e8d482654f94c23e6884fe96b3d26825 commit 14b53301e8d482654f94c23e6884fe96b3d26825 Merge: 354a030185c6 731c85b79831 Author: Bjoern A. Zeeb AuthorDate: 2025-10-17 21:22:52 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-10-23 21:26:07 +0000 mt76: update Mediatek's mt76 driver This version is based on git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git e5f0a698b34ed76002dc5cff3804a61c80233a7a ( tag: v6.17 ). MFC after: 3 days sys/contrib/dev/mediatek/mt76/channel.c | 9 +- sys/contrib/dev/mediatek/mt76/dma.c | 14 +- sys/contrib/dev/mediatek/mt76/eeprom.c | 4 + sys/contrib/dev/mediatek/mt76/mac80211.c | 70 +- sys/contrib/dev/mediatek/mt76/mcu.c | 4 + sys/contrib/dev/mediatek/mt76/mt76.h | 53 +- sys/contrib/dev/mediatek/mt76/mt7603/dma.c | 2 +- sys/contrib/dev/mediatek/mt76/mt7603/mac.c | 10 +- sys/contrib/dev/mediatek/mt76/mt7603/main.c | 5 +- sys/contrib/dev/mediatek/mt76/mt7615/init.c | 2 +- sys/contrib/dev/mediatek/mt76/mt7615/mac.c | 7 +- sys/contrib/dev/mediatek/mt76/mt7615/main.c | 17 +- sys/contrib/dev/mediatek/mt76/mt7615/mcu.c | 6 +- sys/contrib/dev/mediatek/mt76/mt7615/pci_mac.c | 4 +- sys/contrib/dev/mediatek/mt76/mt7615/sdio_mcu.c | 180 ---- sys/contrib/dev/mediatek/mt76/mt7615/usb.c | 2 +- sys/contrib/dev/mediatek/mt76/mt7615/usb_mcu.c | 100 --- sys/contrib/dev/mediatek/mt76/mt76_connac.h | 7 +- sys/contrib/dev/mediatek/mt76/mt76_connac3_mac.h | 4 + sys/contrib/dev/mediatek/mt76/mt76_connac_mac.c | 2 +- sys/contrib/dev/mediatek/mt76/mt76_connac_mcu.c | 51 +- sys/contrib/dev/mediatek/mt76/mt76_connac_mcu.h | 14 + sys/contrib/dev/mediatek/mt76/mt76x0/pci.c | 3 +- sys/contrib/dev/mediatek/mt76/mt76x02.h | 9 +- sys/contrib/dev/mediatek/mt76/mt76x02_mac.c | 4 +- sys/contrib/dev/mediatek/mt76/mt76x02_mmio.c | 1 - sys/contrib/dev/mediatek/mt76/mt76x02_usb_core.c | 4 +- sys/contrib/dev/mediatek/mt76/mt76x02_util.c | 4 +- sys/contrib/dev/mediatek/mt76/mt76x2/pci.c | 3 +- sys/contrib/dev/mediatek/mt76/mt76x2/pci_main.c | 6 +- sys/contrib/dev/mediatek/mt76/mt76x2/usb.c | 6 +- sys/contrib/dev/mediatek/mt76/mt76x2/usb_init.c | 13 +- sys/contrib/dev/mediatek/mt76/mt76x2/usb_main.c | 2 +- sys/contrib/dev/mediatek/mt76/mt7915/debugfs.c | 81 +- sys/contrib/dev/mediatek/mt76/mt7915/eeprom.c | 33 +- sys/contrib/dev/mediatek/mt76/mt7915/eeprom.h | 1 + sys/contrib/dev/mediatek/mt76/mt7915/init.c | 16 +- sys/contrib/dev/mediatek/mt76/mt7915/mac.c | 84 +- sys/contrib/dev/mediatek/mt76/mt7915/main.c | 13 +- sys/contrib/dev/mediatek/mt76/mt7915/mcu.c | 86 +- sys/contrib/dev/mediatek/mt76/mt7915/mcu.h | 14 +- sys/contrib/dev/mediatek/mt76/mt7915/mmio.c | 11 +- sys/contrib/dev/mediatek/mt76/mt7915/mt7915.h | 25 +- sys/contrib/dev/mediatek/mt76/mt7921/mac.c | 8 +- sys/contrib/dev/mediatek/mt76/mt7921/main.c | 28 +- sys/contrib/dev/mediatek/mt76/mt7921/sdio.c | 2 + sys/contrib/dev/mediatek/mt76/mt7921/sdio_mac.c | 58 ++ sys/contrib/dev/mediatek/mt76/mt7925/Makefile | 1 + sys/contrib/dev/mediatek/mt76/mt7925/init.c | 104 +++ sys/contrib/dev/mediatek/mt76/mt7925/mac.c | 8 +- sys/contrib/dev/mediatek/mt76/mt7925/main.c | 219 +++-- sys/contrib/dev/mediatek/mt76/mt7925/mcu.c | 522 +++++++---- sys/contrib/dev/mediatek/mt76/mt7925/mcu.h | 93 +- sys/contrib/dev/mediatek/mt76/mt7925/mt7925.h | 42 +- sys/contrib/dev/mediatek/mt76/mt7925/pci.c | 7 +- sys/contrib/dev/mediatek/mt76/mt7925/regs.h | 4 +- sys/contrib/dev/mediatek/mt76/mt7925/testmode.c | 201 +++++ sys/contrib/dev/mediatek/mt76/mt792x.h | 22 +- sys/contrib/dev/mediatek/mt76/mt792x_acpi_sar.c | 123 ++- sys/contrib/dev/mediatek/mt76/mt792x_acpi_sar.h | 18 +- sys/contrib/dev/mediatek/mt76/mt792x_core.c | 45 +- sys/contrib/dev/mediatek/mt76/mt792x_mac.c | 5 +- sys/contrib/dev/mediatek/mt76/mt7996/coredump.c | 4 +- sys/contrib/dev/mediatek/mt76/mt7996/debugfs.c | 73 +- sys/contrib/dev/mediatek/mt76/mt7996/dma.c | 196 +++-- sys/contrib/dev/mediatek/mt76/mt7996/eeprom.c | 42 +- sys/contrib/dev/mediatek/mt76/mt7996/init.c | 45 +- sys/contrib/dev/mediatek/mt76/mt7996/mac.c | 492 +++++++---- sys/contrib/dev/mediatek/mt76/mt7996/main.c | 1028 ++++++++++++++++------ sys/contrib/dev/mediatek/mt76/mt7996/mcu.c | 907 ++++++++++++------- sys/contrib/dev/mediatek/mt76/mt7996/mcu.h | 59 +- sys/contrib/dev/mediatek/mt76/mt7996/mmio.c | 200 ++++- sys/contrib/dev/mediatek/mt76/mt7996/mt7996.h | 156 ++-- sys/contrib/dev/mediatek/mt76/mt7996/pci.c | 26 +- sys/contrib/dev/mediatek/mt76/mt7996/regs.h | 51 +- sys/contrib/dev/mediatek/mt76/scan.c | 21 +- sys/contrib/dev/mediatek/mt76/sdio_txrx.c | 6 +- sys/contrib/dev/mediatek/mt76/tx.c | 26 +- sys/contrib/dev/mediatek/mt76/util.c | 2 +- sys/contrib/dev/mediatek/mt76/wed.c | 6 +- sys/modules/mt76/Makefile.inc | 1 + 81 files changed, 3978 insertions(+), 1859 deletions(-) diff --cc sys/contrib/dev/mediatek/mt76/dma.c index 6765e1281ac3,000000000000..af902a761e42 mode 100644,000000..100644 --- a/sys/contrib/dev/mediatek/mt76/dma.c +++ b/sys/contrib/dev/mediatek/mt76/dma.c @@@ -1,1066 -1,0 +1,1062 @@@ +// SPDX-License-Identifier: ISC +/* + * Copyright (C) 2016 Felix Fietkau + */ + +#include +#if defined(__FreeBSD__) +#include - #include ++#include +#endif +#include "mt76.h" +#include "dma.h" + +#if IS_ENABLED(CONFIG_NET_MEDIATEK_SOC_WED) + +#define Q_READ(_q, _field) ({ \ + u32 _offset = offsetof(struct mt76_queue_regs, _field); \ + u32 _val; \ + if ((_q)->flags & MT_QFLAG_WED) \ + _val = mtk_wed_device_reg_read((_q)->wed, \ + ((_q)->wed_regs + \ + _offset)); \ + else \ + _val = readl(&(_q)->regs->_field); \ + _val; \ +}) + +#define Q_WRITE(_q, _field, _val) do { \ + u32 _offset = offsetof(struct mt76_queue_regs, _field); \ + if ((_q)->flags & MT_QFLAG_WED) \ + mtk_wed_device_reg_write((_q)->wed, \ + ((_q)->wed_regs + _offset), \ + _val); \ + else \ + writel(_val, &(_q)->regs->_field); \ +} while (0) + +#else + +#define Q_READ(_q, _field) readl(&(_q)->regs->_field) +#define Q_WRITE(_q, _field, _val) writel(_val, &(_q)->regs->_field) + +#endif + +static struct mt76_txwi_cache * +mt76_alloc_txwi(struct mt76_dev *dev) +{ + struct mt76_txwi_cache *t; + dma_addr_t addr; + u8 *txwi; + int size; + + size = L1_CACHE_ALIGN(dev->drv->txwi_size + sizeof(*t)); + txwi = kzalloc(size, GFP_ATOMIC); + if (!txwi) + return NULL; + + addr = dma_map_single(dev->dma_dev, txwi, dev->drv->txwi_size, + DMA_TO_DEVICE); + if (unlikely(dma_mapping_error(dev->dma_dev, addr))) { + kfree(txwi); + return NULL; + } + + t = (struct mt76_txwi_cache *)(txwi + dev->drv->txwi_size); + t->dma_addr = addr; + + return t; +} + +static struct mt76_txwi_cache * +mt76_alloc_rxwi(struct mt76_dev *dev) +{ + struct mt76_txwi_cache *t; + + t = kzalloc(L1_CACHE_ALIGN(sizeof(*t)), GFP_ATOMIC); + if (!t) + return NULL; + + t->ptr = NULL; + return t; +} + +static struct mt76_txwi_cache * +__mt76_get_txwi(struct mt76_dev *dev) +{ + struct mt76_txwi_cache *t = NULL; + + spin_lock(&dev->lock); + if (!list_empty(&dev->txwi_cache)) { + t = list_first_entry(&dev->txwi_cache, struct mt76_txwi_cache, + list); + list_del(&t->list); + } + spin_unlock(&dev->lock); + + return t; +} + +static struct mt76_txwi_cache * +__mt76_get_rxwi(struct mt76_dev *dev) +{ + struct mt76_txwi_cache *t = NULL; + + spin_lock_bh(&dev->wed_lock); + if (!list_empty(&dev->rxwi_cache)) { + t = list_first_entry(&dev->rxwi_cache, struct mt76_txwi_cache, + list); + list_del(&t->list); + } + spin_unlock_bh(&dev->wed_lock); + + return t; +} + +static struct mt76_txwi_cache * +mt76_get_txwi(struct mt76_dev *dev) +{ + struct mt76_txwi_cache *t = __mt76_get_txwi(dev); + + if (t) + return t; + + return mt76_alloc_txwi(dev); +} + +struct mt76_txwi_cache * +mt76_get_rxwi(struct mt76_dev *dev) +{ + struct mt76_txwi_cache *t = __mt76_get_rxwi(dev); + + if (t) + return t; + + return mt76_alloc_rxwi(dev); +} +EXPORT_SYMBOL_GPL(mt76_get_rxwi); + +void +mt76_put_txwi(struct mt76_dev *dev, struct mt76_txwi_cache *t) +{ + if (!t) + return; + + spin_lock(&dev->lock); + list_add(&t->list, &dev->txwi_cache); + spin_unlock(&dev->lock); +} +EXPORT_SYMBOL_GPL(mt76_put_txwi); + +void +mt76_put_rxwi(struct mt76_dev *dev, struct mt76_txwi_cache *t) +{ + if (!t) + return; + + spin_lock_bh(&dev->wed_lock); + list_add(&t->list, &dev->rxwi_cache); + spin_unlock_bh(&dev->wed_lock); +} +EXPORT_SYMBOL_GPL(mt76_put_rxwi); + +static void +mt76_free_pending_txwi(struct mt76_dev *dev) +{ + struct mt76_txwi_cache *t; + + local_bh_disable(); + while ((t = __mt76_get_txwi(dev)) != NULL) { + dma_unmap_single(dev->dma_dev, t->dma_addr, dev->drv->txwi_size, + DMA_TO_DEVICE); + kfree(mt76_get_txwi_ptr(dev, t)); + } + local_bh_enable(); +} + +void +mt76_free_pending_rxwi(struct mt76_dev *dev) +{ + struct mt76_txwi_cache *t; + + local_bh_disable(); + while ((t = __mt76_get_rxwi(dev)) != NULL) { + if (t->ptr) + mt76_put_page_pool_buf(t->ptr, false); + kfree(t); + } + local_bh_enable(); +} +EXPORT_SYMBOL_GPL(mt76_free_pending_rxwi); + +static void +mt76_dma_sync_idx(struct mt76_dev *dev, struct mt76_queue *q) +{ + Q_WRITE(q, desc_base, q->desc_dma); + if (q->flags & MT_QFLAG_WED_RRO_EN) + Q_WRITE(q, ring_size, MT_DMA_RRO_EN | q->ndesc); + else + Q_WRITE(q, ring_size, q->ndesc); + q->head = Q_READ(q, dma_idx); + q->tail = q->head; +} + +void __mt76_dma_queue_reset(struct mt76_dev *dev, struct mt76_queue *q, + bool reset_idx) +{ + if (!q || !q->ndesc) + return; + + if (!mt76_queue_is_wed_rro_ind(q)) { + int i; + + /* clear descriptors */ + for (i = 0; i < q->ndesc; i++) + q->desc[i].ctrl = cpu_to_le32(MT_DMA_CTL_DMA_DONE); + } + + if (reset_idx) { + Q_WRITE(q, cpu_idx, 0); + Q_WRITE(q, dma_idx, 0); + } + mt76_dma_sync_idx(dev, q); +} + +void mt76_dma_queue_reset(struct mt76_dev *dev, struct mt76_queue *q) +{ + __mt76_dma_queue_reset(dev, q, true); +} + +static int +mt76_dma_add_rx_buf(struct mt76_dev *dev, struct mt76_queue *q, + struct mt76_queue_buf *buf, void *data) +{ + struct mt76_queue_entry *entry = &q->entry[q->head]; + struct mt76_txwi_cache *txwi = NULL; + struct mt76_desc *desc; + int idx = q->head; + u32 buf1 = 0, ctrl; + int rx_token; + + if (mt76_queue_is_wed_rro_ind(q)) { + struct mt76_wed_rro_desc *rro_desc; + + rro_desc = (struct mt76_wed_rro_desc *)q->desc; + data = &rro_desc[q->head]; + goto done; + } + + desc = &q->desc[q->head]; + ctrl = FIELD_PREP(MT_DMA_CTL_SD_LEN0, buf[0].len); +#ifdef CONFIG_ARCH_DMA_ADDR_T_64BIT + buf1 = FIELD_PREP(MT_DMA_CTL_SDP0_H, buf->addr >> 32); +#endif + + if (mt76_queue_is_wed_rx(q)) { + txwi = mt76_get_rxwi(dev); + if (!txwi) + return -ENOMEM; + + rx_token = mt76_rx_token_consume(dev, data, txwi, buf->addr); + if (rx_token < 0) { + mt76_put_rxwi(dev, txwi); + return -ENOMEM; + } + + buf1 |= FIELD_PREP(MT_DMA_CTL_TOKEN, rx_token); + ctrl |= MT_DMA_CTL_TO_HOST; + } + + WRITE_ONCE(desc->buf0, cpu_to_le32(buf->addr)); + WRITE_ONCE(desc->buf1, cpu_to_le32(buf1)); + WRITE_ONCE(desc->ctrl, cpu_to_le32(ctrl)); + WRITE_ONCE(desc->info, 0); + +done: + entry->dma_addr[0] = buf->addr; + entry->dma_len[0] = buf->len; + entry->txwi = txwi; + entry->buf = data; + entry->wcid = 0xffff; + entry->skip_buf1 = true; + q->head = (q->head + 1) % q->ndesc; + q->queued++; + + return idx; +} + +static int +mt76_dma_add_buf(struct mt76_dev *dev, struct mt76_queue *q, + struct mt76_queue_buf *buf, int nbufs, u32 info, + struct sk_buff *skb, void *txwi) +{ + struct mt76_queue_entry *entry; + struct mt76_desc *desc; + int i, idx = -1; + u32 ctrl, next; + + if (txwi) { + q->entry[q->head].txwi = DMA_DUMMY_DATA; + q->entry[q->head].skip_buf0 = true; + } + + for (i = 0; i < nbufs; i += 2, buf += 2) { + u32 buf0 = buf[0].addr, buf1 = 0; + + idx = q->head; + next = (q->head + 1) % q->ndesc; + + desc = &q->desc[idx]; + entry = &q->entry[idx]; + + if (buf[0].skip_unmap) + entry->skip_buf0 = true; + entry->skip_buf1 = i == nbufs - 1; + + entry->dma_addr[0] = buf[0].addr; + entry->dma_len[0] = buf[0].len; + + ctrl = FIELD_PREP(MT_DMA_CTL_SD_LEN0, buf[0].len); +#ifdef CONFIG_ARCH_DMA_ADDR_T_64BIT + info |= FIELD_PREP(MT_DMA_CTL_SDP0_H, buf[0].addr >> 32); +#endif + if (i < nbufs - 1) { + entry->dma_addr[1] = buf[1].addr; + entry->dma_len[1] = buf[1].len; + buf1 = buf[1].addr; + ctrl |= FIELD_PREP(MT_DMA_CTL_SD_LEN1, buf[1].len); +#ifdef CONFIG_ARCH_DMA_ADDR_T_64BIT + info |= FIELD_PREP(MT_DMA_CTL_SDP1_H, + buf[1].addr >> 32); +#endif + if (buf[1].skip_unmap) + entry->skip_buf1 = true; + } + + if (i == nbufs - 1) + ctrl |= MT_DMA_CTL_LAST_SEC0; + else if (i == nbufs - 2) + ctrl |= MT_DMA_CTL_LAST_SEC1; + + WRITE_ONCE(desc->buf0, cpu_to_le32(buf0)); + WRITE_ONCE(desc->buf1, cpu_to_le32(buf1)); + WRITE_ONCE(desc->info, cpu_to_le32(info)); + WRITE_ONCE(desc->ctrl, cpu_to_le32(ctrl)); + + q->head = next; + q->queued++; + } + + q->entry[idx].txwi = txwi; + q->entry[idx].skb = skb; + q->entry[idx].wcid = 0xffff; + + return idx; +} + +static void +mt76_dma_tx_cleanup_idx(struct mt76_dev *dev, struct mt76_queue *q, int idx, + struct mt76_queue_entry *prev_e) +{ + struct mt76_queue_entry *e = &q->entry[idx]; + + if (!e->skip_buf0) + dma_unmap_single(dev->dma_dev, e->dma_addr[0], e->dma_len[0], + DMA_TO_DEVICE); + + if (!e->skip_buf1) + dma_unmap_single(dev->dma_dev, e->dma_addr[1], e->dma_len[1], + DMA_TO_DEVICE); + + if (e->txwi == DMA_DUMMY_DATA) + e->txwi = NULL; + + *prev_e = *e; + memset(e, 0, sizeof(*e)); +} + +static void +mt76_dma_kick_queue(struct mt76_dev *dev, struct mt76_queue *q) +{ + wmb(); + Q_WRITE(q, cpu_idx, q->head); +} + +static void +mt76_dma_tx_cleanup(struct mt76_dev *dev, struct mt76_queue *q, bool flush) +{ + struct mt76_queue_entry entry; + int last; + + if (!q || !q->ndesc) + return; + + spin_lock_bh(&q->cleanup_lock); + if (flush) + last = -1; + else + last = Q_READ(q, dma_idx); + + while (q->queued > 0 && q->tail != last) { + mt76_dma_tx_cleanup_idx(dev, q, q->tail, &entry); + mt76_queue_tx_complete(dev, q, &entry); + + if (entry.txwi) { + if (!(dev->drv->drv_flags & MT_DRV_TXWI_NO_FREE)) + mt76_put_txwi(dev, entry.txwi); + } + + if (!flush && q->tail == last) + last = Q_READ(q, dma_idx); + } + spin_unlock_bh(&q->cleanup_lock); + + if (flush) { + spin_lock_bh(&q->lock); + mt76_dma_sync_idx(dev, q); + mt76_dma_kick_queue(dev, q); + spin_unlock_bh(&q->lock); + } + + if (!q->queued) + wake_up(&dev->tx_wait); +} + +static void * +mt76_dma_get_buf(struct mt76_dev *dev, struct mt76_queue *q, int idx, + int *len, u32 *info, bool *more, bool *drop) +{ + struct mt76_queue_entry *e = &q->entry[idx]; + struct mt76_desc *desc = &q->desc[idx]; + u32 ctrl, desc_info, buf1; + void *buf = e->buf; + + if (mt76_queue_is_wed_rro_ind(q)) + goto done; + + ctrl = le32_to_cpu(READ_ONCE(desc->ctrl)); + if (len) { + *len = FIELD_GET(MT_DMA_CTL_SD_LEN0, ctrl); + *more = !(ctrl & MT_DMA_CTL_LAST_SEC0); + } + + desc_info = le32_to_cpu(desc->info); + if (info) + *info = desc_info; + + buf1 = le32_to_cpu(desc->buf1); + mt76_dma_should_drop_buf(drop, ctrl, buf1, desc_info); + + if (mt76_queue_is_wed_rx(q)) { + u32 token = FIELD_GET(MT_DMA_CTL_TOKEN, buf1); + struct mt76_txwi_cache *t = mt76_rx_token_release(dev, token); + + if (!t) + return NULL; + + dma_sync_single_for_cpu(dev->dma_dev, t->dma_addr, + SKB_WITH_OVERHEAD(q->buf_size), + page_pool_get_dma_dir(q->page_pool)); + + buf = t->ptr; + t->dma_addr = 0; + t->ptr = NULL; + + mt76_put_rxwi(dev, t); + if (drop) + *drop |= !!(buf1 & MT_DMA_CTL_WO_DROP); + } else { + dma_sync_single_for_cpu(dev->dma_dev, e->dma_addr[0], + SKB_WITH_OVERHEAD(q->buf_size), + page_pool_get_dma_dir(q->page_pool)); + } + +done: + e->buf = NULL; + return buf; +} + +static void * +mt76_dma_dequeue(struct mt76_dev *dev, struct mt76_queue *q, bool flush, + int *len, u32 *info, bool *more, bool *drop) +{ + int idx = q->tail; + + *more = false; + if (!q->queued) + return NULL; + + if (mt76_queue_is_wed_rro_data(q)) + return NULL; + + if (!mt76_queue_is_wed_rro_ind(q)) { + if (flush) + q->desc[idx].ctrl |= cpu_to_le32(MT_DMA_CTL_DMA_DONE); + else if (!(q->desc[idx].ctrl & cpu_to_le32(MT_DMA_CTL_DMA_DONE))) + return NULL; + } + + q->tail = (q->tail + 1) % q->ndesc; + q->queued--; + + return mt76_dma_get_buf(dev, q, idx, len, info, more, drop); +} + +static int +mt76_dma_tx_queue_skb_raw(struct mt76_dev *dev, struct mt76_queue *q, + struct sk_buff *skb, u32 tx_info) +{ + struct mt76_queue_buf buf = {}; + dma_addr_t addr; + + if (test_bit(MT76_MCU_RESET, &dev->phy.state)) + goto error; + + if (q->queued + 1 >= q->ndesc - 1) + goto error; + + addr = dma_map_single(dev->dma_dev, skb->data, skb->len, + DMA_TO_DEVICE); + if (unlikely(dma_mapping_error(dev->dma_dev, addr))) + goto error; + + buf.addr = addr; + buf.len = skb->len; + + spin_lock_bh(&q->lock); + mt76_dma_add_buf(dev, q, &buf, 1, tx_info, skb, NULL); + mt76_dma_kick_queue(dev, q); + spin_unlock_bh(&q->lock); + + return 0; + +error: + dev_kfree_skb(skb); + return -ENOMEM; +} + +static int +mt76_dma_tx_queue_skb(struct mt76_phy *phy, struct mt76_queue *q, + enum mt76_txq_id qid, struct sk_buff *skb, + struct mt76_wcid *wcid, struct ieee80211_sta *sta) +{ + struct ieee80211_tx_status status = { + .sta = sta, + }; + struct mt76_tx_info tx_info = { + .skb = skb, + }; + struct mt76_dev *dev = phy->dev; + struct ieee80211_hw *hw; + int len, n = 0, ret = -ENOMEM; + struct mt76_txwi_cache *t; + struct sk_buff *iter; + dma_addr_t addr; + u8 *txwi; + + if (test_bit(MT76_RESET, &phy->state)) + goto free_skb; + + t = mt76_get_txwi(dev); + if (!t) + goto free_skb; + + txwi = mt76_get_txwi_ptr(dev, t); + + skb->prev = skb->next = NULL; + if (dev->drv->drv_flags & MT_DRV_TX_ALIGNED4_SKBS) + mt76_insert_hdr_pad(skb); + + len = skb_headlen(skb); + addr = dma_map_single(dev->dma_dev, skb->data, len, DMA_TO_DEVICE); + if (unlikely(dma_mapping_error(dev->dma_dev, addr))) + goto free; + + tx_info.buf[n].addr = t->dma_addr; + tx_info.buf[n++].len = dev->drv->txwi_size; + tx_info.buf[n].addr = addr; + tx_info.buf[n++].len = len; + + skb_walk_frags(skb, iter) { + if (n == ARRAY_SIZE(tx_info.buf)) + goto unmap; + + addr = dma_map_single(dev->dma_dev, iter->data, iter->len, + DMA_TO_DEVICE); + if (unlikely(dma_mapping_error(dev->dma_dev, addr))) + goto unmap; + + tx_info.buf[n].addr = addr; + tx_info.buf[n++].len = iter->len; + } + tx_info.nbuf = n; + + if (q->queued + (tx_info.nbuf + 1) / 2 >= q->ndesc - 1) { + ret = -ENOMEM; + goto unmap; + } + + dma_sync_single_for_cpu(dev->dma_dev, t->dma_addr, dev->drv->txwi_size, + DMA_TO_DEVICE); + ret = dev->drv->tx_prepare_skb(dev, txwi, qid, wcid, sta, &tx_info); + dma_sync_single_for_device(dev->dma_dev, t->dma_addr, dev->drv->txwi_size, + DMA_TO_DEVICE); + if (ret < 0) + goto unmap; + + return mt76_dma_add_buf(dev, q, tx_info.buf, tx_info.nbuf, + tx_info.info, tx_info.skb, t); + +unmap: + for (n--; n > 0; n--) + dma_unmap_single(dev->dma_dev, tx_info.buf[n].addr, + tx_info.buf[n].len, DMA_TO_DEVICE); + +free: +#ifdef CONFIG_NL80211_TESTMODE + /* fix tx_done accounting on queue overflow */ + if (mt76_is_testmode_skb(dev, skb, &hw)) { + struct mt76_phy *phy = hw->priv; + + if (tx_info.skb == phy->test.tx_skb) + phy->test.tx_done--; + } +#endif + + mt76_put_txwi(dev, t); + +free_skb: + status.skb = tx_info.skb; + hw = mt76_tx_status_get_hw(dev, tx_info.skb); + spin_lock_bh(&dev->rx_lock); + ieee80211_tx_status_ext(hw, &status); + spin_unlock_bh(&dev->rx_lock); + + return ret; +} + +static int +mt76_dma_rx_fill_buf(struct mt76_dev *dev, struct mt76_queue *q, + bool allow_direct) +{ + int len = SKB_WITH_OVERHEAD(q->buf_size); + int frames = 0; + + if (!q->ndesc) + return 0; + + while (q->queued < q->ndesc - 1) { + struct mt76_queue_buf qbuf = {}; - enum dma_data_direction dir; - dma_addr_t addr; - int offset; + void *buf = NULL; ++ int offset; + + if (mt76_queue_is_wed_rro_ind(q)) + goto done; + + buf = mt76_get_page_pool_buf(q, &offset, q->buf_size); + if (!buf) + break; + - addr = page_pool_get_dma_addr(virt_to_head_page(buf)) + offset; - dir = page_pool_get_dma_dir(q->page_pool); - dma_sync_single_for_device(dev->dma_dev, addr, len, dir); - - qbuf.addr = addr + q->buf_offset; ++ qbuf.addr = page_pool_get_dma_addr(virt_to_head_page(buf)) + ++ offset + q->buf_offset; +done: + qbuf.len = len - q->buf_offset; + qbuf.skip_unmap = false; + if (mt76_dma_add_rx_buf(dev, q, &qbuf, buf) < 0) { + mt76_put_page_pool_buf(buf, allow_direct); + break; + } + frames++; + } + + if (frames || mt76_queue_is_wed_rx(q)) + mt76_dma_kick_queue(dev, q); + + return frames; +} + +int mt76_dma_rx_fill(struct mt76_dev *dev, struct mt76_queue *q, + bool allow_direct) +{ + int frames; + + if (!q->ndesc) + return 0; + + spin_lock_bh(&q->lock); + frames = mt76_dma_rx_fill_buf(dev, q, allow_direct); + spin_unlock_bh(&q->lock); + + return frames; +} + +static int +mt76_dma_alloc_queue(struct mt76_dev *dev, struct mt76_queue *q, + int idx, int n_desc, int bufsize, + u32 ring_base) +{ + int ret, size; + + spin_lock_init(&q->lock); + spin_lock_init(&q->cleanup_lock); + +#if defined(__linux__) + q->regs = dev->mmio.regs + ring_base + idx * MT_RING_SIZE; +#elif defined(__FreeBSD__) + q->regs = (void *)((u8 *)dev->mmio.regs + ring_base + idx * MT_RING_SIZE); +#endif + q->ndesc = n_desc; + q->buf_size = bufsize; + q->hw_idx = idx; + + size = mt76_queue_is_wed_rro_ind(q) ? sizeof(struct mt76_wed_rro_desc) + : sizeof(struct mt76_desc); + q->desc = dmam_alloc_coherent(dev->dma_dev, q->ndesc * size, + &q->desc_dma, GFP_KERNEL); + if (!q->desc) + return -ENOMEM; + + if (mt76_queue_is_wed_rro_ind(q)) { + struct mt76_wed_rro_desc *rro_desc; + int i; + + rro_desc = (struct mt76_wed_rro_desc *)q->desc; + for (i = 0; i < q->ndesc; i++) { + struct mt76_wed_rro_ind *cmd; + + cmd = (struct mt76_wed_rro_ind *)&rro_desc[i]; + cmd->magic_cnt = MT_DMA_WED_IND_CMD_CNT - 1; + } + } + + size = q->ndesc * sizeof(*q->entry); + q->entry = devm_kzalloc(dev->dev, size, GFP_KERNEL); + if (!q->entry) + return -ENOMEM; + + ret = mt76_create_page_pool(dev, q); + if (ret) + return ret; + + ret = mt76_wed_dma_setup(dev, q, false); + if (ret) + return ret; + + if (mtk_wed_device_active(&dev->mmio.wed)) { + if ((mtk_wed_get_rx_capa(&dev->mmio.wed) && mt76_queue_is_wed_rro(q)) || + mt76_queue_is_wed_tx_free(q)) + return 0; + } + + mt76_dma_queue_reset(dev, q); + + return 0; +} + +static void +mt76_dma_rx_cleanup(struct mt76_dev *dev, struct mt76_queue *q) +{ + void *buf; + bool more; + + if (!q->ndesc) + return; + + do { + spin_lock_bh(&q->lock); + buf = mt76_dma_dequeue(dev, q, true, NULL, NULL, &more, NULL); + spin_unlock_bh(&q->lock); + + if (!buf) + break; + + if (!mt76_queue_is_wed_rro(q)) + mt76_put_page_pool_buf(buf, false); + } while (1); + + spin_lock_bh(&q->lock); + if (q->rx_head) { + dev_kfree_skb(q->rx_head); + q->rx_head = NULL; + } + + spin_unlock_bh(&q->lock); +} + +static void +mt76_dma_rx_reset(struct mt76_dev *dev, enum mt76_rxq_id qid) +{ + struct mt76_queue *q = &dev->q_rx[qid]; + + if (!q->ndesc) + return; + + if (!mt76_queue_is_wed_rro_ind(q)) { + int i; + + for (i = 0; i < q->ndesc; i++) + q->desc[i].ctrl = cpu_to_le32(MT_DMA_CTL_DMA_DONE); + } + + mt76_dma_rx_cleanup(dev, q); + + /* reset WED rx queues */ + mt76_wed_dma_setup(dev, q, true); + + if (mt76_queue_is_wed_tx_free(q)) + return; + + if (mtk_wed_device_active(&dev->mmio.wed) && + mt76_queue_is_wed_rro(q)) + return; + + mt76_dma_sync_idx(dev, q); + mt76_dma_rx_fill_buf(dev, q, false); +} + +static void +mt76_add_fragment(struct mt76_dev *dev, struct mt76_queue *q, void *data, + int len, bool more, u32 info, bool allow_direct) +{ + struct sk_buff *skb = q->rx_head; + struct skb_shared_info *shinfo = skb_shinfo(skb); + int nr_frags = shinfo->nr_frags; + + if (nr_frags < ARRAY_SIZE(shinfo->frags)) { + struct page *page = virt_to_head_page(data); +#if defined(__linux__) + int offset = data - page_address(page) + q->buf_offset; +#elif defined(__FreeBSD__) + int offset = (u8 *)data - (u8 *)page_address(page) + q->buf_offset; +#endif + + skb_add_rx_frag(skb, nr_frags, page, offset, len, q->buf_size); + } else { + mt76_put_page_pool_buf(data, allow_direct); + } + + if (more) + return; + + q->rx_head = NULL; + if (nr_frags < ARRAY_SIZE(shinfo->frags)) + dev->drv->rx_skb(dev, q - dev->q_rx, skb, &info); + else + dev_kfree_skb(skb); +} + +static int +mt76_dma_rx_process(struct mt76_dev *dev, struct mt76_queue *q, int budget) +{ + int len, data_len, done = 0, dma_idx; + struct sk_buff *skb; + unsigned char *data; + bool check_ddone = false; + bool allow_direct = !mt76_queue_is_wed_rx(q); + bool more; + + if (IS_ENABLED(CONFIG_NET_MEDIATEK_SOC_WED) && + mt76_queue_is_wed_tx_free(q)) { + dma_idx = Q_READ(q, dma_idx); + check_ddone = true; + } + + while (done < budget) { + bool drop = false; + u32 info; + + if (check_ddone) { + if (q->tail == dma_idx) *** 37907 LINES SKIPPED *** From nobody Thu Oct 23 21:28:30 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cszfl1pBvz6DZV9; Thu, 23 Oct 2025 21:28:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cszfl0MmCz4PW5; Thu, 23 Oct 2025 21:28:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761254911; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XHST/0AsKqt+iVuLsLGqxUmrXLEm1qOwpESZ2ruX4pI=; b=kz8rOOci2Aj8eY2cth6nUVoHOMArFBEXV4A1eh4xDWSIL05rpiBTyGGVnPrVzReLcM7jIz Chm+L/dahjbHLnGkWrigyIOcGooGoTTPNhW0r6C9L2hMOGnVDN01vhaERYp7WKw3yxqRQk NdE1XnARpW0at1aH141941qvcSGCa/i8BoeuIAV0ejXWOwBMfiMHXValFS6bDKp1oMkEB6 sy4G0rPkeyPc4+F3G8QIrxAsMFPAqWEq9Bhy+OCxe05sLY+kCKYMAmIDNnBMs6xSK/wJ7X nFwr97xg1Q+PrxTlA2atCAEJ65BVjo25NqOtS3D/6weSXo/2i6rTu5KjCTy4RQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761254911; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XHST/0AsKqt+iVuLsLGqxUmrXLEm1qOwpESZ2ruX4pI=; b=f7aVqmyoFDEd89BuLoU8lFc1AGJFmbIW1Ad8V8bV1Xsz/5a/Q0hNhhpRj3tBtwzZR29nJK c50Jv/+dx1pdMcS6HfMoRILzh5MqqERrFkoR/EzL2R7eSN0VAQkvtTFTVpVzFHlkWvfZLC oLsXqbr8eUSlwUWoAh7Q38V/iwjc+3eY2srsYgLfL68krwD0ptrmNtswLc2pIXNiLMojjH hATcIwpx1rLOq47QzA4iZbfcPZRkRGNqvcKeAYW8K4ckp4n0/J5QGc41DvP0JZTDJWsIJa tJhwBdIE1QOSAukkb4pYdOeO1gZvDNRIM4bOju7rtrEOBRYob8/8M4aRvdtYcQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761254911; a=rsa-sha256; cv=none; b=gtesjf+evvHIV3asc2kHBgvaTaa5hp9Heqd4PA8ErnlpGkHeX3uJr8UnNs3ti3M+55EKzF JvffObdGxzei6HrglNHcvtTV2o5Oc9OzS4HRvOoG7hs8ogGGqBh1btvRwTVZeeC+7S2AFr zWikq67a5+y55dv098AnOxCLtlt+5RtwowJF+X89+zyIVHg1loU1ANlirR2Rn29Om+35Lr m/xPOXcXWWxJX1dodfP/rF7HAiSIoBQ//O2GSljsEDyjQrsF7qQUjnOTQuwQSGbr1z3lDU hqitd3CFj/WoThQRZhETkzWfr3952W2I507BLq2Wuswc1ir2Qb80Ehh/vlEWEA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cszfk6mSMzYKS; Thu, 23 Oct 2025 21:28: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 59NLSUrx081632; Thu, 23 Oct 2025 21:28:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59NLSUJx081629; Thu, 23 Oct 2025 21:28:30 GMT (envelope-from git) Date: Thu, 23 Oct 2025 21:28:30 GMT Message-Id: <202510232128.59NLSUJx081629@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 76aed633b5b5 - main - LinuxKPI: 802.11: additions for Linux v6.17 based wireless drivers List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 76aed633b5b526fc2cdb3fa654f54b3cb8e5cfaf Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=76aed633b5b526fc2cdb3fa654f54b3cb8e5cfaf commit 76aed633b5b526fc2cdb3fa654f54b3cb8e5cfaf Author: Bjoern A. Zeeb AuthorDate: 2025-10-11 09:21:55 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-10-23 21:26:07 +0000 LinuxKPI: 802.11: additions for Linux v6.17 based wireless drivers This includes the conflicting changes from previous driver versions (v6.11/v6.14), mostly being function pointer or function arguments. MFC after: 3 days --- sys/compat/linuxkpi/common/include/net/mac80211.h | 14 +++++++------- sys/compat/linuxkpi/common/src/linux_80211_macops.c | 12 ++++++++---- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/net/mac80211.h b/sys/compat/linuxkpi/common/include/net/mac80211.h index 523836b52a40..ee1ace3684de 100644 --- a/sys/compat/linuxkpi/common/include/net/mac80211.h +++ b/sys/compat/linuxkpi/common/include/net/mac80211.h @@ -956,7 +956,7 @@ struct ieee80211_ops { int (*start)(struct ieee80211_hw *); void (*stop)(struct ieee80211_hw *, bool); - int (*config)(struct ieee80211_hw *, u32); + int (*config)(struct ieee80211_hw *, int, u32); void (*reconfig_complete)(struct ieee80211_hw *, enum ieee80211_reconfig_type); void (*prep_add_interface)(struct ieee80211_hw *, enum nl80211_iftype); @@ -983,7 +983,7 @@ struct ieee80211_ops { void (*flush)(struct ieee80211_hw *, struct ieee80211_vif *, u32, bool); void (*flush_sta)(struct ieee80211_hw *, struct ieee80211_vif *, struct ieee80211_sta *); - int (*set_frag_threshold)(struct ieee80211_hw *, u32); + int (*set_frag_threshold)(struct ieee80211_hw *, int, u32); void (*sync_rx_queues)(struct ieee80211_hw *); @@ -1026,8 +1026,8 @@ struct ieee80211_ops { void (*unassign_vif_chanctx)(struct ieee80211_hw *, struct ieee80211_vif *, struct ieee80211_bss_conf *, struct ieee80211_chanctx_conf *); int (*switch_vif_chanctx)(struct ieee80211_hw *, struct ieee80211_vif_chanctx_switch *, int, enum ieee80211_chanctx_switch_mode); - int (*get_antenna)(struct ieee80211_hw *, u32 *, u32 *); - int (*set_antenna)(struct ieee80211_hw *, u32, u32); + int (*get_antenna)(struct ieee80211_hw *, int, u32 *, u32 *); + int (*set_antenna)(struct ieee80211_hw *, int, u32, u32); int (*remain_on_channel)(struct ieee80211_hw *, struct ieee80211_vif *, struct ieee80211_channel *, int, enum ieee80211_roc_type); int (*cancel_remain_on_channel)(struct ieee80211_hw *, struct ieee80211_vif *); @@ -1038,7 +1038,7 @@ struct ieee80211_ops { void (*bss_info_changed)(struct ieee80211_hw *, struct ieee80211_vif *, struct ieee80211_bss_conf *, u64); void (*link_info_changed)(struct ieee80211_hw *, struct ieee80211_vif *, struct ieee80211_bss_conf *, u64); - int (*set_rts_threshold)(struct ieee80211_hw *, u32); + int (*set_rts_threshold)(struct ieee80211_hw *, int, u32); void (*event_callback)(struct ieee80211_hw *, struct ieee80211_vif *, const struct ieee80211_event *); int (*get_survey)(struct ieee80211_hw *, int, struct survey_info *); int (*get_ftm_responder_stats)(struct ieee80211_hw *, struct ieee80211_vif *, struct cfg80211_ftm_responder_stats *); @@ -1048,7 +1048,7 @@ struct ieee80211_ops { void (*offset_tsf)(struct ieee80211_hw *, struct ieee80211_vif *, s64); int (*set_bitrate_mask)(struct ieee80211_hw *, struct ieee80211_vif *, const struct cfg80211_bitrate_mask *); - void (*set_coverage_class)(struct ieee80211_hw *, s16); + void (*set_coverage_class)(struct ieee80211_hw *, int, s16); int (*set_tim)(struct ieee80211_hw *, struct ieee80211_sta *, bool); int (*set_key)(struct ieee80211_hw *, enum set_key_cmd, struct ieee80211_vif *, struct ieee80211_sta *, struct ieee80211_key_conf *); @@ -2406,7 +2406,7 @@ ieee80211_remove_key(struct ieee80211_key_conf *key) static __inline struct ieee80211_key_conf * ieee80211_gtk_rekey_add(struct ieee80211_vif *vif, - struct ieee80211_key_conf *key, int link_id) + uint16_t keyidx, uint8_t *key, size_t keylen, int link_id) { TODO(); return (NULL); diff --git a/sys/compat/linuxkpi/common/src/linux_80211_macops.c b/sys/compat/linuxkpi/common/src/linux_80211_macops.c index 04f9f6d7e7fc..d9e82a6d64ee 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211_macops.c +++ b/sys/compat/linuxkpi/common/src/linux_80211_macops.c @@ -102,7 +102,8 @@ lkpi_80211_mo_get_antenna(struct ieee80211_hw *hw, u32 *txs, u32 *rxs) } LKPI_80211_TRACE_MO("hw %p", hw); - error = lhw->ops->get_antenna(hw, txs, rxs); + LKPI_80211_TRACE_MO("TODO link/radio_idx"); + error = lhw->ops->get_antenna(hw, 0, txs, rxs); out: return (error); @@ -121,7 +122,8 @@ lkpi_80211_mo_set_frag_threshold(struct ieee80211_hw *hw, uint32_t frag_th) } LKPI_80211_TRACE_MO("hw %p frag_th %u", hw, frag_th); - error = lhw->ops->set_frag_threshold(hw, frag_th); + LKPI_80211_TRACE_MO("TODO link/radio_idx"); + error = lhw->ops->set_frag_threshold(hw, 0, frag_th); out: return (error); @@ -140,7 +142,8 @@ lkpi_80211_mo_set_rts_threshold(struct ieee80211_hw *hw, uint32_t rts_th) } LKPI_80211_TRACE_MO("hw %p rts_th %u", hw, rts_th); - error = lhw->ops->set_rts_threshold(hw, rts_th); + LKPI_80211_TRACE_MO("TODO link/radio_idx"); + error = lhw->ops->set_rts_threshold(hw, 0, rts_th); out: return (error); @@ -436,7 +439,8 @@ lkpi_80211_mo_config(struct ieee80211_hw *hw, uint32_t changed) } LKPI_80211_TRACE_MO("hw %p changed %u", hw, changed); - error = lhw->ops->config(hw, changed); + LKPI_80211_TRACE_MO("TODO link/radio_idx"); + error = lhw->ops->config(hw, 0, changed); out: return (error); From nobody Thu Oct 23 22:41:59 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ct1HX1jVTz6Dkkr; Thu, 23 Oct 2025 22:42:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ct1HX1HZ4z3K3s; Thu, 23 Oct 2025 22:42:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761259320; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AX4RUhlhYjpkkShd+4eMlr1/PNsbg2CaBgcnQ295WKM=; b=t8zPnUE2h+wonONy2WRAj/ZUm5LIFLFTfFZtGUIwGK5quExxmDQE4JXkpynqyB9UpfsA+q /vrMuzQdcMBzRTIQKgknElt16y5m8efrLW20CqJWuO/j/qOeelXHDl0pVaIh6O3DzhAQzZ /Q70qUSm4aA32IwWz/z/eRnLfovVmp7A3Xg96qArkAOrGepzglbbSgrMGtcbCjkjMoXMeq w5hKHS6KyXM+87fMYm7tgfu/OhUi90Na/ESbYtZXAXvJYbqOjKAx0DWNN7j8EU+ADl/UFH oqNa0f9u5xsbpD6fJmKeBIyAXsj+NKPOrLz2z5BYE82cpvCjt+AB2U67tplg/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761259320; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AX4RUhlhYjpkkShd+4eMlr1/PNsbg2CaBgcnQ295WKM=; b=tzA3Bnfa0BNBeMqBkFI2M2yJHKleaM4hIGGG+N7BaeQZ9c6MgrTplOJ80JjPDusZb0z7ro jGL3Nt1gB2PZPHNqGB4iGFDdRW7IytI8ycj3dwhQ4mZjFSaVay2HC3R4X5KXu2nYvO02Ea IzGjMpOXa/IhjISklXNFvfvgxypMqKDL3fVLjWXFctUCr1r2xjA3PkfiqepxIbI6+Ulv4D ZEhD19hLK9qOBS7WzfcUWKpTbgglaAQ0Rsftrr0YtnQsUuacsqQax3vt+ferg3PLsb4HB5 RvWBqMs+xbFlRtQjs5TWW3I7FkKw65EvKQToIy411HR4JBhIyqPBY74sQLIDwQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761259320; a=rsa-sha256; cv=none; b=xik7eD/gAX+z3buehuLy5BEzjRD6SJzwhlgjDLON+ek4UHvIH5qdaOkdNVEEFcsPWwPenT PWX4q4Iqw2+s2uXVA15QqhK+43tCwBg9yzh8DG68Flog2uvrkphHLmeZCbjnqJNLe0riXe qSSbBzydOfvGQRKdNF7Ewqy2WOX4I0IEvsKTk8CNnGjuTGHxZOLsil+kHQzjpsqodTuBVC hzk67+qDjzNLVAtmYSXXFj7RnZJ7/EBUvczu4R5FfpS3KceGcx5dmVAGQXowicrxTThkqX xhKJsDbh28jHvP13sNVKacQRUbhgMTFRV8YQDJuI0OEI8OcRsFhXLdxLelCbBg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ct1HX0fbfzbTs; Thu, 23 Oct 2025 22:42: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 59NMfxkr029799; Thu, 23 Oct 2025 22:41:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59NMfx4b029796; Thu, 23 Oct 2025 22:41:59 GMT (envelope-from git) Date: Thu, 23 Oct 2025 22:41:59 GMT Message-Id: <202510232241.59NMfx4b029796@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: bbe65c5e8c0e - main - release: Use PKG_CMD when installing pkgbase packages in vmimage.subr List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bbe65c5e8c0e89ec14cb5d00153691850dadb859 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=bbe65c5e8c0e89ec14cb5d00153691850dadb859 commit bbe65c5e8c0e89ec14cb5d00153691850dadb859 Author: Mark Johnston AuthorDate: 2025-10-23 22:21:11 +0000 Commit: Mark Johnston CommitDate: 2025-10-23 22:41:51 +0000 release: Use PKG_CMD when installing pkgbase packages in vmimage.subr This defaults to plain "pkg", but being able to override it is useful when testing pkg itself. Reviewed by: cperciva MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D53307 --- release/tools/vmimage.subr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/tools/vmimage.subr b/release/tools/vmimage.subr index 99e1936296e1..3bfef585f613 100644 --- a/release/tools/vmimage.subr +++ b/release/tools/vmimage.subr @@ -97,7 +97,7 @@ vm_install_base() { if [ -z "${NOPKGBASE}" ]; then local pkg_cmd - pkg_cmd="pkg --rootdir ${DESTDIR} --repo-conf-dir ${PKGBASE_REPO_DIR} + pkg_cmd="${PKG_CMD} --rootdir ${DESTDIR} --repo-conf-dir ${PKGBASE_REPO_DIR} -o ASSUME_ALWAYS_YES=yes -o IGNORE_OSVERSION=yes -o ABI=${PKG_ABI} -o INSTALL_AS_USER=yes " if [ -n "${NO_ROOT}" ]; then From nobody Thu Oct 23 22:56:41 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ct1cT66Zkz6Dn34; Thu, 23 Oct 2025 22:56:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ct1cT5M8Bz3LKs; Thu, 23 Oct 2025 22:56:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761260201; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7+mdvXEd8go2umXKVNmSWHmBRpGHolodHO2VAg6gVEQ=; b=mCdVU83RKpsAO31XZHk7OHDswHyTH82Jvf0KXVlRqJZKOYni/xN+9Bzjv3z3hI7fPKmFAd c2lz7kxZf0gDaAt1mtSHJe2PVrspOI2sSZrwLodhjKPyFcwZMqH3aZxz9hHApxTqPmwjbn rS8RJKHVYNflQmOEWoqsedyVCt0SN4nmT/n03orBnN0eKG2+VUotQKuxDNPGki44V1834O CQe937kAx5xJ8N2yTnnTt6uTjxhptAr9hmXUtRzzlj+ZoFNR/SkhgMNEnPMKdlHtayDqZJ KangBCdXdGBKW2VwH5kFvinqSYuZLiPi1RmpDa11An2Oh4k3/ljrAAHXycM9WQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761260201; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7+mdvXEd8go2umXKVNmSWHmBRpGHolodHO2VAg6gVEQ=; b=pdQxh29+FwxkxGupHe0G5+fktmnfVdXGy/wZGRC2ILUGpuTXWUZXSIe33eqxCA6iNnnJZ4 aTcpAZ7gzykJGGCeJTU+3niGRdaZdxpanNNFBmZSU1q9Fd4kM8VRWdL8lZWRadtAvRlQ05 sKSAen9p79MnaFzX9h69hRHu7+Y+7cyks6meQkcNxkoNIlZ392XhmHdi5izAv97StCbeph Q7cVCATBGxptg8XZihy9lqEFVj1I0fL7GavoqhatdZKW+RtF5YY9af+fIMKEKGBbMv0THk PcVhsVH0Utmul/wPc1MACn+Tl9jzgwUcFgVJ7JzkkifeeLrzXwuIwtuI0qPFPA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761260201; a=rsa-sha256; cv=none; b=bBzrVS9b82VIgtUPNJvyEhgfOvrgnWaohGMm1RKPl5u96D7ebCPxqEV9P6FqqFeh+4TxYQ nfjzr1D/lgGlFTlP51XQtISWox/WYcX7UwcLP4/jt6v4uFmh2/bu6O5oMuUNHf/IzP60QH yjVgFKd/665nQVl/kUL8xbOmksI5UfdVBRsomhCV0AZ96zi9sfi4ArhYRC5EvCgAlFXd7L OZX8eCMbpjgyiYewrQ9j6jGOytVUisCg50DF2Zw0jYaPufcp1R2VnlPLIsO08B4cQLQvSI rY8gwr9RVCzWR8qcESPMN44gcGmIKuwJIb9oT6F7PjwZ3UAhACJ8SnYcOaLKmw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ct1cT4y6Gzbt5; Thu, 23 Oct 2025 22:56:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59NMufkc049902; Thu, 23 Oct 2025 22:56:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59NMufOn049899; Thu, 23 Oct 2025 22:56:41 GMT (envelope-from git) Date: Thu, 23 Oct 2025 22:56:41 GMT Message-Id: <202510232256.59NMufOn049899@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cy Schubert Subject: git: 6535e9308a26 - main - ipfilter: Plug ip_nat kernel information leak List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6535e9308a26e17023831fe68fb71d2febf2a002 Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=6535e9308a26e17023831fe68fb71d2febf2a002 commit 6535e9308a26e17023831fe68fb71d2febf2a002 Author: Cy Schubert AuthorDate: 2025-10-22 15:59:26 +0000 Commit: Cy Schubert CommitDate: 2025-10-23 22:56:28 +0000 ipfilter: Plug ip_nat kernel information leak ipf_nat_getent() allocates a variable-sized nat_save_t buffer with KMALLOCS() (which does not zero memory) and then copies only a subset of fields into it before returning the object to userland using ipf_outobjsz(). Because the structure is not fully initialized on all paths, uninitialized kernel heap bytes can be copied back to user space, resulting in an information leak. We fix this by zeroing out the data structure immediately after allocation. Reported by: Ilja Van Sprundel Reviewed by: emaste MFC after: 3 days Differential revision: https://reviews.freebsd.org/D53274 --- sys/netpfil/ipfilter/netinet/ip_nat.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/netpfil/ipfilter/netinet/ip_nat.c b/sys/netpfil/ipfilter/netinet/ip_nat.c index 972511f43bd5..53c180cdfbca 100644 --- a/sys/netpfil/ipfilter/netinet/ip_nat.c +++ b/sys/netpfil/ipfilter/netinet/ip_nat.c @@ -1771,6 +1771,7 @@ ipf_nat_getent(ipf_main_softc_t *softc, caddr_t data, int getlock) IPFERROR(60029); return (ENOMEM); } + bzero(ipn, ipns.ipn_dsize); if (getlock) { READ_ENTER(&softc->ipf_nat); From nobody Thu Oct 23 22:56:42 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ct1cW0KnZz6Dn0d; Thu, 23 Oct 2025 22:56:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ct1cV5sV8z3LPk; Thu, 23 Oct 2025 22:56:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761260202; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TXqIbiOU8i0nFnIjpoCoSr1u9XmaFbJhPhTNkhf8w48=; b=g6QjP/y2cjj+RCt9WJdrT6f2fqpAEWbnm0Lb+NvDLYKHEJkMpXFKQPVTKwUwLKQ9jmWbD0 5SaQczJFfhefoTfVt8aYkKIhqULTckI0J7IiCQKAdr3XI7GIQUDAezfN00e33rtKMcDob+ S5xKCGgVcAMXxjDLI3x3B2V/RvQboOqH167O6X3gkjPZfrPH7vzbBpvBlUm+0+MIxwIZgb zVbWlDRn2NCpjx42JS0zCTEGPUP63DgWYafQFLt3RRFrG7ogaxJjNFzyvrkNsarP4npQxy l0pXVjuJ8xfVnvcp/9JJnTLDOhc7WnB+XUMsewWmwc+2HdxfwXuY/SfxSXjQJg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761260202; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TXqIbiOU8i0nFnIjpoCoSr1u9XmaFbJhPhTNkhf8w48=; b=OMrs83jSSitxCg2ke73JluW3Qx0m5ArGaUsCo2f+CcMSuuyukMnZoFgLRb60VdzOUFB/Xl u8sdCVwpyTMFsgrEbUoia9IkAgD6hIWZQXv3xoO62voa0+1ih1HwXkN3fLivtovs9x06VI D4AvqUlMF789E22MMcLUvzbFQteO8UBv++9DncDt5gt+DhI6SH2Cf36o+gxjsvhBKpv/9r oQQ3lYfxo/dttp4Xs4VmhKcFNhjZn+phdwOatIrBEubGVV2hebZjiL9jkTZnyr6cfIaVs6 y8iNcryJSkOHZrqvKp9hUtIEdxE9XvH5peqrlFSuJM0l/9KqqKdsoyzcr2H2EA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761260202; a=rsa-sha256; cv=none; b=RVuEdEtac/Uj1astuPQF1w+Et/DWhr7FOzAYI798XUuC/0S3Gxc6OUcbEqjJnGDwoTqVAw uANJpngcjxn0KANceXKza2A/d6mHLuB8GIEDP8dmibhxO6nOd8llF7HlAPqfHHtpsGdMIO 5dddkQHesNj5sYu98YtKnMlRQX9izLw/A4ia4WVTcIYjtA92UUQifz8l6WNXZ8lLOqLy+t KordxKoZL7TwiViTt6XEewNK3EWXigykzzMb1a3JGLQ8wrNZthi7Ev+MpDrXfDQD3RX5Id lTB8npSWVtgYl+naklhmL2N2ZQrFDZ+F/dJya73pgVnYd4HcApaV8VQPP4qFfw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ct1cV5TGBzbD2; Thu, 23 Oct 2025 22:56:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59NMugkd049938; Thu, 23 Oct 2025 22:56:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59NMugNg049933; Thu, 23 Oct 2025 22:56:42 GMT (envelope-from git) Date: Thu, 23 Oct 2025 22:56:42 GMT Message-Id: <202510232256.59NMugNg049933@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cy Schubert Subject: git: 0d589ecbc7aa - main - ipfilter: Plug ip_htable kernel information leak List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0d589ecbc7aa916537fd21c0344919491cfcb293 Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=0d589ecbc7aa916537fd21c0344919491cfcb293 commit 0d589ecbc7aa916537fd21c0344919491cfcb293 Author: Cy Schubert AuthorDate: 2025-10-22 16:29:03 +0000 Commit: Cy Schubert CommitDate: 2025-10-23 22:56:28 +0000 ipfilter: Plug ip_htable kernel information leak ipf_htable_stats_get() constructs an iphtstat_t on the stack and only initializes select fields before copying the entire structure to userland. The trailing padding array iphs_pad[16] is never initialized, so ~128 bytes of uninitialized kernel stack memory can be leaked to user space on each call. This is a classic information disclosure vulnerability that can reveal pointers and other sensitive data. We fix this by zeroing out the data structure prior to use. Reported by: Ilja Van Sprundel Reviewed by: emaste MFC after: 3 days Differential revision: https://reviews.freebsd.org/D53275 --- sys/netpfil/ipfilter/netinet/ip_htable.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/netpfil/ipfilter/netinet/ip_htable.c b/sys/netpfil/ipfilter/netinet/ip_htable.c index 91b375f80db1..3f765cfab947 100644 --- a/sys/netpfil/ipfilter/netinet/ip_htable.c +++ b/sys/netpfil/ipfilter/netinet/ip_htable.c @@ -230,6 +230,8 @@ ipf_htable_stats_get(ipf_main_softc_t *softc, void *arg, iplookupop_t *op) return (EINVAL); } + bzero(&stats, sizeof(stats)); + stats.iphs_tables = softh->ipf_htables[op->iplo_unit + 1]; stats.iphs_numtables = softh->ipf_nhtables[op->iplo_unit + 1]; stats.iphs_numnodes = softh->ipf_nhtnodes[op->iplo_unit + 1]; From nobody Thu Oct 23 23:17:26 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ct24Q4YXgz6DqB7; Thu, 23 Oct 2025 23:17:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ct24Q3w2vz3NJS; Thu, 23 Oct 2025 23:17:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761261446; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gJDMxHn8BzjYA1WBG9hbCMc+oF2HXyBLLUOjQba1Hr8=; b=iLb5j0c4Mbul1hqKo8tKfu1lRYwmbBP3igeM+LTguhPZEJci2i2S29jfgOfhOKYPYixzPb 0vDNxtnQJVMgBEprjXELgPnbi84fh3+Il9izC2brpzB0A5Nxbam/ZIyFdVkXoxCrTOSIZ0 uecbjHJ4nBrlaSlO99+Ypi1w8nm6FBBWfCLMz3JthSsIF9wbfKxWOMukgQsV2wWHQ5J926 UwGGMQURZZCcQhX37N/Fw8h7FIEfhQcIMcEAx+sIfITOsp4hRBMOh1AGvATIJ9mRmte5Br qNgaHHbddUjK0qL2bvX+MRjVxN69TvDyEUtk4jbUr/l/dICF5Gq2iF1vtWoQTg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761261446; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gJDMxHn8BzjYA1WBG9hbCMc+oF2HXyBLLUOjQba1Hr8=; b=feCtbgVLrv0j5OHCiuLcaKvmRn2dq0/9chsdlSIRXI7dl4g+v0Dpcgfo9JNSLwk9apvIva 5bw1vmu44aVcC5oXkscB8xfNSwkUofdbHn8VDjKULY5cQoxSgvu4+P1Z4dGeBz5q2rZf2N JtPbj4NWXodIuB21N12etDj2IN7yfD4QreL2C6iuIZstasJtNKdBD4OtT4wvFb+Pcd+Dgc r22qxwlgHi9BAsKZu5zRXrzvu7CMK+cecEn6BaByGM0SRcjdBqnvXcZJ1pbgyqEdKC0A2n tpW6iejpLYAs7FE7758rQvWnspenvwQGyfDgzhE8IxYdVD3C4RbxxS9bhNtzHw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761261446; a=rsa-sha256; cv=none; b=Ma+ABaSnTc+vrBI7KJdYZ7Q1tVwz3BY9JBI2yvI3eoJXm1cWgbOHDaDO78I9W2uYgJDpu5 yzIPXdVLU2rL82o4piGK0RIQ1qETTZuZRYAvNzEagNY+1hh3cOYJHolp268JUnWO3WZvpQ tSvgKdJixKehpyNUv3RS5HPVM3KmRqXYrpUXutCJ2hEdiIaw7JvVMBbTbtWfwq+QkQioKG 3fONVBp3V/XGf5yqUJ1BM+27lEdGvFfB9cYL/EFMtQ2otlzFAhoE6Dd+vQHI42Y6VNrdyP RWU7OcG+VLhWqUdie7hJ9XDTIVPvvrFTqJZJomRf8gsAzoStHOnDrHmG01+wwQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ct24Q2zXPzbZ3; Thu, 23 Oct 2025 23:17: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 59NNHQZg088765; Thu, 23 Oct 2025 23:17:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59NNHQMC088762; Thu, 23 Oct 2025 23:17:26 GMT (envelope-from git) Date: Thu, 23 Oct 2025 23:17:26 GMT Message-Id: <202510232317.59NNHQMC088762@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "David E. O'Brien" Subject: git: d1ca01059d5d - main - padlock(4)/nehemiah: move i386-only entropy source to MD files List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: obrien X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d1ca01059d5d756a4aef09d955e98aa59a284344 Auto-Submitted: auto-generated The branch main has been updated by obrien: URL: https://cgit.FreeBSD.org/src/commit/?id=d1ca01059d5d756a4aef09d955e98aa59a284344 commit d1ca01059d5d756a4aef09d955e98aa59a284344 Author: David E. O'Brien AuthorDate: 2025-10-23 22:27:06 +0000 Commit: David E. O'Brien CommitDate: 2025-10-23 23:17:19 +0000 padlock(4)/nehemiah: move i386-only entropy source to MD files Reviewed by: khng Differential Revision: https://reviews.freebsd.org/D53309 --- sys/amd64/conf/GENERIC | 1 - sys/amd64/conf/MINIMAL | 1 - sys/conf/files.i386 | 1 + sys/conf/files.x86 | 1 - sys/i386/conf/NOTES | 7 +++++++ sys/modules/Makefile | 4 +++- sys/x86/conf/NOTES | 1 - 7 files changed, 11 insertions(+), 5 deletions(-) diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index 2e41ed26403a..fb8473505128 100644 --- a/sys/amd64/conf/GENERIC +++ b/sys/amd64/conf/GENERIC @@ -309,7 +309,6 @@ device wpi # Intel 3945ABG wireless NICs. device crypto # core crypto support device aesni # AES-NI OpenCrypto module device loop # Network loopback -device padlock_rng # VIA Padlock RNG device rdrand_rng # Intel Bull Mountain RNG device ether # Ethernet support device vlan # 802.1Q VLAN support diff --git a/sys/amd64/conf/MINIMAL b/sys/amd64/conf/MINIMAL index 0baf6d6431de..61c713c609a4 100644 --- a/sys/amd64/conf/MINIMAL +++ b/sys/amd64/conf/MINIMAL @@ -113,7 +113,6 @@ device uart # Generic UART driver # Pseudo devices. device loop # Network loopback -device padlock_rng # VIA Padlock RNG device rdrand_rng # Intel Bull Mountain RNG device ether # Ethernet support diff --git a/sys/conf/files.i386 b/sys/conf/files.i386 index 41c51a7aa9c5..e6c2089e2c1e 100644 --- a/sys/conf/files.i386 +++ b/sys/conf/files.i386 @@ -33,6 +33,7 @@ dev/hyperv/vmbus/i386/hyperv_machdep.c optional hyperv dev/le/if_le_isa.c optional le isa dev/ofw/ofw_pcib.c optional fdt pci dev/pcf/pcf_isa.c optional pcf +dev/random/nehemiah.c optional padlock_rng !random_loadable dev/sbni/if_sbni.c optional sbni dev/sbni/if_sbni_isa.c optional sbni isa dev/sbni/if_sbni_pci.c optional sbni pci diff --git a/sys/conf/files.x86 b/sys/conf/files.x86 index 21a1b8046f12..31b8e88a6951 100644 --- a/sys/conf/files.x86 +++ b/sys/conf/files.x86 @@ -310,7 +310,6 @@ dev/ntb/ntb_hw/ntb_hw_plx.c optional ntb_hw_plx | ntb_hw dev/ntb/test/ntb_tool.c optional ntb_tool dev/nvram/nvram.c optional nvram isa dev/random/ivy.c optional rdrand_rng !random_loadable -dev/random/nehemiah.c optional padlock_rng !random_loadable dev/random/rdseed.c optional rdrand_rng !random_loadable dev/qat_c2xxx/qat.c optional qat_c2xxx dev/qat_c2xxx/qat_ae.c optional qat_c2xxx diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES index 93dc00634cc0..fbcea76527db 100644 --- a/sys/i386/conf/NOTES +++ b/sys/i386/conf/NOTES @@ -302,6 +302,13 @@ envvar hint.pcf.0.irq="5" # device glxsb # AMD Geode LX Security Block +# +# padlock is a driver for the cryptographic functions and RNG in +# VIA C3, C7, and Eden processors. +# Requires 'device crypto'. +# +device padlock_rng # VIA Padlock RNG + ##################################################################### # ABI Emulation diff --git a/sys/modules/Makefile b/sys/modules/Makefile index 9bc743c0c6d1..cde4c1c0e9ac 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -819,7 +819,6 @@ _nfe= nfe _nvram= nvram .if ${MK_CRYPT} != "no" || defined(ALL_MODULES) _padlock= padlock -_padlock_rng= padlock_rng _rdrand_rng= rdrand_rng _rdseed_rng= rdseed_rng .endif @@ -892,6 +891,9 @@ _glxsb= glxsb _pcfclock= pcfclock _pst= pst _sbni= sbni +.if ${MK_CRYPT} != "no" || defined(ALL_MODULES) +_padlock_rng= padlock_rng +.endif .endif .if ${MACHINE_ARCH} == "armv7" diff --git a/sys/x86/conf/NOTES b/sys/x86/conf/NOTES index 3b3439b519d7..fadaf90d508f 100644 --- a/sys/x86/conf/NOTES +++ b/sys/x86/conf/NOTES @@ -541,7 +541,6 @@ device smbios device vpd device asmc device tpm -device padlock_rng # VIA Padlock RNG device rdrand_rng # Intel Bull Mountain RNG device aesni # AES-NI OpenCrypto module device ossl # OpenSSL OpenCrypto module From nobody Fri Oct 24 00:02:50 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ct34q1qV8z6DwMl; Fri, 24 Oct 2025 00:02:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ct34q11qVz3ZDK; Fri, 24 Oct 2025 00:02:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761264171; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=k+cXlmy+YBzbIUXA68aFLRbDdA2GcEqc7N7eUf57nEo=; b=JWlvqcL4uUpOl3F7TzStu3R1tdhCgxbVIHac4O0APorFOm/YpcoVKNIAJY+ly56WcK4OEI sM7ucT3HZ+UNMI1hRDs+uym2ATRibUSP7d7emc1bFx/thqGjiVlkAlN+aoIkGPsFmZ2IOT 7QKsYUoTyHFS2dlOngFla0pJOcvqjz2FL153qjLgDjYz9sBjU95Q0QDWOEQRF+zbNhlW0a NfXcPMTQHveAjrOPaV5gvChh3PXZHnB6DJs2Xmiqq2dWFKeK6ZHI+oaG2RdVaKvxE6Q1Ex RhFNDIdBHL+1sqGh11Zi9Yy4XepXEYozSZcCXgDxIqryqH+foQOMXVGDHEvrjA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761264171; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=k+cXlmy+YBzbIUXA68aFLRbDdA2GcEqc7N7eUf57nEo=; b=CVB0Fmo4wFz+ID3Eb0YJJgC+D3jJ7SeQhkWHOie5U7d/khIU0VFei6kM3p7ojth78kib4Y 9GK4g1GX2h4B/ghi/R+X6dYONMYw+ZuTa0aSWC2FH7Ku7JTuUzPzIWXQ1RHsop3Sb3F06z CNvvyJZA+g9cZHTMOemkqw5QjAGDdM8fpxGsjdpmVSBWklVIXqYgBSdOkyeh4ZKQLxP4dv /+7JykWb6JNGSbPQMa2Z4wZI35EC7NZsDQk+wGVgrrK4zAb4oGhs3JjDcERAw1DYG8OAkP 5klL3gH+LH6ms5/xAGRP7gxhFN1Wa0X/p/alUjuS8abp/ZvAYwnlGdqJrS4kbg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761264171; a=rsa-sha256; cv=none; b=wzZMphCalOsWHimyi1IyS2Y96+wvy/a72jXb2/bIkNHEpNP2L7fMp7gtQSKi8Qo3WOZDi2 FdZX9JG7IHG/Pp/yi4f7PpPlKUk5LzWvJ8u3g0OKFoobqpDnhFmqLf/Dc+IaXgYR7XYs9n 28lHGqVondS8ls/808iKMIjzDxvco2ZlufBzrQS1jzYce7uK3S6tuFbRI7zUQ2mLptfIsj sfMj4ZQkRnUAJykCm4JLH2UhGVqmJf9W7ZLQ/lrBLu7grY5o+l4YyClHgfKoOXaUchLGsQ Ah5xvvxDCb79JjfI+QxBNV2ySI039Gal5Xy4NMPKsi0E6pM56UXZVbMwbOYcZg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ct34q0L95zcqt; Fri, 24 Oct 2025 00:02: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 59O02o2w083317; Fri, 24 Oct 2025 00:02:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59O02owJ083314; Fri, 24 Oct 2025 00:02:50 GMT (envelope-from git) Date: Fri, 24 Oct 2025 00:02:50 GMT Message-Id: <202510240002.59O02owJ083314@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bryan Drewery Subject: git: ab4abce6c2c2 - main - pwait: Avoid calling getpid(2) for each proc. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bdrewery X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ab4abce6c2c2091a3b9ea1f38cbef94ee7a68090 Auto-Submitted: auto-generated The branch main has been updated by bdrewery: URL: https://cgit.FreeBSD.org/src/commit/?id=ab4abce6c2c2091a3b9ea1f38cbef94ee7a68090 commit ab4abce6c2c2091a3b9ea1f38cbef94ee7a68090 Author: Bryan Drewery AuthorDate: 2025-10-10 18:00:35 +0000 Commit: Bryan Drewery CommitDate: 2025-10-24 00:01:58 +0000 pwait: Avoid calling getpid(2) for each proc. --- bin/pwait/pwait.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/bin/pwait/pwait.c b/bin/pwait/pwait.c index a78c0bb84ca8..27f4c8e9858d 100644 --- a/bin/pwait/pwait.c +++ b/bin/pwait/pwait.c @@ -64,6 +64,7 @@ main(int argc, char *argv[]) char *end, *s; double timeout; long pid; + pid_t mypid; int i, kq, n, nleft, opt, status; bool oflag, tflag, verbose; @@ -137,6 +138,7 @@ main(int argc, char *argv[]) err(EX_OSERR, "malloc"); } nleft = 0; + mypid = getpid(); for (n = 0; n < argc; n++) { s = argv[n]; /* Undocumented Solaris compat */ @@ -149,7 +151,7 @@ main(int argc, char *argv[]) warnx("%s: bad process id", s); continue; } - if (pid == getpid()) { + if (pid == mypid) { warnx("%s: skipping my own pid", s); continue; } From nobody Fri Oct 24 00:02:52 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ct34r3QSbz6DwL0; Fri, 24 Oct 2025 00:02:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ct34r1Fl6z3Yqj; Fri, 24 Oct 2025 00:02:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761264172; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1sBpqbTJNTksG3MQJHqTIRmEzGllrtqHnTH8+dgX8Xs=; b=m7wJtZvRp/VMZezLHIQF0kB42h9jq2mnzVdfgdkAtQoXYxVsJD230j74HuUh6yDj6ic/BM yHGMsVsxQnoliWqxBmbbkQ6WatuFneXbzlI/OFlgFGmi1aWm25BJ+ylBuwN1JOe3+Tb8Gm oqjh/BwDO+x7taWjiJ48X95jiygLKaMrWVbzaD+5UFiPyDzR9PbQZcvLpXQ3dxlGPXBgEB kw0FqBzG5YGrbgz6dFM6A8e24EjHxCoPhnGi646xBj+93YpGfDotoefF0MsmovmDk67RHQ ln616wlfZJzFWsDWaEnE2DV1Sv4gdy8IiEGOiiYocF38p4OPa8tTuH+0ISH7Fw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761264172; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1sBpqbTJNTksG3MQJHqTIRmEzGllrtqHnTH8+dgX8Xs=; b=xKG7QkLr+rUWUzT4hPdB5B6cDXBUPkf88EG7fVEE75vL0+3b5jG5/Qp8uVffhIV3LibXfV qdMeNXztvmxcM9QE+WugyUpis7MAo+K1NQ5LajPWtL9tFfV9g1T28HtA/TXyaZEjGFwbUv Gm/WlnWk4V7AGQ5MrLW4m2DciM8ThD/h5eHitmrFLMxW+xJ6H9TfD3faCrBQKCHnbsreUF bx8p9QhRRCcqEOg0qdcpPr/hbyiwf4WmvM9HSAUvNcH12YwMu0HPDZf9z3BlHJphpryoqA 8KsLz4TlgmOSt4Okq8B8zyWVCrs6MhnnMyKClFjrlArybZ8vlP63K/r2/s3jOw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761264172; a=rsa-sha256; cv=none; b=PxeplnbeB8jVnpZden9aMs1HAE1MfFZGf9J4vsaC/nvtq4Cu9bFFpPV4esLxa/upSWWbfK Ez5I5hJ4CvQ2TJFNU6Eazojj4FG+BeMXjnadg67vJehdfk81qKFX0scIv0hi1DzkhiPES+ RdI39cGhV5I/+rIAVQVS90angJgBOOev+I/RI8Ef0unODoPXd0RLFBWJ1PYHgqQ70JJah5 aP5virqLbMFIZynabSroCi2oJGyfzNY2w/Bz6LyVUh6abIE38h3qnZlDghruHQu3U4lJNY rdayiTm9uPQaKkcPGA70RbmBXGd/fnXS4POBV8biSpvcdUmv9LF40NBJHxwgUQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ct34r0rVWzcqv; Fri, 24 Oct 2025 00:02: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 59O02qMm083365; Fri, 24 Oct 2025 00:02:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59O02qp0083360; Fri, 24 Oct 2025 00:02:52 GMT (envelope-from git) Date: Fri, 24 Oct 2025 00:02:52 GMT Message-Id: <202510240002.59O02qp0083360@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bryan Drewery Subject: git: 30394f3c87cd - main - clock_gettime(2): Remove unneeded trailing wording. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bdrewery X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 30394f3c87cdbeb27aa387dddd3d24020509834f Auto-Submitted: auto-generated The branch main has been updated by bdrewery: URL: https://cgit.FreeBSD.org/src/commit/?id=30394f3c87cdbeb27aa387dddd3d24020509834f commit 30394f3c87cdbeb27aa387dddd3d24020509834f Author: Bryan Drewery AuthorDate: 2025-10-15 23:39:57 +0000 Commit: Bryan Drewery CommitDate: 2025-10-24 00:01:58 +0000 clock_gettime(2): Remove unneeded trailing wording. --- lib/libsys/clock_gettime.2 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/libsys/clock_gettime.2 b/lib/libsys/clock_gettime.2 index 89551d0f720b..841673648dfc 100644 --- a/lib/libsys/clock_gettime.2 +++ b/lib/libsys/clock_gettime.2 @@ -27,7 +27,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd August 10, 2024 +.Dd October 15, 2025 .Dt CLOCK_GETTIME 2 .Os .Sh NAME @@ -80,7 +80,6 @@ Behavior during a leap second is not defined by and POSIX standard. Increments in SI seconds, even while the system is suspended. Its epoch is unspecified. The count is not adjusted by leap seconds. -.Fx implements .It Dv CLOCK_UPTIME .It Dv CLOCK_UPTIME_PRECISE .It Dv CLOCK_UPTIME_FAST From nobody Fri Oct 24 00:02:53 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ct34s4wzgz6Dw2b; Fri, 24 Oct 2025 00:02:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ct34s1vQgz3Z8B; Fri, 24 Oct 2025 00:02:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761264173; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZLos2o0K7vtw2yD0rLCsUftQuUsq12/QTB16R87wBRU=; b=vZ0yCqbPywYwMyUDJV3Q1ow3Hw+owiAmDJXMtcXhh7Fe5UNLJ/R1yLCCTZwieb61q2buIE FmxUqEFWjAuAHDXtWLjpaYx2FNElNkwguLv6zPeujphnQx50bddEyshV+sdCDl4IJd51x1 AdM6s0ITPt6W7SZg1hZwSZ9j7oDFCBDqkED1mJDCIuMAmvoT4C9yvgq2wwo+0hjCurEemF P/TzeAOHOVKOi33QATYffSpguc6rN5D3eLKI0s10a5T6eH9Bi1PQtS/ytHQ2QmDIKwobYI bjj18WG7k0Sx2JoRYn+lc9kP4QWmzUS+ra4VE9Jj5uxD3Yu/WOs4SbIB9v/pLA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761264173; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZLos2o0K7vtw2yD0rLCsUftQuUsq12/QTB16R87wBRU=; b=wOsuFzxlaJTm1PQWkuyzTBRne0VoMkfTdRNRnzFrz3sC2V6MwPrwerfZ8+4GhFCti5C+xE BuR8OsJ3PKq7vey1vNYplQ8x44ZLIMIKGFsxO+e1AXeU5B/i8Lzlv7YKb5QazGlzNXQSov t1wy5OR1yaVtPiP1MhpeJJ6QCs5GlVdcyIM1TyjF5YnL4rLvi3dHsl8pmtMMr6rdwbNc03 r8Nbv8G0hHjAQQ4dkz5P/cMPJamK/MY5RZ46PToqbri07aK7Vn4fwdKaE4EjJ7rgHDdDP5 XbfpiM2Ty97piuQwp9rE6xJ3FaZJIcySazoAx0NEvGyiPbv9Di+woPTJ0TDz2A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761264173; a=rsa-sha256; cv=none; b=vUx6UYfphIYcIF9AGmQv/Bi0z1kUs2CtIrbN3xzaMUGwfe95iuRjAY7sGUGeK1zrBxxqOf 5ap8cBJcSiD4gfuLBOjEF9rNuaUeXnydG+CZ/go2YCvWEBZZXfsedc6jM3Y4HCx7JFFhCS ls8JvVMzSmkbyKAeqby57a8BpBJN6CwTSKfXxbKAmqfCas6eajpqT2SnR0Nqe1ZTEhs2/0 NZ3mGi+Q5eRdpHGq3SUbbrWnLkKXqh3uPBzlNXXnoYAPGmbcidcjGCX0rwZy0odLYoAMYR Cerb/2+5YDW772/UF4SLOKME35/VBxlrcskp1yX0Zt0DtVEQJ/+UEA5N2tNxMw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ct34s1KPFzdGl; Fri, 24 Oct 2025 00:02: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 59O02rec083403; Fri, 24 Oct 2025 00:02:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59O02rqd083399; Fri, 24 Oct 2025 00:02:53 GMT (envelope-from git) Date: Fri, 24 Oct 2025 00:02:53 GMT Message-Id: <202510240002.59O02rqd083399@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bryan Drewery Subject: git: 35f375549c7f - main - cut: Avoid undefined behavior. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bdrewery X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 35f375549c7f4d479ba1d9fcd0a368b0219c4ae6 Auto-Submitted: auto-generated The branch main has been updated by bdrewery: URL: https://cgit.FreeBSD.org/src/commit/?id=35f375549c7f4d479ba1d9fcd0a368b0219c4ae6 commit 35f375549c7f4d479ba1d9fcd0a368b0219c4ae6 Author: Bryan Drewery AuthorDate: 2025-10-20 18:33:31 +0000 Commit: Bryan Drewery CommitDate: 2025-10-24 00:01:58 +0000 cut: Avoid undefined behavior. Summary: UBSAN complains about p[signed - unsigned] wrapping around. Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D53226 --- usr.bin/cut/cut.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.bin/cut/cut.c b/usr.bin/cut/cut.c index 60ff5a31062a..e4e322b4e5c9 100644 --- a/usr.bin/cut/cut.c +++ b/usr.bin/cut/cut.c @@ -448,8 +448,8 @@ f_cut(FILE *fp, const char *fname) break; } if (*pos) - for (i = 0; i < (int)clen; i++) - putchar(p[i - clen]); + (void)fwrite(p - clen, 1, clen, + stdout); } if (ch == '\n') break; From nobody Fri Oct 24 07:41:11 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ctFFg1mcsz6Dhsj; Fri, 24 Oct 2025 07:41:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ctFFg1GH8z3JKm; Fri, 24 Oct 2025 07:41:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761291671; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C1D+Twc2W+2qNJOI07SubYCXQDxybMieGUd/fdnOIrY=; b=t0vO6CqnbUMSTb/v9ibBpOqW85silqUJxxT+cfF8G2eA8JQOu1E58U3LEsRssy3AvBlgKy QEhzvPYI4age+o9+Qlo2ZW36ZnvmFbrL4ZKFyrnsdslioFGDjvLP+H/rqzmCXMNrwoNlPu LDx5cwMGEZjqOFndGJ6Zi9fuCDiZwiDIKEkGLCFlKP7uHL9W9sb6hbAMz/ALsfXEqTDbDT Naim0PNt7NvJkqO18CrPDdwZDEPe24RFoYntU6lel7spEZNw0TNReLvGDNEyiegeokNO+E PP8/QxQS46/Ux2eLaSdG1CXQUxvoKMtqFLmcKtUM90pkQzlS+ZdPXiPBn/BDWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761291671; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C1D+Twc2W+2qNJOI07SubYCXQDxybMieGUd/fdnOIrY=; b=GukBijnqDB32JoZbgAr88ojqlGGAdOfWmhmUgtCTS9UVXLNz724aKniJnbiyfmt7XC/KPp Wn4RRoUykIGVAm5WEQC5JXEGZB5pN2+RybLZ0666MNQnCSFh9TtkrhcNbVlETGYoIpw6cV jWRKdeC2yJP1HqcyN9eEXidSHBabEf5oq+zAY3lXnBVGI+KjMgJc/czewuyhi4yXOnv6wC Z03EmDeG3p94so3y0gPuTyoavLvRupdaUaybS3QeFpeiQ9yXY+zB/ioWvrJTuQXHDWMzYG +E+a0zFHgpl3m0xS+HJQWkCiaFdDPoKkz+bkZaQfxOBDAhBt9vphqzhz83ULcg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761291671; a=rsa-sha256; cv=none; b=oaul7EJGgI+QpW/PZ8pokOjNsUQ3LDH9rwlyUg0WwLgAHST72DHz6DWBiJYbhbVvELXMxo 00WnLC0gQwYTqdzVyt2mZ0ASX3cP86s1HVlVzc8dQzIiFSJ8rPhOdo2k7NSW5rJ+cvj0oQ Qvx/IGVgMvxSR1yXcJtQ/3jtje79qllt4pykk/8i0uszqOh1ufNX5CUFHwkhu4A40PHgnP pqHYZAO7wadzVn9DXnmNByKVy77oJjhYorHMkxBG4FpAdaPWtIAv4trIiP8ic0imgVBnTR tATkcxg4skHXWFGfXEkFWyga0+cn55TDEpOTcP4rZDkLFk0l1+SPQoG5Nq3LTw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ctFFg0pdlzrPs; Fri, 24 Oct 2025 07:41: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 59O7fB4k041998; Fri, 24 Oct 2025 07:41:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59O7fBAe041995; Fri, 24 Oct 2025 07:41:11 GMT (envelope-from git) Date: Fri, 24 Oct 2025 07:41:11 GMT Message-Id: <202510240741.59O7fBAe041995@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Poul-Henning Kamp Subject: git: 2612f1b8649b - main - deadfs: Return ENXIO instead of EIO when the device is gone. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: phk X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2612f1b8649bb4f069a6a064ed714daa5f10d037 Auto-Submitted: auto-generated The branch main has been updated by phk: URL: https://cgit.FreeBSD.org/src/commit/?id=2612f1b8649bb4f069a6a064ed714daa5f10d037 commit 2612f1b8649bb4f069a6a064ed714daa5f10d037 Author: Poul-Henning Kamp AuthorDate: 2025-10-24 07:19:31 +0000 Commit: Poul-Henning Kamp CommitDate: 2025-10-24 07:19:31 +0000 deadfs: Return ENXIO instead of EIO when the device is gone. One some systems, under some conditions, pulling a USB stick would read(2) returning EIO and not ENXIO, like it should and used to. Recoverdisk(1), which does not give up on EIO, like most programs would, spins furiously. Arguably, deadfs was always wrong in returning EIO, because once you get to deadfs no operation will ever work again, but we used to take a different path through devfs_vnops.c which got us the ENXIO. Something changed recently, and while testing this fix, I noticed that drm-kmod-66/i915kms may be the condition which trigger the different code-path. MFC to: stable/15 Fixes: 289785 Thanks to: imp, kib --- sys/fs/deadfs/dead_vnops.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/fs/deadfs/dead_vnops.c b/sys/fs/deadfs/dead_vnops.c index 296cf058f8c9..137c86b65058 100644 --- a/sys/fs/deadfs/dead_vnops.c +++ b/sys/fs/deadfs/dead_vnops.c @@ -122,18 +122,18 @@ dead_read(struct vop_read_args *ap) { /* - * Return EOF for tty devices, EIO for others + * Return EOF for tty devices, ENXIO for others */ - if ((ap->a_vp->v_vflag & VV_ISTTY) == 0) - return (EIO); - return (0); + if (ap->a_vp->v_vflag & VV_ISTTY) + return (0); + return (ENXIO); } int dead_write(struct vop_write_args *ap) { - return (EIO); + return (ENXIO); } int From nobody Fri Oct 24 08:12:49 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ctFyQ3p23z6DmrN; Fri, 24 Oct 2025 08:13:02 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4ctFyQ0FNGz3NNp; Fri, 24 Oct 2025 08:13:01 +0000 (UTC) (envelope-from kostikbel@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: from tom.home (kib@localhost [127.0.0.1] (may be forged)) by kib.kiev.ua (8.18.1/8.18.1) with ESMTP id 59O8CnKE056090; Fri, 24 Oct 2025 11:12:52 +0300 (EEST) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 59O8CnKE056090 Received: (from kostik@localhost) by tom.home (8.18.1/8.18.1/Submit) id 59O8Cndt056089; Fri, 24 Oct 2025 11:12:49 +0300 (EEST) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Fri, 24 Oct 2025 11:12:49 +0300 From: Konstantin Belousov To: Alan Somers Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 6d408ac49073 - main - fusefs: add a regression test for a cluster_read bug Message-ID: References: <202510231341.59NDf5as007410@gitrepo.freebsd.org> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <202510231341.59NDf5as007410@gitrepo.freebsd.org> X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FORGED_GMAIL_RCVD,FREEMAIL_FROM, NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=4.0.1 X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on tom.home X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:6939, ipnet:2001:470::/32, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4ctFyQ0FNGz3NNp On Thu, Oct 23, 2025 at 01:41:05PM +0000, Alan Somers wrote: > The branch main has been updated by asomers: > > URL: https://cgit.FreeBSD.org/src/commit/?id=6d408ac490730614b3ed0ebd3caffcd23f303fb4 > > commit 6d408ac490730614b3ed0ebd3caffcd23f303fb4 > Author: Alan Somers > AuthorDate: 2025-10-23 13:40:56 +0000 > Commit: Alan Somers > CommitDate: 2025-10-23 13:40:56 +0000 > > fusefs: add a regression test for a cluster_read bug > > VOP_BMAP is purely advisory. If VOP_BMAP returns an error during > readahead, cluster_read should still succeed, because the actual data > was still read just fine. No, VOP_BMAP() is not advisory. But read-ahead beyond the first buffer is. The BMAP in question is to translate lblk for read-ahead buffer. > > Add a regression test for PR 264196, wherein cluster_read would fail if > VOP_BMAP did. > > PR: 264196 > MFC with: 62aef3f73f38db9fb68bffc12cc8900fecd58f0e > Reported by: danfe > Reviewed by: arrowd > Differential Revision: https://reviews.freebsd.org/D51316 > --- > tests/sys/fs/fusefs/bmap.cc | 87 +++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 87 insertions(+) > > diff --git a/tests/sys/fs/fusefs/bmap.cc b/tests/sys/fs/fusefs/bmap.cc > index 30612079657d..e61dadb6d79e 100644 > --- a/tests/sys/fs/fusefs/bmap.cc > +++ b/tests/sys/fs/fusefs/bmap.cc > @@ -177,6 +177,93 @@ TEST_F(Bmap, default_) > leak(fd); > } > > +/* > + * The server returns an error for some reason for FUSE_BMAP. fusefs should > + * faithfully report that error up to the caller. > + */ > +TEST_F(Bmap, einval) > +{ > + struct fiobmap2_arg arg; > + const off_t filesize = 1 << 30; > + int64_t lbn = 100; > + const ino_t ino = 42; > + int fd; > + > + expect_lookup(RELPATH, 42, filesize); > + expect_open(ino, 0, 1); > + EXPECT_CALL(*m_mock, process( > + ResultOf([=](auto in) { > + return (in.header.opcode == FUSE_BMAP && > + in.header.nodeid == ino); > + }, Eq(true)), > + _) > + ).WillOnce(Invoke(ReturnErrno(EINVAL))); > + > + fd = open(FULLPATH, O_RDWR); > + ASSERT_LE(0, fd) << strerror(errno); > + > + arg.bn = lbn; > + arg.runp = -1; > + arg.runb = -1; > + ASSERT_EQ(-1, ioctl(fd, FIOBMAP2, &arg)); > + EXPECT_EQ(EINVAL, errno); > + > + leak(fd); > +} > + > +/* > + * Even if the server returns EINVAL during VOP_BMAP, we should still be able > + * to successfully read a block. This is a regression test for > + * https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=264196 . The bug did not > + * lie in fusefs, but this is a convenient place for a regression test. > + */ > +TEST_F(Bmap, spurious_einval) > +{ > + const off_t filesize = 4ull << 30; > + const ino_t ino = 42; > + int fd, r; > + char buf[1]; > + > + expect_lookup(RELPATH, 42, filesize); > + expect_open(ino, 0, 1); > + EXPECT_CALL(*m_mock, process( > + ResultOf([=](auto in) { > + return (in.header.opcode == FUSE_BMAP && > + in.header.nodeid == ino); > + }, Eq(true)), > + _) > + ).WillRepeatedly(Invoke(ReturnErrno(EINVAL))); > + EXPECT_CALL(*m_mock, process( > + ResultOf([=](auto in) { > + return (in.header.opcode == FUSE_READ && > + in.header.nodeid == ino && > + in.body.read.offset == 0 && > + in.body.read.size == (uint64_t)m_maxbcachebuf); > + }, Eq(true)), > + _) > + ).WillOnce(Invoke(ReturnImmediate([=](auto in, auto& out) { > + size_t osize = in.body.read.size; > + > + assert(osize < sizeof(out.body.bytes)); > + out.header.len = sizeof(struct fuse_out_header) + osize; > + bzero(out.body.bytes, osize); > + }))); > + > + fd = open(FULLPATH, O_RDWR); > + ASSERT_LE(0, fd) << strerror(errno); > + > + /* > + * Read the same block multiple times. On a system affected by PR > + * 264196 , the second read will fail. > + */ > + r = read(fd, buf, sizeof(buf)); > + EXPECT_EQ(r, 1) << strerror(errno); > + r = read(fd, buf, sizeof(buf)); > + EXPECT_EQ(r, 1) << strerror(errno); > + r = read(fd, buf, sizeof(buf)); > + EXPECT_EQ(r, 1) << strerror(errno); > +} > + > /* > * VOP_BMAP should not query the server for the file's size, even if its cached > * attributes have expired. From nobody Fri Oct 24 08:17:52 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ctG4822fFz6Dn9d; Fri, 24 Oct 2025 08:18:00 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4ctG4800l7z3P1t; Fri, 24 Oct 2025 08:17:59 +0000 (UTC) (envelope-from kostikbel@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: from tom.home (kib@localhost [127.0.0.1] (may be forged)) by kib.kiev.ua (8.18.1/8.18.1) with ESMTP id 59O8Hqw9056319; Fri, 24 Oct 2025 11:17:55 +0300 (EEST) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 59O8Hqw9056319 Received: (from kostik@localhost) by tom.home (8.18.1/8.18.1/Submit) id 59O8HqKY056318; Fri, 24 Oct 2025 11:17:52 +0300 (EEST) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Fri, 24 Oct 2025 11:17:52 +0300 From: Konstantin Belousov To: "David E. O'Brien" Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: d1ca01059d5d - main - padlock(4)/nehemiah: move i386-only entropy source to MD files Message-ID: References: <202510232317.59NNHQMC088762@gitrepo.freebsd.org> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <202510232317.59NNHQMC088762@gitrepo.freebsd.org> X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FORGED_GMAIL_RCVD,FREEMAIL_FROM, NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=4.0.1 X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on tom.home X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:6939, ipnet:2001:470::/32, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4ctG4800l7z3P1t On Thu, Oct 23, 2025 at 11:17:26PM +0000, David E. O'Brien wrote: > The branch main has been updated by obrien: > > URL: https://cgit.FreeBSD.org/src/commit/?id=d1ca01059d5d756a4aef09d955e98aa59a284344 > > commit d1ca01059d5d756a4aef09d955e98aa59a284344 > Author: David E. O'Brien > AuthorDate: 2025-10-23 22:27:06 +0000 > Commit: David E. O'Brien > CommitDate: 2025-10-23 23:17:19 +0000 > > padlock(4)/nehemiah: move i386-only entropy source to MD files Why do you think that padlock was implemented on 32bit only VIA CPUs? I believe that VIA NANO supported both x86-64 and padlock. And wikipedia (sorry) seems to confirm this https://en.wikipedia.org/wiki/VIA_Nano > > Reviewed by: khng > Differential Revision: https://reviews.freebsd.org/D53309 > --- > sys/amd64/conf/GENERIC | 1 - > sys/amd64/conf/MINIMAL | 1 - > sys/conf/files.i386 | 1 + > sys/conf/files.x86 | 1 - > sys/i386/conf/NOTES | 7 +++++++ > sys/modules/Makefile | 4 +++- > sys/x86/conf/NOTES | 1 - > 7 files changed, 11 insertions(+), 5 deletions(-) > > diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC > index 2e41ed26403a..fb8473505128 100644 > --- a/sys/amd64/conf/GENERIC > +++ b/sys/amd64/conf/GENERIC > @@ -309,7 +309,6 @@ device wpi # Intel 3945ABG wireless NICs. > device crypto # core crypto support > device aesni # AES-NI OpenCrypto module > device loop # Network loopback > -device padlock_rng # VIA Padlock RNG > device rdrand_rng # Intel Bull Mountain RNG > device ether # Ethernet support > device vlan # 802.1Q VLAN support > diff --git a/sys/amd64/conf/MINIMAL b/sys/amd64/conf/MINIMAL > index 0baf6d6431de..61c713c609a4 100644 > --- a/sys/amd64/conf/MINIMAL > +++ b/sys/amd64/conf/MINIMAL > @@ -113,7 +113,6 @@ device uart # Generic UART driver > > # Pseudo devices. > device loop # Network loopback > -device padlock_rng # VIA Padlock RNG > device rdrand_rng # Intel Bull Mountain RNG > device ether # Ethernet support > > diff --git a/sys/conf/files.i386 b/sys/conf/files.i386 > index 41c51a7aa9c5..e6c2089e2c1e 100644 > --- a/sys/conf/files.i386 > +++ b/sys/conf/files.i386 > @@ -33,6 +33,7 @@ dev/hyperv/vmbus/i386/hyperv_machdep.c optional hyperv > dev/le/if_le_isa.c optional le isa > dev/ofw/ofw_pcib.c optional fdt pci > dev/pcf/pcf_isa.c optional pcf > +dev/random/nehemiah.c optional padlock_rng !random_loadable > dev/sbni/if_sbni.c optional sbni > dev/sbni/if_sbni_isa.c optional sbni isa > dev/sbni/if_sbni_pci.c optional sbni pci > diff --git a/sys/conf/files.x86 b/sys/conf/files.x86 > index 21a1b8046f12..31b8e88a6951 100644 > --- a/sys/conf/files.x86 > +++ b/sys/conf/files.x86 > @@ -310,7 +310,6 @@ dev/ntb/ntb_hw/ntb_hw_plx.c optional ntb_hw_plx | ntb_hw > dev/ntb/test/ntb_tool.c optional ntb_tool > dev/nvram/nvram.c optional nvram isa > dev/random/ivy.c optional rdrand_rng !random_loadable > -dev/random/nehemiah.c optional padlock_rng !random_loadable > dev/random/rdseed.c optional rdrand_rng !random_loadable > dev/qat_c2xxx/qat.c optional qat_c2xxx > dev/qat_c2xxx/qat_ae.c optional qat_c2xxx > diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES > index 93dc00634cc0..fbcea76527db 100644 > --- a/sys/i386/conf/NOTES > +++ b/sys/i386/conf/NOTES > @@ -302,6 +302,13 @@ envvar hint.pcf.0.irq="5" > # > device glxsb # AMD Geode LX Security Block > > +# > +# padlock is a driver for the cryptographic functions and RNG in > +# VIA C3, C7, and Eden processors. > +# Requires 'device crypto'. > +# > +device padlock_rng # VIA Padlock RNG > + > ##################################################################### > # ABI Emulation > > diff --git a/sys/modules/Makefile b/sys/modules/Makefile > index 9bc743c0c6d1..cde4c1c0e9ac 100644 > --- a/sys/modules/Makefile > +++ b/sys/modules/Makefile > @@ -819,7 +819,6 @@ _nfe= nfe > _nvram= nvram > .if ${MK_CRYPT} != "no" || defined(ALL_MODULES) > _padlock= padlock > -_padlock_rng= padlock_rng > _rdrand_rng= rdrand_rng > _rdseed_rng= rdseed_rng > .endif > @@ -892,6 +891,9 @@ _glxsb= glxsb > _pcfclock= pcfclock > _pst= pst > _sbni= sbni > +.if ${MK_CRYPT} != "no" || defined(ALL_MODULES) > +_padlock_rng= padlock_rng > +.endif > .endif > > .if ${MACHINE_ARCH} == "armv7" > diff --git a/sys/x86/conf/NOTES b/sys/x86/conf/NOTES > index 3b3439b519d7..fadaf90d508f 100644 > --- a/sys/x86/conf/NOTES > +++ b/sys/x86/conf/NOTES > @@ -541,7 +541,6 @@ device smbios > device vpd > device asmc > device tpm > -device padlock_rng # VIA Padlock RNG > device rdrand_rng # Intel Bull Mountain RNG > device aesni # AES-NI OpenCrypto module > device ossl # OpenSSL OpenCrypto module From nobody Fri Oct 24 08:21:00 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ctG7l1Djfz6DnKL; Fri, 24 Oct 2025 08:21:07 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4ctG7k67M5z3PSm; Fri, 24 Oct 2025 08:21:06 +0000 (UTC) (envelope-from kostikbel@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: from tom.home (kib@localhost [127.0.0.1] (may be forged)) by kib.kiev.ua (8.18.1/8.18.1) with ESMTP id 59O8L0OV056426; Fri, 24 Oct 2025 11:21:03 +0300 (EEST) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 59O8L0OV056426 Received: (from kostik@localhost) by tom.home (8.18.1/8.18.1/Submit) id 59O8L0L2056425; Fri, 24 Oct 2025 11:21:00 +0300 (EEST) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Fri, 24 Oct 2025 11:21:00 +0300 From: Konstantin Belousov To: Poul-Henning Kamp Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 2612f1b8649b - main - deadfs: Return ENXIO instead of EIO when the device is gone. Message-ID: References: <202510240741.59O7fBAe041995@gitrepo.freebsd.org> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <202510240741.59O7fBAe041995@gitrepo.freebsd.org> X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FORGED_GMAIL_RCVD,FREEMAIL_FROM, NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=4.0.1 X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on tom.home X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:6939, ipnet:2001:470::/32, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4ctG7k67M5z3PSm On Fri, Oct 24, 2025 at 07:41:11AM +0000, Poul-Henning Kamp wrote: > The branch main has been updated by phk: > > URL: https://cgit.FreeBSD.org/src/commit/?id=2612f1b8649bb4f069a6a064ed714daa5f10d037 > > commit 2612f1b8649bb4f069a6a064ed714daa5f10d037 > Author: Poul-Henning Kamp > AuthorDate: 2025-10-24 07:19:31 +0000 > Commit: Poul-Henning Kamp > CommitDate: 2025-10-24 07:19:31 +0000 > > deadfs: Return ENXIO instead of EIO when the device is gone. > > One some systems, under some conditions, pulling a USB stick would > read(2) returning EIO and not ENXIO, like it should and used to. > > Recoverdisk(1), which does not give up on EIO, like most programs > would, spins furiously. > > Arguably, deadfs was always wrong in returning EIO, because once you > get to deadfs no operation will ever work again, but we used to > take a different path through devfs_vnops.c which got us the ENXIO. > > Something changed recently, and while testing this fix, I noticed Nothing changed WRT code, it is just a race that causes the behavior. > that drm-kmod-66/i915kms may be the condition which trigger > the different code-path. > > MFC to: stable/15 > Fixes: 289785 > Thanks to: imp, kib > --- > sys/fs/deadfs/dead_vnops.c | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/sys/fs/deadfs/dead_vnops.c b/sys/fs/deadfs/dead_vnops.c > index 296cf058f8c9..137c86b65058 100644 > --- a/sys/fs/deadfs/dead_vnops.c > +++ b/sys/fs/deadfs/dead_vnops.c > @@ -122,18 +122,18 @@ dead_read(struct vop_read_args *ap) > { > > /* > - * Return EOF for tty devices, EIO for others > + * Return EOF for tty devices, ENXIO for others > */ > - if ((ap->a_vp->v_vflag & VV_ISTTY) == 0) > - return (EIO); > - return (0); > + if (ap->a_vp->v_vflag & VV_ISTTY) Old style with explicit '== 0' was more style-correct. > + return (0); > + return (ENXIO); > } > > int > dead_write(struct vop_write_args *ap) > { > > - return (EIO); > + return (ENXIO); > } > > int From nobody Fri Oct 24 09:47:05 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ctJ2x5c3mz6DyTK; Fri, 24 Oct 2025 09:47:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ctJ2x50Zcz3ZFL; Fri, 24 Oct 2025 09:47:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761299225; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8xe9XnAVJW6XxeJSIZ5rF+DXJTsUDmQnosX/O+NlngU=; b=vismyGW1jGHYq4CMFH7L7D7hhyWsv+88kLMDw6p4V5Ynkvi3CMxRpVm0/8+RC7N1oRaoKH mcOY03A04FJDb5P9fY0sQo0iumyjlDzO3k84X0MrRZO5rTPhkTNe2hOKyVWgJWjMirGgOf HvlYtcze6bqHBWMZBUkJK68SzUKZwtFpSqF1n58wCGB0ZBFhMyxBmUJz8jjk5T8btIqjBp o8b+m+nNZy6Sc5h7ELZwhXHNnF9cKumflvWOH1hXShkhT1Uu9NWMmFwjJMKN/OV5pPe7ml LOsaktY8HLvJmvUrWfPVFc32I0MQUosaNwyqEnoRDIHUpdtR7nzEG3tpJyqPmA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761299225; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8xe9XnAVJW6XxeJSIZ5rF+DXJTsUDmQnosX/O+NlngU=; b=AXlJJc2nzFv2HjeqIfN+l5m0sgxc1A0eTrAMBXMrvqtWeSTW+ysVP5fbTYLHHFQidRkYHB u/QPdzzy8YcQO83sjQ6xb62rtwoRH+UlcKis+6ZIJxPDEtef81MACTOWG/DBFVyJu4Jih+ 70iqEg+VXhDeS2BTurg0nMQedGdt5hhGDESomQKGcJnKMUlobv5JuhycJkTcAAGOYGohNB pYTS2sA6F2vjmDYgZfqiAkf7wZ4QgCfHB3yBckbn7lXkpQ6bqj6NUKGPl0Oc/F0xv0nF4/ bHmTtJRcq4Y5L/JCEVfEomEsX+30UkRQDXRTCCOZTNVws+EsyahrLrP5gOEWqQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761299225; a=rsa-sha256; cv=none; b=f9IlMlMzQrtHgYE+eV/U1dQnTTKfOFCHhyYIuIIPVY8qblzElPvEuHfjzbBqnpmMktKNJu mEUREWyw9D3KcOcJ2cvvCUXyXHsWwWFLJC39rZGwJR5ACSEhrQKfG1f8X1w3sP+1fib83c xcKjZ+iTEki1cVzUtluZDNRYQpRf3YGVPXD6225H6piIZjDw7NpmiXMrrtEbmK0ZObI3Qc KZmNpG1Hp+3g//1n7HZUTdemZCCqNCo04HQabSuVXw+wr/+UG0VOI3C3Ig/sOkOLtLJqmj F1l5QoCLhbZ/y1CLWpM7vSOYnz2tp00/vbrPbycuQCgcDyMRSJYPLlunZx62+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 4ctJ2x4P5CzwBG; Fri, 24 Oct 2025 09:47: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 59O9l5R3075596; Fri, 24 Oct 2025 09:47:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59O9l5wE075593; Fri, 24 Oct 2025 09:47:05 GMT (envelope-from git) Date: Fri, 24 Oct 2025 09:47:05 GMT Message-Id: <202510240947.59O9l5wE075593@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: cfb28c5ea0bc - main - amd64: print 'EFI RT fault' line before fault CPU state List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cfb28c5ea0bce2ce95b14076bc63546049f0c16c Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=cfb28c5ea0bce2ce95b14076bc63546049f0c16c commit cfb28c5ea0bce2ce95b14076bc63546049f0c16c Author: Konstantin Belousov AuthorDate: 2025-10-24 09:39:13 +0000 Commit: Konstantin Belousov CommitDate: 2025-10-24 09:46:47 +0000 amd64: print 'EFI RT fault' line before fault CPU state Suggested by: arrowd Sponsored by: The FreeBSD Foundation MFC after: 3 days --- sys/amd64/amd64/trap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/amd64/amd64/trap.c b/sys/amd64/amd64/trap.c index f3469ed5e2bc..84305ca918df 100644 --- a/sys/amd64/amd64/trap.c +++ b/sys/amd64/amd64/trap.c @@ -435,9 +435,9 @@ trap(struct trapframe *frame) if ((print_efirt_faults == 1 && cnt == 0) || print_efirt_faults == 2) { - trap_diag(frame, 0); printf("EFI RT fault %s\n", traptype_to_msg(type)); + trap_diag(frame, 0); } frame->tf_rip = (long)curpcb->pcb_onfault; return; @@ -870,8 +870,8 @@ after_vmfault: if ((print_efirt_faults == 1 && cnt == 0) || print_efirt_faults == 2) { - trap_diag(frame, eva); printf("EFI RT page fault\n"); + trap_diag(frame, eva); } } frame->tf_rip = (long)curpcb->pcb_onfault; From nobody Fri Oct 24 10:12:30 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ctJcJ5B3yz6F2hL; Fri, 24 Oct 2025 10:12:32 +0000 (UTC) (envelope-from phk@critter.freebsd.dk) Received: from phk.freebsd.dk (phk.freebsd.dk [130.225.244.222]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4ctJcJ2qz1z3fG3; Fri, 24 Oct 2025 10:12:32 +0000 (UTC) (envelope-from phk@critter.freebsd.dk) Authentication-Results: mx1.freebsd.org; none Received: from critter.freebsd.dk (unknown [192.168.55.3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by phk.freebsd.dk (Postfix) with ESMTPS id B3C19C3F3D; Fri, 24 Oct 2025 10:12:30 +0000 (UTC) Received: (from phk@localhost) by critter.freebsd.dk (8.18.1/8.16.1/Submit) id 59OACUDA002781; Fri, 24 Oct 2025 10:12:30 GMT (envelope-from phk) Message-Id: <202510241012.59OACUDA002781@critter.freebsd.dk> To: Konstantin Belousov cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 2612f1b8649b - main - deadfs: Return ENXIO instead of EIO when the device is gone. In-reply-to: From: "Poul-Henning Kamp" References: <202510240741.59O7fBAe041995@gitrepo.freebsd.org> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-ID: <2779.1761300750.1@critter.freebsd.dk> Date: Fri, 24 Oct 2025 10:12:30 +0000 X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:1835, ipnet:130.225.0.0/16, country:EU] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4ctJcJ2qz1z3fG3 -------- Konstantin Belousov writes: > On Fri, Oct 24, 2025 at 07:41:11AM +0000, Poul-Henning Kamp wrote: > > Something changed recently, and while testing this fix, I noticed > Nothing changed WRT code, it is just a race that causes the behavior. That is why I wrote "something", because I agree that it is not code in our tree which has changed. > > that drm-kmod-66/i915kms may be the condition which trigger > > the different code-path. It worries me if loading drm-kmod-66/i915kms can cause this kind of change of behaviour. Even with the fix, I see 2-4 read(2) operations return EIO before the ENXIO manifests. The only hypothesis I have, is that something in DRM-world hogs some kind of HW resource, but I do not have time (nor drm-skillz) to look into that this morning, and I wanted to get the ENXIO fix in for RELENG-15 purposes[1]. I'm also seeing two other "hmm, that's odd" things on -current these days, but they are very specialized so I do not think they should hold up 15: A) When using a GreazeWeazle USB device, the USB connection will get stuck. B) When using a Professional Canon document scanner, the USB connection will get stuck even before the first page is been received. When I next get a chance, I am going to retry both of those scenarios without loading drm-kmod-66/i915kms, to see if makes any difference. Poul-Henning [1]: As I remarked to re@: Measured in years, that is probably the oldest bug I have ever fixed in FreeBSD: According to dds' amazing UNIX history it goes back to 4.4BSD, which means it's probably John Heidemann's mistake. -- Poul-Henning Kamp | UNIX since Zilog Zeus 3.20 phk@FreeBSD.ORG | TCP/IP since RFC 956 FreeBSD committer | BSD since 4.3-tahoe Never attribute to malice what can adequately be explained by incompetence. From nobody Fri Oct 24 10:18:46 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ctJlV4FHNz6F38b; Fri, 24 Oct 2025 10:18:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ctJlV3klBz3fsW; Fri, 24 Oct 2025 10:18:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761301126; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zncQI5y22zWeEr5sueT0GajnDA8BLp4NuyxJB+YxCV8=; b=XJtv+LFpjYdUqRoOHvPuwY/9zLvBA4skiMU6uBlb1M/wPyYowkJjVCIG0mQznAEl9II1aC sKb1xUil0EG9sXFKOvopmJiHwf3hzTTdOz0VQZ4r+XY+NThh/NCG9z18ssEBjQSNkwpECU g/E3GIbE4AhFJOdYY7UsBd/wGJlgWqbDUHm9TrLnwDEr2dp6MUIE4xjmdHY7xT2vuaJN4X kG+XYkKCdiuuG5iBt7mZeLH4YToiYXNxe72BC1QOZDxQtCpk1fNIODZuIL9hbYXrlSXSFR o4xH9OsMLRCj7aohK1zN2F0uo3Kuo/CTzS62gMNGJ8h7GclanPuJisTiwF+S5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761301126; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zncQI5y22zWeEr5sueT0GajnDA8BLp4NuyxJB+YxCV8=; b=Yx6Utxc9Gzts3eSCpVriILOHM2bT7fpoqLAqFlhYTY6MavfaKryrm7BoY7h9pgIapKlFFL HKTNfhzhPZopmRXwu2CGUkeAAnLgk8lURENLw79YtHjatSElspFssuKhz/LurvR3ImxzXG tkoqg+0Z1jkGLhXZq/wIk7grNpzCQGE8V3lMraiwTw96huf+AxTFYSKOiqlCPWXcXDpxFo qEEu53mv3ZsnIQAsVb2sD7MNX73B++VkM2+C17ic+TgTNYYUjkbjkzg/Az784HBBg+jTQW D7dMB1EEWHYCJNaE0OVPaMQVLHwk7LhmBi6Ey5PhB8uYIq4s2NsI3HLvPFGwrw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761301126; a=rsa-sha256; cv=none; b=pBnvlwjzBvHjvOMWuBJ0SWxHOMZyTTu3bWwPbRUW+QIqz8wt+8PQ8WNwH8Y2e4FsNtHCu5 0YIDufQE5SNQvOVdgfb7Se/bKMGgXnxOzML18zEsoKAg2NJa4bxA110g8+ZheShcAm6dUy yaoYnDy9vXLtfJ0Ff3lFhsp/9stsPRvEHItQc3L96aGjEmjRiwZCttcxxPKWme+5YMROjN sdJeaX50EY/MDcDQQ0pdR/LPnLl/TWoMCWF854BvWdhvCTnI/nnglfnXoyl3SDIqYo90R1 tiiw+PnH/5FW5clP3/cWma5Ttc+7vVwu5qhW5hMyg1hs3QAFvhPhEfKXGWmfvQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ctJlV3KGxzx4L; Fri, 24 Oct 2025 10:18: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 59OAIkCE033666; Fri, 24 Oct 2025 10:18:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59OAIkNX033663; Fri, 24 Oct 2025 10:18:46 GMT (envelope-from git) Date: Fri, 24 Oct 2025 10:18:46 GMT Message-Id: <202510241018.59OAIkNX033663@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Clausecker Subject: git: ec3242ed1906 - main - lib/libmd: fuz@freebsd.org -> fuz@FreeBSD.org List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ec3242ed1906e77c9af2c54da636833a946c62b6 Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=ec3242ed1906e77c9af2c54da636833a946c62b6 commit ec3242ed1906e77c9af2c54da636833a946c62b6 Author: Robert Clausecker AuthorDate: 2025-10-10 20:25:47 +0000 Commit: Robert Clausecker CommitDate: 2025-10-24 10:16:21 +0000 lib/libmd: fuz@freebsd.org -> fuz@FreeBSD.org Approved by: markj (mentor) MFC after: 1 week --- lib/libmd/aarch64/sha1block.S | 2 +- lib/libmd/aarch64/sha1dispatch.c | 2 +- lib/libmd/amd64/sha1block.S | 2 +- lib/libmd/amd64/sha1dispatch.c | 2 +- lib/libmd/sha1c.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/libmd/aarch64/sha1block.S b/lib/libmd/aarch64/sha1block.S index 56a0297efadd..e16fb36342fd 100644 --- a/lib/libmd/aarch64/sha1block.S +++ b/lib/libmd/aarch64/sha1block.S @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2024 Robert Clausecker + * Copyright (c) 2024 Robert Clausecker * * SPDX-License-Identifier: BSD-2-Clause * diff --git a/lib/libmd/aarch64/sha1dispatch.c b/lib/libmd/aarch64/sha1dispatch.c index e34bf0a1a344..045527044320 100644 --- a/lib/libmd/aarch64/sha1dispatch.c +++ b/lib/libmd/aarch64/sha1dispatch.c @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2024 Robert Clausecker + * Copyright (c) 2024 Robert Clausecker * * SPDX-License-Identifier: BSD-2-Clause */ diff --git a/lib/libmd/amd64/sha1block.S b/lib/libmd/amd64/sha1block.S index f1291ef2647a..6ef083178abc 100644 --- a/lib/libmd/amd64/sha1block.S +++ b/lib/libmd/amd64/sha1block.S @@ -1,6 +1,6 @@ /*- * Copyright (c) 2013 The Go Authors. All rights reserved. - * Copyright (c) 2024 Robert Clausecker + * Copyright (c) 2024 Robert Clausecker * * Adapted from Go's crypto/sha1/sha1block_amd64.s. * diff --git a/lib/libmd/amd64/sha1dispatch.c b/lib/libmd/amd64/sha1dispatch.c index 86509195d56e..c82a60334739 100644 --- a/lib/libmd/amd64/sha1dispatch.c +++ b/lib/libmd/amd64/sha1dispatch.c @@ -1,6 +1,6 @@ /*- * Copyright (c) 2016 The Go Authors. All rights reserved. - * Copyright (c) 2024 Robert Clausecker + * Copyright (c) 2024 Robert Clausecker * * Adapted from Go's crypto/sha1/sha1block_amd64.go. * diff --git a/lib/libmd/sha1c.c b/lib/libmd/sha1c.c index 128e0b991742..02132d720dac 100644 --- a/lib/libmd/sha1c.c +++ b/lib/libmd/sha1c.c @@ -1,6 +1,6 @@ /*- * Copyright (c) 2009 The Go Authors. All rights reserved. - * Copyright (c) 2024 Robert Clausecker + * Copyright (c) 2024 Robert Clausecker * * Adapted from Go's crypto/sha1/sha1.go. * From nobody Fri Oct 24 10:18:47 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ctJlW4xWhz6F38f; Fri, 24 Oct 2025 10:18:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ctJlW4R41z3fjK; Fri, 24 Oct 2025 10:18:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761301127; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JU08yEkFQFISZ9SFDcGJuFdKyu971AtvRpYWSd2aD9Q=; b=yCjFj1o2b1lANoGEn2dj5epmSgNMF/zFKX8wdXcRg5tLfDMLktErHclqPI2eTfupZm4AJU 0op2/3JOshlezy3gTN1/NtCo95it4iBjhlJ4IPEgIXZL3a5Y6K51gtaIazUsbT3zAMfOnh CanAb35vJgW+7o0xQvXfaZoIgT59cdSvNdwpoXb5TUbD7qsnoZSRhLdCN64zC6MClX211v eQWFcw3wSMzmE/C8TP/iMymQEuJnGOBTQbYKOl3XFhyoyN6ucOZGVOCPhKinxkgSrqAO+D EPJXdLRx0dMa1zWRLdxQqxr4eebo7wmyfUa4eMp0JtE2lY6bZYprrztDlRtPMw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761301127; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JU08yEkFQFISZ9SFDcGJuFdKyu971AtvRpYWSd2aD9Q=; b=kuoaiCUr/dPn7VChUGf1pmFCMfOkZJBhV0uC3f1fGbjYyF+WdTEfkgqaiPfa1YANdaQ6pi Q9gU5AuQhcSJH2H9T6E+stMqeXE85VkBgjN9zTsE7pTBZD5ZQkNWjX/sNqEhWG/O39bemR gMK11aff54sjDG7ugLeC4brblRHePLKKHNYbwDeD3O3op+jQlr1d4tNV2todRuv5jlaf76 GY35e2p2Yi/AEo2EbjqYMKhRzthewlDsoSm8d2wk9mqMtY/LzJfP0SzzswGRLbMwAmqcF2 U/Vi4ZxEbmzxr7h9dHL+YZ0kAypxuUwYha46C9MiBmRk3mnKgx582wKv3a59XQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761301127; a=rsa-sha256; cv=none; b=jMWKEZCu5ecGZgJILx8tY8kv38IliwvRDXHRjlFfTpB2t2QflA+ZiAKFtHkXK2foxKOs2p V59YHcbMOvmjIVaqKZrBLa3zLmLHBdtfQF4a8r2SbKZsjjMbthi3u+TvWcTkruJhDjPJbj xfDkOI73OSCiIuocPzzOftj1qTSsFIXRPcf8ls9cy96CzCItLtv1beAvt6u8us+tbxsnVg 7EYOv45cOfrbOCURLS1kGAw01008mSTwri3NlNzya8AIkbLiG8vRPjhTf7qlxmkYcaPiTm HKHPU4Z9R19/Wtp+KWvnAqlmlWcUzc7+JVFU3VrP//VDrVVqv9Gl/0e1ojIUCA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ctJlW42HyzwXB; Fri, 24 Oct 2025 10:18:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59OAIlWC033699; Fri, 24 Oct 2025 10:18:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59OAIlEx033696; Fri, 24 Oct 2025 10:18:47 GMT (envelope-from git) Date: Fri, 24 Oct 2025 10:18:47 GMT Message-Id: <202510241018.59OAIlEx033696@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Clausecker Subject: git: 73a9b273d3d3 - main - sys: move sys/kern/md[45].c to sys/crypto List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 73a9b273d3d315716304c2cc237fef3141a93f2a Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=73a9b273d3d315716304c2cc237fef3141a93f2a commit 73a9b273d3d315716304c2cc237fef3141a93f2a Author: Robert Clausecker AuthorDate: 2025-10-04 21:40:33 +0000 Commit: Robert Clausecker CommitDate: 2025-10-24 10:16:46 +0000 sys: move sys/kern/md[45].c to sys/crypto Both files are used by kernel and userspace. Move them to sys/crypto where they belong. No functional changes intended. In preparation of D45670. Reviewed by: markj Approved by: markj (mentor) MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D52909 --- lib/libmd/Makefile | 2 +- stand/libsa/Makefile | 3 +-- sys/conf/files | 4 ++-- sys/{kern => crypto}/md4c.c | 0 sys/{kern => crypto}/md5c.c | 0 sys/modules/smbfs/Makefile | 4 ++-- 6 files changed, 6 insertions(+), 7 deletions(-) diff --git a/lib/libmd/Makefile b/lib/libmd/Makefile index 547a134fc440..59a519a882af 100644 --- a/lib/libmd/Makefile +++ b/lib/libmd/Makefile @@ -108,7 +108,7 @@ CFLAGS+= -DWEAK_REFS CFLAGS.skein_block.c+= -DSKEIN_LOOP=995 .PATH: ${.CURDIR}/${MACHINE_ARCH} ${SRCTOP}/sys/crypto/sha2 .PATH: ${SRCTOP}/sys/crypto/skein ${SRCTOP}/sys/crypto/skein/${MACHINE_ARCH} -.PATH: ${SRCTOP}/sys/kern +.PATH: ${SRCTOP}/sys/crypto USE_ASM_SOURCES?=1 .if defined(BOOTSTRAPPING) || ${MK_MACHDEP_OPTIMIZATIONS} == no diff --git a/stand/libsa/Makefile b/stand/libsa/Makefile index f5a1acea843e..c1e03c7a5789 100644 --- a/stand/libsa/Makefile +++ b/stand/libsa/Makefile @@ -189,8 +189,7 @@ SRCS+= g_eli_hmac.c pkcs5v2.c .PATH: ${SYSDIR}/crypto/sha2 SRCS+= sha256c.c sha512c.c -# md5 from the kernel -.PATH: ${SYSDIR}/kern +.PATH: ${SYSDIR}/crypto SRCS+= md5c.c .if ${DO32:U0} == 0 diff --git a/sys/conf/files b/sys/conf/files index d9730e6bf55b..c17451324324 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -681,6 +681,8 @@ crypto/curve25519.c optional crypto \ compile-with "${NORMAL_C} -I$S/contrib/libsodium/src/libsodium/include -I$S/crypto/libsodium" crypto/des/des_ecb.c optional netsmb crypto/des/des_setkey.c optional netsmb +crypto/md4c.c optional netsmb +crypto/md5c.c standard crypto/openssl/ossl.c optional ossl crypto/openssl/ossl_aes.c optional ossl crypto/openssl/ossl_chacha20.c optional ossl @@ -3896,8 +3898,6 @@ kern/kern_vnodedumper.c standard kern/kern_xxx.c standard kern/link_elf.c standard kern/linker_if.m standard -kern/md4c.c optional netsmb -kern/md5c.c standard kern/p1003_1b.c standard kern/posix4_mib.c standard kern/sched_4bsd.c optional sched_4bsd diff --git a/sys/kern/md4c.c b/sys/crypto/md4c.c similarity index 100% rename from sys/kern/md4c.c rename to sys/crypto/md4c.c diff --git a/sys/kern/md5c.c b/sys/crypto/md5c.c similarity index 100% rename from sys/kern/md5c.c rename to sys/crypto/md5c.c diff --git a/sys/modules/smbfs/Makefile b/sys/modules/smbfs/Makefile index c796fb0701c5..5ef13757e621 100644 --- a/sys/modules/smbfs/Makefile +++ b/sys/modules/smbfs/Makefile @@ -1,6 +1,6 @@ -.PATH: ${SRCTOP}/sys/crypto/des \ +.PATH: ${SRCTOP}/sys/crypto \ + ${SRCTOP}/sys/crypto/des \ ${SRCTOP}/sys/crypto/des/arch/${MACHINE_CPUARCH} \ - ${SRCTOP}/sys/kern \ ${SRCTOP}/sys/libkern \ ${SRCTOP}/sys/netsmb \ ${SRCTOP}/sys/fs/smbfs From nobody Fri Oct 24 10:18:48 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ctJlX5v6gz6F2y8; Fri, 24 Oct 2025 10:18:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ctJlX5CQvz3fjW; Fri, 24 Oct 2025 10:18:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761301128; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uauBgdZbJy+jhdnx0Ym/hlDeCfpiTlpnN3NeRARWbfM=; b=WmcBoC/p9N19jwx9xDhphBgjXO54oD4H7CN//Tf+5RUN61gKXHkVo5AeorYFFyc/hCQIaD Ih1YOmiBX5Pg19KaF+ZTD509woIn0Ywpcdj3QiVnTR7CwDIV+ENwH9jVlMQFDHxlNYISJo 7vRttVgan1tix6OAtvnYA89OUoCwrfOhYjwb63aqqTPesvdoHdjpH5EsJFhLDDnaVLt8zZ hNbEIoAzvfyHk41V0BTvcGUY2uWQmlt2rRCDt+0/l0QRrh80hcZHS9zVMAYKlQU8lOiFAG dwCgEn4/ZS85ISZCAP6NzoU9EoAlATSj7FQ+Y3okvZBJHU7ztwI7ay3l+HWJtQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761301128; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uauBgdZbJy+jhdnx0Ym/hlDeCfpiTlpnN3NeRARWbfM=; b=s+m+MRqOeX/AAdoYEmdOAfMbtQRSSI4eIEaIrAKvZOAzPdAG+H8jQrn8ubVglhgjaPikWi pJS0oYiD9FE8nTzV/3JK7wu57WpbgmftLmhmEVu5PuzQl/tWTgjxr2Hbw1+iB8TAQVu4SH EW2xLHkv8Oem8L/kzOZqL0yD9b7ExyPj+Bi8dnn/H8iKKifs46IjmSvUwLVH3g/eRSz5js pNqPjipvMy7W06Gv8FKVyKML/Il5d1any1Ls6bzcZbUJiycQqMVSRNzQOFAnbzOknvWZEL Wp99/yAB4RxUL9DGcvY01v7gOGciUp9b/LBoWkaUaBNBl6R9xaVj/dR/e1aDtQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761301128; a=rsa-sha256; cv=none; b=lgghO9Ay9UC2WLB9gIbUOHZNwefnw+nhCOtfJBL1nkaZijk+R6ma0kw2q5Hs0QrsXFseY5 NNEUD2A0uWbknHhSTyhr3gIst+7GH6SaDbfh66bbmdGWm85K9SNq2Dp86/y+BD5Pq7gYWw G8K7/DRC1AZ+1JG1QPrf58UGOcOCHwBSwz0n2kBgyOfeBx+NhfZDRUhcBTFHk2w4sP8T/b XaGbYOR/IQypBXNXPBBfOVT65UgifY3FKLkV0bkrplXT05AlWhXlDKnPl90bFUpGSvJI+e Ob/4CKF8gxbm7SILfpOmTz/VckUKVTYNLAgzLnMDDM5QP3TBU7uBH+LZqpEhBw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ctJlX4hJCzwhF; Fri, 24 Oct 2025 10:18: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 59OAIm8D033735; Fri, 24 Oct 2025 10:18:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59OAImUr033732; Fri, 24 Oct 2025 10:18:48 GMT (envelope-from git) Date: Fri, 24 Oct 2025 10:18:48 GMT Message-Id: <202510241018.59OAImUr033732@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Clausecker Subject: git: 90fa789cfab5 - main - sys/crypto: import md5c.c C rewrite List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 90fa789cfab54294d4c3a0ac74e01747ce074386 Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=90fa789cfab54294d4c3a0ac74e01747ce074386 commit 90fa789cfab54294d4c3a0ac74e01747ce074386 Author: Robert Clausecker AuthorDate: 2025-10-04 21:59:56 +0000 Commit: Robert Clausecker CommitDate: 2025-10-24 10:16:58 +0000 sys/crypto: import md5c.c C rewrite The reimplementation is a bit cleaner than the original code, although it is also slightly slower. This shouldn't matter too much as we will have asm code for the major platforms. The code is unrolled when built in the kernel or user space, but not when in libsa, as to reduce the code size. Differential Revision: https://reviews.freebsd.org/D45670 Reviewed by: jrtc27, imp Approved by: markj (mentor) MFC after: 1 month --- stand/libsa/Makefile | 1 + sys/crypto/md5c.c | 542 ++++++++++++++++++++++++--------------------------- 2 files changed, 260 insertions(+), 283 deletions(-) diff --git a/stand/libsa/Makefile b/stand/libsa/Makefile index c1e03c7a5789..470c03032f61 100644 --- a/stand/libsa/Makefile +++ b/stand/libsa/Makefile @@ -191,6 +191,7 @@ SRCS+= sha256c.c sha512c.c .PATH: ${SYSDIR}/crypto SRCS+= md5c.c +CFLAGS.md5c.c+= -DSTANDALONE_SMALL .if ${DO32:U0} == 0 MAN=libsa.3 diff --git a/sys/crypto/md5c.c b/sys/crypto/md5c.c index 0922d0f8cc61..f9ffb602afdb 100644 --- a/sys/crypto/md5c.c +++ b/sys/crypto/md5c.c @@ -1,331 +1,307 @@ /*- - * SPDX-License-Identifier: RSA-MD + * Copyright (c) 2024, 2025 Robert Clausecker * - * MD5C.C - RSA Data Security, Inc., MD5 message-digest algorithm - * - * Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All - * rights reserved. - * - * License to copy and use this software is granted provided that it - * is identified as the "RSA Data Security, Inc. MD5 Message-Digest - * Algorithm" in all material mentioning or referencing this software - * or this function. - * - * License is also granted to make and use derivative works provided - * that such works are identified as "derived from the RSA Data - * Security, Inc. MD5 Message-Digest Algorithm" in all material - * mentioning or referencing the derived work. - * - * RSA Data Security, Inc. makes no representations concerning either - * the merchantability of this software or the suitability of this - * software for any particular purpose. It is provided "as is" - * without express or implied warranty of any kind. - * - * These notices must be retained in any copies of any part of this - * documentation and/or software. - * - * This code is the same as the code published by RSA Inc. It has been - * edited for clarity and style only. + * SPDX-License-Identifier: BSD-2-Clause */ +#include #include +#include #ifdef _KERNEL +#include +#include #include +#define assert(expr) MPASS(expr) #else +#include +#include #include -#endif - -#include -#include -#include - -static void MD5Transform(uint32_t [4], const unsigned char [64]); - -#if (BYTE_ORDER == LITTLE_ENDIAN) -#define Encode memcpy -#define Decode memcpy -#else - -/* - * Encodes input (uint32_t) into output (unsigned char). Assumes len is - * a multiple of 4. - */ - -static void -Encode (unsigned char *output, uint32_t *input, unsigned int len) -{ - unsigned int i; - uint32_t ip; - - for (i = 0; i < len / 4; i++) { - ip = input[i]; - *output++ = ip; - *output++ = ip >> 8; - *output++ = ip >> 16; - *output++ = ip >> 24; - } -} - -/* - * Decodes input (unsigned char) into output (uint32_t). Assumes len is - * a multiple of 4. - */ +#include +#endif /* defined(_KERNEL) */ -static void -Decode (uint32_t *output, const unsigned char *input, unsigned int len) -{ - unsigned int i; - - for (i = 0; i < len; i += 4) { - *output++ = input[i] | (input[i+1] << 8) | (input[i+2] << 16) | - (input[i+3] << 24); - } -} +#define md5block _libmd_md5block +#ifdef MD5_ASM +extern void md5block(MD5_CTX *, const void *, size_t); +#else +static void md5block(MD5_CTX *, const void *, size_t); #endif -static unsigned char PADDING[64] = { - 0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -}; - -/* F, G, H and I are basic MD5 functions. */ -#define F(x, y, z) (((x) & (y)) | ((~x) & (z))) -#define G(x, y, z) (((x) & (z)) | ((y) & (~z))) -#define H(x, y, z) ((x) ^ (y) ^ (z)) -#define I(x, y, z) ((y) ^ ((x) | (~z))) - -/* ROTATE_LEFT rotates x left n bits. */ -#define ROTATE_LEFT(x, n) (((x) << (n)) | ((x) >> (32-(n)))) - -/* - * FF, GG, HH, and II transformations for rounds 1, 2, 3, and 4. - * Rotation is separate from addition to prevent recomputation. - */ -#define FF(a, b, c, d, x, s, ac) { \ - (a) += F ((b), (c), (d)) + (x) + (uint32_t)(ac); \ - (a) = ROTATE_LEFT ((a), (s)); \ - (a) += (b); \ - } -#define GG(a, b, c, d, x, s, ac) { \ - (a) += G ((b), (c), (d)) + (x) + (uint32_t)(ac); \ - (a) = ROTATE_LEFT ((a), (s)); \ - (a) += (b); \ - } -#define HH(a, b, c, d, x, s, ac) { \ - (a) += H ((b), (c), (d)) + (x) + (uint32_t)(ac); \ - (a) = ROTATE_LEFT ((a), (s)); \ - (a) += (b); \ - } -#define II(a, b, c, d, x, s, ac) { \ - (a) += I ((b), (c), (d)) + (x) + (uint32_t)(ac); \ - (a) = ROTATE_LEFT ((a), (s)); \ - (a) += (b); \ - } - -/* MD5 initialization. Begins an MD5 operation, writing a new context. */ +/* don't unroll in bootloader */ +#ifdef STANDALONE_SMALL +#define UNROLL +#else +#define UNROLL _Pragma("unroll") +#endif void -MD5Init(MD5_CTX *context) +MD5Init(MD5_CTX *ctx) { + ctx->state[0] = 0x67452301; + ctx->state[1] = 0xefcdab89; + ctx->state[2] = 0x98badcfe; + ctx->state[3] = 0x10325476; - context->count[0] = context->count[1] = 0; - - /* Load magic initialization constants. */ - context->state[0] = 0x67452301; - context->state[1] = 0xefcdab89; - context->state[2] = 0x98badcfe; - context->state[3] = 0x10325476; + ctx->count[0] = 0; + ctx->count[1] = 0; } -/* - * MD5 block update operation. Continues an MD5 message-digest - * operation, processing another message block, and updating the - * context. - */ - void -MD5Update(MD5_CTX *context, const void *in, unsigned int inputLen) +MD5Update(MD5_CTX *ctx, const void *data, unsigned int len) { - unsigned int i, index, partLen; - const unsigned char *input = in; + uint64_t nn; + const char *p = data; + unsigned num; - /* Compute number of bytes mod 64 */ - index = (unsigned int)((context->count[0] >> 3) & 0x3F); + num = ctx->count[0] % MD5_BLOCK_LENGTH; + nn = (uint64_t)ctx->count[0] | (uint64_t)ctx->count[1] << 32; + nn += len; + ctx->count[0] = (uint32_t)nn; + ctx->count[1] = (uint32_t)(nn >> 32); - /* Update number of bits */ - if ((context->count[0] += ((uint32_t)inputLen << 3)) - < ((uint32_t)inputLen << 3)) - context->count[1]++; - context->count[1] += ((uint32_t)inputLen >> 29); + if (num > 0) { + unsigned int n = MD5_BLOCK_LENGTH - num; - partLen = 64 - index; + if (n > len) + n = len; - /* Transform as many times as possible. */ - if (inputLen >= partLen) { - memcpy((void *)&context->buffer[index], (const void *)input, - partLen); - MD5Transform (context->state, context->buffer); + memcpy((char *)ctx->buffer + num, p, n); + num += n; + if (num == MD5_BLOCK_LENGTH) + md5block(ctx, (void *)ctx->buffer, MD5_BLOCK_LENGTH); - for (i = partLen; i + 63 < inputLen; i += 64) - MD5Transform (context->state, &input[i]); + p += n; + len -= n; + } - index = 0; + if (len >= MD5_BLOCK_LENGTH) { + unsigned n = len & ~(unsigned)(MD5_BLOCK_LENGTH - 1); + + md5block(ctx, p, n); + p += n; + len -= n; } - else - i = 0; - /* Buffer remaining input */ - memcpy ((void *)&context->buffer[index], (const void *)&input[i], - inputLen-i); + if (len > 0) + memcpy((void *)ctx->buffer, p, len); } -/* - * MD5 padding. Adds padding followed by original length. - */ - static void -MD5Pad(MD5_CTX *context) +MD5Pad(MD5_CTX *ctx) { - unsigned char bits[8]; - unsigned int index, padLen; - - /* Save number of bits */ - Encode (bits, context->count, 8); - - /* Pad out to 56 mod 64. */ - index = (unsigned int)((context->count[0] >> 3) & 0x3f); - padLen = (index < 56) ? (56 - index) : (120 - index); - MD5Update (context, PADDING, padLen); - - /* Append length (before padding) */ - MD5Update (context, bits, 8); + uint64_t len; + unsigned t; + unsigned char tmp[MD5_BLOCK_LENGTH + sizeof(uint64_t)] = {0x80, 0}; + + len = (uint64_t)ctx->count[0] | (uint64_t)ctx->count[1] << 32; + t = 64 + 56 - ctx->count[0] % 64; + if (t > 64) + t -= 64; + + /* length in bits */ + len <<= 3; + le64enc(tmp + t, len); + MD5Update(ctx, tmp, t + 8); + assert(ctx->count[0] % MD5_BLOCK_LENGTH == 0); } -/* - * MD5 finalization. Ends an MD5 message-digest operation, writing the - * the message digest and zeroizing the context. - */ - void -MD5Final(unsigned char digest[static MD5_DIGEST_LENGTH], MD5_CTX *context) +MD5Final(unsigned char md[16], MD5_CTX *ctx) { - /* Do padding. */ - MD5Pad (context); + MD5Pad(ctx); - /* Store state in digest */ - Encode (digest, context->state, MD5_DIGEST_LENGTH); + le32enc(md + 0, ctx->state[0]); + le32enc(md + 4, ctx->state[1]); + le32enc(md + 8, ctx->state[2]); + le32enc(md + 12, ctx->state[3]); - /* Zeroize sensitive information. */ - explicit_bzero (context, sizeof (*context)); + explicit_bzero(ctx, sizeof(ctx)); } -/* MD5 basic transformation. Transforms state based on block. */ +#ifndef MD5_ASM +static const uint32_t K[64] = { + 0xd76aa478, 0xe8c7b756, 0x242070db, 0xc1bdceee, + 0xf57c0faf, 0x4787c62a, 0xa8304613, 0xfd469501, + 0x698098d8, 0x8b44f7af, 0xffff5bb1, 0x895cd7be, + 0x6b901122, 0xfd987193, 0xa679438e, 0x49b40821, + 0xf61e2562, 0xc040b340, 0x265e5a51, 0xe9b6c7aa, + 0xd62f105d, 0x02441453, 0xd8a1e681, 0xe7d3fbc8, + 0x21e1cde6, 0xc33707d6, 0xf4d50d87, 0x455a14ed, + 0xa9e3e905, 0xfcefa3f8, 0x676f02d9, 0x8d2a4c8a, + 0xfffa3942, 0x8771f681, 0x6d9d6122, 0xfde5380c, + 0xa4beea44, 0x4bdecfa9, 0xf6bb4b60, 0xbebfbc70, + 0x289b7ec6, 0xeaa127fa, 0xd4ef3085, 0x04881d05, + 0xd9d4d039, 0xe6db99e5, 0x1fa27cf8, 0xc4ac5665, + 0xf4292244, 0x432aff97, 0xab9423a7, 0xfc93a039, + 0x655b59c3, 0x8f0ccc92, 0xffeff47d, 0x85845dd1, + 0x6fa87e4f, 0xfe2ce6e0, 0xa3014314, 0x4e0811a1, + 0xf7537e82, 0xbd3af235, 0x2ad7d2bb, 0xeb86d391, +}; + +static inline uint32_t +rol32(uint32_t a, int b) +{ + return (a << b | a >> (32 - b)); +} static void -MD5Transform(uint32_t state[4], const unsigned char block[64]) +md5block(MD5_CTX *ctx, const void *data, size_t len) { - uint32_t a = state[0], b = state[1], c = state[2], d = state[3], x[16]; - - Decode (x, block, 64); - - /* Round 1 */ -#define S11 7 -#define S12 12 -#define S13 17 -#define S14 22 - FF (a, b, c, d, x[ 0], S11, 0xd76aa478); /* 1 */ - FF (d, a, b, c, x[ 1], S12, 0xe8c7b756); /* 2 */ - FF (c, d, a, b, x[ 2], S13, 0x242070db); /* 3 */ - FF (b, c, d, a, x[ 3], S14, 0xc1bdceee); /* 4 */ - FF (a, b, c, d, x[ 4], S11, 0xf57c0faf); /* 5 */ - FF (d, a, b, c, x[ 5], S12, 0x4787c62a); /* 6 */ - FF (c, d, a, b, x[ 6], S13, 0xa8304613); /* 7 */ - FF (b, c, d, a, x[ 7], S14, 0xfd469501); /* 8 */ - FF (a, b, c, d, x[ 8], S11, 0x698098d8); /* 9 */ - FF (d, a, b, c, x[ 9], S12, 0x8b44f7af); /* 10 */ - FF (c, d, a, b, x[10], S13, 0xffff5bb1); /* 11 */ - FF (b, c, d, a, x[11], S14, 0x895cd7be); /* 12 */ - FF (a, b, c, d, x[12], S11, 0x6b901122); /* 13 */ - FF (d, a, b, c, x[13], S12, 0xfd987193); /* 14 */ - FF (c, d, a, b, x[14], S13, 0xa679438e); /* 15 */ - FF (b, c, d, a, x[15], S14, 0x49b40821); /* 16 */ - - /* Round 2 */ -#define S21 5 -#define S22 9 -#define S23 14 -#define S24 20 - GG (a, b, c, d, x[ 1], S21, 0xf61e2562); /* 17 */ - GG (d, a, b, c, x[ 6], S22, 0xc040b340); /* 18 */ - GG (c, d, a, b, x[11], S23, 0x265e5a51); /* 19 */ - GG (b, c, d, a, x[ 0], S24, 0xe9b6c7aa); /* 20 */ - GG (a, b, c, d, x[ 5], S21, 0xd62f105d); /* 21 */ - GG (d, a, b, c, x[10], S22, 0x2441453); /* 22 */ - GG (c, d, a, b, x[15], S23, 0xd8a1e681); /* 23 */ - GG (b, c, d, a, x[ 4], S24, 0xe7d3fbc8); /* 24 */ - GG (a, b, c, d, x[ 9], S21, 0x21e1cde6); /* 25 */ - GG (d, a, b, c, x[14], S22, 0xc33707d6); /* 26 */ - GG (c, d, a, b, x[ 3], S23, 0xf4d50d87); /* 27 */ - GG (b, c, d, a, x[ 8], S24, 0x455a14ed); /* 28 */ - GG (a, b, c, d, x[13], S21, 0xa9e3e905); /* 29 */ - GG (d, a, b, c, x[ 2], S22, 0xfcefa3f8); /* 30 */ - GG (c, d, a, b, x[ 7], S23, 0x676f02d9); /* 31 */ - GG (b, c, d, a, x[12], S24, 0x8d2a4c8a); /* 32 */ - - /* Round 3 */ -#define S31 4 -#define S32 11 -#define S33 16 -#define S34 23 - HH (a, b, c, d, x[ 5], S31, 0xfffa3942); /* 33 */ - HH (d, a, b, c, x[ 8], S32, 0x8771f681); /* 34 */ - HH (c, d, a, b, x[11], S33, 0x6d9d6122); /* 35 */ - HH (b, c, d, a, x[14], S34, 0xfde5380c); /* 36 */ - HH (a, b, c, d, x[ 1], S31, 0xa4beea44); /* 37 */ - HH (d, a, b, c, x[ 4], S32, 0x4bdecfa9); /* 38 */ - HH (c, d, a, b, x[ 7], S33, 0xf6bb4b60); /* 39 */ - HH (b, c, d, a, x[10], S34, 0xbebfbc70); /* 40 */ - HH (a, b, c, d, x[13], S31, 0x289b7ec6); /* 41 */ - HH (d, a, b, c, x[ 0], S32, 0xeaa127fa); /* 42 */ - HH (c, d, a, b, x[ 3], S33, 0xd4ef3085); /* 43 */ - HH (b, c, d, a, x[ 6], S34, 0x4881d05); /* 44 */ - HH (a, b, c, d, x[ 9], S31, 0xd9d4d039); /* 45 */ - HH (d, a, b, c, x[12], S32, 0xe6db99e5); /* 46 */ - HH (c, d, a, b, x[15], S33, 0x1fa27cf8); /* 47 */ - HH (b, c, d, a, x[ 2], S34, 0xc4ac5665); /* 48 */ - - /* Round 4 */ -#define S41 6 -#define S42 10 -#define S43 15 -#define S44 21 - II (a, b, c, d, x[ 0], S41, 0xf4292244); /* 49 */ - II (d, a, b, c, x[ 7], S42, 0x432aff97); /* 50 */ - II (c, d, a, b, x[14], S43, 0xab9423a7); /* 51 */ - II (b, c, d, a, x[ 5], S44, 0xfc93a039); /* 52 */ - II (a, b, c, d, x[12], S41, 0x655b59c3); /* 53 */ - II (d, a, b, c, x[ 3], S42, 0x8f0ccc92); /* 54 */ - II (c, d, a, b, x[10], S43, 0xffeff47d); /* 55 */ - II (b, c, d, a, x[ 1], S44, 0x85845dd1); /* 56 */ - II (a, b, c, d, x[ 8], S41, 0x6fa87e4f); /* 57 */ - II (d, a, b, c, x[15], S42, 0xfe2ce6e0); /* 58 */ - II (c, d, a, b, x[ 6], S43, 0xa3014314); /* 59 */ - II (b, c, d, a, x[13], S44, 0x4e0811a1); /* 60 */ - II (a, b, c, d, x[ 4], S41, 0xf7537e82); /* 61 */ - II (d, a, b, c, x[11], S42, 0xbd3af235); /* 62 */ - II (c, d, a, b, x[ 2], S43, 0x2ad7d2bb); /* 63 */ - II (b, c, d, a, x[ 9], S44, 0xeb86d391); /* 64 */ - - state[0] += a; - state[1] += b; - state[2] += c; - state[3] += d; - - /* Zeroize sensitive information. */ - memset ((void *)x, 0, sizeof (x)); + uint32_t m[16], a0, b0, c0, d0; + const char *p = data; + + a0 = ctx->state[0]; + b0 = ctx->state[1]; + c0 = ctx->state[2]; + d0 = ctx->state[3]; + + while (len >= MD5_BLOCK_LENGTH) { + size_t i; + uint32_t a = a0, b = b0, c = c0, d = d0, f, tmp; + + UNROLL + for (i = 0; i < 16; i++) + m[i] = le32dec(p + 4*i); + + UNROLL + for (i = 0; i < 16; i += 4) { + f = d ^ (b & (c ^ d)); + tmp = d; + d = c; + c = b; + b += rol32(a + f + K[i] + m[i], 7); + a = tmp; + + f = d ^ (b & (c ^ d)); + tmp = d; + d = c; + c = b; + b += rol32(a + f + K[i + 1] + m[i + 1], 12); + a = tmp; + + f = d ^ (b & (c ^ d)); + tmp = d; + d = c; + c = b; + b += rol32(a + f + K[i + 2] + m[i + 2], 17); + a = tmp; + + f = d ^ (b & (c ^ d)); + tmp = d; + d = c; + c = b; + b += rol32(a + f + K[i + 3] + m[i + 3], 22); + a = tmp; + } + + UNROLL + for (; i < 32; i += 4) { + f = c ^ (d & (b ^ c)); + tmp = d; + d = c; + c = b; + b += rol32(a + f + K[i] + m[(5*i + 1) % 16], 5); + a = tmp; + + f = c ^ (d & (b ^ c)); + tmp = d; + d = c; + c = b; + b += rol32(a + f + K[i + 1] + m[(5*i + 6) % 16], 9); + a = tmp; + + f = c ^ (d & (b ^ c)); + tmp = d; + d = c; + c = b; + b += rol32(a + f + K[i + 2] + m[(5*i + 11) % 16], 14); + a = tmp; + + f = c ^ (d & (b ^ c)); + tmp = d; + d = c; + c = b; + b += rol32(a + f + K[i + 3] + m[5*i % 16], 20); + a = tmp; + } + + UNROLL + for (; i < 48; i += 4) { + f = b ^ c ^ d; + tmp = d; + d = c; + c = b; + b += rol32(a + f + K[i] + m[(3*i + 5) % 16], 4); + a = tmp; + + f = b ^ c ^ d; + tmp = d; + d = c; + c = b; + b += rol32(a + f + K[i + 1] + m[(3*i + 8) % 16], 11); + a = tmp; + + f = b ^ c ^ d; + tmp = d; + d = c; + c = b; + b += rol32(a + f + K[i + 2] + m[(3*i + 11) % 16], 16); + a = tmp; + + f = b ^ c ^ d; + tmp = d; + d = c; + c = b; + b += rol32(a + f + K[i + 3] + m[(3*i + 14) % 16], 23); + a = tmp; + } + + UNROLL + for (; i < 64; i += 4) { + f = c ^ (b | ~d); + tmp = d; + d = c; + c = b; + b += rol32(a + f + K[i] + m[7*i % 16], 6); + a = tmp; + + f = c ^ (b | ~d); + tmp = d; + d = c; + c = b; + b += rol32(a + f + K[i + 1] + m[(7*i + 7) % 16], 10); + a = tmp; + + f = c ^ (b | ~d); + tmp = d; + d = c; + c = b; + b += rol32(a + f + K[i + 2] + m[(7*i + 14) % 16], 15); + a = tmp; + + f = c ^ (b | ~d); + tmp = d; + d = c; + c = b; + b += rol32(a + f + K[i + 3] + m[(7*i + 5) % 16], 21); + a = tmp; + } + + a0 += a; + b0 += b; + c0 += c; + d0 += d; + + p += MD5_BLOCK_LENGTH; + len -= MD5_BLOCK_LENGTH; + } + + ctx->state[0] = a0; + ctx->state[1] = b0; + ctx->state[2] = c0; + ctx->state[3] = d0; } +#endif /* !defined(MD5_ASM) */ #ifdef WEAK_REFS /* When building libmd, provide weak references. Note: this is not From nobody Fri Oct 24 10:18:49 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ctJlZ1h8wz6F2y9; Fri, 24 Oct 2025 10:18:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ctJlY5yD1z3fyq; Fri, 24 Oct 2025 10:18:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761301129; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kWZIn5mMXNi2TMEaqTFK2pl183/69J7jnrBQhxRRwk0=; b=tpLYkFSU/BWx0KFQKRjj/Gm4QGui3y3fwpIK4mpJQpfopzdvSThv3RAo21jcFQrWzg9Uy0 LrXTBd7nm+puJZQDPRTVisu9gbT2E+b3qr49Gh3BOxIgtlWve5d5ubdrud/Knp+MMurnNa 4hctAqIPyiI/6+ZRLx2JHCikr5BVv3UA52tgCE7TPGuferSabcktQE9YgrP0Bs9OkPHzsN P5iZDf5J9pxqHWld+sZGHszj+b1WOgDbaGOw9tkl0y1uRUF+S/DqCVNNSqwF9H+/hgofxS SPTCLaCS7Cj3+UlnDEEGM2tP7lp+sblDDxr8Ykz7hLupLC95oFpXADQrobHNnw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761301129; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kWZIn5mMXNi2TMEaqTFK2pl183/69J7jnrBQhxRRwk0=; b=drS+E6WavNHLnL/j952PhlGLVJ6fPJqJeTeowVzlkCApmmyHyk/X/CWo0KDC01/qG4EIVh Vdu1NuUDShvmuXCmcFtMTXbni5AIuPJ/kqlrw4LZ/aTIHXnqOUyvVTZffejLoxXofcOLJ3 U/EJp1iTEXZ9TrHW32OJ67btkzEk0ayleEQZwU/RGoBwQIdtuTRTPFW0MAjB7T4Qvnpm3W VaGuHHH6Hc84Bjx9f5yWIseoEOXhiULpma6S+7nPkdAf3UhE+CrUx8Ht6FANEZgP5K3ub4 J5rUtBmRBTFmsG2stYUk/szJWEy2YOPGTIr9Ns0hV1c5eWLETf/SwUXSmKTCVg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761301129; a=rsa-sha256; cv=none; b=xyYx1CSDwgSJYVpe2iA4kbmvM3wI6dNFYljkD36tP/YL1ABOtbyPjEae86hecY4RpYCz6D 3lb3YoX7ePIup/0KUECMcTQLSZZ6/3HtGjP/6O3Dk2ajvxpF7p+eqpWUzs4so14reR3EZy Pm7LMQ6GdAPxSbyIVr9Pjqk6Dk9q92XfC14Kp0fCPCaeyz7VlFYTfxNyl/mEkPcJWDHDDN NFA+/Q2+vMeRJK7PTwI1iNFLjbl9lTDR72WTcBy28IHNuF1d966xqfo79X6qjs9eqQDtag 0t8SzfeOzXBrSIvzrsqSsHzM/dv+p3CajC8xqslsLnKJiKn7cS+mO7n72s5yPA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ctJlY5WJdzwwm; Fri, 24 Oct 2025 10:18: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 59OAInNX033769; Fri, 24 Oct 2025 10:18:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59OAInxp033766; Fri, 24 Oct 2025 10:18:49 GMT (envelope-from git) Date: Fri, 24 Oct 2025 10:18:49 GMT Message-Id: <202510241018.59OAInxp033766@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Clausecker Subject: git: d92e98742100 - main - lib/libmd: import md5 amd64 kernels List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d92e987421001c365216b039f8c3303939c195f7 Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=d92e987421001c365216b039f8c3303939c195f7 commit d92e987421001c365216b039f8c3303939c195f7 Author: Robert Clausecker AuthorDate: 2025-10-10 17:40:49 +0000 Commit: Robert Clausecker CommitDate: 2025-10-24 10:17:05 +0000 lib/libmd: import md5 amd64 kernels Differential Revision: https://reviews.freebsd.org/D45670 Reviewed by: imp Approved by: markj (mentor) MFC after: 1 month --- lib/libmd/Makefile | 7 + lib/libmd/amd64/md5block.S | 363 ++++++++++++++++++++++++++++++++++++++++++ lib/libmd/amd64/md5dispatch.c | 41 +++++ 3 files changed, 411 insertions(+) diff --git a/lib/libmd/Makefile b/lib/libmd/Makefile index 59a519a882af..c4ab767c8b2f 100644 --- a/lib/libmd/Makefile +++ b/lib/libmd/Makefile @@ -117,6 +117,13 @@ USE_ASM_SOURCES:=0 .endif .if ${USE_ASM_SOURCES} != 0 +.if exists(${MACHINE_ARCH}/md5block.S) +SRCS+= md5block.S +CFLAGS+= -DMD5_ASM +.if exists(${MACHINE_ARCH}/md5dispatch.c) +SRCS+= md5dispatch.c +.endif +.endif .if exists(${MACHINE_ARCH}/sha1block.S) SRCS+= sha1block.S CFLAGS+= -DSHA1_ASM diff --git a/lib/libmd/amd64/md5block.S b/lib/libmd/amd64/md5block.S new file mode 100644 index 000000000000..0dd594dd5dc2 --- /dev/null +++ b/lib/libmd/amd64/md5block.S @@ -0,0 +1,363 @@ +/*- + * Copyright (c) 2024, 2025 Robert Clausecker + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#include + +/* apply the round keys to the four round functions */ +.macro allrounds rfn0, rfn1, rfn2, rfn3 + \rfn0 0, 0xd76aa478, 0xe8c7b756, 0x242070db, 0xc1bdceee + \rfn0 4, 0xf57c0faf, 0x4787c62a, 0xa8304613, 0xfd469501 + \rfn0 8, 0x698098d8, 0x8b44f7af, 0xffff5bb1, 0x895cd7be + \rfn0 12, 0x6b901122, 0xfd987193, 0xa679438e, 0x49b40821 + + \rfn1 16, 0xf61e2562, 0xc040b340, 0x265e5a51, 0xe9b6c7aa + \rfn1 20, 0xd62f105d, 0x02441453, 0xd8a1e681, 0xe7d3fbc8 + \rfn1 24, 0x21e1cde6, 0xc33707d6, 0xf4d50d87, 0x455a14ed + \rfn1 28, 0xa9e3e905, 0xfcefa3f8, 0x676f02d9, 0x8d2a4c8a + + \rfn2 32, 0xfffa3942, 0x8771f681, 0x6d9d6122, 0xfde5380c + \rfn2 36, 0xa4beea44, 0x4bdecfa9, 0xf6bb4b60, 0xbebfbc70 + \rfn2 40, 0x289b7ec6, 0xeaa127fa, 0xd4ef3085, 0x04881d05 + \rfn2 44, 0xd9d4d039, 0xe6db99e5, 0x1fa27cf8, 0xc4ac5665 + + \rfn3 48, 0xf4292244, 0x432aff97, 0xab9423a7, 0xfc93a039 + \rfn3 52, 0x655b59c3, 0x8f0ccc92, 0xffeff47d, 0x85845dd1 + \rfn3 56, 0x6fa87e4f, 0xfe2ce6e0, 0xa3014314, 0x4e0811a1 + \rfn3 60, 0xf7537e82, 0xbd3af235, 0x2ad7d2bb, 0xeb86d391 +.endm + + // md5block(MD5_CTX, buf, len) +ENTRY(_libmd_md5block_baseline) +.macro round a, b, c, d, f, k, m, s + \f %ebp, \b, \c, \d + add $\k, \a // a + k[i] + add ((\m)%16*4)(%rsi), \a // a + k[i] + m[g] + add %ebp, \a // a + k[i] + m[g] + f + rol $\s, \a + add \b, \a +.endm + + // f = b ? c : d +.macro f0 f, b, c, d + mov \c, \f + xor \d, \f + and \b, \f + xor \d, \f +.endm + + // f = d ? b : c +.macro f1 f, b, c, d + mov \c, \f + xor \b, \f + and \d, \f + xor \c, \f +.endm + + // f = b ^ c ^ d +.macro f2 f, b, c, d + mov \c, \f + xor \d, \f + xor \b, \f +.endm + + // f = c ^ (b | ~d) +.macro f3 f, b, c, d + mov $-1, \f + xor \d, \f + or \b, \f + xor \c, \f +.endm + + // do 4 rounds +.macro rounds f, p, q, s0, s1, s2, s3, k0, k1, k2, k3 + round %eax, %ebx, %ecx, %edx, \f, \k0, \p*0+\q, \s0 + round %edx, %eax, %ebx, %ecx, \f, \k1, \p*1+\q, \s1 + round %ecx, %edx, %eax, %ebx, \f, \k2, \p*2+\q, \s2 + round %ebx, %ecx, %edx, %eax, \f, \k3, \p*3+\q, \s3 +.endm + + // do 4 rounds with f0, f1, f2, f3 +.macro rounds0 i, k0, k1, k2, k3 + rounds f0, 1, \i, 7, 12, 17, 22, \k0, \k1, \k2, \k3 +.endm + +.macro rounds1 i, k0, k1, k2, k3 + rounds f1, 5, 5*\i+1, 5, 9, 14, 20, \k0, \k1, \k2, \k3 +.endm + +.macro rounds2 i, k0, k1, k2, k3 + rounds f2, 3, 3*\i+5, 4, 11, 16, 23, \k0, \k1, \k2, \k3 +.endm + +.macro rounds3 i, k0, k1, k2, k3 + rounds f3, 7, 7*\i, 6, 10, 15, 21, \k0, \k1, \k2, \k3 +.endm + + push %rbx + push %rbp + push %r12 + + and $~63, %rdx // length in blocks + lea (%rsi, %rdx, 1), %r12 // end pointer + + mov (%rdi), %eax // a + mov 4(%rdi), %ebx // b + mov 8(%rdi), %ecx // c + mov 12(%rdi), %edx // d + + cmp %rsi, %r12 // any data to process? + je .Lend + + .balign 16 +.Lloop: mov %eax, %r8d + mov %ebx, %r9d + mov %ecx, %r10d + mov %edx, %r11d + + allrounds rounds0, rounds1, rounds2, rounds3 + + add %r8d, %eax + add %r9d, %ebx + add %r10d, %ecx + add %r11d, %edx + + add $64, %rsi + cmp %rsi, %r12 + jne .Lloop + + mov %eax, (%rdi) + mov %ebx, 4(%rdi) + mov %ecx, 8(%rdi) + mov %edx, 12(%rdi) + +.Lend: pop %r12 + pop %rbp + pop %rbx + ret +END(_libmd_md5block_baseline) + + /* + * An implementation leveraging the ANDN instruction + * from BMI1 to shorten some dependency chains. + */ +ENTRY(_libmd_md5block_bmi1) + // special-cased round 1 + // f1 = d ? b : c = (d & b) + (~d & c) +.macro round1 a, b, c, d, k, m, s + andn \c, \d, %edi // ~d & c + add $\k, \a // a + k[i] + mov \d, %ebp + add ((\m)%16*4)(%rsi), \a // a + k[i] + m[g] + and \b, %ebp // d & b + add %edi, \a // a + k[i] + m[g] + (~d & c) + add %ebp, \a // a + k[i] + m[g] + (~d & c) + (d & b) + rol $\s, \a + add \b, \a +.endm + + // special-cased round 3 + // f3 = c ^ (b | ~d) = ~(c ^ ~b & d) = -1 - (c ^ ~b & d) +.macro round3 a, b, c, d, k, m, s + andn \d, \b, %ebp + add $\k - 1, \a // a + k[i] - 1 + add ((\m)%16*4)(%rsi), \a // a + k[i] + m[g] + xor \c, %ebp + sub %ebp, \a // a + k[i] + m[g] + f + rol $\s, \a + add \b, \a +.endm + + .purgem rounds1 +.macro rounds1 i, k0, k1, k2, k3 + round1 %eax, %ebx, %ecx, %edx, \k0, 5*\i+ 1, 5 + round1 %edx, %eax, %ebx, %ecx, \k1, 5*\i+ 6, 9 + round1 %ecx, %edx, %eax, %ebx, \k2, 5*\i+11, 14 + round1 %ebx, %ecx, %edx, %eax, \k3, 5*\i+16, 20 +.endm + + .purgem rounds3 +.macro rounds3 i, k0, k1, k2, k3 + round3 %eax, %ebx, %ecx, %edx, \k0, 7*\i+ 0, 6 + round3 %edx, %eax, %ebx, %ecx, \k1, 7*\i+ 7, 10 + round3 %ecx, %edx, %eax, %ebx, \k2, 7*\i+14, 15 + round3 %ebx, %ecx, %edx, %eax, \k3, 7*\i+21, 21 +.endm + + push %rbx + push %rbp + push %r12 + + and $~63, %rdx // length in blocks + lea (%rsi, %rdx, 1), %r12 // end pointer + + mov (%rdi), %eax // a + mov 4(%rdi), %ebx // b + mov 8(%rdi), %ecx // c + mov 12(%rdi), %edx // d + + cmp %rsi, %r12 // any data to process? + je 0f + + push %rdi + + .balign 16 +1: mov %eax, %r8d + mov %ebx, %r9d + mov %ecx, %r10d + mov %edx, %r11d + + allrounds rounds0, rounds1, rounds2, rounds3 + + add %r8d, %eax + add %r9d, %ebx + add %r10d, %ecx + add %r11d, %edx + + add $64, %rsi + cmp %rsi, %r12 + jne 1b + + pop %rdi + mov %eax, (%rdi) + mov %ebx, 4(%rdi) + mov %ecx, 8(%rdi) + mov %edx, 12(%rdi) + +0: pop %r12 + pop %rbp + pop %rbx + ret +END(_libmd_md5block_bmi1) + +#ifndef _KERNEL + /* + * An implementation leveraging AVX-512 for its VPTERNLOGD + * instruction. We're using only XMM registers here, + * avoiding costly thermal licensing. + */ +ENTRY(_libmd_md5block_avx512) +.macro vround a, b, c, d, f, i, m, mi, s + vmovdqa \b, %xmm4 + vpternlogd $\f, \d, \c, %xmm4 + vpaddd 4*(\i)(%rax){1to4}, \m, %xmm5 // m[g] + k[i] +.if \mi != 0 + vpshufd $0x55 * \mi, %xmm5, %xmm5 // broadcast to each dword +.endif + vpaddd %xmm5, \a, \a // a + k[i] + m[g] + vpaddd %xmm4, \a, \a // a + k[i] + m[g] + f + vprold $\s, \a, \a + vpaddd \b, \a, \a +.endm + +.macro vrounds f, i, m0, i0, m1, i1, m2, i2, m3, i3, s0, s1, s2, s3 + vround %xmm0, %xmm1, %xmm2, %xmm3, \f, \i+0, \m0, \i0, \s0 + vround %xmm3, %xmm0, %xmm1, %xmm2, \f, \i+1, \m1, \i1, \s1 + vround %xmm2, %xmm3, %xmm0, %xmm1, \f, \i+2, \m2, \i2, \s2 + vround %xmm1, %xmm2, %xmm3, %xmm0, \f, \i+3, \m3, \i3, \s3 +.endm + +/* + * d c b f0 f1 f2 f3 + * 0 0 0 0 0 0 1 + * 1 0 0 1 0 1 0 + * 0 1 0 0 1 1 0 + * 1 1 0 1 0 0 1 + * 0 0 1 0 0 1 1 + * 1 0 1 0 1 0 1 + * 0 1 1 1 1 0 0 + * 1 1 1 1 1 1 0 + */ + +.macro vrounds0 i, m + vrounds 0xca, \i, \m, 0, \m, 1, \m, 2, \m, 3, 7, 12, 17, 22 +.endm + +.macro vrounds1 i, m0, i0, m1, i1, m2, i2, m3, i3 + vrounds 0xe4, \i, \m0, \i0, \m1, \i1, \m2, \i2, \m3, \i3, 5, 9, 14, 20 +.endm + +.macro vrounds2 i, m0, i0, m1, i1, m2, i2, m3, i3 + vrounds 0x96, \i, \m0, \i0, \m1, \i1, \m2, \i2, \m3, \i3, 4, 11, 16, 23 +.endm + +.macro vrounds3 i, m0, i0, m1, i1, m2, i2, m3, i3 + vrounds 0x39, \i, \m0, \i0, \m1, \i1, \m2, \i2, \m3, \i3, 6, 10, 15, 21 +.endm + + and $~63, %rdx // length in blocks + add %rsi, %rdx // end pointer + + vmovd (%rdi), %xmm0 // a + vmovd 4(%rdi), %xmm1 // b + vmovd 8(%rdi), %xmm2 // c + vmovd 12(%rdi), %xmm3 // d + + lea keys(%rip), %rax + + cmp %rsi, %rdx // any data to process? + je 0f + + .balign 16 +1: vmovdqu 0*4(%rsi), %xmm8 // message words + vmovdqu 4*4(%rsi), %xmm9 + vmovdqu 8*4(%rsi), %xmm10 + vmovdqu 12*4(%rsi), %xmm11 + + vmovdqa %xmm0, %xmm12 // stash old state variables + vmovdqa %xmm1, %xmm13 + vmovdqa %xmm2, %xmm14 + vmovdqa %xmm3, %xmm15 + + vrounds0 0, %xmm8 + vrounds0 4, %xmm9 + vrounds0 8, %xmm10 + vrounds0 12, %xmm11 + + vrounds1 16, %xmm8, 1, %xmm9, 2, %xmm10, 3, %xmm8, 0 + vrounds1 20, %xmm9, 1, %xmm10, 2, %xmm11, 3, %xmm9, 0 + vrounds1 24, %xmm10, 1, %xmm11, 2, %xmm8, 3, %xmm10, 0 + vrounds1 28, %xmm11, 1, %xmm8, 2, %xmm9, 3, %xmm11, 0 + + vrounds2 32, %xmm9, 1, %xmm10, 0, %xmm10, 3, %xmm11, 2 + vrounds2 36, %xmm8, 1, %xmm9, 0, %xmm9, 3, %xmm10, 2 + vrounds2 40, %xmm11, 1, %xmm8, 0, %xmm8, 3, %xmm9, 2 + vrounds2 44 %xmm10, 1, %xmm11, 0, %xmm11, 3, %xmm8, 2 + + vrounds3 48, %xmm8, 0, %xmm9, 3, %xmm11, 2, %xmm9, 1 + vrounds3 52, %xmm11, 0, %xmm8, 3, %xmm10, 2, %xmm8, 1 + vrounds3 56, %xmm10, 0, %xmm11, 3, %xmm9, 2, %xmm11, 1 + vrounds3 60, %xmm9, 0, %xmm10, 3, %xmm8, 2, %xmm10, 1 + + vpaddd %xmm12, %xmm0, %xmm0 + vpaddd %xmm13, %xmm1, %xmm1 + vpaddd %xmm14, %xmm2, %xmm2 + vpaddd %xmm15, %xmm3, %xmm3 + + add $64, %rsi + cmp %rsi, %rdx + jne 1b + + vmovd %xmm0, (%rdi) + vmovd %xmm1, 4(%rdi) + vmovd %xmm2, 8(%rdi) + vmovd %xmm3, 12(%rdi) + +0: ret +END(_libmd_md5block_avx512) + + // round keys, for use in md5block_avx512 + .section .rodata + .balign 16 + +.macro putkeys i, a, b, c, d + .4byte \a, \b, \c, \d +.endm + +keys: allrounds putkeys, putkeys, putkeys, putkeys + .size keys, .-keys +#endif /* !defined(_KERNEL) */ + + .section .note.GNU-stack,"",%progbits diff --git a/lib/libmd/amd64/md5dispatch.c b/lib/libmd/amd64/md5dispatch.c new file mode 100644 index 000000000000..dd2131c5a57c --- /dev/null +++ b/lib/libmd/amd64/md5dispatch.c @@ -0,0 +1,41 @@ +/*- + * Copyright (c) 2024 Robert Clausecker + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#include +#include + +#include +#include +#include +#include +#include + +extern void _libmd_md5block_baseline(MD5_CTX *, const void *, size_t); +extern void _libmd_md5block_bmi1(MD5_CTX *, const void *, size_t); +extern void _libmd_md5block_avx512(MD5_CTX *, const void *, size_t); + +DEFINE_UIFUNC(, void, _libmd_md5block, (MD5_CTX *, const void *, size_t)) +{ + if ((cpu_stdext_feature & (CPUID_STDEXT_AVX512F | CPUID_STDEXT_AVX512VL)) + == (CPUID_STDEXT_AVX512F | CPUID_STDEXT_AVX512VL)) { + u_int regs[4]; + char cpu_vendor[12]; + + do_cpuid(0, regs); + ((u_int *)&cpu_vendor)[0] = regs[1]; + ((u_int *)&cpu_vendor)[1] = regs[3]; + ((u_int *)&cpu_vendor)[2] = regs[2]; + + /* the AVX-512 kernel performs poorly on AMD */ + if (memcmp(cpu_vendor, AMD_VENDOR_ID, sizeof(cpu_vendor)) != 0) + return (_libmd_md5block_avx512); + } + + if (cpu_stdext_feature & CPUID_STDEXT_BMI1) + return (_libmd_md5block_bmi1); + else + return (_libmd_md5block_baseline); +} From nobody Fri Oct 24 10:18:50 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ctJlb204hz6F3HH; Fri, 24 Oct 2025 10:18:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ctJlZ6GcRz3g06; Fri, 24 Oct 2025 10:18:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761301130; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kY7F3NYICP5UHl+HACoPzQOyEIEVCu73RaZPi2224N8=; b=rVrJaoQbrIPBXWPrJT0KYZE34HQryXRdoM6innHBHH/NgM6ODHYqdN67QDphhSBNrc5on6 JKOoPWfMcQ7+GrvDjOcD+ZZl0k3hJfePATqFWl1SjrRLO5UY8agVNYmPqyAIB8lowUu6Dw 62/+rso13mi5gvPuWw1inf3v7xFfLrjiE7Z1Wd8VFyznnlzUwrPrrCsqFsEQEQQgFtKPi8 6CEnJx1t3GZ2JmY6K1IqSVGL2qYogyyUs9gFuzaYmdy7uweyKC6tgc7cAENDukDCUpDrAe 2CCziavOqgL3ZpXXj7jHG97ijfQ+gIl/eUh/6O8iLzYvg2lQwJZca8L7keZPyw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761301130; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kY7F3NYICP5UHl+HACoPzQOyEIEVCu73RaZPi2224N8=; b=LpiUR2zq5BM8yrbYDIlD0ZYE6WfasuVcOdEDXA3vM5k3PMflc0lwt/3T6u8Ig7f7NKT1L/ 27kb5pDrbdxEqeRZY9FzHIKgkSCux3Y7/zgrGx+WWWtJDiOBIdJN5d0XS+0m1Z1uL7imCV 8dMNTIQI4XeS/L8eb/EDIjB2bp8goJKwR7TfkVb/ZO91sZfvV2++mP9svyMW+MRfRpN1/a k6Sp9JrTaGKEefk6BueAh8yHCDy1FSrTO9V65V6g+5LjAP+3S0p//WIbqUDhO69QtezMYs eQFonCa3cycB7442RpWxYYtlDUzQqmgKjE1IJVV6znpKxHwwMHo+op+buGw12g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761301130; a=rsa-sha256; cv=none; b=io449x1z7SNSMfkl9D952eng+4XUpQwJ6KkpWAIIHn8G44H2tu6xqG+ztEN+UuvNFSBoLl EonnRQ/5E0KdBEhsfu9WdCa/AmCYjNyjJ9mDsr/bpffsaVo7e+kxHy0xaXsmU1to+Q57ui QjPDd2s6rwaWPY0GithsbnVzl+1D9U1eqlqdPISbqxFd7zpA09CFVQmQHB6Y3OR4z+qWLK TME8gT4SEcxOV8KYwql1nKwb9usK1KZqntNXW5FxgkDoHSBYz0G3sGt7xxwq17AeheamPt /T/f5wuhQpfGNNqaZpwZ9i5LWaq6dYECa7kp8RlpDofmIUTYfjg2bS6w4pJ41Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ctJlZ5lSdzx4M; Fri, 24 Oct 2025 10:18: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 59OAIoJb033803; Fri, 24 Oct 2025 10:18:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59OAIofC033800; Fri, 24 Oct 2025 10:18:50 GMT (envelope-from git) Date: Fri, 24 Oct 2025 10:18:50 GMT Message-Id: <202510241018.59OAIofC033800@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Clausecker Subject: git: c1135b2b54bf - main - lib/libmd: import aarch64 md5 SIMD implementation List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c1135b2b54bf46709120d98c90ff4d28a77b896c Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=c1135b2b54bf46709120d98c90ff4d28a77b896c commit c1135b2b54bf46709120d98c90ff4d28a77b896c Author: Robert Clausecker AuthorDate: 2025-10-10 17:45:45 +0000 Commit: Robert Clausecker CommitDate: 2025-10-24 10:17:11 +0000 lib/libmd: import aarch64 md5 SIMD implementation Reviewed by: andrew, imp Approved by: markj (mentor) Differential Revision: https://reviews.freebsd.org/D45670 MFC after: 1 month --- lib/libmd/aarch64/md5block.S | 206 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 206 insertions(+) diff --git a/lib/libmd/aarch64/md5block.S b/lib/libmd/aarch64/md5block.S new file mode 100644 index 000000000000..b928c8dd795a --- /dev/null +++ b/lib/libmd/aarch64/md5block.S @@ -0,0 +1,206 @@ +/*- + * Copyright (c) 2024 Robert Clausecker + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#include +#include + +# optimal instruction sequence for k = \key + \m +.macro addkm key, m +.if 0x100000000 - \key > 0x00ffffff + movz k, #\key & 0xffff + movk k, #\key >> 16, lsl #16 + add k, k, \m +.elseif 0x100000000 - \key > 0x0000ffff + sub k, \m, #(0x100000000 - \key) & 0xfff000 + sub k, k, #(0x100000000 - \key) & 0xfff +.else + movz k, #0x100000000 - \key + sub k, \m, k +.endif +.endm + +.macro round a, b, c, d, f, key, m, s + \f f, \b, \c, \d + addkm \key, \m // k[i] + m[g] + add \a, \a, k // k[i] + m[g] + a + add \a, \a, f // k[i] + m[g] + a + f + ror \a, \a, #32-\s + add \a, \a, \b +.endm + + /* f = b ? c : d */ +.macro f0 f, b, c, d + eor \f, \c, \d + and \f, \f, \b + eor \f, \f, \d +.endm + + /* + * special cased round 1 function + * f1 = d ? b : c = (d & b) + (~d & c) + */ +.macro round1 a, b, c, d, key, m, s + bic tmp, \c, \d // ~d & c + addkm \key, \m // k[i] + m[g] + add \a, \a, k // k[i] + m[g] + a + and f, \b, \d // d & b + add \a, \a, tmp // k[i] + m[g] + a + (~d & c) + add \a, \a, f // k[i] + m[g] + a + (~d & c) + (d & b) + ror \a, \a, #32-\s + add \a, \a, \b +.endm + + /* f = b ^ c ^ d */ +.macro f2 f, b, c, d + eor \f, \c, \d + eor \f, \f, \b +.endm + + /* f = c ^ (b | ~d) */ +.macro f3 f, b, c, d + orn \f, \b, \d + eor \f, \f, \c +.endm + + /* do 4 rounds */ +.macro rounds f, m0, m1, m2, m3, s0, s1, s2, s3, k0, k1, k2, k3 + round a, b, c, d, \f, \k0, \m0, \s0 + round d, a, b, c, \f, \k1, \m1, \s1 + round c, d, a, b, \f, \k2, \m2, \s2 + round b, c, d, a, \f, \k3, \m3, \s3 +.endm + + /* do 4 rounds with f0, f1, f2, f3 */ +.macro rounds0 m0, m1, m2, m3, k0, k1, k2, k3 + rounds f0, \m0, \m1, \m2, \m3, 7, 12, 17, 22, \k0, \k1, \k2, \k3 +.endm + +.macro rounds1 m0, m1, m2, m3, k0, k1, k2, k3 + round1 a, b, c, d, \k0, \m0, 5 + round1 d, a, b, c, \k1, \m1, 9 + round1 c, d, a, b, \k2, \m2, 14 + round1 b, c, d, a, \k3, \m3, 20 +.endm + +.macro rounds2 m0, m1, m2, m3, k0, k1, k2, k3 + rounds f2, \m0, \m1, \m2, \m3, 4, 11, 16, 23, \k0, \k1, \k2, \k3 +.endm + +.macro rounds3 m0, m1, m2, m3, k0, k1, k2, k3 + rounds f3, \m0, \m1, \m2, \m3, 6, 10, 15, 21, \k0, \k1, \k2, \k3 +.endm + + /* md5block(MD5_CTX, buf, len) */ +ENTRY(_libmd_md5block) +ctx .req x0 +buf .req x1 +len .req x2 +end .req x2 // aliases len +a .req w3 +b .req w4 +c .req w5 +d .req w6 +f .req w7 +tmp .req w8 +k .req w9 +m0 .req w10 +m1 .req w11 +m2 .req w12 +m3 .req w13 +m4 .req w14 +m5 .req w15 +m6 .req w16 +m7 .req w17 + // x18 is the platform register +m8 .req w19 +m9 .req w20 +m10 .req w21 +m11 .req w22 +m12 .req w23 +m13 .req w24 +m14 .req w25 +m15 .req w26 + +a_ .req m0 +b_ .req m7 +c_ .req m14 +d_ .req m5 + + stp x19, x20, [sp, #-0x40]! + stp x21, x22, [sp, #0x10] + stp x23, x24, [sp, #0x20] + stp x25, x26, [sp, #0x30] + + bics len, len, #63 // length in blocks + add end, buf, len // end pointer + + beq .Lend // was len == 0 after BICS? + + ldp a, b, [ctx, #0] + ldp c, d, [ctx, #8] + + /* first eight rounds interleaved with data loads */ +.Lloop: ldp m0, m1, [buf, #0] + round a, b, c, d, f0, 0xd76aa478, m0, 7 + ldp m2, m3, [buf, #8] + round d, a, b, c, f0, 0xe8c7b756, m1, 12 + ldp m4, m5, [buf, #16] + round c, d, a, b, f0, 0x242070db, m2, 17 + ldp m6, m7, [buf, #24] + round b, c, d, a, f0, 0xc1bdceee, m3, 22 + + ldp m8, m9, [buf, #32] + round a, b, c, d, f0, 0xf57c0faf, m4, 7 + ldp m10, m11, [buf, #40] + round d, a, b, c, f0, 0x4787c62a, m5, 12 + ldp m12, m13, [buf, #48] + round c, d, a, b, f0, 0xa8304613, m6, 17 + ldp m14, m15, [buf, #56] + round b, c, d, a, f0, 0xfd469501, m7, 22 + + /* remaining rounds use the roundsX macros */ + rounds0 m8, m9, m10, m11, 0x698098d8, 0x8b44f7af, 0xffff5bb1, 0x895cd7be + rounds0 m12, m13, m14, m15, 0x6b901122, 0xfd987193, 0xa679438e, 0x49b40821 + + rounds1 m1, m6, m11, m0, 0xf61e2562, 0xc040b340, 0x265e5a51, 0xe9b6c7aa + rounds1 m5, m10, m15, m4, 0xd62f105d, 0x02441453, 0xd8a1e681, 0xe7d3fbc8 + rounds1 m9, m14, m3, m8, 0x21e1cde6, 0xc33707d6, 0xf4d50d87, 0x455a14ed + rounds1 m13, m2, m7, m12, 0xa9e3e905, 0xfcefa3f8, 0x676f02d9, 0x8d2a4c8a + + rounds2 m5, m8, m11, m14, 0xfffa3942, 0x8771f681, 0x6d9d6122, 0xfde5380c + rounds2 m1, m4, m7, m10, 0xa4beea44, 0x4bdecfa9, 0xf6bb4b60, 0xbebfbc70 + rounds2 m13, m0, m3, m6, 0x289b7ec6, 0xeaa127fa, 0xd4ef3085, 0x04881d05 + rounds2 m9, m12, m15, m2, 0xd9d4d039, 0xe6db99e5, 0x1fa27cf8, 0xc4ac5665 + + rounds3 m0, m7, m14, m5, 0xf4292244, 0x432aff97, 0xab9423a7, 0xfc93a039 + rounds3 m12, m3, m10, m1, 0x655b59c3, 0x8f0ccc92, 0xffeff47d, 0x85845dd1 + rounds3 m8, m15, m6, m13, 0x6fa87e4f, 0xfe2ce6e0, 0xa3014314, 0x4e0811a1 + rounds3 m4, m11, m2, m9, 0xf7537e82, 0xbd3af235, 0x2ad7d2bb, 0xeb86d391 + + ldp a_, b_, [ctx, #0] + ldp c_, d_, [ctx, #8] + add a, a, a_ + add b, b, b_ + add c, c, c_ + add d, d, d_ + stp a, b, [ctx, #0] + stp c, d, [ctx, #8] + + add buf, buf, #64 + cmp buf, end + bne .Lloop + +.Lend: ldp x25, x26, [sp, #0x30] + ldp x23, x24, [sp, #0x20] + ldp x21, x22, [sp, #0x10] + ldp x19, x20, [sp], #0x40 + + ret +END(_libmd_md5block) + +GNU_PROPERTY_AARCH64_FEATURE_1_NOTE(GNU_PROPERTY_AARCH64_FEATURE_1_VAL) + + .section .note.GNU-stack,"",%progbits From nobody Fri Oct 24 10:36:19 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ctK8239hgz6F59y; Fri, 24 Oct 2025 10:36:34 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4ctK8146z8z3j1L; Fri, 24 Oct 2025 10:36:33 +0000 (UTC) (envelope-from kostikbel@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: from tom.home (kib@localhost [127.0.0.1] (may be forged)) by kib.kiev.ua (8.18.1/8.18.1) with ESMTP id 59OAaJxV060518; Fri, 24 Oct 2025 13:36:23 +0300 (EEST) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 59OAaJxV060518 Received: (from kostik@localhost) by tom.home (8.18.1/8.18.1/Submit) id 59OAaJbK060517; Fri, 24 Oct 2025 13:36:19 +0300 (EEST) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Fri, 24 Oct 2025 13:36:19 +0300 From: Konstantin Belousov To: Poul-Henning Kamp Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 2612f1b8649b - main - deadfs: Return ENXIO instead of EIO when the device is gone. Message-ID: References: <202510240741.59O7fBAe041995@gitrepo.freebsd.org> <202510241012.59OACUDA002781@critter.freebsd.dk> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <202510241012.59OACUDA002781@critter.freebsd.dk> X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FORGED_GMAIL_RCVD,FREEMAIL_FROM, NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=4.0.1 X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on tom.home X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:6939, ipnet:2001:470::/32, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4ctK8146z8z3j1L On Fri, Oct 24, 2025 at 10:12:30AM +0000, Poul-Henning Kamp wrote: > -------- > Konstantin Belousov writes: > > > On Fri, Oct 24, 2025 at 07:41:11AM +0000, Poul-Henning Kamp wrote: > > > > Something changed recently, and while testing this fix, I noticed > > Nothing changed WRT code, it is just a race that causes the behavior. > > That is why I wrote "something", because I agree that it is not code > in our tree which has changed. > > > > that drm-kmod-66/i915kms may be the condition which trigger > > > the different code-path. > > It worries me if loading drm-kmod-66/i915kms can cause this kind > of change of behaviour. > > Even with the fix, I see 2-4 read(2) operations return EIO before > the ENXIO manifests. > > The only hypothesis I have, is that something in DRM-world hogs > some kind of HW resource, but I do not have time (nor drm-skillz) > to look into that this morning, and I wanted to get the ENXIO fix > in for RELENG-15 purposes[1]. I do not think that DRM really affects the code path for io. I see several EIOs in CAM, in particular scsi_da.c, but I do not know CAM/USB/umass stack to track that down by reading. From nobody Fri Oct 24 11:16:01 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ctL1b5rD8z6DB3b; Fri, 24 Oct 2025 11:16:03 +0000 (UTC) (envelope-from phk@critter.freebsd.dk) Received: from phk.freebsd.dk (phk.freebsd.dk [130.225.244.222]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4ctL1b3XGFz3mYp; Fri, 24 Oct 2025 11:16:03 +0000 (UTC) (envelope-from phk@critter.freebsd.dk) Authentication-Results: mx1.freebsd.org; none Received: from critter.freebsd.dk (unknown [192.168.55.3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by phk.freebsd.dk (Postfix) with ESMTPS id CCDBCC3F3D; Fri, 24 Oct 2025 11:16:01 +0000 (UTC) Received: (from phk@localhost) by critter.freebsd.dk (8.18.1/8.16.1/Submit) id 59OBG1ii003074; Fri, 24 Oct 2025 11:16:01 GMT (envelope-from phk) Message-Id: <202510241116.59OBG1ii003074@critter.freebsd.dk> To: Konstantin Belousov cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 2612f1b8649b - main - deadfs: Return ENXIO instead of EIO when the device is gone. In-reply-to: From: "Poul-Henning Kamp" References: <202510240741.59O7fBAe041995@gitrepo.freebsd.org> <202510241012.59OACUDA002781@critter.freebsd.dk> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-ID: <3072.1761304561.1@critter.freebsd.dk> Date: Fri, 24 Oct 2025 11:16:01 +0000 X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:1835, ipnet:130.225.0.0/16, country:EU] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4ctL1b3XGFz3mYp -------- Konstantin Belousov writes: > On Fri, Oct 24, 2025 at 10:12:30AM +0000, Poul-Henning Kamp wrote: > I do not think that DRM really affects the code path for io. 100% agreement. But it can change the order of thread/interrupt/event-handling scheduling. When I tested the ENXIO patch, I started booting an unmodified kernel in single-user and immediately got ENXIO when I pulled the USB stick - quite to my surprise. Then I kldloaded i915kms, still in single-user, and now I got the observed bad EIO behaviour. With a fixed kernel and i915kms loaded, I saw four or five reads return EIO before one got ENXIO and terminated recoverdisk. Getting a handful of EIO's before the ENXIO finally appears strongly suggests that some of the eventhandling related to the disappearing USB stick is being held up by something. As soon as I can, I'll try to gather more data. -- Poul-Henning Kamp | UNIX since Zilog Zeus 3.20 phk@FreeBSD.ORG | TCP/IP since RFC 956 FreeBSD committer | BSD since 4.3-tahoe Never attribute to malice what can adequately be explained by incompetence. From nobody Fri Oct 24 11:49:11 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ctLm43hzRz6DFQX; Fri, 24 Oct 2025 11:49:24 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4ctLm371LFz3r2Z; Fri, 24 Oct 2025 11:49:23 +0000 (UTC) (envelope-from kostikbel@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: from tom.home (kib@localhost [127.0.0.1] (may be forged)) by kib.kiev.ua (8.18.1/8.18.1) with ESMTP id 59OBnC56063710; Fri, 24 Oct 2025 14:49:15 +0300 (EEST) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 59OBnC56063710 Received: (from kostik@localhost) by tom.home (8.18.1/8.18.1/Submit) id 59OBnB3X063709; Fri, 24 Oct 2025 14:49:11 +0300 (EEST) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Fri, 24 Oct 2025 14:49:11 +0300 From: Konstantin Belousov To: Poul-Henning Kamp Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 2612f1b8649b - main - deadfs: Return ENXIO instead of EIO when the device is gone. Message-ID: References: <202510240741.59O7fBAe041995@gitrepo.freebsd.org> <202510241012.59OACUDA002781@critter.freebsd.dk> <202510241116.59OBG1ii003074@critter.freebsd.dk> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <202510241116.59OBG1ii003074@critter.freebsd.dk> X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FORGED_GMAIL_RCVD,FREEMAIL_FROM, NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=4.0.1 X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on tom.home X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:6939, ipnet:2001:470::/32, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4ctLm371LFz3r2Z On Fri, Oct 24, 2025 at 11:16:01AM +0000, Poul-Henning Kamp wrote: > -------- > Konstantin Belousov writes: > > > On Fri, Oct 24, 2025 at 10:12:30AM +0000, Poul-Henning Kamp wrote: > > > I do not think that DRM really affects the code path for io. > > 100% agreement. > > But it can change the order of thread/interrupt/event-handling > scheduling. > > When I tested the ENXIO patch, I started booting an unmodified > kernel in single-user and immediately got ENXIO when I pulled > the USB stick - quite to my surprise. > > Then I kldloaded i915kms, still in single-user, and now I got > the observed bad EIO behaviour. > > With a fixed kernel and i915kms loaded, I saw four or five reads > return EIO before one got ENXIO and terminated recoverdisk. > > Getting a handful of EIO's before the ENXIO finally appears > strongly suggests that some of the eventhandling related to > the disappearing USB stick is being held up by something. > > As soon as I can, I'll try to gather more data. It might make sense to annotate CAM EIOs with EXTERROR(). But then, we probably need to add something to copy that extended data between threads and possibly extend struct buf/bio witg the place for exterror data besides b_error. From nobody Fri Oct 24 13:12:18 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ctNc54GsRz6DQNt for ; Fri, 24 Oct 2025 13:12:37 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-pg1-x530.google.com (mail-pg1-x530.google.com [IPv6:2607:f8b0:4864:20::530]) (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 4ctNc52bJSz43BC for ; Fri, 24 Oct 2025 13:12:37 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-pg1-x530.google.com with SMTP id 41be03b00d2f7-b67684e2904so1485593a12.2 for ; Fri, 24 Oct 2025 06:12:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1761311551; x=1761916351; darn=freebsd.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=9DWnlSDuQCRrzquYSqmRO0BK3ObuZX4yN8Ajh6pQVY8=; b=axZGOx6U2z1sUdVlXksQdS6MbhLgKm2g6INtYO8dnk+fxejm3qEA4QdRcciV7UIgx3 mEcf6C2HhvPcpldeHYtuCimWTYmXApzC1HKKN1E/5DnS6RglLIvnxPdc73aZlo3R3rey I2KDcfOHbj3EeT5ATwx/ZCP1KsvRnM56USfu+0PP0BinHoLPPdS0OywDQisfx+ZyDFVQ Ah/h9eokJFvqKqFQ2rMOh70Uieqvgw9+PbB5vprNf1VAXgxmJP5IFncL4qxJk2dKoZoC YOTDTHebnontATpYZPbKXnSAlvz3PX1KycbuKrjKIifoeTR28GroLi4UiAwsValiHsdH Ozmg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761311551; x=1761916351; 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=9DWnlSDuQCRrzquYSqmRO0BK3ObuZX4yN8Ajh6pQVY8=; b=w4gp/HfUmayRgMMeTI+HPPdJyAX2We5Z5AT/vTvRUrNG7gK/3A7P7yfMpN3pUhg/Sc 3OWXqnFkFk9QHyf9RRKU/8BGZUQoojVhVhkRX9Vdqj9t0xz1kcZQElL0yMIDqQ0Pg3Rl MiEjdx+pO6GTb+b4iO13MyEiCkosmFI9PEBGNTaiAJqKN2c21UTkHx87f0z7vCxJvS+a +ngbNBvVvSJxQ4S6nDi1XUzsbPtkdRguNSXq0/FO+UtVTgJTQZX+6O5P95qAFEhSHEB/ 9crIkM7+VmiKpyxcJKRugRgMkAlo6BxmO9UK6a4Pa7eNjVvkxD0axAtLN+JZB5b1zTDF mylw== X-Forwarded-Encrypted: i=1; AJvYcCX6BhQXMo8mpGb6zEexJPzQgSBSa1lJDkxE2gL+Zpi8ZHOF/m8d50NSscu6aEDwDgF1jjzxbIGn/WB7mLsMSmaZs7epVg==@freebsd.org X-Gm-Message-State: AOJu0Yy1WazLuBL/0Woe9W+Y1rfExH5SgbnFJvM9tbAkg28qhH8ROH6I cefSRNpkUzsNQcfYhaQ39b/38A0xNPXS/Ud5PitJzzJtEE17Jvowluc59Gv8yg7P280yVV74qt5 AvGpAQmfi1AGxhofmou1EBS1D+Bq7hhtW9eX/JmIHifr5mhs5G9Rs X-Gm-Gg: ASbGncuo1ETCRNqOVeA6wnwyM5EKVB2uXHzBcS2emNK0JvmQ+zwVEJkjXJsr6z7qWNx 4y00LRCSxoaSUyJ2kk0ZbaulJnLlBYUolaITCNFV+z5wGp/lQVJhXsktq0cTz42uNxKZ9bGrlQG KE5+9yM9ZBi9uw+GM0/cxe/2jBX/dHcS03S8eoiI3YR8bBba+sTFzTRpytvdH17FiiC26Ips6Rq NJ3BXa/pX77SEZjFIht9o2d05jtf7CvNMeuKKnQPsDBWt7Wsbt+Psl26PATNw== X-Google-Smtp-Source: AGHT+IFiITbqzThFcp+upC68WrDLUYqpD7kTBA3WIFtAuIGXI0f1qHfIOWwoDBG/BO4TJtDiXzs42+8g8mTLgSLCPfI= X-Received: by 2002:a17:903:1c9:b0:250:643e:c947 with SMTP id d9443c01a7336-2948ba0d434mr30896565ad.28.1761311550970; Fri, 24 Oct 2025 06:12:30 -0700 (PDT) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 References: <202510240741.59O7fBAe041995@gitrepo.freebsd.org> <202510241012.59OACUDA002781@critter.freebsd.dk> <202510241116.59OBG1ii003074@critter.freebsd.dk> In-Reply-To: From: Warner Losh Date: Fri, 24 Oct 2025 09:12:18 -0400 X-Gm-Features: AS18NWC7Fqtjcw_s75lLwOi2ObAAygpzB7d3fyOCwr-dU_SxPAvJNy8cEvaW_X8 Message-ID: Subject: Re: git: 2612f1b8649b - main - deadfs: Return ENXIO instead of EIO when the device is gone. To: Konstantin Belousov Cc: Poul-Henning Kamp , src-committers , "" , "" Content-Type: multipart/alternative; boundary="00000000000055a7830641e74d98" X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4ctNc52bJSz43BC --00000000000055a7830641e74d98 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Fri, Oct 24, 2025, 7:49=E2=80=AFAM Konstantin Belousov wrote: > On Fri, Oct 24, 2025 at 11:16:01AM +0000, Poul-Henning Kamp wrote: > > -------- > > Konstantin Belousov writes: > > > > > On Fri, Oct 24, 2025 at 10:12:30AM +0000, Poul-Henning Kamp wrote: > > > > > I do not think that DRM really affects the code path for io. > > > > 100% agreement. > > > > But it can change the order of thread/interrupt/event-handling > > scheduling. > > > > When I tested the ENXIO patch, I started booting an unmodified > > kernel in single-user and immediately got ENXIO when I pulled > > the USB stick - quite to my surprise. > > > > Then I kldloaded i915kms, still in single-user, and now I got > > the observed bad EIO behaviour. > > > > With a fixed kernel and i915kms loaded, I saw four or five reads > > return EIO before one got ENXIO and terminated recoverdisk. > > > > Getting a handful of EIO's before the ENXIO finally appears > > strongly suggests that some of the eventhandling related to > > the disappearing USB stick is being held up by something. > > > > As soon as I can, I'll try to gather more data. > > It might make sense to annotate CAM EIOs with EXTERROR(). > But then, we probably need to add something to copy that > extended data between threads and possibly extend struct buf/bio > witg the place for exterror data besides b_error. > Given the contexts cam runs in, managing the storage for that can be hard. Warner > --00000000000055a7830641e74d98 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


On Fri, Oct 24, 2025, 7:49=E2=80= =AFAM Konstantin Belousov <kostik= bel@gmail.com> wrote:
On Fri= , Oct 24, 2025 at 11:16:01AM +0000, Poul-Henning Kamp wrote:
> --------
> Konstantin Belousov writes:
>
> > On Fri, Oct 24, 2025 at 10:12:30AM +0000, Poul-Henning Kamp wrote= :
>
> > I do not think that DRM really affects the code path for io.
>
> 100% agreement.
>
> But it can change the order of thread/interrupt/event-handling
> scheduling.
>
> When I tested the ENXIO patch, I started booting an unmodified
> kernel in single-user and immediately got ENXIO when I pulled
> the USB stick - quite to my surprise.
>
> Then I kldloaded i915kms, still in single-user, and now I got
> the observed bad EIO behaviour.
>
> With a fixed kernel and i915kms loaded, I saw four or five reads
> return EIO before one got ENXIO and terminated recoverdisk.
>
> Getting a handful of EIO's before the ENXIO finally appears
> strongly suggests that some of the eventhandling related to
> the disappearing USB stick is being held up by something.
>
> As soon as I can, I'll try to gather more data.

It might make sense to annotate CAM EIOs with EXTERROR().
But then, we probably need to add something to copy that
extended data between threads and possibly extend struct buf/bio
witg the place for exterror data besides b_error.

Given the contexts cam run= s in, managing the storage for that can be hard.
Warner
--00000000000055a7830641e74d98-- From nobody Fri Oct 24 13:14:52 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ctNfl4V3Wz6DQwB; Fri, 24 Oct 2025 13:14:55 +0000 (UTC) (envelope-from phk@critter.freebsd.dk) Received: from phk.freebsd.dk (phk.freebsd.dk [130.225.244.222]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4ctNfl26Vqz43ZL; Fri, 24 Oct 2025 13:14:55 +0000 (UTC) (envelope-from phk@critter.freebsd.dk) Authentication-Results: mx1.freebsd.org; none Received: from critter.freebsd.dk (unknown [192.168.55.3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by phk.freebsd.dk (Postfix) with ESMTPS id 82995C3F3D; Fri, 24 Oct 2025 13:14:53 +0000 (UTC) Received: (from phk@localhost) by critter.freebsd.dk (8.18.1/8.16.1/Submit) id 59ODEq5a035616; Fri, 24 Oct 2025 13:14:52 GMT (envelope-from phk) Message-Id: <202510241314.59ODEq5a035616@critter.freebsd.dk> To: Warner Losh cc: Konstantin Belousov , src-committers , "" , "" Subject: Re: git: 2612f1b8649b - main - deadfs: Return ENXIO instead of EIO when the device is gone. In-reply-to: From: "Poul-Henning Kamp" References: <202510240741.59O7fBAe041995@gitrepo.freebsd.org> <202510241012.59OACUDA002781@critter.freebsd.dk> <202510241116.59OBG1ii003074@critter.freebsd.dk> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-ID: <35614.1761311692.1@critter.freebsd.dk> Date: Fri, 24 Oct 2025 13:14:52 +0000 X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:1835, ipnet:130.225.0.0/16, country:EU] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4ctNfl26Vqz43ZL Warner Losh writes: > > It might make sense to annotate CAM EIOs with EXTERROR(). > > But then, we probably need to add something to copy that > > extended data between threads and possibly extend struct buf/bio > > witg the place for exterror data besides b_error. > > Given the contexts cam runs in, managing the storage for that can be hard. I'm not sure I see the need... -- Poul-Henning Kamp | UNIX since Zilog Zeus 3.20 phk@FreeBSD.ORG | TCP/IP since RFC 956 FreeBSD committer | BSD since 4.3-tahoe Never attribute to malice what can adequately be explained by incompetence. From nobody Fri Oct 24 14:42:24 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ctQbj03Zcz6DcPW; Fri, 24 Oct 2025 14: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ctQbh6bPlz3HCh; Fri, 24 Oct 2025 14:42:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761316944; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KvlQXi9Q2Ya01zPj2vQKA1Vq2GtcdZCdHxeH2N5PBpg=; b=BfcrOMlBhsSjnDBpMp9A1e07TS7MRzSpP+yEoNDSuHMS4tLLC3oi01xy1PCGQ8z6gu3iN/ ZApPa8mdZ7BKEuMGsfXU9fvhGTLPcBQKq9m1kvfVNmluQb7x/FPUd5eGzRGkVXTMtLPXwu 8IuYY0vGMAmv5/vLPAW7mx5AyjdeuWwERL/QsMVKJWGs8cKi0JVqDbNmV4qNKPyj1nxfk8 X3ZJVQIfi6khL+xqfbHhPtYQ9yhg9TBit0bdQ2eval486LdkZ0WzLapW1XaKXATqR6UrwY W24hrjSeQdR3eLXUPOQiOZFb0khKwplZd18rrfsV6fofisbRW+ty1pW2iZdOqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761316944; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KvlQXi9Q2Ya01zPj2vQKA1Vq2GtcdZCdHxeH2N5PBpg=; b=fcax62J64N6pNcwIUtYMrahvtNRkdoSV9CheUAzopuZeVyiyJQC7XZzPHke7q1hBT82nJp 6l7+NyogqvWQlHIOP1dPitOFaLOLZhGnAEGmPAFuKgcBze99H4qSxY0bDXV3TjocPQDi4+ v2HcCnFjcF8tfVby22JOwP35/AoXqkX/nmtJkkY9IAVJ4HJHEpaoEC4OfrWoWk3B9q07QU hK/1+K3RYm1DoNCe13WXboz9XbQVG30mbBxR1dpxjTNXKuShj3S1KtVJl1HcE8uqtuEBgL bnoXGgOJP09GZoJH1yWxAy8bt1bTbCe+nxIk4ygvG6M3se8WXQ1q5qD7pj4YqQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761316944; a=rsa-sha256; cv=none; b=n0LgHEGE2w4XpIJB5bxYTvlIWbmEhWXP2tFodxN+FeF5UZWfcf+xFyfuWATSP5jVEEtPlj 4T56JN6nvNGNXzxhnmWueVcVnT/sUNa47+fYOirpiJ8Auw9/SHcgV7memJlNcEb8sExY3i PxurZLXKPQxTJiGm9WESuY7I1ibdm9mX6p5RA9WwCO7sgl0zpfuqueKNIEI4lFwK4lW4Oi 6T3WHMMvbZqxfsDRAyZVa6RPfwJo0VeCcArsCKFmdj65PPhrE4JvsIik9WkmOOwv5KSM0s O3NLvguWTNWStBD10RFG5SB9QIvHU5/by2Ez6S/HGUf10fb+YI7PGNP4J5a+ZA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ctQbh66Plz14xN; Fri, 24 Oct 2025 14:42:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59OEgOU4037605; Fri, 24 Oct 2025 14:42:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59OEgOZO037602; Fri, 24 Oct 2025 14:42:24 GMT (envelope-from git) Date: Fri, 24 Oct 2025 14:42:24 GMT Message-Id: <202510241442.59OEgOZO037602@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: ae17bca63f0a - main - geom: zero: Let sysctls .byte and .clear to be settable in loader List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ae17bca63f0a03e6e46ea679a5be7f8851f82099 Auto-Submitted: auto-generated The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=ae17bca63f0a03e6e46ea679a5be7f8851f82099 commit ae17bca63f0a03e6e46ea679a5be7f8851f82099 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2025-09-27 15:21:13 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2025-10-24 14:38:48 +0000 geom: zero: Let sysctls .byte and .clear to be settable in loader There is no reason to not allow kern.geom.zero.byte and kern.geom.zero.clear to be settable as a tunable. Reviewed by: imp, markj Approved by: markj (mentor) MFC after: 1 week Event: EuroBSDCon 2025 Differential Revision: https://reviews.freebsd.org/D52763 --- sys/geom/zero/g_zero.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/geom/zero/g_zero.c b/sys/geom/zero/g_zero.c index e9934ba6c784..7952147d660a 100644 --- a/sys/geom/zero/g_zero.c +++ b/sys/geom/zero/g_zero.c @@ -46,11 +46,11 @@ static SYSCTL_NODE(_kern_geom, OID_AUTO, zero, CTLFLAG_RW | CTLFLAG_MPSAFE, 0, "GEOM_ZERO stuff"); static int g_zero_clear = 1; SYSCTL_PROC(_kern_geom_zero, OID_AUTO, clear, - CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_MPSAFE, &g_zero_clear, 0, + CTLTYPE_INT | CTLFLAG_RWTUN | CTLFLAG_MPSAFE, &g_zero_clear, 0, g_zero_clear_sysctl, "I", "Clear read data buffer"); static int g_zero_byte = 0; -SYSCTL_INT(_kern_geom_zero, OID_AUTO, byte, CTLFLAG_RW, &g_zero_byte, 0, +SYSCTL_INT(_kern_geom_zero, OID_AUTO, byte, CTLFLAG_RWTUN, &g_zero_byte, 0, "Byte (octet) value to clear the buffers with"); static struct g_provider *gpp; From nobody Fri Oct 24 14:50:03 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ctQmb53s9z6DcW6; Fri, 24 Oct 2025 14:50:07 +0000 (UTC) (envelope-from phk@critter.freebsd.dk) Received: from phk.freebsd.dk (phk.freebsd.dk [130.225.244.222]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4ctQmZ1VkZz3HjW; Fri, 24 Oct 2025 14:50:06 +0000 (UTC) (envelope-from phk@critter.freebsd.dk) Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of phk@critter.freebsd.dk designates 130.225.244.222 as permitted sender) smtp.mailfrom=phk@critter.freebsd.dk Received: from critter.freebsd.dk (unknown [192.168.55.3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by phk.freebsd.dk (Postfix) with ESMTPS id DF9FEC3F3D; Fri, 24 Oct 2025 14:50:03 +0000 (UTC) Received: (from phk@localhost) by critter.freebsd.dk (8.18.1/8.16.1/Submit) id 59OEo3Vp043004; Fri, 24 Oct 2025 14:50:03 GMT (envelope-from phk) Message-Id: <202510241450.59OEo3Vp043004@critter.freebsd.dk> cc: Warner Losh , Konstantin Belousov , src-committers , "" , "" Subject: Re: git: 2612f1b8649b - main - deadfs: Return ENXIO instead of EIO when the device is gone. In-reply-to: <202510241314.59ODEq5a035616@critter.freebsd.dk> From: "Poul-Henning Kamp" References: <202510240741.59O7fBAe041995@gitrepo.freebsd.org> <202510241012.59OACUDA002781@critter.freebsd.dk> <202510241116.59OBG1ii003074@critter.freebsd.dk> <202510241314.59ODEq5a035616@critter.freebsd.dk> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-ID: <43002.1761317403.1@critter.freebsd.dk> Date: Fri, 24 Oct 2025 14:50:03 +0000 X-Spamd-Bar: / X-Spamd-Result: default: False [-0.63 / 15.00]; MISSING_TO(2.00)[]; NEURAL_HAM_LONG(-0.98)[-0.979]; NEURAL_HAM_SHORT(-0.95)[-0.952]; NEURAL_HAM_MEDIUM(-0.70)[-0.699]; FORGED_SENDER(0.30)[phk@phk.freebsd.dk,phk@critter.freebsd.dk]; R_SPF_ALLOW(-0.20)[+mx]; MIME_GOOD(-0.10)[text/plain]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:1835, ipnet:130.225.0.0/16, country:EU]; MIME_TRACE(0.00)[0:+]; FREEFALL_USER(0.00)[phk]; MISSING_XM_UA(0.00)[]; R_DKIM_NA(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org,dev-commits-src-main@freebsd.org]; MID_RHS_MATCH_FROMTLD(0.00)[]; FROM_NEQ_ENVFROM(0.00)[phk@phk.freebsd.dk,phk@critter.freebsd.dk]; FROM_HAS_DN(0.00)[]; FREEMAIL_CC(0.00)[bsdimp.com,gmail.com,freebsd.org]; ARC_NA(0.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; TO_DN_ALL(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; DMARC_NA(0.00)[freebsd.dk]; RCPT_COUNT_FIVE(0.00)[5] X-Rspamd-Queue-Id: 4ctQmZ1VkZz3HjW I updated the "ThinkCenter" to 15-BETA2-p1 and made some experiments and I get different results now than before. This is obviously without the fix. Now I see 25 read(2)'s return EIO before ENXIO arrives. Each of those 25 read(2)'s do: read(2) syscall all the way down to CAM for 4(?) retries: CAM sends CCB down CAM gets CCB back with error CAM printf's two lines to console CAM returns EIO userland gets EIO userland printf's to stdout (=console) And only then does ENXIO finally appear. This is single-user mode with a random old USB stick. i915kms does not seem to affect the result in this experiment. I'm buildLLVM'ing on my laptop, will perform more experiments on that platform once that is complete Poul-Henning -- Poul-Henning Kamp | UNIX since Zilog Zeus 3.20 phk@FreeBSD.ORG | TCP/IP since RFC 956 FreeBSD committer | BSD since 4.3-tahoe Never attribute to malice what can adequately be explained by incompetence. From nobody Fri Oct 24 14:51:43 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ctQpR2wnHz6Dd75; Fri, 24 Oct 2025 14:51:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ctQpR2FZCz3JYP; Fri, 24 Oct 2025 14:51:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761317503; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JIe3Dh+dzN2Z8LlPgQHanfVBnwUy3l3W3Y1GUA84qX4=; b=fT3r9U9tgfSzRMmtf1MwoTXUfAdKuIpD374yIg2+aRGIJ5RQbjE+feNQmRt1wfuBUo+XNV Al+pwtGyAeBTqhQcKIuPNS/dere4XSE6HhY9Sr1jU2SGz+Yz/yT5LDiiJ8XwwmQ8YJKtUm 9rh3CHlOaTMRL5zBRqPWzsAF5/1ncEUWGFLoHVabRk3n/9Y0L4MLCKuQKIUsHLUdS1au5W XFgvw6gvz/69i/z+7E7wVwQ2Zncc/Or/t/ZXKSgTmlGxvqBroYyBqwSvgp+7/idfR39oGv JjxkqNgVZ1LqUyEun6/OIPJawwxbOYNLHcYVKasmSDTnmxS1FVcQGN4BqvRy/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761317503; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JIe3Dh+dzN2Z8LlPgQHanfVBnwUy3l3W3Y1GUA84qX4=; b=lvZCe8T/hPSm6CPPet4yiIul2dqptQvTu8vK4d29t0EwTa/bKdFfmg/RWxW7yIyhrNQQ0Y so6XuyWHgplFPUmoBtT2zH6B8JHe06bgRV/9uaLeId+CPbxpYQYvN39d8G+gKI+Vt7KLVw 3tFx8+W6JYy0G8oN7SPRTq/cXpu9yGAXIq2ZVkGrMs7kG3QdWmu7aniC1OpajxkdLujo6/ VPuc+oXoyqP5Fx9d65Ohp0kRr6994jTX5nmsCbznuMBKNQa+CA96RpAHfeEIM5dJqeqz9u pNqJ48GjwtfGqZq0qSBZDJz3GXqjeylaqiHtZ91hwX2083gZEfpYjBc7+Q5OnA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761317503; a=rsa-sha256; cv=none; b=rxzc1gO3uytxVP8rtVTYx63DIK0VPJ+BoBwzNBBzqVaks0E8PIXeLTrRHf/nPG4zZxdxV7 RMm28aQuRQLWHcZfRdkgUE96np5S2nPjrFe+gDdcNbnTb1xp66xpXWHlZDDFEZBLpuLEPR cXOO/i9tMfL1XZ/mtjqc10Ej1VCBvkkp4GU8cskBAuEmaQePxmqktN9Ect1f1Vr+DYFSy+ eEnfAn7SkMJJtOz7cgjZSJ/mvcouXVTWTu+u2on+KqrulvQy/669WscGY8PWACEYAZTBBL L0grwPhltUPNPI5pA/ZK/9ZvIrflrGZPJG781Mjsd9+P0Sq3D10HG5MuIky3Sw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ctQpR1rK8z14mZ; Fri, 24 Oct 2025 14:51: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 59OEphGo058995; Fri, 24 Oct 2025 14:51:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59OEphk3058992; Fri, 24 Oct 2025 14:51:43 GMT (envelope-from git) Date: Fri, 24 Oct 2025 14:51:43 GMT Message-Id: <202510241451.59OEphk3058992@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: a08b38dfcea3 - main - gpart.8: Document one of gpart destroy diagnostic message List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a08b38dfcea3c61718dfa40b003518fa3d9adac4 Auto-Submitted: auto-generated The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=a08b38dfcea3c61718dfa40b003518fa3d9adac4 commit a08b38dfcea3c61718dfa40b003518fa3d9adac4 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2025-10-24 14:51:07 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2025-10-24 14:51:07 +0000 gpart.8: Document one of gpart destroy diagnostic message Reviewed by: ziaee MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D52992 --- lib/geom/part/gpart.8 | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/lib/geom/part/gpart.8 b/lib/geom/part/gpart.8 index f76c1d9d5d6c..2e11417f8494 100644 --- a/lib/geom/part/gpart.8 +++ b/lib/geom/part/gpart.8 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd February 11, 2025 +.Dd October 24, 2025 .Dt GPART 8 .Os .Sh NAME @@ -1497,6 +1497,26 @@ and .Bd -literal -offset indent /sbin/gpart backup ada0 | /sbin/gpart restore -F ada1 ada2 .Ed +.Sh DIAGNOSTICS +.Bl -diag +.It gpart: arg0 '%s': Invalid argument +The provided +.Ar geom +argument +is not a GEOM provider. +Not every device in +.Xr devfs 4 +is a GEOM provider. +For example, a +.Xr zfs 4 +zvol will show up as a GEOM provider only if its +.Sy volmode +is set properly +.Po refer to +.Xr zfsprops 8 +for details +.Pc . +.El .Sh SEE ALSO .Xr geom 4 , .Xr boot0cfg 8 , From nobody Fri Oct 24 15:01:30 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ctR253STNz6DfLY for ; Fri, 24 Oct 2025 15:01:49 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-pf1-x436.google.com (mail-pf1-x436.google.com [IPv6:2607:f8b0:4864:20::436]) (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 4ctR250TnKz3KK9 for ; Fri, 24 Oct 2025 15:01:49 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-pf1-x436.google.com with SMTP id d2e1a72fcca58-782e93932ffso1809488b3a.3 for ; Fri, 24 Oct 2025 08:01:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1761318103; x=1761922903; darn=freebsd.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=QRfngypdhPU0OonQMIhxnc+lCq6a+UeXERUBLYXIqXk=; b=Ee9noqIuyqZCrzslrqS32OvSqTMBhv/iICXMpQnv0YZqrvFIsdR85isFNrdWr7jiL/ cns1Et7Jra69BSPYgRdBrY30tovrO98wceZQO8yX6os9UQHpTDH9jyvoZgV8oKW1jByg 5une1EyvI6vtvRGtY1yNybWPr/5JDilTQ2yjq+UgFT6OM0lpfYx3G1c3sTx3C+8drOX9 jpRILG46MMnNyjG1eBvmbwckjKx+w9uB81oa8zSgViVPAN2LLHiVHe5vYzGZZ9h5bVdI EYqHAE348z6IOISwd5/5LHa1vsGOWcF8Qok2i9uDQYSSF1p4RT0R8NfKOggXeBFE0Myo SVQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761318103; x=1761922903; 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=QRfngypdhPU0OonQMIhxnc+lCq6a+UeXERUBLYXIqXk=; b=BXRa2kM+PkxmIekQIUtUZL4wGE4Qctc6AbV5GSKrHaOUOQomfEgUwU9xlKknuuWxHG 0RYgo/k55CNsJCWZNP2wVOtCPKzO3mFbSJ6ln1gjiX+ICCazotCId2w4Vc7s5AlNxJl+ 7oo3eg7l1EbsSBvQL8S6hB4epGABafTBl2Sx67fdJkw3ODKcwRxT008abNlNi3KwVyBC Dh3VP9vY+Oudz80vJK3/rE2MHxRXvvZfLCQs2rleGHC49PlO6Kd4HNd+IWckIC5/usMR 4qtKj7HMMld2i0mDrXsoekDBsso/2pHAOnDN2WL6tpcO37cPtlzNDhnmzT5Wkz1l2MQd qPUg== X-Forwarded-Encrypted: i=1; AJvYcCXEpPWmdzUHq4yrOwLH37Ts1/NF2wXcqVkNJ2+WwwuNUXkGSxVssNFPuzx5AIu5cPI2jKEWU1o/TeYg+YR9DFFTFr0uPQ==@freebsd.org X-Gm-Message-State: AOJu0YwWhddxe2LR/s7GMbhmHO24/Fhf8dNnPsGndUyWBmzGzA/OH51V zvt7XL+lIrSCDgMCIZ09YQspuH0xsEh21baiayrxg+/s4CCVSDgA2ZVobegNW4LSVlo2gHoAlsO LntpUefODdupmB5UG12Ck1aHyMjUNbY8R32qHopsqng== X-Gm-Gg: ASbGncvJ2QX1yq4GXaWTlrSVeaD/R/qNIQRQxE3noj/GSeCHjnLL5UYdVCcRz8T8EBT b+a3SEsBRHUlaeMqZ9mE3TTSqoi/D4MjFiZ8TJj15YmPXTLdn+Cp4ofRscDHDHrnxbz/hPHjdnY QSMPzVz7qFwJgMcSASI2VsuWn6BUWotr6K3bbgx+2z1IS+EP0McOjUNZKzGzI9XMRoOZLHE5uGY lA6UgUh3kJn+UQ+ZVdBolxCUI/LLDHb8CkSlzjBI3xjNKSgXscvzEhsZtTX+Ilwn+M634BN X-Google-Smtp-Source: AGHT+IEgzI2KcZIC+B2BL58SI9jX06DSxTvq4/yEAo2QYuF22vPlzy6rV9+dalUSBdiDjLEayOHUl1o7HKcISiFQ7ro= X-Received: by 2002:a17:90b:3f10:b0:32e:7270:94aa with SMTP id 98e67ed59e1d1-33bcf8e726bmr36419709a91.19.1761318102162; Fri, 24 Oct 2025 08:01:42 -0700 (PDT) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 References: <202510240741.59O7fBAe041995@gitrepo.freebsd.org> <202510241012.59OACUDA002781@critter.freebsd.dk> <202510241116.59OBG1ii003074@critter.freebsd.dk> <202510241314.59ODEq5a035616@critter.freebsd.dk> <202510241450.59OEo3Vp043004@critter.freebsd.dk> In-Reply-To: <202510241450.59OEo3Vp043004@critter.freebsd.dk> From: Warner Losh Date: Fri, 24 Oct 2025 11:01:30 -0400 X-Gm-Features: AS18NWC9nO57atdOXOZ4X1lZr4Zj99AJahOrKb4xB8W79MYEraq3Rv89pD8tckk Message-ID: Subject: Re: git: 2612f1b8649b - main - deadfs: Return ENXIO instead of EIO when the device is gone. To: Poul-Henning Kamp Cc: Konstantin Belousov , src-committers , "" , "" Content-Type: multipart/alternative; boundary="000000000000d0eb540641e8d38b" X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4ctR250TnKz3KK9 --000000000000d0eb540641e8d38b Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Fri, Oct 24, 2025, 10:50=E2=80=AFAM Poul-Henning Kamp wrote: > I updated the "ThinkCenter" to 15-BETA2-p1 and made some experiments > and I get different results no than before. > > This is obviously without the fix. > > > Now I see 25 read(2)'s return EIO before ENXIO arrives. > > Each of those 25 read(2)'s do: > > read(2) syscall > all the way down to CAM > for 4(?) retries: > CAM sends CCB down > CAM gets CCB back with error > CAM printf's two lines to console > CAM returns EIO > userland gets EIO > userland printf's to stdout (=3Dconsole) > What are the cam messages? And only then does ENXIO finally appear. > So we are racing the detach thread here. The errors in the transactions aren't yet recognized as the device being gone. We don't kick that off until the usb stack starts its detach teardown. I've not walked through that. This is single-user mode with a random old USB stick. > I'm guessing it doesn't matter... I'll see if i can repeat these result when I return. Warner i915kms does not seem to affect the result in this experiment. > > I'm buildLLVM'ing on my laptop, will perform more experiments > on that platform once that is complete > > Poul-Henning > > -- > Poul-Henning Kamp | UNIX since Zilog Zeus 3.20 > phk@FreeBSD.ORG | TCP/IP since RFC 956 > FreeBSD committer | BSD since 4.3-tahoe > Never attribute to malice what can adequately be explained by incompetenc= e. > --000000000000d0eb540641e8d38b Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


On Fri, Oct 24, 2025, 10:50=E2= =80=AFAM Poul-Henning Kamp <phk@ph= k.freebsd.dk> wrote:
I updat= ed the "ThinkCenter" to 15-BETA2-p1 and made some experiments
and I get different results no than before.

This is obviously without the fix.


Now I see 25 read(2)'s return EIO before ENXIO arrives.

Each of those 25 read(2)'s do:

=C2=A0 =C2=A0 =C2=A0 =C2=A0 read(2) syscall
=C2=A0 =C2=A0 =C2=A0 =C2=A0 all the way down to CAM
=C2=A0 =C2=A0 =C2=A0 =C2=A0 for 4(?) retries:
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 CAM sends CCB down<= br> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 CAM gets CCB back w= ith error
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 CAM printf's tw= o lines to console
=C2=A0 =C2=A0 =C2=A0 =C2=A0 CAM returns EIO
=C2=A0 =C2=A0 =C2=A0 =C2=A0 userland gets EIO
=C2=A0 =C2=A0 =C2=A0 =C2=A0 userland printf's to stdout (=3Dconsole)

Wha= t are the cam messages?

=
And only then does ENXIO finally appear.

So we are racing the detach thread = here. The errors in the transactions aren't yet recognized as the devic= e being gone. We don't kick that off until the usb stack starts its det= ach teardown. I've not walked through that.=C2=A0

This is single-user mode with a random old USB stick.

I'm guessing it do= esn't matter... I'll see if i can repeat these result when I return= .

Warner

i915kms does not seem to affect the result in this experiment.

I'm buildLLVM'ing on my laptop, will perform more experiments
on that platform once that is complete

Poul-Henning

--
Poul-Henning Kamp=C2=A0 =C2=A0 =C2=A0 =C2=A0| UNIX since Zilog Zeus 3.20 phk@FreeBSD.ORG=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0| TCP/IP since RFC 956
FreeBSD committer=C2=A0 =C2=A0 =C2=A0 =C2=A0| BSD since 4.3-tahoe=C2=A0 =C2= =A0
Never attribute to malice what can adequately be explained by incompetence.=
--000000000000d0eb540641e8d38b-- From nobody Fri Oct 24 15:10:09 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ctRCk2Lkvz6Dg41; Fri, 24 Oct 2025 15:10:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ctRCk1prkz3KhP; Fri, 24 Oct 2025 15:10:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761318610; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pFxWkcIxsNSMuzDp6g+Jggw/seCY6Ofuk25++izSyXE=; b=PDdNXsCBjRZ9Geg74grkTjmUepJ1jG24D3qJMvyY2349KUCFDEtqDz6Ie+mO1ZEac742T/ DkHB1xF91YNBBLJ6ztIRKf7Gru9VP5+K58XgaDE05BvEfDRqsnK+ituDmocT1GSKtdKor1 XMArTqPPeGmri08uyoWskgymcvGlMfcKwZKiJQtnaNNMdtLQ3qdzZ2owsEQvhqJXtc6dpM dUro2TQ+yKnKXYvxncWs4clQ62+S6WnpKEhAyMsURkl5WsXp7MmDNm275WDuT2hAERbwSK S9IOQ40sWxLgLxuNJVIWHG7GY1D4M2PDXQVphL2kxrXifOCvk1SYcuMdCcoUvQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761318610; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pFxWkcIxsNSMuzDp6g+Jggw/seCY6Ofuk25++izSyXE=; b=tboBxkbH5UuqW6EZgFcltgkMF4pfGFviW/UWesV/bUI6PIB7p7PafQZqP29NaVRxmx04og sDHCtNjpy6JUWLwP88r/ydrIDMUys/qS4jpmpcVKmf72lLRLlTyyj85r0YFH3GkaFvZIN0 4odozNfLWpklwGaxW+YNKVCX3+wQErWE+kRk88Ku3aSeLCLPzGGga9s2A+orelbsmNe/Cj ED+BkmVMaO3s7mV82EUq/BB0UjoKGlQi8UAop6ZxwtbHOqTcnbTs1VoquVD/qCkK/CITOE IVxd03yTbDFQcBKTy2Xlw/0pdwARqgzT6OO0mWNwLN7VFT7J2ZNv0amanP8lnA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761318610; a=rsa-sha256; cv=none; b=F6QpJR/AgrwGzpyJxw/n14DAciN3BU1y7kTUktKVt5NEcIu9qHo3hssNtUn8T1a9VwXyx5 fFgLVWA/H2Jmairm3p1WCxls9UjTh3FyfC5bF7QYAraO/Cfbx3IypQlfwW2RK4p85QOX1M xrpcaVIS0uepGYsaNU7KYslWKRC7oKIM9HNjClLNYTcM1R7WQbSrYPKlEF15o1bgMdFokM qfWFOxr0FRjQCkSjL/rjmhxl3DBQ62OVWhJn6jU5fzDjrWp1c/7de5DAnng7DDHzNDcRZx U1eVWjtLY/JQQX1n+/QySk0EfGp0pTsJi4NI1Xwcp2SP+2v6VI2lhymK2Lj+/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ctRCk122sz15DY; Fri, 24 Oct 2025 15:10:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59OFA9QW085269; Fri, 24 Oct 2025 15:10:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59OFA98w085263; Fri, 24 Oct 2025 15:10:09 GMT (envelope-from git) Date: Fri, 24 Oct 2025 15:10:09 GMT Message-Id: <202510241510.59OFA98w085263@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: f817f6e7f4a8 - main - fdisk: Bump removal to FreeBSD 16.0 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f817f6e7f4a8dc507f3e1b1603dfd2d81093e3bd Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=f817f6e7f4a8dc507f3e1b1603dfd2d81093e3bd commit f817f6e7f4a8dc507f3e1b1603dfd2d81093e3bd Author: Ed Maste AuthorDate: 2025-10-24 15:08:25 +0000 Commit: Ed Maste CommitDate: 2025-10-24 15:10:00 +0000 fdisk: Bump removal to FreeBSD 16.0 Removal did not happen prior to 15.0. Sponsored by: The FreeBSD Foundation --- sbin/fdisk/fdisk.8 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sbin/fdisk/fdisk.8 b/sbin/fdisk/fdisk.8 index 09933acf57df..f26e6bb67d6e 100644 --- a/sbin/fdisk/fdisk.8 +++ b/sbin/fdisk/fdisk.8 @@ -1,5 +1,5 @@ .\" -.Dd October 5, 2016 +.Dd October 24, 2025 .Dt FDISK 8 .Os .Sh NAME @@ -18,7 +18,7 @@ .Sh DEPRECATION NOTICE .Nm is deprecated and is not available in -.Fx 15.0 +.Fx 16.0 or later. Use .Xr gpart 8 From nobody Fri Oct 24 15:50:47 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ctS6f6JZMz6DlFZ; Fri, 24 Oct 2025 15:50:50 +0000 (UTC) (envelope-from phk@critter.freebsd.dk) Received: from phk.freebsd.dk (phk.freebsd.dk [130.225.244.222]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4ctS6f2Mx4z3SL1; Fri, 24 Oct 2025 15:50:50 +0000 (UTC) (envelope-from phk@critter.freebsd.dk) Authentication-Results: mx1.freebsd.org; none Received: from critter.freebsd.dk (unknown [192.168.55.3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by phk.freebsd.dk (Postfix) with ESMTPS id 0F598C3F3D; Fri, 24 Oct 2025 15:50:48 +0000 (UTC) Received: (from phk@localhost) by critter.freebsd.dk (8.18.1/8.16.1/Submit) id 59OFolH7062303; Fri, 24 Oct 2025 15:50:47 GMT (envelope-from phk) Message-Id: <202510241550.59OFolH7062303@critter.freebsd.dk> To: Warner Losh cc: Konstantin Belousov , src-committers , "" , "" Subject: Re: git: 2612f1b8649b - main - deadfs: Return ENXIO instead of EIO when the device is gone. In-reply-to: From: "Poul-Henning Kamp" References: <202510240741.59O7fBAe041995@gitrepo.freebsd.org> <202510241012.59OACUDA002781@critter.freebsd.dk> <202510241116.59OBG1ii003074@critter.freebsd.dk> <202510241314.59ODEq5a035616@critter.freebsd.dk> <202510241450.59OEo3Vp043004@critter.freebsd.dk> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-ID: <62301.1761321047.1@critter.freebsd.dk> Date: Fri, 24 Oct 2025 15:50:47 +0000 X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:1835, ipnet:130.225.0.0/16, country:EU] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4ctS6f2Mx4z3SL1 -------- Warner Losh writes: > --000000000000d0eb540641e8d38b > Content-Type: text/plain; charset="UTF-8" > Content-Transfer-Encoding: quoted-printable > > On Fri, Oct 24, 2025, 10:50=E2=80=AFAM Poul-Henning Kamp k> wrote: > > > I updated the "ThinkCenter" to 15-BETA2-p1 and made some experiments > > and I get different results no than before. > > > > This is obviously without the fix. > > > > > > Now I see 25 read(2)'s return EIO before ENXIO arrives. > > > > Each of those 25 read(2)'s do: > > > > read(2) syscall > > all the way down to CAM > > for 4(?) retries: > > CAM sends CCB down > > CAM gets CCB back with error > > CAM printf's two lines to console > > CAM returns EIO > > userland gets EIO > > userland printf's to stdout (=3Dconsole) > > > > What are the cam messages? https://phk.freebsd.dk/misc/IMG_20251024_174810.jpg -- Poul-Henning Kamp | UNIX since Zilog Zeus 3.20 phk@FreeBSD.ORG | TCP/IP since RFC 956 FreeBSD committer | BSD since 4.3-tahoe Never attribute to malice what can adequately be explained by incompetence. From nobody Fri Oct 24 16:03:28 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ctSPD4p76z6DmNV; Fri, 24 Oct 2025 16:03:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ctSPD3ytYz3TkW; Fri, 24 Oct 2025 16:03:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761321808; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qzyuNKkNAFJLqZkH5rby+FpCk88N25qYH7FZzVFjgvI=; b=aUN4Flj6vjRHvUKmTRPQQYr/RDbAGLUf5mCoTiLjYTxtWKzRjk/Lgo2BmjOJ5/4AOt2nOT j2DPCI+okABSqAjG7UDxSxvKlsphwVtEAZ7wYzdNjmPM4GxRywPdrJan941N0CFO0enqrS JLQrO/CY876KMtSnvnGv+3MldZkO4fXYHHgvtmVrj3CcX/FZ5ArXlg3anTJ9vjD7czeIrU vgRg4yC8SEyZZJbBk5dDBkVln2xHVtRXjFlCcbbo0kj8Uvy2Unl9N00X4SBpwuoj8sZWsl RuC8WP5u3idqT9flEC+Hn3k+6zJ9eAFJOsEgC9aJQhZX+mZoP35Fbgi8fuCIjA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761321808; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qzyuNKkNAFJLqZkH5rby+FpCk88N25qYH7FZzVFjgvI=; b=KpW1qYM5GMHRyol/YfdqJs/inbd3fXd2msPXWzze3Dnj91+7QcyNlXSD8Rp99mMcQNAfxz x8r/8RsqvhCGQFMavsZijrGYwwii0fo08sq0hpCrziUAsoTaquKX3TNriGCfh9tqlLOydg n1Nrd0S8Ka3OBauKoa0dO3tu18q9kljbYQAAEKvgl3YgBlhNXrI3hpQNO16tDsVAvwwh1D DIMtH/lTDatw5pf85/wDJmawO2JltcMSPVSr57hpH/fbZL65cFuyJHPy0UfUZR2hxTQhX/ XKt9fMZ8umZyUCX3aXotbrM3S4K46FjNep+kLTjEZ26PR2I47k3heEovnT8Bvw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761321808; a=rsa-sha256; cv=none; b=i5KsSZ8ndf+4jg/HEAPWWJNLPQDz8uNujCJ4MHHO0m/y+mpoDNPNxzVz4vGfWcmk93g+pX DMQg7WlVD0TQ2nP3xzmyHPnilKeiT3J8hnKvzgDDbkuCsX2vbDgFrOgOEGrHjDqF1iJuMR pWyeuNKx4nCaxO4ws+W0rtQPrkjPDO55Uq8FdlGjkBeiVEb4u3VKvHYlij8cRUM8tzEJIQ 7aKErM0ct1rZ+ND2wRWwcdLFNuSGMA3yh59itDtOt2QvKssLASGoXYYrrEmdlOzPOVqDBo p35aKeoXRXCnBOlmIWzXIEJGi+erQ+n/2trwyUQx68ahn2CFSBUj7C8C5TwUJA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ctSPD3Qf8z17Fl; Fri, 24 Oct 2025 16:03: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 59OG3Shq092046; Fri, 24 Oct 2025 16:03:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59OG3Sow092043; Fri, 24 Oct 2025 16:03:28 GMT (envelope-from git) Date: Fri, 24 Oct 2025 16:03:28 GMT Message-Id: <202510241603.59OG3Sow092043@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 2387a51af235 - main - getrlimitusage.2: Update HISTORY section List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2387a51af235e4304c63f95465a569c878f49dcd Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=2387a51af235e4304c63f95465a569c878f49dcd commit 2387a51af235e4304c63f95465a569c878f49dcd Author: Ed Maste AuthorDate: 2025-10-24 12:10:26 +0000 Commit: Ed Maste CommitDate: 2025-10-24 16:02:45 +0000 getrlimitusage.2: Update HISTORY section Add 14.2, as this was cherry-picked prior to release. Reported by: Harald Eilertsen Reviewed by: kib Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D53320 --- lib/libsys/getrlimitusage.2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/libsys/getrlimitusage.2 b/lib/libsys/getrlimitusage.2 index e2114def56c2..d0e92d7f88b4 100644 --- a/lib/libsys/getrlimitusage.2 +++ b/lib/libsys/getrlimitusage.2 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd September 27, 2024 +.Dd October 24, 2025 .Dt GETRLIMITUSAGE 2 .Os .Sh NAME @@ -97,4 +97,4 @@ and The .Fn getrlimitusage system call appeared in -.Bx 15.0 . +.Fx 14.2 . From nobody Fri Oct 24 16:03:22 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ctSPR4HGZz6Dmx0; Fri, 24 Oct 2025 16:03:39 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4ctSPQ4JXqz3VBN; Fri, 24 Oct 2025 16:03:38 +0000 (UTC) (envelope-from kostikbel@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: from tom.home (kib@localhost [127.0.0.1] (may be forged)) by kib.kiev.ua (8.18.1/8.18.1) with ESMTP id 59OG3M7n072120; Fri, 24 Oct 2025 19:03:25 +0300 (EEST) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 59OG3M7n072120 Received: (from kostik@localhost) by tom.home (8.18.1/8.18.1/Submit) id 59OG3MN4072119; Fri, 24 Oct 2025 19:03:22 +0300 (EEST) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Fri, 24 Oct 2025 19:03:22 +0300 From: Konstantin Belousov To: Warner Losh Cc: Poul-Henning Kamp , src-committers , "" , "" Subject: Re: git: 2612f1b8649b - main - deadfs: Return ENXIO instead of EIO when the device is gone. Message-ID: References: <202510240741.59O7fBAe041995@gitrepo.freebsd.org> <202510241012.59OACUDA002781@critter.freebsd.dk> <202510241116.59OBG1ii003074@critter.freebsd.dk> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FORGED_GMAIL_RCVD,FREEMAIL_FROM, NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=4.0.1 X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on tom.home X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:6939, ipnet:2001:470::/32, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4ctSPQ4JXqz3VBN On Fri, Oct 24, 2025 at 09:12:18AM -0400, Warner Losh wrote: > On Fri, Oct 24, 2025, 7:49 AM Konstantin Belousov > wrote: > > > On Fri, Oct 24, 2025 at 11:16:01AM +0000, Poul-Henning Kamp wrote: > > > -------- > > > Konstantin Belousov writes: > > > > > > > On Fri, Oct 24, 2025 at 10:12:30AM +0000, Poul-Henning Kamp wrote: > > > > > > > I do not think that DRM really affects the code path for io. > > > > > > 100% agreement. > > > > > > But it can change the order of thread/interrupt/event-handling > > > scheduling. > > > > > > When I tested the ENXIO patch, I started booting an unmodified > > > kernel in single-user and immediately got ENXIO when I pulled > > > the USB stick - quite to my surprise. > > > > > > Then I kldloaded i915kms, still in single-user, and now I got > > > the observed bad EIO behaviour. > > > > > > With a fixed kernel and i915kms loaded, I saw four or five reads > > > return EIO before one got ENXIO and terminated recoverdisk. > > > > > > Getting a handful of EIO's before the ENXIO finally appears > > > strongly suggests that some of the eventhandling related to > > > the disappearing USB stick is being held up by something. > > > > > > As soon as I can, I'll try to gather more data. > > > > It might make sense to annotate CAM EIOs with EXTERROR(). > > But then, we probably need to add something to copy that > > extended data between threads and possibly extend struct buf/bio > > witg the place for exterror data besides b_error. > > > > Given the contexts cam runs in, managing the storage for that can be hard. Which storage? EXTERROR() does not allocate any memory. It was designed to be safe for using in any context, including real interrupt (not just non-sleepable threads). From nobody Fri Oct 24 16:15:03 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ctSfb2DXrz6DnlV; Fri, 24 Oct 2025 16:15:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ctSfb1257z3Vyc; Fri, 24 Oct 2025 16:15:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761322503; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=16AyU2a6OnLjLsb2YwRiM0l8dETCDsdbluPGNVGFT/g=; b=ZztI1TQeZohka0guJLMk4Q13zAGeb+XyAZU2qBt2wld166KtAIPE/vWMjVNTQPuO8VOIAx vQS2BPUEnFUFOm1Q1DVeCXrL3CiSel5z3hh8jiX3HUsDRhryDD63Tpw+TlB7RD/rthvQ7v vO6wQj+fT34CUchEXiprQS6STQeZ8NWEqPfT0dDGpB+PLf4cJVtGumUA1vBm3TGP43JWJj HjBXleqQzEFZ8wWVaXI55BA3mb8MAMUqOb9gTyduqrFPfIJcr6++4FEQfndtfPJa0OMYiy UFYBvKr1qzwN27b92/i9wq7okJcLlluBMKoyR1Ylj5oY/Q6Qd39VUJzEKk9pBg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761322503; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=16AyU2a6OnLjLsb2YwRiM0l8dETCDsdbluPGNVGFT/g=; b=RbbdH7L/TPZRWLgvXTfAYSLlURQCFb+bGi+FuLrbEk1Xjhvmf8vkTPbqu5YazhsBQdnqsR pw9PaDMbwDYNQxR8ZyuH/eVmd6HmbEj+ExE+pCdkd1aXfsNUxAmWos27+Otq5Q7jeivU3y fvaT31aSj6yAP/8wIkOAFdaTT6gN5aU19iAlEUIAADH3thNGvzjUurMLU5XrGj6lABuSVd VBuLAcO6ynwAxZrdIWgNPM/UzqfFQ5lmky535hRbz37+eHWKKikbtCDp2f8HtWhuCBlczy Xaq6uSpe2J7yfiTUQqEwsR5Q8gq6/oFsrWgQMFFN+JevmgQEP6aMtSOdR5KR7Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761322503; a=rsa-sha256; cv=none; b=Z9lud3FrKGvheg7MSiHbEMBMvGFSFa2YS4UDmVzudAN+y4DNzaXz0xKM180qOyPoycQmLB vOkyoxMh+gWHXXKXs7AEUh4ZOa+1CyWvXirvmGQwzDJBDAfKkfIUU89WAGvRuefDC5YVE2 fzQVrimqjRjd45MXaUmXp92YGoxjklHKmM+zPN2/m5H/5uUmiDveMnWEBhYvm574JGg4sb izBAGeNI+EdyruZS4pZ6ewaGH4wfRLIw1nJucwf4BagyGVpBQ2foFxkJxMze31nNIM7KZ2 1MyWvBxqSKOx/Lt02Sl96ykrfrFPqkbI+Ujrr+hl/SNFTky74sVde242da7HOg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ctSfb0dhPz16p0; Fri, 24 Oct 2025 16:15: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 59OGF3fE011911; Fri, 24 Oct 2025 16:15:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59OGF3tF011908; Fri, 24 Oct 2025 16:15:03 GMT (envelope-from git) Date: Fri, 24 Oct 2025 16:15:03 GMT Message-Id: <202510241615.59OGF3tF011908@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 4dbe6628179d - main - devfs: make destroy_dev() a release barrier for cdevpriv destructors runs List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4dbe6628179d8e6bf400bfdb4bfa869bdc102a56 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=4dbe6628179d8e6bf400bfdb4bfa869bdc102a56 commit 4dbe6628179d8e6bf400bfdb4bfa869bdc102a56 Author: Konstantin Belousov AuthorDate: 2025-10-23 18:37:00 +0000 Commit: Konstantin Belousov CommitDate: 2025-10-24 16:09:25 +0000 devfs: make destroy_dev() a release barrier for cdevpriv destructors runs Ensure that all destructors for cdevpriv finished running before destroy_dev() returns to the caller. Otherwise, since devfs_destroy_cdevpriv() removes the cdevpriv data from the list, drops the cdevpriv_mtx, and then starts the destructor, it is possible for destroy_dev() to return before destructor finished in other thread. This should allow drivers to safely remove cdev instance data that might be referenced by cdevpriv data. Diagnosed by: kevans Reviewed by: kevans, markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D53303 --- sys/fs/devfs/devfs_int.h | 1 + sys/fs/devfs/devfs_vnops.c | 17 ++++++++++++++--- sys/kern/kern_conf.c | 3 +++ 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/sys/fs/devfs/devfs_int.h b/sys/fs/devfs/devfs_int.h index 916297425b53..9fa75c0e90ad 100644 --- a/sys/fs/devfs/devfs_int.h +++ b/sys/fs/devfs/devfs_int.h @@ -67,6 +67,7 @@ struct cdev_priv { void *cdp_dtr_cb_arg; LIST_HEAD(, cdev_privdata) cdp_fdpriv; + u_int cdp_fdpriv_dtrc; struct mtx cdp_threadlock; }; diff --git a/sys/fs/devfs/devfs_vnops.c b/sys/fs/devfs/devfs_vnops.c index caadf257b8ad..323f1e0fa961 100644 --- a/sys/fs/devfs/devfs_vnops.c +++ b/sys/fs/devfs/devfs_vnops.c @@ -200,14 +200,25 @@ devfs_foreach_cdevpriv(struct cdev *dev, int (*cb)(void *data, void *arg), void devfs_destroy_cdevpriv(struct cdev_privdata *p) { + struct file *fp; + struct cdev_priv *cdp; mtx_assert(&cdevpriv_mtx, MA_OWNED); - KASSERT(p->cdpd_fp->f_cdevpriv == p, - ("devfs_destoy_cdevpriv %p != %p", p->cdpd_fp->f_cdevpriv, p)); - p->cdpd_fp->f_cdevpriv = NULL; + fp = p->cdpd_fp; + KASSERT(fp->f_cdevpriv == p, + ("devfs_destoy_cdevpriv %p != %p", fp->f_cdevpriv, p)); + cdp = cdev2priv((struct cdev *)fp->f_data); + cdp->cdp_fdpriv_dtrc++; + fp->f_cdevpriv = NULL; LIST_REMOVE(p, cdpd_list); mtx_unlock(&cdevpriv_mtx); (p->cdpd_dtr)(p->cdpd_data); + mtx_lock(&cdevpriv_mtx); + MPASS(cdp->cdp_fdpriv_dtrc >= 1); + cdp->cdp_fdpriv_dtrc--; + if (cdp->cdp_fdpriv_dtrc == 0) + wakeup(&cdp->cdp_fdpriv_dtrc); + mtx_unlock(&cdevpriv_mtx); free(p, M_CDEVPDATA); } diff --git a/sys/kern/kern_conf.c b/sys/kern/kern_conf.c index b891ed84957a..dcf3309898ab 100644 --- a/sys/kern/kern_conf.c +++ b/sys/kern/kern_conf.c @@ -1163,6 +1163,9 @@ destroy_devl(struct cdev *dev) devfs_destroy_cdevpriv(p); mtx_lock(&cdevpriv_mtx); } + while (cdp->cdp_fdpriv_dtrc != 0) { + msleep(&cdp->cdp_fdpriv_dtrc, &cdevpriv_mtx, 0, "cdfdpc", 0); + } mtx_unlock(&cdevpriv_mtx); dev_lock(); From nobody Fri Oct 24 16:15:04 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ctSfc2d3Wz6DnlW; Fri, 24 Oct 2025 16:15:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ctSfc1qjzz3VtK; Fri, 24 Oct 2025 16:15:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761322504; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TGQ23C44bpRpbJT4U/8AFggON+8DDILNkCqAH/3iM0s=; b=szTtCvrboeHYnpnkcjxP/yXlNsFZDbTifimIrphyptNICjHvxS5PhxMkzN/2qdtKXRs3c9 EWTpunacvRfyUki3+V5rdbsKXcKeD2VCyzJTqq/AJ3r4JnypEw2hkpcZXCWiK4lIiLd1yB +NQzLkLJ5qxrJex1oES7HbclXE9vnpNWP9NaL6haAghEREtUSIM65A+0zzCfv5ElkPDmj/ EJj0A+EyIBYUNlFLbkruvHGnDUtKD3PrPDSoL5yrENYysWrbMf3bmeZIquk003Ya8pwV8J ZD3HJkGGYuPfhs0iPfaDCno8rnN8jc/u6HENAyxPuLnEq90jgIy4ls6t7DVPwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761322504; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TGQ23C44bpRpbJT4U/8AFggON+8DDILNkCqAH/3iM0s=; b=HZzXf1SzBPlX8VR3Xa2OizfhnrW/sRg9q6kEg8JbjKk2A8vyGH/NqYQnqN8GKTvgKLVIcc i1qaL6ctwz/RkO7ErufDlQh13o/lx405nQER4Rktcccgv3tcVHxAY93fHWnuznr5aEyWCg A2RDVZdJeLFLg76H0me1W+8zRvVwRDZZuSQD1tHlGh0V+19h0M0LydsZTXHJvQTL53phQg eff/uts6kRmuiuXopw7/648RboIDhVXBEEZD0s6GMilm1I1WVzhU1N5B75owX2t1z103wx ctaP3ceLDaGLk6o5+2NA3vvlEVvpAtSfZQ3+hG4XZJfrkUl7acrouPbsDUwGnA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761322504; a=rsa-sha256; cv=none; b=UTy2VrNT93+/WldrNctyC8WlGDDMvPzsvB5jcRMZQxGNzDmI5OzdznvZ7uji0W0qvRnKXE BcY5bqgYMqhffhjwyka4sQppg72h/5RePtQjQ5oVWPIRJYFXd7aopqU6oVj1abGo8vqBH8 Bg3K+Nhj1PVnPBD7bSykFw1abx3ro0pcoSpWgax7WGOX86unRZOY7fnbY5VmC0XQzlJZ2G +lzBx/K5bryQk/q6hp8vb36QkQI8A58WkNGNX4mxyd2VgLL8HxbNDprkjPkVgfzFNC4tiz 05Md9WL3YGEg3c8bG1RjUoYnNumpk5lpdcekkrfeXaoYz4AhotdQ7NQfKZKT4Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ctSfc1Pwkz177S; Fri, 24 Oct 2025 16:15:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59OGF47w011952; Fri, 24 Oct 2025 16:15:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59OGF40Y011948; Fri, 24 Oct 2025 16:15:04 GMT (envelope-from git) Date: Fri, 24 Oct 2025 16:15:04 GMT Message-Id: <202510241615.59OGF40Y011948@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 5e85f383da66 - main - vfs_syscalls.c::flags_to_right(): O_DSYNC should be allowed for CAP_FSYNC List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5e85f383da6661bf29ca6054a330406889d8ac60 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=5e85f383da6661bf29ca6054a330406889d8ac60 commit 5e85f383da6661bf29ca6054a330406889d8ac60 Author: Konstantin Belousov AuthorDate: 2025-10-24 09:42:35 +0000 Commit: Konstantin Belousov CommitDate: 2025-10-24 16:09:25 +0000 vfs_syscalls.c::flags_to_right(): O_DSYNC should be allowed for CAP_FSYNC Noted by: arrowd Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D53315 --- share/man/man4/rights.4 | 3 ++- sys/kern/vfs_syscalls.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/share/man/man4/rights.4 b/share/man/man4/rights.4 index 8f5f6ad9c2d2..0223ba0b6b88 100644 --- a/share/man/man4/rights.4 +++ b/share/man/man4/rights.4 @@ -281,7 +281,8 @@ Permit and .Xr openat 2 with -.Dv O_FSYNC +.Dv O_DSYNC , +.Dv O_FSYNC , or .Dv O_SYNC flag. diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c index 9e1275359715..1a739d354f1f 100644 --- a/sys/kern/vfs_syscalls.c +++ b/sys/kern/vfs_syscalls.c @@ -1119,7 +1119,7 @@ flags_to_rights(int flags, cap_rights_t *rightsp) if (flags & O_TRUNC) cap_rights_set_one(rightsp, CAP_FTRUNCATE); - if (flags & (O_SYNC | O_FSYNC)) + if (flags & (O_SYNC | O_FSYNC | O_DSYNC)) cap_rights_set_one(rightsp, CAP_FSYNC); if (flags & (O_EXLOCK | O_SHLOCK)) From nobody Fri Oct 24 16:37:25 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ctT8P5642z6Dr6x; Fri, 24 Oct 2025 16:37:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ctT8P4R3Wz3Zjl; Fri, 24 Oct 2025 16:37:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761323845; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tY1TT5QYC7C7ZHetJzRH/KcNxSIFbvKfcsvEr6pNDHs=; b=OMQTMKtwXI1MCcFUK8sGR4E4i4e2o9QAZIPtdwlm0yqx5tfeZvVtB5TqzWMZD35G0WsjUj dRj8haBMs5ez4fYZhJnDgof7d1rmdu/TkKIM8NrWMK3ZSSwC0OUuqFaprKrgG5ub+sSM1A HbXWMDpjlVHmeoSpFZ0HbP7/f4sF4oUGfoRQ2ypFKSts4nLyrtux+x0gZ5swscNGQ2wUJo EdqFEdOm0BeWlkkAEekWMq4UZAy1+mrPpkWmeIaV6GIs8i1ZKEK7FI7AxsLGoAIHIvhWr2 xagtOfcBuvrsySjwuLf9CX/32VPsVtF2ES+R6ypU6DrMObU0efy+K3jSC8f2Jg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761323845; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tY1TT5QYC7C7ZHetJzRH/KcNxSIFbvKfcsvEr6pNDHs=; b=UyPI7rFB9XaomRj9EiiHO+uWwZDITz0lLNSZHt/ZImB6/v2a6py/Nj0YDvLnV1Ja9MNpqm lM6bgVq1prUI2t/kFKPaT54kK96TFLIgW655S7Ge5Kkx6hVGoIW1i8QsqScR+zO7I9/itl V01+3XY3n5JJqY9xxvLVswV2jMjshvV6+mJchK+f1uTCsKgqRl8d6Ashk2NvwKHeOT9HaZ xUpo7PsU8HNBOdOnf5zj7ixbdzzEwM/ea5/eWOnx8GdDVCvsygwqmZaNj6Wl7Q+xlEy3UN ijQ+6z7+zP8F3Nt0sQcYXi7D+oUfsiptiOQv6YRzB9QR8SDvRqGO3IRBITdCiQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761323845; a=rsa-sha256; cv=none; b=oXPS2wj3+i9phC6vc9THgUJnDn+9XGJHE3s4BSnSBlOKfRkHLzTwZ7VMvxyYMpQSqt+Hgl H1hiZCGV+GITceVhqghRy68VxoaPLi2jj56+m3kbkh79As7NQe1ssWX9Z8twsZ50mANR6N mzXVAIvrhOov8f57gxnWRIEuD76vfxoXewSqzc0GuboAOI8ImRcWcPRo7K5EMI4WbC2zV+ Rta0mla+jxiYyCCDzKuT0Ks2q7gkoUYDsLfvT2ljOAauWTot5iYxRhF+z+ReMtz1hhL4ZQ 4Kj/eUWP/U9scUtgAPFwxPIvtR9typ/BeEMBem4DIVXZljXVIZ7UFm6yV5pL0w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ctT8P3kTGz17LG; Fri, 24 Oct 2025 16:37: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 59OGbPwv049477; Fri, 24 Oct 2025 16:37:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59OGbPwY049475; Fri, 24 Oct 2025 16:37:25 GMT (envelope-from git) Date: Fri, 24 Oct 2025 16:37:25 GMT Message-Id: <202510241637.59OGbPwY049475@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 739750ae7c63 - main - fdisk: Bump deprecated version in warning message as well List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 739750ae7c63c653025ad84cac6ba7cb6756dcf8 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=739750ae7c63c653025ad84cac6ba7cb6756dcf8 commit 739750ae7c63c653025ad84cac6ba7cb6756dcf8 Author: Ed Maste AuthorDate: 2025-10-24 15:10:42 +0000 Commit: Ed Maste CommitDate: 2025-10-24 16:37:14 +0000 fdisk: Bump deprecated version in warning message as well Fixes: f817f6e7f4a8 ("fdisk: Bump removal to FreeBSD 16.0") Sponsored by: The FreeBSD Foundation --- sbin/fdisk/fdisk.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/fdisk/fdisk.c b/sbin/fdisk/fdisk.c index 925cc68932d7..28230191bb16 100644 --- a/sbin/fdisk/fdisk.c +++ b/sbin/fdisk/fdisk.c @@ -266,7 +266,7 @@ main(int argc, char *argv[]) struct dos_partition *partp; fprintf(stderr, - "WARNING: fdisk is deprecated and is not available in FreeBSD 15 or later.\n" + "WARNING: fdisk is deprecated and is not available in FreeBSD 16 or later.\n" "Please use gpart instead.\n\n"); while ((c = getopt(argc, argv, "BIab:f:ipqstuv1234")) != -1) From nobody Fri Oct 24 17:23:22 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ctV9Q6B3gz6Dwsp; Fri, 24 Oct 2025 17:23:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ctV9Q5Qj7z3hff; Fri, 24 Oct 2025 17:23:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761326602; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ISWZhxEH3jCqzzM0SRavzC4IKrlBr9OD14ObDYz5Ens=; b=KTedfgrGizgfntf3j/FH7rBw4IvY40uKetxyz+ShgjM5Wa1IZczFwuSriZv762o1/WMScO SszxNLXoKm2WTpnE0XqgMEAkf16+DBSv32L5/sgcFjcZKYZH3/4EdpSSTrPvoct88iZIdO zh6FMSQ3pdxBU9NesnuM7wRd6k0WnMIIl/2IN/swmGy/hKbEzyTODrcTV8HXbXVcD6t1+c XoJ0Aa83y0rC83FintcAh4wLeh3uO4PCxaIqutMpFx4Ap7iQZv/kI8rsJFdxtvNmXj1Thv 9gJi/KIv45fqDPDI6O4umJ6ErzyA+KsEIYJ/UWWWhrbv2Kvo/gyJLZdQHvMrRQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761326602; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ISWZhxEH3jCqzzM0SRavzC4IKrlBr9OD14ObDYz5Ens=; b=ELcMVQ9z7oRwAf25BltmAO/2l3/SvUDEMDpqiDELngfY1OZT3HpuqElox4BTZgI89VsrGJ 2yHaBvHkp84/stpYmUxbdagcFZQVq0WCkr8JLhNmZjZVAdFl3M9Da6FPINW1ygSvlBHFGG ToM1dFqRcULuEiXXtlWeSH/X/8z/+P+oAgGlBbL4QVNAflEWJZdfZXqhAridFfZ1v7OCOn doSpBISHqI+IziaZX9Qk9zNFq7LwmgnKp9Pn5PHfV7EZFZIXDtRQLuA42qFmWJYS9Ct3Ob PkWwPLQs6zZaRYwtzC0dv0fCZF4MEqMdsHGkFBrqk7+jCPt5kJWd9xyRHM5K+g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761326602; a=rsa-sha256; cv=none; b=YBtJX/Wn5+EUm1PwQPrwpUufH3AJYCdrBwFcnovM1/Y2ieKmhxtgx3hhpmRSUxDWsVpDUl 6MxLRkgNG8meAbLPkkjn901T/4Sf5o+mDdUNtiJBMbIrOMXYpMmvok/qG1BSFi7xjUZhiV l/BGdUrz5oiU+nPEc/fv44MMmPE1WEuJEe/RppUl3PRcShqYCuznBFwrjg+FZtzvZXpzPm DetcfwyMyxPYOtFum1oumc2xN7M69MiL8W++CzYFSi8OW9nzjMUnX9im+BM7AUGSsDFdRa wZOzac+SIgVEX3Df4makXLwDAVlt9uBi3Dz1uIBN8TIee9ZeAl/Oh3Bwq1GKcQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ctV9Q4pg2z18ns; Fri, 24 Oct 2025 17:23: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 59OHNMZE044724; Fri, 24 Oct 2025 17:23:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59OHNMV9044721; Fri, 24 Oct 2025 17:23:22 GMT (envelope-from git) Date: Fri, 24 Oct 2025 17:23:22 GMT Message-Id: <202510241723.59OHNMV9044721@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: e4d6433e9c03 - main - le(4): Update depreciation notice List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e4d6433e9c0379e164ff50ce829b5b1c0716bcb1 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=e4d6433e9c0379e164ff50ce829b5b1c0716bcb1 commit e4d6433e9c0379e164ff50ce829b5b1c0716bcb1 Author: Ed Maste AuthorDate: 2025-10-24 17:05:05 +0000 Commit: Ed Maste CommitDate: 2025-10-24 17:19:51 +0000 le(4): Update depreciation notice This driver was in fact not removed prior to FreeBSD 15.0. Sponsored by: The FreeBSD Foundation --- share/man/man4/le.4 | 4 ++-- sys/dev/le/lance.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/share/man/man4/le.4 b/share/man/man4/le.4 index ff39361a1780..04b57633c91f 100644 --- a/share/man/man4/le.4 +++ b/share/man/man4/le.4 @@ -34,7 +34,7 @@ .\" .\" from: Header: le.4,v 1.2 92/10/13 05:31:33 leres Exp .\" -.Dd June 21, 2023 +.Dd October 24, 2025 .Dt LE 4 .Os .Sh NAME @@ -66,7 +66,7 @@ numbers have to be specified in The .Nm driver may not be present in -.Fx 15.0 +.Fx 16.0 and later. .Sh DESCRIPTION The diff --git a/sys/dev/le/lance.c b/sys/dev/le/lance.c index f5e41e82bb42..df53242e80f4 100644 --- a/sys/dev/le/lance.c +++ b/sys/dev/le/lance.c @@ -193,7 +193,7 @@ lance_attach(struct lance_softc *sc) if_setcapabilitiesbit(ifp, IFCAP_VLAN_MTU, 0); if_setcapenablebit(ifp, IFCAP_VLAN_MTU, 0); - gone_in(15, "Warning! le(4) to be removed: no longer needed for " + gone_in(16, "Warning! le(4) to be removed: no longer needed for " "Qemu/MIPS\n"); } From nobody Fri Oct 24 18:27:46 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ctWbk1wb6z6F5J1; Fri, 24 Oct 2025 18:27:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ctWbk1Qtqz3pQS; Fri, 24 Oct 2025 18:27:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761330466; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kG4hZojYDOmrmvIfPoF+ep9l+pilc8jzdnUwxvc6R+w=; b=Bh3i+WB3ffhmCy0EnQRN2YInN51WrwtniLqxyycF4aZvIUtWSJvyaSC6EmrXlgwF38oHHI tH9CnfzsisQz7DPYnABScloa8lETrbzHJl2PwAiJNM+AdQRlQB9wfdv59VRSYSzd+RJ2SO yHZmoyzT7Uzu7Lyv5IwJdRkhpeL77BdfXEXAzxCONXXaTOYN/1IHXC8VyZvJD5Hdvi0H6Y gPy1iuilI6vHNVulP7ZX76Z9B+Kf4d9ZPaM0rJjL6zCsmhhjyitB/UvCJHQfm2GeO6OYHA VlkQsQzsGrtFBPBqyH4JPzWOD5NNe/6O/hCvx85bmVsBtLOmx76dLfZNwjyefg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761330466; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kG4hZojYDOmrmvIfPoF+ep9l+pilc8jzdnUwxvc6R+w=; b=WtK+pnip9/uj59m+5KhQDx+RQwC6+Waluxj8VDT9VJ1aGuBzguXhcJHs6KRs5eZwd0Hfaj G5i/zRDoL98w83e9HkVCLAKyHrOb8hszYHRYDDtG/a9NHYboHBXmrP4OLCnP53Hs89IxHF wBTkDKDeJ/FjWJCVuD8bwfOT7EX2TYnRSIA4GUUIKN1aoY559zmVNwW5PqneskwKGQ3s+5 3D9yn+SZBYZ2Zro5HlVeRA0NZzK4AJKern7WkleQQCXxbi/69RdQ2WFlwaGxM1QJfhJq/e cunIsPfkHXz9o0BjMZoYT9qKBcZRCoS+XSNlfwCG4w4miNqgVNGdSuKkOqN6sQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761330466; a=rsa-sha256; cv=none; b=RCpw/XqtFuAsZN6PDSCpBVMU/NFSUgWGwDrYHLp1U8Mt5JboPKxFJCrYJS7KLKVRiXHwo/ EWdJqfgPv4ewnvGp6DmkqL3DBD7uU5MYqQKxKRnRS2eeITCSH3u4oah2qiPd/G/Qu9cmq+ hh2SHPlW/BvUjgG5+xWcotMuLLjQZk+2rDefxJHaebTGDwwguETkGtXcWUyGPrF6phMKAj xhPTO28hs8FIF5Co0iwqagPhHXrKwUrYrJVxlkU/A9CFZ8wjnnFj+o8685AilQvKd8kakO Ih/YM432Uw/49LiCDgXfk8WEU4WMlbORHMdcqnsbp8ZIpS4K35A7mxSrUszVng== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ctWbk0rT6z1BYK; Fri, 24 Oct 2025 18:27:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59OIRkr6058956; Fri, 24 Oct 2025 18:27:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59OIRkG8058952; Fri, 24 Oct 2025 18:27:46 GMT (envelope-from git) Date: Fri, 24 Oct 2025 18:27:46 GMT Message-Id: <202510241827.59OIRkG8058952@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 24adb135c5fe - main - sys: Bump GIANT device removal to 16.0 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 24adb135c5fe8d5018781d496e0abae914534ce5 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=24adb135c5fe8d5018781d496e0abae914534ce5 commit 24adb135c5fe8d5018781d496e0abae914534ce5 Author: Ed Maste AuthorDate: 2025-10-24 17:57:30 +0000 Commit: Ed Maste CommitDate: 2025-10-24 18:27:17 +0000 sys: Bump GIANT device removal to 16.0 It did not happen prior to FreeBSD 15.0. Reported by: zlei Sponsored by: The FreeBSD Foundation --- sys/kern/kern_conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/kern_conf.c b/sys/kern/kern_conf.c index dcf3309898ab..2da51d84ff60 100644 --- a/sys/kern/kern_conf.c +++ b/sys/kern/kern_conf.c @@ -664,7 +664,7 @@ prep_cdevsw(struct cdevsw *devsw, int flags) if ((devsw->d_flags & D_GIANTOK) == 0) { printf( "WARNING: Device \"%s\" is Giant locked and may be " - "deleted before FreeBSD 15.0.\n", + "deleted before FreeBSD 16.0.\n", devsw->d_name == NULL ? "???" : devsw->d_name); } if (devsw->d_gianttrick == NULL) { From nobody Fri Oct 24 18:38:10 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ctWqk58w3z6F6HH; Fri, 24 Oct 2025 18:38:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ctWqk4XRNz3qSs; Fri, 24 Oct 2025 18:38:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761331090; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AGlQE3MsYdsEB/cQ2kBqdbmaML2fHK2pQ6L5Kmb6Q1Q=; b=QQ1dTSnP2aAnBcbfo7NWXBrnZFDJ8KH5Ojd89VLGR709A+7eMJdYfKvgooCFO3gmE2weJE g0VecOXrD/yRvxpT2bGby+FY0wdgjUb0r390ARqxOmnGQ8nT9XThm647GTrPKqGqpR7WnF cVC268A9oXkg3Bl93yuOhNqiMZnEAibGlDM2Hg0675tpibd7En9A+EWYzMiuS3nH0XnQId TJV8RY4++kkX43cLrtYDUUb3VIH9EKev/uRpehlwbjy5Ks7GCuPRv3o8M2J/pG5p+vDPc4 21+I6vgqWiVm9AJ1pAObFpIAOacXgrtLBOMt4B6Yd5/IYtbu0QQlDc/YlWUaDQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761331090; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AGlQE3MsYdsEB/cQ2kBqdbmaML2fHK2pQ6L5Kmb6Q1Q=; b=XnrFjLnfENV7d3LW3Jwyy8zQmCkfi4h9s9CRLDoMXxbjmcASLhuEHZ3LXIMo86t9UNLfuX VCxBjxBT+1Bry3TT87bybtiqE5IUVQ0xof3d5SjPVEdwVq4tFqjmWNzIM3IYvIhB033Wlu 8YmmIhiG0zrSeY8239Yb3A1YH1myUdTQ5nONgEivCqMUIh0OD/sqeCAyX6UKxV+tm264lU 6Oesazt0y+tEG7+dtvHykANujX4cGfHU5WN5iVw3I8wXYawQ8nzVxOpo823MQVJBuamjpx QtsSlakKlXQYFX9EEGPTb1k3Qxi7rFlMlg6vylkbAvYB0AFiF97DAo05rD8dnA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761331090; a=rsa-sha256; cv=none; b=efCiZm1IQkoAJ+wLEQ4ZlHs4BJKN7DlWQ6td3ydfj3msN+8YCPuazmuHi4gU8WHK2z2jAK SsU2EXJ94i/XjxLsCmexMcroN6Ni9xRy83x1++Am591vP3kqYlfZ+qzvAXugWiNCAVjdTO b+jWV7WYnNW/svfw4HBscCVyVZ9nwBDYnxhHG/iUwDbAL3lOd3CoV64wkbq3+oukIcf77n xPTPn1WKCjpKljnL7awGKIxg7gUQ154Vnn/+4d9ocJ8pgyHtlWjdY+JPA01G6MQDQfa/wn u9MRO83hU5/qopdiW7UwQ61CnY1ypqzSxP4PBno9Y6rmUjBYexnXcleCgeb52Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ctWqk44WBz1C53; Fri, 24 Oct 2025 18:38:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59OIcAar077618; Fri, 24 Oct 2025 18:38:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59OIcAS5077615; Fri, 24 Oct 2025 18:38:10 GMT (envelope-from git) Date: Fri, 24 Oct 2025 18:38:10 GMT Message-Id: <202510241838.59OIcAS5077615@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: daa6660f8993 - main - deadfs.9: Document List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: daa6660f899309f832bba0c7ac72dada125cfed5 Auto-Submitted: auto-generated The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=daa6660f899309f832bba0c7ac72dada125cfed5 commit daa6660f899309f832bba0c7ac72dada125cfed5 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2025-10-24 18:08:31 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2025-10-24 18:35:15 +0000 deadfs.9: Document Reviewed by: kib MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D53334 --- share/man/man9/Makefile | 1 + share/man/man9/deadfs.9 | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+) diff --git a/share/man/man9/Makefile b/share/man/man9/Makefile index 52ec9be3ae02..80fd8e198a5b 100644 --- a/share/man/man9/Makefile +++ b/share/man/man9/Makefile @@ -90,6 +90,7 @@ MAN= accept_filter.9 \ DECLARE_MODULE.9 \ DEFINE_IFUNC.9 \ DELAY.9 \ + deadfs.9 \ devclass.9 \ devclass_find.9 \ devclass_get_device.9 \ diff --git a/share/man/man9/deadfs.9 b/share/man/man9/deadfs.9 new file mode 100644 index 000000000000..360451266625 --- /dev/null +++ b/share/man/man9/deadfs.9 @@ -0,0 +1,36 @@ +.\" +.\" SPDX-License-Identifier: BSD-2-Clause +.\" +.\" Copyright (c) 2025 Mateusz Piotrowski <0mp@FreeBSD.org> +.\" +.Dd October 24, 2025 +.Dt DEADFS 9 +.Os +.Sh NAME +.Nm deadfs +.Nd pseudo-filesystem to own reclaimed vnodes +.Sh DESCRIPTION +The +.Nm +file system implements operations that do not modify any data +and instead return indications of invalid IO. +Its role is to provide a fallback vnode operations vector for reclaimed +.Xr vnode 9 Ap s . +.Pp +It is a kernel-only pseudo-file system and so cannot be mounted from userspace. +.Sh SEE ALSO +.Xr insmntque 9 , +.Xr vnode 9 , +.Xr VOP_RECLAIM 9 +.Sh HISTORY +UNIX System Manager's Manual (SMM) for +.Bx 4.4 +described +.Nm +as a file system +.Dq where rejected vnods go to die . +.Sh AUTHORS +The +.Nm +manual page was written by +.An Mateusz Piotrowski Aq Mt 0mp@FreeBSD.org . From nobody Fri Oct 24 18:56:11 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ctXDX312Yz6F7yT; Fri, 24 Oct 2025 18:56:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ctXDX0Z4jz3tfc; Fri, 24 Oct 2025 18:56:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761332172; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XWwuzfhUeAWJU485ygKRrAGQ6mZEilXMeMthn4rhIdY=; b=ZRprPpC0jo+Wn94u5/UJTSGkk9mq/INaRATgz9Y3Q2oFDQt0jL+ahlaqT1ddRn2jlmgf5g nAB1YXFfQHa67jYJebKSN05e+jqrF97+/qaajWXJhZRnAHWFL+VJTfihwN+U3b6nSgpPLL z+vf8tok1cLl6SfY2Yu4sTo8/neR++aMTPLBJVOMd78wtENZiziHgJnwC6dtIoYjMdYlRN SSQ/DmEVIoQtBrZUxupQK2Gmr6Z4IrvWO4RmgFgdESXB6DFnHk0Jm33x2bbHfbUM/o7E6c 9UFQGfGiCkcnQjfhHuiwxXvKKWoRJsNQh3wJg/mULYW1qJAzPfNufKchEcfz2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761332172; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XWwuzfhUeAWJU485ygKRrAGQ6mZEilXMeMthn4rhIdY=; b=SXWzpmVovURxA9qJOwjrCIBxahn5bRwYo8Iou9MWCPuhbwlaIlaM0O9LshgVP/FFPvU0VJ FVaQwFh3RWdGyFKh1+bCE+o1c4pkOLrrEvJVsMZJRLeTcA6FgvWbxO+MGfSZJ26HR5nHkf KIIUVGtUjsLyu5QJUJ9IRnzR/kM5IeMliukRspVGMtOBslHztOc4XIGWH70iwVBONwrFAo 0XcSZL2lRNKeFBoBbpVJgGzMTcNlMuaNjoAoxzPD7L8Hy7kT5y6jUvbCJ6GFO/HoGmMeNm bV3tsc+gPpLOFHF2pKZ13KbPVV4XOmtAXd7qlfHy8x+23IUAPUGBAgERlYLwCw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761332172; a=rsa-sha256; cv=none; b=r14i7VqBWKiIWKnQhm8JkFrjDjFe33S8fU6TwcqgsMhgr8Gu6xst5r0OBOowHcxbkW+NTW bsDvg8oMyL+odI5N2a9zKdssfCoxaEo8ER6nf/bJewJIF1Gkf6MUw8SsgbxIzx4eHJseax jKvyPGyRXiMD1SUqONLW4wn9m5Ey+98mbxx2EiOfU3rQzFjbf1ct2WjY5lllysxgCsnYFl /JlCWiLVF5uwcJ7I/nyn8AIIcng1v/wOusHIjAfHpvIgISglNo7mYWj+twDXmN0E3Fmjo+ MA8IYaIG9v7MH4VyqMmtS1XXcoCZKAMJct6pj6esy2ROSS7swJZz73YjTOy9JA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ctXDX09bkz1CM7; Fri, 24 Oct 2025 18:56: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 59OIuBaa014844; Fri, 24 Oct 2025 18:56:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59OIuBVC014841; Fri, 24 Oct 2025 18:56:11 GMT (envelope-from git) Date: Fri, 24 Oct 2025 18:56:11 GMT Message-Id: <202510241856.59OIuBVC014841@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: cf59dabe161f - main - x86 LAPIC: force edge-triggered mode for !bootverbose as well List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cf59dabe161f956ac7d36fbb91b7edeab9d0f6c3 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=cf59dabe161f956ac7d36fbb91b7edeab9d0f6c3 commit cf59dabe161f956ac7d36fbb91b7edeab9d0f6c3 Author: Konstantin Belousov AuthorDate: 2025-10-24 18:17:56 +0000 Commit: Konstantin Belousov CommitDate: 2025-10-24 18:54:17 +0000 x86 LAPIC: force edge-triggered mode for !bootverbose as well Submitted by: Austin Shafer Reviewed by: imp, jhb Fixes: 5c039412a2823 MFC after: 1 week Differential revision: https://reviews.freebsd.org/D53336 --- sys/x86/x86/local_apic.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/sys/x86/x86/local_apic.c b/sys/x86/x86/local_apic.c index db9a1eb757de..c1c9029531f5 100644 --- a/sys/x86/x86/local_apic.c +++ b/sys/x86/x86/local_apic.c @@ -372,9 +372,12 @@ lvt_mode_impl(struct lapic *la, struct lvt *lvt, u_int pin, uint32_t value) case APIC_LVT_DM_SMI: case APIC_LVT_DM_INIT: case APIC_LVT_DM_EXTINT: - if (!lvt->lvt_edgetrigger && bootverbose) { - printf("lapic%u: Forcing LINT%u to edge trigger\n", - la->la_id, pin); + if (!lvt->lvt_edgetrigger) { + if (bootverbose) { + printf( + "lapic%u: Forcing LINT%u to edge trigger\n", + la->la_id, pin); + } value &= ~APIC_LVT_TM; } /* Use a vector of 0. */ From nobody Fri Oct 24 19:26:02 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ctXty3n72z6FBvC; Fri, 24 Oct 2025 19:26:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ctXty38cKz40dx; Fri, 24 Oct 2025 19:26:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761333962; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7spuKJxFwqET0ZJcebwsSqtezyyR11aAbtkw+IN1WLE=; b=SRRQ16RaGxOkl2yX0ogFTGWLm0PgRjc6RiaMflH8Z5RmGugFV0cRp6LLoJw/viGKMwhAnZ qS3JhHPAz/KwTvPbNyr8Yk32mFVclPwD70jNjQmWRq/msBCL5fE+O6R4vlxDkm6K7IqkRP a7jn5HzYyz61HRh4U09uO7YpewxIkA7ytQ7rCt2p/nLebLzUjIOQgfbI87sc+JDIPfk9ge GNSmoDsaywQvu/kHeqULj72eutSFSz93Bw/AEapUp5v0lMOyYjY5g/xm9Vfm6pmbqc//gC ilqC4J7uHL9NNzCc6PS2+T5CgOwHTfgrihGJHfAuX4cyff6SUea6apSDwq25lw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761333962; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7spuKJxFwqET0ZJcebwsSqtezyyR11aAbtkw+IN1WLE=; b=peHdgzZZrw9gtAzOlH88XUPQI6xeL7NVGgRriPdB2vMnkDGdzndPz69WmW8+qmaNsMjdXL Xyb45vs3RQMIVdiscWBAmJrDB+nUZuZP4GLx20mc5ZNeriyrZkPJZ8RYn5YW+SrX39AlHX 5zjQyxNhgwFQybnaVLSP6vtsnQlif6qWLf8PxwwhUkCE50SP2CKexvb5AmMzR8fTzlSfHV gogsSqMVOu5wLm8dUFMB4Y98bQtNuE1rOuqME3Yyc8ZyafcjAt13E2kNyJSadVY4+ZEoMn L1UQwY4kmAKJan25L+yFcS1Peb9dsUrQ0jwrWsL26gqEDomqRRv5TlAuu0KkYg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761333962; a=rsa-sha256; cv=none; b=Zh0qYLUoNfOskbzk2TrUBXFnrI7imyw2w6Uqx6yYaCdkJjeo0hkCyaPXi5cKrtwPlLXlLF 6/IWGzpyYmZxqEn1Jscy/vRHmkr8Ud7wcCJ8aysESTq4Xqp7gL9i5/rhkbCC/t+gKZ6ZmY +gWLHS/UPD//frwT+trC8qNKKgiSevrhxOViBoE4KUJzDlYfzWgFVEioDkcWiVYZbCmZGC 52ubecSkqg3dck1p7WzgUFur3+UYf+QdB2qRtiTHEik7ZpTiMyUbzCNorrSpSR2uPdcpEG f6XifZqAZ/CKdb9OOUqcOuOvs/VMyBPd9zHKpXs3SiBFkCuq/Ho/36ghhf/mNQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ctXty2Ymrz1CrG; Fri, 24 Oct 2025 19:26: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 59OJQ2EJ071003; Fri, 24 Oct 2025 19:26:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59OJQ2am071001; Fri, 24 Oct 2025 19:26:02 GMT (envelope-from git) Date: Fri, 24 Oct 2025 19:26:02 GMT Message-Id: <202510241926.59OJQ2am071001@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 3cc7d67155da - main - style.mdoc.5: Point readers to style(9) regarding copyright headers List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3cc7d67155dad57e0d10f02a584fda6c8f2ea0b2 Auto-Submitted: auto-generated The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=3cc7d67155dad57e0d10f02a584fda6c8f2ea0b2 commit 3cc7d67155dad57e0d10f02a584fda6c8f2ea0b2 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2025-10-24 19:22:32 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2025-10-24 19:25:38 +0000 style.mdoc.5: Point readers to style(9) regarding copyright headers While here, fix the ordering of the elements in the copyright header per style(9) and remove the text of the license as we already have the SPDX tag here. MFC after: 3 days --- share/man/man5/style.mdoc.5 | 30 ++++++------------------------ 1 file changed, 6 insertions(+), 24 deletions(-) diff --git a/share/man/man5/style.mdoc.5 b/share/man/man5/style.mdoc.5 index 1c3ec2012118..2f8ea90ae21f 100644 --- a/share/man/man5/style.mdoc.5 +++ b/share/man/man5/style.mdoc.5 @@ -1,30 +1,9 @@ .\" -.\" SPDX-License-Identifier: BSD-2-Clause -.\" -.\" Copyright (c) 2018-2022 Mateusz Piotrowski <0mp@FreeBSD.org> +.\" Copyright (c) 2018-2025 Mateusz Piotrowski <0mp@FreeBSD.org> .\" -.\" 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. +.\" SPDX-License-Identifier: BSD-2-Clause .\" -.Dd December 21, 2024 +.Dd October 24, 2025 .Dt STYLE.MDOC 5 .Os .Sh NAME @@ -71,6 +50,9 @@ Historically, was the preferred way before the deprecation of .Sy \&Li . .El +.Ss Copyright Header +Refer to +.Xr style 9 . .Ss HARDWARE Section Driver manuals in section four should have a .Sx HARDWARE From nobody Fri Oct 24 19:29:23 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ctXyq4Gc1z6FC9S; Fri, 24 Oct 2025 19:29:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ctXyq2MRHz413w; Fri, 24 Oct 2025 19:29:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761334163; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=G4++Driu2q3nQTPYtsuGSgS/UnUucA9TZvhBRN6Ob8Y=; b=ByqK0ekxSMwoy/047kpCoA7HBV55Gi2auBr/wnjBjdKiuZp+U/b3gbdHpja71/c8ewO55D /xE5v0kXcDKBZ8dZ0TBGURv7ohHh6UXc3GhFdL05S3OByxwT61vdS56QOPK70Cfm3M06FL dSEgvZru6Z0HSkzb7L/jAaSqEYfI8FIdB/Oa2jj0VyPKwSF9KzckFdo+Ir4fahxfpHRkoM hiyIiPHA/m8z2uzTlQ5vmHf1FfdD1YGLRgm36tlnUP/I3RU4gBUdIaUSOAM+3IAHcQe7P2 rhKcMHuxlnh3UMFq1MHZrlfXsDqXKllt98hE2bWwtIkomHzcphcrrzyj7yd4Cg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761334163; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=G4++Driu2q3nQTPYtsuGSgS/UnUucA9TZvhBRN6Ob8Y=; b=b1MONqfWJTXl00nccZfzFNS8HUa2al7UWIQOdQyFBObmzKLmr/0JoPZBJCyj2ppGHBkQIn K9YvQGwNbxKdiHbL+R50F/xkz2Vzm7JtfDDiiTEdmcNuFfgrf/JTVP846to2qU+vb3cFsB O6cDkYPaAQ5WjgqqUAJVHH4TiAijBbeywK3H+HW3alet8yWoTpptcsE/5eO888/oFDGggS 63Qwa3jZVS85kHTcH1fI2WLxIlyV2DG/z5B8GMQQ9xv2ezB6OiV3PAt2F3ojWIoCmCzJxA vt1RjdRRyjXkNFKiXR/C1ZvygqNb+ha+goTel1EVs8gINPwVQCJzpM4pKVEqhQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761334163; a=rsa-sha256; cv=none; b=RQOSmhPrIxKCyKFbpTtGNKrJJz/ngfRD9RbEPwSkr2lsYjzhRca20MsePSFd6oZGeOjP/7 6EYdUX2bkwW0C3s5kMvzpnYUzj6XyHgKYxwVLKNEkt8YIgO3H7HSTg3+O6fAPWCuur3N8v Sh6rAtxAfVZ0lna73ZxzgWI5sFEOrE5GVHaUo+XApccRmkdF7O0GaSg5gQboHhslOOg6yG tm5Lh0eLSpGN50UuF6pjZDlbthhzcbWljvSIieRDsTRiQNjW7WQDVoypCr0VySubCgbloZ dG/Si1OX1v5y+1bWwKZRMhLEhCfcEr9qVe+Z5uPZe8IF0zpNGIyvS4v9jKcyUA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ctXyq1hSJz1CQJ; Fri, 24 Oct 2025 19:29: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 59OJTNcC072035; Fri, 24 Oct 2025 19:29:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59OJTNU7072032; Fri, 24 Oct 2025 19:29:23 GMT (envelope-from git) Date: Fri, 24 Oct 2025 19:29:23 GMT Message-Id: <202510241929.59OJTNU7072032@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 7b28d549427b - main - sys: Bump 32-bit kernel removal to 16.0 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7b28d549427bd85ecfae24d09da6eacb26c15822 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=7b28d549427bd85ecfae24d09da6eacb26c15822 commit 7b28d549427bd85ecfae24d09da6eacb26c15822 Author: Ed Maste AuthorDate: 2025-10-24 18:28:56 +0000 Commit: Ed Maste CommitDate: 2025-10-24 19:29:10 +0000 sys: Bump 32-bit kernel removal to 16.0 We are shipping at least one 32-bit kernel in FreeBSD 15.0 (i.e., armv7). Sponsored by: The FreeBSD Foundation --- sys/kern/init_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c index 87ffdb8dbf07..6612ac685936 100644 --- a/sys/kern/init_main.c +++ b/sys/kern/init_main.c @@ -384,7 +384,7 @@ C_SYSINIT(diagwarn2, SI_SUB_LAST, SI_ORDER_FIFTH, #if __SIZEOF_LONG__ == 4 static const char ilp32_warn[] = - "WARNING: 32-bit kernels are deprecated and may be removed in FreeBSD 15.0.\n"; + "WARNING: 32-bit kernels are deprecated and may be removed in FreeBSD 16.0.\n"; C_SYSINIT(ilp32warn, SI_SUB_COPYRIGHT, SI_ORDER_FIFTH, print_caddr_t, ilp32_warn); C_SYSINIT(ilp32warn2, SI_SUB_LAST, SI_ORDER_FIFTH, From nobody Fri Oct 24 19:36:43 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ctY7J1sKjz6FD7x; Fri, 24 Oct 2025 19:36:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ctY7J1BGCz4205; Fri, 24 Oct 2025 19:36:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761334604; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pdjvoIBdqh+jVQDwUHx6q6dbOtN4vdWp99YXFDNTr/I=; b=axrM6/sb3FjOXEX1BAaajeZz0trnozcitMTGyILv9jdT95Mob4rQwGvdrLUYosVq5Zjz/D juneXzY/4ZbAdk2dmW89i1FuLggeDPPVXkgHcfzeuQc+bH53C/ySRjP8ggFI0eHOEOrI45 WsgaqYBkBrFNutz6vAMwVD6KaUGGGyzqXEcneLrSmZ18avFw8pcVRiuHsVEy3+1vwII6gS sLuOCD714xCTXC6kABhCpZAsQAzGLh1CqBwn+nOLtTZAl6omK3zD8v/P+bDFMCHrhDeEiE nrVBuU99gNP/I43C2m5x4Rd7PM+HdiWfI+FYqmuyHt5nJOmnrffJOtMLMt07Hw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761334604; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pdjvoIBdqh+jVQDwUHx6q6dbOtN4vdWp99YXFDNTr/I=; b=cqsJKZr6w06rA5yJVZfUjPxedOGh+MZgnLc9ifZ4Uga1FEBfaYbYvf3scRrs9w0oQWImvK l5z7WKlwvJIhwOYD1yCnPU+TnvbWeBHjiqHqXHmoPBzZ6aYR2T+SnUCynOY9UqmduCIFwB Adg9MJ2FmCrmAI/R3xggflI/m1tMqtHLPaHLqtru2VRe1j4zJX9OrF04KTuj8xavucV/m4 EgYyorrW9nN2S155TmOV0mmBotgMwPpwNhYlQ7dgHN/BALH1swC0wjo8QwJPUufXuufxR4 4cQY1YrVEIUlDHix9ou4Txnv1aXDnmlpmp5hIsxxRy+dNOlcmqsWf+xaCmIznQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761334604; a=rsa-sha256; cv=none; b=ktThwmuY4Qfv7C7u6/jZirdXEkOa9G8OgxoxgxVtBn9jxLxVkjco2mIm4How5+YfdCJIAb PeLN7hD4LlOcDKBVfX4+4FvlXWAogmMFJ2HzKU0G3lkQvvx60+K3h03ej5nznNyUwoycRT f7wy7IMkwqzKt49H9FPuNh6AuLxZaRH3Hes7wRcNwnka6OceKl2IxaV9m2YfHmOhyJ1kJv eebZHYK0Hyf4DI2PcAXuEVaT5XBgs9vtK4AI4Rss2gj2U9Kyy4mBtkUfWWVzO6BKL0ayzA iqjAw/7YtrmX6JfOIARfWDrJsTOdaQsmkymHPIcq16AIvWKGZ/rzJND47Zx+KQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ctY7J0C4yzcr; Fri, 24 Oct 2025 19:36: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 59OJahDw090484; Fri, 24 Oct 2025 19:36:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59OJahCk090481; Fri, 24 Oct 2025 19:36:43 GMT (envelope-from git) Date: Fri, 24 Oct 2025 19:36:43 GMT Message-Id: <202510241936.59OJahCk090481@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Krzysztof Galazka Subject: git: 2c02e6ca7154 - main - igb(4): Fix out-of-bounds register access on VFs List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kgalazka X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2c02e6ca7154593d214b62578f67d9fe7db23d70 Auto-Submitted: auto-generated The branch main has been updated by kgalazka: URL: https://cgit.FreeBSD.org/src/commit/?id=2c02e6ca7154593d214b62578f67d9fe7db23d70 commit 2c02e6ca7154593d214b62578f67d9fe7db23d70 Author: Krzysztof Galazka AuthorDate: 2025-10-24 19:25:47 +0000 Commit: Krzysztof Galazka CommitDate: 2025-10-24 19:36:18 +0000 igb(4): Fix out-of-bounds register access on VFs Virtual Functions have access to a limited number of registers, and their bus space size is lower. Use KASSERT to detect out-of-bounds access and eliminate them to avoid kernel panics in production environment. Signed-off-by: Krzysztof Galazka Reviewed by: jmg Tested by: mateusz.moga_intel.com Approved by: kbowling (mentor), erj (mentor) Sponsored by: Intel Corporation MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D52976 --- sys/dev/e1000/e1000_osdep.h | 46 ++++++++++++++++++------- sys/dev/e1000/if_em.c | 83 +++++++++++++++++++++++++-------------------- 2 files changed, 80 insertions(+), 49 deletions(-) diff --git a/sys/dev/e1000/e1000_osdep.h b/sys/dev/e1000/e1000_osdep.h index 893979025f01..ba1c8a16fad1 100644 --- a/sys/dev/e1000/e1000_osdep.h +++ b/sys/dev/e1000/e1000_osdep.h @@ -152,6 +152,9 @@ struct e1000_osdep { bus_space_tag_t mem_bus_space_tag; bus_space_handle_t mem_bus_space_handle; +#ifdef INVARIANTS + bus_size_t mem_bus_space_size; +#endif bus_space_tag_t io_bus_space_tag; bus_space_handle_t io_bus_space_handle; bus_space_tag_t flash_bus_space_tag; @@ -175,27 +178,44 @@ struct e1000_osdep bus_space_write_4(((struct e1000_osdep *)(hw)->back)->mem_bus_space_tag, \ ((struct e1000_osdep *)(hw)->back)->mem_bus_space_handle, offset, value) +static __inline uint32_t +e1000_rd32(struct e1000_osdep *osdep, uint32_t reg) +{ + + KASSERT(reg < osdep->mem_bus_space_size, + ("e1000: register offset %#jx too large (max is %#jx)", + (uintmax_t)reg, (uintmax_t)osdep->mem_bus_space_size)); + + return (bus_space_read_4(osdep->mem_bus_space_tag, + osdep->mem_bus_space_handle, reg)); +} + + +static __inline void +e1000_wr32(struct e1000_osdep *osdep, uint32_t reg, uint32_t value) +{ + + KASSERT(reg < osdep->mem_bus_space_size, + ("e1000: register offset %#jx too large (max is %#jx)", + (uintmax_t)reg, (uintmax_t)osdep->mem_bus_space_size)); + + bus_space_write_4(osdep->mem_bus_space_tag, + osdep->mem_bus_space_handle, reg, value); +} + /* Register READ/WRITE macros */ -#define E1000_READ_REG(hw, reg) \ - bus_space_read_4(((struct e1000_osdep *)(hw)->back)->mem_bus_space_tag, \ - ((struct e1000_osdep *)(hw)->back)->mem_bus_space_handle, \ - E1000_REGISTER(hw, reg)) +#define E1000_READ_REG(hw, reg) \ + e1000_rd32((hw)->back, E1000_REGISTER(hw, reg)) #define E1000_WRITE_REG(hw, reg, value) \ - bus_space_write_4(((struct e1000_osdep *)(hw)->back)->mem_bus_space_tag, \ - ((struct e1000_osdep *)(hw)->back)->mem_bus_space_handle, \ - E1000_REGISTER(hw, reg), value) + e1000_wr32((hw)->back, E1000_REGISTER(hw, reg), value) #define E1000_READ_REG_ARRAY(hw, reg, index) \ - bus_space_read_4(((struct e1000_osdep *)(hw)->back)->mem_bus_space_tag, \ - ((struct e1000_osdep *)(hw)->back)->mem_bus_space_handle, \ - E1000_REGISTER(hw, reg) + ((index)<< 2)) + e1000_rd32((hw)->back, E1000_REGISTER(hw, reg) + ((index) << 2)) #define E1000_WRITE_REG_ARRAY(hw, reg, index, value) \ - bus_space_write_4(((struct e1000_osdep *)(hw)->back)->mem_bus_space_tag, \ - ((struct e1000_osdep *)(hw)->back)->mem_bus_space_handle, \ - E1000_REGISTER(hw, reg) + ((index)<< 2), value) + e1000_wr32((hw)->back, E1000_REGISTER(hw, reg) + ((index) << 2), value) #define E1000_READ_REG_ARRAY_DWORD E1000_READ_REG_ARRAY #define E1000_WRITE_REG_ARRAY_DWORD E1000_WRITE_REG_ARRAY diff --git a/sys/dev/e1000/if_em.c b/sys/dev/e1000/if_em.c index 247cf9d7fed3..e3d839b828ed 100644 --- a/sys/dev/e1000/if_em.c +++ b/sys/dev/e1000/if_em.c @@ -1582,7 +1582,7 @@ em_if_init(if_ctx_t ctx) E1000_WRITE_REG(&sc->hw, E1000_VET, ETHERTYPE_VLAN); /* Clear bad data from Rx FIFOs */ - if (sc->hw.mac.type >= igb_mac_min) + if (sc->hw.mac.type >= igb_mac_min && !sc->vf_ifp) e1000_rx_fifo_flush_base(&sc->hw); /* Configure for OS presence */ @@ -1602,7 +1602,9 @@ em_if_init(if_ctx_t ctx) /* Don't lose promiscuous settings */ em_if_set_promisc(ctx, if_getflags(ifp)); - e1000_clear_hw_cntrs_base_generic(&sc->hw); + + if (sc->hw.mac.ops.clear_hw_cntrs != NULL) + sc->hw.mac.ops.clear_hw_cntrs(&sc->hw); /* MSI-X configuration for 82574 */ if (sc->hw.mac.type == e1000_82574) { @@ -2349,7 +2351,7 @@ em_if_stop(if_ctx_t ctx) em_flush_desc_rings(sc); e1000_reset_hw(&sc->hw); - if (sc->hw.mac.type >= e1000_82544) + if (sc->hw.mac.type >= e1000_82544 && !sc->vf_ifp) E1000_WRITE_REG(&sc->hw, E1000_WUFC, 0); e1000_led_off(&sc->hw); @@ -2408,6 +2410,9 @@ em_allocate_pci_resources(if_ctx_t ctx) } sc->osdep.mem_bus_space_tag = rman_get_bustag(sc->memory); sc->osdep.mem_bus_space_handle = rman_get_bushandle(sc->memory); +#ifdef INVARIANTS + sc->osdep.mem_bus_space_size = rman_get_size(sc->memory); +#endif sc->hw.hw_addr = (u8 *)&sc->osdep.mem_bus_space_handle; /* Only older adapters use IO mapping */ @@ -3259,11 +3264,13 @@ em_reset(if_ctx_t ctx) /* Issue a global reset */ e1000_reset_hw(hw); - if (hw->mac.type >= igb_mac_min) { - E1000_WRITE_REG(hw, E1000_WUC, 0); - } else { - E1000_WRITE_REG(hw, E1000_WUFC, 0); - em_disable_aspm(sc); + if (!sc->vf_ifp) { + if (hw->mac.type >= igb_mac_min) { + E1000_WRITE_REG(hw, E1000_WUC, 0); + } else { + E1000_WRITE_REG(hw, E1000_WUFC, 0); + em_disable_aspm(sc); + } } if (sc->flags & IGB_MEDIA_RESET) { e1000_setup_init_funcs(hw, true); @@ -3813,7 +3820,7 @@ em_initialize_receive_unit(if_ctx_t ctx) sc->rx_int_delay.value); } - if (hw->mac.type >= em_mac_min) { + if (hw->mac.type >= em_mac_min && !sc->vf_ifp) { uint32_t rfctl; /* Use extended rx descriptor formats */ rfctl = E1000_READ_REG(hw, E1000_RFCTL); @@ -3833,33 +3840,38 @@ em_initialize_receive_unit(if_ctx_t ctx) E1000_WRITE_REG(hw, E1000_RFCTL, rfctl); } - /* Set up L3 and L4 csum Rx descriptor offloads */ - rxcsum = E1000_READ_REG(hw, E1000_RXCSUM); - if (if_getcapenable(ifp) & IFCAP_RXCSUM) { - rxcsum |= E1000_RXCSUM_TUOFL | E1000_RXCSUM_IPOFL; - if (hw->mac.type > e1000_82575) - rxcsum |= E1000_RXCSUM_CRCOFL; - else if (hw->mac.type < em_mac_min && - if_getcapenable(ifp) & IFCAP_HWCSUM_IPV6) - rxcsum |= E1000_RXCSUM_IPV6OFL; - } else { - rxcsum &= ~(E1000_RXCSUM_IPOFL | E1000_RXCSUM_TUOFL); - if (hw->mac.type > e1000_82575) - rxcsum &= ~E1000_RXCSUM_CRCOFL; - else if (hw->mac.type < em_mac_min) - rxcsum &= ~E1000_RXCSUM_IPV6OFL; - } + /* + * Set up L3 and L4 csum Rx descriptor offloads only on Physical + * Functions. Virtual Functions have no access to this register. + */ + if (!sc->vf_ifp) { + rxcsum = E1000_READ_REG(hw, E1000_RXCSUM); + if (if_getcapenable(ifp) & IFCAP_RXCSUM) { + rxcsum |= E1000_RXCSUM_TUOFL | E1000_RXCSUM_IPOFL; + if (hw->mac.type > e1000_82575) + rxcsum |= E1000_RXCSUM_CRCOFL; + else if (hw->mac.type < em_mac_min && + if_getcapenable(ifp) & IFCAP_HWCSUM_IPV6) + rxcsum |= E1000_RXCSUM_IPV6OFL; + } else { + rxcsum &= ~(E1000_RXCSUM_IPOFL | E1000_RXCSUM_TUOFL); + if (hw->mac.type > e1000_82575) + rxcsum &= ~E1000_RXCSUM_CRCOFL; + else if (hw->mac.type < em_mac_min) + rxcsum &= ~E1000_RXCSUM_IPV6OFL; + } - if (sc->rx_num_queues > 1) { - /* RSS hash needed in the Rx descriptor */ - rxcsum |= E1000_RXCSUM_PCSD; + if (sc->rx_num_queues > 1) { + /* RSS hash needed in the Rx descriptor */ + rxcsum |= E1000_RXCSUM_PCSD; - if (hw->mac.type >= igb_mac_min) - igb_initialize_rss_mapping(sc); - else - em_initialize_rss_mapping(sc); + if (hw->mac.type >= igb_mac_min) + igb_initialize_rss_mapping(sc); + else + em_initialize_rss_mapping(sc); + } + E1000_WRITE_REG(hw, E1000_RXCSUM, rxcsum); } - E1000_WRITE_REG(hw, E1000_RXCSUM, rxcsum); for (i = 0, que = sc->rx_queues; i < sc->rx_num_queues; i++, que++) { struct rx_ring *rxr = &que->rxr; @@ -4367,6 +4379,8 @@ em_get_wakeup(if_ctx_t ctx) switch (sc->hw.mac.type) { case e1000_82542: case e1000_82543: + case e1000_vfadapt: + case e1000_vfadapt_i350: break; case e1000_82544: e1000_read_nvm(&sc->hw, @@ -4412,8 +4426,6 @@ em_get_wakeup(if_ctx_t ctx) case e1000_i354: case e1000_i210: case e1000_i211: - case e1000_vfadapt: - case e1000_vfadapt_i350: apme_mask = E1000_WUC_APME; sc->has_amt = true; eeprom_data = E1000_READ_REG(&sc->hw, E1000_WUC); @@ -4469,7 +4481,6 @@ em_get_wakeup(if_ctx_t ctx) global_quad_port_a = 0; break; } - return; } From nobody Fri Oct 24 19:45:57 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ctYKx64pqz6FDyx; Fri, 24 Oct 2025 19:45:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ctYKx5qD5z42nC; Fri, 24 Oct 2025 19:45:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761335157; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=F6ls7Y9cFNRwB9zKpWJ1bGzhFpqqZAtZ3f7DxJot5Co=; b=Hb3x8bSfaX8MKLQ7A4IqDDXecTlyrwrpttCZTZSbeuthmQNDTnRUJhplwsEpbNxeqSVGHA ANt40MHDfwPl6r34FtLwlkyhtKDQH7v2BPD74FsdLtXA/u7VsTrLVn0GQaYw3LrNJJ1D+6 KAYIqwaz8E9ojgPZ4TJnNJo4IXB5cHbpTA+lM8jm7e3g1xjubc157o2OWt5zvhExrY62DH Q/XpIkNIW72eu/hjeKdAAWjOtnoj349XGztUnFBrVWnirfB8h3b1JF1Bb1VV3k6rqA9wAD N9wB6KQEmBlqrSGlQBRgQmuM44y9Yl/Si64N6h1wEPZKiautW2WjXFkbEE/qvA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761335157; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=F6ls7Y9cFNRwB9zKpWJ1bGzhFpqqZAtZ3f7DxJot5Co=; b=XhfBaUuo+0hQmsDYkR8HN4jd108arYZkC10iPXg+MxdLI4BTyzkRmqG331C+MJeC491WuI YsJ5Vs1OW2ZDazbkIg73x610HC2dHne1B+YImcPdWvO7diyRRSY0Zl7kSvqSmMbB8o5n0D 9fr1Y9Il31BstXCumP2JGXMR45+fHJiDXDBqlyXYncdmHCIPoYNkIgTqmd3f0SCDCgJ+8C VNO2gZfabwQssEugO+XBc6vZ2Cua3fblF2iaJq3lTWS8I08ssGso2SSnquJEbzGPeT3X3q g7sh7w7q+rZvQh/35PtCuXH+k6DZ3VNb65nsqa7zFBd/tprSzo5c5s/CqUGXPw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761335157; a=rsa-sha256; cv=none; b=RePlNAfSH6Fees57teO3lddd1k7bj2yO+8N+eEGCdgWH9cK5f1rvLRHj7Ge158qeL3y7WD cAaP7LbrMRcY0yM16LEZwVBZxKyKs6jHyRQL590K4gY/Gl/IhPaaCSYwbwDCgZDA7bPJGc Em9LPa48RzRXXuSPKVQ7oh01wx2jVRLYUqT0m7u4lTKdelGSzw617TTJOVsul3kEBPExzE UXcuMPQtWtLEQ8o4Xi+aq8yTra+lDhOUuw72Q2486qjFky4S/miSz1ZuMce4+Hc3jTCLHo LUUsEt1qEDkYc3tLvZxMLshBLn3bkUECX4fBIy1vrLS1zcNDzhArTbvehNu3dQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ctYKx4vWqzsW; Fri, 24 Oct 2025 19:45: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 59OJjvHE008952; Fri, 24 Oct 2025 19:45:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59OJjvDY008949; Fri, 24 Oct 2025 19:45:57 GMT (envelope-from git) Date: Fri, 24 Oct 2025 19:45:57 GMT Message-Id: <202510241945.59OJjvDY008949@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: 04c264240681 - main - tcp rack: cleanup List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 04c2642406815729781e7eb219a5438583fff27f Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=04c2642406815729781e7eb219a5438583fff27f commit 04c2642406815729781e7eb219a5438583fff27f Author: Peter Lei AuthorDate: 2025-10-24 19:42:28 +0000 Commit: Michael Tuexen CommitDate: 2025-10-24 19:45:51 +0000 tcp rack: cleanup The TCP_SAD_DETECTION code was removed. Remove the remaining sysctl-variables and counters. Reviewed by: tuexen MFC after: 3 days Sponsored by: Netflix, Inc. --- sys/netinet/tcp_stacks/rack.c | 201 +------------------------------------- sys/netinet/tcp_stacks/tcp_rack.h | 1 - 2 files changed, 4 insertions(+), 198 deletions(-) diff --git a/sys/netinet/tcp_stacks/rack.c b/sys/netinet/tcp_stacks/rack.c index 50077abdfd86..9ed26d5a617b 100644 --- a/sys/netinet/tcp_stacks/rack.c +++ b/sys/netinet/tcp_stacks/rack.c @@ -204,10 +204,6 @@ static int32_t rack_dnd_default = 0; /* For rr_conf = 3, what is the default fo static int32_t rack_rxt_controls = 0; static int32_t rack_fill_cw_state = 0; static uint8_t rack_req_measurements = 1; -/* Attack threshold detections */ -static uint32_t rack_highest_sack_thresh_seen = 0; -static uint32_t rack_highest_move_thresh_seen = 0; -static uint32_t rack_merge_out_sacks_on_attack = 0; static int32_t rack_enable_hw_pacing = 0; /* Due to CCSP keep it off by default */ static int32_t rack_hw_rate_caps = 0; /* 1; */ static int32_t rack_hw_rate_cap_per = 0; /* 0 -- off */ @@ -223,7 +219,6 @@ static int32_t rack_default_pacing_divisor = 250; static uint16_t rack_pacing_min_seg = 0; static int32_t rack_timely_off = 0; -static uint32_t sad_seg_size_per = 800; /* 80.0 % */ static int32_t rack_pkt_delay = 1000; static int32_t rack_send_a_lot_in_prr = 1; static int32_t rack_min_to = 1000; /* Number of microsecond min timeout */ @@ -399,18 +394,6 @@ counter_u64_t rack_extended_rfo; counter_u64_t rack_sack_proc_all; counter_u64_t rack_sack_proc_short; counter_u64_t rack_sack_proc_restart; -counter_u64_t rack_sack_attacks_detected; -counter_u64_t rack_sack_attacks_reversed; -counter_u64_t rack_sack_attacks_suspect; -counter_u64_t rack_sack_used_next_merge; -counter_u64_t rack_sack_splits; -counter_u64_t rack_sack_used_prev_merge; -counter_u64_t rack_sack_skipped_acked; -counter_u64_t rack_ack_total; -counter_u64_t rack_express_sack; -counter_u64_t rack_sack_total; -counter_u64_t rack_move_none; -counter_u64_t rack_move_some; counter_u64_t rack_input_idle_reduces; counter_u64_t rack_collapsed_win; @@ -834,18 +817,6 @@ sysctl_rack_clear(SYSCTL_HANDLER_ARGS) counter_u64_zero(rack_rxt_clamps_cwnd_uniq); counter_u64_zero(rack_multi_single_eq); counter_u64_zero(rack_proc_non_comp_ack); - counter_u64_zero(rack_sack_attacks_detected); - counter_u64_zero(rack_sack_attacks_reversed); - counter_u64_zero(rack_sack_attacks_suspect); - counter_u64_zero(rack_sack_used_next_merge); - counter_u64_zero(rack_sack_used_prev_merge); - counter_u64_zero(rack_sack_splits); - counter_u64_zero(rack_sack_skipped_acked); - counter_u64_zero(rack_ack_total); - counter_u64_zero(rack_express_sack); - counter_u64_zero(rack_sack_total); - counter_u64_zero(rack_move_none); - counter_u64_zero(rack_move_some); counter_u64_zero(rack_try_scwnd); counter_u64_zero(rack_collapsed_win); counter_u64_zero(rack_collapsed_win_rxt); @@ -872,7 +843,6 @@ static void rack_init_sysctls(void) { struct sysctl_oid *rack_counters; - struct sysctl_oid *rack_attack; struct sysctl_oid *rack_pacing; struct sysctl_oid *rack_timely; struct sysctl_oid *rack_timers; @@ -883,12 +853,6 @@ rack_init_sysctls(void) struct sysctl_oid *rack_probertt; struct sysctl_oid *rack_hw_pacing; - rack_attack = SYSCTL_ADD_NODE(&rack_sysctl_ctx, - SYSCTL_CHILDREN(rack_sysctl_root), - OID_AUTO, - "sack_attack", - CTLFLAG_RW | CTLFLAG_MPSAFE, 0, - "Rack Sack Attack Counters and Controls"); rack_counters = SYSCTL_ADD_NODE(&rack_sysctl_ctx, SYSCTL_CHILDREN(rack_sysctl_root), OID_AUTO, @@ -1533,11 +1497,6 @@ rack_init_sysctls(void) OID_AUTO, "dnd", CTLFLAG_RW, &rack_dnd_default, 0, "Do not disturb default for rack_rrr = 3"); - SYSCTL_ADD_S32(&rack_sysctl_ctx, - SYSCTL_CHILDREN(rack_misc), - OID_AUTO, "sad_seg_per", CTLFLAG_RW, - &sad_seg_size_per, 800, - "Percentage of segment size needed in a sack 800 = 80.0?"); SYSCTL_ADD_S32(&rack_sysctl_ctx, SYSCTL_CHILDREN(rack_misc), OID_AUTO, "rxt_controls", CTLFLAG_RW, @@ -1619,85 +1578,6 @@ rack_init_sysctls(void) &rack_autosndbuf_inc, 20, "What percentage should rack scale up its snd buffer by?"); - - /* Sack Attacker detection stuff */ - SYSCTL_ADD_U32(&rack_sysctl_ctx, - SYSCTL_CHILDREN(rack_attack), - OID_AUTO, "merge_out", CTLFLAG_RW, - &rack_merge_out_sacks_on_attack, 0, - "Do we merge the sendmap when we decide we are being attacked?"); - - SYSCTL_ADD_U32(&rack_sysctl_ctx, - SYSCTL_CHILDREN(rack_attack), - OID_AUTO, "detect_highsackratio", CTLFLAG_RW, - &rack_highest_sack_thresh_seen, 0, - "Highest sack to ack ratio seen"); - SYSCTL_ADD_U32(&rack_sysctl_ctx, - SYSCTL_CHILDREN(rack_attack), - OID_AUTO, "detect_highmoveratio", CTLFLAG_RW, - &rack_highest_move_thresh_seen, 0, - "Highest move to non-move ratio seen"); - rack_ack_total = counter_u64_alloc(M_WAITOK); - SYSCTL_ADD_COUNTER_U64(&rack_sysctl_ctx, - SYSCTL_CHILDREN(rack_attack), - OID_AUTO, "acktotal", CTLFLAG_RD, - &rack_ack_total, - "Total number of Ack's"); - rack_express_sack = counter_u64_alloc(M_WAITOK); - SYSCTL_ADD_COUNTER_U64(&rack_sysctl_ctx, - SYSCTL_CHILDREN(rack_attack), - OID_AUTO, "exp_sacktotal", CTLFLAG_RD, - &rack_express_sack, - "Total expresss number of Sack's"); - rack_sack_total = counter_u64_alloc(M_WAITOK); - SYSCTL_ADD_COUNTER_U64(&rack_sysctl_ctx, - SYSCTL_CHILDREN(rack_attack), - OID_AUTO, "sacktotal", CTLFLAG_RD, - &rack_sack_total, - "Total number of SACKs"); - rack_move_none = counter_u64_alloc(M_WAITOK); - SYSCTL_ADD_COUNTER_U64(&rack_sysctl_ctx, - SYSCTL_CHILDREN(rack_attack), - OID_AUTO, "move_none", CTLFLAG_RD, - &rack_move_none, - "Total number of SACK index reuse of positions under threshold"); - rack_move_some = counter_u64_alloc(M_WAITOK); - SYSCTL_ADD_COUNTER_U64(&rack_sysctl_ctx, - SYSCTL_CHILDREN(rack_attack), - OID_AUTO, "move_some", CTLFLAG_RD, - &rack_move_some, - "Total number of SACK index reuse of positions over threshold"); - rack_sack_attacks_detected = counter_u64_alloc(M_WAITOK); - SYSCTL_ADD_COUNTER_U64(&rack_sysctl_ctx, - SYSCTL_CHILDREN(rack_attack), - OID_AUTO, "attacks", CTLFLAG_RD, - &rack_sack_attacks_detected, - "Total number of SACK attackers that had sack disabled"); - rack_sack_attacks_reversed = counter_u64_alloc(M_WAITOK); - SYSCTL_ADD_COUNTER_U64(&rack_sysctl_ctx, - SYSCTL_CHILDREN(rack_attack), - OID_AUTO, "reversed", CTLFLAG_RD, - &rack_sack_attacks_reversed, - "Total number of SACK attackers that were later determined false positive"); - rack_sack_attacks_suspect = counter_u64_alloc(M_WAITOK); - SYSCTL_ADD_COUNTER_U64(&rack_sysctl_ctx, - SYSCTL_CHILDREN(rack_attack), - OID_AUTO, "suspect", CTLFLAG_RD, - &rack_sack_attacks_suspect, - "Total number of SACKs that triggered early detection"); - - rack_sack_used_next_merge = counter_u64_alloc(M_WAITOK); - SYSCTL_ADD_COUNTER_U64(&rack_sysctl_ctx, - SYSCTL_CHILDREN(rack_attack), - OID_AUTO, "nextmerge", CTLFLAG_RD, - &rack_sack_used_next_merge, - "Total number of times we used the next merge"); - rack_sack_used_prev_merge = counter_u64_alloc(M_WAITOK); - SYSCTL_ADD_COUNTER_U64(&rack_sysctl_ctx, - SYSCTL_CHILDREN(rack_attack), - OID_AUTO, "prevmerge", CTLFLAG_RD, - &rack_sack_used_prev_merge, - "Total number of times we used the prev merge"); /* Counters */ rack_total_bytes = counter_u64_alloc(M_WAITOK); SYSCTL_ADD_COUNTER_U64(&rack_sysctl_ctx, @@ -1908,18 +1788,6 @@ rack_init_sysctls(void) OID_AUTO, "sack_short", CTLFLAG_RD, &rack_sack_proc_short, "Total times we took shortcut for sack processing"); - rack_sack_skipped_acked = counter_u64_alloc(M_WAITOK); - SYSCTL_ADD_COUNTER_U64(&rack_sysctl_ctx, - SYSCTL_CHILDREN(rack_attack), - OID_AUTO, "skipacked", CTLFLAG_RD, - &rack_sack_skipped_acked, - "Total number of times we skipped previously sacked"); - rack_sack_splits = counter_u64_alloc(M_WAITOK); - SYSCTL_ADD_COUNTER_U64(&rack_sysctl_ctx, - SYSCTL_CHILDREN(rack_attack), - OID_AUTO, "ofsplit", CTLFLAG_RD, - &rack_sack_splits, - "Total number of times we did the old fashion tree split"); rack_input_idle_reduces = counter_u64_alloc(M_WAITOK); SYSCTL_ADD_COUNTER_U64(&rack_sysctl_ctx, SYSCTL_CHILDREN(rack_counters), @@ -3319,16 +3187,6 @@ rack_counter_destroy(void) counter_u64_free(rack_hw_pace_lost); counter_u64_free(rack_non_fto_send); counter_u64_free(rack_extended_rfo); - counter_u64_free(rack_ack_total); - counter_u64_free(rack_express_sack); - counter_u64_free(rack_sack_total); - counter_u64_free(rack_move_none); - counter_u64_free(rack_move_some); - counter_u64_free(rack_sack_attacks_detected); - counter_u64_free(rack_sack_attacks_reversed); - counter_u64_free(rack_sack_attacks_suspect); - counter_u64_free(rack_sack_used_next_merge); - counter_u64_free(rack_sack_used_prev_merge); counter_u64_free(rack_tlp_tot); counter_u64_free(rack_tlp_newdata); counter_u64_free(rack_tlp_retran); @@ -3351,8 +3209,6 @@ rack_counter_destroy(void) counter_u64_free(rack_sack_proc_all); counter_u64_free(rack_sack_proc_restart); counter_u64_free(rack_sack_proc_short); - counter_u64_free(rack_sack_skipped_acked); - counter_u64_free(rack_sack_splits); counter_u64_free(rack_input_idle_reduces); counter_u64_free(rack_collapsed_win); counter_u64_free(rack_collapsed_win_rxt); @@ -9542,7 +9398,6 @@ do_rest_ofb: goto out; } rack_log_map_chg(tp, rack, &stack_map, rsm, next, MAP_SACK_M1, end, __LINE__); - counter_u64_add(rack_sack_used_next_merge, 1); /* Postion for the next block */ start = next->r_end; rsm = tqhash_next(rack->r_ctl.tqh, next); @@ -9574,7 +9429,6 @@ do_rest_ofb: */ goto out; } - counter_u64_add(rack_sack_splits, 1); rack_clone_rsm(rack, nrsm, rsm, start); rsm->r_just_ret = 0; #ifndef INVARIANTS @@ -9596,7 +9450,6 @@ do_rest_ofb: } } else { /* Already sacked this piece */ - counter_u64_add(rack_sack_skipped_acked, 1); if (end == rsm->r_end) { /* Done with block */ rsm = tqhash_next(rack->r_ctl.tqh, rsm); @@ -9696,8 +9549,6 @@ do_rest_ofb: rsm->r_in_tmap = 0; } rack_log_map_chg(tp, rack, NULL, rsm, NULL, MAP_SACK_M3, end, __LINE__); - } else { - counter_u64_add(rack_sack_skipped_acked, 1); } if (end == rsm->r_end) { /* This block only - done, setup for next */ @@ -9876,7 +9727,6 @@ do_rest_ofb: } rack_log_map_chg(tp, rack, prev, &stack_map, rsm, MAP_SACK_M4, end, __LINE__); rsm = prev; - counter_u64_add(rack_sack_used_prev_merge, 1); } else { /** * This is the case where our previous @@ -9941,7 +9791,6 @@ do_rest_ofb: * rsm |---| (acked) * nrsm |------| (not acked) */ - counter_u64_add(rack_sack_splits, 1); rack_clone_rsm(rack, nrsm, rsm, end); rsm->r_flags &= (~RACK_HAS_FIN); rsm->r_just_ret = 0; @@ -9989,11 +9838,6 @@ do_rest_ofb: rsm->r_in_tmap = 0; } } - } else if (start != end){ - /* - * The block was already acked. - */ - counter_u64_add(rack_sack_skipped_acked, 1); } out: if (rsm && @@ -10786,17 +10630,6 @@ rack_log_ack(struct tcpcb *tp, struct tcpopt *to, struct tcphdr *th, int entered changed = 0; th_ack = th->th_ack; segsiz = ctf_fixed_maxseg(rack->rc_tp); - if (BYTES_THIS_ACK(tp, th) >= segsiz) { - /* - * You only get credit for - * MSS and greater (and you get extra - * credit for larger cum-ack moves). - */ - int ac; - - ac = BYTES_THIS_ACK(tp, th) / ctf_fixed_maxseg(rack->rc_tp); - counter_u64_add(rack_ack_total, ac); - } if (SEQ_GT(th_ack, tp->snd_una)) { rack_log_progress_event(rack, tp, ticks, PROGRESS_UPDATE, __LINE__); tp->t_acktime = ticks; @@ -10868,8 +10701,8 @@ rack_log_ack(struct tcpcb *tp, struct tcpopt *to, struct tcphdr *th, int entered if (sacks_seen != NULL) *sacks_seen = num_sack_blks; if (num_sack_blks == 0) { - /* Nothing to sack, but we need to update counts */ - goto out_with_totals; + /* Nothing to sack */ + goto out; } /* Its a sack of some sort */ if (num_sack_blks < 2) { @@ -10892,7 +10725,7 @@ rack_log_ack(struct tcpcb *tp, struct tcpopt *to, struct tcphdr *th, int entered */ again: if (num_sack_blks == 0) - goto out_with_totals; + goto out; if (num_sack_blks > 1) { for (i = 0; i < num_sack_blks; i++) { for (j = i + 1; j < num_sack_blks; j++) { @@ -10945,19 +10778,7 @@ do_sack_work: changed += acked; } if (num_sack_blks == 1) { - /* - * This is what we would expect from - * a normal implementation to happen - * after we have retransmitted the FR, - * i.e the sack-filter pushes down - * to 1 block and the next to be retransmitted - * is the sequence in the sack block (has more - * are acked). Count this as ACK'd data to boost - * up the chances of recovering any false positives. - */ - counter_u64_add(rack_ack_total, (acked / ctf_fixed_maxseg(rack->rc_tp))); - counter_u64_add(rack_express_sack, 1); - goto out_with_totals; + goto out; } else { /* * Start the loop through the @@ -10966,7 +10787,6 @@ do_sack_work: loop_start = 1; } } - counter_u64_add(rack_sack_total, 1); rsm = rack->r_ctl.rc_sacklast; for (i = loop_start; i < num_sack_blks; i++) { acked = rack_proc_sack_blk(tp, rack, &sack_blocks[i], to, &rsm, cts, segsiz); @@ -10975,18 +10795,6 @@ do_sack_work: changed += acked; } } -out_with_totals: - if (num_sack_blks > 1) { - /* - * You get an extra stroke if - * you have more than one sack-blk, this - * could be where we are skipping forward - * and the sack-filter is still working, or - * it could be an attacker constantly - * moving us. - */ - counter_u64_add(rack_move_some, 1); - } out: if (changed) { /* Something changed cancel the rack timer */ @@ -14706,7 +14514,6 @@ rack_init(struct tcpcb *tp, void **ptr) rack->r_ctl.rc_prr_sendalot = rack_send_a_lot_in_prr; rack->r_ctl.rc_min_to = rack_min_to; microuptime(&rack->r_ctl.act_rcv_time); - rack->r_ctl.rc_last_time_decay = rack->r_ctl.act_rcv_time; rack->r_ctl.rack_per_of_gp_ss = rack_per_of_gp_ss; if (rack_hw_up_only) rack->r_up_only = 1; diff --git a/sys/netinet/tcp_stacks/tcp_rack.h b/sys/netinet/tcp_stacks/tcp_rack.h index 144b4fabf7eb..cac17d9aeb50 100644 --- a/sys/netinet/tcp_stacks/tcp_rack.h +++ b/sys/netinet/tcp_stacks/tcp_rack.h @@ -462,7 +462,6 @@ struct rack_control { uint64_t rc_gp_output_ts; /* chg*/ uint64_t rc_gp_cumack_ts; /* chg*/ struct timeval act_rcv_time; - struct timeval rc_last_time_decay; /* SAD time decay happened here */ uint64_t gp_bw; uint64_t init_rate; #ifdef NETFLIX_SHARED_CWND From nobody Fri Oct 24 19:49:43 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ctYQJ0f9Rz6FF7m; Fri, 24 Oct 2025 19:49:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ctYQJ06Fyz4381; Fri, 24 Oct 2025 19:49:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761335384; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oI3JthFOT4E0SV/mXOB0xy9bdMfqXITjMyj84lUBLNQ=; b=H5KmYvcTEvsbR0R9LMYrg947XUkjW9UFTharl8c3F7a0CQUrIqFN87xnhrlpm0hOK5/a30 e/L1nVGNXL9WGAOjJASP5Ws48K776qpGgmV1jMlyKAMc2bnrZvnF7uqCKjrFAy54k5fypx yKJRMJh/yPjmGvAEa5nXWG3kC05+cFwJPumQHNY+qgO45t7xKsrhfs1K1jTC8rknAlXEPx YK1vu7k+cPe5H1wJfP5o196i77lBEgRtj3V0Iu4HgNbw9hLpmRIDpAI725ugzvxfOegpQe 6V9hL+P4wvM7fylQCb5KCAClPrNqT6rHlZucidtzQE6fzJHw7qBYYlZePDX8gQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761335384; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oI3JthFOT4E0SV/mXOB0xy9bdMfqXITjMyj84lUBLNQ=; b=Dv5q4sjjUTLCYOhetC4gt0HkTYEiMME+hHpOuRVYyS7xFEpRVOSLplGR6xz/8uIbb3EBqf R3dm8C3CLEb8xwBsA3RBnv5okSJiC6HNTE7N0WBw+ZTI4458VO25e5V90Dh+JXHomq7KS2 HnKB+CCN3+p/KAnG5AfY3r+C2OwNvyw8kECELoBTPIf5ER2booS7TzOIieiDogO8F2pRSA 9O7QwVVV3lJH08B4sq8uYDSbDkcn4s5k2If1AklESuhfrI9meF2nSTB9Yrz4JnAsBUPvSs p4ieBjf4bUMh4Lz+UbRwteJyg1ZO+zs1eoF4/fT6bkavPAq0Wur2JGtpHU/beQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761335384; a=rsa-sha256; cv=none; b=hIumrVIRC33F+AH6xStEhWn4jfE/piYOIXPkGbh8m7bGEthEavaxXTsZrILr5cXKFCzE+B EW1ESl0FFnSYfhCaa4x0HOkD/zfOzBdphZ544mxdmxk029wZlV4fnhKCDmH4ih9wwMa2+w aUZvFyN7qdt/i1AdjjcsBbilQjU4dsyuzgiyw6CYA2j2Gww7RFX7Na2z/Tda72wL+C/7MN BvguX3cYq7q2VQ7CFZyW0AZugxoIOsmB+2W6+udkWDwzZfRKhAMPQQgo2r8FHz6Nbhd5FC 1cyPDz4+DMSgpHTinvoGWgsfU+jbd85IpRgvC2gg/feXz+SEHSrxM/6MOsHfTA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ctYQH6XhHzw2; Fri, 24 Oct 2025 19:49: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 59OJnhnC010125; Fri, 24 Oct 2025 19:49:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59OJnhVv010122; Fri, 24 Oct 2025 19:49:43 GMT (envelope-from git) Date: Fri, 24 Oct 2025 19:49:43 GMT Message-Id: <202510241949.59OJnhVv010122@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: 1a61a673a370 - main - tcp: save progress timeout cause in connection end status List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1a61a673a3700c0ebdb0c5847b5923d0e3641f89 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=1a61a673a3700c0ebdb0c5847b5923d0e3641f89 commit 1a61a673a3700c0ebdb0c5847b5923d0e3641f89 Author: Peter Lei AuthorDate: 2025-10-24 19:47:12 +0000 Commit: Michael Tuexen CommitDate: 2025-10-24 19:47:12 +0000 tcp: save progress timeout cause in connection end status TCP stats are currently incremented for the persist and progress timeout conditions, but only the persist cause was saved in the connection end info status, which in turn is logged in the blackbox "connection end" event. Reviewed by: tuexen MFC after: 3 days Sponsored by: Netflix, Inc. --- sys/netinet/tcp_timer.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sys/netinet/tcp_timer.c b/sys/netinet/tcp_timer.c index 3b9fe7a317b0..57c57666fa3a 100644 --- a/sys/netinet/tcp_timer.c +++ b/sys/netinet/tcp_timer.c @@ -513,9 +513,12 @@ tcp_timer_persist(struct tcpcb *tp) if (progdrop || (tp->t_rxtshift >= V_tcp_retries && (ticks - tp->t_rcvtime >= tcp_maxpersistidle || ticks - tp->t_rcvtime >= TCP_REXMTVAL(tp) * tcp_totbackoff))) { - if (!progdrop) + if (progdrop) { + tcp_log_end_status(tp, TCP_EI_STATUS_PROGRESS); + } else { TCPSTAT_INC(tcps_persistdrop); - tcp_log_end_status(tp, TCP_EI_STATUS_PERSIST_MAX); + tcp_log_end_status(tp, TCP_EI_STATUS_PERSIST_MAX); + } goto dropit; } /* From nobody Fri Oct 24 20:11:32 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ctYvS23Mfz6FH2Y; Fri, 24 Oct 2025 20:11:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ctYvS1RwNz45J8; Fri, 24 Oct 2025 20:11:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761336692; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c41qJX0hqswH0m5F/cHkBH/Vwp30e9V2ZGVZDu0RA1A=; b=OAVRobKQN7WdqfiZuDDQaJbrs3EUHSGsLswc9CcgioBJn+grdCEqMS0yGkyh0KowbjIu4k W5/K0ufi6Q0qVYmGWy5/QpqNVliFfgtk/9fMFODs4T7hC4yaD/iAI4uL4VG9MCuz0X4Ooz cK1lj66jQEYjHZ2DfeYx7rHjsflfFjQhAFDA9zw5fCWD6sINkmhoXH2IPSYsih2sPw5XKd YBYkoPGhRy1ZuzTfA0Cy5NikVIsv6LU4wOMoPC4I9wF1NgDEcHkwSEU1EBQZXUw8zxiTUA ZWVWlqKFfg3yCP0sAIaxcC8JoPNGormeLS0ILrRia0MbYXwOT0Ciq8tUmMFPDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761336692; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c41qJX0hqswH0m5F/cHkBH/Vwp30e9V2ZGVZDu0RA1A=; b=gGGRVH3fn+7EsISEbYT3pC6LAk7Zpcdoy/WfAmd3YBiyB6IRWBPwGqCq9Kc6h1Id9qSGJW v8um0aSe+2P3eFBVHo3VEmzNFYbjTiI53VZNW3dTaf3GYTEhPi6Ei4SG8dZPUuS7Iv72n6 6Bz4Jkb80956tBvvYTpVwZP3iOemFU7u7FQR1e+bFfqhcjUtd18DcemaN5gbEFEWOFBRga JvG3Z+pwG0CrHZQZEzqARyl2/Uy1pvqDbfqoMFkx0VWpSV57bYlBXBM/umgDaP8Bs8OaD7 4ooMQi2+LsNcQnuxvXA/b95mtLOqBFZXcx6cQCBMzTNJY5017s/i/h+cGao/lA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761336692; a=rsa-sha256; cv=none; b=m5CnO72v0tgJ3wnAZ4elNAk3GPToyDpFJIsAxKRwcebcjPKRN+DqWtD6/tr/XRHZ8yFdc8 752fFjcPvVfblTWssXo38Wbu/ylDEqK0TmTb13n5DBqWeLG8V+m1CQVeDppySJK0gg3zkC MZBl9ZpGcvA9Grf8TW/m9+MXmbAh+qU9yg2DQNYs8SxqdLPwWfnxMR5UHGeCTkynrNRA0X rdp9+v0popeHzCOSHDgrvQfoA6JFxwyd0jGjqmjClSP8/dUmscb1RExXj9jwge0AZekWl9 D+vp4MFQfUSnKMvXIWFc5UTgrd+zU/HCZ5guYg5foqQSYtglPApE00Oby/zD2w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ctYvS0qSTz1c9; Fri, 24 Oct 2025 20:11: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 59OKBWuf061899; Fri, 24 Oct 2025 20:11:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59OKBW8Y061896; Fri, 24 Oct 2025 20:11:32 GMT (envelope-from git) Date: Fri, 24 Oct 2025 20:11:32 GMT Message-Id: <202510242011.59OKBW8Y061896@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Maxim Konovalov Subject: git: ec5b9019c2bb - main - deadfs.9: spell List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: maxim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ec5b9019c2bb456a9b6130e8056d68ac49a20e0a Auto-Submitted: auto-generated The branch main has been updated by maxim: URL: https://cgit.FreeBSD.org/src/commit/?id=ec5b9019c2bb456a9b6130e8056d68ac49a20e0a commit ec5b9019c2bb456a9b6130e8056d68ac49a20e0a Author: Maxim Konovalov AuthorDate: 2025-10-24 20:10:46 +0000 Commit: Maxim Konovalov CommitDate: 2025-10-24 20:10:46 +0000 deadfs.9: spell --- share/man/man9/deadfs.9 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/man/man9/deadfs.9 b/share/man/man9/deadfs.9 index 360451266625..5f4d037a0f09 100644 --- a/share/man/man9/deadfs.9 +++ b/share/man/man9/deadfs.9 @@ -28,7 +28,7 @@ UNIX System Manager's Manual (SMM) for described .Nm as a file system -.Dq where rejected vnods go to die . +.Dq where rejected vnodes go to die . .Sh AUTHORS The .Nm From nobody Fri Oct 24 20:18:21 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ctZ3L0bprz6FHf6; Fri, 24 Oct 2025 20:18:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ctZ3K6xsJz46QB; Fri, 24 Oct 2025 20:18:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761337102; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OjzFtGHwiTzhHWfYEaY/6LSF+js+fkU+gCDZoJq+aYQ=; b=kg/JK1VsRi3qIiVm5RdnyzATcXqofvu0d6yZVigiYil/4TQBcFHDrJhdXRawsXVgI62m+6 8bgU3RZsqTAn9Vn4RepLddTln1PkY6n7CosaLcqeSCbYI5xzsECdjw+DK0jOrDfe8B+kdd RM32hYGdQL9IATJsycXl0ndHhF7xlBPK+C9Fw5owetT3qvrWZPZeGl276N9wXFH5MJN/7N nyWS+vnUj3Cqzrn91/FDqQNNtnSaiJ88/2dZtt2Scgv1rbrw9w3SRQh7RBxOkszNyVUi3a U7tEfnBtxxY0CdTpiH8r1XbifMsMQEuvmTDACoaKmSE2VcTjbvOV5yaX8/84Fg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761337102; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OjzFtGHwiTzhHWfYEaY/6LSF+js+fkU+gCDZoJq+aYQ=; b=L2oP/GNkaxXEN5JOHK7aPjFNeNuLuBYNudYI0dcrj6iVnMNz9LNE/WZopuVU+ydTdaTq6l xF3mQVmIuaXJWn/O73XpyEpcUCwwqwkdZu9LsfS3xuEWywebyEt2jD2kI3oKpn/qCapB0L 8rby9SyUKV7vM6Y9MMc/00I/xyV1ZoGKepgOM1NBFj7LjWv10/kZrRxHtp20Il6/1pIa5e anD7Ejfexlhf9CZpG3059LnTGzzghOd0zyGqvUQuk8NYzuN5+NH9sn92DS2XQu7wDy5dA6 LBm9wAlHbBvn/EjyU+aNsRFPB/trgvI1I1okiYZ4RJCDhHzcruAdxXIPLXXgCA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761337102; a=rsa-sha256; cv=none; b=i1UTqXB0ZlKOADIPlzZohTt/ynD8E59LXo56+g7AmB2d0aufdX7/Puh9qvFq3xiB4X2KF5 +HVPWX1RLOVINHkNbHOoXxHrVB/BFV/xUwm+Llvzhd5ud5OFfzdRqKw15fuj9NgTiwk8Cx fjAQaIdwszCDeBU97amorBRhqucadG5/6BK0ecZlsQ4z1yKJhJ0VlHFJ2FuQXd0YAc/BoQ MhTW+8fhuLMVGPdBnkDkCZJaU7R5yCu9yAoG/Q3A5jK78GR7JbTtYeuxPO75nloMaBLb8D 4LjofsBvMnYUtGTDvMUhvHXiYL7lY1cz+6jgbBnb/YoI/Ci2ixUxAQkkPuNAYw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ctZ3K65tsz1fd; Fri, 24 Oct 2025 20:18: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 59OKILlA067394; Fri, 24 Oct 2025 20:18:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59OKILgU067391; Fri, 24 Oct 2025 20:18:21 GMT (envelope-from git) Date: Fri, 24 Oct 2025 20:18:21 GMT Message-Id: <202510242018.59OKILgU067391@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 83ac79599f6b - main - examples/mdoc: Remove text of BSD-2-Clause from mdoc examples List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 83ac79599f6b94c57321ce3738fc28d1fa6a6c60 Auto-Submitted: auto-generated The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=83ac79599f6b94c57321ce3738fc28d1fa6a6c60 commit 83ac79599f6b94c57321ce3738fc28d1fa6a6c60 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2025-10-24 18:13:02 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2025-10-24 20:17:37 +0000 examples/mdoc: Remove text of BSD-2-Clause from mdoc examples We live in the SPDX world now and our example manual pages should reflect that. Also, fix the order of the SPDX and copyright lines as per style(9). Reviewed by: ziaee MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D53335 --- share/examples/mdoc/example.1 | 23 +---------------------- share/examples/mdoc/example.3 | 23 +---------------------- share/examples/mdoc/example.4 | 23 +---------------------- share/examples/mdoc/example.9 | 23 +---------------------- 4 files changed, 4 insertions(+), 88 deletions(-) diff --git a/share/examples/mdoc/example.1 b/share/examples/mdoc/example.1 index 0bdabe95aa95..daffb8bc0422 100644 --- a/share/examples/mdoc/example.1 +++ b/share/examples/mdoc/example.1 @@ -1,28 +1,7 @@ .\" -.\" SPDX-License-Identifier: BSD-2-Clause -.\" .\" Copyright (c) [year] [your name] .\" -.\" 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. +.\" SPDX-License-Identifier: BSD-2-Clause .\" .\" Note: The date here should be updated whenever a non-trivial .\" change is made to the manual page. diff --git a/share/examples/mdoc/example.3 b/share/examples/mdoc/example.3 index c4e85062cad1..22c398e0491c 100644 --- a/share/examples/mdoc/example.3 +++ b/share/examples/mdoc/example.3 @@ -1,28 +1,7 @@ .\" -.\" SPDX-License-Identifier: BSD-2-Clause -.\" .\" Copyright (c) [year] [your name] .\" -.\" 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. +.\" SPDX-License-Identifier: BSD-2-Clause .\" .\" Note: The date here should be updated whenever a non-trivial .\" change is made to the manual page. diff --git a/share/examples/mdoc/example.4 b/share/examples/mdoc/example.4 index 47ae5456b79a..e627f81af530 100644 --- a/share/examples/mdoc/example.4 +++ b/share/examples/mdoc/example.4 @@ -1,28 +1,7 @@ .\" -.\" SPDX-License-Identifier: BSD-2-Clause -.\" .\" Copyright (c) [year] [your name] .\" -.\" 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. +.\" SPDX-License-Identifier: BSD-2-Clause .\" .\" Note: The date here should be updated whenever a non-trivial .\" change is made to the manual page. diff --git a/share/examples/mdoc/example.9 b/share/examples/mdoc/example.9 index 1dd24a99fd42..f105f7465f2c 100644 --- a/share/examples/mdoc/example.9 +++ b/share/examples/mdoc/example.9 @@ -1,28 +1,7 @@ .\" -.\" SPDX-License-Identifier: BSD-2-Clause -.\" .\" Copyright (c) [year] [your name] .\" -.\" 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. +.\" SPDX-License-Identifier: BSD-2-Clause .\" .\" Note: The date here should be updated whenever a non-trivial .\" change is made to the manual page. From nobody Fri Oct 24 20:46:35 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ctZgv2gvhz6FLbr; Fri, 24 Oct 2025 20:46:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ctZgv1yxYz48tw; Fri, 24 Oct 2025 20:46:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761338795; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jf4GdDhzZdpQrw9b6vWs5UzmlEIGO/iv2lV5luHGUqM=; b=iZS/EJbbohxxW/Fclk8WwmOiqiG5CbcuWmQtZKLvDz+XOKdqU5114yolTsYHiojvnvqpaf hHe7AQrRarTJMrJQWR6g47jQFTqr3k4LlBzU1kdrgeMG6s5zpiVJ1zCPxCsWabsdVo64ir jGiZAdorco/0OEISqf6T7e6dHxu/lHMMZeX6A1wN0QYL751Cgqnv438Oi0C1EG39F7r2R/ 4xPI7QgCx5unjZLXU2VGKiksVLNDIrHzcgjAnskk7ImOWTE2YRe1d6Zt4pKbSqO2oawGad IMNbWzyotlOReaJGfymqHlzNCGN86UTPbeidxlZrmOohEojEDWG5NxyG7Mbjpw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761338795; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jf4GdDhzZdpQrw9b6vWs5UzmlEIGO/iv2lV5luHGUqM=; b=kQ5JDuU1xc32c6gNtk5UAKtxWpyR+zokIK+ciI5JcS/CF/4zHmBXL/xnlTAy0fA0s2/gW3 3AHq0Wip2z5aVcrsMO2mJbJ/sJuPf8OIrktJbBHHuVHtHK6ejNu3v+iL++c6H90ngGsqdm HsrcJZE8sBA46DKgbGyyUCPqBrotgIyLQpDtl0OxYBPDTv9Nb0v2fUEft8vjJklhXjA5Qv Zg2szpYPpiAUJWZgYr7i0D73kEnZhmRgkLuYnI8yZcaNNilJMZhD2m+zauvsrrhXBiXPAS ogF0/0EhR5mHPwg/cWCsdDpb0YZ3vcd7M+LNedDIPCipRhhnc9utsoknqJzjpg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761338795; a=rsa-sha256; cv=none; b=PSyZ2LjxU5gJLfjO9XGvHulbMm2Oe3p4Js2uAOFoixKC7/TXYrbnVe8wuiOd8cwLp4bs7T jyaQmGYY9hmysJfjZsvzhRmv1ykT4eXxTNrCcXqHqqYQgtT78DjBa7Fhm2pDfXieG2Cinf HJSVCuCAzTas9l07+h+wCQOlFGWJgHYrZprSyeFT8ozjYWxyZOPaW7+bHcOqilUeBilqjw FnHkdwyIBZePLl1/YeAu/x87SMPeqdjAO8Kqva6PT2nwrxF6gLO/P/BJb0vm5fID+QIF51 YSwe9Q9napOqBUilVNiuFdB2dCpAa+nRLZ+WHETq6Rc3Ace0v181qDZR//XEyQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ctZgv1QLvz1G2; Fri, 24 Oct 2025 20:46: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 59OKkZHg022605; Fri, 24 Oct 2025 20:46:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59OKkZfI022602; Fri, 24 Oct 2025 20:46:35 GMT (envelope-from git) Date: Fri, 24 Oct 2025 20:46:35 GMT Message-Id: <202510242046.59OKkZfI022602@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 1f95a517880b - main - ipfw: Update warning/error setsockopt references List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1f95a517880bae5fc0a9fe4463a8f2ec36ed734a Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=1f95a517880bae5fc0a9fe4463a8f2ec36ed734a commit 1f95a517880bae5fc0a9fe4463a8f2ec36ed734a Author: Ed Maste AuthorDate: 2025-10-24 20:05:30 +0000 Commit: Ed Maste CommitDate: 2025-10-24 20:46:12 +0000 ipfw: Update warning/error setsockopt references Dummynet v3 switched to IP_DUMMYNET3 but did not update these warnings/errors. Fixes: cc4d3c30ea28 ("Bring in the most recent version of ipfw and dummynet, developed") Sponsored by: The FreeBSD Foundation Differential Revision: sbin/ipfw/ipfw2.c --- sbin/ipfw/dummynet.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sbin/ipfw/dummynet.c b/sbin/ipfw/dummynet.c index 6714b2af3124..a0cefcffd183 100644 --- a/sbin/ipfw/dummynet.c +++ b/sbin/ipfw/dummynet.c @@ -680,7 +680,7 @@ ipfw_delete_pipe(int do_pipe, int i) i = do_cmd(IP_DUMMYNET3, &cmd, cmd.oid.len); if (i) { i = 1; - warn("rule %u: setsockopt(IP_DUMMYNET_DEL)", i); + warn("rule %u: setsockopt(IP_DUMMYNET3)", i); } return i; } @@ -1863,7 +1863,7 @@ end_mask: i = do_cmd(IP_DUMMYNET3, base, (char *)buf - (char *)base); if (i) - err(1, "setsockopt(%s)", "IP_DUMMYNET_CONFIGURE"); + err(1, "setsockopt(%s)", "IP_DUMMYNET3"); } void From nobody Fri Oct 24 21:40:36 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ctbtW0y0kz6CyDD for ; Fri, 24 Oct 2025 21:40:51 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-pj1-x1032.google.com (mail-pj1-x1032.google.com [IPv6:2607:f8b0:4864:20::1032]) (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 4ctbtV64xbz3Hfy for ; Fri, 24 Oct 2025 21:40:50 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-pj1-x1032.google.com with SMTP id 98e67ed59e1d1-33be037cf73so2807099a91.2 for ; Fri, 24 Oct 2025 14:40:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1761342048; x=1761946848; darn=freebsd.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=nGaz+B3fEJ0WJmJrsHErZdNkloh9cvhgZMyGNzOidqc=; b=t51uxUc/2IzJQC81YfAdaTjrym3YA4tjrGOLLoQTxCkZeY13zTRjzct68Ut1OlJ1IR qVtpFzc+nRMUHtdH0bR/+nt0C2d0B/hOspiGhvyQZWgCEsENfxPwhQ5nB9Ed+EkshU64 XFOkFZepzUNg0bFfUkzbezd0GwO3buW3htrj5nN+or/owxLvsc+AhCAm2ngXMJglT00v Wh33IDObb1NGSCj8kkKyC0wCC1jhjFHWAmrV/rwzMlprmRLO4nyN6ZZCwEV3HR0zLomB HmE9m4s5CcIb0ynJ5Wj9VkaTqZn8c9wIwLNalrHAjdy0aTMiK0E4/dnspWu2y37KeHct sBXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761342048; x=1761946848; 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=nGaz+B3fEJ0WJmJrsHErZdNkloh9cvhgZMyGNzOidqc=; b=UYhXaieXQXy9bDvX0RovduK1NLkKnwP4rH4iS6lZ8WJrnjE9ZGWAQiGVUQijBvuXPz nRCngO6ZhQUAy/UMYfzNqfFaBDW75F2iDhDHkrE9s+l8HHzwlHcHHnz5iZuBk7t//ntH RrFs4wYb0UxG34EQQB0MVKr3sRxco8yWJGXOLvhttMxCH8L0obm/AxN2E9Zdsa9qPUbz 6frO3wrfcviKsJZMfhenmzZO4wqLFBBKEk7C/ozsOImxcGkKv3AKGXyu1CPe/Xce8IWs 6ra08gzTa0Mcdv2FP39b74mZ4O3Qsjb1qnTOh9UjTqE9tH4/zD7je+dH/WAxPThiBFh7 9a8Q== X-Forwarded-Encrypted: i=1; AJvYcCWaVSLYJr0vG5WlQbCwUDVVy/tuvreHlCa+VMHzR5HzOI8sjNr0C47KxPJCZORcZQ6LeALFETTZ9v7SQGZfhMGPUkxC9Q==@freebsd.org X-Gm-Message-State: AOJu0YxtQN17tz0tIccHjFdmrJJUgdneedOQIrsvck+pfc+MM8nxM6cR bRkq5ibFnf1uMQI0STt5GivWIlQb+x7nmmjTW/zHzpt4dOX1EZiLYcGp/9NihW1hc088VnDTLY6 oyTZGxvAWUcORsNbO/HloqWaCMh8A4mMyWHvXy+yo8Q== X-Gm-Gg: ASbGncvJxDoEpbFRMQPJ/+kkeAW2oivCF1yYgAFUEs5CkPBll+CFhdFPQGsTFJ4v/m7 4XYNe53sB3tYd0jgS/F/zyT8Y0Fc4cifZT8eLqI6zHqi2NJB/VPFP2KSshybPzCFqjdvvvGk3wo 2q63pBN+SdS6uLQ0IlgIoJ6ChnXIoCiX98R+f2HmpeRDLndKgIqCI6H9uWbQI9ZqG25FAqd5Q6j IK1/jVOEIoWBCRzSqJC1rd1GTYkgoHaFZ5Ug63AbQ8R1EsYUGPrpjfV7vGLhYW+mEmfm1tg X-Google-Smtp-Source: AGHT+IHIoJEIA/AV8jgJ0xXaETvYzsbDeGm66D+vhdbB5VjMdWPuhEq/6Z891+qBe09CWD1YDO0i8bAeelhfMhzbamU= X-Received: by 2002:a17:90a:ec8b:b0:335:2934:e217 with SMTP id 98e67ed59e1d1-33bcf86c0a9mr38279214a91.10.1761342048363; Fri, 24 Oct 2025 14:40:48 -0700 (PDT) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 References: <202510240741.59O7fBAe041995@gitrepo.freebsd.org> <202510241012.59OACUDA002781@critter.freebsd.dk> <202510241116.59OBG1ii003074@critter.freebsd.dk> In-Reply-To: From: Warner Losh Date: Fri, 24 Oct 2025 17:40:36 -0400 X-Gm-Features: AS18NWAFrpyICRMTQ9NTbJkx9vS7qH2wMEjYLUc7c2BpglRrGrLHeOoTOxxm3yc Message-ID: Subject: Re: git: 2612f1b8649b - main - deadfs: Return ENXIO instead of EIO when the device is gone. To: Konstantin Belousov Cc: Poul-Henning Kamp , src-committers , "" , "" Content-Type: multipart/alternative; boundary="0000000000001ef73a0641ee6764" X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4ctbtV64xbz3Hfy --0000000000001ef73a0641ee6764 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Fri, Oct 24, 2025 at 12:03=E2=80=AFPM Konstantin Belousov wrote: > On Fri, Oct 24, 2025 at 09:12:18AM -0400, Warner Losh wrote: > > On Fri, Oct 24, 2025, 7:49=E2=80=AFAM Konstantin Belousov > > wrote: > > > > > On Fri, Oct 24, 2025 at 11:16:01AM +0000, Poul-Henning Kamp wrote: > > > > -------- > > > > Konstantin Belousov writes: > > > > > > > > > On Fri, Oct 24, 2025 at 10:12:30AM +0000, Poul-Henning Kamp wrote= : > > > > > > > > > I do not think that DRM really affects the code path for io. > > > > > > > > 100% agreement. > > > > > > > > But it can change the order of thread/interrupt/event-handling > > > > scheduling. > > > > > > > > When I tested the ENXIO patch, I started booting an unmodified > > > > kernel in single-user and immediately got ENXIO when I pulled > > > > the USB stick - quite to my surprise. > > > > > > > > Then I kldloaded i915kms, still in single-user, and now I got > > > > the observed bad EIO behaviour. > > > > > > > > With a fixed kernel and i915kms loaded, I saw four or five reads > > > > return EIO before one got ENXIO and terminated recoverdisk. > > > > > > > > Getting a handful of EIO's before the ENXIO finally appears > > > > strongly suggests that some of the eventhandling related to > > > > the disappearing USB stick is being held up by something. > > > > > > > > As soon as I can, I'll try to gather more data. > > > > > > It might make sense to annotate CAM EIOs with EXTERROR(). > > > But then, we probably need to add something to copy that > > > extended data between threads and possibly extend struct buf/bio > > > witg the place for exterror data besides b_error. > > > > > > > Given the contexts cam runs in, managing the storage for that can be > hard. > > Which storage? > > EXTERROR() does not allocate any memory. It was designed to be safe for > using in any context, including real interrupt (not just non-sleepable > threads). > So I don't know curthread of the transaction that scheduled the I/O. That's how I was, impricely, using the word 'context'. So how does EXTERROR make it's way back to curthread for system call return from something like gup or some direct dispatch that wakes up the sleeper for the I/O? Warner --0000000000001ef73a0641ee6764 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


On Fri, Oct 24,= 2025 at 12:03=E2=80=AFPM Konstantin Belousov <kostikbel@gmail.com> wrote:
On Fri, Oct 24, 2025 at 09:12:18AM -0400, = Warner Losh wrote:
> On Fri, Oct 24, 2025, 7:49=E2=80=AFAM Konstantin Belousov <kostikbel@gmail.com&g= t;
> wrote:
>
> > On Fri, Oct 24, 2025 at 11:16:01AM +0000, Poul-Henning Kamp wrote= :
> > > --------
> > > Konstantin Belousov writes:
> > >
> > > > On Fri, Oct 24, 2025 at 10:12:30AM +0000, Poul-Henning = Kamp wrote:
> > >
> > > > I do not think that DRM really affects the code path fo= r io.
> > >
> > > 100% agreement.
> > >
> > > But it can change the order of thread/interrupt/event-handli= ng
> > > scheduling.
> > >
> > > When I tested the ENXIO patch, I started booting an unmodifi= ed
> > > kernel in single-user and immediately got ENXIO when I pulle= d
> > > the USB stick - quite to my surprise.
> > >
> > > Then I kldloaded i915kms, still in single-user, and now I go= t
> > > the observed bad EIO behaviour.
> > >
> > > With a fixed kernel and i915kms loaded, I saw four or five r= eads
> > > return EIO before one got ENXIO and terminated recoverdisk.<= br> > > >
> > > Getting a handful of EIO's before the ENXIO finally appe= ars
> > > strongly suggests that some of the eventhandling related to<= br> > > > the disappearing USB stick is being held up by something. > > >
> > > As soon as I can, I'll try to gather more data.
> >
> > It might make sense to annotate CAM EIOs with EXTERROR().
> > But then, we probably need to add something to copy that
> > extended data between threads and possibly extend struct buf/bio<= br> > > witg the place for exterror data besides b_error.
> >
>
> Given the contexts cam runs in, managing the storage for that can be h= ard.

Which storage?

EXTERROR() does not allocate any memory.=C2=A0 It was designed to be safe f= or
using in any context, including real interrupt (not just non-sleepable
threads).

So I don't know curthread= of the transaction that scheduled the I/O. That's how I was, impricely= , using the word 'context'. So how does EXTERROR make it's way = back to curthread for system call return from something like gup or some di= rect dispatch that wakes up the sleeper for the I/O?

Warner=C2=A0
--0000000000001ef73a0641ee6764-- From nobody Sat Oct 25 08:11:36 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ctstQ0zxxz6Dm2F; Sat, 25 Oct 2025 08: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ctstQ0hz5z3HS5; Sat, 25 Oct 2025 08: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=1761379902; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8YQlUP6yUMxJTVunqEleXfSNFhhkd9wm9W3d0uAazQU=; b=Pd0lcG0zEKUnQuoVb7nJ4wWwWoxoonPazgwOj7mw6ZzAD/gwTuhFKsZkZOl75wvzYjY097 C2VhP1ba3EFcxXBmQ8M9KXERS6kFwbNueNR+eZqqB9MBxcKKkOeaXU/X/oyvtH+tsG4ji5 anX7dVSmOmkFG9/gBjlEuyKVlJuujLCsXX5Yvm3nYmGzHdRPmHNyI9UWCPE2N8sIKzPL7J UxwsKMbwwcM66psr8dqkVwDWpZXu5ZJgHAUO2aqZbT7jwOF4rIeBgCc6p8NvQnTEPm6rj2 oMC3jn/e3DDwXnVIcn+2vinvGuj1yo1aMN5DaJqf7NythHEdPFKGdqX4ClQI8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761379902; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8YQlUP6yUMxJTVunqEleXfSNFhhkd9wm9W3d0uAazQU=; b=nLSs5VJmwt4+V9gv79fweUM7byRmG6kRHlSDbyaU7b2UxXa+pXomrUvwF+WXXyHbTe57ca UhcogML08URjWkNUsdIEu9ADzlXpscX1KYJfqG82ldqFlMXItELuF89yTwnulGh4T02BhN +Zud2jDCj/QazQxLN95HXV3jHUKmNW6WxyRweb9EC4xsUoi2zojJY+783rH7ght1+YzNa9 nIM5weG2NNz39m8dw0GYnlsPW7dI2cr5q9Z/cLVvsSlPPVtBgRxpPfWb+u2auB0ELx52io pPK4+8CdMS7JargigjGcMYoOZj0XJ3bdV+cb/byiQxNY3i4LaTh5C+NZTiOJig== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761379902; a=rsa-sha256; cv=none; b=ucGYgw3Px5p9F+xHqLopUv67PB9hR+/A5QcLW2QqeiocKiZFyC03ZfKa/XVx+TvoqiNezy S3FrJtUtEqLPmJvy0BLbbAg3YnG04UKb4R7idmjoVVP67RCh4qKX3R7Z4GLJdJmKNcPO9o ODwh8o/HD62PGaEOvcarL69aIm4jbfY0NTm3IYelpUA5PciYR95gleZHyx70CtZhzPDy7R 9nYLzN3bxkqKgzDZIetTg9g8LVNJB1pCnFCnA3sZr+6E+62u4o/cCB/GW7Lnwr+ttZMU74 z0V+mGEz8uT7PjAmWd1fuwlKD1PL/3mIgi7O98hP6aeR/EGH9APIB1ijxuE8zg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ctstQ0GFXzfyg; Sat, 25 Oct 2025 08: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 59P8Bgea017848; Sat, 25 Oct 2025 08: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 59P8Ba0Q017819; Sat, 25 Oct 2025 08:11:36 GMT (envelope-from git) Date: Sat, 25 Oct 2025 08:11:36 GMT Message-Id: <202510250811.59P8Ba0Q017819@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Martin Matuska Subject: git: e6e941e659ab - main - zfs: merge openzfs/zfs@0455150f1 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e6e941e659ab7b3db6786103c1cdc30735a82e32 Auto-Submitted: auto-generated The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=e6e941e659ab7b3db6786103c1cdc30735a82e32 commit e6e941e659ab7b3db6786103c1cdc30735a82e32 Merge: 1f95a517880b 0455150f1160 Author: Martin Matuska AuthorDate: 2025-10-25 07:52:46 +0000 Commit: Martin Matuska CommitDate: 2025-10-25 08:01:38 +0000 zfs: merge openzfs/zfs@0455150f1 Notable upstream pull request merges: #17836 adacf020c Fix return value for setting zvol threading #17839 44704616b zpool: fix conflict with -v and -o options #17851 3a55e76b8 FreeBSD: zfs_getpages: Don't zero freshly allocated pages #17863 0455150f1 FreeBSD zio_crypt.c: initialize uio variables before access Obtained from: OpenZFS OpenZFS commit: 0455150f1160dd7089ab31fefcfc58bfa548ab81 sys/contrib/openzfs/.mailmap | 8 ++ sys/contrib/openzfs/AUTHORS | 14 +++ sys/contrib/openzfs/cmd/zdb/zdb.c | 6 +- sys/contrib/openzfs/cmd/zpool/zpool_main.c | 133 ++++++++++++++------- .../config/kernel-block-device-operations.m4 | 34 ++++++ sys/contrib/openzfs/config/kernel-drop-inode.m4 | 24 ++++ sys/contrib/openzfs/config/kernel-namespace.m4 | 31 +++++ .../openzfs/config/kernel-userns-capabilities.m4 | 79 ------------ sys/contrib/openzfs/config/kernel-writeback.m4 | 58 +++++++++ sys/contrib/openzfs/config/kernel-writepage_t.m4 | 26 ---- sys/contrib/openzfs/config/kernel.m4 | 8 +- .../include/os/linux/kernel/linux/vfs_compat.h | 7 ++ sys/contrib/openzfs/man/man8/zpool-remove.8 | 4 +- .../openzfs/module/icp/algs/sha2/sha2_generic.c | 41 ++++--- .../openzfs/module/os/freebsd/zfs/zio_crypt.c | 2 + sys/contrib/openzfs/module/os/linux/spl/spl-zone.c | 19 ++- sys/contrib/openzfs/module/os/linux/zfs/abd_os.c | 9 ++ sys/contrib/openzfs/module/os/linux/zfs/zfs_acl.c | 2 +- .../openzfs/module/os/linux/zfs/zfs_vnops_os.c | 5 +- sys/contrib/openzfs/module/os/linux/zfs/zpl_file.c | 74 ++++++++++++ .../openzfs/module/os/linux/zfs/zpl_super.c | 4 +- sys/contrib/openzfs/module/os/linux/zfs/zvol_os.c | 32 +++-- sys/contrib/openzfs/module/zfs/vdev_removal.c | 80 +++++++++---- sys/contrib/openzfs/module/zfs/zvol.c | 2 +- sys/contrib/openzfs/scripts/zfs-tests.sh | 4 + .../tests/test-runner/bin/test-runner.py.in | 33 ++--- sys/modules/zfs/zfs_config.h | 17 ++- sys/modules/zfs/zfs_gitrev.h | 2 +- 28 files changed, 531 insertions(+), 227 deletions(-) diff --cc sys/contrib/openzfs/.mailmap index e6f09c6c9d43,000000000000..3397fbc3745d mode 100644,000000..100644 --- a/sys/contrib/openzfs/.mailmap +++ b/sys/contrib/openzfs/.mailmap @@@ -1,229 -1,0 +1,237 @@@ +# This file maps the name+email seen in a commit back to a canonical +# name+email. Git will replace the commit name/email with the canonical version +# wherever it sees it. +# +# If there is a commit in the history with a "wrong" name or email, list it +# here. If you regularly commit with an alternate name or email address and +# would like to ensure that you are always listed consistently in the repo, add +# mapping here. +# +# On the other hand, if you use multiple names or email addresses legitimately +# (eg you use a company email address for your paid OpenZFS work, and a +# personal address for your evening side projects), then don't map one to the +# other here. +# +# The most common formats are: +# +# Canonical Name +# Canonical Name +# Canonical Name Commit Name +# +# See https://git-scm.com/docs/gitmailmap for more info. + +# These maps are making names consistent where they have varied but the email +# address has never changed. In most cases, the full name is in the +# Signed-off-by of a commit with a matching author. +Achill Gilgenast +Ahelenia Ziemiańska +Ahelenia Ziemiańska +Alex John +Andreas Dilger +Andrew Walker +Benedikt Neuffer +Chengfei Zhu +ChenHao Lu <18302010006@fudan.edu.cn> +Chris Lindee +Colm Buckley +Crag Wang +Damian Szuberski +Daniel Kolesa +Debabrata Banerjee +Diwakar Kristappagari +Finix Yan +Gaurav Kumar +Gionatan Danti +Glenn Washburn +Gordan Bobic +Gregory Bartholomew +hedong zhang +Ilkka Sovanto +InsanePrawn +Jason Cohen +Jason Harmening +Jeremy Faulkner +Jinshan Xiong +John Poduska ++Jo Zzsi +Justin Scholz +Ka Ho Ng +Kash Pande +Kay Pedersen +KernelOfTruth +Liu Hua +Liu Qing +loli10K +Mart Frauenlob +Matthias Blankertz +Michael Gmelin +Olivier Mazouffre +Piotr Kubaj +Quentin Zdanis ++Roberto Ricci +Roberto Ricci +Rob Norris +Rob Norris +Sam Lunt +Sanjeev Bagewadi +Sebastian Wuerl +SHENGYI HONG +Stoiko Ivanov +Tamas TEVESZ +WHR +Yanping Gao +Youzhong Yang + +# Signed-off-by: overriding Author: +Alexander Ziaee +Felix Schmidt ++Jean-Sébastien Pédron ++Konstantin Belousov +Olivier Certner ++Patrick Xia +Phil Sutter +poscat +Qiuhao Chen +Ryan +Sietse +Yuxin Wang +Zhenlei Huang + +# Commits from strange places, long ago +Brian Behlendorf +Brian Behlendorf +Brian Behlendorf +Brian Behlendorf +Brian Behlendorf +Herb Wartens +Ned Bass +Tulsi Jain + +# Mappings from Github no-reply addresses +ajs124 +Alek Pinchuk +Aleksandr Liber <61714074+AleksandrLiber@users.noreply.github.com> +Alexander Lobakin +Alexey Smirnoff +Allen Holl <65494904+allen-4@users.noreply.github.com> +Alphan Yılmaz +Ameer Hamza <106930537+ixhamza@users.noreply.github.com> +Andrew J. Hesford <48421688+ahesford@users.noreply.github.com>> +Andrew Sun +Aron Xu +Arun KV <65647132+arun-kv@users.noreply.github.com> +Ben Wolsieffer +bernie1995 <42413912+bernie1995@users.noreply.github.com> +Bojan Novković <72801811+bnovkov@users.noreply.github.com> +Boris Protopopov +Brad Forschinger +Brandon Thetford +buzzingwires <131118055+buzzingwires@users.noreply.github.com> +Cedric Maunoury <38213715+cedricmaunoury@users.noreply.github.com> +Charles Suh +Chris Peredun <126915832+chrisperedun@users.noreply.github.com> ++classabbyamp <5366828+classabbyamp@users.noreply.github.com> +Dacian Reece-Stremtan <35844628+dacianstremtan@users.noreply.github.com> +Damian Szuberski <30863496+szubersk@users.noreply.github.com> +Daniel Hiepler <32984777+heeplr@users.noreply.github.com> +Daniel Kobras +Daniel Reichelt +David Quigley +Dennis R. Friedrichsen <31087738+dennisfriedrichsen@users.noreply.github.com> +Dex Wood +DHE +Dmitri John Ledkov <19779+xnox@users.noreply.github.com> +Dries Michiels <32487486+driesmp@users.noreply.github.com> +Edmund Nadolski <137826107+ednadolski-ix@users.noreply.github.com> +Érico Nogueira <34201958+ericonr@users.noreply.github.com> +Fedor Uporov <60701163+fuporovvStack@users.noreply.github.com> +Felix Dörre +Felix Neumärker <34678034+xdch47@users.noreply.github.com> +Finix Yan +Friedrich Weber <56110206+frwbr@users.noreply.github.com> +Gaurav Kumar +George Gaydarov +Georgy Yakovlev <168902+gyakovlev@users.noreply.github.com> +Gerardwx +Germano Massullo +Gian-Carlo DeFazio +Giuseppe Di Natale +Hajo Möller +Harry Mallon <1816667+hjmallon@users.noreply.github.com> +Hiếu Lê +Jake Howard +James Cowgill +Jaron Kent-Dobias +Jason King +Jeff Dike <52420226+jdike@users.noreply.github.com> +Jitendra Patidar <53164267+jsai20@users.noreply.github.com> +João Carlos Mendes Luís +John Eismeier <32205350+jeis2497052@users.noreply.github.com> +John L. Hammond <35266395+jhammond-intel@users.noreply.github.com> +John-Mark Gurney +John Ramsden +Jonathon Fernyhough <559369+jonathonf@users.noreply.github.com> +Jose Luis Duran +Justin Hibbits +Kaitlin Hoang +Kevin Greene <104801862+kxgreene@users.noreply.github.com> +Kevin Jin <33590050+jxdking@users.noreply.github.com> +Kevin P. Fleming +Krzysztof Piecuch <3964215+pikrzysztof@users.noreply.github.com> +Kyle Evans +Laurențiu Nicola +loli10K +Lorenz Hüdepohl +Luís Henriques <73643340+lumigch@users.noreply.github.com> +Marcin Skarbek +Matt Fiddaman <81489167+matt-fidd@users.noreply.github.com> +Maxim Filimonov +Max Zettlmeißl <6818198+maxz@users.noreply.github.com> +Michael Niewöhner +Michael Zhivich <33133421+mzhivich@users.noreply.github.com> +MigeljanImeri <78048439+MigeljanImeri@users.noreply.github.com> +Mo Zhou <5723047+cdluminate@users.noreply.github.com> ++nav1s <42621369+nav1s@users.noreply.github.com> +Nick Mattis +omni <79493359+omnivagant@users.noreply.github.com> +Pablo Correa Gómez <32678034+pablofsf@users.noreply.github.com> +Paul Zuchowski <31706010+PaulZ-98@users.noreply.github.com> +Peter Ashford +Peter Dave Hello +Peter Wirdemo <4224155+pewo@users.noreply.github.com> +Petros Koutoupis +Ping Huang <101400146+hpingfs@users.noreply.github.com> +Piotr P. Stefaniak +Richard Allen <33836503+belperite@users.noreply.github.com> +Rich Ercolani <214141+rincebrain@users.noreply.github.com> +Rick Macklem <64620010+rmacklem@users.noreply.github.com> +Rob Wing <98866084+rob-wing@users.noreply.github.com> +Roman Strashkin +Ryan Hirasaki <4690732+RyanHir@users.noreply.github.com> +Samuel Wycliffe J <115969550+samwyc@users.noreply.github.com> +Samuel Wycliffe <50765275+npc203@users.noreply.github.com> +Savyasachee Jha +Scott Colby +Sean Eric Fagan ++Shreshth Srivastava <66148173+Shreshth3@users.noreply.github.com> +Spencer Kinny <30333052+Spencer-Kinny@users.noreply.github.com> +Srikanth N S <75025422+nssrikanth@users.noreply.github.com> +Stefan Lendl <1321542+stfl@users.noreply.github.com> +Thomas Bertschinger <101425190+bertschinger@users.noreply.github.com> +Thomas Geppert +Tim Crawford +Todd Seidelmann <18294602+seidelma@users.noreply.github.com> +Tom Matthews +Tony Perkins <62951051+tony-zfs@users.noreply.github.com> +Torsten Wörtwein +Tulsi Jain +Václav Skála <33496485+vaclavskala@users.noreply.github.com> +Vaibhav Bhanawat <88050553+vaibhav-delphix@users.noreply.github.com> +Vandana Rungta <46906819+vandanarungta@users.noreply.github.com> +Violet Purcell <66446404+vimproved@users.noreply.github.com> +Vipin Kumar Verma <75025470+vermavipinkumar@users.noreply.github.com> +Wolfgang Bumiller +XDTG <35128600+XDTG@users.noreply.github.com> +xtouqh <72357159+xtouqh@users.noreply.github.com> +Yuri Pankov <113725409+yuripv@users.noreply.github.com> +Yuri Pankov <82001006+yuripv@users.noreply.github.com> diff --cc sys/contrib/openzfs/config/kernel-drop-inode.m4 index 000000000000,6f2b12cadc02..6f2b12cadc02 mode 000000,100644..100644 --- a/sys/contrib/openzfs/config/kernel-drop-inode.m4 +++ b/sys/contrib/openzfs/config/kernel-drop-inode.m4 diff --cc sys/contrib/openzfs/config/kernel-namespace.m4 index 000000000000,9b0b12e4eab4..9b0b12e4eab4 mode 000000,100644..100644 --- a/sys/contrib/openzfs/config/kernel-namespace.m4 +++ b/sys/contrib/openzfs/config/kernel-namespace.m4 diff --cc sys/contrib/openzfs/config/kernel-writeback.m4 index 000000000000,334d65ef84b6..334d65ef84b6 mode 000000,100644..100644 --- a/sys/contrib/openzfs/config/kernel-writeback.m4 +++ b/sys/contrib/openzfs/config/kernel-writeback.m4 diff --cc sys/modules/zfs/zfs_config.h index 3a17ed289235,000000000000..39b9229653af mode 100644,000000..100644 --- a/sys/modules/zfs/zfs_config.h +++ b/sys/modules/zfs/zfs_config.h @@@ -1,882 -1,0 +1,895 @@@ +/* + */ + +/* zfs_config.h. Generated from zfs_config.h.in by configure. */ +/* zfs_config.h.in. Generated from configure.ac by autoheader. */ + +/* Define to 1 if translation of program messages to the user's native + language is requested. */ +/* #undef ENABLE_NLS */ + +/* __assign_str() has one arg */ +/* #undef HAVE_1ARG_ASSIGN_STR */ + +/* lookup_bdev() wants 1 arg */ +/* #undef HAVE_1ARG_LOOKUP_BDEV */ + +/* kernel has access_ok with 'type' parameter */ +/* #undef HAVE_ACCESS_OK_TYPE */ + +/* add_disk() returns int */ +/* #undef HAVE_ADD_DISK_RET */ + +/* Define if host toolchain supports AES */ +#define HAVE_AES 1 + +/* Define if you have [rt] */ +#define HAVE_AIO_H 1 + +#ifdef __amd64__ +#ifndef RESCUE +/* Define if host toolchain supports AVX */ +#define HAVE_AVX 1 +#endif + +/* Define if host toolchain supports AVX2 */ +#define HAVE_AVX2 1 + +/* Define if host toolchain supports AVX512BW */ +#define HAVE_AVX512BW 1 + +/* Define if host toolchain supports AVX512CD */ +#define HAVE_AVX512CD 1 + +/* Define if host toolchain supports AVX512DQ */ +#define HAVE_AVX512DQ 1 + +/* Define if host toolchain supports AVX512ER */ +#define HAVE_AVX512ER 1 + +/* Define if host toolchain supports AVX512F */ +#define HAVE_AVX512F 1 + +/* Define if host toolchain supports AVX512IFMA */ +#define HAVE_AVX512IFMA 1 + +/* Define if host toolchain supports AVX512PF */ +#define HAVE_AVX512PF 1 + +/* Define if host toolchain supports AVX512VBMI */ +#define HAVE_AVX512VBMI 1 + +/* Define if host toolchain supports AVX512VL */ +#define HAVE_AVX512VL 1 +#endif + +/* backtrace() is available */ +/* #undef HAVE_BACKTRACE */ + +/* bdevname() is available */ +/* #undef HAVE_BDEVNAME */ + +/* bdev_check_media_change() exists */ +/* #undef HAVE_BDEV_CHECK_MEDIA_CHANGE */ + +/* bdev_file_open_by_path() exists */ +/* #undef HAVE_BDEV_FILE_OPEN_BY_PATH */ + +/* bdev_*_io_acct() available */ +/* #undef HAVE_BDEV_IO_ACCT_63 */ + +/* bdev_*_io_acct() available */ +/* #undef HAVE_BDEV_IO_ACCT_OLD */ + +/* bdev_kobj() exists */ +/* #undef HAVE_BDEV_KOBJ */ + +/* bdev_max_discard_sectors() is available */ +/* #undef HAVE_BDEV_MAX_DISCARD_SECTORS */ + +/* bdev_max_secure_erase_sectors() is available */ +/* #undef HAVE_BDEV_MAX_SECURE_ERASE_SECTORS */ + +/* bdev_nr_bytes() is available */ +/* #undef HAVE_BDEV_NR_BYTES */ + +/* bdev_open_by_path() exists */ +/* #undef HAVE_BDEV_OPEN_BY_PATH */ + +/* bdev_release() exists */ +/* #undef HAVE_BDEV_RELEASE */ + +/* block_device_operations->submit_bio() returns void */ +/* #undef HAVE_BDEV_SUBMIT_BIO_RETURNS_VOID */ + +/* bdev_whole() is available */ +/* #undef HAVE_BDEV_WHOLE */ + +/* bio_alloc() takes 4 arguments */ +/* #undef HAVE_BIO_ALLOC_4ARG */ + +/* bio->bi_bdev->bd_disk exists */ +/* #undef HAVE_BIO_BDEV_DISK */ + +/* bio_*_io_acct() available */ +/* #undef HAVE_BIO_IO_ACCT */ + +/* bio_max_segs() is implemented */ +/* #undef HAVE_BIO_MAX_SEGS */ + +/* bio_set_dev() GPL-only */ +/* #undef HAVE_BIO_SET_DEV_GPL_ONLY */ + +/* bio_set_dev() is a macro */ +/* #undef HAVE_BIO_SET_DEV_MACRO */ + +/* bio_set_op_attrs is available */ +/* #undef HAVE_BIO_SET_OP_ATTRS */ + +/* blkdev_get_by_path() exists and takes 4 args */ +/* #undef HAVE_BLKDEV_GET_BY_PATH_4ARG */ + +/* blkdev_get_by_path() handles ERESTARTSYS */ +/* #undef HAVE_BLKDEV_GET_ERESTARTSYS */ + +/* __blkdev_issue_discard(flags) is available */ +/* #undef HAVE_BLKDEV_ISSUE_DISCARD_ASYNC_FLAGS */ + +/* __blkdev_issue_discard() is available */ +/* #undef HAVE_BLKDEV_ISSUE_DISCARD_ASYNC_NOFLAGS */ + +/* blkdev_issue_discard(flags) is available */ +/* #undef HAVE_BLKDEV_ISSUE_DISCARD_FLAGS */ + +/* blkdev_issue_discard() is available */ +/* #undef HAVE_BLKDEV_ISSUE_DISCARD_NOFLAGS */ + +/* blkdev_issue_secure_erase() is available */ +/* #undef HAVE_BLKDEV_ISSUE_SECURE_ERASE */ + +/* blkdev_put() exists */ +/* #undef HAVE_BLKDEV_PUT */ + +/* blkdev_put() accepts void* as arg 2 */ +/* #undef HAVE_BLKDEV_PUT_HOLDER */ + +/* struct queue_limits has a features field */ +/* #undef HAVE_BLKDEV_QUEUE_LIMITS_FEATURES */ + +/* blkdev_reread_part() exists */ +/* #undef HAVE_BLKDEV_REREAD_PART */ + +/* blkg_tryget() is available */ +/* #undef HAVE_BLKG_TRYGET */ + +/* blkg_tryget() GPL-only */ +/* #undef HAVE_BLKG_TRYGET_GPL_ONLY */ + +/* blk_alloc_disk() exists */ +/* #undef HAVE_BLK_ALLOC_DISK */ + +/* blk_alloc_disk() exists and takes 2 args */ +/* #undef HAVE_BLK_ALLOC_DISK_2ARG */ + +/* blk_alloc_queue() expects request function */ +/* #undef HAVE_BLK_ALLOC_QUEUE_REQUEST_FN */ + +/* blk_alloc_queue_rh() expects request function */ +/* #undef HAVE_BLK_ALLOC_QUEUE_REQUEST_FN_RH */ + +/* blk_cleanup_disk() exists */ +/* #undef HAVE_BLK_CLEANUP_DISK */ + +/* blk_mode_t is defined */ +/* #undef HAVE_BLK_MODE_T */ + +/* block multiqueue hardware context is cached in struct request */ +/* #undef HAVE_BLK_MQ_RQ_HCTX */ + +/* blk queue backing_dev_info is dynamic */ +/* #undef HAVE_BLK_QUEUE_BDI_DYNAMIC */ + +/* blk_queue_discard() is available */ +/* #undef HAVE_BLK_QUEUE_DISCARD */ + +/* backing_dev_info is available through queue gendisk */ +/* #undef HAVE_BLK_QUEUE_DISK_BDI */ + +/* blk_queue_secure_erase() is available */ +/* #undef HAVE_BLK_QUEUE_SECURE_ERASE */ + +/* blk_queue_update_readahead() exists */ +/* #undef HAVE_BLK_QUEUE_UPDATE_READAHEAD */ + +/* BLK_STS_RESV_CONFLICT is defined */ +/* #undef HAVE_BLK_STS_RESV_CONFLICT */ + ++/* Define if getgeo() in block_device_operations takes struct gendisk * as its ++ first arg */ ++/* #undef HAVE_BLOCK_DEVICE_OPERATIONS_GETGEO_GENDISK */ ++ +/* Define if release() in block_device_operations takes 1 arg */ +/* #undef HAVE_BLOCK_DEVICE_OPERATIONS_RELEASE_1ARG */ + +/* Define if revalidate_disk() in block_device_operations */ +/* #undef HAVE_BLOCK_DEVICE_OPERATIONS_REVALIDATE_DISK */ + +/* Define to 1 if you have the Mac OS X function + CFLocaleCopyPreferredLanguages in the CoreFoundation framework. */ +/* #undef HAVE_CFLOCALECOPYPREFERREDLANGUAGES */ + +/* Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in + the CoreFoundation framework. */ +/* #undef HAVE_CFPREFERENCESCOPYAPPVALUE */ + +/* check_disk_change() exists */ +/* #undef HAVE_CHECK_DISK_CHANGE */ + +/* copy_splice_read exists */ +/* #undef HAVE_COPY_SPLICE_READ */ + +/* cpu_has_feature() is GPL-only */ +/* #undef HAVE_CPU_HAS_FEATURE_GPL_ONLY */ + +/* Define if the GNU dcgettext() function is already present or preinstalled. + */ +/* #undef HAVE_DCGETTEXT */ + +/* DECLARE_EVENT_CLASS() is available */ +/* #undef HAVE_DECLARE_EVENT_CLASS */ + +/* 3-arg dequeue_signal() takes a type argument */ +/* #undef HAVE_DEQUEUE_SIGNAL_3ARG_TYPE */ + +/* dequeue_signal() takes 4 arguments */ +/* #undef HAVE_DEQUEUE_SIGNAL_4ARG */ + +/* lookup_bdev() wants dev_t arg */ +/* #undef HAVE_DEVT_LOOKUP_BDEV */ + +/* disk_check_media_change() exists */ +/* #undef HAVE_DISK_CHECK_MEDIA_CHANGE */ + +/* disk_*_io_acct() available */ +/* #undef HAVE_DISK_IO_ACCT */ + +/* disk_update_readahead() exists */ +/* #undef HAVE_DISK_UPDATE_READAHEAD */ + +/* Define to 1 if you have the header file. */ +#define HAVE_DLFCN_H 1 + +/* dops->d_revalidate() takes 4 args */ +/* #undef HAVE_D_REVALIDATE_4ARGS */ + +/* Define if d_set_d_op() is available */ +/* #undef HAVE_D_SET_D_OP */ + +/* Define to 1 if you have the 'execvpe' function. */ +#define HAVE_EXECVPE 1 + +/* fault_in_iov_iter_readable() is available */ +/* #undef HAVE_FAULT_IN_IOV_ITER_READABLE */ + +/* file->f_version exists */ +/* #undef HAVE_FILE_F_VERSION */ + +/* flush_dcache_page() is GPL-only */ +/* #undef HAVE_FLUSH_DCACHE_PAGE_GPL_ONLY */ + +/* Define if compiler supports -Wformat-overflow */ +/* #undef HAVE_FORMAT_OVERFLOW */ + +/* fsync_bdev() is declared in include/blkdev.h */ +/* #undef HAVE_FSYNC_BDEV */ + +/* yes */ +/* #undef HAVE_GENERIC_FADVISE */ + +/* generic_fillattr requires struct mnt_idmap* */ +/* #undef HAVE_GENERIC_FILLATTR_IDMAP */ + +/* generic_fillattr requires struct mnt_idmap* and u32 request_mask */ +/* #undef HAVE_GENERIC_FILLATTR_IDMAP_REQMASK */ + +/* generic_fillattr requires struct user_namespace* */ +/* #undef HAVE_GENERIC_FILLATTR_USERNS */ + +/* generic_*_io_acct() 4 arg available */ +/* #undef HAVE_GENERIC_IO_ACCT_4ARG */ + +/* GENHD_FL_EXT_DEVT flag is available */ +/* #undef HAVE_GENHD_FL_EXT_DEVT */ + +/* GENHD_FL_NO_PART flag is available */ +/* #undef HAVE_GENHD_FL_NO_PART */ + +/* Define if the GNU gettext() function is already present or preinstalled. */ +/* #undef HAVE_GETTEXT */ + +/* Define to 1 if you have the 'gettid' function. */ +/* #undef HAVE_GETTID */ + +/* iops->get_acl() exists */ +/* #undef HAVE_GET_ACL */ + +/* iops->get_acl() takes rcu */ +/* #undef HAVE_GET_ACL_RCU */ + +/* has iops->get_inode_acl() */ +/* #undef HAVE_GET_INODE_ACL */ + +/* iattr->ia_vfsuid and iattr->ia_vfsgid exist */ +/* #undef HAVE_IATTR_VFSID */ + +/* Define if you have the iconv() function and it works. */ +#define HAVE_ICONV 1 + +/* iops->getattr() takes struct mnt_idmap* */ +/* #undef HAVE_IDMAP_IOPS_GETATTR */ + +/* iops->setattr() takes struct mnt_idmap* */ +/* #undef HAVE_IDMAP_IOPS_SETATTR */ + +/* APIs for idmapped mount are present */ +/* #undef HAVE_IDMAP_MNT_API */ + +/* mnt_idmap does not have user_namespace */ +/* #undef HAVE_IDMAP_NO_USERNS */ + +/* Define if compiler supports -Wimplicit-fallthrough */ +/* #undef HAVE_IMPLICIT_FALLTHROUGH */ + +/* Define if compiler supports -Winfinite-recursion */ +/* #undef HAVE_INFINITE_RECURSION */ + ++/* inode_generic_drop() exists */ ++/* #undef HAVE_INODE_GENERIC_DROP */ ++ +/* inode_get_atime() exists in linux/fs.h */ +/* #undef HAVE_INODE_GET_ATIME */ + +/* inode_get_ctime() exists in linux/fs.h */ +/* #undef HAVE_INODE_GET_CTIME */ + +/* inode_get_mtime() exists in linux/fs.h */ +/* #undef HAVE_INODE_GET_MTIME */ + +/* inode_owner_or_capable() exists */ +/* #undef HAVE_INODE_OWNER_OR_CAPABLE */ + +/* inode_owner_or_capable() takes mnt_idmap */ +/* #undef HAVE_INODE_OWNER_OR_CAPABLE_IDMAP */ + +/* inode_owner_or_capable() takes user_ns */ +/* #undef HAVE_INODE_OWNER_OR_CAPABLE_USERNS */ + +/* inode_set_atime_to_ts() exists in linux/fs.h */ +/* #undef HAVE_INODE_SET_ATIME_TO_TS */ + +/* inode_set_ctime_to_ts() exists in linux/fs.h */ +/* #undef HAVE_INODE_SET_CTIME_TO_TS */ + +/* inode_set_mtime_to_ts() exists in linux/fs.h */ +/* #undef HAVE_INODE_SET_MTIME_TO_TS */ + +/* timestamp_truncate() exists */ +/* #undef HAVE_INODE_TIMESTAMP_TRUNCATE */ + +/* Define to 1 if you have the header file. */ +#define HAVE_INTTYPES_H 1 + +/* iops->create() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_CREATE_IDMAP */ + +/* iops->create() takes struct user_namespace* */ +/* #undef HAVE_IOPS_CREATE_USERNS */ + +/* iops->mkdir() returns struct dentry* */ +/* #undef HAVE_IOPS_MKDIR_DENTRY */ + +/* iops->mkdir() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_MKDIR_IDMAP */ + +/* iops->mkdir() takes struct user_namespace* */ +/* #undef HAVE_IOPS_MKDIR_USERNS */ + +/* iops->mknod() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_MKNOD_IDMAP */ + +/* iops->mknod() takes struct user_namespace* */ +/* #undef HAVE_IOPS_MKNOD_USERNS */ + +/* iops->permission() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_PERMISSION_IDMAP */ + +/* iops->permission() takes struct user_namespace* */ +/* #undef HAVE_IOPS_PERMISSION_USERNS */ + +/* iops->rename() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_RENAME_IDMAP */ + +/* iops->rename() takes struct user_namespace* */ +/* #undef HAVE_IOPS_RENAME_USERNS */ + +/* iops->symlink() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_SYMLINK_IDMAP */ + +/* iops->symlink() takes struct user_namespace* */ +/* #undef HAVE_IOPS_SYMLINK_USERNS */ + +/* iov_iter_get_pages2() is available */ +/* #undef HAVE_IOV_ITER_GET_PAGES2 */ + +/* iov_iter_type() is available */ +/* #undef HAVE_IOV_ITER_TYPE */ + +/* Define to 1 if you have the 'issetugid' function. */ +#define HAVE_ISSETUGID 1 + +/* iter_iov() is available */ +/* #undef HAVE_ITER_IOV */ + +/* iter_is_ubuf() is available */ +/* #undef HAVE_ITER_IS_UBUF */ + +/* kernel has kernel_fpu_* functions */ +/* #undef HAVE_KERNEL_FPU */ + +/* kernel has asm/fpu/api.h */ +/* #undef HAVE_KERNEL_FPU_API_HEADER */ + +/* kernel fpu internal */ +/* #undef HAVE_KERNEL_FPU_INTERNAL */ + +/* kernel has asm/fpu/internal.h */ +/* #undef HAVE_KERNEL_FPU_INTERNAL_HEADER */ + +/* Define if compiler supports -Winfinite-recursion */ +/* #undef HAVE_KERNEL_INFINITE_RECURSION */ + +/* kernel defines intptr_t */ +/* #undef HAVE_KERNEL_INTPTR_T */ + +/* kernel has kernel_neon_* functions */ +/* #undef HAVE_KERNEL_NEON */ + +/* kernel does stack verification */ +/* #undef HAVE_KERNEL_OBJTOOL */ + +/* kernel has linux/objtool.h */ +/* #undef HAVE_KERNEL_OBJTOOL_HEADER */ + +/* strlcpy() exists */ +/* #undef HAVE_KERNEL_STRLCPY */ + +/* kernel has kmap_local_page */ +/* #undef HAVE_KMAP_LOCAL_PAGE */ + +/* Define if you have [aio] */ +/* #undef HAVE_LIBAIO */ + +/* Define if you have [blkid] */ +/* #undef HAVE_LIBBLKID */ + +/* Define if you have [crypto] */ +#define HAVE_LIBCRYPTO 1 + +/* Define if you have [tirpc] */ +/* #undef HAVE_LIBTIRPC */ + +/* Define if you have [udev] */ +/* #undef HAVE_LIBUDEV */ + +/* Define if you have [unwind] */ +/* #undef HAVE_LIBUNWIND */ + +/* libunwind has unw_get_elf_filename */ +/* #undef HAVE_LIBUNWIND_ELF */ + +/* Define if you have [uuid] */ +/* #undef HAVE_LIBUUID */ + +/* building against unsupported kernel version */ +/* #undef HAVE_LINUX_EXPERIMENTAL */ + +/* makedev() is declared in sys/mkdev.h */ +/* #undef HAVE_MAKEDEV_IN_MKDEV */ + +/* makedev() is declared in sys/sysmacros.h */ +/* #undef HAVE_MAKEDEV_IN_SYSMACROS */ + +/* Noting that make_request_fn() returns blk_qc_t */ +/* #undef HAVE_MAKE_REQUEST_FN_RET_QC */ + +/* Define to 1 if you have the 'mlockall' function. */ +#define HAVE_MLOCKALL 1 + +/* PG_error flag is available */ +/* #undef HAVE_MM_PAGE_FLAG_ERROR */ + +/* page_mapping() is available */ +/* #undef HAVE_MM_PAGE_MAPPING */ + +/* page_size() is available */ +/* #undef HAVE_MM_PAGE_SIZE */ + +/* Define if host toolchain supports MOVBE */ +#define HAVE_MOVBE 1 + ++/* Define if ns_type is accessible through ns_common */ ++/* #undef HAVE_NS_COMMON_TYPE */ ++ +/* folio_wait_bit() exists */ +/* #undef HAVE_PAGEMAP_FOLIO_WAIT_BIT */ + +/* readahead_page() exists */ +/* #undef HAVE_PAGEMAP_READAHEAD_PAGE */ + +/* part_to_dev() exists */ +/* #undef HAVE_PART_TO_DEV */ + +/* iops->getattr() takes a path */ +/* #undef HAVE_PATH_IOPS_GETATTR */ + +/* Define if host toolchain supports PCLMULQDQ */ +#define HAVE_PCLMULQDQ 1 + +/* pin_user_pages_unlocked() is available */ +/* #undef HAVE_PIN_USER_PAGES_UNLOCKED */ + +/* proc_handler ctl_table arg is const */ +/* #undef HAVE_PROC_HANDLER_CTL_TABLE_CONST */ + +/* proc_ops structure exists */ +/* #undef HAVE_PROC_OPS_STRUCT */ + +/* If available, contains the Python version number currently in use. */ +/* #undef HAVE_PYTHON */ + +/* qat is enabled and existed */ +/* #undef HAVE_QAT */ + +/* struct reclaim_state has reclaimed */ +/* #undef HAVE_RECLAIM_STATE_RECLAIMED */ + +/* register_shrinker is vararg */ +/* #undef HAVE_REGISTER_SHRINKER_VARARG */ + +/* register_sysctl_sz exists */ +/* #undef HAVE_REGISTER_SYSCTL_SZ */ + +/* register_sysctl_table exists */ +/* #undef HAVE_REGISTER_SYSCTL_TABLE */ + +/* iops->rename() wants flags */ +/* #undef HAVE_RENAME_WANTS_FLAGS */ + +/* revalidate_disk() is available */ +/* #undef HAVE_REVALIDATE_DISK */ + +/* revalidate_disk_size() is available */ +/* #undef HAVE_REVALIDATE_DISK_SIZE */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SECURITY_PAM_MODULES_H 1 + +/* setattr_prepare() accepts mnt_idmap */ +/* #undef HAVE_SETATTR_PREPARE_IDMAP */ + +/* setattr_prepare() is available, doesn't accept user_namespace */ +/* #undef HAVE_SETATTR_PREPARE_NO_USERNS */ + +/* setattr_prepare() accepts user_namespace */ +/* #undef HAVE_SETATTR_PREPARE_USERNS */ + +/* iops->set_acl() takes 4 args, arg1 is struct mnt_idmap * */ +/* #undef HAVE_SET_ACL_IDMAP_DENTRY */ + +/* iops->set_acl() takes 4 args */ +/* #undef HAVE_SET_ACL_USERNS */ + +/* iops->set_acl() takes 4 args, arg2 is struct dentry * */ +/* #undef HAVE_SET_ACL_USERNS_DENTRY_ARG2 */ + +/* Define if set_default_d_op() is available */ +/* #undef HAVE_SET_DEFAULT_D_OP */ + +/* shrinker_register exists */ +/* #undef HAVE_SHRINKER_REGISTER */ + +/* kernel_siginfo_t exists */ +/* #undef HAVE_SIGINFO */ + +/* sops->free_inode() exists */ +/* #undef HAVE_SOPS_FREE_INODE */ + +#if defined(__amd64__) || defined(__i386__) +/* Define if host toolchain supports SSE */ +#define HAVE_SSE 1 + +/* Define if host toolchain supports SSE2 */ +#define HAVE_SSE2 1 + +/* Define if host toolchain supports SSE3 */ +#define HAVE_SSE3 1 + +/* Define if host toolchain supports SSE4.1 */ +#define HAVE_SSE4_1 1 + +/* Define if host toolchain supports SSE4.2 */ +#define HAVE_SSE4_2 1 + +/* Define if host toolchain supports SSSE3 */ +#define HAVE_SSSE3 1 +#endif + +/* STACK_FRAME_NON_STANDARD is defined */ +/* #undef HAVE_STACK_FRAME_NON_STANDARD */ + +/* STACK_FRAME_NON_STANDARD asm macro is defined */ +/* #undef HAVE_STACK_FRAME_NON_STANDARD_ASM */ + +/* standalone exists */ +/* #undef HAVE_STANDALONE_LINUX_STDARG */ + +/* statx() is available */ +/* #undef HAVE_STATX */ + +/* STATX_MNT_ID is available */ +/* #undef HAVE_STATX_MNT_ID */ + +/* Define to 1 if you have the header file. */ +#define HAVE_STDINT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDIO_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRINGS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if you have the 'strlcat' function. */ +#define HAVE_STRLCAT 1 + +/* Define to 1 if you have the 'strlcpy' function. */ +#define HAVE_STRLCPY 1 + +/* submit_bio is member of struct block_device_operations */ +/* #undef HAVE_SUBMIT_BIO_IN_BLOCK_DEVICE_OPERATIONS */ + +/* have super_block s_shrink */ +/* #undef HAVE_SUPER_BLOCK_S_SHRINK */ + +/* have super_block s_shrink pointer */ +/* #undef HAVE_SUPER_BLOCK_S_SHRINK_PTR */ *** 235 LINES SKIPPED *** From nobody Sat Oct 25 09:27:45 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ctvZT194tz6DwB2; Sat, 25 Oct 2025 09:28:01 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4ctvZS5C4Hz3QyR; Sat, 25 Oct 2025 09:28:00 +0000 (UTC) (envelope-from kostikbel@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: from tom.home (kib@localhost [127.0.0.1] (may be forged)) by kib.kiev.ua (8.18.1/8.18.1) with ESMTP id 59P9RjnI016530; Sat, 25 Oct 2025 12:27:48 +0300 (EEST) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 59P9RjnI016530 Received: (from kostik@localhost) by tom.home (8.18.1/8.18.1/Submit) id 59P9RjHm016529; Sat, 25 Oct 2025 12:27:45 +0300 (EEST) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Sat, 25 Oct 2025 12:27:45 +0300 From: Konstantin Belousov To: Warner Losh Cc: Poul-Henning Kamp , src-committers , "" , "" Subject: Re: git: 2612f1b8649b - main - deadfs: Return ENXIO instead of EIO when the device is gone. Message-ID: References: <202510240741.59O7fBAe041995@gitrepo.freebsd.org> <202510241012.59OACUDA002781@critter.freebsd.dk> <202510241116.59OBG1ii003074@critter.freebsd.dk> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FORGED_GMAIL_RCVD,FREEMAIL_FROM, NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=4.0.1 X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on tom.home X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:6939, ipnet:2001:470::/32, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4ctvZS5C4Hz3QyR On Fri, Oct 24, 2025 at 05:40:36PM -0400, Warner Losh wrote: > On Fri, Oct 24, 2025 at 12:03 PM Konstantin Belousov > wrote: > > > On Fri, Oct 24, 2025 at 09:12:18AM -0400, Warner Losh wrote: > > > On Fri, Oct 24, 2025, 7:49 AM Konstantin Belousov > > > wrote: > > > > > > > On Fri, Oct 24, 2025 at 11:16:01AM +0000, Poul-Henning Kamp wrote: > > > > > -------- > > > > > Konstantin Belousov writes: > > > > > > > > > > > On Fri, Oct 24, 2025 at 10:12:30AM +0000, Poul-Henning Kamp wrote: > > > > > > > > > > > I do not think that DRM really affects the code path for io. > > > > > > > > > > 100% agreement. > > > > > > > > > > But it can change the order of thread/interrupt/event-handling > > > > > scheduling. > > > > > > > > > > When I tested the ENXIO patch, I started booting an unmodified > > > > > kernel in single-user and immediately got ENXIO when I pulled > > > > > the USB stick - quite to my surprise. > > > > > > > > > > Then I kldloaded i915kms, still in single-user, and now I got > > > > > the observed bad EIO behaviour. > > > > > > > > > > With a fixed kernel and i915kms loaded, I saw four or five reads > > > > > return EIO before one got ENXIO and terminated recoverdisk. > > > > > > > > > > Getting a handful of EIO's before the ENXIO finally appears > > > > > strongly suggests that some of the eventhandling related to > > > > > the disappearing USB stick is being held up by something. > > > > > > > > > > As soon as I can, I'll try to gather more data. > > > > > > > > It might make sense to annotate CAM EIOs with EXTERROR(). > > > > But then, we probably need to add something to copy that > > > > extended data between threads and possibly extend struct buf/bio > > > > witg the place for exterror data besides b_error. > > > > > > > > > > Given the contexts cam runs in, managing the storage for that can be > > hard. > > > > Which storage? > > > > EXTERROR() does not allocate any memory. It was designed to be safe for > > using in any context, including real interrupt (not just non-sleepable > > threads). > > > > So I don't know curthread of the transaction that scheduled the I/O. That's > how I was, impricely, using the word 'context'. So how does EXTERROR make > it's way back to curthread for system call return from something like gup > or some direct dispatch that wakes up the sleeper for the I/O? I started the WIP that does exactly this: > > > > But then, we probably need to add something to copy that > > > > extended data between threads and possibly extend struct buf/bio > > > > witg the place for exterror data besides b_error. See https://reviews.freebsd.org/D53351 It is very beginning. From nobody Sat Oct 25 20:28:05 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cvBDM57fMz6DSRC for ; Sat, 25 Oct 2025 20:28:19 +0000 (UTC) (envelope-from rlibby@gmail.com) Received: from mail-yw1-f173.google.com (mail-yw1-f173.google.com [209.85.128.173]) (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 4cvBDL3FY3z3ZDT for ; Sat, 25 Oct 2025 20:28:18 +0000 (UTC) (envelope-from rlibby@gmail.com) Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=freebsd.org (policy=none); spf=pass (mx1.freebsd.org: domain of rlibby@gmail.com designates 209.85.128.173 as permitted sender) smtp.mailfrom=rlibby@gmail.com Received: by mail-yw1-f173.google.com with SMTP id 00721157ae682-784966ad073so41033087b3.1 for ; Sat, 25 Oct 2025 13:28:18 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761424097; x=1762028897; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7xmCQfITdSRooTSdhPD6juZeD60m4HtCllE3eY7sN3E=; b=vnmyIl/h1bjWKf/Srkk1UfHjc098rqqJ183iIyjzOmTH3mw+AMs2uP4p4w65YR57YA tlrCcpuAoDeVl9eTgiRFqAera/WPKVuTzgS0HD62hd6yyqDc7HPBf6iCIPF2H5i++JRT SHMTfkNMBe1js3fwDYyBiQKxfYzC/fbbKUtZM4cozzVsRb9r+Pa9cNz48lXhDP07Efo3 ZU+NGM++NsWECpBZsvFHNREz3vPEkq9VBt7Ll4G/MI1TI1izTeLKXEAX/7PFMUWyalI+ UShzTu/0mgoKNUHKZ8jzAck7jL1NSt+5N9v/TrZ5w+K8dym68gmHzgq2TmEhw1+5lP0l dfmg== X-Forwarded-Encrypted: i=1; AJvYcCXeNWAHQovOLN8PdIzP6UVldbwTgV3AZs1r1QXRr8f75m4oV1kFFe4Sf8INH2qxTYOMpUH3MddH/+i1ilc9gq50sRGXDw==@freebsd.org X-Gm-Message-State: AOJu0YyK6NLech2Im4wfqAwDgk1slSUeTzXxzVF4foucV156E0r/vMVP 1d4AUYPBlpA6Ehdodv3J5hZx/Jaxd/M3N8Mg55Ir7oGoF7A5NHLlXoR+MsgF+A== X-Gm-Gg: ASbGncvzCz4EqolFXqn2Y2z3O+Z9zIhLDI3/SXEMrCkZ1y3zV16ki7oN2ZSKZVE2JBg EsC6le9QLC9b2s0jeqX0iIbpubsk0NIFGS2ifUq/RY7p5MiCCaBXt97xM11u35SzGAw7USn7Evh tDddR57CeBwVzbPabFmJEo+r5kl12fJKZ0ZMGg+weZBHpv7T38c84NCY4YuecYoc+vqgz3ZKo5s QSb7whwFKy8T40Z5DDnvD7qEjab4iHja6Y5D39CxRdZbpX/KyI39J/0xl4PjrhCthXf8P1QcHWS K4JVqvfQbzUcsdAGJhIzoY+BlymhVT1FyMTBDD6YDOEAgKDb+D8gJt/CG5YB1pP0BC4NZRjJ/NM J/OENLYq/rWh1wMwjp9ybsVW5+rGe5h0xAppNiClGcskwrTcBjo/VfOIf6159APMBRML/HXjSL1 l6KUn57IJxL2fhM4wi0t/jsYFQAN+r/pdsAf8zzu8= X-Google-Smtp-Source: AGHT+IE18ey17MX2yVmJRUcDzv4SiHc7E964OgIOTyZfR6NSTSBf63Poqn39Vgp81RAysyfBOunpsQ== X-Received: by 2002:a05:690e:12c7:b0:63e:e04:fc31 with SMTP id 956f58d0204a3-63e161c7871mr22646818d50.43.1761424097017; Sat, 25 Oct 2025 13:28:17 -0700 (PDT) Received: from mail-yw1-f172.google.com (mail-yw1-f172.google.com. [209.85.128.172]) by smtp.gmail.com with ESMTPSA id 00721157ae682-785ed196a0dsm7314487b3.27.2025.10.25.13.28.16 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 25 Oct 2025 13:28:16 -0700 (PDT) Received: by mail-yw1-f172.google.com with SMTP id 00721157ae682-784966ad073so41032987b3.1 for ; Sat, 25 Oct 2025 13:28:16 -0700 (PDT) X-Forwarded-Encrypted: i=1; AJvYcCUw4IosPowpyLi4EtPiAAVM4hk65NsTndWKAXlSaS8SoBe45kTxxJKGtPB8IGYYsFsJTzAAYNMHG/066ssu5IlUT64s3g==@freebsd.org X-Received: by 2002:a05:690c:385:b0:785:4803:5e2b with SMTP id 00721157ae682-785480363fcmr159586017b3.20.1761424096185; Sat, 25 Oct 2025 13:28:16 -0700 (PDT) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 References: <202510201832.59KIWCG0006624@gitrepo.freebsd.org> In-Reply-To: <202510201832.59KIWCG0006624@gitrepo.freebsd.org> From: Ryan Libby Date: Sat, 25 Oct 2025 13:28:05 -0700 X-Gmail-Original-Message-ID: X-Gm-Features: AS18NWC_bNRGAAreIS_VhM_9PnPJamxfoMxBYzoI-mimPHVTTUSJ-qgi21BfEGg Message-ID: Subject: Re: git: e1aeb58cbbc3 - main - inet_net_test: Use int to hold expected return values from inet_net_pton To: John Baldwin Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Spamd-Bar: - X-Spamd-Result: default: False [-1.79 / 15.00]; NEURAL_HAM_SHORT(-1.00)[-0.999]; NEURAL_HAM_MEDIUM(-0.80)[-0.798]; FORGED_SENDER(0.30)[rlibby@freebsd.org,rlibby@gmail.com]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17:c]; DMARC_POLICY_SOFTFAIL(0.10)[freebsd.org : SPF not aligned (relaxed), No valid DKIM,none]; MIME_GOOD(-0.10)[text/plain]; NEURAL_HAM_LONG(-0.10)[-0.095]; RCPT_COUNT_THREE(0.00)[4]; RCVD_TLS_LAST(0.00)[]; RCVD_COUNT_THREE(0.00)[3]; ARC_NA(0.00)[]; MISSING_XM_UA(0.00)[]; TO_DN_SOME(0.00)[]; MIME_TRACE(0.00)[0:+]; FROM_HAS_DN(0.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; FREEMAIL_ENVFROM(0.00)[gmail.com]; PREVIOUSLY_DELIVERED(0.00)[dev-commits-src-main@freebsd.org]; TO_MATCH_ENVRCPT_SOME(0.00)[]; FROM_NEQ_ENVFROM(0.00)[rlibby@freebsd.org,rlibby@gmail.com]; FREEFALL_USER(0.00)[rlibby]; MLMMJ_DEST(0.00)[dev-commits-src-main@freebsd.org]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.128.173:from]; R_DKIM_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[209.85.128.172:received,209.85.128.173:from] X-Rspamd-Queue-Id: 4cvBDL3FY3z3ZDT On Mon, Oct 20, 2025 at 11:32=E2=80=AFAM John Baldwin wro= te: > > The branch main has been updated by jhb: > > URL: https://cgit.FreeBSD.org/src/commit/?id=3De1aeb58cbbc3839db93ec38ce4= 91b7b9383d5649 > > commit e1aeb58cbbc3839db93ec38ce491b7b9383d5649 > Author: John Baldwin > AuthorDate: 2025-10-20 18:31:41 +0000 > Commit: John Baldwin > CommitDate: 2025-10-20 18:31:41 +0000 > > inet_net_test: Use int to hold expected return values from inet_net_p= ton > > GCC warns about the sign mismatch in comparisons: > > lib/libc/tests/net/inet_net_test.cc: In member function 'virtual void= {anonymous}::atfu_tc_inet_net_inet4::body() const': > lib/libc/tests/net/inet_net_test.cc:86:17: error: comparison of integ= er expressions of different signedness: 'int' and 'const unsigned int' [-We= rror=3Dsign-compare] > 86 | ATF_REQUIRE_EQ(bits, addr.bits); > | ^~~~~~~~~~~~~~ > lib/libc/tests/net/inet_net_test.cc: In member function 'virtual void= {anonymous}::atfu_tc_inet_net_inet6::body() const': > lib/libc/tests/net/inet_net_test.cc:205:17: error: comparison of inte= ger expressions of different signedness: 'int' and 'const unsigned int' [-W= error=3Dsign-compare] > 205 | ATF_REQUIRE_EQ(bits, addr.bits); > | ^~~~~~~~~~~~~~ > > Fixes: 8f4a0d2f7b96 ("libc: Import OpenBSD's inet_net_{ntop,= pton}") > --- > lib/libc/tests/net/inet_net_test.cc | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/lib/libc/tests/net/inet_net_test.cc b/lib/libc/tests/net/ine= t_net_test.cc > index 4ecf5a3de492..c4411373165e 100644 > --- a/lib/libc/tests/net/inet_net_test.cc > +++ b/lib/libc/tests/net/inet_net_test.cc > @@ -50,7 +50,7 @@ ATF_TEST_CASE_BODY(inet_net_inet4) > > struct test_addr { > std::string input; > - unsigned bits; > + int bits; > std::string output; > }; > > @@ -134,7 +134,7 @@ ATF_TEST_CASE_BODY(inet_net_inet6) > > struct test_addr { > std::string input; > - unsigned bits; > + int bits; > std::string output; > }; > > Could you MFC e1aeb58cbbc3 and aa358ce3ca8e to stable/15 to fix the gcc build there, or would you mind if I did? Thanks, Ryan From nobody Sat Oct 25 20:41:34 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cvBWf5czCz6DTvT; Sat, 25 Oct 2025 20:41:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cvBWf4zwnz3bn3; Sat, 25 Oct 2025 20:41:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761424894; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/FG6qRrEGAiJMh9wcSxmVnB3AFEOq7vsSF+8/X7xrjk=; b=P4dBMi0KkmVYLmYRRiYCzwABwHE5omIVxIkosi7v+wi38Sx+oWzB+OPsoiOxi48OUw0YH+ sAeOcuyJ9J1l3FHsrVvWsNRsaLiFTrKhE3ZvQcMy366R23cV43JE8LJ6rRL035MVh3yPYp kN7P3E6Ue0JfMdGOoXcJLNdQB2Ev6B08oW/LVGfQWYM/inkewoLo8en9H41YNZk4NCadK6 UFu7IYcJHdHOTS9S1BjNaWlzV4Vm5BUFnAUghaO+PN2GeiBclqTviZaN8ZKoEzVFxn25Ov 6i9rvj+SiSzMCltUL1Awhgq3lDJLLX27tdL5qDP4Vhul3TlLXt6bTzUlELTd3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761424894; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/FG6qRrEGAiJMh9wcSxmVnB3AFEOq7vsSF+8/X7xrjk=; b=dRl4LATK76tFBtOeArvo72qJ4+dA0asqj8LZZhawqTUT9Q6vymadSxBB3EVUuXumn3nG88 r0W/L74N5tWg2XVCsmh6NEF7sdnMp0942mxXSJzJwhPMqqGQwaWn3knPQUkb9HMDWsyPBm dtZQ/YbDp9j8gyc6A5OIbZL31yXrLnxfwQVljfI+XKUbUtr+sqGDp0XffFAEAvp+hatOb8 wKo1ajNq3asmvL45IAxyf6B72TxrSi+oXShHvVDqlkZBcQCoa4RtWywg3lPLwklYj3JX88 +er4n4Dd6KpIR6NBSfWkz7KFMqXehNe9cUGL7cYXob7jmXdzaoBFpUE3w44emQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761424894; a=rsa-sha256; cv=none; b=Aoty/QUyOAxnEBAlHdSACPb+rwYwuXjDSPw2R98/zR4hSjZv65KO5o/jC1SXoQnS8lfRnT 19Fm0XX+680JuWXmjubE+hQeD0hWe4oE5W6qoRSyDvvOISc+keZBMNWIzhRT+C5v+z+8ZV yJZxz3zjAyMVVsnKsBwEJQrArAycZl5bSCugv0EI2QPDlnBTI7jpuIfhTHX4sGrAyZifhi b07xzFLlhfvFCa/AAw+/89EeLxX5k9MEB5Lma7Rr1spe7mtUurJJsQ+x/o1sWMkEk6Jyka o2Zw95FbFrX0dks1NANKianVsm8dpAPGrqBPGbcNGhdX6jT5rDho0sXrHoyxoA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cvBWf3tN7z11wM; Sat, 25 Oct 2025 20:41: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 59PKfYDJ026184; Sat, 25 Oct 2025 20:41:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59PKfYwb026181; Sat, 25 Oct 2025 20:41:34 GMT (envelope-from git) Date: Sat, 25 Oct 2025 20:41:34 GMT Message-Id: <202510252041.59PKfYwb026181@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: d6864221d884 - main - pathconf: Define a new name called _PC_CASE_INSENSITIVE List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d6864221d88425a079f76ca106f30812c671ca9a Auto-Submitted: auto-generated The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=d6864221d88425a079f76ca106f30812c671ca9a commit d6864221d88425a079f76ca106f30812c671ca9a Author: Rick Macklem AuthorDate: 2025-10-25 20:37:35 +0000 Commit: Rick Macklem CommitDate: 2025-10-25 20:37:35 +0000 pathconf: Define a new name called _PC_CASE_INSENSITIVE Some FreeBSD file systems (msdosfs and optionally ZFS) handle case insensitive file name lookup. NFS (v3 and 4) provide an attribute to indicate this capability, but without this patch, the NFS server does not know if the file system does support this. This patch adds the pathconf name_PC_CASE_INSENSITIVE that can be used by the NFS server or user programs to check for this feature. Reviewed by: kib MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D53349 --- sys/fs/msdosfs/msdosfs_vnops.c | 3 +++ sys/kern/vfs_default.c | 1 + sys/sys/unistd.h | 1 + 3 files changed, 5 insertions(+) diff --git a/sys/fs/msdosfs/msdosfs_vnops.c b/sys/fs/msdosfs/msdosfs_vnops.c index 33e0d94954d7..6dfac1b4ebd2 100644 --- a/sys/fs/msdosfs/msdosfs_vnops.c +++ b/sys/fs/msdosfs/msdosfs_vnops.c @@ -1944,6 +1944,9 @@ msdosfs_pathconf(struct vop_pathconf_args *ap) case _PC_HAS_HIDDENSYSTEM: *ap->a_retval = 1; return (0); + case _PC_CASE_INSENSITIVE: + *ap->a_retval = 1; + return (0); default: return (vop_stdpathconf(ap)); } diff --git a/sys/kern/vfs_default.c b/sys/kern/vfs_default.c index 05d1120030f3..4eca09aef145 100644 --- a/sys/kern/vfs_default.c +++ b/sys/kern/vfs_default.c @@ -458,6 +458,7 @@ vop_stdpathconf(struct vop_pathconf_args *ap) case _PC_HAS_NAMEDATTR: case _PC_HAS_HIDDENSYSTEM: case _PC_CLONE_BLKSIZE: + case _PC_CASE_INSENSITIVE: *ap->a_retval = 0; return (0); default: diff --git a/sys/sys/unistd.h b/sys/sys/unistd.h index 5743dc1c8033..29adf6b59425 100644 --- a/sys/sys/unistd.h +++ b/sys/sys/unistd.h @@ -160,6 +160,7 @@ #define _PC_XATTR_EXISTS _PC_HAS_NAMEDATTR /* Solaris Compatible */ #define _PC_HAS_HIDDENSYSTEM 68 #define _PC_CLONE_BLKSIZE 69 +#define _PC_CASE_INSENSITIVE 70 #endif /* From OpenSolaris, used by SEEK_DATA/SEEK_HOLE. */ From nobody Sat Oct 25 21:20:17 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cvCNS1PCKz6DYp7; Sat, 25 Oct 2025 21:20:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cvCNS0kwKz3fkl; Sat, 25 Oct 2025 21:20:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761427224; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mEDabQUtwlI5lDejqehKdWltF2DlKlkPvPmRI9p/Gi8=; b=IqenHmM2V1BjraMuiFawAc3Ysz7H+b/d8HgOJz2xHpCI3Hoa7Qw8tY6ODa0i+RKO79++EP BXYj/XVMzHktxlwe4fOrduJFpi0sn14spv5u+jWzwBSNOum2EXYlvbVx0jBO++gvL3ycF+ kGTwgtvayvn79dmN4N+76ANZqhYUrcObc6Ukr9sQGIR51i2xZ54dJbAbNHiOm5p34fm99N A8DIoZP1LINTSCS+OS48I/bv8iP76go4GKXmTbaSeByd6BrEvpI821KlAfbLNJ6ZyBHHUG FoLHg3wtXvrNgWUe/glZC60eIhW3n5NUQuSKL9olPjbrhFyda6sY9zFispKrgg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761427224; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mEDabQUtwlI5lDejqehKdWltF2DlKlkPvPmRI9p/Gi8=; b=peGj7umNEf6yeIAnalLrQRr1vEDagdgXf2TqX6GOgTJl3ty/u37YkxfODgy/i6DNB9nA7q 89mS8qGjj2IPQ0OKX4HpYXotvEo/nO+cAksDjbMTskOQCR5Uoz07xFvMB1exGLTZV84hLd XAjXulKWyJLGmCUKEZQGQtDZ3GtjqWvLNVAXlh0sZkqY3Rd22oNdPU2Wpu6ePJPz7sSXOq 3fVz0Fa+3OXmFZcpLgnmDPQis+MH/G6dUA83UtF6GJuZAkMS+IXrldfnth5Q6s1/i646n3 HknLmJKAjkXjJ6e2Lx7vdMpYKmRKdyq1wNVThN/x/cCJF/OZC+Jypv3XcwJTfg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761427224; a=rsa-sha256; cv=none; b=uBbX2ReloeoVByx1ow1p6ShYSYPn5egeMuHAkb40Xzhqt5M9IKTUYv2vmw/iRY5IzDpoc0 lcuS5No/xNFZOyAHrhep7TeoorA2gDVe9zWXUFWSvbW/ZcSbeUn8ruCrYE6XuR6lBFZCzX 3TooHiQ/i+ojsFakblwTw2kaOWRFjIOloFlKk/BQidsqcvVh8Bi4+s6oHlFBwFhoxTCWkT eSjjefotfLvWjjluOhqkYBbUWFMPxsLZY7SoJ/ktS7/iOIBo6kPce0RaiypdwRWv7yAClv OiYtAfIrPpWnsfwH0TlN1WV06aSmgJBShUphiq/l4T+OSuhHCXm5TefMHPHAQQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cvCNS02mDz13Zt; Sat, 25 Oct 2025 21:20:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59PLKN46096155; Sat, 25 Oct 2025 21:20:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59PLKH5W095791; Sat, 25 Oct 2025 21:20:17 GMT (envelope-from git) Date: Sat, 25 Oct 2025 21:20:17 GMT Message-Id: <202510252120.59PLKH5W095791@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jose Luis Duran Subject: git: bcbe0a3c924e - main - MFV: Import blocklist 2025-10-25 (156df4f) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bcbe0a3c924e09c4d78514e3d16d493e3da54f83 Auto-Submitted: auto-generated The branch main has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=bcbe0a3c924e09c4d78514e3d16d493e3da54f83 commit bcbe0a3c924e09c4d78514e3d16d493e3da54f83 Merge: d6864221d884 1ae0b2f3a242 Author: Jose Luis Duran AuthorDate: 2025-10-25 21:15:18 +0000 Commit: Jose Luis Duran CommitDate: 2025-10-25 21:18:36 +0000 MFV: Import blocklist 2025-10-25 (156df4f) Merge commit '1ae0b2f3a242a48af2deef1e88649bf4a3a74e2f' Changes: https://github.com/zoulasc/blocklist/compare/8aa81bf...156df4f MFC after: 2 days contrib/blocklist/bin/blocklistctl.8 | 5 ++--- contrib/blocklist/bin/blocklistctl.c | 8 ++++---- contrib/blocklist/bin/blocklistd.c | 18 ++++++++---------- 3 files changed, 14 insertions(+), 17 deletions(-) diff --cc contrib/blocklist/bin/blocklistd.c index 03a1dbbf056c,20bd29c7683c..c78c560613fc --- a/contrib/blocklist/bin/blocklistd.c +++ b/contrib/blocklist/bin/blocklistd.c @@@ -222,16 -222,19 +222,16 @@@ process(bl_t bl switch (bi->bi_type) { case BL_ABUSE: /* - * If the application has signaled abusive behavior, set the - * number of fails to be two less than the configured limit. - * Fall through to the normal BL_ADD and BL_BADUSER processing, - * which will increment the failure count to the threshold, and - * block the abusive address. + * If the application has signaled abusive behavior, + * set the number of fails to be one less than the + * configured limit. Fallthrough to the normal BL_ADD + * processing, which will increment the failure count - * to the threshhold, and block the abusive address. ++ * to the threshold, and block the abusive address. */ if (c.c_nfail != -1) - dbi.count = c.c_nfail - 2; + dbi.count = c.c_nfail - 1; /*FALLTHROUGH*/ case BL_ADD: - dbi.count++; /* will become += 2 */ - /*FALLTHROUGH*/ - case BL_BADUSER: dbi.count++; dbi.last = ts.tv_sec; if (c.c_nfail != -1 && dbi.count >= c.c_nfail) { From nobody Sat Oct 25 21:37:53 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cvCmd5VhDz6DbSb; Sat, 25 Oct 2025 21:37:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cvCmd4tG3z3hM1; Sat, 25 Oct 2025 21:37:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761428273; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Q+Iitz+VDQfxC/OLROAWrZnmt09x//pDQmYfPZyoajM=; b=BtOg8Aprpj7XhvDREveWZcoTBHUQSKTTDuOsRhFS6Qrg20eaNXwZnDMdJ6me3GCVI0SdyV YZnMqs4CQzTdbHYkn/CYhhAxh+o91vtwdVqGe0NocGaLVJCME6+kIe0c+15RfAdkuNpsEb CcmYuURYEfrxDFd3rudSZTF/ng9joJIviqlEpz3qcZpkQurEJ716xO+tlyub1jSBTIbC0z 4iTo4VyI7IOi6m9eH701vX5AFZ11M3RugyDApj9ikOoBcl297nBSqdm9MC0bqWSgLup62H LX6vhezq5x184kyEgcqhufm8cBchptBIGWZ+BCggkrQC1kXU/Ruju+e9K2aUkA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761428273; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Q+Iitz+VDQfxC/OLROAWrZnmt09x//pDQmYfPZyoajM=; b=wdrRDSi/ZolWXyslJVHF/4citpykeNSuFFxQXe4K12Z1s6Z9Ka2+TGaTfXyzZzpKogEpi6 Tucw7cpCRdfQiUn1amB66MVtkhhxaglsatY4QLihBn957bFBIe0HH7vPW678PvtSxMqCpo uAHCrli9Wjg46/4UI3ws+2t/ftts58wBr+d6c7mMZsNG9gpgx7umX17mQyB8uIlxxwbBvE 1QstmyyR5nMuW6b2ljJjLRjKJSzncL5a+N0Ej3e/Aq2bzx9Ki3sMtKt9kthhXDp1TYjxuM SnM8RqGIn6smLRPoLgPJfoWEUrs+xJvfU+D8Cpfm44IZK6OuLvN5zTLTA54HkQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761428273; a=rsa-sha256; cv=none; b=vw60K/8+6n8DK17HlXgpUD+pMkBUs1dXGbc9Kg8gXK7DN7ZlbozGjCHoiBLdJj5AM7Me8H 8Ud4qDcEQiHSL+1x56eUNDO0QO92BYBF1SaEsfGnjKC6alO4VfS62j+JA79cyJPOiqW4SD tIeHTidSIcaw5hpFVez2zRoWDYn8BLgbShg2I0qrHjOuPRUAKaYA+0a/nVKF6sYJzgLa9M S4YwGf4X9jLgIFZZCeCEScu6zfTr663FwerX5MbKPMx333ejE8alLndE/ZXjMXF8b1pyxd 4HdjV6Qvk3b8cpXYNLC2NHd0RW5LPBNfsEQ+G8MiHtQiJxFtyBH+2hIFRt6HAA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cvCmd4MLvz14Fv; Sat, 25 Oct 2025 21:37: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 59PLbrVi024363; Sat, 25 Oct 2025 21:37:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59PLbr1j024360; Sat, 25 Oct 2025 21:37:53 GMT (envelope-from git) Date: Sat, 25 Oct 2025 21:37:53 GMT Message-Id: <202510252137.59PLbr1j024360@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: f1cb4e9962d7 - main - ffs.3: Add a STANDARDS section to the manual page List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f1cb4e9962d715ec85ba26d7019ab83adea1ffb7 Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=f1cb4e9962d715ec85ba26d7019ab83adea1ffb7 commit f1cb4e9962d715ec85ba26d7019ab83adea1ffb7 Author: Gordon Bergling AuthorDate: 2025-10-25 21:37:22 +0000 Commit: Gordon Bergling CommitDate: 2025-10-25 21:37:22 +0000 ffs.3: Add a STANDARDS section to the manual page The ffs() function conforms to IEEE Std 1003.1-2008 ("POSIX.1"). The ffsl() and ffsll() functions conform to IEEE Std 1003.1-2024 ("POSIX.1"). Reviewed by: ziaee MFC after: 5 days Differential Revision: https://reviews.freebsd.org/D53352 --- lib/libc/string/ffs.3 | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/lib/libc/string/ffs.3 b/lib/libc/string/ffs.3 index 2a5adb01c737..1cca54c0b30b 100644 --- a/lib/libc/string/ffs.3 +++ b/lib/libc/string/ffs.3 @@ -27,7 +27,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd October 17, 2015 +.Dd October 25, 2025 .Dt FFS 3 .Os .Sh NAME @@ -80,6 +80,17 @@ argument was zero. .Sh SEE ALSO .Xr bitstring 3 , .Xr bitset 9 +.Sh STANDARDS +The +.Fn ffs +function conforms to +.St -p1003.1-2008 . +The +.Fn ffsl +and +.Fn ffsll +functions conform to +.St -p1003.1-2024 . .Sh HISTORY The .Fn ffs From nobody Sat Oct 25 21:56:30 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cvDB65rJvz6Dddk; Sat, 25 Oct 2025 21:56:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cvDB652zLz3kNZ; Sat, 25 Oct 2025 21:56:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761429390; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=d3Z1LKOTbkIeejzcuUzxOfKiX8qD4us7IIfLPHWo/a4=; b=ZnU58DxrWnMV8QTGQdtY9ZOkmzbld1OSvDICtzLxRMjYUZJyI2d52SlpdeIEuL9om9ZqTz u5xFfMfxMw6uQMULA58zu+gfWl8A+cwEocBKqt5SCeOWu0VH/+ZQkunTcKlu+Zq5tHFL0l GTSFRKeH4uMgndrEKu63RTy35Y+YQqswKE+GI5Z7zpSIFfxeYklX1tEaaFEloZNug8qV6T cZgZHoHHt6IiCX7tXTjKGOFRGH/8chcvPCdE+OaWF7BCeFH8ql9jtNL9nc8TlAt50U3LNt S36BBpgAi+XWTnr2XyUTRVzebiJK4pKAeYhLwK5S6m6jHJKEtiUVaLmfjQ/USg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761429390; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=d3Z1LKOTbkIeejzcuUzxOfKiX8qD4us7IIfLPHWo/a4=; b=plHszZWS7MP1NNFTzJYFlzkBEtbq7HE/pI13Y/B9ExoUGVWm5492/Gt1d8E3stW/Q5p1xs 2/C5WYIP1S/sIVnYTyMimiwTemFkapwAbwcvG7mxwLimj7FqMzuzfHxk1JchIywgwWJy8V ekTISbtW0hq/WtcnqpPDMXmcdExljusnKsRxrH/nkzqdbI99ocq4eyK/Pm0zXILZJF4Elj gdmcTbJvWZ5k5ba0o+W5CFQBaZb5K+j0z4lBIFNLDJyVXRCj6Va3XP/vdIPyLi1wFU2OaF sdwYocEEP9alDlOeQ4fv25JIpjy61lA35HbjU99tggjKDshnGljfVe6/M5Au1Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761429390; a=rsa-sha256; cv=none; b=a1zcBs7r2jNR6QYzsrbs7lUGyZ5naQGA2Pd/L/pxi0GuA29jp6/aqmQzUBA0prUWsxj6NC IH2E4ZrD62icF3ZJ56E6vloZTSxbEqP8XAC9VHK043W3H6WAKlvhRW/ruR/u+FMECvt6uY saO2SeCS3k8+AJ2zIod3cgzmj48K1mfL1kxZTI1rMqqu/HIwOdIzZnhMbryfytUBHB8bJu A/rjlGQ+FmGMSFzZPetkwZAoc2C2B4X8BIKCrfJ40ZtM5nEhHi9XrccoLgURxbV7Y7tv60 R0vhds+G+Dh4PNLQtYXowEHNy0FHf85YaBS+q4k6KVqymNHNia/NAUZ+QP/xkw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cvDB64RJnz145t; Sat, 25 Oct 2025 21:56: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 59PLuUsX060739; Sat, 25 Oct 2025 21:56:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59PLuUZe060736; Sat, 25 Oct 2025 21:56:30 GMT (envelope-from git) Date: Sat, 25 Oct 2025 21:56:30 GMT Message-Id: <202510252156.59PLuUZe060736@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jose Luis Duran Subject: git: eae98e28a0e1 - main - blocklist: blacklist: Chase recent upstream changes List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: eae98e28a0e17f625e29f9849a4dc655636d9164 Auto-Submitted: auto-generated The branch main has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=eae98e28a0e17f625e29f9849a4dc655636d9164 commit eae98e28a0e17f625e29f9849a4dc655636d9164 Author: Jose Luis Duran AuthorDate: 2025-10-25 21:24:13 +0000 Commit: Jose Luis Duran CommitDate: 2025-10-25 21:56:08 +0000 blocklist: blacklist: Chase recent upstream changes Upstream introduced an extra column in blocklistctl(8) to display the name of the rule associated in the database entry. It is intended to avoid confusion when seemingly duplicate locations appear in the output of the blocklistctl dump command. Especially when users are transitioning from the old nomenclature to the new one. The latest patches will not be fully backported to blacklistctl(8), to avoid breaking current scripts that may be parsing its output. Also we are slowly preparing to feature-freeze everything related to blacklist. MFC: 2 days --- contrib/blocklist/bin/blacklistctl.8 | 3 +-- contrib/blocklist/bin/blacklistd.c | 18 ++++++++---------- contrib/blocklist/bin/blocklistctl.8 | 6 +++++- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/contrib/blocklist/bin/blacklistctl.8 b/contrib/blocklist/bin/blacklistctl.8 index 4d557c0c979d..08f1d1b9e5af 100644 --- a/contrib/blocklist/bin/blacklistctl.8 +++ b/contrib/blocklist/bin/blacklistctl.8 @@ -45,7 +45,6 @@ is a program used to display and change the state of the database. The following sub-commands are supported: .Ss dump -.Pp The following options are available for the .Cm dump sub-command: @@ -90,7 +89,7 @@ associated with the database entry. column will show the identifier for the packet filter rule associated with the database entry, though this may only be the word .Ql OK -for packet filters which do not creat a unique identifier for each rule. +for packet filters which do not create a unique identifier for each rule. .It Ql nfail The number of .Em failures diff --git a/contrib/blocklist/bin/blacklistd.c b/contrib/blocklist/bin/blacklistd.c index ded3075ed707..b5f9358122ef 100644 --- a/contrib/blocklist/bin/blacklistd.c +++ b/contrib/blocklist/bin/blacklistd.c @@ -1,4 +1,4 @@ -/* $NetBSD: blocklistd.c,v 1.10 2025/03/26 17:09:35 christos Exp $ */ +/* $NetBSD: blocklistd.c,v 1.11 2025/10/25 16:55:23 christos Exp $ */ /*- * Copyright (c) 2015 The NetBSD Foundation, Inc. @@ -35,7 +35,7 @@ #ifdef HAVE_SYS_CDEFS_H #include #endif -__RCSID("$NetBSD: blocklistd.c,v 1.10 2025/03/26 17:09:35 christos Exp $"); +__RCSID("$NetBSD: blocklistd.c,v 1.11 2025/10/25 16:55:23 christos Exp $"); #include #include @@ -191,12 +191,12 @@ process(bl_t bl) } if (getremoteaddress(bi, &rss, &rsl) == -1) - goto out; + return; if (debug || bi->bi_msg[0]) { sockaddr_snprintf(rbuf, sizeof(rbuf), "%a:%p", (void *)&rss); (*lfun)(bi->bi_msg[0] ? LOG_INFO : LOG_DEBUG, - "processing type=%d fd=%d remote=%s msg=%s uid=%lu gid=%lu", + "processing type=%d fd=%d remote=%s msg=\"%s\" uid=%lu gid=%lu", bi->bi_type, bi->bi_fd, rbuf, bi->bi_msg, (unsigned long)bi->bi_uid, (unsigned long)bi->bi_gid); @@ -204,12 +204,12 @@ process(bl_t bl) if (conf_find(bi->bi_fd, bi->bi_uid, &rss, &c) == NULL) { (*lfun)(LOG_DEBUG, "no rule matched"); - goto out; + return; } if (state_get(state, &c, &dbi) == -1) - goto out; + return; if (debug) { char b1[128], b2[128]; @@ -226,7 +226,7 @@ process(bl_t bl) * set the number of fails to be one less than the * configured limit. Fallthrough to the normal BL_ADD * processing, which will increment the failure count - * to the threshhold, and block the abusive address. + * to the threshold, and block the abusive address. */ if (c.c_nfail != -1) dbi.count = c.c_nfail - 1; @@ -269,8 +269,6 @@ process(bl_t bl) state_put(state, &c, &dbi); out: - close(bi->bi_fd); - if (debug) { char b1[128], b2[128]; (*lfun)(LOG_DEBUG, "%s: final db state for %s: count=%d/%d " @@ -565,7 +563,7 @@ main(int argc, char *argv[]) conf_parse(configfile); } ret = poll(pfd, (nfds_t)nfd, tout); - if (debug) + if (debug && ret != 0) (*lfun)(LOG_DEBUG, "received %d from poll()", ret); switch (ret) { case -1: diff --git a/contrib/blocklist/bin/blocklistctl.8 b/contrib/blocklist/bin/blocklistctl.8 index 7943c54159c1..75228599a9de 100644 --- a/contrib/blocklist/bin/blocklistctl.8 +++ b/contrib/blocklist/bin/blocklistctl.8 @@ -27,7 +27,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd January 27, 2025 +.Dd October 25, 2025 .Dt BLOCKLISTCTL 8 .Os .Sh NAME @@ -82,6 +82,10 @@ sub-command consists of a header (unless was given) and one line for each record in the database, where each line has the following columns: .Bl -tag -width indent +.It Ql rulename +The packet filter rule name associated with the database entry, +usually +.Dv blocklistd . .It Ql address/ma:port The remote address, mask, and local port number of the client connection associated with the database entry. From nobody Sat Oct 25 22:13:20 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cvDYX34vfz6Dfmf; Sat, 25 Oct 2025 22:13:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cvDYX1vmLz3lNj; Sat, 25 Oct 2025 22:13:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761430400; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6Pv8IuAT4kfsINn/Z6NEgjYKNqgxyuXnKR34I1jAQd0=; b=SZWukzn0Vu2AdzC7C4SvriJZNnYJO8770xFgqVKFWmUA+xRpIg57mTnhzCnlkFu8H2TNBe K1RLqu1lx5i0RyN3yCgQ3B9YcoqMh/NBfB5mHSBjC+F0gorTE5lkfssNVyOyuRCEP4L/E8 iqUFbOL0LbNkNEtYb5qC3+VRaZvJyTB+TaY/ppSoc8hgxuxtdjEowJED7BYA+YnAp8rKHM MS2IXRZjZxVxYMyC7AhTPDrf166XdC6acdZkNg2nISztkYdQinaA7/VPDrz5rtLlAF2qLe 3ZCuR7Lb5+6tDnJaw1E4XY+td4nDDF/JkVRBquXukA4xDVywRK83VHWxf3SIpA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761430400; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6Pv8IuAT4kfsINn/Z6NEgjYKNqgxyuXnKR34I1jAQd0=; b=TckMLrdCHuzpIaQybh0Yq9qWP0HIGz5ZFSwgwoaelDCBhG1B+JEax0LF14ruPfdqU65lLU YxLeo7qusHGVrSomJJCJ1SuwEODEXqiIun7Q+zj5p1WasWVlb5NqpWlK3ihJogh3TnYJlm j9StiHiCA/LWPGRIFo/YQ64FpA/7/TF5KaN/Uym/NdWZPPn9317eDMO4oiQmC+tYCEgGV7 K0CRAWmRu4ihgU/g43Co+T4XIjc0g+klHN1JEmn4VTnjk51HfA3p+SoaP4fZi/he83u1Cy 943fTjI6W7WhxiIoCRjH9xUHYE1jksOKlc0TxGTsfUicMu3bqN8FNtOI1pg7RA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761430400; a=rsa-sha256; cv=none; b=DmWY9mwlpYmFsovEKGAqjqcLetekWKcrCY1hXEN934HkQpRsbIIWSiXK4rVPEiEek/BJ+h oXHoac9/jfxwwZfQOdSmeaI+Go3oIcj6K09hYHBUcuRlRvMRcTgeHfj9DG2INVCPd/qwGp NVnmidhT1Ka7HAL8rotFCsqa1B83JEHAGxSEgQrSKT92tmKbeVGzYzpmzPVbnujde+Kkvk 026G5AtwOOKyX1ZJt6XSQqlXoMb42IqooJrC5lihew7JxrB9LrKKnoA79Fk/fvKVa7Xg9D OAvKuTDFrep72BScrh1NXRd5FF+SvvgaKSEpbK5dgjNKKniuqRAi11nfZyL0xg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cvDYX1J0nz14yx; Sat, 25 Oct 2025 22:13:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59PMDKDx097840; Sat, 25 Oct 2025 22:13:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59PMDKg1097837; Sat, 25 Oct 2025 22:13:20 GMT (envelope-from git) Date: Sat, 25 Oct 2025 22:13:20 GMT Message-Id: <202510252213.59PMDKg1097837@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 28e52dea9680 - main - ipfw: Remove IP_DUMMYNET_GET case List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 28e52dea96809c7904e498759ee1f79bda929a82 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=28e52dea96809c7904e498759ee1f79bda929a82 commit 28e52dea96809c7904e498759ee1f79bda929a82 Author: Ed Maste AuthorDate: 2025-10-24 20:51:25 +0000 Commit: Ed Maste CommitDate: 2025-10-25 22:07:57 +0000 ipfw: Remove IP_DUMMYNET_GET case IP_DUMMYNET_GET is no longer used in ipfw(1). Reviewed by: markj Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D53348 --- sbin/ipfw/ipfw2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/ipfw/ipfw2.c b/sbin/ipfw/ipfw2.c index 2addc0295f0f..eed390ba5bec 100644 --- a/sbin/ipfw/ipfw2.c +++ b/sbin/ipfw/ipfw2.c @@ -648,7 +648,7 @@ do_cmd(int optname, void *optval, uintptr_t optlen) if (ipfw_socket < 0) err(EX_UNAVAILABLE, "socket"); - if (optname == IP_FW_GET || optname == IP_DUMMYNET_GET || + if (optname == IP_FW_GET || optname == IP_FW_ADD || optname == IP_FW3 || optname == IP_FW_NAT_GET_CONFIG || optname < 0 || From nobody Sat Oct 25 22:58:55 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cvFZ74Fd5z6DktJ; Sat, 25 Oct 2025 22:58:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cvFZ73Sqlz3qht; Sat, 25 Oct 2025 22:58:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761433135; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8BxAMAyDdyPPmzl/0YpsOjHiSOY3Wi1h5pNI3OM9ee4=; b=SkbDHOq3+Z+LS9B7gZulFu0GbiglGx9jZoSEomTwqAcUCzB0VodmOglpRlF9MuTxygq2k7 ifWFkDxp82MOl94V5RnsmlHhcKghUyQLKpuHHlSFnbnPqyfGgNhse19/oK/kCjwUYcbmnz ecG25jPu3FbZV3pkw17e61hhInrnbB6wzol90whzF/33ZWewD8Ah0Iz/gxhFu0/TpJLHCC jEmJvToDi/01cWVOAOWYAENaciM5kNFexqt25keCEBch3s5xXYBPfi/qWNoMeA42aEHOZL Q/T4xqwWFMvZnfLQxnIc72JDsiLo9M1iVDI3AuptI9exrJZaZH4ktaaIkwZX+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761433135; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8BxAMAyDdyPPmzl/0YpsOjHiSOY3Wi1h5pNI3OM9ee4=; b=lVoUtvgeqVG6ChI458g4TZMxm7E0o6zwBG7rGfzMBc1WquOVSUNlhSnLKlWjJtlIqwELkx zn6v3TzysJulh/J/ScPba2J3zNtNjlJPARp85kHWeeYYjFuTqpAfwBsC1L1cMIivKwnlTs 7ltcB+KZxLUFMxs4PNL33JKp50WXdw/V+hC49QTS5o8rsXEcRpeFLQG21w+QpID/Pcu1ym ArnsBj6AZE/zYDh32lflTUMNngPadbVv4yKgurEOUQoE4dFZ6L6HKr0q3L02s0aZ3N+1C1 fu41Tk1tKe9jbKj6EOZSq9uilD8jZj2roWzjGAVQNdQZzTXj182FG0cv7SfDtg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761433135; a=rsa-sha256; cv=none; b=iRGNQvkpN5KHAvmEcjgspqWbFTf8xwTImhUDtieq7AW1yRGYMC2zvGQa+JSlmcuUhgNO6a 3TwLWh8aO1FIFUmSDcnMowg2RvqpHRFtYC/dluI3mutireglJuLi9M6ehWo3DT8XUnj6Q2 7uY1wQx8QeC8Uwx42lZTPN5m74R8CYadutufbv4Z2L9kZWTsFrI83pvHB+swtUOOoZ/BqU LD0CERTu859RVmaa2OH4ZYeiXZUIA5jfoXQE+dbynGzsRALurMMn2sTL7F33X6w1G+SZZ8 JdC8D/VI6QyMb5RWG3mxw0/i10nmm9O9sFnNhl2OZsDNwypDpiR7apNN3syYmg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cvFZ72V2jz15W7; Sat, 25 Oct 2025 22:58: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 59PMwtjH074837; Sat, 25 Oct 2025 22:58:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59PMwthG074834; Sat, 25 Oct 2025 22:58:55 GMT (envelope-from git) Date: Sat, 25 Oct 2025 22:58:55 GMT Message-Id: <202510252258.59PMwthG074834@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 46f982122c0d - main - sys: Bump non-ISA PNP removal to 16.0 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 46f982122c0d670ac181b748a5b8c2b221f61517 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=46f982122c0d670ac181b748a5b8c2b221f61517 commit 46f982122c0d670ac181b748a5b8c2b221f61517 Author: Ed Maste AuthorDate: 2025-10-24 18:39:00 +0000 Commit: Ed Maste CommitDate: 2025-10-25 22:57:15 +0000 sys: Bump non-ISA PNP removal to 16.0 This may include atkbdc, which is not being removed in 15.0. Sponsored by: The FreeBSD Foundation --- sys/isa/isa_common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/isa/isa_common.c b/sys/isa/isa_common.c index 1a6df7bf6046..41a63a3c676c 100644 --- a/sys/isa/isa_common.c +++ b/sys/isa/isa_common.c @@ -570,7 +570,7 @@ isa_probe_children(device_t dev) strcmp(kern_ident, "GENERIC") == 0 && device_is_attached(child)) device_printf(child, - "non-PNP ISA device will be removed from GENERIC in FreeBSD 15.\n"); + "non-PNP ISA device will be removed from GENERIC in FreeBSD 16.\n"); } /* From nobody Sat Oct 25 23:25:28 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cvG8n1DR0z6Dp4J; Sat, 25 Oct 2025 23:25:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cvG8n0kDPz3t1c; Sat, 25 Oct 2025 23:25:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761434729; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YtMB6yIwyBitq/TXE/eAG12Xddry57j0vFWWdjUJY1g=; b=IdOSWHEaGzTLVHAMwJgnHIlDeYxN0pGG8IfcfUcGrbUgTzgrvHgJecBTEXMESXbkFDd3BL xAUmKcaULFLOBVuftRRbd1XisbC+Qg6RYp+Z5v77t8nWkUxNy1rvcZmnRzOXznySJDrnCR u58fxyN02AtyHerF8GWsjlOx1e6nDK+nx52db6ZnUEzolyVZB8o+dhUx4ppZ/11BGpyuFu csYdz0Rl1Q3EifADSOvGA3Rc73WK1j4LOYlOUeR9138FH2QZ/wrRVhBF9XhE45tk9DYLbE Zbl6o4zTlpSPtnPp0Z0ETOKUOUBvcte5iMksbelpY6JMLOZUCjxFtQK3Fy6Qhw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761434729; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YtMB6yIwyBitq/TXE/eAG12Xddry57j0vFWWdjUJY1g=; b=W5SvumvRFWC0Hej6yZcVhWeeGyYRT3XBE9jarixi7VvOxcdcl6h6tZdfHNcmwYkv+qPSdH q75sCPwjzmFGGNSCST/TXBRTxy+OF1ep/rWoyxS5/sKSk8g+jvz8AeF904N830D32TMZ0G WuDVQWtvYR/WqFd3l2HPmkGg4Hj9VxLLjHfX6Hto160s4XDwKhemzeA9AAwoMgxlaLpmMq b8X5jwtnoQ0XfRPkFSI4SLumFPrO/X1eXjJsSGagjFWcw1rU+SLjOGcmh82puuYDQZ3+bA W4hhS9ndn4MC160aokKnBbDX6Hsjq5CMgiu0ObEoYMw+3E6cdOu3vcys08icDw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761434729; a=rsa-sha256; cv=none; b=d37UVyTo7rvYurTXCZsoZa7onVjhdv1RJ1kN6try9636d/ITbjWs9vBAM8EJbd5/TfrT10 JKmZVAGwCTQ3ck7Egzl6SNuC8FnfFatVtpjKO2pzDFHofW0h658aKREVGML1jGrtJF5OIW uQRAHpAcS5kh8DH8t8P5bZJGtk9HP/kj/0ecMJrliuNQJ8vvlT8qnYX9/JCyQRBqI9xTUz BSMZfRq7ddhr2EhJ+JNZN2cN29qBVUmwtdMRYqO6jRnlxacFrGb15rLYbvLqc69koPhfYO Tiu01zpgjeokUpgeb3w1BXWZra1SRgx8fDfPDFWNcL9Jg8+L2yals71kc3/xpA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cvG8m6yTWz16b9; Sat, 25 Oct 2025 23:25: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 59PNPS7Y030701; Sat, 25 Oct 2025 23:25:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59PNPSrc030698; Sat, 25 Oct 2025 23:25:28 GMT (envelope-from git) Date: Sat, 25 Oct 2025 23:25:28 GMT Message-Id: <202510252325.59PNPSrc030698@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jose Luis Duran Subject: git: 67ade69eb607 - main - blocklistd-helper: Silence another bogus pf warning List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 67ade69eb6079887215db1fde86eba2fb8e2acf7 Auto-Submitted: auto-generated The branch main has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=67ade69eb6079887215db1fde86eba2fb8e2acf7 commit 67ade69eb6079887215db1fde86eba2fb8e2acf7 Author: Jose Luis Duran AuthorDate: 2025-10-25 23:14:48 +0000 Commit: Jose Luis Duran CommitDate: 2025-10-25 23:21:07 +0000 blocklistd-helper: Silence another bogus pf warning It has been reported as PR 290478. In the meantime, just sweep under the carpet. It is worth noting that neither commit: 2347ca21d657 ("blocklist-helper: Silence a bogus pf warning") nor this one will be upstreamed, as this is a FreeBSD-specific issue. PR: 290478 MFC after: 2 days --- contrib/blocklist/libexec/blocklistd-helper | 2 +- libexec/blocklistd-helper/blacklistd-helper | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/blocklist/libexec/blocklistd-helper b/contrib/blocklist/libexec/blocklistd-helper index 14a192ee35ce..1d4a38b1d831 100755 --- a/contrib/blocklist/libexec/blocklistd-helper +++ b/contrib/blocklist/libexec/blocklistd-helper @@ -259,7 +259,7 @@ flush) # dynamically determine which anchors exist for anchor in $(/sbin/pfctl -a "$2" -s Anchors 2> /dev/null); do /sbin/pfctl -a "$anchor" -t "port${anchor##*/}" -T flush 2> /dev/null - /sbin/pfctl -a "$anchor" -F rules + /sbin/pfctl -a "$anchor" -F rules 2> /dev/null done echo OK ;; diff --git a/libexec/blocklistd-helper/blacklistd-helper b/libexec/blocklistd-helper/blacklistd-helper index 92f768e86cdf..053c9ce9b2a2 100644 --- a/libexec/blocklistd-helper/blacklistd-helper +++ b/libexec/blocklistd-helper/blacklistd-helper @@ -280,7 +280,7 @@ flush) # dynamically determine which anchors exist for anchor in $(/sbin/pfctl -a "$2" -s Anchors 2> /dev/null); do /sbin/pfctl -a "$anchor" -t "port${anchor##*/}" -T flush 2> /dev/null - /sbin/pfctl -a "$anchor" -F rules + /sbin/pfctl -a "$anchor" -F rules 2> /dev/null done echo OK ;; From nobody Sun Oct 26 00:41:22 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cvHrM1D8cz6DS4l; Sun, 26 Oct 2025 00:41:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cvHrM0hQgz42NV; Sun, 26 Oct 2025 00:41:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761439283; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PI65/MYO+7i+K7OPcQJInmEfGAhBskDDBgX4f/EG23o=; b=oCewWeqXQhARqKKgSoQROj+9IgipgvIiF+ryPYwdfcz+y9qoSoXK7a45KAaEsrm+AqnJJ4 baZOatjtRu/WpJ059VkwjsbsfWQcYXD8RwXAeFevD1Vop0Ecmn0vThzzJuDK+85eS9dpvf cvfaMaRxF0TuVwIDBXU+ObMNo5OjARKu6nPpuXDW7Zn3n4n3MHbcfWshSKxF8s1qZuuhQt zzODBNfB15+y5l3D0CyLQXs0RwgJ+X8TBxXa47oH6+Xx0C6xzTNyYwruZvWpQncRvmc6ub wMET8GjBSozeDImO/0hmwDG+r3pTaoHRhHyGgxVuXjjWOtqZ/HQA/UIV4+/p5A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761439283; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PI65/MYO+7i+K7OPcQJInmEfGAhBskDDBgX4f/EG23o=; b=mwNEAcxumExiUGHhU/R1juy803IIe0x3U9I7E5g+ScyXF/jNoqrcKkYDS3GSg7WLazqvhf r01VRboATU8LbGfWmIMPZh/1pbYBIyXD+ZGiVE/cHN40R9WVpJ62e8VCwl3V2N72xTl9uc jJ7SVLZuOQFvG2iKrKBWx0w+MQUhUt70anm2cNaHLnQ+sVWJh5nPEVquEWzxhQJ004+ShQ rPe5FT9BvVEchoHtpMT3+J9rSKyQ2LjY7SMdet9A/IEPPWgbmmdGsPdXAZrA871iDE+XFn R4ozyJptfs07cWk8zCKGIK5jiBnQ5Bj6IcLkeic+Dxno3+XOCDX9+08Q5QgxFw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761439283; a=rsa-sha256; cv=none; b=RMv1S94JwbWWS7cH69bLJWc/HUh3zlWAUxB28z5CUsFILDFdh7xtRWC3NEJz4a3fID3Jc4 ktVI1YHjr1qTU51qS9p/y0RlVVopDYipmLKu0AC+O/KiOjnUVdIwX3bt87iOUSYImSGL1A B2lMYglW2Jd1zO6coh9jMSYJ+f+vBEK5cs4iuJWISAUE3gRf2YhMsXMbDZXPQEMnSMMmXS M2OwzacxQyrN4+iv3N8k572LCHWduXRivQw4i8wrbWk82M0lm4iXvpbP7ls/1JcVf7SnjT ww9bK+us5+gj/00Xcb/bubunY/W4XZxnHB030ufc0VOvaSmFaukzOuR3YrjU/w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cvHrL728Gz18ts; Sun, 26 Oct 2025 00:41: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 59Q0fM6d074427; Sun, 26 Oct 2025 00:41:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59Q0fM9J074424; Sun, 26 Oct 2025 00:41:22 GMT (envelope-from git) Date: Sun, 26 Oct 2025 00:41:22 GMT Message-Id: <202510260041.59Q0fM9J074424@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: e93db9abc9a6 - main - cam: Bump deprecated sysctl removal to 16 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e93db9abc9a62d662c40d783663d64cdb829a0cc Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=e93db9abc9a62d662c40d783663d64cdb829a0cc commit e93db9abc9a62d662c40d783663d64cdb829a0cc Author: Ed Maste AuthorDate: 2025-10-24 19:36:42 +0000 Commit: Ed Maste CommitDate: 2025-10-26 00:38:38 +0000 cam: Bump deprecated sysctl removal to 16 The descriptions for these unmapped_io and rotating sysctls indicated that they're deprecated and being removed for FreeBSD 15.0. That did not happen, so update to FreeBSD 16 instead. Sponsored by: The FreeBSD Foundation --- sys/cam/ata/ata_da.c | 4 ++-- sys/cam/scsi/scsi_da.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/cam/ata/ata_da.c b/sys/cam/ata/ata_da.c index 0d844a6fbf9e..08747cd59131 100644 --- a/sys/cam/ata/ata_da.c +++ b/sys/cam/ata/ata_da.c @@ -1557,11 +1557,11 @@ adasysctlinit(void *context, int pending) SYSCTL_ADD_PROC(&softc->sysctl_ctx, SYSCTL_CHILDREN(softc->sysctl_tree), OID_AUTO, "unmapped_io", CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_MPSAFE, &softc->flags, (u_int)ADA_FLAG_UNMAPPEDIO, adabitsysctl, "I", - "Use unmapped I/O. This sysctl is *DEPRECATED*, gone in FreeBSD 15"); + "Use unmapped I/O. This sysctl is *DEPRECATED*, gone in FreeBSD 16"); SYSCTL_ADD_PROC(&softc->sysctl_ctx, SYSCTL_CHILDREN(softc->sysctl_tree), OID_AUTO, "rotating", CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_MPSAFE, &softc->flags, (u_int)ADA_FLAG_ROTATING, adabitsysctl, "I", - "Rotating media. This sysctl is *DEPRECATED*, gone in FreeBSD 15"); + "Rotating media. This sysctl is *DEPRECATED*, gone in FreeBSD 16"); #ifdef CAM_TEST_FAILURE /* diff --git a/sys/cam/scsi/scsi_da.c b/sys/cam/scsi/scsi_da.c index fc8c0413448d..c0c0be12856b 100644 --- a/sys/cam/scsi/scsi_da.c +++ b/sys/cam/scsi/scsi_da.c @@ -2408,11 +2408,11 @@ dasysctlinit(void *context, int pending) SYSCTL_ADD_PROC(&softc->sysctl_ctx, SYSCTL_CHILDREN(softc->sysctl_tree), OID_AUTO, "rotating", CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_MPSAFE, &softc->flags, (u_int)DA_FLAG_ROTATING, dabitsysctl, "I", - "Rotating media *DEPRECATED* gone in FreeBSD 15"); + "Rotating media *DEPRECATED* gone in FreeBSD 16"); SYSCTL_ADD_PROC(&softc->sysctl_ctx, SYSCTL_CHILDREN(softc->sysctl_tree), OID_AUTO, "unmapped_io", CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_MPSAFE, &softc->flags, (u_int)DA_FLAG_UNMAPPEDIO, dabitsysctl, "I", - "Unmapped I/O support *DEPRECATED* gone in FreeBSD 15"); + "Unmapped I/O support *DEPRECATED* gone in FreeBSD 16"); #ifdef CAM_TEST_FAILURE SYSCTL_ADD_PROC(&softc->sysctl_ctx, SYSCTL_CHILDREN(softc->sysctl_tree), From nobody Sun Oct 26 02:28:03 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cvLCR3rcTz6Dgr4; Sun, 26 Oct 2025 02:28:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cvLCR3DtRz3HHh; Sun, 26 Oct 2025 02:28:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761445683; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=G7nvge5h8tBlFwsv+uI3qe6w4/ruO6tyi7mksQEvVgs=; b=ab+ETpRO1+ZjbOdBAKJTdVa0J3gIP6PXXJfAUg7ubyJlJisy9IHAh4rDPn5FHAId8+2ITr DRehma1bAnzVLSn6j3ZCLSMEeKO7LSU/tclT3zTlqO0at9Du8GXa+ildz2pB5eIDQFnKKn BBOBYgz2sgLMD534+4llRY+TJ/qO3Np01aIjchXUqI+ZlOChA0bI1+10DBAsjxLt8IsNFW hgsah7c7w9Azksm0Xijou2PIpXrc/NQDIpy+3cjSHcbSSAy9gYsIv1AfCpj1YMLymu8kOC WEu+f7Vggn1rJVg3C9spplWbIcnpxDPlL04EHe5Em4xv14uq0697qU2dbRuBvw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761445683; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=G7nvge5h8tBlFwsv+uI3qe6w4/ruO6tyi7mksQEvVgs=; b=dDHR3iDuLf1J/LNNvKXzVXWusK8kPiWEt5rMZSswehZ+dBQYczZL3CIfQoxylkCPy2JXzj lvMdocURJjLmGcZ4RIECwEXveaCCnZucZhbyqCCWdpnqMRPSvNNgvKxFc5DzJTwkSjOr8c 2DWUBzdr29tFOTLHrJnbyFvts6ZgSQ2UO7VklOOIL0fOPctfeTwl02vwXEnF+L1BDN46pH /CMfQky1B5xzT0vFr8/na7C6ffLgqUjp2HRhpKwI9owLzTfOE255rr1nLy8R0Xa2VJBwr0 +0B159sqqWIVj/gA0WLiROwTlEVWxdqTnBLe9GJP3VMNHmr5+JUMBOv/fCv0FQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761445683; a=rsa-sha256; cv=none; b=llSU3w3SVeuUuGIMa2ZU9wTwsDVx6fw38WOzVbpTKKZR0eFP7bS89Bn/6Er+90QAQoCV2n Y4uW5pDnWDvS7RIzjgdBb92yIK2d6WgxbR0daW/MA2oUUubQrL7Jowz1jm3mRFvDJVeaVB dSbFzDmeBgKlAyRZ4uefRSugj+BT8LMOp+HlswFrGBiQWeFMTGCbDvDCRZijSw6rNJXFmj KNQMABFKa6hLOEXqb8gulTMQHF+Ga8BgZ4e8RvMZanWZ7atPrs51oIfqEhhLxYWolRiwT8 9FUv/BNOMXlS8VV2HEeL+Y73l4Z0PWHFRSb7O302x5XHX5llLQQzvQr3A4KJPw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cvLCR2cW5z1CMK; Sun, 26 Oct 2025 02:28: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 59Q2S3dn068967; Sun, 26 Oct 2025 02:28:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59Q2S3QX068964; Sun, 26 Oct 2025 02:28:03 GMT (envelope-from git) Date: Sun, 26 Oct 2025 02:28:03 GMT Message-Id: <202510260228.59Q2S3QX068964@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Lexi Winter Subject: git: 842942be28b2 - main - packages: Remove the /boot hack from mtree-to-plist.awk List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ivy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 842942be28b21354e3f547e39fc75bf18ee5b6f7 Auto-Submitted: auto-generated The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=842942be28b21354e3f547e39fc75bf18ee5b6f7 commit 842942be28b21354e3f547e39fc75bf18ee5b6f7 Author: Lexi Winter AuthorDate: 2025-10-25 17:18:46 +0000 Commit: Lexi Winter CommitDate: 2025-10-26 02:22:47 +0000 packages: Remove the /boot hack from mtree-to-plist.awk Currently, files in /boot (other than /boot/kernel) are assigned to the bootloader package using a filename match in mtree-to-plist.awk. This causes some problems, most notably that debug info for userboot ends up in the utilities-dbg package instead of bootloader-dbg. Remove the path handling from mtree-to-plist and instead set PACKAGE in the appropriate Makefiles to put these in the correct package. While here, move userboot*.so from bootloader-dev to bootloader. MFC after: 3 days Reviewed by: cperciva Sponsored by: https://www.patreon.com/bsdivy Differential Revision: https://reviews.freebsd.org/D53179 --- release/scripts/mtree-to-plist.awk | 6 ------ stand/Makefile.inc | 2 ++ stand/userboot/Makefile.inc | 4 ++++ sys/conf/dtb.mk | 2 ++ 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/release/scripts/mtree-to-plist.awk b/release/scripts/mtree-to-plist.awk index a9f1e194389a..38c9963680ee 100644 --- a/release/scripts/mtree-to-plist.awk +++ b/release/scripts/mtree-to-plist.awk @@ -40,12 +40,6 @@ for (i in a) { if (a[i] ~ /^package=/) { pkgname=a[i] - if ($1 ~ /^\/boot\//) { - if (kernel != "" && $1 ~ /^\/boot\/dtb\//) - pkgname="dtb" - else if ($1 !~ /^\/boot\/firmware\//) - pkgname="bootloader" - } gsub(/package=/, "", pkgname) } else if (a[i] == "config") { type="config" diff --git a/stand/Makefile.inc b/stand/Makefile.inc index 5d55c4e4a16f..2866ebd20af3 100644 --- a/stand/Makefile.inc +++ b/stand/Makefile.inc @@ -1,5 +1,7 @@ SUBDIR_PARALLEL= yes +PACKAGE= bootloader + # Firmware may not be able to handle branch protection failures MK_BRANCH_PROTECTION= no diff --git a/stand/userboot/Makefile.inc b/stand/userboot/Makefile.inc index 01b5f23410c8..392fd59a115f 100644 --- a/stand/userboot/Makefile.inc +++ b/stand/userboot/Makefile.inc @@ -1 +1,5 @@ .include "../Makefile.inc" + +# userboot.so should be installed in the base bootloader package, +# not bootloader-dev. +NO_DEV_PACKAGE= diff --git a/sys/conf/dtb.mk b/sys/conf/dtb.mk index ec3df525d1e7..2050be7560a4 100644 --- a/sys/conf/dtb.mk +++ b/sys/conf/dtb.mk @@ -31,6 +31,8 @@ .include "dtb.build.mk" +PACKAGE?= dtb + .if !target(install) && !target(realinstall) all: ${DTB} ${DTBO} realinstall: _dtbinstall From nobody Sun Oct 26 02:28:04 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cvLCS4h5qz6Dh51; Sun, 26 Oct 2025 02:28:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cvLCS48Kbz3H8q; Sun, 26 Oct 2025 02:28:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761445684; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nZyK8UG9DjUODDytUlQcv1WmOYjtHNYovwux4bJby8A=; b=diTqMRGYDzYIzk+EBPKaTWnR/C4TvLpQxPNd57CJJns1c19i0CJ5L/t9FUMNT+MiHd8tYZ eoKGzjpUrt07d8ofejJdisXgH4K9Uoo8sIG4i6rv447I8DRrin1YrJmfynSnKODNRKxAvT lb8sxiaPujR+CrN+uje78JpZ5O6SIsNqW4HTiTzNr/KlQxINd/pCaHHPjQrrJE9jyShR16 xuyZRs4ov6EI3z7cNxVk/3DHYmGz1aLZYnXQDnQhG+NXVM948Q5dtsI6swBgAn8lqRm7UV PGCtJCLVOcGgk+2nyn3wDZfOhp0MiHxd/g72fAfYxUhMR2sDaKzMShFu+TrrCA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761445684; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nZyK8UG9DjUODDytUlQcv1WmOYjtHNYovwux4bJby8A=; b=sEF9fN8Pm6AgRfCZ0QFiGhSj4GzJsK6j330rUHZ+3WFhqKsLlYuJmzFes8zO2boOo3glV/ 5UEnoO2B0hUbGfuCdkVPOluckS23wIT+3kPZtMfSXPzNputn6SWjKKzahbxapiHl/QEKHg L4j+2edo6l8EihcUOise0Lx1XtO49Ab5IfywswTrj18JNgf63Zo9v74ckB054B3Qj00fk5 X9uNcSCgTg+FxLZzc/CSF3JXxbYI+RrK9EEh2AMFnD3Y7A7QGeoAYgSUH08kVc3f+dZX9/ JH8hVI9Wf07uMoKW0emZNLMKtQmbx9ckaWvwOLkFf4iku1cP3yvS7TTvZVAZow== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761445684; a=rsa-sha256; cv=none; b=btdrHSzfXWKx//qr8mxTxX5VkG3HCBmUm8JSbyW1Y+zhbrE47BaDa0JrvvG5S5cYg2pbpZ EbB+ev87iOSxyGy3eu7On6Vr5jjhJim86LJ210G2oNJfJFytbz+BP6wsmSCpIB0L5kBs53 XBa9o13288CJ0Fp2soL/wiIka/zZCbt3626crCIXwF6bJorowvcG/oT46a3s0y/0MenpQb +b/e/II1onCDuckndena3ph4cyhTP3rjxbekNu4sHWSk7+95x0na8WHZkUA2LYWQcd/dxO 1lXXXC26IDKxLJbpYsQ6Eh9JQhiX66yrLa4MM3c7viUUw+xZmrUA9m7tN1e5dg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cvLCS3l9Xz1Cml; Sun, 26 Oct 2025 02:28: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 59Q2S4NG069001; Sun, 26 Oct 2025 02:28:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59Q2S4vq068998; Sun, 26 Oct 2025 02:28:04 GMT (envelope-from git) Date: Sun, 26 Oct 2025 02:28:04 GMT Message-Id: <202510260228.59Q2S4vq068998@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Lexi Winter Subject: git: 957715f877b5 - main - flua: Move to a new flua package List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ivy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 957715f877b57a17545ead94d27ea8fd3ff4932a Auto-Submitted: auto-generated The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=957715f877b57a17545ead94d27ea8fd3ff4932a commit 957715f877b57a17545ead94d27ea8fd3ff4932a Author: Lexi Winter AuthorDate: 2025-10-25 17:21:37 +0000 Commit: Lexi Winter CommitDate: 2025-10-26 02:22:47 +0000 flua: Move to a new flua package flua is a standalone third-party component that deserves its own package. In particular, this means things can use flua without having to depend on FreeBSD-utilities, which will be useful as more base utilities use flua. This saves ~500kB in FreeBSD-utilities for systems which don't need flua. MFC after: 3 days Reviewed by: kevans Sponsored by: https://www.patreon.com/bsdivy Differential Revision: https://reviews.freebsd.org/D53161 --- UPDATING | 6 ++++++ libexec/flua/Makefile | 2 ++ libexec/flua/Makefile.inc | 2 ++ release/packages/ucl/bsdinstall.ucl | 5 +++++ release/packages/ucl/flua-all.ucl | 32 ++++++++++++++++++++++++++++++++ release/packages/ucl/nuageinit-all.ucl | 7 +++++++ release/packages/ucl/tests.ucl | 27 +++++++++++++++++++++++++++ 7 files changed, 81 insertions(+) diff --git a/UPDATING b/UPDATING index 448febb5ba1a..d89afb7ef429 100644 --- a/UPDATING +++ b/UPDATING @@ -27,6 +27,12 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 16.x IS SLOW: world, or to merely disable the most expensive debugging functionality at runtime, run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20251025: + flua(1) has moved to the new FreeBSD-flua package. If you use flua, + you may want to install this package if it's not otherwise installed + as a dependency of something else. This change only affects pkgbase + users. + 20251021: Bump __FreeBSD_version to 1600002 for LinuxKPI. An embedded struct has changed size and might possibly be an issue otherwise. diff --git a/libexec/flua/Makefile b/libexec/flua/Makefile index 23de404710d0..f1c46b270ded 100644 --- a/libexec/flua/Makefile +++ b/libexec/flua/Makefile @@ -1,5 +1,7 @@ .include +PACKAGE= flua + # New flua modules should be added here rather than to SUBDIR so that we can do # the right thing for both bootstrap flua and target flua. The former does not # do any shared libs, so we just build them all straight into flua itself rather diff --git a/libexec/flua/Makefile.inc b/libexec/flua/Makefile.inc index 37a49e258ecb..5e214c76921b 100644 --- a/libexec/flua/Makefile.inc +++ b/libexec/flua/Makefile.inc @@ -1,3 +1,5 @@ +PACKAGE= flua + SHLIBDIR?= ${LIBDIR}/flua CFLAGS+= \ diff --git a/release/packages/ucl/bsdinstall.ucl b/release/packages/ucl/bsdinstall.ucl index 7fe8898b9427..96ff220bfb54 100644 --- a/release/packages/ucl/bsdinstall.ucl +++ b/release/packages/ucl/bsdinstall.ucl @@ -21,4 +21,9 @@ deps { "runtime" { version = "${VERSION}" }, + + # the pkgbase script requires flua + "flua" { + version = "${VERSION}" + }, } diff --git a/release/packages/ucl/flua-all.ucl b/release/packages/ucl/flua-all.ucl new file mode 100644 index 000000000000..7488e2e36839 --- /dev/null +++ b/release/packages/ucl/flua-all.ucl @@ -0,0 +1,32 @@ +/* + * SPDX-License-Identifier: ISC + * + * Copyright (c) 2025 Lexi Winter + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +comment = "Private Lua implementation" + +desc = < + * + * 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. + */ + + +deps { + # Quite a few tests require flua. + "flua" { + version = "${VERSION}" + }, +} + + From nobody Sun Oct 26 02:28:05 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cvLCV064Hz6Dgtc; Sun, 26 Oct 2025 02:28:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cvLCT57RBz3H96; Sun, 26 Oct 2025 02:28:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761445685; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tLxeNk3Ft+dXEn6eNf3vgd3r/ffzPw/Ry7SZeSEX7OE=; b=I1zyKTu0YkFmz7NVWQQF7mrjuTkOvvX/+Q/FTTgfNCq15L54j0LLCDy1pbcV9tAwJyoQ5p jZIbATxGKU95HtB3MKV0mQs+brce4vFmmP7B2utPADiH4BA42frqdRqXajlQkV3drXrJTf AbftC5lDm1cLjlxOY2eAZdCXcye6Evno9WHo5TTfVSln9NhzEZhVZbZwZ778yvdlnPZMSw R2ryLfu92mNDHdpMiCK8x9nhXgGX3eRkRQTHDySDQczy3iiV/a3tqDEPyZXeDpVLxRBh1A uEFq7HHRu3FdLG25OIFbKM17eABUx+rF39BGzpRAL8hdQD++zP0dsCAzNUlJXw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761445685; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tLxeNk3Ft+dXEn6eNf3vgd3r/ffzPw/Ry7SZeSEX7OE=; b=CoI6bhdEFefhk48A5Dd3D0G1pfR+VpL/zzyhN16pi81uBxAMTPkKm0GulIiaWbpNT9QVjI RSfsNDh775zCEXRrLwKb4AN61YPRKM8R5qWMqtGuEO4m+ra/FUn8U0RdhHrhXsEsQ62njQ rOKUTBI0Nb73dHrZD3Zlgp1ciNM4H71bMAX0KKh0uP7pU274f7P1WyE5eaGj2w33BSWUjx XeaUrH1gYuTJBofQRpfRCp8AwydPAyBrZOjKa3LqJ6CIeZ7RXC8VCtvlpsGLAz88HF8gsj fz6i5mKzgFVA+JTNgnT11iNshExU1C22IhuRSBrNSSNbBNzymfcTFw7Y1abrrw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761445685; a=rsa-sha256; cv=none; b=etum3PjPjU9D7fHnnym49dApuYdIoJq3BUkJfz0FTQnrqpeTWdRPCEdqKRecZm2pBNvLgX Kj/5H/bc6V7w/rTjKsfVX+luHUql0HI23G8ZJ2z+LVdVU6SCqCFF4Y1sxZFFhBsGOCSLI4 myCs5gzhYDn8H9R4TYONvfpLUsmis10pvHC+JGtQFVChyYhscDKsT7FNv+zmrtE5K8Acwe 6kflkenS/LcZk0MWc24lU1LNDp7SHlbwTwdwloWG9aXc5BoxxpaKeNi3TX8KtDV/RjpqTL bC2cA84/05moCjLhBZxzaf5IxuIvZX7oFFb2PSzUxbglOA/8qW0HQf1Hzp88Qw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cvLCT4ZXSz1C2D; Sun, 26 Oct 2025 02:28: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 59Q2S5WZ069036; Sun, 26 Oct 2025 02:28:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59Q2S5Dl069033; Sun, 26 Oct 2025 02:28:05 GMT (envelope-from git) Date: Sun, 26 Oct 2025 02:28:05 GMT Message-Id: <202510260228.59Q2S5Dl069033@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Lexi Winter Subject: git: 8a9d29bedab5 - main - packages: Put dhclient in the minimal-jail set List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ivy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8a9d29bedab597df6bfd4fab1b1bb023f8375a1f Auto-Submitted: auto-generated The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=8a9d29bedab597df6bfd4fab1b1bb023f8375a1f commit 8a9d29bedab597df6bfd4fab1b1bb023f8375a1f Author: Lexi Winter AuthorDate: 2025-10-25 17:26:20 +0000 Commit: Lexi Winter CommitDate: 2025-10-26 02:22:47 +0000 packages: Put dhclient in the minimal-jail set This is somewhat widely used in VNET jails, it's fairly small (150kB on amd64) and it's enough of a core system component that it's reasonable to include, even if many jails don't require it. MFC after: 3 days Reviewed by: dch Sponsored by: https://www.patreon.com/bsdivy Differential Revision: https://reviews.freebsd.org/D53154 --- release/packages/ucl/dhclient-all.ucl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/packages/ucl/dhclient-all.ucl b/release/packages/ucl/dhclient-all.ucl index bae3c7d7c413..b540a23eeb71 100644 --- a/release/packages/ucl/dhclient-all.ucl +++ b/release/packages/ucl/dhclient-all.ucl @@ -46,5 +46,5 @@ EOD licenses = [ "BSD-3-Clause" ] annotations { - set = minimal + set = "minimal,minimal-jail" } From nobody Sun Oct 26 02:28:06 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cvLCZ2wpFz6Dgr9; Sun, 26 Oct 2025 02: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cvLCW1TC1z3HFZ; Sun, 26 Oct 2025 02: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=1761445687; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oeifbK/PYiuAjU6VSFFTgoTj+Ude4hRi42p4kjShDMc=; b=XO6GfO5z0okCHeayWlQRzKZqlCFv8qcwFPxts7DOaYpVw+hxJ4F2dH+agwh4qG5SL+O4xW 5HJju42eH8mUp5vE3g1NB6M9o3mkcHGFrUmqSY2My0CAQtnxKtXRhbjhiaRPh973w+KW8D p82CWB2/68lRAxbo4vIJmxL/trKlbjrwNhhi2+jrc2CG0nR5KKLM4gRJMHgrWdBKlKqr+N 8Zfe9jWrwN9xYOPgUQLijSDOk4zcqHzxu/05b7kbAM9PXA5kTK6L9u7nH7rN5+oIBy60fd UVvaaOgY9TYJFDrF9V053N8Sz4LP7+4e3rTzDMCgIo7GKNA8q4MbSWH5TKYWKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761445687; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oeifbK/PYiuAjU6VSFFTgoTj+Ude4hRi42p4kjShDMc=; b=S04Dblk+QeiTmDkEQNLR3LQEwiEGHwN8Z+aUhIMGqxFL+CHcBSs9iMiwqt5BVouTPx5jbX KBowDB//YTlub7Bx13RMJoTPfk/QMhAH/ONh1ATCDlOOpO75b3jE7hS1LhAuYgw7+eNEEQ Rak9Duo1k5M1POoMTTVhqthd02TgKf4H/psFOhscBxhRR7ol7UjhPAyK2CJwriiFqohW2T yqt7bOhK43UkLLtbKMc4H4KWktOkkbiEmd3zndzoQenZcrpFoS8vaaCMQgF6xiRq6fkq3R 6mhi4kd4S5DsxO1WF+pjEpelhVYnX+/Ff6wqvh8ev/HW80n6txh0W1D6/l1iHA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761445687; a=rsa-sha256; cv=none; b=KspMX/INDARK8UTt7DcFKAgskcYhiCRNWJLyWMnwzniLo1k/sHfE/jbv7YkY1szQ9+G68K ae4TUiiKaykOgreCfQrREUJlzeqadBezjrHBKIgikiNlmdL14NC5sHS5ijgoTU9jBywo0L XlPCEimZkFrWb8AGp1pT+tV7Kj2GRAEujErMQNAqnclqug2A8o46a7kX76LmX50wPZtfb9 y1dZpywHO25Oxp/B34psnlKZygkJ/U3qxv70MAo1WLfh4i3WK45dep90KFGhYhgGPeitqp cz5L5TTlUzd8IfPezseOFyNaN6LhRwmC+EZ0TiFpVamgID9FaZ4IgJroXabVZg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cvLCV6F7Dz1CGw; Sun, 26 Oct 2025 02:28: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 59Q2S6fa069078; Sun, 26 Oct 2025 02:28:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59Q2S6W6069075; Sun, 26 Oct 2025 02:28:06 GMT (envelope-from git) Date: Sun, 26 Oct 2025 02:28:06 GMT Message-Id: <202510260228.59Q2S6W6069075@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Lexi Winter Subject: git: 82f96b2bc983 - main - share/man/man5: Use MANGROUPS.yes List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ivy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 82f96b2bc983163a890f1782d3091701498b78a2 Auto-Submitted: auto-generated The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=82f96b2bc983163a890f1782d3091701498b78a2 commit 82f96b2bc983163a890f1782d3091701498b78a2 Author: Lexi Winter AuthorDate: 2025-10-25 17:27:23 +0000 Commit: Lexi Winter CommitDate: 2025-10-26 02:25:58 +0000 share/man/man5: Use MANGROUPS.yes Simplify the Makefile logic by using MANGROUPS.yes for optional packages. Also, move bluetooth manpages to the correct package, add the correct conditional for OpenSSH (MK_OPENSSH), and properly alphabetise the file. MFC after: 3 days Reviewed by: emaste Sponsored by: https://www.patreon.com/bsdivy Differential Revision: https://reviews.freebsd.org/D53127 --- share/man/man5/Makefile | 70 ++++++++++++++++++++++--------------------------- 1 file changed, 32 insertions(+), 38 deletions(-) diff --git a/share/man/man5/Makefile b/share/man/man5/Makefile index c13a8b7afde2..abf4b59d184b 100644 --- a/share/man/man5/Makefile +++ b/share/man/man5/Makefile @@ -43,20 +43,6 @@ MAN= a.out.5 \ style.mdoc.5 \ sysctl.conf.5 \ -.if ${MK_BLUETOOTH} != "no" -MAN+= bluetooth.device.conf.5 \ - bluetooth.hosts.5 \ - bluetooth.protocols.5 -.endif - -.if ${MK_FREEBSD_UPDATE} != "no" -MAN+= freebsd-update.conf.5 -.endif - -.if ${MK_HESIOD} != "no" -MAN+= hesiod.conf.5 -.endif - MLINKS= dir.5 dirent.5 MLINKS+=fs.5 inode.5 MLINKS+=hosts.equiv.5 rhosts.5 @@ -69,37 +55,46 @@ MANGROUPS+= ACCT ACCT= acct.5 ACCTPACKAGE= acct -MANGROUPS+= BOOTLOADER +MANGROUPS.${MK_BLUETOOTH}+= BLUETOOTH +BLUETOOTHPACKAGE= bluetooth +BLUETOOTH= bluetooth.device.conf.5 \ + bluetooth.hosts.5 \ + bluetooth.protocols.5 + +MANGROUPS+= BOOTLOADER +BOOTLOADERPACKAGE= bootloader BOOTLOADER= device.hints.5 -BOOTLOADERPACKAGE=bootloader -.if ${MK_TOOLCHAIN} != "no" -MANGROUPS+= TOOLCHAIN +MANGROUPS.${MK_FREEBSD_UPDATE}+= FREEBSD_UPDATE +FREEBSD_UPDATE= freebsd-update.conf.5 + +MANGROUPS.${MK_HESIOD}+= HESIOD +HESIOD= hesiod.conf.5 + +MANGROUPS.${MK_TOOLCHAIN}+= TOOLCHAIN +TOOLCHAINPACKAGE= toolchain TOOLCHAIN= ar.5 -TOOLCHAINPACKAGE=toolchain -.endif -MANGROUPS+= LP +MANGROUPS+= LP +LPPACKAGE= lp LP= hosts.lpd.5 -LPPACKAGE= lp -MANGROUPS+= PERIODIC +MANGROUPS+= PERIODIC +PERIODICPACKAGE= periodic PERIODIC= periodic.conf.5 -PERIODICPACKAGE=periodic -.if ${MK_PF} != "no" -MANGROUPS+= PF +MANGROUPS.${MK_PF}+= PF +PFPACKAGE= pf PF= pf.conf.5 \ pf.os.5 -PFPACKAGE= pf -.endif -MANGROUPS+= RC +MANGROUPS+= RC +RCPACKAGE= rc RC= rc.conf.5 RCLINKS= rc.conf.5 rc.conf.local.5 -RCPACKAGE= rc -MANGROUPS+= RUNTIME +MANGROUPS+= RUNTIME +RUNTIMEPACKAGE= runtime RUNTIME= devfs.conf.5 \ devfs.rules.5 \ fstab.5 \ @@ -107,19 +102,18 @@ RUNTIME= devfs.conf.5 \ RUNTIMELINKS= passwd.5 master.passwd.5 RUNTIMELINKS+= passwd.5 pwd.db.5 RUNTIMELINKS+= passwd.5 spwd.db.5 -RUNTIMEPACKAGE= runtime -MANGROUPS+= SMB +MANGROUPS+= SMB +SMBPACKAGE= smbutils SMB= nsmb.conf.5 -SMBPACKAGE= smbutils -MANGROUPS+= SSH +MANGROUPS.${MK_OPENSSH}+= SSH +SSHPACKAGE= ssh SSH= moduli.5 -SSHPACKAGE= ssh -MANGROUPS+= UFS +MANGROUPS+= UFS +UFSPACKAGE= ufs UFS= fs.5 -UFSPACKAGE= ufs # This makes more sense for amd64 and i386 but # we decide to install all manpages in all architectures From nobody Sun Oct 26 02:28:08 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cvLCZ6Dgnz6Dh7R; Sun, 26 Oct 2025 02: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cvLCZ4QkCz3H9K; Sun, 26 Oct 2025 02:28:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761445690; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Tu0fLkW5G+guSeJtRo1tKaExP9PzQ/fGW7wqjVzFbWg=; b=m8/vNoZZyJwCz9xmkwLjbbVwctC6QdtufgR8QBYN749YtD43dQfvyMteA5t3VQDzOw1gMX M3VWaHeyUw2shs7eFEU6BqMm68I+3wgnypSO0owWt979/vl1JqxSHt/mntaJ9YxlWaxVol hW/0HhfO5c2yEY4iwyKwZzBG/CUxcTFbpvm3b1JyzvxJPoCmly0l2g6UXh17DKcL2lz0Is QBe6sx0RHoB9N44jtzU/NycI4obTshThoefYCYsikFN4B5O/4vHMzVhiHZE+n5V77QE1zZ 6vQG+LekWMrB5k1LOBC0WWxzuzqXM0C0CTgEfhAtGEMT8EEUfdDwgDQMdCOKQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761445690; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Tu0fLkW5G+guSeJtRo1tKaExP9PzQ/fGW7wqjVzFbWg=; b=rZ+gFP4ejYdQFXQ+H2XEtZheojHYyTMECHXoGfcNgvNqMu+4r/Io+xWsE4j2QK61qLZeVh 6aaBOUstDr0BvCUmrcj25sHp2hgocxQbIW0ol4hBBugKEznZSyucrnDQfYvgAinwaQ5fAu pGD9AF8QHJ/r2sjglvXT4GbS775HQHOv406Vn9i6ATpto13pMlyicwPGYw6DgCyiwFN2Z3 fkRmr2fgqw1yFWGTx4vWv0TRMCQQaXUIUPh/pnoOGGRoS5b9M3UOGPPovc+Kkwe5yg2PBh tKo95PRYcLS36qKN5orrKsJEoWbkdgVo9WHmvLlnbVGJLoDZsOwC50DzsRKCRQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761445690; a=rsa-sha256; cv=none; b=PIz4yN0RTF/uG5FA9ktwPYQy/AiOaMveraOcuI864fPv9bn+ZeFFKEXOZbSbqWsy6PAflg eBJL1cAb1ihQoP/0QNgCdPllVAW4Hv7Uq8jTGwuxph4dqs+AA4nOl4q0VfBoBP/HfW06I2 5AamngATIWaNFZeN2nplEG+s7zOU80mr0Ac1vNvCNcbJzxJzVpI+RyKcUU98lNqhvEXjZV +yUj1BCU3UkZbignkISUVlrI/Q8lZAB1BNt/cjyivI9Xc3oLkQ4jmi895gkZ7nsYdk1z4D /GsMOGzFTFB5RwPb24cS4IjQ8pBokaOq3eSphdgIZCM+nb3ePC7FyiQyQPOTkQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cvLCX6M2xz1Cmm; Sun, 26 Oct 2025 02: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 59Q2S825069147; Sun, 26 Oct 2025 02: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 59Q2S8bP069144; Sun, 26 Oct 2025 02:28:08 GMT (envelope-from git) Date: Sun, 26 Oct 2025 02:28:08 GMT Message-Id: <202510260228.59Q2S8bP069144@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Lexi Winter Subject: git: 450fb637f453 - main - mandoc: Also run makewhatis for /usr/share/openssl/man List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ivy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 450fb637f453c3722aa9f0aeb369e2aa2f5a5001 Auto-Submitted: auto-generated The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=450fb637f453c3722aa9f0aeb369e2aa2f5a5001 commit 450fb637f453c3722aa9f0aeb369e2aa2f5a5001 Author: Lexi Winter AuthorDate: 2025-10-25 17:30:03 +0000 Commit: Lexi Winter CommitDate: 2025-10-26 02:26:06 +0000 mandoc: Also run makewhatis for /usr/share/openssl/man We use a pkg(8) trigger to run makewhatis for /usr/share/man when manpages are updated, but this doesn't cover /usr/share/openssl/man. Rewrite the trigger to process a list of directories instead of a single directory, and include /usr/share/openssl/man in the list. MFC after: 3 days Reviewed by: emaste Sponsored by: https://www.patreon.com/bsdivy Differential Revision: https://reviews.freebsd.org/D53064 --- usr.bin/mandoc/mandoc.ucl | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/usr.bin/mandoc/mandoc.ucl b/usr.bin/mandoc/mandoc.ucl index f320b6f547fd..75b8123d55cc 100644 --- a/usr.bin/mandoc/mandoc.ucl +++ b/usr.bin/mandoc/mandoc.ucl @@ -1,10 +1,14 @@ -path_glob: "/usr/share/man/*" +path_glob: [ + "/usr/share/man/*", + "/usr/share/openssl/man/*", +] cleanup: { type: lua sandbox: false script: < To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Lexi Winter Subject: git: bf28c98f14b4 - main - packages: dhclient, local-unbound require resolvconf List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ivy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bf28c98f14b439796b395eb4bf9070e4f7cffd68 Auto-Submitted: auto-generated The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=bf28c98f14b439796b395eb4bf9070e4f7cffd68 commit bf28c98f14b439796b395eb4bf9070e4f7cffd68 Author: Lexi Winter AuthorDate: 2025-10-25 17:28:28 +0000 Commit: Lexi Winter CommitDate: 2025-10-26 02:26:06 +0000 packages: dhclient, local-unbound require resolvconf Both of these packages use resolvconf for various things. Add a dependency to make this work. MFC after: 3 days Reviewed by: des Sponsored by: https://www.patreon.com/bsdivy Differential Revision: https://reviews.freebsd.org/D53115 --- release/packages/ucl/dhclient.ucl | 26 ++++++++++++++++++++++++++ release/packages/ucl/local-unbound.ucl | 8 ++++++++ 2 files changed, 34 insertions(+) diff --git a/release/packages/ucl/dhclient.ucl b/release/packages/ucl/dhclient.ucl new file mode 100644 index 000000000000..f15ca8703edf --- /dev/null +++ b/release/packages/ucl/dhclient.ucl @@ -0,0 +1,26 @@ +/* + * SPDX-License-Identifier: ISC + * + * Copyright (c) 2025 Lexi Winter + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +deps { + # dhclient uses resolvconf to update /etc/resolv.conf in case the + # DHCP server returns nameserver addresses. + "resolvconf" { + version = "${VERSION}" + }, +} + diff --git a/release/packages/ucl/local-unbound.ucl b/release/packages/ucl/local-unbound.ucl index 0f1c77a0d0ee..34d4c3664c9e 100644 --- a/release/packages/ucl/local-unbound.ucl +++ b/release/packages/ucl/local-unbound.ucl @@ -25,3 +25,11 @@ by running "service local_unbound setup" before restarting the service. EOM } ] + +deps { + # local-unbound uses resolvconf to update resolv.conf and to generate + # its forward.conf. + "resolvconf" { + version = "${VERSION}" + }, +} From nobody Sun Oct 26 02:28:09 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cvLCZ6h13z6Dh53; Sun, 26 Oct 2025 02: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cvLCZ4QgBz3H4p; Sun, 26 Oct 2025 02:28:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761445690; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4IpnMUZMFHACXzxrhyo50BTgccnXAQTXhXnozRnls3I=; b=yZF0+CcJVDUCo0/6g8n6PFfLQe+2fyVeCr35rjEsKoyIfwTnwMYMC7S+KsZKJDZJsFbVA1 4/FHPl+CSikMKJ9b4d54kLh+9uwo34ppFwwzFhnIz6w3VTcSarh1msf25XIFutvWk5ivKm cVY1A7wZDWW/WZp/VhHZCxGD8x/Hb1FHMlytDFzjxoycezxPmQweG91HUa/BfC3xhpfgKb f8vZLMJBzkVY1nJ0m/inp9JSfKMfJX9rMk8wGx8t02qHIMjBvfT2XRqf1WjcujdZwoMStq HkMhjEqD8VQ/S8cyceNjbDyapQ4WuxB4xAyRbhj3nGiWbfOna3HKwifjWFAO8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761445690; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4IpnMUZMFHACXzxrhyo50BTgccnXAQTXhXnozRnls3I=; b=o0ThC/YTbg8eQ6k9LMVpmMXHPJhJfgPTOkFtJ56A4M/Uehyb8hU0qYv227u/7rxrQH6JqJ PTIghCMAqyIWWH+TVHldglPbDVpqm16FcwUJcEEqFCJPHeYB00R5N8N83ebthhFI/vFjTx iWKXQFDrr0QUZM5KvOa6G80K7uQGW9tIwzKjMKhaxmbQp4D5hH0OjL5q4DecFzeIMkuMYN f5tpWmawzmf6DLBuK90KyATgRTg0YDQO0i5qv8ejlz6xWmW6yEQLdtkP7KzaqHzVRjhBm6 qSHfdYfPyDxL1tfHKfQ+WOW0QGwPFX2zGuXt8fPYwYDBXp2UFfvUFDqbMoPpFQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761445690; a=rsa-sha256; cv=none; b=XduqbKm5PKxZCdSPnPldFjK5pbbNorSXURj+gh4ya8L9Uyl2A3R2Ij1a2WthBQ2xglAwYo j1meDuAhazM8Ink2MvGr+NhZOej6Rejnv3uozjNWybx+KsccJyQHVkfkJKFIQt5D+9IOOD CFc3G6tVjtwhvuYu1Rvut4Ij0IysEDNgycwYnC/FInS4KYFsLzytbcW8fPOnXSDVCBnGDQ w5C56D5CyBGJNahZvmNLARKbkPUZPgeVkNgX1V5xa+ueiZyp7sstVaOMBeiv81sPvZ93d4 FPBnnXGUgOwtuFADHy8mCnFV71f6ocKLX3WpTq2Zpbwb004kGWgR3YhqF0FoXA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cvLCZ0Y8Mz1CML; Sun, 26 Oct 2025 02:28:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59Q2S9F7069181; Sun, 26 Oct 2025 02: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 59Q2S9Rf069178; Sun, 26 Oct 2025 02:28:09 GMT (envelope-from git) Date: Sun, 26 Oct 2025 02:28:09 GMT Message-Id: <202510260228.59Q2S9Rf069178@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Lexi Winter Subject: git: 031e711647c3 - main - packages: Install development manpages in the -dev package List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ivy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 031e711647c3edc3021c1029496d6798a632697e Auto-Submitted: auto-generated The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=031e711647c3edc3021c1029496d6798a632697e commit 031e711647c3edc3021c1029496d6798a632697e Author: Lexi Winter AuthorDate: 2025-10-25 17:33:04 +0000 Commit: Lexi Winter CommitDate: 2025-10-26 02:26:06 +0000 packages: Install development manpages in the -dev package Add a new per-group SUBPACKAGE option to bsd.man.mk. When MANSPLITPKG is enabled, this is forced to "-man", otherwise it defaults to empty but can be overridden by the caller. Use this in bsd.lib.mk to install library manpages in the -dev package instead of the base package. This is nearly always preferable, since library manpages are usually in section 2 or 3 and are only relevant to people with development packages installed. For manpages which should be installed in the base package even for libraries, add a new MANNODEV group in bsd.lib.mk. Update existing Makefiles to use this where appropriate. MFC after: 3 days Discussed with: olce Reviewed by: olce Sponsored by: https://www.patreon.com/bsdivy Differential Revision: https://reviews.freebsd.org/D52832 --- lib/geom/Makefile.inc | 11 ++- lib/libarchive/Makefile | 9 +- lib/libc/locale/Makefile.inc | 2 +- lib/libc/posix1e/Makefile.inc | 3 +- lib/libc/regex/Makefile.inc | 8 +- lib/libc/rpc/Makefile.inc | 4 +- lib/libedit/Makefile | 6 +- lib/libmagic/Makefile | 8 +- lib/libpam/libpam/Makefile | 6 +- lib/libpam/static_libpam/Makefile | 1 + lib/libpcap/Makefile | 13 +-- lib/libradius/Makefile | 4 +- lib/libtacplus/Makefile | 4 +- lib/libutil/Makefile | 3 +- lib/libwrap/Makefile | 17 ++-- lib/libxo/libxo/Makefile | 2 +- lib/ncurses/tinfo/Makefile | 6 +- lib/nss_tacplus/Makefile | 2 +- share/man/man3/Makefile | 1 + share/man/man9/Makefile | 2 +- share/mk/bsd.lib.mk | 13 ++- share/mk/bsd.man.mk | 26 +++-- usr.sbin/bsnmpd/bsnmpd/Makefile | 203 +++++++++++++++++++------------------- 23 files changed, 199 insertions(+), 155 deletions(-) diff --git a/lib/geom/Makefile.inc b/lib/geom/Makefile.inc index 35163127538d..75d312a94fe4 100644 --- a/lib/geom/Makefile.inc +++ b/lib/geom/Makefile.inc @@ -1,10 +1,11 @@ .include -SHLIBDIR=${GEOM_CLASS_DIR} -SHLIB_NAME?=geom_${GEOM_CLASS}.so -MAN= g${GEOM_CLASS}.8 -SRCS+= geom_${GEOM_CLASS}.c subr.c -CFLAGS+=-I${SRCTOP}/sbin/geom +SHLIBDIR= ${GEOM_CLASS_DIR} +SHLIB_NAME?= geom_${GEOM_CLASS}.so +MANNODEV= g${GEOM_CLASS}.8 + +SRCS+= geom_${GEOM_CLASS}.c subr.c +CFLAGS+= -I${SRCTOP}/sbin/geom .PATH: ${SRCTOP}/sbin/geom/misc diff --git a/lib/libarchive/Makefile b/lib/libarchive/Makefile index fed73c388318..4e32dcf72341 100644 --- a/lib/libarchive/Makefile +++ b/lib/libarchive/Makefile @@ -184,12 +184,13 @@ MAN= archive_entry.3 \ archive_write_new.3 \ archive_write_open.3 \ archive_write_set_options.3 \ - cpio.5 \ libarchive.3 \ libarchive_changes.3 \ - libarchive_internals.3 \ - libarchive-formats.5 \ - tar.5 + libarchive_internals.3 + +MANNODEV= cpio.5 \ + libarchive-formats.5 \ + tar.5 # Symlink the man pages under each function name. MLINKS+= archive_entry.3 archive_entry_clear.3 diff --git a/lib/libc/locale/Makefile.inc b/lib/libc/locale/Makefile.inc index 33caafc5c10a..127f8fc67abc 100644 --- a/lib/libc/locale/Makefile.inc +++ b/lib/libc/locale/Makefile.inc @@ -46,7 +46,7 @@ MAN+= btowc.3 \ wctrans.3 wctype.3 wcwidth.3 \ duplocale.3 freelocale.3 newlocale.3 querylocale.3 uselocale.3 xlocale.3 -MAN+= big5.5 euc.5 gb18030.5 gb2312.5 gbk.5 mskanji.5 utf8.5 +MANNODEV+= big5.5 euc.5 gb18030.5 gb2312.5 gbk.5 mskanji.5 utf8.5 MLINKS+=btowc.3 wctob.3 MLINKS+=digittoint.3 digittoint_l.3 diff --git a/lib/libc/posix1e/Makefile.inc b/lib/libc/posix1e/Makefile.inc index 934998cdd092..48f6c1ddf884 100644 --- a/lib/libc/posix1e/Makefile.inc +++ b/lib/libc/posix1e/Makefile.inc @@ -84,7 +84,6 @@ MAN+= acl.3 \ acl_valid.3 \ extattr.3 \ mac.3 \ - mac.conf.5 \ mac_free.3 \ mac_is_present.3 \ mac_get.3 \ @@ -134,4 +133,6 @@ MLINKS+=acl_create_entry.3 acl_create_entry_np.3\ mac_text.3 mac_from_text.3 \ mac_text.3 mac_to_text.3 +MANNODEV+= mac.conf.5 + CLEANFILES+= subr_acl_nfs4.c diff --git a/lib/libc/regex/Makefile.inc b/lib/libc/regex/Makefile.inc index 89468f1317f6..e3417a3d9983 100644 --- a/lib/libc/regex/Makefile.inc +++ b/lib/libc/regex/Makefile.inc @@ -9,9 +9,9 @@ SYM_MAPS+=${LIBC_SRCTOP}/regex/Symbol.map # manpages only included in libc version .if ${LIB} == "c" -MAN+= regex.3 -MAN+= re_format.7 +MAN+= regex.3 +MLINKS+= regex.3 regcomp.3 regex.3 regexec.3 regex.3 regerror.3 +MLINKS+= regexec.3 regfree.3 -MLINKS+=regex.3 regcomp.3 regex.3 regexec.3 regex.3 regerror.3 -MLINKS+=regexec.3 regfree.3 +MANNODEV+= re_format.7 .endif diff --git a/lib/libc/rpc/Makefile.inc b/lib/libc/rpc/Makefile.inc index 87963d10eec1..c22fac2c0e16 100644 --- a/lib/libc/rpc/Makefile.inc +++ b/lib/libc/rpc/Makefile.inc @@ -42,12 +42,12 @@ crypt_xdr.c: ${RPCDIR}/crypt.x crypt.h crypt.h: ${RPCDIR}/crypt.x ${RPCGEN} -h -o ${.TARGET} ${RPCDIR}/crypt.x + MAN+= bindresvport.3 des_crypt.3 getnetconfig.3 getnetpath.3 getrpcent.3 \ getrpcport.3 rpc.3 rpc_soc.3 rpc_clnt_auth.3 rpc_clnt_calls.3 \ rpc_clnt_create.3 rpc_svc_calls.3 rpc_svc_create.3 rpc_svc_err.3 \ rpc_svc_reg.3 rpc_xdr.3 rpcbind.3 publickey.3 rpc_secure.3 \ rtime.3 -MAN+= rpc.5 netconfig.5 MLINKS+= bindresvport.3 bindresvport_sa.3 \ des_crypt.3 ecb_crypt.3 \ des_crypt.3 cbc_crypt.3 \ @@ -177,3 +177,5 @@ MLINKS+= bindresvport.3 bindresvport_sa.3 \ rpc_soc.3 xdr_authunix_parms.3 \ rpc_soc.3 xdr_pmap.3 \ rpc_soc.3 xdr_pmaplist.3 + +MANNODEV+= rpc.5 netconfig.5 diff --git a/lib/libedit/Makefile b/lib/libedit/Makefile index c7a54253dae9..9161e05a7d36 100644 --- a/lib/libedit/Makefile +++ b/lib/libedit/Makefile @@ -15,10 +15,10 @@ SRCS= chared.c chartype.c common.c el.c eln.c emacs.c filecomplete.c \ parse.c prompt.c read.c readline.c refresh.c search.c sig.c \ terminal.c tokenizer.c tokenizern.c tty.c vi.c +MAN= editline.3 +MANNODEV= editrc.5 editline.7 -MAN= editline.3 editrc.5 editline.7 - -MLINKS= \ +MLINKS=\ editline.3 el_deletestr.3 \ editline.3 el_end.3 \ editline.3 el_get.3 \ diff --git a/lib/libmagic/Makefile b/lib/libmagic/Makefile index 150ddc686241..fe04f5ea68c8 100644 --- a/lib/libmagic/Makefile +++ b/lib/libmagic/Makefile @@ -11,7 +11,9 @@ SHLIB_MAJOR= 4 .if !make(build-tools) LIBADD= z .endif -MAN= libmagic.3 magic.5 + +MAN= libmagic.3 +MANNODEV= magic.5 SRCS= apprentice.c apptype.c ascmagic.c buffer.c cdf.c cdf_time.c \ compress.c der.c encoding.c fsmagic.c funcs.c is_json.c \ @@ -73,8 +75,8 @@ magic.mgc: mkmagic FILEVER!= awk '$$1 == "\#define" && $$2 == "VERSION" { print $$3; exit }' \ ${.CURDIR}/config.h -CLEANFILES+= ${MAN} -.for mp in ${MAN} +CLEANFILES+= ${MAN} ${MANNODEV} +.for mp in ${MAN} ${MANNODEV} ${mp}: ${mp:C/[0-9]/man/} sed -e 's/__FSECTION__/5/g' -e 's/__CSECTION__/1/g' \ -e 's/__VERSION__/${FILEVER}/g' \ diff --git a/lib/libpam/libpam/Makefile b/lib/libpam/libpam/Makefile index dd19eba5c1ec..c6db4992bb36 100644 --- a/lib/libpam/libpam/Makefile +++ b/lib/libpam/libpam/Makefile @@ -148,10 +148,10 @@ MAN?= openpam.3 \ pam_strerror.3 \ pam_verror.3 \ pam_vinfo.3 \ - pam_vprompt.3 \ - pam.conf.5 + pam_vprompt.3 -MLINKS?= pam.conf.5 pam.d.5 +MANNODEV?= pam.conf.5 +MANNODEVLINKS?= pam.conf.5 pam.d.5 CFLAGS+= -DLOCALBASE=\"${LOCALBASE:U/usr/local}\" CFLAGS+= -I${OPENPAM}/include diff --git a/lib/libpam/static_libpam/Makefile b/lib/libpam/static_libpam/Makefile index a1f0f209dea1..8830f09ef0da 100644 --- a/lib/libpam/static_libpam/Makefile +++ b/lib/libpam/static_libpam/Makefile @@ -42,6 +42,7 @@ NO_PIC= # Avoid redundancy with the master Makefile. MAN= +MANNODEV= INCS= MLINKS= MK_TESTS= no diff --git a/lib/libpcap/Makefile b/lib/libpcap/Makefile index 9ba91504852b..c4bd175b502a 100644 --- a/lib/libpcap/Makefile +++ b/lib/libpcap/Makefile @@ -109,10 +109,11 @@ MAN= pcap.3 \ pcap_strerror.3 \ pcap_tstamp_type_name_to_val.3 \ pcap_tstamp_type_val_to_name.3 \ - pcap-savefile.5 \ - pcap-filter.7 \ - pcap-linktype.7 \ - pcap-tstamp.7 + pcap-savefile.5 + +MANNODEV= pcap-filter.7 \ + pcap-linktype.7 \ + pcap-tstamp.7 MLINKS= \ pcap_datalink_val_to_name.3 pcap_datalink_val_to_description.3 \ @@ -129,7 +130,7 @@ MLINKS= \ pcap_setnonblock.3 pcap_getnonblock.3 # Our man pages are a special copy from the distdir. See below. -CLEANFILES+=${MAN} +CLEANFILES+=${MAN} ${MANNODEV} CLEANFILES+=grammar.y scanner.h tokdefs.h YFLAGS+=-p pcap_ @@ -175,7 +176,7 @@ tokdefs.h: grammar.h .NOMETA # # Magic to convert the man pages to something non Solarish # -.for _page in ${MAN} +.for _page in ${MAN} ${MANNODEV} ${_page}: if [ -f ${PCAP_DISTDIR}/${_page:S/3$/3pcap/} ]; then \ F=${_page:S/3$/3pcap/}; \ diff --git a/lib/libradius/Makefile b/lib/libradius/Makefile index 0ab83d5418b1..b6857a71260a 100644 --- a/lib/libradius/Makefile +++ b/lib/libradius/Makefile @@ -31,7 +31,9 @@ INCS= radlib.h radlib_vs.h CFLAGS+= -Wall CFLAGS+= -DOPENSSL_API_COMPAT=0x10100000L SHLIB_MAJOR= 4 -MAN= libradius.3 radius.conf.5 + +MAN= libradius.3 +MANNODEV= radius.conf.5 MLINKS+=libradius.3 rad_acct_open.3 \ libradius.3 rad_add_server.3 \ diff --git a/lib/libtacplus/Makefile b/lib/libtacplus/Makefile index 43567350aeac..2149b57b124a 100644 --- a/lib/libtacplus/Makefile +++ b/lib/libtacplus/Makefile @@ -29,7 +29,9 @@ INCS= taclib.h CFLAGS+= -Wall LIBADD= md pam SHLIB_MAJOR= 5 -MAN= libtacplus.3 tacplus.conf.5 + +MAN= libtacplus.3 +MANNODEV= tacplus.conf.5 WARNS?= 2 diff --git a/lib/libutil/Makefile b/lib/libutil/Makefile index f6251c093345..d54d9af38a34 100644 --- a/lib/libutil/Makefile +++ b/lib/libutil/Makefile @@ -147,7 +147,8 @@ MLINKS+=uucplock.3 uu_lock.3 MLINKS+=uucplock.3 uu_lock_txfr.3 MLINKS+=uucplock.3 uu_lockerr.3 MLINKS+=uucplock.3 uu_unlock.3 -MAN+= login.conf.5 + +MANNODEV= login.conf.5 HAS_TESTS= SUBDIR.${MK_TESTS}+= tests diff --git a/lib/libwrap/Makefile b/lib/libwrap/Makefile index bc39d5804637..7c302e0f0dc5 100644 --- a/lib/libwrap/Makefile +++ b/lib/libwrap/Makefile @@ -1,6 +1,3 @@ -# -# - .include PACKAGE= tcpd @@ -9,12 +6,14 @@ CONFS= hosts.allow LIB= wrap SHLIB_MAJOR= 6 INCS= tcpd.h -MAN= hosts_access.3 -MAN+= hosts_access.5 hosts_options.5 -MLINKS= hosts_access.3 hosts_ctl.3 \ - hosts_access.3 request_init.3 \ - hosts_access.3 request_set.3 \ - hosts_options.5 hosts.allow.5 + +MAN= hosts_access.3 +MLINKS= hosts_access.3 hosts_ctl.3 \ + hosts_access.3 request_init.3 \ + hosts_access.3 request_set.3 + +MANNODEV= hosts_access.5 hosts_options.5 +MANNODEVLINKS= hosts_options.5 hosts.allow.5 .PATH: ${SRCTOP}/contrib/tcp_wrappers diff --git a/lib/libxo/libxo/Makefile b/lib/libxo/libxo/Makefile index 38e6ff031c7f..9caf8a498b05 100644 --- a/lib/libxo/libxo/Makefile +++ b/lib/libxo/libxo/Makefile @@ -51,7 +51,7 @@ MAN+= xo_attr.3 \ MAN+= xo_format.5 -MAN+= xo_options.7 +MANNODEV= xo_options.7 MLINKS= xo_attr.3 xo_attr_h.3 \ xo_attr.3 xo_attr_hv.3 \ diff --git a/lib/ncurses/tinfo/Makefile b/lib/ncurses/tinfo/Makefile index 8f01557edaee..08c2311cd7a9 100644 --- a/lib/ncurses/tinfo/Makefile +++ b/lib/ncurses/tinfo/Makefile @@ -399,6 +399,7 @@ terminfo.5: MKterminfo.sh terminfo.head Caps CLEANFILES+= terminfo.5 .PATH: ${NCURSES_DIR}/man + MAN= \ curs_addch.3 \ curs_addchstr.3 \ @@ -475,8 +476,9 @@ MAN+= \ curs_printw.3 \ curs_scanw.3 -MAN+= term.5 terminfo.5 scr_dump.5 user_caps.5 -MAN+= term.7 +MAN+= scr_dump.5 + +MANNODEV= term.5 term.7 terminfo.5 user_caps.5 CLEANFILES+= ${MAN:M*.3} diff --git a/lib/nss_tacplus/Makefile b/lib/nss_tacplus/Makefile index c85297a7dbaa..e6fb934c234b 100644 --- a/lib/nss_tacplus/Makefile +++ b/lib/nss_tacplus/Makefile @@ -4,6 +4,6 @@ SHLIB_MAJOR= 1 SHLIB_NAME= ${LIB}.so.${SHLIB_MAJOR} LIBADD= tacplus MK_INSTALLLIB= no -MAN= ${LIB}.8 +MANNODEV= ${LIB}.8 .include diff --git a/share/man/man3/Makefile b/share/man/man3/Makefile index 3511acb254e1..18e439491793 100644 --- a/share/man/man3/Makefile +++ b/share/man/man3/Makefile @@ -1,6 +1,7 @@ .include PACKAGE= clibs +MANSUBPACKAGE= -dev MAN= alloca.3 \ arb.3 \ diff --git a/share/man/man9/Makefile b/share/man/man9/Makefile index 80fd8e198a5b..fecde7152f80 100644 --- a/share/man/man9/Makefile +++ b/share/man/man9/Makefile @@ -1,6 +1,6 @@ .include -PACKAGE= kernel-man +MANPACKAGE= kernel-man MAN= accept_filter.9 \ accf_data.9 \ diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk index 065e635ed43d..159957b6300b 100644 --- a/share/mk/bsd.lib.mk +++ b/share/mk/bsd.lib.mk @@ -82,7 +82,18 @@ DEV_TAG_ARGS= ${TAG_ARGS},dev .else DEV_TAG_ARGS= ${TAG_ARGS} .endif -.endif # !defined(NO_ROOT) + +.endif # defined(NO_ROOT) + +# By default, put library manpages in the -dev subpackage, since they're not +# usually interesting if the development files aren't installed. For pages +# that should be installed in the base package, define a new MANNODEV group. +# Note that bsd.man.mk ignores this setting if MANSPLITPKG is enabled: then +# manpages are always installed in the -man subpackage. +MANSUBPACKAGE?= -dev +MANGROUPS?= MAN +MANGROUPS+= MANNODEV +MANNODEVSUBPACKAGE= # ELF hardening knobs .if ${MK_BIND_NOW} != "no" diff --git a/share/mk/bsd.man.mk b/share/mk/bsd.man.mk index 1591a3e0905e..dde11afb8283 100644 --- a/share/mk/bsd.man.mk +++ b/share/mk/bsd.man.mk @@ -61,6 +61,16 @@ MANGROUPS?= MAN +# MAN_SUBPACKAGE is the subpackage manpages will be installed in. When +# MANSPLITPKG is enabled, this is ignored and the subpackage is forced +# to be "-man", otherwise it defaults to empty so manpages go in the +# base package. This can be set to "-dev" for manpages that should go +# in the -dev package. +MAN_SUBPACKAGE?= + +# The default man package, if not otherwise specified. +MAN_PACKAGE= ${PACKAGE:Uutilities} + # Backwards compatibility. MINSTALL?= ${MANINSTALL} @@ -113,17 +123,19 @@ manlinksinstall: manlinksinstall-${__group} ${__group}OWN?= ${MANOWN} ${__group}GRP?= ${MANGRP} ${__group}MODE?= ${MANMODE} -${__group}PACKAGE?= ${PACKAGE:Uutilities} +# If MANSPLITPKG is enabled, ignore the requested man subpackage and put the +# manpages in -man instead. +.if ${MK_MANSPLITPKG} == "yes" +${__group}SUBPACKAGE= -man +.else +${__group}SUBPACKAGE?= ${MAN_SUBPACKAGE} +.endif +${__group}PACKAGE?= ${MAN_PACKAGE}${${__group}SUBPACKAGE} # Tag processing is only done for NO_ROOT installs. .if defined(NO_ROOT) - .if !defined(${__group}TAGS) || ! ${${__group}TAGS:Mpackage=*} -.if ${MK_MANSPLITPKG} == "no" || ${${__group}PACKAGE:M*-man} -${__group}TAGS+= package=${${__group}PACKAGE} -.else -${__group}TAGS+= package=${${__group}PACKAGE}-man -.endif +${__group}TAGS+= package=${${__group}PACKAGE} .endif ${__group}TAG_ARGS= -T ${${__group}TAGS:ts,:[*]} diff --git a/usr.sbin/bsnmpd/bsnmpd/Makefile b/usr.sbin/bsnmpd/bsnmpd/Makefile index 601fc31ec475..0943c49c1ca1 100644 --- a/usr.sbin/bsnmpd/bsnmpd/Makefile +++ b/usr.sbin/bsnmpd/bsnmpd/Makefile @@ -17,105 +17,110 @@ XSYM= snmpMIB begemotSnmpdModuleTable begemotSnmpd begemotTrapSinkTable \ freeBSD freeBSDVersion begemotSnmpdTransInet CLEANFILES= oid.h tree.c tree.h -MAN= bsnmpd.1 snmpmod.3 - -MLINKS+= snmpmod.3 FIND_OBJECT_INT.3 -MLINKS+= snmpmod.3 FIND_OBJECT_INT_LINK.3 -MLINKS+= snmpmod.3 FIND_OBJECT_INT_LINK_INDEX.3 -MLINKS+= snmpmod.3 FIND_OBJECT_OID.3 -MLINKS+= snmpmod.3 FIND_OBJECT_OID_LINK.3 -MLINKS+= snmpmod.3 FIND_OBJECT_OID_LINK_INDEX.3 -MLINKS+= snmpmod.3 INSERT_OBJECT_INT.3 -MLINKS+= snmpmod.3 INSERT_OBJECT_INT_LINK.3 -MLINKS+= snmpmod.3 INSERT_OBJECT_INT_LINK_INDEX.3 -MLINKS+= snmpmod.3 INSERT_OBJECT_OID.3 -MLINKS+= snmpmod.3 INSERT_OBJECT_OID_LINK.3 -MLINKS+= snmpmod.3 INSERT_OBJECT_OID_LINK_INDEX.3 -MLINKS+= snmpmod.3 NEXT_OBJECT_INT.3 -MLINKS+= snmpmod.3 NEXT_OBJECT_INT_LINK.3 -MLINKS+= snmpmod.3 NEXT_OBJECT_INT_LINK_INDEX.3 -MLINKS+= snmpmod.3 NEXT_OBJECT_OID.3 -MLINKS+= snmpmod.3 NEXT_OBJECT_OID_LINK.3 -MLINKS+= snmpmod.3 NEXT_OBJECT_OID_LINK_INDEX.3 -MLINKS+= snmpmod.3 bsnmpd_get_target_stats.3 -MLINKS+= snmpmod.3 bsnmpd_get_usm_stats.3 -MLINKS+= snmpmod.3 bsnmpd_reset_usm_stats.3 -MLINKS+= snmpmod.3 buf_alloc.3 -MLINKS+= snmpmod.3 buf_size.3 -MLINKS+= snmpmod.3 comm_define.3 -MLINKS+= snmpmod.3 community.3 -MLINKS+= snmpmod.3 fd_deselect.3 -MLINKS+= snmpmod.3 fd_resume.3 -MLINKS+= snmpmod.3 fd_select.3 -MLINKS+= snmpmod.3 fd_suspend.3 -MLINKS+= snmpmod.3 get_ticks.3 -MLINKS+= snmpmod.3 index_append.3 -MLINKS+= snmpmod.3 index_append_off.3 -MLINKS+= snmpmod.3 index_compare.3 -MLINKS+= snmpmod.3 index_compare_off.3 -MLINKS+= snmpmod.3 index_decode.3 -MLINKS+= snmpmod.3 ip_commit.3 -MLINKS+= snmpmod.3 ip_get.3 -MLINKS+= snmpmod.3 ip_rollback.3 -MLINKS+= snmpmod.3 ip_save.3 -MLINKS+= snmpmod.3 or_register.3 -MLINKS+= snmpmod.3 or_unregister.3 -MLINKS+= snmpmod.3 oid_commit.3 -MLINKS+= snmpmod.3 oid_get.3 -MLINKS+= snmpmod.3 oid_rollback.3 -MLINKS+= snmpmod.3 oid_save.3 -MLINKS+= snmpmod.3 oid_usmNotInTimeWindows.3 -MLINKS+= snmpmod.3 oid_usmUnknownEngineIDs.3 -MLINKS+= snmpmod.3 oid_zeroDotZero.3 -MLINKS+= snmpmod.3 reqid_allocate.3 -MLINKS+= snmpmod.3 reqid_base.3 -MLINKS+= snmpmod.3 reqid_istype.3 -MLINKS+= snmpmod.3 reqid_next.3 -MLINKS+= snmpmod.3 reqid_type.3 -MLINKS+= snmpmod.3 snmp_input_finish.3 -MLINKS+= snmpmod.3 snmp_input_start.3 -MLINKS+= snmpmod.3 snmp_output.3 -MLINKS+= snmpmod.3 snmp_pdu_auth_access.3 -MLINKS+= snmpmod.3 snmp_send_port.3 -MLINKS+= snmpmod.3 snmp_send_trap.3 -MLINKS+= snmpmod.3 snmpd_target_stat.3 -MLINKS+= snmpmod.3 snmpd_usmstats.3 -MLINKS+= snmpmod.3 start_tick.3 -MLINKS+= snmpmod.3 string_commit.3 -MLINKS+= snmpmod.3 string_free.3 -MLINKS+= snmpmod.3 string_get.3 -MLINKS+= snmpmod.3 string_get_max.3 -MLINKS+= snmpmod.3 string_rollback.3 -MLINKS+= snmpmod.3 string_save.3 -MLINKS+= snmpmod.3 systemg.3 -MLINKS+= snmpmod.3 this_tick.3 -MLINKS+= snmpmod.3 timer_start.3 -MLINKS+= snmpmod.3 timer_start_repeat.3 -MLINKS+= snmpmod.3 timer_stop.3 -MLINKS+= snmpmod.3 target_activate_address.3 -MLINKS+= snmpmod.3 target_address.3 -MLINKS+= snmpmod.3 target_delete_address.3 -MLINKS+= snmpmod.3 target_delete_notify.3 -MLINKS+= snmpmod.3 target_delete_param.3 -MLINKS+= snmpmod.3 target_first_address.3 -MLINKS+= snmpmod.3 target_first_notify.3 -MLINKS+= snmpmod.3 target_first_param.3 -MLINKS+= snmpmod.3 target_flush_all.3 -MLINKS+= snmpmod.3 target_next_address.3 -MLINKS+= snmpmod.3 target_next_notify.3 -MLINKS+= snmpmod.3 target_next_param.3 -MLINKS+= snmpmod.3 target_new_address.3 -MLINKS+= snmpmod.3 target_new_notify.3 -MLINKS+= snmpmod.3 target_new_param.3 -MLINKS+= snmpmod.3 target_notify.3 -MLINKS+= snmpmod.3 target_param.3 -MLINKS+= snmpmod.3 usm_delete_user.3 -MLINKS+= snmpmod.3 usm_find_user.3 -MLINKS+= snmpmod.3 usm_first_user.3 -MLINKS+= snmpmod.3 usm_flush_users.3 -MLINKS+= snmpmod.3 usm_next_user.3 -MLINKS+= snmpmod.3 usm_new_user.3 -MLINKS+= snmpmod.3 usm_user.3 +MANGROUPS= MAN MAN3 + +MAN= bsnmpd.1 + +MAN3= snmpmod.3 +MAN3SUBPACKAGE=-dev + +MAN3LINKS+= snmpmod.3 FIND_OBJECT_INT.3 +MAN3LINKS+= snmpmod.3 FIND_OBJECT_INT_LINK.3 +MAN3LINKS+= snmpmod.3 FIND_OBJECT_INT_LINK_INDEX.3 +MAN3LINKS+= snmpmod.3 FIND_OBJECT_OID.3 +MAN3LINKS+= snmpmod.3 FIND_OBJECT_OID_LINK.3 +MAN3LINKS+= snmpmod.3 FIND_OBJECT_OID_LINK_INDEX.3 +MAN3LINKS+= snmpmod.3 INSERT_OBJECT_INT.3 +MAN3LINKS+= snmpmod.3 INSERT_OBJECT_INT_LINK.3 +MAN3LINKS+= snmpmod.3 INSERT_OBJECT_INT_LINK_INDEX.3 +MAN3LINKS+= snmpmod.3 INSERT_OBJECT_OID.3 +MAN3LINKS+= snmpmod.3 INSERT_OBJECT_OID_LINK.3 +MAN3LINKS+= snmpmod.3 INSERT_OBJECT_OID_LINK_INDEX.3 +MAN3LINKS+= snmpmod.3 NEXT_OBJECT_INT.3 +MAN3LINKS+= snmpmod.3 NEXT_OBJECT_INT_LINK.3 +MAN3LINKS+= snmpmod.3 NEXT_OBJECT_INT_LINK_INDEX.3 +MAN3LINKS+= snmpmod.3 NEXT_OBJECT_OID.3 +MAN3LINKS+= snmpmod.3 NEXT_OBJECT_OID_LINK.3 +MAN3LINKS+= snmpmod.3 NEXT_OBJECT_OID_LINK_INDEX.3 +MAN3LINKS+= snmpmod.3 bsnmpd_get_target_stats.3 +MAN3LINKS+= snmpmod.3 bsnmpd_get_usm_stats.3 +MAN3LINKS+= snmpmod.3 bsnmpd_reset_usm_stats.3 +MAN3LINKS+= snmpmod.3 buf_alloc.3 +MAN3LINKS+= snmpmod.3 buf_size.3 +MAN3LINKS+= snmpmod.3 comm_define.3 +MAN3LINKS+= snmpmod.3 community.3 +MAN3LINKS+= snmpmod.3 fd_deselect.3 +MAN3LINKS+= snmpmod.3 fd_resume.3 +MAN3LINKS+= snmpmod.3 fd_select.3 +MAN3LINKS+= snmpmod.3 fd_suspend.3 +MAN3LINKS+= snmpmod.3 get_ticks.3 +MAN3LINKS+= snmpmod.3 index_append.3 +MAN3LINKS+= snmpmod.3 index_append_off.3 +MAN3LINKS+= snmpmod.3 index_compare.3 +MAN3LINKS+= snmpmod.3 index_compare_off.3 +MAN3LINKS+= snmpmod.3 index_decode.3 +MAN3LINKS+= snmpmod.3 ip_commit.3 +MAN3LINKS+= snmpmod.3 ip_get.3 +MAN3LINKS+= snmpmod.3 ip_rollback.3 +MAN3LINKS+= snmpmod.3 ip_save.3 +MAN3LINKS+= snmpmod.3 or_register.3 +MAN3LINKS+= snmpmod.3 or_unregister.3 +MAN3LINKS+= snmpmod.3 oid_commit.3 +MAN3LINKS+= snmpmod.3 oid_get.3 +MAN3LINKS+= snmpmod.3 oid_rollback.3 +MAN3LINKS+= snmpmod.3 oid_save.3 +MAN3LINKS+= snmpmod.3 oid_usmNotInTimeWindows.3 +MAN3LINKS+= snmpmod.3 oid_usmUnknownEngineIDs.3 +MAN3LINKS+= snmpmod.3 oid_zeroDotZero.3 +MAN3LINKS+= snmpmod.3 reqid_allocate.3 +MAN3LINKS+= snmpmod.3 reqid_base.3 +MAN3LINKS+= snmpmod.3 reqid_istype.3 +MAN3LINKS+= snmpmod.3 reqid_next.3 +MAN3LINKS+= snmpmod.3 reqid_type.3 +MAN3LINKS+= snmpmod.3 snmp_input_finish.3 +MAN3LINKS+= snmpmod.3 snmp_input_start.3 +MAN3LINKS+= snmpmod.3 snmp_output.3 +MAN3LINKS+= snmpmod.3 snmp_pdu_auth_access.3 +MAN3LINKS+= snmpmod.3 snmp_send_port.3 +MAN3LINKS+= snmpmod.3 snmp_send_trap.3 +MAN3LINKS+= snmpmod.3 snmpd_target_stat.3 +MAN3LINKS+= snmpmod.3 snmpd_usmstats.3 +MAN3LINKS+= snmpmod.3 start_tick.3 +MAN3LINKS+= snmpmod.3 string_commit.3 +MAN3LINKS+= snmpmod.3 string_free.3 +MAN3LINKS+= snmpmod.3 string_get.3 +MAN3LINKS+= snmpmod.3 string_get_max.3 +MAN3LINKS+= snmpmod.3 string_rollback.3 +MAN3LINKS+= snmpmod.3 string_save.3 +MAN3LINKS+= snmpmod.3 systemg.3 +MAN3LINKS+= snmpmod.3 this_tick.3 +MAN3LINKS+= snmpmod.3 timer_start.3 +MAN3LINKS+= snmpmod.3 timer_start_repeat.3 +MAN3LINKS+= snmpmod.3 timer_stop.3 +MAN3LINKS+= snmpmod.3 target_activate_address.3 +MAN3LINKS+= snmpmod.3 target_address.3 +MAN3LINKS+= snmpmod.3 target_delete_address.3 +MAN3LINKS+= snmpmod.3 target_delete_notify.3 +MAN3LINKS+= snmpmod.3 target_delete_param.3 +MAN3LINKS+= snmpmod.3 target_first_address.3 +MAN3LINKS+= snmpmod.3 target_first_notify.3 +MAN3LINKS+= snmpmod.3 target_first_param.3 +MAN3LINKS+= snmpmod.3 target_flush_all.3 +MAN3LINKS+= snmpmod.3 target_next_address.3 +MAN3LINKS+= snmpmod.3 target_next_notify.3 +MAN3LINKS+= snmpmod.3 target_next_param.3 +MAN3LINKS+= snmpmod.3 target_new_address.3 +MAN3LINKS+= snmpmod.3 target_new_notify.3 +MAN3LINKS+= snmpmod.3 target_new_param.3 +MAN3LINKS+= snmpmod.3 target_notify.3 +MAN3LINKS+= snmpmod.3 target_param.3 +MAN3LINKS+= snmpmod.3 usm_delete_user.3 +MAN3LINKS+= snmpmod.3 usm_find_user.3 +MAN3LINKS+= snmpmod.3 usm_first_user.3 +MAN3LINKS+= snmpmod.3 usm_flush_users.3 +MAN3LINKS+= snmpmod.3 usm_next_user.3 +MAN3LINKS+= snmpmod.3 usm_new_user.3 +MAN3LINKS+= snmpmod.3 usm_user.3 FILESGROUPS= BMIBS DEFS From nobody Sun Oct 26 02:37:34 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cvLQd6lGKz6DjFr; Sun, 26 Oct 2025 02:37:45 +0000 (UTC) (envelope-from ivy@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cvLQd6ChWz3LLK; Sun, 26 Oct 2025 02:37:45 +0000 (UTC) (envelope-from ivy@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761446265; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=hwj3pk6EwDF9IYzBgMocBk8trplSr9P7sYyO/ZzwIIQ=; b=ioTxDplGWbfvVDd3RqOJvUVcGgk1waIk5SUYXm8nP+SWhvyVnimV3vckCB3onMkhM03Vmr dA+sNEa1m7XX9PkMSFisNqAvwXgmZv4ZiFLpn3d+jaOut5aNCQT/YmFmjRHlpyMEyeiFr5 akojbTfZJ28IOOiovBcOpESr/2vi5upQKui5NYRhK0+TpK+eycgcBBl2tgoRqJjapgLOTl A9gBooObKeWioVbdkwwVb+TDZPyvLdWAWcLa76KvXrK8nYK51IWBtVwBl8Bqljhg8wGYLb B1bo9MAexHXbn6N5H6pT7xPuLtK3hLQM9EP5dQhbkPp6bCqoGL1ex3LVRgy1xQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761446265; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=hwj3pk6EwDF9IYzBgMocBk8trplSr9P7sYyO/ZzwIIQ=; b=qA+aKt6D1gxjKVbw2JgbyXXHZUkedoMYAM9nDLPbjhdYqdPEHOXMFea/Ueha8+4c7IkYwg 6RalyvMH0oA1Z1VPnMmVyxPGH1GbsJOUxn+tMzlyftunvBT9dn6T0j2gLdyBNoeGMIoatE 8D2Sn1i6Sn6cpJj2DW06PSrQLOpXFc2xZnbKXeoYiwLrmm4hxp7c1L0oZZeaIlJoRh5Hh+ 1O+qehYQANPAUvwUi7+Nfa770V7qbarjCClLUHnpTEsHx7dfCgHmbErcjROb+uinJg8zIC pvfg3KOxKan0MfuG8LyJcNSqYPcQe7TFHNO0jI0Fyc9ydB8rHOyml/oPHF7gaw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761446265; a=rsa-sha256; cv=none; b=LPBCYlhNEQqAIKivcebiXo9WDVnkjUiOusozSQdF3IrU3tadtrw9C+H6s52D+806ni+FgH 0Qlysr6ETIoiZsoLtvk9iDJKzQ5whQsFS0e8eaSdXHOLLr8fJt5SXbRtV6JLy23OFEm9iO pXXveZ9FXByEGfwCWu5jaHQ3E9sCcarzvJK+tA5Qq8XkHtOk0NXxWB0CShGzh+x0V3XNcU 3dh5RtncudzqIr32OIM5N1nZvGST6Ot8AKMhD3kK3pVxzD8mP7OW2LONgLNriz3/wBeL4z 94heML2UruDwfe80GdH4mYqf8IzdBQd/+rlvgm5b4DIVucxElEJrZmflyeARvw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from amaryllis.le-fay.org (amaryllis.le-fay.org [IPv6:2a00:1098:6b:400::9]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: ivy/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4cvLQd194szq5f; Sun, 26 Oct 2025 02:37:45 +0000 (UTC) (envelope-from ivy@freebsd.org) Date: Sun, 26 Oct 2025 02:37:34 +0000 From: Lexi Winter To: Ryan Libby Cc: John Baldwin , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: e1aeb58cbbc3 - main - inet_net_test: Use int to hold expected return values from inet_net_pton Message-ID: Mail-Followup-To: Ryan Libby , John Baldwin , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org References: <202510201832.59KIWCG0006624@gitrepo.freebsd.org> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="VtOmjGibKelQbPb2" Content-Disposition: inline In-Reply-To: --VtOmjGibKelQbPb2 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Ryan Libby wrote in : > On Mon, Oct 20, 2025 at 11:32=E2=80=AFAM John Baldwin w= rote: > > inet_net_test: Use int to hold expected return values from inet_net= _pton > > > Could you MFC e1aeb58cbbc3 and aa358ce3ca8e to stable/15 to fix the gcc > build there, or would you mind if I did? i have just MFC'd these to stable/15 and will also ask re@ to pick them into releng/15.0. --VtOmjGibKelQbPb2 Content-Type: application/pgp-signature; name=signature.asc -----BEGIN PGP SIGNATURE----- iHUEABYKAB0WIQSyjTg96lp3RifySyn1nT63mIK/YAUCaP2JaQAKCRD1nT63mIK/ YORlAQDtTIaUIcZOk2CAs8cJoMy1v5/QMdwrLJtNJuUnmpfC0AEAuX4eDG0LZv+T UCG2sBhnz+1WVFYi8sDJA9xpADcDggY= =LCql -----END PGP SIGNATURE----- --VtOmjGibKelQbPb2-- From nobody Sun Oct 26 03:48:39 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cvN0h6VLqz6Drc7 for ; Sun, 26 Oct 2025 03:48:52 +0000 (UTC) (envelope-from rlibby@gmail.com) Received: from mail-yw1-f182.google.com (mail-yw1-f182.google.com [209.85.128.182]) (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 4cvN0h2NpZz3Wm4 for ; Sun, 26 Oct 2025 03:48:52 +0000 (UTC) (envelope-from rlibby@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-yw1-f182.google.com with SMTP id 00721157ae682-7817c2d909cso39198647b3.1 for ; Sat, 25 Oct 2025 20:48:52 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761450531; x=1762055331; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=QuLeBrvsZKbS20sDgoiiBAvFoK8Lzkzflndtbu/3kls=; b=QwpeOJaevPDXItSg7dMc1/JG0rK0XWCw1A32nY8nlJ9rSTW9f5uwH0/lSwjhJ4ccMS xSYWqeWJ9ymOLebO92jzSP6dQmxL5VGT/s9V7izpPGj+bM0h5IhKKuFjALzbEBDJeLm8 ganOA4ywXu/CrqvJGMs9iW/eN6RzbzC3XtzeYvvv4xdD9Vu2zpPCQcO1IAXgpit1WIpJ OYWVd5E6A2R9QXNSv/CYkkUffpRsFJkqeKTHwTePS0Ot/DRvvqrPIavAxPfbBztvCvXS fCSuXpVUpoO7gBUc7SHVwaeCAlcYUJ4/EAbW5M407Zr6vYsuroo1nyV+zZViC7Wp+xVb gf9Q== X-Forwarded-Encrypted: i=1; AJvYcCUw4KLXAkMgaG8AdEN1nnaafAtxIA1KdD0lKQp9n81MQhKGs0cHsnI4v4vFgp7VUEv04FbO8TNdJgqjg3M2T60YufXsXQ==@freebsd.org X-Gm-Message-State: AOJu0YzidLH8laE5uQ0Rga4SdyHvTpWPna47dj87Y//uecvZdSYWztys sBkwmjYvpj/hR+9yOi3IwvhSGxrVHGJ+Il9WpsuWVmWps5KyMp4uekzxZDXbNw== X-Gm-Gg: ASbGnctKQCJ+309gnSORroZyaFAoDXMrGQyoUqQvZhqmLMgkokNnrXt5ZrDwk9SUZBD XIzmBT5gDqv+cb3iyVxhLo7OesUC/iRKdZk1q6VRY5Nt4hAJXnHBYMp7M1pr7OG8Fs5PB8BlE5/ 2gYiSbGAZICa0i9kP4KT1HM4Kkg1yi3yw/5GlCe2LfXgVAYwQa09d2OJIe2RDVbqHM2g8T3A3pU u8ZLFpWupV8Z7ex76tR42+M/6bN8cAfgsX6lmKqt+5oEN2jQJOKeEzcZhFh3h4vsHTCxoRbIChM VONzYtJmxrEhfL89EtTR1piC+bRqaWIuwi3iiecSmFkJq6jG02bns7IDKlHL8g2OBm7lYaduvYQ ZHTWHMd7vH0qeI5Y8sPOh+CiTPHeQ7o37i9DCu4GRkh6/bTcKkMBJafQyokuZA5L4KUCc9wJlVg W+fYq9qOX4cbXijd8Gtsi+wlxPJvAU7EO/sW8= X-Google-Smtp-Source: AGHT+IHqr+SsiU8kVA3I9w7Ew5CPaKFG33+TfSEV5EysHjIesZIlPfKS8JIKmHrMaj0QvTpJ1o4DHQ== X-Received: by 2002:a05:690c:600f:b0:721:6b2e:a08a with SMTP id 00721157ae682-7836d2d6737mr506499257b3.37.1761450531475; Sat, 25 Oct 2025 20:48:51 -0700 (PDT) Received: from mail-yx1-f54.google.com (mail-yx1-f54.google.com. [74.125.224.54]) by smtp.gmail.com with ESMTPSA id 956f58d0204a3-63f4c441fbcsm1164015d50.18.2025.10.25.20.48.50 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 25 Oct 2025 20:48:50 -0700 (PDT) Received: by mail-yx1-f54.google.com with SMTP id 956f58d0204a3-63e10cd6efeso3724797d50.0 for ; Sat, 25 Oct 2025 20:48:50 -0700 (PDT) X-Forwarded-Encrypted: i=1; AJvYcCU0IGdOrYKbs6rCgc1K3telNOxHqKD6+TCJMlNTDGSANEl/3i0sGv2/p+tdBvCVHUcJemLZ1N6mMrTGyM0R53DNCPHlVg==@freebsd.org X-Received: by 2002:a05:690c:67c5:b0:77f:772e:6229 with SMTP id 00721157ae682-7836d169afcmr522705907b3.1.1761450530397; Sat, 25 Oct 2025 20:48:50 -0700 (PDT) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 References: <202510201832.59KIWCG0006624@gitrepo.freebsd.org> In-Reply-To: From: Ryan Libby Date: Sat, 25 Oct 2025 20:48:39 -0700 X-Gmail-Original-Message-ID: X-Gm-Features: AWmQ_bk3LbgcZenBn09qQV9t6DOOVlY6MYkScMpNEtVZBIuhiNmIeifOnLPOR40 Message-ID: Subject: Re: git: e1aeb58cbbc3 - main - inet_net_test: Use int to hold expected return values from inet_net_pton To: ivy@freebsd.org Cc: John Baldwin , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4cvN0h2NpZz3Wm4 On Sat, Oct 25, 2025 at 7:37=E2=80=AFPM Lexi Winter wrote= : > > Ryan Libby wrote in : > > On Mon, Oct 20, 2025 at 11:32=E2=80=AFAM John Baldwin = wrote: > > > inet_net_test: Use int to hold expected return values from inet_n= et_pton > > > > > Could you MFC e1aeb58cbbc3 and aa358ce3ca8e to stable/15 to fix the gcc > > build there, or would you mind if I did? > > i have just MFC'd these to stable/15 and will also ask re@ to pick them > into releng/15.0. Great, thanks. From nobody Sun Oct 26 10:54:30 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cvYRs1BmYz6Fbw5; Sun, 26 Oct 2025 10:54:33 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cvYRs0W3Dz4Frl; Sun, 26 Oct 2025 10:54:33 +0000 (UTC) (envelope-from bz@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761476073; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=uWvyhJSAWdZ392KXBRqkRK2RbWn7r17zGsN7eYVsfNk=; b=ZHOBeDXdlVqrmfwFZaajzeuTPDa5XHQS7+Bv1ESya8fYTCec3zDsZTPVv/dvcdCS+jBLDT f3VS0a2JRNA4gkCbxv+xMIvye9uRom1T7j9nZfaX0uEb4n7OdixN/5wYPIzDOxm/cQJ9aW NLDkz4KRPEY8G1pBaeBRgUZ+sxiYObONmXHIl+5g8GnG9rgS/1pKseEj2XMBiL82X7frbp 5F2R9ijn11STZhTVWtyqfRD+MnGvwg4+QFYbwAIGy8DicmTKh7Jy3hYla8MYSmoHEry7ih WcmvW52ASPBGxcxwPQFwmtf23HucciIzIO0he1rpryAQHY6/8B97jtPQqcv1eg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761476073; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=uWvyhJSAWdZ392KXBRqkRK2RbWn7r17zGsN7eYVsfNk=; b=JsEZFZib2ooGkkkg+Eh4Lonl+kJitMCsE7B23Dojcd6Qo/Vqb2EcJVk+2gsCsQ+8Np+nDX OV+GLU1d04Tl9hN2bgGJLG5mFsl5YhFLlf0UrE0umfzEUpenM8EwFXgpLKsbQSVtnZhScm prt74e51VZRhdvDsTyndrlcGlSllyyHKaGpL+i1UzZYOh4RR8zuLkPnDYxUcLsKpbEZ8ya O6T69tO2DHueLOofVgthtMR+sTkyXrD3t7iIPdsw2NoBul12ZPvKxE+oH9YM1gIqhMHKY9 744yIULgG3Ts4C5NO45Zj1jfKR35waGAp7eMgK6qt7bCKmcNJm6B7FcizfT+nA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761476073; a=rsa-sha256; cv=none; b=VVLMAT42ds8swFKUagpifwLcsXC+P5tGM7+QNya499neXARdnUqwMWU5dZi5wzma2CRRNZ lAYl+jbcSuPfwq5drjq/IIfUBCc7FlRavzk6qsqKcCccZqVTuXI2syhsvFlRy9bC+B6tJt /MCf4ACYlwfsWq4gIm6BMTFSWr/4PxNvnTWxv+5txaylxzFhMp8CpB9JvLKbhKHZlsCBgx R/VpiXfHqfB67t8zukLSYbNfmtayszI1KHuyDZxAUKmE5UYWuLF9ahg9KV6S2Qf603iVwL AaHo4MmGpzs0XYYBSDwR0ZE2KpWjb3zGzG9mtykYM/ddLEihDa8Hkv8wcpDq3w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from mx-01.divo.sbone.de (mx-01.divo.sbone.de [IPv6:2003:a:140a:2200:6:594:fffe:19]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature ECDSA (prime256v1) client-digest SHA256) (Client CN "mx-01.divo.sbone.de", Issuer "E8" (verified OK)) (Authenticated sender: bz/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4cvYRr64ZFz10sf; Sun, 26 Oct 2025 10:54:32 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from mail.sbone.de (mail.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:1025]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by mx-01.divo.sbone.de (Postfix) with ESMTPS id E77BEA64806; Sun, 26 Oct 2025 10:54:19 +0000 (UTC) Received: from content-filter.t4-02.sbone.de (content-filter.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:2742]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPS id 25A8D2D029E7; Sun, 26 Oct 2025 10:54:31 +0000 (UTC) X-Virus-Scanned: amavisd-new at sbone.de Received: from mail.sbone.de ([IPv6:fde9:577b:c1a9:4902:0:7404:2:1025]) by content-filter.t4-02.sbone.de (content-filter.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:2742]) (amavisd-new, port 10024) with ESMTP id gWfIQXIL5Xxd; Sun, 26 Oct 2025 10:54:30 +0000 (UTC) Received: from nv.t4-02.sbone.de (nv.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:22]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPSA id 3689B2D029D8; Sun, 26 Oct 2025 10:54:30 +0000 (UTC) Date: Sun, 26 Oct 2025 10:54:30 +0000 (UTC) From: "Bjoern A. Zeeb" To: Ed Maste cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 46f982122c0d - main - sys: Bump non-ISA PNP removal to 16.0 In-Reply-To: <202510252258.59PMwthG074834@gitrepo.freebsd.org> Message-ID: References: <202510252258.59PMwthG074834@gitrepo.freebsd.org> X-OpenPGP-Key-Id: 0x14003F198FEFA3E77207EE8D2B58B8F83CCF1842 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII; format=flowed On Sat, 25 Oct 2025, Ed Maste wrote: > The branch main has been updated by emaste: > > URL: https://cgit.FreeBSD.org/src/commit/?id=46f982122c0d670ac181b748a5b8c2b221f61517 > > commit 46f982122c0d670ac181b748a5b8c2b221f61517 > Author: Ed Maste > AuthorDate: 2025-10-24 18:39:00 +0000 > Commit: Ed Maste > CommitDate: 2025-10-25 22:57:15 +0000 > > sys: Bump non-ISA PNP removal to 16.0 > > This may include atkbdc, which is not being removed in 15.0. We really ought to have a macro for these somehow so we can grep them more easily. Could even be a sysinit just spitting them out whenever they are compiled in to increase the pain and visibility on main. Add a tunable for people to turn them off ;-) > Sponsored by: The FreeBSD Foundation > --- > sys/isa/isa_common.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/sys/isa/isa_common.c b/sys/isa/isa_common.c > index 1a6df7bf6046..41a63a3c676c 100644 > --- a/sys/isa/isa_common.c > +++ b/sys/isa/isa_common.c > @@ -570,7 +570,7 @@ isa_probe_children(device_t dev) > strcmp(kern_ident, "GENERIC") == 0 && > device_is_attached(child)) > device_printf(child, > - "non-PNP ISA device will be removed from GENERIC in FreeBSD 15.\n"); > + "non-PNP ISA device will be removed from GENERIC in FreeBSD 16.\n"); > } > > /* > -- Bjoern A. Zeeb r15:7 From nobody Sun Oct 26 11:23:54 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cvZ5k5nD7z6CwbG; Sun, 26 Oct 2025 11:23:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cvZ5k5D0rz4KkX; Sun, 26 Oct 2025 11:23:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761477834; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=46gxC0y0ibCdwsM/htjD8kGOyfGT+wFV4bi5P8vAXQQ=; b=j5MHL6B80PDScJB3jC3sIS0qXUX607nuKDdU/R/KqrUiJOmJcWRZysoc9cKaN4XdCOVRUQ SxV8lhX9wKVanE2I4CxQO71rpWMWbBbr9hkohFQa1H8E45EyJ8LguZy0O2tI5YBCa+gCsE zERuP+CoFjIZn0p4bLTlB5OUOXN0HgMO+ijin06bNuNuZCXj/AUVi1Lw+I40wcaaBhlkjW m82ka2iPZdysAzz9eObGYIZH7VZKC56VNV5ej3MVA7p/Nc1h5cdEz5g1Pl923YOEZ4DIT7 jfWQ3D15kFHceEL/8VLEuKmlR4VU43UUBkA22CmSQwggM3lcAQ9GoCAzopMyaQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761477834; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=46gxC0y0ibCdwsM/htjD8kGOyfGT+wFV4bi5P8vAXQQ=; b=Q6Jzx4B18JkN59fo4U9V316rS+VVEKjRFzWrtBzPZyMZEFhz/bjT/xaM5sVajVwRJcqm6U SRuGr/SvxO6VKu3MUfW9qxJARN6VzLnN31Fe1lOtNwNeTPFeiVB819ggL+wyou5zFFasmK xZtQJ1TdCsbv/qbC95EFnEML5YQif2h/OyIRF2PL3UyyBmsmBgQt5LMevwcm/zWnbPHg3x 15bJsUI+AV6m1AslG+Jg2frjjlRFHgKIe6rBPnrPD7Fr8ZsSoup+Dg4AU4gpubOQupTgJW YJd2Ug77nOUKUaObvKiATdmCPT1x+y06lJcIbYMJ5Qk1YlrbYmYE9HjwuaiZpg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761477834; a=rsa-sha256; cv=none; b=GcYnfWEsS9JOniX2W/cKSXTEcsY33B6BwqJkbtRhFKj+ZNLdZrUzmPRdEZBBFU0BsXWTw+ ydBXGZYe2K92MQxjyfl4lT2qev7pNs7BDOvXerzNO7C0lN0kj9mFSPRBUORYL3w1Xq4g+Q oE6x6ikw941PHy9kt91RMQP3wrWXU/4PKX7zDRXNW7WBfHa6PfhfRKwDvO4w/EuaFtQW9j x/8jepzrMAsN2wnqNIKdTX3n9q5u2evQOKTPgw5HPbSG+1q2izYwMlovHlf3Nm1DQ2jxVy lMK14DbmLGkqfP5stIoZW1S3jHzRKwurlxGje16+Szetyal7HEz66Cc+iBJiSQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cvZ5k4lHdzWWJ; Sun, 26 Oct 2025 11:23: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 59QBNsrU081532; Sun, 26 Oct 2025 11:23:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59QBNsUj081529; Sun, 26 Oct 2025 11:23:54 GMT (envelope-from git) Date: Sun, 26 Oct 2025 11:23:54 GMT Message-Id: <202510261123.59QBNsUj081529@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Aymeric Wibo Subject: git: ee363e1bab6f - main - thunderbolt: Fix stale symlink for opt_acpi_wmi.h List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: obiwac X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ee363e1bab6ffcf196afbf870e92a1e9abdd8f11 Auto-Submitted: auto-generated The branch main has been updated by obiwac: URL: https://cgit.FreeBSD.org/src/commit/?id=ee363e1bab6ffcf196afbf870e92a1e9abdd8f11 commit ee363e1bab6ffcf196afbf870e92a1e9abdd8f11 Author: Aymeric Wibo AuthorDate: 2025-10-26 10:43:47 +0000 Commit: Aymeric Wibo CommitDate: 2025-10-26 11:23:41 +0000 thunderbolt: Fix stale symlink for opt_acpi_wmi.h Reported by: wosch Sponsored by: The FreeBSD Foundation --- sys/modules/thunderbolt/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/modules/thunderbolt/Makefile b/sys/modules/thunderbolt/Makefile index 3b279f4352d4..ba7c7cab6e6b 100644 --- a/sys/modules/thunderbolt/Makefile +++ b/sys/modules/thunderbolt/Makefile @@ -5,7 +5,7 @@ SRCS= nhi_pci.c nhi.c tb_pcib.c tb_acpi_pcib.c tb_debug.c nhi_wmi.c SRCS+= router.c hcm.c tb_dev.c SRCS+= opt_thunderbolt.h SRCS+= device_if.h bus_if.h pci_if.h pcib_if.h tb_if.c tb_if.h -SRCS+= opt_acpi.h opt_acpi_wmi.h acpi_if.h acpi_wmi_if.h +SRCS+= opt_acpi.h acpi_if.h acpi_wmi_if.h opt_thunderbolt.h: echo "#define THUNDERBOLT_DEBUG 1" > ${.TARGET} From nobody Sun Oct 26 13:33:01 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cvcyj5Yt2z6DBmW; Sun, 26 Oct 2025 13:33:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cvcyj4vBrz3JB9; Sun, 26 Oct 2025 13:33:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761485581; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=l0Jn3chFFUsAPPHh3uGjz6vhmg9T+go5hYEHu0WhMPY=; b=ybgPvQXu4vfA8xncuX3x383af12LzAtLrOBZuMq4HPiIVs+5VQjSay9dZwN7Dzm8i6BsGv t5o67MhM+P1g/8gIIv9vVIhrJ7xFn9M3bpM1eqOpW7asFCbWtHqoopWzxgBUpYe4KF8ZIa v5PkQ0VfUzzkUVGsislTG0h/MtMsrvc84plmgESz0iO3ELmTXVabyAX+0LZqIhs2LEgsy7 IBZSAMjKS4IRKMacbfMz+E/m6qd09Hxh9wxsMM/1/pOirVm8Ku1ICcG0r3VZ/5rqA4VGH4 9/+Md6rsyixZxtQmbb/7y94Q5v73IsoY/eHukjov77wwIf0+IAfVxDx4ZkRDVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761485581; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=l0Jn3chFFUsAPPHh3uGjz6vhmg9T+go5hYEHu0WhMPY=; b=riVDBBITS5wVODJo4Cq2czuKRd5ro4F2y74UlS8zHaKqYcqWmu6cehUQuLA48YjGmYlZ7p 5N3fv1gER898XRegtg7PcClf+rGsBjTJfEA7uCnrypfIhPh0vage2tnAG3eFAyYPIe2/dj W3Fk+oLa1xHAWLQOmkQJdjA9KyJzYdJoJQ5oArYwxhSdgcFPLPmzbkRmrnD+KIN2dnmaLX Rau8MTGk+gRsMYS7iYAV3v4o4ebmJv7qQJJoY1Z1YpK7N5Ml/Zv9suUtkDx7cSagT0Sq9d bgcChCbF7FUKJxHQPhj8alXWeT6kOh9NrfAkYfL9IYOaJM6yKoaaqWOXPUObBw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761485581; a=rsa-sha256; cv=none; b=RB4DpFUhVK5Oh/FhlZjmQ6MDEToAsT9WaFHY/F/CgrtgG0mY/qAPWXxV6ZvWOyLp3BOIrA 4EQh0XS2AMoZuuIsmqbV7jGVb/3Qrp0lNfdpeVgpuj2MXlun0Uw0lC7LMWRMiUTizYNVjs iyeHFMlmw/K/kjI131QnAPmhmpzRHoTnQ72i3btcjEQLf++c9zjcHQ3VMsRVJZ00aQNrJ3 TbK1i4c25/TjiNQ6izrouN8MDsNrV+VTRXb50TB8pf8SkfFlaBif41WhfX+fQjeaZaIhxM IgA/v1n/CVzNcvjnd5aU6j7qGekxbDK272rdowzGXxEK+xdSfzonJQob/I6OYQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cvcyj4TGHzbSV; Sun, 26 Oct 2025 13:33: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 59QDX1Hx025119; Sun, 26 Oct 2025 13:33:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59QDX1bG025116; Sun, 26 Oct 2025 13:33:01 GMT (envelope-from git) Date: Sun, 26 Oct 2025 13:33:01 GMT Message-Id: <202510261333.59QDX1bG025116@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: f5a3d790c786 - main - queue.3: Fix a typo in the manual page List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f5a3d790c78682506888b2bb4e67fa08cf5d8bd4 Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=f5a3d790c78682506888b2bb4e67fa08cf5d8bd4 commit f5a3d790c78682506888b2bb4e67fa08cf5d8bd4 Author: Gordon Bergling AuthorDate: 2025-10-26 13:03:44 +0000 Commit: Gordon Bergling CommitDate: 2025-10-26 13:32:41 +0000 queue.3: Fix a typo in the manual page - s/overriden/overridden/ MFC after: 5 days --- share/man/man3/queue.3 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/share/man/man3/queue.3 b/share/man/man3/queue.3 index 79c8d92decbe..535358ae82d5 100644 --- a/share/man/man3/queue.3 +++ b/share/man/man3/queue.3 @@ -1420,13 +1420,13 @@ while in userland builds it prints the diagnostic message on .Dv stderr and then calls .Fn abort . -These behaviors can be overriden by defining a custom +These behaviors can be overridden by defining a custom .Fn QMD_PANIC macro before first inclusion of .In sys/queue.h . The diagnostic messages automatically include the source file, line and function -where the failing check occured. -This behavior can be overriden by defining a custom +where the failing check occurred. +This behavior can be overridden by defining a custom .Fn QMD_ASSERT macro before first inclusion of .In sys/queue.h . From nobody Sun Oct 26 13:33:02 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cvcyk74TSz6DBmX; Sun, 26 Oct 2025 13:33:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cvcyk5w4Jz3JDd; Sun, 26 Oct 2025 13:33:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761485582; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qA1u+AQBCshBBCJhyNw0ddVo6BiKrw3F8APQ7CsHpy0=; b=BE9//pIeIu/7zfrHuzOe8HPgE/+0z2/SicqtLhCS2gBoW4V8iUc+APYO0CV1XginZWLKyT nVrI6mvnJYrWlucy3y6bSOmy8dsA4J/DM45WDQExF6/2DOi4OlxV2aBy3/Z2sNziYyEOYa ZlOWRksNCU+XXECwS82taLrp9o26WFQ+hMHSeLXKVPrbF8CkWRk8bPhuqRWECFUteS1uC3 uBWVsojzxwkknvaPRvjQmoVvhhuXlFB1QF7ztvkvYdgmlTKwlmA1mwaAkE31bb2Jj/TfHj RLmdJ6g+8t5g1wWZXwxVgsh1A8yuufd82Xd89ya5Yy7tdEQgsoX5yxEUaYPeoA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761485582; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qA1u+AQBCshBBCJhyNw0ddVo6BiKrw3F8APQ7CsHpy0=; b=ANBA1GXwQyGy2RDPMzJSjGiykwIfh7I/oyrMxb+Bc2231P0cHC3Eo5QRamm0XxvQBQ6Q+u K7H0iG7+RO/KxBZ/89p6ZAUz8BQ1ptepJ6kAIDWnjsX2Be3852EM1QowUWpzj/N6op/HSg JBgcZ6qobp9dVdP7IC5srHUaYscHWw+7FRZK8aDsv22hZDP41jPupWuEXMzeSXEJqnXyvV OzBswTVrKz/6K1Akb5JNTHJyvW3GZ4qFr4qu2OvG9KBjDYDbNQurHDxZ+/LmVtugIEvBfX 3hiJFHiVUzGSPDlxKieJV16hEUuqNLwxdvFHycF1Lo330cP3YNcdeUhdeWXWYw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761485582; a=rsa-sha256; cv=none; b=jdGX0u5zy5X+flnY68X6OUA+GmMMVrwCpfxBKYb+o0DhskEyNsodxrxZKvoydKN5cHsa+i dS8LoDfr+uOxt2BZ6a9yewbA3j3OkRHK1cr44xD21BpcONfVOI3JkwpsnxFUqYr9W4Uwau PIIyHeLjvWEwjYNr06Caoi5BSwMW2LL68+F0Du24e+6+7hrcABgQvPGY6kOl8OrNJLTeUt hCnXG45AuxlMnzCYjGx05d5fMC/NYWGrOOtE/FtaXU8IAwR9/d+CuPFwMDxwOJiA/tb355 3hvywoiWXXXTq5WHnkSYd8BOlTMp7Pqd2qHyh4i5/UhocM59yLoE2gXMlrN0mw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cvcyk5L7hzbMY; Sun, 26 Oct 2025 13:33: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 59QDX2So025161; Sun, 26 Oct 2025 13:33:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59QDX2eu025158; Sun, 26 Oct 2025 13:33:02 GMT (envelope-from git) Date: Sun, 26 Oct 2025 13:33:02 GMT Message-Id: <202510261333.59QDX2eu025158@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: 1447a221338c - main - siginfo.3: Fix a typo in the manual page List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1447a221338c070130d7e990733486ed142267a1 Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=1447a221338c070130d7e990733486ed142267a1 commit 1447a221338c070130d7e990733486ed142267a1 Author: Gordon Bergling AuthorDate: 2025-10-26 13:04:43 +0000 Commit: Gordon Bergling CommitDate: 2025-10-26 13:32:41 +0000 siginfo.3: Fix a typo in the manual page - s/Sychronous/Synchronous/ MFC after: 5 days --- share/man/man3/siginfo.3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/man/man3/siginfo.3 b/share/man/man3/siginfo.3 index f57cf5f7d706..59e3ecf8f3e8 100644 --- a/share/man/man3/siginfo.3 +++ b/share/man/man3/siginfo.3 @@ -224,7 +224,7 @@ raised by a hardware watchpoint exception may report the data address that triggered the watchpoint in .Va si_addr . .Pp -Sychronous signals set +Synchronous signals set .Va si_trapno to a machine-dependent trap number. .Pp From nobody Sun Oct 26 13:33:03 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cvcym2xHKz6DBq4; Sun, 26 Oct 2025 13:33:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cvcym099Hz3HpD; Sun, 26 Oct 2025 13:33:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761485584; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BHndkOustvBAA7utBoF6y6QZNqxJ49ivI19F02VZL/Y=; b=WkYlPIxomDaS7744UeplELIGnXDDgm1zJ7PtCei6bdH5bm5LI+mhHoNXRsIx2eJSuBn0Wr dMzWENTY0RJle9JH/rVxM/zcqgW5Mf+b+100LojNN6342A1NY034FR7poxErW1xw0PhYmQ N6CwE6Zwa3Id79bKfUoR2wJku+QkkpfBKUsaZqzPHat64VgXCpkl4PmkQtJDn22Zub9t1R hjvK+Tw+EvaHL0Oot8gtDxQa9pUVBTZfXIa2HaewbUkwGbblo3hzt2j73umZW4B7UuaVrz B3SD1FYmjxwO7MPEUolSAg/FK2Gsm0L/hnSOeED+s/7w2nFKEki2vqqK4JcBYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761485584; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BHndkOustvBAA7utBoF6y6QZNqxJ49ivI19F02VZL/Y=; b=JTPCJi4UF7IcjRfD8Y2OFsNnP1K7JKayqkdc53KEuH7d7Mpe0pcS3Fjx+r+1U/WgdMuFa9 HxnHHcr2SlQ5lpVCk7KULUj1y/oAZYYJZARyuynGUHiMoXcvuH4aFdJEPdJushXHM6D2F+ ZEnBgfTwsgrfTtIQ2RXFqmi0Bi/gdPWSqmHuGj/zv3y8+qc0BcQVzOdXufSeKnTMbvc6Qp yCP9ETrqDRZfZhFMyRxu525NJy01MRCrS/0bg166b6mMK7SEkWMd4q9EbpEnPBo5YlK+aS wo2qoK/GaYqs0beVfyJjKp0ijyZvejLCe515X2TQqQNA5mFi+kdNS9wA10bZWw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761485584; a=rsa-sha256; cv=none; b=hg5L/2+bDTIIoDLGOehm7u5LTdTlV19FCFbjbAL83SlffSVkfP3kIZv/KQH3Knu/+yOK2v I1yYVoBB+Sul3bzKgBethcI8WjCyV4FeIslcNmcmYIO380XGg6sZgBxgNLBGhgr9SVf532 3kyZO2+YOt/OPWPaIylM917zJsbPoEqleignpJ4eyZMPXxrnGN1y97KtCrWopskqG8HAHR ZFHqrFNC/EafLxD8Pp4afCKnTD6d/eVxtUZ0UkJu6AbPRUP7jJXJB32O9/hngcBn5Juzmy EF1FaOQxmXReMD1zZU+Zk/fKqMl2yl73fjJewZlv8CLojys0457tbfQqJL6UWQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cvcyl6BFKzbH3; Sun, 26 Oct 2025 13:33: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 59QDX3LT025204; Sun, 26 Oct 2025 13:33:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59QDX3Wo025201; Sun, 26 Oct 2025 13:33:03 GMT (envelope-from git) Date: Sun, 26 Oct 2025 13:33:03 GMT Message-Id: <202510261333.59QDX3Wo025201@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: 69fbd069d837 - main - debug.sh.8: Fix a typo in the manual page List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 69fbd069d83784bf765471931542f53551501354 Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=69fbd069d83784bf765471931542f53551501354 commit 69fbd069d83784bf765471931542f53551501354 Author: Gordon Bergling AuthorDate: 2025-10-26 13:06:48 +0000 Commit: Gordon Bergling CommitDate: 2025-10-26 13:32:42 +0000 debug.sh.8: Fix a typo in the manual page - s/noticable/noticeable/ - s/compatability/compatibility/ MFC after: 5 days --- share/man/man8/debug.sh.8 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/man/man8/debug.sh.8 b/share/man/man8/debug.sh.8 index bf0fdbd6bcf5..3b59d6ae2e78 100644 --- a/share/man/man8/debug.sh.8 +++ b/share/man/man8/debug.sh.8 @@ -143,7 +143,7 @@ and defaults to .It Ic DebugTrace Ar message Debug output can be very noisy, and it can be tricky to align with the script. -This function outputs a very noticable banner indicating the value of +This function outputs a very noticeable banner indicating the value of .Va DEBUG_ON , and .Ar message @@ -168,7 +168,7 @@ skipped/run when debugging is turned on. .Va DEBUGGING is the same as .Va DEBUG_SKIP -for backwards compatability and is only set by +for backwards compatibility and is only set by .Fn Debug . .Pp The use of From nobody Sun Oct 26 13:33:04 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cvcyn4Zbwz6DBbr; Sun, 26 Oct 2025 13:33:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cvcym6t5Pz3HpW; Sun, 26 Oct 2025 13:33:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761485585; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LaOAfeuxwFUeQxkfR6wfgxHoMttSj082QKlMySdlVk0=; b=Os4Em8FwnHncuTjf00PBILUCuJsrkJ2IRK3WVOdJE4ESe4ClbeeDwU5Dre1UhaJhzfTc0i nE1k4riRunC6NtznrHquZZdyurjGx9JnAk/VDh64GjayQj4nJcF62YphTwUVAgsFE2Jovf jUXoII5kccphMKwvqUomseikpB3eD1jzt+xpehwAiXnJhxB9OvgkcafZ3idXI3aghNxwC6 GSSB7x7zieF01s9Si/aMEuxrgjXP47EpgA3/x8Scuc9bpwNvT7RUf9JJVOjycZomjvEOI9 RVGf13GyOM1y2j54EksITkbcewQpfonPzA6+Vv+Ml0BfLNKWo8sG7GH61Mps3g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761485585; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LaOAfeuxwFUeQxkfR6wfgxHoMttSj082QKlMySdlVk0=; b=Kxl7kFRxI2CbdHhkpRpoYUg6Wb01gY29d2jjhUeUYb0edQk73t8Up3Y09PG/h+DRdts/6I d2hJU8fPiL9RvyCx3OadNws6LZ6wsAcH1nCllUhh5AnDRa+BVB5XwfYVWjwmB0PrYzKneM xAajXwRf+st58p8mO8pHOs8ID1yV6+WgmzNz+yvJGemyUOW2gcY9SMcghdzPkjFXq9mOhO CUIHYF/zjBu94C+jHQBsIM1xwR2E+TbajG8W6bQ4XR9MoEkpS1Axksx/eDPHqQTI62ALLU UmoTu/vdb9cGWsFrecJaZDfq0UJtkEcGgAY5WzlpAgff6NOQrae2B4H9vk1o+g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761485585; a=rsa-sha256; cv=none; b=IhYeECu3IoCzgX0QJoddGETtt9nlQuEwvFPA8Xzb4BXekCSr+Sqg30kc9Qd9AlHI5hDblR bQwxTNVuuRC5lOYt01Onnk8we1On1n5u0T5ya10LnOZVYTeq+No4a7Nz93vzrWY4RIwElw dQ1XUGnxa9S4jMbxfcoQc9glfzEd1s/RUhZK2CpDCWgK8Kf/iVv2qoKALc1mXuRlqTeI6g 6XcNUHk+CvzligSzo/eUXq2YRSuX3lluu6cauqQMgOLJzUpEr/v+oLWeXhIXqAIbffAiPc u1X/J10zTq+8L+Jrp3ObTz+3d6zD+x5OpmnEFfjIOiOgqD/rIW447uVGH+Hhjg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cvcym6R3Hzc0L; Sun, 26 Oct 2025 13:33: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 59QDX4i9025238; Sun, 26 Oct 2025 13:33:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59QDX4PE025235; Sun, 26 Oct 2025 13:33:04 GMT (envelope-from git) Date: Sun, 26 Oct 2025 13:33:04 GMT Message-Id: <202510261333.59QDX4PE025235@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: 12584410c5dc - main - rc.subr.8: Fix a typo in the manual page List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 12584410c5dc3d17f6a07a743ca351f02434dc00 Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=12584410c5dc3d17f6a07a743ca351f02434dc00 commit 12584410c5dc3d17f6a07a743ca351f02434dc00 Author: Gordon Bergling AuthorDate: 2025-10-26 13:07:43 +0000 Commit: Gordon Bergling CommitDate: 2025-10-26 13:32:42 +0000 rc.subr.8: Fix a typo in the manual page - s/derrived/derived/ MFC after: 5 days --- share/man/man8/rc.subr.8 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/man/man8/rc.subr.8 b/share/man/man8/rc.subr.8 index 1fd5041cecd8..45a9e9a684cd 100644 --- a/share/man/man8/rc.subr.8 +++ b/share/man/man8/rc.subr.8 @@ -1010,7 +1010,7 @@ However, if fails, just return. .Pp .Ic DebugOn -will be called with tags derrived from +will be called with tags derived from .Va name and .Va rc_arg From nobody Sun Oct 26 13:33:05 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cvcyp3zXvz6DBq6; Sun, 26 Oct 2025 13:33:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cvcyp0x6Sz3Hm5; Sun, 26 Oct 2025 13:33:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761485586; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eJTqap9qQSgNcHNLn2N/76Tj2hCajA/+ZENqbrjcjAs=; b=HV+OWztoEUUd/QAcX6Eu3X9OCeLlKFuPYCqeBsDIWwDi2dD2+FMuX7JkOxuxBSShSFJHW7 uRamBJEnTA5vK3GJ7OFSDEjkVkVgmZe/3A8URTvCpIh0H2WRrTGkPe/8JXODh57sDXDQGC 0HjWoGhaH/mSAVSkgQxaH8cVeC4LeSzVZxmGcSbdAsLXspyWHDW+JczNxREhj5fwNadajp ZjHi0PKL/g1D+MoagkUrfPlEqH2PYIe2qVrQIPMvPIZG9ifPT1uGjS1huA2J3XHsp2OhGR fkdzrDaxOmzmrVO4XpZoVmr9lB4/2BDqHF4yjGSlL8NsLJ8fbnV5fhEvF9euWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761485586; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eJTqap9qQSgNcHNLn2N/76Tj2hCajA/+ZENqbrjcjAs=; b=Wwbg9ClavXnnJkMSDSeHpNAivlmBtHgSxMv/FxpAwDt9GcwjPYLE2e7ksq1eZQr/IlFPoe 9FyZip42BaqAr0KnMZBX9cYKLQ21Ybb1K6F1Ezb/wW3rTfuaoT5CuP8FrN2fWtS/HbIKlQ An5BZDNHNMxlj+ZTuHzBdn/Bir+a9t3in4ampfHtwxrOvJh/BafWmxuVJRijyBLbMJZtRr JyC20mkma6NqaFvZ5qgAbKevW3d7wxyuYZ9SV7ryeOFxViTsVuub4DqL8C1P8cAvMtGaIu Dwm4H11vRkZzGPbPKGgaFH0Yf6lQFqz1rRF9iYNcejYIOAMEZZPZPmjbMLg+4A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761485586; a=rsa-sha256; cv=none; b=PmEENLI4ao5YnB+KI9NILlKMctBtNgkS2TQaytKZ3sN2MJITMHO2uTpKmXhJsHDZFdFatx oL/Bml4Wkd1d+g+5MCfkuloiyO6fXpPBTXWmz2mNUEiF7iPfHqtVncNGR24sR2p3onfLGW hwQW5FWmgGSfVZ/HGLOn/nY0euRLFTpbopPmkPOn57xZRsd7nNQbNgLQOpxuUouzmuwc3m RPE2jx10ZRhx1EhZlNP2qwjWj6EruXyObfvQXy8i7i4Ec1nxB8MoaYiFkn5+G9xkGoXnYm TnhPOuXLe2hhhUHoZmni1V3Q5ro1TdiMBG00s+W1hMj6ThXgGJst5sExE5vCnw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cvcyp0XjYzbSW; Sun, 26 Oct 2025 13:33: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 59QDX58C025278; Sun, 26 Oct 2025 13:33:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59QDX5Du025275; Sun, 26 Oct 2025 13:33:05 GMT (envelope-from git) Date: Sun, 26 Oct 2025 13:33:05 GMT Message-Id: <202510261333.59QDX5Du025275@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: 189cec2f0d6c - main - pf.conf.5: Fix a typo in the manual page List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 189cec2f0d6ceb258c754193cf03a26eb9d7b3fe Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=189cec2f0d6ceb258c754193cf03a26eb9d7b3fe commit 189cec2f0d6ceb258c754193cf03a26eb9d7b3fe Author: Gordon Bergling AuthorDate: 2025-10-26 13:09:01 +0000 Commit: Gordon Bergling CommitDate: 2025-10-26 13:32:42 +0000 pf.conf.5: Fix a typo in the manual page - s/opion/option/ MFC after: 5 days --- share/man/man5/pf.conf.5 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/man/man5/pf.conf.5 b/share/man/man5/pf.conf.5 index 41410d6bc0fa..be46b1a47291 100644 --- a/share/man/man5/pf.conf.5 +++ b/share/man/man5/pf.conf.5 @@ -1490,7 +1490,7 @@ options and both implicitly and explicitly in the case of ones. A .Ar rdr-to -opion may cause the source port to be modified if doing so avoids a conflict +option may cause the source port to be modified if doing so avoids a conflict with an existing connection. A random source port in the range 50001-65535 is chosen in this case. Port numbers are never translated with a From nobody Sun Oct 26 13:33:07 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cvcyq4h7gz6DBq8; Sun, 26 Oct 2025 13:33:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cvcyq1t8gz3JCF; Sun, 26 Oct 2025 13:33:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761485587; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=53dRgxKJswsKiWOlvuPHHYnCgldCv7JiYfaHtrO/HNA=; b=GUdj7GEurkX9viGlsWvQb3kbkFHUcf8Vsp1jvc/L1ITXncMjwirD37TpiYvvvZW8nalMHA 0C09yT5iFSm/gL/70gMAWCfSsr0Npp0rJptcDL//Gj3aKFOADnmXDP7Xm2N5O1dvjYsvS7 Kw/qcOfRLoYUtV6xZhzuDHqByse2Eh2ezfcS3tiX1Tr2mDw1lFRoE3MKJ1lf1Y3zoRtA69 Hma1CzLcPkTwAatJlcYPCJAGodNPvhkzIOdja4wyF+Faz1G20aQTwzqJ5x0QqOLSkL16iH PwswWviXhoXLjX6WDsHpAoLY7NPyH6cdFIC2XgWYs1jppU8tuXr0bnApac4gkg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761485587; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=53dRgxKJswsKiWOlvuPHHYnCgldCv7JiYfaHtrO/HNA=; b=YDx1nE5MjKISKc8+TWC2YMvzZ5qym1G+nY8wmAn+Zvd/mfAYaAoSaGuJDNAXyf/5it2FYf 6xTRyHWbVbIUa5y2ynNcDQnn6XJhmOXQRvIFhP2zaaQnTYpT12UyQa9ThpjtvRqmbAZgjl QKz7euj8ZMrRcsgJHAeAeUzhHVVKP948txr5XqS2EjmVPn7QUH4b75cE5pFXoDkQ2LlNz1 otAuAdNyxv1dqduI1E4T9PYPYjc8A4qUaTGRbqKQKWnuFPKT+1pT0raaUZu7KUBMpc/7cT 06FFT5hezl0ov6Y7etty7Kq7Ir3+u1+g0Uvc/4JhDKvOF0GvkY81EqsRY3s9eg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761485587; a=rsa-sha256; cv=none; b=IYxPJJNyr/qDcSEzhAqLRqB/0g9Ztbu/eUUjwqUpD+JQuar45dg5c+7YhuehXiF7he6yRu dGB1GjeeCwUTYaSNoFzbvUHnCgfmbI7Ftepztf3YO73xX00fu1TV1vysCw9aey1eERhpO5 L11QViShj3w/231PJZb6iHtRobxozCn56KsXjKCCXq+0x+Fii8XRZ6rs1M3Abqe+lBO92S KrM8OzXmMBEiI7XgJWra4/GX1zS3Ce+ivztfKvCeCCgUPRGD/K2oD1ciE01aXVRiE7Gvc7 gJQFAErojHQX40d6Ek2R3Wzxl3i9O6qFIVi+9I1TNiI5Wcfy/YHT+HxR18oG5Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cvcyq1RWfzbPX; Sun, 26 Oct 2025 13:33: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 59QDX7Dh025312; Sun, 26 Oct 2025 13:33:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59QDX7hG025309; Sun, 26 Oct 2025 13:33:07 GMT (envelope-from git) Date: Sun, 26 Oct 2025 13:33:07 GMT Message-Id: <202510261333.59QDX7hG025309@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: ca7deba74b2e - main - rc.conf.5: Fix a typo in the manual page List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ca7deba74b2e5179c8fc2180d509632128b56bac Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=ca7deba74b2e5179c8fc2180d509632128b56bac commit ca7deba74b2e5179c8fc2180d509632128b56bac Author: Gordon Bergling AuthorDate: 2025-10-26 13:10:16 +0000 Commit: Gordon Bergling CommitDate: 2025-10-26 13:32:42 +0000 rc.conf.5: Fix a typo in the manual page - s/overriden/overridden/ - s/explicitely/explicitly/ MFC after: 5 days --- share/man/man5/rc.conf.5 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/man/man5/rc.conf.5 b/share/man/man5/rc.conf.5 index edbfa937f8df..6274c1ee5b94 100644 --- a/share/man/man5/rc.conf.5 +++ b/share/man/man5/rc.conf.5 @@ -4950,7 +4950,7 @@ can be used in jails) depending on the content of the .Ao Ar name Ac Ns Va _svcj_options variable. Typically this variable is set inside rc scripts, but it can be -overriden in the rc config. +overridden in the rc config. Valid options for .Ao Ar name Ac Ns Va _svcj_options are: @@ -5041,7 +5041,7 @@ service at all, or may set it to if it is not set in the rc config, to exclude it from .Va svcj_all_enable -but allow to explicitely enable it. +but allow to explicitly enable it. The sshd service for example would not see other jails, if it would run as a service jail. This may or may not be what is needed, and as such it is From nobody Sun Oct 26 13:33:08 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cvcyr4GPTz6DBbw; Sun, 26 Oct 2025 13:33:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cvcyr2j1cz3J1P; Sun, 26 Oct 2025 13:33:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761485588; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pKeP2iUvdc+UzjkVMkeC1eb9PhlgeY1nU3g/PWRXp0E=; b=HGL0zG4Cfc+pN4ySGQI900t3SNhb2eA2DBBgzFl2SCVXghi/COcbuQt8dxxYm7C1SU7pmT VNGrrjVNcoHpgYDcAZku2JGOv4wxDOkGJdxJ8ZKx30G4SWabTxaLL6HB1Jn91YWXg4FRKT twzUnXmOdXdvn5REjEVMh6wo+lULgMTNR+nxKO0DUbJ6L/OZnEjxb4aN1G8OyawiFrcQN/ 5YlTRRS6yEjtU68xV+6nF2bDYP/zz5HMElkeAewpybE7Be4ferlDhy7M5kGe0Bjg2d6Kcy QAg65FpizSYxWyzmDlKt2nzNXVMsF6AvnLN7VDTtG5eBhFH9GuALBZtXhMHAVQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761485588; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pKeP2iUvdc+UzjkVMkeC1eb9PhlgeY1nU3g/PWRXp0E=; b=vS1P5RbYnIBYhdf5Y/YigrX3MlhLhgdLzXSXMuIl8YXvRn1VmaeKOkc+r8tShRogwqgH4F JGzsYRb3a6wRDQRB4bzDLnhsc+k1mgd1VXJftKRr3XkwzQLVJIiFDinFLakvgIzk1FzCuo Zyx38pdfJN5xxk755YK2Z95i9S21HZXH4xLkdM8fUWRGOrt8IyD++Yrb1wxq+fLEhHMax5 FOBFWI6yJVGCbZ4eL2ttabKAF4CfI+ZcCyieC2I4vyPkhGz89zXcqDlEHanNa0RyvQPlRJ bWHa2YVJEdGEXKIOXjaoQ7kIlDRsxBWKULfWgp+5nQFuQ6lA/5And7wXoEjJDg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761485588; a=rsa-sha256; cv=none; b=Bd/8+aKER4FJyHhpF1+8CnXT9fJg6x3BZxAgfVwwtX0sm5VYxMSO6FqktGdCslTrjOVGhe U47GzIuBaYz8CuoP1wXA48/swMSTQjLlONkVv5jVxZ9Tc0AVfTnQsbW8Ur17psT37/R3fr 5crnbnumELow8nyYKk7/yOO5EIzmoVNXW7dIzWxko/VNJ4dymZI050HSjQyp8KZ1kIVQd2 p9AmMXyAZBYLYzUla2NTK4C/FSVD1nIVvldfhcWbXCbFUmmYytFQHTEsRe1SVul4dg1qJi /6A2+KalWYHtKTLtXpvm+sXE6yl8sK2x6YW76wpfojBHI+zeBdta5qJEmxeDaA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cvcyr21Rqzblg; Sun, 26 Oct 2025 13:33: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 59QDX8Nm025354; Sun, 26 Oct 2025 13:33:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59QDX8MR025351; Sun, 26 Oct 2025 13:33:08 GMT (envelope-from git) Date: Sun, 26 Oct 2025 13:33:08 GMT Message-Id: <202510261333.59QDX8MR025351@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: 66923ac81ba8 - main - arch.7: Fix a typo in the manual page List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 66923ac81ba8077d2eeb02e49c890a2bfa8ba39f Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=66923ac81ba8077d2eeb02e49c890a2bfa8ba39f commit 66923ac81ba8077d2eeb02e49c890a2bfa8ba39f Author: Gordon Bergling AuthorDate: 2025-10-26 13:11:46 +0000 Commit: Gordon Bergling CommitDate: 2025-10-26 13:32:42 +0000 arch.7: Fix a typo in the manual page - s/dereferencable/dereferenceable/ MFC after: 5 days --- share/man/man7/arch.7 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/man/man7/arch.7 b/share/man/man7/arch.7 index 668f5aa23155..5170a27768b8 100644 --- a/share/man/man7/arch.7 +++ b/share/man/man7/arch.7 @@ -76,7 +76,7 @@ Pointers should not be cast to or .Vt size_t if they will later be cast back to a pointer that is expected to be -dereferencable as they remain bare integer types on all architectures. +dereferenceable as they remain bare integer types on all architectures. .Pp On some architectures, e.g., AIM variants of From nobody Sun Oct 26 13:33:09 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cvcys64WPz6DBc3; Sun, 26 Oct 2025 13:33:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cvcys3nvtz3J1b; Sun, 26 Oct 2025 13:33:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761485589; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MFaNuij5l4HpXsLFW7FjHscuOS5ZyzgqXWTVcIdlB1Y=; b=QOonfcsb2mxQ6F5oic9CNcYuPNeGtiHRciww5PG9nRz+bElcf46R4GgkADJ/0H00k32LpJ +/nCIbPaNVuhQlSFq3BsYdPXg6HO6mU9kotWiZ7iqt6fpOJFafnpxgR0XesGUa/cLbjwES C/7FClp1G+rpokjDrxJ7cizQAMh0WYpivxMrUGtEaXZmXPnK1qaDpSGROe4e+j65R5PupD J5tDoAHJpUCaw/y/3v/PPEbrkTXUnEwo1iEX3usv2muClL/bXDRow+aMgWqcj5klOZuIgG i0e/YDn/m4i+2Nr27BDtSoCXj9PePhonYI95CaHZLEYcKpVoypr/XmsR0ZR4oA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761485589; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MFaNuij5l4HpXsLFW7FjHscuOS5ZyzgqXWTVcIdlB1Y=; b=ixIa98ULWMcowjURHAxRJPEJIKUCZnwiWlNN4D7PLjBef9CqwCq+hFrJmrUR4eIZTfrmnX AtBY3oIsx2R//wgQbON4TSprkyOxcSSIYLrKZO65IvJcPlz0s38+cggFLrSuB4L2aDJpqC UAJH+h5yTjXQVboYhGyxX9FKFfzqvFW00uVywVsMCJn0N8BA4TYtXsnEENgWRS4tQ/KtdW lcuGxJzD1NBHBxpLNAfVDhN82XLOwOu4goOqpD8wTRM4udtjJHRrTnn3pu7mKLs3G/H72L DznwkZ1mvU+IDwKTSHZ1V5EDbUrkxzt2m0jgtaELOglYBUMyaiUm+vpQ7LbCqA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761485589; a=rsa-sha256; cv=none; b=A7y9sRjsg23T2vaBgSdwCCANlTV61OuoRsWyzhhOzdHYl/snA2Hu9g9FUcBc2P0tvjLhpV emhLjnXjyOmmSR+Dc5Z2hXr1y/ZmZ/8BvE2mG/M3MmJT6kZhOVEPMSFbkSKbZQVLCoD911 rNAg80VvaB+n6HNGFGLgt0GVYurmrLit1Ql7sxpXdbWyibQ3byWlp0z/HIvvdhIrc2bj+K J0sKVsibpr3V2vekDcTkSqBYQUMgenYDg+TQ3QH2jX0SHcSBYUbzLmUD/cFsCLGnyuDAeK EmCP1pXKHFPVGKq5nlmCAbgyzNm4i/xPjrC+rG3y4cXPJDF217o8dhIhxc90Tw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cvcys3HbXzbMZ; Sun, 26 Oct 2025 13:33: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 59QDX9Zd025390; Sun, 26 Oct 2025 13:33:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59QDX9MH025387; Sun, 26 Oct 2025 13:33:09 GMT (envelope-from git) Date: Sun, 26 Oct 2025 13:33:09 GMT Message-Id: <202510261333.59QDX9MH025387@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: 8c48902d41d8 - main - build.7 Fix a typo in the manual page List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8c48902d41d887eed3490b2f274801aa6911f389 Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=8c48902d41d887eed3490b2f274801aa6911f389 commit 8c48902d41d887eed3490b2f274801aa6911f389 Author: Gordon Bergling AuthorDate: 2025-10-26 13:14:48 +0000 Commit: Gordon Bergling CommitDate: 2025-10-26 13:32:42 +0000 build.7 Fix a typo in the manual page - s/envirnoment/environment/ While here fix a .Xr macro. MFC after: 5 days --- share/man/man7/build.7 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/man/man7/build.7 b/share/man/man7/build.7 index 5e15a528246b..9adfd4bc8a63 100644 --- a/share/man/man7/build.7 +++ b/share/man/man7/build.7 @@ -202,7 +202,7 @@ package or port provides a more generic solution. .It Cm buildenvvars Print the shell variables that are set for a .Cm buildenv -envirnoment and exit. +environment and exit. .It Cm buildworld Build everything but the kernel, configure files in .Pa etc , @@ -732,7 +732,7 @@ See .Xr src.conf 5 .It Va REPODIR The root directory used to create the package repository for building -.Xr packges 7 . +.Xr packages 7 . Defaults to .Pa ${OBJROOT}/repo/ . This can also be set in From nobody Sun Oct 26 13:33:10 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cvcyv014fz6DBlB; Sun, 26 Oct 2025 13:33:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cvcyt4h67z3JGP; Sun, 26 Oct 2025 13:33:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761485590; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=g13H9z4bPQsL/AZG+2kkILJ1n6TR04VICfC89E/EPwM=; b=opzhBSRZUpxB2UFInjPNDgyEFHgTTR/NR3O4nQipdkpZWgwupmnshkLpeghZtbAjL6xPY6 Y5mtWUtV6Eihwgk/SaemZ4J/+db7N9dZVGrr1ZDLZ+LRgplKIe1EwhG14qkNbCQYx7zRWI kGSvWC7zVDip3EU5VplC8BQHB+1D+QEvqyA5/6PEVkY3YPEU2ajXksUzImDsyZSCyJm/Yg uDg3Wq0uJbFlHS76QeRszXpBR4e8JaId1IpabY/qDORyzTXgCLXhc0RO/62BkcBQi3oGvU gL/nJbtBlhJHtY0q7sNrD96EC4nIqCjSEy9Zwf4J0r53GAuardIAb8bXCORy1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761485590; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=g13H9z4bPQsL/AZG+2kkILJ1n6TR04VICfC89E/EPwM=; b=HclyZCX9ZDGfgUS++KSi1nxg3XZawA0YOyjgL+cdVhkjjNST3u2ibttJhZ8LAoxC1Tes4C eT9AS1bJYepuyVfnk6k31CqYXJ8RdFDnAy/matmA5lD3XReQQIptzGrlF2AKMjsqTptHyE jmHCIjcSvlDxx+aWQomjJ7RIhaYuuS17SA9t/WKe+6/3ro6C4a4sxYopEz6sHy34HImLek eeFtUhPtGtCo87I2rOfgs6YhbOhx6nP/W0MNwYLcc00xmXsZL0DDpegq8bbOrfD8158S3Q F/yjXDbR1/vxYV89l/1BomOvhorqRCJrS22g0QVyxPWjDYTY/aToLPrShE0CDQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761485590; a=rsa-sha256; cv=none; b=PkGeQPF+jz8K9xiYRZwXyndrP07uKen1BKDgm/Tv8mgZh4rT/Bo5DAQUVHygMalHIQO/f1 Ql7l4sl2heySVe5OFMM31sltou6WoTE3Z3ZUIrXzfvQR/fzua/KthLS9zGfTteA3RlgCJ9 P1sPjaF/PRRFm7qg8Ei6v5hAiXtDKHvFY6ZIi40IO6tqs6JE+r9kNWFKNPQ1p0raBz87P2 WfYyW4jyjZGm9AQc4BVWQfrYiJ9Y78dbOAYBdCPPjVUY2BFqb+dIQez+0jAqIHghmSUX50 EOFiQ4ZlItXOeHWSTTXYnUzmr0GeI5ZWPov3MZhADOLRkaD3hJvohxAPxo/xnQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cvcyt494lzc0M; Sun, 26 Oct 2025 13:33:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59QDXAEs025431; Sun, 26 Oct 2025 13:33:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59QDXAjf025429; Sun, 26 Oct 2025 13:33:10 GMT (envelope-from git) Date: Sun, 26 Oct 2025 13:33:10 GMT Message-Id: <202510261333.59QDXAjf025429@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: e47c294d005c - main - acpi_battery.4: Fix a typo in the manual page List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e47c294d005c7789f120d80b566c25f90e431278 Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=e47c294d005c7789f120d80b566c25f90e431278 commit e47c294d005c7789f120d80b566c25f90e431278 Author: Gordon Bergling AuthorDate: 2025-10-26 13:23:22 +0000 Commit: Gordon Bergling CommitDate: 2025-10-26 13:32:42 +0000 acpi_battery.4: Fix a typo in the manual page - s/rechargable/rechargeable/ MFC after: 5 days --- share/man/man4/acpi_battery.4 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/man/man4/acpi_battery.4 b/share/man/man4/acpi_battery.4 index 3707cd125678..49fed625ea31 100644 --- a/share/man/man4/acpi_battery.4 +++ b/share/man/man4/acpi_battery.4 @@ -158,8 +158,8 @@ Typically this will decrease every charging cycle. .It btech Battery technology: .Bl -tag -width indent -.It 0x00000000 Primary cell Pq non-rechargable -.It 0x00000001 Secondary cell Pq rechargable +.It 0x00000000 Primary cell Pq non-rechargeable +.It 0x00000001 Secondary cell Pq rechargeable .El .It Va dvol Design voltage in mV, From nobody Sun Oct 26 13:33:11 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cvcyw08qBz6DBqH; Sun, 26 Oct 2025 13:33:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cvcyv5BjNz3J24; Sun, 26 Oct 2025 13:33:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761485591; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JCDX+SKVLR2h2TaEK13BmeECjr+EQZMKuo5lXhND9CU=; b=ma1p5D6cjSRD9152m0LlxsFH5id/XjDmSfqZR7RATHAu5cgFo/lJPpWetcwfzF9L4fJuZj /4ozDFT7zfJ3e5Vc+kan5JpGeTcgJl8+PLoZDQG5hExddjVIVVwK1JHZ5mztr206S4tNIz tIZqz6Ruc4K+F9eACXOeLF8kG8p9RfZl7MXCWWLx/FzQWEJZShMksO+y5VMkNdq4q1wabw 0DHgpMMwPnBbOm52LgphoDFJ3bS4GL5EKPL2eA29WQQw/OGYFlWZO5stLv+o+Y7jvb0Kel bGwI5zaI2izn3GULeAnqpRSIQ5OLcDQMkO2hamgjbpMhJhGVDjaG8J7VA1sB9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761485591; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JCDX+SKVLR2h2TaEK13BmeECjr+EQZMKuo5lXhND9CU=; b=ybgGXSOkkfCNZ6MsORoMxXMm4YL++JizGRqqn2L32zCsgTVrGDyZ3evO4R2OmaVgCoJ8h7 vDtRlycCwtF+MvQicbDh6hxU2wyY5ncb1VTBUUKEdL40WfmxcxlnunapU+OivUx3XO3O9P XJt14E0SuePxFY4JtNAFNmycojs+t6IqbZfn1kMVRivBpSiAITb6MCVckxbRyOvI6ExG+Z 4F6GBcgeOAC5KhDgmnc9vZsaNt9TZ6iDoH/tkQ+N1+SFtHE/LJN/oPDqoDNPAkSQURalcf OXukckee4bxtTXNbkGON1QIicrnegN7N5s5Q8+L0DKVrxGn3O3InylgjmVoMpg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761485591; a=rsa-sha256; cv=none; b=qE9ryWrgPCJKYzMBRIITUY9I+OqTzm8KwBC+EvjgmPoMfISXAodhYWDeefleSbpl86mbqs iti4Lrx7LMLftbjVPrrHXDxZ+jvN59HzogzBj4Wv2KFUiMaLBBVuu0vtOMo4S2TDdfcKx/ S3g6bT4ZuFrd1cZcLollYgSd05CEGhSNOJbpE/dLQyNxkavHXCEP92QInaTfFb7ilavxyP l86Q+rE1w9Iu6hKahBJ5YSoK9oiBuE9MAsFPvATtEsam2iUzvdFUpMM7tE/1txENAG9C4n +oYCKGcIF6vo7mlLGdqWu0JM2HYu27UM8vpR9hmNBvOJrE1LvnVyHC9nJw46fg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cvcyv4pQczc0N; Sun, 26 Oct 2025 13:33: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 59QDXBZ0025463; Sun, 26 Oct 2025 13:33:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59QDXBsk025460; Sun, 26 Oct 2025 13:33:11 GMT (envelope-from git) Date: Sun, 26 Oct 2025 13:33:11 GMT Message-Id: <202510261333.59QDXBsk025460@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: 76b44182c6c2 - main - ahc.4: Fix a typo in the manual page List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 76b44182c6c250a3307c4eecf24976c810e065c2 Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=76b44182c6c250a3307c4eecf24976c810e065c2 commit 76b44182c6c250a3307c4eecf24976c810e065c2 Author: Gordon Bergling AuthorDate: 2025-10-26 13:24:47 +0000 Commit: Gordon Bergling CommitDate: 2025-10-26 13:32:42 +0000 ahc.4: Fix a typo in the manual page - s/configued/configured/ MFC after: 5 days --- share/man/man4/ahc.4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/man/man4/ahc.4 b/share/man/man4/ahc.4 index 72a1e092f1bc..a2aa911c0646 100644 --- a/share/man/man4/ahc.4 +++ b/share/man/man4/ahc.4 @@ -144,7 +144,7 @@ system hang if memory mapped I/O is attempted. .Pp Most modern motherboards perform the initialization correctly and work fine with this option enabled and it is the default. This option can also be -dynamically configued through a device hint documented below. +dynamically configured through a device hint documented below. .Ed .Pp To statically configure one or more controllers to assume the target role: From nobody Sun Oct 26 13:33:12 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cvcyx1Fw4z6DBlM; Sun, 26 Oct 2025 13:33:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cvcyw6QLKz3JcH; Sun, 26 Oct 2025 13:33:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761485592; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+lfaIcbNILjwb4OoWUywPGFRoJGYhqP/ytprwvk7qCY=; b=oC7qA6oXaywO5GN18MX++sezMNQb/eLrSlr2tkos8tXgA2Io8TxaJUgNpALBcI9/AykpNE Fl0MQgWIyhvWr+MbFrMMT/GZL6Dk/pcH3w/aWnV1Lo4nPMeA3HeDbyKYGBGpPuTZxSZ4MU /4kCPERTBeNqV0hpcxNOQd/DpnQB53d407zkJlFlsCBkv9j/4W92jHhB1oMlbTnJOZ4+NA qLMWJ053sFoGuQd1/gQe6eHsowYtsy74x0Nas/ooZTZVdVMFbdByXFPG5zu4GxGvxOxp11 foyK0SyyImsNVdgW40esY68wYJz0JF96q0L13T28CNJjkZakhWrlvZKLJ6e/eg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761485592; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+lfaIcbNILjwb4OoWUywPGFRoJGYhqP/ytprwvk7qCY=; b=HY2Tpgtigyxq/3qmP1RHe4DUvoWAOEkoTP8IWUo9N7zUQUpeJT9NYYCh3pgm0jPJgc3LvO +EBU47dKJm8X5/UjYLIwfMK7WBeS2B+QIUk1UjOL3/u7TtzL4SgH/okUQZsQ7RR6sVjzCz LjTspcSxPqbd/yJdfOJnmR5FG2ZSMPkNQzlEEvlsPExuet5+coim6Cdmb0ugfAXJZ1WBQC CrNVlevjmgYmhq2EGeQciA4lsDu6VlhAfKF8ZERQLOwyfBDv4VyyXALEPq27/lxj2mqhUC WwyRyy0K9aC7jLCXlfMWsc9BGCdfn+oVYkF+7zSUo+F7dfMGiCbxWJ0nt3vjfg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761485592; a=rsa-sha256; cv=none; b=dByeVJyd3hMbsTOlYutZrX2klypXM1eS3U6wzFvjT5Pp8PEc4o8jy2oVQOWIQh5y70qa8+ Eu6yMTXyTAVY6r9hxpX9g63xzF2hLPXcUpN8i+OyzMoITz4EAg+0442zx4ZtMoswNiXYz9 Kkq1nWT6xWvxTgkTPmYuWb3G9m9jsS4ZElmHa1zU+YZL5KzHdJuk0o0SdEpgf5sdJyRgUn u9EgP4A8g3SXHBfmY/JvMUxQ60EaUJgus3DuBtFrYPB5+0P6ogtGj7+kg7ktaBNmijFLQQ kZwpVfUdoQFLVLikFK1tbNkHSuXV5v0lQ7nn9ERF0QpC0N7/u1fmZsKKoDAbCQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cvcyw5rDHzbSX; Sun, 26 Oct 2025 13:33: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 59QDXCm0025501; Sun, 26 Oct 2025 13:33:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59QDXCvc025498; Sun, 26 Oct 2025 13:33:12 GMT (envelope-from git) Date: Sun, 26 Oct 2025 13:33:12 GMT Message-Id: <202510261333.59QDXCvc025498@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: dc9fd0f379be - main - bce.4: Fix a typo in the manual page List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dc9fd0f379becb94cfa3adb3a53a8a42da336d52 Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=dc9fd0f379becb94cfa3adb3a53a8a42da336d52 commit dc9fd0f379becb94cfa3adb3a53a8a42da336d52 Author: Gordon Bergling AuthorDate: 2025-10-26 13:25:49 +0000 Commit: Gordon Bergling CommitDate: 2025-10-26 13:32:42 +0000 bce.4: Fix a typo in the manual page - s/activitiy/activity/ MFC after: 5 days --- share/man/man4/bce.4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/man/man4/bce.4 b/share/man/man4/bce.4 index ab979f371b66..aab9eaebd505 100644 --- a/share/man/man4/bce.4 +++ b/share/man/man4/bce.4 @@ -240,7 +240,7 @@ Values from 0-256 are valid. A value of 0 disables this status block update (default 6). .It Va hw.bce.tx_ticks Time in microsecond ticks to wait before a status block -update is generated due to TX activitiy. +update is generated due to TX activity. Values from 0-100 are valid. A value of 0 disables this status block update. Cannot be set to 0 if hw.bce.tx_quick_cons_trip is also 0 From nobody Sun Oct 26 13:33:13 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cvcyy1rvcz6DBcD; Sun, 26 Oct 2025 13:33:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cvcyy05Gwz3JM7; Sun, 26 Oct 2025 13:33:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761485594; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c4HTUm/w9lC4i7XrB1uJdgTjaDSuJ4PCzZMe0Y4xyG4=; b=hOtg9oF16Z6Zv6wJiKmzvhbydUxc6SS73Zxtd90GuLoyPS+skir1SIgQmIR3YYxBczIXLG D/8aGyd2RMmnKDPNLHD8cnkOByVVoiyT7f+6zc1euQ+c5xJBF2CX5AftUI1nbNOL/SF9N2 tUYJ3s9bI1VS6ZdeZo8296e3UcjFdg+2iiRswlCKWdUmsg205Dv9TFaggTHpBZjFNfU9vJ GlQVhlVkRN6UZdF14oNU4tpyeiktHychhwY6ZERUaF2BBgvpkq9OE5tJyoLYG9SyxdBOXG fFxRhqEfNi7NY2cuXzrhCebrGIk3kFV7vZyIzN/eCDjb8uKDimzr4fjA4+oyVQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761485594; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c4HTUm/w9lC4i7XrB1uJdgTjaDSuJ4PCzZMe0Y4xyG4=; b=vPA/FPcDYnzpy/5YrMAtrWRu0/rtrTEbgJ0nhlvsrvgE88NzdkUXNXqm3yrr6xHKiNVKkx iaFRtVFS1r9E3tpP1ZtRGKC3KqxmoUvZZAWzhbgdi1ky0H2fPgqV0XL3VslGeSAOx3lcAa xO0herkx5O/2ReYTUkMCtT1djjEZwAhFWcbo+mDEV3jYXBSsqo9ZeRlxV1HuKukn1a/1u1 duQYz9CU+IIqfN+S2AlFovRLAFw2NWl2oDWjbbaC+W6cLm8/mm8ij992A0TzXLbMgLai6V +oh75Vp0kRUgQgMVLC/SrDkeDm+R/J6mqvIQPMkNcDnInSl2wDgURTUkXvBnEw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761485594; a=rsa-sha256; cv=none; b=fKQvp9X9rtTk7DjA0On7Gqlw35fTyTTeDGEPR/76JXiON/rv7Yoi+WmASkQGnvtLiTCJFP R35COTduLuPVeYye5z7Wc3ZiKd/B2OdA8C3aG1M6WTkaSiaEzOVUkrQfMizea3yq6z1UNl KQIbERfHJodpVA+SU/pro0cRfiNgQ/2YDyy5eFWrotXk0Bu1aLzIhttChDaN/O0J+Z37Yr O3OLC5D3YTNSiT5XI5YfoZt6HN3F/Deh2t4uAe44wDTXrkIOSND0sGqsHzr+t9ucp8ih/h 1xQ/IhHa87uqheazlW1BTHqNiw/nsOYb7GkkIaLI+bkUm4H+srqExpd5TueyXw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cvcyx6nJVzbqT; Sun, 26 Oct 2025 13:33:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59QDXDVn025533; Sun, 26 Oct 2025 13:33:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59QDXDxX025530; Sun, 26 Oct 2025 13:33:13 GMT (envelope-from git) Date: Sun, 26 Oct 2025 13:33:13 GMT Message-Id: <202510261333.59QDXDxX025530@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: 7c8c5ac82e27 - main - iwlwifi.4: Fix a typo in the manual page List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7c8c5ac82e27a4d4246574bc1a636b05b1d0937f Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=7c8c5ac82e27a4d4246574bc1a636b05b1d0937f commit 7c8c5ac82e27a4d4246574bc1a636b05b1d0937f Author: Gordon Bergling AuthorDate: 2025-10-26 13:26:52 +0000 Commit: Gordon Bergling CommitDate: 2025-10-26 13:32:43 +0000 iwlwifi.4: Fix a typo in the manual page - s/incosistent/inconsistent/ MFC after: 5 days --- share/man/man4/iwlwifi.4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/man/man4/iwlwifi.4 b/share/man/man4/iwlwifi.4 index 660f6a9bf57c..411af54be9fb 100644 --- a/share/man/man4/iwlwifi.4 +++ b/share/man/man4/iwlwifi.4 @@ -284,7 +284,7 @@ module parameters and are mapped automatically by .Sy linuxkpi . They were not adjusted so that they stay consistent with upstream Linux, e.g., for documentation available and problem investigations. -This left their names inconsistent between themselves and incosistent to +This left their names inconsistent between themselves and inconsistent to .Fx style. .Pp From nobody Sun Oct 26 13:33:14 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cvcyz2dmhz6DBXb; Sun, 26 Oct 2025 13:33:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cvcyz1F24z3JMK; Sun, 26 Oct 2025 13:33:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761485595; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jMQFgPp5TCRp5X80PPUURiGkOZQViM+8t8m2bG3xt78=; b=p8Ikgbv2GTu5du9L18V9oaTN+WAl4JYo95nqTbzXqM00AvWk2ZLue1tJi/i9m+VqstLxTe QE41AywSqzqNelOY6DRrpSjVSG4PtNzP+GA8kU2GOTU1uKiH3pKZqX00k6deXdq4nlrR8n SOHPxFHn96A6tEAv0ulRQjj7hbcw6FB6Gw0m0jn2iuXkBogU6ReI32YmHhqhmaFtNWYTUn ngLQr6CdUkihl+1UV6auXI/r/+Pi9BStzO+KPfOAoqH4HGcxPCKR9xrnTZ9HhOAMD2AKpE f5uvnn00SH30K6sOcrzhRJ1mZH+kzwUcaRUL+mVq0jsb+qRZh3hr5Qq8tpK9lg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761485595; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jMQFgPp5TCRp5X80PPUURiGkOZQViM+8t8m2bG3xt78=; b=hiEsFkXus0UDJKLFLh5fMs+9EXlDQUk+n59rr76BT2gFmfA8ooB/Nh3MNDr81RcL4Ot9zQ W7h2R+S28Ho+n5LofGhTtTOwrNRPl1LCa7In87birWi65CzpNyJ3UzPhBB0hlqZl+P8pVC m+cSkeAtCJSu61ZpCVutSwZ/d4yzkt9Yvkjx7Q5yAavZHbsZF8GeWcLItbSVQBpo37okDG UGqHJC57q4AQMFQr3sFPn52YO0PRRF3zpflZP/rvRidLgp8hJa0JVDMl9sKnqcIdKeGwyk agunAr/7aXj+XWnu4fTqMwXQb3WH1OQPq4mtwSWLPj2UhSNwJUYfzcqn/Bn8lw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761485595; a=rsa-sha256; cv=none; b=xhsDzGdhjq+1AuQ9JEZED90P0IrwFhsoolXoQY2UMzFW+AMX16aT9iKVWECxhZvyNcoCIo h+SvF4igfrEPCEwPnF8Opj9v4Gafa0tp1slW9AYnN/2G1XG2MvIItEYvcfOa1sfck/onVG yADC5NmBjtj5cJrZvLAWUWiOY/A0D+sNWvzQ8u4ZW8o66f9hdFbagr7LYD/u85bbXy1hx6 RJ2TODGqD5nm4BjpFv0xB4S3F25WCilCCd4lA4K3wZ0d85UGLxr9HBRodnA9oLEjCvglYU bqbHc34xOiozUOsN64tehYs/g5FzuGBbAVOPfXLt4JC1swQBqKmh7ghldFHooA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cvcyz0grjzbMb; Sun, 26 Oct 2025 13:33: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 59QDXEcs025565; Sun, 26 Oct 2025 13:33:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59QDXEOO025562; Sun, 26 Oct 2025 13:33:14 GMT (envelope-from git) Date: Sun, 26 Oct 2025 13:33:14 GMT Message-Id: <202510261333.59QDXEOO025562@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: 72a9bfcfab08 - main - mac_do.4: Fix a typo in the manual page List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 72a9bfcfab08da5a00e2ec3fba580157173c6a15 Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=72a9bfcfab08da5a00e2ec3fba580157173c6a15 commit 72a9bfcfab08da5a00e2ec3fba580157173c6a15 Author: Gordon Bergling AuthorDate: 2025-10-26 13:27:53 +0000 Commit: Gordon Bergling CommitDate: 2025-10-26 13:32:43 +0000 mac_do.4: Fix a typo in the manual page - s/occurences/occurrences/ MFC after: 5 days --- share/man/man4/mac_do.4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/man/man4/mac_do.4 b/share/man/man4/mac_do.4 index 39bfafd95474..d02932070e25 100644 --- a/share/man/man4/mac_do.4 +++ b/share/man/man4/mac_do.4 @@ -246,7 +246,7 @@ nor contradictory ones. In practice, no two clauses may display the same ID except for group IDs but only if, each time the same ID appears, it does so with a different flag, or no flags only once. -Additionally, the specified flags in multiple occurences must not be +Additionally, the specified flags in multiple occurrences must not be contradictory. For example, the same group ID appearing with both .Ql + From nobody Sun Oct 26 13:33:16 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cvcz04D1vz6DBqS; Sun, 26 Oct 2025 13:33:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cvcz023nnz3JMV; Sun, 26 Oct 2025 13:33:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761485596; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HKeNXGd9sc+4pYgPABJxfvwehuJlPDxYA9zXV2FJ5P8=; b=W/CVGbMyMr9W9DsIbuO/zTKChfCxk+ezvAxKiqUns4SDu1i80Y2yQOUxtKYaMNf2DTG0ZZ 0a84FAIMW5R2pPACyjbl1YR9jVOcMZOnNdoKLVj9msxdJsSLi0w0iIin66fynvXHWbOsQ1 PemKLM9htHH2dbDiSNn56aeVa/bdg7k6WUuyhzDy2PM9a3t/Z1niF/UXY9kJdK3Jhw2QMW R/YlVP2yzQR3HqeFOD0VHnPpkapcigMRa2L/WUe/ZdZijVTlEBVGp3xmmdmz0DpfHxKSFr sVK3g4BOhIEVVsqLatxsoWIdsoO5O3Uc1+rXKZhVKXGzgLAZEQ8lsaL/2KJB7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761485596; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HKeNXGd9sc+4pYgPABJxfvwehuJlPDxYA9zXV2FJ5P8=; b=Erk5QofZNVMLG6XpYOURE1NdvRXdhDuONprBTKCpNI6j69crD2QcGIXHFYVNWaV6pj5J/W Pq8ZgLgInwIqoAQhMmYwRXiI1UTOr5ilQ7LcBYrISETBV1I0OFkCQKtwsF9ngKwEjZ2O/N 4xalAG5yBRs9KhIikwuTdF59bkDVFyVsK/fOZx+sTbV9Lzs5gMKUF9/C2DhKJWAdx+oL40 ydJeEgKG8kwJq5erO3O7RLIgaQGXaRUk1oxw1JSxVwFr8OJSMfmT8U1RdCis0Xlu3c67Bu M7AgaqyV3lpK6v3XxF8HtIm98hKw30To1AV8OVJFEBj6dt9IEJQypo4muNSoww== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761485596; a=rsa-sha256; cv=none; b=yNmNCOnN1jsu5fvWMACfyGUsUs+LHZjwiY6Wjaz0TXVM0i1eo8PNDow6Xu6vYTyqv7TXM5 YDlfvd/elFQCt2swJqGRB4/9Qp2eM4dDdfSymW9VAE2l5LGDlyw/0oq9WmYyAki9VIBkhA 9DIi3aQgHRZnxH3DcgHIEiAywQ/gCtFGBvpc6Oq88jFnWZBFsHx4S4X9oovbjTc02j5ozQ ciRvI6321/FBM+h/Y/KtND2O7377S4PMiywB0Ajn1wNpyGwwYHC7nnk2WIDHfVAUYqgPbP BJG7Dfj5quCy86TZuZAlg3xIvplaVorhYkA+wG7Y3vmWK/J/BNgJej0zfrlszw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cvcz01dWyzbSY; Sun, 26 Oct 2025 13:33:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59QDXGfZ025597; Sun, 26 Oct 2025 13:33:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59QDXGAb025594; Sun, 26 Oct 2025 13:33:16 GMT (envelope-from git) Date: Sun, 26 Oct 2025 13:33:16 GMT Message-Id: <202510261333.59QDXGAb025594@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: 5a739b74650b - main - p9fs.4: Fix a typo in the manual page List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5a739b74650b0746334ddcd92ef73369f0c18c54 Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=5a739b74650b0746334ddcd92ef73369f0c18c54 commit 5a739b74650b0746334ddcd92ef73369f0c18c54 Author: Gordon Bergling AuthorDate: 2025-10-26 13:28:48 +0000 Commit: Gordon Bergling CommitDate: 2025-10-26 13:32:43 +0000 p9fs.4: Fix a typo in the manual page - s/recommented/recommended/ MFC after: 5 days --- share/man/man4/p9fs.4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/man/man4/p9fs.4 b/share/man/man4/p9fs.4 index 04f27abd2545..a49053d461d4 100644 --- a/share/man/man4/p9fs.4 +++ b/share/man/man4/p9fs.4 @@ -96,7 +96,7 @@ may not work correctly. If .Nm is the root filesystem, -it is recommented to use with +it is recommended to use with .Xr tmpfs 5 to ensure that temporary files created in .Pa /tmp From nobody Sun Oct 26 15:09:55 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cvg6W6sLjz6DMfl; Sun, 26 Oct 2025 15:09:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cvg6W674dz3XpC; Sun, 26 Oct 2025 15:09:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761491395; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IzNbw5DUQBL84RWpM9LIeKVAO+Nt/GsDCrCUxeu7U0M=; b=hBFvhdS+qeBr/O2UlcXonFQx0P2uCE5R1NTXrpAq4M5CeEPACAsHS5D6hKOsFFX45LKvw/ wXk1iEt2viLsC9o9zsB4+nDsKBnybsdkJto/EKTfcjndClxVEPZexh3mtS88GzXaCNAPB7 Bgv6BUczKUUKgDrTSz4TN0joATr3L7HTATs4jIWA1FiEgll8vo99/jgc4ZlghIupJ035xf Zf2H3CSH/MvYMNXNCSfzTD7PL6zZvi9yT6yOyXtL4PgucbsEn7xIN5lKbNuNawfjgBHub0 FUYTgIW/OQCys8ZHjz8XiNBGGR06qj9sgxzTUcOCadGyC7bhgMBVJmYO02sbSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761491395; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IzNbw5DUQBL84RWpM9LIeKVAO+Nt/GsDCrCUxeu7U0M=; b=VEBysebOJmRF3HPiL+jsb/7ClObRxPXWxRFnvDvywQJoLm77+tfQcUDqI8cnKTp/5R356u kmuw0E1ESurTaV5vDv9HZbfvZIezLi6NHnQXtq00OcnTOyy9587UWD2UO1EDGGL016kSA9 6eGchgYelbM4ley+6Q9+fLbXV2tMn+B12Cz/jylzzjhiK3V2DTInQ9BqlM2iPVq00jek9q L/P8sSjsSEK4SyC9lndjMIQlirvEq23CxzOO3ggu2iZmcnvBD/BOI7V6KB2xK3dGLBQI5+ 24tsyFECwGgpMmlInJ0mS6u0hm36nPYHzsHU2Fp/9Cv3ngv6hMoVGSkhl02AYQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761491395; a=rsa-sha256; cv=none; b=PjGCueT41q1R21TDKPEyhZU7VjKoQiygNBuW4UVPjjN0IO6AbzYWPrBzsvyFcfdr53rcQx eR86J1algWrQxHLPQFCA3uI0c/VS8fEBJEyw58n8NEAPrZSLDScQgfkPECZGccnLSbdEo7 TpRbH8mSdxPZ6APLmFXw/VuBHWyerZfQ5lF5ThfLGWUuOMjWBv0+Q4Gg0CDXfXmW+CjASH t8+vgiDJDMbq1QvHtDFZd4X+ZbFqiJAiIBm2BDWvsy/ZSF5H7agl9ZLdUPjbioIWHBiHgL 3sTbb2uqwXqXsppaamG8Sf9aUzSNgrGjzfo4JMuY/nrLoRcwUtMYBEwG1C6iJg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cvg6W5kCyzfQR; Sun, 26 Oct 2025 15:09: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 59QF9tkQ097576; Sun, 26 Oct 2025 15:09:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59QF9taO097573; Sun, 26 Oct 2025 15:09:55 GMT (envelope-from git) Date: Sun, 26 Oct 2025 15:09:55 GMT Message-Id: <202510261509.59QF9taO097573@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: 44004bcffabc - main - nvmecontrol(8): Fix a typo in an error message List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 44004bcffabc3372d6812c2e0c4bf90386919e21 Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=44004bcffabc3372d6812c2e0c4bf90386919e21 commit 44004bcffabc3372d6812c2e0c4bf90386919e21 Author: Gordon Bergling AuthorDate: 2025-10-26 15:08:31 +0000 Commit: Gordon Bergling CommitDate: 2025-10-26 15:08:31 +0000 nvmecontrol(8): Fix a typo in an error message - s/speciifed/specified/ MFC after: 1 week --- sbin/nvmecontrol/perftest.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/nvmecontrol/perftest.c b/sbin/nvmecontrol/perftest.c index 59439d3ed2a9..da75afc64d8d 100644 --- a/sbin/nvmecontrol/perftest.c +++ b/sbin/nvmecontrol/perftest.c @@ -171,7 +171,7 @@ perftest(const struct cmd *f, int argc, char *argv[]) arg_help(argc, argv, f); } if (opt.time == 0) { - fprintf(stderr, "No time speciifed\n"); + fprintf(stderr, "No time specified\n"); arg_help(argc, argv, f); } io_test.time = opt.time; From nobody Sun Oct 26 15:09:56 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cvg6Y1bqJz6DN27; Sun, 26 Oct 2025 15:09:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cvg6Y07t5z3Xqp; Sun, 26 Oct 2025 15:09:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761491397; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YSafa3fOH8W+ZuQqrcPNpeVYYWy2AQsq5paVDaWnlnM=; b=wIs85usObwFgwY95pL48qPZwkbLEOVrdeDxsxJyfqesjPv3JA5Y9C2S3V8y7KHG6ZfgHjL X8fcg1z5ed5IG9YTfgoTS3ILLk2cJJxj86F43w7R4j+O0nOYCCNRwuvicEeHahpqgv0KLJ Allf595F8nSj6PaemnXtAKwAXXAZMPInEQtOCkAad0w6cjqy8PFae0zeNhjS4nDG0wflHr oEissJK34esz/mk7hVGX5cojIfi997JXOfwuucfuUzJbmVWuWZMpu4HJFrCHzhq02NmMFY +WwAqfnkvNAlIJS1yFMOnybW3W33NB1A9Y2RDzsvgyCvnNoh/m+h8az83ic07g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761491397; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YSafa3fOH8W+ZuQqrcPNpeVYYWy2AQsq5paVDaWnlnM=; b=ml+44Ksu9Etcf9IdNe2sZQNzVFl2ncn7T3R5zdRhNA3I/aAv83FGRHvTCzGXehl4IQ3VDI 2PWVT+vnL+j1TXvwYk2ssKGmvouMnp+K1lJc+VxtiWPIoWsw4o4seNeHraFKjj2reODt5Y KQs5jqknASz0nHbK5nELTK1s0a+0AgauFTvqeM4YgOLRFfB8VLcs+/2PXRfwPgcvFwFp6W gSILMeJnp2NWuoQHGXO9TkVbWv7FAK92EGVTzdpMIEY3PWLnIMJPczBhPGGQ5Igmi/uOm8 6NoqS00VKJdtbtV+xxsp+2tkbxamDi6+mVTppeyqYPgBLsF+kDm3g4UNWkgrPw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761491397; a=rsa-sha256; cv=none; b=r2vcvntens8GUICmS5Sq7h0JgrJjkrdZQSakn8Q3iqd+m1QTzP23Ib9KUbMGxrkLndSxfE qrI2cbngYPNDoB1VSoTuqvsjHTJ+H0LFJxn0wv69bpzletnO4REo95VxD3n6d5xahzcP83 qNYmnmt8vjTleu/ZTy/nmdLCw955KO2eLqUGHcXloYJn+Cs4udXDueCDEFG+EoZF7Im78E a9IenYTNM3Ejd6mgj6MmJGIq35bV5Eh6+/ulmXUiig1gMo1N8Ge1ZAXaS9yzquHEJ2siFR RR0UUiYf+kTuvhQ/dGknzYzobU11s3WLLOTpVDwx03zXBmWH54Oz4B4oOQ27OA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cvg6X6jcdzf5j; Sun, 26 Oct 2025 15:09: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 59QF9uX2097617; Sun, 26 Oct 2025 15:09:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59QF9u7B097614; Sun, 26 Oct 2025 15:09:56 GMT (envelope-from git) Date: Sun, 26 Oct 2025 15:09:56 GMT Message-Id: <202510261509.59QF9u7B097614@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: a31d432264c4 - main - pfctl(8): Fix a typo in an error message List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a31d432264c461581231c08c00a5d0ad8c38bafd Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=a31d432264c461581231c08c00a5d0ad8c38bafd commit a31d432264c461581231c08c00a5d0ad8c38bafd Author: Gordon Bergling AuthorDate: 2025-10-26 15:09:43 +0000 Commit: Gordon Bergling CommitDate: 2025-10-26 15:09:43 +0000 pfctl(8): Fix a typo in an error message - s/addresess/addresses/ MFC after: 1 week --- 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 0f7702fc4630..127e2c257d69 100644 --- a/sbin/pfctl/parse.y +++ b/sbin/pfctl/parse.y @@ -6246,7 +6246,7 @@ check_binat_redirspec(struct node_host *src_host, struct pfctl_rule *r, } if (PF_AZERO(&r->src.addr.v.a.mask, af) || PF_AZERO(&(nat_pool->addr.v.a.mask), af)) { - yyerror ("source and redir addresess must have " + yyerror ("source and redir addresses must have " "a matching network mask in binat-rule"); error++; } From nobody Sun Oct 26 15:14:20 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cvgCd1BPNz6DNXF; Sun, 26 Oct 2025 15:14:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cvgCd0fNdz3ZRT; Sun, 26 Oct 2025 15:14:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761491661; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+niUn0IQt0xAJH280wMa3850hUGJ3BU+VLn0j64+jGs=; b=aikDHCHp9RA1tkEWQK5V25dA1SOxM63xfhpx1+z/QWVFME4UBpbwd6c/xX1jZdFD5DpQhH cgKiEzlS42l6iD5mmOcqqNOPgjcDKcwtbLcn2cYKojjxYspaJHOC9qDNDIVLO2Sj8LN2vb b2IYbqaqgJnwIM3AGCDFQTz+EpfPzPXsN3s8Al/XczGqcJABuXmmk0V9NdrgPKC3BAoapD G8xuaz7Yzzoo91SAefBpdmhxMcSRo2y9X7eTgd0IWI9TJy5l/+rRi+QkHpYC+flZ2GJHj5 1mo/ZzQKXtNsSk90BgpF5bPSSdvUwFKKgWFj44J26JUO8qcEF4kIj5wYgQ7TkQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761491661; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+niUn0IQt0xAJH280wMa3850hUGJ3BU+VLn0j64+jGs=; b=u8yDk9V7w/DaeZr7z+SOgJ1h3wAFiTEaukwpbCidj/LmsyHKffbtmtaNUnt78pqaABU41h wuKn6Ug8l0aORLga7DcOn76Vq7RyLN3PHr91CF5U7H5LspMRCJ1qXBGG/vJqPHpXxhH9v1 yMsrazyxMgXYykVxeHjp9O4TRF62mm6RcpPxLSLg81CBS6cqjTEOtOG1gS/bzvqMuCtnlO ehpOUh5JZ6PDqwW1z4P+XNjQM0dpxWG0j9+GbYLIKzQPvJOJnRji8HxPexVlkWLn1Vi8Ck MwNZXoPFobwNNe2HRgJn+W1D1HoDhbAEdFO6zr8M5BPOQJtE5E49wtrH3CpyUQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761491661; a=rsa-sha256; cv=none; b=JuYRy73Zlh2BnKG9zm38NPzTvwQMmCqJnxnR+MImXtbf4hEXnnukEH7K1NiafQHNdmVkxY 2PgQuaZ6yTXYzZ/qZzs/IcYMjJB5yyk6C2mwDa/NAeVFPlYaRWQpxEfchNsbYCWfheYoJO zmiSn03nsAcAsT9uh/rQKPqOA/jmMV2f59pHPr0NmbCmbSIm1ntmXaNm4wxxBKvp368jSX T5lP8B4f8w03Jr1F85sZWtSvK+6qg9ps6dtpzoZS+LExcKtxbpG/ffw6jVIup9KCGZeDd3 6dUXW5ZpiWU2ZnrEt9Q5pd1DcCF128TL1pZw6xiJk7JCsQ46Q6rV2hFfvwuXhw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cvgCd02KyzfCW; Sun, 26 Oct 2025 15:14: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 59QFEKcs014636; Sun, 26 Oct 2025 15:14:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59QFEKq1014633; Sun, 26 Oct 2025 15:14:20 GMT (envelope-from git) Date: Sun, 26 Oct 2025 15:14:20 GMT Message-Id: <202510261514.59QFEKq1014633@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 081218b7a200 - main - libc: fix description issues in mac_text(3)/mac_free(3) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 081218b7a2006e5b6783e51f66fd751871ac1272 Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=081218b7a2006e5b6783e51f66fd751871ac1272 commit 081218b7a2006e5b6783e51f66fd751871ac1272 Author: Kyle Evans AuthorDate: 2025-10-26 15:10:34 +0000 Commit: Kyle Evans CommitDate: 2025-10-26 15:13:21 +0000 libc: fix description issues in mac_text(3)/mac_free(3) mac_text(3) as-written would seem to indicate that a `mac_t` should be freed with free(3), but this isn't the case. One can derive from context from when the change was introduced and COMPATIBILITY that this was intended to talk about *text in `mac_to_text`, so move the comment there. PR: 179832 Co-authored-by: Priit Järv MFC after: 3 days --- lib/libc/posix1e/mac_free.3 | 4 ++-- lib/libc/posix1e/mac_text.3 | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/lib/libc/posix1e/mac_free.3 b/lib/libc/posix1e/mac_free.3 index 4ed68b70f3a3..6674ca2e9094 100644 --- a/lib/libc/posix1e/mac_free.3 +++ b/lib/libc/posix1e/mac_free.3 @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd September 21, 2023 +.Dd October 26, 2025 .Dt MAC_FREE 3 .Os .Sh NAME @@ -85,7 +85,7 @@ is a complex structure in the implementation, .Fn mac_free is specific to -.Vt mac_3 , +.Vt mac_t , and must not be used to free the character strings returned from .Fn mac_to_text . Doing so may result in undefined behavior. diff --git a/lib/libc/posix1e/mac_text.3 b/lib/libc/posix1e/mac_text.3 index 29c1aacca485..7633f4b0da64 100644 --- a/lib/libc/posix1e/mac_text.3 +++ b/lib/libc/posix1e/mac_text.3 @@ -28,7 +28,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd September 21, 2023 +.Dd October 26, 2025 .Dt MAC_TEXT 3 .Os .Sh NAME @@ -52,14 +52,16 @@ into the internal policy label format and places it in .Fa *mac , which must later be freed with -.Xr free 3 . +.Xr mac_free 3 . .Pp The .Fn mac_to_text function allocates storage for .Fa *text , which will be set to the text representation of -.Fa label . +.Fa label +and must later be freed with +.Xr free 3 . .Pp Refer to .Xr maclabel 7 From nobody Sun Oct 26 15:59:56 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cvhDD4B7Yz6DSSs; Sun, 26 Oct 2025 15:59:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cvhDD3j3pz3hh7; Sun, 26 Oct 2025 15:59:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761494396; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nX7xd+HyZ5oftQ9b5b8O+XV+Y9MNQo7fPQdctH4fcE8=; b=yqM/xvaLACBtVSXGIMpe1+39VcJDvN6Z3iuTGomY8WMxND9RHt1nDmKIKNnRouKCtsUT+7 /Ri72hZ8ZT5tRnVJC9OOZrjBZWCk3h0L8ulVsfJLIRIsJivUqPmBJmgOPQUm8Y/FkrsFn4 xA+34yIOGYr/Q/rbY9tUsbARHq44YIUHTTS9bwsRRaXfUwprImlpnFGUyeB94QdYEzJEge QxCvgjKS5OhM9T1uGxb9EQrq30za/tMGmLS3hfnNqXngErvAvTzYAP24+cVqTwNPfAkX7p akemjQ9FIaBlrXcqz/GOA03zSuC1TxZ4Vd3WmStsSR91Cu2MVq6I4osZhR2vUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761494396; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nX7xd+HyZ5oftQ9b5b8O+XV+Y9MNQo7fPQdctH4fcE8=; b=mnIJO7MIVyVyaU+71x3Wg3u5kmzREfZIKevinRsYeC4Q2D+hcPg8sHg1YbUffFGYRZ2TuL Hl5TSfanrDmN9VR5cjCxqr1+kWDNKfykpfMnIlAHYatOiyyHVfR506BTzI3iZOT88vNS0a 4rOQ/fhxxFwk+LKrgpaBi4hn7ZF+Sj0kiGZ/eNiNovdxaDsAI9PIPcVFDU4Quz8TREFcBg qhOkE650jP0rymiGoCwAdfpmSUiutL7ILXYPcKZfvLQnCBuw6VtROn3ZrMaVi0BTdi8WaO Dzz7ehV2ax1NWcC6i8mdYLZroS52q8xKEpS1S+kwrdLIFXgXSrXDjfbsOg/KtQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761494396; a=rsa-sha256; cv=none; b=kZW+jjN9e1XFB+z/dfNzep55ubqEKjnOWHcYQ+Wcf5a+SUB533Diz7v5vgNJ3xw8bWAhfi FPe1aP5KMJESlJ7VkPtemNO1Jxl4eQcwrgJSWwx5jdd9eOGeuvNGRJ9pjEWPJDNSPnTuy5 uxR9YA2MODfzpC7Z5BdUP+6YdIO459dRjXFt33i5tT6JemQ59iZqRT+OAis3tAOVdPFfez nZsHexq1GDuFHmNjQWQ8m2pui/8viPK9oN94lSQiglPRYmmkeKdY4CGPXk/aKZ2zPanIMe Se0RpSJ9LXIlAvUIrfNWLRDR+6TLbH7TObLmmhYjPRSWctcKevVC+I5Ovbvxuw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cvhDD3GL4zfWp; Sun, 26 Oct 2025 15:59: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 59QFxusr092439; Sun, 26 Oct 2025 15:59:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59QFxuOp092436; Sun, 26 Oct 2025 15:59:56 GMT (envelope-from git) Date: Sun, 26 Oct 2025 15:59:56 GMT Message-Id: <202510261559.59QFxuOp092436@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: 39d43543b306 - main - rtlbtfw(8): Fix a typo in an error message List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 39d43543b306ac686aa684303ae972c386ccea12 Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=39d43543b306ac686aa684303ae972c386ccea12 commit 39d43543b306ac686aa684303ae972c386ccea12 Author: Gordon Bergling AuthorDate: 2025-10-26 15:26:21 +0000 Commit: Gordon Bergling CommitDate: 2025-10-26 15:59:41 +0000 rtlbtfw(8): Fix a typo in an error message - s/Parseing/Parsing/ MFC after: 1 week --- usr.sbin/bluetooth/rtlbtfw/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/bluetooth/rtlbtfw/main.c b/usr.sbin/bluetooth/rtlbtfw/main.c index 280045a6aa25..58503b8087b5 100644 --- a/usr.sbin/bluetooth/rtlbtfw/main.c +++ b/usr.sbin/bluetooth/rtlbtfw/main.c @@ -479,7 +479,7 @@ main(int argc, char *argv[]) } else r = rtlbt_parse_fwfile_v1(&fw, rom_version); if (r < 0) { - rtlbt_err("Parseing firmware file failed"); + rtlbt_err("Parsing firmware file failed"); goto shutdown; } From nobody Sun Oct 26 15:59:57 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cvhDF6jvwz6DSfW; Sun, 26 Oct 2025 15:59:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cvhDF51H6z3j0V; Sun, 26 Oct 2025 15:59:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761494397; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YdVTn3ms0YnX5rgp74QO32iVoEbjEbuCf02SAiVVCzo=; b=v1ilWtebr+JEydbTEAkVeM6+1xDzAWxXtJfrh0724FDA/ly0XfpWaNZF0HEjC7PQjNpCiL lbh+tFEHGSSRO/pdlGLJ4+gMGPvutMPnfBPRNmGVlqiTWOhs4d5Qh+NzxDieJ8/HN0zdWC a9FzmJguWBbgKgaZeSR2wLCk7TykJGW9d+3B/HK+55VvhPcbj3L1UxTZVonkBoqdz0VnCP 4Z0ZNjP2eB0nxxgsxmiO8YEt3pbw+woT+LR3UyhOnm5Igvl9FccsLFUkjv06jB1VT5r8Is gQfFKPzUScgxSXKexXufsrwhlMPkb/2w9/3Tvicdb4XMn6OBqTv1IE4RyQnkjQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761494397; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YdVTn3ms0YnX5rgp74QO32iVoEbjEbuCf02SAiVVCzo=; b=aQ+LJrr7Flw3gowas21YEoc/6cVSBrJ3gOKzYa8B8/xHWhPazWzOEfZ//PZOFN/ZtY6KNm VjaAoQT19C6FyQR3Q8B7DRJZClZcBgmfzx+ZfZ66J1fEBtyd/dAqqJM6ML50GTiHTgWKU6 mHG13TqCsom7IU4Ublo9/5N4uCbI/0N+yBu0D3Fe5dDBokSHq82UxkiO4jNJdBy09s7BNP TowjQL1RvbUnrl8JRM16vdcag44h/AY5XXw8iGuXi/eykPYOWDbU97U4jlMyn69jkxwytc KNt1YVn4ibTpYCvao6yEw7cYiC8WLRORHZaP+xtlbL2bild/FlNuYnIc2pFSQg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761494397; a=rsa-sha256; cv=none; b=w8TemCBpXMaiDpUgLnt66jDSKda1q+YuuGE15bUdvP3b02WWEGvBdP1daZEm2m7QRyZybj X9onUsMh4C0LvnsnANIEeenxspY0QPIcg9ioKzfBNr6m+BsZnukLTvDml9LJUcieMZiFFD B7p+6w0nhZm/hlCrZ0ziEhami/rvzYVwXyaIrCBslfy6Y9vuZbfxiHWWnrHmslsHIYhkoX UDoQj+eC7f+bpTmfc2PoYfFl/rMCdOTMdH0SN+rcGujjHsWJahWetwFSFo1sUR2xHDM+I4 S3tT3PNfzyFVZlmTBXZ/N/gua1XBIjY+Jy3F/rJVEqSFJ7FbpQW3xqiMyN9Mzg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cvhDF4Xghzg8q; Sun, 26 Oct 2025 15:59: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 59QFxvpE092474; Sun, 26 Oct 2025 15:59:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59QFxvrl092471; Sun, 26 Oct 2025 15:59:57 GMT (envelope-from git) Date: Sun, 26 Oct 2025 15:59:57 GMT Message-Id: <202510261559.59QFxvrl092471@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: 8f1c946f1c42 - main - cxgbetool(8): Fix a typo in an error message List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8f1c946f1c42bdf9fabd870100b316af71c5e45e Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=8f1c946f1c42bdf9fabd870100b316af71c5e45e commit 8f1c946f1c42bdf9fabd870100b316af71c5e45e Author: Gordon Bergling AuthorDate: 2025-10-26 15:27:51 +0000 Commit: Gordon Bergling CommitDate: 2025-10-26 15:59:41 +0000 cxgbetool(8): Fix a typo in an error message - s/MISCELANEOUS/MISCELLANEOUS/ MFC after: 1 week --- usr.sbin/cxgbetool/tcbshowt7.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/cxgbetool/tcbshowt7.c b/usr.sbin/cxgbetool/tcbshowt7.c index a3397960b26b..1d4be0fbcc91 100644 --- a/usr.sbin/cxgbetool/tcbshowt7.c +++ b/usr.sbin/cxgbetool/tcbshowt7.c @@ -190,7 +190,7 @@ void t7_display_tcb_aux_0 (_TCBVAR *tvp, int aux) val("rx_flow_control_ddp")); - PR("MISCELANEOUS:\n"); /* *************************** */ + PR("MISCELLANEOUS:\n"); /* *************************** */ PR(" pend_ctl: 0x%1x, core_bypass: 0x%x, main_slush: 0x%x\n", ((val("pend_ctl2")<<2) | (val("pend_ctl1")<<1) | val("pend_ctl0")), From nobody Sun Oct 26 15:59:58 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cvhDH2fpWz6DSSw; Sun, 26 Oct 2025 15:59:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cvhDG60YBz3j1m; Sun, 26 Oct 2025 15:59:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761494398; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hzoSwYIlty3gO6l1D+jYNJ3AP2a4iAo/JFIKPlEtpgA=; b=IvV1NuflHQrcsG5ZDD47sswXItQenPW9+vRRLPml1djFogsKZbSY8qD3p6QdnAo6T28Ohm VZb/RmOsWhrKP/bDXEf3IPnjoFjTUUV3sCC4oOTGkoyuGbYn4ZDc+54AnAWuC8tIq6zO7q qxLm2jOtYUaqCitm9RRkny9WhpW/VXyBQGdGUGZXH6oGko6qn3Fm5NQxIU2DfhjxJOVjzC TIPBpnbKV4rH/czxDwWFdFAHeR38DXDHxowe0InVzmr3hWkG4mQjMIf1x3cohERn3Md6GL 8QcNdtrxBYU/8D/SukRazW+zSP3ogsgkFumlaFxGNk0vZYNpIleipOVI3/M09A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761494398; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hzoSwYIlty3gO6l1D+jYNJ3AP2a4iAo/JFIKPlEtpgA=; b=IyfZ5xvq5wvf/atmcyFEHj1M4cPBrj3PxawaCdZ3zlFRCUzwdB4RATyV6SO6WA5GNoFvNw yubuzhVFzVCBQPdqDMoG5xsv8GALV/TJZoguFH+h+Z0ZllVjIig3qIlEHe9eEAaGYWhfRC tdUMjP7Qol4IdTR+Cw2CGPmggNT9bLFAxAb12qdgjlLZa6jKjB4BhnBtJTustXNrzJFze7 fXd5ednJ8LsOFmMcPI4fPlfCrzCMFK5VltEoee82VhUMK6SQytoXq35XVZhCjpB1S5+xFu Wse1dCv4iPdICmMD81Ae/N+ntNfg4gZROFBj4VxR+dknJ1d4PUjpmYyUdw1eYA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761494398; a=rsa-sha256; cv=none; b=D5bmcZyKNUb0lu92PQhUPE5uxEyuruz9ZHgx/KF9Mtp1S52624b+0AX7ZYKF+CCOrgxqcr CAzAQW/Qy3nIFmS0Zkjv+iwJayJWJehSoU9PR/kRtqiEUe69RwmCEc/zrTftFyt76TrWO+ lrMInrpL3tDPQqENRB3/TutLeAzhJ12h0GSFsfrTZow8lOoKKkYzFmmRQBpJLVAY3Tz2zW zhfDdT7VUBUj3lcDCai7Ie64d3e/qM6NFiB0lKxToYBI7YK1oM3dxilm0/2HddwHCb9tM0 QgDgXvwF/dX1UWdSsoxC/CgzDeJxkAwUkAqBoNyOHCEsOiOG7wYsgdG43qM+Fw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cvhDG5WGbzg8r; Sun, 26 Oct 2025 15:59:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59QFxwDV092512; Sun, 26 Oct 2025 15:59:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59QFxwJx092509; Sun, 26 Oct 2025 15:59:58 GMT (envelope-from git) Date: Sun, 26 Oct 2025 15:59:58 GMT Message-Id: <202510261559.59QFxwJx092509@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: 780a50c729c7 - main - pmcstat(8): Fix a typo in an error message List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 780a50c729c7bc0ac1750947223feadd918b17e8 Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=780a50c729c7bc0ac1750947223feadd918b17e8 commit 780a50c729c7bc0ac1750947223feadd918b17e8 Author: Gordon Bergling AuthorDate: 2025-10-26 15:29:08 +0000 Commit: Gordon Bergling CommitDate: 2025-10-26 15:59:41 +0000 pmcstat(8): Fix a typo in an error message - s/evalation/evaluation/ MFC after: 1 week --- usr.sbin/pmcstat/pmcstat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/pmcstat/pmcstat.c b/usr.sbin/pmcstat/pmcstat.c index 98e14dfb9113..ac9169f3e008 100644 --- a/usr.sbin/pmcstat/pmcstat.c +++ b/usr.sbin/pmcstat/pmcstat.c @@ -215,7 +215,7 @@ pmcstat_find_targets(const char *spec) SLIST_INSERT_HEAD(&args.pa_targets, pt, pt_next); } else if (rv != REG_NOMATCH) { regerror(rv, ®, errbuf, sizeof(errbuf)); - errx(EX_SOFTWARE, "ERROR: Regex evalation failed: %s", + errx(EX_SOFTWARE, "ERROR: Regex evaluation failed: %s", errbuf); } } From nobody Sun Oct 26 15:59:59 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cvhDJ30dCz6DSfZ; Sun, 26 Oct 2025 16:00:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cvhDH68Svz3hyH; Sun, 26 Oct 2025 15:59:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761494399; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NlSD4sseaTqJtBPLjdNGzZX+S5t7KinOqVD6fhp5C9Y=; b=I6UFTlTvtI21Lffo/fYryf4sRSYAaBxAnQYtLO0LCLhXmDrFPePdQTDxJps+WHoOzRrUYT riNmbiE37eB/UaAR4eQto+6xggpTBc2602aV5hU+f+fCogdiTPEzuZjkVVw6t8EOzSG9bx i31OnFbtCGFNkUe5BU9kOpLPcvH4QtSCp8jdPWZu79iukMD6GcjkGT4n0RgKod7n9C0i1+ pNF6casASzBx19L218uZW1fKxWanOEZQ6pLTXWG1+kX5XCwJdvgOZ7Rx1ZiCzPDzWBubEz SHdJS0jEw1f2FAUnVSr1QLTJapzMgJC+AJM+b3bC3ZucjZnu8ltasF9/BYvj5w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761494399; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NlSD4sseaTqJtBPLjdNGzZX+S5t7KinOqVD6fhp5C9Y=; b=ZgiWJ0zsRN7ZhyK4mDyysEHbB/1+PjeiGFx5uVrQPIANH3a26uJFDXgnXGVej+05tedBGK nktuAmpQRmeDnqhdcU510SL/8DVShSA3fpFEmTig7rQCFdLeO2uwkoNe/Ce10q0dB+d9KK kW7F/D0SGluTvAKkGwDfqwYuZUk6ipA3HQzXZOw4TcL4KAn9Ntur28cSxpfeUUzoJllu3q 5EMLI2AIhhWTlTe95UjvHuztH7NUDCP/CMl/UamaiRi2aoWvO2ZYn1KkdR0ylCLNI0F/Qr MZcQGzSPqJVyQJ+A+Pa9FLLoYSAHIX+obv3lRFeZTNK3mrqfrrP3TFATwGIGKg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761494399; a=rsa-sha256; cv=none; b=ZiNjfdgmaP3CC+cl2GPKM93E6YOPPRkiETvxwyvdP/P3gMUpcYQ5VUFLHhq0t+2ZZ4dD8I 1WgzlQAt2gpr2J7veHxaxAbD414ekZnZ0fkUxwfUZTlL8fOsC7Cu8a+wcSVJwo+F6gGP0O 7tvhTueet3Vb5ubYtJATEWRWQ+B0dlh8hdZJnr7CvJah1ZmtnQLskPFGG5HM7e6+LgPZmn 9afYfSHhR18kM8ikwBDxclo22xiI4xhi2nH3zGDxTsitB/5i1vFrf0N3iKETXWHMRDMiZS wVr+/r5KjTtc9316oL/xKaJMQGQT/lgQVwzgZugCB0RSdmH6XzL2n5yFYHzpag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cvhDH5hdTzgCR; Sun, 26 Oct 2025 15:59: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 59QFxxs3092549; Sun, 26 Oct 2025 15:59:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59QFxxBT092547; Sun, 26 Oct 2025 15:59:59 GMT (envelope-from git) Date: Sun, 26 Oct 2025 15:59:59 GMT Message-Id: <202510261559.59QFxxBT092547@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: 56a72214a359 - main - fwcontrol(8): Fix a typo in a message List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 56a72214a35965197932b6366ffad0fe1e3fc398 Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=56a72214a35965197932b6366ffad0fe1e3fc398 commit 56a72214a35965197932b6366ffad0fe1e3fc398 Author: Gordon Bergling AuthorDate: 2025-10-26 15:30:48 +0000 Commit: Gordon Bergling CommitDate: 2025-10-26 15:59:41 +0000 fwcontrol(8): Fix a typo in a message - s/verndor/vendor/ MFC after: 1 week --- usr.sbin/fwcontrol/fwcontrol.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/fwcontrol/fwcontrol.c b/usr.sbin/fwcontrol/fwcontrol.c index ce908341a42a..195697475973 100644 --- a/usr.sbin/fwcontrol/fwcontrol.c +++ b/usr.sbin/fwcontrol/fwcontrol.c @@ -440,7 +440,7 @@ show_crom(u_int32_t *crom_buf) if (hdr->info_len == 1) { /* minimum ROM */ reg = (struct csrreg *)hdr; - printf("verndor ID: 0x%06x\n", reg->val); + printf("vendor ID: 0x%06x\n", reg->val); return; } printf("info_len=%d crc_len=%d crc=0x%04x", From nobody Sun Oct 26 16:34:18 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cvhzt5yHJz6DXSP; Sun, 26 Oct 2025 16:34:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cvhzt5NpNz3nQj; Sun, 26 Oct 2025 16:34:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761496458; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5WExpMhtv4ejjWt8/6HgZMr/Wl0r1wiXdesU3MILEV0=; b=dBHUfkb5lC3/BfS7NVdj3YPJU0ieO18hvmKL6goLEVbD99B7oBoyTI5RdEioVE34JPn68J R9Xx+073RD6HKUZ0ZHAd0K/4f0eQoGUxMN2m0unp1SHKXmeB9/IHcwApngmTbZvWexb/Vp Zn+lJC3cvxx1xedGC49k3etsoZs4D6ZuyZq6NZ0zokwLBV8VM8hAD87spSsbN/kIxksQFo I21XMjIHnn1HVGdQoy1m7w4080KaBDOdNF2KoBgHv29zOJpX2omEwJvdjIwodlP5W74beZ 26zIjBR5Xdr8czoPeLoMTZmgevQplbDL4mnQ2r2/vQ4WvN01ZH08/r70LIbLUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761496458; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5WExpMhtv4ejjWt8/6HgZMr/Wl0r1wiXdesU3MILEV0=; b=es4KAsd3keJyV7zm1dGecIBXSVR6GSF3QU0KwtIch/iIeGqkN92AcRM5EYSmEOGgvDGj6i lYt2PWhZPqS0xSaOJ2Dap15sKm4Gp8iK0B4HFgFlnWK7nOTRajf9WRJBwmxMsm35E1ahsi 0883GjBYgjAWV0kAaIVQqqBVISD6suEL9YgDI6nWjjOOLCu2y2dxYKP0Yt3tTiGgtf7Ftb QIqztzN2Bm0vr4yYHvYMTOgNy4ZfuGLr3B8WDKhGoAMoNyqjhXw1TocJyyqg65Ymq9iLaD 9gNmJsaQ07uD9SphOtvloJgIQM9ArT8IlbGFCpU0PcVmxit+QLv5CgJcXC8oqQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761496458; a=rsa-sha256; cv=none; b=G/2VwX2BSGIbnWTA2IqdIhZTNdl3EPJ9Q9XrhjZNObPFd/6F/unczp/rpDgPMIg3NM6MUb j2OF5pGGPLdnb32sjRGgHel7bnJK9DHkz/Z3/cmPKDYhbWzsZ4sVlY/nK7Qf0Y9RTxW6wC wr9AqHI3NvsZC9BW65eF9PV2nhHRSvK4OXEIvBPVzhjUrYyUNmqF+xJWYZOwNvoDhblKd7 wtfWpZA/SpNRH745da8N0ekvWnWQ7DkgajMfJHJ4bscaMovr30QeXZhnaOu5s96eKWQd7U jN2AFRTOk2cJkY703zFso1nDRgO1mSUD8QABEWW5+bsZMeQctd51BfetneyHbQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cvhzt4qmHzhFZ; Sun, 26 Oct 2025 16:34: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 59QGYIC7066962; Sun, 26 Oct 2025 16:34:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59QGYIVl066959; Sun, 26 Oct 2025 16:34:18 GMT (envelope-from git) Date: Sun, 26 Oct 2025 16:34:18 GMT Message-Id: <202510261634.59QGYIVl066959@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 3559b8e98341 - main - g_bio.9: Reference dtrace_io(4) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3559b8e98341d7087771516b1d8f9560a5c555b4 Auto-Submitted: auto-generated The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=3559b8e98341d7087771516b1d8f9560a5c555b4 commit 3559b8e98341d7087771516b1d8f9560a5c555b4 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2025-10-26 16:31:37 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2025-10-26 16:32:00 +0000 g_bio.9: Reference dtrace_io(4) MFC after: 3 days --- share/man/man9/g_bio.9 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/share/man/man9/g_bio.9 b/share/man/man9/g_bio.9 index 407c38e6ca70..fc278cd229a9 100644 --- a/share/man/man9/g_bio.9 +++ b/share/man/man9/g_bio.9 @@ -22,7 +22,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd August 7, 2019 +.Dd October 26, 2025 .Dt G_BIO 9 .Os .Sh NAME @@ -309,6 +309,7 @@ example_start(struct bio *bp) } .Ed .Sh SEE ALSO +.Xr dtrace_io 4 , .Xr geom 4 , .Xr DECLARE_GEOM_CLASS 9 , .Xr g_access 9 , From nobody Sun Oct 26 16:45:08 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cvjDP1Dskz6DYJj; Sun, 26 Oct 2025 16:45:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cvjDP0mC0z3q2G; Sun, 26 Oct 2025 16:45:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761497109; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8Ly3F7WxJZ9sVO8uT8mSH/+hJmumVmars0itQIK8KdI=; b=yqf/scOc9WC4xnR9F6Mn8lHFCm8i9gmw//7heD7XlBj0wvLYSbWYLmeOmc2D50ZOg4I4LI dvcsM4wS6SwMCHu5ToUbj2++05Y8JmDZRcWNUYWyc+oy4pgbl0IS3eZWqaTc7kwInRiyfY CBRNxwXLbSTPIYHzIcsQhkntdc3RfRLRhBUtxIMTS2tCFsKsSCbo15/0i178vCXnPV2HPp dpJIOZcVKZlywZTMOLq3hcydSSGxoarbaMm1KJfnbS9sQcYN99uKF6IrN+3xM9+8vJgdPn 2rypvmb56i9HXR59rXfUttZYrNN4eJgyvrkTpyHz5cBQ0F/MCc4ZaNii1dUzKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761497109; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8Ly3F7WxJZ9sVO8uT8mSH/+hJmumVmars0itQIK8KdI=; b=YjwPDmETsxtYD7QR6EtQ+nrrqcpAk2g837idd7MzOobZLKwKHsplT33TLqsbyDVdTPX88L GZTEXRi3ksZyJFlmLYmmp1/wyzZstDBpHa2VPuRi8jRsGSjyHwwIGSkJw3T/pf4au+625I U0Ft+f9R5k/AWkxfBQFv/AZBv/4ecnM09cS0KkoC5dd+U+H67CLs7QgIkMZ/affQIh2o/G qtlxnxiuiFwbNPW6njVdgKT93qSx41x5Q3urIUq30gUO/wA6cljUDpdfxaG0BwW2dKt8qY h6O36yJt4hh4XLRr0UX1kXs6KcNkStv2DADNIh3CJoPDj9TMNMC1f1WFvInbVQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761497109; a=rsa-sha256; cv=none; b=CB0TCUgBpTT/RTP8Dp3UUMRzmKtMhJNOXdSBtnKrIfBISmmssO5MKF+DL7Ehe7DBa2oc3g Ew3Q4uao0qm9WdXEjTbmHm7rzPLdmeB2kZc6za0HIYNvqP2FBg2b3KbKbRUt6x53sJzShu L3MmfGXGe3MKD/oSb4s1sMyryHVJniAPc2KKcsslUaxPdC6h7ZrqdC3r+YFDdG/fJQ0nXI 7PLAs2AZIOwnZmz0wz5d76LNLGstbvEjY0EFkvku1Tw6g6eJH1erGdnyHksBRb+ZXVWwMJ 8ydpepuGIOIFHFUHJMNbUbUY5CBjdgN/LFAhX6rwLnPhQK58L0Y8jf2dqq1QHQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cvjDN6v4qzhcR; Sun, 26 Oct 2025 16:45: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 59QGj8iX085772; Sun, 26 Oct 2025 16:45:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59QGj8R2085769; Sun, 26 Oct 2025 16:45:08 GMT (envelope-from git) Date: Sun, 26 Oct 2025 16:45:08 GMT Message-Id: <202510261645.59QGj8R2085769@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alan Somers Subject: git: 5d42c8813976 - main - fusefs: fix page fault triggered by async notification when unmounted List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5d42c8813976af484fd3e9a896c7839ba27ca764 Auto-Submitted: auto-generated The branch main has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=5d42c8813976af484fd3e9a896c7839ba27ca764 commit 5d42c8813976af484fd3e9a896c7839ba27ca764 Author: Alan Somers AuthorDate: 2025-10-26 00:37:02 +0000 Commit: Alan Somers CommitDate: 2025-10-26 16:44:27 +0000 fusefs: fix page fault triggered by async notification when unmounted A FUSE daemon can send asynchronous notification to the kernel in order to, for example, invalidate an inode's cache. Fix a page fault that can happen if the file system isn't yet mounted, or is already unmounted, when that notification arrives. PR: 290519 MFC after: 1 week Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D53356 --- sys/fs/fuse/fuse_device.c | 7 ++++++ tests/sys/fs/fusefs/mockfs.cc | 4 +++- tests/sys/fs/fusefs/mockfs.hh | 4 +++- tests/sys/fs/fusefs/notify.cc | 56 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 69 insertions(+), 2 deletions(-) diff --git a/sys/fs/fuse/fuse_device.c b/sys/fs/fuse/fuse_device.c index 75bc0357571f..cee477865c42 100644 --- a/sys/fs/fuse/fuse_device.c +++ b/sys/fs/fuse/fuse_device.c @@ -550,6 +550,13 @@ fuse_device_write(struct cdev *dev, struct uio *uio, int ioflag) } else if (ohead.unique == 0){ /* unique == 0 means asynchronous notification */ SDT_PROBE1(fusefs, , device, fuse_device_write_notify, &ohead); + if (data->mp == NULL) { + SDT_PROBE2(fusefs, , device, trace, 1, + "asynchronous notification before mount" + " or after unmount"); + return (EXTERROR(ENODEV, + "This FUSE session is not mounted")); + } mp = data->mp; vfs_ref(mp); err = vfs_busy(mp, 0); diff --git a/tests/sys/fs/fusefs/mockfs.cc b/tests/sys/fs/fusefs/mockfs.cc index e8081dea9604..55c191716629 100644 --- a/tests/sys/fs/fusefs/mockfs.cc +++ b/tests/sys/fs/fusefs/mockfs.cc @@ -827,10 +827,12 @@ void MockFS::loop() { } } -int MockFS::notify_inval_entry(ino_t parent, const char *name, size_t namelen) +int MockFS::notify_inval_entry(ino_t parent, const char *name, size_t namelen, + int expected_errno) { std::unique_ptr out(new mockfs_buf_out); + out->expected_errno = expected_errno; out->header.unique = 0; /* 0 means asynchronous notification */ out->header.error = FUSE_NOTIFY_INVAL_ENTRY; out->body.inval_entry.parent = parent; diff --git a/tests/sys/fs/fusefs/mockfs.hh b/tests/sys/fs/fusefs/mockfs.hh index ba6f7fded9d0..4b0628d34dd7 100644 --- a/tests/sys/fs/fusefs/mockfs.hh +++ b/tests/sys/fs/fusefs/mockfs.hh @@ -390,8 +390,10 @@ class MockFS { * @param parent Parent directory's inode number * @param name name of dirent to invalidate * @param namelen size of name, including the NUL + * @param expected_errno The error that write() should return */ - int notify_inval_entry(ino_t parent, const char *name, size_t namelen); + int notify_inval_entry(ino_t parent, const char *name, size_t namelen, + int expected_errno = 0); /* * Send an asynchronous notification to invalidate an inode's cached diff --git a/tests/sys/fs/fusefs/notify.cc b/tests/sys/fs/fusefs/notify.cc index 1e22bde13db7..d370a1e6e706 100644 --- a/tests/sys/fs/fusefs/notify.cc +++ b/tests/sys/fs/fusefs/notify.cc @@ -385,6 +385,27 @@ TEST_F(Notify, inval_inode_with_clean_cache) leak(fd); } +/* + * Attempting to invalidate an entry or inode after unmounting should fail, but + * nothing bad should happen. + * https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=290519 + */ +TEST_F(Notify, notify_after_unmount) +{ + const static char *name = "foo"; + struct inval_entry_args iea; + + expect_destroy(0); + + m_mock->unmount(); + + iea.mock = m_mock; + iea.parent = FUSE_ROOT_ID; + iea.name = name; + iea.namelen = strlen(name); + iea.mock->notify_inval_entry(iea.parent, iea.name, iea.namelen, ENODEV); +} + /* FUSE_NOTIFY_STORE with a file that's not in the entry cache */ /* disabled because FUSE_NOTIFY_STORE is not yet implemented */ TEST_F(Notify, DISABLED_store_nonexistent) @@ -544,3 +565,38 @@ TEST_F(NotifyWriteback, inval_inode_attrs_only) leak(fd); } + +/* + * Attempting asynchronous invalidation of an Entry before mounting the file + * system should fail, but nothing bad should happen. + * + * Note that invalidating an inode before mount goes through the same path, and + * is not separately tested. + * + * https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=290519 + */ +TEST(PreMount, inval_entry_before_mount) +{ + const static char name[] = "foo"; + size_t namelen = strlen(name); + struct mockfs_buf_out *out; + int r; + int fuse_fd; + + fuse_fd = open("/dev/fuse", O_CLOEXEC | O_RDWR); + ASSERT_GE(fuse_fd, 0) << strerror(errno); + + out = new mockfs_buf_out; + out->header.unique = 0; /* 0 means asynchronous notification */ + out->header.error = FUSE_NOTIFY_INVAL_ENTRY; + out->body.inval_entry.parent = FUSE_ROOT_ID; + out->body.inval_entry.namelen = namelen; + strlcpy((char*)&out->body.bytes + sizeof(out->body.inval_entry), + name, sizeof(out->body.bytes) - sizeof(out->body.inval_entry)); + out->header.len = sizeof(out->header) + sizeof(out->body.inval_entry) + + namelen; + r = write(fuse_fd, out, out->header.len); + EXPECT_EQ(-1, r); + EXPECT_EQ(ENODEV, errno); + delete out; +} From nobody Sun Oct 26 16:53:05 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cvjPr73lKz6DYnT for ; Sun, 26 Oct 2025 16:53:20 +0000 (UTC) (envelope-from asomers@gmail.com) Received: from mail-ed1-f51.google.com (mail-ed1-f51.google.com [209.85.208.51]) (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 4cvjPr1x68z3qht for ; Sun, 26 Oct 2025 16:53:20 +0000 (UTC) (envelope-from asomers@gmail.com) Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=freebsd.org (policy=none); spf=pass (mx1.freebsd.org: domain of asomers@gmail.com designates 209.85.208.51 as permitted sender) smtp.mailfrom=asomers@gmail.com Received: by mail-ed1-f51.google.com with SMTP id 4fb4d7f45d1cf-63c489f1e6cso6197847a12.1 for ; Sun, 26 Oct 2025 09:53:20 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761497598; x=1762102398; 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=DY35La6reeaN6J9dgikuoMXdAhBU+7orS3bNR6INwcY=; b=wifFLwx8+u/knfn2q6kv09+PEhaY05rdmm77eSFE71WJ8ht83vzF47SNN/FTgRwauk ZDedyi6kg7jucGRYD2f9dYlKgylK2n+FLyY3G0MMknF+korDdyEm3zVn51d3hHv2qX8m /Na0m7NJORlnUxMtkySz1dfBqC0g4DcCLvBY2rVCfKxQ1YRtCn4ClaEIRge7ZOE5Fsdx IkwaL6LmwfWphXZSKBJvufHZcRVN4KuUWFYwmxiaNwdwnzQgAbM8GZ8bZX9gPo+c5Gt6 fFDWVIrswBTv8eKZJGot693KMs8TMxCwHIfxCtclH7tdsbiWCrM/l3/3zpcO11v2jqD2 S7vg== X-Forwarded-Encrypted: i=1; AJvYcCUrF7Ki97+aeQBrViPBw2sifhyDyV8HbM9xsLGY4sdz+5Gud8Sac1I6ZbeqOMjP0OZ6tz1OCTOJsMKCm/qQfRBsZ8NavA==@freebsd.org X-Gm-Message-State: AOJu0YwIAkN+m4sRv00Z90g9sELmjXbzTBKlh8dHfRrQWUNlZfMCn5OI HJo9xQz9AJQD8bgMfgKjA7TY4n8AFNm6O+qZlj/5Ze5a1roNowysp7SWZnSMdlcGE9wj8WWtXw0 3+9rvoIcTckixrEDL54mTyww9IC0s/rw= X-Gm-Gg: ASbGncumbukXchGylFYk1OlnmrzweFFnbh3Q3ekLPQSesVJ88EicL1K6xQghwCBgp38 IPoOow3UW4qYDKHm9f2DMiFNriuVI+qqVsrY1KX8JQUYLx7gWcXsl1L8OUJe3/a6QCuS8rZpAFw StaijWebJCHd8n63mBFbUnWCDGg2rvSWO1AUCilq0J5TzblJKUCc7fPUykxd1iih1UHsB2b3JQ5 Hr3LVoTIG32fTt/Q6pvP3QdL587Ed4L1i9HwlFW1hX79xJPWJykWsSnblx/Nk3ZTAutxkj4RO6m XgtZfA== X-Google-Smtp-Source: AGHT+IGaD8vP7cX5roIPxcxY2ZnG/Ok6rFaIadf9Zt1v5QxVbfg64RTpBSJC8Dflb85Pjukh8qxT7yftn0hZi221RGw= X-Received: by 2002:a05:6402:4cd:b0:62f:1366:46e8 with SMTP id 4fb4d7f45d1cf-63e5e9054e8mr5844020a12.7.1761497597665; Sun, 26 Oct 2025 09:53:17 -0700 (PDT) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 References: <202510231341.59NDf5as007410@gitrepo.freebsd.org> In-Reply-To: From: Alan Somers Date: Sun, 26 Oct 2025 10:53:05 -0600 X-Gm-Features: AWmQ_bnrPDOhE2PXksaIPEDlKOAk7QIlfn_fJXnY7jwtZIEHCLc9iR3s4KOqCAQ Message-ID: Subject: Re: git: 6d408ac49073 - main - fusefs: add a regression test for a cluster_read bug To: Konstantin Belousov Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: multipart/alternative; boundary="00000000000094e34e0642129e6e" X-Spamd-Bar: -- X-Spamd-Result: default: False [-2.89 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-0.999]; NEURAL_HAM_SHORT(-1.00)[-0.995]; FORGED_SENDER(0.30)[asomers@freebsd.org,asomers@gmail.com]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; DMARC_POLICY_SOFTFAIL(0.10)[freebsd.org : SPF not aligned (relaxed), No valid DKIM,none]; RCPT_COUNT_THREE(0.00)[4]; RCVD_TLS_LAST(0.00)[]; FREEMAIL_TO(0.00)[gmail.com]; ARC_NA(0.00)[]; RCVD_COUNT_ONE(0.00)[1]; TO_DN_SOME(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:~]; MISSING_XM_UA(0.00)[]; FROM_HAS_DN(0.00)[]; FREEMAIL_ENVFROM(0.00)[gmail.com]; PREVIOUSLY_DELIVERED(0.00)[dev-commits-src-main@freebsd.org]; TO_MATCH_ENVRCPT_SOME(0.00)[]; FROM_NEQ_ENVFROM(0.00)[asomers@freebsd.org,asomers@gmail.com]; FREEFALL_USER(0.00)[asomers]; MLMMJ_DEST(0.00)[dev-commits-src-main@freebsd.org]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.208.51:from]; R_DKIM_NA(0.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; RCVD_IN_DNSWL_NONE(0.00)[209.85.208.51:from] X-Rspamd-Queue-Id: 4cvjPr1x68z3qht --00000000000094e34e0642129e6e Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Fri, Oct 24, 2025 at 2:13=E2=80=AFAM Konstantin Belousov wrote: > On Thu, Oct 23, 2025 at 01:41:05PM +0000, Alan Somers wrote: > > The branch main has been updated by asomers: > > > > URL: > https://cgit.FreeBSD.org/src/commit/?id=3D6d408ac490730614b3ed0ebd3caffcd= 23f303fb4 > > > > commit 6d408ac490730614b3ed0ebd3caffcd23f303fb4 > > Author: Alan Somers > > AuthorDate: 2025-10-23 13:40:56 +0000 > > Commit: Alan Somers > > CommitDate: 2025-10-23 13:40:56 +0000 > > > > fusefs: add a regression test for a cluster_read bug > > > > VOP_BMAP is purely advisory. If VOP_BMAP returns an error during > > readahead, cluster_read should still succeed, because the actual da= ta > > was still read just fine. > No, VOP_BMAP() is not advisory. But read-ahead beyond the first buffer i= s. > The BMAP in question is to translate lblk for read-ahead buffer. > > The FUSE_WRITE request _always_ includes the file's nodeid and offset. So unlike, say, UFS, FUSE_BMAP is only used to make decisions about clustering, to compute the amount of readahead. So I suppose I should've said that "FUSE_BMAP is purely advisory". Thanks for the correction. --00000000000094e34e0642129e6e Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
On Fri, Oct 24, 2025 at 2:13=E2=80=AFAM Konst= antin Belousov <kostikbel@gmail.c= om> wrote:
https://= cgit.FreeBSD.org/src/commit/?id=3D6d408ac490730614b3ed0ebd3caffcd23f303fb4<= /a>
>
> commit 6d408ac490730614b3ed0ebd3caffcd23f303fb4
> Author:=C2=A0 =C2=A0 =C2=A0Alan Somers <asomers@FreeBSD.org>
> AuthorDate: 2025-10-23 13:40:56 +0000
> Commit:=C2=A0 =C2=A0 =C2=A0Alan Somers <asomers@FreeBSD.org>
> CommitDate: 2025-10-23 13:40:56 +0000
>
>=C2=A0 =C2=A0 =C2=A0fusefs: add a regression test for a cluster_read bu= g
>=C2=A0 =C2=A0 =C2=A0
>=C2=A0 =C2=A0 =C2=A0VOP_BMAP is purely advisory.=C2=A0 If VOP_BMAP retu= rns an error during
>=C2=A0 =C2=A0 =C2=A0readahead, cluster_read should still succeed, becau= se the actual data
>=C2=A0 =C2=A0 =C2=A0was still read just fine.
No, VOP_BMAP() is not advisory.=C2=A0 But read-ahead beyond the first buffe= r is.
The BMAP in question is to translate lblk for read-ahead buffer.

=C2=A0
The FUSE_WRITE request _always_ inclu= des the file's nodeid and offset.=C2=A0=20 So unlike, say, UFS, FUSE_BMAP is only used to make decisions about=20 clustering, to compute the amount of readahead.=C2=A0 So I suppose I=20 should've said that "FUSE_BMAP is purely advisory".=C2=A0 Tha= nks for the correction.
--00000000000094e34e0642129e6e-- From nobody Sun Oct 26 17:02:01 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cvjc82jhrz6DZly; Sun, 26 Oct 2025 17:02:16 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4cvjc76M49z3rS7; Sun, 26 Oct 2025 17:02:15 +0000 (UTC) (envelope-from kostikbel@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: from tom.home (kib@localhost [127.0.0.1] (may be forged)) by kib.kiev.ua (8.18.1/8.18.1) with ESMTP id 59QH21pX094988; Sun, 26 Oct 2025 19:02:04 +0200 (EET) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 59QH21pX094988 Received: (from kostik@localhost) by tom.home (8.18.1/8.18.1/Submit) id 59QH21RO094987; Sun, 26 Oct 2025 19:02:01 +0200 (EET) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Sun, 26 Oct 2025 19:02:01 +0200 From: Konstantin Belousov To: Alan Somers Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 6d408ac49073 - main - fusefs: add a regression test for a cluster_read bug Message-ID: References: <202510231341.59NDf5as007410@gitrepo.freebsd.org> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FORGED_GMAIL_RCVD,FREEMAIL_FROM, NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=4.0.1 X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on tom.home X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:6939, ipnet:2001:470::/32, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4cvjc76M49z3rS7 On Sun, Oct 26, 2025 at 10:53:05AM -0600, Alan Somers wrote: > On Fri, Oct 24, 2025 at 2:13 AM Konstantin Belousov > wrote: > > > On Thu, Oct 23, 2025 at 01:41:05PM +0000, Alan Somers wrote: > > > The branch main has been updated by asomers: > > > > > > URL: > > https://cgit.FreeBSD.org/src/commit/?id=6d408ac490730614b3ed0ebd3caffcd23f303fb4 > > > > > > commit 6d408ac490730614b3ed0ebd3caffcd23f303fb4 > > > Author: Alan Somers > > > AuthorDate: 2025-10-23 13:40:56 +0000 > > > Commit: Alan Somers > > > CommitDate: 2025-10-23 13:40:56 +0000 > > > > > > fusefs: add a regression test for a cluster_read bug > > > > > > VOP_BMAP is purely advisory. If VOP_BMAP returns an error during > > > readahead, cluster_read should still succeed, because the actual data > > > was still read just fine. > > No, VOP_BMAP() is not advisory. But read-ahead beyond the first buffer is. > > The BMAP in question is to translate lblk for read-ahead buffer. > > > > > The FUSE_WRITE request _always_ includes the file's nodeid and offset. So > unlike, say, UFS, FUSE_BMAP is only used to make decisions about > clustering, to compute the amount of readahead. So I suppose I should've > said that "FUSE_BMAP is purely advisory". Thanks for the correction. I would say that the specific instance of the VOP_BMAP() call is allowed to fail. From nobody Sun Oct 26 17:08:49 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cvjlx4rqRz6DbMf for ; Sun, 26 Oct 2025 17:09:01 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-il1-f174.google.com (mail-il1-f174.google.com [209.85.166.174]) (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 4cvjlx2w1Lz3spk for ; Sun, 26 Oct 2025 17:09:01 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-il1-f174.google.com with SMTP id e9e14a558f8ab-430da72d67bso24196205ab.1 for ; Sun, 26 Oct 2025 10:09:01 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761498540; x=1762103340; 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=i/Ipf8vXYqoglAJ9DkfPEoGYNzBcgmPZ0X9Uh2zEt9Y=; b=JS3fekatwtX4IzROT8Y7KwM9iHJmcLP7+sjh6CjGQGuNe9bsstE9Z9lPA+PG9YVE9R W8yP3sHD9CiGqN9ujnL7dAyFjDHYV4WHaL1a4XcV9RQOoRNVZBNfw1yciaiVI6URDTfB dPIRo7eVnAI9oxafKrrtd3MC2rabgVjbmq64GtV4MlHbOQsWn6UJgKxsZ6kks+ePHez6 d1OmD3eHlRtoec05YF8LYVGkITV6k0WePS5GlYfxW02UDJccWA1jTOv9TihdIJlCa1As rPvovd0NXwW2Q6hstyM+/3rZv4EB/nYRzmuKmQwfMrVikzo+YRztuZWvf3dsBwsQ8zXd xtYQ== X-Forwarded-Encrypted: i=1; AJvYcCWxS58f39pLx//dbOmSLrz1pUuFUA9cHjeYv0QwJbDMzyUCTb7HL7nigQflnY9MkB36P9qxvL9C0O0Xwd7di4VALHbDcg==@freebsd.org X-Gm-Message-State: AOJu0YwNetpS5ijHgsM/jhwr3KYoAarxNcxyCekqocEx4pDeFypb2KM4 m9g/SXbswsDenHOatU5a8/0pzrtVrQoLD+oIU98odePn6m+s+ZP3Qi06nmoqxD+ZlMImQGqdc7z fE1qhjUTT4auzuqW02WT+Isgq2a4Y0e8= X-Gm-Gg: ASbGncunQVJHQKq8DICO9s+j/JT71La3DEeajLfQ/K++65AwcK6+xT4H6zsEhyx8X8f 7Ac7qyQ3zH2IdEwmt+ePFXnGNh50XjFlhzYO47uS31ZXHg5jSQjYS6GB1gYmSSGo8dIt93JZoWT VeZn/4rWtfR9tiNlOTloPIbwhjSH1QXnwzD295LI1bfgam4C3fP6Inaw3azqFRUlbo0Cr46+UGV JdsOV+kf2AOCypc4EBQZUu+whZKl57QKVPuYVhNzBaPO3EyAH6wfSoxvWVc0zBNEOrdtuN4nN1X kgV4QL1ZoRlh3OG6iyvmkQZfsjW3TA== X-Google-Smtp-Source: AGHT+IGLwz9Zx0iIm3nGbG9fhk1PTash2e8x2deBy0hPmy23sU89gewcFj03rhkIiukF5zahRqiHxJ76+K2zsygjct0= X-Received: by 2002:a05:6e02:460e:b0:431:f39e:6bd8 with SMTP id e9e14a558f8ab-431f39e6e29mr88139725ab.5.1761498540343; Sun, 26 Oct 2025 10:09:00 -0700 (PDT) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 References: <202510252258.59PMwthG074834@gitrepo.freebsd.org> In-Reply-To: From: Ed Maste Date: Sun, 26 Oct 2025 13:08:49 -0400 X-Gm-Features: AWmQ_blYqGTCMqzq_tv_GlqJt9RCgUH_u_1M3CecMk6O4XiIB7kfrJ2Dkd1wEHo Message-ID: Subject: Re: git: 46f982122c0d - main - sys: Bump non-ISA PNP removal to 16.0 To: "Bjoern A. Zeeb" 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-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4cvjlx2w1Lz3spk On Sun, 26 Oct 2025 at 06:54, Bjoern A. Zeeb wrote: > > On Sat, 25 Oct 2025, Ed Maste wrote: > > > The branch main has been updated by emaste: > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=46f982122c0d670ac181b748a5b8c2b221f61517 > > > > commit 46f982122c0d670ac181b748a5b8c2b221f61517 > > Author: Ed Maste > > AuthorDate: 2025-10-24 18:39:00 +0000 > > Commit: Ed Maste > > CommitDate: 2025-10-25 22:57:15 +0000 > > > > sys: Bump non-ISA PNP removal to 16.0 > > > > This may include atkbdc, which is not being removed in 15.0. > > We really ought to have a macro for these somehow so we can grep them more easily. > Could even be a sysinit just spitting them out whenever they are compiled in to > increase the pain and visibility on main. Add a tunable for people to turn them > off ;-) We have gone_in(9) to indicate functionality that will be removed; I suppose this message was added prior to the creation of gone_in(). https://reviews.freebsd.org/D53366 is now open to switch it to gone_in(). Other gone_in()s with a post-15 removal: sys/dev/le/lance.c: gone_in(16, "Warning! le(4) to be removed: no longer needed for " sys/kern/kern_sendfile.c: gone_in(16, "Warning! %s[%u] uses SF_SYNC sendfile(2) flag. " sys/netinet/tcp_sack.c: gone_in(16, "net.inet.tcp.sack.revised will be deprecated." sys/netinet/tcp_timewait.c: gone_in(16, "net.inet.tcp.nolocaltimewait is obsolete." and one with a pre-15 removal: sys/dev/drm2/drm_os_freebsd.h:#define DRM_OBSOLETE(dev) gone_in_dev(dev, 13, DRM_MSG) From nobody Sun Oct 26 17:36:13 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cvkMK5JfZz6DfFs; Sun, 26 Oct 2025 17:36:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cvkMK4lKLz3xXH; Sun, 26 Oct 2025 17:36:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761500173; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hYBkdgPT0TqkeSihryXL7A1CPFje7ac5EUqj8H0jfus=; b=Ee5xAw7tn4fiB+52LzJCrmuwsdUHSzwyS0UV4rrwzwQzk7Jlk+1rM0tPNVsL/IKJwZgTiM pMRNx7wd2nJTCiH+Gduo/AUzeFh6Tq5sY9sa5f5hyEMJkeL65Sl4ZXtTrGKFd7sceYWDpD his51n2vNijkcYAJAOdq7+R97zGUjabPJQNaZSxjZ5b0NdMcIl8HmqIY3D6k6KIYb7AhWP 1I2NJptzRh/tJ2dv0nCVWgeG2brj+PPKguvwTYIIQXrHwj/7s6IrSPJ7mrRR+guAGNvhbM yrq7RiukSIxoyLm1VlLjZXTZ5hY6NV4vjy8tBdzGkHPYmOvOIL53HIUG7SQM9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761500173; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hYBkdgPT0TqkeSihryXL7A1CPFje7ac5EUqj8H0jfus=; b=fMEB4VrEAFNEWmlW+LvqvWRj+kLkTxNaKYR8ACBH92zomwouAnt5jLIcQ+sLyjJEfRYRw6 nu2ULMk+BUhQI472fb2ZSFLwQijWrtHBLGFbAjGK72/l7T3QL5SNyEFwP2nyr3w85WdMrt 4bSmuaPGYN+MM5ZUb0ut35nrZxe2DxaSd3acyZAyOB4hCKrkN3MHjo9LCbyGu/OysJ3P4/ UNJlFDmj7xzFRfkGhkZKsrK8+Gi5oLZqoLV0hRcgj1c3LWzjxZ7n9HB6YMQxuTaUiFir3Q 9d9lJD5hy4Bf5X5cRsHJPOYZIQA37wtfinzeSPpX79//nW8SIgTvd+fOXOJi0Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761500173; a=rsa-sha256; cv=none; b=Wy+Ig5I17Wo0Fa1Gw7fot4bDd4OmKmSbiaoMisBh3ji1+kYZrXAwzdPXxgJbhVCxG/UMvt SsvPxkpaqSueAzF6P6Q6mVmQyHvAE6asNK3eLYG/GnTl4MA5unOwywjwjqTRLDjoY72tM9 ZAeQM/flbZYRb+mMNh6ZdwpFJPCpEGspQKrPE3WRb2KtSiUzJ3pzZ54zgXkG2kmLRS3Hmx s7WzJlUOVkSafvNj2PAXiBWKnOBtmw4qT47SFRwG3xip3bEJ/FCgCC4GcE8P8zHzHErD3+ bUKtCnYD+aYUocY/WODT5InWG6iRmnPI8e2UT4ENiyQgFMzCCtyBgVfuV3Yvvg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cvkMK46g6zjwX; Sun, 26 Oct 2025 17:36:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59QHaDxS079516; Sun, 26 Oct 2025 17:36:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59QHaDik079513; Sun, 26 Oct 2025 17:36:13 GMT (envelope-from git) Date: Sun, 26 Oct 2025 17:36:13 GMT Message-Id: <202510261736.59QHaDik079513@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 1c8d7bb4cf7a - main - write.2: explain the atomicity guarantees of the writes List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1c8d7bb4cf7a6b19262333b2a9b1dacf3094b938 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=1c8d7bb4cf7a6b19262333b2a9b1dacf3094b938 commit 1c8d7bb4cf7a6b19262333b2a9b1dacf3094b938 Author: Konstantin Belousov AuthorDate: 2025-10-26 14:57:16 +0000 Commit: Konstantin Belousov CommitDate: 2025-10-26 17:35:31 +0000 write.2: explain the atomicity guarantees of the writes Also provide the pointer to the latest POSIX standard that justifies the requirement. Reviewed by: emaste Discussed with: rmacklem Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D53361 --- lib/libsys/write.2 | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/lib/libsys/write.2 b/lib/libsys/write.2 index d2ff41ceead9..77067893ab4c 100644 --- a/lib/libsys/write.2 +++ b/lib/libsys/write.2 @@ -132,6 +132,26 @@ and may write fewer bytes than requested; the return value must be noted, and the remainder of the operation should be retried when possible. +.Sh ATOMICITY OF WRITES +When operating on regular files on local file systems, the effects of +.Fn write +are atomic. +As required by the POSIX standard, +the +.Fn read , +.Fn write , +and +.Fn ftruncate +functions and their variations are atomic with respect to +each other on the file data and metadata for regular files. +See for instance +.St -p1003.1-2024 +Volume 2, Section 2.9.7 for more information. +.Pp +.Fx +implements the requirement by taking +a read/write range lock on the file byte range +affected by the corresponding function. .Sh RETURN VALUES Upon successful completion the number of bytes which were written is returned. From nobody Sun Oct 26 17:55:41 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cvknn4FLCz6DghV; Sun, 26 Oct 2025 17:55:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cvknn3B92z42DL; Sun, 26 Oct 2025 17:55:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761501341; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AOCFx4acrhnuhkZevsZzradOABEsM1HmFbE3zR2DEYY=; b=VwlQ6bt7ffcJXL5gVqdv2NW3a51LC6+Ges1cFCP4kpQ1LY+3TnUjc+EyJNZ2LAyrvua+Ak k78C70w7ut9V4gYfvKM70r0JG+XNb60oBd/z0ZzTqIOQ9KFEDwgzFXUiGUfLzEmGWG/jiB 9kyE1m7T+r+9roo4e45a35MDE2l2ROry5hTgg7kPZJktban51v4cTgQ9u5z21GtgsD1kGW RlzHSm/88YCIKsdLGLDt6VXmjxS9TOGiOjscdKrxTItzFNGexHP25S0GtGMXEfRuHhlTg1 6ZLkt6rAVPO8HjPEPYbCFO7PJv61KrCxA7W+pJwV35j/lJ5flFohij0ub1a7Ng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761501341; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AOCFx4acrhnuhkZevsZzradOABEsM1HmFbE3zR2DEYY=; b=ucXZuiFp5ETJwKEz+rV5U//gfqmbC1e73hwFQdI+fjyp5xokxXsNIK7dqMZl5mEwNixVtX 5+irPJraqek/OeTVU54YDUUVEFLfEsPG2MOFCtQ26iR/GLWX2wZ8vlkEkiVjmHqnApOtc6 2H1kGOWe+wlwJFbEjHjq6vr9UJ3hTaGZk8O8tZKyjGyoGXDOt3EcBva2mbMc9k321DmNqm dkLOknrDyydoEu2cTSTumP4ehOhLHyyJCGdry4MglZPmU66GsBDsrid3YIxwcWU/COufJ6 NNwQg5+uAF60zz8yO2V3ub5vSrpJNq8l2HdtXRgJKkcBFMT+BCKj/pxB9L7NXw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761501341; a=rsa-sha256; cv=none; b=CY3OpR+touUynQrFEwaOYgAoij1sYp/lDwX1DKQV8NueEUcTZ1i10jZwYyJREfLNeVv6b6 UtVlIhhH10W+QwjDFqjxj6947FMDWHIPctyu9rBYibdUXtQ036W8sx6CUIs1PwxrPeABkI jLO4QGrnPvJkuk5bedsD66YKkBhO/uHD33UbXzvJtV5F4XHn8TWpXVxaeRZynwsy9IyNmt z9UrIlirsAM3qS938gfN9wwJAv0+rMRXzQzHblRksoZewfOi+l/ZCIddigJ3lccziziy+s a5V0dNUtuagpdCPhHusarHIpvyfkSK7hAtPcOopIXTUcpUa3fAtvarGr8VEvaw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cvknn2ll3zkRf; Sun, 26 Oct 2025 17:55: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 59QHtfkV016829; Sun, 26 Oct 2025 17:55:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59QHtfsJ016826; Sun, 26 Oct 2025 17:55:41 GMT (envelope-from git) Date: Sun, 26 Oct 2025 17:55:41 GMT Message-Id: <202510261755.59QHtfsJ016826@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: 3535546a8684 - main - udp: honor IPV6_TCLASS socket option for UDP/IPv4 packets List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3535546a86846ddb0ca5fe4a0689ac635b504459 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=3535546a86846ddb0ca5fe4a0689ac635b504459 commit 3535546a86846ddb0ca5fe4a0689ac635b504459 Author: Michael Tuexen AuthorDate: 2025-10-26 17:52:33 +0000 Commit: Michael Tuexen CommitDate: 2025-10-26 17:52:33 +0000 udp: honor IPV6_TCLASS socket option for UDP/IPv4 packets Honor the IPPROTO_IPV6-level socket option IPV6_TCLASS when sending an UDP/IPv4 packet on an AF_INET6 socket. Reviewed by: bz, glebius MFC after: 3 days Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D53346 --- sys/netinet/udp_usrreq.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c index 04d01099d54a..6ce1bcce6fc6 100644 --- a/sys/netinet/udp_usrreq.c +++ b/sys/netinet/udp_usrreq.c @@ -1172,7 +1172,19 @@ udp_send(struct socket *so, int flags, struct mbuf *m, struct sockaddr *addr, else INP_RLOCK(inp); NET_EPOCH_ENTER(et); +#ifdef INET6 + if ((flags & PRUS_IPV6) != 0) { + if ((inp->in6p_outputopts != NULL) && + (inp->in6p_outputopts->ip6po_tclass != -1)) + tos = (u_char)inp->in6p_outputopts->ip6po_tclass; + else + tos = 0; + } else { + tos = inp->inp_ip_tos; + } +#else tos = inp->inp_ip_tos; +#endif if (control != NULL) { /* * XXX: Currently, we assume all the optional information is From nobody Sun Oct 26 18:00:58 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cvkvv3JhYz6DhbY; Sun, 26 Oct 2025 18:00:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cvkvt4lBHz43B0; Sun, 26 Oct 2025 18:00:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761501658; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7NH2HvUB2OqjayPeShvuNFVUSa/C4GN3gV9pDQVFG/0=; b=k8MkXjvwgOusrgb3EYJSmdzlxi+UHeK5ZGZsLUH7JMdfJA9YDHup9NYRSQKkJ4bdOmhPOv 8YPjYahW0blUz3eORuk+KugOAv/Z4OToW9fUz+InSrjqtnQVcHBcaqpFpBVJ4WAlZyZ6Xq sLSehDlACBHkTvxiC65Mf8OhfzFXS/UDIMapPc9+xsqxofjxm7lODOeu9Fi9RjiLGieYrS wCicBujhJ9TNBlUKmjwX0MWt1RtFW7e83zG+/InWzUcjyjgjmSsy9qEmfj2gbyh1zoZQI1 gGmUX9cqrSv953evlIqOby+jXJKyyLuUOQvjGXZCYNX84B2JIAcMx3KF94bQTw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761501658; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7NH2HvUB2OqjayPeShvuNFVUSa/C4GN3gV9pDQVFG/0=; b=JipUmRRAjtASeZrMqMyiHoLPJjEWyI+gn3agdsbh5YeNN6dHfK907fN7CsoRcmcIwukFCz CISiY7gjqSDhMXyfqiY8xtb/XZ2gy/67ruA7icxx/vCZnx1xT7Lumv62x1CDtU6zCRwIs+ FL+cYX6ykMjnnBGLfhk1oEgUsVsS8wxOnhDcN/MM2u9ZOpIuIO/jszTkwa/5/vixwFyX63 7a6LrKJ0DuDlTOiNDvyDVEmkRp3Bup9Gs0Yd9ggeLNnTyvchLtoV0dAIprTzjWK+E5iEXG WEKxlU3VP6zd8v8H2lXpEORp+vK4CGQ8CJ5sY+YpvcUchHpxEmAdc0BzRFn9wQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761501658; a=rsa-sha256; cv=none; b=gI4DlTvqqT0agNiU4naHM/AJu19lQ0mKDuxvI0xN4NLTrzmD0gJkHscoqWeTefpyzv7E3k X71vkFOVaty7OnN1iTYLvWX5kUWgvVVMKJXU9GMsbc5dtI3D+CwaX3yYIM2Qr3VDDBzT+M yIoCCmDwLmHwuc+nrcPwuzMtiLeRBNdAU76tOLXaGEBXHnMTgqSqaKnH0dE7zuIrC8gbv4 ZA2HTrb2lbyt5GWasYyGusOjGOQMDXm2eaBuSKqpW1FzvsesUA1xGTbTuCbcb1G4syCjQv KoQArBx+kTgkKH7GS90dXS1oe+skPiZgnCVEgWA75XnZvF5kDsVsS7S4VYg58g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cvkvt4HfQzkg9; Sun, 26 Oct 2025 18:00:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59QI0wda029185; Sun, 26 Oct 2025 18:00:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59QI0wYx029182; Sun, 26 Oct 2025 18:00:58 GMT (envelope-from git) Date: Sun, 26 Oct 2025 18:00:58 GMT Message-Id: <202510261800.59QI0wYx029182@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: d3a3854fdc6e - main - udp: honor IPV6_TCLASS cmsg for UDP/IPv4 packets List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d3a3854fdc6e8da3bc6c1c13aab8d371445d2914 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=d3a3854fdc6e8da3bc6c1c13aab8d371445d2914 commit d3a3854fdc6e8da3bc6c1c13aab8d371445d2914 Author: Michael Tuexen AuthorDate: 2025-10-26 17:58:15 +0000 Commit: Michael Tuexen CommitDate: 2025-10-26 17:58:15 +0000 udp: honor IPV6_TCLASS cmsg for UDP/IPv4 packets Honor the IPPROTO_IPV6-level cmsg of type IPV6_TCLASS when sending an UDP/IPv4 packet on an AF_INET6 socket. Reviewed by: bz MFC after: 3 days Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D53347 --- sys/netinet/udp_usrreq.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c index 6ce1bcce6fc6..f1d952037d5a 100644 --- a/sys/netinet/udp_usrreq.c +++ b/sys/netinet/udp_usrreq.c @@ -1208,6 +1208,23 @@ udp_send(struct socket *so, int flags, struct mbuf *m, struct sockaddr *addr, error = udp_v4mapped_pktinfo(cm, &src, inp, flags); if (error != 0) break; + if (((flags & PRUS_IPV6) != 0) && + (cm->cmsg_level == IPPROTO_IPV6) && + (cm->cmsg_type == IPV6_TCLASS)) { + int tclass; + + if (cm->cmsg_len != CMSG_LEN(sizeof(int))) { + error = EINVAL; + break; + } + tclass = *(int *)CMSG_DATA(cm); + if (tclass < -1 || tclass > 255) { + error = EINVAL; + break; + } + if (tclass != -1) + tos = (u_char)tclass; + } #endif if (cm->cmsg_level != IPPROTO_IP) continue; From nobody Sun Oct 26 23:27:25 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cvt8Y5qplz6DqsX; Sun, 26 Oct 2025 23:27:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cvt8Y53hyz3jwV; Sun, 26 Oct 2025 23:27:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761521245; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ob/oQvdkJOlB01Cb3H0g9RFU4abelClagCsQcUCuswY=; b=vsAUAsxUV2AEOtBeOxHQlYvaIWK6MuVD7JlAuiThU5yyR/Ouk+d53uXt5ag3KVJHbqLLFI VQ9tNMv7jLvXa1vluKiL7e79yUuVFss8iqFtealF2PSOkYPeH2J+ht3SLonjEN8z1B2elx v9EAh1nfgE3mxBKFh/iDkUaGcW7cFfsPT/9KrL+VeogMhH7exvQhfd4Ow/phGfP3GW8KYA zEqGH1FHIA3g6NvoMt4emA3Azt6tRly+CmsEFdMkr3kkfRFtOpbEMj1/YITL/GaTleMibz RPtlLNIeSIuDXZlQuU4vC2mnWi2qJ3R08SF/PztPMkFj6R8KrH+d71R8m3ILmQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761521245; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ob/oQvdkJOlB01Cb3H0g9RFU4abelClagCsQcUCuswY=; b=pcVc3XiztCfOOa2Mt3nD23B09tQHegRjmZaJ1yhaEZr8aYK9yqcskhN1UuhIEBzLp6snvq gOEmb0W7kbhngot/sBtv17qho9wsfS8++mORb0MsPW7M5gonLb6zyFmFtIhiGSycAkm2aY iMtRtJdJ5kyrTZhAGKDEiovkIWPQ5ABr9g3z73rZ8Y/4siUjYzwvwXMbJx9N0DIvewsrZf +/6Vy5cfaFURONuwc+L1mcMhwDS+Z5p+lHIpDzkKUU5QL9qFtCpS6mHc3M93Wm3jo++ZLK qYMPAJL1UtWAjwr0549Rtkit6KrUmg0InNcnyjcS5HgqZ0mqEI21xnRdtDYKcg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761521245; a=rsa-sha256; cv=none; b=cLbwMZ1SBT1Z3rvzOccwxclJzIKFYmdMKrdpMRLymDgEwXF/ciOa6eaY8wI0FBz9O9Iq8s VMZKHRAnAK5wXSMUDEmaii1atdtYzgxIiKOVVWwXETMtBvmLzYCJ1681U+PTcSXiuwOIFd bHP8GutIsgGyWe7jPHyjnE8C49kIhtArpG75MEMXglYQag4AtMqm5mTgsbKBPzNbGIqr25 MlYTVemXEwJVkGEYrv2u5Ku/aLolJEe1OzXXpaBG3HgLDP24uN6/pKGBHADVyBNrrBRk0M tXtpnUHMHoxVGmWKQONBZmA7up8Jw82Y5Y8VfKFoW9N1tjsmv9y/0stQv7qZbQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cvt8Y4KG3ztZN; Sun, 26 Oct 2025 23:27: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 59QNRPiH048339; Sun, 26 Oct 2025 23:27:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59QNRP5w048336; Sun, 26 Oct 2025 23:27:25 GMT (envelope-from git) Date: Sun, 26 Oct 2025 23:27:25 GMT Message-Id: <202510262327.59QNRP5w048336@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Adrian Chadd Subject: git: 1d100747d747 - main - vchiq: update printf-s to more architecture-independent format specifiers List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adrian X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1d100747d747887a13498216d39b03e26b381d8b Auto-Submitted: auto-generated The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=1d100747d747887a13498216d39b03e26b381d8b commit 1d100747d747887a13498216d39b03e26b381d8b Author: Adrian Chadd AuthorDate: 2025-10-20 02:38:21 +0000 Commit: Adrian Chadd CommitDate: 2025-10-26 22:47:59 +0000 vchiq: update printf-s to more architecture-independent format specifiers This migrates a bunch of format strings to compile on both 32 and 64 bit platforms. This should be a no-op, and it isn't yet used by a 64 bit kernel build as the 64 bit changes to vchiq are not yet in the tree. Differential Revision: https://reviews.freebsd.org/D36431 Submitted by: Marco Devesas Campos --- sys/contrib/vchiq/interface/vchiq_arm/vchiq_core.c | 199 ++++++++++----------- .../vchiq/interface/vchiq_arm/vchiq_kern_lib.c | 8 +- 2 files changed, 103 insertions(+), 104 deletions(-) diff --git a/sys/contrib/vchiq/interface/vchiq_arm/vchiq_core.c b/sys/contrib/vchiq/interface/vchiq_arm/vchiq_core.c index 2e30dd7dc3de..e7459a5553e4 100644 --- a/sys/contrib/vchiq/interface/vchiq_arm/vchiq_core.c +++ b/sys/contrib/vchiq/interface/vchiq_arm/vchiq_core.c @@ -392,9 +392,9 @@ make_service_callback(VCHIQ_SERVICE_T *service, VCHIQ_REASON_T reason, VCHIQ_HEADER_T *header, void *bulk_userdata) { VCHIQ_STATUS_T status; - vchiq_log_trace(vchiq_core_log_level, "%d: callback:%d (%s, %x, %x)", + vchiq_log_trace(vchiq_core_log_level, "%d: callback:%d (%s, %p, %p)", service->state->id, service->localport, reason_names[reason], - (unsigned int)header, (unsigned int)bulk_userdata); + header, bulk_userdata); status = service->base.callback(reason, header, service->handle, bulk_userdata); if (status == VCHIQ_ERROR) { @@ -640,8 +640,8 @@ process_free_queue(VCHIQ_STATE_T *state) rmb(); - vchiq_log_trace(vchiq_core_log_level, "%d: pfq %d=%x %x %x", - state->id, slot_index, (unsigned int)data, + vchiq_log_trace(vchiq_core_log_level, "%d: pfq %d=%p %x %x", + state->id, slot_index, data, local->slot_queue_recycle, slot_queue_available); /* Initialise the bitmask for services which have used this @@ -675,13 +675,13 @@ process_free_queue(VCHIQ_STATE_T *state) vchiq_log_error(vchiq_core_log_level, "service %d " "message_use_count=%d " - "(header %x, msgid %x, " + "(header %p, msgid %x, " "header->msgid %x, " "header->size %x)", port, service_quota-> message_use_count, - (unsigned int)header, msgid, + header, msgid, header->msgid, header->size); WARN(1, "invalid message use count\n"); @@ -704,24 +704,24 @@ process_free_queue(VCHIQ_STATE_T *state) up(&service_quota->quota_event); vchiq_log_trace( vchiq_core_log_level, - "%d: pfq:%d %x@%x - " + "%d: pfq:%d %x@%p - " "slot_use->%d", state->id, port, header->size, - (unsigned int)header, + header, count - 1); } else { vchiq_log_error( vchiq_core_log_level, "service %d " "slot_use_count" - "=%d (header %x" + "=%d (header %p" ", msgid %x, " "header->msgid" " %x, header->" "size %x)", port, count, - (unsigned int)header, + header, msgid, header->msgid, header->size); @@ -735,9 +735,9 @@ process_free_queue(VCHIQ_STATE_T *state) pos += calc_stride(header->size); if (pos > VCHIQ_SLOT_SIZE) { vchiq_log_error(vchiq_core_log_level, - "pfq - pos %x: header %x, msgid %x, " + "pfq - pos %x: header %p, msgid %x, " "header->msgid %x, header->size %x", - pos, (unsigned int)header, msgid, + pos, header, msgid, header->msgid, header->size); WARN(1, "invalid slot position\n"); } @@ -885,17 +885,16 @@ queue_message(VCHIQ_STATE_T *state, VCHIQ_SERVICE_T *service, int slot_use_count; vchiq_log_info(vchiq_core_log_level, - "%d: qm %s@%x,%x (%d->%d)", + "%d: qm %s@%p,%x (%d->%d)", state->id, msg_type_str(VCHIQ_MSG_TYPE(msgid)), - (unsigned int)header, size, + header, size, VCHIQ_MSG_SRCPORT(msgid), VCHIQ_MSG_DSTPORT(msgid)); BUG_ON(!service); BUG_ON((flags & (QMFLAGS_NO_MUTEX_LOCK | QMFLAGS_NO_MUTEX_UNLOCK)) != 0); - for (i = 0, pos = 0; i < (unsigned int)count; pos += elements[i++].size) if (elements[i].size) { @@ -951,9 +950,9 @@ queue_message(VCHIQ_STATE_T *state, VCHIQ_SERVICE_T *service, VCHIQ_SERVICE_STATS_ADD(service, ctrl_tx_bytes, size); } else { vchiq_log_info(vchiq_core_log_level, - "%d: qm %s@%x,%x (%d->%d)", state->id, + "%d: qm %s@%p,%x (%d->%d)", state->id, msg_type_str(VCHIQ_MSG_TYPE(msgid)), - (unsigned int)header, size, + header, size, VCHIQ_MSG_SRCPORT(msgid), VCHIQ_MSG_DSTPORT(msgid)); if (size != 0) { @@ -1036,9 +1035,9 @@ queue_message_sync(VCHIQ_STATE_T *state, VCHIQ_SERVICE_T *service, int i, pos; vchiq_log_info(vchiq_sync_log_level, - "%d: qms %s@%x,%x (%d->%d)", state->id, + "%d: qms %s@%p,%x (%d->%d)", state->id, msg_type_str(VCHIQ_MSG_TYPE(msgid)), - (unsigned int)header, size, + header, size, VCHIQ_MSG_SRCPORT(msgid), VCHIQ_MSG_DSTPORT(msgid)); @@ -1065,9 +1064,9 @@ queue_message_sync(VCHIQ_STATE_T *state, VCHIQ_SERVICE_T *service, VCHIQ_SERVICE_STATS_ADD(service, ctrl_tx_bytes, size); } else { vchiq_log_info(vchiq_sync_log_level, - "%d: qms %s@%x,%x (%d->%d)", state->id, + "%d: qms %s@%p,%x (%d->%d)", state->id, msg_type_str(VCHIQ_MSG_TYPE(msgid)), - (unsigned int)header, size, + header, size, VCHIQ_MSG_SRCPORT(msgid), VCHIQ_MSG_DSTPORT(msgid)); if (size != 0) { @@ -1368,26 +1367,26 @@ resolve_bulks(VCHIQ_SERVICE_T *service, VCHIQ_BULK_QUEUE_T *queue) "Send Bulk to" : "Recv Bulk from"; if (bulk->actual != VCHIQ_BULK_ACTUAL_ABORTED) vchiq_log_info(SRVTRACE_LEVEL(service), - "%s %c%c%c%c d:%d len:%d %x<->%x", + "%s %c%c%c%c d:%d len:%d %p<->%p", header, VCHIQ_FOURCC_AS_4CHARS( service->base.fourcc), service->remoteport, bulk->size, - (unsigned int)bulk->data, - (unsigned int)bulk->remote_data); + bulk->data, + bulk->remote_data); else vchiq_log_info(SRVTRACE_LEVEL(service), "%s %c%c%c%c d:%d ABORTED - tx len:%d," - " rx len:%d %x<->%x", + " rx len:%d %p<->%p", header, VCHIQ_FOURCC_AS_4CHARS( service->base.fourcc), service->remoteport, bulk->size, bulk->remote_size, - (unsigned int)bulk->data, - (unsigned int)bulk->remote_data); + bulk->data, + bulk->remote_data); } vchiq_complete_bulk(bulk); @@ -1522,8 +1521,8 @@ parse_open(VCHIQ_STATE_T *state, VCHIQ_HEADER_T *header) fourcc = payload->fourcc; vchiq_log_info(vchiq_core_log_level, - "%d: prs OPEN@%x (%d->'%c%c%c%c')", - state->id, (unsigned int)header, + "%d: prs OPEN@%p (%d->'%c%c%c%c')", + state->id, header, localport, VCHIQ_FOURCC_AS_4CHARS(fourcc)); @@ -1661,7 +1660,7 @@ parse_rx_slots(VCHIQ_STATE_T *state) header = (VCHIQ_HEADER_T *)(state->rx_data + (state->rx_pos & VCHIQ_SLOT_MASK)); - DEBUG_VALUE(PARSE_HEADER, (int)header); + DEBUG_VALUE(PARSE_HEADER, (size_t)header); msgid = header->msgid; DEBUG_VALUE(PARSE_MSGID, msgid); size = header->size; @@ -1695,20 +1694,20 @@ parse_rx_slots(VCHIQ_STATE_T *state) remoteport); if (service) vchiq_log_warning(vchiq_core_log_level, - "%d: prs %s@%x (%d->%d) - " + "%d: prs %s@%p (%d->%d) - " "found connected service %d", state->id, msg_type_str(type), - (unsigned int)header, + header, remoteport, localport, service->localport); } if (!service) { vchiq_log_error(vchiq_core_log_level, - "%d: prs %s@%x (%d->%d) - " + "%d: prs %s@%p (%d->%d) - " /* XXX */ "invalid/closed service %d", state->id, msg_type_str(type), - (unsigned int)header, + header, remoteport, localport, localport); goto skip_message; } @@ -1734,12 +1733,12 @@ parse_rx_slots(VCHIQ_STATE_T *state) min(16, size)); } - if (((unsigned int)header & VCHIQ_SLOT_MASK) + calc_stride(size) + if (((size_t)header & VCHIQ_SLOT_MASK) + calc_stride(size) > VCHIQ_SLOT_SIZE) { vchiq_log_error(vchiq_core_log_level, - "header %x (msgid %x) - size %x too big for " + "header %p (msgid %x) - size %x too big for " "slot", - (unsigned int)header, (unsigned int)msgid, + header, (unsigned int)msgid, (unsigned int)size); WARN(1, "oversized for slot\n"); } @@ -1758,8 +1757,8 @@ parse_rx_slots(VCHIQ_STATE_T *state) service->peer_version = payload->version; } vchiq_log_info(vchiq_core_log_level, - "%d: prs OPENACK@%x,%x (%d->%d) v:%d", - state->id, (unsigned int)header, size, + "%d: prs OPENACK@%p,%x (%d->%d) v:%d", + state->id, header, size, remoteport, localport, service->peer_version); if (service->srvstate == VCHIQ_SRVSTATE_OPENING) { @@ -1776,8 +1775,8 @@ parse_rx_slots(VCHIQ_STATE_T *state) WARN_ON(size != 0); /* There should be no data */ vchiq_log_info(vchiq_core_log_level, - "%d: prs CLOSE@%x (%d->%d)", - state->id, (unsigned int)header, + "%d: prs CLOSE@%p (%d->%d)", + state->id, header, remoteport, localport); mark_service_closing_internal(service, 1); @@ -1794,8 +1793,8 @@ parse_rx_slots(VCHIQ_STATE_T *state) break; case VCHIQ_MSG_DATA: vchiq_log_info(vchiq_core_log_level, - "%d: prs DATA@%x,%x (%d->%d)", - state->id, (unsigned int)header, size, + "%d: prs DATA@%p,%x (%d->%d)", + state->id, header, size, remoteport, localport); if ((service->remoteport == remoteport) @@ -1819,8 +1818,8 @@ parse_rx_slots(VCHIQ_STATE_T *state) break; case VCHIQ_MSG_CONNECT: vchiq_log_info(vchiq_core_log_level, - "%d: prs CONNECT@%x", - state->id, (unsigned int)header); + "%d: prs CONNECT@%p", + state->id, header); state->version_common = ((VCHIQ_SLOT_ZERO_T *) state->slot_data)->version; up(&state->connect); @@ -1854,12 +1853,12 @@ parse_rx_slots(VCHIQ_STATE_T *state) wmb(); vchiq_log_info(vchiq_core_log_level, - "%d: prs %s@%x (%d->%d) %x@%x", + "%d: prs %s@%p (%d->%d) %x@%p", state->id, msg_type_str(type), - (unsigned int)header, + header, remoteport, localport, bulk->remote_size, - (unsigned int)bulk->remote_data); + bulk->remote_data); queue->remote_insert++; @@ -1912,10 +1911,10 @@ parse_rx_slots(VCHIQ_STATE_T *state) if ((int)(queue->remote_insert - queue->local_insert) >= 0) { vchiq_log_error(vchiq_core_log_level, - "%d: prs %s@%x (%d->%d) " + "%d: prs %s@%p (%d->%d) " "unexpected (ri=%d,li=%d)", state->id, msg_type_str(type), - (unsigned int)header, + header, remoteport, localport, queue->remote_insert, queue->local_insert); @@ -1932,11 +1931,11 @@ parse_rx_slots(VCHIQ_STATE_T *state) queue->remote_insert++; vchiq_log_info(vchiq_core_log_level, - "%d: prs %s@%x (%d->%d) %x@%x", + "%d: prs %s@%p (%d->%d) %x@%p", state->id, msg_type_str(type), - (unsigned int)header, + header, remoteport, localport, - bulk->actual, (unsigned int)bulk->data); + bulk->actual, bulk->data); vchiq_log_trace(vchiq_core_log_level, "%d: prs:%d %cx li=%x ri=%x p=%x", @@ -1958,14 +1957,14 @@ parse_rx_slots(VCHIQ_STATE_T *state) break; case VCHIQ_MSG_PADDING: vchiq_log_trace(vchiq_core_log_level, - "%d: prs PADDING@%x,%x", - state->id, (unsigned int)header, size); + "%d: prs PADDING@%p,%x", + state->id, header, size); break; case VCHIQ_MSG_PAUSE: /* If initiated, signal the application thread */ vchiq_log_trace(vchiq_core_log_level, - "%d: prs PAUSE@%x,%x", - state->id, (unsigned int)header, size); + "%d: prs PAUSE@%p,%x", + state->id, header, size); if (state->conn_state == VCHIQ_CONNSTATE_PAUSED) { vchiq_log_error(vchiq_core_log_level, "%d: PAUSE received in state PAUSED", @@ -1988,8 +1987,8 @@ parse_rx_slots(VCHIQ_STATE_T *state) break; case VCHIQ_MSG_RESUME: vchiq_log_trace(vchiq_core_log_level, - "%d: prs RESUME@%x,%x", - state->id, (unsigned int)header, size); + "%d: prs RESUME@%p,%x", + state->id, header, size); /* Release the slot mutex */ lmutex_unlock(&state->slot_mutex); if (state->is_master) @@ -2010,8 +2009,8 @@ parse_rx_slots(VCHIQ_STATE_T *state) default: vchiq_log_error(vchiq_core_log_level, - "%d: prs invalid msgid %x@%x,%x", - state->id, msgid, (unsigned int)header, size); + "%d: prs invalid msgid %x@%p,%x", + state->id, msgid, header, size); WARN(1, "invalid message\n"); break; } @@ -2179,10 +2178,10 @@ sync_func(void *v) if (!service) { vchiq_log_error(vchiq_sync_log_level, - "%d: sf %s@%x (%d->%d) - " + "%d: sf %s@%p (%d->%d) - " "invalid/closed service %d", state->id, msg_type_str(type), - (unsigned int)header, + header, remoteport, localport, localport); release_message_sync(state, header); continue; @@ -2213,8 +2212,8 @@ sync_func(void *v) service->peer_version = payload->version; } vchiq_log_info(vchiq_sync_log_level, - "%d: sf OPENACK@%x,%x (%d->%d) v:%d", - state->id, (unsigned int)header, size, + "%d: sf OPENACK@%p,%x (%d->%d) v:%d", + state->id, header, size, remoteport, localport, service->peer_version); if (service->srvstate == VCHIQ_SRVSTATE_OPENING) { service->remoteport = remoteport; @@ -2228,8 +2227,8 @@ sync_func(void *v) case VCHIQ_MSG_DATA: vchiq_log_trace(vchiq_sync_log_level, - "%d: sf DATA@%x,%x (%d->%d)", - state->id, (unsigned int)header, size, + "%d: sf DATA@%p,%x (%d->%d)", + state->id, header, size, remoteport, localport); if ((service->remoteport == remoteport) && @@ -2248,8 +2247,8 @@ sync_func(void *v) default: vchiq_log_error(vchiq_sync_log_level, - "%d: sf unexpected msgid %x@%x,%x", - state->id, msgid, (unsigned int)header, size); + "%d: sf unexpected msgid %x@%p,%x", + state->id, msgid, header, size); release_message_sync(state, header); break; } @@ -2334,8 +2333,8 @@ vchiq_init_state(VCHIQ_STATE_T *state, VCHIQ_SLOT_ZERO_T *slot_zero, if (slot_zero->magic != VCHIQ_MAGIC) { vchiq_loud_error_header(); vchiq_loud_error("Invalid VCHIQ magic value found."); - vchiq_loud_error("slot_zero=%x: magic=%x (expected %x)", - (unsigned int)slot_zero, slot_zero->magic, VCHIQ_MAGIC); + vchiq_loud_error("slot_zero=%p: magic=%x (expected %x)", + slot_zero, slot_zero->magic, VCHIQ_MAGIC); vchiq_loud_error_footer(); return VCHIQ_ERROR; } @@ -2348,9 +2347,9 @@ vchiq_init_state(VCHIQ_STATE_T *state, VCHIQ_SLOT_ZERO_T *slot_zero, if (slot_zero->version < VCHIQ_VERSION_MIN) { vchiq_loud_error_header(); vchiq_loud_error("Incompatible VCHIQ versions found."); - vchiq_loud_error("slot_zero=%x: VideoCore version=%d " + vchiq_loud_error("slot_zero=%p: VideoCore version=%d " "(minimum %d)", - (unsigned int)slot_zero, slot_zero->version, + slot_zero, slot_zero->version, VCHIQ_VERSION_MIN); vchiq_loud_error("Restart with a newer VideoCore image."); vchiq_loud_error_footer(); @@ -2360,9 +2359,9 @@ vchiq_init_state(VCHIQ_STATE_T *state, VCHIQ_SLOT_ZERO_T *slot_zero, if (VCHIQ_VERSION < slot_zero->version_min) { vchiq_loud_error_header(); vchiq_loud_error("Incompatible VCHIQ versions found."); - vchiq_loud_error("slot_zero=%x: version=%d (VideoCore " + vchiq_loud_error("slot_zero=%p: version=%d (VideoCore " "minimum %d)", - (unsigned int)slot_zero, VCHIQ_VERSION, + slot_zero, VCHIQ_VERSION, slot_zero->version_min); vchiq_loud_error("Restart with a newer kernel."); vchiq_loud_error_footer(); @@ -2375,25 +2374,25 @@ vchiq_init_state(VCHIQ_STATE_T *state, VCHIQ_SLOT_ZERO_T *slot_zero, (slot_zero->max_slots_per_side != VCHIQ_MAX_SLOTS_PER_SIDE)) { vchiq_loud_error_header(); if (slot_zero->slot_zero_size != sizeof(VCHIQ_SLOT_ZERO_T)) - vchiq_loud_error("slot_zero=%x: slot_zero_size=%x " + vchiq_loud_error("slot_zero=%p: slot_zero_size=%x " "(expected %zx)", - (unsigned int)slot_zero, + slot_zero, slot_zero->slot_zero_size, sizeof(VCHIQ_SLOT_ZERO_T)); if (slot_zero->slot_size != VCHIQ_SLOT_SIZE) - vchiq_loud_error("slot_zero=%x: slot_size=%d " + vchiq_loud_error("slot_zero=%p: slot_size=%d " "(expected %d", - (unsigned int)slot_zero, slot_zero->slot_size, + slot_zero, slot_zero->slot_size, VCHIQ_SLOT_SIZE); if (slot_zero->max_slots != VCHIQ_MAX_SLOTS) - vchiq_loud_error("slot_zero=%x: max_slots=%d " + vchiq_loud_error("slot_zero=%p: max_slots=%d " "(expected %d)", - (unsigned int)slot_zero, slot_zero->max_slots, + slot_zero, slot_zero->max_slots, VCHIQ_MAX_SLOTS); if (slot_zero->max_slots_per_side != VCHIQ_MAX_SLOTS_PER_SIDE) - vchiq_loud_error("slot_zero=%x: max_slots_per_side=%d " + vchiq_loud_error("slot_zero=%p: max_slots_per_side=%d " "(expected %d)", - (unsigned int)slot_zero, + slot_zero, slot_zero->max_slots_per_side, VCHIQ_MAX_SLOTS_PER_SIDE); vchiq_loud_error_footer(); @@ -2775,18 +2774,18 @@ release_service_messages(VCHIQ_SERVICE_T *service) if ((port == service->localport) && (msgid & VCHIQ_MSGID_CLAIMED)) { vchiq_log_info(vchiq_core_log_level, - " fsi - hdr %x", - (unsigned int)header); + " fsi - hdr %p", + header); release_slot(state, slot_info, header, NULL); } pos += calc_stride(header->size); if (pos > VCHIQ_SLOT_SIZE) { vchiq_log_error(vchiq_core_log_level, - "fsi - pos %x: header %x, " + "fsi - pos %x: header %p, " "msgid %x, header->msgid %x, " "header->size %x", - pos, (unsigned int)header, + pos, header, msgid, header->msgid, header->size); WARN(1, "invalid slot position\n"); @@ -3360,10 +3359,10 @@ vchiq_bulk_transfer(VCHIQ_SERVICE_HANDLE_T handle, wmb(); vchiq_log_info(vchiq_core_log_level, - "%d: bt (%d->%d) %cx %x@%x %x", + "%d: bt (%d->%d) %cx %x@%p %p", state->id, service->localport, service->remoteport, dir_char, - size, (unsigned int)bulk->data, (unsigned int)userdata); + size, bulk->data, userdata); /* The slot mutex must be held when the service is being closed, so claim it here to ensure that isn't happening */ @@ -3710,12 +3709,12 @@ vchiq_dump_state(void *dump_context, VCHIQ_STATE_T *state) vchiq_dump(dump_context, buf, len + 1); len = snprintf(buf, sizeof(buf), - " tx_pos=%x(@%x), rx_pos=%x(@%x)", + " tx_pos=%x(@%p), rx_pos=%x(@%p)", state->local->tx_pos, - (uint32_t)state->tx_data + + state->tx_data + (state->local_tx_pos & VCHIQ_SLOT_MASK), state->rx_pos, - (uint32_t)state->rx_data + + state->rx_data + (state->rx_pos & VCHIQ_SLOT_MASK)); vchiq_dump(dump_context, buf, len + 1); @@ -3817,21 +3816,21 @@ vchiq_dump_service_state(void *dump_context, VCHIQ_SERVICE_T *service) vchiq_dump(dump_context, buf, len + 1); len = snprintf(buf, sizeof(buf), - " Ctrl: tx_count=%d, tx_bytes=%llu, " - "rx_count=%d, rx_bytes=%llu", + " Ctrl: tx_count=%d, tx_bytes=%ju, " + "rx_count=%d, rx_bytes=%ju", service->stats.ctrl_tx_count, - service->stats.ctrl_tx_bytes, + (uintmax_t) service->stats.ctrl_tx_bytes, service->stats.ctrl_rx_count, - service->stats.ctrl_rx_bytes); + (uintmax_t) service->stats.ctrl_rx_bytes); vchiq_dump(dump_context, buf, len + 1); len = snprintf(buf, sizeof(buf), - " Bulk: tx_count=%d, tx_bytes=%llu, " - "rx_count=%d, rx_bytes=%llu", + " Bulk: tx_count=%d, tx_bytes=%ju, " + "rx_count=%d, rx_bytes=%ju", service->stats.bulk_tx_count, - service->stats.bulk_tx_bytes, + (uintmax_t) service->stats.bulk_tx_bytes, service->stats.bulk_rx_count, - service->stats.bulk_rx_bytes); + (uintmax_t) service->stats.bulk_rx_bytes); vchiq_dump(dump_context, buf, len + 1); len = snprintf(buf, sizeof(buf), diff --git a/sys/contrib/vchiq/interface/vchiq_arm/vchiq_kern_lib.c b/sys/contrib/vchiq/interface/vchiq_arm/vchiq_kern_lib.c index 1f849a09d854..4eddcf3b43b2 100644 --- a/sys/contrib/vchiq/interface/vchiq_arm/vchiq_kern_lib.c +++ b/sys/contrib/vchiq/interface/vchiq_arm/vchiq_kern_lib.c @@ -151,9 +151,9 @@ VCHIQ_STATUS_T vchiq_shutdown(VCHIQ_INSTANCE_T instance) list); list_del(pos); vchiq_log_info(vchiq_arm_log_level, - "bulk_waiter - cleaned up %x " + "bulk_waiter - cleaned up %p " "for pid %d", - (unsigned int)waiter, waiter->pid); + waiter, waiter->pid); _sema_destroy(&waiter->bulk_waiter.event); kfree(waiter); @@ -454,8 +454,8 @@ vchiq_blocking_bulk_transfer(VCHIQ_SERVICE_HANDLE_T handle, void *data, list_add(&waiter->list, &instance->bulk_waiter_list); lmutex_unlock(&instance->bulk_waiter_list_mutex); vchiq_log_info(vchiq_arm_log_level, - "saved bulk_waiter %x for pid %d", - (unsigned int)waiter, current->p_pid); + "saved bulk_waiter %p for pid %d", + waiter, current->p_pid); } return status;