From nobody Mon May 11 07:42:50 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gDWsk1RQNz6cKcl for ; Mon, 11 May 2026 07:42: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gDWsk0fJSz4GCl for ; Mon, 11 May 2026 07:42:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778485370; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GkNFnpGsGXO4z7CZhxgn36llXduuQuP44YIl+qsMs4s=; b=kLO28PKGj0myuGDxaSBhT8Gq88Y7s+sWzGArf15ABOkQGWnupR+eS+BXojaiO3VuxTZNWW CGobjQJrf97oF6IxZEwnbTT8MWiXwmPLTSchWae1y1audxPI6iwcnPK9S2bl/weeRdUDhQ uFyR2Dcn2TIQ72MHvp1rPT1s/FrjSmPHDgBXclpWguV2RNg/JqV7lLqZwmpHuFtH+bEGoH 0Zfasla3BjeryUaU/WVovljLLisWlPVE1QXyxZbHdFhqa97EzYp16DZbXNqPzOgFyDpBP7 acNMBhOezb8wPqnUTtBRWbV4HLdBuXYSVv5WcB2IItTKrdOJW2XPgWuZzRaMYg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778485370; a=rsa-sha256; cv=none; b=ZJ8Mcs5qusq/SBAh3oywvD0qs6aMffAWiBq8kNUTJFL1Db0rAXWnnHYuV+9T2qcsuN5aQZ hUKOyhkkGKP1q79hgv0ClUzyJmCgYDpC3n0ACPzjHniMuozgtdSNpVuzA6r/m4A+LJ5kuA shHDJxb7cr2IFRCs3ul6LyzX5b1brSi7h83er6Dd3v/9wdUhALHfhGCzn2iOqH38euUiK1 MfZELIqD+23OBPx1NYeG/3XQ6kQpGINWmTdKbyvhqqiPB6q0uLIxeTb58gi4OqmO+lNGyA 2Z4jOcISt3T83PEeezjkRJZdRF5wYz51VoBDMYv5ug0Xb0NjlAFWFBf5GmJvKA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778485370; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GkNFnpGsGXO4z7CZhxgn36llXduuQuP44YIl+qsMs4s=; b=cenpPxAVXW+gn9sqWBbVDLMVOqkKpfjRFo+SPcX7vDBR1KDcmtI1zTLQyvskUEKFmj6t3f vinad7ogAiMgsWLgEVTp9J8DIFoRAhROw2smuY8Fbxx/a7h2lQuS4OFEIw1rgFQzVgyZzA y/tYhQi/9qdtd8JxCO/oRfW9VnFIOc5t0ItRa1Xwu8fCTt2CeZy/ne3bfsIkkXJNXc9QB6 9qUKP8baPxsDjnnyrDhyYtQjQ0ruV9Jd6KZoFHWPQ7LD5Rrszq2khQ4jd/FeDC9Mtlyez7 zqjXU7D3+4zV5Or6pIJ/9FG8ZsmQ/jvwMm6weNOOMCLoyRmsGPdGXbhN5W48uw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gDWsk0FvBz16jg for ; Mon, 11 May 2026 07:42:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 21c3a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 11 May 2026 07:42:50 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ryan Libby Subject: git: bac7bd5038e0 - main - linux: address executable stack warnings List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rlibby X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bac7bd5038e09d12dfdbf79a87b25443e02d0ba9 Auto-Submitted: auto-generated Date: Mon, 11 May 2026 07:42:50 +0000 Message-Id: <6a01887a.21c3a.72ac7450@gitrepo.freebsd.org> The branch main has been updated by rlibby: URL: https://cgit.FreeBSD.org/src/commit/?id=bac7bd5038e09d12dfdbf79a87b25443e02d0ba9 commit bac7bd5038e09d12dfdbf79a87b25443e02d0ba9 Author: Ryan Libby AuthorDate: 2026-05-11 05:39:27 +0000 Commit: Ryan Libby CommitDate: 2026-05-11 05:39:27 +0000 linux: address executable stack warnings Mark assembly files as not requiring executable stacks. This still leaves linux32_vdso.so without a .note.GNU-stack section in the gcc build for now. Reviewed by: imp, kib Differential Revision: https://reviews.freebsd.org/D56894 --- sys/amd64/linux/linux_locore.asm | 2 ++ sys/amd64/linux/linux_support.S | 2 ++ sys/amd64/linux32/linux32_locore.asm | 2 ++ sys/amd64/linux32/linux32_support.S | 2 ++ sys/arm64/linux/linux_locore.asm | 2 ++ sys/arm64/linux/linux_support.S | 2 ++ sys/compat/linux/linux_vdso_inc.S | 2 ++ sys/i386/linux/linux_locore.asm | 2 ++ 8 files changed, 16 insertions(+) diff --git a/sys/amd64/linux/linux_locore.asm b/sys/amd64/linux/linux_locore.asm index 19a6ac5d50d8..d4af90bda5fb 100644 --- a/sys/amd64/linux/linux_locore.asm +++ b/sys/amd64/linux/linux_locore.asm @@ -85,3 +85,5 @@ END(linux_rt_sigcode) .balign 4 .previous #endif + + .section .note.GNU-stack,"",%progbits diff --git a/sys/amd64/linux/linux_support.S b/sys/amd64/linux/linux_support.S index 7cc59b205a97..2ab46fe8c5ea 100644 --- a/sys/amd64/linux/linux_support.S +++ b/sys/amd64/linux/linux_support.S @@ -227,3 +227,5 @@ ENTRY(futex_xorl_smap) movq %rax,PCB_ONFAULT(%r8) ret END(futex_xorl_smap) + + .section .note.GNU-stack,"",%progbits diff --git a/sys/amd64/linux32/linux32_locore.asm b/sys/amd64/linux32/linux32_locore.asm index 4b77bd32600e..cc4b0488edb0 100644 --- a/sys/amd64/linux32/linux32_locore.asm +++ b/sys/amd64/linux32/linux32_locore.asm @@ -128,3 +128,5 @@ END(__kernel_vsyscall) .balign 4 .previous #endif + + .section .note.GNU-stack,"",%progbits diff --git a/sys/amd64/linux32/linux32_support.S b/sys/amd64/linux32/linux32_support.S index a316a9bf066d..1018b6ce579c 100644 --- a/sys/amd64/linux32/linux32_support.S +++ b/sys/amd64/linux32/linux32_support.S @@ -227,3 +227,5 @@ ENTRY(futex_xorl_smap) movq %rax,PCB_ONFAULT(%r8) ret END(futex_xorl_smap) + + .section .note.GNU-stack,"",%progbits diff --git a/sys/arm64/linux/linux_locore.asm b/sys/arm64/linux/linux_locore.asm index c330546702f1..20846a324647 100644 --- a/sys/arm64/linux/linux_locore.asm +++ b/sys/arm64/linux/linux_locore.asm @@ -51,3 +51,5 @@ __user_rt_sigreturn: mov x8, #LINUX_SYS_linux_rt_sigreturn svc #0 EEND(__kernel_rt_sigreturn) + + .section .note.GNU-stack,"",%progbits diff --git a/sys/arm64/linux/linux_support.S b/sys/arm64/linux/linux_support.S index 3b16583e9d54..61a0604dd91b 100644 --- a/sys/arm64/linux/linux_support.S +++ b/sys/arm64/linux/linux_support.S @@ -176,3 +176,5 @@ ENTRY(futex_xorl) END(futex_xorl) GNU_PROPERTY_AARCH64_FEATURE_1_NOTE(GNU_PROPERTY_AARCH64_FEATURE_1_VAL) + + .section .note.GNU-stack,"",%progbits diff --git a/sys/compat/linux/linux_vdso_inc.S b/sys/compat/linux/linux_vdso_inc.S index 44cc357b4a4a..d2ac3e28aabe 100644 --- a/sys/compat/linux/linux_vdso_inc.S +++ b/sys/compat/linux/linux_vdso_inc.S @@ -37,3 +37,5 @@ _binary_linux_vdso_so_o_end: #include GNU_PROPERTY_AARCH64_FEATURE_1_NOTE(GNU_PROPERTY_AARCH64_FEATURE_1_VAL) #endif + + .section .note.GNU-stack,"",%progbits diff --git a/sys/i386/linux/linux_locore.asm b/sys/i386/linux/linux_locore.asm index dbd0757c44bc..c188ad72f009 100644 --- a/sys/i386/linux/linux_locore.asm +++ b/sys/i386/linux/linux_locore.asm @@ -122,3 +122,5 @@ END(__kernel_vsyscall) .balign 4 .previous #endif + + .section .note.GNU-stack,"",%progbits From nobody Mon May 11 08:41:53 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gDY9s3rQnz6cfDX for ; Mon, 11 May 2026 08:41: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gDY9s2wCWz4NxF for ; Mon, 11 May 2026 08:41:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778488913; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SUyjonThgb/O80+MMPV0ram0NquG7vgGezxUcjesrlw=; b=uNgzHnGBrBO0S7u2EEpV2DZ/roE0wKE1OwZ3yRwuz290e3OfRCiB4Fh4QtNhGTQqY1dg2D pE1eOtZ48tNw/4ajJ1A36I2wKcIZ0keRCvE1Oo9vWG3NwI8aFlkPgUxEBYXjsP5fW8A8bA ZfUgRHWJoLi4bmesAmn3JffZsqWcE8OVXN/cFgjdvuXlfALAtkmPnqN51gag1agJSlD+OL VvCUDeCnEBugEPAu5sSHwFt4lFS4QA6ov4U5qsI7LWBCmFdQkQj1Lglw8C9KesO5sBNvIf OR7oa//w/4UuywiUSjNxhRX3gP/RS/Mw1knjI3vRHubjafJXP0CIhwmnwwzvoQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778488913; a=rsa-sha256; cv=none; b=JDT67zQqEvPSfeAfr8PvqEsuuWdY49+eQ3IMv1EGqgpLFTiGtB80JhzoNfstf0sicInvcU FLJvbJ6bR4GQZIm/aMDwPwLqBfyEvbt7hwvVk1dOpOps3WvxAYFFrDgLjUyy4Ckum682Dz xlhsN5EKee5Pp7gaYQNL/5Ccbg2uJ8C8CbfNaFTQtFtQ1WRAY1r34i0Zf0q4IB/qOCRak/ ToEtL+xe1fH5ONDWbCU+HmnJu+xAYAo1GXwHhBg42jwjWLJFo4ikbMvAFZ4Gof5fv64Ggv SxXYQVB1WFmDSn035C9EjjC0MXRX1Zdw3ROUdLPek//+Vb5QB9ZgNcKGCY2vJA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778488913; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SUyjonThgb/O80+MMPV0ram0NquG7vgGezxUcjesrlw=; b=N7jxGfsQPO5ZorGf2oY5p72MNLUr5WZTUhDyo4KUP4AVf+9i7FTMD4yaxGweedCc4L2ESf LkpYbJm54WDy+bareAN+eI53wGCTHsXWYBIME5zyRNEAIglrHtw0QC643S7HasfBrQ3mru OrsSKUDDH0edoYQRJM2eyCphgEGzBB0ZJmqxG2DDl7/XoUh//hfU2alW9R6spoPjDLLAvS +o5z3d20XMNb+SQn3gVsNRw9dysppJcAtDc9nT1ju4fkGMEwuJfv/x/3gQps++V4gRWWnt vFnTHGsx5zhtEgOKdZS1znE2kqjH9lR5orILNW+e28g+sGiQ7zNsYQmlamTwow== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gDY9s2Q8wz18Hj for ; Mon, 11 May 2026 08:41:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 30f98 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 11 May 2026 08:41:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Wei Hu Subject: git: 97cc6bd98fc4 - stable/14 - mana: support jumbo packet size List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: whu X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 97cc6bd98fc4b3fe1ec9ee3ba9d5c091d1f0dcb3 Auto-Submitted: auto-generated Date: Mon, 11 May 2026 08:41:53 +0000 Message-Id: <6a019651.30f98.456ae013@gitrepo.freebsd.org> The branch stable/14 has been updated by whu: URL: https://cgit.FreeBSD.org/src/commit/?id=97cc6bd98fc4b3fe1ec9ee3ba9d5c091d1f0dcb3 commit 97cc6bd98fc4b3fe1ec9ee3ba9d5c091d1f0dcb3 Author: Wei Hu AuthorDate: 2025-12-23 07:00:38 +0000 Commit: Wei Hu CommitDate: 2026-05-11 08:29:49 +0000 mana: support jumbo packet size Remove the restriction of up to 4k packet size. Now the driver supports up to MJUM16BYTES size packets as long as hardware supporting it. Tested on VMs in Azure. Tested by: whu MFC after: 1 week Sponsored by: Microsoft (cherry picked from commit d0a2bd2765b365c4be9b17c29306f848953e55a5) --- sys/dev/mana/gdma.h | 6 ++++ sys/dev/mana/mana.h | 11 +++++-- sys/dev/mana/mana_en.c | 79 ++++++++++++++++++++++++++++++++------------------ 3 files changed, 65 insertions(+), 31 deletions(-) diff --git a/sys/dev/mana/gdma.h b/sys/dev/mana/gdma.h index 9e32d58dbfdc..90cd908055af 100644 --- a/sys/dev/mana/gdma.h +++ b/sys/dev/mana/gdma.h @@ -193,6 +193,9 @@ struct gdma_general_req { }; /* HW DATA */ #define GDMA_MESSAGE_V1 1 +#define GDMA_MESSAGE_V2 2 +#define GDMA_MESSAGE_V3 3 +#define GDMA_MESSAGE_V4 4 struct gdma_general_resp { struct gdma_resp_hdr hdr; @@ -409,6 +412,9 @@ struct gdma_context { struct gdma_resource msix_resource; struct gdma_irq_context *irq_contexts; + /* L2 MTU */ + uint16_t adapter_mtu; + /* This maps a CQ index to the queue structure. */ unsigned int max_num_cqs; struct gdma_queue **cq_table; diff --git a/sys/dev/mana/mana.h b/sys/dev/mana/mana.h index a037eb3f05c7..de34f8a82c6a 100644 --- a/sys/dev/mana/mana.h +++ b/sys/dev/mana/mana.h @@ -102,9 +102,6 @@ enum TRI_STATE { #define COMP_ENTRY_SIZE 64 #define MIN_FRAME_SIZE 146 -#define ADAPTER_MTU_SIZE 1500 -#define DEFAULT_FRAME_SIZE (ADAPTER_MTU_SIZE + 14) -#define MAX_FRAME_SIZE 4096 /* Unit number of RX buffers. Must be power of two * Higher number could fail at allocation. @@ -534,6 +531,9 @@ struct mana_port_context { uint16_t port_idx; uint16_t frame_size; + uint16_t max_mtu; + uint16_t min_mtu; + uint16_t mtu; bool port_is_up; bool port_st_save; /* Saved port state */ @@ -613,6 +613,11 @@ struct mana_query_device_cfg_resp { uint16_t max_num_vports; uint16_t reserved; uint32_t max_num_eqs; + + /* response v2: */ + uint16_t adapter_mtu; + uint16_t reserved2; + uint32_t reserved3; }; /* HW DATA */ /* Query vPort Configuration */ diff --git a/sys/dev/mana/mana_en.c b/sys/dev/mana/mana_en.c index 9eeaec11d1b2..ee2e99359498 100644 --- a/sys/dev/mana/mana_en.c +++ b/sys/dev/mana/mana_en.c @@ -181,18 +181,19 @@ mana_ioctl(if_t ifp, u_long command, caddr_t data) new_mtu = ifr->ifr_mtu; if (if_getmtu(ifp) == new_mtu) break; - if ((new_mtu + 18 > MAX_FRAME_SIZE) || - (new_mtu + 18 < MIN_FRAME_SIZE)) { + if ((new_mtu > apc->max_mtu) || + (new_mtu < apc->min_mtu)) { if_printf(ifp, "Invalid MTU. new_mtu: %d, " "max allowed: %d, min allowed: %d\n", - new_mtu, MAX_FRAME_SIZE - 18, MIN_FRAME_SIZE - 18); + new_mtu, apc->max_mtu, apc->min_mtu); return EINVAL; } MANA_APC_LOCK_LOCK(apc); if (apc->port_is_up) mana_down(apc); - apc->frame_size = new_mtu + 18; + apc->frame_size = new_mtu + ETHER_HDR_LEN; + apc->mtu = new_mtu; if_setmtu(ifp, new_mtu); mana_dbg(NULL, "Set MTU to %d\n", new_mtu); @@ -421,17 +422,11 @@ mana_load_rx_mbuf(struct mana_port_context *apc, struct mana_rxq *rxq, if (alloc_mbuf) { mbuf = m_getjcl(M_NOWAIT, MT_DATA, M_PKTHDR, rxq->datasize); - if (unlikely(mbuf == NULL)) { - mbuf = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR); - if (unlikely(mbuf == NULL)) { - return ENOMEM; - } - mlen = MCLBYTES; - } else { - mlen = rxq->datasize; - } + if (unlikely(mbuf == NULL)) + return ENOMEM; - mbuf->m_pkthdr.len = mbuf->m_len = mlen; + mbuf->m_pkthdr.len = mbuf->m_len = rxq->datasize; + mlen = rxq->datasize; } else { if (rx_oob->mbuf) { mbuf = rx_oob->mbuf; @@ -911,9 +906,9 @@ mana_init_port_context(struct mana_port_context *apc) BUS_SPACE_MAXADDR, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ NULL, NULL, /* filter, filterarg */ - MJUMPAGESIZE, /* maxsize */ + MJUM16BYTES, /* maxsize */ 1, /* nsegments */ - MJUMPAGESIZE, /* maxsegsize */ + MJUM16BYTES, /* maxsegsize */ 0, /* flags */ NULL, NULL, /* lockfunc, lockfuncarg*/ &apc->rx_buf_tag); @@ -994,6 +989,9 @@ mana_query_device_cfg(struct mana_context *ac, uint32_t proto_major_ver, mana_gd_init_req_hdr(&req.hdr, MANA_QUERY_DEV_CONFIG, sizeof(req), sizeof(resp)); + + req.hdr.resp.msg_version = GDMA_MESSAGE_V2; + req.proto_major_ver = proto_major_ver; req.proto_minor_ver = proto_minor_ver; req.proto_micro_ver = proto_micro_ver; @@ -1016,8 +1014,14 @@ mana_query_device_cfg(struct mana_context *ac, uint32_t proto_major_ver, *max_num_vports = resp.max_num_vports; - mana_dbg(NULL, "mana max_num_vports from device = %d\n", - *max_num_vports); + if (resp.hdr.response.msg_version >= GDMA_MESSAGE_V2) + gc->adapter_mtu = resp.adapter_mtu; + else + gc->adapter_mtu = ETHERMTU + ETHER_HDR_LEN; + + mana_dbg(NULL, "mana max_num_vports from device = %d, " + "adapter_mtu = %u\n", + *max_num_vports, gc->adapter_mtu); return 0; } @@ -2295,7 +2299,7 @@ mana_alloc_rx_wqe(struct mana_port_context *apc, uint32_t buf_idx; int err; - if (rxq->datasize == 0 || rxq->datasize > PAGE_SIZE) { + if (rxq->datasize == 0) { mana_err(NULL, "WARNING: Invalid rxq datasize %u\n", rxq->datasize); } @@ -2359,6 +2363,28 @@ mana_push_wqe(struct mana_rxq *rxq) return 0; } +static uint32_t +mana_calc_rx_datasize(struct mana_port_context *apc) +{ + uint32_t effective_mtu = 0; + + if (apc->frame_size > MJUM16BYTES) { + mana_err(NULL, "mana frame_size %u is too big\n", + apc->frame_size); + effective_mtu = MJUM16BYTES; + } else if (apc->frame_size > MJUM9BYTES) { + effective_mtu = MJUM16BYTES; + } else if (apc->frame_size > MJUMPAGESIZE) { + effective_mtu = MJUM9BYTES; + } else if (apc->frame_size > MCLBYTES) { + effective_mtu = MJUMPAGESIZE; + } else { + effective_mtu = MCLBYTES; + } + + return effective_mtu; +} + static struct mana_rxq * mana_create_rxq(struct mana_port_context *apc, uint32_t rxq_idx, struct mana_eq *eq, if_t ndev) @@ -2381,14 +2407,8 @@ mana_create_rxq(struct mana_port_context *apc, uint32_t rxq_idx, rxq->ndev = ndev; rxq->num_rx_buf = apc->rx_queue_size; rxq->rxq_idx = rxq_idx; - /* - * Minimum size is MCLBYTES(2048) bytes for a mbuf cluster. - * Now we just allow maximum size of 4096. - */ - rxq->datasize = ALIGN(apc->frame_size, MCLBYTES); - if (rxq->datasize > MAX_FRAME_SIZE) - rxq->datasize = MAX_FRAME_SIZE; + rxq->datasize = mana_calc_rx_datasize(apc); mana_dbg(NULL, "Setting rxq %d datasize %d\n", rxq_idx, rxq->datasize); @@ -2914,10 +2934,13 @@ mana_probe_port(struct mana_context *ac, int port_idx, mana_rx_req_size); apc->port_handle = INVALID_MANA_HANDLE; apc->port_idx = port_idx; - apc->frame_size = DEFAULT_FRAME_SIZE; apc->last_tx_cq_bind_cpu = -1; apc->last_rx_cq_bind_cpu = -1; apc->vport_use_count = 0; + apc->max_mtu = gc->adapter_mtu - ETHER_HDR_LEN; + apc->min_mtu = MIN_FRAME_SIZE; + apc->mtu = ETHERMTU; + apc->frame_size = apc->mtu + ETHER_HDR_LEN; MANA_APC_LOCK_INIT(apc); @@ -2932,7 +2955,7 @@ mana_probe_port(struct mana_context *ac, int port_idx, if_setioctlfn(ndev, mana_ioctl); if_setgetcounterfn(ndev, mana_get_counter); - if_setmtu(ndev, ETHERMTU); + if_setmtu(ndev, apc->mtu); if_setbaudrate(ndev, IF_Gbps(100)); mana_rss_key_fill(apc->hashkey, MANA_HASH_KEY_SIZE); From nobody Mon May 11 08:41:52 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gDY9x5Sszz6cfZH for ; Mon, 11 May 2026 08:41: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gDY9x4Ltyz4P1R for ; Mon, 11 May 2026 08:41:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778488917; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C+Z0asD0XWEtgPgxEylElyv3+DBapbcYMNaLI/sVgd4=; b=ao1uc2iL5OYbLJWzkOx6vskL0X6Vlih2UIqDiA22qUzEYUoWmhQcjALY+KS1sXmr0jS/+3 Zms7twwRNmbSLpFWlbUqqBXIhcWjED+mfo4jq0rL+mXHutZxhbkvC676FnqhTC877xZEJp auJHalnqXXwF5nMLFBO4OdbpHfGouOoxQKm6uOLNULESgdAkiy7bh5223QdouNZ4tOLY7q +CJ3+yRqBjCx+2/CxvQ+jfbcqZ3EU7UBplyaumGI9cWhPsmVo+pBf/L5fRM/TvnUt/RZ7t xD5utBgK/KT3edp+yfdg0OxvZws4n64PoQszPJaxvHo7YVTjOFfDrsK3kXxXVw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778488917; a=rsa-sha256; cv=none; b=Saf972aeE+0VR1/SBkeYdNKQey438yWWDc0pueL1pYzd+bG6oT7Kxh73HYt5d8N/edOfYl 5oKI/srDlORDDVN7PtWKIEty4lV/2+Q3GpvmNz+S904Kag37r5NiulPY5gR4APhMVbsddJ w3bbw6JQNiSRlx2agkWEdEybq3WBG7Wc8Ivuy6twNZeV5BbHn4qPqcbfg15hsWpdp3y301 V+2HPEpGT8HzavtymjgfvQCTrY2bCF/9OvTQk06ZVAC/qN+z2GndPhXLqLkio309uGfTQ7 nz6Ov+pqp797g+hGg4fLv34kxdpdxlZUR6r7kAyGbQK3ENSbItgnbCHJwHkPGA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778488917; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C+Z0asD0XWEtgPgxEylElyv3+DBapbcYMNaLI/sVgd4=; b=v2k078zbah4sYPU9Ijd+T8RAeVfiOvhGvPCUl3bJjbXW1fwltyWaHKbHuEIcl0IN4iX/IY AQzBwfvmgn5vI987kwdLPAY5qJhd6p8RUCDcVpaJeKGNPEU/1ULjx5hzVJmk5xigHqaWxB Lyf+qlvCT0JVprwOW3Kh94r+i+9SbcfQnNlbTzfUY3uA/VSfb1Setxwag7aI/DdQWn7mOm HLqgAXP8luR25YwRUFaHtv7V2nkFFLXZp5IkBwPx26SCd2nWlzQJT2D0y83IxFLqonQrdZ eoBL5QHhgY/Y9ZlVZpeBwOhzRc/fysftCGiV+BSNZkYEssXammBKtrKo/heuUA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gDY9x3brdz18Kp for ; Mon, 11 May 2026 08:41:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 30d1e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 11 May 2026 08:41:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Wei Hu Subject: git: b0f19adbd5df - stable/14 - Hyper-V: hn: just call vf's ioctl when changing mtu List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: whu X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b0f19adbd5df12aee46f00a0c1edbee1600c9712 Auto-Submitted: auto-generated Date: Mon, 11 May 2026 08:41:52 +0000 Message-Id: <6a019650.30d1e.65f5c777@gitrepo.freebsd.org> The branch stable/14 has been updated by whu: URL: https://cgit.FreeBSD.org/src/commit/?id=b0f19adbd5df12aee46f00a0c1edbee1600c9712 commit b0f19adbd5df12aee46f00a0c1edbee1600c9712 Author: Wei Hu AuthorDate: 2025-12-23 04:23:39 +0000 Commit: Wei Hu CommitDate: 2026-05-11 08:28:29 +0000 Hyper-V: hn: just call vf's ioctl when changing mtu When changing mtu, if a vf is attached to the netvsc interface, just calling its ioctl to change vf's mtu is good enough. Tested by: whu MFC after: 3 days Sponsored by: Microsoft (cherry picked from commit 44f656641c238cb3db31026f3e3bef36cd5231a8) --- sys/dev/hyperv/netvsc/if_hn.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/sys/dev/hyperv/netvsc/if_hn.c b/sys/dev/hyperv/netvsc/if_hn.c index 24b0beac8075..937aae05320d 100644 --- a/sys/dev/hyperv/netvsc/if_hn.c +++ b/sys/dev/hyperv/netvsc/if_hn.c @@ -3763,14 +3763,16 @@ hn_ioctl(if_t ifp, u_long cmd, caddr_t data) ifr_vf = *ifr; strlcpy(ifr_vf.ifr_name, if_name(vf_ifp), sizeof(ifr_vf.ifr_name)); - error = ifhwioctl(SIOCSIFMTU,vf_ifp, + error = ifhwioctl(SIOCSIFMTU, vf_ifp, (caddr_t)&ifr_vf, curthread); + HN_UNLOCK(sc); if (error) { - HN_UNLOCK(sc); if_printf(ifp, "%s SIOCSIFMTU %d failed: %d\n", if_name(vf_ifp), ifr->ifr_mtu, error); - break; + } else { + if_setmtu(ifp, ifr->ifr_mtu); } + break; } /* From nobody Mon May 11 15:26:12 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gDk8T6slVz6dBDT for ; Mon, 11 May 2026 15:26: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gDk8T5gkfz40j6 for ; Mon, 11 May 2026 15:26:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778513177; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5YgViGRsleiEoRUee2dqWtRYRbcCjFm4lu9jyII32S4=; b=lkSq0atd8VSosd5DqZACSV1wJbaYr8IqVVsksKhrhXuNOgxK/94fKu0+LRUYIWtYR002eb KNHjCM1DzQXpY+ePkLkQHhcSEpZU/vObTPDs+EWpf3erqkPQZSsJCSmlrm3dB+PmoX+fCR DVGi/ViD41Eemet6l04Qyn4u5WM2WCQsGSv97pDezTRZbBtcSlmlqp3BcRrrkZOCVnDAKe opu54VcakOGQlKcyRzCGamj3yP0eWWvq/68FU0+QsKze1rHDxmvf5im0FHx9bAl2W0pvsM RNH3R/Vfk+fvQCLP2pm7ltwddIsZtNB471smknDWxVjTmgvogh6pSf4Q3LBWhg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778513177; a=rsa-sha256; cv=none; b=xIxLPPlBUasVKo4cYD8kAjYIbKm3/9Dqrktd+DoS3kD8FpZzDbu6Zsmv3wo+T4eoRupfhA ZECRPr+FxpB2iFSe2tViX44L6TQEFdyBLUxNPGjJkbpvcKArnQ7TRqgfJR59HJcMI3pLRB dDVA1mcPfLS1FpfvvFM/tk8aOoL7hfACNtfb8po3pzpB1CYaaadyeRkZGDHi1H8pMyIU2o H/p3S6Q57qLsMOC/YsaUv5frYJfY+074uvllPTiE5W6ymWw+ehHv5zGRvHOoGojvtY4m/V f6WCVYMllTl4wtUFSOAAXqzk/5M58KH1ImRdnNBd5ZI97DXWC8JjSAH/AHXK+g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778513177; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5YgViGRsleiEoRUee2dqWtRYRbcCjFm4lu9jyII32S4=; b=QdC2SviJHs105KGvonr6bIQpHscbXAWA2Kt+XuDQ3FtIPOr8icELj3PLvq0OtNjJkN33VT 3BOMUV5RHqwuNAB9gkjFBhoNBsvEc4ruyWbyiEfxQ+tXLlKYyFLddLWl9lnyUi8JEMVEFP +hMZ2hmavD2JOPnL1LzzsTwfiSywLJfCWE207V/aHqgzC1yDR+E899u9qoxrw+LWmm31RW VBfD/LcUjuJY2n63ULbSxxPGBUcutekhbbWD+qTPj4GcN8xqhCcnSx448i4RS72NsN9gQq 8AIanVVUOenb+yEdM5jhvVRM6wZrUnKzsDbvPGHnvhQDfzJl9ApRqQjrTUywRg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gDk8T4smCz6YZ for ; Mon, 11 May 2026 15:26:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3142c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 11 May 2026 15:26:12 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 92f623e4a988 - main - rge: add the Intel Killer E5000 PCI ID List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: 92f623e4a98876c897669be0f1220887c996918e Auto-Submitted: auto-generated Date: Mon, 11 May 2026 15:26:12 +0000 Message-Id: <6a01f514.3142c.2ccfe8ca@gitrepo.freebsd.org> The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=92f623e4a98876c897669be0f1220887c996918e commit 92f623e4a98876c897669be0f1220887c996918e Author: Kyle Evans AuthorDate: 2026-05-11 15:26:03 +0000 Commit: Kyle Evans CommitDate: 2026-05-11 15:26:03 +0000 rge: add the Intel Killer E5000 PCI ID This and the E3000 are both handled by the r8169 driver in Linux, and reportedly this is infact just a straight re-brand of the RTL8126. Tested by: "Sinetek" on Discord Reviewed by: adrian Differential Revision: https://reviews.freebsd.org/D56917 --- share/man/man4/rge.4 | 4 +++- sys/dev/rge/if_rge.c | 1 + sys/dev/rge/if_rge_vendor.h | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/share/man/man4/rge.4 b/share/man/man4/rge.4 index 24c42f9106dc..5e338ebf9c87 100644 --- a/share/man/man4/rge.4 +++ b/share/man/man4/rge.4 @@ -3,7 +3,7 @@ .\" .\" SPDX-License-Identifier: BSD-2-Clause .\" -.Dd April 5, 2026 +.Dd May 11, 2026 .Dt RGE 4 .Os .Sh NAME @@ -137,6 +137,8 @@ RealTek RTL8126 (up to 5 Gbps) RealTek RTL8127 (up to 10 Gbps) .It Killer E3000 (up to 2.5 Gbps) +.It +Killer E5000 (up to 5 Gbps) .El .Sh SYSCTL VARIABLES The following variables are available as both diff --git a/sys/dev/rge/if_rge.c b/sys/dev/rge/if_rge.c index 8887e8d39ae4..06f034ebd61d 100644 --- a/sys/dev/rge/if_rge.c +++ b/sys/dev/rge/if_rge.c @@ -113,6 +113,7 @@ struct rge_matchid { const struct rge_matchid rge_devices[] = { { PCI_VENDOR_REALTEK, PCI_PRODUCT_REALTEK_E3000, "Killer E3000" }, + { PCI_VENDOR_REALTEK, PCI_PRODUCT_REALTEK_E5000, "Killer E5000" }, { PCI_VENDOR_REALTEK, PCI_PRODUCT_REALTEK_RTL8125, "RTL8125" }, { PCI_VENDOR_REALTEK, PCI_PRODUCT_REALTEK_RTL8126, "RTL8126", }, { PCI_VENDOR_REALTEK, PCI_PRODUCT_REALTEK_RTL8127, "RTL8127" }, diff --git a/sys/dev/rge/if_rge_vendor.h b/sys/dev/rge/if_rge_vendor.h index eea94e39e20b..f80b99f1f8b6 100644 --- a/sys/dev/rge/if_rge_vendor.h +++ b/sys/dev/rge/if_rge_vendor.h @@ -21,6 +21,7 @@ #define PCI_VENDOR_REALTEK 0x10ec #define PCI_PRODUCT_REALTEK_E3000 0x3000 +#define PCI_PRODUCT_REALTEK_E5000 0x5000 #define PCI_PRODUCT_REALTEK_RTL8125 0x8125 #define PCI_PRODUCT_REALTEK_RTL8126 0x8126 #define PCI_PRODUCT_REALTEK_RTL8127 0x8127 From nobody Mon May 11 15:26:30 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gDk8k4gzdz6dB7Y for ; Mon, 11 May 2026 15:26:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gDk8k3PLlz40mp for ; Mon, 11 May 2026 15:26:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778513190; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=T4gsW2UcW6E7Gw9yu4uF0j0m6ZlJyEBz5azkWCc9yWI=; b=RyjvaoOEvXv04NidRCdSD8/CdxOdiwQd5cZdBUKtlU96/Wbra5Bzdb8BOK0Ip3gAS4DwQq OtBaKKSyw3alujUs5pej/5nErqq6EorkenaJMP6fWLjvcElRW+eTXDvJFM81RehaT/6hKN HlZdc9euggFrOYz3YEDKmZ6H5eIhkp+mRpbZCXOefivSO83ZpVReMYYgOcJ8sPK6xjxVB6 rJ7e6ayWXQwxjgPqssPYKlLsTp//CYrTSzD7eY3wz5t5TD8DVenEGsGk1USv9K4HQPFnuq cu+t6bP2g4FhHaU1NDYdoCTXIEeMK12F+9j78Xs/463hcunxlJS7Br0xMT1vwA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778513190; a=rsa-sha256; cv=none; b=VxUsDvrre0IIur5WN/F+iofeJUf+mjDmIdNLAvZdM1qLce4pz5gFKjQfbjGqFlq00USN93 07wP4moy8AeEgdCCIdibFhWR+l0TTt4/ZVvhfVAJSaCJDwZE/rzRB5rjdBJ2ccW5ro7eAi sBJdWn9T0Oy+E4IN0iT7sJT3eGBHqAvXVY5jFo4LQGg53STo++YlOjWdFPfyqbHf+921QU lcz3DT0sInVjNjwZcYIO8viQA5GJkadj1pDshWYe9pMEuGE7TSI2GCIVwdhDH67m/XAuc7 DnekVGCCllxxYFOTChzqppizoA16cjv99CoLHdM472Bh46dP1SvROUH7ep8fkQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778513190; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=T4gsW2UcW6E7Gw9yu4uF0j0m6ZlJyEBz5azkWCc9yWI=; b=dfAlorCXvGBBOmAHjSCuGEm5YM06BAgeWMu+ksTQb2MCHucJJ5+wGhY0EP3U098qF4iGMV a3p+fON9LVh7v69kIAtC7bMLXp6AFZCJYAWo4kHbB61zrP+HIPiDn/hQvx9jx7y90h2L4d hOMzgW3kJysoVxCmJpAQ5H5+qQOjrervdta/AbC2J+EiO7UEqH0eBvTsfmZrkFo6/2pe8E emXOkmHLSZzPmhXtkylQi38jh0yZDb0L/BBSlMre6GXO8W2McVeNFoV4A6e4Nl/CtSFAmn 9cqw/YRu61kZcpg6qIYSqyFLsoPeGfqMBjhSOlBofpUUkrho+G+zOIlkrr4kAg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gDk8k2kMnz6wc for ; Mon, 11 May 2026 15:26:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33028 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 11 May 2026 15:26:30 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: d64438a09dc8 - stable/14 - libregex: fix our mapping for \w List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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/stable/14 X-Git-Reftype: branch X-Git-Commit: d64438a09dc8e466c969fbe94c1a2fa500554da4 Auto-Submitted: auto-generated Date: Mon, 11 May 2026 15:26:30 +0000 Message-Id: <6a01f526.33028.3f375504@gitrepo.freebsd.org> The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=d64438a09dc8e466c969fbe94c1a2fa500554da4 commit d64438a09dc8e466c969fbe94c1a2fa500554da4 Author: Kyle Evans AuthorDate: 2025-08-08 18:21:03 +0000 Commit: Kyle Evans CommitDate: 2026-05-11 15:20:50 +0000 libregex: fix our mapping for \w A small oversight in our implementation of \w is that it's actually not strictly [[:alnum:]]. According to the GNU documentation, it's actually [[:alnum:]] + underscore. The fix is rather trivial: just add it to our set explicitly, and amend our test set to be sure that _ is actually included. PR: 287396 (cherry picked from commit d0ff5773cefaf3fa41b1be3e44ca35bd9d5f68ee) --- lib/libc/regex/regcomp.c | 1 + lib/libregex/tests/gnuext.in | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/libc/regex/regcomp.c b/lib/libc/regex/regcomp.c index eae4d02657e8..d1f0fc0d862f 100644 --- a/lib/libc/regex/regcomp.c +++ b/lib/libc/regex/regcomp.c @@ -1170,6 +1170,7 @@ p_b_pseudoclass(struct parse *p, char c) { /* PASSTHROUGH */ case 'w': p_b_cclass_named(p, cs, "alnum"); + CHadd(p, cs, '_'); break; case 'S': cs->invert = 1; diff --git a/lib/libregex/tests/gnuext.in b/lib/libregex/tests/gnuext.in index 8f49854235a9..3ce0f4af1b34 100644 --- a/lib/libregex/tests/gnuext.in +++ b/lib/libregex/tests/gnuext.in @@ -10,9 +10,9 @@ a\|b\|c b abc a (ab)\1 - abab abab \1(ab) C ESUBREG (a)(b)(c)(d)(e)(f)(g)(h)(i)\9 - abcdefghii abcdefghii -# \w, \W, \s, \S (alnum, ^alnum, space, ^space) -\w+ - -%@a0X- a0X -\w\+ b -%@a0X- a0X +# \w, \W, \s, \S (_alnum, ^_alnum, space, ^space) +\w+ - -%@a_0X- a_0X +\w\+ b -%@a_0X- a_0X \s+ - aSNTb SNT \s\+ b aSNTb SNT # Word boundaries (\b, \B, \<, \>, \`, \') From nobody Mon May 11 17:20:44 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gDmhY3BBbz6dKfK for ; Mon, 11 May 2026 17:20: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gDmhX53kzz3Gn4 for ; Mon, 11 May 2026 17:20:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778520044; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XQ1K2gn0x9ipD3067fRPbSuU5b0a1cbVhGGkNk5ZZI8=; b=IcvtIO4qZ60UedFa2Mt2HbJ1uM0Bqu5O+miziawI1fUk5rib7fLURomKXQZ3Z9NWP4m1GV jbYqV9kRH+ApVbEcBEklZ7hEMreuBsxPebpf8eui7XV3tFvkujTjRk5j0wt7OdBenxNZl4 HLzRkyQNhhmFvQgZEET1+OxjxOwcl/sk1EZM/VP2wHP1JBZ1ogvoMluTY58PlDNWhGNZW9 B5KcCI7RV5afiMlPYLbcBR+UMJqQGeKFTU5cUVDdanf7BpY8E3Wef1XLmjqEMT/Sst1WRt CsQKJUjPthwtShV65djwdCJe+06ycKf02bPyRIpRjCHM7xZPgNFTueDVvV4BRg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778520044; a=rsa-sha256; cv=none; b=rZjjCGYNKzrUDcpX8WMwJbbnytmuXKdn0HSnSsnmK+gyEaCcM++C0QIZGcqtIa8F7kgbCn fqiBt2wlAT28PsKkOMsFlsyvP/MAFmcfkVXRovp/4pImHYw6ojGVEDITQZF9VmfSivfAE1 bUoTqxEJbSa4pjs0cSHKYTowk+x6QMhSKLFXGNRj503w5q1k+Uek3j1N06lz+oRAn5UbZ+ DJuxWG0S3tH1Haz8iS9jQeI8hhVQtP/mCjzP5+/I6r6DFkeVnj+FhF8GY023lX9vBrPTVq BsjwIYdYVlFCzGpDXzLmZr9d5WubpafrPItGAvc14H6UZSWwlsFCj+hbHjp/dQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778520044; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XQ1K2gn0x9ipD3067fRPbSuU5b0a1cbVhGGkNk5ZZI8=; b=MUxkMCABswvk1ov3fQ9QCq+ovBXz+JJxeqZdQUpALoP/T8EO1447qiuj4W8agO3/csJ3w+ G7IZHzgnmlGZzQxuWzu9L3LI7AuzFSEWEzk0xLbvLFpzIBmXmyPr/6s0Y58/T3QmUGZcNg hg1FRDWW307rBQOOLTafjhmG6eSvzzlKSRG9jD8CQP7d8mC1I4nGf03gmtfPPojx4uNhPx g/McEFerZ0zQ/pp8u8UOG5F/5L5f/dKxTErA/ASOb9LYBCGgsFJym82WXKUyeznQHdS8jV Zo+hVTngKZg25B9G5XQALiQc8SNyNxQuKzWGywaZk5Vucn/Omsb1cphGjE6H3w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gDmhX4NtMzBGd for ; Mon, 11 May 2026 17:20:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3fa30 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 11 May 2026 17:20:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Aymeric Wibo Subject: git: 95b4436e989d - main - power: Rename sleep types List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: 95b4436e989df29f6368f13832cb13d7cbc52eac Auto-Submitted: auto-generated Date: Mon, 11 May 2026 17:20:44 +0000 Message-Id: <6a020fec.3fa30.760ea205@gitrepo.freebsd.org> The branch main has been updated by obiwac: URL: https://cgit.FreeBSD.org/src/commit/?id=95b4436e989df29f6368f13832cb13d7cbc52eac commit 95b4436e989df29f6368f13832cb13d7cbc52eac Author: Aymeric Wibo AuthorDate: 2026-05-11 17:11:36 +0000 Commit: Aymeric Wibo CommitDate: 2026-05-11 17:11:39 +0000 power: Rename sleep types Make sleep type names clearer and more consistent, and allow space for something like "os_hibernate" once that gets added to FreeBSD. Reviewed by: jaeyoon, olce, markj Approved by: jaeyoon, olce, markj Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D56920 --- sys/compat/linuxkpi/common/src/linux_acpi.c | 2 +- sys/dev/acpica/acpi.c | 16 ++++++++-------- sys/dev/ufshci/ufshci_private.h | 4 ++-- sys/dev/xen/control/control.c | 6 +++--- sys/kern/subr_power.c | 8 ++++---- sys/sys/power.h | 10 +++++----- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_acpi.c b/sys/compat/linuxkpi/common/src/linux_acpi.c index c7d62c745c7e..85a3afe5d01d 100644 --- a/sys/compat/linuxkpi/common/src/linux_acpi.c +++ b/sys/compat/linuxkpi/common/src/linux_acpi.c @@ -131,7 +131,7 @@ linux_handle_power_suspend_event(void *arg __unused, enum power_stype stype) linux_acpi_target_sleep_state = ACPI_STATE_S3; pm_suspend_target_state = PM_SUSPEND_TO_IDLE; break; - case POWER_STYPE_SUSPEND_TO_MEM: + case POWER_STYPE_FW_SUSPEND: linux_acpi_target_sleep_state = ACPI_STATE_S3; pm_suspend_target_state = PM_SUSPEND_MEM; break; diff --git a/sys/dev/acpica/acpi.c b/sys/dev/acpica/acpi.c index bdc197a4fb59..ec1f002150c1 100644 --- a/sys/dev/acpica/acpi.c +++ b/sys/dev/acpica/acpi.c @@ -672,12 +672,12 @@ acpi_attach(device_t dev) * s2idle when ACPI_FADT_LOW_POWER_S0 is set. */ sc->acpi_sleep_button_stype = POWER_STYPE_UNKNOWN; - for (stype = POWER_STYPE_STANDBY; stype <= POWER_STYPE_HIBERNATE; stype++) + for (stype = POWER_STYPE_STANDBY; stype <= POWER_STYPE_FW_HIBERNATE; stype++) if (acpi_supported_stypes[stype]) { sc->acpi_sleep_button_stype = stype; break; } - if (sc->acpi_sleep_button_stype == POWER_STYPE_HIBERNATE || + if (sc->acpi_sleep_button_stype == POWER_STYPE_FW_HIBERNATE || sc->acpi_sleep_button_stype == POWER_STYPE_UNKNOWN) { if (acpi_supported_stypes[POWER_STYPE_SUSPEND_TO_IDLE]) sc->acpi_sleep_button_stype = POWER_STYPE_SUSPEND_TO_IDLE; @@ -816,9 +816,9 @@ acpi_stype_to_sstate(struct acpi_softc *sc, enum power_stype stype) return (ACPI_STATE_S0); case POWER_STYPE_STANDBY: return (sc->acpi_standby_sx); - case POWER_STYPE_SUSPEND_TO_MEM: + case POWER_STYPE_FW_SUSPEND: return (ACPI_STATE_S3); - case POWER_STYPE_HIBERNATE: + case POWER_STYPE_FW_HIBERNATE: return (ACPI_STATE_S4); case POWER_STYPE_POWEROFF: return (ACPI_STATE_S5); @@ -851,9 +851,9 @@ acpi_sstate_to_stype(int sstate) case ACPI_STATE_S2: return (POWER_STYPE_STANDBY); case ACPI_STATE_S3: - return (POWER_STYPE_SUSPEND_TO_MEM); + return (POWER_STYPE_FW_SUSPEND); case ACPI_STATE_S4: - return (POWER_STYPE_HIBERNATE); + return (POWER_STYPE_FW_HIBERNATE); case ACPI_STATE_S5: return (POWER_STYPE_POWEROFF); } @@ -3723,8 +3723,8 @@ acpi_EnterSleepState(struct acpi_softc *sc, enum power_stype stype) case POWER_STYPE_STANDBY: do_standby(sc, &slp_state, intr); break; - case POWER_STYPE_SUSPEND_TO_MEM: - case POWER_STYPE_HIBERNATE: + case POWER_STYPE_FW_SUSPEND: + case POWER_STYPE_FW_HIBERNATE: do_sleep(sc, &slp_state, intr, acpi_sstate); break; case POWER_STYPE_SUSPEND_TO_IDLE: diff --git a/sys/dev/ufshci/ufshci_private.h b/sys/dev/ufshci/ufshci_private.h index 067b51a419e8..8d18fab982d7 100644 --- a/sys/dev/ufshci/ufshci_private.h +++ b/sys/dev/ufshci/ufshci_private.h @@ -262,11 +262,11 @@ static const struct ufshci_power_entry power_map[POWER_STYPE_COUNT] = { UFSHCI_UIC_LINK_STATE_ACTIVE }, [POWER_STYPE_STANDBY] = { UFSHCI_DEV_PWR_SLEEP, SSS_PC_IDLE, UFSHCI_UIC_LINK_STATE_HIBERNATE }, - [POWER_STYPE_SUSPEND_TO_MEM] = { UFSHCI_DEV_PWR_POWERDOWN, + [POWER_STYPE_FW_SUSPEND] = { UFSHCI_DEV_PWR_POWERDOWN, SSS_PC_STANDBY, UFSHCI_UIC_LINK_STATE_HIBERNATE }, [POWER_STYPE_SUSPEND_TO_IDLE] = { UFSHCI_DEV_PWR_SLEEP, SSS_PC_IDLE, UFSHCI_UIC_LINK_STATE_HIBERNATE }, - [POWER_STYPE_HIBERNATE] = { UFSHCI_DEV_PWR_DEEPSLEEP, 0x40, + [POWER_STYPE_FW_HIBERNATE] = { UFSHCI_DEV_PWR_DEEPSLEEP, 0x40, UFSHCI_UIC_LINK_STATE_OFF }, [POWER_STYPE_POWEROFF] = { UFSHCI_DEV_PWR_POWERDOWN, SSS_PC_STANDBY, UFSHCI_UIC_LINK_STATE_OFF }, diff --git a/sys/dev/xen/control/control.c b/sys/dev/xen/control/control.c index 2c61b48c0451..e363ea1700f6 100644 --- a/sys/dev/xen/control/control.c +++ b/sys/dev/xen/control/control.c @@ -176,12 +176,12 @@ xctrl_suspend(void) cpuset_t cpu_suspend_map; #endif - EVENTHANDLER_INVOKE(power_suspend_early, POWER_STYPE_SUSPEND_TO_MEM); + EVENTHANDLER_INVOKE(power_suspend_early, POWER_STYPE_FW_SUSPEND); xs_lock(); stop_all_proc(); xs_unlock(); suspend_all_fs(); - EVENTHANDLER_INVOKE(power_suspend, POWER_STYPE_SUSPEND_TO_MEM); + EVENTHANDLER_INVOKE(power_suspend, POWER_STYPE_FW_SUSPEND); #ifdef EARLY_AP_STARTUP MPASS(mp_ncpus == 1 || smp_started); @@ -298,7 +298,7 @@ xctrl_suspend(void) resume_all_fs(); resume_all_proc(); - EVENTHANDLER_INVOKE(power_resume, POWER_STYPE_SUSPEND_TO_MEM); + EVENTHANDLER_INVOKE(power_resume, POWER_STYPE_FW_SUSPEND); if (bootverbose) printf("System resumed after suspension\n"); diff --git a/sys/kern/subr_power.c b/sys/kern/subr_power.c index 13448cfa4d1e..761c9c0639ce 100644 --- a/sys/kern/subr_power.c +++ b/sys/kern/subr_power.c @@ -153,12 +153,12 @@ power_pm_register(u_int pm_type, power_pm_fn_t pm_fn, void *pm_arg, sizeof(power_pm_supported)); if (power_pm_supported[POWER_STYPE_STANDBY]) power_standby_stype = POWER_STYPE_STANDBY; - if (power_pm_supported[POWER_STYPE_SUSPEND_TO_MEM]) - power_suspend_stype = POWER_STYPE_SUSPEND_TO_MEM; + if (power_pm_supported[POWER_STYPE_FW_SUSPEND]) + power_suspend_stype = POWER_STYPE_FW_SUSPEND; else if (power_pm_supported[POWER_STYPE_SUSPEND_TO_IDLE]) power_suspend_stype = POWER_STYPE_SUSPEND_TO_IDLE; - if (power_pm_supported[POWER_STYPE_HIBERNATE]) - power_hibernate_stype = POWER_STYPE_HIBERNATE; + if (power_pm_supported[POWER_STYPE_FW_HIBERNATE]) + power_hibernate_stype = POWER_STYPE_FW_HIBERNATE; error = 0; TASK_INIT(&power_pm_task, 0, power_pm_deferred_fn, NULL); } else { diff --git a/sys/sys/power.h b/sys/sys/power.h index d34af0ddb86a..85e0b12391ff 100644 --- a/sys/sys/power.h +++ b/sys/sys/power.h @@ -67,9 +67,9 @@ enum power_sstate_transition { enum power_stype { POWER_STYPE_AWAKE, POWER_STYPE_STANDBY, - POWER_STYPE_SUSPEND_TO_MEM, + POWER_STYPE_FW_SUSPEND, POWER_STYPE_SUSPEND_TO_IDLE, - POWER_STYPE_HIBERNATE, + POWER_STYPE_FW_HIBERNATE, POWER_STYPE_POWEROFF, POWER_STYPE_COUNT, POWER_STYPE_UNKNOWN, @@ -78,9 +78,9 @@ enum power_stype { static const char * const power_stype_names[POWER_STYPE_COUNT] = { [POWER_STYPE_AWAKE] = "awake", [POWER_STYPE_STANDBY] = "standby", - [POWER_STYPE_SUSPEND_TO_MEM] = "s2mem", - [POWER_STYPE_SUSPEND_TO_IDLE] = "s2idle", - [POWER_STYPE_HIBERNATE] = "hibernate", + [POWER_STYPE_FW_SUSPEND] = "fw_suspend", + [POWER_STYPE_SUSPEND_TO_IDLE] = "suspend_to_idle", + [POWER_STYPE_FW_HIBERNATE] = "fw_hibernate", [POWER_STYPE_POWEROFF] = "poweroff", }; From nobody Mon May 11 21:42:10 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gDtVH6Tyhz6c9Sj for ; Mon, 11 May 2026 21: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gDtVH43JZz3wlv for ; Mon, 11 May 2026 21: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=1778535735; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=v9XtR2DZx1tS9VyVaxLKl3qs53z4QAWtOjWoa8hFyCI=; b=th+jl1/7dQI9NxLHBNMGlDeVBfys+ONtDyNZDNO2SrgQJ3TKVYQ2eZRRjP2SuDgqpqv9R1 lO4ZT1pPx0A2tAxv7h/YGqQMfLCOQBJQiG0pS6WpuWj6x7dIG9G8IDVyhEynONqPGXgTwb TMG+5dg7AnSChNX8+//YYYjGFzg6SuImwYVeqhEklQGe4WFgyrApy1aINUEVr1XhGmYWX4 AJuPgop1pqHezyO7T9DM+OhVycU7VCOjoe3saRP8SyoGaQprikRz+QPUp+z50CQu1XjimB XQncy5HUjbOhHuk42SAWUXAANwtJDkPmvwA908leF5ILtnmn3xm2RvTHvXjbaQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778535735; a=rsa-sha256; cv=none; b=MDyQ7d/KpHl2YOS+ThG45uTh9je1ckOs8WxEyeYzebW4po1G/Mlb/jhRtEQ1CZ/HCCtxDs R6pxjDyrIjFgvUlK2OtrffAKkem+jOYvPS4wy7OtYvatPP+Fmmqo1xBN17yckbBTC6WNO8 x3iw4+et/ZZe2XDoBs2uYeb7+MxmDmcJfP5+bf7oQOuj0BGZERx1PaOjzvnIdEIh6gfEGF foJFrYLLjkxhJr64FTEV+RC8kyiKgeMcBSAi5h00O6YDLNSj3NQi4oIPeEQMVXF5HbHFxr LuNlb/Amtd46J7TVmyG58CEsFi8b2Vgw+hfQPCXZf+LsNGMqGFUld2HlO66cOQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778535735; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=v9XtR2DZx1tS9VyVaxLKl3qs53z4QAWtOjWoa8hFyCI=; b=hSwuMmSx5IDXrjORPid7O5UnkCR9j10f6TaiSqQsMc8ouM4j8djow/ewua/iwybEwW2Nc2 e0MeBU/M5Y+/Sxvaaq9gY3P4ouhAvrxA8+kyhhF9KVFRtEFwGY84+DtETNUIpc59HgXUK0 oKMSaE0mJ66CI1C/lNNKftuXIAF68dD93yFL7EeomAcjbNxzsVQ3cT7NodMOH4HRW19DjC jp0MTmwGe6iiPphlARCA6QKMjQFvdZFIIntIEBmGK+EEAruvAG8Sgowi4sHl5eTmx6zJ6i H6ZB0XiSAqn9IMQcrraDsdVDTlicR9U4eS9P5Tx+gH4GHVAeqc7k0vHpugi76w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gDtVH301rzbH5 for ; Mon, 11 May 2026 21:42:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3076e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 11 May 2026 21:42:10 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Jung-uk Kim Subject: git: 5cab380e2a26..69ae37302ee9 - vendor/acpica - vendor branch updated List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jkim X-Git-Repository: src X-Git-Refname: refs/heads/vendor/acpica X-Git-Reftype: branch X-Git-Commit: 69ae37302ee98839857791a261546e19d078cdb8 X-Git-Oldrev: 5cab380e2a2644aaa920b93f1580a1cfc803a8de X-Git-Newrev: 69ae37302ee98839857791a261546e19d078cdb8 Auto-Submitted: auto-generated Date: Mon, 11 May 2026 21:42:10 +0000 Message-Id: <6a024d32.3076e.93641dc@gitrepo.freebsd.org> The branch vendor/acpica has been updated by jkim: URL: https://cgit.FreeBSD.org/src/log/?id=5cab380e2a26..69ae37302ee9 69ae37302ee9 Import ACPICA 20260408 From nobody Mon May 11 21:45:01 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gDtYT6c7Bz6ddJ6 for ; Mon, 11 May 2026 21:45: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gDtYT2nrNz3x3V for ; Mon, 11 May 2026 21:45:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778535901; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YJMvKvmKdzbTra++fQBAjOdB2ik4Zuda3fqnoXOTD4c=; b=FPPKRN7mJu8Ps01r7nhfev2TDd4lfLaaU26KgEWEcuJ4+NDx4mZixpOhZSWNsVOHaHnLYx GylbAWbOwLLe7PtfY8ZLUL6rfvaeAUvAIsqGPnm694p/7qFuHceAQq5dkPe8m010CzKJXO jV2kxMebjYt1/cEnMhl+aLKBZEyQ3UC/nQ+OThNA3WM2teK9FN5J3xRZfhbwG+fAdfb3Fv G1UC2zFuR4xN5ZGv6zdsYuwgQTYV4xURLhSk+k4zDXVokiCSh1Auebe2epK/l0s5321EUX g/eHIh7mjUQtKZOwzCRFhbFRx1Si1wNrc+4gOJw8+LfKsvoIQkv8O4ixuDdyUA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778535901; a=rsa-sha256; cv=none; b=aYA345t6VWAEQFq7Rduy1Y0rfcJCPibHHD4iuckq1U3k/RaGqlgC0TZRi51N/FxbyAmESQ P8Rw7x4pPqRuxdejo/rH+irXwsR6yB3eDVVHKMmxwx24uGk7n+GWKIUK2vdFh5xLSjXPgA X2Tr2YCBvI1M4PYmrBuBiVCL0VIB5Yn6E2dhiDVSQ1s5gbg9sJj+Pjp9HU3CzXTzLR7rki zEkCXdO+rUEV5588W14hUqc7jC1B4DSlLgk7rQ3hsxKAjgvN0G6LgGuVPDjXFiNXRGc93a FX7nH8RWdmSCDaUz6QqtRD0914hRlH7u1B1EuOBO3nnSPZSk4fvaZovf2hzThg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778535901; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YJMvKvmKdzbTra++fQBAjOdB2ik4Zuda3fqnoXOTD4c=; b=eCzbgTxDoifCjVJO2q3Sq2mDsqEjgg2OaLEhhvlCufUAqCZ8ghCdQMNFz0xBxDP/O4qHaO 9tjLWmNqU56N4OaNaMtHmjQJnWongqWWyO3iYq/gLqVmCrlONOzCzjTgMOEo9YOpWZ4svO EYY0FP1cT+qbVZkA6KcDn8XBZhPfohbmfx5vEBgM95T5r98A3ShKgddd9Z16rcV/ZSh2+x V6aIHspWn9Yf8jas+bA5hwexOKT6Pu8wIIk8PLbvRbW8uqtgYHFlu2eI0bUheFdwb2RWkl MTxeVJzMqhw8tbn54Lwp62l4k/Pk2H/mAyYwq523X6ohg3pLR8fPuYtndXJE8g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gDtYT1lpjzbkc for ; Mon, 11 May 2026 21:45:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33939 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 11 May 2026 21:45:01 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Jung-uk Kim Subject: git: 787c9421f879 - Create tag vendor/acpica/20260408 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jkim X-Git-Repository: src X-Git-Refname: refs/tags/vendor/acpica/20260408 X-Git-Reftype: annotated tag X-Git-Commit: 787c9421f8790f5571a5d67d0cb46ea7095ce6e8 Auto-Submitted: auto-generated Date: Mon, 11 May 2026 21:45:01 +0000 Message-Id: <6a024ddd.33939.7d1a61d@gitrepo.freebsd.org> The annotated tag vendor/acpica/20260408 has been created by jkim: URL: https://cgit.FreeBSD.org/src/tag/?h=vendor/acpica/20260408 tag vendor/acpica/20260408 Tagger: Jung-uk Kim TaggerDate: 2026-05-11 21:41:40 +0000 Tag ACPICA 20260408 commit 69ae37302ee98839857791a261546e19d078cdb8 Author: Jung-uk Kim AuthorDate: 2026-05-11 21:41:03 +0000 Commit: Jung-uk Kim CommitDate: 2026-05-11 21:41:03 +0000 Import ACPICA 20260408 From nobody Mon May 11 22:21:18 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gDvMM3YjDz6cDL4 for ; Mon, 11 May 2026 22:21: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gDvMM0zZqz431Y for ; Mon, 11 May 2026 22:21:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778538079; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2R8++xx9ARzWiQE91340RTQySl20t34yUIAv/lkZgrQ=; b=u20qqWZ3uRj/uuDnRjCv8yLKIEECpwIENEM1m6jtqh2sDWNpwfyzvcPXPp8IWXh1SihkKu NNnG+1wZoj3THW5qJ0M1IzzfZrdocSKbjk30DFnTrRyEzFF3B38LWdQaE1vRLXQgpPN6LJ /yKb9Jrb3QN7XvjSCr8lcsHGGz5Lx754RTjioVn0MnM61dNUMSqZmyJrrxXwWVpxMLOUKi qo0Bp+RfL2u0MBLsZSXqxTdUHDOpzp4skK9Mkdd3Lyp9A9J0ByluOyJup1mI+24RCRN4yq DQaVN+P1Bk+isvbSZyT7u4/7XsjmSO2wpi3KLqsXowROWZsealcWsHcaJxO1QQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778538079; a=rsa-sha256; cv=none; b=ntGBLJm1pHG0yD2inEOpR+yqtiShrkKWHtcKZ47tpH5E5+Ucs5KTWP5xVv6W6fF6AuB1rU YWJIuG3lLv5fT6TppgxyLIHOklBGyfsKiQX6mHUEsFky9xxH0C5w1vICBaU8+MCNQcPiZv q/cN4z9Y5Ocn1gVXKliS6ObOauCWFFrSRVJaP9NlybM+3MEaP4Bf8Hf8xTPvW01F6WkbGP m72czPgzFwc7Chu5TwaG3mltK8KzEteZihYpJpEVQrpTK0J9yOetT0Kh6PfL3IMP+3WBjs HSYImeyxqrjET0X+WY+S7wTwYG2ZLxrFFzhtgMosR3dEc18OTgZl5CM8ALa6BQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778538079; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2R8++xx9ARzWiQE91340RTQySl20t34yUIAv/lkZgrQ=; b=c3mx2goZnD9HYwmuYkTXKjDbTlhtWJmBIXoT8jpVba8cLcC+TcbCc3kwmuV/T2LyzCB93p 0sqVm5rcN+4+ZeLwIp6W4Q7dAslNAmQq84bo0tpBSRPMHjorlN3ZD0Y0m5oLiGnkXTpFHk Lbd00j4Fn9OQhtFsG58QWlKgF9FLiL6dHYj5Q/cXD1X1F31l/x6ANnnw/Ozu+6ogiz/AZC PHROOJDrrJE9eH02NTuCO4LZCz+uovFsUm3jTpM5eUFG5VyY1XeKhojMH520vX8O/tg0bI AEX5N4xe86OFurA+IS8M9Hby+uf4ukHz3xtAB+Om6C2E3mA46u85eMgTa1kivw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gDvMM0ZSQzcq4 for ; Mon, 11 May 2026 22:21:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 341f8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 11 May 2026 22:21:18 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Chuck Tuffli Subject: git: 7419d6e463fe - main - Add 'contrib/smart/' from commit 'eb3b1302382b1d0cbe37eeebabfcdd546aa2fc4e' List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: chuck X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7419d6e463fee40f0f52cd5bc46a93cbb7ac6114 Auto-Submitted: auto-generated Date: Mon, 11 May 2026 22:21:18 +0000 Message-Id: <6a02565e.341f8.64b91f9e@gitrepo.freebsd.org> The branch main has been updated by chuck: URL: https://cgit.FreeBSD.org/src/commit/?id=7419d6e463fee40f0f52cd5bc46a93cbb7ac6114 commit 7419d6e463fee40f0f52cd5bc46a93cbb7ac6114 Merge: 95b4436e989d eb3b1302382b Author: Chuck Tuffli AuthorDate: 2026-05-11 21:50:04 +0000 Commit: Chuck Tuffli CommitDate: 2026-05-11 21:50:04 +0000 Add 'contrib/smart/' from commit 'eb3b1302382b1d0cbe37eeebabfcdd546aa2fc4e' git-subtree-dir: contrib/smart git-subtree-mainline: 95b4436e989df29f6368f13832cb13d7cbc52eac git-subtree-split: eb3b1302382b1d0cbe37eeebabfcdd546aa2fc4e contrib/smart/Changelog | 37 ++ contrib/smart/LICENSE | 13 + contrib/smart/Makefile | 26 + contrib/smart/README.md | 62 ++ contrib/smart/freebsd_dev.c | 828 +++++++++++++++++++++++++ contrib/smart/libsmart.c | 1359 +++++++++++++++++++++++++++++++++++++++++ contrib/smart/libsmart.h | 174 ++++++ contrib/smart/libsmart_desc.c | 158 +++++ contrib/smart/libsmart_dev.h | 60 ++ contrib/smart/libsmart_priv.h | 83 +++ contrib/smart/smart.8 | 245 ++++++++ contrib/smart/smart.c | 334 ++++++++++ 12 files changed, 3379 insertions(+) diff --cc contrib/smart/Changelog index 000000000000,42b79bc34070..42b79bc34070 mode 000000,100644..100644 --- a/contrib/smart/Changelog +++ b/contrib/smart/Changelog diff --cc contrib/smart/LICENSE index 000000000000,8b0a0bf6a4a6..8b0a0bf6a4a6 mode 000000,100644..100644 --- a/contrib/smart/LICENSE +++ b/contrib/smart/LICENSE diff --cc contrib/smart/Makefile index 000000000000,000000000000..64cab720e08f new file mode 100644 --- /dev/null +++ b/contrib/smart/Makefile @@@ -1,0 -1,0 +1,26 @@@ ++# ++# Copyright (c) 2016-2021 Chuck Tuffli ++# ++# 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. ++# ++PROG= smart ++SRCS= smart.c libsmart.c libsmart_desc.c ++SRCS+= freebsd_dev.c ++LIBADD= cam xo ++MAN=smart.8 ++MLINKS= smart.8 diskhealth.8 ++#CFLAGS+= -ggdb -O0 ++CFLAGS+= -DLIBXO ++LINKS= ${BINDIR}/smart ${BINDIR}/diskhealth ++ ++.include diff --cc contrib/smart/README.md index 000000000000,000000000000..57fc685a9ef8 new file mode 100644 --- /dev/null +++ b/contrib/smart/README.md @@@ -1,0 -1,0 +1,62 @@@ ++# README # ++ ++### What is this repository for? ### ++ ++* Application to output the SMART values of disks ++ ++### How do I get set up? ### ++ ++Clone this repository onto a FreeBSD box and run make ++ ++ $ git clone https://github.com/ctuffli/smart ++ $ cd smart && make ++ ++or install it from ports ( http://www.freshports.org/sysutils/smart/ ) ++ ++### How to use ++ Usage: smart [-htxi] [-a attribute[,attribute]...] ++ -h, --help ++ -t, --threshold : also print out the threshold values ++ -x, --hex : print the values out in hexadecimal ++ -a, --attribute : print a specific attribute(s) ++ -i, --info : print general device information ++ -d, --decode: decode the attribute IDs ++ -D, --no-decode: don't decode the attribute IDs ++ -v, --version : print the version and copyright ++ ++### Example ++* List the raw attributes of SATA device /dev/ada0 ++ ++ smart ada0 ++ ++* List the decoded attributes of NVMe device /dev/nda0 ++ ++ smart -d nda0 ++ ++ or ++ ++ diskhealth nda0 ++ ++### What does the raw output mean? ++The format and location of SMART / health data varies across protocols. ++To simplify the output, the application uses a Dumb Unified Model of ++SMART Buffers. In this model, SMART data is located in one or more log ++pages. Each page contains one or more values ("attributes") ++differentiated by an ID. Note that ID's are only unique within a log ++page. Thus, the application outputs: ++ ++ ++for each selected attribute. Threshold values, if defined by the protocol ++and selected by the user, are printed after the attribute value. ++ ++See the shell scripts `atasmart`, `nvmesmart`, and `scsismart` for examples of parsing the output. ++ ++### What is the decoded output? ++Decoded output converts numeric values (Log Page, Attribute ID and Value tuples) into human-readable descriptions. ++ ++The output for protocols like NVMe and SCSI which provide standardized descriptions will match the text in the specification. ATA, however, allows vendors to define their own attributes. For ATA, descriptions come from the "SMART Attribute Descriptions (SAD)" (ANSI - INCITS TR-54) specification which documents attributes common to multiple ATA drive vendors. ++ ++### Protocol Specific Notes ++* __ATA__ : The attribute and values follow the 'standard'. The log page is the Feature value used in ATA command. Thus, the default page is 208 / 0xd0 (a.k.a SMART Read Data). The threshold values printed are status flags, current value, and worst value. The SMART Return Status (Feature 218 / 0xda) indicates the reliability status of the device and is sometimes used as a top-level SMART health indication. While this command does not return data, the application encodes "no errors" as 0x0 and "threshold exceeded" as 0x1 in attribute 0. ++* __NVMe__ : The Log Page is the SMART / Health Information LID value in the Get Log Page command (i.e. 0x2). The attribute ID is the byte offset within this page. ++* __SCSI__ : The Log Page ID is the Page Code value in the Mode Sense command. The attribute ID is the parameter code defined by this page (e.g. 0 in the Write Error Counters log page is 'Errors corrected without substantial delay'). The values will depend on the Page Codes supported by a drive. diff --cc contrib/smart/freebsd_dev.c index 000000000000,d1dda2289742..d1dda2289742 mode 000000,100644..100644 --- a/contrib/smart/freebsd_dev.c +++ b/contrib/smart/freebsd_dev.c diff --cc contrib/smart/libsmart.c index 000000000000,a1732de09ed9..a1732de09ed9 mode 000000,100644..100644 --- a/contrib/smart/libsmart.c +++ b/contrib/smart/libsmart.c diff --cc contrib/smart/libsmart.h index 000000000000,60346f3b3a70..60346f3b3a70 mode 000000,100644..100644 --- a/contrib/smart/libsmart.h +++ b/contrib/smart/libsmart.h diff --cc contrib/smart/libsmart_desc.c index 000000000000,bcfb31d66922..bcfb31d66922 mode 000000,100644..100644 --- a/contrib/smart/libsmart_desc.c +++ b/contrib/smart/libsmart_desc.c diff --cc contrib/smart/libsmart_dev.h index 000000000000,bbf028e73712..bbf028e73712 mode 000000,100644..100644 --- a/contrib/smart/libsmart_dev.h +++ b/contrib/smart/libsmart_dev.h diff --cc contrib/smart/libsmart_priv.h index 000000000000,f29fc1e1e033..f29fc1e1e033 mode 000000,100644..100644 --- a/contrib/smart/libsmart_priv.h +++ b/contrib/smart/libsmart_priv.h diff --cc contrib/smart/smart.8 index 000000000000,3215ff890001..3215ff890001 mode 000000,100644..100644 --- a/contrib/smart/smart.8 +++ b/contrib/smart/smart.8 diff --cc contrib/smart/smart.c index 000000000000,8b543fea1819..8b543fea1819 mode 000000,100644..100644 --- a/contrib/smart/smart.c +++ b/contrib/smart/smart.c From nobody Mon May 11 22:21:20 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gDvMN32sDz6cDJ1 for ; Mon, 11 May 2026 22:21: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gDvMN1dmqz43Gs for ; Mon, 11 May 2026 22:21:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778538080; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=v26/90V/XN9PbYMnBSaKbS/+A44P/YkZb9f3o8Q0NQM=; b=R2rG/qbItyvpVDSYM/KRxerHlS6iWcWiToufrsAxqG68yno3F0nf0X6Bvmy/VrlMOYyfVv qOWiMsIb6brHQJ9bUyN7O8Ja5gmHTKR5X484bwfDqg2Emcp1aY+VDLsNijbXQaFrypzCTm F9cIunVON8UFyJwaB87EAN+eZK6fIXP5Dq0Egwu/COd1EewjWLe0BRKEYxRpsKsZ38H7Hg 1O+XX7r2KvxGbdLWCpRObbHXUm+sE4g3fLq6xTp+vTEEWTbw/oqaSmIfgvDOPbSt1Ys+Wj ornp+pflVJ1ExBqxVihbho6OVzpC+XCq6//PG5xlSbsBec1jzM4A3FXvzpP7fA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778538080; a=rsa-sha256; cv=none; b=yVOh/65iN7HDNeGckhNqD/IBvXNVMu0z7dYEvGr52gCP7/jZA7rhABWnjbNPmUm0rpjAKp 2e7pwHwq7OVzSdOadi+UNbUiFi3tC3Dl0zjUX7qyVJpxfiaUmIj1qeMOgjVGMjRuxpI6eP Cal33jLP7Aglv4YJlqdv2SgbCdbLweGc2b45tHCnWk0bwHUkIF2551Mu6ZFwlGqcdq9k6q YS3wDBeGZ/zj7aoP4uCqe+q65XLpLYBaD3gXgmv+AxGk7Lko2192FsC6HLJvCmCe6AmDXx A84tQm88BifIArsMua8Z6i6ybY/TxgPBiK8nisQy6VVxDDmXBXP1XtXhUFCpMg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778538080; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=v26/90V/XN9PbYMnBSaKbS/+A44P/YkZb9f3o8Q0NQM=; b=Rq6GbpY0LIWK51SBpbe/Z6rbZzGhtvRQOtr08qOJO7M5USsB5ymlQk8HMVpc0hYYKRFLeK gLBKFhltKAlXcjdiR+HduvLsPZajh6SuOTVbleWyexnqvrn69vTfTM3DPSuwN1hpwU9fsm +JMoQs9kQMApeARPzpQ995tNdDRLp7XHwBeQs8pPICLRQbmezKQLuKHuT6ki21dxgh/xBO iukYEWPtT3OCxwYBSHmimt5vplgvRfMfDsyx7la7JDYRqdXcUmciyKRF/2KT9NI7HQ6ShF 0MnQTAwzLmwvgAXmagjBHdTghL61C2h6z3PqVjqY9GFBJssIfVT8Q5h/KRseyg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gDvMN0y4zzcv3 for ; Mon, 11 May 2026 22:21:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 37fa7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 11 May 2026 22:21:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Chuck Tuffli Subject: git: 25942dddc8a8 - main - smart: Connect contrib/smart to build List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: chuck X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 25942dddc8a81a338d4615db99b8e7cbb8550449 Auto-Submitted: auto-generated Date: Mon, 11 May 2026 22:21:20 +0000 Message-Id: <6a025660.37fa7.6a3f7fc0@gitrepo.freebsd.org> The branch main has been updated by chuck: URL: https://cgit.FreeBSD.org/src/commit/?id=25942dddc8a81a338d4615db99b8e7cbb8550449 commit 25942dddc8a81a338d4615db99b8e7cbb8550449 Author: Chuck Tuffli AuthorDate: 2026-04-28 16:55:50 +0000 Commit: Chuck Tuffli CommitDate: 2026-05-11 22:18:52 +0000 smart: Connect contrib/smart to build Reviewed by: fuz, jrm Relnotes: yes Differential Revision: https://reviews.freebsd.org/D56638 --- packages/Makefile | 1 + packages/smart/Makefile | 4 ++++ packages/smart/smart.ucl | 30 ++++++++++++++++++++++++++++++ usr.sbin/Makefile | 1 + usr.sbin/smart/Makefile | 8 ++++++++ 5 files changed, 44 insertions(+) diff --git a/packages/Makefile b/packages/Makefile index 79bdab9f1abd..71a49d6d06ea 100644 --- a/packages/Makefile +++ b/packages/Makefile @@ -66,6 +66,7 @@ SUBDIR= blocklist \ resolvconf \ rip \ runtime \ + smart \ smbutils \ syslogd \ tcpd \ diff --git a/packages/smart/Makefile b/packages/smart/Makefile new file mode 100644 index 000000000000..2cc04493da57 --- /dev/null +++ b/packages/smart/Makefile @@ -0,0 +1,4 @@ +WORLDPACKAGE= smart + +.include + diff --git a/packages/smart/smart.ucl b/packages/smart/smart.ucl new file mode 100644 index 000000000000..e861f61a08ab --- /dev/null +++ b/packages/smart/smart.ucl @@ -0,0 +1,30 @@ +/* + * SPDX-License-Identifier: ISC + * + * Copyright (c) 2026 Chuck Tuffli + * + * 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 = "SMART monitoring" + +desc = < + +SMARTDIR=${SRCTOP}/contrib/smart +.PATH: ${SMARTDIR} + +PACKAGE= smart + +.include "${SMARTDIR}/Makefile" From nobody Mon May 11 23:31:03 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gDwvx50Mlz6cKQN for ; Mon, 11 May 2026 23:31: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gDwvx4B8Vz49Rg for ; Mon, 11 May 2026 23:31:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778542269; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vZo0YhTY6jrb28ocS/F8d+NVPQin5FcoOvvzSy8Q+pQ=; b=kpQLMi7P+fP+WhQiSoJUlyvvGELrKfpmdOkO4n7ecW45t/qUbS5lBKYY6RGL/IPHHItG2i lQPj5j9zuy7eaUjBLfdzVuoz0r2mXTKksjt8k21RfvYdbjSfsUUEPA5yDLBAewhzEO+cZT gBzQPmzlomxwtTLwN+xTjpOKAHl6v2Il+lSzsvSH7G+6hR4vqMyUxfkiaX6y6YZYcgSjUW rPIDV6xmyBP+uMnuWILfCk6Kfhkwp1NUWpE1E+h1Ck1cdFMjcpjJMJ4jChuCEKoO1+RWhy v7tPHK28CBdBrKTe8A4Ua0/8MTiYpuvvZb9xCHJfjU9XFwIbca2TOH+b3deCpA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778542269; a=rsa-sha256; cv=none; b=pmCA2vgCE6cHYRH6ov3XBZHss2ssrKaNGEyGqpVPmavu3flUFiV6WMt+qIAd6Hz5zfnA+n BdvccAjXPNJ83e5nFYlZ8iuKnXuPxWsVv89SDIbQuW11C2j0NB1w7tKtpYKN7u1G2za86Z lNGIb/eokSBLIdoGrfw1rR5W34PvoPmAQuDt5b4ack+xJ7kkh5qBVfMzhrk4jVXyw6JRpI 0DnyS+GPOvioSGqZTnXPAeMqh0Ihldprj99CrFYUkN69k4sAaUGUjCCNZJPyKUGhWoWRBZ GF1VqMvfs4VWjibFjZ2M0UPQzJZJcle64bbHbZYQ9JWx/qc27UaGmSX0JMxvBg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778542269; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vZo0YhTY6jrb28ocS/F8d+NVPQin5FcoOvvzSy8Q+pQ=; b=DTZLwBmmcoQpODVP+eqcwVcdbFFS/5L46RPtn87hP25ZN+kKYKHYnqbJh55+JYEvzOltn/ v971q+BXVzO9JFbOioy8OlTeT/IhDpU3y0DBF0Fg7vSGA0E8FvIzcmJ80HOsUEkUVTk+xl aRyaGoMkXSMYRBOXFa7TmQdQVmjDUd5CRRchnJiWQStsyin7T5KPAQYZND6G8YeHnwFDS6 90mDixI4rwG+UzkHbPREHtWNhWVdvPBxtx1Z6N6KcwRUg+tEC3+3UNLjrUqPXzcvAKYriM wbfbjOPJDb2Amn0oQkJIi8RAXWe3UVCu/WBU4PYRTns369s3GaQVa/DD26sGng== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gDwvx2c84zfd9 for ; Mon, 11 May 2026 23:31:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e53b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 11 May 2026 23:31:03 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jung-uk Kim Subject: git: 7697e6c4df71 - main - acpica: Merge ACPICA 20260408 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jkim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7697e6c4df7188ee3a2aa66f73c572c27479bdf2 Auto-Submitted: auto-generated Date: Mon, 11 May 2026 23:31:03 +0000 Message-Id: <6a0266b7.3e53b.16dacd8f@gitrepo.freebsd.org> The branch main has been updated by jkim: URL: https://cgit.FreeBSD.org/src/commit/?id=7697e6c4df7188ee3a2aa66f73c572c27479bdf2 commit 7697e6c4df7188ee3a2aa66f73c572c27479bdf2 Merge: 25942dddc8a8 69ae37302ee9 Author: Jung-uk Kim AuthorDate: 2026-05-11 23:29:58 +0000 Commit: Jung-uk Kim CommitDate: 2026-05-11 23:29:58 +0000 acpica: Merge ACPICA 20260408 Merge commit '69ae37302ee98839857791a261546e19d078cdb8' sys/contrib/dev/acpica/changes.txt | 24 ++ sys/contrib/dev/acpica/common/acfileio.c | 11 +- sys/contrib/dev/acpica/common/acgetline.c | 2 +- sys/contrib/dev/acpica/common/adfile.c | 2 +- sys/contrib/dev/acpica/common/adisasm.c | 2 +- sys/contrib/dev/acpica/common/adwalk.c | 2 +- sys/contrib/dev/acpica/common/ahids.c | 10 +- sys/contrib/dev/acpica/common/ahpredef.c | 2 +- sys/contrib/dev/acpica/common/ahtable.c | 3 +- sys/contrib/dev/acpica/common/ahuuids.c | 7 +- sys/contrib/dev/acpica/common/cmfsize.c | 2 +- sys/contrib/dev/acpica/common/dmextern.c | 2 +- sys/contrib/dev/acpica/common/dmrestag.c | 2 +- sys/contrib/dev/acpica/common/dmswitch.c | 2 +- sys/contrib/dev/acpica/common/dmtable.c | 7 +- sys/contrib/dev/acpica/common/dmtables.c | 2 +- sys/contrib/dev/acpica/common/dmtbdump.c | 2 +- sys/contrib/dev/acpica/common/dmtbdump1.c | 111 +++++++- sys/contrib/dev/acpica/common/dmtbdump2.c | 2 +- sys/contrib/dev/acpica/common/dmtbdump3.c | 2 +- sys/contrib/dev/acpica/common/dmtbinfo.c | 2 +- sys/contrib/dev/acpica/common/dmtbinfo1.c | 40 ++- sys/contrib/dev/acpica/common/dmtbinfo2.c | 4 +- sys/contrib/dev/acpica/common/dmtbinfo3.c | 2 +- sys/contrib/dev/acpica/common/getopt.c | 2 +- sys/contrib/dev/acpica/compiler/aslallocate.c | 2 +- sys/contrib/dev/acpica/compiler/aslanalyze.c | 2 +- sys/contrib/dev/acpica/compiler/aslascii.c | 2 +- sys/contrib/dev/acpica/compiler/aslbtypes.c | 2 +- sys/contrib/dev/acpica/compiler/aslcache.c | 2 +- sys/contrib/dev/acpica/compiler/aslcodegen.c | 12 +- sys/contrib/dev/acpica/compiler/aslcompile.c | 2 +- sys/contrib/dev/acpica/compiler/aslcompiler.h | 2 +- sys/contrib/dev/acpica/compiler/aslcompiler.l | 2 +- sys/contrib/dev/acpica/compiler/aslcstyle.y | 2 +- sys/contrib/dev/acpica/compiler/asldebug.c | 2 +- sys/contrib/dev/acpica/compiler/asldefine.h | 2 +- sys/contrib/dev/acpica/compiler/aslerror.c | 2 +- sys/contrib/dev/acpica/compiler/aslexternal.c | 105 +++++++- sys/contrib/dev/acpica/compiler/aslfileio.c | 2 +- sys/contrib/dev/acpica/compiler/aslfiles.c | 2 +- sys/contrib/dev/acpica/compiler/aslfold.c | 2 +- sys/contrib/dev/acpica/compiler/aslglobal.h | 3 +- sys/contrib/dev/acpica/compiler/aslhelp.c | 2 +- sys/contrib/dev/acpica/compiler/aslhelpers.y | 2 +- sys/contrib/dev/acpica/compiler/aslhex.c | 2 +- sys/contrib/dev/acpica/compiler/aslkeywords.y | 2 +- sys/contrib/dev/acpica/compiler/asllength.c | 2 +- sys/contrib/dev/acpica/compiler/asllisting.c | 2 +- sys/contrib/dev/acpica/compiler/asllistsup.c | 2 +- sys/contrib/dev/acpica/compiler/aslload.c | 4 +- sys/contrib/dev/acpica/compiler/asllookup.c | 2 +- sys/contrib/dev/acpica/compiler/aslmain.c | 2 +- sys/contrib/dev/acpica/compiler/aslmap.c | 4 +- sys/contrib/dev/acpica/compiler/aslmapenter.c | 2 +- sys/contrib/dev/acpica/compiler/aslmapoutput.c | 2 +- sys/contrib/dev/acpica/compiler/aslmaputils.c | 2 +- sys/contrib/dev/acpica/compiler/aslmessages.c | 5 +- sys/contrib/dev/acpica/compiler/aslmessages.h | 3 +- sys/contrib/dev/acpica/compiler/aslmethod.c | 2 +- sys/contrib/dev/acpica/compiler/aslnamesp.c | 2 +- sys/contrib/dev/acpica/compiler/asloffset.c | 2 +- sys/contrib/dev/acpica/compiler/aslopcodes.c | 10 +- sys/contrib/dev/acpica/compiler/asloperands.c | 32 ++- sys/contrib/dev/acpica/compiler/aslopt.c | 2 +- sys/contrib/dev/acpica/compiler/asloptions.c | 2 +- sys/contrib/dev/acpica/compiler/aslparseop.c | 2 +- sys/contrib/dev/acpica/compiler/aslparser.y | 2 +- sys/contrib/dev/acpica/compiler/aslpld.c | 2 +- sys/contrib/dev/acpica/compiler/aslpredef.c | 2 +- sys/contrib/dev/acpica/compiler/aslprepkg.c | 2 +- sys/contrib/dev/acpica/compiler/aslprimaries.y | 2 +- sys/contrib/dev/acpica/compiler/aslprintf.c | 2 +- sys/contrib/dev/acpica/compiler/aslprune.c | 2 +- sys/contrib/dev/acpica/compiler/aslresource.c | 2 +- sys/contrib/dev/acpica/compiler/aslresources.y | 2 +- sys/contrib/dev/acpica/compiler/aslrestype1.c | 2 +- sys/contrib/dev/acpica/compiler/aslrestype1i.c | 2 +- sys/contrib/dev/acpica/compiler/aslrestype2.c | 2 +- sys/contrib/dev/acpica/compiler/aslrestype2d.c | 2 +- sys/contrib/dev/acpica/compiler/aslrestype2e.c | 2 +- sys/contrib/dev/acpica/compiler/aslrestype2q.c | 2 +- sys/contrib/dev/acpica/compiler/aslrestype2s.c | 2 +- sys/contrib/dev/acpica/compiler/aslrestype2w.c | 2 +- sys/contrib/dev/acpica/compiler/aslrules.y | 2 +- sys/contrib/dev/acpica/compiler/aslstartup.c | 2 +- sys/contrib/dev/acpica/compiler/aslstubs.c | 2 +- sys/contrib/dev/acpica/compiler/aslsupport.l | 2 +- sys/contrib/dev/acpica/compiler/aslsupport.y | 2 +- sys/contrib/dev/acpica/compiler/asltokens.y | 2 +- sys/contrib/dev/acpica/compiler/asltransform.c | 2 +- sys/contrib/dev/acpica/compiler/asltree.c | 2 +- sys/contrib/dev/acpica/compiler/asltypes.h | 2 +- sys/contrib/dev/acpica/compiler/asltypes.y | 2 +- sys/contrib/dev/acpica/compiler/aslutils.c | 2 +- sys/contrib/dev/acpica/compiler/asluuid.c | 2 +- sys/contrib/dev/acpica/compiler/aslwalks.c | 17 +- sys/contrib/dev/acpica/compiler/aslxref.c | 14 +- sys/contrib/dev/acpica/compiler/aslxrefout.c | 2 +- sys/contrib/dev/acpica/compiler/cvcompiler.c | 2 +- sys/contrib/dev/acpica/compiler/cvdisasm.c | 2 +- sys/contrib/dev/acpica/compiler/cvparser.c | 2 +- sys/contrib/dev/acpica/compiler/dtcompile.c | 28 +- sys/contrib/dev/acpica/compiler/dtcompiler.h | 7 +- sys/contrib/dev/acpica/compiler/dtcompilerparser.l | 2 +- sys/contrib/dev/acpica/compiler/dtcompilerparser.y | 2 +- sys/contrib/dev/acpica/compiler/dtexpress.c | 2 +- sys/contrib/dev/acpica/compiler/dtfield.c | 2 +- sys/contrib/dev/acpica/compiler/dtio.c | 8 +- sys/contrib/dev/acpica/compiler/dtparser.l | 2 +- sys/contrib/dev/acpica/compiler/dtparser.y | 2 +- sys/contrib/dev/acpica/compiler/dtsubtable.c | 9 +- sys/contrib/dev/acpica/compiler/dttable.c | 2 +- sys/contrib/dev/acpica/compiler/dttable1.c | 133 +++++++++- sys/contrib/dev/acpica/compiler/dttable2.c | 17 +- sys/contrib/dev/acpica/compiler/dttemplate.c | 2 +- sys/contrib/dev/acpica/compiler/dttemplate.h | 57 +++- sys/contrib/dev/acpica/compiler/dtutils.c | 2 +- sys/contrib/dev/acpica/compiler/preprocess.h | 2 +- sys/contrib/dev/acpica/compiler/prexpress.c | 2 +- sys/contrib/dev/acpica/compiler/prmacros.c | 2 +- sys/contrib/dev/acpica/compiler/prparser.l | 2 +- sys/contrib/dev/acpica/compiler/prparser.y | 2 +- sys/contrib/dev/acpica/compiler/prscan.c | 2 +- sys/contrib/dev/acpica/compiler/prutils.c | 2 +- .../dev/acpica/components/debugger/dbcmds.c | 2 +- .../dev/acpica/components/debugger/dbconvert.c | 2 +- .../dev/acpica/components/debugger/dbdisply.c | 2 +- .../dev/acpica/components/debugger/dbexec.c | 2 +- .../dev/acpica/components/debugger/dbfileio.c | 2 +- .../dev/acpica/components/debugger/dbhistry.c | 2 +- .../dev/acpica/components/debugger/dbinput.c | 2 +- .../dev/acpica/components/debugger/dbmethod.c | 2 +- .../dev/acpica/components/debugger/dbnames.c | 2 +- .../dev/acpica/components/debugger/dbobject.c | 2 +- .../dev/acpica/components/debugger/dbstats.c | 2 +- .../dev/acpica/components/debugger/dbtest.c | 2 +- .../dev/acpica/components/debugger/dbutils.c | 2 +- .../dev/acpica/components/debugger/dbxface.c | 2 +- .../dev/acpica/components/disassembler/dmbuffer.c | 2 +- .../dev/acpica/components/disassembler/dmcstyle.c | 2 +- .../acpica/components/disassembler/dmdeferred.c | 2 +- .../dev/acpica/components/disassembler/dmnames.c | 2 +- .../dev/acpica/components/disassembler/dmopcode.c | 19 +- .../dev/acpica/components/disassembler/dmresrc.c | 23 +- .../dev/acpica/components/disassembler/dmresrcl.c | 2 +- .../dev/acpica/components/disassembler/dmresrcl2.c | 2 +- .../dev/acpica/components/disassembler/dmresrcs.c | 2 +- .../dev/acpica/components/disassembler/dmutils.c | 2 +- .../dev/acpica/components/disassembler/dmwalk.c | 16 +- .../dev/acpica/components/dispatcher/dsargs.c | 2 +- .../dev/acpica/components/dispatcher/dscontrol.c | 2 +- .../dev/acpica/components/dispatcher/dsdebug.c | 2 +- .../dev/acpica/components/dispatcher/dsfield.c | 2 +- .../dev/acpica/components/dispatcher/dsinit.c | 2 +- .../dev/acpica/components/dispatcher/dsmethod.c | 43 ++- .../dev/acpica/components/dispatcher/dsmthdat.c | 2 +- .../dev/acpica/components/dispatcher/dsobject.c | 2 +- .../dev/acpica/components/dispatcher/dsopcode.c | 2 +- .../dev/acpica/components/dispatcher/dspkginit.c | 2 +- .../dev/acpica/components/dispatcher/dsutils.c | 2 +- .../dev/acpica/components/dispatcher/dswexec.c | 2 +- .../dev/acpica/components/dispatcher/dswload.c | 2 +- .../dev/acpica/components/dispatcher/dswload2.c | 2 +- .../dev/acpica/components/dispatcher/dswscope.c | 2 +- .../dev/acpica/components/dispatcher/dswstate.c | 2 +- sys/contrib/dev/acpica/components/events/evevent.c | 2 +- sys/contrib/dev/acpica/components/events/evglock.c | 2 +- sys/contrib/dev/acpica/components/events/evgpe.c | 2 +- .../dev/acpica/components/events/evgpeblk.c | 2 +- .../dev/acpica/components/events/evgpeinit.c | 2 +- .../dev/acpica/components/events/evgpeutil.c | 2 +- .../dev/acpica/components/events/evhandler.c | 14 +- sys/contrib/dev/acpica/components/events/evmisc.c | 2 +- .../dev/acpica/components/events/evregion.c | 2 +- .../dev/acpica/components/events/evrgnini.c | 2 +- sys/contrib/dev/acpica/components/events/evsci.c | 2 +- sys/contrib/dev/acpica/components/events/evxface.c | 2 +- .../dev/acpica/components/events/evxfevnt.c | 2 +- sys/contrib/dev/acpica/components/events/evxfgpe.c | 2 +- .../dev/acpica/components/events/evxfregn.c | 2 +- .../dev/acpica/components/executer/exconcat.c | 2 +- .../dev/acpica/components/executer/exconfig.c | 29 ++- .../dev/acpica/components/executer/exconvrt.c | 2 +- .../dev/acpica/components/executer/excreate.c | 2 +- .../dev/acpica/components/executer/exdebug.c | 2 +- .../dev/acpica/components/executer/exdump.c | 2 +- .../dev/acpica/components/executer/exfield.c | 2 +- .../dev/acpica/components/executer/exfldio.c | 2 +- .../dev/acpica/components/executer/exmisc.c | 2 +- .../dev/acpica/components/executer/exmutex.c | 2 +- .../dev/acpica/components/executer/exnames.c | 2 +- .../dev/acpica/components/executer/exoparg1.c | 2 +- .../dev/acpica/components/executer/exoparg2.c | 2 +- .../dev/acpica/components/executer/exoparg3.c | 12 +- .../dev/acpica/components/executer/exoparg6.c | 2 +- .../dev/acpica/components/executer/exprep.c | 2 +- .../dev/acpica/components/executer/exregion.c | 2 +- .../dev/acpica/components/executer/exresnte.c | 2 +- .../dev/acpica/components/executer/exresolv.c | 2 +- .../dev/acpica/components/executer/exresop.c | 2 +- .../dev/acpica/components/executer/exserial.c | 2 +- .../dev/acpica/components/executer/exstore.c | 2 +- .../dev/acpica/components/executer/exstoren.c | 2 +- .../dev/acpica/components/executer/exstorob.c | 2 +- .../dev/acpica/components/executer/exsystem.c | 2 +- .../dev/acpica/components/executer/extrace.c | 2 +- .../dev/acpica/components/executer/exutils.c | 2 +- .../dev/acpica/components/hardware/hwacpi.c | 2 +- .../dev/acpica/components/hardware/hwesleep.c | 2 +- sys/contrib/dev/acpica/components/hardware/hwgpe.c | 2 +- sys/contrib/dev/acpica/components/hardware/hwpci.c | 2 +- .../dev/acpica/components/hardware/hwregs.c | 2 +- .../dev/acpica/components/hardware/hwsleep.c | 2 +- .../dev/acpica/components/hardware/hwtimer.c | 2 +- .../dev/acpica/components/hardware/hwvalid.c | 2 +- .../dev/acpica/components/hardware/hwxface.c | 2 +- .../dev/acpica/components/hardware/hwxfsleep.c | 2 +- .../dev/acpica/components/namespace/nsaccess.c | 2 +- .../dev/acpica/components/namespace/nsalloc.c | 2 +- .../dev/acpica/components/namespace/nsarguments.c | 2 +- .../dev/acpica/components/namespace/nsconvert.c | 2 +- .../dev/acpica/components/namespace/nsdump.c | 2 +- .../dev/acpica/components/namespace/nsdumpdv.c | 2 +- .../dev/acpica/components/namespace/nseval.c | 2 +- .../dev/acpica/components/namespace/nsinit.c | 2 +- .../dev/acpica/components/namespace/nsload.c | 2 +- .../dev/acpica/components/namespace/nsnames.c | 9 +- .../dev/acpica/components/namespace/nsobject.c | 9 +- .../dev/acpica/components/namespace/nsparse.c | 2 +- .../dev/acpica/components/namespace/nspredef.c | 2 +- .../dev/acpica/components/namespace/nsprepkg.c | 9 +- .../dev/acpica/components/namespace/nsrepair.c | 2 +- .../dev/acpica/components/namespace/nsrepair2.c | 2 +- .../dev/acpica/components/namespace/nssearch.c | 2 +- .../dev/acpica/components/namespace/nsutils.c | 2 +- .../dev/acpica/components/namespace/nswalk.c | 2 +- .../dev/acpica/components/namespace/nsxfeval.c | 2 +- .../dev/acpica/components/namespace/nsxfname.c | 2 +- .../dev/acpica/components/namespace/nsxfobj.c | 2 +- sys/contrib/dev/acpica/components/parser/psargs.c | 136 +++++++++- sys/contrib/dev/acpica/components/parser/psloop.c | 5 +- .../dev/acpica/components/parser/psobject.c | 2 +- .../dev/acpica/components/parser/psopcode.c | 2 +- .../dev/acpica/components/parser/psopinfo.c | 2 +- sys/contrib/dev/acpica/components/parser/psparse.c | 2 +- sys/contrib/dev/acpica/components/parser/psscope.c | 2 +- sys/contrib/dev/acpica/components/parser/pstree.c | 2 +- sys/contrib/dev/acpica/components/parser/psutils.c | 2 +- sys/contrib/dev/acpica/components/parser/pswalk.c | 4 +- sys/contrib/dev/acpica/components/parser/psxface.c | 2 +- .../dev/acpica/components/resources/rsaddr.c | 2 +- .../dev/acpica/components/resources/rscalc.c | 2 +- .../dev/acpica/components/resources/rscreate.c | 2 +- .../dev/acpica/components/resources/rsdump.c | 2 +- .../dev/acpica/components/resources/rsdumpinfo.c | 2 +- .../dev/acpica/components/resources/rsinfo.c | 2 +- sys/contrib/dev/acpica/components/resources/rsio.c | 2 +- .../dev/acpica/components/resources/rsirq.c | 2 +- .../dev/acpica/components/resources/rslist.c | 2 +- .../dev/acpica/components/resources/rsmemory.c | 2 +- .../dev/acpica/components/resources/rsmisc.c | 2 +- .../dev/acpica/components/resources/rsserial.c | 9 +- .../dev/acpica/components/resources/rsutils.c | 2 +- .../dev/acpica/components/resources/rsxface.c | 2 +- sys/contrib/dev/acpica/components/tables/tbdata.c | 2 +- sys/contrib/dev/acpica/components/tables/tbfadt.c | 5 +- sys/contrib/dev/acpica/components/tables/tbfind.c | 2 +- .../dev/acpica/components/tables/tbinstal.c | 2 +- sys/contrib/dev/acpica/components/tables/tbprint.c | 2 +- sys/contrib/dev/acpica/components/tables/tbutils.c | 2 +- sys/contrib/dev/acpica/components/tables/tbxface.c | 2 +- .../dev/acpica/components/tables/tbxfload.c | 2 +- .../dev/acpica/components/tables/tbxfroot.c | 2 +- .../dev/acpica/components/utilities/utaddress.c | 2 +- .../dev/acpica/components/utilities/utalloc.c | 2 +- .../dev/acpica/components/utilities/utascii.c | 2 +- .../dev/acpica/components/utilities/utbuffer.c | 2 +- .../dev/acpica/components/utilities/utcache.c | 2 +- .../dev/acpica/components/utilities/utcksum.c | 2 +- .../dev/acpica/components/utilities/utcopy.c | 13 +- .../dev/acpica/components/utilities/utdebug.c | 2 +- .../dev/acpica/components/utilities/utdecode.c | 2 +- .../dev/acpica/components/utilities/utdelete.c | 2 +- .../dev/acpica/components/utilities/uterror.c | 2 +- .../dev/acpica/components/utilities/uteval.c | 2 +- .../dev/acpica/components/utilities/utexcep.c | 2 +- .../dev/acpica/components/utilities/utglobal.c | 2 +- .../dev/acpica/components/utilities/uthex.c | 2 +- .../dev/acpica/components/utilities/utids.c | 2 +- .../dev/acpica/components/utilities/utinit.c | 2 +- .../dev/acpica/components/utilities/utlock.c | 2 +- .../dev/acpica/components/utilities/utmath.c | 2 +- .../dev/acpica/components/utilities/utmisc.c | 2 +- .../dev/acpica/components/utilities/utmutex.c | 2 +- .../dev/acpica/components/utilities/utnonansi.c | 2 +- .../dev/acpica/components/utilities/utobject.c | 2 +- .../dev/acpica/components/utilities/utosi.c | 2 +- .../dev/acpica/components/utilities/utownerid.c | 2 +- .../dev/acpica/components/utilities/utpredef.c | 2 +- .../dev/acpica/components/utilities/utresdecode.c | 2 +- .../dev/acpica/components/utilities/utresrc.c | 34 ++- .../dev/acpica/components/utilities/utstate.c | 2 +- .../dev/acpica/components/utilities/utstring.c | 2 +- .../dev/acpica/components/utilities/utstrsuppt.c | 2 +- .../dev/acpica/components/utilities/utstrtoul64.c | 2 +- .../dev/acpica/components/utilities/uttrack.c | 2 +- .../dev/acpica/components/utilities/utuuid.c | 2 +- .../dev/acpica/components/utilities/utxface.c | 2 +- .../dev/acpica/components/utilities/utxferror.c | 2 +- .../dev/acpica/components/utilities/utxfinit.c | 2 +- .../dev/acpica/components/utilities/utxfmutex.c | 2 +- sys/contrib/dev/acpica/include/acapps.h | 4 +- sys/contrib/dev/acpica/include/acbuffer.h | 2 +- sys/contrib/dev/acpica/include/acclib.h | 2 +- sys/contrib/dev/acpica/include/accommon.h | 2 +- sys/contrib/dev/acpica/include/acconfig.h | 2 +- sys/contrib/dev/acpica/include/acconvert.h | 2 +- sys/contrib/dev/acpica/include/acdebug.h | 2 +- sys/contrib/dev/acpica/include/acdisasm.h | 11 +- sys/contrib/dev/acpica/include/acdispat.h | 2 +- sys/contrib/dev/acpica/include/acevents.h | 2 +- sys/contrib/dev/acpica/include/acexcep.h | 2 +- sys/contrib/dev/acpica/include/acglobal.h | 2 +- sys/contrib/dev/acpica/include/achware.h | 2 +- sys/contrib/dev/acpica/include/acinterp.h | 2 +- sys/contrib/dev/acpica/include/aclocal.h | 3 +- sys/contrib/dev/acpica/include/acmacros.h | 2 +- sys/contrib/dev/acpica/include/acnames.h | 2 +- sys/contrib/dev/acpica/include/acnamesp.h | 2 +- sys/contrib/dev/acpica/include/acobject.h | 2 +- sys/contrib/dev/acpica/include/acopcode.h | 2 +- sys/contrib/dev/acpica/include/acoutput.h | 2 +- sys/contrib/dev/acpica/include/acparser.h | 2 +- sys/contrib/dev/acpica/include/acpi.h | 2 +- sys/contrib/dev/acpica/include/acpiosxf.h | 2 +- sys/contrib/dev/acpica/include/acpixf.h | 4 +- sys/contrib/dev/acpica/include/acpredef.h | 6 +- sys/contrib/dev/acpica/include/acresrc.h | 2 +- sys/contrib/dev/acpica/include/acrestyp.h | 3 +- sys/contrib/dev/acpica/include/acstruct.h | 2 +- sys/contrib/dev/acpica/include/actables.h | 2 +- sys/contrib/dev/acpica/include/actbinfo.h | 10 +- sys/contrib/dev/acpica/include/actbl.h | 2 +- sys/contrib/dev/acpica/include/actbl1.h | 289 ++++++++++++++++++++- sys/contrib/dev/acpica/include/actbl2.h | 2 +- sys/contrib/dev/acpica/include/actbl3.h | 2 +- sys/contrib/dev/acpica/include/actypes.h | 2 +- sys/contrib/dev/acpica/include/acutils.h | 2 +- sys/contrib/dev/acpica/include/acuuid.h | 7 +- sys/contrib/dev/acpica/include/amlcode.h | 2 +- sys/contrib/dev/acpica/include/amlresrc.h | 2 +- sys/contrib/dev/acpica/include/platform/acenv.h | 2 +- sys/contrib/dev/acpica/include/platform/acenvex.h | 2 +- .../dev/acpica/include/platform/acfreebsd.h | 2 +- sys/contrib/dev/acpica/include/platform/acgcc.h | 2 +- sys/contrib/dev/acpica/include/platform/acgccex.h | 2 +- .../acpica/os_specific/service_layers/osgendbg.c | 2 +- .../acpica/os_specific/service_layers/osunixxf.c | 2 +- 359 files changed, 1611 insertions(+), 412 deletions(-) diff --cc sys/contrib/dev/acpica/common/getopt.c index 535e7a00bc8f,000000000000..3af472ffe13d mode 100644,000000..100644 --- a/sys/contrib/dev/acpica/common/getopt.c +++ b/sys/contrib/dev/acpica/common/getopt.c @@@ -1,384 -1,0 +1,384 @@@ +/****************************************************************************** + * + * Module Name: getopt + * + *****************************************************************************/ + +/****************************************************************************** + * + * 1. Copyright Notice + * - * Some or all of this work - Copyright (c) 1999 - 2025, Intel Corp. ++ * Some or all of this work - Copyright (c) 1999 - 2026, Intel Corp. + * All rights reserved. + * + * 2. License + * + * 2.1. This is your license from Intel Corp. under its intellectual property + * rights. You may have additional license terms from the party that provided + * you this software, covering your right to use that party's intellectual + * property rights. + * + * 2.2. Intel grants, free of charge, to any person ("Licensee") obtaining a + * copy of the source code appearing in this file ("Covered Code") an + * irrevocable, perpetual, worldwide license under Intel's copyrights in the + * base code distributed originally by Intel ("Original Intel Code") to copy, + * make derivatives, distribute, use and display any portion of the Covered + * Code in any form, with the right to sublicense such rights; and + * + * 2.3. Intel grants Licensee a non-exclusive and non-transferable patent + * license (with the right to sublicense), under only those claims of Intel + * patents that are infringed by the Original Intel Code, to make, use, sell, + * offer to sell, and import the Covered Code and derivative works thereof + * solely to the minimum extent necessary to exercise the above copyright + * license, and in no event shall the patent license extend to any additions + * to or modifications of the Original Intel Code. No other license or right + * is granted directly or by implication, estoppel or otherwise; + * + * The above copyright and patent license is granted only if the following + * conditions are met: + * + * 3. Conditions + * + * 3.1. Redistribution of Source with Rights to Further Distribute Source. + * Redistribution of source code of any substantial portion of the Covered + * Code or modification with rights to further distribute source must include + * the above Copyright Notice, the above License, this list of Conditions, + * and the following Disclaimer and Export Compliance provision. In addition, + * Licensee must cause all Covered Code to which Licensee contributes to + * contain a file documenting the changes Licensee made to create that Covered + * Code and the date of any change. Licensee must include in that file the + * documentation of any changes made by any predecessor Licensee. Licensee + * must include a prominent statement that the modification is derived, + * directly or indirectly, from Original Intel Code. + * + * 3.2. Redistribution of Source with no Rights to Further Distribute Source. + * Redistribution of source code of any substantial portion of the Covered + * Code or modification without rights to further distribute source must + * include the following Disclaimer and Export Compliance provision in the + * documentation and/or other materials provided with distribution. In + * addition, Licensee may not authorize further sublicense of source of any + * portion of the Covered Code, and must include terms to the effect that the + * license from Licensee to its licensee is limited to the intellectual + * property embodied in the software Licensee provides to its licensee, and + * not to intellectual property embodied in modifications its licensee may + * make. + * + * 3.3. Redistribution of Executable. Redistribution in executable form of any + * substantial portion of the Covered Code or modification must reproduce the + * above Copyright Notice, and the following Disclaimer and Export Compliance + * provision in the documentation and/or other materials provided with the + * distribution. + * + * 3.4. Intel retains all right, title, and interest in and to the Original + * Intel Code. + * + * 3.5. Neither the name Intel nor any other trademark owned or controlled by + * Intel shall be used in advertising or otherwise to promote the sale, use or + * other dealings in products derived from or relating to the Covered Code + * without prior written authorization from Intel. + * + * 4. Disclaimer and Export Compliance + * + * 4.1. INTEL MAKES NO WARRANTY OF ANY KIND REGARDING ANY SOFTWARE PROVIDED + * HERE. ANY SOFTWARE ORIGINATING FROM INTEL OR DERIVED FROM INTEL SOFTWARE + * IS PROVIDED "AS IS," AND INTEL WILL NOT PROVIDE ANY SUPPORT, ASSISTANCE, + * INSTALLATION, TRAINING OR OTHER SERVICES. INTEL WILL NOT PROVIDE ANY + * UPDATES, ENHANCEMENTS OR EXTENSIONS. INTEL SPECIFICALLY DISCLAIMS ANY + * IMPLIED WARRANTIES OF MERCHANTABILITY, NONINFRINGEMENT AND FITNESS FOR A + * PARTICULAR PURPOSE. + * + * 4.2. IN NO EVENT SHALL INTEL HAVE ANY LIABILITY TO LICENSEE, ITS LICENSEES + * OR ANY OTHER THIRD PARTY, FOR ANY LOST PROFITS, LOST DATA, LOSS OF USE OR + * COSTS OF PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES, OR FOR ANY INDIRECT, + * SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THIS AGREEMENT, UNDER ANY + * CAUSE OF ACTION OR THEORY OF LIABILITY, AND IRRESPECTIVE OF WHETHER INTEL + * HAS ADVANCE NOTICE OF THE POSSIBILITY OF SUCH DAMAGES. THESE LIMITATIONS + * SHALL APPLY NOTWITHSTANDING THE FAILURE OF THE ESSENTIAL PURPOSE OF ANY + * LIMITED REMEDY. + * + * 4.3. Licensee shall not export, either directly or indirectly, any of this + * software or system incorporating such software without first obtaining any + * required license or other approval from the U. S. Department of Commerce or + * any other agency or department of the United States Government. In the + * event Licensee exports any such software from the United States or + * re-exports any such software from a foreign destination, Licensee shall + * ensure that the distribution and export/re-export of the software is in + * compliance with all laws, regulations, orders, or other restrictions of the + * U.S. Export Administration Regulations. Licensee agrees that neither it nor + * any of its subsidiaries will export/re-export any technical data, process, + * software, or service, directly or indirectly, to any country for which the + * United States government or any agency thereof requires an export license, + * other governmental approval, or letter of assurance, without first obtaining + * such license, approval or letter. + * + ***************************************************************************** + * + * Alternatively, you may choose to be licensed under the terms of the + * following license: + * + * 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, + * without modification. + * 2. Redistributions in binary form must reproduce at minimum a disclaimer + * substantially similar to the "NO WARRANTY" disclaimer below + * ("Disclaimer") and any redistribution must be conditioned upon + * including a substantially similar Disclaimer requirement for further + * binary redistribution. + * 3. Neither the names of the above-listed copyright holders nor the names + * of any 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 + * OWNER 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. + * + * Alternatively, you may choose to be licensed under the terms of the + * GNU General Public License ("GPL") version 2 as published by the Free + * Software Foundation. + * + *****************************************************************************/ + +/* + * ACPICA getopt() implementation + * + * Option strings: + * "f" - Option has no arguments + * "f:" - Option requires an argument + * "f+" - Option has an optional argument + * "f^" - Option has optional single-char sub-options + * "f|" - Option has required single-char sub-options + */ + +#include +#include +#include + +#define ACPI_OPTION_ERROR(msg, badchar) \ + if (AcpiGbl_Opterr) {fprintf (stderr, "%s%c\n", msg, badchar);} + + +int AcpiGbl_Opterr = 1; +int AcpiGbl_Optind = 1; +int AcpiGbl_SubOptChar = 0; +char *AcpiGbl_Optarg; + +static int CurrentCharPtr = 1; + + +/******************************************************************************* + * + * FUNCTION: AcpiGetoptArgument + * + * PARAMETERS: argc, argv - from main + * + * RETURN: 0 if an argument was found, -1 otherwise. Sets AcpiGbl_Optarg + * to point to the next argument. + * + * DESCRIPTION: Get the next argument. Used to obtain arguments for the + * two-character options after the original call to AcpiGetopt. + * Note: Either the argument starts at the next character after + * the option, or it is pointed to by the next argv entry. + * (After call to AcpiGetopt, we need to backup to the previous + * argv entry). + * + ******************************************************************************/ + +int +AcpiGetoptArgument ( + int argc, + char **argv) +{ + + AcpiGbl_Optind--; + CurrentCharPtr++; + + if (argv[AcpiGbl_Optind][(int) (CurrentCharPtr+1)] != '\0') + { + AcpiGbl_Optarg = &argv[AcpiGbl_Optind++][(int) (CurrentCharPtr+1)]; + } + else if (++AcpiGbl_Optind >= argc) + { + ACPI_OPTION_ERROR ("\nOption requires an argument", 0); + + CurrentCharPtr = 1; + return (-1); + } + else + { + AcpiGbl_Optarg = argv[AcpiGbl_Optind++]; + } + + CurrentCharPtr = 1; + return (0); +} + + +/******************************************************************************* + * + * FUNCTION: AcpiGetopt + * + * PARAMETERS: argc, argv - from main + * opts - options info list + * + * RETURN: Option character or ACPI_OPT_END + * + * DESCRIPTION: Get the next option + * + ******************************************************************************/ + +int +AcpiGetopt( + int argc, + char **argv, + char *opts) +{ + int CurrentChar; + char *OptsPtr; + + + if (CurrentCharPtr == 1) + { + if (AcpiGbl_Optind >= argc || + argv[AcpiGbl_Optind][0] != '-' || + argv[AcpiGbl_Optind][1] == '\0') + { + return (ACPI_OPT_END); + } + else if (strcmp (argv[AcpiGbl_Optind], "--") == 0) + { + AcpiGbl_Optind++; + return (ACPI_OPT_END); + } + } + + /* Get the option */ + + CurrentChar = argv[AcpiGbl_Optind][CurrentCharPtr]; + + /* Make sure that the option is legal */ + + if (CurrentChar == ':' || + (OptsPtr = strchr (opts, CurrentChar)) == NULL) + { + ACPI_OPTION_ERROR ("Illegal option: -", CurrentChar); + + if (argv[AcpiGbl_Optind][++CurrentCharPtr] == '\0') + { + AcpiGbl_Optind++; + CurrentCharPtr = 1; + } + + return ('?'); + } + + /* Option requires an argument? */ + + if (*++OptsPtr == ':') + { + if (argv[AcpiGbl_Optind][(int) (CurrentCharPtr+1)] != '\0') + { + AcpiGbl_Optarg = &argv[AcpiGbl_Optind++][(int) (CurrentCharPtr+1)]; + } + else if (++AcpiGbl_Optind >= argc) + { + ACPI_OPTION_ERROR ( + "Option requires an argument: -", CurrentChar); + + CurrentCharPtr = 1; + return ('?'); + } + else + { + AcpiGbl_Optarg = argv[AcpiGbl_Optind++]; + } + + CurrentCharPtr = 1; + } + + /* Option has an optional argument? */ + + else if (*OptsPtr == '+') + { + if (argv[AcpiGbl_Optind][(int) (CurrentCharPtr+1)] != '\0') + { + AcpiGbl_Optarg = &argv[AcpiGbl_Optind++][(int) (CurrentCharPtr+1)]; + } + else if (++AcpiGbl_Optind >= argc) + { + AcpiGbl_Optarg = NULL; + } + else + { + AcpiGbl_Optarg = argv[AcpiGbl_Optind++]; + } + + CurrentCharPtr = 1; + } + + /* Option has optional single-char arguments? */ + + else if (*OptsPtr == '^') + { + if (argv[AcpiGbl_Optind][(int) (CurrentCharPtr+1)] != '\0') + { + AcpiGbl_Optarg = &argv[AcpiGbl_Optind][(int) (CurrentCharPtr+1)]; + } + else + { + AcpiGbl_Optarg = "^"; + } + + AcpiGbl_SubOptChar = AcpiGbl_Optarg[0]; + AcpiGbl_Optind++; + CurrentCharPtr = 1; + } + + /* Option has a required single-char argument? */ + + else if (*OptsPtr == '|') + { + if (argv[AcpiGbl_Optind][(int) (CurrentCharPtr+1)] != '\0') + { + AcpiGbl_Optarg = &argv[AcpiGbl_Optind][(int) (CurrentCharPtr+1)]; + } + else + { + ACPI_OPTION_ERROR ( + "Option requires a single-character suboption: -", + CurrentChar); + + CurrentCharPtr = 1; + return ('?'); + } + + AcpiGbl_SubOptChar = AcpiGbl_Optarg[0]; + AcpiGbl_Optind++; + CurrentCharPtr = 1; + } + + /* Option with no arguments */ + + else + { + if (argv[AcpiGbl_Optind][++CurrentCharPtr] == '\0') + { + CurrentCharPtr = 1; + AcpiGbl_Optind++; + } + + AcpiGbl_Optarg = NULL; + } + + return (CurrentChar); +} diff --cc sys/contrib/dev/acpica/components/debugger/dbtest.c index 4e0eb486c35b,000000000000..eda8013762b0 mode 100644,000000..100644 --- a/sys/contrib/dev/acpica/components/debugger/dbtest.c +++ b/sys/contrib/dev/acpica/components/debugger/dbtest.c @@@ -1,1340 -1,0 +1,1340 @@@ +/******************************************************************************* + * + * Module Name: dbtest - Various debug-related tests + * + ******************************************************************************/ + +/****************************************************************************** + * + * 1. Copyright Notice + * - * Some or all of this work - Copyright (c) 1999 - 2025, Intel Corp. ++ * Some or all of this work - Copyright (c) 1999 - 2026, Intel Corp. + * All rights reserved. + * + * 2. License + * + * 2.1. This is your license from Intel Corp. under its intellectual property + * rights. You may have additional license terms from the party that provided + * you this software, covering your right to use that party's intellectual + * property rights. + * + * 2.2. Intel grants, free of charge, to any person ("Licensee") obtaining a + * copy of the source code appearing in this file ("Covered Code") an + * irrevocable, perpetual, worldwide license under Intel's copyrights in the + * base code distributed originally by Intel ("Original Intel Code") to copy, + * make derivatives, distribute, use and display any portion of the Covered + * Code in any form, with the right to sublicense such rights; and + * + * 2.3. Intel grants Licensee a non-exclusive and non-transferable patent + * license (with the right to sublicense), under only those claims of Intel + * patents that are infringed by the Original Intel Code, to make, use, sell, + * offer to sell, and import the Covered Code and derivative works thereof + * solely to the minimum extent necessary to exercise the above copyright + * license, and in no event shall the patent license extend to any additions + * to or modifications of the Original Intel Code. No other license or right + * is granted directly or by implication, estoppel or otherwise; + * + * The above copyright and patent license is granted only if the following + * conditions are met: + * + * 3. Conditions + * + * 3.1. Redistribution of Source with Rights to Further Distribute Source. + * Redistribution of source code of any substantial portion of the Covered + * Code or modification with rights to further distribute source must include + * the above Copyright Notice, the above License, this list of Conditions, + * and the following Disclaimer and Export Compliance provision. In addition, + * Licensee must cause all Covered Code to which Licensee contributes to + * contain a file documenting the changes Licensee made to create that Covered + * Code and the date of any change. Licensee must include in that file the + * documentation of any changes made by any predecessor Licensee. Licensee + * must include a prominent statement that the modification is derived, + * directly or indirectly, from Original Intel Code. + * + * 3.2. Redistribution of Source with no Rights to Further Distribute Source. + * Redistribution of source code of any substantial portion of the Covered + * Code or modification without rights to further distribute source must + * include the following Disclaimer and Export Compliance provision in the + * documentation and/or other materials provided with distribution. In + * addition, Licensee may not authorize further sublicense of source of any + * portion of the Covered Code, and must include terms to the effect that the + * license from Licensee to its licensee is limited to the intellectual + * property embodied in the software Licensee provides to its licensee, and + * not to intellectual property embodied in modifications its licensee may + * make. + * + * 3.3. Redistribution of Executable. Redistribution in executable form of any + * substantial portion of the Covered Code or modification must reproduce the + * above Copyright Notice, and the following Disclaimer and Export Compliance + * provision in the documentation and/or other materials provided with the + * distribution. + * + * 3.4. Intel retains all right, title, and interest in and to the Original + * Intel Code. + * + * 3.5. Neither the name Intel nor any other trademark owned or controlled by + * Intel shall be used in advertising or otherwise to promote the sale, use or + * other dealings in products derived from or relating to the Covered Code + * without prior written authorization from Intel. + * + * 4. Disclaimer and Export Compliance + * + * 4.1. INTEL MAKES NO WARRANTY OF ANY KIND REGARDING ANY SOFTWARE PROVIDED + * HERE. ANY SOFTWARE ORIGINATING FROM INTEL OR DERIVED FROM INTEL SOFTWARE + * IS PROVIDED "AS IS," AND INTEL WILL NOT PROVIDE ANY SUPPORT, ASSISTANCE, + * INSTALLATION, TRAINING OR OTHER SERVICES. INTEL WILL NOT PROVIDE ANY + * UPDATES, ENHANCEMENTS OR EXTENSIONS. INTEL SPECIFICALLY DISCLAIMS ANY + * IMPLIED WARRANTIES OF MERCHANTABILITY, NONINFRINGEMENT AND FITNESS FOR A + * PARTICULAR PURPOSE. + * + * 4.2. IN NO EVENT SHALL INTEL HAVE ANY LIABILITY TO LICENSEE, ITS LICENSEES + * OR ANY OTHER THIRD PARTY, FOR ANY LOST PROFITS, LOST DATA, LOSS OF USE OR + * COSTS OF PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES, OR FOR ANY INDIRECT, + * SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THIS AGREEMENT, UNDER ANY + * CAUSE OF ACTION OR THEORY OF LIABILITY, AND IRRESPECTIVE OF WHETHER INTEL + * HAS ADVANCE NOTICE OF THE POSSIBILITY OF SUCH DAMAGES. THESE LIMITATIONS + * SHALL APPLY NOTWITHSTANDING THE FAILURE OF THE ESSENTIAL PURPOSE OF ANY + * LIMITED REMEDY. + * + * 4.3. Licensee shall not export, either directly or indirectly, any of this + * software or system incorporating such software without first obtaining any + * required license or other approval from the U. S. Department of Commerce or + * any other agency or department of the United States Government. In the + * event Licensee exports any such software from the United States or + * re-exports any such software from a foreign destination, Licensee shall + * ensure that the distribution and export/re-export of the software is in + * compliance with all laws, regulations, orders, or other restrictions of the + * U.S. Export Administration Regulations. Licensee agrees that neither it nor + * any of its subsidiaries will export/re-export any technical data, process, + * software, or service, directly or indirectly, to any country for which the + * United States government or any agency thereof requires an export license, + * other governmental approval, or letter of assurance, without first obtaining + * such license, approval or letter. + * + ***************************************************************************** + * + * Alternatively, you may choose to be licensed under the terms of the + * following license: + * + * 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, + * without modification. + * 2. Redistributions in binary form must reproduce at minimum a disclaimer + * substantially similar to the "NO WARRANTY" disclaimer below + * ("Disclaimer") and any redistribution must be conditioned upon + * including a substantially similar Disclaimer requirement for further + * binary redistribution. + * 3. Neither the names of the above-listed copyright holders nor the names + * of any 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 + * OWNER 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. + * + * Alternatively, you may choose to be licensed under the terms of the + * GNU General Public License ("GPL") version 2 as published by the Free + * Software Foundation. + * + *****************************************************************************/ + +#include +#include +#include +#include +#include +#include + + +#define _COMPONENT ACPI_CA_DEBUGGER + ACPI_MODULE_NAME ("dbtest") + + +/* Local prototypes */ + +static void +AcpiDbTestAllObjects ( + void); + +static ACPI_STATUS +AcpiDbTestOneObject ( + ACPI_HANDLE ObjHandle, + UINT32 NestingLevel, + void *Context, + void **ReturnValue); + +static ACPI_STATUS +AcpiDbTestIntegerType ( + ACPI_NAMESPACE_NODE *Node, + UINT32 BitLength); + +static ACPI_STATUS +AcpiDbTestBufferType ( + ACPI_NAMESPACE_NODE *Node, + UINT32 BitLength); + +static ACPI_STATUS +AcpiDbTestStringType ( + ACPI_NAMESPACE_NODE *Node, + UINT32 ByteLength); + +static ACPI_STATUS +AcpiDbTestPackageType ( + ACPI_NAMESPACE_NODE *Node); + +static ACPI_STATUS +AcpiDbTestFieldUnitType ( + ACPI_OPERAND_OBJECT *ObjDesc); + +static ACPI_STATUS +AcpiDbReadFromObject ( + ACPI_NAMESPACE_NODE *Node, + ACPI_OBJECT_TYPE ExpectedType, + ACPI_OBJECT **Value); + +static ACPI_STATUS +AcpiDbWriteToObject ( + ACPI_NAMESPACE_NODE *Node, + ACPI_OBJECT *Value); + +static void +AcpiDbEvaluateAllPredefinedNames ( + char *CountArg); *** 1922 LINES SKIPPED *** From nobody Tue May 12 00:02:31 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gDxcF1mYbz6cMW9 for ; Tue, 12 May 2026 00: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gDxcD5Xxjz3Ds2 for ; Tue, 12 May 2026 00:02:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778544156; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Crrs9oHM+odwsF3aZs/9Vi2Ec/qjED9kKg6cfbyoSag=; b=davzjJjLv450NULyo7XhejVC4fNsfaxRYLFuQkjzC0tg530btfaPUUu54oXdXtQjbdzAaz cHGreid2gcd5lYJg3HQ6cx9B5AQ6p9BCVUfjlSeW+ut6ih12efFrPfeY1r0GDh382G+Yv8 KN8eww2gq+gXs4kA03t65zxk0FgL+lYJAumHXNRtmi/+dLG9sN4bhILTKk77EbTtzE2eH+ gZEwpokjLHLiwLPkRo4M4fX9t6Tw2uDTj9i5ru1LtnCDkeEIL0iiVGUJ49fLMbIbVnkBqS AI5AD3tyiypqMpDU/2iY2kj2s5MR11IGx0aBNKOnWpo0VHINjQY8vYV34I+3JA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778544156; a=rsa-sha256; cv=none; b=OtsTe3YrgQlRr4Bsm7yVH95G/gn1oQyJ6SSsPr68jk7Vqu8Sb080K1YxEsliZuGirc45W5 0rXyrQI8ApyZ5OLv44qAQBjPcP9h1xcWCAZywSLtk6EaEx6KOrozhqLv+GmG08rqhxwKAx /c3tYoJXwKw+wQa7hxxneJUaYF/Crv4H6or1hCl6e/sDU36nXnSfNAXUY7cGZ48GXExew1 NvGya06vgq0W+TkWbPFKhfpxVsRmMUprrL6xtj/gHaNHvcgfwwGQ6jCDvUMFWZXV4NEQBd b1awc0B2eRZhH7blsdRtlsmQTByNLZsfksX5PDFcR0qkmbzA06XsHNwqS1dZ5w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778544156; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Crrs9oHM+odwsF3aZs/9Vi2Ec/qjED9kKg6cfbyoSag=; b=HwsYsSKuSbU1Rt22XtfOxIih8FEOKIy3/+lAZuo3aD9GaWZgO9Q0BwxKUvQrSqTSOcGkFr Czz5a+YhFEMosIZMIxofnH8j7COSq3aM1hpQ+qWKneZhg3PnCZHNW2Zsr/m0TBzhBuMMbq m+l2yVnfb0Nmq97x13SYvXhKPOCPDqB1WgjFnnFvVny9rOqyjv4Zkfb/iSaHeAf/GQZieF 9L6zm3FoX4gFgQjA0jgRQjPe/Pg1Bvt6pxbR6g7BsDn67wkzr9W1cVehu7/WJn982UN+WK 1IlMaCApDtiwuq+t2OuVh5dJytJrqAevf2AU17hBOya9DTRtifEN3Pr+8TuyEg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gDxcD58Nnzfs8 for ; Tue, 12 May 2026 00:02:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3f0ff by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 00:02:31 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: a3036edd0292 - main - if_media: Claim 10BASE-T1S and 10BASE-T1L constants List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: a3036edd0292291a71fb74ba2bce355159ac6913 Auto-Submitted: auto-generated Date: Tue, 12 May 2026 00:02:31 +0000 Message-Id: <6a026e17.3f0ff.60f5efc6@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=a3036edd0292291a71fb74ba2bce355159ac6913 commit a3036edd0292291a71fb74ba2bce355159ac6913 Author: Ed Maste AuthorDate: 2026-05-04 23:48:25 +0000 Commit: Ed Maste CommitDate: 2026-05-12 00:01:04 +0000 if_media: Claim 10BASE-T1S and 10BASE-T1L constants These are two single-pair Ethernet (SPE) variants that run at 10 Mbps. 10BASE-T1S has automotive origins and supports multiple nodes on up to 25m of cable. 10BASE-T1L is intended for building and industrial automation and supports long-distance point to point links of over 1km. Reviewed by: kbowling Differential Revision: https://reviews.freebsd.org/D56952 --- sys/net/if_media.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sys/net/if_media.h b/sys/net/if_media.h index 892b7d1e3e52..5cc8714219c8 100644 --- a/sys/net/if_media.h +++ b/sys/net/if_media.h @@ -262,6 +262,8 @@ uint64_t ifmedia_baudrate(int); #define IFM_1000_BX IFM_X(121) /* 1000Base-BX */ #define IFM_400G_SR8 IFM_X(122) /* 400GBase-SR8 */ #define IFM_400G_CR8 IFM_X(123) /* 400GBase-CR8 */ +#define IFM_10_T1S IFM_X(124) /* 10BASE-T1S */ +#define IFM_10_T1L IFM_X(125) /* 10BASE-T1L */ /* * Please update ieee8023ad_lacp.c:lacp_compose_key() @@ -554,6 +556,8 @@ struct ifmedia_description { { IFM_400G_AUI8, "400G-AUI8" }, \ { IFM_400G_SR8, "400GBase-SR8" }, \ { IFM_400G_CR8, "400GBase-CR8" }, \ + { IFM_10_T1S, "10BASE-T1S" }, \ + { IFM_10_T1L, "10BASE-T1L" }, \ { 0, NULL }, \ } @@ -903,6 +907,8 @@ struct ifmedia_baudrate { { IFM_ETHER | IFM_400G_AUI8, IF_Gbps(400ULL) }, \ { IFM_ETHER | IFM_400G_SR8, IF_Gbps(400ULL) }, \ { IFM_ETHER | IFM_400G_CR8, IF_Gbps(400ULL) }, \ + { IFM_ETHER | IFM_10_T1S, IF_Mbps(10) }, \ + { IFM_ETHER | IFM_10_T1L, IF_Mbps(10) }, \ \ { IFM_IEEE80211 | IFM_IEEE80211_FH1, IF_Mbps(1) }, \ { IFM_IEEE80211 | IFM_IEEE80211_FH2, IF_Mbps(2) }, \ From nobody Tue May 12 03:16:05 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gF1vZ5KZbz6csRR for ; Tue, 12 May 2026 03:16: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gF1vZ4mZdz3Zv0 for ; Tue, 12 May 2026 03:16:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778555770; 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; bh=CBXhiQnvMb8Lt6yJLlu1WjJKfh1qyJVyljjBISnJ7gs=; b=OV7QXOALQLUNOJ2yrf2+p8sgGyGMfEiCG6L+zFifJ5auGctBtCnoZKFp3YGKcue3uTerVW UHlXwak1z/6Qtmn24TKgvQcqqkGllfwFWsIfA4o2mv/GWLsOQMrv3Cfd2XRwurYaSfDpHM zC2wbDJcSl9DRljY7BxDDKh4s6TgUpU4k7olf60NfwsZRyXRVpfxIlrMZuuhVcnKb1NaGY xowwGb1df+1uBr1DFpHcohfi6cWoaKz/Pxj4j/BdPC/eVyMi16CBLF4ewZ7+eb4l4uhXKM OkdJBcRxugsAY56FFENQd050KS4dbCOdG+cKTIU+KnLUEAK5fB9fZtw+zzkB/g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778555770; a=rsa-sha256; cv=none; b=bHSBQY0m09UNhYgZupjg2zO1QE0G6uNDyccJT6X5c+1VX5dYkOP4SBC0lHKIVu4EDW0iag 6WcoKfbmu25+DJo9yqovvEW6zDtm83eoxn/85YMTz5B3uIuAnASf6c38kKyl5QdJ3aIBMu E3hgfV1UOsr/Xrq8mCAa7qM8JqDeB7Ce/CneZps24vUv/KXJpSgknr4fTj2GPpNCcULv3T apkBfOB/uqAYApKdlwZXZLw1RXo53OMDK9+C15+GdC/vk13Nm8b/p3bKx124Z94MNDAGoo YiLNme5uZcG7iPpmqyryeTVnREUXsklaSlYLX29Mz6Wc2cYUA6jYfC4fPqlLug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778555770; 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; bh=CBXhiQnvMb8Lt6yJLlu1WjJKfh1qyJVyljjBISnJ7gs=; b=MXgw8UbPlm3HSJiNy5QgklkheiajnNFGHUXgIUsRcOcW+UUjROmkbSjjLkRjeE5o6V48jm tg5LqPWcg6BXP4FqogaE0IahgU4ooe0X0QwCQXr5Br+NwAeAzXESs5yjLcmN7d+ixls9Oy gbXxeYN3o4j7wMf1AoKXX6YDrFqtiNMmLFEqLJg2ShzBn+ZEWWIMFgwnKQbFJUpZovBf/D UApAtqEgmuiSVdnEVJN2MRjgMQ6YEvgkz09l4Lh+lsFUvEb+HUwisHsl38XjEnwxKD0ekD xhVAEqtMoUNot3Qkg7f9O9dwZ94BF8VUfVg+EAGYhfwM40C3AXS0r06o9X05lw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gF1vZ4Mn4zlh3 for ; Tue, 12 May 2026 03:16:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 37c10 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 03:16:05 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Raphael 'kena' Poss From: Alexander Ziaee Subject: git: e26b5e074934 - main - spkr.4: Reflect latest changes and add history List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e26b5e0749340d4e4557881b6634b044bce3fa61 Auto-Submitted: auto-generated Date: Tue, 12 May 2026 03:16:05 +0000 Message-Id: <6a029b75.37c10.370bf11a@gitrepo.freebsd.org> The branch main has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=e26b5e0749340d4e4557881b6634b044bce3fa61 commit e26b5e0749340d4e4557881b6634b044bce3fa61 Author: Raphael 'kena' Poss AuthorDate: 2026-05-08 13:10:29 +0000 Commit: Alexander Ziaee CommitDate: 2026-05-12 03:14:16 +0000 spkr.4: Reflect latest changes and add history - speaker(4) was recently modernized to lock the driver per-playback instead of per-open. Update the man page to explain this change. - added a reference to MML and SMX in the historical context to make it easier for users to find additional documentation online. Signed-off-by: Raphael Poss Reviewed by: ziaee Closes: https://github.com/freebsd/freebsd-src/pull/2183 --- share/man/man4/spkr.4 | 102 ++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 78 insertions(+), 24 deletions(-) diff --git a/share/man/man4/spkr.4 b/share/man/man4/spkr.4 index 64dfee278de4..a2e55035408c 100644 --- a/share/man/man4/spkr.4 +++ b/share/man/man4/spkr.4 @@ -16,16 +16,6 @@ speaker on an machine running .Fx . .Pp -Only one process may have this device open at any given time; -.Xr open 2 -and -.Xr close 2 -are used to lock and relinquish it. -An attempt to open when -another process has the device locked will return -1 with an -.Er EBUSY -error -indication. Writes to the device are interpreted as `play strings' in a simple ASCII melody notation. An @@ -34,6 +24,13 @@ request for tone generation at arbitrary frequencies is also supported. .Pp +Only one string can be playing at a time. +Concurrent +.Xr write 2 +and +.Xr ioctl 2 +calls from separate threads or processes are serialized per string. +.Pp Sound-generation does not monopolize the processor; in fact, the driver spends most of its time sleeping while the PC hardware is emitting tones. @@ -64,18 +61,25 @@ pointer to the first of an array of tone structures and plays them in continuous sequence; this array must be terminated by a final member with a zero duration. .Pp -The play-string language is modeled on the PLAY statement conventions of +The play-string language is a dialect of the Music Markup Language +(MML) used in various computer and gaming systems since the 1970s. +It is a subset of the MML variant supported by the PLAY statement of .Tn IBM -Advanced BASIC 2.0. -The +Advanced BASIC 2.0, +.Tn MS +BASICA and GW-BASIC, +as well as the Standard Musical Expression (SMX) supported in +.Tn MS +QBasic. .Li MB , .Li MF , and .Li X -primitives of PLAY are not -useful in a timesharing environment and are omitted. +primitives of MML/SMX are not supported. The `octave-tracking' -feature and the slur mark are new. +feature and the slur mark are specific to the +.Fx +implementation. .Pp There are 84 accessible notes numbered 1-84 in 7 octaves, each running from C to B, numbered 0-6; the scale is equal-tempered A440 and octave 3 starts @@ -115,10 +119,11 @@ Thus ``olbc'' will be played as ``olb>c'', and ``olcb'' as ``olc, < and O[0123456]. -(The octave-locking -feature is not supported in +The octave-locking feature is not supported in .Tn IBM -BASIC.) +and +.Tn MS +BASIC dialects. .It Li > Bump the current octave up one. .It Li < @@ -201,9 +206,11 @@ dotted twice, it is held 9/4, and three times would give 27/8. A note and its sustain dots may also be followed by a slur mark (underscore). This causes the normal micro-rest after the note to be filled in, slurring it to the next one. -(The slur feature is not supported in +The slur feature is not supported in .Tn IBM -BASIC.) +and +.Tn MS +BASIC dialects. .Pp Whitespace in play strings is simply skipped and may be used to separate melody sections. @@ -214,16 +221,63 @@ speaker device file .El .Sh SEE ALSO .Xr spkrtest 8 +.Pp +Additional information about MML: +.Bl -dash -offset indent +.It +.Lk https://electronicmusic.fandom.com/wiki/Music_Macro_Language "The Electronic Music Wiki - Music Macro Language" +.It +.Rs +.%T "IBM Personal Computer BASIC manual" +.%I "IBM Corporation" +.%D "1982" +.Re +.It +.Rs +.%T "BASICA manual" +.%I "Microsoft Corporation" +.%D "1982" +.Re +.It +.Rs +.%T "GW-BASIC manual" +.%I "Microsoft Corporation" +.%D "1987" +.Re +.It +.Rs +.%T "QBasic manual" +.%I "Microsoft Corporation" +.%D "1991" +.Re +.It +.Rs +.%A "Eleanor Selfridge-Field" +.%T "Beyond MIDI: the handbook of musical codes" +.%I "MIT Press" +.%D "1997" +.Re +.El .Sh HISTORY The .Nm device appeared in .Fx 1.0 . +.Pp +Prior to +.Fx 16 , +only one file descriptor could hold the device open. .Sh AUTHORS -.An Eric S. Raymond Aq Mt esr@snark.thyrsus.com , +.An -nosplit +The +.Nm +driver was written by +.An Eric S. Raymond Aq Mt esr@snark.thyrsus.com in June 1990 -.Sh PORTED BY -.An Andrew A. Chernov Aq Mt ache@astral.msk.su +and ported by +.An Andrew A. Chernov Aq Mt ache@astral.msk.su . +Support for concurrent open was added by +.An Raphael Poss Aq Mt knz@thaumogen.net . .Sh BUGS Due to roundoff in the pitch tables and slop in the tone-generation and timer hardware (neither of which was designed for precision), neither pitch accuracy From nobody Tue May 12 05:16:14 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gF4ZD2fk6z6d2vD for ; Tue, 12 May 2026 05:16: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gF4ZC6kL7z3lvR for ; Tue, 12 May 2026 05:16:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778562980; 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; bh=YNdJ/cOP0aL93twws1FB/Jl6MhBUQ+57afngCahteUU=; b=OOZOoMmKlGW7a1o35vlhFY0iijXKtU2RVfdQQe7QvBESjdae0fVQTXXaKVVq7TJnZUDyfe NmNcC1z80WjU4sn6UZpzeBLHdDsHNQwGriN/yq5rBLmnlSquYzPGwZ+fEBYfiFrh4vmV4s SBwsWetI9fIgWU8xIy8QIDhn27hv4PDwpn0uPYBbSKRs9TRRggrrsyoxZPWMWGIENB361+ lnlO3oZAoLphQvmJt+RiAJFdD3K7shFENyzXlr8B7Zx0ZALJv16jlhnThv8yincv7ba5iZ ByxYt7QyDUAWNHgoZu0othT3EVTUBVg/BeoOys0etLkJH+yo/MhS9oJuk4mZHg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778562980; a=rsa-sha256; cv=none; b=HkI/RtXGuK/24lG9EvaA1IPh52uLjIQW/vBoj2LHH3bMbaqZ+pzXVJ9wh23rzbL2agrOaO 0WwfaCPeo+K4chxqHJ2z+rAbDYvXZ5dwh4UNI38GkcFBQCP14dN5/DDsoOaoVLHlz1ZiZ9 5zOv7fcror7mrO0wQdIdPSPw0j4bm3nVDBntviGGGOxeseEVgCHEApihF8s+0VmwLAijbL CwJoyqshBZkKQAqEPeIp0kwyCCxHU+TW0HzpDxrzw/UxoMLqS2O0ZCpEWAY65hMSTX9osh 8BGqEfd6AHEetct4xt8pQAPWgl/dh/54N0qNPjSoxBau+SzPA5r5ZVvTigHO1Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778562980; 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; bh=YNdJ/cOP0aL93twws1FB/Jl6MhBUQ+57afngCahteUU=; b=NtSeXqhmDVuSmwC7G+vmjU2Ez5VfDXyDFZJBeNsAoWiduQ3wh3tdcYw4B++9ExF/D/kjXv sZ6anRBdaST1ZRPABRAjhW/dogcU6Uppzfe0HBOSDzZRyW5lG7UTvg1YLYmyXU7x/7rBd6 wNfMEtv2NKHOeQKWawCKTFaIugAZCHksTtqxk2cTuvaTEh4bCDcUHYK1IMwaDTdgmcc5oa kc0Qz4EV0g3oj9LY6FoGEA607KT4rNYAAPUTIIrYLiszoJ/1LyRk9yhBz8W2wJ/NTDNoWz sLdTfC4p07s0w16ODR6vY2kyW32UFI/RFb2ru/K8Sebm3zR8rICAbS3WU7o7Eg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gF4ZC5shqzqM6 for ; Tue, 12 May 2026 05:16:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 426e3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 05:16:14 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Lianwei Wang From: Xin LI Subject: git: ae32d61a2e3e - stable/15 - fsck_msdosfs: fix FAT header correction not persisting in cache mode List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: ae32d61a2e3e47bed54d861893d8e2da90fb7c76 Auto-Submitted: auto-generated Date: Tue, 12 May 2026 05:16:14 +0000 Message-Id: <6a02b79e.426e3.32abb9a9@gitrepo.freebsd.org> The branch stable/15 has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=ae32d61a2e3e47bed54d861893d8e2da90fb7c76 commit ae32d61a2e3e47bed54d861893d8e2da90fb7c76 Author: Lianwei Wang AuthorDate: 2026-05-09 04:56:12 +0000 Commit: Xin LI CommitDate: 2026-05-12 05:15:41 +0000 fsck_msdosfs: fix FAT header correction not persisting in cache mode When fsck_msdosfs runs with FAT32 cache mode (used for large filesystems that cannot be mmap'd), a detected FAT header correction was written into the in-memory buffer but the corresponding cache entry (fat32_cache_allentries[0]) was never marked dirty. As a result, fat_flush_fat32_cache_entry() skipped it, the corrected bytes were never written to disk, and copyfat() propagated the uncorrected on-disk data to all backup FAT copies. Every subsequent fsck run would repeat the same "FAT starts with odd byte sequence / FIXED" cycle indefinitely. Fix by marking fat32_cache_allentries[0].dirty = true after applying the in-memory correction, ensuring the chunk is flushed before copyfat() runs. Obtained from: https://android-review.googlesource.com/c/platform/external/fsck_msdos/+/4047981 (cherry picked from commit 10e342c1ec78af5a0b97739c806b16a632118fa5) --- sbin/fsck_msdosfs/fat.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/sbin/fsck_msdosfs/fat.c b/sbin/fsck_msdosfs/fat.c index 567bfcd428cb..5ead0b1bf783 100644 --- a/sbin/fsck_msdosfs/fat.c +++ b/sbin/fsck_msdosfs/fat.c @@ -927,6 +927,17 @@ readfat(int fs, struct bootblock *boot, struct fat_descriptor **fp) default: break; } + /* + * In cache mode the header lives in + * fat32_cache_allentries[0]. Mark it + * dirty so it is flushed to disk (either + * on eviction or in writefat()) before + * copyfat() copies the primary FAT to + * backup copies. + */ + if (fat->use_cache) + fat->fat32_cache_allentries[0].dirty = + true; } } } From nobody Tue May 12 05:18:04 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gF4cK5MNrz6d2sY for ; Tue, 12 May 2026 05:18:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gF4cK4p9qz3mQ8 for ; Tue, 12 May 2026 05:18:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778563089; 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; bh=od1hh4CfKm/1aaluInhBp5cQw3fA2h6OuXMcSAFea68=; b=YahZTgoboywZQsVilDQfWklqyB5v9s+RwlfDasc9Ye1nIxpK5FQ5WX624ggRzXb3tSI9Tc 2p3qArA+ofVnX0V+ildxV9tKaL2Y0qdH+jj9+of1rLRYFpO1qzlY3c3vmiBDz8ao+uLkXX Xf0XSOJ0YNtE6pmgGNlO422860UsnZYDO5Y9z0de7/HLsMAGLtuwdagYERA4Bj6THKnq+b nyCWAeo4eqU/Yk3uM3cDgUtSBQ0vRMBgCyzhOKuV7bA+7P+RzgimvZfSTVcvSCiADM6yP6 cP6CBmvEXq8zIb/oFw81QlW12PLJuGTGRliBATH3ovjx0ExDo8bDY3eEUj2JJQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778563089; a=rsa-sha256; cv=none; b=e0k5ssIlA438wiVYlxWtSbzepQY3KB2Rohbg4mGbj2y1kjzAa/NtWHubkaIdVKoZQPAMxo G4hO8gEq3EBFrHdUKDDTkW57+4HWFGuhIR2PgDtdlVKMcBRYJObCUJV5LB1M7DfiG3EcxR XUMhEiu4BRfqohq/009d+6O/XVReD3Bh+whmVt2a1fJDZA0PNDq1qMEwXAMnEwshkEEuF2 DNv5gP9wdPxbUxM7uXrTJVMDzKHnhOmWKPZHjmzICGm43ql1+aKbl2wunSPp0JQ/+zHemw NcEiDPD76hprDxaxrI1BCRsB8h2McqhhDXBfgFlAmKnRJ0mYYBV4rQVlABN14A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778563089; 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; bh=od1hh4CfKm/1aaluInhBp5cQw3fA2h6OuXMcSAFea68=; b=Mhth1Swk/pI+rxHmypLfou7g0ThWnROIyHvXzZlv4aeWOl8tRCnmGpFequcs4s0uoc85WC A5+j+tHCS+wINYonSf4M2Fp63kRRyktw339yEI9ft08cI6kyy7WiUaAjlhy+4MwDdXxiIp 1Qedz9Pgvux0XNcuVmCJvKQutraH7kjJ7wnEbTjO5pr+ukDCBvB+j/GSk1wP2DqkyPyP1n 6713RFntdbY+JUsiPgaPVK0dQfhqZYHO4SWyMiOlcFyIT4O1nqnr/xn9CK+9VaKO+y1Dpc /MDOEArvp/M4gOZiBd5RB3ywr93qAo+asS3g17dsvPLamvH8cXl+hsX0y4CT+Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gF4cK4JQ1zqWl for ; Tue, 12 May 2026 05:18:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4390a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 05:18:04 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Lianwei Wang From: Xin LI Subject: git: 302545bcbc1c - stable/14 - fsck_msdosfs: fix FAT header correction not persisting in cache mode List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 302545bcbc1c81076123cb69a12a5514661972df Auto-Submitted: auto-generated Date: Tue, 12 May 2026 05:18:04 +0000 Message-Id: <6a02b80c.4390a.4a1f31dd@gitrepo.freebsd.org> The branch stable/14 has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=302545bcbc1c81076123cb69a12a5514661972df commit 302545bcbc1c81076123cb69a12a5514661972df Author: Lianwei Wang AuthorDate: 2026-05-09 04:56:12 +0000 Commit: Xin LI CommitDate: 2026-05-12 05:17:53 +0000 fsck_msdosfs: fix FAT header correction not persisting in cache mode When fsck_msdosfs runs with FAT32 cache mode (used for large filesystems that cannot be mmap'd), a detected FAT header correction was written into the in-memory buffer but the corresponding cache entry (fat32_cache_allentries[0]) was never marked dirty. As a result, fat_flush_fat32_cache_entry() skipped it, the corrected bytes were never written to disk, and copyfat() propagated the uncorrected on-disk data to all backup FAT copies. Every subsequent fsck run would repeat the same "FAT starts with odd byte sequence / FIXED" cycle indefinitely. Fix by marking fat32_cache_allentries[0].dirty = true after applying the in-memory correction, ensuring the chunk is flushed before copyfat() runs. Obtained from: https://android-review.googlesource.com/c/platform/external/fsck_msdos/+/4047981 (cherry picked from commit 10e342c1ec78af5a0b97739c806b16a632118fa5) --- sbin/fsck_msdosfs/fat.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/sbin/fsck_msdosfs/fat.c b/sbin/fsck_msdosfs/fat.c index 567bfcd428cb..5ead0b1bf783 100644 --- a/sbin/fsck_msdosfs/fat.c +++ b/sbin/fsck_msdosfs/fat.c @@ -927,6 +927,17 @@ readfat(int fs, struct bootblock *boot, struct fat_descriptor **fp) default: break; } + /* + * In cache mode the header lives in + * fat32_cache_allentries[0]. Mark it + * dirty so it is flushed to disk (either + * on eviction or in writefat()) before + * copyfat() copies the primary FAT to + * backup copies. + */ + if (fat->use_cache) + fat->fat32_cache_allentries[0].dirty = + true; } } } From nobody Tue May 12 07:48:45 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gF7y63R1sz6dDjq for ; Tue, 12 May 2026 07:48: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gF7y616pxz427m for ; Tue, 12 May 2026 07:48:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778572126; 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; bh=R80TsFeuiyXKqvh5FI6LLoM36jzfPpXgs+VO0v2a/fE=; b=t6OTqK4zL7thaNpKLvhUSo/pZXIHwrhB0bKOGnH49hZoOPRRiMgKsrFewjlX0k7BaeVP/D /dnCd4sXeiEk3RCGzhXleSQQn9qVNYRugRRbkDR4Wvm2vEsgxYwrhqfSn66eXl7/928EUD 2kCgAFY9ByItoyWLRdV7OJzJwEM/ohTSfo2xpi3gN3J1bGNCNm3q/msv1SsBwrkGgIaJKb 6Ue4LqjeMbVnIS+aGbrGcTRhL7yuaKhWzjsO1UlDHs5e5Ey2Ll+ZMJOf1zygeYR0UBqR08 pHpzJM0Wb1n70JfzhajZxIwNfEp2QP5To38dZaqT7skZKw7aUILAvrHG+FwHXg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778572126; a=rsa-sha256; cv=none; b=MAC5pPUpulJE5m3hOB2ikMsMhTqZd+F9Kn/Mh4RXcAQgARPcYx610QVC7mP4XEW9KZmgoi KJULvOu9WqUmfjwWFuI7BgYjHggCEX0DzO4X/766sZgMTmDlSr+JXKIihEDX4R4ZlAEWUB vKEftXtYTrok54YL8A1CRsgNVLF16mbYCTR7rIyXsvdKO/JoVYzu2syrcAWH2pNrZkA0iB zTEHOQ1+1c3wBDlHuAEDAGXoI6AZXQou22R4hjW7zZfdEUGqtwnbBQ3Mty+VS31RtbQA/o oS6WW09EoU/mq+PmwVr9unp2sUWMtBxxMGcd2RGe+sDirnPL6wsA3saFzXmsOw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778572126; 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; bh=R80TsFeuiyXKqvh5FI6LLoM36jzfPpXgs+VO0v2a/fE=; b=adwU898V49cSL7jrewy7UFnWOT6HERl3zVOiU1JvWNpqu80MBM+jFOWJLLhLH8r5dHCdAA lrbT+mJdCJBaUoc0epf86sZidwt9YhDiCqeyxbflMgcyBNVFqMn8TqkH91Ar5MJTvMnTdd tpN0jVOJPJWxz9lUEF4Qrq/rHQ232bXT1UOpLM2P1lRzHi03fW79fhC5wvFoz1/iJFSb+F 6E/oA5GlNjo9OoMAjH2SaDAH6zJV9MIXR20XLR86LQO+RqD8mBXtz/69nR1//P9soOq/64 Ct/0AunLgYjBsti0qt/G+Ukv0ou4eso4MwcBJjAhxiyFL/OIZwdWChoDE1ziZg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gF7y56ycczvBQ for ; Tue, 12 May 2026 07:48:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 23ba8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 07:48:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Boris Lytochkin From: Andrey V. Elsukov Subject: git: 3d39eadcdeb3 - main - ipfw: fix IPv6 flow label matching List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ae X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3d39eadcdeb301e95abdc94b1ad5d1255fa0f446 Auto-Submitted: auto-generated Date: Tue, 12 May 2026 07:48:45 +0000 Message-Id: <6a02db5d.23ba8.7e41e5d9@gitrepo.freebsd.org> The branch main has been updated by ae: URL: https://cgit.FreeBSD.org/src/commit/?id=3d39eadcdeb301e95abdc94b1ad5d1255fa0f446 commit 3d39eadcdeb301e95abdc94b1ad5d1255fa0f446 Author: Boris Lytochkin AuthorDate: 2026-05-12 07:44:10 +0000 Commit: Andrey V. Elsukov CommitDate: 2026-05-12 07:44:10 +0000 ipfw: fix IPv6 flow label matching * do not require just only ip6 proto for flow-id opcode in ipfw(8). ipv6-icmp, tcp, udp should be fine too. * fix off-by-one bug leading to out-of-bounds read. * apply IPV6_FLOWLABEL_MASK before comparison in flow6id_match(), so flow-id opcode will match a specified flow label. No need to take protocol version and traffic class into account. * add the test to verify that opcode is working correctly. Reviewed by: pouria Obtained from: Yandex LLC MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D56869 --- sbin/ipfw/ipfw2.c | 5 +-- sys/netpfil/ipfw/ip_fw2.c | 4 +- tests/sys/netpfil/common/pft_ping.py | 13 +++++- tests/sys/netpfil/ipfw/Makefile | 1 + tests/sys/netpfil/ipfw/ipv6-flow-id.sh | 78 ++++++++++++++++++++++++++++++++++ 5 files changed, 95 insertions(+), 6 deletions(-) diff --git a/sbin/ipfw/ipfw2.c b/sbin/ipfw/ipfw2.c index e0e1339a1dce..06a1ee937cd7 100644 --- a/sbin/ipfw/ipfw2.c +++ b/sbin/ipfw/ipfw2.c @@ -5515,10 +5515,7 @@ read_options: break; case TOK_FLOWID: - if (proto != IPPROTO_IPV6 ) - errx( EX_USAGE, "flow-id filter is active " - "only for ipv6 protocol\n"); - fill_flow6( (ipfw_insn_u32 *) cmd, *av, cblen); + fill_flow6(insntod(cmd, u32), *av, cblen); av++; break; diff --git a/sys/netpfil/ipfw/ip_fw2.c b/sys/netpfil/ipfw/ip_fw2.c index 10690920e6fd..133aeeb969a6 100644 --- a/sys/netpfil/ipfw/ip_fw2.c +++ b/sys/netpfil/ipfw/ip_fw2.c @@ -780,7 +780,9 @@ static int flow6id_match(int curr_flow, ipfw_insn_u32 *cmd) { int i; - for (i=0; i <= cmd->o.arg1; ++i) + /* Mask proto version and traffic class out before comparing flow-id */ + curr_flow &= ntohl(IPV6_FLOWLABEL_MASK); + for (i=0; i < cmd->o.arg1; ++i) if (curr_flow == cmd->d[i]) return 1; return 0; diff --git a/tests/sys/netpfil/common/pft_ping.py b/tests/sys/netpfil/common/pft_ping.py index a2a1d9c7f4ec..ada4f8607ab0 100644 --- a/tests/sys/netpfil/common/pft_ping.py +++ b/tests/sys/netpfil/common/pft_ping.py @@ -63,6 +63,7 @@ def prepare_ipv6(send_params): dst_address = send_params.get('dst_address') hlim = send_params.get('hlim') tc = send_params.get('tc') + fl = send_params.get('fl') ip6 = sp.IPv6(dst=dst_address) if src_address: ip6.src = src_address @@ -70,6 +71,8 @@ def prepare_ipv6(send_params): ip6.hlim = hlim if tc: ip6.tc = tc + if fl: + ip6.fl = fl return ip6 @@ -224,6 +227,7 @@ def check_ipv6(expect_params, packet): flags = expect_params.get('flags') hlim = expect_params.get('hlim') tc = expect_params.get('tc') + fl = expect_params.get('fl') ip6 = packet.getlayer(sp.IPv6) if not ip6: LOGGER.debug('Packet is not IPv6!') @@ -245,6 +249,9 @@ def check_ipv6(expect_params, packet): if tc and ip6.tc != tc: LOGGER.debug(f'Wrong TC value {ip6.tc}, expected {tc}') return False + if fl and ip6.fl != fl: + LOGGER.debug(f'Wrong Flow Label value {ip6.fl}, expected {fl}') + return False return True @@ -635,6 +642,8 @@ def parse_args(): help='ICMP Echo Request payload size') parser_send.add_argument('--send-tc', type=int, help='IPv6 Traffic Class or IPv4 DiffServ / ToS') + parser_send.add_argument('--send-fl', type=int, + help='IPv6 Flow label') parser_send.add_argument('--send-tcpopt-unaligned', action='store_true', help='Include unaligned TCP options') parser_send.add_argument('--send-nop', action='store_true', @@ -652,6 +661,8 @@ def parse_args(): help='TCP sequence number') parser_expect.add_argument('--expect-tc', type=int, help='IPv6 Traffic Class or IPv4 DiffServ / ToS') + parser_expect.add_argument('--expect-fl', type=int, + help='IPv6 Flow Label') parser.add_argument('-v', '--verbose', action='store_true', help=('Enable verbose logging. Apart of potentially useful information ' @@ -673,7 +684,7 @@ def main(): send_params = {} expect_params = {} for param_name in ( - 'flags', 'hlim', 'length', 'mss', 'seq', 'tc', 'frag_length', + 'flags', 'hlim', 'length', 'mss', 'seq', 'tc', 'fl', 'frag_length', 'sport', 'dport', ): param_arg = vars(args).get(f'send_{param_name}') diff --git a/tests/sys/netpfil/ipfw/Makefile b/tests/sys/netpfil/ipfw/Makefile index 52f898050267..0be870945891 100644 --- a/tests/sys/netpfil/ipfw/Makefile +++ b/tests/sys/netpfil/ipfw/Makefile @@ -4,6 +4,7 @@ TESTSDIR= ${TESTSBASE}/sys/netpfil/ipfw ATF_TESTS_SH+= fwd \ divert \ + ipv6-flow-id \ log \ lookup \ table diff --git a/tests/sys/netpfil/ipfw/ipv6-flow-id.sh b/tests/sys/netpfil/ipfw/ipv6-flow-id.sh new file mode 100644 index 000000000000..fd3ef2f6cd81 --- /dev/null +++ b/tests/sys/netpfil/ipfw/ipv6-flow-id.sh @@ -0,0 +1,78 @@ +# +# Copyright (c) 2026 Boris Lytochkin +# +# SPDX-License-Identifier: BSD-2-Clause +# + +common_dir="$(atf_get_srcdir)/../common" +. ${common_dir}/utils.subr + +NC="nc -w 1 -dnN" + +setup_network_v6() +{ + epair="$1" + + ifconfig ${epair}a inet6 2001:db8:42::1/64 up no_dad -ifdisabled + + vnet_mkjail alcatraz ${epair}b + + ifconfig -j alcatraz ${epair}b inet6 2001:db8:42::2/64 up no_dad -ifdisabled + + jexec alcatraz /usr/sbin/inetd -p /dev/null $(atf_get_srcdir)/lookup_inetd.conf + + # Sanity checks + atf_check -s exit:0 -o ignore ping6 -i .1 -c 3 -s 1200 2001:db8:42::2 + atf_check -o "inline:GOOD 82\n" ${NC} 2001:db8:42::2 82 +} + +atf_test_case "ipv6fl" "cleanup" + +ipv6fl_head() +{ + atf_set descr 'flow-id test' + atf_set require.user root + atf_set require.progs python3 scapy +} + +ipv6fl_body() +{ + + firewall_init "ipfw" + + epair=$(vnet_mkepair) + + setup_network_v6 ${epair} + + # Check if the firewall is able to match exact IPv6 flow label + firewall_config "alcatraz" ipfw ipfw \ + "ipfw -q add 100 allow ip6 from any to any flow-id 0xbaad" \ + "ipfw -q add 200 deny ipv6-icmp from any to any icmp6types 128 in" + + # Check Flow Label matches + atf_check -s exit:0 ${common_dir}/pft_ping.py \ + --sendif ${epair}a \ + --fromaddr 2001:db8:42::1 \ + --to 2001:db8:42::2 \ + --send-fl $((0xbaad)) \ + --replyif ${epair}a + + # Check Flow Label mismatch + atf_check -s exit:1 ${common_dir}/pft_ping.py \ + --sendif ${epair}a \ + --fromaddr 2001:db8:42::1 \ + --to 2001:db8:42::2 \ + --send-fl $((0xf001)) \ + --replyif ${epair}a + +} + +ipv6fl_cleanup() +{ + firewall_cleanup $1 +} + +atf_init_test_cases() +{ + atf_add_test_case "ipv6fl" +} From nobody Tue May 12 07:53:00 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gF8353WfQz6dDvw for ; Tue, 12 May 2026 07: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gF8352Bstz42hD for ; Tue, 12 May 2026 07: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=1778572385; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=y2tfkr/3GtdCzqR4dVvq9Y7Y+9vuttD4v4cliyY+5sI=; b=loq8E4yZUcDg+VuKwhhQYg9P3LagwnxAtDz+eSVJEl/D2tyZJtltIERJldhR4eP0v7d/9V myJ8CfBoSx6CkQ8/Rl49pzRHrD/anUkCeUgL/CePy9AFm8N7qEZnUgy41ficXWyS+vpjY2 mHrKjYPm3xmu/rjMnvHUuRiDj4M+tLO1YxpQna+oZiy5UXGsS8SZhPw56EChLA18jbbLU7 lBQMzVmtm7kpYA6XWjSRkoTWsqcLrrd1Pi1GNHgi3bVlSOI5K837G6MhenBXs38+TFdd48 b3UxE6DxUtmq4CtteU931K0UwCYQj6zfcUJepU+14dcidnbhxqMdIBcYdW3y0A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778572385; a=rsa-sha256; cv=none; b=KZyuJ4O0hy6C2NPRuf5iIXl6qD1rKmWcU5lfUlQSnDvX1SXRtFWaK8AZSZyieyrXEBCpdC qwmU+hmmgaQzApPDrR1uqx2jgDazdrwEKUirrysnHzX5rPsjzJQtwftbumeblgK0LvjCF1 hHhj5qkiSpPf9f9xBVJXe8BX6saqKoF6Y0Il2tCJkXv2Rf/z7SUFvRoHKojaGjq0xEMWgu 1o8PtbKRNnCyum/uLpnbkQkgqMKp4swj46u1u2oHeUYPdPbA8cLKcs0hHKCwxMTvmE6fDh thw2dkFeWpkIeMRJUsmS3CTO2x5OmnpxmM2D9SJran6MPe0APsdWSecICGVgeQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778572385; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=y2tfkr/3GtdCzqR4dVvq9Y7Y+9vuttD4v4cliyY+5sI=; b=E+LdPVKIR1zTMhLq6fI0l9iaHtRD29w7xOG/ycxISf6YeWOMQL1enruIYO0EYCkfmLiAQI aT1rSTzjSWr5RMynFF8ROB66/kPQtiadrdM2QUmc+oztmvJrc5nMceWMZavAEylO20BT+Z OiAJ8ShuCfGYejSXjTxvds/oyGqV0QSYiCUvPPLdJqlls8/e8AFuO7GXkBL8KoWQrAzJrG Y95bRs4LV1tMDx2DC5GQXiof/SqnDIIbNVBpaHP7c9dD0XMNESUMIXvMEhbw5lKUMkhCGJ B6lEyXLVP3WnpBK+uAe2dD8+fEmsOAcreYk1wQEP9jAcL4uMe5JRGIH7dCn9gg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gF8351klxzvPX for ; Tue, 12 May 2026 07:53:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 24b1f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 07:53:00 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 8b70a203be10 - main - nuageinit: fix command injection and related issues List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8b70a203be10411c560ed303ab25713d70b316e9 Auto-Submitted: auto-generated Date: Tue, 12 May 2026 07:53:00 +0000 Message-Id: <6a02dc5c.24b1f.734d8e95@gitrepo.freebsd.org> The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=8b70a203be10411c560ed303ab25713d70b316e9 commit 8b70a203be10411c560ed303ab25713d70b316e9 Author: Baptiste Daroussin AuthorDate: 2026-05-07 18:22:14 +0000 Commit: Baptiste Daroussin CommitDate: 2026-05-12 07:52:32 +0000 nuageinit: fix command injection and related issues - Add shell_escape() helper to safely escape shell arguments - Apply shell_escape to all user-controlled values in shell commands: adduser (usershow, useradd, lock, primary_group, groups) addgroup (groupshow, groupadd, members) exec_change_password (usermod) settimezone (tzsetup root and timezone) install_package (pkg package names) - Escape double quotes in hostname when writing rc.conf.d/hostname - Add missing 'local' declaration for resolvconf_command in nameservers() - Escape interface name in resolvconf -a command - Change open_resolvconf_conf() from 'w' to 'a' mode to prevent data loss when nameservers() is called multiple times - Clean up stale resolvconf.conf at the start of each boot (skip on postnet to preserve config written by first call) MFC After: 1 day --- libexec/nuageinit/nuage.lua | 43 +++++++++++++++++++++++------------- libexec/nuageinit/nuageinit | 17 ++++++++++++-- libexec/nuageinit/tests/nuageinit.sh | 6 ++--- 3 files changed, 46 insertions(+), 20 deletions(-) diff --git a/libexec/nuageinit/nuage.lua b/libexec/nuageinit/nuage.lua index 2d962b540b23..f3c23a7c3eb8 100644 --- a/libexec/nuageinit/nuage.lua +++ b/libexec/nuageinit/nuage.lua @@ -52,6 +52,10 @@ local function decode_base64(input) return table.concat(result) end +local function shell_escape(s) + return "'" .. string.gsub(s, "'", "'\\''") .. "'" +end + local function warnmsg(str, prepend) if not str then return @@ -121,7 +125,7 @@ local function sethostname(hostname) warnmsg("Impossible to open " .. hostnamepath .. ":" .. err) return end - f:write('hostname="' .. hostname .. '"\n') + f:write('hostname="' .. hostname:gsub('"', '\\"') .. '"\n') f:close() end @@ -199,7 +203,7 @@ local function adduser(pwd) if root then cmd = cmd .. "-R " .. root .. " " end - local f = io.popen(cmd .. " usershow " .. pwd.name .. " -7 2> /dev/null") + local f = io.popen(cmd .. " usershow " .. shell_escape(pwd.name) .. " -7 2> /dev/null") local pwdstr = f:read("*a") f:close() if pwdstr:len() ~= 0 then @@ -220,13 +224,17 @@ local function adduser(pwd) -- a warning but creates the user anyway. list = purge_group(list) if #list > 0 then - extraargs = " -G " .. table.concat(list, ",") + local escaped_list = {} + for _, g in ipairs(list) do + table.insert(escaped_list, shell_escape(g)) + end + extraargs = " -G " .. table.concat(escaped_list, ",") end end -- pw will automatically create a group named after the username -- do not add a -g option in this case if pwd.primary_group and pwd.primary_group ~= pwd.name then - extraargs = extraargs .. " -g " .. pwd.primary_group + extraargs = extraargs .. " -g " .. shell_escape(pwd.primary_group) end if not pwd.no_create_home then extraargs = extraargs .. " -m " @@ -248,9 +256,9 @@ local function adduser(pwd) if root then cmd = cmd .. "-R " .. root .. " " end - cmd = cmd .. "useradd -n " .. pwd.name .. " -M 0755 -w none " - cmd = cmd .. extraargs .. " -c '" .. pwd.gecos - cmd = cmd .. "' -d '" .. pwd.homedir .. "' -s " .. pwd.shell .. postcmd + cmd = cmd .. "useradd -n " .. shell_escape(pwd.name) .. " -M 0755 -w none " + cmd = cmd .. extraargs .. " -c " .. shell_escape(pwd.gecos) + cmd = cmd .. " -d " .. shell_escape(pwd.homedir) .. " -s " .. shell_escape(pwd.shell) .. postcmd f = io.popen(cmd, "w") if input then @@ -267,7 +275,7 @@ local function adduser(pwd) if root then cmd = cmd .. "-R " .. root .. " " end - cmd = cmd .. "lock " .. pwd.name + cmd = cmd .. "lock " .. shell_escape(pwd.name) os.execute(cmd) end return pwd.homedir @@ -283,7 +291,7 @@ local function addgroup(grp) if root then cmd = cmd .. "-R " .. root .. " " end - local f = io.popen(cmd .. " groupshow " .. grp.name .. " 2> /dev/null") + local f = io.popen(cmd .. " groupshow " .. shell_escape(grp.name) .. " 2> /dev/null") local grpstr = f:read("*a") f:close() if grpstr:len() ~= 0 then @@ -292,13 +300,17 @@ local function addgroup(grp) local extraargs = "" if grp.members then local list = splitlist(grp.members) - extraargs = " -M " .. table.concat(list, ",") + local escaped_list = {} + for _, m in ipairs(list) do + table.insert(escaped_list, shell_escape(m)) + end + extraargs = " -M " .. table.concat(escaped_list, ",") end cmd = "pw " if root then cmd = cmd .. "-R " .. root .. " " end - cmd = cmd .. "groupadd -n " .. grp.name .. extraargs + cmd = cmd .. "groupadd -n " .. shell_escape(grp.name) .. extraargs local r = os.execute(cmd) if not r then warnmsg("fail to add group " .. grp.name) @@ -484,7 +496,7 @@ local function exec_change_password(user, password, type, expire) postcmd = " -w random" end end - cmd = cmd .. "usermod " .. user .. postcmd + cmd = cmd .. "usermod " .. shell_escape(user) .. postcmd if expire then cmd = cmd .. " -p 1" else @@ -577,7 +589,7 @@ local function settimezone(timezone) root = "/" end - local f, _, rc = os.execute("tzsetup -s -C " .. root .. " " .. timezone) + local f, _, rc = os.execute("tzsetup -s -C " .. shell_escape(root) .. " " .. shell_escape(timezone)) if not f then warnmsg("Impossible to configure time zone ( rc = " .. rc .. " )") @@ -600,8 +612,8 @@ local function install_package(package) if package == nil then return true end - local install_cmd = "pkg install -y " .. package - local test_cmd = "pkg info -q " .. package + local install_cmd = "pkg install -y " .. shell_escape(package) + local test_cmd = "pkg info -q " .. shell_escape(package) if os.getenv("NUAGE_RUN_TESTS") then print(install_cmd) print(test_cmd) @@ -683,6 +695,7 @@ local function addfile(file, defer) end local n = { + shell_escape = shell_escape, warn = warnmsg, err = errmsg, chmod = chmod, diff --git a/libexec/nuageinit/nuageinit b/libexec/nuageinit/nuageinit index a1ebd3f52b25..fc8d9582b9c6 100755 --- a/libexec/nuageinit/nuageinit +++ b/libexec/nuageinit/nuageinit @@ -67,7 +67,14 @@ local function open_resolv_conf() end local function open_resolvconf_conf() - return openat("/etc", "resolvconf.conf") + local path_dir = root .. "/etc" + local path_name = path_dir .. "/resolvconf.conf" + nuage.mkdir_p(path_dir) + local f, err = io.open(path_name, "a") + if not f then + nuage.err("unable to open " .. path_name .. ": " .. err) + end + return f, path_name end local function get_ifaces_by_mac() @@ -271,8 +278,9 @@ local function nameservers(interface, obj) end -- Only call resolvconf with interface if interface is provided + local resolvconf_command if interface then - resolvconf_command = "resolvconf -a " .. interface .. " < " .. resolv_conf + resolvconf_command = "resolvconf -a " .. nuage.shell_escape(interface) .. " < " .. resolv_conf else resolvconf_command = "resolvconf -u" end @@ -738,6 +746,11 @@ local function load_userdata() return line, obj end +-- Clean up stale resolvconf.conf from previous boot +if citype ~= "postnet" then + os.remove(root .. "/etc/resolvconf.conf") +end + if citype == "config-2" then -- network config2_network(ni_path) diff --git a/libexec/nuageinit/tests/nuageinit.sh b/libexec/nuageinit/tests/nuageinit.sh index 1fd68d5a178e..89207fdf0aca 100644 --- a/libexec/nuageinit/tests/nuageinit.sh +++ b/libexec/nuageinit/tests/nuageinit.sh @@ -801,7 +801,7 @@ packages: - yeah/plop EOF chmod 755 "${PWD}"/media/nuageinit/user_data - atf_check -s exit:0 -o inline:"pkg install -y yeah/plop\npkg info -q yeah/plop\n" /usr/libexec/nuageinit "${PWD}"/media/nuageinit postnet + atf_check -s exit:0 -o inline:"pkg install -y 'yeah/plop'\npkg info -q 'yeah/plop'\n" /usr/libexec/nuageinit "${PWD}"/media/nuageinit postnet cat > media/nuageinit/user_data << 'EOF' #cloud-config @@ -809,7 +809,7 @@ packages: - curl EOF chmod 755 "${PWD}"/media/nuageinit/user_data - atf_check -o inline:"pkg install -y curl\npkg info -q curl\n" /usr/libexec/nuageinit "${PWD}"/media/nuageinit postnet + atf_check -o inline:"pkg install -y 'curl'\npkg info -q 'curl'\n" /usr/libexec/nuageinit "${PWD}"/media/nuageinit postnet cat > media/nuageinit/user_data << 'EOF' #cloud-config @@ -818,7 +818,7 @@ packages: - meh: bla EOF chmod 755 "${PWD}"/media/nuageinit/user_data - atf_check -o inline:"pkg install -y curl\npkg info -q curl\n" -e inline:"nuageinit: Invalid type: table for packages entry number 2\n" /usr/libexec/nuageinit "${PWD}"/media/nuageinit postnet + atf_check -o inline:"pkg install -y 'curl'\npkg info -q 'curl'\n" -e inline:"nuageinit: Invalid type: table for packages entry number 2\n" /usr/libexec/nuageinit "${PWD}"/media/nuageinit postnet } config2_userdata_update_packages_body() From nobody Tue May 12 08:15:21 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gF8Xq3Bb7z6dGhm; Tue, 12 May 2026 08:15:23 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gF8Xq2YSmz43bX; Tue, 12 May 2026 08:15:23 +0000 (UTC) (envelope-from bapt@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778573723; 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=yYueH2zL/CazWv42Pk0M9f1lwsJ9+yoASEVp2X3z0ec=; b=e2HZrvzHkS5+XleSJbuEMd9xODFDKEANMEP17DaZU/EjrTAzM6daeEY+i23BYVm9X5hXCZ kjQo8z5yNHQktgkMzN6kTooe+NrO1RzNC+fyf8xtKAPX9wC3pmnh3wljfcGDIDTj/ndxco J6yKCyt/SUjfWcIEqkM6ydgUjZYFppuIRr+1KbGir+e9eIcnahZPfgnhkKGRqCfO/6IAv/ seYg+lm8kbHUXnqgJbEeKCFhE92gBkzXQ8lgESiSYwPbg2Rc5iCrICa0cCkaGN/9cP37Iu aS4GhLX64xBi4SSY1Xaj0Wnob8U4JrGn827GPyQI9BZUzX+qLkxUCh7VQcmVcw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778573723; a=rsa-sha256; cv=none; b=x8Pe9+1fvgjL+TbASw1yMJrNp6HRVybPBNvKPmaFQcoF1REbqq2hGsKNQnOMZqnJ+LDGgL UeX8n4PmuXMpCiRf0RVRd6q5+eVyIu9Xp1WUqbaq4NuxLrlhVB7/XeAbeZIKwUp6QX59YL IVasJshT+Jq5BVzIf/hXbreZzlSqg6a50rSo2zD4dtO7jH0/C1EKcu4j2iKmh4JTDDdNRw UbcsbFDD6r4dF7HpG1Wr+knryFweB4xKELSVU86r8gWIvis+Ds3yRIbXrFLtmEcybLSS2U yKDhGmSZu+Tq90hz0/0l9WftgfblVe3FymzDkgY7x0Xrau89OIaGs0T3P8DZxg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778573723; 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=yYueH2zL/CazWv42Pk0M9f1lwsJ9+yoASEVp2X3z0ec=; b=c9cd6HSeHrKdYZROFUzJChnnDz/2isi5qVXSnj/1/ov/OsW+5wKsDZ9ntMHFpLwXgEEVqc mRm+J9PKKj3/VwBZcUSwjOPLTcKz5HCcqZeyrvTkadgsVCTgh0H7tW0rPCYxuIiSsWvYrt LhaPjy/SWyfi9Ow3lUiKblXwTMcnvk3bGrsVnLpvWtqN7LDBtmV8oOF/XpuifdwJ13Agx4 nfKZHEcY4cQ0VeSjteHkcAXz1uJNvXf+Q+iTsZQiOoo0XgNa2cy8ju8EEecCGj42VSmPdf nU53h0LnVrBhHYmwoI2j42T5bvd82TSLUWOH0YZK3Ay2uMCwUNQPW3WLTWBq0w== Received: from b.nours.eu (b.nours.eu [54.38.177.57]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (Client did not present a certificate) (Authenticated sender: bapt) by smtp.freebsd.org (Postfix) with ESMTPSA id 4gF8Xq1LHpzZKR; Tue, 12 May 2026 08:15:23 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: by b.nours.eu (Postfix, from userid 1001) id DE0D63D576; Tue, 12 May 2026 10:15:21 +0200 (CEST) Date: Tue, 12 May 2026 10:15:21 +0200 From: Baptiste Daroussin To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 8b70a203be10 - main - nuageinit: fix command injection and related issues Message-ID: References: <6a02dc5c.24b1f.734d8e95@gitrepo.freebsd.org> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <6a02dc5c.24b1f.734d8e95@gitrepo.freebsd.org> On Tue 12 May 07:53, Baptiste Daroussin wrote: > The branch main has been updated by bapt: > > URL: https://cgit.FreeBSD.org/src/commit/?id=8b70a203be10411c560ed303ab25713d70b316e9 > > commit 8b70a203be10411c560ed303ab25713d70b316e9 > Author: Baptiste Daroussin > AuthorDate: 2026-05-07 18:22:14 +0000 > Commit: Baptiste Daroussin > CommitDate: 2026-05-12 07:52:32 +0000 > > nuageinit: fix command injection and related issues > > - Add shell_escape() helper to safely escape shell arguments > - Apply shell_escape to all user-controlled values in shell commands: > adduser (usershow, useradd, lock, primary_group, groups) > addgroup (groupshow, groupadd, members) > exec_change_password (usermod) > settimezone (tzsetup root and timezone) > install_package (pkg package names) > - Escape double quotes in hostname when writing rc.conf.d/hostname > - Add missing 'local' declaration for resolvconf_command in nameservers() > - Escape interface name in resolvconf -a command > - Change open_resolvconf_conf() from 'w' to 'a' mode to prevent > data loss when nameservers() is called multiple times > - Clean up stale resolvconf.conf at the start of each boot > (skip on postnet to preserve config written by first call) > > MFC After: 1 day Part of this has been reported by: Yazdan Soltani sorry I forgot to mention. Best regards, Bapt From nobody Tue May 12 09:20:59 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gFB0Y3D6Kz6dLpN; Tue, 12 May 2026 09:21:01 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFB0Y2hndz3HkQ; Tue, 12 May 2026 09:21:01 +0000 (UTC) (envelope-from ivy@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778577661; 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=TYFFkcRKWU6Y9keTpBRlwsX8oGPhAXFRTr/0AT7scRY=; b=sELA9WN+iqkeujZksGKng0dRqLF3RAclU1sDnZUMMEMupAHnjgLpvl+EUp31anMTcjwqMy tRJiRn4wySukV3XLHuVP3TgOF/osNFVOu5Tj47a2AJU7J0wJg83mqofHUwahRtZjvh1s6/ P1ZZ3m7kwqxJWQ/6JyG6e3t1hXDtkyklojnZ9Xqp/LlDEbBGako1keooPg031RNhPtUtCy aa6PzEvz+08b5X9pnFuODOEof+2X4AjVAQ5D8aeDoaovO4mSkcpmEdspNVvsu9zsnY58TG ZvcjXuYOJl2fZjA43hjK49OPmgug7T6DYVnZYCsS/5TDufPrccnByp03mlRGKQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778577661; a=rsa-sha256; cv=none; b=xPrZ1dt0SDgHi2Prvz98LC07joHcv4KqOHqhx90/FXutH/GTlw507Vl+Z/XiyIpQArRRSj IKuxteh3HMBWHwYgqFmZbrnv9CciEmQuTc1e6UnjbrNkP3uqvmZy4xMYdNulnjttQLmAps k130f/nvF4nbZowEk81UIz0R1JALpCGvo7hK5mtQy+34GdPiCFObahOdKFptaiY4cW81Ek F+a5MzuZE2GjvYhJBrkIq+Sa9hfQLD0bne2AZ4+aIQXUPh8cTb/9cZgerQhkZ8vk1qHGx6 vxJhynt1ezbeQYu4h6YMZuHYc1VYpqlv4grvohFnIcLSsgmlkWQRToVkB3kirg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778577661; 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=TYFFkcRKWU6Y9keTpBRlwsX8oGPhAXFRTr/0AT7scRY=; b=LZFP2n+GtoeeTvHhjbI1Rjt9Zup79/RRu/QzdjBz4C6VfHmeSmQHXTSYqoYcxEllDyGK5P 8FHkUOwb03SpmEZUxGykGeyjT3NxlmcT/QEArOo3/L/oUnE2oXgM9sAiAIsjMgyYusHW58 SWhdvCdGt0qdrPCD1h79vsrY9qSytO4uSf8HpoVXuuK0WhNs2WVEX9yrYNQDEcGGKMZIZM m86plmNZG/9Xl2O0h1xNUrbt3pd8bVVNX6oN/C6AFQlFnJD9+3zh49huYw0wBz5AGqP8tg Xeyiq+ct6vYPaFUbdntC8uUWOspgSuIbZJNqZt2U84DrLxc/aKqncVFH8d8krQ== Received: from rose.le-fay.org (rose.le-fay.org [IPv6:2a00:1098:6b:400::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: ivy/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4gFB0X5lgSzkm7; Tue, 12 May 2026 09:21:00 +0000 (UTC) (envelope-from ivy@freebsd.org) Date: Tue, 12 May 2026 10:20:59 +0100 From: Lexi Winter To: Chuck Tuffli Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 25942dddc8a8 - main - smart: Connect contrib/smart to build Message-ID: Mail-Followup-To: Chuck Tuffli , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org References: <6a025660.37fa7.6a3f7fc0@gitrepo.freebsd.org> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="wPgJQBgrz6YCK84D" Content-Disposition: inline In-Reply-To: <6a025660.37fa7.6a3f7fc0@gitrepo.freebsd.org> --wPgJQBgrz6YCK84D Content-Type: text/plain; charset=us-ascii Content-Disposition: inline hello, Chuck Tuffli wrote in <6a025660.37fa7.6a3f7fc0@gitrepo.freebsd.org>: > smart: Connect contrib/smart to build this has broken the armv7 build: --- all_subdir_usr.sbin/smart --- /aux0/ci/worker/main-linux-clang-armv7/build/contrib/smart/libsmart.c:1351:26: error: format specifies type 'unsigned long' but the argument has type 'size_t' (aka 'unsigned int') [-Werror,-Wformat] 1350 | dprintf("bad read (%d) from page %#x (bytes=%lu)\n", rc, | ~~~ | %zu 1351 | plist->pages[p].id, plist->pages[p].bytes); | ^~~~~~~~~~~~~~~~~~~~~ /aux0/ci/worker/main-linux-clang-armv7/build/contrib/smart/libsmart_priv.h:36:69: note: expanded from macro 'dprintf' 36 | #define dprintf(f, ...) if (do_debug) fprintf(stderr, "dbg: " f, ## __VA_ARGS__) | ~ ^~~~~~~~~~~ 1 error generated. --wPgJQBgrz6YCK84D Content-Type: application/pgp-signature; name=signature.asc -----BEGIN PGP SIGNATURE----- iHUEABYKAB0WIQSyjTg96lp3RifySyn1nT63mIK/YAUCagLw9wAKCRD1nT63mIK/ YNpJAP9qIApUQMf7+9CPkHZ+tvbwX9G3eTmTyC+v5JO0Ol/jpwEA9sGDhT0aPO+v M7TPgcMNaLpgWjXRyfZTbt8BAGrtGw0= =SkBm -----END PGP SIGNATURE----- --wPgJQBgrz6YCK84D-- From nobody Tue May 12 09:53:05 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gFBjY2HBkz6dPDn for ; Tue, 12 May 2026 09: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFBjY1Twkz3Vl9 for ; Tue, 12 May 2026 09: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=1778579585; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=P6QfCeNyUe55iwYIgv2yjKUkbD7a+4qlFO6eYxGlUtw=; b=X7gqTCygX7ALw7qjFXPygdqt/3o9c9AMQBZt4TBOczm6pDONWWL4E0lQ5Zk+3hS9LyXAKt f0FlgTzGo7N3IjWh5PBiK8yDPssLeTweleRwDOM+F6Y35Umu3HnAOWj3pftiabqINXgUTZ vg0NPWOvlodc9oEljHGvSgkG8i1rbnq2kRKILNQNlZcVxXPogH/4vQ2lN2Rcrs5V7L8dBq DOR13iU6Log91C66WS35VBZYPgfqMpvSYBsMqchSk61bMvhNCPwtF/jqrBIHHXpmCrWzSl gpqyWndGS7Wlr1+GP5y6YjZeXnBUg/GPLXPTsOmptWALwECZ+ZX8c8QngtjNOg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778579585; a=rsa-sha256; cv=none; b=OJZfBSMia/OcchT70LvMG6W3q2U7mwpRB8PsmK1FYx9xvjrQmohafXTv/NlLUix3gIlRqo 7x4B3xW930ZNIA0qRYijXR3R9h2oNXZQt8PHTvBH4J94CfDogA2GqxK1gdBuQx+IPb1bt3 Sd4XFrqb1JUeODMaQ/Ox9/O6bg+nnQL7VJdNqMZRPeIkOgv68AplVAuusMRjdaaBQOVZJ7 7BJEenr7vlRnNcySN5YWDUSKqx1SjK92lbbGaREE6Qmcv51QIFkIJLmEqXrHRK9B8/FrP3 NAdYvnbmFcsATXVi2FEtzYM58bAfpFCSbMqla6INelmTOx2MgpO30i4saJuhtQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778579585; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=P6QfCeNyUe55iwYIgv2yjKUkbD7a+4qlFO6eYxGlUtw=; b=UN8K2l27YgcOhkuybK3xQyR9utIugoJMhEKVwkqhMvmOn8ch1DJHX5Ezmkhk8mFvgdUA5m vY+ejT3sSuEmTDuCBp45GNf6Au8xcZXFJzy1d5LhhQbtKMg0tszWs32EgMMAgCfXbhfBDJ 6p0P4JGvzYnlvT67YHdEOQsqorM4BSpE4A0V4bplsR9s0QTaPvcTGe8ULlH4EEY6wbT21U 4pfi4hhEczn6i9RJjnMC/jHaz/aA7J8JBfj1pPbzl6wUAD6DOa6+u59eCIVTd/0A/uXuws fUmPB33gzhlpfZGwpUZlwk7rSKaEE+2sf53nQvVmER8a3DqSxxW0tEN47WWVpw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFBjY13PbzyKj for ; Tue, 12 May 2026 09:53:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 39142 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 09:53:05 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Aymeric Wibo Subject: git: 6f451c60918f - main - power: Rename power transition enum List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: 6f451c60918f2152ebe89f561f04e5219cecffa6 Auto-Submitted: auto-generated Date: Tue, 12 May 2026 09:53:05 +0000 Message-Id: <6a02f881.39142.4116e66@gitrepo.freebsd.org> The branch main has been updated by obiwac: URL: https://cgit.FreeBSD.org/src/commit/?id=6f451c60918f2152ebe89f561f04e5219cecffa6 commit 6f451c60918f2152ebe89f561f04e5219cecffa6 Author: Aymeric Wibo AuthorDate: 2026-05-12 09:46:19 +0000 Commit: Aymeric Wibo CommitDate: 2026-05-12 09:46:24 +0000 power: Rename power transition enum Just so it isn't so long. Changing now before the API freezes, after discussion with olce@. While here, improve the wording in the comments for power transitions and sleep types a bit. Reviewed by: olce Approved by: olce Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D56953 --- sys/dev/acpi_support/acpi_ibm.c | 2 +- sys/dev/syscons/syscons.c | 4 ++-- sys/dev/vt/vt_core.c | 4 ++-- sys/kern/subr_power.c | 8 ++++---- sys/sys/power.h | 19 ++++++++++--------- 5 files changed, 19 insertions(+), 18 deletions(-) diff --git a/sys/dev/acpi_support/acpi_ibm.c b/sys/dev/acpi_support/acpi_ibm.c index 1221384e7d8a..2967832a0878 100644 --- a/sys/dev/acpi_support/acpi_ibm.c +++ b/sys/dev/acpi_support/acpi_ibm.c @@ -1453,7 +1453,7 @@ acpi_ibm_eventhandler(struct acpi_ibm_softc *sc, int arg) * instead of suspend-to-RAM. */ case IBM_EVENT_SUSPEND_TO_RAM: - power_pm_suspend(POWER_SSTATE_TRANSITION_SUSPEND); + power_pm_suspend(POWER_TRANSITION_SUSPEND); break; case IBM_EVENT_BLUETOOTH: diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c index 1a2969d6f2d8..fe440b68f209 100644 --- a/sys/dev/syscons/syscons.c +++ b/sys/dev/syscons/syscons.c @@ -3987,10 +3987,10 @@ next_code: break; case SUSP: - power_pm_suspend(POWER_SSTATE_TRANSITION_SUSPEND); + power_pm_suspend(POWER_TRANSITION_SUSPEND); break; case STBY: - power_pm_suspend(POWER_SSTATE_TRANSITION_STANDBY); + power_pm_suspend(POWER_TRANSITION_STANDBY); break; case DBG: diff --git a/sys/dev/vt/vt_core.c b/sys/dev/vt/vt_core.c index f7cffcea5b92..68e9f45cff56 100644 --- a/sys/dev/vt/vt_core.c +++ b/sys/dev/vt/vt_core.c @@ -804,11 +804,11 @@ vt_machine_kbdevent(struct vt_device *vd, int c) return (1); case SPCLKEY | STBY: /* XXX Not present in kbdcontrol parser. */ /* Put machine into Stand-By mode. */ - power_pm_suspend(POWER_SSTATE_TRANSITION_STANDBY); + power_pm_suspend(POWER_TRANSITION_STANDBY); return (1); case SPCLKEY | SUSP: /* kbdmap(5) keyword `susp`. */ /* Suspend machine. */ - power_pm_suspend(POWER_SSTATE_TRANSITION_SUSPEND); + power_pm_suspend(POWER_TRANSITION_SUSPEND); return (1); } diff --git a/sys/kern/subr_power.c b/sys/kern/subr_power.c index 761c9c0639ce..47682a0ee75e 100644 --- a/sys/kern/subr_power.c +++ b/sys/kern/subr_power.c @@ -176,7 +176,7 @@ power_pm_get_type(void) } void -power_pm_suspend(enum power_sstate_transition trans) +power_pm_suspend(enum power_transition trans) { enum power_stype stype; @@ -184,13 +184,13 @@ power_pm_suspend(enum power_sstate_transition trans) return; switch (trans) { - case POWER_SSTATE_TRANSITION_STANDBY: + case POWER_TRANSITION_STANDBY: stype = power_standby_stype; break; - case POWER_SSTATE_TRANSITION_SUSPEND: + case POWER_TRANSITION_SUSPEND: stype = power_suspend_stype; break; - case POWER_SSTATE_TRANSITION_HIBERNATE: + case POWER_TRANSITION_HIBERNATE: stype = power_hibernate_stype; break; default: diff --git a/sys/sys/power.h b/sys/sys/power.h index 85e0b12391ff..e420717e1aa7 100644 --- a/sys/sys/power.h +++ b/sys/sys/power.h @@ -48,21 +48,22 @@ * Sleep state transition requests. * * These are high-level sleep states that the system can enter. They map to - * a specific generic sleep type (enum power_stype). + * a specific generic sleep type (enum power_stype), depending on the + * kern.power.* sysctls. */ -enum power_sstate_transition { - POWER_SSTATE_TRANSITION_STANDBY, - POWER_SSTATE_TRANSITION_SUSPEND, - POWER_SSTATE_TRANSITION_HIBERNATE, +enum power_transition { + POWER_TRANSITION_STANDBY, + POWER_TRANSITION_SUSPEND, + POWER_TRANSITION_HIBERNATE, }; /* * Sleep type. * * These are the specific generic methods of entering a sleep state. E.g. - * POWER_SSTATE_TRANSITION_SUSPEND could be set to enter either suspend-to-RAM - * (which is S3 on ACPI systems), or suspend-to-idle (S0ix on ACPI systems). - * This would be done through the kern.power.suspend sysctl. + * POWER_TRANSITION_SUSPEND could be set to enter either firmware suspend (which + * is suspend-to-RAM or S3 on ACPI systems), or suspend-to-idle (S0ix on ACPI + * platforms). This would be done through the kern.power.suspend sysctl. */ enum power_stype { POWER_STYPE_AWAKE, @@ -96,7 +97,7 @@ extern int power_pm_register(u_int _pm_type, power_pm_fn_t _pm_fn, void *_pm_arg, bool _pm_supported[static POWER_STYPE_COUNT]); extern u_int power_pm_get_type(void); -extern void power_pm_suspend(enum power_sstate_transition _trans); +extern void power_pm_suspend(enum power_transition _trans); /* * System power API. From nobody Tue May 12 10:20:41 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gFCKX00xcz6dQw3 for ; Tue, 12 May 2026 10:20: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFCKW25TYz3bcH for ; Tue, 12 May 2026 10:20:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778581247; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=P4j7l9D/EslOB8JAowTcSWZiwmz2i9eK02FukDtvXMI=; b=yBxX1QOtfh/ZmZNBIntoSal/O8gpGSwCEsIrV0GxDGBNo44gqIX7u1+marevH9PXHXqX1k 1IKvOwo/jM5lL9yXg/ZjHQIz021yQ7Cc8f67r1/dmTYyaKLXgSxMHf9t7+I+2qKAvgmMYj 9Rt5HcXS15TxDSxCX75iNfTun5EYePRq3hgwSO05t5jI32x04JY1vMW/0sGZ9G1LCMsELg MEhl9AFNCuMOzydyS4TlfvEtiGqoB6NZoUFddfhCq+GCypqEvfYU6Oh9k67vX9Kqd+2U0d jD1e274Qh7RZyOiI1VBn57T1xt4OsHbuoHt9DZL8TzXJ86EKRSZmT8KhHeAB5w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778581247; a=rsa-sha256; cv=none; b=Jhou+ZQzorkJ7+yRoshVysV2qMFOQZ7sNUqWS0o+BsqzVOgRCsO0KGyEx6WOTPtPnZo2cH nbqPi2tiPu47Ab/nxO4YRGEE5/f5Wt5LtJH8ce3dHnmzymREvjkjLeVPYzyU8uMQUwCCck 2VbXka0HG4WIzC7yfx9q0qyAJbiUaRc7L3kBvKHYyk73HGLVhNEoMUXGV2BAU3i0BKFg0w c4dorQdpOrgkV+YMcjNyNHABLvsKUuhTc6O3I6r3SCznitpZcTHP7JWtWW9aWXZ6rQUDjB 2q7HIaGa3Jhz7EJnyER96OkRD03SAEqUp2M2S1UZcjUOvC0pnMQiT/kPwlYT1Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778581247; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=P4j7l9D/EslOB8JAowTcSWZiwmz2i9eK02FukDtvXMI=; b=hKj/EzBiSXGAidpVXW0+7dO4/pHo5HHe8sGFhLY6efb1pjpH1BybwvrkOvqx7puP0rNVTu HIuwy5qh3g1H3lCXaw+RhGQiIE/Nrx5shcT62QGMkfF2ORr/qiPRzJ05w+aM1l2lTZ9aqF 3IRBV/16zeyYrbXkefvHPA7/vLCXgXBaKQMEEKW7+1CUn1SjLfetkHXf1jfiPJiy4Uc2oc BFtpnIOzbUEgjbOuae0v7tjMtDA9BRq0hL9N8nm5D9WPFmvkgNFsNhspPf4W8F5lM9HrH0 av/cgPkru43C8Wm84jCtcAu/H3xfZX3fEC+ZiQlpyqdjV5tcxOwuAarqKs9FGQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFCKW1j4Gz10Cp for ; Tue, 12 May 2026 10:20:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3c055 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 10:20:41 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ruslan Bukin Subject: git: bcecad2c24aa - main - riscv: IOMMU support List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: br X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bcecad2c24aa500913559c00f1be8b364a3ff150 Auto-Submitted: auto-generated Date: Tue, 12 May 2026 10:20:41 +0000 Message-Id: <6a02fef9.3c055.3a6526da@gitrepo.freebsd.org> The branch main has been updated by br: URL: https://cgit.FreeBSD.org/src/commit/?id=bcecad2c24aa500913559c00f1be8b364a3ff150 commit bcecad2c24aa500913559c00f1be8b364a3ff150 Author: Ruslan Bukin AuthorDate: 2026-05-12 10:09:04 +0000 Commit: Ruslan Bukin CommitDate: 2026-05-12 10:11:32 +0000 riscv: IOMMU support Support for RISC-V IOMMU spec v1.0.1 (ratified) https://github.com/riscv-non-isa/riscv-iommu Supports translation for PCI devices only. Supports 1 or 2-level device-directory-table (DDT). Supports SV39 and SV48 virtual memory system (on per-device basis). Supports both "standard" and "extended" device-context (DC) structure. Supports "bypass" mode to disable translation for a particular device. Supports WSI (Wire-Signalled Interrupts) only. This includes both PCI-bus and FDT attachment drivers. Note in case of PCI-bus attachment, interrupts are not available. In this case no error report is provided in case of translation fault. Otherwise interrupts are not needed. Differential Revision: https://reviews.freebsd.org/D55922 --- sys/conf/files.riscv | 9 + sys/riscv/conf/GENERIC | 1 + sys/riscv/include/bus_dma_impl.h | 3 + sys/riscv/include/iommu.h | 10 + sys/riscv/iommu/iommu.c | 1351 ++++++++++++++++++++++++++++++++++++++ sys/riscv/iommu/iommu.h | 359 ++++++++++ sys/riscv/iommu/iommu_fdt.c | 145 ++++ sys/riscv/iommu/iommu_frontend.c | 505 ++++++++++++++ sys/riscv/iommu/iommu_frontend.h | 38 ++ sys/riscv/iommu/iommu_if.m | 147 +++++ sys/riscv/iommu/iommu_pci.c | 172 +++++ sys/riscv/iommu/iommu_pmap.c | 629 ++++++++++++++++++ sys/riscv/iommu/iommu_pmap.h | 49 ++ 13 files changed, 3418 insertions(+) diff --git a/sys/conf/files.riscv b/sys/conf/files.riscv index 90a74367a54f..58a31b5f326e 100644 --- a/sys/conf/files.riscv +++ b/sys/conf/files.riscv @@ -6,6 +6,7 @@ cddl/dev/fbt/riscv/fbt_isa.c optional dtrace_fbt | dtraceall compile-with "${ crypto/des/des_enc.c optional netsmb dev/cpufreq/cpufreq_dt.c optional cpufreq fdt dev/ofw/ofw_cpu.c optional fdt +dev/ofw/ofw_pci.c optional pci fdt dev/ofw/ofw_pcib.c optional pci fdt dev/pci/pci_dw.c optional pci fdt dev/pci/pci_dw_if.m optional pci fdt @@ -42,6 +43,14 @@ libkern/memset.c standard libkern/strcmp.c standard libkern/strlen.c standard libkern/strncmp.c standard +riscv/iommu/iommu_frontend.c standard +riscv/iommu/iommu_if.m standard +riscv/iommu/iommu.c standard +riscv/iommu/iommu_fdt.c optional fdt +riscv/iommu/iommu_pci.c optional pci +riscv/iommu/iommu_pmap.c optional iommu +dev/iommu/busdma_iommu.c optional iommu +dev/iommu/iommu_gas.c optional iommu riscv/riscv/aplic.c standard riscv/riscv/autoconf.c standard riscv/riscv/bus_machdep.c standard diff --git a/sys/riscv/conf/GENERIC b/sys/riscv/conf/GENERIC index 827d5efef50b..cce2787ed5d7 100644 --- a/sys/riscv/conf/GENERIC +++ b/sys/riscv/conf/GENERIC @@ -77,6 +77,7 @@ options RACCT # Resource accounting framework options RACCT_DEFAULT_TO_DISABLED # Set kern.racct.enable=0 by default options RCTL # Resource limits options SMP +options IOMMU # RISC-V SBI console device rcons diff --git a/sys/riscv/include/bus_dma_impl.h b/sys/riscv/include/bus_dma_impl.h index 09fd29b74f8e..8c2040a68f52 100644 --- a/sys/riscv/include/bus_dma_impl.h +++ b/sys/riscv/include/bus_dma_impl.h @@ -41,6 +41,7 @@ struct bus_dma_tag_common { int flags; bus_dma_lock_t *lockfunc; void *lockfuncarg; + int domain; }; struct bus_dma_impl { @@ -52,6 +53,8 @@ struct bus_dma_impl { int (*tag_destroy)(bus_dma_tag_t dmat); int (*map_create)(bus_dma_tag_t dmat, int flags, bus_dmamap_t *mapp); int (*map_destroy)(bus_dma_tag_t dmat, bus_dmamap_t map); + int (*tag_set_domain)(bus_dma_tag_t); + bool (*id_mapped)(bus_dma_tag_t, vm_paddr_t, bus_size_t); int (*mem_alloc)(bus_dma_tag_t dmat, void** vaddr, int flags, bus_dmamap_t *mapp); void (*mem_free)(bus_dma_tag_t dmat, void *vaddr, bus_dmamap_t map); diff --git a/sys/riscv/include/iommu.h b/sys/riscv/include/iommu.h new file mode 100644 index 000000000000..38214b7003f4 --- /dev/null +++ b/sys/riscv/include/iommu.h @@ -0,0 +1,10 @@ +/*- + * This file is in the public domain. + */ + +#ifndef _MACHINE_IOMMU_H_ +#define _MACHINE_IOMMU_H_ + +#include + +#endif /* !_MACHINE_IOMMU_H_ */ diff --git a/sys/riscv/iommu/iommu.c b/sys/riscv/iommu/iommu.c new file mode 100644 index 000000000000..59df2e68384f --- /dev/null +++ b/sys/riscv/iommu/iommu.c @@ -0,0 +1,1351 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2026 Ruslan Bukin + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include + +#include +#include + +#include +#include + +#include +#include +#include + +#include "iommu_if.h" + +#define dprintf(fmt, ...) + +MALLOC_DEFINE(M_IOMMU, "RISCV_IOMMU", "RISC-V IOMMU"); + +#define RD4(sc, reg) bus_read_4(sc->res[0], (reg)) +#define WR4(sc, reg, val) bus_write_4(sc->res[0], (reg), (val)) +#define RD8(sc, reg) bus_read_8(sc->res[0], (reg)) +#define WR8(sc, reg, val) bus_write_8(sc->res[0], (reg), (val)) + +#define CQ_ENTRY_DWORDS 2 /* 16-byte */ +#define CQ_ENTRY_COUNT 8192 /* Amount of 16-byte entries. */ +#define FQ_ENTRY_DWORDS 4 /* 32-byte */ +#define FQ_ENTRY_COUNT 8192 /* Amount of 32-byte entries. */ +#define PQ_ENTRY_DWORDS 2 /* 16-byte */ +#define PQ_ENTRY_COUNT 8192 /* Amount of 16-byte entries. */ + +#define DDT_NON_LEAF_DWORDS 1 +#define DDT_DC_STD_DWORDS 4 /* Standard-format DC. */ +#define DDT_DC_EXT_DWORDS 8 /* Extended-format DC. */ +#define DDT_L1_DID_BITS 9 /* All formats. */ + +#define QUEUE_ALIGN (1024 * 1024) /* TODO */ +#define QUEUE_HEAD(q) ((q)->csr + RISCV_IOMMU_CQH - RISCV_IOMMU_CQB) +#define QUEUE_TAIL(q) ((q)->csr + RISCV_IOMMU_CQT - RISCV_IOMMU_CQB) +#define QUEUE_IPSR(q) (1 << (q)->idx) + +#define PHYS_TO_PPN(p) ((p) >> 12) + +struct riscv_iommu_fq_event { + uint16_t cause_id; + char *descr; +}; + +static struct riscv_iommu_fq_event fq_events[] = { + { FQ_CAUSE_INST_FAULT, "Instruction access fault" }, + { FQ_CAUSE_RD_ADDR_MISALIGNED, "Read address misaligned" }, + { FQ_CAUSE_RD_FAULT, "Read access fault" }, + { FQ_CAUSE_WR_ADDR_MISALIGNED, "Write/AMO address misaligned" }, + { FQ_CAUSE_WR_FAULT, "Write/AMO access fault" }, + { FQ_CAUSE_INST_FAULT_S, "Instruction page fault" }, + { FQ_CAUSE_RD_FAULT_S, "Read page fault" }, + { FQ_CAUSE_WR_FAULT_S, "Write/AMO page fault" }, + { FQ_CAUSE_INST_FAULT_VS, "Instruction guest page fault" }, + { FQ_CAUSE_RD_FAULT_VS, "Read guest-page fault" }, + { FQ_CAUSE_WR_FAULT_VS, "Write/AMO guest-page fault" }, + { FQ_CAUSE_DMA_DISABLED, "All inbound transactions disallowed" }, + { FQ_CAUSE_DDT_LOAD_FAULT, "DDT entry load access fault" }, + { FQ_CAUSE_DDT_INVALID, "DDT entry not valid" }, + { FQ_CAUSE_DDT_MISCONFIGURED, "DDT entry misconfigured" }, + { FQ_CAUSE_TR_TYPE_DISALLOWED, "Transaction type disallowed" }, + { FQ_CAUSE_MSI_LOAD_FAULT, "MSI PTE load access fault" }, + { FQ_CAUSE_MSI_INVALID, "MSI PTE not valid" }, + { FQ_CAUSE_MSI_MISCONFIGURED, "MSI PTE misconfigured" }, + { FQ_CAUSE_MRIF_FAULT, "MRIF access fault" }, + { FQ_CAUSE_PDT_LOAD_FAULT, "PDT entry load access fault" }, + { FQ_CAUSE_PDT_INVALID, "PDT entry not valid" }, + { FQ_CAUSE_PDT_MISCONFIGURED, "PDT entry misconfigured" }, + { FQ_CAUSE_DDT_CORRUPTED, "DDT data corruption" }, + { FQ_CAUSE_PDT_CORRUPTED, "PDT data corruption" }, + { FQ_CAUSE_MSI_PT_CORRUPTED, "MSI PT data corruption" }, + { FQ_CAUSE_MRIF_CORRUPTED, "MSI MRIF data corruption" }, + { FQ_CAUSE_INTERNAL_DP_ERROR, "Internal data path error" }, + { FQ_CAUSE_MSI_WR_FAULT, "IOMMU MSI write access fault" }, + { FQ_CAUSE_PT_CORRUPTED, "1st/2nd-stage PT data corruption" }, + { 0, NULL }, +}; + +static void +riscv_iommu_init_pscids(struct riscv_iommu_softc *sc) +{ + + sc->pscid_set_size = (1 << sc->pscid_bits); + sc->pscid_set = bit_alloc(sc->pscid_set_size, M_IOMMU, M_WAITOK); + mtx_init(&sc->pscid_set_mutex, "pscid set", NULL, MTX_SPIN); +} + +static int +riscv_iommu_pscid_alloc(struct riscv_iommu_softc *sc, int *new_pscid) +{ + + mtx_lock_spin(&sc->pscid_set_mutex); + bit_ffc(sc->pscid_set, sc->pscid_set_size, new_pscid); + if (*new_pscid == -1) { + mtx_unlock_spin(&sc->pscid_set_mutex); + return (ENOMEM); + } + bit_set(sc->pscid_set, *new_pscid); + mtx_unlock_spin(&sc->pscid_set_mutex); + + return (0); +} + +static void +riscv_iommu_pscid_free(struct riscv_iommu_softc *sc, int pscid) +{ + + mtx_lock_spin(&sc->pscid_set_mutex); + bit_clear(sc->pscid_set, pscid); + mtx_unlock_spin(&sc->pscid_set_mutex); +} + +static uint32_t +riscv_iommu_q_inc_tail(struct riscv_iommu_queue *q) +{ + + return ((q->lc.tail + 1) & q->mask); +} + +static uint32_t +riscv_iommu_q_inc_head(struct riscv_iommu_queue *q) +{ + + return ((q->lc.head + 1) & q->mask); +} + +static int +riscv_iommu_q_has_space(struct riscv_iommu_queue *q) +{ + + if (riscv_iommu_q_inc_tail(q) != q->lc.head) + return (1); + + return (0); +} + +static int +riscv_iommu_q_empty(struct riscv_iommu_queue *q) +{ + + if (q->lc.tail == q->lc.head) + return (1); + + return (0); +} + +static int +riscv_iommu_dequeue(struct riscv_iommu_softc *sc, struct riscv_iommu_queue *q, + void *data) +{ + void *entry_addr; + + q->lc.val = RD8(sc, q->head_off); + entry_addr = (void *)((uint64_t)q->vaddr + q->lc.head * q->entry_size); + memcpy(data, entry_addr, q->entry_size); + q->lc.head = riscv_iommu_q_inc_head(q); + WR4(sc, q->head_off, q->lc.head); + + return (0); +} + +static int +riscv_iommu_enqueue(struct riscv_iommu_softc *sc, struct riscv_iommu_queue *q, + void *data) +{ + void *entry_addr; + + RISCV_IOMMU_LOCK(sc); + + /* Ensure that a space is available. */ + do { + q->lc.head = RD4(sc, q->head_off); + } while (riscv_iommu_q_has_space(q) == 0); + + /* Write the command to the current tail entry. */ + entry_addr = (void *)((uint64_t)q->vaddr + q->lc.tail * q->entry_size); + memcpy(entry_addr, data, q->entry_size); + + /* Increment tail index. */ + q->lc.tail = riscv_iommu_q_inc_tail(q); + WR4(sc, q->tail_off, q->lc.tail); + + RISCV_IOMMU_UNLOCK(sc); + + return (0); +} + +static void +riscv_iommu_sync(struct riscv_iommu_softc *sc, struct riscv_iommu_queue *q) +{ + struct riscv_iommu_command cmd; + uint64_t reg; + + bzero(&cmd, sizeof(struct riscv_iommu_command)); + reg = COMMAND_OPCODE_IOFENCE; + reg |= FUNC_IOFENCE_FUNC_C | FUNC_IOFENCE_PR | FUNC_IOFENCE_PW; + cmd.dword0 = reg; + + riscv_iommu_enqueue(sc, &sc->cq, (void *)&cmd); + + /* + * FUNC_IOFENCE_WSI does not seem to be implemented in QEMU, + * so ensure all requests are processed in polling mode; + */ + do { + q->lc.head = RD4(sc, q->head_off); + } while (riscv_iommu_q_empty(q) == 0); +} + +static int +riscv_iommu_inval_ddt(struct riscv_iommu_softc *sc) +{ + struct riscv_iommu_command cmd; + uint64_t reg; + + bzero(&cmd, sizeof(struct riscv_iommu_command)); + reg = COMMAND_OPCODE_IODIR; + reg |= FUNC_IODIR_INVAL_DDT; + cmd.dword0 = reg; + + riscv_iommu_enqueue(sc, &sc->cq, (void *)&cmd); + + return (0); +} + +static int +riscv_iommu_inval_ddt_did(struct riscv_iommu_softc *sc, int did) +{ + struct riscv_iommu_command cmd; + uint64_t reg; + + bzero(&cmd, sizeof(struct riscv_iommu_command)); + reg = COMMAND_OPCODE_IODIR; + reg |= FUNC_IODIR_INVAL_DDT; + reg |= FUNC_IODIR_DV; + reg |= (uint64_t)did << FUNC_IODIR_DID_S; + cmd.dword0 = reg; + + riscv_iommu_enqueue(sc, &sc->cq, (void *)&cmd); + + return (0); +} + +/* Invalidate entire address space. */ +static int +riscv_iommu_inval_vma(struct riscv_iommu_softc *sc) +{ + struct riscv_iommu_command cmd; + uint64_t reg; + + bzero(&cmd, sizeof(struct riscv_iommu_command)); + reg = COMMAND_OPCODE_IOTINVAL; + reg |= FUNC_IOTINVAL_VMA; + cmd.dword0 = reg; + + riscv_iommu_enqueue(sc, &sc->cq, (void *)&cmd); + + return (0); +} + +static int +riscv_iommu_inval_vma_page(struct riscv_iommu_softc *sc, vm_offset_t addr, + int pscid) +{ + struct riscv_iommu_command cmd; + uint64_t reg; + + bzero(&cmd, sizeof(struct riscv_iommu_command)); + reg = COMMAND_OPCODE_IOTINVAL; + reg |= FUNC_IOTINVAL_VMA; + reg |= FUNC_IOTINVAL_AV; + reg |= FUNC_IOTINVAL_PSCV; + reg |= pscid << FUNC_IOTINVAL_PSCID_S; + cmd.dword0 = reg; + cmd.dword1 = PHYS_TO_PPN(addr) << FUNC_IOTINVAL_ADDR_S; + + riscv_iommu_enqueue(sc, &sc->cq, (void *)&cmd); + + return (0); +} + +static int +riscv_iommu_inval_vma_pscid(struct riscv_iommu_softc *sc, int pscid) +{ + struct riscv_iommu_command cmd; + uint64_t reg; + + bzero(&cmd, sizeof(struct riscv_iommu_command)); + reg = COMMAND_OPCODE_IOTINVAL; + reg |= FUNC_IOTINVAL_VMA; + reg |= FUNC_IOTINVAL_PSCV; + reg |= pscid << FUNC_IOTINVAL_PSCID_S; + cmd.dword0 = reg; + + riscv_iommu_enqueue(sc, &sc->cq, (void *)&cmd); + + return (0); +} + +static int +riscv_iommu_set_mode(struct riscv_iommu_softc *sc) +{ + struct riscv_iommu_ddt *ddt; + uint64_t reg; + uint64_t base; + + reg = RD8(sc, RISCV_IOMMU_DDTP); + if (reg & DDTP_BUSY) + return (ENXIO); + + ddt = &sc->ddt; + base = ddt->base | (sc->iommu_mode << DDTP_IOMMU_MODE_S); + WR8(sc, RISCV_IOMMU_DDTP, base); + + reg = RD8(sc, RISCV_IOMMU_DDTP); + if (reg != base) { + device_printf(sc->dev, "could not set mode\n"); + return (ENXIO); + } + + riscv_iommu_inval_ddt(sc); + riscv_iommu_inval_vma(sc); + + return (0); +} + +static int +riscv_iommu_enable_queue(struct riscv_iommu_softc *sc, + struct riscv_iommu_queue *q) +{ + uint32_t reg; + int timeout; + + if (q == &sc->cq) + WR4(sc, QUEUE_TAIL(q), 0); + else + WR4(sc, QUEUE_HEAD(q), 0); + + reg = CQCSR_CQEN | CQCSR_CIE | CQCSR_CQMF; + WR4(sc, q->csr, reg); + + timeout = 1000; + do { + reg = RD4(sc, RISCV_IOMMU_CQCSR); + if ((reg & CQCSR_BUSY) == 0) + break; + DELAY(10); + } while (timeout--); + + if (timeout <= 0) { + device_printf(sc->dev, "could not enable command queue\n"); + return (-1); + } + + if ((reg & CQCSR_CQON) == 0) { + device_printf(sc->dev, "could not activate command queue\n"); + return (-1); + } + + /* RW1C interrupt pending bit. */ + WR4(sc, RISCV_IOMMU_IPSR, QUEUE_IPSR(q)); + + return (0); +} + +static int +riscv_iommu_init_queue(struct riscv_iommu_softc *sc, + struct riscv_iommu_queue *q, uint64_t base, uint32_t dwords) +{ + uint64_t reg; + int sz; + + q->entry_size = dwords * 8; + sz = (1 << q->size_log2) * q->entry_size; + + /* Set up the command circular buffer */ + q->vaddr = contigmalloc(sz, M_IOMMU, M_WAITOK | M_ZERO, 0, + (1ul << 48) - 1, QUEUE_ALIGN, 0); + if (q->vaddr == NULL) { + device_printf(sc->dev, "failed to allocate %d bytes\n", sz); + return (-1); + } + + q->mask = (1 << q->size_log2) - 1; + q->head_off = (uint32_t)base - RISCV_IOMMU_CQB + RISCV_IOMMU_CQH; + q->tail_off = (uint32_t)base - RISCV_IOMMU_CQB + RISCV_IOMMU_CQT; + q->paddr = vtophys(q->vaddr); + q->base = (sc->cq.size_log2 - 1) << CQB_LOG2SZ_1_S; + q->base |= PHYS_TO_PPN(q->paddr) << CQB_PPN_S; + WR8(sc, base, q->base); + + /* Verify it sticks. */ + reg = RD8(sc, base); + if (reg != q->base) { + device_printf(sc->dev, "could not init queue\n"); + return (ENXIO); + } + + return (0); +} + +static int +riscv_iommu_init_queues(struct riscv_iommu_softc *sc) +{ + int error; + + sc->cq.size_log2 = ilog2(CQ_ENTRY_COUNT); + sc->fq.size_log2 = ilog2(FQ_ENTRY_COUNT); + sc->pq.size_log2 = ilog2(PQ_ENTRY_COUNT); + + sc->cq.csr = RISCV_IOMMU_CQCSR; + sc->fq.csr = RISCV_IOMMU_FQCSR; + sc->pq.csr = RISCV_IOMMU_PQCSR; + + sc->cq.idx = 0; + sc->fq.idx = 1; + sc->pq.idx = 3; + + /* Command queue (CQ). */ + error = riscv_iommu_init_queue(sc, &sc->cq, RISCV_IOMMU_CQB, + CQ_ENTRY_DWORDS); + if (error) + return (error); + + /* Fault queue (FQ). */ + error = riscv_iommu_init_queue(sc, &sc->fq, RISCV_IOMMU_FQB, + FQ_ENTRY_DWORDS); + if (error) + return (error); + + /* Page request queue (PQ). */ + error = riscv_iommu_init_queue(sc, &sc->pq, RISCV_IOMMU_PQB, + PQ_ENTRY_DWORDS); + if (error) + return (error); + + error = riscv_iommu_enable_queue(sc, &sc->cq); + if (error) + return (error); + + error = riscv_iommu_enable_queue(sc, &sc->fq); + if (error) + return (error); + + error = riscv_iommu_enable_queue(sc, &sc->pq); + if (error) + return (error); + + return (0); +} + +static int +riscv_iommu_init_pagedir(struct riscv_iommu_softc *sc) +{ + + return (0); +} + +static void +riscv_iommu_print_fault(struct riscv_iommu_softc *sc, + struct riscv_iommu_fq_record *rec) +{ + struct riscv_iommu_fq_event *ev; + uint16_t cause_id; + uint16_t ttyp; + uint32_t did; + uint32_t pid; + bool pv, priv; + int i; + + cause_id = (rec->hdr & FQR_HDR_CAUSE_M) >> FQR_HDR_CAUSE_S; + ttyp = (rec->hdr & FQR_HDR_TTYP_M) >> FQR_HDR_TTYP_S; + did = (rec->hdr & FQR_HDR_DID_M) >> FQR_HDR_DID_S; + pid = (rec->hdr & FQR_HDR_PID_M) >> FQR_HDR_PID_S; + pv = (rec->hdr & FQR_HDR_PV) ? 1 : 0; + priv = (rec->hdr & FQR_HDR_PRIV) ? 1 : 0; + + ev = NULL; + for (i = 0; fq_events[i].cause_id != 0; i++) { + if (fq_events[i].cause_id == cause_id) { + ev = &fq_events[i]; + break; + } + } + + if (ev == NULL) { + device_printf(sc->dev, "Fault: unknown fault 0x%x received\n", + cause_id); + return; + } + + device_printf(sc->dev, "Fault: event 0x%x received: %s\n", + ev->cause_id, ev->descr); + device_printf(sc->dev, " hdr 0x%lx\n", rec->hdr); + device_printf(sc->dev, " iotval 0x%lx\n", rec->iotval); + device_printf(sc->dev, " iotval2 0x%lx\n", rec->iotval2); + device_printf(sc->dev, " ttyp 0x%x did 0x%x pid 0x%x pv %d priv %d" + "\n", ttyp, did, pid, pv, priv); +} + +static int +riscv_cq_intr(void *arg) +{ + struct riscv_iommu_softc *sc; + struct riscv_iommu_queue *q; + uint32_t reg; + + sc = arg; + q = &sc->cq; + + reg = RD4(sc, q->csr); + printf("%s: pending %x\n", __func__, reg); + + /* Clear pending bit. */ + WR4(sc, RISCV_IOMMU_IPSR, IPSR_CIP); + + return (FILTER_HANDLED); +} + +static int +riscv_fq_intr(void *arg) +{ + struct riscv_iommu_fq_record rec; + struct riscv_iommu_softc *sc; + struct riscv_iommu_queue *q; + uint32_t reg; + + sc = arg; + q = &sc->fq; + + reg = RD4(sc, q->csr); + printf("%s: pending %x\n", __func__, reg); + + /* Clear pending bit. */ + WR4(sc, RISCV_IOMMU_IPSR, IPSR_FIP); + + do { + riscv_iommu_dequeue(sc, q, &rec); + riscv_iommu_print_fault(sc, &rec); + } while (!riscv_iommu_q_empty(q)); + + return (FILTER_HANDLED); +} + +static int +riscv_pm_intr(void *arg) +{ + struct riscv_iommu_softc *sc; + + sc = arg; + + printf("%s\n", __func__); + + /* Clear pending bit. */ + WR4(sc, RISCV_IOMMU_IPSR, IPSR_PMIP); + + return (FILTER_HANDLED); +} + +static int +riscv_pq_intr(void *arg) +{ + struct riscv_iommu_softc *sc; + struct riscv_iommu_queue *q; + uint32_t reg; + + sc = arg; + q = &sc->pq; + + reg = RD4(sc, q->csr); + printf("%s: pending %x\n", __func__, reg); + + /* Clear pending bit. */ + WR4(sc, RISCV_IOMMU_IPSR, IPSR_PIP); + + return (FILTER_HANDLED); +} + +static int +riscv_iommu_init_ddt_linear(struct riscv_iommu_softc *sc) +{ + struct riscv_iommu_ddt *ddt; + uint64_t size; + uint64_t reg; + + ddt = &sc->ddt; + ddt->num_top_entries = (1 << sc->l0_did_bits); + + size = ddt->num_top_entries * (sc->dc_dwords << 3); + + if (bootverbose) + device_printf(sc->dev, "linear ddt size %ld, num_top_entries " + "%d\n", size, ddt->num_top_entries); + + ddt->vaddr = contigmalloc(size, M_IOMMU, + M_WAITOK | M_ZERO, /* flags */ + 0, /* low */ + (1ul << 48) - 1, /* high */ + size, /* alignment */ + 0); /* boundary */ + if (ddt->vaddr == NULL) { + device_printf(sc->dev, "failed to allocate ddt\n"); + return (ENXIO); + } + + reg = vtophys(ddt->vaddr); + if (bootverbose) + device_printf(sc->dev, "ddt base %p size %lx\n", ddt->vaddr, + size); + ddt->base = PHYS_TO_PPN(reg) << DDTP_PPN_S; + + return (0); +} + +static int +riscv_iommu_init_ddt_2lvl(struct riscv_iommu_softc *sc) +{ + struct riscv_iommu_ddt *ddt; + uint64_t size; + uint64_t reg; + uint64_t sz; + + ddt = &sc->ddt; + ddt->num_top_entries = (1 << DDT_L1_DID_BITS); + + size = ddt->num_top_entries * (DDT_NON_LEAF_DWORDS << 3); + + if (bootverbose) + device_printf(sc->dev, "%s: size %lu, l1 entries %d, size " + "%lu\n", __func__, size, ddt->num_top_entries, size); + + ddt->vaddr = contigmalloc(size, M_IOMMU, + M_WAITOK | M_ZERO, /* flags */ + 0, /* low */ + (1ul << 48) - 1, /* high */ + size, /* alignment */ + 0); /* boundary */ + if (ddt->vaddr == NULL) { + device_printf(sc->dev, "Failed to allocate 2lvl ddt.\n"); + return (ENOMEM); + } + + sz = ddt->num_top_entries * sizeof(struct l1_desc); + ddt->l1 = malloc(sz, M_IOMMU, M_WAITOK | M_ZERO); + + reg = vtophys(ddt->vaddr); + if (bootverbose) + device_printf(sc->dev, "ddt base %p size %lx\n", ddt->vaddr, + size); + ddt->base = PHYS_TO_PPN(reg) << DDTP_PPN_S; + + return (0); +} + +static int +riscv_iommu_init_l0_directory(struct riscv_iommu_softc *sc, int sid) +{ + struct riscv_iommu_ddt *ddt; + struct l1_desc *l1_desc; + uint64_t *l1e; + uint64_t val; + size_t size; + int i; + + ddt = &sc->ddt; + l1_desc = &ddt->l1[sid >> sc->l0_did_bits]; + if (l1_desc->va) { + /* Already allocated. */ + return (0); + } + + size = (1 << sc->l0_did_bits) * (sc->dc_dwords << 3); + + l1_desc->va = contigmalloc(size, M_IOMMU, + M_WAITOK | M_ZERO, /* flags */ + 0, /* low */ + (1ul << 48) - 1, /* high */ + size, /* alignment */ + 0); /* boundary */ + if (l1_desc->va == NULL) { + device_printf(sc->dev, "failed to allocate l0 directory\n"); + return (ENXIO); + } + + l1_desc->pa = vtophys(l1_desc->va); + + i = sid >> sc->l0_did_bits; + l1e = (void *)((uint64_t)ddt->vaddr + DDT_NON_LEAF_DWORDS * 8 * i); + + /* Install the L1 entry. */ + val = PHYS_TO_PPN(l1_desc->pa) << DC_NON_LEAF_ENTRY_PPN_S; + val |= DC_NON_LEAF_ENTRY_VALID; + *l1e = val; + + return (0); +} + +static void * +riscv_iommu_get_dc_addr(struct riscv_iommu_softc *sc, int did) +{ + struct riscv_iommu_ddt *ddt; + struct l1_desc *l1_desc; + uintptr_t l0_base; + void *addr; + int l0_offs; + int l1_idx; + + ddt = &sc->ddt; + + l0_offs = sc->dc_dwords * 8 * (did & ((1 << sc->l0_did_bits) - 1)); + + if (sc->iommu_mode == DDTP_IOMMU_MODE_2LVL) { + l1_idx = (did >> sc->l0_did_bits) & + ((1 << DDT_L1_DID_BITS) - 1); + l1_desc = &ddt->l1[l1_idx]; + l0_base = (uintptr_t)l1_desc->va; + } else + l0_base = (uintptr_t)ddt->vaddr; + + addr = (void *)(l0_base + l0_offs); + + dprintf("ddt vaddr %p addr %p\n", ddt->vaddr, addr); + + return (addr); +} + +static int +riscv_iommu_init_dc(struct riscv_iommu_softc *sc, + struct riscv_iommu_domain *domain, int did, bool bypass) +{ + struct riscv_iommu_dc_base *dc_base; + struct riscv_iommu_dc *dc; + struct riscv_iommu_pmap *p; + + dc = riscv_iommu_get_dc_addr(sc, did); + dc_base = &dc->base; + + device_printf(sc->dev, "address translation for device id" + " 0x%x is %s.\n", did, bypass ? "bypassed" : "enabled"); + + p = &domain->p; + + bzero(dc_base, sizeof(struct riscv_iommu_dc_base)); + if (bypass == false) + dc_base->fsc = p->pm_satp; + dc_base->ta = (domain->pscid << DC_TA_PSCID_S) | DC_TA_V; + + riscv_iommu_inval_ddt_did(sc, did); + riscv_iommu_sync(sc, &sc->cq); + dc_base->tc |= DC_TC_V; + riscv_iommu_inval_ddt_did(sc, did); + riscv_iommu_inval_vma(sc); + riscv_iommu_sync(sc, &sc->cq); + + return (0); +} + +static void +riscv_iommu_deinit_dc(struct riscv_iommu_softc *sc, int did) +{ + struct riscv_iommu_dc_base *dc_base; + struct riscv_iommu_dc *dc; + + dc = riscv_iommu_get_dc_addr(sc, did); + dc_base = &dc->base; + dc_base->tc &= ~DC_TC_V; + + riscv_iommu_inval_ddt_did(sc, did); + riscv_iommu_sync(sc, &sc->cq); +} + +static int +riscv_iommu_setup_interrupts(struct riscv_iommu_softc *sc) +{ + device_t dev; + int error; + + dev = sc->dev; + + if (sc->res[1] == NULL || sc->res[2] == NULL || + sc->res[3] == NULL || sc->res[4] == NULL) { + device_printf(dev, "Warning: no interrupt resources " + "provided.\n"); + return (ENXIO); + } + + error = bus_setup_intr(dev, sc->res[1], INTR_TYPE_MISC, + riscv_cq_intr, NULL, sc, &sc->intr_cookie[0]); + if (error) { + device_printf(dev, "Couldn't setup cq interrupt handler\n"); + return (ENXIO); + } + + error = bus_setup_intr(dev, sc->res[2], INTR_TYPE_MISC, + riscv_fq_intr, NULL, sc, &sc->intr_cookie[1]); + if (error) { + device_printf(dev, "Couldn't setup fq interrupt handler\n"); + return (ENXIO); + } + + error = bus_setup_intr(dev, sc->res[3], INTR_TYPE_MISC, + riscv_pm_intr, NULL, sc, &sc->intr_cookie[2]); + if (error) { + device_printf(dev, "Couldn't setup pm interrupt handler\n"); + return (ENXIO); + } + + error = bus_setup_intr(dev, sc->res[4], INTR_TYPE_MISC, + riscv_pq_intr, NULL, sc, &sc->intr_cookie[3]); + if (error) { + device_printf(dev, "Couldn't setup pq interrupt handler\n"); + return (ENXIO); + } *** 2583 LINES SKIPPED *** From nobody Tue May 12 13:02:01 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gFGvZ1XVQz6dd2Z for ; Tue, 12 May 2026 13:02: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFGvY6d1rz4DkP for ; Tue, 12 May 2026 13:02:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778590921; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vwOG5znDhcMgDLPrYnImC2zyP2ngMbwPnEprCw0/JbM=; b=m8HgtoBbgQJmNDZXnrPxoF8H3aOa8yq9Qkfjjyh2sTr16Zvou8OSc5Q4pV0pBxbtoMzTG8 gFvRMOmwLw/c2piHcSvuDLNO6U96OZwKgzPuT+DJCcaWFk9Rq7wtSjZtxlS0Kr4iMtdstn ljFsfNkj+Bsm+oXdrnJiKm3Wvf2BVpjA18mHom5KM4oS3ESjgetUDAyEEgpBFraJRuhWRJ U6K7x+JpD9Q8yIu6Ez3XMS0nIxaL+AQj9z2IEVUlwYvpOG2ceZAGET1LtoLrdqLl4lzvdU aG+fQHMhAeWPezTL+260lN+GYlPki0S2OGowTes4FEyfB0A0aVsjJD5zoqd+9Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778590921; a=rsa-sha256; cv=none; b=iLsr/wzDgR/L7mc48nrfLpwNoMWBQ1O6NPnJz8ZdHdho51JP7tQAxGQBPhxAkFos0MNIUA 5Lv35AF6+Ry+mV2t1+JdH1b8LTrGxzLHijxyepGSmVwZVkmZ0Q1DIK4F1dTcpUjZ0gSaP4 dJu218V8u/lTKy4AH7WFCjrhIqNmglKIFcZnqAXRlhr1LMfDWdZ7MKGxCuHwNS2x2IiXY4 OArQ45+W7oScLOW0ruBzkU1wUzD1Nd4GSISbxs7UpXmZTx+ct5+vuqhWilepz19dgY1c2G Pda0GgY3T5uUeN9bftbVViZLLHL70KwwiIUdEqcADV3QCA+UmmLEnz7vh77u+A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778590921; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vwOG5znDhcMgDLPrYnImC2zyP2ngMbwPnEprCw0/JbM=; b=vqKmQeC+i+ADGhil6ooTlUvWsRzu8kdRwBE7IPWhdhVxOhjNPwyAa7kiRqEgatsPi/uWBO DIiiPjBbKE3Lp5z9baattQfN4NDC14WahAEOVTZ8XrwKzxnr1W8e1tU8Yut9nQlAXG/4Ow iElVOTiJxIMwIabduvq+RLm4D7NWDr/likr/mv3oaKdq7mLYi9EYqPBZDTpGR1ExlF0Kkp WejQalZj+4kCvsdIF25xKqKL1vRF1Pqz7XXb2eZ6IMrzk4wVXYGEs/iIJjkdL0Ugkrr5pq M6OcQDz7m2hcpfM9JqzLue7sZ6S7iWyx0RxtFYmPepYeC7Dg2PqCb9560VJTRQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFGvY6BxGz13kq for ; Tue, 12 May 2026 13:02:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c7de by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 13:02:01 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Gallatin Subject: git: 23b263dfbf5e - main - Revert "mlx5e: Ensure rx timestamps are monotonically increasing" List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gallatin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 23b263dfbf5ec24de2f6e1abc2a4eb04869b3e07 Auto-Submitted: auto-generated Date: Tue, 12 May 2026 13:02:01 +0000 Message-Id: <6a0324c9.1c7de.6615b4a8@gitrepo.freebsd.org> The branch main has been updated by gallatin: URL: https://cgit.FreeBSD.org/src/commit/?id=23b263dfbf5ec24de2f6e1abc2a4eb04869b3e07 commit 23b263dfbf5ec24de2f6e1abc2a4eb04869b3e07 Author: Andrew Gallatin AuthorDate: 2026-05-12 12:55:54 +0000 Commit: Andrew Gallatin CommitDate: 2026-05-12 12:55:54 +0000 Revert "mlx5e: Ensure rx timestamps are monotonically increasing" This reverts commit ce33f96fcf2f2d0d49c406274bcc64df72fe530e. It turns out that doing it this way did indeed prevent backwards movement of timestamps, however it also lead to an ever increasing error, eventually yielding timestamps hundreds or thousands of seconds in the future. Back this out until we can come up with a solution that prevents backards timestamps and also avoids accumulating error. Sponsored by: Netflix --- sys/dev/mlx5/mlx5_en/mlx5_en_main.c | 50 ------------------------------------- 1 file changed, 50 deletions(-) diff --git a/sys/dev/mlx5/mlx5_en/mlx5_en_main.c b/sys/dev/mlx5/mlx5_en/mlx5_en_main.c index 9bcb0dcf8e16..fb8b79c8f787 100644 --- a/sys/dev/mlx5/mlx5_en/mlx5_en_main.c +++ b/sys/dev/mlx5/mlx5_en/mlx5_en_main.c @@ -1134,25 +1134,6 @@ mlx5e_hw_clock(struct mlx5e_priv *priv) return (((uint64_t)hw_h << 32) | hw_l); } -/* - * Seed the first calibration point so that base_prev and clbr_hw_prev - * are always valid. Called once during attach before the first - * calibration callout fires. - */ -static void -mlx5e_seed_calibration(struct mlx5e_priv *priv) -{ - struct mlx5e_clbr_point *cp; - struct timespec ts; - - cp = &priv->clbr_points[0]; - cp->clbr_hw_curr = mlx5e_hw_clock(priv); - nanouptime(&ts); - cp->base_curr = mlx5e_timespec2usec(&ts); - cp->clbr_hw_prev = cp->clbr_hw_curr - 1; - cp->base_prev = cp->base_curr - 1; -} - /* * The calibration callout, it runs either in the context of the * thread which enables calibration, or in callout. It takes the @@ -1166,9 +1147,6 @@ mlx5e_calibration_callout(void *arg) struct mlx5e_priv *priv; struct mlx5e_clbr_point *next, *curr; struct timespec ts; - uint64_t hw_delta_new, hw_delta_old; - uint64_t old_nsec, old_projected, old_sec; - uint64_t res_n, res_s, res_s_mod, rt_delta_old; int clbr_curr_next; priv = arg; @@ -1197,33 +1175,6 @@ mlx5e_calibration_callout(void *arg) nanouptime(&ts); next->base_curr = mlx5e_timespec2usec(&ts); - /* - * Ensure monotonicity across calibration transitions. Compute - * what the old calibration would extrapolate to at the new - * hw_curr. If the new base_curr is less, clamp it so the new - * slope is at least as steep as the old one. This prevents - * packets from seeing time go backwards when the slope drops. - * - * Use the same split-seconds technique as mlx5e_mbuf_tstmp() - * to avoid overflowing uint64_t in the multiplication. - */ - hw_delta_new = next->clbr_hw_curr - curr->clbr_hw_curr; - rt_delta_old = curr->base_curr - curr->base_prev; - hw_delta_old = curr->clbr_hw_curr - curr->clbr_hw_prev; - old_sec = hw_delta_new / priv->cclk; - old_nsec = hw_delta_new % priv->cclk; - res_s = old_sec * rt_delta_old; - res_n = old_nsec * rt_delta_old; - res_s_mod = res_s % hw_delta_old; - res_s /= hw_delta_old; - res_s_mod *= priv->cclk; - res_n += res_s_mod; - res_n /= hw_delta_old; - res_s *= priv->cclk; - old_projected = curr->base_curr + res_s + res_n; - if (next->base_curr < old_projected) - next->base_curr = old_projected; - curr->clbr_gen = 0; atomic_thread_fence_rel(); priv->clbr_curr = clbr_curr_next; @@ -4936,7 +4887,6 @@ mlx5e_create_ifp(struct mlx5_core_dev *mdev) callout_init(&priv->tstmp_clbr, 1); /* Pull out the frequency of the clock in hz */ priv->cclk = (uint64_t)MLX5_CAP_GEN(mdev, device_frequency_khz) * 1000ULL; - mlx5e_seed_calibration(priv); mlx5e_reset_calibration_callout(priv); pa.pa_version = PFIL_VERSION; From nobody Tue May 12 13:02:00 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gFGvf0mTKz6dclf for ; Tue, 12 May 2026 13:02: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFGvd6mZHz4Dn0 for ; Tue, 12 May 2026 13:02:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778590925; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bs/zBvMaG/oAvERUrUZolhqYPLqheCL4h5whELKB12s=; b=X1TBiMdIvba/lxTP/Zk0aBiYjXxr3c5T8ntC1sV0/LXyHIEueuAzcxLomxkCRlGGQuwW7u BgB7Q+dfdmMIrGLQv6L5kr8dEuwzQ4TVTs0A+s/y841ia/Qzy+VPoNYbcS3kTYH8g+qAah PR2v/jDEu+M/dcSdNA25fe6KhC8beh6l7DJq4djvaYwNbbCcw//ZlcbAhM/sOIUN2HSwSF 2Cq/nDlzx+FfmJUMmw0dqsfxHIac7xwiul5vBhocNFmeRhtp9kXmsFTtzakC/FpjhLwYND vqv7g3Vi7yf2+rUtN8YKQMeUF3XnSL6zVjBGDP27qaVG+3allHcDBfkJjiPXSw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778590925; a=rsa-sha256; cv=none; b=m0VEavd7HySxidIgYu9atQ1nw3BeDSqa4oWdstHcR+aWBrLbu7g1/JbyF2XPDNMPy9pNFA sr5nETKUz2ddSWdSzUQnloAXt//Rm52FftBtsqkDc75GzZhu/U3JXcLqxmJm+fbHiPLWeC T7XABekZcgFNKytQii45miedCyZTNaCEQJZOhWDFPJiwNaIkLraMNtbotUwMp31GGiRclA AjaIiiaIK/ACBe+33qZuWmR5DI1z2R9z5c6j27codj/sBXfS/vIuU5QGgLV31G9cl5RaAF SlUSOlBGX9+Z9FMTWG403Ayew0kmPu5LYD0uK3UymWP4L6G2RK3bRDbsATiAVA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778590925; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bs/zBvMaG/oAvERUrUZolhqYPLqheCL4h5whELKB12s=; b=sCi2XGvgu4yOYcNQ0BwjPUHuAxcEaZpJLTwphXGA3DQZaVDYPLkB2Jx81kDCkHy1/KO6Ho GVWJa+xY5W3ITqB5/HbdOkuDUjccQvW4fJhYmbkJUvjLjcTcKztz2NydF31kYyFavFZnTa NHSnGn3jV2fwEkCTYKLeukQhQ5Lhfkk4gG4HOVFt0Q7ngHrYEQSDmVGcUkUXgrQSYQ6RzY 3XYtr4lJLCypAiJUUyCq3ZkHSc62RrbRsDDLfyeQlZFGVwyZLYb5piMQFCn2sPtiDyitx+ NqHfa1uKewH4O4qkN3wmEj7nS/mfXkx320xORB2jMGcXGd6Ta+hxvizlv6F+AQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFGvd67BRz13CJ for ; Tue, 12 May 2026 13:02:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1de2a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 13:02:00 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Gallatin Subject: git: 9f69446d4548 - main - lacp: fix link state with multiple aggregators List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gallatin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9f69446d45484c16d2b9b9bf71bbb2fca86cb6e5 Auto-Submitted: auto-generated Date: Tue, 12 May 2026 13:02:00 +0000 Message-Id: <6a0324c8.1de2a.5c820de6@gitrepo.freebsd.org> The branch main has been updated by gallatin: URL: https://cgit.FreeBSD.org/src/commit/?id=9f69446d45484c16d2b9b9bf71bbb2fca86cb6e5 commit 9f69446d45484c16d2b9b9bf71bbb2fca86cb6e5 Author: Andrew Gallatin AuthorDate: 2026-05-12 12:52:24 +0000 Commit: Andrew Gallatin CommitDate: 2026-05-12 12:52:24 +0000 lacp: fix link state with multiple aggregators When we have multiple aggregators, the link state should reflect the state of the active aggregator. This change was prompted by a script pruning 10GbE interfaces from an lacp bundle with 100GbE interfaces. Mixing speeds like this creates multiple aggregators. When the last 10GbE interface was removed, lagg0 would loose link because the current aggregator's port count would drop to 0, even though the 100GbE aggregator had active ports. This left the system in a hard to diagnose state where lagg0 reported "active", but all outgoing IP traffic was dropped, due to the RT_LINK_IS_UP() check noticing lagg0's if_link_state was marked as down. Reviewed by: zlei Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D56579 --- sys/net/ieee8023ad_lacp.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sys/net/ieee8023ad_lacp.c b/sys/net/ieee8023ad_lacp.c index 281d16bc6c05..8c695f71cc0f 100644 --- a/sys/net/ieee8023ad_lacp.c +++ b/sys/net/ieee8023ad_lacp.c @@ -682,6 +682,7 @@ static void lacp_disable_distributing(struct lacp_port *lp) { struct lacp_aggregator *la = lp->lp_aggregator; + struct lacp_aggregator *la_active; struct lacp_softc *lsc = lp->lp_lsc; struct lagg_softc *sc = lsc->lsc_softc; char buf[LACP_LAGIDSTR_MAX+1]; @@ -703,7 +704,6 @@ lacp_disable_distributing(struct lacp_port *lp) TAILQ_REMOVE(&la->la_ports, lp, lp_dist_q); la->la_nports--; - sc->sc_active = la->la_nports; if (lsc->lsc_active_aggregator == la) { lacp_suppress_distributing(lsc, la); @@ -713,6 +713,8 @@ lacp_disable_distributing(struct lacp_port *lp) } lp->lp_state &= ~LACP_STATE_DISTRIBUTING; + la_active = lsc->lsc_active_aggregator; + sc->sc_active = la_active != NULL ? la_active->la_nports : 0; if_link_state_change(sc->sc_ifp, sc->sc_active ? LINK_STATE_UP : LINK_STATE_DOWN); } @@ -721,6 +723,7 @@ static void lacp_enable_distributing(struct lacp_port *lp) { struct lacp_aggregator *la = lp->lp_aggregator; + struct lacp_aggregator *la_active; struct lacp_softc *lsc = lp->lp_lsc; struct lagg_softc *sc = lsc->lsc_softc; char buf[LACP_LAGIDSTR_MAX+1]; @@ -739,7 +742,6 @@ lacp_enable_distributing(struct lacp_port *lp) KASSERT(la->la_refcnt > la->la_nports, ("aggregator refcnt invalid")); TAILQ_INSERT_HEAD(&la->la_ports, lp, lp_dist_q); la->la_nports++; - sc->sc_active = la->la_nports; lp->lp_state |= LACP_STATE_DISTRIBUTING; @@ -750,6 +752,8 @@ lacp_enable_distributing(struct lacp_port *lp) /* try to become the active aggregator */ lacp_select_active_aggregator(lsc); + la_active = lsc->lsc_active_aggregator; + sc->sc_active = la_active != NULL ? la_active->la_nports : 0; if_link_state_change(sc->sc_ifp, sc->sc_active ? LINK_STATE_UP : LINK_STATE_DOWN); } From nobody Tue May 12 13:39:13 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gFHkV2BKVz6cCN6 for ; Tue, 12 May 2026 13:39: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFHkV1Xzcz4PZR for ; Tue, 12 May 2026 13:39:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778593154; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FFLyf/YKLcD3Pgkld7yIXRTx1b6yEABRVZ45kBFabPI=; b=CsEoKsMzuq10Nh9Ls/2BzTSCF5yKtrHrUG6eGgFmDwu417rPtohdiQDlRq5u7l2vk/u+ix e/Fs7D8QjUeUVQYforytbvBIgn3vgbMBawOnuvjg5pbiSfEUs1pi4GrGCFy/jIDQN9JKQC 4qxiCvK/GLadKoX/r+UmpO1sBU5kA0HYf6zxb68F4GBeHKGrI4u9VjKixCygfMpSvO44Ao D40vGnVPQAg35VWUXjJH1Gat1AED09yJ1EGXOEVRGaz6IW2I5tK3r168/Yj9Sf15dWRGC6 YGwdpjZTUXDZ+BU5GO0XaPiIj7ZKd+rxtC775+A0UlNMI2AJyiXCjCqgfHw45A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778593154; a=rsa-sha256; cv=none; b=psZHgqbL7vQcDg24gVT23kJxPJayzAozjXwn5NUdCMuykZkB8tkFMGCMG1iquGhqhyGN7r do1ecS8G2FK9eiUqx/a4t7xW6BERpBUurEp/fzeefwscIwiTw1stDcebGopuAhdTBlQEic iNM0ZqSgAFitkR6mRFMrc5tHBNB6/z+0GqTZjrbP9atRcTsRci50IgJXKCcFfjgk5VW7iz 1bbJd6/qPIoB7IBu/J1/hM/WbXxoEkStAAxV4FvFPkC5RHB7iqIj8SCtC+Kdv2sc2cbHDR OYnKo77Jhex9flgFxr9Ihfux37bdINPF7kRV3lB7Kytg3JOH/c/ypdDyVEv8iA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778593154; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FFLyf/YKLcD3Pgkld7yIXRTx1b6yEABRVZ45kBFabPI=; b=scesCfOjPHluWukbcpbpMhkQXsbCVpd2rK1ideEOuiLnv2xWPmxo6qBU3RW51zYSgecTFr 7RBtv5ChwxrBZ5eddQyErlIkxfQiPObGHG0q9q0MiH5dzrkfAiwmv9y8DFWF0e4K2WlDQE B530MenRqkqOkugpfaemtLyyVRzYW2JJj6gXWuP+ukgThvM02NR9DPD9ObFo8Ci/t30v5e 6KP44KGkbvHafctFcYlBV3jHK9w+ZjW6XMRAc/vJi/o1J3CXvqnnW2ZBDEkgVSmQh+EXSj zpE12bokHLNtJdCnL9g29iyH+deb1B1drU3uqPRrZchr8F6r6HSy3fwa3eZqjQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFHkV0NGwz14xm for ; Tue, 12 May 2026 13:39:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 20d11 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 13:39:13 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Chuck Tuffli Subject: git: 6447191cfba5 - Create tag vendor/smart/1.0.3 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: chuck X-Git-Repository: src X-Git-Refname: refs/tags/vendor/smart/1.0.3 X-Git-Reftype: annotated tag X-Git-Commit: 6447191cfba5cfe7b36988ed6cef27927bbf96cd Auto-Submitted: auto-generated Date: Tue, 12 May 2026 13:39:13 +0000 Message-Id: <6a032d81.20d11.3cd64e87@gitrepo.freebsd.org> The annotated tag vendor/smart/1.0.3 has been created by chuck: URL: https://cgit.FreeBSD.org/src/tag/?h=vendor/smart/1.0.3 tag vendor/smart/1.0.3 Tagger: Chuck Tuffli TaggerDate: 2026-05-12 13:36:41 +0000 smart: tag import of smart 1.0.3 commit d2d20bb5099dc1c443a4b783d43b8a45338c85d2 Author: Chuck Tuffli AuthorDate: 2026-05-12 13:35:31 +0000 Commit: Chuck Tuffli CommitDate: 2026-05-12 13:35:31 +0000 Import smart revision 1.0.3 Fixes armv7 and gcc14 build issues. From nobody Tue May 12 13:39:13 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gFHkb3PJcz6cCCg for ; Tue, 12 May 2026 13:39: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFHkb1xZsz4PsX for ; Tue, 12 May 2026 13:39:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778593159; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/0kovgQmzwA4b+0ZcZMiJOfNL7RZvEAwLPS/G7na9b0=; b=XTJTVark8+Igl5tEzCB+8bgXCHEpbgYejrasoSoi8I07beb+RLPQkP7lc5uLouOQiCD07M vJFjx45iMdLz/Q0u+fgfvVNrJfjo4Ot6Qn7CFV9kEWD5er/47/0d2C8KuIpVpZIvADCBZ3 tcOGEHTAZT1zlt39GpxsPmykrTuocVWX8d+OJLr+CKP73ujEAdgg0kiw9FwngrZa1FSfAK +SeF3Gf3XGbDME7YSfWHRET661v06uTbP3AtqKIVxsynOH/rxkugcCpkX4pKEXpTJwUmDl c7uEv7C1I6fbl8wLExETVckrMmzux9JomqqB5ldn9IjECgVrnOpSFxL/QIeDUQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778593159; a=rsa-sha256; cv=none; b=T8f4Jkk7Tny29gI9pdmYvoP3fB8NYEEdnrf1tqMBK5mYTpKvQII6ZMYA52bj+LnJiTZcNO e2/tjjkwIZgRn81qARSrywwk9TPB6+/9R0EHIKyM+7HsQ6L6FT+pI7uvhbE8+LJyukOcYC fl0FV8sfcuJbr2cV7oAXd4HrrO20UoN/6m9ZXGoryJ1z5WJi14as7p0rc4mG/QqF0R2VaR 3wRndzRmqDyxYXgaHdqM5uI6LW2hoTAVYGOq/CBtOZiTMxtQSiYemmuGwSuIG6jYCfJdKB WCvfQVlku2OE1yOMdIjl195clxuHaGQlL0+meTWTlFU3U2omXLAhXZzmI1s38g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778593159; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/0kovgQmzwA4b+0ZcZMiJOfNL7RZvEAwLPS/G7na9b0=; b=WhFNuYS7aHH+lIYa0YeX2TpZx1BWbWWGceF60vnF+DtsvA/sh2y74Q302SsWUDWIfkgeDv P8XlULb6nxAVvMJmHGffiZLCSXhlub2fOUO5/RuqDsKCSr/npFl1p/xMbUn9qohqZvBzzK 63LPCbc1YzOwnMk4Pjx4EbB67fIc+nQAs2dcV7W1WsEzxf/b6WgGHfysvq3Wf4caEXBKYn qavjqno59NjfCbmW85kMpp2duGNYDHzzyX/QuQxIXvi+53rjNs3W7yJESIaVviDVuAP64T mbEeUjKL4BGh/kp8Ny2du8L8uZlkQIqpdnPVs8VlLauDreR5BEMfcgVEH5okfw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFHkb0hpdz14WT for ; Tue, 12 May 2026 13:39:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 20cb0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 13:39:13 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Chuck Tuffli Subject: git: eb3b1302382b..d2d20bb5099d - vendor/smart - vendor branch updated List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: chuck X-Git-Repository: src X-Git-Refname: refs/heads/vendor/smart X-Git-Reftype: branch X-Git-Commit: d2d20bb5099dc1c443a4b783d43b8a45338c85d2 X-Git-Oldrev: eb3b1302382b1d0cbe37eeebabfcdd546aa2fc4e X-Git-Newrev: d2d20bb5099dc1c443a4b783d43b8a45338c85d2 Auto-Submitted: auto-generated Date: Tue, 12 May 2026 13:39:13 +0000 Message-Id: <6a032d81.20cb0.38c52d9f@gitrepo.freebsd.org> The branch vendor/smart has been updated by chuck: URL: https://cgit.FreeBSD.org/src/log/?id=eb3b1302382b..d2d20bb5099d d2d20bb5099d Import smart revision 1.0.3 From nobody Tue May 12 13:50:34 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gFHzs1KTNz6cDGB for ; Tue, 12 May 2026 13:50:49 +0000 (UTC) (envelope-from ctuffli@gmail.com) Received: from mail-pj1-f54.google.com (mail-pj1-f54.google.com [209.85.216.54]) (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 4gFHzr2Mz0z3FRb for ; Tue, 12 May 2026 13:50:48 +0000 (UTC) (envelope-from ctuffli@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 ctuffli@gmail.com designates 209.85.216.54 as permitted sender) smtp.mailfrom=ctuffli@gmail.com Received: by mail-pj1-f54.google.com with SMTP id 98e67ed59e1d1-365cae89bf5so2409576a91.3 for ; Tue, 12 May 2026 06:50:48 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778593846; x=1779198646; h=content-transfer-encoding:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=wPl1aCYEXjZ28HL7WYecev440tqmRysytxpve8bLqos=; b=Xj0XXesbFAfuyIrSZz2jJA/F4yhD3Owo8328vrlTXxIIRK5pebcsyg8jeKhhdvl0qC xb/EfCFHPSnSGJNpQBE/T86TScfbYgkRMixivKqSm4pP/FYsc+3tLZyLW7PBqZ72byL/ 63BrsWTLTwDqRtO3yvofz8070tWWkk3R/3I8i4XOACTowtyZviKG5+lHIZAmp+v1I8t7 ospNxOvFp3SpRP2zO2ezYG9K0vrcrUrvHltfXrQys+xWsS+coOtimvnAZtRzO4KwqAK7 vexGIodXn22hB3uqrcBo6fpWBelXERuDedu6qf2Rt+JLnJuXwQV0LnfN1uAE1xV0JDiW jXVw== X-Forwarded-Encrypted: i=1; AFNElJ+I7nJBTndJ428rGfZVVshIc6hm4D/Kh/fWWyyGCknFL6SZWZMfo2iULAzPfjIpqBlrMaoWfJqQ9+zmOTQLs+BZkbjl@freebsd.org X-Gm-Message-State: AOJu0YwRjn1BAYgIMQ/JrtqktGgSHOYdGjTzCLusU0xzpVS8n7W440uU Fc40UME1tt6to8DuVY7P587KO2WZc4uIwM/7BMsk0XagZ6yamj+W0wfqePZv9g== X-Gm-Gg: Acq92OG3A3sMOwnVk5523cvqGxcOhXP+S04qd/cbBfC8cyWM2fcibn4/9XjLMhDPQGE aYbbtI0u0ntPgyiBObHw/zfBysUvRs4cpQ3ORQwFuBXmQyEAXG1iNtYXxYikMREbqE31cnp8R7l F5dg+4BDeq1BDuHALM0xGOoDSwYpueL9otrLNhgtIWM824PHZ2hcA+OQYjHtA1RsOuWst6gpvmv Vek+wdhYesu0tw9JmRJbLeyyPTMihQts17CnOdzc8OPjuq+G9ZPh3CO/LNut2mJA5VS+o1yg5P6 CjKNqIWA3BLfdNPiZdxUd/uIDSpnzBdL7mR3juJ1HnhnVd86hCzGOloPbjgPr31Nv3VOoZGfgQn xl0a7nFie/W6zIw4q4j1i1+Kduwpzl6yFvRt3EV+s6f3F39osmXGfZ+DhI82YcBQaj91GYKBMD1 ZV9JwR3j88kJHZg3nbDKSXjIkEYBhmAV00UgCoLpO8iHhzKGGr9+3/mIeO1f4I X-Received: by 2002:a17:90b:5824:b0:366:aba:4c86 with SMTP id 98e67ed59e1d1-368b270cce3mr3598266a91.27.1778593846297; Tue, 12 May 2026 06:50:46 -0700 (PDT) Received: from mail-pg1-f177.google.com (mail-pg1-f177.google.com. [209.85.215.177]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-367d629f40bsm11204887a91.7.2026.05.12.06.50.46 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 12 May 2026 06:50:46 -0700 (PDT) Received: by mail-pg1-f177.google.com with SMTP id 41be03b00d2f7-c802803ac17so2464433a12.1 for ; Tue, 12 May 2026 06:50:46 -0700 (PDT) X-Forwarded-Encrypted: i=1; AFNElJ+suDnCF3SHXrNWNQHAcbR255DRYY8MjYYicC2oIgQ1hzB+Bz/woYBK2vlWcJ6QdSkr+qeAm8u9js7zcgKyrTCe0P/0@freebsd.org X-Received: by 2002:a17:902:c404:b0:2ba:4eee:6c1e with SMTP id d9443c01a7336-2bd0112cdd7mr40179675ad.15.1778593845679; Tue, 12 May 2026 06:50:45 -0700 (PDT) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 References: <6a025660.37fa7.6a3f7fc0@gitrepo.freebsd.org> In-Reply-To: From: Chuck Tuffli Date: Tue, 12 May 2026 06:50:34 -0700 X-Gmail-Original-Message-ID: X-Gm-Features: AVHnY4KGlinc8BKOvX589SzcmviBbBYal6jL9VPIy78y3RZBanQ0C0EkTLDo1Hg Message-ID: Subject: Re: git: 25942dddc8a8 - main - smart: Connect contrib/smart to build To: Chuck Tuffli , 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-Result: default: False [-3.00 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-0.999]; FORGED_SENDER(0.30)[chuck@freebsd.org,ctuffli@gmail.com]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17:c]; MIME_GOOD(-0.10)[text/plain]; DMARC_POLICY_SOFTFAIL(0.10)[freebsd.org : SPF not aligned (relaxed), No valid DKIM,none]; RWL_MAILSPIKE_GOOD(-0.10)[209.85.216.54:from]; PREVIOUSLY_DELIVERED(0.00)[dev-commits-src-all@freebsd.org]; MIME_TRACE(0.00)[0:+]; MISSING_XM_UA(0.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; TO_DN_SOME(0.00)[]; FREEMAIL_ENVFROM(0.00)[gmail.com]; FROM_HAS_DN(0.00)[]; RCVD_TLS_LAST(0.00)[]; ARC_NA(0.00)[]; FROM_NEQ_ENVFROM(0.00)[chuck@freebsd.org,ctuffli@gmail.com]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org]; RCVD_COUNT_THREE(0.00)[3]; RCVD_VIA_SMTP_AUTH(0.00)[]; R_DKIM_NA(0.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[209.85.215.177:received,209.85.216.54:from]; RCPT_COUNT_THREE(0.00)[4] X-Spamd-Bar: -- X-Rspamd-Queue-Id: 4gFHzr2Mz0z3FRb On Tue, May 12, 2026 at 2:21=E2=80=AFAM Lexi Winter wrote= : > > hello, > > Chuck Tuffli wrote in <6a025660.37fa7.6a3f7fc0@gitrepo.freebsd.org>: > > smart: Connect contrib/smart to build > > this has broken the armv7 build: Apologies. Working on a fix ... From nobody Tue May 12 14:00:44 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gFJCJ3cpzz6cDvH for ; Tue, 12 May 2026 14:00: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFJCJ1c2lz3HT4 for ; Tue, 12 May 2026 14:00:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778594444; 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; bh=/RMVus7CMl/VMb7CfheotMj9oeOgxje6fZu4p3mFdtM=; b=eSF8SfL1OlGN2jLxauB1Pv1sfGKzBLTTsG5wLRDLUpsQs9tAf3NCXigTUkMcQ0ec80t5rf PqK+a13Uh8nY84ROT1Zvk3xe2Lb/HPMEL0YpRn2HF4YIzXgRf7H8eCqiYBaW6gawUC0WnY /4Z2KGGRnf+1P7peWjRdo6fh3CMOzxsBwQAjhaDtROC4/GoR7cdeub/ydSnxkXYgA6swov X1OEIfDTeIpfDIpnc5KHxH0wTHm2nWKQUO9MJaYY4e/UZdYa1T3iTXRaJ8tV1hnRx4oYYi rKy9OlII6bIumlf3clEjjz8tR8Dz59cTJQ2nNuUv7AUqObeEKclDvIeGS+MnUQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778594444; a=rsa-sha256; cv=none; b=IYDR4Wa2DOEM83WC8cBz/CxcAk1T/opHAXtX/ZK1pwc8TNxmbq8U359oYajiokGCw/Pctw SxwzSvmerdO5D97jAjUFjX4VMpBgu67kYjRug5NaMcisk3akO2z9cXLfmcyLlFldVZ6/Vl 3uZew8iNdjndWFpIwdM/sw6RCHsFhE/O0pZ2ARt1PXkjfTzJXimsZ8asGCqGUApCBWKaah dQEHzz4jGiegN6otoBK685zHMAHCJbcaecG0b9nC3msLQG27J3QLzWusms77fbGIOEr5Ri BnR9JHK5eo0nv6ZNbiW9M1acXQ/eI3AEFIZi/CQu1MDnbJVTyi23uxpMRTqgpg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778594444; 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; bh=/RMVus7CMl/VMb7CfheotMj9oeOgxje6fZu4p3mFdtM=; b=NXg3BrLSfcknstjdDnn+auwcNiFITFsvmzh8ISY0D38MRkB17fMvRXok2M/dm0v4sR76Di nPfCRjI2fY48/l/ZgeVgAJjx8KFLVrMkDUtqOhL9grX5J1bd8NVXkfA2C1wMOZ6r/k/tFQ oqLDFjH853K+AbT65xGOqGT+wT8akgwfW2It+wvP65sMrOWa2nAAu2PIb0QTCpMIR7zUjZ WmmnlA5trd8EgjlIdx3NUbw+OVpyllz++GODjRQSGp9uOKE3YXzKxD2jmm8EE3qJjbVZWJ aO8ktdU21hlDOQx0Kmjpfb2hSgI89vIfvRP7ZnDmPLY0xa6bYVxU70z7IhN8Bw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFJCJ0c8qz15h0 for ; Tue, 12 May 2026 14:00:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 247a7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 14:00:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Brian Scott From: Mitchell Horne Subject: git: dab8138e13de - main - g_part,mkimg: Add additional GPT partition types List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: dab8138e13dea539a387c458979403980a137bf2 Auto-Submitted: auto-generated Date: Tue, 12 May 2026 14:00:44 +0000 Message-Id: <6a03328c.247a7.6b3f3736@gitrepo.freebsd.org> The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=dab8138e13dea539a387c458979403980a137bf2 commit dab8138e13dea539a387c458979403980a137bf2 Author: Brian Scott AuthorDate: 2026-05-11 16:24:46 +0000 Commit: Mitchell Horne CommitDate: 2026-05-12 14:00:10 +0000 g_part,mkimg: Add additional GPT partition types Add the hifive-fsbl, hifive-bbl, and xbootldr aliases to mkimg(1). Add the xbootldr alias to geom(4), and thus gpart(8). The "hifive" partition types are defined and used by various RISC-V SBCs for locating firmware. "xbootldr", or the Extended Boot Loader Partition is defined here: https://uapi-group.org/specifications/specs/boot_loader_specification/ Reviewed by: emaste, markj, mhorne MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D56784 --- sys/geom/part/g_part.c | 1 + sys/geom/part/g_part.h | 2 ++ sys/geom/part/g_part_gpt.c | 2 ++ sys/sys/disk/gpt.h | 2 ++ usr.bin/mkimg/gpt.c | 6 ++++++ usr.bin/mkimg/scheme.c | 3 +++ usr.bin/mkimg/scheme.h | 3 +++ 7 files changed, 19 insertions(+) diff --git a/sys/geom/part/g_part.c b/sys/geom/part/g_part.c index 1e4236507fa4..6c4c37d9bfce 100644 --- a/sys/geom/part/g_part.c +++ b/sys/geom/part/g_part.c @@ -135,6 +135,7 @@ struct g_part_alias_list { { "vmware-vmfs", G_PART_ALIAS_VMFS }, { "vmware-vmkdiag", G_PART_ALIAS_VMKDIAG }, { "vmware-vsanhdr", G_PART_ALIAS_VMVSANHDR }, + { "xbootldr", G_PART_ALIAS_XBOOTLDR }, }; SYSCTL_DECL(_kern_geom); diff --git a/sys/geom/part/g_part.h b/sys/geom/part/g_part.h index 575d97623e9b..1355cfec66a0 100644 --- a/sys/geom/part/g_part.h +++ b/sys/geom/part/g_part.h @@ -108,6 +108,8 @@ enum g_part_alias { G_PART_ALIAS_VMKDIAG, /* A VMware vmkDiagnostic partition entry */ G_PART_ALIAS_VMRESERVED, /* A VMware reserved partition entry */ G_PART_ALIAS_VMVSANHDR, /* A VMware vSAN header partition entry */ + G_PART_ALIAS_XBOOTLDR, /* A Systemd/Linux extended boot partition + Also used by visionfive2 as part of the boot sequence */ /* Keep the following last */ G_PART_ALIAS_COUNT }; diff --git a/sys/geom/part/g_part_gpt.c b/sys/geom/part/g_part_gpt.c index 4733631c4b20..eeca5fbfae17 100644 --- a/sys/geom/part/g_part_gpt.c +++ b/sys/geom/part/g_part_gpt.c @@ -230,6 +230,7 @@ static struct uuid gpt_uuid_vmfs = GPT_ENT_TYPE_VMFS; static struct uuid gpt_uuid_vmkdiag = GPT_ENT_TYPE_VMKDIAG; static struct uuid gpt_uuid_vmreserved = GPT_ENT_TYPE_VMRESERVED; static struct uuid gpt_uuid_vmvsanhdr = GPT_ENT_TYPE_VMVSANHDR; +static struct uuid gpt_uuid_xbootldr = GPT_ENT_TYPE_XBOOTLDR; static struct g_part_uuid_alias { struct uuid *uuid; @@ -302,6 +303,7 @@ static struct g_part_uuid_alias { { &gpt_uuid_vmkdiag, G_PART_ALIAS_VMKDIAG, 0 }, { &gpt_uuid_vmreserved, G_PART_ALIAS_VMRESERVED, 0 }, { &gpt_uuid_vmvsanhdr, G_PART_ALIAS_VMVSANHDR, 0 }, + { &gpt_uuid_xbootldr, G_PART_ALIAS_XBOOTLDR, 0 }, { NULL, 0, 0 } }; diff --git a/sys/sys/disk/gpt.h b/sys/sys/disk/gpt.h index 426ae835c0c1..65b00f5de733 100644 --- a/sys/sys/disk/gpt.h +++ b/sys/sys/disk/gpt.h @@ -261,6 +261,8 @@ CTASSERT(sizeof(struct gpt_ent) == 128); #define GPT_ENT_TYPE_U_BOOT_ENV \ {0x3de21764,0x95bd,0x54bd,0xa5,0xc3,{0x4a,0xbe,0x78,0x6f,0x38,0xa8}} +#define GPT_ENT_TYPE_XBOOTLDR \ + {0xbc13c2ff,0x59e6,0x4262,0xa3,0x52,{0xb2,0x75,0xfd,0x6f,0x71,0x72}} /* * Boot partition used by GRUB 2. diff --git a/usr.bin/mkimg/gpt.c b/usr.bin/mkimg/gpt.c index ce817ea10ed2..4471cfa1d4b4 100644 --- a/usr.bin/mkimg/gpt.c +++ b/usr.bin/mkimg/gpt.c @@ -52,6 +52,9 @@ static mkimg_uuid_t gpt_uuid_freebsd_zfs = GPT_ENT_TYPE_FREEBSD_ZFS; static mkimg_uuid_t gpt_uuid_mbr = GPT_ENT_TYPE_MBR; static mkimg_uuid_t gpt_uuid_ms_basic_data = GPT_ENT_TYPE_MS_BASIC_DATA; static mkimg_uuid_t gpt_uuid_prep_boot = GPT_ENT_TYPE_PREP_BOOT; +static mkimg_uuid_t gpt_uuid_hifive_bbl = GPT_ENT_TYPE_HIFIVE_BBL; +static mkimg_uuid_t gpt_uuid_xbootldr = GPT_ENT_TYPE_XBOOTLDR; +static mkimg_uuid_t gpt_uuid_hifive_fsbl = GPT_ENT_TYPE_HIFIVE_FSBL; static struct mkimg_alias gpt_aliases[] = { { ALIAS_EFI, ALIAS_PTR2TYPE(&gpt_uuid_efi) }, @@ -65,6 +68,9 @@ static struct mkimg_alias gpt_aliases[] = { { ALIAS_MBR, ALIAS_PTR2TYPE(&gpt_uuid_mbr) }, { ALIAS_NTFS, ALIAS_PTR2TYPE(&gpt_uuid_ms_basic_data) }, { ALIAS_PPCBOOT, ALIAS_PTR2TYPE(&gpt_uuid_prep_boot) }, + { ALIAS_HIFIVE_BBL, ALIAS_PTR2TYPE(&gpt_uuid_hifive_bbl) }, + { ALIAS_XBOOTLDR, ALIAS_PTR2TYPE(&gpt_uuid_xbootldr) }, + { ALIAS_HIFIVE_FSBL, ALIAS_PTR2TYPE(&gpt_uuid_hifive_fsbl) }, { ALIAS_NONE, 0 } /* Keep last! */ }; diff --git a/usr.bin/mkimg/scheme.c b/usr.bin/mkimg/scheme.c index 80ff456a709f..b64cfe8bd007 100644 --- a/usr.bin/mkimg/scheme.c +++ b/usr.bin/mkimg/scheme.c @@ -58,6 +58,9 @@ static struct { { "mbr", ALIAS_MBR }, { "ntfs", ALIAS_NTFS }, { "prepboot", ALIAS_PPCBOOT }, + { "hifive-bbl", ALIAS_HIFIVE_BBL }, + { "xbootldr", ALIAS_XBOOTLDR }, + { "hifive-fsbl", ALIAS_HIFIVE_FSBL }, { NULL, ALIAS_NONE } /* Keep last! */ }; diff --git a/usr.bin/mkimg/scheme.h b/usr.bin/mkimg/scheme.h index 1c234b86d66c..7a5e09036ee3 100644 --- a/usr.bin/mkimg/scheme.h +++ b/usr.bin/mkimg/scheme.h @@ -47,6 +47,9 @@ enum alias { ALIAS_MBR, ALIAS_NTFS, ALIAS_PPCBOOT, + ALIAS_HIFIVE_BBL, + ALIAS_XBOOTLDR, + ALIAS_HIFIVE_FSBL, /* end */ ALIAS_COUNT /* Keep last! */ }; From nobody Tue May 12 14:00:42 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gFJCN3lDKz6cDkH for ; Tue, 12 May 2026 14:00: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFJCN1yG5z3HKY for ; Tue, 12 May 2026 14:00:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778594448; 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; bh=rFxTsLP43axOZAoyKR0sY/BsGYrOYlOHXnnsw6iivHw=; b=n4hYEmf30iVUqE7XZ9bduCVbe2PHS+bxCh/nzOavVmqywC6mlPgw9FVj5CtdQ/LJjkc++a sb2gpYXgyUEuG2xgH+5+ZiF8wnvG8Y55A9T0vWGxpKZOoBBAJWrENCJhKLO64MC3H6qu+l ZKkLDyAVf2RgcLShyM1vzxdh1CWJrngL92p8VdrxeU2LDkiSRelqVyEBASF4iDXXTdiWkO IDxVkF1Kp3M3qPGMqNt4DhLSMskwJ+Dcl/6KhEur4yHr/HY+uI+MXCtCq0naEcQLRUjjH+ abDUV4TmDTEjk8XNSyvOhdm7Tupdsn8Yw8Uknx3FmyEvmhesWxMiGV7TiBx1uA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778594448; a=rsa-sha256; cv=none; b=p0XiqqdYqibb9ZA5GxgK6twGqk8+8Db17xUfLxjrkT460IKRZhCUWNttY60ftDfJ4YCzXe /k3jgMWbXdhiCyC8xVEWlRkMqtZ7i8pnZKC0LD/TUoQsGJaO/vlJpkEO7BYykXoc2G6UZQ RuREQ2brlPvmdGk88C8tMa/qNzPBLWvj3cgr/gWqYHuCdwCY+u6zhXPnG0YqZJM8L3fdFP teaQCdsRhC6v0DQ5YRifhhRTO+l7+vwxj0hWJDIjBMctI7dxFCsAkhHJem6wTdxYMUGBRr CwiFnrQ1KBzkJRW9h/7SU1LuBAudA8Uus/toZ3Tp0hSEz9IVL7gvK7LCTElpgg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778594448; 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; bh=rFxTsLP43axOZAoyKR0sY/BsGYrOYlOHXnnsw6iivHw=; b=o4XKxuIp6FE3ZZcnShHledMvcXGHiDxdsCcMVaJ3Qez+b/JM8EU/N1FTgJV7dRwRC0MN8h rl2htwi66jefdyLBe9M4RMrZQM3r38P2KoutgHyERYWCfFSnyIxcerO7WU4pCz5W5+dAJC I8TKAAjHHVXhzfncct8XiOcX0m0ZUSBVEeotCRn91B3YH2T2zsZ0PxsFbvUwQtnkuQ7Mk2 5g6tb2WeIxfDteb4CVzfQjYtsUiCYxsq4KNj1ICK9CmbFbMQU/PhgUVtD8KRaBeqg/D3gG KJDI4prYar8XP8aKh++Q9L1ArRPlbFQLiLnA5WWS5kTtqXLwLJ0O4WC6fdYQtA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFJCN1Wj1z151j for ; Tue, 12 May 2026 14:00:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 243ef by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 14:00:42 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Brian Scott From: Mitchell Horne Subject: git: 351fad05e075 - main - if_eqos_starfive: Read MAC address from device tree List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: 351fad05e075c388dece4cd6dd8613494b870bad Auto-Submitted: auto-generated Date: Tue, 12 May 2026 14:00:42 +0000 Message-Id: <6a03328a.243ef.7c686076@gitrepo.freebsd.org> The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=351fad05e075c388dece4cd6dd8613494b870bad commit 351fad05e075c388dece4cd6dd8613494b870bad Author: Brian Scott AuthorDate: 2026-05-11 16:54:04 +0000 Commit: Mitchell Horne CommitDate: 2026-05-12 14:00:10 +0000 if_eqos_starfive: Read MAC address from device tree u-boot/opensbi determines the ethernet MAC address from ROM and passes it to the OS in the device tree. This change sets the correct MAC address from this source. This prevents the eqos class driver from generating random MAC addresses at each boot. Tested on Starfive VisionFive 2, riscv64 SBC. Reviewed by: mhorne MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D56782 --- sys/dev/eqos/if_eqos_starfive.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/sys/dev/eqos/if_eqos_starfive.c b/sys/dev/eqos/if_eqos_starfive.c index 62f8b3f38983..f81118fd3094 100644 --- a/sys/dev/eqos/if_eqos_starfive.c +++ b/sys/dev/eqos/if_eqos_starfive.c @@ -17,6 +17,7 @@ #include #include +#include #include #include #include @@ -40,6 +41,7 @@ #define JH7110_CSR_FREQ 198000000 #define WR4(sc, o, v) bus_write_4(sc->base.res[EQOS_RES_MEM], (o), (v)) +#define RD4(sc, o) bus_read_4(sc->base.res[EQOS_RES_MEM], (o)) static const struct ofw_compat_data compat_data[] = { {"starfive,jh7110-dwmac", 1}, @@ -131,6 +133,8 @@ if_eqos_starfive_init(device_t dev) struct if_eqos_starfive_softc *sc = device_get_softc(dev); hwreset_t rst_ahb, rst_stmmaceth; phandle_t node; + uint8_t eaddr[ETHER_ADDR_LEN]; + uint32_t maclo, machi; node = ofw_bus_get_node(dev); @@ -186,6 +190,14 @@ if_eqos_starfive_init(device_t dev) return (ENXIO); } + if (OF_getprop(node, "local-mac-address", eaddr, sizeof(eaddr)) == + sizeof(eaddr)) { + machi = eaddr[5] | (eaddr[4] << 8); + WR4(sc, GMAC_MAC_ADDRESS0_HIGH, machi); + maclo = eaddr[3] | (eaddr[2] << 8) | (eaddr[1] << 16) | + (eaddr[0] << 24); + WR4(sc, GMAC_MAC_ADDRESS0_LOW, maclo); + } return (0); } From nobody Tue May 12 14:13:55 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gFJVX0Lzvz6cFfY for ; Tue, 12 May 2026 14:13: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFJVW67lQz3KN0 for ; Tue, 12 May 2026 14:13:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778595235; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fsQAbidLCr8uZMYnTeFIsM6G3L/RuZw7LFMIdXxY2go=; b=oNElQJwvwa5lEEawsAYVLMGRhrEwpL++ySAy85VpjLK2SOBi9Z9uq8du7b79IxsKifkfHo ky643oj7TYR1pTvlbEgHYTkOy8/f0lV+EglbaMv2CszAcZj9zoOl1eGJCP3K2VdaQTFVCg o+3eey8nQvu8fD/X/4p2nASwuoeMRCpMBO8ecigqBTo/BsGZYJXRxQRL94oW/HUOfHBQ+a 3Fv3HjQII3/oPKRpxb9uSBCF3XvZlAjak9LRgktg1+VINMhifhATQxvjEwU9ZH5w17NybC leCbM/NKg4KXCfl0JnrPqy1F6hagCAsLke0CRuOSdSoKsrYhwMS7TKWvdlP3zg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778595235; a=rsa-sha256; cv=none; b=S4zBFHikvzM3ov1i9O/r1QAQGcOg7CzbCPG9gLRCSW+xJInyn2CjeGfrH6a200MLVk5QoW TxtIzHPFiT0jXtRQ1xQxCvsMg6el+Hb6fGfWjuSmRWEgQqGOxaxEdAXw6DLKFVcGD96Xhm S+1MpxGx1fHGoW4i5QDReC6+RY/oXDL3OkxIdivqBQHEGg1pWbJPCjX0FsP325Rdp/L44G jPQZ3RaiMn6z9kcDMWG0Fqk7ZbZ5Do/O0Yvf8yUAuvNo3cbgk2Ux3Ub0wrklpgwHnG1Inj ShR2Spk2B5eEOfcWiFArypEyHIm046PnQvEKJAHQ15fdm/1oswAnlf1TuJargA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778595235; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fsQAbidLCr8uZMYnTeFIsM6G3L/RuZw7LFMIdXxY2go=; b=wZnHotJWkGMCMnnslTSICbTUU8HWV5DMkO8SMQDm794cu/J5kmk3AJb9vFcUXrLFC6146u 72sNAryHEtTvPGYylqZbb9sY3pbOJeXh0XiYLWX4lc2b1UAK54AJay553ZpoOix603VQVt UD2s6mIU2/VrKKfAOhJfxrlU8lwW4R1m41iBu+JSyirg9KxQqvR8I5kBhBUVBe6TY93mB6 KhHcgpRt9VpbotGeGFALBS781afnHCkO8z6bo1FPfISsTawcvFMOTcctj+l+10CgPtCxqb UXalzjD+bwNNXX3hidOMLIxdQh7dY5voyD1XEPQdBdXgLSERSpGlkZ83zjLv5w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFJVW5kgRz15nc for ; Tue, 12 May 2026 14:13:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 25016 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 14:13:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alan Somers Subject: git: dc14ae4217a0 - main - bsdinstall: do pkgbase installations with the "script" command List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: dc14ae4217a0babb1240f813b642edc2d7b955a6 Auto-Submitted: auto-generated Date: Tue, 12 May 2026 14:13:55 +0000 Message-Id: <6a0335a3.25016.6508a60e@gitrepo.freebsd.org> The branch main has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=dc14ae4217a0babb1240f813b642edc2d7b955a6 commit dc14ae4217a0babb1240f813b642edc2d7b955a6 Author: Alan Somers AuthorDate: 2026-04-28 17:27:17 +0000 Commit: Alan Somers CommitDate: 2026-05-12 14:13:16 +0000 bsdinstall: do pkgbase installations with the "script" command "bsdinstall script" will now do a pkgbase installation by default. The system components to install can be specified in the COMPONENTS variable, and have the same names as those used in the interactive installer. bsdinstall will still do a legacy distset installation if DISTRIBUTIONS is defined in the installerconfig file. MFC: 1 week PR: 290375 Sponsored by: ConnectWise Reviewed by: ziaee, ivy, jduran Differential Revision: https://reviews.freebsd.org/D56717 --- UPDATING | 5 +++ usr.sbin/bsdinstall/bsdinstall.8 | 45 ++++++++++++++++----- usr.sbin/bsdinstall/scripts/pkgbase.in | 15 ++++++- usr.sbin/bsdinstall/scripts/script | 71 ++++++++++++++++++++-------------- 4 files changed, 95 insertions(+), 41 deletions(-) diff --git a/UPDATING b/UPDATING index c60143c6184e..58d12856c581 100644 --- a/UPDATING +++ b/UPDATING @@ -27,6 +27,11 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 16.x IS SLOW: world, or to merely disable the most expensive debugging functionality at runtime, run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20260512: + "bsdinstall script" will now do a pkgbase installation by default. To + revert to the legacy distset installation, set "DISTRIBUTIONS" in + your installerconfig. + 20260412: The /etc/rc.d/NETWORKING script no longer provides the legacy NETWORK alias. Third-party or local RC scripts that still use diff --git a/usr.sbin/bsdinstall/bsdinstall.8 b/usr.sbin/bsdinstall/bsdinstall.8 index 282b88328e99..a35c8f56ada7 100644 --- a/usr.sbin/bsdinstall/bsdinstall.8 +++ b/usr.sbin/bsdinstall/bsdinstall.8 @@ -29,7 +29,7 @@ .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd April 20, 2026 +.Dd May 12, 2026 .Dt BSDINSTALL 8 .Os .Sh NAME @@ -109,9 +109,12 @@ for more information on this target. .Pp The .Ev DISTRIBUTIONS -environment variable is set to -.Dq base.txz kernel.txz -by default for this target. +environment variable is unset by default for this target. +Instead, the +.Ev COMPONENTS +environment variable is effectively set to +.Dq base kernel kernel-dbg +for this target. .It Cm keymap If the current controlling TTY is a .Xr syscons 4 @@ -321,8 +324,17 @@ overridden when making scripted or customized installers. The directory to use for temporary files. Default: .Dq Pa /tmp +.It Ev COMPONENTS +The set of components to install for scripted installations using +base system packages, e.g., +.Dq base lib32 kernel-dbg tests . +Default: "base kernel-dbg" .It Ev DISTRIBUTIONS -The set of distributions to install, e.g., "base.txz kernel.txz ports.txz". +The set of distributions to install for traditional installations, e.g., +.Dq base.txz kernel.txz ports.txz . +If unset, then +.Nm +will install using base system packages. Default: unset unless noted otherwise in the .Sx TARGETS section. @@ -609,18 +621,18 @@ A typical bsdinstall script, using the default filesystem layout and the UFS filesystem, looks like this: .Bd -literal -offset indent PARTITIONS=DEFAULT -DISTRIBUTIONS="kernel.txz base.txz" +COMPONENTS="base debug" #!/bin/sh sysrc ifconfig_DEFAULT=DHCP sysrc sshd_enable=YES -pkg install puppet +pkg install -y puppet .Ed .Pp For a scripted installation involving a ZFS pool spanning multiple disks, the script instead looks like this: .Bd -literal -offset indent -DISTRIBUTIONS="kernel.txz base.txz" +COMPONENTS="base debug" export ZFSBOOT_VDEV_TYPE=stripe export ZFSBOOT_DISKS="ada0 ada1" export nonInteractive="YES" @@ -628,7 +640,20 @@ export nonInteractive="YES" #!/bin/sh echo "ifconfig_DEFAULT=DHCP" >> /etc/rc.conf echo "sshd_enable=YES" >> /etc/rc.conf -pkg install puppet +pkg install -y puppet +.Ed +.Pp +To install using traditional distributions sets instead of packages, set +.Ev DISTRIBUTIONS +to the list of distribution sets to install, like this: +.Bd -literal -offset indent +PARTITIONS=DEFAULT +DISTRIBUTIONS="kernel.txz base.txz" + +#!/bin/sh +sysrc ifconfig_DEFAULT=DHCP +sysrc sshd_enable=YES +pkg install -y puppet .Ed .Pp On @@ -653,7 +678,7 @@ arbitrary commands can be run here to extend the installer. In addition to the variables in .Sx ENVIRONMENT VARIABLES , in particular -.Ev DISTRIBUTIONS , +.Ev COMPONENTS , the preamble can contain a variable .Ev PARTITIONS which is passed to the diff --git a/usr.sbin/bsdinstall/scripts/pkgbase.in b/usr.sbin/bsdinstall/scripts/pkgbase.in index 89ddc244171e..2c7d6bcae904 100755 --- a/usr.sbin/bsdinstall/scripts/pkgbase.in +++ b/usr.sbin/bsdinstall/scripts/pkgbase.in @@ -180,7 +180,18 @@ local function select_components(components, options) } append_list(bsddialog_args, checklist_items) - local exit_code, output = bsddialog(bsddialog_args) + local exit_code = 0 + local output = "" + if options.non_interactive then + local env_components = os.getenv("COMPONENTS") + if env_components then + output = env_components:gsub(" ", "\n") + else + output = "base\nkernel-dbg" + end + else + exit_code, output = bsddialog(bsddialog_args) + end -- This should only be possible if bsddialog is killed by a signal -- or buggy, we disable the cancel option and esc key. -- If this does happen, there's not much we can do except exit with a @@ -300,6 +311,8 @@ local function parse_options() for _, a in ipairs(arg) do if a == "--jail" then options.jail = true + elseif a == "--non-interactive" then + options.non_interactive = true else io.stderr:write("Error: unknown option " .. a .. "\n") os.exit(1) diff --git a/usr.sbin/bsdinstall/scripts/script b/usr.sbin/bsdinstall/scripts/script index 21da2ea7c366..93d07c7899c3 100755 --- a/usr.sbin/bsdinstall/scripts/script +++ b/usr.sbin/bsdinstall/scripts/script @@ -40,6 +40,7 @@ f_include $BSDCFG_SHARE/variable.subr # PARTITIONS # DISTRIBUTIONS # BSDINSTALL_DISTDIR +# COMPONENTS # # Default name of the ZFS boot-pool @@ -97,7 +98,6 @@ awk 'BEGIN {pathb=ARGV[2]; ARGV[2]=""} /^#!/{b=1} { >$TMPDIR/bsdinstall-installscript-preamble . $TMPDIR/bsdinstall-installscript-preamble -: ${DISTRIBUTIONS="kernel.txz base.txz"}; export DISTRIBUTIONS export BSDINSTALL_DISTDIR # Re-initialize a new log if preamble changed BSDINSTALL_LOG @@ -118,37 +118,48 @@ else fi bsdinstall mount -# Fetch missing distribution files, if any -exec 5>&1 -export BSDINSTALL_DISTDIR=$(`dirname $0`/fetchmissingdists 2>&1 1>&5) -FETCH_RESULT=$? -exec 5>&- +if [ -n "$COMPONENTS" -a -n "$DISTRIBUTIONS" ]; then + error "Cannot set both COMPONENTS and DISTRIBUTIONS" +elif [ -z "$DISTRIBUTIONS" ]; then + # If COMPONENTS is set, or neither is, install with pkgbase + bsdinstall pkgbase --non-interactive +else + # Otherwise, unpack distsets -[ $FETCH_RESULT -ne 0 ] && error "Could not fetch remote distributions" + # Fetch missing distribution files, if any + exec 5>&1 + export BSDINSTALL_DISTDIR=$(`dirname $0`/fetchmissingdists 2>&1 1>&5) + FETCH_RESULT=$? + exec 5>&- -# Unpack distributions -bsdinstall checksum -if [ -t 0 ]; then - # If install is a tty, use distextract as normal - bsdinstall distextract -else - # Otherwise, we need to use tar (see https://reviews.freebsd.org/D10736) - for set in $DISTRIBUTIONS; do - f_dprintf "Extracting $BSDINSTALL_DISTDIR/$set" - # XXX: The below fails if any mountpoints are FAT, due to - # inability to set ctime/mtime on the root of FAT partitions, - # which is needed to support e.g. EFI system partitions. tar has - # no option to ignore this (distextract ignores them internally - # through a hack), and returns 1 on any warning or error, - # effectively turning all warnings into fatal errors. - # - # Work around this in an extremely lame way for the specific - # case of EFI system partitions only. This *ONLY WORKS* if - # /boot/efi is empty and does not handle analogous problems on - # other systems (ARM, PPC64). - tar -xf "$BSDINSTALL_DISTDIR/$set" -C $BSDINSTALL_CHROOT --exclude boot/efi - mkdir -p $BSDINSTALL_CHROOT/boot/efi - done + [ $FETCH_RESULT -ne 0 ] && error "Could not fetch remote distributions" + + bsdinstall checksum + if [ -t 0 ]; then + # If install is a tty, use distextract as normal + bsdinstall distextract + else + # Otherwise, we need to use tar (see + # https://reviews.freebsd.org/D10736) + for set in $DISTRIBUTIONS; do + f_dprintf "Extracting $BSDINSTALL_DISTDIR/$set" + # XXX: The below fails if any mountpoints are FAT, due + # to inability to set ctime/mtime on the root of FAT + # partitions, which is needed to support e.g. EFI + # system partitions. tar has no option to ignore this + # (distextract ignores them internally through a hack), + # and returns 1 on any warning or error, effectively + # turning all warnings into fatal errors. + # + # Work around this in an extremely lame way for the + # specific case of EFI system partitions only. This + # *ONLY WORKS* if /boot/efi is empty and does not + # handle analogous problems on other systems (ARM, + # PPC64). + tar -xf "$BSDINSTALL_DISTDIR/$set" -C $BSDINSTALL_CHROOT --exclude boot/efi + mkdir -p $BSDINSTALL_CHROOT/boot/efi + done + fi fi # Configure bootloader if needed From nobody Tue May 12 15:10:42 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gFKm25vrCz6cKsM for ; Tue, 12 May 2026 15:10: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFKm25Bc6z3Vpt for ; Tue, 12 May 2026 15:10:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778598642; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LoadKi2kFhxG1WGDA4Obu+oaDMTPzqmIraKayqpWjlU=; b=V6tTlnBdbPi2+tIUgjUDEqLLZU4cDDuPG2Exf30MsgV5QVFzkJIj0lF4mTdBLCokfwc5qb 3UWsa1QRQ0a5XQ2r6Q+DPJ+HVPH1uA59Ohex7fq7Vq9FvnK3yLz52a9OPo/7D49XaMsm9V 5851UhNzfs2zElkElEmFbBiNQgWOrzhNcc8C4aMvg40QG8omipoHmuoDr+9wvZj20XtPRB xfrEB+G5l9NkJM43G5q1Pmj81g2TwVJ4ji7cz/zVSUokaM0ablgj0uwlwVk6/OuPyAhz8D QYl9Sru68c/VTpZ0dv48JyEHHltraGk4eCUP+uW9IQHjTlkKXi7zX9+LDYu/3A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778598642; a=rsa-sha256; cv=none; b=sK/SKiSCLiwdLCnWa8OAxm6LqrsfS3sIVtu0sAyW34tCoc3GChYQC+GXl9ab8MTNRzDCRm i2R3ByxS5Z6ZL1spjPyP26R/Lqm/5mZ7hXIZzpTNbnqw++1yGxMrr1fa59UDOEAn805V5I 3R/pugOYvL2+giMSbu3ZDdbwn7J0lNPk0T+/Dvjh3WWXmWNOCJFK+71HjbHzYPyGhyhkfx AOAcic99JGJtcWDHwciojEpyYkCnglYxRVlxwPNSgH44+HUejuFYLu+J/joeWQ0ke+DP/V W2GYIfrXDDNwFG1DKhtJ76BXWf4NEg+iBFkkJ03pMfoXKbo3By4JL9nFQCsiDA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778598642; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LoadKi2kFhxG1WGDA4Obu+oaDMTPzqmIraKayqpWjlU=; b=eFt1MEFqqYDm2hnYks5/FnZBMUHZT8wLmzZGEfcY3/iIIwTs8GNXFiidw+nmOm5sFbIx+f 2rnLAqS9Sl3QvNTNm+gS5DPvHRwwdXEbuU1QAWsQbBSSUziY6NFGQcEwp+IGaqn20l8K5D FFpIR8VHLFsE3Ova3PTP0eOrPJaqt74+8CP1Fnlz3Mwgpe0xIJIOy2upySOUDNooX9/pF1 vpo62uERugAmIhz39rZntk5z2JevziiArStxHHClzAlhA742gJLM18S+o8nmPgPk+dvnsh 7icNAaTuXLD3Vinqslogru40m8AybPtTepk45DK/eZM2a5a7YCrcAzgH8a3X5A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFKm24lJ6z17WV for ; Tue, 12 May 2026 15:10:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 331a1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 15:10:42 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Gleb Smirnoff Subject: git: 654c2d1878cd - internal/admin - Re-activate ray's commit bit. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/internal/admin X-Git-Reftype: branch X-Git-Commit: 654c2d1878cd7a6114482c3d0c94d2cf582c28e0 Auto-Submitted: auto-generated Date: Tue, 12 May 2026 15:10:42 +0000 Message-Id: <6a0342f2.331a1.56378398@gitrepo.freebsd.org> The branch internal/admin has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=654c2d1878cd7a6114482c3d0c94d2cf582c28e0 commit 654c2d1878cd7a6114482c3d0c94d2cf582c28e0 Author: Gleb Smirnoff AuthorDate: 2026-05-12 15:09:34 +0000 Commit: Gleb Smirnoff CommitDate: 2026-05-12 15:09:34 +0000 Re-activate ray's commit bit. glebius@ and imp@ to mentor. Approved by: srcmgr --- access | 1 + mentors | 1 + 2 files changed, 2 insertions(+) diff --git a/access b/access index 16b8b1bdd1e2..fbcc5ba59979 100644 --- a/access +++ b/access @@ -146,6 +146,7 @@ pjd pouria pstef ram +ray rcm rew rlibby diff --git a/mentors b/mentors index f4b7944ebf37..e3c8b170c7ec 100644 --- a/mentors +++ b/mentors @@ -21,6 +21,7 @@ js asomers oh manu osamaabb cperciva Co-mentor: akiyano ram ken Co-mentor: mav +ray imp Co-mentor: glebius rcm kp siva lwhsu Co-mentor: emaste ssaxena imp From nobody Tue May 12 15:33:29 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gFLGR0Nyqz6cMvH for ; Tue, 12 May 2026 15:33:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFLGQ5bP0z3ZC8 for ; Tue, 12 May 2026 15:33:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778600014; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TUpuSFZxFCLWvt9VwtedWQjo6lOlqG3HyR0MuwpKuN8=; b=cai0XloqlZIJCQQoZBtKqqojtZHiGX8Frq5jgH2M/bxJH/mOwvmQnFz/A59uJoa2r4oEwE wfN7Bigq+lwvMJTsUtKctuNwARk5F93u9P2LZ93C+otL6BsMIaWLGG7Wmo5XyNHanukCwD QVkDEm0/1SdciOJq3wYUk5wGH7PGIlIMa+Hdi1eaKGXV4tc31K+vcQ/fBfUPab2WEOyVjf M6JNneNYGOZ9ezmdaQqB8BPdikyQHe8sXvdz14ItBweBrbQKRDu9qe4Z76lSYkpn2i6Mlw szb0W9gWTnc87CX3J2zc23XPkJuPeMSBMxcuCshNKBnZk2OGef1XJ+eZ8UYf4A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778600014; a=rsa-sha256; cv=none; b=q4bL+Egvw0xI+U6bpGL1ahF3q8TDklekiX7NhFusseD9cxD4BgSrRd9OykaCf5eVloagp6 TlYR66geZXXK1QcdF4pU+EHe4SwkNMJ9gUfgbStbciNxbTyFoOPDcZDdt3ocPF//Yo2u1i FfM4tDzBz8ztDvUJy1/Nfxh94ttcCYmY8bCC8uywHIdREB2z6TKQmJqNeIJLWogDLPeMwQ yJUuhCnO4dbpd8iJWbcCGyZM5kEszXLgZXV6g10kNWb490mUVXwCePJ7kzi/WujsFQEDmo AX4fTZ2WIwKythARKhgBcf9KxUEgssZpVCu6a4NcPO5/f4A5GU5sC7p7l15G1g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778600014; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TUpuSFZxFCLWvt9VwtedWQjo6lOlqG3HyR0MuwpKuN8=; b=DFY3YPNGy8BiwqU0+9++22IwUKM7AcIBgm4KhqRBRKRC2B98uRIEoj5FoTT0QZgjZICmGr T1PahjojqsmdBFJJxjholLJE8HFK4SHWiM124iEC9J8cF7E248HG52wNSooO48a946+OFH n8WREaviobn8TiRBHL311WYbG3yn/5g3FdJQN3Sk1G4TtqblsZD5BPqfOdioVm1w74fFVY Pa7HY+AzQq97hGbaB2R/ZmR57Ica01Y+TgnOn46KFJ/nf23HNBhbCPURApXiqTtiztCiZB j2c4Y14uk/quTHBesdMw+osTELfMMEMO00dS1Ic+yTuYcxP9tgWPq5/NTx3ykw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFLGQ4z2nz17sD for ; Tue, 12 May 2026 15:33:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 365ac by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 15:33:29 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Chuck Tuffli Subject: git: 346be36e8861 - main - smart: Merge smart 1.0.3 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: chuck X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 346be36e8861e26bfed44cbf960903d0055f6660 Auto-Submitted: auto-generated Date: Tue, 12 May 2026 15:33:29 +0000 Message-Id: <6a034849.365ac.30377fd0@gitrepo.freebsd.org> The branch main has been updated by chuck: URL: https://cgit.FreeBSD.org/src/commit/?id=346be36e8861e26bfed44cbf960903d0055f6660 commit 346be36e8861e26bfed44cbf960903d0055f6660 Merge: dc14ae4217a0 d2d20bb5099d Author: Chuck Tuffli AuthorDate: 2026-05-12 14:33:03 +0000 Commit: Chuck Tuffli CommitDate: 2026-05-12 14:33:03 +0000 smart: Merge smart 1.0.3 Merge commit 'd2d20bb5099dc1c443a4b783d43b8a45338c85d2' contrib/smart/Changelog | 4 ++++ contrib/smart/freebsd_dev.c | 17 +++++------------ contrib/smart/libsmart.c | 2 +- contrib/smart/smart.c | 2 +- 4 files changed, 11 insertions(+), 14 deletions(-) From nobody Tue May 12 15:48:38 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gFLc50mZKz6cP86 for ; Tue, 12 May 2026 15:48:53 +0000 (UTC) (envelope-from rlibby@gmail.com) Received: from mail-yw1-f174.google.com (mail-yw1-f174.google.com [209.85.128.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 4gFLc354vXz3fkW for ; Tue, 12 May 2026 15:48:51 +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.174 as permitted sender) smtp.mailfrom=rlibby@gmail.com Received: by mail-yw1-f174.google.com with SMTP id 00721157ae682-7c0dea734b8so30236577b3.3 for ; Tue, 12 May 2026 08:48:51 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778600931; x=1779205731; h=content-transfer-encoding:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=3H0+Sav9WjwHu0//Qn3KwI2m78IWW/q1BJYphH2aK/I=; b=nq7SvdsQFXDUtphvO7foopFBJy77C1DwYQpXrSxPWcyifSwFmiKiuXx7aPgMkkGsrD jqIddfzWQWIszFsRL0HEqNcVHehKiXRlEw8M3Dc8j0uiBfx+KDpdfN+Xe5MZIuOYoYQE NLlMEvRTO2MNgf7UIB9kejzi+3tJItiQIZf38sboOcaT4fRrGbhneo4vlZF7/w4MA/JZ diIYn7lY3YUHIP7pUBsOlRsWSXE5zpWZzz2ZqcopZ8j/lW+wMNE/xna+nQx0QG0IgSLR lF8eqHObwFOA6YwR9ZOar/+Rp/EjTVW4MdGJQP4mt2Xa+j+99W0SPwWUg13aKuIaJ0H0 AY5Q== X-Forwarded-Encrypted: i=1; AFNElJ+X6e6AxiRioDIvrI4NzAE0m6fP88HcVL2a8x4oiQzqWawyJEiboLnvHhGGcuOQSPjvDnp6uEMjf6W+pnl2Pd1OpXId@freebsd.org X-Gm-Message-State: AOJu0YwFyZOMqMlVZH0VFKkGmAjCJ1TsgGbbWnS00ZZkbQIGAoREnfWJ Mk2QgXojlwtHVBAPledDeOknhPzgnI3HEs16hUA+cK4doAB0Y7QDcfCWtb1Mfw== X-Gm-Gg: Acq92OE4JyaAiC9tz5+BLHZp7vJF6YpcJJ9o4Bc7AJKXSHZ8Hf+Dyvd0coHiNlBqUxZ PS6zuGwxkSdVQLpP/XvzpyjM7lg9O4vJ3SWcAuYeYpxiM9VEdCn/PuM2YQFYEharz0u48nziEoZ WSsZqivxm5+/QIliWfcq81d8nkg+dEVsi+fL+Gw+oa//JRwQv4cARcELrk+5mFB2Wb4QKLObQM5 abpE6LERK10z67j6HDdLL844nx9iW8OUbCPV1UjRNDQt6q7bmm/NLj+rCFpBYXqFx12vx3Lp/N/ 6SuOKPGmuZjcFH7Bz1o8TsN+rXiXmCWPmBWI+K7Y4pOg+tTVNP9JuRQDnSsgk7V4bSgUBB2e9+W BYgkxXn+hUE18nrPh1i4AfO4WXxQBcCzouDk4Kd+GUbum6hB0hdzEK5S5ky5bYfdkt8hxmJwrs3 KR3F6oHcxrkAlRXyOD9ZtpBLqxqtmgIaUtEI6Jghtgjq6kgcwbr0UJj/w6yA== X-Received: by 2002:a05:690c:48c5:b0:7b7:5f48:d9aa with SMTP id 00721157ae682-7bdf5f3dee4mr298143007b3.50.1778600930739; Tue, 12 May 2026 08:48:50 -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 00721157ae682-7bd66896398sm165435787b3.48.2026.05.12.08.48.50 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 12 May 2026 08:48:50 -0700 (PDT) Received: by mail-yx1-f54.google.com with SMTP id 956f58d0204a3-651c7ddf514so6219623d50.1 for ; Tue, 12 May 2026 08:48:50 -0700 (PDT) X-Forwarded-Encrypted: i=1; AFNElJ/PKSlawzmrpFLtbp/YzeB0cfbvgDDYz+ZjkSiJft6lVe3fTD13x3DiQ0ufC3J+kIHxHrfQiZNiJYv04pG+TQMaRNjR@freebsd.org X-Received: by 2002:a05:690e:1403:b0:650:a6d:d6bf with SMTP id 956f58d0204a3-65c79ee4068mr28594244d50.51.1778600930119; Tue, 12 May 2026 08:48:50 -0700 (PDT) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 References: <6a000ce6.3679f.32629671@gitrepo.freebsd.org> In-Reply-To: <6a000ce6.3679f.32629671@gitrepo.freebsd.org> From: Ryan Libby Date: Tue, 12 May 2026 08:48:38 -0700 X-Gmail-Original-Message-ID: X-Gm-Features: AVHnY4Lifka9WCN9AryEFSz2Va1AsGfSfjQaB4_jIONpD0hxvLjmkF2lwz6VsQQ Message-ID: Subject: Re: git: 58e5b4dbd959 - main - vfs_subr: mark uma zone and smr pointers __read_mostly To: 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-Result: default: False [-2.89 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.99)[-0.989]; 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]; RCPT_COUNT_THREE(0.00)[3]; MISSING_XM_UA(0.00)[]; FROM_HAS_DN(0.00)[]; RCVD_COUNT_THREE(0.00)[3]; RCVD_TLS_LAST(0.00)[]; MIME_TRACE(0.00)[0:+]; ARC_NA(0.00)[]; FREEFALL_USER(0.00)[rlibby]; RCVD_VIA_SMTP_AUTH(0.00)[]; FREEMAIL_ENVFROM(0.00)[gmail.com]; TO_MATCH_ENVRCPT_SOME(0.00)[]; TO_DN_NONE(0.00)[]; FROM_NEQ_ENVFROM(0.00)[rlibby@freebsd.org,rlibby@gmail.com]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; PREVIOUSLY_DELIVERED(0.00)[dev-commits-src-all@freebsd.org]; R_DKIM_NA(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.128.174:from]; RCVD_IN_DNSWL_NONE(0.00)[209.85.128.174:from,74.125.224.54:received] X-Spamd-Bar: -- X-Rspamd-Queue-Id: 4gFLc354vXz3fkW On Sat, May 9, 2026 at 9:43=E2=80=AFPM Ryan Libby wrot= e: > > The branch main has been updated by rlibby: > > URL: https://cgit.FreeBSD.org/src/commit/?id=3D58e5b4dbd9594f9553cfe9df68= a19a294e245ed7 > > commit 58e5b4dbd9594f9553cfe9df68a19a294e245ed7 > Author: Ryan Libby > AuthorDate: 2026-05-10 04:25:12 +0000 > Commit: Ryan Libby > CommitDate: 2026-05-10 04:25:12 +0000 > > vfs_subr: mark uma zone and smr pointers __read_mostly > > Reviewed by: kib > Differential Revision: https://reviews.freebsd.org/D56892 > --- I should have tagged this one: Sponsored by: Dell Inc. From nobody Tue May 12 15:56:29 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gFLmz0G6kz6cfH2 for ; Tue, 12 May 2026 15:56:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFLmy3zVDz3hT4 for ; Tue, 12 May 2026 15:56:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778601394; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SUY1fTXY+rcioVxgZlZBOwucMMRXgKYwbE2ghlWidhg=; b=Z5MPetkl+n1KYRyvZsF7Nbybkt30cpXwHaepiZf6XKUWUgRsekJujPqjmSH76/cyL1sKUn dJ2VW/hMZ4AP8G/dT3V/Vr3gCVHXdvGWQ/C4iEMgBY9FUKzCN2sK9zjqXhssC7k+/l0Qmd WMxslwUMhni8NcuszoubRvNoBFpwEXcclk7ga1C74yDH1L5RivKZjMQM9CpjL9AKKnlmBI loKrowDu/ty/S/N8qkGnDYsSJU2D9Mfie23k36qwUAfUaYCAXw60FYWLa5VHHu5A+H9UTZ li0gZPFF6gM8K0QXeqZtxJcDpW2L1uGxipYhKStmtTD6L8ibdQ+6YFnz0TlLig== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778601394; a=rsa-sha256; cv=none; b=xMqQcJxsIJuQBq7d2KQ1Od1VYKd7QwnJF5Ud7DAmgK+jEJSIr/wEvrfyOivNLTf9OY96Wy W8YtbHoJcN56DbJzeHALii7AbCoxahoie3Y9TsE6FN4lv0ZoAO9OI+MKUpN705H8R1cRit 7MkB0HAQrHWNv/d6je6UYEqseEzhutNp92j50ppXIJJuM3zXz2LPPW/bfoXkF8E1pHDJ2N WrA2rPbXJ2aNa+nxseHjQXkyBHKQXb09Ehmpz1FqfXamEYpwx2ivLne1vHqsFp4s4idmc6 nOxfzKmLMwcMKmcvCEnshaGFVSrgFUS7uLEyiGxttX9ub98iFeAcU7rhmppePQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778601394; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SUY1fTXY+rcioVxgZlZBOwucMMRXgKYwbE2ghlWidhg=; b=BHV6Yt64nSd+DLPWKlK6qNWP5Y8R138x2CdiYXTZy6S0sKE4qYhBbV/Zikuv0qZ7Eih53E zvHp7SVpgW9fsSo+SoMVa601TxNK2y2ODF5LnxN7TNuBAKYKyC/UGCcriSIkROSPXIDYQf chHSjLd2ENMclt0r/T/czDj0BDYyfMH1PGpE08BBK09IIXMitIxZ61/VS519P3CzTPqS4b 3NsWvrf0Y5Ylt+OfvTS8nYyVGylQUXjGbOVx8EGoIw0sOtad/xmoeaBD7vopZA4k9ZEEr7 UjqgJXOaVGjULnoooq/m1YELSIKadtbrjyX0xPI3wcKGCRDtW2bmfrth0g7PAA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFLmy36pZz18WD for ; Tue, 12 May 2026 15:56:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 376c9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 15:56:29 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Aleksandr Rybalko Subject: git: 8db0553ed6d8 - main - vt: Clear cut-paste selection if the area intersects with the filled region List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ray X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8db0553ed6d8636d82a26896237099526b93be19 Auto-Submitted: auto-generated Date: Tue, 12 May 2026 15:56:29 +0000 Message-Id: <6a034dad.376c9.1b86bb2c@gitrepo.freebsd.org> The branch main has been updated by ray: URL: https://cgit.FreeBSD.org/src/commit/?id=8db0553ed6d8636d82a26896237099526b93be19 commit 8db0553ed6d8636d82a26896237099526b93be19 Author: Aleksandr Rybalko AuthorDate: 2026-05-12 15:56:20 +0000 Commit: Aleksandr Rybalko CommitDate: 2026-05-12 15:56:20 +0000 vt: Clear cut-paste selection if the area intersects with the filled region * cut-paste buffer stays unchanged PR: 260069 Reported by: emaste Reviewed by: imp Approved by: imp (mentor) Differential Revision: https://reviews.freebsd.org/D56922 --- sys/dev/vt/vt.h | 2 ++ sys/dev/vt/vt_buf.c | 30 ++++++++++++++++++++++++++++++ sys/dev/vt/vt_core.c | 8 +++++--- 3 files changed, 37 insertions(+), 3 deletions(-) diff --git a/sys/dev/vt/vt.h b/sys/dev/vt/vt.h index 4abe99e4ab13..6ff242562c87 100644 --- a/sys/dev/vt/vt.h +++ b/sys/dev/vt/vt.h @@ -248,6 +248,8 @@ void vtbuf_cursor_visibility(struct vt_buf *, int); int vtbuf_set_mark(struct vt_buf *vb, int type, int col, int row); int vtbuf_get_marked_len(struct vt_buf *vb); void vtbuf_extract_marked(struct vt_buf *vb, term_char_t *buf, int sz, int mark); +void vtbuf_unmark(struct vt_buf *vb); +void vtbuf_unmark_on_cross(struct vt_buf *vb, int target_begin, int target_end); #endif #define VTB_MARK_NONE 0 diff --git a/sys/dev/vt/vt_buf.c b/sys/dev/vt/vt_buf.c index e1e4ebc23491..8596342c139a 100644 --- a/sys/dev/vt/vt_buf.c +++ b/sys/dev/vt/vt_buf.c @@ -202,6 +202,36 @@ vtbuf_in_this_range(int begin, int test, int end, int sz) else return (test >= begin && test < end); } + +void +vtbuf_unmark(struct vt_buf *vb) +{ + + vtbuf_set_mark(vb, VTB_MARK_START, 0, 0); +} + +void +vtbuf_unmark_on_cross(struct vt_buf *vb, int target_begin, int target_end) +{ + int hsz, mb, me, tb, te; + + tb = vtbuf_wth(vb, target_begin); + te = vtbuf_wth(vb, target_end); + mb = vb->vb_mark_start.tp_row; + me = vb->vb_mark_end.tp_row; + hsz = vb->vb_history_size; + + /* + * Test intersection with vtbuf_in_this_range due to use of + * the circular buffer. + */ + if (vtbuf_in_this_range(tb, mb, te, hsz) || + vtbuf_in_this_range(tb, me, te, hsz) || + vtbuf_in_this_range(mb, tb, me, hsz) || + vtbuf_in_this_range(mb, te, me, hsz)) { + vtbuf_unmark(vb); + } +} #endif int diff --git a/sys/dev/vt/vt_core.c b/sys/dev/vt/vt_core.c index 68e9f45cff56..641f6c014937 100644 --- a/sys/dev/vt/vt_core.c +++ b/sys/dev/vt/vt_core.c @@ -1197,6 +1197,10 @@ vtterm_fill(struct terminal *tm, const term_rect_t *r, term_char_t c) { struct vt_window *vw = tm->tm_softc; +#ifndef SC_NO_CUTPASTE + vtbuf_unmark_on_cross(&vw->vw_buf, r->tr_begin.tp_row, + r->tr_end.tp_row); +#endif vtbuf_fill(&vw->vw_buf, r, c); } @@ -2465,9 +2469,7 @@ vt_mouse_event(int type, int x, int y, int event, int cnt, int mlevel) default: vt_mouse_paste(); /* clear paste buffer selection after paste */ - vtbuf_set_mark(&vw->vw_buf, VTB_MARK_START, - vd->vd_mx / vf->vf_width, - vd->vd_my / vf->vf_height); + vtbuf_unmark(&vw->vw_buf); break; } return; /* Done */ From nobody Tue May 12 16:04:19 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gFLyF5Z6pz6cfn1 for ; Tue, 12 May 2026 16:04:37 +0000 (UTC) (envelope-from ctuffli@gmail.com) Received: from mail-pf1-f181.google.com (mail-pf1-f181.google.com [209.85.210.181]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFLyB6ggdz3lxv for ; Tue, 12 May 2026 16:04:34 +0000 (UTC) (envelope-from ctuffli@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 ctuffli@gmail.com designates 209.85.210.181 as permitted sender) smtp.mailfrom=ctuffli@gmail.com Received: by mail-pf1-f181.google.com with SMTP id d2e1a72fcca58-834f1075805so4015153b3a.2 for ; Tue, 12 May 2026 09:04:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778601873; x=1779206673; h=content-transfer-encoding:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=0TmW/YaNwyeBKFsXezyHeDlWuX6yIXapFxYhi4rSYS0=; b=WTwscn8Hgw2StLPenwvJ0eKiLXjvhegoIW4l0yflcUMAeoKEyT2jJNLZLMpIB20uXE 7UNsJLyrgRQFKSEhx4brQbccLRVxiYcMGzkmb7AFPI16hLLGrxLS0grU/KiVNFTTRA+W 1P6KfwHsrUceD8aMcV1fWSKZonBeP/gpPJWhsdEsE3bHBT5KSbWRHBWral4XRfyh9LyQ GIh/yD9rHDit0SDfWuN0GmFUsXCm54G5dgnU3G6h5M9xLFMLDf5bx7cXFt2Xq2LkcXDf 2Nl4beXl2HFqe0R1IpILk62lTq5X8XyEEgs4iceJAxWhVQBENfC5QlgI+CCUbftwBZYE 35eQ== X-Forwarded-Encrypted: i=1; AFNElJ9z2ephjCwTfdR0V6aYLVnDVR96poSNN+OoO1bnXBy5IeneLRKvd3SliA/HpLt0wUZFsRCO0cweAtl6lTcRdV3wy3Db@freebsd.org X-Gm-Message-State: AOJu0YxqQoyfpzZPbp8TRCwIHWgPTwUV6j1Krc1TvJlUTW84c22YeW8/ 5dls15SCl/5njKSpFNhPy6561KlScxLZqqldnXpFp9/tMercHpFFwBqlMkOqEA== X-Gm-Gg: Acq92OHWK1Y4R9MhNGwYNOcZWLXIG3fT8jzrDUlKn8cLAms2ekNJf9ZSTGV2vgFlAn1 AqXOR5djIQDYntXrr4xS8SDo67OLmTAbKWQ4cL7wqFeIX3UGQj6CO97rc2dPgcFflLnXR0ZrJA9 0YshDVeJXvW7dnOXPA3njACEgSDBXb2cWz62qqV09bKmuNez/qGRq8+l8ERs2kMbIEo8mpwzQ+P QgyeDbxqVM02yiapbdhKmJrrRqK6Q4JVEbSu2LnP0X26iEPulBTVzREPXmdRlJRIjHQDUxvGAtZ sV4qR5Q+8mf0bY1fxLCyeI2lNAXWk9Q1MMY8LMDGI66aYk3qTM7Apo7rm2Ew3OfSzXaLdy9OD9k tzNPaAvtXNDXzMTOJ5b0lJbAQfK/A7A9pGLyLXlLQYeasQcPiIfG75R0bFUS2SDQDy9XHRwuTRO D0HYWD1T+mxjMkBj3N6iITrx/pw8IH4mJZelgYpyfdlecpIc+paw+77nsQMWkF X-Received: by 2002:a05:6a00:b48:b0:82f:280a:d888 with SMTP id d2e1a72fcca58-83a5bbd5fd8mr29537706b3a.12.1778601873014; Tue, 12 May 2026 09:04:33 -0700 (PDT) Received: from mail-pf1-f176.google.com (mail-pf1-f176.google.com. [209.85.210.176]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-83967dbdda0sm23974986b3a.44.2026.05.12.09.04.31 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 12 May 2026 09:04:31 -0700 (PDT) Received: by mail-pf1-f176.google.com with SMTP id d2e1a72fcca58-83ef8b48f94so428064b3a.0 for ; Tue, 12 May 2026 09:04:31 -0700 (PDT) X-Forwarded-Encrypted: i=1; AFNElJ8TN2INw4k8BDl982k8tWIFGnv1HaJzc0YHha1goUOUZCj83URO/2K9V1zQoUs74pHcsG67wPHotgyDIk3zfjrXxxjD@freebsd.org X-Received: by 2002:a05:6a00:b48:b0:82f:280a:d888 with SMTP id d2e1a72fcca58-83a5bbd5fd8mr29537511b3a.12.1778601871058; Tue, 12 May 2026 09:04:31 -0700 (PDT) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 References: <6a025660.37fa7.6a3f7fc0@gitrepo.freebsd.org> In-Reply-To: From: Chuck Tuffli Date: Tue, 12 May 2026 09:04:19 -0700 X-Gmail-Original-Message-ID: X-Gm-Features: AVHnY4JgaPS6toj0mC3T-6ilaC0wcFU78HK1G_7BfZqVW7ExXPuuqJHNyKauEIs Message-ID: Subject: Re: git: 25942dddc8a8 - main - smart: Connect contrib/smart to build To: Chuck Tuffli , 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-Result: default: False [-2.99 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.99)[-0.990]; FORGED_SENDER(0.30)[chuck@freebsd.org,ctuffli@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]; RWL_MAILSPIKE_GOOD(-0.10)[209.85.210.181:from]; RCVD_VIA_SMTP_AUTH(0.00)[]; ARC_NA(0.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; FREEMAIL_ENVFROM(0.00)[gmail.com]; TO_DN_SOME(0.00)[]; MISSING_XM_UA(0.00)[]; MIME_TRACE(0.00)[0:+]; R_DKIM_NA(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org]; FROM_NEQ_ENVFROM(0.00)[chuck@freebsd.org,ctuffli@gmail.com]; FROM_HAS_DN(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[209.85.210.181:from,209.85.210.176:received]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_TLS_LAST(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[dev-commits-src-all@freebsd.org]; RCVD_COUNT_THREE(0.00)[3]; RCPT_COUNT_THREE(0.00)[4] X-Spamd-Bar: -- X-Rspamd-Queue-Id: 4gFLyB6ggdz3lxv On Tue, May 12, 2026 at 2:21=E2=80=AFAM Lexi Winter wrote= : > > hello, > > Chuck Tuffli wrote in <6a025660.37fa7.6a3f7fc0@gitrepo.freebsd.org>: > > smart: Connect contrib/smart to build > > this has broken the armv7 build: Both the armv7 and gcc14 builds should be working again. From nobody Tue May 12 16:44:45 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gFMrZ0BZVz6ckTp for ; Tue, 12 May 2026 16:44:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFMrY5rLbz3sgs for ; Tue, 12 May 2026 16:44:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778604285; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aIHpMFldcMXvMDXQSQTzY7E4Fgx6f1JAa6jvWjU1riI=; b=a3mvyf0IeeAbC32aO3XYhTKMmmmlOXhb1elXlc+3OFbrQ7x5AEiNPT0wfECGBnTmpVUYfj knt0IGCryVZqfLthPN08nDzpm8f1xSBHd6SrW9ChlRTRb51hg6eBdn41lKRYavnCE8cjl6 i24JQGUuH3DMDSQCyAWXz3BBqOlr8s2PJkshWmnYs0vDpHp2wkmDA+o7DKfP1DOwl87F8V qcmTCwSoly48v5b6OF95O8aW7UPuyFEECQH0i1cfuDE9rJvhnEclGfO7FqaZLregrea8pf SCJURVkqq43yxoPh+YBMNFlv8YPR2Bd1bVOU/ttUxYaLvxbn1AUU6K8zemNkjw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778604285; a=rsa-sha256; cv=none; b=ZtDi6a6O9kOpdQzAkzDJln5rOURei6VHs3CvYVjpJwMOrD0XxPBLs14xQwtZs9jdpXxROz CMV3S6wb/nklLDH12xXhCThiL+PTsamrXd+w3I9LkXa+F5DqF+AWAFiBWyxnBWXk7WZH3f 1cOk/25tYyBi8xwXze8Pyr5aqNIBlRWKIwFuUl9V3FGLaRhkWEWABBEeqnQzIo1bs7UsvS BQh8utzRMyuL7t4T6jNkKDT7f5gKm0vF7FZiIAVUn5z84f5R0sYg74dxmRoNo7Bo9QBkS4 e/LnIIu6bt20QHX7EB2cF3Widw6y5Vz5DtXXHvBtLzhJKKhHehmidOI3LzPWCw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778604285; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aIHpMFldcMXvMDXQSQTzY7E4Fgx6f1JAa6jvWjU1riI=; b=s6stwmZiZS/0U08ia/fkKbN1mNm7T3QlUAfpcjIc3/RtloatuQgBuXdMHAVVFSWsPpNYkC lgmDm2R0CpFcPhXbvbOjapD1FSJ7UhC0b0BQQOe79su2ckuXiPbPTN/4Zz8GFUGsaYvnht SejvnRn6DCN/F+5EbDI/TCpDdbeIwSX1Wrg3gtjUJ7CSHtIZZBTdxs+phmWDjG1waEHy3Q RkWAkKEVPMucUXO7mQ18CoJ3BHo/q6bcQKRvzcWrYlVPDiQeqKtd0TyX5fqlKV/0hPaeYk 9Eb9gr37QAKjwslnJ07tuJrkgJXuzoaohUgX2nTgFCve+LFTHuDSMvLOXbMwtg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFMrY5NZjz19kv for ; Tue, 12 May 2026 16:44:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d501 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 16:44:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 91d1c1c2b1e7 - stable/15 - pfsync: reject invalid SCTP states List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 91d1c1c2b1e74e776641a0923a9796b018c610d2 Auto-Submitted: auto-generated Date: Tue, 12 May 2026 16:44:45 +0000 Message-Id: <6a0358fd.3d501.11255333@gitrepo.freebsd.org> The branch stable/15 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=91d1c1c2b1e74e776641a0923a9796b018c610d2 commit 91d1c1c2b1e74e776641a0923a9796b018c610d2 Author: Kristof Provost AuthorDate: 2026-05-04 16:08:35 +0000 Commit: Kristof Provost CommitDate: 2026-05-12 07:54:34 +0000 pfsync: reject invalid SCTP states SCTP states should always have a src scrub object associated with them. Crafted pfsync packets might not have this, leading to us derferencing a NULL pointer on cleanup. Validate the pfsync state insertion packet to make sure this is correct. PR: 294989 MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit bf6d00afdb6171ba04a1c5a7fde904cde87d212d) --- sys/netpfil/pf/if_pfsync.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sys/netpfil/pf/if_pfsync.c b/sys/netpfil/pf/if_pfsync.c index 3edf08aefeb5..a5f377e84307 100644 --- a/sys/netpfil/pf/if_pfsync.c +++ b/sys/netpfil/pf/if_pfsync.c @@ -873,6 +873,13 @@ pfsync_state_import(union pfsync_state_union *sp, int flags, int msg_version) (st->act.rtableid >= 0 && st->act.rtableid < rt_numfibs))) goto cleanup; + if (sks->proto == IPPROTO_SCTP && st->src.scrub == NULL) { + if (V_pf_status.debug >= PF_DEBUG_MISC) + printf("%s: invalid SCTP state from creator id: %08x\n", __func__, + ntohl(sp->pfs_1301.creatorid)); + goto cleanup; + } + st->id = sp->pfs_1301.id; st->creatorid = sp->pfs_1301.creatorid; pf_state_peer_ntoh(&sp->pfs_1301.src, &st->src); From nobody Tue May 12 16:44:44 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gFMrd65X5z6ckTv for ; Tue, 12 May 2026 16:44:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFMrd30Khz3swc for ; Tue, 12 May 2026 16:44:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778604289; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eVS0UlS/z9GXBqi/dxtCUkoPzGw7oNLyecGFOB/bYC4=; b=kd2FdxEtq4xbwbNzsMiWXfxIr9o4X24Ybwb1IXEur+H3LfJqYJqtPTGLKbxNq6c+InmBuy bMfgVreeIzss7fVIHz9Do49YQndHDxXla/WhKeMf3pkDTsH3+ie52TVhRuRYmmEWboGqaf Rd+3XUW6nWCan+bTJcmtvq4xj0xSlp1LVI8W31NDbHwgttlEUMAyErF/XMZfZ9oh6Rd8Rk n88eTP2Ey9NWqYPCOO4JVh9x5X9yXjoT+Ct6287lWwRHy0ceUmjiFoAleldLu1piPKCn7P iWCHhodZ5NCGv8B3g19E3ZRl9EPwX1QkpXwvWD3BmWVZHbrBVXGspUo+D395+Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778604289; a=rsa-sha256; cv=none; b=A8/IBJRreNQZ4Lpqw671Aa9G70rUbBLMnMPxIQv+IBdlsWvPRxJs/v5Pyab/8/jYg/puj7 B4UjyIHOaMESKX/Bl/3ZQBhAAPBjuhJlvNcUQKIu5PI39U6OhFu0bOB3ujMD1gAis3MCBy 6e1DMD6kRp7JPP4xnduqfajrYMxtDwzl9vdpBec5dDIkd18z5rU6EDQpmQ38rxO2n2FCsA PO1GZfB5xBzISzA3p4I8/EhlLXD1STVgKW9KMDkSW4QSnVlS0R9MTeKx2HW3zKvKfTopzw GckS7yLHZdLwAlzopDs9UHvBqO3C1K55d4ZcIpnmTC6HdRMuTZRGugt8eLPRxA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778604289; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eVS0UlS/z9GXBqi/dxtCUkoPzGw7oNLyecGFOB/bYC4=; b=m8Yg2nYqhYaRKZKKXEC+I94kqmBP71WhYb1K2qkbcTdBC5B4JJ7JhD7knQYVNASBy3J+IR XhhMzW+tuhqCcCniWiI8Ar+zyYMEH2cEFwlr2JUAG4ZmcyLt40tPncciqLUDbD/oXDKSwB i/qHyWIUDNs1Fg+mXHGASMlqmPtB+62uAg4kwLqjU8p3mwEPQ+FfqZVIIr+WWKiw+o8Jiw skeCmXLP7mCjpWg8YtJ5ynhuFbnUTqtkFzdO2hE4QBOMQKHEWGnsdrtcDNd/wTOKugQrvt V7KcqS3gdGyIj9Olu0XX9rCKQatSn5tnTTUkpYKCyIAxNZ/uJIVRGBY5YvKgFw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFMrd2K9pz19mY for ; Tue, 12 May 2026 16:44:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3ce12 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 16:44:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 8d583858e499 - stable/14 - pfsync: reject invalid SCTP states List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 8d583858e499dcc23a1c7b6b9c80e2e84f245d04 Auto-Submitted: auto-generated Date: Tue, 12 May 2026 16:44:44 +0000 Message-Id: <6a0358fc.3ce12.672d0d5a@gitrepo.freebsd.org> The branch stable/14 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=8d583858e499dcc23a1c7b6b9c80e2e84f245d04 commit 8d583858e499dcc23a1c7b6b9c80e2e84f245d04 Author: Kristof Provost AuthorDate: 2026-05-04 16:08:35 +0000 Commit: Kristof Provost CommitDate: 2026-05-12 07:54:38 +0000 pfsync: reject invalid SCTP states SCTP states should always have a src scrub object associated with them. Crafted pfsync packets might not have this, leading to us derferencing a NULL pointer on cleanup. Validate the pfsync state insertion packet to make sure this is correct. PR: 294989 MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit bf6d00afdb6171ba04a1c5a7fde904cde87d212d) --- sys/netpfil/pf/if_pfsync.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sys/netpfil/pf/if_pfsync.c b/sys/netpfil/pf/if_pfsync.c index 6b828989c54d..10883e233b03 100644 --- a/sys/netpfil/pf/if_pfsync.c +++ b/sys/netpfil/pf/if_pfsync.c @@ -706,6 +706,13 @@ pfsync_state_import(union pfsync_state_union *sp, int flags, int msg_version) (st->act.rtableid >= 0 && st->act.rtableid < rt_numfibs))) goto cleanup; + if (sks->proto == IPPROTO_SCTP && st->src.scrub == NULL) { + if (V_pf_status.debug >= PF_DEBUG_MISC) + printf("%s: invalid SCTP state from creator id: %08x\n", __func__, + ntohl(sp->pfs_1301.creatorid)); + goto cleanup; + } + st->id = sp->pfs_1301.id; st->creatorid = sp->pfs_1301.creatorid; pf_state_peer_ntoh(&sp->pfs_1301.src, &st->src); From nobody Tue May 12 16:55:29 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gFN4x3fznz6ckcR for ; Tue, 12 May 2026 16:55:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFN4x1HNGz3w3r for ; Tue, 12 May 2026 16:55:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778604929; 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; bh=0fyy/SroxdhHoSvLYJoSLYTizZ2ZWJh87kCTs/ELtzk=; b=boOa+v7pLp4xCz/o//+dukU9o9BXiZrw+fWI41CM74xZkksn2h8XjbEEad1KKGYkEKFnGs cCV9bl2E06hlte+Tg1+ZwxNElB+PIChbb1sDLJEHevnXNwqeszMDh/b1ql/dtk2dIv3WfT 1Q2Jv372HLBey0rpm/wvewD2qXPXSFXFXHX/YFV//hBqI1zT8lNDurM1+mU99eck1Soodo yrHeshedT/NtChrsXqYRNsqafIDtx0IIYV0kBFYmSC2JslrzwJ2tVOoGf2L3Ee5L8JYmYZ iN9khsLgoE8ho0diGVRNB2rFePa8o2AVWVaXQ3rmzfZL6GHGjtauA6muji4g9g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778604929; a=rsa-sha256; cv=none; b=FSPdxhErmRMUlf0Mano97dgfuPXb4NwrTFJsOTuRUFdgovNnLFEAeIbvTrRgWI2WVy2krd xIyuoI8h/YA0QdKJ+awnSeg3cZGkhZM2RfdfwCk1apzR+bT25bCQwwWjcyidfF9dvQEjfX G1uTx2BCFI8xP2EhLQx+vZSxu4+zTcDMIGnbH0yrB2epZrCeIyzAJF4CVv8uRuzWAnhlm8 Igdlnz1Q5h+XF/Vk/apSpMI5iw1eVJsHdQyVs+J7+7P4/DMOaVFmrm74EE9PrTUxhSaimG fSTlKQZVp7zlSXNq0tqssoX5Aqnmu6y0j1vp2WERmS3n30iEjpT/1wOdkVnCzg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778604929; 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; bh=0fyy/SroxdhHoSvLYJoSLYTizZ2ZWJh87kCTs/ELtzk=; b=T9GhkxRCwIcFoIcxYc4JqLrVRMAC4GjrlvAcFX/acgBDCQWoSbmuioIP9nuJ7b7iqn8cza AGAIbReVwfurJVZZxZ8/5MJX+wVdmuWmn5eOILGO/gy6wNiHOj89pMOvOq2CuP3Hg0+Qoy RkykZrP8cxzG33TZ5sx88kZZNbBYxpOX+F9FlO6EwSskMiOd/xEcXDYec3xLf6WFIzW6hx nwhKIcwpWyLdRA77XgByViC6xU2/1fDD68MI8fLSk9cnAtF2enrStL+amxFXyctsYoCpL3 ELuwj6x62cn/MjGUgJ01ErKGV/wKRYdjJMWzs5dPqPXrk2ACOvpBxKJmr57PGA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFN4x0K4Nz1BSK for ; Tue, 12 May 2026 16:55:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3dcae by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 16:55:29 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Sarah Walker From: Andrew Turner Subject: git: f9ba99eaa24f - main - physmem: Add a way to read all memory List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: f9ba99eaa24fb41a69c5480621427fe64333986f Auto-Submitted: auto-generated Date: Tue, 12 May 2026 16:55:29 +0000 Message-Id: <6a035b81.3dcae.2ec4e6d3@gitrepo.freebsd.org> The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=f9ba99eaa24fb41a69c5480621427fe64333986f commit f9ba99eaa24fb41a69c5480621427fe64333986f Author: Sarah Walker AuthorDate: 2026-05-12 11:10:32 +0000 Commit: Andrew Turner CommitDate: 2026-05-12 16:54:40 +0000 physmem: Add a way to read all memory In Arm CCA we need to find all memory to protect it. This needs to find all memory, ignoring any excluded memory to protect it from the host. Add physmem_all that reads all physical memory regions. Co-developed-by: Andrew Turner (writing tests & commit message) Sponsored by: Arm Ltd --- sys/kern/subr_physmem.c | 6 ++++++ sys/sys/physmem.h | 1 + tests/sys/kern/subr_physmem_test.c | 33 +++++++++++++++++++++++++++++++++ 3 files changed, 40 insertions(+) diff --git a/sys/kern/subr_physmem.c b/sys/kern/subr_physmem.c index 6b97b36a6c51..7458c8147ad1 100644 --- a/sys/kern/subr_physmem.c +++ b/sys/kern/subr_physmem.c @@ -503,6 +503,12 @@ physmem_avail(vm_paddr_t *avail, size_t maxavail) return (regions_to_avail(avail, EXFLAG_NOALLOC, maxavail, 0, NULL, NULL)); } +size_t +physmem_all(vm_paddr_t *avail, size_t maxavail) +{ + return (regions_to_avail(avail, 0, maxavail, 0, NULL, NULL)); +} + bool physmem_excluded(vm_paddr_t pa, vm_size_t sz) { diff --git a/sys/sys/physmem.h b/sys/sys/physmem.h index 1b75dc63dc40..97c3ad9f3154 100644 --- a/sys/sys/physmem.h +++ b/sys/sys/physmem.h @@ -54,6 +54,7 @@ void physmem_hardware_region(uint64_t pa, uint64_t sz); void physmem_exclude_region(vm_paddr_t pa, vm_size_t sz, uint32_t flags); size_t physmem_avail(vm_paddr_t *avail, size_t maxavail); +size_t physmem_all(vm_paddr_t *avail, size_t maxavail); void physmem_init_kernel_globals(void); void physmem_print_tables(void); bool physmem_excluded(vm_paddr_t pa, vm_size_t sz); diff --git a/tests/sys/kern/subr_physmem_test.c b/tests/sys/kern/subr_physmem_test.c index b810a2016473..31bd30447e3b 100644 --- a/tests/sys/kern/subr_physmem_test.c +++ b/tests/sys/kern/subr_physmem_test.c @@ -79,6 +79,12 @@ ATF_TC_BODY(hwregion, tc) ATF_CHECK_EQ(len, 2); ATF_CHECK_EQ(avail[0], 2 * PAGE_SIZE); ATF_CHECK_EQ(avail[1], 7 * PAGE_SIZE); + + /* Check physmem_all */ + len = physmem_all(avail, nitems(avail)); + ATF_CHECK_EQ(len, 2); + ATF_CHECK_EQ(avail[0], 2 * PAGE_SIZE); + ATF_CHECK_EQ(avail[1], 7 * PAGE_SIZE); } ATF_TC_WITHOUT_HEAD(hwregion_exclude); @@ -106,6 +112,27 @@ ATF_TC_BODY(hwregion_exclude, tc) ATF_CHECK_EQ(avail[1], 3 * PAGE_SIZE); ATF_CHECK_EQ(avail[2], 6 * PAGE_SIZE); ATF_CHECK_EQ(avail[3], 7 * PAGE_SIZE); + + /* Check physmem_all */ + len = physmem_all(avail, 6); + ATF_CHECK_EQ(len, 2); + ATF_CHECK_EQ(avail[0], 2 * PAGE_SIZE); + ATF_CHECK_EQ(avail[1], 7 * PAGE_SIZE); + + /* Check an excluded region out of the included memory works */ + physmem_exclude_region(7 * PAGE_SIZE, PAGE_SIZE, EXFLAG_NOALLOC); + len = physmem_avail(avail, 6); + ATF_CHECK_EQ(len, 4); + ATF_CHECK_EQ(avail[0], 2 * PAGE_SIZE); + ATF_CHECK_EQ(avail[1], 3 * PAGE_SIZE); + ATF_CHECK_EQ(avail[2], 6 * PAGE_SIZE); + ATF_CHECK_EQ(avail[3], 7 * PAGE_SIZE); + + /* Check physmem_all */ + len = physmem_all(avail, 6); + ATF_CHECK_EQ(len, 2); + ATF_CHECK_EQ(avail[0], 2 * PAGE_SIZE); + ATF_CHECK_EQ(avail[1], 7 * PAGE_SIZE); } ATF_TC_WITHOUT_HEAD(hwregion_unordered); @@ -125,6 +152,12 @@ ATF_TC_BODY(hwregion_unordered, tc) ATF_CHECK_EQ(len, 2); ATF_CHECK_EQ(avail[0], PAGE_SIZE); ATF_CHECK_EQ(avail[1], 3 * PAGE_SIZE); + + /* Check physmem_all */ + len = physmem_all(avail, 4); + ATF_CHECK_EQ(len, 2); + ATF_CHECK_EQ(avail[0], PAGE_SIZE); + ATF_CHECK_EQ(avail[1], 3 * PAGE_SIZE); } ATF_TP_ADD_TCS(tp) From nobody Tue May 12 16:55:30 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gFN4y3nXTz6cl5q for ; Tue, 12 May 2026 16:55: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFN4y1Xsvz3vjS for ; Tue, 12 May 2026 16:55:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778604930; 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; bh=EFCna7ir+8t8FFaSfvQnc2RlfY6KY/MvNmQIFoaFkaE=; b=FkoDhXsk7xWz/vZR5gfruPMpYi0anl9rUy6UoIjAPiPgJeAq6IZ5aguHA+zP7w2z3SjUZU 1YzKX0DXldUp/2vGqkn966SBvSYYSvdhC43KJoYyOGebEv35dwaxCgtwqvFpnfJxXbr0c8 NzB/E+SiDs28a9N0jrfrYnMWnJ4sCXBnA3cZzSVmasRZf0Yf7sQtKwlFFJXZUG/H2R2Hz3 aCRllvOHaO8XPJfrUZp+qNNqQdHkc6KgDPCzZzXPMsGwdZtdqMOdLk7RfosBKMhzbrduWd 7Q0sRqHhgBieXpnqHQgYXVwP1ARrmCOpycE1/8AIndlI/zFCwbAzqRH+nWjWfg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778604930; a=rsa-sha256; cv=none; b=sI4lfkHLPj7qPy3+unCSMLTrczH+TlQgPyh/Vy+BOrswzCgAk+8pE0SD0IRgnV338VKTXa LCwoZsUg/XLKVuRe2MM4cEeURMZyvylf6EgyzokUNP13/plPp/5LLnXY4FnlwkGcm/d1os ajCg8ZuuSPmlmCOBSCf4ope068ryHaxYmVZSbRRpTfy3zARDzmJjtZ3UdMD/Ug5JnMe2Nr zhKUUw5qNf+rryC3MunlXvfUi2AvVPhd+e5RSwp+KfnbAnR4j/vOqbsne7QzfIX2FejmW9 9xurJkHMD+AihjDEgnIyQUUIz4JBvLg4+a4uVGMQEWOxp05NFX46gpVt00kWmA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778604930; 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; bh=EFCna7ir+8t8FFaSfvQnc2RlfY6KY/MvNmQIFoaFkaE=; b=dLQFHAk6ATOijADYESf5/3fVz9SWVP9RhMsdyCbr2BfDMFOL4xbve9q1h8C5r3Yk2NunYS yyib8ZvQIWYRK5wfDET2zZ7eTema0YzGMxRuILB4ZMPsZNVNg4+3pYrHNkOBgXGzSEtO5p g9n0mJjwrzl5GiE4qLJxLbIiTIhy7+U9LF2UFADvX2C3GGqkO+IeBbXJopg+lPElP1/JiW RsF2aagc1Nff6NgftJfnyARvtjnF2eWwylwNLBk0ColnbLv1c2i3RGY/36hMMhuj2qetUD IWhO2OZ00uN+yY1bf+d6tVWfjsjoHvlmVbNOfN+bBXLGDLnSifBRZkcgGwdOSQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFN4y16z9z1BXv for ; Tue, 12 May 2026 16:55:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e295 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 16:55:30 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Sarah Walker From: Andrew Turner Subject: git: 76a2904c352b - main - arm64: Add RSI detection for CCA List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: 76a2904c352b497b32fc902523e3e485f7b06ffd Auto-Submitted: auto-generated Date: Tue, 12 May 2026 16:55:30 +0000 Message-Id: <6a035b82.3e295.91ae8c3@gitrepo.freebsd.org> The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=76a2904c352b497b32fc902523e3e485f7b06ffd commit 76a2904c352b497b32fc902523e3e485f7b06ffd Author: Sarah Walker AuthorDate: 2026-05-12 11:27:13 +0000 Commit: Andrew Turner CommitDate: 2026-05-12 16:54:40 +0000 arm64: Add RSI detection for CCA Detect the presence of the Realm Services Interface (RSI). This detection is performed early in bootup; PSCI initialisation has been moved to initarm() to faciliate this. Reviewed by: andrew Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D56598 --- sys/arm64/arm64/machdep.c | 5 ++ sys/arm64/arm64/pmap.c | 2 + sys/arm64/arm64/rsi.c | 185 ++++++++++++++++++++++++++++++++++++++++++++++ sys/arm64/include/pmap.h | 3 + sys/arm64/include/rsi.h | 129 ++++++++++++++++++++++++++++++++ sys/conf/files.arm64 | 1 + sys/dev/psci/psci.c | 11 ++- sys/dev/psci/psci.h | 3 + 8 files changed, 338 insertions(+), 1 deletion(-) diff --git a/sys/arm64/arm64/machdep.c b/sys/arm64/arm64/machdep.c index adfb509d4924..d219c737c215 100644 --- a/sys/arm64/arm64/machdep.c +++ b/sys/arm64/arm64/machdep.c @@ -86,6 +86,7 @@ #include #include #include +#include #include #include @@ -103,6 +104,7 @@ #include #endif +#include #include _Static_assert(sizeof(struct pcb) == 1248, "struct pcb is incorrect size"); @@ -889,6 +891,9 @@ initarm(struct arm64_bootparams *abp) valid = bus_probe(); + psci_init(NULL); + arm64_rsi_setup_memory(); + cninit(); set_ttbr0(abp->kern_ttbr0); pmap_s1_invalidate_all_kernel(); diff --git a/sys/arm64/arm64/pmap.c b/sys/arm64/arm64/pmap.c index 595fba2da411..2d2982fdfae7 100644 --- a/sys/arm64/arm64/pmap.c +++ b/sys/arm64/arm64/pmap.c @@ -205,6 +205,8 @@ __exclusive_cache_line static struct pmap_large_md_page pv_dummy_large; #define pv_dummy pv_dummy_large.pv_page __read_mostly static struct pmap_large_md_page *pv_table; +__read_mostly uint64_t prot_ns_shared_pa; + static struct pmap_large_md_page * _pa_to_pmdp(vm_paddr_t pa) { diff --git a/sys/arm64/arm64/rsi.c b/sys/arm64/arm64/rsi.c new file mode 100644 index 000000000000..85c7896e13ce --- /dev/null +++ b/sys/arm64/arm64/rsi.c @@ -0,0 +1,185 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2026 Arm Ltd + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include "opt_platform.h" + +#include +#include +#include +#include + +#include + +#include +#include + +#include +#include + +static struct realm_config config; +static bool rsi_present = false; + +#define PHYSMAP_SIZE (2 * (VM_PHYSSEG_MAX - 1)) + +static vm_paddr_t physmap[PHYSMAP_SIZE]; + +static unsigned long +rsi_request_version(unsigned long req, unsigned long *out_lower, + unsigned long *out_higher) +{ + struct arm_smccc_res res; + + arm_smccc_invoke_smc(SMC_RSI_ABI_VERSION, req, &res); + + if (out_lower != NULL) + *out_lower = res.a1; + if (out_higher != NULL) + *out_higher = res.a2; + + return (res.a0); +} + +static inline unsigned long +rsi_get_realm_config(struct realm_config *cfg) +{ + struct arm_smccc_res res; + + arm_smccc_invoke_smc(SMC_RSI_REALM_CONFIG, vtophys(cfg), &res); + return (res.a0); +} + +static bool +rsi_version_matches(void) +{ + unsigned long ver_lower, ver_higher; + unsigned long ret; + + ret = rsi_request_version(RSI_ABI_VERSION, &ver_lower, &ver_higher); + + if (ret == SMCCC_RET_NOT_SUPPORTED) + return (false); + + if (ret != RSI_SUCCESS) { + printf("RME: RMM doesn't support RSI version %lu.%lu. Supported range: %lu.%lu-%lu.%lu\n", + RSI_ABI_VERSION_MAJOR, RSI_ABI_VERSION_MINOR, + RSI_ABI_VERSION_GET_MAJOR(ver_lower), + RSI_ABI_VERSION_GET_MINOR(ver_lower), + RSI_ABI_VERSION_GET_MAJOR(ver_higher), + RSI_ABI_VERSION_GET_MINOR(ver_higher)); + return (false); + } + + printf("RME: Using RSI version %lu.%lu\n", + RSI_ABI_VERSION_GET_MAJOR(ver_lower), + RSI_ABI_VERSION_GET_MINOR(ver_lower)); + + return (true); +} + + +unsigned long +rsi_set_addr_range_state(vm_paddr_t start, vm_paddr_t end, enum ripas state, + unsigned long flags, vm_paddr_t *top) +{ + struct arm_smccc_res res; + + arm_smccc_smc(SMC_RSI_IPA_STATE_SET, start, end, state, flags, 0, 0, 0, + &res); + + if (top) + *top = res.a1; + + return (res.a0); +} + +static int +rsi_set_memory_range(vm_paddr_t start, vm_paddr_t end, enum ripas state, + unsigned long flags) +{ + unsigned long ret; + vm_paddr_t top; + + while (start != end) { + ret = rsi_set_addr_range_state(start, end, state, flags, &top); + if (ret || top < start || top > end) + return (-EINVAL); + start = top; + } + + return (0); +} + +/* + * Convert the specified range to RAM. Do not convert any pages that may have + * been DESTROYED, without our permission. + */ +static int +rsi_set_memory_range_protected_safe(vm_paddr_t start, vm_paddr_t end) +{ + return (rsi_set_memory_range(start, end, RSI_RIPAS_RAM, + RSI_NO_CHANGE_DESTROYED)); +} + +void +arm64_rsi_setup_memory(void) +{ + int physmap_idx; + int i; + + if (!psci_conduit_is_smc()) + return; + if (!rsi_version_matches()) + return; + if (rsi_get_realm_config(&config)) + return; + + prot_ns_shared_pa = 1ul << (config.ipa_bits - 1); + if (bootverbose) + printf("arm64_rsi_setup_memory: rsi_present, ipa_bits=%lu prot_ns_shared_pa=%lx\n", + config.ipa_bits, prot_ns_shared_pa); + rsi_present = true; + + physmap_idx = physmem_all(physmap, nitems(physmap)); + + if (bootverbose) + printf("physmap:\n"); + + for (i = 0; i < physmap_idx; i += 2) { + if (bootverbose) + printf(" %lx %lx\n", physmap[i], physmap[i + 1]); + + if (rsi_set_memory_range_protected_safe(physmap[i], + physmap[i + 1])) + panic("rsi_set_memory_range_protected_safe failed"); + } +} + +bool +in_realm(void) +{ + return (rsi_present); +} diff --git a/sys/arm64/include/pmap.h b/sys/arm64/include/pmap.h index 2ee70fc754da..00b54a874e12 100644 --- a/sys/arm64/include/pmap.h +++ b/sys/arm64/include/pmap.h @@ -43,6 +43,7 @@ #ifndef LOCORE #include +#include #include #include #include @@ -132,6 +133,8 @@ extern vm_offset_t virtual_end; extern pt_entry_t pmap_sh_attr; +extern __read_mostly uint64_t prot_ns_shared_pa; + /* * Macros to test if a mapping is mappable with an L1 Section mapping * or an L2 Large Page mapping. diff --git a/sys/arm64/include/rsi.h b/sys/arm64/include/rsi.h new file mode 100644 index 000000000000..82e54f9c57e3 --- /dev/null +++ b/sys/arm64/include/rsi.h @@ -0,0 +1,129 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2026 Arm Ltd + * + * 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 _MACHINE_RSI_H_ +#define _MACHINE_RSI_H_ + +extern uint64_t prot_ns_shared; + +bool in_realm(void); + +void arm64_rsi_setup_memory(void); + +/* + * The major version number of the RSI implementation. This is increased when + * the binary format or semantics of the SMC calls change. + */ +#define RSI_ABI_VERSION_MAJOR UL(1) + +/* + * The minor version number of the RSI implementation. This is increased when + * a bug is fixed, or a feature is added without breaking binary compatibility. + */ +#define RSI_ABI_VERSION_MINOR UL(0) + +#define RSI_ABI_VERSION ((RSI_ABI_VERSION_MAJOR << 16) | \ + RSI_ABI_VERSION_MINOR) + +#define RSI_ABI_VERSION_GET_MAJOR(_version) ((_version) >> 16) +#define RSI_ABI_VERSION_GET_MINOR(_version) ((_version) & 0xFFFF) + +#define RSI_SUCCESS UL(0) +#define RSI_ERROR_INPUT UL(1) +#define RSI_ERROR_STATE UL(2) +#define RSI_INCOMPLETE UL(3) +#define RSI_ERROR_UNKNOWN UL(4) + +#define SMC_RSI_FID(n) SMCCC_FUNC_ID(SMCCC_FAST_CALL, \ + SMCCC_64BIT_CALL, \ + SMCCC_STD_SECURE_SERVICE_CALLS, \ + n) + +/* + * Returns RSI version. + * + * arg1 == Requested interface revision + * ret0 == Status / error + * ret1 == Lower implemented interface revision + * ret2 == Higher implemented interface revision + */ +#define SMC_RSI_ABI_VERSION SMC_RSI_FID(0x190) + +/* + * Read configuration for the current Realm. + * + * arg1 == struct realm_config addr + * ret0 == Status / error + */ +#define SMC_RSI_REALM_CONFIG SMC_RSI_FID(0x196) + +struct realm_config { + union { + struct { + unsigned long ipa_bits; /* Width of IPA in bits */ + unsigned long hash_algo; /* Hash algorithm */ + }; + uint8_t pad[0x200]; + }; + union { + uint8_t rpv[64]; /* Realm Personalization Value */ + uint8_t pad2[0xe00]; + }; + /* + * The RMM requires the configuration structure to be aligned to a 4k + * boundary, ensure this happens by aligning this structure. + */ +} __aligned(0x1000); + +/* + * Request RIPAS of a target IPA range to be changed to a specified value. + * + * arg1 == Base IPA address of target region + * arg2 == Top of the region + * arg3 == RIPAS value + * arg4 == flags + * ret0 == Status / error + * ret1 == Top of modified IPA range + * ret2 == Whether the Host accepted or rejected the request + */ +#define SMC_RSI_IPA_STATE_SET SMC_RSI_FID(0x197) + +#define RSI_NO_CHANGE_DESTROYED UL(0) +#define RSI_CHANGE_DESTROYED UL(1) + +#define RSI_ACCEPT UL(0) +#define RSI_REJECT UL(1) + +enum ripas { + RSI_RIPAS_EMPTY = 0, + RSI_RIPAS_RAM +}; + +unsigned long rsi_set_addr_range_state(vm_paddr_t start, vm_paddr_t end, + enum ripas state, unsigned long flags, vm_paddr_t *top); + +#endif /* !_MACHINE_RSI_H_ */ diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64 index 44f292d9048f..8f550a644db6 100644 --- a/sys/conf/files.arm64 +++ b/sys/conf/files.arm64 @@ -77,6 +77,7 @@ arm64/arm64/ptrauth.c standard \ compile-with "${NORMAL_C:N-mbranch-protection*} -mbranch-protection=bti" arm64/arm64/pmap.c standard arm64/arm64/ptrace_machdep.c standard +arm64/arm64/rsi.c standard arm64/arm64/sdt_machdep.c optional kdtrace_hooks arm64/arm64/sigtramp.S standard arm64/arm64/spec_workaround.c standard diff --git a/sys/dev/psci/psci.c b/sys/dev/psci/psci.c index 2b250401ae83..872fae056a4b 100644 --- a/sys/dev/psci/psci.c +++ b/sys/dev/psci/psci.c @@ -133,7 +133,7 @@ static int psci_def_callfn(register_t, register_t, register_t, register_t, psci_callfn_t psci_callfn = psci_def_callfn; -static void +void psci_init(void *dummy) { psci_callfn_t new_callfn; @@ -146,8 +146,11 @@ psci_init(void *dummy) psci_callfn = new_callfn; psci_present = true; } + +#ifdef __arm__ /* This needs to be before cpu_mp at SI_SUB_CPU, SI_ORDER_THIRD */ SYSINIT(psci_start, SI_SUB_CPU, SI_ORDER_FIRST, psci_init, NULL); +#endif static int psci_def_callfn(register_t a __unused, register_t b __unused, @@ -631,3 +634,9 @@ psci_v0_2_init(device_t dev, int default_version) device_printf(dev, "PSCI version number mismatched with DT\n"); return (1); } + +bool +psci_conduit_is_smc(void) +{ + return (psci_callfn == arm_smccc_smc); +} diff --git a/sys/dev/psci/psci.h b/sys/dev/psci/psci.h index 6704eaf26c71..c250bf45d344 100644 --- a/sys/dev/psci/psci.h +++ b/sys/dev/psci/psci.h @@ -44,6 +44,9 @@ void psci_reset(void); int32_t psci_features(uint32_t); int psci_get_version(void); +void psci_init(void *dummy); +bool psci_conduit_is_smc(void); + /* Handler to let us call into the PSCI/SMCCC firmware */ extern psci_callfn_t psci_callfn; static inline int From nobody Tue May 12 16:55:31 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gFN4z4gDfz6cl22 for ; Tue, 12 May 2026 16:55: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFN4z2V9tz3vsy for ; Tue, 12 May 2026 16:55:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778604931; 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; bh=MyfAD4MjAZD5hSnfq194TyeUAFKrn7fooLifjiSKyfM=; b=kupV4AvOaNMc5AIFhRaNCzYBMIXFkeQFrroVfCRj6ELP0vo/BfYXOXYPwkLQMZRiNt+AYg HoyiLUH8GglRXLlJ1BVZSVaHf4BeRYTLehCl38Mk8UVrufimE2hxdTDSrlgc46WrxQhWPP 9bCkNV+ppUhj8o11jYPwkzd6tRXZ42V4ZzEn+kBEwbm70/ZLxPCKHr0fvM2a6HcS6aFnEs WIOc5xgrMbk3t262v4JBZvEyKPbZXOcTGEEtMH2aWciFQHFSr2OxejnGU4iOXCoQfuE3ke bqFEzkjuYRMF2E4TClWP7L0OHtVuwIulrVwoK2c5gG/cdcQrQszPjWrB9cP2ng== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778604931; a=rsa-sha256; cv=none; b=pBM85BMg/O/9pps5WDOIyvgTBKZweR9Mywe48BS4R2zgRjYE8TLAL6I/1fvWhSaj2BjRj7 ErsEdf5N18VJBkslpDzg25XFSsw+Nwd8hLbFhf0sUL1bqSd5McKPWRzccTCtE1KkLl96Ig +h5gYp6fpL2aDjqWVqN5b+T6jDqs6NULPLgRLDBZgKC6S1nCE3d37jaK/tF2oEqYIUtWAi R5ofc0ZBbSEpW43DPyCyiJT7TqWBoiwpTgzCmEtQn/J/fOE+SExRZ060qM2wwBXWzcKY41 g+CMRheX3l3QNy9WaDme3vtW7QgfzZNDg8kHWGvulp9UEF2c1BMHxwQcE657NQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778604931; 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; bh=MyfAD4MjAZD5hSnfq194TyeUAFKrn7fooLifjiSKyfM=; b=agdsGoO0xvulLGQ24hqXxYYz1Z1duxefvbakictIs/k5WNpg29mGNIzWsK9nkl0CBRPY8y ONsFHHZr5N27ExepiudOFVVslfoqsnO0xsqswwwS/0SbpeCEsxEWo5ktQ+T0dq8OJK4YO9 FDXDmSAHvrl6DnaH6m/6RBdaaQI0omAPT54p6MIohiUKm5+N+++sPHordNK9So1OzgQXCP OaLgXhzEjOmFjrkuJcA0VN8Lk7GsNudX7RjFL25CJV2jOo6jzzCknoAshyqUq4LjPkvPai UeWAdzSkiG820r7NjopshKPVdLV+Vpf/IjhfB4pRV3PJvPDfZqQ7USeH8XmLjg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFN4z216Nz19yf for ; Tue, 12 May 2026 16:55:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3df8a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 16:55:31 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Sarah Walker From: Andrew Turner Subject: git: 56abdbc5f709 - main - arm64: VM/PMAP changes for CCA guest support List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: 56abdbc5f709fc0e18624b3b7586647459922a41 Auto-Submitted: auto-generated Date: Tue, 12 May 2026 16:55:31 +0000 Message-Id: <6a035b83.3df8a.27c5734@gitrepo.freebsd.org> The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=56abdbc5f709fc0e18624b3b7586647459922a41 commit 56abdbc5f709fc0e18624b3b7586647459922a41 Author: Sarah Walker AuthorDate: 2026-05-12 11:29:20 +0000 Commit: Andrew Turner CommitDate: 2026-05-12 16:54:41 +0000 arm64: VM/PMAP changes for CCA guest support When in a realm: - Mappings with mode VM_MEMATTR_DEVICE and VM_MEMATTR_DEVICE_NP are unprotected - Imported busdma buffers in protected memory are always bounced - If EARLY_PRINTK is in use, the UART physical address must be in the unprotected address space Reviewed by: andrew Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D56599 --- sys/arm64/arm64/busdma_bounce.c | 68 ++++++++++++++++++++++++++++++++++++++--- sys/arm64/arm64/efirt_machdep.c | 10 +++++- sys/arm64/arm64/pmap.c | 40 ++++++++++++++++++++++++ sys/conf/files.arm64 | 1 + sys/vm/vm_page.c | 8 +++++ 5 files changed, 122 insertions(+), 5 deletions(-) diff --git a/sys/arm64/arm64/busdma_bounce.c b/sys/arm64/arm64/busdma_bounce.c index 74fa611e6d1a..db7e108812aa 100644 --- a/sys/arm64/arm64/busdma_bounce.c +++ b/sys/arm64/arm64/busdma_bounce.c @@ -36,6 +36,7 @@ #include #include #include +#include #include #include #include @@ -56,6 +57,7 @@ #include #include #include +#include #include #define MAX_BPAGES 4096 @@ -120,6 +122,8 @@ static void _bus_dmamap_count_pages(bus_dma_tag_t dmat, bus_dmamap_t map, static void _bus_dmamap_count_phys(bus_dma_tag_t dmat, bus_dmamap_t map, vm_paddr_t buf, bus_size_t buflen, int flags); +static busdma_bufalloc_t nonsecure_allocator; + static MALLOC_DEFINE(M_BUSDMA, "busdma", "busdma metadata"); #define dmat_alignment(dmat) ((dmat)->common.alignment) @@ -215,6 +219,10 @@ might_bounce(bus_dma_tag_t dmat, bus_dmamap_t map, bus_addr_t paddr, if (map && (map->flags & DMAMAP_FROM_DMAMEM) != 0) return (false); + /* Bounce if accessing secure memory */ + if (in_realm() && !(paddr & prot_ns_shared_pa)) + return (true); + if ((dmat->bounce_flags & BF_COULD_BOUNCE) != 0) return (true); @@ -239,6 +247,10 @@ must_bounce(bus_dma_tag_t dmat, bus_dmamap_t map, bus_addr_t paddr, addr_needs_bounce(dmat, paddr)) return (true); + /* Bounce if accessing secure memory */ + if (in_realm() && !(paddr & prot_ns_shared_pa)) + return (true); + return (false); } @@ -492,6 +504,7 @@ static int bounce_bus_dmamem_alloc(bus_dma_tag_t dmat, void** vaddr, int flags, bus_dmamap_t *mapp) { + struct busdma_bufzone *bufzone; vm_memattr_t attr; int mflags; @@ -524,6 +537,9 @@ bounce_bus_dmamem_alloc(bus_dma_tag_t dmat, void** vaddr, int flags, else attr = VM_MEMATTR_DEFAULT; + if (in_realm()) + mflags |= M_UNPROTECTED; + /* * Create the map, but don't set the could bounce flag as * this allocation should never bounce; @@ -567,13 +583,16 @@ bounce_bus_dmamem_alloc(bus_dma_tag_t dmat, void** vaddr, int flags, * * In the meantime warn the user if malloc gets it wrong. */ - if (dmat->alloc_size <= PAGE_SIZE && + + bufzone = busdma_bufalloc_findzone(nonsecure_allocator, + dmat->alloc_size); + + if (bufzone && + dmat->alloc_size <= PAGE_SIZE && dmat->alloc_alignment <= PAGE_SIZE && dmat->common.lowaddr >= ptoa((vm_paddr_t)Maxmem) && attr == VM_MEMATTR_DEFAULT) { - *vaddr = malloc_domainset_aligned(dmat->alloc_size, - dmat->alloc_alignment, M_DEVBUF, - DOMAINSET_PREF(dmat->common.domain), mflags); + *vaddr = uma_zalloc(bufzone->umazone, mflags); } else if (dmat->common.nsegments >= howmany(dmat->alloc_size, MIN(dmat->common.maxsegsz, PAGE_SIZE)) && dmat->alloc_alignment <= PAGE_SIZE && @@ -1148,3 +1167,44 @@ struct bus_dma_impl bus_dma_bounce_impl = { .load_kmsan = bounce_bus_dmamap_load_kmsan, #endif }; + +static void * +nonsecure_alloc(uma_zone_t zone, vm_size_t size, int domain, uint8_t *pflag, + int wait) +{ + void *p; /* Returned page */ + + *pflag = UMA_SLAB_KERNEL; + p = kmem_malloc_domainset(DOMAINSET_FIXED(domain), size, + wait | M_UNPROTECTED); + + return (p); +} + +static void +nonsecure_free(void *mem, vm_size_t size, uint8_t flags) +{ + KASSERT((flags & UMA_SLAB_KERNEL) != 0, + ("UMA: page_free used with invalid flags %x", flags)); + + kmem_free(mem, size); +} + +static void +busdma_bounce_init(void *dummy) +{ + if (in_realm()) + nonsecure_allocator = busdma_bufalloc_create("nonsecure", + dcache_line_size, /* minimum_alignment */ + nonsecure_alloc, /* uma_alloc func */ + nonsecure_free, /* uma_free func */ + UMA_ZONE_NOTOUCH); /* uma_zcreate_flags */ + else + nonsecure_allocator = busdma_bufalloc_create("nonsecure", + dcache_line_size, /* minimum_alignment */ + NULL, /* uma_alloc func */ + NULL, /* uma_free func */ + UMA_ZONE_NOTOUCH); /* uma_zcreate_flags */ +} + +SYSINIT(busdma, SI_SUB_KMEM + 1, SI_ORDER_FIRST, busdma_bounce_init, NULL); diff --git a/sys/arm64/arm64/efirt_machdep.c b/sys/arm64/arm64/efirt_machdep.c index b079393cd2a9..07946a2bdb82 100644 --- a/sys/arm64/arm64/efirt_machdep.c +++ b/sys/arm64/arm64/efirt_machdep.c @@ -46,6 +46,7 @@ #include #include +#include #include #include @@ -171,6 +172,7 @@ efi_create_1t1_map(struct efi_md *map, int ndesc, int descsz) vm_page_t efi_l0_page; uint64_t idx; int i, mode; + uint64_t pa; obj_1t1_pt = vm_pager_allocate(OBJT_PHYS, NULL, L0_ENTRIES + L0_ENTRIES * Ln_ENTRIES + L0_ENTRIES * Ln_ENTRIES * Ln_ENTRIES + @@ -231,7 +233,13 @@ efi_create_1t1_map(struct efi_md *map, int ndesc, int descsz) for (va = p->md_phys, idx = 0; idx < p->md_pages; idx += (PAGE_SIZE / EFI_PAGE_SIZE), va += PAGE_SIZE) { l3 = efi_1t1_l3(va); - *l3 = va | l3_attr; + + if (mode == VM_MEMATTR_DEVICE && in_realm()) + pa = va | prot_ns_shared_pa; + else + pa = va; + + *l3 = PHYS_TO_PTE(pa) | l3_attr; } VM_OBJECT_WUNLOCK(obj_1t1_pt); } diff --git a/sys/arm64/arm64/pmap.c b/sys/arm64/arm64/pmap.c index 2d2982fdfae7..adc583812e5b 100644 --- a/sys/arm64/arm64/pmap.c +++ b/sys/arm64/arm64/pmap.c @@ -152,6 +152,7 @@ #include #include #include +#include #ifdef NUMA #define PMAP_MEMDOM MAXMEMDOM @@ -539,6 +540,9 @@ static int pmap_bti_copy(pmap_t dst_pmap, pmap_t src_pmap); static void pmap_bti_deassign_all(pmap_t pmap); static void pagezero(void *); +static void pmap_set_protected(pt_entry_t old_l3); +static void pmap_set_unprotected(pt_entry_t new_l3); + /* * These load the old table data and store the new value. * They need to be atomic as the System MMU may write to the table at @@ -2381,6 +2385,11 @@ pmap_kenter(vm_offset_t sva, vm_size_t size, vm_paddr_t pa, int mode) KASSERT((size & PAGE_MASK) == 0, ("pmap_kenter: Mapping is not page-sized")); + /* CCA - Map devices as nonsecure */ + if (in_realm() && (mode == VM_MEMATTR_DEVICE || + mode == VM_MEMATTR_DEVICE_NP)) + pa |= prot_ns_shared_pa; + attr = ATTR_AF | pmap_sh_attr | ATTR_S1_AP(ATTR_S1_AP_RW) | ATTR_S1_XN | ATTR_KERN_GP | ATTR_S1_IDX(mode); old_l3e = 0; @@ -4224,6 +4233,9 @@ pmap_remove_l3_range(pmap_t pmap, pd_entry_t l2e, vm_offset_t sva, if ((old_l3 & ATTR_SW_WIRED) != 0) pmap->pm_stats.wired_count--; pmap_resident_count_dec(pmap, 1); + /* Below will only be true in a realm environment. */ + if (PTE_TO_PHYS(old_l3) & prot_ns_shared_pa) + pmap_set_protected(old_l3); if ((old_l3 & ATTR_SW_MANAGED) != 0) { m = PTE_TO_VM_PAGE(old_l3); if (pmap_pte_dirty(pmap, old_l3)) @@ -5376,6 +5388,28 @@ restart: return (KERN_SUCCESS); } +static void +pmap_set_unprotected(pt_entry_t new_l3) +{ + vm_paddr_t pa; + + pa = PTE_TO_PHYS(new_l3) & ~prot_ns_shared_pa; + + rsi_set_addr_range_state(pa, pa + L3_SIZE, RSI_RIPAS_EMPTY, + RSI_CHANGE_DESTROYED, NULL); +} + +static void +pmap_set_protected(pt_entry_t old_l3) +{ + vm_paddr_t pa; + + pa = PTE_TO_PHYS(old_l3) & ~prot_ns_shared_pa; + + rsi_set_addr_range_state(pa, pa + L3_SIZE, RSI_RIPAS_RAM, + RSI_CHANGE_DESTROYED, NULL); +} + /* * Insert the given physical page (p) at * the specified virtual address (v) in the @@ -5409,6 +5443,8 @@ pmap_enter(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot, if ((m->oflags & VPO_UNMANAGED) == 0) VM_PAGE_OBJECT_BUSY_ASSERT(m); pa = VM_PAGE_TO_PHYS(m); + if (in_realm() && (flags & PMAP_ENTER_UNPROTECTED) != 0) + pa |= prot_ns_shared_pa; new_l3 = (pt_entry_t)(PHYS_TO_PTE(pa) | ATTR_AF | pmap_sh_attr | L3_PAGE); new_l3 |= pmap_pte_memattr(pmap, m->md.pv_memattr); @@ -5728,6 +5764,10 @@ validate: #endif rv = KERN_SUCCESS; + + if (in_realm() && (flags & PMAP_ENTER_UNPROTECTED) != 0) + pmap_set_unprotected(new_l3); + out: if (lock != NULL) rw_wunlock(lock); diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64 index 8f550a644db6..faecea51d5c1 100644 --- a/sys/conf/files.arm64 +++ b/sys/conf/files.arm64 @@ -9,6 +9,7 @@ kern/subr_devmap.c standard kern/subr_efi_map.c standard kern/subr_intr.c optional intrng kern/subr_physmem.c standard +kern/subr_busdma_bufalloc.c standard libkern/strlen.c standard libkern/arm64/crc32c_armv8.S standard diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c index bdea77bfabf0..233292bdd6cb 100644 --- a/sys/vm/vm_page.c +++ b/sys/vm/vm_page.c @@ -110,6 +110,10 @@ #include #include +#if defined(__aarch64__) +#include +#include +#endif struct vm_domain vm_dom[MAXMEMDOM]; @@ -1290,6 +1294,10 @@ PHYS_TO_VM_PAGE(vm_paddr_t pa) vm_page_t m; #ifdef VM_PHYSSEG_SPARSE +#if defined(__aarch64__) + if (in_realm()) + pa &= ~prot_ns_shared_pa; /* Mask off secure bit */ +#endif m = vm_phys_paddr_to_vm_page(pa); if (m == NULL) m = vm_phys_fictitious_to_vm_page(pa); From nobody Tue May 12 16:55:27 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gFN515QcKz6cl3S for ; Tue, 12 May 2026 16:55: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFN5112Hjz3wGN for ; Tue, 12 May 2026 16:55:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778604933; 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; bh=QfMUnhsbCLreXKDo+xqePsDZpkQ+hK+hFKSd0dEG0i0=; b=xQ+TjD6Mvi9y6gKZlRZamgxzsm//5CkBqi7h5yxvR3SodYg8wRiNm9WqrLXht9yd1fifoo zlZLki/Ybwug4hma9/7mLtT3nS7jR7akwZ2axad/r6D0n/co4wKGPpIn4fUfFPBRTAFoa7 A6oJCXXEP6SXMav09mvrluCFxknZfH6RAZVqowRDsHzgj4XY82i0V+5tLaVAZbRpON2+jS rm6+1pWyTXbCPA3xBw1DKrKRtuS71IlzrZ0LHm2yLNcRIoMbmnGvfReThJtQauP7VPbe30 SlW7Q57DxHM5P2BgfANloMOUqumjMUpKiLb9h3b6AgfHww4Rwk04MZqF8O54eQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778604933; a=rsa-sha256; cv=none; b=FZOpmkoYdm8UHb+OG83Dfdh81/G5hiwZTr11zPWXFdvdVMHFTR8vIeK9vbrwFwijvF4fbr FPjqYkGP4g37MD7xgpAFkStukcNNUyhvZVwrk68RmWBKfNdPNHlQC7n4d1s7mTMWCKI/01 NJBLYcgTmQ8Cr/EOpBK3tBg+7TgFohQVh+dbZgzwVJfu6fuFFEtE7AruYHZ0Fsv4LS/BaX uBmQc0vmQy9KQiMYQQGfiEbdmlmjf1t9f75rF5XrWzLHSR390/39bULLOLAkKdd76IxxvR t/a0UK3lFptkQUEB0qmoyGtGW9Vd39Gh/i/iWbCNfbd0UC9aBfRVBSapXKcJaQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778604933; 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; bh=QfMUnhsbCLreXKDo+xqePsDZpkQ+hK+hFKSd0dEG0i0=; b=U4X/EQC7EHdI09cH8977juS3vx/JOHPWRhtXz2uSGe67EzWVcn+GUl5yaFCMmmtrjJeikZ OLX0Fk+zj6cN9fsJqMfgk/XRWN4C1XJx4PQmbT3DmAvOWm4/sWRatpM4sKNlRXpKAcRwVP jUoCGq5QcLqlOwGbQVMhpaLrEevHV0DpsgaXtt6DNeJoJE0OvJHPvtcVi4/sGr/MXrzfSZ 8LJE1aCz36fX3aHDfOOkarAzRzutn+iVz3IAXjjb7tkEZmAvOT5PyNgqskSxtXhvhFn6iy /Ju3rf/yl6PAKvR7iUSZZhkxKBAQaod6kiSTzk9XY3TCrcamYr2Z2LsFgwllYg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFN506qS4z19nH for ; Tue, 12 May 2026 16:55:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e1ba by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 16:55:27 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Sarah Walker From: Andrew Turner Subject: git: cd2512eaab5c - main - vm: Add flags for unprotected allocations List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: cd2512eaab5cd402a0177a8078b9234b215b39bd Auto-Submitted: auto-generated Date: Tue, 12 May 2026 16:55:27 +0000 Message-Id: <6a035b7f.3e1ba.1c3bccb@gitrepo.freebsd.org> The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=cd2512eaab5cd402a0177a8078b9234b215b39bd commit cd2512eaab5cd402a0177a8078b9234b215b39bd Author: Sarah Walker AuthorDate: 2026-05-12 12:16:00 +0000 Commit: Andrew Turner CommitDate: 2026-05-12 16:54:40 +0000 vm: Add flags for unprotected allocations Unprotected allocations are intended to be accessible outside of the current VM on systems such as Arm CCA. Reviewed by: markj Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D56518 --- sys/sys/malloc.h | 1 + sys/vm/pmap.h | 1 + sys/vm/vm_kern.c | 23 ++++++++++++++++++++--- 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/sys/sys/malloc.h b/sys/sys/malloc.h index 9b281da4b4d4..68dffb395534 100644 --- a/sys/sys/malloc.h +++ b/sys/sys/malloc.h @@ -61,6 +61,7 @@ #define M_EXEC 0x4000 /* allocate executable space */ #define M_NEXTFIT 0x8000 /* only for vmem, follow cursor */ #define M_NEVERFREED 0x10000 /* chunk will never get freed */ +#define M_UNPROTECTED 0x20000 /* alloc out of unprotected memory */ #define M_VERSION 2024073001 diff --git a/sys/vm/pmap.h b/sys/vm/pmap.h index e6dcd47d32f6..868bb787dc98 100644 --- a/sys/vm/pmap.h +++ b/sys/vm/pmap.h @@ -104,6 +104,7 @@ extern vm_offset_t kernel_vm_end; #define PMAP_ENTER_NOSLEEP 0x00000100 #define PMAP_ENTER_WIRED 0x00000200 #define PMAP_ENTER_LARGEPAGE 0x00000400 +#define PMAP_ENTER_UNPROTECTED 0x00000800 #define PMAP_ENTER_RESERVED 0xFF000000 /* diff --git a/sys/vm/vm_kern.c b/sys/vm/vm_kern.c index fc5d0de424bd..41ba07373976 100644 --- a/sys/vm/vm_kern.c +++ b/sys/vm/vm_kern.c @@ -270,6 +270,7 @@ kmem_alloc_attr_domain(int domain, vm_size_t size, int flags, vm_paddr_t low, vm_size_t asize; int pflags; vm_prot_t prot; + u_int pmap_enter_flags; object = kernel_object; asize = round_page(size); @@ -279,6 +280,11 @@ kmem_alloc_attr_domain(int domain, vm_size_t size, int flags, vm_paddr_t low, offset = addr - VM_MIN_KERNEL_ADDRESS; pflags = malloc2vm_flags(flags) | VM_ALLOC_WIRED; prot = (flags & M_EXEC) != 0 ? VM_PROT_ALL : VM_PROT_RW; + + pmap_enter_flags = prot | PMAP_ENTER_WIRED; + if ((flags & M_UNPROTECTED) != 0) + pmap_enter_flags |= PMAP_ENTER_UNPROTECTED; + VM_OBJECT_WLOCK(object); for (i = 0; i < asize; i += PAGE_SIZE) { m = kmem_alloc_contig_pages(object, atop(offset + i), @@ -296,7 +302,7 @@ kmem_alloc_attr_domain(int domain, vm_size_t size, int flags, vm_paddr_t low, pmap_zero_page(m); vm_page_valid(m); pmap_enter(kernel_pmap, addr + i, m, prot, - prot | PMAP_ENTER_WIRED, 0); + pmap_enter_flags, 0); } VM_OBJECT_WUNLOCK(object); kmem_alloc_san(addr, size, asize, flags); @@ -363,6 +369,7 @@ kmem_alloc_contig_domain(int domain, vm_size_t size, int flags, vm_paddr_t low, vm_size_t asize; u_long npages; int pflags; + u_int pmap_enter_flags; object = kernel_object; asize = round_page(size); @@ -385,12 +392,17 @@ kmem_alloc_contig_domain(int domain, vm_size_t size, int flags, vm_paddr_t low, vm_page_domain(m), domain)); end_m = m + npages; tmp = addr; + + pmap_enter_flags = VM_PROT_RW | PMAP_ENTER_WIRED; + if ((flags & M_UNPROTECTED) != 0) + pmap_enter_flags |= PMAP_ENTER_UNPROTECTED; + for (; m < end_m; m++) { if ((flags & M_ZERO) && (m->flags & PG_ZERO) == 0) pmap_zero_page(m); vm_page_valid(m); pmap_enter(kernel_pmap, tmp, m, VM_PROT_RW, - VM_PROT_RW | PMAP_ENTER_WIRED, 0); + pmap_enter_flags, 0); tmp += PAGE_SIZE; } VM_OBJECT_WUNLOCK(object); @@ -549,6 +561,7 @@ kmem_back_domain(int domain, vm_object_t object, vm_offset_t addr, vm_page_t m; vm_prot_t prot; int pflags; + u_int pmap_enter_flags; KASSERT(object == kernel_object, ("kmem_back_domain: only supports kernel object.")); @@ -560,6 +573,10 @@ kmem_back_domain(int domain, vm_object_t object, vm_offset_t addr, pflags |= VM_ALLOC_WAITFAIL; prot = (flags & M_EXEC) != 0 ? VM_PROT_ALL : VM_PROT_RW; + pmap_enter_flags = prot | PMAP_ENTER_WIRED; + if ((flags & M_UNPROTECTED) != 0) + pmap_enter_flags |= PMAP_ENTER_UNPROTECTED; + i = 0; vm_page_iter_init(&pages, object); VM_OBJECT_WLOCK(object); @@ -589,7 +606,7 @@ retry: ("kmem_malloc: page %p is managed", m)); vm_page_valid(m); pmap_enter(kernel_pmap, addr + i, m, prot, - prot | PMAP_ENTER_WIRED, 0); + pmap_enter_flags, 0); if (__predict_false((prot & VM_PROT_EXECUTE) != 0)) m->oflags |= VPO_KMEM_EXEC; } From nobody Tue May 12 16:55:32 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gFN513hHBz6cklr for ; Tue, 12 May 2026 16:55: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFN504jnJz3vrS for ; Tue, 12 May 2026 16:55:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778604932; 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; bh=ze2kn2YzrzbGp9J1ZWfgNvderBh9JXPemilfxIraYFk=; b=qiNx5k07JfTNwjl5KJYdWK6BmGvRKjV1CkIrcLaP1BzUROpfFt5Ka+fXRL+/v9RrAiMJ52 a2M8HDrQYvL0GOiM5ULLdqXxsg26KxD6RujOPDt+Vqu11zq8eLQ8FowdyIk7FknCVRPm3C pqFIfQMAC0wbVi11LlSAITrpwvqgptdkdiuXaheYt4jRSeLPyMoARA9XVv7tyEeVqsvAjE hB8qKUdVSg5UrQmPj0D8yRaRiLcAOGZkT38sMmndDOOSzWow7yC3XV4Jy7zcJ14k8BETU/ QH4GwvgbHR/nvOvFdqkiXp5cNRGQ5TC0iOxglrXh+CeW1HxCMELZJidjDZKc5w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778604932; a=rsa-sha256; cv=none; b=QfIRZoB7iGnDgswVNo0J1SJzzHOc8pTCoW0MtF7QqgS/r2lgLACegDhiF7OzfPxo/1n87t buK0QhTxq9pE4b0Y8e4yYlvgXOwmbXb4zHOq/Vf9whGleVJ3TvS8c71A67YpqGSCkUrfui 5WNu8vrZMsLTJhUDWV/abE8WVuUwvYwp+AGJxqRiV3xB4ooVbxmpJJLc2+Y24Y8MFO1d+B D4NMhZLQjZfN6W6W+sIKfkVU2+d5Pq2WFyNMGPhzyoS2mcun+6JlMS42wYEBfJOJaDgsnc MgBvauf+3M/2FMnC8YP4Atlz05/RdMRPwYRfYIGJ9fh/oxnsthX9/X+HFI3vqg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778604932; 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; bh=ze2kn2YzrzbGp9J1ZWfgNvderBh9JXPemilfxIraYFk=; b=hFA7fmmn67SqWR/e7NGEDIZOU4/w+DihAJazxUX56yo/lnXXj1ueRIcvYDOJrcPbOlW68R CVMYRXtEVhpabbosXILdOmiqvqcKCnrXFIHmXNWLsfdo7tU1VlLh86+nn7SJDEk+Ikqi9V 4uqTPUUBRJrtjKgASPSRWGzCfXaFh/aVItkSqs7R+y/I+m8aDOPhnCyB0x9oJ7RwLE9ciU RVgjqb7DUuhPw4qtD/gxi/hEdZyobX1mKVVzEcowpwY1M1OqP4RPEeFpfOCMb8yTiHDX0D XnBDnXVe5nFizv/OrD8+8J1i+Tqw2HdJXIHfKwLked+0WVkRyyKm4fPeu+nUkQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFN502qp4z1BVP for ; Tue, 12 May 2026 16:55:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e0a7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 16:55:32 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Sarah Walker From: Andrew Turner Subject: git: a6add87b5e17 - main - arm64: Load SOCDEV_PA as a literal rather than an immediate List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: a6add87b5e174702261f3b8e8022791ed4ab9898 Auto-Submitted: auto-generated Date: Tue, 12 May 2026 16:55:32 +0000 Message-Id: <6a035b84.3e0a7.681a7a75@gitrepo.freebsd.org> The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=a6add87b5e174702261f3b8e8022791ed4ab9898 commit a6add87b5e174702261f3b8e8022791ed4ab9898 Author: Sarah Walker AuthorDate: 2026-05-12 12:15:49 +0000 Commit: Andrew Turner CommitDate: 2026-05-12 16:54:41 +0000 arm64: Load SOCDEV_PA as a literal rather than an immediate When EARLY_PRINTK is used in a realm environment, the UART physical address must be in the unprotected address space. The resulting physical address will not generally fit in an immediate, so use a literal instead. Reviewed by: andrew Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D56600 --- sys/arm64/arm64/locore.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm64/arm64/locore.S b/sys/arm64/arm64/locore.S index 14300eceb6d5..b200aa93c281 100644 --- a/sys/arm64/arm64/locore.S +++ b/sys/arm64/arm64/locore.S @@ -799,7 +799,7 @@ common: adrp x9, socdev_va str x17, [x9, :lo12:socdev_va] - mov x9, #(SOCDEV_PA & ~L2_OFFSET) /* PA start */ + ldr x9, =(SOCDEV_PA) /* PA start */ mov x10, #1 bl build_l2_block_pagetable #endif From nobody Tue May 12 17:02:54 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gFNFW2Dwrz6clGq for ; Tue, 12 May 2026 17:02:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFNFV6P9Fz416P for ; Tue, 12 May 2026 17:02:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778605374; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ilKxDnzrr39GYaa9CdzEt8a2IkPINiw4QkBBsE2qJGE=; b=yXgfxUKAJd9oSmx9Bc5J1/EDfd/eIn4df+BHEFTqXvgBi1FUCMsfF2NkTtaVef+Ba9cv5I hqwSX7Y8nmBBZaHPruUbKDnnJBCJpUD2yQs+JFzXZHzftj18668QdKFpn/FAujPGyS3Uqi h75n1EI1RBoEJU3wfi88B5ld7YaRL7vYAFa6kKhnPDd2VLotczV1iagxLJZk+GFTfhpLuI fXpzVlTBxlVNj5od0gpK6I4nMnz/4f+k4NFvRyJfE0nyDanCxXrjt3/DDTlyDEzwqG6zwn 4aQqUxrAVU2/2qFZOd+bWzlOXvyB8EokShvNUDMWeI3o6ddWbe5RsIiqEdsOZw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778605374; a=rsa-sha256; cv=none; b=uliIIAtSYhiN1os90EednoB1cwGFHzoROsjUz10dUimnJp3Bc+xs7QRWf2CBdKgIbpzKpJ eiUHXM/KlmByLkRk0kN+i4+K4U26/wqGpi0FquCtUbFBxE+yJjUQ7FfBatYe8d45grw4P8 rHyfU3MD3UD95rMe6HUqqPz/Xdj8uxBzalUfz7Iw19l8n7azVCqCxihnnrus8Ef3/79Iff f4V9rrCM2oqCrvh+jkT+vI2T2FJMnYKzJwApM5MmrSZ3zFyjQJ0pY3k7zwTWPK2NMGjUSA gh+cC1C4THcLDVaIWIctETBRActkO+hMjX+YZhCx5ardTQe9YR9LCocMW3333g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778605374; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ilKxDnzrr39GYaa9CdzEt8a2IkPINiw4QkBBsE2qJGE=; b=jrsHNN9LAFpscevrBM9ZDxEqIVGpkg96hT1gcxRvPMSBJFK1AM7bc6UR3J7nzUiIHuCxjV 5fg2OuXfXLpnzUnW/RgK6klyuaB3DcAAJ1PNyjY2MdoEoOuU7SfBHTUD8n1NjK6XO1x6Og PcWUmaI7/Vvrh5aFUQDGWXq7RbVgnQrcM/6XheYvEjghG8pl3B12mtnKHRl7Y6Wi4dUzaE BmaSGRHhPPKp3/mZB8JvcbfZo9Oi9ygnO/qZ+bKJIh9KvXiYwm3a+55KQZ4W9QrGJbSgDh +UNLVV/GeDlk5z0atdU4N3OMPIJsGa7yqa60XFnkrSmiCfyAhXjH8TXETeYusQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFNFV5sHmz1BF1 for ; Tue, 12 May 2026 17:02:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3ddc4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 17:02:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Wei Hu Subject: git: ab5161397066 - stable/15 - mana: support jumbo packet size List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: whu X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: ab51613970667988a67be69410e87ec2f4bba407 Auto-Submitted: auto-generated Date: Tue, 12 May 2026 17:02:54 +0000 Message-Id: <6a035d3e.3ddc4.79288c7d@gitrepo.freebsd.org> The branch stable/15 has been updated by whu: URL: https://cgit.FreeBSD.org/src/commit/?id=ab51613970667988a67be69410e87ec2f4bba407 commit ab51613970667988a67be69410e87ec2f4bba407 Author: Wei Hu AuthorDate: 2025-12-23 07:00:38 +0000 Commit: Wei Hu CommitDate: 2026-05-12 17:02:00 +0000 mana: support jumbo packet size Remove the restriction of up to 4k packet size. Now the driver supports up to MJUM16BYTES size packets as long as hardware supporting it. Tested on VMs in Azure. Tested by: whu MFC after: 1 week Sponsored by: Microsoft (cherry picked from commit d0a2bd2765b365c4be9b17c29306f848953e55a5) --- sys/dev/mana/gdma.h | 6 ++++ sys/dev/mana/mana.h | 11 +++++-- sys/dev/mana/mana_en.c | 79 ++++++++++++++++++++++++++++++++------------------ 3 files changed, 65 insertions(+), 31 deletions(-) diff --git a/sys/dev/mana/gdma.h b/sys/dev/mana/gdma.h index 9e32d58dbfdc..90cd908055af 100644 --- a/sys/dev/mana/gdma.h +++ b/sys/dev/mana/gdma.h @@ -193,6 +193,9 @@ struct gdma_general_req { }; /* HW DATA */ #define GDMA_MESSAGE_V1 1 +#define GDMA_MESSAGE_V2 2 +#define GDMA_MESSAGE_V3 3 +#define GDMA_MESSAGE_V4 4 struct gdma_general_resp { struct gdma_resp_hdr hdr; @@ -409,6 +412,9 @@ struct gdma_context { struct gdma_resource msix_resource; struct gdma_irq_context *irq_contexts; + /* L2 MTU */ + uint16_t adapter_mtu; + /* This maps a CQ index to the queue structure. */ unsigned int max_num_cqs; struct gdma_queue **cq_table; diff --git a/sys/dev/mana/mana.h b/sys/dev/mana/mana.h index a037eb3f05c7..de34f8a82c6a 100644 --- a/sys/dev/mana/mana.h +++ b/sys/dev/mana/mana.h @@ -102,9 +102,6 @@ enum TRI_STATE { #define COMP_ENTRY_SIZE 64 #define MIN_FRAME_SIZE 146 -#define ADAPTER_MTU_SIZE 1500 -#define DEFAULT_FRAME_SIZE (ADAPTER_MTU_SIZE + 14) -#define MAX_FRAME_SIZE 4096 /* Unit number of RX buffers. Must be power of two * Higher number could fail at allocation. @@ -534,6 +531,9 @@ struct mana_port_context { uint16_t port_idx; uint16_t frame_size; + uint16_t max_mtu; + uint16_t min_mtu; + uint16_t mtu; bool port_is_up; bool port_st_save; /* Saved port state */ @@ -613,6 +613,11 @@ struct mana_query_device_cfg_resp { uint16_t max_num_vports; uint16_t reserved; uint32_t max_num_eqs; + + /* response v2: */ + uint16_t adapter_mtu; + uint16_t reserved2; + uint32_t reserved3; }; /* HW DATA */ /* Query vPort Configuration */ diff --git a/sys/dev/mana/mana_en.c b/sys/dev/mana/mana_en.c index 949b498ceadc..bc8c172bab69 100644 --- a/sys/dev/mana/mana_en.c +++ b/sys/dev/mana/mana_en.c @@ -181,18 +181,19 @@ mana_ioctl(if_t ifp, u_long command, caddr_t data) new_mtu = ifr->ifr_mtu; if (if_getmtu(ifp) == new_mtu) break; - if ((new_mtu + 18 > MAX_FRAME_SIZE) || - (new_mtu + 18 < MIN_FRAME_SIZE)) { + if ((new_mtu > apc->max_mtu) || + (new_mtu < apc->min_mtu)) { if_printf(ifp, "Invalid MTU. new_mtu: %d, " "max allowed: %d, min allowed: %d\n", - new_mtu, MAX_FRAME_SIZE - 18, MIN_FRAME_SIZE - 18); + new_mtu, apc->max_mtu, apc->min_mtu); return EINVAL; } MANA_APC_LOCK_LOCK(apc); if (apc->port_is_up) mana_down(apc); - apc->frame_size = new_mtu + 18; + apc->frame_size = new_mtu + ETHER_HDR_LEN; + apc->mtu = new_mtu; if_setmtu(ifp, new_mtu); mana_dbg(NULL, "Set MTU to %d\n", new_mtu); @@ -421,17 +422,11 @@ mana_load_rx_mbuf(struct mana_port_context *apc, struct mana_rxq *rxq, if (alloc_mbuf) { mbuf = m_getjcl(M_NOWAIT, MT_DATA, M_PKTHDR, rxq->datasize); - if (unlikely(mbuf == NULL)) { - mbuf = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR); - if (unlikely(mbuf == NULL)) { - return ENOMEM; - } - mlen = MCLBYTES; - } else { - mlen = rxq->datasize; - } + if (unlikely(mbuf == NULL)) + return ENOMEM; - mbuf->m_pkthdr.len = mbuf->m_len = mlen; + mbuf->m_pkthdr.len = mbuf->m_len = rxq->datasize; + mlen = rxq->datasize; } else { if (rx_oob->mbuf) { mbuf = rx_oob->mbuf; @@ -911,9 +906,9 @@ mana_init_port_context(struct mana_port_context *apc) BUS_SPACE_MAXADDR, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ NULL, NULL, /* filter, filterarg */ - MJUMPAGESIZE, /* maxsize */ + MJUM16BYTES, /* maxsize */ 1, /* nsegments */ - MJUMPAGESIZE, /* maxsegsize */ + MJUM16BYTES, /* maxsegsize */ 0, /* flags */ NULL, NULL, /* lockfunc, lockfuncarg*/ &apc->rx_buf_tag); @@ -994,6 +989,9 @@ mana_query_device_cfg(struct mana_context *ac, uint32_t proto_major_ver, mana_gd_init_req_hdr(&req.hdr, MANA_QUERY_DEV_CONFIG, sizeof(req), sizeof(resp)); + + req.hdr.resp.msg_version = GDMA_MESSAGE_V2; + req.proto_major_ver = proto_major_ver; req.proto_minor_ver = proto_minor_ver; req.proto_micro_ver = proto_micro_ver; @@ -1016,8 +1014,14 @@ mana_query_device_cfg(struct mana_context *ac, uint32_t proto_major_ver, *max_num_vports = resp.max_num_vports; - mana_dbg(NULL, "mana max_num_vports from device = %d\n", - *max_num_vports); + if (resp.hdr.response.msg_version >= GDMA_MESSAGE_V2) + gc->adapter_mtu = resp.adapter_mtu; + else + gc->adapter_mtu = ETHERMTU + ETHER_HDR_LEN; + + mana_dbg(NULL, "mana max_num_vports from device = %d, " + "adapter_mtu = %u\n", + *max_num_vports, gc->adapter_mtu); return 0; } @@ -2295,7 +2299,7 @@ mana_alloc_rx_wqe(struct mana_port_context *apc, uint32_t buf_idx; int err; - if (rxq->datasize == 0 || rxq->datasize > PAGE_SIZE) { + if (rxq->datasize == 0) { mana_err(NULL, "WARNING: Invalid rxq datasize %u\n", rxq->datasize); } @@ -2359,6 +2363,28 @@ mana_push_wqe(struct mana_rxq *rxq) return 0; } +static uint32_t +mana_calc_rx_datasize(struct mana_port_context *apc) +{ + uint32_t effective_mtu = 0; + + if (apc->frame_size > MJUM16BYTES) { + mana_err(NULL, "mana frame_size %u is too big\n", + apc->frame_size); + effective_mtu = MJUM16BYTES; + } else if (apc->frame_size > MJUM9BYTES) { + effective_mtu = MJUM16BYTES; + } else if (apc->frame_size > MJUMPAGESIZE) { + effective_mtu = MJUM9BYTES; + } else if (apc->frame_size > MCLBYTES) { + effective_mtu = MJUMPAGESIZE; + } else { + effective_mtu = MCLBYTES; + } + + return effective_mtu; +} + static struct mana_rxq * mana_create_rxq(struct mana_port_context *apc, uint32_t rxq_idx, struct mana_eq *eq, if_t ndev) @@ -2381,14 +2407,8 @@ mana_create_rxq(struct mana_port_context *apc, uint32_t rxq_idx, rxq->ndev = ndev; rxq->num_rx_buf = apc->rx_queue_size; rxq->rxq_idx = rxq_idx; - /* - * Minimum size is MCLBYTES(2048) bytes for a mbuf cluster. - * Now we just allow maximum size of 4096. - */ - rxq->datasize = ALIGN(apc->frame_size, MCLBYTES); - if (rxq->datasize > MAX_FRAME_SIZE) - rxq->datasize = MAX_FRAME_SIZE; + rxq->datasize = mana_calc_rx_datasize(apc); mana_dbg(NULL, "Setting rxq %d datasize %d\n", rxq_idx, rxq->datasize); @@ -2914,10 +2934,13 @@ mana_probe_port(struct mana_context *ac, int port_idx, mana_rx_req_size); apc->port_handle = INVALID_MANA_HANDLE; apc->port_idx = port_idx; - apc->frame_size = DEFAULT_FRAME_SIZE; apc->last_tx_cq_bind_cpu = -1; apc->last_rx_cq_bind_cpu = -1; apc->vport_use_count = 0; + apc->max_mtu = gc->adapter_mtu - ETHER_HDR_LEN; + apc->min_mtu = MIN_FRAME_SIZE; + apc->mtu = ETHERMTU; + apc->frame_size = apc->mtu + ETHER_HDR_LEN; MANA_APC_LOCK_INIT(apc); @@ -2932,7 +2955,7 @@ mana_probe_port(struct mana_context *ac, int port_idx, if_setioctlfn(ndev, mana_ioctl); if_setgetcounterfn(ndev, mana_get_counter); - if_setmtu(ndev, ETHERMTU); + if_setmtu(ndev, apc->mtu); if_setbaudrate(ndev, IF_Gbps(100)); mana_rss_key_fill(apc->hashkey, MANA_HASH_KEY_SIZE); From nobody Tue May 12 17:02:53 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gFNFb1b3bz6clVP for ; Tue, 12 May 2026 17:02: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFNFZ68PYz40kK for ; Tue, 12 May 2026 17:02:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778605378; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BT9YtlokYONbATQEH1s4/ZQu+C4tmC3/XZ2Xtey1EHo=; b=EeWvwjzvk/6CL/M1XY2BTGcorXbYePFCMiF+0lU4TBBF/2rG+SCmlGJiMDYtg+KfP8kDcE OopQHCiFueGFHIV5TxXjbn7M8BgnIxIakHH1aEtChhlh0ft4YE+6pZGbtKkxwtGr7UdBmk o3N3j1SR2Cn8FK/0g/5YTpjKz/WbhNqwW4ft1kCQidSjkW9ojUr9Hp0yrCd5MUmbPpdVdc ybjjT1JQeikwR4GYBzgcaTTf2KvQR3+R4BlMQrg1+GKSV6MJWgBsrW++4ZcTE556P1PLIw 8ukykONZifQwCiFyenbqra2PwkVjs4oWR4HMlMX1HbwP1+pJO/F7vNZ/pnBUjQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778605378; a=rsa-sha256; cv=none; b=M3LWMKzgpx9b6X6fag3a1gRdukQUilw98DqVUEkXvhSnwhIUPIjt6VbyDJB/BOwE/9uo5P ulYKjzk6kQ6pGYHr3gV5Jee6X0HppRHRHhuVbWuLd8nkLc8bwYUhIRF4FKh4J0dfWuhJw5 xvYlt+0rOaK5IhsNlyDg3qj83sCU7ZokVQywza6hyocUUGfLd8ICrhH6jKrnhtj63NEzeu nfvjr6JNuoGUClfcG4UqtqzzgbPfTeK60Mp0lD0+OfcIGE3rceSpyXYiNrnBT3JdHekbE3 wwfTGOhFkHVCovuBzFWy9y6z4KwuUiXsGmH85V1xvBnemSWLDJm04hkhobnfAA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778605378; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BT9YtlokYONbATQEH1s4/ZQu+C4tmC3/XZ2Xtey1EHo=; b=bYLEmYN3SwaEnh82DDnMO+/LvrtZYcNJHOIJWkhZS6kQm/V9UuCX5I30VlOdkBjByzdyZW BNkF6wdWW0eM90FVyePfdBmNtsbxOKPqmYBZK4s3/+8edf0d7tLIH1F9MAmj9pjOkehpyr mtLchwXgOnfO8V0ku4Moi/6gFUOPu7nyErRFwpr3Pm0+5tfJHs0aGQi5YYB1NzZqSwcT1r U2e3pIFHhd1lagfrQz5wK3fYVkTGHX0YDIJGyRHbIVOzF0itpir0xuxR6g8cghAj63Z+i6 UYHc3jcCAiYxXr5tcChgD7yv/fhz44W4NkJtNn8klJsU4n6d+0nJ4VRs0Oauaw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFNFZ5NQqz1BjR for ; Tue, 12 May 2026 17:02:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3efc8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 17:02:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Wei Hu Subject: git: de698a13ccca - stable/15 - Hyper-V: hn: just call vf's ioctl when changing mtu List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: whu X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: de698a13cccaf831b1812c577594429421b028c5 Auto-Submitted: auto-generated Date: Tue, 12 May 2026 17:02:53 +0000 Message-Id: <6a035d3d.3efc8.1da886a2@gitrepo.freebsd.org> The branch stable/15 has been updated by whu: URL: https://cgit.FreeBSD.org/src/commit/?id=de698a13cccaf831b1812c577594429421b028c5 commit de698a13cccaf831b1812c577594429421b028c5 Author: Wei Hu AuthorDate: 2025-12-23 04:23:39 +0000 Commit: Wei Hu CommitDate: 2026-05-12 17:02:00 +0000 Hyper-V: hn: just call vf's ioctl when changing mtu When changing mtu, if a vf is attached to the netvsc interface, just calling its ioctl to change vf's mtu is good enough. Tested by: whu MFC after: 3 days Sponsored by: Microsoft (cherry picked from commit 44f656641c238cb3db31026f3e3bef36cd5231a8) --- sys/dev/hyperv/netvsc/if_hn.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/sys/dev/hyperv/netvsc/if_hn.c b/sys/dev/hyperv/netvsc/if_hn.c index b23c0d76115d..8c79ae7b003b 100644 --- a/sys/dev/hyperv/netvsc/if_hn.c +++ b/sys/dev/hyperv/netvsc/if_hn.c @@ -3763,14 +3763,16 @@ hn_ioctl(if_t ifp, u_long cmd, caddr_t data) ifr_vf = *ifr; strlcpy(ifr_vf.ifr_name, if_name(vf_ifp), sizeof(ifr_vf.ifr_name)); - error = ifhwioctl(SIOCSIFMTU,vf_ifp, + error = ifhwioctl(SIOCSIFMTU, vf_ifp, (caddr_t)&ifr_vf, curthread); + HN_UNLOCK(sc); if (error) { - HN_UNLOCK(sc); if_printf(ifp, "%s SIOCSIFMTU %d failed: %d\n", if_name(vf_ifp), ifr->ifr_mtu, error); - break; + } else { + if_setmtu(ifp, ifr->ifr_mtu); } + break; } /* From nobody Tue May 12 18:00:31 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gFPX42Cbrz6cqM9 for ; Tue, 12 May 2026 18:00: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFPX41ckGz3C4D for ; Tue, 12 May 2026 18:00:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778608836; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sPlS55ATgAPdTWOk2m18uRiY7GynW2YZScd/NH7BD4o=; b=IxmB4cW+2GAvyIB0lfQgBG7A4j+YLKYX7FUrlM9IvG6rEIVMugzgZoJ7+YE+2dtsEYBicK 7BJvR/wKlTeVccsQKCEEpd/JPHOWNF0OODq2W07iNhKGD239DBcQvBcUz8dLTTX9vVfZSg kuoDFCR1x5RlFgHzIuAbwhVttBfXtzPrTGma2lAvO2eMzgzX1QTUC1OlLM2ow+EJ2ZQvY8 NTEVG8jA8dz+rLAruj6g5yghXmwOuv03m+pT6EKSDkgiq2NgYZvJIRrSpZa62JrfLhifDX PT1BxPNQY+uEUqAM6HZg/GLH5S8lAIJz3uBDXnDgCoXUTLSEyJUru1BcYhulXg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778608836; a=rsa-sha256; cv=none; b=Wgc1Pqnk2sOiSrRimZ4Mw/g1TJuyNPBcnwY03BifjBhi1sFD2pLeTbOepIA7GLkb/Zz5M1 UBdgiriOIFkIxtL0S/SnkD2QVa5NE90z+2WJjZIaoMR66TZ0Sw1Thv1lPAx7DCttrsUSmx u31RNVKteYWX4Cpzm3ben4w5fyAdpMDs2xrfBLutedxAw2ta6HkwziWMHIeeN9WLUOmS9C /1aXR1Z06MDLybl8FFnluc7dawmo1tcfxMDkx3sd+nawxHkFrB6erz5ksmRaFVvnYuHXdn k934BkU0CzFdKzKj9KMzzUQzMVvsf3iZjOgcsgDaPZXZmV/h6EOmjt4IIdItqQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778608836; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sPlS55ATgAPdTWOk2m18uRiY7GynW2YZScd/NH7BD4o=; b=X+nUoUkADkGaehyQaUb9pNVvhwQSvU7s/2YOylPQuqZ2tFH9rYhQSJ0mPydK3+0RNDOdhh /IbCZm8onZ5LgDq4B7rU6UYTZOIxGvi/dBkPOVexfioAEHETsDDvWiqZrnXy9qy9vn0dtI WFkq0c1W8upx1hLbrVAwSeNS+jcUB/xCk1+niHPQ3PLOsAp05QYasTuSWktW/3GVE7pGpD tWh/OR7+giac8GwVAWB8m6DzD3BZ3BvZ5kkLbfx5xu2jeMh9o4xfCFlveaz5sxRYShmFKL kjLt1XuOnJpkKkis/PMRTiqcPo4VkGZSPbJfmtr4wAaaW9rWFoP1ZifWfeFKmg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFPX41DD1z1Crj for ; Tue, 12 May 2026 18:00:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 44a0c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 18:00:31 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: e68433e1990d - main - sys: Fix heap disclosure in compat7 kern.proc.filedesc sysctl List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: e68433e1990d5f1bcc1bdd270d65f1e4792a8e1b Auto-Submitted: auto-generated Date: Tue, 12 May 2026 18:00:31 +0000 Message-Id: <6a036abf.44a0c.1cbab5f5@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=e68433e1990d5f1bcc1bdd270d65f1e4792a8e1b commit e68433e1990d5f1bcc1bdd270d65f1e4792a8e1b Author: Ed Maste AuthorDate: 2026-05-12 16:25:01 +0000 Commit: Ed Maste CommitDate: 2026-05-12 17:59:51 +0000 sys: Fix heap disclosure in compat7 kern.proc.filedesc sysctl Reported by: Yuxiang Yang, Yizhou Zhao, Ao Wang, Xuewei Feng, Qi Li, and Ke Xu from Tsinghua University using GLM-5.1 from Z.ai Reviewed by: markj Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D56976 --- sys/kern/kern_descrip.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c index 48303926759b..349ebb5702a5 100644 --- a/sys/kern/kern_descrip.c +++ b/sys/kern/kern_descrip.c @@ -5135,7 +5135,7 @@ sysctl_kern_proc_ofiledesc(SYSCTL_HANDLER_ARGS) return (ENOENT); } kif = malloc(sizeof(*kif), M_TEMP, M_WAITOK); - okif = malloc(sizeof(*okif), M_TEMP, M_WAITOK); + okif = malloc(sizeof(*okif), M_TEMP, M_WAITOK | M_ZERO); PWDDESC_XLOCK(pdp); pwd = pwd_hold_pwddesc(pdp); if (pwd != NULL) { From nobody Tue May 12 18:07:44 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gFPhJ3ZQdz6cr7p for ; Tue, 12 May 2026 18:07: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFPhJ2wTHz3DJb for ; Tue, 12 May 2026 18:07:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778609264; 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; bh=MvdzMs4fd1RG5R/9nrhf3721u6+GrymnT4/Uj/jj06I=; b=y0U5tGbg+jAQ2cgk96VCOePxnmEjq1rig/zUDu0QHZ3WqWI+RQE3G1N1QSrzUPbD5abVMp q3PxXlrAlcvH9jVoAJteT06yBYozOYMH313QTmRGDqt/usnxPy12vqzdPjYm6jBxkoJQRt iK1kgA3Mw92gb//1Nhk1+5b9svTEjTBZ6b9Th8alViIOHEy6cYg3+U6llQb+P/i1QxCoMw VmZcMrHWHD+GkEUPJGrppBrbBVQWPMeRE8bR/oWevRhJTnqmy25iOwlbsgYasAGBr/t+YD PEozep9NFTn45xx39MmuqI6O7eyJDk05ppIUnRSdzL1/qhinCELSjXe7GkRfpg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778609264; a=rsa-sha256; cv=none; b=F5kl1XSlxgG1/bXNXwF3s/wE200tqUoLwoeASnvTnTIuyMdRqNlg5K4NLS2xvLZqlsrGk0 TlU8vZwro+G59Lij3B4upxvxMAQ1o1AsoqBD6Ae4ZjyLGlOS2kfY5lWlzvV2pMMWwJP6kg e+IvH7WrRryeqcP3Do4eCXsMkmeuqVNRCv6+wwUziCUenyokCPmTa+BtzwtNtyKJYFohiC WywGUuVE8nwZBJramEFOlpL43n9nVpwsP/E/80uy8xe3HPhZtgtpnxwAqh8uRJzWjtJl5C 1VxeGcPGp5Gk+DruhONxiTqgl52l5q5f7039v+sW7BMJtg2dCfFXawQpMumHEw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778609264; 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; bh=MvdzMs4fd1RG5R/9nrhf3721u6+GrymnT4/Uj/jj06I=; b=gDVAa/CCdbhXK3vsM+YE4w9wNp1cVyxUUF0lOzum9phRt6dqFVuHNTAsANRhg3gpBRq6hP ieIsw/9pVfI0XwYlv6Xk70/EPopZvtPpzpwfnsj5wE5WUjpmyAOZhQp2hPf2hwlBqGzu1o wQHHGK0C3EZJzENhyIVoEFo3rhG7ImnBRAYmQEMpe6GcjlVU6gKILUEe7h34/AF+2ZMh7S k/D/1qtkyohEDSNiqi3hW9ojxMlV8hVRwR9VhOal6tBQI8V86XOiRsJ3N4BD5an4wFJZAs NHhf+t3aoDZrUN4EA5EyOCwC9X8a9GnIC1wzS/cvQuklaOb3wS3V+RiyPIcg6g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFPhJ2R9Xz9B for ; Tue, 12 May 2026 18:07:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 432e5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 18:07:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Tuukka Pasanen From: Ed Maste Subject: git: 9d283f97ebd0 - stable/15 - mkimg: Add SPDX-License-Identifier tags List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 9d283f97ebd038ca081100855592d9695233b226 Auto-Submitted: auto-generated Date: Tue, 12 May 2026 18:07:44 +0000 Message-Id: <6a036c70.432e5.709ae413@gitrepo.freebsd.org> The branch stable/15 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=9d283f97ebd038ca081100855592d9695233b226 commit 9d283f97ebd038ca081100855592d9695233b226 Author: Tuukka Pasanen AuthorDate: 2026-02-09 08:32:54 +0000 Commit: Ed Maste CommitDate: 2026-05-12 18:06:26 +0000 mkimg: Add SPDX-License-Identifier tags Reviewed by: emaste Sponsored by: The FreeBSD Foundation (cherry picked from commit 971696b22f7acc8c45600bb56b972340e9b912e8) --- usr.bin/mkimg/apm.c | 2 ++ usr.bin/mkimg/bsd.c | 2 ++ usr.bin/mkimg/ebr.c | 2 ++ usr.bin/mkimg/endian.h | 2 ++ usr.bin/mkimg/format.c | 2 ++ usr.bin/mkimg/format.h | 2 ++ usr.bin/mkimg/gpt.c | 2 ++ usr.bin/mkimg/image.c | 2 ++ usr.bin/mkimg/image.h | 2 ++ usr.bin/mkimg/mbr.c | 2 ++ usr.bin/mkimg/mkimg.c | 2 ++ usr.bin/mkimg/mkimg.h | 2 ++ usr.bin/mkimg/qcow.c | 2 ++ usr.bin/mkimg/raw.c | 2 ++ usr.bin/mkimg/scheme.c | 2 ++ usr.bin/mkimg/scheme.h | 2 ++ usr.bin/mkimg/uuid.c | 2 ++ usr.bin/mkimg/vhd.c | 2 ++ usr.bin/mkimg/vhdx.c | 2 ++ usr.bin/mkimg/vmdk.c | 2 ++ 20 files changed, 40 insertions(+) diff --git a/usr.bin/mkimg/apm.c b/usr.bin/mkimg/apm.c index 259a7533c27c..59776d18bc47 100644 --- a/usr.bin/mkimg/apm.c +++ b/usr.bin/mkimg/apm.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2014 Juniper Networks, Inc. * All rights reserved. * diff --git a/usr.bin/mkimg/bsd.c b/usr.bin/mkimg/bsd.c index 17933c01ac07..647e9ab0608c 100644 --- a/usr.bin/mkimg/bsd.c +++ b/usr.bin/mkimg/bsd.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2014 Juniper Networks, Inc. * All rights reserved. * diff --git a/usr.bin/mkimg/ebr.c b/usr.bin/mkimg/ebr.c index 4d6adbb3b8ba..20ade1ed88d1 100644 --- a/usr.bin/mkimg/ebr.c +++ b/usr.bin/mkimg/ebr.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2014 Juniper Networks, Inc. * All rights reserved. * diff --git a/usr.bin/mkimg/endian.h b/usr.bin/mkimg/endian.h index e9dc2b44b9b7..98e699bee855 100644 --- a/usr.bin/mkimg/endian.h +++ b/usr.bin/mkimg/endian.h @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2002 Thomas Moestl * All rights reserved. * diff --git a/usr.bin/mkimg/format.c b/usr.bin/mkimg/format.c index 6730c22ca153..97e580cd8ca2 100644 --- a/usr.bin/mkimg/format.c +++ b/usr.bin/mkimg/format.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2014 Juniper Networks, Inc. * All rights reserved. * diff --git a/usr.bin/mkimg/format.h b/usr.bin/mkimg/format.h index 304af4586da8..db1ea764ced2 100644 --- a/usr.bin/mkimg/format.h +++ b/usr.bin/mkimg/format.h @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2014 Juniper Networks, Inc. * All rights reserved. * diff --git a/usr.bin/mkimg/gpt.c b/usr.bin/mkimg/gpt.c index ed3f008c394f..ce817ea10ed2 100644 --- a/usr.bin/mkimg/gpt.c +++ b/usr.bin/mkimg/gpt.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2014 Juniper Networks, Inc. * All rights reserved. * diff --git a/usr.bin/mkimg/image.c b/usr.bin/mkimg/image.c index 07aaf1a6c0ea..90817206e317 100644 --- a/usr.bin/mkimg/image.c +++ b/usr.bin/mkimg/image.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2014 Juniper Networks, Inc. * All rights reserved. * diff --git a/usr.bin/mkimg/image.h b/usr.bin/mkimg/image.h index 53dd3dc2df8a..956fe3f27556 100644 --- a/usr.bin/mkimg/image.h +++ b/usr.bin/mkimg/image.h @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2014 Juniper Networks, Inc. * All rights reserved. * diff --git a/usr.bin/mkimg/mbr.c b/usr.bin/mkimg/mbr.c index 7bda01c72e6a..cc5bd51bd7e5 100644 --- a/usr.bin/mkimg/mbr.c +++ b/usr.bin/mkimg/mbr.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2014 Juniper Networks, Inc. * All rights reserved. * diff --git a/usr.bin/mkimg/mkimg.c b/usr.bin/mkimg/mkimg.c index 8f3a5d879bbb..c625b49dc29a 100644 --- a/usr.bin/mkimg/mkimg.c +++ b/usr.bin/mkimg/mkimg.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2013,2014 Juniper Networks, Inc. * All rights reserved. * diff --git a/usr.bin/mkimg/mkimg.h b/usr.bin/mkimg/mkimg.h index aa0ec2a8d944..13ca7aab36fb 100644 --- a/usr.bin/mkimg/mkimg.h +++ b/usr.bin/mkimg/mkimg.h @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2014 Juniper Networks, Inc. * All rights reserved. * diff --git a/usr.bin/mkimg/qcow.c b/usr.bin/mkimg/qcow.c index 2dc3e5498420..6e67cbaa0887 100644 --- a/usr.bin/mkimg/qcow.c +++ b/usr.bin/mkimg/qcow.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2014 Marcel Moolenaar * All rights reserved. * diff --git a/usr.bin/mkimg/raw.c b/usr.bin/mkimg/raw.c index 2de674b908ac..b68c5f06b3c4 100644 --- a/usr.bin/mkimg/raw.c +++ b/usr.bin/mkimg/raw.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2014 Juniper Networks, Inc. * All rights reserved. * diff --git a/usr.bin/mkimg/scheme.c b/usr.bin/mkimg/scheme.c index 85ed94013e8d..80ff456a709f 100644 --- a/usr.bin/mkimg/scheme.c +++ b/usr.bin/mkimg/scheme.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2013,2014 Juniper Networks, Inc. * All rights reserved. * diff --git a/usr.bin/mkimg/scheme.h b/usr.bin/mkimg/scheme.h index 52614255595f..1c234b86d66c 100644 --- a/usr.bin/mkimg/scheme.h +++ b/usr.bin/mkimg/scheme.h @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2013,2014 Juniper Networks, Inc. * All rights reserved. * diff --git a/usr.bin/mkimg/uuid.c b/usr.bin/mkimg/uuid.c index 885a6c36b522..da99c33109e3 100644 --- a/usr.bin/mkimg/uuid.c +++ b/usr.bin/mkimg/uuid.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2016 Marcel Moolenaar * All rights reserved. * diff --git a/usr.bin/mkimg/vhd.c b/usr.bin/mkimg/vhd.c index c0fe45ab416e..09d3cfab4dcc 100644 --- a/usr.bin/mkimg/vhd.c +++ b/usr.bin/mkimg/vhd.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2014, 2015 Marcel Moolenaar * All rights reserved. * diff --git a/usr.bin/mkimg/vhdx.c b/usr.bin/mkimg/vhdx.c index e280250bd964..6ecdfe8e13e9 100644 --- a/usr.bin/mkimg/vhdx.c +++ b/usr.bin/mkimg/vhdx.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2020 Oleksandr Tymoshenko * * Redistribution and use in source and binary forms, with or without diff --git a/usr.bin/mkimg/vmdk.c b/usr.bin/mkimg/vmdk.c index 132eb801387a..79ef256df223 100644 --- a/usr.bin/mkimg/vmdk.c +++ b/usr.bin/mkimg/vmdk.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2014 Juniper Networks, Inc. * All rights reserved. * From nobody Tue May 12 18:07:45 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gFPhK6WFHz6crD4 for ; Tue, 12 May 2026 18:07: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFPhK3xGKz3D7Q for ; Tue, 12 May 2026 18:07:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778609265; 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; bh=Lw/hKnBzEb+q6KspVtAdtrYezQcqbfcHarQAGJEq4ZE=; b=YpSIQQGgPVLdDyRkWOyuiBZKNZJ4J4OUItczPfqIylNy2JOm466g3gIEJ5A84dSCCSyHTC ofecZGorT238ayGzzrKCEC6HFOHuqK4ewtm200X0dpGGdu/oR1FxxWB7ZvvloA3+AGBdE3 rCRYJBE2yaDrnpeRvKiVdaeo2nz6r91XUaer8wxzIqLD3fg7Z6ZIHLFQRJdWw36cpO4Up4 Bli9sq459PU7jBHuLP3MiauSxKx26za/OMKhHX0cyTET3ZW31OZmAYGEzBEQnhsEHSMa/V HIZ+rfCIdX57mYSJudcxkAYcHqpzm8pU350B4FkiHatn1FegK44AeV7V5eHPvw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778609265; a=rsa-sha256; cv=none; b=TguO24esIZhORYdelJtVpyfwR/yU0LpW4hada2s2S3g99Gt6uPSTkqk1UKdw3wFmMVRRl3 x4SwlYxIY2FCBwVzA30ceZmnS9TkZvVwIZ0CtfJYnVhLKGLqoGI1o8Bmr/Qzg2GGuJ62De YmzDvEu9R8RyEuLaw4VFEqfHbPcqiYzkV+uUOYFlNlErH2sEwwkBEwQufsG3fnYOah8Nhx Ee8QvMEHaNUiviIMQHq/wov9pzdwCQr8nyMm6U2CnbWH4o4e5Eh0ZJdQUYVaQFXd0g/z36 Y8J2bEuPTuhUOMfzSutQ8nhBexbx9djZ/EzfZQcAeiDW7u1k0BXBnQYTy+m6gA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778609265; 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; bh=Lw/hKnBzEb+q6KspVtAdtrYezQcqbfcHarQAGJEq4ZE=; b=JVl0dHGlBLgBFDpBOk5KqSicdmo0X9KVuzucCRLRKNW6yBPJsrbSIbV2KnLKK4i44RJqSp sWCVA/TcIVvZIu07UUEHt/q7Xk1lCC092UJmkTLZfd5PC+V/ESlApIkM3yggYcFsOS4+K6 bUIX7oa40DtuKuy/CZoMpvTypaGEHuAN+MTnH5kyANfuVMsqKw5PC/m4lrCCcxhMihnf5p iCw3OC0nYd9UZ1/xdQmMGdNgPMdb5JC67fCCY8OgNpA9QSeZXWKqJt9q/frcpO1OlLxhtc Maoj5TQg1ksKC3zJo15tjlHr2iOFS2eFdNgrgNGcXdCvpBRAvkzm8vRp8GOIiQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFPhK3FYwz1CYj for ; Tue, 12 May 2026 18:07:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 42c69 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 18:07:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Tuukka Pasanen From: Ed Maste Subject: git: f0bb84ffbbe4 - stable/15 - vtfontcvt: Add SPDX-License-Identifier tag List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: f0bb84ffbbe4f716a07630f2d03c89dab3e2c873 Auto-Submitted: auto-generated Date: Tue, 12 May 2026 18:07:45 +0000 Message-Id: <6a036c71.42c69.7244d7fb@gitrepo.freebsd.org> The branch stable/15 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=f0bb84ffbbe4f716a07630f2d03c89dab3e2c873 commit f0bb84ffbbe4f716a07630f2d03c89dab3e2c873 Author: Tuukka Pasanen AuthorDate: 2026-02-16 09:01:58 +0000 Commit: Ed Maste CommitDate: 2026-05-12 18:06:26 +0000 vtfontcvt: Add SPDX-License-Identifier tag Reviewed by: emaste Sponsored by: The FreeBSD Foundation (cherry picked from commit f12a0dca86b529069a940f09aba796dd4e28c66f) --- usr.bin/vtfontcvt/vtfontcvt.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/usr.bin/vtfontcvt/vtfontcvt.c b/usr.bin/vtfontcvt/vtfontcvt.c index 773072813d8a..1e388ef36276 100644 --- a/usr.bin/vtfontcvt/vtfontcvt.c +++ b/usr.bin/vtfontcvt/vtfontcvt.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2009, 2014 The FreeBSD Foundation * * This software was developed by Ed Schouten under sponsorship from the From nobody Tue May 12 18:07:46 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gFPhM0G8kz6crJ1 for ; Tue, 12 May 2026 18:07: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFPhL4RRnz3DJf for ; Tue, 12 May 2026 18:07:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778609266; 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; bh=JaE7rQu/r6Fv/Aih5zTZ4HantnxWRwTuIpqgju2FXdM=; b=EkpB7jqVJ640mObGu3WkiNOvb0Mj0dRlMXzooucK+MR91B0bhj1JEQZOpp9RjN5x4DBtFi enpM2s0Oi5FqIQwwAMlgUYk0msWjz2KJIU7Pq7Yt3f0oyxOEYMb57Kc5m7YelCQEWYZVXG iilfmMBKhAFLGwNTycWK131Mkd1lrWX6hH4BwHN3hAvG2b3FDao2QMxj5I+3om3tNUIXy0 cuEm5hshoHfjU1WOrpm/pCn+FXtMkVcZJF81MqFImyLuYSHDcrHFch1ch9nE71GBrphphC KreAOGHN5+XYbsytwbBpScjYE1UE2QdRbcU51wCnawlUuM26Me6DaHDt0cTllQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778609266; a=rsa-sha256; cv=none; b=ZGPrmcOiyxYJ2496NsRccA9lAoQVtqSyn2/U43N+rBWrs5NMqp/pejOgOejfLV4fXPfaJp H+EBI97J8eMfYo2vGyfApxrCZjFhpgTS1wU7XBDbUMnsLKp/D3I+E3F/08YkPyMd1IITfW iNiWo5VgPVoR5gfvVb/22W3CI7kmbSi9eyBrEMngkG39HS2LMIMzEf+m7j4zLLZhDTmPsb ACIZg+OCRNmJ1pBL+FMoY28il2IyCwcR5wxlaR5V1rk57Qun6FiuJxecEVlMG3UjzMZ6cD TXZx4D4CUd9J8O4JWcp5Nd65fcn9kJNgQ8ZMAETU7sT+SEV+2h/x7Z2FdJMkaQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778609266; 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; bh=JaE7rQu/r6Fv/Aih5zTZ4HantnxWRwTuIpqgju2FXdM=; b=sBLC/LpobeehkLe/fjxJnwwSRIqePDUaa7k583A5HtuwJCKBNxLVNPKC2iPWEW8jRSdyFe YPEEDY5nr5z69mHJTYRNdEbiANhdfMDi3KMP3K49jjvRYIigqlFcmZ6PjYu1lGM9QoEfJF HMjKSLDD+M9PGomoPP8vk5g5FS2Ke7MeJ9KLFTlqqdKOunE77d40ZCd6xi2O0+fGW56DYe WvSNYe4U0O3yakwmSHeCuDY56ZPIfT7IDrvKlhUqSapDIu+7Q2aXBYWoBl1reTpTcDVMt2 t2gXF+C2SV0Xoxox9z/31MGpW2xiv/ewtUgRcbcAbYiywnY8Fkb0AFibnuHVhg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFPhL40yKz1CYk for ; Tue, 12 May 2026 18:07:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 44e33 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 18:07:46 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Tuukka Pasanen From: Ed Maste Subject: git: 16d0c3475cf9 - stable/15 - chio: Add SPDX-License-Identifier tags List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 16d0c3475cf978037aea066bac2a9397051aa94b Auto-Submitted: auto-generated Date: Tue, 12 May 2026 18:07:46 +0000 Message-Id: <6a036c72.44e33.5789d67f@gitrepo.freebsd.org> The branch stable/15 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=16d0c3475cf978037aea066bac2a9397051aa94b commit 16d0c3475cf978037aea066bac2a9397051aa94b Author: Tuukka Pasanen AuthorDate: 2026-02-09 07:47:08 +0000 Commit: Ed Maste CommitDate: 2026-05-12 18:06:26 +0000 chio: Add SPDX-License-Identifier tags Some BSD-4-Clause files under bin/chio were missing the SPDX-License-Identifier-tag. Reviewed by: emaste Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55193 (cherry picked from commit b6824fe48e4197877f472268859ffe80d7fd946b) --- bin/chio/chio.c | 2 ++ bin/chio/defs.h | 2 ++ bin/chio/pathnames.h | 2 ++ 3 files changed, 6 insertions(+) diff --git a/bin/chio/chio.c b/bin/chio/chio.c index 07def55ee88f..10468406800e 100644 --- a/bin/chio/chio.c +++ b/bin/chio/chio.c @@ -1,5 +1,7 @@ /* $NetBSD: chio.c,v 1.6 1998/01/04 23:53:58 thorpej Exp $ */ /*- + * SPDX-License-Identifier: BSD-4-Clause + * * Copyright (c) 1996 Jason R. Thorpe * All rights reserved. * diff --git a/bin/chio/defs.h b/bin/chio/defs.h index 6b4381a3d447..4dbe69629a81 100644 --- a/bin/chio/defs.h +++ b/bin/chio/defs.h @@ -1,5 +1,7 @@ /*- + * SPDX-License-Identifier: BSD-4-Clause + * * Copyright (c) 1996 Jason R. Thorpe * All rights reserved. * diff --git a/bin/chio/pathnames.h b/bin/chio/pathnames.h index a8308ed7b0ac..6c5ee3c63cd0 100644 --- a/bin/chio/pathnames.h +++ b/bin/chio/pathnames.h @@ -1,5 +1,7 @@ /*- + * SPDX-License-Identifier: BSD-4-Clause + * * Copyright (c) 1996 Jason R. Thorpe * All rights reserved. * From nobody Tue May 12 18:07:47 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gFPhN0N4jz6crB9 for ; Tue, 12 May 2026 18:07: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFPhM5WPjz3DDW for ; Tue, 12 May 2026 18:07:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778609267; 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; bh=9/6CToexIWpggpQHEPhRampjnaG0yiWWr2HZ3yOXyas=; b=lUHDrY/tcZWK4mpcAVZvAcV3qPn57Px/hUD7p3Gq6xt6LLbEO+2zxBPr/0vnkeXrFgXCaG o0xVLR2X4Sh3ApyEip1bfBZQlUxWFcLtalK82L+O2E9les3Gw6uLKsoZD+xNM9YPw5yNbs 5XQESMubH99MNdH9918vos90+OCvudv+Ngnu2t3BJ8kWKWBYHpR5ce4hUzO2KwkWTCjRz2 mENAChK/D1+P2c8JuWVPFqRojocxKxND2BEkgTAekmu9eTcj1/kyn57PeUYThLCTQGXNyY dp8HRizU7/ppT5INROaOlureMnOo/EvHvg9fMMchGZJ5Xz8/LZSq8tmealsSTw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778609267; a=rsa-sha256; cv=none; b=BF+GtkvBpGiVh67exhDJ3/M0BUYu64ZAyiCC0+awEPKjF5orlxkVQO9rKnR9TQDvozQ2eo 1zXy4CMulv077cxy/dOvitnaXo0NrbYnlMac5bspWxI9IUa/XsjwgNKUNgVQlf2eIcUjst hg+ip4Z/RAspuS97AnTY/+1h+SY5jS6EIkbwFeyrlxhacpTE9zFEOneEvfiVso6OjA7rOn wlpgW6j/o75RmiaGyICRtLanoMgSS66ythOe9J8SEmcYG4PxYy7qxx5Vvsuod5HJoy/Oyf 77Yj0NQzdYQVv4vf5zEfWTz2duSJ9Do9/lvTY9uVBIGbHn9vwm6PLGBIWMyqNw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778609267; 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; bh=9/6CToexIWpggpQHEPhRampjnaG0yiWWr2HZ3yOXyas=; b=rsfzHkYJsZzDvRYVuaXikzgs02M3vX/DnIXb4VQ7vkMn8B3btNEM69u5lEJyqvzwljXn+D fyoUnnLaMsxuuiNK6Q3G5i+UyzVs5ROTCxgev3O5SZ7+hreH8OoQjA9hwIuuB3aLDnxB9F WZEQI7te8qV65wi113g0QZ7vbtM9Cjqm0Bod0jNlzC2B8RiNyD2DmtL3w1753muc66p5VE cgOKZU9WDV8HvieU/zha0jPHrx72OsZYZx4rSOrrFS1XV9KJzWLR8tCOBvu3RrEkAeSCyK /qc78X8hMoG+NBWY8P889AGXpoa4TVo/K3W0tmiYgt6fMmKVo/Y0GjTCOYUJVA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFPhM4nHSzLY for ; Tue, 12 May 2026 18:07:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4489d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 18:07:47 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Tuukka Pasanen From: Ed Maste Subject: git: cbf20714f7b5 - stable/15 - ipfw: Add SPDX-License-Identifier tag List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: cbf20714f7b5227d4faa4f1b5ee35976b6e651c4 Auto-Submitted: auto-generated Date: Tue, 12 May 2026 18:07:47 +0000 Message-Id: <6a036c73.4489d.6de07152@gitrepo.freebsd.org> The branch stable/15 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=cbf20714f7b5227d4faa4f1b5ee35976b6e651c4 commit cbf20714f7b5227d4faa4f1b5ee35976b6e651c4 Author: Tuukka Pasanen AuthorDate: 2026-02-09 08:19:20 +0000 Commit: Ed Maste CommitDate: 2026-05-12 18:06:26 +0000 ipfw: Add SPDX-License-Identifier tag Reviewed by: emaste Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55273 (cherry picked from commit 904e0dcd2967cfe72899e7285e6cd6e9977ae68c) --- sbin/ipfw/nptv6.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sbin/ipfw/nptv6.c b/sbin/ipfw/nptv6.c index eee6109a3d9e..b78c5c236e75 100644 --- a/sbin/ipfw/nptv6.c +++ b/sbin/ipfw/nptv6.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2016 Yandex LLC * Copyright (c) 2016 Andrey V. Elsukov * All rights reserved. From nobody Tue May 12 18:07:43 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gFPhN4PSFz6cqqp for ; Tue, 12 May 2026 18:07: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFPhN2RQqz3DGC for ; Tue, 12 May 2026 18:07:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778609268; 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; bh=JhFHFxhyHAT/OvKgaNMYnWh5lNUN6XmehBgMazxcE5I=; b=TI058QIE9t6sVz++e+m58v8cTi3tyxbnQQD/+PeghPFB9Ei1MXuXJx0ShdKe12PZ57QHWX G1oUgs9ecehGWnZactRPj1zr9/+UViVOznFhxLYQbR4GWnF2YqXOSE0bAMuiBuGc9ZriKU XDzwmGngfXwyjJtZPef4tOUPm3IK7jQrtNgwV+/qfVeXJXGFgo8lVvXTvzPPtHttXT3hwu u3fNESCdSm86xZrvo56qhdACjb4mwhlPxnP1zU6orp+/1/uH3UJ8BMlmq1DHpl+YyZhKex 3uxE+kTIkzNI66pdfiADvuQ5F6R5fyWPWf6fz1rAwVeDx+9/abd3VcJtmKhcUg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778609268; a=rsa-sha256; cv=none; b=J+mpT80ps8Jm0pU6EvencN2aWvNA5hEgQ1jVOaW0TK6Npdp7HsmzrmPYkcapwH0tv7HVAK Op+ikWLq0soIKYkuGQSJzRfym9b+NQW72aycXK3GsvxmugLeMXHfyDABpQ/Qmy2JZqjIU9 4SPBN/pXi77HMrmHLIY5VLt6gFxxIdFD5idooDOgWpSIHzdr16uSZz5x+dKKPopesaIVgY k3uuJRSP72M2nZnnO2F0p/7SAFHhKxPWT+e3WI7rxAt8MhkIIf8oV+5E+hGmTsaCDbpWUs OP+3WNMWeHq7yf5bGfTmULyjOTW3C0ktMDsZt/sC74pTeCzUJL/n7ZgPg7DqHQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778609268; 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; bh=JhFHFxhyHAT/OvKgaNMYnWh5lNUN6XmehBgMazxcE5I=; b=yU7bjw2fPDBoTnjczRcUKJTCEvHzhSNYxgAUc3EKt3987ZNh41yCQB5Mnr4srbuWboZmsn ZHg4/eC8WPxYhvGPuHvn1qfiuZ0veIVf+bb/tvddWGbuW0O0d1YGkTTFABAQiRhc8loa8B 2aFtrhuC03BjX3yzEAx7kL3weuFWTRAXdDvxVzpC1vfxqialFV4QrylvCtTvexgX2eTDnT FVMa8a7hYihdhPlpCa/BqD0g11A5bW++v333QqelytEPBpebs/4jpTgsq6jyQypPYnNal2 w9sJhRTVTMAFUWjVMKKIFTBpsAHW6brGqwdRl3AokNBgyh6Es5c0+84oLUrMvw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFPhN1tRTzNQ for ; Tue, 12 May 2026 18:07:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 452bb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 18:07:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Tuukka Pasanen From: Ed Maste Subject: git: f7e41b41aedb - stable/15 - newfs_msdos: Add SPDX-License-Identifier tags List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: f7e41b41aedb2fd76e4a5b5aa60a177f594d29dc Auto-Submitted: auto-generated Date: Tue, 12 May 2026 18:07:43 +0000 Message-Id: <6a036c6f.452bb.123187a7@gitrepo.freebsd.org> The branch stable/15 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=f7e41b41aedb2fd76e4a5b5aa60a177f594d29dc commit f7e41b41aedb2fd76e4a5b5aa60a177f594d29dc Author: Tuukka Pasanen AuthorDate: 2026-02-09 08:20:05 +0000 Commit: Ed Maste CommitDate: 2026-05-12 18:06:25 +0000 newfs_msdos: Add SPDX-License-Identifier tags Reviewed by: emaste Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55274 (cherry picked from commit 8ac992645850318d8b2cf93b083372b99b6374e1) --- sbin/newfs_msdos/mkfs_msdos.c | 2 ++ sbin/newfs_msdos/mkfs_msdos.h | 2 ++ 2 files changed, 4 insertions(+) diff --git a/sbin/newfs_msdos/mkfs_msdos.c b/sbin/newfs_msdos/mkfs_msdos.c index a570d92cd17b..21b0785fb6ea 100644 --- a/sbin/newfs_msdos/mkfs_msdos.c +++ b/sbin/newfs_msdos/mkfs_msdos.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 1998 Robert Nordier * All rights reserved. * diff --git a/sbin/newfs_msdos/mkfs_msdos.h b/sbin/newfs_msdos/mkfs_msdos.h index 6e5bad0da8f0..e1f46f4d74cf 100644 --- a/sbin/newfs_msdos/mkfs_msdos.h +++ b/sbin/newfs_msdos/mkfs_msdos.h @@ -1,6 +1,8 @@ /* $NetBSD: mkfs_msdos.h,v 1.3 2015/10/16 17:38:17 christos Exp $ */ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2013 The NetBSD Foundation, Inc. * All rights reserved. * From nobody Tue May 12 18:07:48 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gFPhP0VF7z6cr7v for ; Tue, 12 May 2026 18:07:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFPhN6WH3z3DLs for ; Tue, 12 May 2026 18:07:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778609268; 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; bh=a3zN+7IYAVMLzCNb6Rccbil53lIgJ3rL4XqaAwsw2vU=; b=LklJAPGi0d+srhNQmDcdDJPPW9wdKDrZG3fYcLd4kRNZ7CiVdfPf6ouUj8KokSJcE0KihT ycNDYdqLs0FF7eBRrStkmFN/20yQr18+s7ZpOHR2Acw/0/ijdx60LwJYvS4k+Fv4NGadgG giCx9vGE4J1XtoCC0+tw5LBVHe1qYNzK7GoLolrkMO8ZyuJHKq3vvpOhMzlDguG++6bE5V HG+g9g7BBaJW4CDnBK5h6+JO53Ix5acYn1WYxLHAMLyEhAPp3KtO1f84hYy2ttHpDhOt7n yH59GgHUzQvPJYnnKI2H+onj1hy8MRjg9drTHzKOo1vIYYr5hB+DrWncV63HkQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778609268; a=rsa-sha256; cv=none; b=plp0sdJQQDRhrFy5vJ4ESmlaj404PdiRnIpPbd+0kwhHJsmJUzyvyUZs/O/a9DISPGY2ku 2mFleNBbjcewA6wkrBEcP8a0VrYwQQms1gUFKxtAz3fFOj/ZG40Z3i2kFA6AztbljUYj+s kjfr9alUvgK6TPuwx/QdbF9YFx8Cv9J0u09sEN02eVJ4nmqIpe3A5lGvXoYZt/QPawIrpp OqfF1m1ZtfxYliFDtm8gvPv6Bti+sSDhDFfMnAIUs42xAKRx9FSB2d+EwLAUrbZmqfcS75 UO3wVCoWK5i8jllEPPXA7QzToLXvL3L7OmcMpiJXIsQxSI5aqTYUPgSDQGteng== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778609268; 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; bh=a3zN+7IYAVMLzCNb6Rccbil53lIgJ3rL4XqaAwsw2vU=; b=nx02Os+KZpxcquZex9KrnIy3sx5gMvu3JKzSXzLAvKQNrySEZB2EoZIPxiesTCQOstNtNZ WiVkRk8MRMOybrddh7aThFYOY375OtMKgnI9cwJRn8U4UwVCldYVorTUzd/36kv7Lq1v3X 2rPFALZ40buaNEH/X2lBoeegvwedRPM73rgUcXc/3n0nnPWWN6GkMF+tHUzzl8GjZhRWQm Zlma7gn/XDDVWkxyEqZxyNa9tR7ErEWbCzaJewjn9K1TU8elhGkFA4z9mZb+N3M5y/AA8W CXioExpBRWBG6VlOfOvoXiQ4lHk1b+GPRiXbXfcLgw6cX5WcDgvUtL6Yyad4bA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFPhN5cNTzLb for ; Tue, 12 May 2026 18:07:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 44994 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 18:07:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Tuukka Pasanen From: Ed Maste Subject: git: 8fcc509f8907 - stable/15 - fstyp: Add SPDX-License-Identifier tags List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 8fcc509f89073a0bf70f8f4499eb1244a9f5c41b Auto-Submitted: auto-generated Date: Tue, 12 May 2026 18:07:48 +0000 Message-Id: <6a036c74.44994.38b868d0@gitrepo.freebsd.org> The branch stable/15 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=8fcc509f89073a0bf70f8f4499eb1244a9f5c41b commit 8fcc509f89073a0bf70f8f4499eb1244a9f5c41b Author: Tuukka Pasanen AuthorDate: 2026-02-16 09:22:39 +0000 Commit: Ed Maste CommitDate: 2026-05-12 18:06:26 +0000 fstyp: Add SPDX-License-Identifier tags Reviewed by: emaste Sponsored by: The FreeBSD Foundation (cherry picked from commit 836ac989933bcd5b662979bfdec429a201c123a6) --- usr.sbin/fstyp/apfs.c | 2 ++ usr.sbin/fstyp/cd9660.c | 2 ++ usr.sbin/fstyp/exfat.c | 2 ++ usr.sbin/fstyp/ext2fs.c | 2 ++ usr.sbin/fstyp/fstyp.c | 2 ++ usr.sbin/fstyp/fstyp.h | 2 ++ usr.sbin/fstyp/geli.c | 2 ++ usr.sbin/fstyp/hammer.c | 2 ++ usr.sbin/fstyp/hammer2.c | 2 ++ usr.sbin/fstyp/hammer2_disk.h | 2 ++ usr.sbin/fstyp/hammer_disk.h | 2 ++ usr.sbin/fstyp/hfsplus.c | 2 ++ usr.sbin/fstyp/msdosfs.c | 2 ++ usr.sbin/fstyp/msdosfs.h | 2 ++ usr.sbin/fstyp/ntfs.c | 2 ++ usr.sbin/fstyp/ufs.c | 2 ++ usr.sbin/fstyp/zfs.c | 2 ++ 17 files changed, 34 insertions(+) diff --git a/usr.sbin/fstyp/apfs.c b/usr.sbin/fstyp/apfs.c index aeb459a1c3af..809e6fab6914 100644 --- a/usr.sbin/fstyp/apfs.c +++ b/usr.sbin/fstyp/apfs.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2019 Conrad Meyer . All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/usr.sbin/fstyp/cd9660.c b/usr.sbin/fstyp/cd9660.c index e981a5978dd4..73a18b16edea 100644 --- a/usr.sbin/fstyp/cd9660.c +++ b/usr.sbin/fstyp/cd9660.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2004 Pawel Jakub Dawidek * Copyright (c) 2014 The FreeBSD Foundation * All rights reserved. diff --git a/usr.sbin/fstyp/exfat.c b/usr.sbin/fstyp/exfat.c index 8f8393b861fb..bb3d0eabed75 100644 --- a/usr.sbin/fstyp/exfat.c +++ b/usr.sbin/fstyp/exfat.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2017 Conrad Meyer * All rights reserved. * diff --git a/usr.sbin/fstyp/ext2fs.c b/usr.sbin/fstyp/ext2fs.c index d7110f6896ce..90af4f986ee4 100644 --- a/usr.sbin/fstyp/ext2fs.c +++ b/usr.sbin/fstyp/ext2fs.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2005 Stanislav Sedov * Copyright (c) 2014 The FreeBSD Foundation * All rights reserved. diff --git a/usr.sbin/fstyp/fstyp.c b/usr.sbin/fstyp/fstyp.c index dd06df33bbe2..853fdd839713 100644 --- a/usr.sbin/fstyp/fstyp.c +++ b/usr.sbin/fstyp/fstyp.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2014 The FreeBSD Foundation * * This software was developed by Edward Tomasz Napierala under sponsorship diff --git a/usr.sbin/fstyp/fstyp.h b/usr.sbin/fstyp/fstyp.h index d87cac456379..322f117dd29f 100644 --- a/usr.sbin/fstyp/fstyp.h +++ b/usr.sbin/fstyp/fstyp.h @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2014 The FreeBSD Foundation * * This software was developed by Edward Tomasz Napierala under sponsorship diff --git a/usr.sbin/fstyp/geli.c b/usr.sbin/fstyp/geli.c index 17d1faf8407f..aa4c1bc2c955 100644 --- a/usr.sbin/fstyp/geli.c +++ b/usr.sbin/fstyp/geli.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2015 Allan Jude * All rights reserved. * diff --git a/usr.sbin/fstyp/hammer.c b/usr.sbin/fstyp/hammer.c index 45aee42fb53a..2785e42c9998 100644 --- a/usr.sbin/fstyp/hammer.c +++ b/usr.sbin/fstyp/hammer.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2016-2019 The DragonFly Project * Copyright (c) 2016-2019 Tomohiro Kusumi * All rights reserved. diff --git a/usr.sbin/fstyp/hammer2.c b/usr.sbin/fstyp/hammer2.c index aeb29762fb6b..dfc4ef842cf1 100644 --- a/usr.sbin/fstyp/hammer2.c +++ b/usr.sbin/fstyp/hammer2.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2017-2019 The DragonFly Project * Copyright (c) 2017-2019 Tomohiro Kusumi * All rights reserved. diff --git a/usr.sbin/fstyp/hammer2_disk.h b/usr.sbin/fstyp/hammer2_disk.h index 6efefe9a2495..5de82e205ffc 100644 --- a/usr.sbin/fstyp/hammer2_disk.h +++ b/usr.sbin/fstyp/hammer2_disk.h @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 2011-2018 The DragonFly Project. All rights reserved. * * This code is derived from software contributed to The DragonFly Project diff --git a/usr.sbin/fstyp/hammer_disk.h b/usr.sbin/fstyp/hammer_disk.h index 4b5182d7e868..87ecfab0cf09 100644 --- a/usr.sbin/fstyp/hammer_disk.h +++ b/usr.sbin/fstyp/hammer_disk.h @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 2007 The DragonFly Project. All rights reserved. * * This code is derived from software contributed to The DragonFly Project diff --git a/usr.sbin/fstyp/hfsplus.c b/usr.sbin/fstyp/hfsplus.c index bdeaaa3b397c..580f8974fec1 100644 --- a/usr.sbin/fstyp/hfsplus.c +++ b/usr.sbin/fstyp/hfsplus.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2019 Conrad Meyer . All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/usr.sbin/fstyp/msdosfs.c b/usr.sbin/fstyp/msdosfs.c index cd0a67243a15..16db364ed430 100644 --- a/usr.sbin/fstyp/msdosfs.c +++ b/usr.sbin/fstyp/msdosfs.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2004 Pawel Jakub Dawidek * Copyright (c) 2006 Tobias Reifenberger * Copyright (c) 2014 The FreeBSD Foundation diff --git a/usr.sbin/fstyp/msdosfs.h b/usr.sbin/fstyp/msdosfs.h index 91fe5967cd03..8c83c9862f84 100644 --- a/usr.sbin/fstyp/msdosfs.h +++ b/usr.sbin/fstyp/msdosfs.h @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2006 Tobias Reifenberger * All rights reserved. * diff --git a/usr.sbin/fstyp/ntfs.c b/usr.sbin/fstyp/ntfs.c index be8095d5ee27..28a635097315 100644 --- a/usr.sbin/fstyp/ntfs.c +++ b/usr.sbin/fstyp/ntfs.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2005 Takanori Watanabe * Copyright (c) 2014 The FreeBSD Foundation * All rights reserved. diff --git a/usr.sbin/fstyp/ufs.c b/usr.sbin/fstyp/ufs.c index 5133febbf065..4e676faae493 100644 --- a/usr.sbin/fstyp/ufs.c +++ b/usr.sbin/fstyp/ufs.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2002, 2003 Gordon Tetlow * Copyright (c) 2006 Pawel Jakub Dawidek * Copyright (c) 2014 The FreeBSD Foundation diff --git a/usr.sbin/fstyp/zfs.c b/usr.sbin/fstyp/zfs.c index 6fde88c79524..0e54c8260c96 100644 --- a/usr.sbin/fstyp/zfs.c +++ b/usr.sbin/fstyp/zfs.c @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2015 Allan Jude * Copyright (c) 2015 Xin LI * From nobody Tue May 12 18:07:49 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gFPhQ53Klz6cqtN for ; Tue, 12 May 2026 18:07: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFPhQ01kFz3DTX for ; Tue, 12 May 2026 18:07:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778609270; 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; bh=60EZorZQ0ovFJoamPDdqycGkJCc0UO8E6Qcxb5jdnRE=; b=xWz+CmgdI5Ye9/2QjwEw4nqEz/0awRO45j+MuH4DgWTP+uWMpMEEhZvYAAwoMECruHk6BG AVepO15UKljuwSw79si0ZpHhR1jaGQ4Lvl0ZHBN6onUu+Hyw7aQr62wnw8kU26MTtbxJUH QzKM6pqgx59CDCiDLKtbifobaJns1MtKBkOrRpboMiwBjDodNT+STsyisGZ5+gSmX8daLz PcOOXsov5qnFIkyhrOCbPb6POKR8t3+Gk+G9rkux7ALiq233ZURkOLdaHDGPndH+M6S9dA 61+O4IxQOBuX3E22kQR+D7YS5WLh8HRvkULkg4WvWr5uufmpxXpOu7Bk72+kpw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778609270; a=rsa-sha256; cv=none; b=kX+AJZJZYMSz1UMptVbUz+absvXe4zynDqQ8q7G6CxaGGmtxcGMWzyg3zXFXOROgXDlMgp dWaEqJSWg/80WsQSjgsEGAxb5jko809FPeo2+IXpy9g5W7cttTZMsYXgerE5iLjJe1+nCx DlBwztDMDTh2rgOJzkb+gdtGl1oLPkPXiTCYI1Hy0POBXDjYSBMHf6LqTtFQEHsDPLGVJz 6lIHry4glUE6arQYJXQqPxRNiSQ5az735BszOXHHXHRXAegnffJ0hVPZzA60lHfJbDONq9 H5tH5X4CTkH0GvP/WEXIsgV9YPpr6KorZxfl/7s7h7H56DbIW86++TZMJMdhHw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778609270; 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; bh=60EZorZQ0ovFJoamPDdqycGkJCc0UO8E6Qcxb5jdnRE=; b=a4D/ycf2OHw+g+igcA/QB/QB7EP9eJv2055gdU4U1nsE7dOMhpQN636cYFDp8sR/Z+Sn1x oN5b12YI1UofgEPj6gWX9H6wYgIFZ69kWvE2yZwlfeMFkyuxwVVFiRLj9BpdCdt1cU9V0/ 8nC5Pm+mttnX08est7ho/oWjXwtUjnyLJBNy0tEWmh2KM34L0RKWjY3xVJxY+GOo3+FugO sPC34ApyLZmbrPUU4ZpxyOs/+nLq6Ww5YF9wjbG/YdpQKmirQ0R6rvNmIM9XpZmlxmkeZ6 gmY90Rve7Z3UTdqKEkkhPKq7ugD15jXTHW63AefJCvpEL4X7WBDI+B+IhMM2Yw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFPhP69qKzLc for ; Tue, 12 May 2026 18:07:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4516d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 18:07:49 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Tuukka Pasanen From: Ed Maste Subject: git: 025f886b1eb1 - stable/15 - makefs: Add SPDX-License-Identifier tags List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 025f886b1eb1d966e804abde139a245f9fdff5fd Auto-Submitted: auto-generated Date: Tue, 12 May 2026 18:07:49 +0000 Message-Id: <6a036c75.4516d.4767f7d9@gitrepo.freebsd.org> The branch stable/15 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=025f886b1eb1d966e804abde139a245f9fdff5fd commit 025f886b1eb1d966e804abde139a245f9fdff5fd Author: Tuukka Pasanen AuthorDate: 2026-02-16 09:26:43 +0000 Commit: Ed Maste CommitDate: 2026-05-12 18:06:26 +0000 makefs: Add SPDX-License-Identifier tags Reviewed by: emaste Sponsored by: The FreeBSD Foundation (cherry picked from commit 6010b73fa9574b8e651b08451f30ba9c05f3f894) --- usr.sbin/makefs/msdos.c | 2 ++ usr.sbin/makefs/msdos.h | 2 ++ 2 files changed, 4 insertions(+) diff --git a/usr.sbin/makefs/msdos.c b/usr.sbin/makefs/msdos.c index 3707481a1c47..76c6ec05c71b 100644 --- a/usr.sbin/makefs/msdos.c +++ b/usr.sbin/makefs/msdos.c @@ -1,6 +1,8 @@ /* $NetBSD: msdos.c,v 1.20 2017/04/14 15:40:35 christos Exp $ */ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2013 The NetBSD Foundation, Inc. * All rights reserved. * diff --git a/usr.sbin/makefs/msdos.h b/usr.sbin/makefs/msdos.h index 376713051d52..80c2d4c39593 100644 --- a/usr.sbin/makefs/msdos.h +++ b/usr.sbin/makefs/msdos.h @@ -1,6 +1,8 @@ /* $NetBSD: msdos.h,v 1.3 2015/10/16 16:40:02 christos Exp $ */ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2013 The NetBSD Foundation, Inc. * All rights reserved. * From nobody Tue May 12 18:12:09 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gFPnP6DJrz6crHS for ; Tue, 12 May 2026 18:12: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFPnP54tFz3H5M for ; Tue, 12 May 2026 18:12:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778609529; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=R74bwGvD1oS5FxUcA3n3s2tiS/rgNXcExiB7+6iCfvg=; b=rWeh0MDasl3KvRrazZbyjpZsaKbDQuz0vAMNw88Lu9DVgyq8exxGAQp6lHwZsE5RgfWvh7 dAvOI4TdotRX4EqElzmOuOnT/dJqDCwe23pyHqx1Z4Fg96zwOotLFMAy7YFFVZcqow77X6 ym9t4fgziZTlmtWDlcqtme0HSN2/oDnG6o6cw5dh2hC7gF1GpJVxf0eiTztb+3YQ+BAaHZ ZzAeQIFJMrekjYHyIPIT3CuDXZcqo3mc9FszeM4ExkOc4nEnzHjQVBSJKjeF/3uAjnkUZy HjE4q6oJcyAvYbfeXoo7nrqiTGekDDtajumjxELVuYs026idY6krgK4/AP4V8w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778609529; a=rsa-sha256; cv=none; b=UzRkJpsKr1r2+WoRzYw1VFxaz9osIaI0pYQqh90uI/avLe9E4ntV0Yvw+4kO/ytmxD9ZUJ gdWhWbgI/syz9FG+KTzah8+f3H0MFINZJRb+P1iCS0Iv0AYEZtGxykvLmZXs+2eqfB9H46 7ep8Bb8oAxf8rVJS4ez4IaKq5xU4qxmdHIpfWeFH5zAp1BUmOXNKM/4WR8PoMYiVeM42Zm YXCA+ToBUx02Q0x8U2Pgw2xZfqbmQkXge9RWVro3gZbRXc36YpZZH6Qp+XNtVfyCy1ksBs RbVhuLo1lNPqKmjCQwOItgp7Tu3sSRGdq7fnlmRldI90jLE5yyo5FJd8PnrEBQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778609529; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=R74bwGvD1oS5FxUcA3n3s2tiS/rgNXcExiB7+6iCfvg=; b=UR1VuvSNlOxqMch6UxuskBdInwhbE+ULW/gyyiwMe9FvipZ2NI8nrcGZC1gcIduQKjMGlW YFwndcj6afEHWo8vSChNReP5sJQd4XfhByF3vxtT1rQabIjRs9/0W7ACb/EYMH9+zQVWyA 7l7n4irl4i65KRNqflOeYVn7nsjR/MizQMEz+EBre75ymDSFWWmVQhfV7YgYbULzG/pZda JP3B3uOR8O4Z/c/iO0rXLcJGIhqD8bfz+aZEzK7yGdBI7g6y508UHqccFl0mCLPCfALmPP qQD3BN3GzxgUDetebV9M5otT3fKtlbhw5tP6rRKFZItArXhG4XRpgEyHKXNgOg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFPnP4YTcz9X for ; Tue, 12 May 2026 18:12:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 45867 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 18:12:09 +0000 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: 03bc95b060a9 - main - dtrace_dtmalloc.4: Document the DTrace dtmalloc provider List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: 03bc95b060a91ed9d410270d00d1dd4f8edcdcc7 Auto-Submitted: auto-generated Date: Tue, 12 May 2026 18:12:09 +0000 Message-Id: <6a036d79.45867.754c40cd@gitrepo.freebsd.org> The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=03bc95b060a91ed9d410270d00d1dd4f8edcdcc7 commit 03bc95b060a91ed9d410270d00d1dd4f8edcdcc7 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2025-07-17 20:55:49 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2026-05-12 18:03:11 +0000 dtrace_dtmalloc.4: Document the DTrace dtmalloc provider MFC after: 1 week Discussed with: christos, markj, ziaee Differential Revision: https://reviews.freebsd.org/D51396 --- cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 | 3 +- share/man/man4/Makefile | 1 + share/man/man4/dtrace_dtmalloc.4 | 132 +++++++++++++++++++++++++++ share/man/man9/malloc.9 | 3 +- 4 files changed, 137 insertions(+), 2 deletions(-) diff --git a/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 b/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 index e78b6e1875ae..ad639f337a72 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 +++ b/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 @@ -20,7 +20,7 @@ .\" .\" $FreeBSD$ .\" -.Dd May 7, 2026 +.Dd May 12, 2026 .Dt DTRACE 1 .Os .Sh NAME @@ -1298,6 +1298,7 @@ in .Xr dtrace_audit 4 , .Xr dtrace_callout_execute 4 , .Xr dtrace_cam 4 , +.Xr dtrace_dtmalloc 4 , .Xr dtrace_dtrace 4 , .Xr dtrace_fbt 4 , .Xr dtrace_io 4 , diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index b9c441e97597..4f067f3ef757 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -1017,6 +1017,7 @@ _ccd.4= ccd.4 _dtrace_provs= dtrace_audit.4 \ dtrace_callout_execute.4 \ dtrace_cam.4 \ + dtrace_dtmalloc.4 \ dtrace_dtrace.4 \ dtrace_fbt.4 \ dtrace_io.4 \ diff --git a/share/man/man4/dtrace_dtmalloc.4 b/share/man/man4/dtrace_dtmalloc.4 new file mode 100644 index 000000000000..97b4ffd8a057 --- /dev/null +++ b/share/man/man4/dtrace_dtmalloc.4 @@ -0,0 +1,132 @@ +.\" +.\" Copyright (c) 2025-2026 Mateusz Piotrowski <0mp@FreeBSD.org> +.\" +.\" SPDX-License-Identifier: BSD-2-Clause +.\" +.Dd May 12, 2026 +.Dt DTRACE_DTMALLOC 4 +.Os +.Sh NAME +.Nm dtrace_dtmalloc +.Nd a DTrace provider for tracing kernel memory allocations by type +.Sh SYNOPSIS +.Nm dtmalloc Ns Cm :: Ns Ar function Ns Cm :malloc +.Nm dtmalloc Ns Cm :: Ns Ar function Ns Cm :free +.Sh DESCRIPTION +The +.Nm dtmalloc +provider instruments +.Xr malloc 9 +and +.Xr free 9 +kernel functions to trace memory allocations by type. +Refer to +.Xr malloc 9 +for more details about malloc types. +.Pp +The +.Nm dtmalloc Ns Cm :: Ns Ar function Ns Cm :malloc +probe fires upon a successful allocation. +Its probe arguments are: +.Bl -column -offset indent "malloc Probe Argument" "Definition" +.It Sy Probe Argument Ta Sy Definition +.It Fa args[0] Ta Ft struct malloc_type *mtp +.It Fa args[1] Ta Ft struct malloc_type_internal *mtip +.It Fa args[2] Ta Ft struct malloc_type_stats *mtsp +.It Fa args[3] Ta Ft unsigned long size +.It Fa args[4] Ta Ft int zindx +.El +.Pp +The +.Nm dtmalloc Ns Cm :: Ns Ar function Ns Cm :free +probe fires upon a free operation. +Its probe arguments are: +.Bl -column -offset indent "free Probe Argument" "Definition" +.It Sy free Probe Argument Ta Sy Definition +.It Fa args[0] Ta Ft struct malloc_type *mtp +.It Fa args[1] Ta Ft struct malloc_type_internal *mtip +.It Fa args[2] Ta Ft struct malloc_type_stats *mtsp +.It Fa args[3] Ta Ft unsigned long size +.It Fa args[4] Ta Always 0 +.El +.Pp +The first three arguments for each probe +.Po i.e., +.Fa mtp , mtip , +and +.Fa mtsp Pc +provide references to the +.Xr malloc 9 +type internals; +.Fa size +is the size of the allocation; +.Fa zindx +is the index into the +.Va kmemzones[] +array used for the allocation. +In practice, +.Fa size +is the most useful parameter to trace. +.Sh IMPLEMENTATION NOTES +The +.Ar function +part of the probe description in the +.Nm dtmalloc +provider is the +.Xr malloc 9 +type short description with all whitespace characters replaced +with underscores. +For example, a malloc type defined by +.Bd -literal -offset indent +MALLOC_DEFINE(M_FOO_BAR, "foo bar", "FooBar subsystem"); +.Ed +.Pp +will have probes called +.Bd -literal -offset indent +dtmalloc::foo_bar: +.Ed +.Sh FILES +.Bl -tag -width "" +.It In sys/malloc.h +The header where +.Vt struct malloc_type +is defined. +.El +.Sh EXAMPLES +.Ss Example 1 : Counting Successful Memory Allocations by Type +.Bd -literal -offset 2n +# dtrace -n 'dtmalloc:::malloc {@[stringof args[0]->ks_shortdesc] = count()}' +dtrace: description 'dtmalloc:::malloc ' matched 480 probes +^C + 80211node 1 + CAM CCB 1 + CAM periph 1 + ioctlops 1 + netlink 1 + soname 4 + sysctltmp 4 + solaris 5 + acpica 16 + temp 36 + lkpikmalloc 44 + iov 100 + selfd 648 +.Ed +.Sh SEE ALSO +.Xr dtrace 1 , +.Xr tracing 7 , +.Xr malloc 9 +.Sh AUTHORS +.An -nosplit +.Nm +was written by +.An John Birrell Aq Mt jb@FreeBSD.org . +.Pp +This manual page was written by +.An Mateusz Piotrowski Aq Mt 0mp@FreeBSD.org . +.Sh CAVEATS +The +.Nm dtmalloc +provider does not trace +.Xr uma 9 +allocations. diff --git a/share/man/man9/malloc.9 b/share/man/man9/malloc.9 index 06f5ed4ef360..269a766e6168 100644 --- a/share/man/man9/malloc.9 +++ b/share/man/man9/malloc.9 @@ -28,7 +28,7 @@ .\" .\" $NetBSD: malloc.9,v 1.3 1996/11/11 00:05:11 lukem Exp $ .\" -.Dd August 4, 2024 +.Dd May 12, 2026 .Dt MALLOC 9 .Os .Sh NAME @@ -394,6 +394,7 @@ functions. Failing consistency checks will cause a panic or a system console message. .Sh SEE ALSO +.Xr dtrace_dtmalloc 4 , .Xr numa 4 , .Xr vmstat 8 , .Xr contigmalloc 9 , From nobody Tue May 12 19:00:52 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gFQsd2cXLz6cwHM for ; Tue, 12 May 2026 19:00: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFQsc6sRlz3PwR for ; Tue, 12 May 2026 19:00:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778612453; 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; bh=F3sfRDeXUE0GtABXaPL5ora9/tYPz7wecPclWApEWU0=; b=tVwxylvrOL27NHPOCf24m/LXf014NYrQSH7XZgsdeiIoLiyV/A4UkF4vt6FvTVOO1rGfMB IJv4RSemd1RA/UpzNqugYtgH0cI9eRsJScuwadhTO4JivWV66Wsgkz7nERneubjKDjIAiX wGSmvI1ICWSpDvNKi6Zu8gzWOCqdMAdk7xGWG48g0rNV/BXzByRb12aXBg379wmtUIPS6Y RU6uDnBo5+dcVWBJEOcp61j53YXu7qU8Vi2yAxj7Uzsevck1wxPPUESYZAFUJ64JIyOEX6 LVJT4naHE8x9QCRqrq13WfghzuxgfRRldwKz2sVUrrRVOnNerjTPg7KoxujJ6A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778612453; a=rsa-sha256; cv=none; b=Ma4Je6b1gkhxl3EklwYx6bMLTeoWehVAa3aOlSLah6w15xw5A6buCZGid8lrmExDh78Hju YLIYexhosTlx3LFoFh3QNT5bbAJPwTxdhIV9kaH0nlhPuv2hlsXLAJaqm8O0mDPUjMTmbJ gNNr2mK2TO829SYrx2IHvIQu7uU5gHyqSPZJ4PjgFD+85jiqG6u1MRh5Dnl/VXQKi6tFBX ez9YVAr/TW+tTF4cpelu1RZAaMLzoWs0Isq36XJvJ+XVmAuB5/2Hdh5q9Ev/a7hsX6jVwe M4k3Ttac+oMBGPkrwOo8vmOtRCT1kLDNOaC7uNE1CjQ3DMkB4nfiTgIBnCEzqA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778612453; 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; bh=F3sfRDeXUE0GtABXaPL5ora9/tYPz7wecPclWApEWU0=; b=tswKZzcTdf7UCPJglejTRdGAHmghh16HqrpMArmo8rd4vPf69sTvcHUKwgZtlOu1qoI0iS Ph/e/nJ8t+sWypBVRHLATpgZwsfB6Nbxsm/1KeUPjsE7JY2UF2rlwZSQl3hUA+Jvl75EYt 3eaxq3fIRm2gVus9048kni0rQ2G4rHF1c/VkHDJYLRXlwu5G2ms0KMcIQnSekoUL82YjG2 gqgUOgy7PayPtjwU9/MkGv85aJm2rCzmumB9AcbLwrRheQp78+vMC04bvCOkCJYHndxGXo DRDRVn10oGpfAxq1pwcGaa2hEZnHiHjA61zo20fiEhJL4NpIUtnKJVLFkl/MmA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFQsc6Rryz11Z for ; Tue, 12 May 2026 19:00:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 196c9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 19:00:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Johan=?utf-8?Q? S=C3=B6llv?=ander From: Colin Percival Subject: git: 379805b29732 - releng/15.1 - ctld: normalize iSCSI TargetName on login List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.1 X-Git-Reftype: branch X-Git-Commit: 379805b29732c4160fbbd6d109e9a5a1585d8e6f Auto-Submitted: auto-generated Date: Tue, 12 May 2026 19:00:52 +0000 Message-Id: <6a0378e4.196c9.172920a3@gitrepo.freebsd.org> The branch releng/15.1 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=379805b29732c4160fbbd6d109e9a5a1585d8e6f commit 379805b29732c4160fbbd6d109e9a5a1585d8e6f Author: Johan Söllvander AuthorDate: 2026-04-24 07:44:43 +0000 Commit: Colin Percival CommitDate: 2026-05-12 19:00:43 +0000 ctld: normalize iSCSI TargetName on login Case-insensitive TargetName matching on logins was accidentally removed, let's fix that by normalizing TargetName again according to RFC 3722. Approved by: re (cperciva) PR: 294522 Fixes: 4b1aac931465f39c5c26bfa1d5539a428d340f20 Sponsored by: ConnectWise Reviewed by: asomers, jhb Approved by: asomers (mentor) Differential Revision: https://reviews.freebsd.org/D56469 (cherry picked from commit eb837cb8b2073c09bafaf3318f5bb103827b2bca) (cherry picked from commit 0baae6223a6350215d7b11264e59408362b15a19) --- usr.sbin/ctld/login.cc | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/usr.sbin/ctld/login.cc b/usr.sbin/ctld/login.cc index cda11cc1f21b..fb4b60c37f54 100644 --- a/usr.sbin/ctld/login.cc +++ b/usr.sbin/ctld/login.cc @@ -967,12 +967,18 @@ iscsi_connection::login() login_send_error(request, 0x02, 0x07); log_errx(1, "received Login PDU without TargetName"); } + /* + * Normalize target_name according to RFC 3722 + */ + std::string t_name(target_name); + for (char &c : t_name) + c = tolower(c); - conn_port = pg->find_port(target_name); + conn_port = pg->find_port(t_name); if (conn_port == NULL) { login_send_error(request, 0x02, 0x03); log_errx(1, "requested target \"%s\" not found", - target_name); + t_name.c_str()); } conn_target = conn_port->target(); } From nobody Tue May 12 19:00:51 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gFQsj3PTpz6cw3l for ; Tue, 12 May 2026 19:00: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFQsh6RFPz3Pny for ; Tue, 12 May 2026 19:00:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778612456; 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; bh=R8upLhb1GW/tXPKiUBgvs3DNgE5nmlLG/Y0lBoExM/s=; b=c0JzOdp3hIRdpURfDZ2BpkTJsezmuOYF3pEdGeeAMXrygVpjDqisE5AY4CNLbWGZ0xmAIK t+TRmu3Uy3jxbqszAf484oFy9cPRgOybtTE1d/KfXPQ+CEMCXW8u4fkkC5Wh/rBjlYmSaC n8NSGCfnh7tfm2cSiNvH4FShRsfauoKEAnjSELktBvtiQ0nAM8pWzcvYIdJRWqW9O00rYv vCr4It9oF5FPv/9Y0afNRa2Ja0gQvr3mFqTsLW2rrrcw/6qMtLsjF031uQ5opJ5YqSbUIi 63LflQwbbpX5sPLHNwLN5BPnOhRTeiPl8UcLcrV+haTt5muxmhPiKNOPnK7fAA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778612456; a=rsa-sha256; cv=none; b=JLgK4Ot7qxjfkQO4rQzkG8Gx79pRJ1XQW0tG6NvcUXBPIw0gow4f4YbKN7kc2lOGIz8yXd 2ZeX49YZ7/bD9RndREHC27vAC3868Lz+ooaCThndX5ZimIRc7hTBF4zDcYJRYst9wht0GT gF8wsAT7KfmHYTcuYDqc+WnhzEg/IMa0NuPMVje0g0mSF8rvpj46PrftPbnPVHpFtoX84+ 6pMov8K62USoqYXMdFyKtLyYiYVmyichJRKiV0qDZMvMmx49IgTlMxppFRy9uZ1YsnQnwB ZKeF0k3g+P9GeZ7wxqngTd+BgyfdJEnkE+roFzXVoZhLsA9s1S5BrcHlox8ZsA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778612456; 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; bh=R8upLhb1GW/tXPKiUBgvs3DNgE5nmlLG/Y0lBoExM/s=; b=HpLp+eP8EMR4wp0Pv67KO8ss81xrrzssz4Hxk2Bq9V8HuwrpIJsKLjAGTQ8pQymVVspKFj 5LtXf9KiywpW7kz0QbqARAzsx1YAafzEcRpfcgWSX4x0aiXnvilcChdvy2pfc9xGcGt7Xc 6XN5Rt3/Kd7FoeVb/z6Mb3GlVclaycHo+IUP5C2VBTi2O8S8VU1ZXrkuyOio2S+4dSYtIA g9ErDnxyKFCDSdqwwJxcthiAABaVTN63ycwgo4GYkIQbbrUUrT6m1Xo2TbT2/7fk8GmnXZ pqGPT38v010Z43q3SyrlqhrdPnVyWZluWL0ZaQ6YA85dVPnqoOXU4wUU82LIvA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFQsh5pWRz1fP for ; Tue, 12 May 2026 19:00:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 19662 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 19:00:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Lianwei Wang From: Colin Percival Subject: git: a7bc1c0c353f - releng/15.1 - fsck_msdosfs: fix FAT header correction not persisting in cache mode List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.1 X-Git-Reftype: branch X-Git-Commit: a7bc1c0c353fc426ecfc98d42c807c74250c137d Auto-Submitted: auto-generated Date: Tue, 12 May 2026 19:00:51 +0000 Message-Id: <6a0378e3.19662.b76267f@gitrepo.freebsd.org> The branch releng/15.1 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=a7bc1c0c353fc426ecfc98d42c807c74250c137d commit a7bc1c0c353fc426ecfc98d42c807c74250c137d Author: Lianwei Wang AuthorDate: 2026-05-09 04:56:12 +0000 Commit: Colin Percival CommitDate: 2026-05-12 19:00:33 +0000 fsck_msdosfs: fix FAT header correction not persisting in cache mode When fsck_msdosfs runs with FAT32 cache mode (used for large filesystems that cannot be mmap'd), a detected FAT header correction was written into the in-memory buffer but the corresponding cache entry (fat32_cache_allentries[0]) was never marked dirty. As a result, fat_flush_fat32_cache_entry() skipped it, the corrected bytes were never written to disk, and copyfat() propagated the uncorrected on-disk data to all backup FAT copies. Every subsequent fsck run would repeat the same "FAT starts with odd byte sequence / FIXED" cycle indefinitely. Fix by marking fat32_cache_allentries[0].dirty = true after applying the in-memory correction, ensuring the chunk is flushed before copyfat() runs. Approved by: re (cperciva) Obtained from: https://android-review.googlesource.com/c/platform/external/fsck_msdos/+/4047981 (cherry picked from commit 10e342c1ec78af5a0b97739c806b16a632118fa5) (cherry picked from commit ae32d61a2e3e47bed54d861893d8e2da90fb7c76) --- sbin/fsck_msdosfs/fat.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/sbin/fsck_msdosfs/fat.c b/sbin/fsck_msdosfs/fat.c index 567bfcd428cb..5ead0b1bf783 100644 --- a/sbin/fsck_msdosfs/fat.c +++ b/sbin/fsck_msdosfs/fat.c @@ -927,6 +927,17 @@ readfat(int fs, struct bootblock *boot, struct fat_descriptor **fp) default: break; } + /* + * In cache mode the header lives in + * fat32_cache_allentries[0]. Mark it + * dirty so it is flushed to disk (either + * on eviction or in writefat()) before + * copyfat() copies the primary FAT to + * backup copies. + */ + if (fat->use_cache) + fat->fat32_cache_allentries[0].dirty = + true; } } } From nobody Tue May 12 19:10:25 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gFR4p6K9jz6cwYs for ; Tue, 12 May 2026 19:10: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFR4p0Dmmz3Ryn for ; Tue, 12 May 2026 19:10:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778613034; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dmE+1OubpdTI+5I5r5Vb5wVon7JpubmjWRsmoTF6pwg=; b=Z8J1dMvI+4a9i3xhSCryJv4tHP227wt8ZoL9LQQacxjyk8YsV4iLlCoM5hBtEaDm1QuEnk Jeo4N7i8EuWzzNolUKvA0oHHT9zI9qW49ewoZbNS1eR58HRdezZFkPobguZuXiV++ZB8w5 fgQzwMzUDc0Y17cjcgdRblKoEBfgbbK1DkvuvekzclMZAZlizvGUaBVomuJ1HKlTmwW8AF wNzxG82wRQm6fPOeSthqPDo1s1EPbzOt2yCyT/EQD2iHWPf4rGE4R5KzBqatyq5J+r+5O0 YwmfQ66iWIUs4N91UvJnpK/A0zHfScXjOiI59nVuNzhr0A6basrrXDBfi4n4kA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778613034; a=rsa-sha256; cv=none; b=PZSdI/MZ48p2h/Qm8AE2v1Y3ccGqSqO53+T+HtrB5V/xFkm2bU1jV7//0D8Kt45YDTEh2x FesNJ3eYkc2T89s+tJyOkCaCTIz6GzQfKSqkvMuTopYgt7DVIwkkr7olRhCFzje96UW7wh mB5s8piZEsaR7sb+KheyJPU+VoRVPGQtB2eZ/aUfFeLeF5jYTjNFbBPju+aY8ZUb+8kFRb 1B7FFgCQoULWTKeYd9Erz+UqROzkmia7wYTI8V1kKOVW8sQXgL9fhgbwvB0+d7dNrKOXAj ZPJaZnwnmrXePYetqeUMXqL+gJnI70qNmRCLY/DQarmWvvPymypg1R/szbpwtw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778613034; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dmE+1OubpdTI+5I5r5Vb5wVon7JpubmjWRsmoTF6pwg=; b=dV7ZwIf+L4CQJNY7b9kWg5VJyHzWGZ7/gR4ZJiO3Du/f9PGmvul8rZaUawgGZGfq3mzYur 0QID27ZSyFWzZ8j797/39Rt7nyhatAwS2Urds8/Eso5BfJ4VA8kKVtnTzRjfxHpCUVcygK VZJm1lcdsF+y1qGAIo5sLxUQV0suA2zJOldyfeN4TQaha0vsmBuRfEJQdXP6grUnTxVYhS MMCQFlWJb/fNTP/gsIuFiPU0rYtUdCcsAIjGat0WJWXX4kdxHXNM6BRkSTYNATU41+t0Ij 0ZZK/BmrWbBOChJdqfO2lCsYgg5hWky/PdGM9QFsq3+C6FOiTCR1g9W0BYJDFQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFR4k3bHhz1fq for ; Tue, 12 May 2026 19:10:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c7a9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 19:10:25 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 714f6ac00034 - stable/15 - BSD.root.dist: Correct tag for /etc/sysctl.kld.d List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 714f6ac0003482d3270a9d0026e59909cff73c3f Auto-Submitted: auto-generated Date: Tue, 12 May 2026 19:10:25 +0000 Message-Id: <6a037b21.1c7a9.6c790c92@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=714f6ac0003482d3270a9d0026e59909cff73c3f commit 714f6ac0003482d3270a9d0026e59909cff73c3f Author: Dag-Erling Smørgrav AuthorDate: 2026-05-09 09:04:08 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-05-12 19:10:12 +0000 BSD.root.dist: Correct tag for /etc/sysctl.kld.d This is only used by rc.subr and belongs in rc, not runtime. Fixes: fa6d67cd16b5 ("BSD.root.dist: Add package tag for all directories") MFC after: 3 days Reviewed by: ivy Differential Revision: https://reviews.freebsd.org/D56900 (cherry picked from commit 44338ccd12685621c4b1c57e692a4f27f5a655d3) --- etc/mtree/BSD.root.dist | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/mtree/BSD.root.dist b/etc/mtree/BSD.root.dist index d5ef29c51a92..274397769cac 100644 --- a/etc/mtree/BSD.root.dist +++ b/etc/mtree/BSD.root.dist @@ -105,7 +105,7 @@ untrusted tags=package=caroot .. .. - sysctl.kld.d tags=package=runtime + sysctl.kld.d tags=package=rc .. syslog.d tags=package=syslogd .. From nobody Tue May 12 19:30:19 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gFRWj1KYKz6cxxQ for ; Tue, 12 May 2026 19:30: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFRWh70VVz3V7s for ; Tue, 12 May 2026 19:30:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778614225; 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; bh=CAJFaNMEwId7PPopEw7nI83Qga3RUrtagnxm4i76ffc=; b=S/xJDN5q1hfTxcMKfzKVJ69pa0zYYdQdtHwWuUS0qQTn4r63QhS2WRnheNOiVP6Vc0EydV RmUkVG/Ay/QoRc6JkwkKQuAkm0JJyFO8a0gTqXDHfCZqLb3pvBxs1/7bhRnVn79weiLUiU 1bm+qPnuJfXncrGW4PV30BSvYqaNe3htcVYSFJmr/+WFCyhis+56v3Gw4Q5LNh0EpMUCLW 92uBlhpaXmNeBCyty+bsTQRu35mY0pXQqMml9lcXsSDFgLOrgeoYBl+6QD1yt1/5mB6uA2 Rzmg+fE6PQb0S+wisiyEoqmzhdOlQ9I0/qoLnT3A/Jy2KTnbQwFXUJ2fhp1zOA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778614225; a=rsa-sha256; cv=none; b=qZRS2gv62Z64MffMSMn+eUNt5kLm5LcnLyUdJct7Jvfo9RZazYqp/gtQ2OR7q4HhdiFvXK mvJpTasLdjN84qU27/EbeO+hnU0JVZHOCpI9KwBsXsXy0vaQG2MgexDOVxCAJJTigYvH5L Tm9YU4LMXg1Oz0ratNur8vYHte9/m6GrViJXFoGqGo3M/WHZueIzBvbbtF0ZmCfMyJzTMx x4+uYlOWknLxkj0/Gv4Ih5+slul5kLAZcaDAm6XlK5aw56wkG6lOXA7F00F2/Ea2Nle0QU po6R+5qzB2f9zRb1SLnnraIzmk7TpOXUnO3ARIWO8AGb7lMhEQYl8XgW6sONuQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778614225; 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; bh=CAJFaNMEwId7PPopEw7nI83Qga3RUrtagnxm4i76ffc=; b=coPpU+nHHceZQDGXIE2ESTz/lwhbgIU3F+zbq7NkpxsoqaUmtklF4I5sMAuUl5Y0bZ6SI2 xWFj1GeLe08NWuuCl8lU7oBUnkNOlLTOd7QTZMpTW+/6sHZm1nQZjLMqxzmUUR4wTdRGtO 0paauxsaop1cyWIhDbixfPpBfV1bmZlHGnB0DkqHAWw8sVnCbqPueMcnIonuV2PrfbXlzH n8G5U/sjA2gJEEWiVOO6/RTLXX9NHBR+k+OeJgTC2SyUNCwPW2GRqytWqYO6go17aPFCGL iTZV/fMMJTFV8NZJfcV3KNFb1n1VzOTW5K8zhxd0FnLdJiNxEClKQ18c6VeSGg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFRWh6bmbz2Jx for ; Tue, 12 May 2026 19:30:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1ec21 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 19:30:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Nick Banks From: Michael Tuexen Subject: git: d1aee9f1535b - main - sys/time.h: add bintime2us() helper List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: d1aee9f1535b02dc3db2a5bd1ac75213068a675a Auto-Submitted: auto-generated Date: Tue, 12 May 2026 19:30:19 +0000 Message-Id: <6a037fcb.1ec21.727adcef@gitrepo.freebsd.org> The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=d1aee9f1535b02dc3db2a5bd1ac75213068a675a commit d1aee9f1535b02dc3db2a5bd1ac75213068a675a Author: Nick Banks AuthorDate: 2026-05-12 19:26:24 +0000 Commit: Michael Tuexen CommitDate: 2026-05-12 19:26:24 +0000 sys/time.h: add bintime2us() helper Add a microsecond conversion helper to complement the existing bintime2ns(). The body mirrors bintime2ns(). This will be used by an upcoming eventlog(9) framework as well as the TCP code in upcoming changes. Approved by: gallatin, tuexen Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D56972 --- sys/sys/time.h | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/sys/sys/time.h b/sys/sys/time.h index 5255d3bc9c7e..ecde8a826499 100644 --- a/sys/sys/time.h +++ b/sys/sys/time.h @@ -308,6 +308,17 @@ bintime2ns(const struct bintime *_bt) return (ret); } +static __inline uint64_t +bintime2us(const struct bintime *_bt) +{ + uint64_t ret; + + ret = (uint64_t)(_bt->sec) * (uint64_t)1000000; + ret += __utime64_scale64_floor( + _bt->frac, 1000000, 1ULL << 32) >> 32; + return (ret); +} + static __inline void timespec2bintime(const struct timespec *_ts, struct bintime *_bt) { From nobody Tue May 12 20:05:56 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gFSJj2vDGz6d1kP for ; Tue, 12 May 2026 20:05: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFSJj1gPBz3ZGH for ; Tue, 12 May 2026 20:05:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778616357; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uxX+p1cigWkTzQ2VXP5uo1/Eau+QVk+510jJr8bMmzc=; b=QpypCT8M6wSVQHqL8D7Z0vasVVMIuyrYAapLIUdFhDvlHUOrV/S64kU/VX9D5nnc5IiO3q A4dL+kq1rhd6Cb8rlRLRGnsl7elUQplsnUQg2FPRBznH/ZyIsUBWVtoVJny2ujqKqXY/ls q2D6Ij/plfQtLy1/6RTzxJN5MnnjYQoFubdp3/+2l7uWkm2mUn+b2BevtNxV9DxWLLKbxN T/YDTNdoHZbAucrD3tlISc0aVdRN8Xe5wiT1cxzuRVqj1T3PMpp/QKr4IMBMorzbMalzUO XjzDV3S8YTxeO3mEBqc/e/fQowen0hCgrFv3YM/aS12iPmNZXnH66YR8MnsOGg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778616357; a=rsa-sha256; cv=none; b=miAdfKzQkZenO/8ksxLTgLWsRbKSefEBtUJ9KOkNqGalLVA7KiFB7f2BE+oK8wcgU5gHik d4EZh71JytqW22ZrumpMIldOYhsX3nIaI1aBjkTgQuzZe0VmBEPfP+pqufNozSqAR4W+/g KKHP42ZR6ptniCCudRcPCKE1hU88JdD8x+xzAOKhCKU7sGSMojhpPf2VSmm7aCFUow+9CK c43ce/rhOkVRKy896O94Yhz88ZxBUx8daKdMnKCcGu63prtknWBnimosGBkvcGDKPQgqjB rOUWCtodaPo63EUbkNkoIiEf+ozV0VeFdFeCU1huPvDHz6DbzbUB8xZ1rBszkQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778616357; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uxX+p1cigWkTzQ2VXP5uo1/Eau+QVk+510jJr8bMmzc=; b=bf34hzZ0BI0j3hY/TJlPGGEhvsBLrPVtJCZ7k2NgzPyPb+TKSaS3crQoHv+98zUJ26Mjr9 L1yZU27z0MUmDVL1UYD4yKWzRVhf5BSsu8IPgLyNssx3j3ZsQHZMKGDmkzQZhx+NHGPv60 9vAHOPcd0w4HuNLTCVka8KqGjromj2UIdpfJzqlbdC+nm7SMWLzmBQYPQ209++VN+qhNWP 2or1jSftQQsiQByCQfZRvGyZA3EC7e8KlTMJ8KnJu9hmrQD9YW+T6kcYolaKIFzc2zze9/ yKzuZuMAUkfQt0sh1kVbpO5vvSTXz/rRxCJezc857GFwrFHdG2of1zqYJH/9MA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFSJj0QBfz3ZF for ; Tue, 12 May 2026 20:05:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2147c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 20:05:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 3b16e96b005c - main - tests/ip_mroute: Remove test timeouts List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: 3b16e96b005c723717aa6a4ebc48000354e64fa1 Auto-Submitted: auto-generated Date: Tue, 12 May 2026 20:05:56 +0000 Message-Id: <6a038824.2147c.36d8a879@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=3b16e96b005c723717aa6a4ebc48000354e64fa1 commit 3b16e96b005c723717aa6a4ebc48000354e64fa1 Author: Mark Johnston AuthorDate: 2026-05-12 17:45:08 +0000 Commit: Mark Johnston CommitDate: 2026-05-12 20:05:18 +0000 tests/ip_mroute: Remove test timeouts The configured timeout of 30s is a bit too low for a couple of tests which create 4+ VNET jails when running tests in parallel and with kernel sanitizers enabled. There's no reason to have custom timeouts, just use the default. MFC after: 1 week --- tests/sys/netinet/ip_mroute.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/tests/sys/netinet/ip_mroute.py b/tests/sys/netinet/ip_mroute.py index c79b046445e5..0a705670e89b 100644 --- a/tests/sys/netinet/ip_mroute.py +++ b/tests/sys/netinet/ip_mroute.py @@ -192,7 +192,6 @@ class Test1RBasicINET(MRouteINETTestTemplate): @pytest.mark.require_user("root") @pytest.mark.require_progs(["pimd"]) - @pytest.mark.timeout(30) def test(self): self.starttest(["vnet_host1", "vnet_host2"]) self.waittest() @@ -287,7 +286,6 @@ class Test1RCrissCrossINET(MRouteINETCrissCrossTestTemplate): @pytest.mark.require_user("root") @pytest.mark.require_progs(["pimd"]) - @pytest.mark.timeout(30) def test(self): self.starttest(["vnet_host1", "vnet_host2", "vnet_host3", "vnet_host4"]) self.waittest() @@ -347,7 +345,6 @@ class Test1RCrissCrossINETMissingRouter(MRouteINETCrissCrossTestTemplate): @pytest.mark.require_user("root") @pytest.mark.require_progs(["pimd"]) - @pytest.mark.timeout(30) def test(self): self.starttest(["vnet_host1", "vnet_host2", "vnet_host3", "vnet_host4"]) self.waittest() @@ -401,7 +398,6 @@ class Test1RBasicINET6(MRouteINET6TestTemplate): self.donetest() @pytest.mark.require_user("root") - @pytest.mark.timeout(30) def test(self): self.starttest(["vnet_host1", "vnet_host2"]) self.waittest() @@ -489,7 +485,6 @@ class Test1RCrissCrossINET6MissingRouter(MRouteINET6CrissCrossTestTemplate): self.donetest() @pytest.mark.require_user("root") - @pytest.mark.timeout(30) def test(self): self.starttest(["vnet_host1", "vnet_host2", "vnet_host3", "vnet_host4"]) self.waittest() @@ -549,7 +544,6 @@ class Test1RCrissCrossINET6(MRouteINET6CrissCrossTestTemplate): self.donetest() @pytest.mark.require_user("root") - @pytest.mark.timeout(30) def test(self): self.starttest(["vnet_host1", "vnet_host2", "vnet_host3", "vnet_host4"]) self.waittest() From nobody Tue May 12 20:05:58 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gFSJk4qPwz6d1Gc for ; Tue, 12 May 2026 20:05: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFSJk0jclz3Z98 for ; Tue, 12 May 2026 20:05:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778616358; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bQ6ssESVJc3IV4gIE0nqg1CG9fv4ArZ6HD/Lmbb/S0w=; b=lK33OxjwrWJ7O24IsViLkmNONC1VPINIaktNHLBYIjivOUVX1Bgi6ZtVnhEOswDfab/N9C eLiXfq2uoSsCKco4Kl22wJf2JgzPneESK0EkObY4H0mOvro7JSaiFyHEqR7K9HYzWrYisn WdS3/Midlz1R1b/eVGD5oIzWgr2+kufSGv+R2YCdh5lg2FUPlvdfhgLs4xokVf8RGQ6SPj vz7d/z2TlRvgFxbgVMxkRjgGtV6C8Qvd96szc5KIie4tMylQIJvRP34ExjdTebdChGAvGG nJptrjpob8q20f1hHIil7+IX3+qQ/tv3LnaiinrTE/FtOnPC7ahj7UTT/+9LwQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778616358; a=rsa-sha256; cv=none; b=W9zOmnMYHdu8AfI/wlVZt6YbsyOIqj9Z8mTGNRMnqWeT+LCreHaHsWVmgR5J25M4NeQcst SJAVd5XdAlPexFVZuMWPGyJPREpiwjnfFAb3MxLVEWyIVC45qCNg/jyUc2RMRoKyznFD2y EfDP/6n3Tcelxz3GnHien2qwDG13bQvlnY6xzaWO3iH98/LjUt1t2VD3Nd0iXGe9BHAdtP ooBtMK04j0M+UVUzMmoXijaf/TSiTFNsoHhTMtW7cEJTqyDUDocLUEaTCqAFrF4Iv/IfwO /VALCXMUsp88jfcRZaMadaBIwi1x4U70iwz139Kra6iXwZmBnf3mcKcmIS6RrA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778616358; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bQ6ssESVJc3IV4gIE0nqg1CG9fv4ArZ6HD/Lmbb/S0w=; b=vPxyy76uidySw0p3Zel9wNuxccaZaX9gHstm5p5F9TKXQdHF0xbBPY7Zz3JMvP7XglPJ8G nzi+5IcgPqRZqsqdIyb1ARWsV+nwcZuDPtJWqzk94jTd0EPGbAi9BkrIg8NKE9KOoDC8Md MFxvcFcfnnclXqQplNfbWKHVZlEaACY00XBrdI6kxmUTVnpqVeI8Zlrm0XBQzfaquqwCXL RkxXlbIocizgAEvPwnAimoHZgeELmolmJa0fmQs4blBoCWpCkfsbannZJpYcUzFQj4B1r0 aZTUzSR2OfV0X57nswjDbl7VVAWi9th34PRQSQzs8E8evtCZGoz6bOKycouJqQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFSJk0Bh8z3Hg for ; Tue, 12 May 2026 20:05:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 217db by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 20:05:58 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 35a36d4a54df - main - mdo: Avoid relying on header pollution List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: 35a36d4a54df244e93bf280345426a600e394a90 Auto-Submitted: auto-generated Date: Tue, 12 May 2026 20:05:58 +0000 Message-Id: <6a038826.217db.7419e13b@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=35a36d4a54df244e93bf280345426a600e394a90 commit 35a36d4a54df244e93bf280345426a600e394a90 Author: Mark Johnston AuthorDate: 2026-05-12 17:46:17 +0000 Commit: Mark Johnston CommitDate: 2026-05-12 20:05:18 +0000 mdo: Avoid relying on header pollution The uses of PAGE_SIZE and roundup2() require param.h. MFC after: 1 week --- usr.bin/mdo/mdo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.bin/mdo/mdo.c b/usr.bin/mdo/mdo.c index 879423bc0128..e72f28b237e7 100644 --- a/usr.bin/mdo/mdo.c +++ b/usr.bin/mdo/mdo.c @@ -10,9 +10,9 @@ * Foundation. */ +#include #include #include -#include #include #include From nobody Tue May 12 20:05:59 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gFSJl6Kpkz6d1bB for ; Tue, 12 May 2026 20:05: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFSJl35lyz3ZGg for ; Tue, 12 May 2026 20:05:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778616359; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PwkPM7IJ+pYMMsHXHw3OvtJw2DUwiXqnZlN/hQ/dtMI=; b=nZYovAED9vKRSDSFB85Aqo9iW4eR7eWrDIK4IUo+ssqtZlkHHsBjM9SugdDblfK4JnnFEd 7rp7G6/YYku+7pEh1R1C5QQJVvL6I4JTcQE/2U0Nh5f9sadW/oBbWoay2mTmPbhH5DvToD T6AvL6z42EzYGY84JVEOjSGTbl/F0d+9XdLlvOEX85fojsiqpLVBp4XIvho4k3hbx045/V w68Jm3759DHoaZOJmbX6TkXDCupGcdFWJ9VWT6h+ZuP9RJQTvzrjb/PD/oP+QVmJjezdNq 8zBoxTnApB4wsGRnVfcq+BarHp4hUgPH08u41M92FMTcMeYejyZvg1ualtotew== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778616359; a=rsa-sha256; cv=none; b=Y6fmkqcKFOLXdv3Ceq3R1i/bkDvu76Zrh1pJoo2q5JpevybejqD8SPN/u6Ec4dSJkz4bQe /ZACzd2ByyP+ZXkkCRyKv3Xp61ngVq8VoX483/TdolkPe4HDvF45Wtq8UffMIYAHSRLDc3 T9jzneT4U0djWd5jpMb9C89u76tSzDVVI7XUagyuGjnUFFCKQ5SeTp9J1dOOzycIvgEYvZ KsIXbtzIQix/fyi5Z0Kd1qEQYJfkQfayAmZxX//0/DZTbNfTab7TpxEltovbarKYc0TRNG Ri9qyhCnseeJ8pyoKNIprcDiptVs/ZNQt1fNzEqgNkNZq9cQiUfXbebkfZ7/cA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778616359; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PwkPM7IJ+pYMMsHXHw3OvtJw2DUwiXqnZlN/hQ/dtMI=; b=KgwIRdrWgiNvMfj8HFOh5cWweUEs0lzzM5FkDGWbaai6XA27mEsJ6/Jx42yML5fS6wSufF 1NqN4uZB+MqYPx5tBE+ewdzQB7S5uBvtvA1SRWjg7aWIpbNJG6s2ZPz088FrpMJYhACFhl 9WgyIAsEV+ufA0cCc+vK4PTv7zNf6q6/S6UDoC0ltrnlpfdkeZnykO5QUBpbbAI8qBwtHG 77budEvnU85r4D6vi8NKWNbB2re2GjPb8qIAeGIsTNaGYcukDkvrSFqtWZybO6kAKmXYDm BHP42reyA6BRBs6oKkdZ7d/H9qZ9Q4pGnq6zPBsmWoGbyFMlsYXu9z8UnBXp1g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFSJl117Mz3FZ for ; Tue, 12 May 2026 20:05:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22295 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 20:05:59 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: fab4acbb7db8 - main - vmem: Include param.h in the userspace port as well List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: fab4acbb7db8ffc7082d1b60b3c8e446a7cfef90 Auto-Submitted: auto-generated Date: Tue, 12 May 2026 20:05:59 +0000 Message-Id: <6a038827.22295.56bc29ca@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=fab4acbb7db8ffc7082d1b60b3c8e446a7cfef90 commit fab4acbb7db8ffc7082d1b60b3c8e446a7cfef90 Author: Mark Johnston AuthorDate: 2026-05-12 17:46:24 +0000 Commit: Mark Johnston CommitDate: 2026-05-12 20:05:18 +0000 vmem: Include param.h in the userspace port as well It is required at least for NBBY. MFC after: 1 week --- sys/kern/subr_vmem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/subr_vmem.c b/sys/kern/subr_vmem.c index 8b834a2e2a79..0ea8c9e41568 100644 --- a/sys/kern/subr_vmem.c +++ b/sys/kern/subr_vmem.c @@ -80,7 +80,7 @@ #else /* _KERNEL */ -#include +#include #include #include #include From nobody Tue May 12 20:05:55 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gFSJn5Hvmz6d1Gn for ; Tue, 12 May 2026 20:06: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFSJn0FV4z3Ynr for ; Tue, 12 May 2026 20:06:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778616361; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=913t0nSr42ZalVYcwkowGqc7iTCezGEqwMdq6EbKf0Y=; b=WKf7tr0w0w7pJHuR4kVzxVaOHDOJcLtMmVY+63g02eHw9i1tzYI8evDSXBA+AhQVwtfiO2 tMrCqUDySHwPc9WPtbamtN6n7G62vF/DbJ0s3TnRBldwKs/P9BLWitHipU0mrgd1uK4ICd tv5D1dh8sJieebtGelAXnEtNsUF5UbYiIFBta7M4Y9Q+Fizbt19OeLkoVX5WFAdIqr7h28 5blEOPePVviD6mbD4/gLpPNeLQgjJ5E0AnsG+MY2jOAq/filsl1/hVcPMC3c9Nb3x/wdbp uXqaB/XHWQJ7HjEl4XS1LmATeJiA2qb5zDCzRrXILrusHJbHJaVmzQg2XCv2eg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778616361; a=rsa-sha256; cv=none; b=IHh8ovUmbM+jHqPYulB/SIwonGk1W6pEVFXhZ+2wwewh39IBj4kRNZHRB+UkJgConHSt8N I+8O5PV0JDg3DYWXdO1jI8Uz+N6E4Edc1h+gEwehEscDWFfI0/aoL9RBzJ2AsmACt3GzRJ CNkVrJTC4+dLkNAbvgpGKHqQa1boXuj0JzZnvzxPf+GOIJYyniWjdqA6dUxgXkDk+d2lSI M4I96Gn2DyshAuqMx0HVIg54u7JrKcxBWm6XeIZDtenJZEDJvJVSQtU2cBDzKTLIIedKU0 7EnWbC7SSDVQ/cVT8ldZ2/n25R1cB2GdWdvg4V4NHWYYYNjaPbpvvjN3hScQuw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778616361; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=913t0nSr42ZalVYcwkowGqc7iTCezGEqwMdq6EbKf0Y=; b=blwc8RujlrkBb64onhTBsK43jQiaFjdUBlLYiJ85aWPTKot0vucIDx9AEYBhXzI4vJ/hgN R3HuqM0Oya0H805lRdd9ei9tUaT9dwsBgdO1P9hI0/lKPW2RZeeCmkoRRXdRDNmJ+qw2YR Mr9rvDcZfwAm2LdZ/uBNYmNNn3/kOhKwfqMqhU9IY7IF/vrBR7+YV3/mf4F1fPs/Dl+tCO Tj9tWRpfZlKDeYTHZAOg50vDrDFheHkghE9F/M9YtKuj9WNDCrzZG/4SEjGDVZpLtl5OA1 lxIitIzXnnJJEOBWj+2+sblk/dtzj8pPd6A++KeWgaYNErsfu+/Hcm6VfZhlNg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFSJm6S2rz3ZJ for ; Tue, 12 May 2026 20:06:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22d84 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 20:05:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 26bffe5695d7 - main - tests/tcp_hpts_test: Fix more resource leaks List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: 26bffe5695d7cab2e797ce4ad153f324c0262f48 Auto-Submitted: auto-generated Date: Tue, 12 May 2026 20:05:55 +0000 Message-Id: <6a038823.22d84.f4d7a67@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=26bffe5695d7cab2e797ce4ad153f324c0262f48 commit 26bffe5695d7cab2e797ce4ad153f324c0262f48 Author: Mark Johnston AuthorDate: 2026-05-12 17:44:31 +0000 Commit: Mark Johnston CommitDate: 2026-05-12 20:05:18 +0000 tests/tcp_hpts_test: Fix more resource leaks Address leaks that I missed in commit f7bf9fd6199c ("tests/tcp_hpts_test: Fix resource leaks"). Reviewed by: Nick Banks , tuexen MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D56943 --- sys/netinet/tcp_hpts_test.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/sys/netinet/tcp_hpts_test.c b/sys/netinet/tcp_hpts_test.c index bc61b64b8c58..25c3a939e86d 100644 --- a/sys/netinet/tcp_hpts_test.c +++ b/sys/netinet/tcp_hpts_test.c @@ -624,7 +624,9 @@ KTEST_FUNC(tcpcb_insertion) struct tcpcb *tp; struct tcp_hpts_entry *hpts; uint32_t timeout_usecs = 10; + int error; + error = 0; test_hpts_init(); pace = tcp_hptsi_create(&test_funcs, false); @@ -638,9 +640,9 @@ KTEST_FUNC(tcpcb_insertion) INP_WLOCK(&tp->t_inpcb); tp->t_flags2 |= TF2_HPTS_CALLS; - KTEST_EQUAL(call_counts[CCNT_SWI_SCHED], 0); + KTEST_EQUAL_GOTO(call_counts[CCNT_SWI_SCHED], 0, cleanup_locked); tcp_hpts_insert(pace, tp, timeout_usecs, NULL); - KTEST_EQUAL(tp->t_in_hpts, IHPTS_ONQUEUE); + KTEST_EQUAL_GOTO(tp->t_in_hpts, IHPTS_ONQUEUE, cleanup_locked); INP_WUNLOCK(&tp->t_inpcb); KTEST_EQUAL(call_counts[CCNT_TCP_OUTPUT], 0); KTEST_EQUAL(call_counts[CCNT_SWI_SCHED], 1); @@ -656,7 +658,7 @@ KTEST_FUNC(tcpcb_insertion) INP_WLOCK(&tp->t_inpcb); tcp_hpts_remove(pace, tp); - KTEST_EQUAL(tp->t_in_hpts, IHPTS_NONE); + KTEST_EQUAL_GOTO(tp->t_in_hpts, IHPTS_NONE, cleanup_locked); INP_WUNLOCK(&tp->t_inpcb); KTEST_EQUAL(call_counts[CCNT_TCP_OUTPUT], 0); KTEST_VERIFY(!tcp_in_hpts(tp)); @@ -668,6 +670,10 @@ KTEST_FUNC(tcpcb_insertion) tcp_hptsi_destroy(pace); return (0); + +cleanup_locked: + INP_WUNLOCK(&tp->t_inpcb); + return (error); } /* @@ -1475,6 +1481,7 @@ KTEST_FUNC(direct_wake_mechanism) struct tcp_hpts_entry *hpts; int error; + error = 0; test_hpts_init(); pace = tcp_hptsi_create(&test_funcs, false); From nobody Tue May 12 20:06:00 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gFSJn2l5sz6d1rh for ; Tue, 12 May 2026 20:06: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFSJm2w6Yz3Z7m for ; Tue, 12 May 2026 20:06:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778616360; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3z0ER0tBxl+ja8C/mn3ZFat7B1G5f7F5TmLzDPwBvfI=; b=FhO8Po7GeW2wde0scBlUtgfOQKr3H5RRWEFJmzUJCq0C5r/NbPWkDPiQlQ+1eMfnBJ2l/j +n6jjK7CRIWRNCU+WYBWJ/lYARK7caE6YxZlTncqHUsbwNVVMKs7adtGrKwi2rQV55hi3/ jF8vSZUbh945Cnoa24un01dkFEo6JNhqdbxwt65ibgPDTAxRaFu+JlCN9RhoFtwNLYcWJV ixO5rV0NIsVarp6uJ1rCDyuBDK9C6GXcsUil6uJ1JTzUg/UE4TxvAQ9+BFxiOWpGDaCyE6 R/rgMtAi2qAK2U4YUWU8oqEUzWySI2cW/tESU9A9hkOli32huSJqUys0Vtc95Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778616360; a=rsa-sha256; cv=none; b=DjIT3a3OQBFKOmCiPjaYlUO4Hzi1X/BYwZFzBQ3EfAKgWqBj0wYfmgi9fct/wi0McCM4Oi fzJAwxAqFlhz8t/15KBMKoZrkQ2K9T5wNNffsQOt42FD7W5gkX1AWj0cTd9rEUlV1hA0Qt WaFJ+z6VpujCU5MmNLi/5h+8zw9NUhGeo3YRYvdn2P5r3mPXNQyBUkB6x3q1R1ffW9NZdx BUIhT1sIiEU9Vex0fAITojho+lFxHqaJVAIMUPOzoj8r8eo4eR4nI1LkSkUI6IAgoVrAdB KojJRMBXpkiKobybda9j9UxIUoZ6RF2OVvNlAyr4h7+9Y56RakqWHIFBV/EXlw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778616360; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3z0ER0tBxl+ja8C/mn3ZFat7B1G5f7F5TmLzDPwBvfI=; b=O/7Cg694b4jvBo4wAXu7mKpexz/bspKP3BJkQ87MjCUvE1me5WxURk6ixumTS8/0P8Kw9c 4DvbLNSkSclwpaQO4FyELz1qeVBtL3CoT7CWJfSksgc7lgqeA4d5yA/44BX/Up/AeMVYd2 v2DDfjMkgjy7BbDkUolMFbRk3fpfZl8FP9eaie7RWmEIwCezxCgRxVq16dBIKMvRMgzDJG Kuk3TCMIdD55y5jM4Fed2zZe4MHbjYbsQWdxWElMj4vubaPIlLaFJ3tXdEIY/LWSWdVyXq yU9DP59aF9ailwUbVnXxNTwxlvjVhHI5UxLhLXQCIXxlfwJv6BmuBokFKtfAIg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFSJm1qS3z2qV for ; Tue, 12 May 2026 20:06:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1fb75 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 20:06:00 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 5615db1007bd - main - find: Include signal.h to get a definition for sig_atomic_t List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: 5615db1007bdc935ac6592a66721320ccd8335ce Auto-Submitted: auto-generated Date: Tue, 12 May 2026 20:06:00 +0000 Message-Id: <6a038828.1fb75.479f33d8@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=5615db1007bdc935ac6592a66721320ccd8335ce commit 5615db1007bdc935ac6592a66721320ccd8335ce Author: Mark Johnston AuthorDate: 2026-05-12 17:46:29 +0000 Commit: Mark Johnston CommitDate: 2026-05-12 20:05:18 +0000 find: Include signal.h to get a definition for sig_atomic_t MFC after: 1 week --- usr.bin/find/extern.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.bin/find/extern.h b/usr.bin/find/extern.h index 250b5fb6689c..acb86f084fbf 100644 --- a/usr.bin/find/extern.h +++ b/usr.bin/find/extern.h @@ -29,7 +29,7 @@ * SUCH DAMAGE. */ -#include +#include void brace_subst(char *, char **, char *, size_t); PLAN *find_create(char ***); From nobody Tue May 12 20:06:01 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gFSJn6VxRz6d1rr for ; Tue, 12 May 2026 20:06: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFSJn345yz3ZL0 for ; Tue, 12 May 2026 20:06:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778616361; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=veptGizTNRkxmo7iKePa5Wdhb9r1zXRBD/Tf/rHAIDw=; b=BqLyFdqJQbiFfeI1HxIdMI83pwE6n6yVjBoff2QSUfQCVmUnVxo/aajhEZL5769EBJ8JbK +T7OUcBNOtD25TvXK+KvR0Qp8sog/T/D+h/IFn10ifprZlFHNjxgwsiFIG9yg6P13ct1ac 5IvDFILXPDz0WI19oOX2XYxrqjLuyMXGa1T1I1rfoOxsQs1sVZAUYo/BxsnwZJ+VoesN1n v/QRWuY2KbAgTIXb83XYcRLhp9w8fxHSfd8kSdmley6WtHDPoBEDhSayRUC4qICUkL0Kxt +IQODp0+jBAosduj3+37ORaTdabYqc0gsHlIfpJsLx608AaLISMCuCDOYRGd1Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778616361; a=rsa-sha256; cv=none; b=gAGP8kBxqRTMDCMD43DR3ypZ3cRmTtgtRoWWPUBbkdVL5VYiEew6RYzZ56GlfgPUxqBWlX q6DIQzkjH4HI9JGLCYKAYjHwzLIzDINllPdAKbp0N8v5WAt4nvLlpAATt+BajAVW/YNOJZ FoCI7elg7y1gIOFel49w78liJpCncDDP/Rgx0o/1uqlNFkbb65kVbhQRi11D0pgNgjdq9v fQY55FPddi+1f+87oQHeCQxXhORs+jgBvUXDyKLLZx7D5xEzZYkkVo6pfQn8oBL+Lsd8ns LU4ZSD4drDMjy1Cys1hsiBFcqthxw6iQgPW/1m4oYKvXSqhtuZCwmkOBvb4VNg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778616361; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=veptGizTNRkxmo7iKePa5Wdhb9r1zXRBD/Tf/rHAIDw=; b=tgIyYdp7OLvtWvrE8P3Lh/FoMN/t7dTTU9kwx2V76hDzHRR1gx9IgLqIl5mnWzIbVmWEBH IJEx8+y+djC+W7QqyylaP47MQ5dMUbOnRRYeWRQhq0WN8i3kVJVYCSKHHKUBcX3t43W9Xh sLCEgyAXsnrSXaMOtLfK1ytGDGjicKup02mqXek4qR/NwgdCdpZSCINj792oCo2NVDfGaA FzyxnMuYUJsA8dD3xC50MVifjpku+SlIeT/RY2Pku8ZUrZt2NPgYyIvTrbqyMOWoa38zra ZbJrs1Sv1fajjLrhdCQq+Ac0beK+YOmyHIW0OjgBARteCrTvJuFHAUEX2+4wFA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFSJn2c54z3Fb for ; Tue, 12 May 2026 20:06:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 217e4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 20:06:01 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: fae5815a1d7e - main - hastd: Include param.h instead of relying on pollution in hooks.c List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: fae5815a1d7ef6ef07a15231ca695cba0f848e18 Auto-Submitted: auto-generated Date: Tue, 12 May 2026 20:06:01 +0000 Message-Id: <6a038829.217e4.5bd0d91d@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=fae5815a1d7ef6ef07a15231ca695cba0f848e18 commit fae5815a1d7ef6ef07a15231ca695cba0f848e18 Author: Mark Johnston AuthorDate: 2026-05-12 17:46:34 +0000 Commit: Mark Johnston CommitDate: 2026-05-12 20:05:18 +0000 hastd: Include param.h instead of relying on pollution in hooks.c This is needed at least for MAX() and PATH_MAX. MFC after: 1 week --- sbin/hastd/hooks.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/hastd/hooks.c b/sbin/hastd/hooks.c index 43ba6f06851a..f8c908928b0f 100644 --- a/sbin/hastd/hooks.c +++ b/sbin/hastd/hooks.c @@ -30,7 +30,7 @@ * SUCH DAMAGE. */ -#include +#include #include #include From nobody Tue May 12 20:06:02 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gFSJq0nF4z6d1ry for ; Tue, 12 May 2026 20:06: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFSJp3mzHz3ZLp for ; Tue, 12 May 2026 20: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=1778616362; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9yFZ18QbA7b7Ud2Y8+MgQ/JnIHi0QT2yiCNV/VShoSc=; b=G8CW4bYeipu3xnOCZGi+M8SFiq1N5fmgjaEdOCeICJPov2fPv3aBWv9TM8ByJEBl5oAhIx 8nWhfgVY8rFbrnthObFjIGHs/nMPWT+CtdHh35SlrdaC+2jARlN/T7LpaCRmFG36/k+oDt OGd73Hd4h6MMzMTWPwjcy69mqtV6cRAURbiROjTsTujvMkAPw6Ntl/Ac4bvZvB00xolaPW BeB4jtvu3uJqklAPYZDITdSbOiaPHBKVWCOhHTKFM+LbLueoF5XR+Gw4VaJd6DQcDYg9ka TeiNifcpWEWA9tPIgUhSu0Mji52/rLaT41lpabMXTTb5+KXJ5IvU+EsZDi6UVQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778616362; a=rsa-sha256; cv=none; b=V2Outgo/yWVUwqqahWt9qiRLchE2z5dNFYfhyDtEtECQrxDWU8WW0g/QppVPsa5P36awhL PeY97h6vdoBqBEnkdeLUwdydDhk45Fs1mDs12QHE5cu8vCp+J++75WNE4U9e4qsAa17hkO Vd6WKs9IL9tpOmODMSJBVzzHksbV3vpF8Sa06VIy+8SF5C651FSd24ywsuTLkxPjaARz/H yVVoIJwxnoq4kotJ2WfBhHukjlDuzIFF1UDUyxj8+FH14BBSPaabCcaEUVC+HS4dI9PTzY 3AORi+aCSGcdI44RsuZvPIRlhyVy1WCEcwxbx6loYPD0AIieOvnRk3D6LGy/4w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778616362; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9yFZ18QbA7b7Ud2Y8+MgQ/JnIHi0QT2yiCNV/VShoSc=; b=QZcgt+0sRdAp0wtaOhZHojsGBoLPkk4PglzzbMTW40n5LZfG3MtfqJ8BePSHsYBP6bdrlc XBx1niADMzEnFFOqYITZE2A/n4WZ6uBdFvYMnA7/Z6EuTR6foIesjhJhuLbJOSZ91BncAz k51jMNH2zU5DhQyTa/IqZJRydFMffOZt1H7Q6IRjvIH6v+fHpPTAWvHYijdJbLxi+ZQMCJ 6NoO79YGUeZTpYFADcpZWJLNMcnHq+dhHKKlUZMWGhSNLRtomfkjf3Ufmux4jitO6WQJt9 /gqi4w39LbUqQ4VcetSH2b+02iYDiHX236wE8U6S/PHVWCllwNXIhSX/Gpggow== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFSJp3M6tz3ZK for ; Tue, 12 May 2026 20:06:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22e00 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 20:06:02 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: ee2d1a1a5a18 - main - edquota: Include param.h List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: ee2d1a1a5a1877f8ce7b9eee94479ec702880bd7 Auto-Submitted: auto-generated Date: Tue, 12 May 2026 20:06:02 +0000 Message-Id: <6a03882a.22e00.2ef61b9e@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=ee2d1a1a5a1877f8ce7b9eee94479ec702880bd7 commit ee2d1a1a5a1877f8ce7b9eee94479ec702880bd7 Author: Mark Johnston AuthorDate: 2026-05-12 17:46:40 +0000 Commit: Mark Johnston CommitDate: 2026-05-12 20:05:19 +0000 edquota: Include param.h Required for MAXPATHLEN and MAXLOGNAME. MFC after: 1 week --- usr.sbin/edquota/edquota.c | 1 + 1 file changed, 1 insertion(+) diff --git a/usr.sbin/edquota/edquota.c b/usr.sbin/edquota/edquota.c index 6c209cd23716..f9780a7b0507 100644 --- a/usr.sbin/edquota/edquota.c +++ b/usr.sbin/edquota/edquota.c @@ -36,6 +36,7 @@ * Disk quota editor. */ +#include #include #include #include From nobody Tue May 12 20:06:04 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gFSJs3P0bz6d1pT for ; Tue, 12 May 2026 20:06: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFSJr5fnJz3ZM4 for ; Tue, 12 May 2026 20:06:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778616364; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1neNGwcisDk3vVMIYNX/YA9TX9kT5PVS7c4Fhku24Ws=; b=rcN5SbuYLw+r+HyrmbxMbqSZwEmk3SH50q/3FjP2q1594iGY2Jpy1P6kdJRxVKKKJqn65t 0tJFHTp7axJMFVTik8WFNZYoOd4QNSXRWRgE6Z1lTC918fmiXd8l36L7hzEitXlEASmNDX sSMhNCsLBU9iAMDWt2mJaTis2IGEgCRNueTyM3N61sPuQoyoamrB9GWpfk/KSBTB4hn/Cy sPMmiC5S7k1LrAXsvUaqyd+qka2f1uUoxZNd3ERyo4U51zjGQIAyaxDOmkiKV6TeKLUtnZ 4I+A8rSj2sXldKZeMMX2LtwGf7NtAEdHGqJeMen7OgE0lbs24wpK4Dt9rcorOA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778616364; a=rsa-sha256; cv=none; b=GKPJ9wHwrGiyff8X666ENOF8d1UXGgQWl4rZKQTiegxHyXUeYDB+Pd5LlTga1BX5RFu4ds DTj9qsE6bzcawHqbH3U3SD/Koi9V0jS0J+9JNUksqBtWWooSMRA5Fcc23JPgBQ6VklOkmI H/jva47rhohGsn/XH/C2ksiLvQVsxo3FwHZaXhih9KqAj8K0egep3fcHRLxHnr6+8hTm81 aWpF4AL+PX7UEM+4/fNY/3BrxUenCOwXtyVLG54e0mILoLasa43gE0Tlk8f5ute0pkyYYs OI5bRDXOPbodEyrt95KXHUUakmhw1fO1dX+InVX55/qZFAoUvKRD7JgOnQjowA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778616364; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1neNGwcisDk3vVMIYNX/YA9TX9kT5PVS7c4Fhku24Ws=; b=HoTxi7HGjuPWBChcrWg6AQVcd6tX6lWMg1brqXtimJoYDNGOtQcNFPQRFf+pEQgc9m5G7p 3ZXt4/xqOcFkvmvM0BrcO/+lK4Vbf4FdYgu1Kt43JoasfZHcCBtMn+RJZA2my9Tu/Nbiu5 wS3eykGLi9E2e191r6sJinY9jpB+Br7V0A1AH3ng1ZuqV9ZcAafGQwo9ZPv9Gn3khniV6v c4Jk1YVfIhjxFamvvxI4UYPXLNa7PjaceBU7jWt0W+1c9IWz7FcN/Dj/gc3hcrJMB6E5A5 YNLHmik6xwcrDH44L4UpPaOrpeUSvifxwZwIlRfHGW3G61I+9mzO9E4g4HAn0w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFSJr4yzxz2m8 for ; Tue, 12 May 2026 20:06:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2261e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 20:06:04 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 237900f17f09 - main - libutil: Include param.h in quotafile.c List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: 237900f17f091d059a3ead6a5320285654f4bfa0 Auto-Submitted: auto-generated Date: Tue, 12 May 2026 20:06:04 +0000 Message-Id: <6a03882c.2261e.3fd16310@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=237900f17f091d059a3ead6a5320285654f4bfa0 commit 237900f17f091d059a3ead6a5320285654f4bfa0 Author: Mark Johnston AuthorDate: 2026-05-12 17:47:04 +0000 Commit: Mark Johnston CommitDate: 2026-05-12 20:05:19 +0000 libutil: Include param.h in quotafile.c Required for MAXPATHLEN. MFC after: 1 week --- lib/libutil/quotafile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libutil/quotafile.c b/lib/libutil/quotafile.c index 1f02813dee92..e8c8b39843d2 100644 --- a/lib/libutil/quotafile.c +++ b/lib/libutil/quotafile.c @@ -28,7 +28,7 @@ * SUCH DAMAGE. */ -#include +#include #include #include #include From nobody Tue May 12 20:06:03 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gFSJr01z1z6d1pM for ; Tue, 12 May 2026 20:06: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFSJq4kbNz3ZLC for ; Tue, 12 May 2026 20:06:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778616363; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OqqKCxd6yEinfZwSTGohtw6jg/eXhS1o9WcCz68yB3E=; b=Z53cpPNTMUu71CsMs5QzTV6XCOnCyBLHsK5NZKK3LRlu1dbixgh8KQVnVpM+xZJnMZ/wt5 Wm7EgrFt3JUrT/XyBBlptQdVSTrFbQPlZBu1rQVKaTLzzBdsliMMmBvCXEZjmHP3dJ0GdL X1fsZz1P8teUUs8ndoEAl8QaTlOJR7Ppg+jW9R7Njq3t+nkW0kFvgOi9T9/xE64jBw2KVE ltqGk0LTW7Job5bAW98NUA/f1zvVgH+ig/Eou4g0OLMYT4CcX10f+VtOMPZsRlzsE3paKJ JSwMhhGckB/1uA8CWmiRB0dNRr4kM3SfK2GE6Dn4BHTpLVy7Aeh6UENLVmseRg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778616363; a=rsa-sha256; cv=none; b=Q4eWum1RBuTM48L3s8lQsvZaMxUowSyp0OFhbPTNxoeFyqT7BdLL9uTE4pk6OdZiQdVH29 unD20ebnOK5IiUV8CcR9vkdqE1sOODNRl4mjWwumMz+gha0nUfIKpRUGolUKoVCD5vOzjS i6nek+KgF20vKaA548J4mU2DzAO1FiVAgOJWkcvYqz/D9fxT+1n9VJLI9lUYO8ezJmc5dh fTf2UogG9/Vr4BqPtnB9/uhAZ19XPH1CCgmRFJGvvdbNZXDFZYcLDEy48EG1ug9wJ0g4jH KMhUYqEP+GHkwmaqPqEecQqaneWBE+tUUOXJOFsJxHGIMnBHM/roZn2ofb95bA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778616363; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OqqKCxd6yEinfZwSTGohtw6jg/eXhS1o9WcCz68yB3E=; b=jjfw/ZuwpELaxV81+P55NTXXc5CkKV7JHNXEwcEYSJjI9yNeD7wUY6ChC1a2huRkthDZ3I cgCgvCre6FlKZYXxjyJ814/AJWwfGoUBmp5ULRHnbVhj0YZM+1xQVShwqKJ9Pgzcw2PWLz ySbkX3DGN8FST5d3e39xq+c0e1lOsPp+NyLtMwCG6jIrjEZRQmIjYddpJOOeV7BPvMg+EE YO7323kAj5I0UfKp+UxMmT+cWB3WZfJ6Cmbt+WISpmYJMf9syFpn7hp7idvzC0Q0uVTFvk ffgEbFAv5OUkDphaCvx3vbI0ETTxIieSn+mfP3YB5sbqviHAPplvHEqhu3q82A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFSJq48xHz3XJ for ; Tue, 12 May 2026 20:06:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1fcd8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 20:06:03 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 9461071d5cd9 - main - reboot: Include limits.h for PATH_MAX List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: 9461071d5cd901c968dcd7f4a114905995f90d66 Auto-Submitted: auto-generated Date: Tue, 12 May 2026 20:06:03 +0000 Message-Id: <6a03882b.1fcd8.17e6fa2e@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=9461071d5cd901c968dcd7f4a114905995f90d66 commit 9461071d5cd901c968dcd7f4a114905995f90d66 Author: Mark Johnston AuthorDate: 2026-05-12 17:46:45 +0000 Commit: Mark Johnston CommitDate: 2026-05-12 20:05:19 +0000 reboot: Include limits.h for PATH_MAX MFC after: 1 week --- sbin/reboot/reboot.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sbin/reboot/reboot.c b/sbin/reboot/reboot.c index 002a393000eb..a11f92453147 100644 --- a/sbin/reboot/reboot.c +++ b/sbin/reboot/reboot.c @@ -40,6 +40,7 @@ #include #include #include +#include #include #include #include From nobody Tue May 12 20:06:05 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gFSJt1nsnz6d1mt for ; Tue, 12 May 2026 20:06: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFSJs6Ghgz3ZXq for ; Tue, 12 May 2026 20:06:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778616365; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uySVV8oc08REFXhhXo1OGjhTLcSHSmRnCL6GQYvWwtE=; b=hgPtjvXPYU9SF9BLuUYGNsLygTZ3MPSxihSO/wl76t5ZPAUyc+CkXNRLk5xlXG/3bUqatl xmrFiiLpaRP3lYIWiIDuXwTFXyXHwfA19ORkMoB4YugjIPzxVGU5fqJEFKEwvcb5f/sTls QM1WGfPy2DgzvD6sh6Zxeg0X7URZJSZdPaUJI7osodb/EPG3fJ2JMLg+VbWIomOr9gq86J YpxZU+BszplhMtT8au5U2GLHZAKiz7ASS9a5xyKSp6lx+9BZLvh6cLrgWshchLXMoOHaxZ Az1xI8AJf6H+1yGD+eF92LxN5p6qtDi2RKBVW6dBaTjkN1UiGhmyOBQAbQ4z8Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778616365; a=rsa-sha256; cv=none; b=i9UVF3B4GkA1hldmApQLf0ebTJBSfhQFnlaeNplMD7vyknGJAhdwlzzZ0fruQPTI1BXESi 1E5egXtqPJNa48yhEjRGmRTRemzlIzNgghECoSBQO+6bKgQNHxreNg58re5og03yCCBi8P m1HQL7aWFvgJ+SxkfvH8AaeMvz4MqiITLsTIYHwqLMGHsfVQ9pzQb0gCVzM4FL0IEMCftO HRr3IZCSz7khTfZsEfpCfUrzGNItpcvDdibjTz/pMh9pFp8+UTcDBtRdLJBfpqM04ZNCxE AJWvh7w9w3+cR+BS9EuuAO5b6jTxGcz/kl4M5Y8pRGPK4HxiKfHF1It6whoXXg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778616365; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uySVV8oc08REFXhhXo1OGjhTLcSHSmRnCL6GQYvWwtE=; b=aHnyBQNmkGY8ncXny7gE7w83/aKb2gP7ATH2HBhz8zVAUwLugOPy9y7G5r8jPnlPj0xDBh /7pZIOJ8Pji6s2PSylNUOVaMn1pfbTs+7rCN20P064J9OU/yklI7eXvQ8+7Xt4fwKYRzwZ ZZA8lPyJFjes/c1RraF8fuNliFH1qy/ULAC1qDhgS+xdkzisAnv0s0/QbENxqipAz2EpjT zhrW0jTrZPL1tpUGbm9IG3OEssHCmOVqAA3rUryByPPd1aq5VUVEQqZZK8iW6BIfcPazJv x/lyziIHFg6ebJtWlYK5l9bM3EB1Us4x7xNa0WI3chQGop/Wvv+vEOoc2GkQ1w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFSJs5pxrz3ZM for ; Tue, 12 May 2026 20:06:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22d60 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 20:06:05 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 3cd3900b690d - main - fsck_ffs: Avoid relying on param.h pollution from libufs.h List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: 3cd3900b690d8296094921cec844da3f72d30cbb Auto-Submitted: auto-generated Date: Tue, 12 May 2026 20:06:05 +0000 Message-Id: <6a03882d.22d60.75b6446@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=3cd3900b690d8296094921cec844da3f72d30cbb commit 3cd3900b690d8296094921cec844da3f72d30cbb Author: Mark Johnston AuthorDate: 2026-05-12 17:47:11 +0000 Commit: Mark Johnston CommitDate: 2026-05-12 20:05:19 +0000 fsck_ffs: Avoid relying on param.h pollution from libufs.h - gjournal.c needs param.h to get a definition of isclr(). - fsck.h needs signal.h for sig_atomic_t. Sort includes while here. Reviewed by: kib MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D56858 --- sbin/fsck_ffs/fsck.h | 9 +++++---- sbin/fsck_ffs/gjournal.c | 4 ++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/sbin/fsck_ffs/fsck.h b/sbin/fsck_ffs/fsck.h index aaf02850f29a..ff2ac6305be2 100644 --- a/sbin/fsck_ffs/fsck.h +++ b/sbin/fsck_ffs/fsck.h @@ -62,13 +62,14 @@ #ifndef _FSCK_H_ #define _FSCK_H_ -#include -#include +#include + +#include #include +#include +#include #include -#include - #define MAXDUP 10 /* limit on dup blks (per inode) */ #define MAXBAD 10 /* limit on bad blks (per inode) */ #define MINBUFS 100 /* minimum number of buffers required */ diff --git a/sbin/fsck_ffs/gjournal.c b/sbin/fsck_ffs/gjournal.c index b94f27758315..edbb2f373815 100644 --- a/sbin/fsck_ffs/gjournal.c +++ b/sbin/fsck_ffs/gjournal.c @@ -53,10 +53,10 @@ * SUCH DAMAGE. */ -#include -#include +#include #include #include +#include #include "fsck.h" void From nobody Tue May 12 20:06:06 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gFSJv54Bwz6d1hS for ; Tue, 12 May 2026 20:06: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFSJt7355z3ZMX for ; Tue, 12 May 2026 20:06:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778616367; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fODo2dzqr2CZSS22/Oo85aDc4fP1K+F6i3qXyXDc0Ic=; b=WPvp7tWUgWrySY5+WpI782Hezl8SE07c6QM3H0AShhqICtl5P8Y+KAbPAcyk9NGrXtsJh8 9gmwAiG8cj+Y7JPLlz2VbM25Fhyfd1mnUX4Y8xm0UJQmgRyBEYSkQVmha0gN7FtHwjGl34 vJljW9gRl+JfNo8rzp9Xwd/zYle2ZpWKxKeh7iTZufblP2z37w51+Ys6NTYdoh/tUfw1xI XcEDbgjEDJhN2fZeseG5F3oQRo9WPKASBdRyZOIvGMzbjUPonMSLFqofMQzzThjavtnQe4 Mr8qj3yrNuAyxpq5zDO4XV2HRD6Lm/Y2zvledV62T89DMQAgElHyT926evU0dw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778616367; a=rsa-sha256; cv=none; b=L2Q70+GPRge0WpcpSBUcteVIRT10P6s/B1E/R7Tf+0cn6h2eItytHGDOLwozxnwCmpsQ20 O9O2oLmflhX6qVpnUCMddnKs/t/JzPM0czPHvkauNf8rIp71jMvXqf4EVDioAM6Zoh9H+f iwkya/EC9irv9gmdfZk+fwrEA19sztFbBE3UnQA4ObxLo/RP+8Or3U8Efu7GlmLUChFzIx 8kTt9SsjwZ0XnKHS70v9RmbbLFZKDN5P1JY+7+pjc1WuGByZdF2XV1MASMqw9NLk8RoeDp e+Remd1iI3dlYH0syYvYc7WtacICugsLUgx8JjOkIBGiMPUP5T0Tf1qEe4A1nA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778616367; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fODo2dzqr2CZSS22/Oo85aDc4fP1K+F6i3qXyXDc0Ic=; b=WWoDC5k7zPvh+qK8D+gY98XZWfDAigqCAU7m/VuPtvJsTNp1oCYYaafAqli4VdPIdaWeqc 4MxIKP8FQQpVJwSO5MgR0I7t8m55wd8v7U4ooTECtmlf4g1BtiFITJ8NkariNMDl1SpGdv t4g1fXJUVHRA/uxXc7tYMk8aWmODuDdYL06wkPTetZjLTCX1m+wj4UdP88c+13WrshgL1k kkN3q9QGUbamuoRcWJ5uIknC1cpvk10UfFJkBjLpAsGXV+DFQhAvWxD4luftqosrlPO3+1 cojjR/egYmELVcdPeor6S6gIRZKmcOuSzTq3ygvi3QPZ20b5v/DTZFWFm0wlBw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFSJt6dSsz3Tw for ; Tue, 12 May 2026 20:06:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22098 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 20:06:06 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 271d25a066b5 - main - libufs: Avoid using param.h constants in libufs.h List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: 271d25a066b59df1e2bb774990948c985382126a Auto-Submitted: auto-generated Date: Tue, 12 May 2026 20:06:06 +0000 Message-Id: <6a03882e.22098.3032f52d@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=271d25a066b59df1e2bb774990948c985382126a commit 271d25a066b59df1e2bb774990948c985382126a Author: Mark Johnston AuthorDate: 2026-05-12 17:47:17 +0000 Commit: Mark Johnston CommitDate: 2026-05-12 20:05:19 +0000 libufs: Avoid using param.h constants in libufs.h MAXBSIZE is defined in param.h, which defines many other things. To avoid forcing all consumers of libufs.h to include param.h, let's instead redefine it and verify the definition in inode.c. Reviewed by: kib MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D56859 --- lib/libufs/inode.c | 3 +++ lib/libufs/libufs.h | 7 +++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/lib/libufs/inode.c b/lib/libufs/inode.c index 863e71867daa..bc4d99c66203 100644 --- a/lib/libufs/inode.c +++ b/lib/libufs/inode.c @@ -48,6 +48,9 @@ #include +_Static_assert(LIBUFS_MAXBSIZE >= MAXBSIZE, + "LIBUFS_MAXBSIZE must be at least MAXBSIZE"); + int getinode(struct uufsd *disk, union dinodep *dp, ino_t inum) { diff --git a/lib/libufs/libufs.h b/lib/libufs/libufs.h index bb92e082a875..b76d15b338b4 100644 --- a/lib/libufs/libufs.h +++ b/lib/libufs/libufs.h @@ -29,6 +29,7 @@ #ifndef __LIBUFS_H__ #define __LIBUFS_H__ + #include /* @@ -38,6 +39,8 @@ */ #define LIBUFS_BUFALIGN 128 +#define LIBUFS_MAXBSIZE 65536 + /* * userland ufs disk. */ @@ -48,11 +51,11 @@ struct uufsd { } d_sbunion __aligned(LIBUFS_BUFALIGN); union { struct cg d_cg; /* cylinder group */ - char d_buf[MAXBSIZE]; /* cylinder group storage */ + char d_buf[LIBUFS_MAXBSIZE]; /* cylinder group storage */ } d_cgunion __aligned(LIBUFS_BUFALIGN); union { union dinodep d_ino[1]; /* inode block */ - char d_inos[MAXBSIZE]; /* inode block as buffer */ + char d_inos[LIBUFS_MAXBSIZE]; /* inode block as buffer */ } d_inosunion __aligned(LIBUFS_BUFALIGN); const char *d_name; /* disk name */ const char *d_error; /* human readable disk error */ From nobody Tue May 12 20:06:07 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gFSJw40q9z6d1n1 for ; Tue, 12 May 2026 20:06: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFSJw0SqWz3ZSS for ; Tue, 12 May 2026 20:06:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778616368; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yTe9hdH4duWDZNq9Icf9csEh00uyvVPAibqjpqtl4D0=; b=q7qzly9AWcJqfRwbDqIMZLLpUGrVc1mqTqr7p7s2G8GgeYXlY1QAHsWydBAMZODK44Wpo3 9bu9CVH+LELYSqCU2uXfvfSHn5ws+GUxOdpChJn9I2s3Pxirj6XomgV+rsI+Ps0qxR7Mys S2HsPwE6hEZMG4ooZdGj9TFqmiHw0gE3MaHNCIOpNCSloHZjQz0S6Eq49HEdSLQOyb+z23 w7GcA1RVjIPW8vn5CNoktD84TMFJnWhqwBEYaFzBLvFO5xTFplk3vgCSyWxUeMdq36u73J M+7E7u3PuHfAN5v+rdeIQ4sqDo5QZw3jKuc4kZcXZQPBM7lLZpvcHu6dHMjlcw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778616368; a=rsa-sha256; cv=none; b=dye4qUHri97dNp3x3zTIP44yr6bqHtUO+EPZIug1ynV2CrPFUrQMCmmIs6tvxcPeRbiVBs 1LefsDDK3RFSv5p8GSj4YQ0VEVZKn9lQkzKFOGkK0587tl/CE1uFuiDa6rVwWx/PI1+UOI kTUxaP9bcXXlt0A364WLusRtiXrzeqF6hbRa2UXLB9EulMJz9nF3z3iWmN7GzIP9WCGH6t +yd2NPk2zQlc7OgQYynEthuDx+AlguqPYQC43VkNuvIJrRciK+3unHKo+8ZkV28McMlItt zEB4vGSnz/3Oia5SAR3Sxyctj8WUi0qk0DOf4m4BZ6+9w0y1AxGXdX/XPc5JtA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778616368; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yTe9hdH4duWDZNq9Icf9csEh00uyvVPAibqjpqtl4D0=; b=UHbLW43Qni/TAMl87cCZmIfDEs/Hlz4wC0522XTy+RcCypITQfBxKpABzPHCg6cK+cOzh0 ZXXgtZ3qKwh7UoEaBFsL9EQ6gyk0KDoor0rD/6Adwlnlm8LawyAAAmbZ/rW4BY8ua0ZcSA 1nZGa7KnXU9Mg9qC8WcDV68unDD9z2zlmvEfPX+NaCbhuIc5Zlng6gtvIjLKHHO+VAlTKe QhsSkvev7qLayJn4TCGC3ycLvEOdj6pcKvSGbIrOQawQQ+qDcA/ibfZZ6EOV6UVhpdps1h lf8gzPanKlZHwVdqAgUO+UC6ysve8GqGmLwtoPafvQ0Zux/IZN6sWowO6qKUZQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFSJv708xz3ZN for ; Tue, 12 May 2026 20:06:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 213fe by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 20:06:07 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 8b4b995effb7 - main - cpuset: Move userspace declarations out of _cpuset.h List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: 8b4b995effb7911cc13706dc309d5e03c83b9a94 Auto-Submitted: auto-generated Date: Tue, 12 May 2026 20:06:07 +0000 Message-Id: <6a03882f.213fe.54e83363@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=8b4b995effb7911cc13706dc309d5e03c83b9a94 commit 8b4b995effb7911cc13706dc309d5e03c83b9a94 Author: Mark Johnston AuthorDate: 2026-05-12 17:47:25 +0000 Commit: Mark Johnston CommitDate: 2026-05-12 20:05:19 +0000 cpuset: Move userspace declarations out of _cpuset.h The _*.h headers are for structure definitions and should avoid dependencies on other headers. This convention is violated by using __BEGIN_DECLS/__END_DECLS. Move the declarations to cpuset.h, I see no reason they can't be there. Reviewed by: olce, brooks, kib MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D56856 --- sys/sys/_cpuset.h | 7 ------- sys/sys/cpuset.h | 7 ++++++- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/sys/sys/_cpuset.h b/sys/sys/_cpuset.h index b87cfb5d3f80..157192ed65ba 100644 --- a/sys/sys/_cpuset.h +++ b/sys/sys/_cpuset.h @@ -49,11 +49,4 @@ __BITSET_DEFINE(_cpuset, CPU_SETSIZE); typedef struct _cpuset cpuset_t; -#ifndef _KERNEL -__BEGIN_DECLS -cpuset_t *__cpuset_alloc(size_t set_size); -void __cpuset_free(cpuset_t *ptr); -__END_DECLS -#endif - #endif /* !_SYS__CPUSET_H_ */ diff --git a/sys/sys/cpuset.h b/sys/sys/cpuset.h index e861321586db..92c14b0de5eb 100644 --- a/sys/sys/cpuset.h +++ b/sys/sys/cpuset.h @@ -181,8 +181,13 @@ int cpusetobj_strscan(cpuset_t *, const char *); void ddb_display_cpuset(const cpuset_t *); #endif -#else +#else /* !_KERNEL */ +#include + __BEGIN_DECLS +cpuset_t *__cpuset_alloc(size_t set_size); +void __cpuset_free(cpuset_t *ptr); + int cpuset(cpusetid_t *); int cpuset_setid(cpuwhich_t, id_t, cpusetid_t); int cpuset_getid(cpulevel_t, cpuwhich_t, id_t, cpusetid_t *); From nobody Tue May 12 20:06:09 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gFSJx5Vmwz6d1bs for ; Tue, 12 May 2026 20:06:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFSJx3Ht4z3Zbb for ; Tue, 12 May 2026 20:06:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778616369; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YZYVYewwpfbuEElL49WvYx/DuWZEyelc5MQm+L7yp1k=; b=REIliy9tq41cQMVP7u7NySrKMphW7+LNeJiMijDretkYtG66BSvCEeeC/u0z1H/Lbh4Ih/ Y8P9k+U+x5BwirKPzS1n/VTf16q+W9kQQu/5E7ljyWi+fQ7gDb04l7NRp6YimwrWV0Revn M16tDjOTPZ2gW2rvxd1zVvn2h0KJGddYtL9lK1c9e4lSrNivE1lk+iLLIlXzM9QDhDxYdz etV7LeYABKdMPjz7dGeK09m3bFLkSRGG+epa1fSAa3DPyif6M1cBEb6wusGfnbc/GqjVtD yTGAqz+eAaQicMiHUtZz0TuMCYuSsozcEYQc+aqrZ9EMVD1PpEB1JOIKEEs46A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778616369; a=rsa-sha256; cv=none; b=RTcZ4XYEkKJK68we5DdnQ+cmMFNxO4YohKAhznsLVlJVIlW1RsH2ksNtwEx0ciiIkDk/m2 R7Cft4uqrtJYFvTm51bC47KW0EhNXYFmW2sABICY8zRbXlbTgdfnQwzJI0AfBnOAiJubQ5 viu2kQd34afjh3sE4YkLEw6cmoAuI3u9Dl67LvBG0ovrRQyqTG3R6NBrFqGA8zEu4fE5kd AYSVu9T1RGv2efwgG1b/MzzMMeqX99w28uBvkdZCBuxu+jyJFiMcOr2NzDkL0bwiSnzIYg ykRlxR12msRthfbZfcTsCieUJWHrFbGO1ewrB1MhWCZ0ViJFLoON88WkIpYotg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778616369; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YZYVYewwpfbuEElL49WvYx/DuWZEyelc5MQm+L7yp1k=; b=jQEWNcGCvpoKUF1EBzPY3NTMyrtDdbTqPbKboSI2Gyuu1+bV5WCutsJsnf5C502gJ+ci49 urI0Ff7dv3DvGEPJOrAaYfA5CyGucTr9Oxehz688HrjchT2aJsnpi4SLtEYWDQbBx6Yse9 O/2eDfSip8pCCdyP83KqsjkP+NsJdhtWkA/uMY0ILUyIPs6bU37m/4pY3Zo+KSvFjdNOyV 8e0WYfbYMRO1ycrux5LJHOiWifmFHv0p8cLPJKpyzI1s4cdLItj+ei7PK7QTxOoLkQEPfT OkBQG1WZHtb8OkEsY5ebs4VszD7z+abb9EDnMTNjgVbzNTTe5NfIdUNy4l5BwQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFSJx0gX4z3Ff for ; Tue, 12 May 2026 20:06:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 217ee by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 20:06:09 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: a6c4fe2d1a38 - main - if_vxlan: Update *m0 after a pullup List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: a6c4fe2d1a38885914b1c3e85508b965ccdb7874 Auto-Submitted: auto-generated Date: Tue, 12 May 2026 20:06:09 +0000 Message-Id: <6a038831.217ee.3920506b@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=a6c4fe2d1a38885914b1c3e85508b965ccdb7874 commit a6c4fe2d1a38885914b1c3e85508b965ccdb7874 Author: Mark Johnston AuthorDate: 2026-05-12 17:50:15 +0000 Commit: Mark Johnston CommitDate: 2026-05-12 20:05:19 +0000 if_vxlan: Update *m0 after a pullup vxlan_input()'s caller is supposed to free *m0 if it is non-NULL after the function returns. vxlan_input() failed to update *m0 after the pullup however, so if it hits an error case after the pullup, we'll free the mbuf twice. Currently this can happen only if the interface is brought down or due to a packet loop. Reported by: Yuxiang Yang, Yizhou Zhao, Xuewei Feng, Qi Li, and Ke Xu from Tsinghua University using GLM5.1 from Z.ai Reviewed by: pouria, zlei MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D56944 --- sys/net/if_vxlan.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/net/if_vxlan.c b/sys/net/if_vxlan.c index 3d51c3c421ff..da219217480f 100644 --- a/sys/net/if_vxlan.c +++ b/sys/net/if_vxlan.c @@ -2876,8 +2876,7 @@ vxlan_input(struct vxlan_socket *vso, uint32_t vni, struct mbuf **m0, ifp = sc->vxl_ifp; if (m->m_len < ETHER_HDR_LEN && - (m = m_pullup(m, ETHER_HDR_LEN)) == NULL) { - *m0 = NULL; + (m = *m0 = m_pullup(m, ETHER_HDR_LEN)) == NULL) { error = ENOBUFS; goto out; } From nobody Tue May 12 20:06:10 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gFSJy3pBsz6d1hh for ; Tue, 12 May 2026 20:06: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFSJy1xDTz3ZQV for ; Tue, 12 May 2026 20:06:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778616370; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/e7Dq6z67xH2cxMmC2kBS7Hbw6J3iPUq3Hq10flZe9k=; b=oHHGynWJn0bSPD2iJyMblSNXJooA+Ye6FgPmgo4BBCCu9174oC2gZaWVKCl6qnOdhFmjxY RNQXixjfZsSCv69hH5dyNaNyq1dD72qZJmpx3M2Wo86VkHG2cQd/JREOIhRA7tUw95UB3O gbUz4DWLGnC8UHL3ROoSFZvrwK+waJi6JXubPmUAaS57U7xys10zNaP9vklvZCzVIlx9ue r7t5n6e7TUCkSpDlv7jUYCH4yFD4JF22MY9mrJKB/qYVcmbQ3l58SdDiwa7Kb+d9mkCtnu zTd416EkRATVDol/uZhUuEKmzt8Snjx9Id+mF1YvsqWhgJwfX4S68beobMgUWw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778616370; a=rsa-sha256; cv=none; b=XOYFxFbtBsboXST9f7Kv/GPjFtEQKC+zY6Gkpi0Ppql4649Ki9TgMtLsC/eCRgkRnTKbRu dyh3n2otW2i23o6RUlb3qIh8qQM+pj6ExWK/7Q+p+wwe/vrArHRGescqx5edwMCxf93hcV zmEJDdTb2l2VIhYpEaQ/yC76Om8OFpQJ2SHrD+rd+hv5JPldtypYFVMzQZvt9KoMQYZw9l 2eIqSXizjRkuHQGISPcMu5zBUn4szvPQD9OMPEMIkRYerqtQVvGpeXChhVbUKHXrdYsPJI ZS/jDCO1BiQPNqXRjPNOanJoMI6aeH+RP4baQBnSCymrAMJ5zLH1DR4iYoXKGA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778616370; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/e7Dq6z67xH2cxMmC2kBS7Hbw6J3iPUq3Hq10flZe9k=; b=c4UsGbNPTrxj4Ec8/o1wtYmcpXuOkaujC5vTwvLpdLgWfZDvFNBH11Dm8gRBuVwkeIvenP AvcHu0DV1g9emgl2KFnxhKUyciMGEt5VLwUVEJL5DgUesi3CUhL7vvvJ+oSKD7WzyFm0fL a216pHtrmSAJqDAFRRM4Af6i9yzEbA5O3iumiay1oKKsGFWYannSaf7b68IWaFRFQSlbGz iQlod2Z1D2YAjOyxZ0kntyMc75ibn920TMqbIrhKGuRvcfRriols021meXN7tU35DXMG0H 6LGmpjWTXVnS2E7MEB2osRW93Z/wmGacX+wcWgOgBQjKmJXRMNtgFMUPr+a1Ew== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFSJy1XzFz2mC for ; Tue, 12 May 2026 20:06:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22e04 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 20:06:10 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: beab4a237a45 - main - igmp: Avoid leaving dangling pointers in the state-change queue List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: beab4a237a45aea809e81802b9e1e9ff30f3d929 Auto-Submitted: auto-generated Date: Tue, 12 May 2026 20:06:10 +0000 Message-Id: <6a038832.22e04.6ba24256@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=beab4a237a45aea809e81802b9e1e9ff30f3d929 commit beab4a237a45aea809e81802b9e1e9ff30f3d929 Author: Mark Johnston AuthorDate: 2026-05-12 17:53:49 +0000 Commit: Mark Johnston CommitDate: 2026-05-12 20:05:19 +0000 igmp: Avoid leaving dangling pointers in the state-change queue When igmp_v3_merge_state_changes() is iterating over state-change packets, there is a case where it'll free a queued packet but will fail to remove it from the queue. Fix that. Reported by: Yuxiang Yang, Yizhou Zhao, Xuewei Feng, Qi Li, and Ke Xu from Tsinghua University using GLM5.1 from Z.ai Reviewed by: pouria, glebius MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D56947 --- sys/netinet/igmp.c | 8 +++++--- sys/sys/mbuf.h | 8 ++++++++ 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/sys/netinet/igmp.c b/sys/netinet/igmp.c index 00288356cb1f..226f38a035fb 100644 --- a/sys/netinet/igmp.c +++ b/sys/netinet/igmp.c @@ -3326,10 +3326,12 @@ igmp_v3_merge_state_changes(struct in_multi *inm, struct mbufq *scq) CTR2(KTR_IGMPV3, "%s: outbound queue full, skipping whole packet %p", __func__, m); - mt = m->m_nextpkt; - if (!docopy) + m0 = m->m_nextpkt; + if (!docopy) { + mbufq_remove(gq, m); m_freem(m); - m = mt; + } + m = m0; continue; } diff --git a/sys/sys/mbuf.h b/sys/sys/mbuf.h index c5072cec904b..fb1a0a5b81d0 100644 --- a/sys/sys/mbuf.h +++ b/sys/sys/mbuf.h @@ -1656,6 +1656,14 @@ mbufq_enqueue(struct mbufq *mq, struct mbuf *m) return (0); } +static inline void +mbufq_remove(struct mbufq *mq, struct mbuf *m) +{ + + STAILQ_REMOVE(&mq->mq_head, m, mbuf, m_stailqpkt); + mq->mq_len--; +} + static inline struct mbuf * mbufq_dequeue(struct mbufq *mq) { From nobody Tue May 12 20:18:59 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gFSbx2hzPz6d2mS; Tue, 12 May 2026 20:19:09 +0000 (UTC) (envelope-from olce@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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFSbx22bnz3h2t; Tue, 12 May 2026 20:19:09 +0000 (UTC) (envelope-from olce@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778617149; 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=dwC6EyGqM3VgGY6zzqPAiOBTGOYInxlzz/DW1t59ZoY=; b=EpJNjnUKnDZjRBcLOU7kaQq1wXdepDQLqMPOCH9Ro9kMn9DVtYb3hC+9jrnFgQMYDQsPpo C7ugsHyfwyeQempTEKu/XCDQ+Vm6vvui4d/poDy8YB5bn9+svyhD/+oWQybFVHRBJPKp4Y fWQZrGwEVLLhMuWyQMp9+Jb6fJSs/yOZgq0FeiNZ4z7FJxFmFnuCxICN+87nv7fegnCkGk fqyFKu4Se0Y3cAW6MC5ddIxyYk7181Goi8yBhmvPxj/78eimNUNfaIZvAYZPjBLgEENfu6 wbrsB1DMltabZ2ldOFwaNniWXucEV9EdO0NZOD1WmcVr1SibStLTC8kMqqqYnQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778617149; a=rsa-sha256; cv=none; b=BaQTcjlZAYLx/SB62sCYNBK8vZ4wV3eIZyNFPgZKP59YwTJJ7+z6HwcMvhWmtALwuUBaZx 4A9rx1X7U3FBLKBkPn2FfefIuafbhgdC8kqmdWWW2jK6SAKdsDi7jOPc2ykduo12fmrsm5 jZgOEEWLeLfQkzyCKU/16ex2PAKLRNE5vZEWkjRWq3/rwR1H1JSIF2/fr9rlzuxwEqknfB ZoDN6DH5HzWd3wmUTG5PRBjUtrCgvNBYXS5gCfoFkYJaonmoEzQj4ielKoEaZ0u9IIUnfV YtVopo2NyQUlnlH8dgHSYp+bLa+qGvRZDO4uh7zOvki2i2wfulIAhzRJ7ZUJ6A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778617149; 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=dwC6EyGqM3VgGY6zzqPAiOBTGOYInxlzz/DW1t59ZoY=; b=o+myHmoU/5An4SnOqO4L9dgWASpOumZpDqZNRrg5d9YGc7x6MX2ooAT8pILP/KzgtiVkvH okD3JByH4yGAiRc+3gRcGhfw91W702ekbcO9OnJ8LgnI+5CJiYImBUJXDFYkrHo5drHtoH WEIrkIxpb9IqLCtTcAat4tJc3/eQdKFEASiu7aWruxXi5l6NjInPCoLWBDTyoOUneXp9IU W86YMWXblmVA+kCp5sUTF+4F4xxogsFbS9y2675O3Q+3eBxU8Bi5Jf9SFr7qa0z0bEPdqm 5OakrI18fHbDUPaAD4BYUJ2qLDpYZTEbqlIyackwM5vWB3WP6BTkeoXApSUmBw== Received: from ravel.localnet (lfbn-nic-1-328-19.w90-116.abo.wanadoo.fr [90.116.162.19]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: olce/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4gFSbw3WL3zyfF; Tue, 12 May 2026 20:19:08 +0000 (UTC) (envelope-from olce@freebsd.org) From: Olivier Certner To: Mark Johnston Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org, src-committers@freebsd.org Subject: Re: git: fab4acbb7db8 - main - vmem: Include param.h in the userspace port as well Date: Tue, 12 May 2026 22:18:59 +0200 Message-ID: <6585650.O1aUxXEVJ6@ravel> In-Reply-To: <6a038827.22295.56bc29ca@gitrepo.freebsd.org> References: <6a038827.22295.56bc29ca@gitrepo.freebsd.org> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: multipart/signed; boundary="nextPart2540870.bDOn7JOVgO"; micalg="pgp-sha384"; protocol="application/pgp-signature" --nextPart2540870.bDOn7JOVgO Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="utf-8"; protected-headers="v1" From: Olivier Certner To: Mark Johnston Date: Tue, 12 May 2026 22:18:59 +0200 Message-ID: <6585650.O1aUxXEVJ6@ravel> In-Reply-To: <6a038827.22295.56bc29ca@gitrepo.freebsd.org> References: <6a038827.22295.56bc29ca@gitrepo.freebsd.org> MIME-Version: 1.0 Hi Mark, > The branch main has been updated by markj: > > URL: https://cgit.FreeBSD.org/src/commit/?id=fab4acbb7db8ffc7082d1b60b3c8e446a7cfef90 > > commit fab4acbb7db8ffc7082d1b60b3c8e446a7cfef90 > Author: Mark Johnston > AuthorDate: 2026-05-12 17:46:24 +0000 > Commit: Mark Johnston > CommitDate: 2026-05-12 20:05:18 +0000 > > vmem: Include param.h in the userspace port as well > > It is required at least for NBBY. > > MFC after: 1 week Strictly speaking, NBBY requires only , a header I created to put simple and frequently used definitions such as nitems(), howmany() and round*(). Using it in these cases may be preferable. Regards. -- Olivier Certner --nextPart2540870.bDOn7JOVgO Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part. Content-Transfer-Encoding: 7Bit -----BEGIN PGP SIGNATURE----- iQIzBAABCQAdFiEEmNCxHjkosai0LYIujKEwQJceJicFAmoDizQACgkQjKEwQJce JicLpQ//Z5sSX2kt7BzHP9gOYsuRL54TK3WurHoe9OgOIBh/u+2ppOCTqAeAHS2J y1x0/c/l+GIKdifNh+A8JtWOKaQLqXBcTOcHqel8dkRsunfPXHSNvaEpIyFWxw1g xlQQeUzrzJapbD/8zv6kN+lwJSwndEtaornecTNpnIRXHxDoR5YBeBKgpXcr73uz J3IgOnqqHU6yky9BXRDi3WSwmuAjVtvY2NI1mBkvRK52Hs7ROkmcEHeOKpqyCBPq uHwSrvjgYQqM9j+4ktu+6Xq9q98D8QLevd9TsCnGgBk5Dk+VcXx+13DDXXbJE41x /TP+qVxaXvqDR0Yq9IuWaYQFozCJ97/fhN5wtk5RrOBhalm6i07GfeXxVvNFZa2M kwUrf5pXJbdcpbwV2aMlJvWcO9nNJeuubcRX3KXJxzyCWJb2SSsaamkBF8ZYlGXn CrMGquLPDIQYVi4dAJZhNCjid0B/clvlXsA5/6XzW9clj2zBdqdHRXykroh2CHnu xCMs9dIJ9C+vAUEYH4kjAnNUHcfie1CG88WQcg5gwMr2xIhPp+Z+2HDlCTSc57EK GqsejpWJVSO9ZnfC3dNaT9bMuJQFWrvZldMi6GGvahdPnhOEKcsjfRx65L65ligI f+1wLu26PyXAVzulSDviY025Uc66OiQ6mzazAIdcQpqkrKQEPoA= =p6Ih -----END PGP SIGNATURE----- --nextPart2540870.bDOn7JOVgO-- From nobody Tue May 12 20:25:05 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gFSkv37X6z6d3LS for ; Tue, 12 May 2026 20:25: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFSkv2lLmz3jLf for ; Tue, 12 May 2026 20:25:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778617511; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yT+qVqI+6F1k73ugDbTGAGiowNzQ7hDiwbp5MWWTdhA=; b=UU7G4Tolaif9sTflaHzJByQQWOD4slSe3P77N2ZuQsS9TogZPAFNArhuIqPzzx8pvZ4bDs 1a1B7aM/TyGqHY8Z9GcNB9McToVCWsHKR+D5HZp9NIR+BfchLVNR4RzpqPATOaQ6oIn7Qg 4M9CJJA8kZNxNd+cMc2bLcdlnW5Q0u1VmmEeinlLgfnSnyYBySTEQyLZhioP6O363C8VQf 2TR+2nICWU4k4ku84hZie8mwSycR4QqxM/zIBseBHJkys6x4sGTWamvBXi6LkGbE4C43mO WujLWQL4ATSMT5xAnAci5UuS/b1xhabA/BfsujgR8QnGZw1ilw36+bqJEH+3yA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778617511; a=rsa-sha256; cv=none; b=hXM7T98t6ntHE/Jx4zAuOLtsbp91+cIMtbrP2X777PGoakNY7PuwI8jdsjI8zpUVd8bCsb Pb7qXjU56xXjirL6RNjD2B8W31vBJfys++zwVOn1ZksmejBIcgn6mlobXq0K2towsPQ5YH ws/iwGE64D0UjrXMWEpJjO0qNDpG0/4oAF7JBMjFMgYkMBwgE3V86VmRAlGbDeGBPhmX+D VUR5Og6/z6dWTgHSPHcuOD6lbwrijLvVFy1cSG515No0lmsCdeB0/vEQg9hxyyC58D5whw sU5/I4WvFlqeZ6D4lrpIhiBOKI5CC9aRva+o4KTbs1ivnh/9Dkoval99GRiU/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778617511; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yT+qVqI+6F1k73ugDbTGAGiowNzQ7hDiwbp5MWWTdhA=; b=sVmDZh897arb+LngxRcANRP2XU5h5uWZPPynX6TgsLoWDkrZsDnW7pte0yQkTCPozdSGfs WMwDb2MrdgxdRc7ZuEm+9lXorkE43RpLZ7SARcRv+HBIoyC3ObYW7HhPWW4fl9/0qdSv5A PaFgXLBAMqgDpGv3l3GEaxDytLszldVzgMtfVe/h2BVG+mlZHRjqafzS1UN39kOAVmHsBd den+wzJv9Bf6dpBzo1+/nJGMdmPM1tM6KO/OoccRiu9IzPMjDAhegYwmGKsLhs0qDFzBg+ 5QtUzfNCu9Ffa5f2huhZr5ZDqNSueS7mH3YNxpHkZIopOOiOGg0xcw5HTElaDA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFSkv0tQYz3q1 for ; Tue, 12 May 2026 20:25:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 24392 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 20:25:05 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 644b4646c7ac - main - OpenSSH: Update to 10.1p1 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: 644b4646c7acab87dc20d4e5dd53d2d9da152989 Auto-Submitted: auto-generated Date: Tue, 12 May 2026 20:25:05 +0000 Message-Id: <6a038ca1.24392.5194335f@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=644b4646c7acab87dc20d4e5dd53d2d9da152989 commit 644b4646c7acab87dc20d4e5dd53d2d9da152989 Merge: beab4a237a45 6409980cbba7 Author: Ed Maste AuthorDate: 2026-05-12 20:24:10 +0000 Commit: Ed Maste CommitDate: 2026-05-12 20:24:10 +0000 OpenSSH: Update to 10.1p1 Full release notes are available at https://www.openssh.com/txt/release-10.1 Selected highlights from the release notes: Potentially-incompatible changes * ssh(1): add a warning when the connection negotiates a non-post quantum key agreement algorithm. * ssh(1), sshd(8): major changes to handling of DSCP marking/IPQoS * ssh(1), sshd(8): deprecate support for IPv4 type-of-service (ToS) keywords in the IPQoS configuration directive. * ssh-add(1): when adding certificates to an agent, set the expiry to the certificate expiry time plus a short (5 min) grace period. * ssh-agent(1), sshd(8): move agent listener sockets from /tmp to under ~/.ssh/agent for both ssh-agent(1) and forwarded sockets in sshd(8). Security * ssh(1): disallow control characters in usernames passed via the commandline or expanded using %-sequences from the configuration file, and disallow \0 characters in ssh:// URIs. New features * ssh(1), sshd(8): add SIGINFO handlers to log active channel and session information. Sponsored by: The FreeBSD Foundation crypto/openssh/.depend | 25 +- crypto/openssh/.github/ci-status.md | 22 +- crypto/openssh/.github/configs | 13 +- crypto/openssh/.github/install_libcrypto.sh | 75 + crypto/openssh/.github/install_putty.sh | 37 + crypto/openssh/.github/run_test.sh | 23 +- crypto/openssh/.github/setup_ci.sh | 73 +- crypto/openssh/.github/workflows/c-cpp.yml | 89 +- crypto/openssh/.github/workflows/selfhosted.yml | 15 +- crypto/openssh/.github/workflows/upstream.yml | 11 +- crypto/openssh/.github/workflows/vm.yml | 371 + crypto/openssh/.gitignore | 1 + crypto/openssh/.skipped-commit-ids | 7 + crypto/openssh/ChangeLog | 11611 +++++++++++-------- crypto/openssh/INSTALL | 2 +- crypto/openssh/Makefile.in | 70 +- crypto/openssh/PROTOCOL | 126 +- crypto/openssh/PROTOCOL.agent | 13 +- crypto/openssh/PROTOCOL.certkeys | 326 - crypto/openssh/PROTOCOL.chacha20poly1305 | 107 - crypto/openssh/README | 2 +- crypto/openssh/TODO | 2 +- crypto/openssh/atomicio.c | 6 - crypto/openssh/audit-bsm.c | 2 +- crypto/openssh/audit-linux.c | 4 +- crypto/openssh/auth-krb5.c | 2 +- crypto/openssh/auth-options.c | 7 +- crypto/openssh/auth-pam.c | 127 +- crypto/openssh/auth-passwd.c | 4 +- crypto/openssh/auth-rhosts.c | 4 +- crypto/openssh/auth-shadow.c | 4 +- crypto/openssh/auth.c | 7 +- crypto/openssh/auth2-chall.c | 10 +- crypto/openssh/auth2-hostbased.c | 15 +- crypto/openssh/auth2-pubkey.c | 16 +- crypto/openssh/auth2-pubkeyfile.c | 23 +- crypto/openssh/auth2.c | 2 +- crypto/openssh/authfd.c | 27 +- crypto/openssh/authfd.h | 8 +- crypto/openssh/authfile.c | 8 +- crypto/openssh/channels.c | 115 +- crypto/openssh/channels.h | 13 +- crypto/openssh/cipher.c | 17 +- crypto/openssh/clientloop.c | 55 +- crypto/openssh/config.h | 45 +- crypto/openssh/configure.ac | 110 +- crypto/openssh/contrib/Makefile | 7 +- crypto/openssh/contrib/README | 8 +- crypto/openssh/contrib/cygwin/ssh-user-config | 3 +- crypto/openssh/contrib/gnome-ssh-askpass4.c | 249 + crypto/openssh/contrib/redhat/openssh.spec | 17 +- crypto/openssh/contrib/redhat/sshd.init | 2 +- crypto/openssh/contrib/ssh-copy-id | 15 +- crypto/openssh/contrib/suse/openssh.spec | 3 +- crypto/openssh/crypto_api.h | 4 +- crypto/openssh/defines.h | 14 + crypto/openssh/digest-libc.c | 3 +- crypto/openssh/dispatch.c | 6 +- crypto/openssh/dns.c | 8 +- crypto/openssh/dns.h | 5 +- crypto/openssh/groupaccess.c | 21 +- crypto/openssh/gss-genr.c | 2 +- crypto/openssh/gss-serv.c | 2 +- crypto/openssh/hmac.c | 2 +- crypto/openssh/hostfile.c | 62 +- crypto/openssh/kex-names.c | 64 +- crypto/openssh/kex.c | 9 +- crypto/openssh/kex.h | 7 +- crypto/openssh/kexdh.c | 3 +- crypto/openssh/kexecdh.c | 3 +- crypto/openssh/kexgen.c | 6 +- crypto/openssh/kexgexc.c | 6 +- crypto/openssh/kexgexs.c | 7 +- crypto/openssh/kexmlkem768x25519.c | 6 +- crypto/openssh/krb5_config.h | 1 + crypto/openssh/krl.c | 5 +- crypto/openssh/log.c | 4 +- crypto/openssh/loginrec.c | 48 +- crypto/openssh/logintest.c | 2 - crypto/openssh/m4/openssh.m4 | 42 +- crypto/openssh/mac.c | 23 +- crypto/openssh/misc-agent.c | 357 + crypto/openssh/misc.c | 103 +- crypto/openssh/misc.h | 9 +- crypto/openssh/moduli | 859 +- crypto/openssh/moduli.c | 59 +- crypto/openssh/monitor.c | 86 +- crypto/openssh/monitor_fdpass.c | 12 +- crypto/openssh/monitor_wrap.c | 93 +- crypto/openssh/monitor_wrap.h | 6 +- crypto/openssh/mux.c | 23 +- crypto/openssh/openbsd-compat/Makefile.in | 5 +- crypto/openssh/openbsd-compat/arc4random.c | 2 - crypto/openssh/openbsd-compat/arc4random_uniform.c | 4 +- crypto/openssh/openbsd-compat/bsd-misc.c | 55 +- crypto/openssh/openbsd-compat/bsd-misc.h | 14 +- crypto/openssh/openbsd-compat/bsd-openpty.c | 8 +- crypto/openssh/openbsd-compat/bsd-poll.h | 6 +- crypto/openssh/openbsd-compat/daemon.c | 4 +- crypto/openssh/openbsd-compat/glob.c | 2 - crypto/openssh/openbsd-compat/include/netgroup.h | 0 crypto/openssh/openbsd-compat/include/util.h | 0 crypto/openssh/openbsd-compat/memmem.c | 2 - crypto/openssh/openbsd-compat/openssl-compat.c | 9 +- crypto/openssh/openbsd-compat/openssl-compat.h | 19 +- crypto/openssh/openbsd-compat/port-prngd.c | 4 +- crypto/openssh/openbsd-compat/reallocarray.c | 2 - crypto/openssh/openbsd-compat/recallocarray.c | 2 - .../openssh/openbsd-compat/regress/utimensattest.c | 12 +- crypto/openssh/packet.c | 107 +- crypto/openssh/packet.h | 8 +- crypto/openssh/pathnames.h | 13 +- crypto/openssh/pkcs11.h | 1502 ++- crypto/openssh/platform.c | 15 +- crypto/openssh/poly1305.c | 4 +- crypto/openssh/progressmeter.c | 12 +- crypto/openssh/readconf.c | 75 +- crypto/openssh/readconf.h | 8 +- crypto/openssh/readpass.c | 8 +- crypto/openssh/regress/Makefile | 69 +- crypto/openssh/regress/agent-pkcs11-cert.sh | 57 +- crypto/openssh/regress/agent-pkcs11-restrict.sh | 31 +- crypto/openssh/regress/agent-pkcs11.sh | 72 +- crypto/openssh/regress/agent-restrict.sh | 17 +- crypto/openssh/regress/agent.sh | 8 +- crypto/openssh/regress/cert-hostkey.sh | 4 +- crypto/openssh/regress/cert-userkey.sh | 6 +- crypto/openssh/regress/cfgmatch.sh | 4 +- crypto/openssh/regress/cfgparse.sh | 19 +- crypto/openssh/regress/connect-bigconf.sh | 17 + crypto/openssh/regress/dropbear-server.sh | 76 + crypto/openssh/regress/dsa_ssh2.prv | 14 - crypto/openssh/regress/dsa_ssh2.pub | 13 - crypto/openssh/regress/dynamic-forward.sh | 4 +- crypto/openssh/regress/hostbased.sh | 3 +- crypto/openssh/regress/keygen-comment.sh | 3 +- crypto/openssh/regress/keytype.sh | 4 +- crypto/openssh/regress/knownhosts-command.sh | 3 +- crypto/openssh/regress/krl.sh | 3 +- crypto/openssh/regress/limit-keytype.sh | 6 +- crypto/openssh/regress/misc/fuzz-harness/Makefile | 11 +- .../regress/misc/fuzz-harness/agent_fuzz_helper.c | 7 - .../openssh/regress/misc/fuzz-harness/fixed-keys.h | 26 - .../fuzz-harness/testdata/create-agent-corpus.sh | 2 +- .../misc/fuzz-harness/testdata/id_dsa-cert.pub | 1 - crypto/openssh/regress/misc/sk-dummy/sk-dummy.c | 7 +- .../regress/misc/ssh-verify-attestation/Makefile | 4 +- .../ssh-verify-attestation.c | 7 +- crypto/openssh/regress/modpipe.c | 4 +- crypto/openssh/regress/netcat.c | 36 +- crypto/openssh/regress/password.sh | 60 + crypto/openssh/regress/penalty-expire.sh | 2 +- crypto/openssh/regress/penalty.sh | 2 +- crypto/openssh/regress/percent.sh | 45 +- crypto/openssh/regress/rekey.sh | 2 +- crypto/openssh/regress/ssh-com-client.sh | 14 +- crypto/openssh/regress/ssh-com.sh | 26 +- crypto/openssh/regress/ssh2putty.sh | 3 +- crypto/openssh/regress/sshcfgparse.sh | 27 +- crypto/openssh/regress/sshsig.sh | 4 +- crypto/openssh/regress/test-exec.sh | 54 +- crypto/openssh/regress/unittests/Makefile.inc | 29 +- crypto/openssh/regress/unittests/authopt/Makefile | 8 +- crypto/openssh/regress/unittests/authopt/tests.c | 10 +- crypto/openssh/regress/unittests/bitmap/Makefile | 7 +- crypto/openssh/regress/unittests/bitmap/tests.c | 32 +- .../openssh/regress/unittests/conversion/Makefile | 4 +- .../openssh/regress/unittests/conversion/tests.c | 10 +- crypto/openssh/regress/unittests/hostkeys/Makefile | 8 +- .../regress/unittests/hostkeys/mktestdata.sh | 13 +- .../regress/unittests/hostkeys/test_iterate.c | 214 +- .../regress/unittests/hostkeys/testdata/dsa_1.pub | 1 - .../regress/unittests/hostkeys/testdata/dsa_2.pub | 1 - .../regress/unittests/hostkeys/testdata/dsa_3.pub | 1 - .../regress/unittests/hostkeys/testdata/dsa_4.pub | 1 - .../regress/unittests/hostkeys/testdata/dsa_5.pub | 1 - .../regress/unittests/hostkeys/testdata/dsa_6.pub | 1 - .../unittests/hostkeys/testdata/known_hosts | 12 +- crypto/openssh/regress/unittests/hostkeys/tests.c | 13 +- crypto/openssh/regress/unittests/kex/Makefile | 8 +- crypto/openssh/regress/unittests/kex/test_kex.c | 79 +- .../openssh/regress/unittests/kex/test_proposal.c | 2 - crypto/openssh/regress/unittests/kex/tests.c | 9 +- crypto/openssh/regress/unittests/match/Makefile | 4 +- crypto/openssh/regress/unittests/match/tests.c | 10 +- crypto/openssh/regress/unittests/misc/Makefile | 6 +- crypto/openssh/regress/unittests/misc/test_argv.c | 2 - .../openssh/regress/unittests/misc/test_convtime.c | 2 - .../openssh/regress/unittests/misc/test_expand.c | 31 +- .../openssh/regress/unittests/misc/test_hpdelim.c | 2 - crypto/openssh/regress/unittests/misc/test_misc.c | 436 + crypto/openssh/regress/unittests/misc/test_parse.c | 10 +- .../openssh/regress/unittests/misc/test_ptimeout.c | 8 +- .../openssh/regress/unittests/misc/test_strdelim.c | 2 - .../openssh/regress/unittests/misc/test_xextendf.c | 89 + crypto/openssh/regress/unittests/misc/tests.c | 14 +- .../openssh/regress/unittests/sshbuf/test_sshbuf.c | 4 +- .../regress/unittests/sshbuf/test_sshbuf_fixed.c | 4 +- .../regress/unittests/sshbuf/test_sshbuf_fuzz.c | 4 +- .../unittests/sshbuf/test_sshbuf_getput_basic.c | 11 +- .../unittests/sshbuf/test_sshbuf_getput_crypto.c | 11 +- .../unittests/sshbuf/test_sshbuf_getput_fuzz.c | 18 +- .../regress/unittests/sshbuf/test_sshbuf_misc.c | 223 +- crypto/openssh/regress/unittests/sshbuf/tests.c | 12 +- crypto/openssh/regress/unittests/sshkey/Makefile | 6 +- crypto/openssh/regress/unittests/sshkey/common.c | 49 +- crypto/openssh/regress/unittests/sshkey/common.h | 5 +- .../openssh/regress/unittests/sshkey/mktestdata.sh | 53 +- .../openssh/regress/unittests/sshkey/test_file.c | 98 +- .../openssh/regress/unittests/sshkey/test_fuzz.c | 77 +- .../openssh/regress/unittests/sshkey/test_sshkey.c | 225 +- .../regress/unittests/sshkey/testdata/dsa_1 | 12 - .../unittests/sshkey/testdata/dsa_1-cert.fp | 1 - .../unittests/sshkey/testdata/dsa_1-cert.pub | 1 - .../regress/unittests/sshkey/testdata/dsa_1.fp | 1 - .../regress/unittests/sshkey/testdata/dsa_1.fp.bb | 1 - .../unittests/sshkey/testdata/dsa_1.param.g | 1 - .../unittests/sshkey/testdata/dsa_1.param.priv | 1 - .../unittests/sshkey/testdata/dsa_1.param.pub | 1 - .../regress/unittests/sshkey/testdata/dsa_1.pub | 1 - .../regress/unittests/sshkey/testdata/dsa_1_pw | 15 - .../regress/unittests/sshkey/testdata/dsa_2 | 12 - .../regress/unittests/sshkey/testdata/dsa_2.fp | 1 - .../regress/unittests/sshkey/testdata/dsa_2.fp.bb | 1 - .../regress/unittests/sshkey/testdata/dsa_2.pub | 1 - .../regress/unittests/sshkey/testdata/dsa_n | 21 - .../regress/unittests/sshkey/testdata/dsa_n_pw | 21 - crypto/openssh/regress/unittests/sshkey/tests.c | 10 +- crypto/openssh/regress/unittests/sshsig/Makefile | 6 +- .../openssh/regress/unittests/sshsig/mktestdata.sh | 8 +- .../openssh/regress/unittests/sshsig/testdata/dsa | 12 - .../regress/unittests/sshsig/testdata/dsa.pub | 1 - .../regress/unittests/sshsig/testdata/dsa.sig | 13 - crypto/openssh/regress/unittests/sshsig/tests.c | 15 +- .../openssh/regress/unittests/test_helper/fuzz.c | 7 +- .../regress/unittests/test_helper/test_helper.c | 214 +- .../regress/unittests/test_helper/test_helper.h | 28 +- crypto/openssh/regress/unittests/utf8/Makefile | 7 +- crypto/openssh/regress/unittests/utf8/tests.c | 8 +- crypto/openssh/sandbox-capsicum.c | 8 +- crypto/openssh/sandbox-darwin.c | 6 +- crypto/openssh/sandbox-seccomp-filter.c | 66 +- crypto/openssh/scp.1 | 19 +- crypto/openssh/scp.c | 48 +- crypto/openssh/servconf.c | 93 +- crypto/openssh/serverloop.c | 40 +- crypto/openssh/session.c | 56 +- crypto/openssh/sftp-client.c | 40 +- crypto/openssh/sftp-client.h | 3 +- crypto/openssh/sftp-common.c | 2 - crypto/openssh/sftp-glob.c | 4 +- crypto/openssh/sftp-server.c | 16 +- crypto/openssh/sftp.c | 22 +- crypto/openssh/sk-api.h | 2 - crypto/openssh/sk-usbhid.c | 11 +- crypto/openssh/srclimit.c | 16 +- crypto/openssh/ssh-add.1 | 13 +- crypto/openssh/ssh-add.c | 224 +- crypto/openssh/ssh-agent.1 | 38 +- crypto/openssh/ssh-agent.c | 141 +- crypto/openssh/ssh-dss.c | 457 - crypto/openssh/ssh-ecdsa.c | 35 +- crypto/openssh/ssh-ed25519.c | 37 +- crypto/openssh/ssh-keygen.1 | 13 +- crypto/openssh/ssh-keygen.c | 320 +- crypto/openssh/ssh-keyscan.1 | 6 +- crypto/openssh/ssh-keyscan.c | 42 +- crypto/openssh/ssh-keysign.c | 14 +- crypto/openssh/ssh-pkcs11-client.c | 517 +- crypto/openssh/ssh-pkcs11-helper.c | 221 +- crypto/openssh/ssh-pkcs11.c | 862 +- crypto/openssh/ssh-pkcs11.h | 14 +- crypto/openssh/ssh-rsa.c | 50 +- crypto/openssh/ssh-sk-helper.c | 19 +- crypto/openssh/ssh-sk.c | 4 +- crypto/openssh/ssh-xmss.c | 389 - crypto/openssh/ssh.c | 117 +- crypto/openssh/ssh_config | 3 +- crypto/openssh/ssh_config.5 | 50 +- crypto/openssh/ssh_namespace.h | 44 +- crypto/openssh/sshbuf-getput-basic.c | 4 +- crypto/openssh/sshbuf-misc.c | 63 +- crypto/openssh/sshbuf.h | 18 +- crypto/openssh/sshconnect.c | 39 +- crypto/openssh/sshconnect2.c | 4 +- crypto/openssh/sshd-auth.c | 35 +- crypto/openssh/sshd-session.c | 38 +- crypto/openssh/sshd.8 | 6 +- crypto/openssh/sshd.c | 60 +- crypto/openssh/sshd_config | 2 +- crypto/openssh/sshd_config.5 | 27 +- crypto/openssh/sshkey-xmss.c | 1113 -- crypto/openssh/sshkey-xmss.h | 56 - crypto/openssh/sshkey.c | 233 +- crypto/openssh/sshkey.h | 43 +- crypto/openssh/sshlogin.c | 2 +- crypto/openssh/sshpty.c | 10 +- crypto/openssh/sshsig.c | 5 +- crypto/openssh/uidswap.c | 8 +- crypto/openssh/umac.c | 9 +- crypto/openssh/version.h | 8 +- crypto/openssh/xmalloc.c | 8 +- crypto/openssh/xmss_commons.c | 36 - crypto/openssh/xmss_commons.h | 21 - crypto/openssh/xmss_fast.c | 1106 -- crypto/openssh/xmss_fast.h | 111 - crypto/openssh/xmss_hash.c | 137 - crypto/openssh/xmss_hash.h | 22 - crypto/openssh/xmss_hash_address.c | 66 - crypto/openssh/xmss_hash_address.h | 40 - crypto/openssh/xmss_wots.c | 192 - crypto/openssh/xmss_wots.h | 64 - secure/lib/libssh/Makefile | 4 +- secure/ssh.mk | 2 +- 314 files changed, 14462 insertions(+), 14120 deletions(-) diff --cc crypto/openssh/.github/install_libcrypto.sh index 000000000000,d1aa23450679..d1aa23450679 mode 000000,100755..100755 --- a/crypto/openssh/.github/install_libcrypto.sh +++ b/crypto/openssh/.github/install_libcrypto.sh diff --cc crypto/openssh/.github/install_putty.sh index 000000000000,6d6d0ad49f41..6d6d0ad49f41 mode 000000,100755..100755 --- a/crypto/openssh/.github/install_putty.sh +++ b/crypto/openssh/.github/install_putty.sh diff --cc crypto/openssh/.github/workflows/vm.yml index 000000000000,9dcf5fcca764..9dcf5fcca764 mode 000000,100644..100644 --- a/crypto/openssh/.github/workflows/vm.yml +++ b/crypto/openssh/.github/workflows/vm.yml diff --cc crypto/openssh/.gitignore index c419d0fd662b,000000000000..df0f2ce0464e mode 100644,000000..100644 --- a/crypto/openssh/.gitignore +++ b/crypto/openssh/.gitignore @@@ -1,39 -1,0 +1,40 @@@ +Makefile +buildpkg.sh +config.h +config.h.in~ +config.log +config.status +openbsd-compat/Makefile +openbsd-compat/regress/Makefile ++openbsd-compat/include +openssh.xml +opensshd.init +survey.sh +**/*.o +**/*.lo +**/*.so +**/*.dylib +**/*.dll +**/*.out +**/*.a +**/*.un~ +**/.*.swp +autom4te.cache/ +scp +sftp +sftp-server +ssh +ssh-add +ssh-agent +ssh-keygen +ssh-keyscan +ssh-keysign +ssh-pkcs11-helper +ssh-sk-helper +sshd +sshd-session +sshd-auth +!regress/misc/**/Makefile +!regress/unittests/**/Makefile +tags + diff --cc crypto/openssh/INSTALL index 113c25cc2203,000000000000..32f2e9ad53b5 mode 100644,000000..100644 --- a/crypto/openssh/INSTALL +++ b/crypto/openssh/INSTALL @@@ -1,295 -1,0 +1,295 @@@ +1. Prerequisites +---------------- + +A C compiler. Any C89 or better compiler that supports variadic macros +should work. Where supported, configure will attempt to enable the +compiler's run-time integrity checking options. Some notes about +specific compilers: + - clang: -ftrapv and -sanitize=integer require the compiler-rt runtime + (CC=clang LDFLAGS=--rtlib=compiler-rt ./configure) + +To support Privilege Separation (which is now required) you will need +to create the user, group and directory used by sshd for privilege +separation. See README.privsep for details. + + +The remaining items are optional. + +A working installation of zlib: +Zlib 1.1.4 or 1.2.1.2 or greater (earlier 1.2.x versions have problems): +https://zlib.net/ + +libcrypto from either of LibreSSL or OpenSSL. Building without libcrypto +is supported but severely restricts the available ciphers and algorithms. + - LibreSSL (https://www.libressl.org/) 3.1.0 or greater + - OpenSSL (https://www.openssl.org) 1.1.1 or greater + +LibreSSL/OpenSSL should be compiled as a position-independent library +(i.e. -fPIC, eg by configuring OpenSSL as "./config [options] -fPIC" +or LibreSSL as "CFLAGS=-fPIC ./configure") otherwise OpenSSH will not +be able to link with it. If you must use a non-position-independent +libcrypto, then you may need to configure OpenSSH --without-pie. + +If you build either from source, running the OpenSSL self-test ("make +tests") or the LibreSSL equivalent ("make check") and ensuring that all +tests pass is strongly recommended. + +NB. If you operating system supports /dev/random, you should configure +libcrypto (LibreSSL/OpenSSL) to use it. OpenSSH relies on libcrypto's +direct support of /dev/random, or failing that, either prngd or egd. + +PRNGD: + +If your system lacks kernel-based random collection, the use of Lutz +Jaenicke's PRNGd is recommended. If you are using libcrypto it requires +that the libcrypto is configured to support it. If you are building +--without-openssl then the --with-prngd-socket option must match the +socket provided by prngd. + +http://prngd.sourceforge.net/ + +EGD: + +The Entropy Gathering Daemon (EGD) supports the same interface as prngd. +The same caveats about configuration for prngd also apply. + +http://egd.sourceforge.net/ + +PAM: + +OpenSSH can utilise Pluggable Authentication Modules (PAM) if your +system supports it. PAM is standard most Linux distributions, Solaris, +HP-UX 11, AIX >= 5.2, FreeBSD, NetBSD and Mac OS X. + +Information about the various PAM implementations are available: + +Solaris PAM: http://www.sun.com/software/solaris/pam/ +Linux PAM: http://www.kernel.org/pub/linux/libs/pam/ +OpenPAM: http://www.openpam.org/ + +If you wish to build the GNOME passphrase requester, you will need the GNOME +libraries and headers. + +GNOME: +http://www.gnome.org/ + +Alternatively, Jim Knoble has written an excellent X11 +passphrase requester. This is maintained separately at: + +http://www.jmknoble.net/software/x11-ssh-askpass/ + +TCP Wrappers: + +If you wish to use the TCP wrappers functionality you will need at least +tcpd.h and libwrap.a, either in the standard include and library paths, +or in the directory specified by --with-tcp-wrappers. Version 7.6 is +known to work. + +http://ftp.porcupine.org/pub/security/index.html + +LibEdit: + +sftp supports command-line editing via NetBSD's libedit. If your platform +has it available natively you can use that, alternatively you might try +these multi-platform ports: + +http://www.thrysoee.dk/editline/ +http://sourceforge.net/projects/libedit/ + +LDNS: + +LDNS is a DNS BSD-licensed resolver library which supports DNSSEC. + +http://nlnetlabs.nl/projects/ldns/ + +Autoconf: + +If you modify configure.ac or configure doesn't exist (eg if you checked +the main git branch) then you will need autoconf-2.69 and automake-1.16.1 +or newer to rebuild the automatically generated files by running +"autoreconf". Earlier versions may also work but this is not guaranteed. + +http://www.gnu.org/software/autoconf/ +http://www.gnu.org/software/automake/ + +Basic Security Module (BSM): + +Native BSM support is known to exist in Solaris from at least 2.5.1, +FreeBSD 6.1 and OS X. Alternatively, you may use the OpenBSM +implementation (http://www.openbsm.org). + +makedepend: + +https://www.x.org/archive/individual/util/ + +If you are making significant changes to the code you may need to rebuild +the dependency (.depend) file using "make depend", which requires the +"makedepend" tool from the X11 distribution. + +libfido2: + +libfido2 allows the use of hardware security keys over USB. libfido2 +in turn depends on libcbor. libfido2 >= 1.5.0 is strongly recommended. +Limited functionality is possible with earlier libfido2 versions. + +https://github.com/Yubico/libfido2 +https://github.com/pjk/libcbor + + +2. Building / Installation +-------------------------- + +To install OpenSSH with default options: + +./configure +make +make install + +This will install the OpenSSH binaries in /usr/local/bin, configuration files +in /usr/local/etc, the server in /usr/local/sbin, etc. To specify a different +installation prefix, use the --prefix option to configure: + +./configure --prefix=/opt +make +make install + +Will install OpenSSH in /opt/{bin,etc,lib,sbin}. You can also override +specific paths, for example: + +./configure --prefix=/opt --sysconfdir=/etc/ssh +make +make install + +This will install the binaries in /opt/{bin,lib,sbin}, but will place the +configuration files in /etc/ssh. + +If you are using PAM, you may need to manually install a PAM control +file as "/etc/pam.d/sshd" (or wherever your system prefers to keep +them). Note that the service name used to start PAM is __progname, +which is the basename of the path of your sshd (e.g., the service name +for /usr/sbin/osshd will be osshd). If you have renamed your sshd +executable, your PAM configuration may need to be modified. + +A generic PAM configuration is included as "contrib/sshd.pam.generic", +you may need to edit it before using it on your system. If you are +using a recent version of Red Hat Linux, the config file in +contrib/redhat/sshd.pam should be more useful. Failure to install a +valid PAM file may result in an inability to use password +authentication. On HP-UX 11 and Solaris, the standard /etc/pam.conf +configuration will work with sshd (sshd will match the other service +name). + +There are a few other options to the configure script: + +--with-audit=[module] enable additional auditing via the specified module. +Currently, drivers for "debug" (additional info via syslog) and "bsm" +(Sun's Basic Security Module) are supported. + +--with-pam enables PAM support. If PAM support is compiled in, it must +also be enabled in sshd_config (refer to the UsePAM directive). + +--with-prngd-socket=/some/file allows you to enable EGD or PRNGD +support and to specify a PRNGd socket. Use this if your Unix lacks +/dev/random. + +--with-prngd-port=portnum allows you to enable EGD or PRNGD support +and to specify a EGD localhost TCP port. Use this if your Unix lacks +/dev/random. + +--with-lastlog=FILE will specify the location of the lastlog file. +./configure searches a few locations for lastlog, but may not find +it if lastlog is installed in a different place. + +--without-lastlog will disable lastlog support entirely. + +--with-osfsia, --without-osfsia will enable or disable OSF1's Security +Integration Architecture. The default for OSF1 machines is enable. + +--with-tcp-wrappers will enable TCP Wrappers (/etc/hosts.allow|deny) +support. + +--with-utmpx enables utmpx support. utmpx support is automatic for +some platforms. + +--without-shadow disables shadow password support. + +--with-ipaddr-display forces the use of a numeric IP address in the +$DISPLAY environment variable. Some broken systems need this. + +--with-default-path=PATH allows you to specify a default $PATH for sessions +started by sshd. This replaces the standard path entirely. + +--with-pid-dir=PATH specifies the directory in which the sshd.pid file is +created. + +--with-xauth=PATH specifies the location of the xauth binary + +--with-ssl-dir=DIR allows you to specify where your Libre/OpenSSL +libraries are installed. + +--with-ssl-engine enables Libre/OpenSSL's (hardware) ENGINE support + +--without-openssl builds without using OpenSSL. Only a subset of ciphers +and algorithms are supported in this configuration. + +--without-zlib builds without zlib. This disables the Compression option. + +--with-4in6 Check for IPv4 in IPv6 mapped addresses and convert them to +real (AF_INET) IPv4 addresses. Works around some quirks on Linux. + +If you need to pass special options to the compiler or linker, you +can specify these as environment variables before running ./configure. +For example: + +CC="/usr/foo/cc" CFLAGS="-O" LDFLAGS="-s" LIBS="-lrubbish" ./configure + +3. Configuration +---------------- + +The runtime configuration files are installed by in ${prefix}/etc or +whatever you specified as your --sysconfdir (/usr/local/etc by default). + +The default configuration should be instantly usable, though you should +review it to ensure that it matches your security requirements. + +To generate a host key, run "make host-key". Alternately you can do so +manually using the following commands: + + ssh-keygen -t [type] -f /etc/ssh/ssh_host_key -N "" + - for each of the types you wish to generate (rsa, dsa or ecdsa) or ++for each of the types you wish to generate (rsa, ed25519 or ecdsa) or + + ssh-keygen -A + +to generate keys for all supported types. + +Replacing /etc/ssh with the correct path to the configuration directory. +(${prefix}/etc or whatever you specified with --sysconfdir during +configuration). + +If you have configured OpenSSH with EGD/prngd support, ensure that EGD or +prngd is running and has collected some entropy first. + +For more information on configuration, please refer to the manual pages +for sshd, ssh and ssh-agent. + +4. (Optional) Send survey +------------------------- + +$ make survey +[check the contents of the file "survey" to ensure there's no information +that you consider sensitive] +$ make send-survey + +This will send configuration information for the currently configured +host to a survey address. This will help determine which configurations +are actually in use, and what valid combinations of configure options +exist. The raw data is available only to the OpenSSH developers, however +summary data may be published. + +5. Problems? +------------ + +If you experience problems compiling, installing or running OpenSSH, +please refer to the "reporting bugs" section of the webpage at +https://www.openssh.com/ diff --cc crypto/openssh/auth.c index 28ee390f4a15,000000000000..496a0194b100 mode 100644,000000..100644 --- a/crypto/openssh/auth.c +++ b/crypto/openssh/auth.c @@@ -1,788 -1,0 +1,787 @@@ - /* $OpenBSD: auth.c,v 1.162 2024/09/15 01:18:26 djm Exp $ */ ++/* $OpenBSD: auth.c,v 1.163 2025/09/15 04:39:15 djm Exp $ */ +/* + * Copyright (c) 2000 Markus Friedl. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include "includes.h" + +#include +#include +#include +#include + +#include + +#include +#include +#include - #ifdef HAVE_PATHS_H - # include - #endif ++#include +#include +#ifdef HAVE_LOGIN_H +#include +#endif +#ifdef USE_SHADOW +#include +#endif +#include +#include +#include +#include +#include +#include +#include + +#include "xmalloc.h" +#include "match.h" +#include "groupaccess.h" +#include "log.h" +#include "sshbuf.h" +#include "misc.h" +#include "servconf.h" +#include "sshkey.h" +#include "hostfile.h" +#include "auth.h" +#include "auth-options.h" +#include "canohost.h" +#include "uidswap.h" +#include "packet.h" +#include "loginrec.h" +#ifdef GSSAPI +#include "ssh-gss.h" +#endif +#include "authfile.h" +#include "monitor_wrap.h" +#include "ssherr.h" +#include "channels.h" +#include "blocklist_client.h" + +/* import */ +extern ServerOptions options; +extern struct include_list includes; +extern struct sshbuf *loginmsg; +extern struct passwd *privsep_pw; +extern struct sshauthopt *auth_opts; + +/* Debugging messages */ +static struct sshbuf *auth_debug; + +/* + * Check if the user is allowed to log in via ssh. If user is listed + * in DenyUsers or one of user's groups is listed in DenyGroups, false + * will be returned. If AllowUsers isn't empty and user isn't listed + * there, or if AllowGroups isn't empty and one of user's groups isn't + * listed there, false will be returned. + * If the user's shell is not executable, false will be returned. + * Otherwise true is returned. + */ +int +allowed_user(struct ssh *ssh, struct passwd * pw) +{ + struct stat st; + const char *hostname = NULL, *ipaddr = NULL; + u_int i; + int r; + + /* Shouldn't be called if pw is NULL, but better safe than sorry... */ + if (!pw || !pw->pw_name) + return 0; + + if (!options.use_pam && platform_locked_account(pw)) { + logit("User %.100s not allowed because account is locked", + pw->pw_name); + return 0; + } + + /* + * Deny if shell does not exist or is not executable unless we + * are chrooting. + */ + if (options.chroot_directory == NULL || + strcasecmp(options.chroot_directory, "none") == 0) { + char *shell = xstrdup((pw->pw_shell[0] == '\0') ? + _PATH_BSHELL : pw->pw_shell); /* empty = /bin/sh */ + + if (stat(shell, &st) == -1) { + logit("User %.100s not allowed because shell %.100s " + "does not exist", pw->pw_name, shell); + free(shell); + return 0; + } + if (S_ISREG(st.st_mode) == 0 || + (st.st_mode & (S_IXOTH|S_IXUSR|S_IXGRP)) == 0) { + logit("User %.100s not allowed because shell %.100s " + "is not executable", pw->pw_name, shell); + free(shell); + return 0; + } + free(shell); + } + + if (options.num_deny_users > 0 || options.num_allow_users > 0 || + options.num_deny_groups > 0 || options.num_allow_groups > 0) { + hostname = auth_get_canonical_hostname(ssh, options.use_dns); + ipaddr = ssh_remote_ipaddr(ssh); + } + + /* Return false if user is listed in DenyUsers */ + if (options.num_deny_users > 0) { + for (i = 0; i < options.num_deny_users; i++) { + r = match_user(pw->pw_name, hostname, ipaddr, + options.deny_users[i]); + if (r < 0) { + fatal("Invalid DenyUsers pattern \"%.100s\"", + options.deny_users[i]); + } else if (r != 0) { + logit("User %.100s from %.100s not allowed " + "because listed in DenyUsers", + pw->pw_name, hostname); + return 0; + } + } + } + /* Return false if AllowUsers isn't empty and user isn't listed there */ + if (options.num_allow_users > 0) { + for (i = 0; i < options.num_allow_users; i++) { + r = match_user(pw->pw_name, hostname, ipaddr, + options.allow_users[i]); + if (r < 0) { + fatal("Invalid AllowUsers pattern \"%.100s\"", + options.allow_users[i]); + } else if (r == 1) + break; + } + /* i < options.num_allow_users iff we break for loop */ + if (i >= options.num_allow_users) { + logit("User %.100s from %.100s not allowed because " + "not listed in AllowUsers", pw->pw_name, hostname); + return 0; + } + } + if (options.num_deny_groups > 0 || options.num_allow_groups > 0) { + /* Get the user's group access list (primary and supplementary) */ + if (ga_init(pw->pw_name, pw->pw_gid) == 0) { + logit("User %.100s from %.100s not allowed because " + "not in any group", pw->pw_name, hostname); + return 0; + } + + /* Return false if one of user's groups is listed in DenyGroups */ + if (options.num_deny_groups > 0) + if (ga_match(options.deny_groups, + options.num_deny_groups)) { + ga_free(); + logit("User %.100s from %.100s not allowed " + "because a group is listed in DenyGroups", + pw->pw_name, hostname); + return 0; + } + /* + * Return false if AllowGroups isn't empty and one of user's groups + * isn't listed there + */ + if (options.num_allow_groups > 0) + if (!ga_match(options.allow_groups, + options.num_allow_groups)) { + ga_free(); + logit("User %.100s from %.100s not allowed " + "because none of user's groups are listed " + "in AllowGroups", pw->pw_name, hostname); + return 0; + } + ga_free(); + } + +#ifdef CUSTOM_SYS_AUTH_ALLOWED_USER + if (!sys_auth_allowed_user(pw, loginmsg)) + return 0; +#endif + + /* We found no reason not to let this user try to log on... */ + return 1; +} + +/* + * Formats any key left in authctxt->auth_method_key for inclusion in + * auth_log()'s message. Also includes authxtct->auth_method_info if present. + */ +static char * +format_method_key(Authctxt *authctxt) +{ + const struct sshkey *key = authctxt->auth_method_key; + const char *methinfo = authctxt->auth_method_info; + char *fp, *cafp, *ret = NULL; + + if (key == NULL) + return NULL; + + if (sshkey_is_cert(key)) { + fp = sshkey_fingerprint(key, + options.fingerprint_hash, SSH_FP_DEFAULT); + cafp = sshkey_fingerprint(key->cert->signature_key, + options.fingerprint_hash, SSH_FP_DEFAULT); + xasprintf(&ret, "%s %s ID %s (serial %llu) CA %s %s%s%s", + sshkey_type(key), fp == NULL ? "(null)" : fp, + key->cert->key_id, + (unsigned long long)key->cert->serial, + sshkey_type(key->cert->signature_key), + cafp == NULL ? "(null)" : cafp, + methinfo == NULL ? "" : ", ", + methinfo == NULL ? "" : methinfo); + free(fp); *** 15227 LINES SKIPPED *** From nobody Tue May 12 20:37:32 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gFT1B55LQz6d4DN; Tue, 12 May 2026 20:37:34 +0000 (UTC) (envelope-from markj@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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFT1B4VzBz3mJq; Tue, 12 May 2026 20:37:34 +0000 (UTC) (envelope-from markj@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778618254; 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=9aGTZHEidYgdZhvhgFus82YALn7RqmFVfjDL0bv/yO4=; b=p2LvhPwYJShZNGJWPN5ghkTAziFhBNQbGSS8RQn4bcJ2fU9iXyev8IWhNmdh5pZ7zYTyp+ XJ0aL754A3yNfqQScGPFYDL9+IqZNSZ6f5TMnDsW6EB7zLAV9oh3fP2Mt8uGk5iCg8ibwv NPsFWCOQV216ojvplVjTu+o3+dmY5qXasNlju3tSI94wY2AC42ssJqjebmaUJKvmCz2xmv DofjFBE3+8VLEiKgHZ5ZHrh7fsHKZdsO4o4nGCpAdk1Crag+VpZ/ZCQOo3vDaXlDP+2TR0 eGI5Kj/zjvHbcZvpkqaCm4PU18adUyg2oXMcKbzfinrx9gq4kBZC/ieNHuhbAA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778618254; a=rsa-sha256; cv=none; b=jScmUK19tzxScnsN5pBqFtKaI3wl87TSU8yQ8OuplRIW7F/etdvXrjgmmqhkIrjIy6CHZm sApBiiT7r546DwGWVCOKJDv/8chyipDxnHryR0AefvnRXuQGfzg0vBgP764MgI28dXIQY7 tzYxPo4ibkQwg1UF+H0UKdF5mFkhtmJUkiSQN7NlqcwoKrNeurnyEyJLuIMKfqbjuMyZ8i s4N/m09Yy6Wq2CUfdSsNhfuNYB68KdsanU8hoZiOlcmZgHzKZuen2JPVpjBrADSBKS4tKO H8OoJgCndNhk+tMfk5OZ8+LpTx3pgAI0/XQnJPbvxJQYb8Bci94wQpSaaP4FRw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778618254; 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=9aGTZHEidYgdZhvhgFus82YALn7RqmFVfjDL0bv/yO4=; b=RyayIPzCDhhoigmx+pr5qk3/FH2z9RPWJdWf8AUZPsx6xlKuIayIWzhaUfVph55sItOcMP Ufg6Bxu4PMJWlplQ//6lnZV0RvCphbHpIvtGu72RHTZw8rtYp81drJTyK/1qlWDsWcqk+a 18J7v1F4hn86xgclMLQyd4ZSMwhz31LnN0vLc2S0hY+RQOe82EiNgchR8L847x0iZxuWuA glE/Brf5GCZQr//1nqDdI6uJ+v1bG25puFNlx793w7DKsqPu9+8EHiZG6HEiVq7I4YIfmh PhFxTTbXEnmNAMDAqyxizeLdUXbSljLyHr243Snq+9meCEG4Erzm/oaSN8yX5g== Received: from nuc (192-0-220-237.cpe.teksavvy.com [192.0.220.237]) (using TLSv1.3 with cipher TLS_AES_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: markj) by smtp.freebsd.org (Postfix) with ESMTPSA id 4gFT1B2c9Pz10lp; Tue, 12 May 2026 20:37:34 +0000 (UTC) (envelope-from markj@freebsd.org) Date: Tue, 12 May 2026 16:37:32 -0400 From: Mark Johnston To: Olivier Certner Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: fab4acbb7db8 - main - vmem: Include param.h in the userspace port as well Message-ID: References: <6a038827.22295.56bc29ca@gitrepo.freebsd.org> <6585650.O1aUxXEVJ6@ravel> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <6585650.O1aUxXEVJ6@ravel> On Tue, May 12, 2026 at 10:18:59PM +0200, Olivier Certner wrote: > Hi Mark, > > > The branch main has been updated by markj: > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=fab4acbb7db8ffc7082d1b60b3c8e446a7cfef90 > > > > commit fab4acbb7db8ffc7082d1b60b3c8e446a7cfef90 > > Author: Mark Johnston > > AuthorDate: 2026-05-12 17:46:24 +0000 > > Commit: Mark Johnston > > CommitDate: 2026-05-12 20:05:18 +0000 > > > > vmem: Include param.h in the userspace port as well > > > > It is required at least for NBBY. > > > > MFC after: 1 week > > Strictly speaking, NBBY requires only , a header I created to put simple and frequently used definitions such as nitems(), howmany() and round*(). Using it in these cases may be preferable. Yes, it looks like _param.h is sufficient here. I think it's ok to just keep it as param.h given that 1) it's not a header and 2) we already include sys/param.h in the #ifdef _KERNEL case. From nobody Tue May 12 21:12:35 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gFTnj3dQTz6d6Rm for ; Tue, 12 May 2026 21:12: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFTnh70dhz3tmn for ; Tue, 12 May 2026 21:12:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778620361; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6DggzHgCT3sEWsoHRPLJjxv0DW7hUTMhiEWwMYWoWxE=; b=qAN0iDwTtrTOOdzWW29zjzii/n+cHewn/GyCBF52MsDi7nAKnj5LaCr1n2tPNklXdwR4Rv BFktV5mnhF/PTHT8lPpTfpnD7asBD/awTwYhz/xFg7fhhGHRQN4J/OaM5Za1HFsMCnT6Rl I11TF5ecoTwNKHKiNSokdGyZPzA8705EMmUyT45nmNVwnWvM7IFB3JrNuSy8GoRzUDTrci L3y0ZXcDCzZIeLByFzTD511oudKXeLWVPZVJDzF15L9MYOs2aHUFc5ljR4+id8IBYd+4mz +63wxWcH1S8QSP3Td1mIMnf2PRTcVWJDyYOc4VPd1U7EoHryS1pzvfg3Q3CM2g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778620361; a=rsa-sha256; cv=none; b=xQSHrr75CxdxihBLDtyrMUiR7wAp9bIgoVVUzczyRq1XpNnQsqMzVQ1uDTeM4W6t8eMnJz 5x//RmPJT8ZMx4CrXpbCdYCn1JK9JoDZk7pqYLko3uEATGVXuFZA8sp7CfyRUCQ5dCjYig esumQA8h6D6laTtwGcE4pigsAdH5oOD6aMj+AAaCvg0fn6qY76CT2ENB5EFkx97T4hyxSn I56r5GxtUZuGXtH8S7MJsv7L2+wTg2MriKaoe7WDnawG1FKgDxlYzZYZj62fMGRVlAucVO FEoUMc2p6qcjRchw1SXjvmdwYeFM68igljY7ytI1LJD3cR2pkyNFhgEHPoAhrw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778620361; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6DggzHgCT3sEWsoHRPLJjxv0DW7hUTMhiEWwMYWoWxE=; b=Qr3tLxYW1DLWWaeFfJtJ3jau6XcK+QOw1ryiPIipGgv3M5XsgxiLEpjrU7GlVLbZ7IcV0E DwcrsOwOUq7YwTrRAf4nqKzl8yAk7jlahjShuXVTZ3CXYrK/4YzHTFTKUMhU8etftI70C+ foFC2TwKamWlfVDd5677JzHtUxfg/vNw2+5J6Xa7nw5kLBx8lFBHkI3Ko4IryczA2o9Yrx 4KLn9KQnt6zLwIiev52YhIr+IRIXn16mEXKqApZVMHSaLZoHUqwTEZwE53EQhXWyxuXOKr Hjgehz+lvFeHFR+wqdMpqh8xT0LvzVmgoovFCgt1vUha3lGNvLwWS5VYcwL5NQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFTnh6XxHz56t for ; Tue, 12 May 2026 21:12:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27cd6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 21:12:35 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: e68aa5ab80ab - main - OpenSSH: Update to 10.2p1 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: e68aa5ab80ab57bdbcbe94dd2922a018d675e7f0 Auto-Submitted: auto-generated Date: Tue, 12 May 2026 21:12:35 +0000 Message-Id: <6a0397c3.27cd6.3581a08b@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=e68aa5ab80ab57bdbcbe94dd2922a018d675e7f0 commit e68aa5ab80ab57bdbcbe94dd2922a018d675e7f0 Merge: 644b4646c7ac 17ecafb37c65 Author: Ed Maste AuthorDate: 2026-05-12 21:12:09 +0000 Commit: Ed Maste CommitDate: 2026-05-12 21:12:09 +0000 OpenSSH: Update to 10.2p1 Full release notes are available at https://www.openssh.com/txt/release-10.2 Selected highlights from the release notes: Bugfixes -------- * ssh(1): fix mishandling of terminal connections when ControlPersist was active that rendered the session unusable. bz3872 Sponsored by: The FreeBSD Foundation crypto/openssh/.depend | 2 +- crypto/openssh/.github/ci-status.md | 5 + crypto/openssh/.github/run_test.sh | 1 - crypto/openssh/ChangeLog | 183 +++++++++++++++++++++++------ crypto/openssh/Makefile.in | 2 +- crypto/openssh/README | 2 +- crypto/openssh/auth-pam.c | 2 +- crypto/openssh/channels.c | 9 +- crypto/openssh/channels.h | 3 +- crypto/openssh/config.h | 5 +- crypto/openssh/configure.ac | 2 + crypto/openssh/contrib/redhat/openssh.spec | 2 +- crypto/openssh/contrib/suse/openssh.spec | 2 +- crypto/openssh/openbsd-compat/arc4random.h | 4 +- crypto/openssh/openbsd-compat/bsd-misc.c | 24 ++++ crypto/openssh/openbsd-compat/bsd-misc.h | 8 ++ crypto/openssh/regress/test-exec.sh | 12 +- crypto/openssh/ssh-pkcs11-helper.c | 16 --- crypto/openssh/ssh-pkcs11.c | 31 ++++- crypto/openssh/ssh_namespace.h | 1 - crypto/openssh/sshkey.c | 8 ++ crypto/openssh/version.h | 4 +- 22 files changed, 248 insertions(+), 80 deletions(-) diff --cc crypto/openssh/config.h index 23d24fadf6cd,000000000000..b7f432596b55 mode 100644,000000..100644 --- a/crypto/openssh/config.h +++ b/crypto/openssh/config.h @@@ -1,2115 -1,0 +1,2118 @@@ +/* config.h. Generated from config.h.in by configure. */ +/* config.h.in. Generated from configure.ac by autoheader. */ + +/* Define if building universal (internal helper macro) */ +/* #undef AC_APPLE_UNIVERSAL_BUILD */ + +/* Define if you have a getaddrinfo that fails for the all-zeros IPv6 address + */ +/* #undef AIX_GETNAMEINFO_HACK */ + +/* Define if your AIX loginfailed() function takes 4 arguments (AIX >= 5.2) */ +/* #undef AIX_LOGINFAILED_4ARG */ + +/* System only supports IPv4 audit records */ +/* #undef AU_IPv4 */ + +/* Define if your resolver libs need this for getrrsetbyname */ +/* #undef BIND_8_COMPAT */ + +/* The system has incomplete BSM API */ +/* #undef BROKEN_BSM_API */ + +/* broken in chroots on older kernels */ +/* #undef BROKEN_CLOSEFROM */ + +/* Define if cmsg_type is not passed correctly */ +/* #undef BROKEN_CMSG_TYPE */ + +/* getaddrinfo is broken (if present) */ +/* #undef BROKEN_GETADDRINFO */ + +/* getgroups(0,NULL) will return -1 */ +/* #undef BROKEN_GETGROUPS */ + +/* getline is not what we expect */ +/* #undef BROKEN_GETLINE */ + +/* FreeBSD glob does not do what we need */ +#define BROKEN_GLOB 1 + +/* Define if you system's inet_ntoa is busted (e.g. Irix gcc issue) */ +/* #undef BROKEN_INET_NTOA */ + +/* Define if your struct dirent expects you to allocate extra space for d_name + */ +/* #undef BROKEN_ONE_BYTE_DIRENT_D_NAME */ + +/* System poll(2) implementation is broken */ +/* #undef BROKEN_POLL */ + +/* Can't do comparisons on readv */ +/* #undef BROKEN_READV_COMPARISON */ + +/* NetBSD read function is sometimes redirected, breaking atomicio comparisons + against it */ +/* #undef BROKEN_READ_COMPARISON */ + +/* Needed for NeXT */ +/* #undef BROKEN_SAVED_UIDS */ + +/* Define if your setregid() is broken */ +/* #undef BROKEN_SETREGID */ + +/* Define if your setresgid() is broken */ +/* #undef BROKEN_SETRESGID */ + +/* Define if your setresuid() is broken */ +/* #undef BROKEN_SETRESUID */ + +/* Define if your setreuid() is broken */ +/* #undef BROKEN_SETREUID */ + +/* LynxOS has broken setvbuf() implementation */ +/* #undef BROKEN_SETVBUF */ + +/* QNX shadow support is broken */ +/* #undef BROKEN_SHADOW_EXPIRE */ + +/* Define if your snprintf is busted */ +/* #undef BROKEN_SNPRINTF */ + +/* strndup broken, see APAR IY61211 */ +/* #undef BROKEN_STRNDUP */ + +/* strnlen broken, see APAR IY62551 */ +/* #undef BROKEN_STRNLEN */ + +/* strnvis detected broken */ +#define BROKEN_STRNVIS 1 + +/* tcgetattr with ICANON may hang */ +/* #undef BROKEN_TCGETATTR_ICANON */ + +/* updwtmpx is broken (if present) */ +/* #undef BROKEN_UPDWTMPX */ + +/* Define if you have BSD auth support */ +/* #undef BSD_AUTH */ + +/* Define if you want to specify the path to your lastlog file */ +/* #undef CONF_LASTLOG_FILE */ + +/* Define if you want to specify the path to your utmp file */ +/* #undef CONF_UTMP_FILE */ + +/* Define if you want to specify the path to your wtmpx file */ +/* #undef CONF_WTMPX_FILE */ + +/* Define if you want to specify the path to your wtmp file */ +/* #undef CONF_WTMP_FILE */ + +/* Need to call setpgrp as root */ +/* #undef DISABLE_FD_PASSING */ + +/* Define if you don't want to use lastlog */ +/* #undef DISABLE_LASTLOG */ + +/* Define if you don't want to use your system's login() call */ +/* #undef DISABLE_LOGIN */ + +/* Define if you don't want to use pututline() etc. to write [uw]tmp */ +/* #undef DISABLE_PUTUTLINE */ + +/* Define if you don't want to use pututxline() etc. to write [uw]tmpx */ +/* #undef DISABLE_PUTUTXLINE */ + +/* Define if you want to disable shadow passwords */ +/* #undef DISABLE_SHADOW */ + +/* Define if you don't want to use utmp */ +#define DISABLE_UTMP 1 + +/* Define if you don't want to use utmpx */ +/* #undef DISABLE_UTMPX */ + +/* Define if you don't want to use wtmp */ +#define DISABLE_WTMP 1 + +/* Define if you don't want to use wtmpx */ +#define DISABLE_WTMPX 1 + +/* Enable for PKCS#11 support */ +#define ENABLE_PKCS11 /**/ + +/* Enable for U2F/FIDO support */ +#define ENABLE_SK /**/ + +/* Enable for built-in U2F/FIDO support */ +/* #undef ENABLE_SK_INTERNAL */ + +/* define if fflush(NULL) does not work */ +/* #undef FFLUSH_NULL_BUG */ + +/* File names may not contain backslash characters */ +/* #undef FILESYSTEM_NO_BACKSLASH */ + +/* fsid_t has member val */ +/* #undef FSID_HAS_VAL */ + +/* fsid_t has member __val */ +/* #undef FSID_HAS___VAL */ + +/* getpgrp takes one arg */ +#define GETPGRP_VOID 1 + +/* Conflicting defs for getspnam */ +/* #undef GETSPNAM_CONFLICTING_DEFS */ + +/* Define if your system glob() function has the GLOB_ALTDIRFUNC extension */ +#define GLOB_HAS_ALTDIRFUNC 1 + +/* Define if your system glob() function has gl_matchc options in glob_t */ +#define GLOB_HAS_GL_MATCHC 1 + +/* Define if your system glob() function has gl_statv options in glob_t */ +/* #undef GLOB_HAS_GL_STATV */ + +/* Define this if you want GSSAPI support in the version 2 protocol */ +/* #undef GSSAPI */ + +/* Define if you want to use shadow password expire field */ +/* #undef HAS_SHADOW_EXPIRE */ + +/* Define if your system uses access rights style file descriptor passing */ +/* #undef HAVE_ACCRIGHTS_IN_MSGHDR */ + +/* Define if you have ut_addr in utmp.h */ +/* #undef HAVE_ADDR_IN_UTMP */ + +/* Define if you have ut_addr in utmpx.h */ +/* #undef HAVE_ADDR_IN_UTMPX */ + +/* Define if you have ut_addr_v6 in utmp.h */ +/* #undef HAVE_ADDR_V6_IN_UTMP */ + +/* Define if you have ut_addr_v6 in utmpx.h */ +/* #undef HAVE_ADDR_V6_IN_UTMPX */ + +/* Define to 1 if you have the 'arc4random' function. */ +#define HAVE_ARC4RANDOM 1 + +/* Define to 1 if you have the 'arc4random_buf' function. */ +#define HAVE_ARC4RANDOM_BUF 1 + +/* Define to 1 if you have the 'arc4random_stir' function. */ +/* #undef HAVE_ARC4RANDOM_STIR */ + +/* Define to 1 if you have the 'arc4random_uniform' function. */ +#define HAVE_ARC4RANDOM_UNIFORM 1 + +/* Define to 1 if you have the 'asprintf' function. */ +#define HAVE_ASPRINTF 1 + +/* OpenBSD's gcc has bounded */ +/* #undef HAVE_ATTRIBUTE__BOUNDED__ */ + +/* Have attribute nonnull */ +#define HAVE_ATTRIBUTE__NONNULL__ 1 + +/* OpenBSD's gcc has sentinel */ +/* #undef HAVE_ATTRIBUTE__SENTINEL__ */ + +/* Define to 1 if you have the 'aug_get_machine' function. */ +/* #undef HAVE_AUG_GET_MACHINE */ + +/* Define to 1 if you have the 'auth_hostok' function. */ +#define HAVE_AUTH_HOSTOK 1 + +/* Define to 1 if you have the 'auth_timeok' function. */ +#define HAVE_AUTH_TIMEOK 1 + +/* Define to 1 if you have the 'b64_ntop' function. */ +/* #undef HAVE_B64_NTOP */ + +/* Define to 1 if you have the 'b64_pton' function. */ +/* #undef HAVE_B64_PTON */ + +/* Define if you have the basename function. */ +#define HAVE_BASENAME 1 + +/* Define to 1 if you have the 'bcopy' function. */ +#define HAVE_BCOPY 1 + +/* Define to 1 if you have the 'bcrypt_pbkdf' function. */ +/* #undef HAVE_BCRYPT_PBKDF */ + +/* Define to 1 if you have the 'bindresvport_sa' function. */ +#define HAVE_BINDRESVPORT_SA 1 + +/* Define to 1 if you have the 'blf_enc' function. */ +/* #undef HAVE_BLF_ENC */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_BLF_H */ + +/* Define to 1 if you have the 'Blowfish_expand0state' function. */ +/* #undef HAVE_BLOWFISH_EXPAND0STATE */ + +/* Define to 1 if you have the 'Blowfish_expandstate' function. */ +/* #undef HAVE_BLOWFISH_EXPANDSTATE */ + +/* Define to 1 if you have the 'Blowfish_initstate' function. */ +/* #undef HAVE_BLOWFISH_INITSTATE */ + +/* Define to 1 if you have the 'Blowfish_stream2word' function. */ +/* #undef HAVE_BLOWFISH_STREAM2WORD */ + +/* Define to 1 if you have the 'BN_is_prime_ex' function. */ +#define HAVE_BN_IS_PRIME_EX 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_BSD_LIBUTIL_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_BSM_AUDIT_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_BSTRING_H */ + +/* Define to 1 if you have the 'bzero' function. */ +#define HAVE_BZERO 1 + +/* calloc(0, x) returns NULL */ +#define HAVE_CALLOC 1 + +/* Define if you have caph_cache_tzdata */ +#define HAVE_CAPH_CACHE_TZDATA 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_CAPSICUM_HELPERS_H 1 + +/* Define to 1 if you have the 'cap_rights_limit' function. */ +#define HAVE_CAP_RIGHTS_LIMIT 1 + +/* Define to 1 if you have the 'clock' function. */ +#define HAVE_CLOCK 1 + +/* Have clock_gettime */ +#define HAVE_CLOCK_GETTIME 1 + +/* define if you have clock_t data type */ +#define HAVE_CLOCK_T 1 + +/* Define to 1 if you have the 'closefrom' function. */ +#define HAVE_CLOSEFROM 1 + +/* Define to 1 if you have the 'close_range' function. */ +#define HAVE_CLOSE_RANGE 1 + +/* Define if gai_strerror() returns const char * */ +#define HAVE_CONST_GAI_STRERROR_PROTO 1 + +/* Define if your system uses ancillary data style file descriptor passing */ +#define HAVE_CONTROL_IN_MSGHDR 1 + +/* Define to 1 if you have the 'crypt' function. */ +#define HAVE_CRYPT 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_CRYPTO_SHA2_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_CRYPT_H */ + +/* Define if you are on Cygwin */ +/* #undef HAVE_CYGWIN */ + +/* Define if your libraries define daemon() */ +#define HAVE_DAEMON 1 + +/* Define to 1 if you have the declaration of 'AI_NUMERICSERV', and to 0 if + you don't. */ +#define HAVE_DECL_AI_NUMERICSERV 1 + +/* Define to 1 if you have the declaration of 'authenticate', and to 0 if you + don't. */ +/* #undef HAVE_DECL_AUTHENTICATE */ + +/* Define to 1 if you have the declaration of 'bzero', and to 0 if you don't. + */ +#define HAVE_DECL_BZERO 1 + +/* Define to 1 if you have the declaration of 'ftruncate', and to 0 if you + don't. */ +#define HAVE_DECL_FTRUNCATE 1 + +/* Define to 1 if you have the declaration of 'getentropy', and to 0 if you + don't. */ +#define HAVE_DECL_GETENTROPY 1 + +/* Define to 1 if you have the declaration of 'getpeereid', and to 0 if you + don't. */ +#define HAVE_DECL_GETPEEREID 1 + +/* Define to 1 if you have the declaration of 'GLOB_NOMATCH', and to 0 if you + don't. */ +#define HAVE_DECL_GLOB_NOMATCH 1 + +/* Define to 1 if you have the declaration of 'GSS_C_NT_HOSTBASED_SERVICE', + and to 0 if you don't. */ +/* #undef HAVE_DECL_GSS_C_NT_HOSTBASED_SERVICE */ + +/* Define to 1 if you have the declaration of 'howmany', and to 0 if you + don't. */ +#define HAVE_DECL_HOWMANY 1 + +/* Define to 1 if you have the declaration of 'htole64', and to 0 if you + don't. */ +#define HAVE_DECL_HTOLE64 1 + +/* Define to 1 if you have the declaration of 'h_errno', and to 0 if you + don't. */ +#define HAVE_DECL_H_ERRNO 1 + +/* Define to 1 if you have the declaration of 'INFINITY', and to 0 if you + don't. */ +#define HAVE_DECL_INFINITY 1 + +/* Define to 1 if you have the declaration of 'le32toh', and to 0 if you + don't. */ +#define HAVE_DECL_LE32TOH 1 + +/* Define to 1 if you have the declaration of 'le64toh', and to 0 if you + don't. */ +#define HAVE_DECL_LE64TOH 1 + +/* Define to 1 if you have the declaration of 'loginfailed', and to 0 if you + don't. */ +/* #undef HAVE_DECL_LOGINFAILED */ + +/* Define to 1 if you have the declaration of 'loginrestrictions', and to 0 if + you don't. */ +/* #undef HAVE_DECL_LOGINRESTRICTIONS */ + +/* Define to 1 if you have the declaration of 'loginsuccess', and to 0 if you + don't. */ +/* #undef HAVE_DECL_LOGINSUCCESS */ + +/* Define to 1 if you have the declaration of 'MAXSYMLINKS', and to 0 if you + don't. */ +#define HAVE_DECL_MAXSYMLINKS 1 + +/* Define to 1 if you have the declaration of 'memmem', and to 0 if you don't. + */ +#define HAVE_DECL_MEMMEM 1 + +/* Define to 1 if you have the declaration of 'NFDBITS', and to 0 if you + don't. */ +#define HAVE_DECL_NFDBITS 1 + +/* Define to 1 if you have the declaration of 'offsetof', and to 0 if you + don't. */ +#define HAVE_DECL_OFFSETOF 1 + +/* Define to 1 if you have the declaration of 'O_NONBLOCK', and to 0 if you + don't. */ +#define HAVE_DECL_O_NONBLOCK 1 + +/* Define to 1 if you have the declaration of 'passwdexpired', and to 0 if you + don't. */ +/* #undef HAVE_DECL_PASSWDEXPIRED */ + +/* Define to 1 if you have the declaration of 'readv', and to 0 if you don't. + */ +#define HAVE_DECL_READV 1 + +/* Define to 1 if you have the declaration of 'setauthdb', and to 0 if you + don't. */ +/* #undef HAVE_DECL_SETAUTHDB */ + +/* Define to 1 if you have the declaration of 'SHUT_RD', and to 0 if you + don't. */ +#define HAVE_DECL_SHUT_RD 1 + +/* Define to 1 if you have the declaration of 'UINT32_MAX', and to 0 if you + don't. */ +#define HAVE_DECL_UINT32_MAX 1 + +/* Define to 1 if you have the declaration of 'writev', and to 0 if you don't. + */ +#define HAVE_DECL_WRITEV 1 + +/* Define to 1 if you have the declaration of '_getlong', and to 0 if you + don't. */ +#define HAVE_DECL__GETLONG 0 + +/* Define to 1 if you have the declaration of '_getshort', and to 0 if you + don't. */ +#define HAVE_DECL__GETSHORT 0 + +/* Define to 1 if you have the declaration of '__builtin_inff', and to 0 if + you don't. */ +/* #undef HAVE_DECL___BUILTIN_INFF */ + +/* Define to 1 if you have the 'DES_crypt' function. */ +#define HAVE_DES_CRYPT 1 + +/* Define if you have /dev/ptmx */ +/* #undef HAVE_DEV_PTMX */ + +/* Define if you have /dev/ptc */ +/* #undef HAVE_DEV_PTS_AND_PTC */ + +/* Define to 1 if you have the header file. */ +#define HAVE_DIRENT_H 1 + +/* Define to 1 if you have the 'dirfd' function. */ +#define HAVE_DIRFD 1 + +/* Define to 1 if you have the 'dirname' function. */ +#define HAVE_DIRNAME 1 + +/* Define to 1 if you have the 'dlopen' function. */ +#define HAVE_DLOPEN 1 + +/* Define to 1 if you have the 'EC_KEY_METHOD_new' function. */ +#define HAVE_EC_KEY_METHOD_NEW 1 + +/* Define to 1 if you have the 'EC_POINT_get_affine_coordinates' function. */ +#define HAVE_EC_POINT_GET_AFFINE_COORDINATES 1 + +/* Define to 1 if you have the 'EC_POINT_get_affine_coordinates_GFp' function. + */ +#define HAVE_EC_POINT_GET_AFFINE_COORDINATES_GFP 1 + +/* Define to 1 if you have the 'EC_POINT_set_affine_coordinates' function. */ +#define HAVE_EC_POINT_SET_AFFINE_COORDINATES 1 + +/* Define to 1 if you have the 'EC_POINT_set_affine_coordinates_GFp' function. + */ +#define HAVE_EC_POINT_SET_AFFINE_COORDINATES_GFP 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_ELF_H 1 + +/* Define to 1 if you have the 'endgrent' function. */ +#define HAVE_ENDGRENT 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_ENDIAN_H 1 + +/* Define to 1 if you have the 'endutent' function. */ +/* #undef HAVE_ENDUTENT */ + +/* Define to 1 if you have the 'endutxent' function. */ +#define HAVE_ENDUTXENT 1 + +/* Define to 1 if you have the 'err' function. */ +#define HAVE_ERR 1 + +/* Define to 1 if you have the 'errx' function. */ +#define HAVE_ERRX 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_ERR_H 1 + +/* Define if your system has /etc/default/login */ +/* #undef HAVE_ETC_DEFAULT_LOGIN */ + +/* Define to 1 if you have the 'EVP_chacha20' function. */ +#define HAVE_EVP_CHACHA20 1 + +/* Define to 1 if you have the 'EVP_CIPHER_CTX_get_iv' function. */ +/* #undef HAVE_EVP_CIPHER_CTX_GET_IV */ + +/* Define to 1 if you have the 'EVP_CIPHER_CTX_get_updated_iv' function. */ +#define HAVE_EVP_CIPHER_CTX_GET_UPDATED_IV 1 + +/* Define to 1 if you have the 'EVP_CIPHER_CTX_iv' function. */ +#define HAVE_EVP_CIPHER_CTX_IV 1 + +/* Define to 1 if you have the 'EVP_CIPHER_CTX_iv_noconst' function. */ +#define HAVE_EVP_CIPHER_CTX_IV_NOCONST 1 + +/* Define to 1 if you have the 'EVP_CIPHER_CTX_set_iv' function. */ +/* #undef HAVE_EVP_CIPHER_CTX_SET_IV */ + +/* Define to 1 if you have the 'EVP_DigestFinal_ex' function. */ +#define HAVE_EVP_DIGESTFINAL_EX 1 + +/* Define to 1 if you have the 'EVP_DigestInit_ex' function. */ +#define HAVE_EVP_DIGESTINIT_EX 1 + +/* Define to 1 if you have the 'EVP_DigestSign' function. */ +#define HAVE_EVP_DIGESTSIGN 1 + +/* Define to 1 if you have the 'EVP_DigestVerify' function. */ +#define HAVE_EVP_DIGESTVERIFY 1 + +/* Define to 1 if you have the 'EVP_MD_CTX_cleanup' function. */ +/* #undef HAVE_EVP_MD_CTX_CLEANUP */ + +/* Define to 1 if you have the 'EVP_MD_CTX_copy_ex' function. */ +#define HAVE_EVP_MD_CTX_COPY_EX 1 + +/* Define to 1 if you have the 'EVP_MD_CTX_init' function. */ +/* #undef HAVE_EVP_MD_CTX_INIT */ + +/* Define to 1 if you have the 'EVP_PKEY_get_raw_private_key' function. */ +#define HAVE_EVP_PKEY_GET_RAW_PRIVATE_KEY 1 + +/* Define to 1 if you have the 'EVP_PKEY_get_raw_public_key' function. */ +#define HAVE_EVP_PKEY_GET_RAW_PUBLIC_KEY 1 + +/* Define to 1 if you have the 'EVP_sha256' function. */ +#define HAVE_EVP_SHA256 1 + +/* Define to 1 if you have the 'EVP_sha384' function. */ +#define HAVE_EVP_SHA384 1 + +/* Define to 1 if you have the 'EVP_sha512' function. */ +#define HAVE_EVP_SHA512 1 + +/* Define if you have ut_exit in utmp.h */ +/* #undef HAVE_EXIT_IN_UTMP */ + +/* Define to 1 if you have the 'explicit_bzero' function. */ +#define HAVE_EXPLICIT_BZERO 1 + +/* Define to 1 if you have the 'explicit_memset' function. */ +/* #undef HAVE_EXPLICIT_MEMSET */ + +/* Define to 1 if you have the 'fchmod' function. */ +#define HAVE_FCHMOD 1 + +/* Define to 1 if you have the 'fchmodat' function. */ +#define HAVE_FCHMODAT 1 + +/* Define to 1 if you have the 'fchown' function. */ +#define HAVE_FCHOWN 1 + +/* Define to 1 if you have the 'fchownat' function. */ +#define HAVE_FCHOWNAT 1 + +/* Use F_CLOSEM fcntl for closefrom */ +/* #undef HAVE_FCNTL_CLOSEM */ + +/* Define to 1 if you have the header file. */ +#define HAVE_FCNTL_H 1 + +/* Define to 1 if the system has the type 'fd_mask'. */ +#define HAVE_FD_MASK 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_FEATURES_H */ + +/* Define to 1 if you have the 'fido_assert_set_clientdata' function. */ +/* #undef HAVE_FIDO_ASSERT_SET_CLIENTDATA */ + +/* Define to 1 if you have the 'fido_cred_prot' function. */ +/* #undef HAVE_FIDO_CRED_PROT */ + +/* Define to 1 if you have the 'fido_cred_set_clientdata' function. */ +/* #undef HAVE_FIDO_CRED_SET_CLIENTDATA */ + +/* Define to 1 if you have the 'fido_cred_set_prot' function. */ +/* #undef HAVE_FIDO_CRED_SET_PROT */ + +/* Define to 1 if you have the 'fido_dev_get_touch_begin' function. */ +/* #undef HAVE_FIDO_DEV_GET_TOUCH_BEGIN */ + +/* Define to 1 if you have the 'fido_dev_get_touch_status' function. */ +/* #undef HAVE_FIDO_DEV_GET_TOUCH_STATUS */ + +/* Define to 1 if you have the 'fido_dev_is_winhello' function. */ +/* #undef HAVE_FIDO_DEV_IS_WINHELLO */ + +/* Define to 1 if you have the 'fido_dev_supports_cred_prot' function. */ +/* #undef HAVE_FIDO_DEV_SUPPORTS_CRED_PROT */ + +/* Define to 1 if you have the header file. */ +#define HAVE_FLOATINGPOINT_H 1 + +/* Define to 1 if you have the 'flock' function. */ +#define HAVE_FLOCK 1 + +/* Define to 1 if you have the 'fmt_scaled' function. */ +/* #undef HAVE_FMT_SCALED */ + +/* Define to 1 if you have the 'fnmatch' function. */ +#define HAVE_FNMATCH 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_FNMATCH_H 1 + +/* Define to 1 if you have the 'freeaddrinfo' function. */ +#define HAVE_FREEADDRINFO 1 + +/* Define to 1 if you have the 'freezero' function. */ +/* #undef HAVE_FREEZERO */ + +/* Define to 1 if the system has the type 'fsblkcnt_t'. */ +#define HAVE_FSBLKCNT_T 1 + +/* Define to 1 if the system has the type 'fsfilcnt_t'. */ +#define HAVE_FSFILCNT_T 1 + +/* Define to 1 if you have the 'fstatat' function. */ +#define HAVE_FSTATAT 1 + +/* Define to 1 if you have the 'fstatfs' function. */ +#define HAVE_FSTATFS 1 + +/* Define to 1 if you have the 'fstatvfs' function. */ +#define HAVE_FSTATVFS 1 + +/* Define to 1 if you have the 'futimes' function. */ +#define HAVE_FUTIMES 1 + +/* Define to 1 if you have the 'gai_strerror' function. */ +#define HAVE_GAI_STRERROR 1 + +/* Define to 1 if you have the 'getaddrinfo' function. */ +#define HAVE_GETADDRINFO 1 + +/* Define to 1 if you have the 'getaudit' function. */ +/* #undef HAVE_GETAUDIT */ + +/* Define to 1 if you have the 'getaudit_addr' function. */ +/* #undef HAVE_GETAUDIT_ADDR */ + +/* Define to 1 if you have the 'getcwd' function. */ +#define HAVE_GETCWD 1 + +/* Define to 1 if you have the 'getentropy' function. */ +#define HAVE_GETENTROPY 1 + +/* Define to 1 if you have the 'getgrouplist' function. */ +#define HAVE_GETGROUPLIST 1 + +/* Define to 1 if you have the 'getgrset' function. */ +/* #undef HAVE_GETGRSET */ + +/* Define to 1 if you have the 'getlastlogxbyname' function. */ +/* #undef HAVE_GETLASTLOGXBYNAME */ + +/* Define to 1 if you have the 'getline' function. */ +#define HAVE_GETLINE 1 + +/* Define to 1 if you have the 'getluid' function. */ +/* #undef HAVE_GETLUID */ + +/* Define to 1 if you have the 'getnameinfo' function. */ +#define HAVE_GETNAMEINFO 1 + +/* Define to 1 if you have the 'getopt' function. */ +#define HAVE_GETOPT 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_GETOPT_H 1 + +/* Define if your getopt(3) defines and uses optreset */ +#define HAVE_GETOPT_OPTRESET 1 + +/* Define if your libraries define getpagesize() */ +#define HAVE_GETPAGESIZE 1 + +/* Define to 1 if you have the 'getpeereid' function. */ +#define HAVE_GETPEEREID 1 + +/* Define to 1 if you have the 'getpeerucred' function. */ +/* #undef HAVE_GETPEERUCRED */ + +/* Define to 1 if you have the 'getpgid' function. */ +#define HAVE_GETPGID 1 + +/* Define to 1 if you have the 'getpgrp' function. */ +#define HAVE_GETPGRP 1 + +/* Define to 1 if you have the 'getpwanam' function. */ +/* #undef HAVE_GETPWANAM */ + +/* Define to 1 if you have the 'getrandom' function. */ +#define HAVE_GETRANDOM 1 + +/* Define to 1 if you have the 'getrlimit' function. */ +#define HAVE_GETRLIMIT 1 + +/* Define if getrrsetbyname() exists */ +/* #undef HAVE_GETRRSETBYNAME */ + +/* Define to 1 if you have the 'getseuserbyname' function. */ +/* #undef HAVE_GETSEUSERBYNAME */ + +/* Define to 1 if you have the 'getsid' function. */ +#define HAVE_GETSID 1 + +/* Define to 1 if you have the 'gettimeofday' function. */ +#define HAVE_GETTIMEOFDAY 1 + +/* Define to 1 if you have the 'getttyent' function. */ +#define HAVE_GETTTYENT 1 + +/* Define to 1 if you have the 'getutent' function. */ +/* #undef HAVE_GETUTENT */ + +/* Define to 1 if you have the 'getutid' function. */ +/* #undef HAVE_GETUTID */ + +/* Define to 1 if you have the 'getutline' function. */ +/* #undef HAVE_GETUTLINE */ + +/* Define to 1 if you have the 'getutxent' function. */ +#define HAVE_GETUTXENT 1 + +/* Define to 1 if you have the 'getutxid' function. */ +#define HAVE_GETUTXID 1 + +/* Define to 1 if you have the 'getutxline' function. */ +#define HAVE_GETUTXLINE 1 + +/* Define to 1 if you have the 'getutxuser' function. */ +#define HAVE_GETUTXUSER 1 + +/* Define to 1 if you have the 'get_default_context_with_level' function. */ +/* #undef HAVE_GET_DEFAULT_CONTEXT_WITH_LEVEL */ + +/* Define to 1 if you have the 'glob' function. */ +#define HAVE_GLOB 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_GLOB_H 1 + +/* Define to 1 if you have the 'group_from_gid' function. */ +#define HAVE_GROUP_FROM_GID 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_GSSAPI_GENERIC_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_GSSAPI_GSSAPI_GENERIC_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_GSSAPI_GSSAPI_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_GSSAPI_GSSAPI_KRB5_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_GSSAPI_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_GSSAPI_KRB5_H */ + +/* Define if HEADER.ad exists in arpa/nameser.h */ +#define HAVE_HEADER_AD 1 + +/* Define to 1 if you have the 'HMAC_CTX_init' function. */ +/* #undef HAVE_HMAC_CTX_INIT */ + +/* Define if you have ut_host in utmp.h */ +/* #undef HAVE_HOST_IN_UTMP */ + +/* Define if you have ut_host in utmpx.h */ +#define HAVE_HOST_IN_UTMPX 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_IAF_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_IA_H */ + +/* Define if you have ut_id in utmp.h */ +/* #undef HAVE_ID_IN_UTMP */ + +/* Define if you have ut_id in utmpx.h */ +#define HAVE_ID_IN_UTMPX 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_IFADDRS_H 1 + +/* Define to 1 if you have the 'inet_aton' function. */ +#define HAVE_INET_ATON 1 + +/* Define to 1 if you have the 'inet_ntoa' function. */ +#define HAVE_INET_NTOA 1 + +/* Define to 1 if you have the 'inet_ntop' function. */ +#define HAVE_INET_NTOP 1 + +/* Define to 1 if you have the 'innetgr' function. */ +#define HAVE_INNETGR 1 + +/* define if you have int64_t data type */ +#define HAVE_INT64_T 1 + +/* Define to 1 if the system has the type 'intmax_t'. */ +#define HAVE_INTMAX_T 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_INTTYPES_H 1 + +/* define if you have intxx_t data type */ +#define HAVE_INTXX_T 1 + +/* Define to 1 if the system has the type 'in_addr_t'. */ +#define HAVE_IN_ADDR_T 1 + +/* Define to 1 if the system has the type 'in_port_t'. */ +#define HAVE_IN_PORT_T 1 + +/* Define if you have isblank(3C). */ +#define HAVE_ISBLANK 1 + +/* Define to 1 if you have the 'killpg' function. */ +#define HAVE_KILLPG 1 + +/* Define to 1 if you have the 'krb5_cc_new_unique' function. */ +/* #undef HAVE_KRB5_CC_NEW_UNIQUE */ + +/* Define to 1 if you have the 'krb5_free_error_message' function. */ +/* #undef HAVE_KRB5_FREE_ERROR_MESSAGE */ + +/* Define to 1 if you have the 'krb5_get_error_message' function. */ +/* #undef HAVE_KRB5_GET_ERROR_MESSAGE */ + +/* Define to 1 if you have the header file. */ +#define HAVE_LANGINFO_H 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_LASTLOG_H */ + +/* Define if you want ldns support */ +/* #undef HAVE_LDNS */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_LIBAUDIT_H */ + +/* Define to 1 if you have the 'bsm' library (-lbsm). */ +/* #undef HAVE_LIBBSM */ + +/* Define to 1 if you have the 'dl' library (-ldl). */ +#define HAVE_LIBDL 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_LIBGEN_H 1 + +/* Define if system has libiaf that supports set_id */ +/* #undef HAVE_LIBIAF */ + +/* Define to 1 if you have the 'network' library (-lnetwork). */ +/* #undef HAVE_LIBNETWORK */ + +/* Define to 1 if you have the 'pam' library (-lpam). */ +#define HAVE_LIBPAM 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_LIBPROC_H */ + +/* Define to 1 if you have the 'socket' library (-lsocket). */ +/* #undef HAVE_LIBSOCKET */ + +/* Define to 1 if you have the header file. */ +#define HAVE_LIBUTIL_H 1 + +/* Define to 1 if you have the 'xnet' library (-lxnet). */ +/* #undef HAVE_LIBXNET */ + +/* Define to 1 if you have the 'z' library (-lz). */ +#define HAVE_LIBZ 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_LIMITS_H 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_LINUX_AUDIT_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_LINUX_FILTER_H */ + *** 8246 LINES SKIPPED *** From nobody Tue May 12 22:28:14 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gFWSz48Vvz6dCT0 for ; Tue, 12 May 2026 22:28: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFWSz3cDMz45wK for ; Tue, 12 May 2026 22:28:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778624899; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OlXNCZLHjLtVgEdN1PJ/TCiOt81MpFu9u2vl2PXEnTs=; b=KYoyAV2cN3a3R2aRQ3IICK/Wp5s8wsbM1X4gCFaMe+Xax8gTlA/zOA2bfbvzutu6WpkK8s 77ENdfGLyaGc6+IhqeWo5pkUnYkcmKkREh+DsQgQOdwVpCPX2dElPNo01uq8S0VSno+utS /RYViDgl1rOpGgZNS+df+THsbDa3Msc2xZn5Vy6yFcIU2K0uroA6+Ea/wzQzUV96NZKgTt cDDM2skX4KK9h9ogefs7IzYZiA/8ftB9xDCUk2ZkrYsO+iEdY1FB9GR+Kp9bSeGyzOyqud b+ibsJrp4kTGNVgTAf6su46dKzRp6CIcWsLPsEws18sGboE2E6BkYVcxOCsXgQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778624899; a=rsa-sha256; cv=none; b=o0hyixIRUQUwcghC8b6HskEqHzM/zFoI6jdFrbzy6f72VhBh4iApXRpa2HVevwlFxlF8vf nRNOHbv66Utn6WsUwCPf8xMc3ONCH56MEGzhp7CdTq8s30V/pu/n13IuSdEB2et60Lr7Lu rui6za9UMPF95Fthow8WJrAlxWNcpjBCjuJDDH9rIfGttmYaL6vu9jgUzWU71BMFI6i00c 5X2S2Pbbysfq7wpjYAP2uiZYYVGx8gE00UZQhDk1Upj51jOqUhlOCrch5x49Zhpr8FN5Fy FfPbg/0iigx43GhKegpdTwXEemN/HmXlyOJpmxewfiltcWiJ/zMh0XnIXE/ONA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778624899; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OlXNCZLHjLtVgEdN1PJ/TCiOt81MpFu9u2vl2PXEnTs=; b=iMjdPg/BaSed0pQzUeFIMDExc02qzdl7uxtLkR7oQG64pP6CUZwlA1swou6KCa8/Zsk5Ra vdB7SB91yiPV3Ic7+4e1eg1fJjrHi7MZ6BUPdJx+BhGRa6rFc3d3rrT0D7Bt/r4igeUIX2 1e0tfRgoihBFyQnLWymcUddtTQda92YU6/pdJ55wg24OckzKl3Pp7q+3UxV+p9WyQyCCf+ UffQIpm+uRK+/+ZBKSxIhcCT/yaIhI7KiWCVpfesxmmKrm3g+fninVxGCGQyxlDJPpzNZD 4E88AJU5T2l7hGhikFIY3el8SqZCeE7B/nlrDRZ6nPpI+pZgWcXXB3DmyADPXw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFWSz33hSz7WK for ; Tue, 12 May 2026 22:28:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 399ec by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 22:28:14 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dave Cottlehuber Subject: git: d889f6c466d4 - stable/15 - release/tools: use same pkg settings in containers as in /etc/pkg/FreeBSD.conf List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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/stable/15 X-Git-Reftype: branch X-Git-Commit: d889f6c466d4cec73c34bc71093d08b25e321071 Auto-Submitted: auto-generated Date: Tue, 12 May 2026 22:28:14 +0000 Message-Id: <6a03a97e.399ec.7290eca8@gitrepo.freebsd.org> The branch stable/15 has been updated by dch: URL: https://cgit.FreeBSD.org/src/commit/?id=d889f6c466d4cec73c34bc71093d08b25e321071 commit d889f6c466d4cec73c34bc71093d08b25e321071 Author: Dave Cottlehuber AuthorDate: 2026-01-27 22:51:22 +0000 Commit: Dave Cottlehuber CommitDate: 2026-05-12 22:22:57 +0000 release/tools: use same pkg settings in containers as in /etc/pkg/FreeBSD.conf Instructions in /etc/pkg/FreeBSD.conf and elsewhere recommend putting changes in /usr/local/etc/pkg/repos/FreeBSD.conf so bring OCI containers into line as well. Reviewed by: dfr, ivy Differential Revision: https://reviews.freebsd.org/D54090 MFC after: 5 days Sponsored by: SkunkWerks, GmbH (cherry picked from commit c73ae67348998a0056145e88debbea9ff6860c4f) --- release/tools/oci-image-static.conf | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/release/tools/oci-image-static.conf b/release/tools/oci-image-static.conf index 8e642d9defce..e2231d951268 100644 --- a/release/tools/oci-image-static.conf +++ b/release/tools/oci-image-static.conf @@ -36,12 +36,8 @@ oci_image_build() { ;; esac mkdir -p $m/usr/local/etc/pkg/repos - cat > $m/usr/local/etc/pkg/repos/base.conf < $m/usr/local/etc/pkg/repos/FreeBSD.conf <; Tue, 12 May 2026 22:51:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFWzh64nxz47qj for ; Tue, 12 May 2026 22:51:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778626288; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4ZGKdppjktkDlpq+h4g3UZRfu4z8Fp3aGCXIRDhoFu8=; b=AzZOrXbqnZy+1M12SvStbXKtk+5ECDNiwnpAgo+M1EN/gOeD0X9W3TEJJXn5yoWMDuf0Bx aOA7tH4jz+hR1Z0HbqXXfsqs62HkYmCvc35+tz9jzcoy2HBBQGHQgMrHtfjf8xuxrmyWX8 JZVF/JgL/hNkBFvd9z8VOh0ZhaFUwSgEhPImP79AwZcQ1LeVyjziD9a1UJPVsiq4jPOFKN 13jqUxoxnx5qTogYEwKXsD8jM4b8sSlR2HSlK6EzBprPDhHQjHHGeYS+ih8uyzwVijy8EM cB1uI6SEbdx8/5RRURvtXeNo25nKb0WZJz9fdAsEDe22qpKDGLN/gbuLP5W+hw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778626288; a=rsa-sha256; cv=none; b=NWq1UJHr7YK5QDc8aW+VJSLdmF8oGAhu95Kslq8ln4r22VZPPGLAIaHs/q8SyKrDP1xFul wIgijtZj2b34lJ46zMd0e6rnLOFWFZj7grJCaKSyf2QiYUFk4XM0lyacmIPzSmN7TpTnrB VUoIrBq0HMAq31I3GNKmrxUEvRWSw0KpoBWra6+teNK7nM6abUWXMBmbXl2fjoptmb0VU6 wnFUzP5l0+DIB4Nsc71lcTgBzNT2r1nDWyzD7DBYrcJRTAn1LNwr6tNBQqF0eo2AdHKDet bqdngPIRCVYkMhv74XT3A6Qu60Iv48ibe4oeCSxOLGyAqQEMd6Kkte62MvHopA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778626288; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4ZGKdppjktkDlpq+h4g3UZRfu4z8Fp3aGCXIRDhoFu8=; b=no9xhgXgkqzMZobh8kvofAaVgYTkipeaPfrWGn+jWrDsZfKH4NJLAPZjiaTkJa7vu5yRXw QULSGY+HUkndIeWfE7vNvY0wEb9Zaxz1k9tg+oA7TbAs3lAAiGmBii4ofmAPAD0y12kCr0 CUqQJTXv+z6oZgiGjBf0O1bgIaOz/mG9utYL7APhofiQlWvqmgnqOsp8TFgTP9YIKBV8F2 kLBqSFJqihyUxdSSowMJMc7gNelUaLTB9wV5wTuSPdJKpqjOkD35+qtUO4S936zsBCGVm1 8L5Fr5MDSroeymLNvjA4Bw/yrzKzxZmLAmpKXGvHWjzV+OtwAhXQWK3wsW+PjA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFWzh5dhxz8Fr for ; Tue, 12 May 2026 22:51:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3b5f8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 22:51:28 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: b76b05c04cc9 - main - pam_ssh: Fix build - chase OpenSSH function signature change List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: b76b05c04cc9ed2cd053c7b367c92628447ede6f Auto-Submitted: auto-generated Date: Tue, 12 May 2026 22:51:28 +0000 Message-Id: <6a03aef0.3b5f8.6d9c077f@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=b76b05c04cc9ed2cd053c7b367c92628447ede6f commit b76b05c04cc9ed2cd053c7b367c92628447ede6f Author: Ed Maste AuthorDate: 2026-05-12 22:49:29 +0000 Commit: Ed Maste CommitDate: 2026-05-12 22:51:00 +0000 pam_ssh: Fix build - chase OpenSSH function signature change Reported by: dch Fixes: 644b4646c7ac ("OpenSSH: Update to 10.1p1") Sponsored by: The FreeBSD Foundation --- lib/libpam/modules/pam_ssh/pam_ssh.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libpam/modules/pam_ssh/pam_ssh.c b/lib/libpam/modules/pam_ssh/pam_ssh.c index 157908b6b910..1fcee93efb69 100644 --- a/lib/libpam/modules/pam_ssh/pam_ssh.c +++ b/lib/libpam/modules/pam_ssh/pam_ssh.c @@ -62,7 +62,7 @@ #include "sshkey.h" #define ssh_add_identity(auth, key, comment) \ - ssh_add_identity_constrained(auth, key, comment, 0, 0, 0, NULL, NULL, 0) + ssh_add_identity_constrained(auth, key, comment, 0, 0, NULL, NULL, 0) extern char **environ; From nobody Wed May 13 00:24:25 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gFZ2x25Wwz6dM98 for ; Wed, 13 May 2026 00:24: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFZ2x15X5z3RvB for ; Wed, 13 May 2026 00:24:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778631865; 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; bh=qFuaqnI2u5Mo1xgqAD5Llr0LTC1bWYidpYvmzHdzX14=; b=o8qy0WyhLso6wAnIPDzELiyT+sDjHFVWTKcUKpixENjOTx8+/6Zfi8QkB2uTh09ilKTXyk +T3TSLWE8mlsgyFXdBpSWUpyEzl393KjIB+Ag+OuDuxEmTMcyzIGU2ZicpnPdqjkW5uyxL 1e/S3PgJoelb7FD3t02AEOLeVzfrTZQaGHpJRKQHIxoHGk74NkTXoRvE5a0pRgQh+48/rX gznbMgA3G0fwRQzJWjdfPYos/cjnDzPAJqvwGRLpZvBWQa025lu8J1asVgAECHgnouRw/Y xfx2tKs9qasQqipuCFlWz+HGBHgOeYmCMav9jtmgY+pkM8xIl06JAbmUfSZqaQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778631865; a=rsa-sha256; cv=none; b=ETxKhwbKCk2V70T7OJPeybDCCZnblu/8hFq2KvPBBK6yMq/qeJ9HCccmf3HTq3+4v62xEY HCKLaYfvG7ye5Y1CDI3CyMvzku90vMWEDWOXm+Mu29tI2T6UbMLQRRDteLUZJXFiouirjt 6HPYF5mf48qWtlhH59Ky+AdBtKfsFTaaggBuzRtou6kejVQPLeJO9md3tmcE+/PiPI6Zpy MrW8TZGeZIT5IUMYlesUtvXTpE7C84fQ73tzgluOL6oZA6arJT6/Xf+IRvuA9FixETrCa3 X5+I3V15x9nqhrBgYn1d/DskUd3PDxPIelboduexwzoYt+fBUiatpDp5cyvpxA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778631865; 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; bh=qFuaqnI2u5Mo1xgqAD5Llr0LTC1bWYidpYvmzHdzX14=; b=OvUhkTOdh2QQjBpQCmkFHI8RaUHhmm2YASs+nx4pbTnmTm+zj6vXWrJAfxVdGnXXA5Wjl/ zU0T9NCT+G+38t9FRyLK95uXSk9tkCn8FtwiVQXizvj55JfqUu+Mo6FjPeBhLiZl6YDnTl QqTRyKi4SDbWFJXHpD/n9j7Lo1FoABfo9rYKpCgt8aT4bf/sc2mBihOlXXBBMpWLdv1rp3 b0m57vNSlsw/OOmHYoQr4J7p8WoRzonPEO9f7IrwNxvlHph25EawREGrCLVbTySPvraB2D DI9lh6r8Bi9OpNYAHZQK5ezMV5IMN60+nO6cS6Tzhk8fnVMoQc0DM8dEIcIrIg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFZ2x0cbtzBWH for ; Wed, 13 May 2026 00:24:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1eac1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 00:24:25 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Ariel Ehrenberg From: Konstantin Belousov Subject: git: 8c5cc4498499 - stable/15 - mlx5en: destroy TIR before DEK during TLS RX teardown List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 8c5cc4498499f9e3bb64cb6e8244ccd212ee514a Auto-Submitted: auto-generated Date: Wed, 13 May 2026 00:24:25 +0000 Message-Id: <6a03c4b9.1eac1.7be30e3@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=8c5cc4498499f9e3bb64cb6e8244ccd212ee514a commit 8c5cc4498499f9e3bb64cb6e8244ccd212ee514a Author: Ariel Ehrenberg AuthorDate: 2026-04-15 21:45:07 +0000 Commit: Konstantin Belousov CommitDate: 2026-05-13 00:23:53 +0000 mlx5en: destroy TIR before DEK during TLS RX teardown (cherry picked from commit bf636accdde4bb9af2c6c07af5420dffffd82332) --- sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls_rx.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls_rx.c b/sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls_rx.c index 89d2010656c5..b6a9a0c01d09 100644 --- a/sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls_rx.c +++ b/sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls_rx.c @@ -596,14 +596,21 @@ mlx5e_tls_rx_work(struct work_struct *work) if (ptag->flow_rule != NULL) mlx5e_accel_fs_del_inpcb(ptag->flow_rule); + /* + * Destroy TIR before DEK. DESTROY_TIR for a TLS- + * enabled TIR issues a TRA RX fence that drains all + * in-flight packets from the crypto pipeline. If the + * DEK were destroyed first, packets still in flight + * would hit a TPT encryption error (vendor syndrome + * 0x55) because the key they reference is already gone. + */ + if (ptag->tirn != 0) + mlx5_tls_close_tir(priv->mdev, ptag->tirn); + /* try to destroy DEK context by ID */ if (ptag->dek_index_ok) mlx5_encryption_key_destroy(priv->mdev, ptag->dek_index); - /* try to destroy TIR context by ID */ - if (ptag->tirn != 0) - mlx5_tls_close_tir(priv->mdev, ptag->tirn); - /* free tag */ mlx5e_tls_rx_tag_zfree(ptag); break; From nobody Wed May 13 00:35:13 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gFZHQ2dWfz6dMX8 for ; Wed, 13 May 2026 00:35: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFZHP69GKz3T7v for ; Wed, 13 May 2026 00:35:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778632513; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BwvlGzb6AnO5MWDpy7WPwiefaJcyPqEe8+kvpzzH+t8=; b=QmvgKTlWHnntHS4K++eNTbYnEEEN47B5TL9NBlcFhXzgp19CSLHfkiNNjmhnCrlh32+JBP /iialc7xWR0yw5d2QBR40iWpLmyRWP4nULQNw2Mxa3jrNI6aRCA1gSfBezh7ogqHANg7U0 GTImEylwFJowEHmz+1NkYNB9rcLC1JCkAj5mtKZHXgE9c/JOYkv4W7nk0CVbHLzYFZPp8s XvyR+IFJO+8TxHQ060SyL7pemdSkQDESRFQIBPlAn4r+vI7gT1J4/aMYLZ5VWuuKNJx7xB Oth4CkSpuBrbs+TVypg7z3NaqSOTl3crsWPifmnZjvu1o1Y+t8/LGShDBdiisw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778632513; a=rsa-sha256; cv=none; b=YUDlAj5caDALYx7HnNbGMEr1wW/oD4jOSIywIhh5yUFT1ju0ekXVYo0xzmT8lcvsny6vIp 9O1VMqYI86mg/tybiaVH0SuZDy8ndVdP2gCV13+lNaldqcZxkWI0KyY6b8p7jr02dYfsRi BFOpGC5VtbzXGQHH8+R5QPkQTd61JPVxrFYQfRui0ikGnM5A07xSv2f38iXWlm/AGkA8Cz UfEJYhApdohrC5JE9nAMYBDoV4SN0Yzrc2zhXqT9n0kX/gz3IwklDNadVQ9nghJX7X5UjI 2tVJeBb41sm6xam8gv8SR4ojIIU7AULDAuyTBfOcMXKeHmF9UU8J919ro+FmVg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778632513; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BwvlGzb6AnO5MWDpy7WPwiefaJcyPqEe8+kvpzzH+t8=; b=kUs9Vy/sdLZoFvL2EyUmGzh6Z4N6xasNz3XMibQFdLhWD35f2SYSLoL2vnBc+J8VEW5RWW 0RwIixBr/u8mg/QvzWM2JLJNUistlVVb44Gauk72UeqGO2pGExz/9mfJGG2BszjHWk395C M1PxaboUM84due6RKr6R1q7V94nGncvKhAwm9gjY2Vf0oPbs0l1e8UrMs8y/8rDSpRr+Gl zZBv7l9/EZ4v4eHtrxcz7Mv5N8Cjlev9h1JhQpz0ubRKaqD/Z17yfHf/adLJoR+TkWnrde nlPicLUQpRrCNUQXph8rDCyV4pSrW0iP++u/YNNiLEwjScDKssP5VAzEYxy15A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFZHP5kRYzBM1 for ; Wed, 13 May 2026 00:35:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f606 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 00:35:13 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: e6475c8f3539 - main - Cirrus-CI: Bump toolchain to LLVM 21 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: e6475c8f353981baeddb544f5a9deb48956f2815 Auto-Submitted: auto-generated Date: Wed, 13 May 2026 00:35:13 +0000 Message-Id: <6a03c741.1f606.6b4b843@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=e6475c8f353981baeddb544f5a9deb48956f2815 commit e6475c8f353981baeddb544f5a9deb48956f2815 Author: Ed Maste AuthorDate: 2026-05-12 23:35:11 +0000 Commit: Ed Maste CommitDate: 2026-05-13 00:29:30 +0000 Cirrus-CI: Bump toolchain to LLVM 21 Cirrus-CI is shutting down at the end of the month, but we can still finish with an up-to-date working build with an LLVM version matching the in-tree toolchain. Sponsored by: The FreeBSD Foundation --- .cirrus.yml | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index 83cfe6e5c591..2fdf0d492987 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -39,12 +39,20 @@ task: TOOLCHAIN: llvm18 TOOLCHAIN_PKG: ${TOOLCHAIN}-lite - name: amd64-llvm19 World and kernel build and boot smoke test - only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src' || $CIRRUS_BRANCH =~ 'pull/.*' + only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src' + trigger_type: manual env: TARGET: amd64 TARGET_ARCH: amd64 TOOLCHAIN: llvm19 TOOLCHAIN_PKG: ${TOOLCHAIN}-lite + - name: amd64-llvm21 World and kernel build and boot smoke test + only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src' || $CIRRUS_BRANCH =~ 'pull/.*' + env: + TARGET: amd64 + TARGET_ARCH: amd64 + TOOLCHAIN: llvm21 + TOOLCHAIN_PKG: ${TOOLCHAIN}-lite - name: arm64-llvm16 World and kernel build and boot smoke test (manual) only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src' trigger_type: manual @@ -77,6 +85,14 @@ task: TARGET_ARCH: aarch64 TOOLCHAIN: llvm19 TOOLCHAIN_PKG: ${TOOLCHAIN} + - name: arm64-llvm21 World and kernel build and boot smoke test (manual) + only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src' + trigger_type: manual + env: + TARGET: arm64 + TARGET_ARCH: aarch64 + TOOLCHAIN: llvm21 + TOOLCHAIN_PKG: ${TOOLCHAIN} - name: amd64-gcc12 World and kernel build and boot smoke test (manual) only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src' trigger_type: manual From nobody Wed May 13 00:36:57 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gFZKV5LF2z6dMsZ for ; Wed, 13 May 2026 00:37: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFZKV3Sbxz3TgW for ; Wed, 13 May 2026 00:37:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778632622; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dH+KZ8KEsVvuXVbQoIG2SmKvFNFOhxTdqT2+34NkAf4=; b=S+5Moza/8klasixe1twQK4HX//fhJlWjoCGLzF/RBPGQWYW2mimuQFg6TeFlkFbtiXBx9z gz1w83kUW7ZwxS8HGLMbmRoPpTSISZPmUTGIm8usdWHm2getXNgI+9kqQBRUEZqiY74LA0 ADVBXKrsDH+2uTZkhWpWIdhQc74e6+aK2A7xjdFJWKI5r1+mIP2UXzmWiCyqB12tFZo0H+ eX0RkT/f4rnJ5cU2v0X4QGR9bL4m51lftQ2Q1JA/l2HZGB+hcb8UzX1Ucdk5kCNxQ1odVe 83twifiGUk0EcQubTQzCg5Jb+r6fx6bUUO6ikAdYHfn/P8IU4ixVdPwXv2Dfxg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778632622; a=rsa-sha256; cv=none; b=JVdRu2PnbzxbL5NkITvpmyxO2EEuNW+fHdRwh7TNuzZG4DS53DxhM2oKeWRtGhMuTxrJ4F jSIhxx6Z9IQ0VMejOqO1jVaNXluF/jxrmqIxvlzV3LJ9W6Bk6sQdUifE5f2b1Oj6talsNM u3mhIHfOUaQMJGzMlJXxRFv+h5FQJ1MMBl3RtJRK474/AOR1dsNMgcyuPaZCUZKEVYo0Bw pM7A1x5c3VSCw7hNgAdJmvMU9hNC5hyK20jUKtQIGjxl72R79eoNekYAWnamzeoDp4Sth6 X8nHfqoGeozl04C8YAOvdUKYOLjrlKK0enZdEAbF21V8gatJapTMxSYDR8z/ew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778632622; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dH+KZ8KEsVvuXVbQoIG2SmKvFNFOhxTdqT2+34NkAf4=; b=QjAdhwczU7DNfduNY51dMF8JCd0DE67yxNoWpYmdcGNUQ41pwz4ItKOIDfz7KnPsboJX2e WjTYVhkIxVxoiIRdKhVjr2fItJ4NIQczv8pFJZxYM2X9+8uQDzbkWlQViLbE6qpzzwPbgm OBlKStAO3Te1f94W0yjVHZhPkXmk+N/NPr9+szmJzbVcRIyOFOdjvUGq+TZS/+X258K38h SH/bQ/8hn9tfglIQJsPmxAAkkhwp8ACKu/naC53oahQZJVUBjxGv7whd5QCwFu2fATVks/ nSMKGmyd6IWObmdZL1JDJDuAaSUfFYS+WlNw5SL7ker10ye+JagIELJNBeFYvw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFZKV2N6szBM2 for ; Wed, 13 May 2026 00:37:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f414 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 00:36:57 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: eacf4f50bfb1 - main - u3g: Add Telit LM960A18 LTE modem List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: eacf4f50bfb19aa0278db5e8982d73c6d77ca24c Auto-Submitted: auto-generated Date: Wed, 13 May 2026 00:36:57 +0000 Message-Id: <6a03c7a9.1f414.6cf0aa4d@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=eacf4f50bfb19aa0278db5e8982d73c6d77ca24c commit eacf4f50bfb19aa0278db5e8982d73c6d77ca24c Author: Ed Maste AuthorDate: 2026-05-12 19:52:16 +0000 Commit: Ed Maste CommitDate: 2026-05-13 00:36:39 +0000 u3g: Add Telit LM960A18 LTE modem The patch in the PR failed to apply, so I manually applied the same changes. PR: 295231 Submitted by: Mike Tancsa Reviewed by: emaste --- sys/dev/usb/serial/u3g.c | 2 ++ sys/dev/usb/usbdevs | 2 ++ 2 files changed, 4 insertions(+) diff --git a/sys/dev/usb/serial/u3g.c b/sys/dev/usb/serial/u3g.c index 0fc774d83ee1..6e3d9395359b 100644 --- a/sys/dev/usb/serial/u3g.c +++ b/sys/dev/usb/serial/u3g.c @@ -624,6 +624,8 @@ static const STRUCT_USB_HOST_ID u3g_devs[] = { U3G_DEV(TCTMOBILE, X080S, U3GINIT_TCT), U3G_DEV(TELIT, UC864E, 0), U3G_DEV(TELIT, UC864G, 0), + U3G_DEV(TELIT, LM960, 0), + U3G_DEV(TELIT, LM960_ECM, 0), U3G_DEV(TLAYTECH, TEU800, 0), U3G_DEV(TOSHIBA, G450, 0), U3G_DEV(TOSHIBA, HSDPA, 0), diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs index 594afafbb07f..ff4a6fd82f07 100644 --- a/sys/dev/usb/usbdevs +++ b/sys/dev/usb/usbdevs @@ -4807,6 +4807,8 @@ product TELEX MIC1 0x0001 Enhanced USB Microphone /* Telit products */ product TELIT UC864E 0x1003 UC864E 3G modem product TELIT UC864G 0x1004 UC864G 3G modem +product TELIT LM960 0x1040 LM960A18 LTE modem (RNDIS) +product TELIT LM960_ECM 0x1042 LM960A18 LTE modem (ECM) /* Ten X Technology, Inc. */ product TENX UAUDIO0 0xf211 USB audio headset From nobody Wed May 13 01:12:14 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gFb672y63z6YDMb for ; Wed, 13 May 2026 01:12: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFb665ZcQz3ZN8 for ; Wed, 13 May 2026 01:12:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778634734; 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; bh=+RBWj7BnqvSk4KNBXjBs8ey7fxy1IkGjzW90RehN39I=; b=SaEWKmmF8Yfds9c7sRy2Hgu9T5AocGbhVAZKSCxB+A4xW2vqbRgVYNCDuzeqsF5uLPNeJL 3zHlis806xbKLWNu8KVjx6a7mQkgo/TO2XGtGlKzP9doA37cGytJPAZTrFFDrrkK6RV933 r4Tutoh1OyMAI2oIQByllkAw8Fmi85H3jw1LNndomGBTcAFMX+ZFQMFoGiRVIRb2KLubPg F2Qk74kI7bEskhiZhTKGbczAdHEixL3jIe1fCW8W50Phm8J1Uq9j6uWICWTWIPIE61mxb2 U0rvZyq9DnLNP3WTJXNJcSk7Ql16MVf4duJQxduDRCf5CmurIWfd9AmiCcnxFA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778634734; a=rsa-sha256; cv=none; b=DRQ0m+F/geFP28lwrm1F1I7e5dXOIzIhCUfcMn5mcZ+xUADs8WbXnMEQWnjwIRvi8AndxE 3olt/dfemC6anWrMehjMwqmcLOtov6Gy2U8cNOXl/QtXZhiNTkCKHRMHHDXYmedhM4Bt6D 3nQjMl0VLR57tk3a/jaLG+EIu1PpH7MaBcC6yV3AWxpbCmhrlWnbTXQ1ZJKhTxOBYKwvGT ZSwPimcWXP1jLRYW1zTqNCcLXoz1k31EcPJQh0aDQjq6Zuh6DY596XP9frU8t7Ff6ra740 ByTjzsiupv7WqyihNyhn2X3v0TM1oOaAK/mTiBxBfF7PM+rBEM+5IJkEKRB3Bw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778634734; 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; bh=+RBWj7BnqvSk4KNBXjBs8ey7fxy1IkGjzW90RehN39I=; b=avFJixa66ewog0qbM/BTtH5b/PmlXy9858HBebtx/83pNbcczbgzlPk6LfsZcVFD1j7Ijh Fl3yczTgnOuQoxOAuBItPQu/+V78ao3SyzFoGZsJkEMxmzwXC+0VIMr7C+pf0iAS9kgec3 6YGs/obvA1kS2Vu4Hm/TfsKKvDXVisq07jBc4utiKgYy/cWvXZKl2SMOGfN9u2UVdxoHRG PCQiOwvxj2uoudY5CJoYdj7a1gfo8NKuIWUsME5gJpwuekPybZ2vIKD4i0h8QcezIu7uMc RTxNml940jNN79iED6oJCRYqCwkpZKEwj3AY9IgdXVGCkW1agx2ctBCWDznX/g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFb66545CzCZN for ; Wed, 13 May 2026 01:12:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 228b0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 01:12:14 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav From: Colin Percival Subject: git: b66538ca983c - releng/15.1 - BSD.root.dist: Correct tag for /etc/sysctl.kld.d List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.1 X-Git-Reftype: branch X-Git-Commit: b66538ca983ce71043797e3b717c963ac1d308c5 Auto-Submitted: auto-generated Date: Wed, 13 May 2026 01:12:14 +0000 Message-Id: <6a03cfee.228b0.24110382@gitrepo.freebsd.org> The branch releng/15.1 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=b66538ca983ce71043797e3b717c963ac1d308c5 commit b66538ca983ce71043797e3b717c963ac1d308c5 Author: Dag-Erling Smørgrav AuthorDate: 2026-05-09 09:04:08 +0000 Commit: Colin Percival CommitDate: 2026-05-13 01:12:01 +0000 BSD.root.dist: Correct tag for /etc/sysctl.kld.d This is only used by rc.subr and belongs in rc, not runtime. Approved by: re (cperciva) Fixes: fa6d67cd16b5 ("BSD.root.dist: Add package tag for all directories") MFC after: 3 days Reviewed by: ivy Differential Revision: https://reviews.freebsd.org/D56900 (cherry picked from commit 44338ccd12685621c4b1c57e692a4f27f5a655d3) (cherry picked from commit 714f6ac0003482d3270a9d0026e59909cff73c3f) --- etc/mtree/BSD.root.dist | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/mtree/BSD.root.dist b/etc/mtree/BSD.root.dist index d5ef29c51a92..274397769cac 100644 --- a/etc/mtree/BSD.root.dist +++ b/etc/mtree/BSD.root.dist @@ -105,7 +105,7 @@ untrusted tags=package=caroot .. .. - sysctl.kld.d tags=package=runtime + sysctl.kld.d tags=package=rc .. syslog.d tags=package=syslogd .. From nobody Wed May 13 03:16:12 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gFds868nQz6YPHk for ; Wed, 13 May 2026 03:16: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFds85ZNtz3nCt for ; Wed, 13 May 2026 03:16:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778642172; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Mcyi8h1pXQUZKFZHlg3C1/LGQ8kkhjrFS/V+9s8eUag=; b=WRo5fG4QdKmr3wI+Zky8hYfSlV8Ocacg2UjzRgwbfPJ50EWtpPI3XnnKtovLcw+FOkyLbw m1WnrDkRChJElg7BVCL25tJVqPoLMtl2J1K7NVAR3PlMxtESH8x91YWuerfOTnY2sHdZeb pp/fK0yrXT5ykRefRgW/pERcQ+R2VstiDx7wJWTmIYoUUHCpJel/vzdEq9Agig12Z7VuVT W5iKOpT9DG9HHqJJhrEkGM3sc2VTSlJC6Fx/TqpuBVLPhQYkP9ROATQBhLss4NRAp3uV0U CyebD8ZXV5Xw1bE9y2bknI6RnNH4YCqzRwn2ILwGpQE5fGdGlSAbv1scpBN6rw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778642172; a=rsa-sha256; cv=none; b=rrUMtBH/39e1v7m42DChzqjijIYfzR+/OYcL3aOo8PMd4iBmSE5Vo+fXeggSW5lgl5RGHu ts5rSnZ50IuziD7HOowNf7W46ZKkVU8+CtcjhUw62MuTZGVFxGAkVVEECeVdEOLKMwrX1D KhATtSmQU2j091VZkyuIbhYs/hXGHVF8OiLPW0pXXVeFro0ax+tstRl6BoMsUx8kQ72yMR hYooNSZBCOw8viC0tj6c7w1wFtTL7Wc8EWxVZzuTBnJ/ABkBH60M2Md+y2dHclC08eB8K2 DgERnn9R0i+rgGOgETudfHQGppc58bmFmG1GXM06jyv0G0AiIqtovbtgM0rDQQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778642172; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Mcyi8h1pXQUZKFZHlg3C1/LGQ8kkhjrFS/V+9s8eUag=; b=VQhqBQQfarP05aFZsQXUj8LnBNbGUuIZ74tIkX2h5v0zgj9+0llmq1YNIuClpug4izq62k d0asBsjYkrCI/TX7YdmPjAq2ZGBg4nG2URfp9jyc0NNenhtjr9fBacomJUVaWJN/88FxQi JzyDCLnKsXtJnNXYsex3HY46m2rNizclJhqtOZggCWViPLww0kxhj+XV/CXrX7/UErAN/w OWUirPTsz+97vokgIORwi0ks4FM9ztQ+a5EfdvW4RUbcvXLG3oNJZs+cHAood/MEFp/FTk 86SS4zqu3r896XVhE/UVck0uMmmsqpbzOnky4M0dN8CRliMai88GCoLK4oixaw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFds84ZtDzYxh for ; Wed, 13 May 2026 03:16:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 36771 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 03:16:12 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Philip Paeps Subject: git: 1102bfff8f2c..e3c0f2f39909 - vendor/expat - vendor branch updated List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: philip X-Git-Repository: src X-Git-Refname: refs/heads/vendor/expat X-Git-Reftype: branch X-Git-Commit: e3c0f2f39909f86f1707b375a63fff5ed1f31b97 X-Git-Oldrev: 1102bfff8f2caed02885b18aceb9859b0bb943ae X-Git-Newrev: e3c0f2f39909f86f1707b375a63fff5ed1f31b97 Auto-Submitted: auto-generated Date: Wed, 13 May 2026 03:16:12 +0000 Message-Id: <6a03ecfc.36771.1798e3d4@gitrepo.freebsd.org> The branch vendor/expat has been updated by philip: URL: https://cgit.FreeBSD.org/src/log/?id=1102bfff8f2c..e3c0f2f39909 e3c0f2f39909 Vendor import of expat 2.8.1 From nobody Wed May 13 03:16:12 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gFds93RsXz6YNs0 for ; Wed, 13 May 2026 03:16: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFds86dpsz3nP6 for ; Wed, 13 May 2026 03:16:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778642173; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MGqcqFAMitCaK0K+2Dj5Zr7MMy1RIqigIu3wPykwHxg=; b=KUgqztYKJLa/dM85Kos5PRk56BbP8WbX4shozG32j+DFkUN/kcPpAlfSRyHWPeNfRLUDtz i1XpsaWfzdjWYYyqeBfhoKpwdeiyMUlGZPORDiEmj22IxdbjNf9Whu1M8Ibjzfpn19oO0D DDkpfRZwfz358kWkFxGXgcuh6jx2Z6qxx5L0se6wLyIhJeh3osh2rFYnRNCSVuDPr8USd7 djQAGD9tXYVWCn8S908Qv6uEmXIi7NGjlHfIZYXPbRawy78IBTouLOaQZsD7ng9ZyZOEXl sTJAeNRxxK8zE0g61yYCFL0xTv+MC/N8gMY254Az7DIDMQguUFh0qZnewNE6zw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778642172; a=rsa-sha256; cv=none; b=w62XfObvz/r36EzXtRutIheFuHowsVdekvLMq4tdEJpRaH0dxGR2ZqaYWL8FR9h2ZSRWsr 8v7Myxyxh2UjaE8tSUIzyoSggVIlFSRd+tGuGCnKClM2CsUNbypGu9U7RHue2bowIlhKkr 1JThawJPVeOm500DaKm8e4VVQ0TFOOrB/wmZcZjgh5WbQLfZNwYGXf0lZ/7W9cEdN4Vc1F 4NT+WuBO92Fq4JTkFir30og0q2W863ziBemH0B2CEQ9ci8526Bt5lFQAI0DwxXUa+utQWp fbross1vl06j+oT9yghYpy3OcBjUgk9sXq+Oxlodfwibhdx3xXOMFQeCPC2FNA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778642172; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MGqcqFAMitCaK0K+2Dj5Zr7MMy1RIqigIu3wPykwHxg=; b=WWmizKVgCuDl16UwwEtcM5N+MUtt21meSLsqVvcmiu9tCKmiPcNgLvzd/H9uMr1E73wk2b Jd4kAOWqUHQ9nOtYuy/CrZpPqOKD14Sqygl3Tn0E7kXU3eOlZ853cWhBJvC2zXybXlkGNE F3mK6FmfhqYT8t5rMlTgsJ2uRZDGEzLC3vqolyGx5qyxnwBb47bbArTOUIphiBK6tmHEnv v1DFEXWunHSion9uDsUzYU/dgJAjDGYUYrdhmfaAJFOvxBu6aB3PYb2Ix74NjiKmwROTJx kOGs1QUQ0e/cHO/dtkEnM23wTV+B4PfqEIY+tIwDZWtWrwosMG47X2tCfhIB3w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFds851WpzYxj for ; Wed, 13 May 2026 03:16:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38e86 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 03:16:12 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Philip Paeps Subject: git: 0801acedb808 - Create tag vendor/expat/2.8.1 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: philip X-Git-Repository: src X-Git-Refname: refs/tags/vendor/expat/2.8.1 X-Git-Reftype: annotated tag X-Git-Commit: 0801acedb808fe49d23dfbea5d489eb13c77aaa4 Auto-Submitted: auto-generated Date: Wed, 13 May 2026 03:16:12 +0000 Message-Id: <6a03ecfc.38e86.323b0ca2@gitrepo.freebsd.org> The annotated tag vendor/expat/2.8.1 has been created by philip: URL: https://cgit.FreeBSD.org/src/tag/?h=vendor/expat/2.8.1 tag vendor/expat/2.8.1 Tagger: Philip Paeps TaggerDate: 2026-05-13 03:13:20 +0000 Release 2.8.1 Sun May 10 2026 commit e3c0f2f39909f86f1707b375a63fff5ed1f31b97 Author: Philip Paeps AuthorDate: 2026-05-13 03:13:20 +0000 Commit: Philip Paeps CommitDate: 2026-05-13 03:13:20 +0000 Vendor import of expat 2.8.1 From nobody Wed May 13 03:27:43 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gFf6Y43phz6YQ9c for ; Wed, 13 May 2026 03:27:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFf6Y355vz3q3f for ; Wed, 13 May 2026 03:27:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778642869; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xFEin/LZmDNFJejYGTPsCbi6tU+rLycLrP+JMwSqSD0=; b=sWXxkSfOqnUPf7GgeznhaI/V7SiT+mZq9UI8WoVaaIInWgZT+FNbrTvT/sSz7fpHmndz4V X6QWchHq782a0r/CzUJB61kYnwwFavgkSXA84496MrNGQB7NIZZUhRYBmCnAMJNICjs8sD TOKQFoJ8Xo2TAkB4P+cIEdWM2DoM//duRIsTK5nuzy6syBsMn4WNMbDOh7xhe9ZSNxToUL FZ40IDeoHrKCljC+j3rDodj4wkXmSX6npRIKqiV04OK4sVCmP7MWivIBBy4ZTwT7LZMLQg Gwe8/amOkTFNtrhGQlEWQ21/ft4mxpmi9tYyBHUIdUW0kuF3nNqa9zCKEdZlsQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778642869; a=rsa-sha256; cv=none; b=a8y/qI5gT6vrZPWVTMlLXT1SvRspa+DoqvjSZbLn80nXKouxpT6cQC+BJlCFJCXtMPB+kr /AAF67c1CAZCSEUkHMkXPu82pd6fB7Z9upB0uUSlCvF+BjMwPSnmmSk5ulUF7W1RFjIJWv b6yv+m/VZ9obG2lXJcrJ0CVdllowjXBLC7ITXbhrlYQtOn+ttzS2qgqfxFe0zltk1drlXx zv9sOa3DmG0XYUUpHuA9jXrycL7Di+eQtFA9SeHhNc/7L+LK47ZvUEpiPmfAb7UND2QVDx z4d5TU5G0oJOkWGhGAPSg76DUBXBuNA3NJJN4a49m5AvYnA5WyyBFF/LC5p57g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778642869; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xFEin/LZmDNFJejYGTPsCbi6tU+rLycLrP+JMwSqSD0=; b=W+BIZqgdO9BhIcatbroCFSEskwDv/BHW2rHbINLv548fZ86uLlMj3fp1OhX3nE5/xrE+YL N349MIo4I5cl3gbXhfqfealxp2soChDOi+PZgYmuhfCfB0ZGBUwULCXFM/AWP+y0weudwg i7fX3fv1d6mL8vj7Bl+uCLl4m2/9XBieWRUvNqIuaA8YyNmArq1ZpfiUHQCQsrahhVjKsZ iL39cnReCoWQ1ooWzmsrCEoHMpW3qw3+/9GsQAqm57Z10c86Wy25b3oGGGYMjoVTLptYSA sCdYxIWdFd1apTrVDiClfZCFdsDuPeJs9pDTX0SqUf3SEPgrJwcPw6SSVsNqgg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFf6Y1g8kzYvh for ; Wed, 13 May 2026 03:27:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3797c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 03:27:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Philip Paeps Subject: git: 9cc9b8b37284 - main - contrib/expat: import expat 2.8.1 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: philip X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9cc9b8b372842b9a941d235c5e9949a214e5284f Auto-Submitted: auto-generated Date: Wed, 13 May 2026 03:27:43 +0000 Message-Id: <6a03efaf.3797c.399f0d1b@gitrepo.freebsd.org> The branch main has been updated by philip: URL: https://cgit.FreeBSD.org/src/commit/?id=9cc9b8b372842b9a941d235c5e9949a214e5284f commit 9cc9b8b372842b9a941d235c5e9949a214e5284f Merge: eacf4f50bfb1 e3c0f2f39909 Author: Philip Paeps AuthorDate: 2026-05-13 03:17:00 +0000 Commit: Philip Paeps CommitDate: 2026-05-13 03:26:56 +0000 contrib/expat: import expat 2.8.1 Changes: https://github.com/libexpat/libexpat/blob/R_2_8_1/expat/Changes Security: CVE-2026-45186 MFC after: 1 week contrib/expat/Changes | 26 ++++ contrib/expat/README.md | 2 +- contrib/expat/configure.ac | 2 +- contrib/expat/doc/reference.html | 2 +- contrib/expat/doc/xmlwf.1 | 2 +- contrib/expat/doc/xmlwf.xml | 2 +- contrib/expat/lib/expat.h | 2 +- contrib/expat/lib/xmlparse.c | 36 ++++- contrib/expat/tests/alloc_tests.c | 4 +- contrib/expat/tests/basic_tests.c | 310 ++++++++++++++++++++++++++++++++++++-- contrib/expat/tests/common.c | 5 +- contrib/expat/tests/handlers.c | 34 +++-- contrib/expat/tests/handlers.h | 2 + contrib/expat/tests/memcheck.c | 6 +- contrib/expat/tests/minicheck.c | 10 +- contrib/expat/tests/misc_tests.c | 7 +- contrib/expat/tests/structdata.c | 7 +- contrib/expat/xmlwf/unixfilemap.c | 5 +- contrib/expat/xmlwf/xmlfile.c | 4 +- contrib/expat/xmlwf/xmlwf.c | 83 +++++----- lib/libexpat/expat_config.h | 6 +- lib/libexpat/libbsdxml.3 | 4 +- 22 files changed, 450 insertions(+), 111 deletions(-) diff --cc contrib/expat/README.md index 619e60b2d16b,000000000000..7a5ed463b6d5 mode 100644,000000..100644 --- a/contrib/expat/README.md +++ b/contrib/expat/README.md @@@ -1,300 -1,0 +1,300 @@@ +[![Run Linux CI tasks](https://github.com/libexpat/libexpat/actions/workflows/linux.yml/badge.svg)](https://github.com/libexpat/libexpat/actions/workflows/linux.yml) +[![Packaging status](https://repology.org/badge/tiny-repos/expat.svg)](https://repology.org/metapackage/expat/versions) +[![Downloads SourceForge](https://img.shields.io/sourceforge/dt/expat?label=Downloads%20SourceForge)](https://sourceforge.net/projects/expat/files/) +[![Downloads GitHub](https://img.shields.io/github/downloads/libexpat/libexpat/total?label=Downloads%20GitHub)](https://github.com/libexpat/libexpat/releases) +[![OpenSSF Best Practices](https://www.bestpractices.dev/projects/10205/badge)](https://www.bestpractices.dev/projects/10205) + +> [!CAUTION] +> +> Expat is **understaffed** and without funding. +> There is a [call for help with details](https://github.com/libexpat/libexpat/blob/master/expat/Changes) +> at the top of the `Changes` file. + + - # Expat, Release 2.8.0 ++# Expat, Release 2.8.1 + +This is Expat, a C99 library for parsing +[XML 1.0 Fourth Edition](https://www.w3.org/TR/2006/REC-xml-20060816/), started by +[James Clark](https://en.wikipedia.org/wiki/James_Clark_%28programmer%29) in 1997. +Expat is a stream-oriented XML parser. This means that you register +handlers with the parser before starting the parse. These handlers +are called when the parser discovers the associated structures in the +document being parsed. A start tag is an example of the kind of +structures for which you may register handlers. + +Expat supports the following C99 compilers: + +- GNU GCC >=4.5 (for use from C) or GNU GCC >=4.8.1 (for use from C++) +- LLVM Clang >=3.5 +- Microsoft Visual Studio >=17.0/2022 + (the oldest version supported by the [official GitHub Actions Windows images](https://github.com/actions/runner-images)) + +Windows users can use the +[`expat-win32bin-*.*.*.{exe,zip}` download](https://github.com/libexpat/libexpat/releases), +which includes both pre-compiled libraries and executables, and source code for +developers. + +Expat is [free software](https://www.gnu.org/philosophy/free-sw.en.html). +You may copy, distribute, and modify it under the terms of the License +contained in the file +[`COPYING`](https://github.com/libexpat/libexpat/blob/master/expat/COPYING) +distributed with this package. +This license is the same as the MIT/X Consortium license. + + +## Using libexpat in your CMake-Based Project + +There are three documented ways of using libexpat with CMake: + +### a) `find_package` with Module Mode + +This approach leverages CMake's own [module `FindEXPAT`](https://cmake.org/cmake/help/latest/module/FindEXPAT.html). + +Notice the *uppercase* `EXPAT` in the following example: + +```cmake +cmake_minimum_required(VERSION 3.10) + +project(hello VERSION 1.0.0) + +find_package(EXPAT 2.2.8 MODULE REQUIRED) + +add_executable(hello + hello.c +) + +target_link_libraries(hello PUBLIC EXPAT::EXPAT) +``` + +### b) `find_package` with Config Mode + +This approach requires files from… + +- libexpat >=2.2.8 where packaging uses the CMake build system +or +- libexpat >=2.3.0 where packaging uses the GNU Autotools build system + on Linux +or +- libexpat >=2.4.0 where packaging uses the GNU Autotools build system + on macOS or MinGW. + +Notice the *lowercase* `expat` in the following example: + +```cmake +cmake_minimum_required(VERSION 3.10) + +project(hello VERSION 1.0.0) + +find_package(expat 2.2.8 CONFIG REQUIRED char dtd ns) + +add_executable(hello + hello.c +) + +target_link_libraries(hello PUBLIC expat::expat) +``` + +### c) The `FetchContent` module + +This approach — as demonstrated below — requires CMake >=3.18 for both the +[`FetchContent` module](https://cmake.org/cmake/help/latest/module/FetchContent.html) +and its support for the `SOURCE_SUBDIR` option to be available. + +Please note that: +- Use of the `FetchContent` module with *non-release* SHA1s or `master` + of libexpat is neither advised nor considered officially supported. +- Pinning to a specific commit is great for robust CI. +- Pinning to a specific commit needs updating every time there is a new + release of libexpat — either manually or through automation —, + to not miss out on libexpat security updates. + +For an example that pulls in libexpat via Git: + +```cmake +cmake_minimum_required(VERSION 3.18) + +include(FetchContent) + +project(hello VERSION 1.0.0) + +FetchContent_Declare( + expat + GIT_REPOSITORY https://github.com/libexpat/libexpat/ + GIT_TAG 000000000_GIT_COMMIT_SHA1_HERE_000000000 # i.e. Git tag R_X_Y_Z + SOURCE_SUBDIR expat/ +) + +FetchContent_MakeAvailable(expat) + +add_executable(hello + hello.c +) + +target_link_libraries(hello PUBLIC expat) +``` + + +## Building from a Git Clone + +If you are building Expat from a check-out from the +[Git repository](https://github.com/libexpat/libexpat/), +you need to run a script that generates the configure script using the +GNU autoconf and libtool tools. To do this, you need to have +autoconf 2.58 or newer. Run the script like this: + +```console +./buildconf.sh +``` + +Once this has been done, follow the same instructions as for building +from a source distribution. + + +## Building from a Source Distribution + +### a) Building with the configure script (i.e. GNU Autotools) + +To build Expat from a source distribution, you first run the +configuration shell script in the top level distribution directory: + +```console +./configure +``` + +There are many options which you may provide to configure (which you +can discover by running configure with the `--help` option). But the +one of most interest is the one that sets the installation directory. +By default, the configure script will set things up to install +libexpat into `/usr/local/lib`, `expat.h` into `/usr/local/include`, and +`xmlwf` into `/usr/local/bin`. If, for example, you'd prefer to install +into `/home/me/mystuff/lib`, `/home/me/mystuff/include`, and +`/home/me/mystuff/bin`, you can tell `configure` about that with: + +```console +./configure --prefix=/home/me/mystuff +``` + +Another interesting option is to enable 64-bit integer support for +line and column numbers and the over-all byte index: + +```console +./configure CPPFLAGS=-DXML_LARGE_SIZE +``` + +However, such a modification would be a breaking change to the ABI +and is therefore not recommended for general use — e.g. as part of +a Linux distribution — but rather for builds with special requirements. + +After running the configure script, the `make` command will build +things and `make install` will install things into their proper +location. Have a look at the `Makefile` to learn about additional +`make` options. Note that you need to have write permission into +the directories into which things will be installed. + +If you are interested in building Expat to provide document +information in UTF-16 encoding rather than the default UTF-8, follow +these instructions (after having run `make distclean`). +Please note that we configure with `--without-xmlwf` as xmlwf does not +support this mode of compilation (yet): + +1. Mass-patch `Makefile.am` files to use `libexpatw.la` for a library name: +
+ `find . -name Makefile.am -exec sed + -e 's,libexpat\.la,libexpatw.la,' + -e 's,libexpat_la,libexpatw_la,' + -i.bak {} +` + +1. Run `automake` to re-write `Makefile.in` files:
+ `automake` + +1. For UTF-16 output as unsigned short (and version/error strings as char), + run:
+ `./configure CPPFLAGS=-DXML_UNICODE --without-xmlwf`
+ For UTF-16 output as `wchar_t` (incl. version/error strings), run:
+ `./configure CFLAGS="-g -O2 -fshort-wchar" CPPFLAGS=-DXML_UNICODE_WCHAR_T + --without-xmlwf` +
Note: The latter requires libc compiled with `-fshort-wchar`, as well. + +1. Run `make` (which excludes xmlwf). + +1. Run `make install` (again, excludes xmlwf). + +Using `DESTDIR` is supported. It works as follows: + +```console +make install DESTDIR=/path/to/image +``` + +overrides the in-makefile set `DESTDIR`, because variable-setting priority is + +1. commandline +1. in-makefile +1. environment + +Note: This only applies to the Expat library itself, building UTF-16 versions +of xmlwf and the tests is currently not supported. + +A reference manual is available in the file `doc/reference.html` in this +distribution. + + +### b) Building with CMake + +The CMake build system is still *experimental* and may replace the primary +build system based on GNU Autotools at some point when it is ready. + + +#### Available Options + +For an idea of the available (non-advanced) options for building with CMake: + +```console +# rm -f CMakeCache.txt ; cmake -D_EXPAT_HELP=ON -LH . | grep -B1 ':.*=' | sed 's,^--$,,' +// Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel ... +CMAKE_BUILD_TYPE:STRING= + +// Install path prefix, prepended onto install directories. +CMAKE_INSTALL_PREFIX:PATH=/usr/local + +// Path to a program. +DOCBOOK_TO_MAN:FILEPATH=/usr/bin/docbook2x-man + +// Build man page for xmlwf +EXPAT_BUILD_DOCS:BOOL=ON + +// Build the examples for expat library +EXPAT_BUILD_EXAMPLES:BOOL=ON + +// Build fuzzers for the expat library +EXPAT_BUILD_FUZZERS:BOOL=OFF + +// Build pkg-config file +EXPAT_BUILD_PKGCONFIG:BOOL=ON + +// Build the tests for expat library +EXPAT_BUILD_TESTS:BOOL=ON + +// Build the xmlwf tool for expat library +EXPAT_BUILD_TOOLS:BOOL=ON + +// Character type to use (char|ushort|wchar_t) [default=char] +EXPAT_CHAR_TYPE:STRING=char + +// Install expat files in cmake install target +EXPAT_ENABLE_INSTALL:BOOL=ON + +// Use /MT flag (static CRT) when compiling in MSVC +EXPAT_MSVC_STATIC_CRT:BOOL=OFF + +// Build fuzzers via OSS-Fuzz for the expat library +EXPAT_OSSFUZZ_BUILD:BOOL=OFF + +// Build a shared expat library +EXPAT_SHARED_LIBS:BOOL=ON + +// Define to provide symbol versioning for dependency generation +EXPAT_SYMBOL_VERSIONING:BOOL=OFF + +// Treat all compiler warnings as errors +EXPAT_WARNINGS_AS_ERRORS:BOOL=OFF +``` diff --cc lib/libexpat/expat_config.h index fcc692224520,000000000000..3259e7a187aa mode 100644,000000..100644 --- a/lib/libexpat/expat_config.h +++ b/lib/libexpat/expat_config.h @@@ -1,149 -1,0 +1,149 @@@ +/* expat_config.h. Generated from expat_config.h.in by configure. */ +/* expat_config.h.in. Generated from configure.ac by autoheader. */ + +#ifndef EXPAT_CONFIG_H +#define EXPAT_CONFIG_H 1 + +#include + +/* Define if building universal (internal helper macro) */ +/* #undef AC_APPLE_UNIVERSAL_BUILD */ + +/* 1234 = LILENDIAN, 4321 = BIGENDIAN */ +#if BYTE_ORDER == LITTLE_ENDIAN +#define BYTEORDER 1234 +#else +#define BYTEORDER 4321 +#endif + +/* Define to 1 if you have the `arc4random' function. */ +#define HAVE_ARC4RANDOM 1 + +/* Define to 1 if you have the `arc4random_buf' function. */ +#define HAVE_ARC4RANDOM_BUF 1 + +/* define if the compiler supports basic C++11 syntax */ +#define HAVE_CXX11 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_DLFCN_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_FCNTL_H 1 + +/* Define to 1 if you have the 'getpagesize' function. */ +#define HAVE_GETPAGESIZE 1 + +/* Define to 1 if you have the `getrandom' function. */ +#define HAVE_GETRANDOM 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_INTTYPES_H 1 + +/* Define to 1 if you have the 'bsd' library (-lbsd). */ +/* #undef HAVE_LIBBSD */ + +/* Define to 1 if you have a working 'mmap' system call. */ +#define HAVE_MMAP 1 + +/* 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 `syscall' and `SYS_getrandom'. */ +#define HAVE_SYSCALL_GETRANDOM 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_PARAM_H 1 + +/* 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 + +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 + +/* Define to the sub-directory where libtool stores uninstalled libraries. */ +#define LT_OBJDIR ".libs/" + +/* Name of package */ +#define PACKAGE "expat" + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "https://github.com/libexpat/libexpat/issues" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "expat" + +/* Define to the full name and version of this package. */ - #define PACKAGE_STRING "expat 2.8.0" ++#define PACKAGE_STRING "expat 2.8.1" + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "expat" + +/* Define to the home page for this package. */ +#define PACKAGE_URL "" + +/* Define to the version of this package. */ - #define PACKAGE_VERSION "2.8.0" ++#define PACKAGE_VERSION "2.8.1" + +/* 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 STDC_HEADERS 1 + +/* Version number of package */ - #define VERSION "2.8.0" ++#define VERSION "2.8.1" + +/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most + significant byte first (like Motorola and SPARC, unlike Intel). */ +#if defined AC_APPLE_UNIVERSAL_BUILD +# if defined __BIG_ENDIAN__ +# define WORDS_BIGENDIAN 1 +# endif +#else +# ifndef WORDS_BIGENDIAN +/* # undef WORDS_BIGENDIAN */ +# endif +#endif + +/* Define to allow retrieving the byte offsets for attribute names and values. + */ +/* #undef XML_ATTR_INFO */ + +/* Define to specify how much context to retain around the current parse + point, 0 to disable. */ +#define XML_CONTEXT_BYTES 1024 + +/* Define to include code reading entropy from `/dev/urandom'. */ +#define XML_DEV_URANDOM 1 + +/* Define to make parameter entity parsing functionality available. */ +#define XML_DTD 1 + +/* Define as 1/0 to enable/disable support for general entities. */ +#define XML_GE 1 + +/* Define to make XML Namespaces functionality available. */ +#define XML_NS 1 + +/* Define to empty if 'const' does not conform to ANSI C. */ +/* #undef const */ + +/* Define to 'long int' if does not define. */ +/* #undef off_t */ + +#endif // ndef EXPAT_CONFIG_H diff --cc lib/libexpat/libbsdxml.3 index e5fedea71dd1,000000000000..3283aeffedfa mode 100644,000000..100644 --- a/lib/libexpat/libbsdxml.3 +++ b/lib/libexpat/libbsdxml.3 @@@ -1,67 -1,0 +1,67 @@@ +.\"- +.\" Copyright (c) 2002 Poul-Henning Kamp +.\" All rights reserved. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\" SUCH DAMAGE. +.\"/ - .Dd April 27, 2026 ++.Dd May 13, 2026 +.Dt LIBBSDXML 3 +.Os +.Sh NAME +.Nm libbsdxml +.Nd eXpat XML parser library +.Sh SYNOPSIS +.In bsdxml.h +.Sh DESCRIPTION +The +.Nm - library is a verbatim copy of the eXpat XML library version 2.8.0. ++library is a verbatim copy of the eXpat XML library version 2.8.1. +.Pp +The +.Nm +library is intended to be used within the +.Fx +base system only. +Use of the +.Nm +library for other purposes is not supported and discouraged. +.Pp +To avoid version and autoconfiguration issues, the library has been +renamed to +.Nm +rather than retain the original eXpat library and include file names +to prevent confusion and autoconfiguration issues for 3rd party +software. +.Sh SEE ALSO +For full documentation, please see the eXpat webpage at +.Pa http://www.libexpat.org/ . +.Sh AUTHORS +.An -nosplit +The original eXpat was written by +.An James Clark Aq Mt jjc@jclark.com . +.Pp +Subsequently eXpat maintenance and development been taken up by a group +of people under the leadership of +.An Fred Drake Aq Mt fdrake@acm.com , +.An Paul Prescod , +and +.An Clark Cooper . From nobody Wed May 13 04:21:41 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gFgJj6jZnz6chpK for ; Wed, 13 May 2026 04:21: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFgJj4qtTz3v7w for ; Wed, 13 May 2026 04:21:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778646101; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gJO7VqiBl7bSVX0BdDaJ/HOVHlJPD1lhw+puzpvLou8=; b=wpX97XGuGVKn/LGWlDassC/1QKpDhSQM0g2JmcWlb1NiT5ihzXPHWHWT7mtdFEWCgUUPoO 58zAe6u++HNUoCaoLNfHTTlX3Z1wx4idgwBlVjUjHkLzHofN/nDSuu7B9nfzXWywrwsbdM n8nEqkekju6MWVB4qnHno25OENeXZUnmk7IaHh3gKH8lkH8Uuiziu0SpD6fiXp8GcIvHZ/ wLK5uxv5QG7FL0BzMctX6p1fHBKrbQq4be7AJHn0YfjQuYEG0bTKvRbA+TxyHqO0Wj6r7j TkZ3yqNfJf9bY1vORJqDVtpyzoQ+I6xW1xQDtSCBtkVoAt9JpQepba5kC+H2Bw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778646101; a=rsa-sha256; cv=none; b=u1HUzQ81FCznFvFE06yfF2EEo3zBzFRVS7lpiO5KpHUclg3hFgJBNdqjGpmrrcBsMqfTWq Xix/tUF7OmyHsfOVwpZu29VdogCSr7GHCdNhYSnnyJaXYFjshsV0C5cIQQRmQvqNZTHRn+ 4JbyOcmsQJ81Cpvzqog3feA8jgLM432GbLxJ/mPviPNnBATQueeKiI6fYA4hWtW6K+Qg6x OPvujTqDNiRvgvDMMtW58fYFSFKgnPb24DxLVjxHQJ1pQe6vj1e1h9eS/rS26XgLmFVtHg 8sdbcosw5qcoTrwKoCcf4G4I3y3kIcjIlT9jpqAioyLC9NWYGHuSosuk5W2Dxg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778646101; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gJO7VqiBl7bSVX0BdDaJ/HOVHlJPD1lhw+puzpvLou8=; b=qB7WuNFqbwL9PyYeoh2fkPLEqRwejzpI9/kMOGBY+bCUHiL7pQrnPB9deuZBMSpP0dHwsS Te3D6Ym2GYvp1fm/wLECQfcc92H5a+OXdmyl3k0SB4RMQnhiEqOOV9qcWtrDkkHc5Ng/lK KdKytAFhQXw+gdJ+2vjUMs0ZQcbHVnk5bAPV4jmkxClsk+huJTUxvzcX2pTxWN2kOJnhrA wJKv+YIHowZ3av6+atwcppAIastGQASoIF1aiiiHoFyEl+gdLKPeCeaY0e7Wy3Ma9uuZwQ D8waaywoUtIClgqXuqwg9bdcTJtD5mqyf7Ygo8gZ6J6kPK9gLquJdPJ0Gg+G2g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFgJj4HtbzbZk for ; Wed, 13 May 2026 04:21:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3fe6b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 04:21:41 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Simon J. Gerraty Subject: git: 87c7c12d343a - Create tag vendor/NetBSD/bmake/20260508 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sjg X-Git-Repository: src X-Git-Refname: refs/tags/vendor/NetBSD/bmake/20260508 X-Git-Reftype: annotated tag X-Git-Commit: 87c7c12d343aeaf8b95c1765ea3c08c3c7173c18 Auto-Submitted: auto-generated Date: Wed, 13 May 2026 04:21:41 +0000 Message-Id: <6a03fc55.3fe6b.6ae5c34f@gitrepo.freebsd.org> The annotated tag vendor/NetBSD/bmake/20260508 has been created by sjg: URL: https://cgit.FreeBSD.org/src/tag/?h=vendor/NetBSD/bmake/20260508 tag vendor/NetBSD/bmake/20260508 Tagger: Simon J. Gerraty TaggerDate: 2026-05-13 04:21:25 +0000 Tag bmake/20260508 commit ef402bba84260816d3e8d6e2439b0bc7eddc9446 Author: Simon J. Gerraty AuthorDate: 2026-05-13 04:20:50 +0000 Commit: Simon J. Gerraty CommitDate: 2026-05-13 04:20:50 +0000 Import bmake-20260508 Intersting/relevant changes since bmake-20260313 ChangeLog since bmake-20260313 2026-05-08 Simon J Gerraty * VERSION (_MAKE_VERSION): 20260508 Merge with NetBSD make, pick up o make.1: fix description of '-' handling in jobs-mod by intenting it correctly. 2026-04-13 Simon J Gerraty * VERSION (_MAKE_VERSION): 20260406 Merge with NetBSD make, pick up o cleanup unnecessary parens * configure.in: add --with-save-dollars to control default for .MAKE.SAVE.DOLLARS - address FreeBSD PR 294436 mk/ChangeLog since bmake-20260313 2026-05-09 Simon J Gerraty * gendirdeps.mk: also apply ':S,/$,,' and ':C,/(\.[^.]*)$,\1,' when setting DIRDEPS prior to saving. * dirdeps.mk: when debugging it is handy to be able to skip recursing so if DEBUG_DIRDEPS contains 'norecurse' we will only process the immediate DIRDEPS. Also if DEBUG_DIRDEPS contains '-V' we process sections normally skipped when doing 'make -V'. o ensure we do not get duplicate build dirs due to someone adding a trailing '/' or '/.${TARGET_SPEC}' to a DIRDEPS entry. Add ':S,/$,,' when setting '__depdirs' and add ':C,/(\.[^.]*)$,\1,' when setting '__qual_depdirs'. 2026-04-24 Simon J Gerraty * install-mk (MK_VERSION): 20260424 * Use MK_META_AUTODEP to control use of meta.autodep.mk so it can be used independently of MK_DIRDEPS_BUILD for bootstrapping. * sys.vars.mk (M_type): use :sh rather than :sh1 to avoid surprises in a .for loop. From nobody Wed May 13 04:21:41 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gFgJq16HSz6chRp for ; Wed, 13 May 2026 04:21: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFgJq01vqz3vTq for ; Wed, 13 May 2026 04:21:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778646107; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X59egyOhYUuwbNOHedJpSNGolO9cGG0gc/RFlKWGNSA=; b=Z0etYz/TIq2bUYGAvsSNOpoaTrI30/p8x71rwfJw/CRxzt9FtHfMQwF04k9qWWYaMxRcGZ QL0xhYlpBEojdO5OvEsGqnQcyq9bDwX14C74T3IsaA6PhHrji/fkCFGLACDz1G4IObKcUA Ji8kURzrBO8NYnCqZPkQ4uxFe4hRSMJevbBT40APBRVcQ4l8NFVU1OoGYbcKNj/nPRJ1OU Fke/7nnuHiuzSC3y8GYB38r3qLM2aA+chG0UgBNckx24ca+lUOgAeJjdS7y7WM58qC1PeM LvioXzkI0VGny1Qucyuk/ZLnggCNl1MHX7Yut2+bCTcNxvK7dlE1lW7OSLizmw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778646107; a=rsa-sha256; cv=none; b=CzcRaKvqMkUsa3QjSDcWaIPdr7zyUgAfbsDZ8Fd7EfG2QXqyo7DAeNQo4Sh4k4jvUcBkBa igwC6Cc4/nj30GSTiD/Lih9XccouU6IdaQdnZwZgNUQEBd2M9Tooq6e7mcEFRy4DDQs2wa Fndt11E1CMcn8dzk+MdtYqvjpn17i0lZ03e50do83Xz2Haw4UHyoH7/vGvi8EXJVkIAQgY Lv7ItJ3gzN3YdcDRrfOHTyvkTFfqWh2RwiPmRdry/AINbExt0T5jK4NcL+9rlpGS9CDhBn +dUU/pVPz5jRh568K2yjKChWz19485I/ObUZ3X5MBv91DLyDkWAQEVLkIhy4og== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778646107; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X59egyOhYUuwbNOHedJpSNGolO9cGG0gc/RFlKWGNSA=; b=sfdpOv/A21ECTKCLHU6CYk/A+/CTXLTFl4AplIkCYFARRz8I3U9mp2OqQ/FvHdaLN0AG28 8hIl2KWjQsKaLN7sUiiSizDil5dn+CRoA+FPErd+pXoVm6up/bLCP6YP7PvQO+t7bNE8Kc sYWnVN6WTWqEbtPWTX/OWpoz3xBrHyiI2YEBrgcG4kjMR1qJEDy9U23/NYjy+uUzmDXpoe miU9hlpNnHzxOSj7SBl1KHwwoRL/1AdERMbapulRtSsnPQdyz/EwRafkvjoVEvhLsYFNQq C/4n/NttDYUf6bCqaKhAYwxbJ17eTIVzjbURSrbJgYBnFtHIuDANZMe0dbxkug== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFgJp62pPzbX2 for ; Wed, 13 May 2026 04:21:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e736 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 04:21:41 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Simon J. Gerraty Subject: git: fe271bdb43cf..ef402bba8426 - vendor/NetBSD/bmake - vendor branch updated List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sjg X-Git-Repository: src X-Git-Refname: refs/heads/vendor/NetBSD/bmake X-Git-Reftype: branch X-Git-Commit: ef402bba84260816d3e8d6e2439b0bc7eddc9446 X-Git-Oldrev: fe271bdb43cf88ee129d94c0e286fe618fd28e89 X-Git-Newrev: ef402bba84260816d3e8d6e2439b0bc7eddc9446 Auto-Submitted: auto-generated Date: Wed, 13 May 2026 04:21:41 +0000 Message-Id: <6a03fc55.3e736.b433ab9@gitrepo.freebsd.org> The branch vendor/NetBSD/bmake has been updated by sjg: URL: https://cgit.FreeBSD.org/src/log/?id=fe271bdb43cf..ef402bba8426 ef402bba8426 Import bmake-20260508 From nobody Wed May 13 04:31:48 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gFgXT1wvpz6cj3c for ; Wed, 13 May 2026 04:31: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFgXT1TVsz3wB6 for ; Wed, 13 May 2026 04:31:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778646713; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yyl/CtarHrtJnk5eBJF4RrMqiJEkaHm6Pf7aqx6sL3I=; b=MbdqSEjOt3etnoH4+se/Ftxn69/5jKtApZAKD9oe/ekCeNHIb6m2HLZBvFmR5hpcNnau1c zaGlOEFyo2YfkQ2NrPEUSjOMSWPXNaeHJVzPyrR3U4lf4Y55AzRxifMTLG34N4S0sigoQX RJXj/EwbHUiyXqP69pX/71kv/dZw+MELhZMbugzns56SVrWe8H77pfo6kmdLIQxtJmrJ9T HudxOQLvmquxjtTnqwn/tF5mMmHiVDjANWgFSJoXtWUdYTnWGQj/xU2nUrbuWz9g8PZ2Xo RzXIZGNvxJNpRZJSydC2cCKxksHt3VVdsElymmx/BzRTIA1Yo1ZkV5AQ++EjvA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778646713; a=rsa-sha256; cv=none; b=Jhqs/bXJeQUBjPvSl4+LQRM1T8Fsx1kB9uEl6KoMnZ0sJxYKwSlP0b+3vv8/1nxa+s0FUf UwgQGnPVOYhb9Fay0K4Y6ZiV9YJEoJne5fjIG26hVZTH++qCN9FTdzM5oUISng59LF1bUg TjdSXM809f0X8/dliNpXP4PncjHYak0qd5jxfxFV5WKDB41WJuLbsdItUYlpTTp1FyTKxA rK36u/1/SzqUlVyJMtZEVP0wkFlESAwiYP6SKFKDCUluaGhYO8jKbzybiNBKE51zk+ZNjX x2JvXCDvkurz0uLf7K/5dbUaKwLqBXMXXZ0THym08yrs/vG3GVJJmwFcOKurjA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778646713; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yyl/CtarHrtJnk5eBJF4RrMqiJEkaHm6Pf7aqx6sL3I=; b=sqMn5IBsma7T4vO5s/iCtLnhnQOCmEFL74TVJt+GKUj4qPlrForNEkgBa36lB7G1HPrKn3 mFKO+hHWGoGHgkisYnjaGlbu5PmTAjkPqFeYFYu1Wb1sxShHsl3YYklPcDTWm/Qy18seD+ GQ+qFBAAzZEaBrQGiv+dUAnoNYaoRBk+HHYNZH3/By5UsCTN5yHzQ2KzKfTz9VebaWqW4e FLpMmHJyTU34EEgSQS4cO7hnlbRjyZ1QkTd+YHFxPHgoq/TL0DO9Vsd4s2+AKp4RBjoIGt c8r/XvWnpcCKITxUKyeKb2eryBHsIhKdTCb/ZzhpA+x0/yoMayAEtYW4gO77ug== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFgXT0v91zc0D for ; Wed, 13 May 2026 04:31:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 41498 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 04:31:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Simon J. Gerraty Subject: git: 1729d2f741a1 - main - Merge bmake-20260508 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1729d2f741a12a42c61ed5308ee156a0d1cd1918 Auto-Submitted: auto-generated Date: Wed, 13 May 2026 04:31:48 +0000 Message-Id: <6a03feb4.41498.1110fe88@gitrepo.freebsd.org> The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=1729d2f741a12a42c61ed5308ee156a0d1cd1918 commit 1729d2f741a12a42c61ed5308ee156a0d1cd1918 Merge: 9cc9b8b37284 ef402bba8426 Author: Simon J. Gerraty AuthorDate: 2026-05-13 04:24:08 +0000 Commit: Simon J. Gerraty CommitDate: 2026-05-13 04:26:44 +0000 Merge bmake-20260508 Merge commit 'ef402bba84260816d3e8d6e2439b0bc7eddc9446' contrib/bmake/ChangeLog | 16 ++++++++++++++++ contrib/bmake/Makefile.config.in | 1 + contrib/bmake/VERSION | 2 +- contrib/bmake/arch.c | 16 ++++++++-------- contrib/bmake/bmake.1 | 6 +++--- contrib/bmake/bmake.cat1 | 22 ++++++++++++---------- contrib/bmake/cond.c | 12 +++++------- contrib/bmake/configure | 35 +++++++++++++++++++++++++---------- contrib/bmake/configure.in | 21 ++++++++++++++++++--- contrib/bmake/dir.c | 8 ++++---- contrib/bmake/for.c | 14 +++++++------- contrib/bmake/job.c | 11 +++++------ contrib/bmake/main.c | 6 +++--- contrib/bmake/make-bootstrap.sh.in | 4 +++- contrib/bmake/make.1 | 6 +++--- contrib/bmake/make.c | 13 ++++++------- contrib/bmake/make.h | 14 +++++++------- contrib/bmake/meta.c | 8 +++----- contrib/bmake/mk/ChangeLog | 26 ++++++++++++++++++++++++++ contrib/bmake/mk/dirdeps.mk | 23 ++++++++++++++--------- contrib/bmake/mk/gendirdeps.mk | 8 ++++---- contrib/bmake/mk/install-mk | 4 ++-- contrib/bmake/mk/lib.mk | 4 ++-- contrib/bmake/mk/meta.sys.mk | 8 ++++++-- contrib/bmake/mk/sys.dependfile.mk | 4 ++-- contrib/bmake/mk/sys.dirdeps.mk | 5 +++-- contrib/bmake/mk/sys.mk | 10 ++++++++-- contrib/bmake/mk/sys.vars.mk | 4 ++-- contrib/bmake/parse.c | 6 +++--- contrib/bmake/var.c | 13 ++++++------- usr.bin/bmake/Makefile.config | 3 ++- usr.bin/bmake/config.h | 4 ++-- 32 files changed, 212 insertions(+), 125 deletions(-) diff --cc usr.bin/bmake/Makefile.config index 5ba662b3145e,000000000000..17005c8109db mode 100644,000000..100644 --- a/usr.bin/bmake/Makefile.config +++ b/usr.bin/bmake/Makefile.config @@@ -1,28 -1,0 +1,29 @@@ +# This is a generated file, do NOT edit! +# See contrib/bmake/bsd.after-import.mk +# + +SRCTOP?= ${.CURDIR:H:H} + +# things set by configure + - _MAKE_VERSION?=20260313 ++_MAKE_VERSION?=20260508 + +prefix?= /usr +srcdir= ${SRCTOP}/contrib/bmake +CC?= cc +MAKE_OS?= +DEFAULT_SYS_PATH?= .../share/mk:/usr/share/mk ++MAKE_SAVE_DOLLARS_DEFAULT?= no + +EGREP= egrep +CPPFLAGS+= +CFLAGS+= ${CPPFLAGS} -DHAVE_CONFIG_H +LDFLAGS+= +LIBOBJS+= ${LIBOBJDIR}stresep$U.o +LDADD+= +USE_META?= yes +USE_FILEMON?= dev +FILEMON_H?= /usr/include/dev/filemon/filemon.h +BMAKE_PATH_MAX?= 1024 +# used if MAXPATHLEN not defined +CPPFLAGS+= -DBMAKE_PATH_MAX=${BMAKE_PATH_MAX} diff --cc usr.bin/bmake/config.h index fecfc2be4adb,000000000000..4e4b7c9da809 mode 100644,000000..100644 --- a/usr.bin/bmake/config.h +++ b/usr.bin/bmake/config.h @@@ -1,449 -1,0 +1,449 @@@ +/* config.h. Generated from config.h.in by configure. */ +/* config.h.in. Generated from configure.in by autoheader. */ + +/* Define if building universal (internal helper macro) */ +/* #undef AC_APPLE_UNIVERSAL_BUILD */ + +/* Path of default shell */ +/* #undef DEFSHELL_CUSTOM */ + +/* Shell spec to use by default */ +/* #undef DEFSHELL_INDEX */ + +/* Path of default shell */ +/* #undef DEFSHELL_PATH */ + +/* Define to 1 if you have the header file. */ +#define HAVE_AR_H 1 + +/* Define to 1 if you have the declaration of 'sys_siglist', and to 0 if you + don't. */ +#define HAVE_DECL_SYS_SIGLIST 1 + +/* Define to 1 if you have the header file, and it defines 'DIR'. + */ +#define HAVE_DIRENT_H 1 + +/* Define to 1 if you have the 'dirname' function. */ +#define HAVE_DIRNAME 1 + +/* Define to 1 if you don't have 'vprintf' but do have '_doprnt.' */ +/* #undef HAVE_DOPRNT */ + +/* Define to 1 if you have the 'err' function. */ +#define HAVE_ERR 1 + +/* Define to 1 if you have the 'errx' function. */ +#define HAVE_ERRX 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_ERR_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_FCNTL_H 1 + +/* Define to 1 if you have the 'fork' function. */ +#define HAVE_FORK 1 + +/* Define to 1 if you have the 'getcwd' function. */ +#define HAVE_GETCWD 1 + +/* Define to 1 if you have the 'getenv' function. */ +#define HAVE_GETENV 1 + +/* Define to 1 if you have the 'getopt' function. */ +#define HAVE_GETOPT 1 + +/* Define to 1 if you have the 'getwd' function. */ +#define HAVE_GETWD 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_INTTYPES_H 1 + +/* Define to 1 if you have the 'killpg' function. */ +#define HAVE_KILLPG 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_LIBGEN_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_LIMITS_H 1 + +/* Define to 1 if the system has the type 'long long int'. */ +#define HAVE_LONG_LONG_INT 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_MINIX_CONFIG_H */ + +/* Define to 1 if you have the header file, and it defines 'DIR'. */ +/* #undef HAVE_NDIR_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_PATHS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_POLL_H 1 + +/* Define to 1 if you have the 'putenv' function. */ +#define HAVE_PUTENV 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_RANLIB_H 1 + +/* Define to 1 if you have the 'realpath' function. */ +#define HAVE_REALPATH 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_REGEX_H 1 + +/* Define to 1 if you have the 'select' function. */ +#define HAVE_SELECT 1 + +/* Define to 1 if you have the 'setenv' function. */ +#define HAVE_SETENV 1 + +/* Define to 1 if you have the 'setpgid' function. */ +#define HAVE_SETPGID 1 + +/* Define to 1 if you have the 'setrlimit' function. */ +#define HAVE_SETRLIMIT 1 + +/* Define to 1 if you have the 'setsid' function. */ +#define HAVE_SETSID 1 + +/* Define to 1 if you have the 'sigaction' function. */ +#define HAVE_SIGACTION 1 + +/* Define to 1 if you have the 'sigaddset' function. */ +#define HAVE_SIGADDSET 1 + +/* Define to 1 if you have the 'sigpending' function. */ +#define HAVE_SIGPENDING 1 + +/* Define to 1 if you have the 'sigprocmask' function. */ +#define HAVE_SIGPROCMASK 1 + +/* Define to 1 if you have the 'sigsetmask' function. */ +#define HAVE_SIGSETMASK 1 + +/* Define to 1 if you have the 'sigsuspend' function. */ +#define HAVE_SIGSUSPEND 1 + +/* Define to 1 if you have the 'sigvec' function. */ +#define HAVE_SIGVEC 1 + +/* Define to 1 if the system has the type 'sig_atomic_t'. */ +#define HAVE_SIG_ATOMIC_T 1 + +/* Define to 1 if you have the 'snprintf' function. */ +#define HAVE_SNPRINTF 1 + +/* 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 'strerror' function. */ +#define HAVE_STRERROR 1 + +/* Define to 1 if you have the 'stresep' function. */ +/* #undef HAVE_STRESEP */ + +/* Define to 1 if you have the 'strftime' function. */ +#define HAVE_STRFTIME 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 'strlcpy' function. */ +#define HAVE_STRLCPY 1 + +/* Define to 1 if you have the 'strsep' function. */ +#define HAVE_STRSEP 1 + +/* Define to 1 if you have the 'strtod' function. */ +#define HAVE_STRTOD 1 + +/* Define to 1 if you have the 'strtol' function. */ +#define HAVE_STRTOL 1 + +/* Define to 1 if you have the 'strtoll' function. */ +#define HAVE_STRTOLL 1 + +/* Define to 1 if you have the 'strtoul' function. */ +#define HAVE_STRTOUL 1 + +/* Define to 1 if you have the 'sysctl' function. */ +#define HAVE_SYSCTL 1 + +/* Define to 1 if you have the header file, and it defines 'DIR'. + */ +/* #undef HAVE_SYS_DIR_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_MMAN_H 1 + +/* Define to 1 if you have the header file, and it defines 'DIR'. + */ +/* #undef HAVE_SYS_NDIR_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_PARAM_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_SELECT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_SOCKET_H 1 + +/* 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_SYSCTL_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TIME_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_UIO_H 1 + +/* Define to 1 if you have that is POSIX.1 compatible. */ +#define HAVE_SYS_WAIT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 + +/* Define to 1 if you have the 'unsetenv' function. */ +#define HAVE_UNSETENV 1 + +/* Define to 1 if the system has the type 'unsigned long long int'. */ +#define HAVE_UNSIGNED_LONG_LONG_INT 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_UTIME_H 1 + +/* Define to 1 if you have the 'vfork' function. */ +#define HAVE_VFORK 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_VFORK_H */ + +/* Define to 1 if you have the 'vprintf' function. */ +#define HAVE_VPRINTF 1 + +/* Define to 1 if you have the 'vsnprintf' function. */ +#define HAVE_VSNPRINTF 1 + +/* Define to 1 if you have the 'wait3' function. */ +#define HAVE_WAIT3 1 + +/* Define to 1 if you have the 'wait4' function. */ +#define HAVE_WAIT4 1 + +/* Define to 1 if you have the 'waitpid' function. */ +#define HAVE_WAITPID 1 + +/* Define to 1 if you have the 'warn' function. */ +#define HAVE_WARN 1 + +/* Define to 1 if you have the 'warnx' function. */ +#define HAVE_WARNX 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_WCHAR_H 1 + +/* Define to 1 if 'fork' works. */ +#define HAVE_WORKING_FORK 1 + +/* Define to 1 if 'vfork' works. */ +#define HAVE_WORKING_VFORK 1 + +/* define if your compiler has __attribute__ */ +#define HAVE___ATTRIBUTE__ 1 + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "sjg@NetBSD.org" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "bmake" + +/* Define to the full name and version of this package. */ - #define PACKAGE_STRING "bmake 20251111" ++#define PACKAGE_STRING "bmake 20260406" + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "bmake" + +/* Define to the home page for this package. */ +#define PACKAGE_URL "" + +/* Define to the version of this package. */ - #define PACKAGE_VERSION "20251111" ++#define PACKAGE_VERSION "20260406" + +/* Define to 1 if the 'S_IS*' macros in do not work properly. */ +/* #undef STAT_MACROS_BROKEN */ + +/* 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 STDC_HEADERS 1 + +/* Define to 1 if your declares 'struct tm'. */ +/* #undef TM_IN_SYS_TIME */ + +/* Enable extensions on AIX, Interix, z/OS. */ +#ifndef _ALL_SOURCE +# define _ALL_SOURCE 1 +#endif +/* Enable general extensions on macOS. */ +#ifndef _DARWIN_C_SOURCE +# define _DARWIN_C_SOURCE 1 +#endif +/* Enable general extensions on Solaris. */ +#ifndef __EXTENSIONS__ +# define __EXTENSIONS__ 1 +#endif +/* Enable GNU extensions on systems that have them. */ +#ifndef _GNU_SOURCE +# define _GNU_SOURCE 1 +#endif +/* Enable X/Open compliant socket functions that do not require linking + with -lxnet on HP-UX 11.11. */ +#ifndef _HPUX_ALT_XOPEN_SOCKET_API +# define _HPUX_ALT_XOPEN_SOCKET_API 1 +#endif +/* Identify the host operating system as Minix. + This macro does not affect the system headers' behavior. + A future release of Autoconf may stop defining this macro. */ +#ifndef _MINIX +/* # undef _MINIX */ +#endif +/* Enable general extensions on NetBSD. + Enable NetBSD compatibility extensions on Minix. */ +#ifndef _NETBSD_SOURCE +# define _NETBSD_SOURCE 1 +#endif +/* Enable OpenBSD compatibility extensions on NetBSD. + Oddly enough, this does nothing on OpenBSD. */ +#ifndef _OPENBSD_SOURCE +# define _OPENBSD_SOURCE 1 +#endif +/* Define to 1 if needed for POSIX-compatible behavior. */ +#ifndef _POSIX_SOURCE +/* # undef _POSIX_SOURCE */ +#endif +/* Define to 2 if needed for POSIX-compatible behavior. */ +#ifndef _POSIX_1_SOURCE +/* # undef _POSIX_1_SOURCE */ +#endif +/* Enable POSIX-compatible threading on Solaris. */ +#ifndef _POSIX_PTHREAD_SEMANTICS +# define _POSIX_PTHREAD_SEMANTICS 1 +#endif +/* Enable extensions specified by ISO/IEC TS 18661-5:2014. */ +#ifndef __STDC_WANT_IEC_60559_ATTRIBS_EXT__ +# define __STDC_WANT_IEC_60559_ATTRIBS_EXT__ 1 +#endif +/* Enable extensions specified by ISO/IEC TS 18661-1:2014. */ +#ifndef __STDC_WANT_IEC_60559_BFP_EXT__ +# define __STDC_WANT_IEC_60559_BFP_EXT__ 1 +#endif +/* Enable extensions specified by ISO/IEC TS 18661-2:2015. */ +#ifndef __STDC_WANT_IEC_60559_DFP_EXT__ +# define __STDC_WANT_IEC_60559_DFP_EXT__ 1 +#endif +/* Enable extensions specified by C23 Annex F. */ +#ifndef __STDC_WANT_IEC_60559_EXT__ +# define __STDC_WANT_IEC_60559_EXT__ 1 +#endif +/* Enable extensions specified by ISO/IEC TS 18661-4:2015. */ +#ifndef __STDC_WANT_IEC_60559_FUNCS_EXT__ +# define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1 +#endif +/* Enable extensions specified by C23 Annex H and ISO/IEC TS 18661-3:2015. */ +#ifndef __STDC_WANT_IEC_60559_TYPES_EXT__ +# define __STDC_WANT_IEC_60559_TYPES_EXT__ 1 +#endif +/* Enable extensions specified by ISO/IEC TR 24731-2:2010. */ +#ifndef __STDC_WANT_LIB_EXT2__ +# define __STDC_WANT_LIB_EXT2__ 1 +#endif +/* Enable extensions specified by ISO/IEC 24747:2009. */ +#ifndef __STDC_WANT_MATH_SPEC_FUNCS__ +# define __STDC_WANT_MATH_SPEC_FUNCS__ 1 +#endif +/* Enable extensions on HP NonStop. */ +#ifndef _TANDEM_SOURCE +# define _TANDEM_SOURCE 1 +#endif +/* Enable X/Open extensions. Define to 500 only if necessary + to make mbstate_t available. */ +#ifndef _XOPEN_SOURCE +/* # undef _XOPEN_SOURCE */ +#endif + + +/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most + significant byte first (like Motorola and SPARC, unlike Intel). */ +#if defined AC_APPLE_UNIVERSAL_BUILD +# if defined __BIG_ENDIAN__ +# define WORDS_BIGENDIAN 1 +# endif +#else +# ifndef WORDS_BIGENDIAN +/* # undef WORDS_BIGENDIAN */ +# endif +#endif + +/* Define for Solaris 2.5.1 so the uint32_t typedef from , + , or is not used. If the typedef were allowed, the + #define below would cause a syntax error. */ +/* #undef _UINT32_T */ + +/* C99 function name */ +/* #undef __func__ */ + +/* Define to empty if 'const' does not conform to ANSI C. */ +/* #undef const */ + +/* Define to '__inline__' or '__inline' if that's what the C compiler + calls it, or to nothing if 'inline' is not supported under any name. */ +#ifndef __cplusplus +/* #undef inline */ +#endif + +/* Define to the type of a signed integer type of width exactly 64 bits if + such a type exists and the standard includes do not define it. */ +/* #undef int64_t */ + +/* Define to 'int' if does not define. */ +/* #undef mode_t */ + +/* Define to 'long int' if does not define. */ +/* #undef off_t */ + +/* Define as a signed integer type capable of holding a process identifier. */ +/* #undef pid_t */ + +/* type that signal handlers can safely frob */ +/* #undef sig_atomic_t */ + +/* Define as 'unsigned int' if doesn't define. */ +/* #undef size_t */ + +/* Define to the type of an unsigned integer type of width exactly 32 bits if + such a type exists and the standard includes do not define it. */ +/* #undef uint32_t */ + +/* Define as 'fork' if 'vfork' does not work. */ +/* #undef vfork */ From nobody Wed May 13 09:10:26 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gFnjv1WBBz6d48y for ; Wed, 13 May 2026 09:10: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFnjt6P7Jz3HBT for ; Wed, 13 May 2026 09: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=1778663426; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=G9nq/yIC5btdPgakF9lIniOWqwnjS+loaWw8/6XOWWk=; b=ScoGrArKB+Orz0IP9994YcM2WqtQX5EyCHGxHldBYKQCVDAK2uC2rCDN39BGpBLQgTa7OM JivufNp2WRNDSCdqwhA/bPnAHwWllxPuLACCKIf0mGzoF7gZGoHROLSMoP4v8RTmq9lpuG /ukpbrVzFFhZ2wBBj3loMDuac/5iHuRUIF6acIHJHeT3nNuG2olbYH9jv0TadGqnVPb2r9 01djRivfoc87LIaJFmMZqqXqO4c7dUxxOrQDFGkrVbjm4Xoyr9ntA3hP1qpiemVhsbkNYz NGYMpE79yWB+XOsxfywE9Gy21tXri5N9LvR/R4mxFmq2vTsA7m/NfjRp8CHcOw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778663426; a=rsa-sha256; cv=none; b=os9VSW6x0IbYFggs6lopa/Plp3wP9NgqRjIcW5rQbL30KV43w9xstUABF/KfB+YRKMsnML 9g8UO6cICMzz7ifirYZYSdfwEQD4lVHz/ypJ5X2nKBmuEMpwitNgHE/2Zv7BVKz8U0A6Bj 6YZTTVb623ljvRSz9ciVqTTubOp0CwfL8desEXsBfowKWZXlruqjBRgsHxDsaq8yAlk/yR ieonPFh5MWepIAiKByCK7z2kC6s6dTiQoeNu28dJ9OOnrDDkh4rsowBmaJql2uj+4Wv7Yj MbW8Jo2lgPCx+ev0rybwEe9iR31S1rmqMLKHd/EORtS0siArqa1JejJRWw6P0Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778663426; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=G9nq/yIC5btdPgakF9lIniOWqwnjS+loaWw8/6XOWWk=; b=epe57LeVyLEopi0M2bNNXTTi5yllMPOadfNI56D17Gm7TKmUv4/rY8em60/I3zLnECRLAa zDZqgktQySzATmlT/le5PrwOhBKzxZen/EWsCcKkzt0+9gLs8V57yEOLeMFkNfnBmYthMe pE757mUU4BwQ/g9K5utZnUiIUNXstYdJG8DJLc4pGop3zFLeMbMCCnZReF8eFPrwBvArAN sKVf6Zk8DTvWYcOnOvqSCoIDjz67CI9u12Kxzbfmgeu5nbLs9Nk7jXp7XvdoqeR302o0Sx k6avF8I7Q3ka4ZekM7q3IR/RCYCM0OOBYvvr5MP0P+VmoEGpfknVrFvhlZ7Kuw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFnjt5vplzkvc for ; Wed, 13 May 2026 09:10:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3337e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 09:10:26 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 87b18b611ec9 - stable/15 - nuageinit: fix command injection and related issues List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 87b18b611ec9a70347fdd239345fa23977bcb2d0 Auto-Submitted: auto-generated Date: Wed, 13 May 2026 09:10:26 +0000 Message-Id: <6a044002.3337e.39e48fa3@gitrepo.freebsd.org> The branch stable/15 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=87b18b611ec9a70347fdd239345fa23977bcb2d0 commit 87b18b611ec9a70347fdd239345fa23977bcb2d0 Author: Baptiste Daroussin AuthorDate: 2026-05-07 18:22:14 +0000 Commit: Baptiste Daroussin CommitDate: 2026-05-13 09:10:20 +0000 nuageinit: fix command injection and related issues - Add shell_escape() helper to safely escape shell arguments - Apply shell_escape to all user-controlled values in shell commands: adduser (usershow, useradd, lock, primary_group, groups) addgroup (groupshow, groupadd, members) exec_change_password (usermod) settimezone (tzsetup root and timezone) install_package (pkg package names) - Escape double quotes in hostname when writing rc.conf.d/hostname - Add missing 'local' declaration for resolvconf_command in nameservers() - Escape interface name in resolvconf -a command - Change open_resolvconf_conf() from 'w' to 'a' mode to prevent data loss when nameservers() is called multiple times - Clean up stale resolvconf.conf at the start of each boot (skip on postnet to preserve config written by first call) MFC After: 1 day (cherry picked from commit 8b70a203be10411c560ed303ab25713d70b316e9) --- libexec/nuageinit/nuage.lua | 43 +++++++++++++++++++++++------------- libexec/nuageinit/nuageinit | 17 ++++++++++++-- libexec/nuageinit/tests/nuageinit.sh | 6 ++--- 3 files changed, 46 insertions(+), 20 deletions(-) diff --git a/libexec/nuageinit/nuage.lua b/libexec/nuageinit/nuage.lua index 2d962b540b23..f3c23a7c3eb8 100644 --- a/libexec/nuageinit/nuage.lua +++ b/libexec/nuageinit/nuage.lua @@ -52,6 +52,10 @@ local function decode_base64(input) return table.concat(result) end +local function shell_escape(s) + return "'" .. string.gsub(s, "'", "'\\''") .. "'" +end + local function warnmsg(str, prepend) if not str then return @@ -121,7 +125,7 @@ local function sethostname(hostname) warnmsg("Impossible to open " .. hostnamepath .. ":" .. err) return end - f:write('hostname="' .. hostname .. '"\n') + f:write('hostname="' .. hostname:gsub('"', '\\"') .. '"\n') f:close() end @@ -199,7 +203,7 @@ local function adduser(pwd) if root then cmd = cmd .. "-R " .. root .. " " end - local f = io.popen(cmd .. " usershow " .. pwd.name .. " -7 2> /dev/null") + local f = io.popen(cmd .. " usershow " .. shell_escape(pwd.name) .. " -7 2> /dev/null") local pwdstr = f:read("*a") f:close() if pwdstr:len() ~= 0 then @@ -220,13 +224,17 @@ local function adduser(pwd) -- a warning but creates the user anyway. list = purge_group(list) if #list > 0 then - extraargs = " -G " .. table.concat(list, ",") + local escaped_list = {} + for _, g in ipairs(list) do + table.insert(escaped_list, shell_escape(g)) + end + extraargs = " -G " .. table.concat(escaped_list, ",") end end -- pw will automatically create a group named after the username -- do not add a -g option in this case if pwd.primary_group and pwd.primary_group ~= pwd.name then - extraargs = extraargs .. " -g " .. pwd.primary_group + extraargs = extraargs .. " -g " .. shell_escape(pwd.primary_group) end if not pwd.no_create_home then extraargs = extraargs .. " -m " @@ -248,9 +256,9 @@ local function adduser(pwd) if root then cmd = cmd .. "-R " .. root .. " " end - cmd = cmd .. "useradd -n " .. pwd.name .. " -M 0755 -w none " - cmd = cmd .. extraargs .. " -c '" .. pwd.gecos - cmd = cmd .. "' -d '" .. pwd.homedir .. "' -s " .. pwd.shell .. postcmd + cmd = cmd .. "useradd -n " .. shell_escape(pwd.name) .. " -M 0755 -w none " + cmd = cmd .. extraargs .. " -c " .. shell_escape(pwd.gecos) + cmd = cmd .. " -d " .. shell_escape(pwd.homedir) .. " -s " .. shell_escape(pwd.shell) .. postcmd f = io.popen(cmd, "w") if input then @@ -267,7 +275,7 @@ local function adduser(pwd) if root then cmd = cmd .. "-R " .. root .. " " end - cmd = cmd .. "lock " .. pwd.name + cmd = cmd .. "lock " .. shell_escape(pwd.name) os.execute(cmd) end return pwd.homedir @@ -283,7 +291,7 @@ local function addgroup(grp) if root then cmd = cmd .. "-R " .. root .. " " end - local f = io.popen(cmd .. " groupshow " .. grp.name .. " 2> /dev/null") + local f = io.popen(cmd .. " groupshow " .. shell_escape(grp.name) .. " 2> /dev/null") local grpstr = f:read("*a") f:close() if grpstr:len() ~= 0 then @@ -292,13 +300,17 @@ local function addgroup(grp) local extraargs = "" if grp.members then local list = splitlist(grp.members) - extraargs = " -M " .. table.concat(list, ",") + local escaped_list = {} + for _, m in ipairs(list) do + table.insert(escaped_list, shell_escape(m)) + end + extraargs = " -M " .. table.concat(escaped_list, ",") end cmd = "pw " if root then cmd = cmd .. "-R " .. root .. " " end - cmd = cmd .. "groupadd -n " .. grp.name .. extraargs + cmd = cmd .. "groupadd -n " .. shell_escape(grp.name) .. extraargs local r = os.execute(cmd) if not r then warnmsg("fail to add group " .. grp.name) @@ -484,7 +496,7 @@ local function exec_change_password(user, password, type, expire) postcmd = " -w random" end end - cmd = cmd .. "usermod " .. user .. postcmd + cmd = cmd .. "usermod " .. shell_escape(user) .. postcmd if expire then cmd = cmd .. " -p 1" else @@ -577,7 +589,7 @@ local function settimezone(timezone) root = "/" end - local f, _, rc = os.execute("tzsetup -s -C " .. root .. " " .. timezone) + local f, _, rc = os.execute("tzsetup -s -C " .. shell_escape(root) .. " " .. shell_escape(timezone)) if not f then warnmsg("Impossible to configure time zone ( rc = " .. rc .. " )") @@ -600,8 +612,8 @@ local function install_package(package) if package == nil then return true end - local install_cmd = "pkg install -y " .. package - local test_cmd = "pkg info -q " .. package + local install_cmd = "pkg install -y " .. shell_escape(package) + local test_cmd = "pkg info -q " .. shell_escape(package) if os.getenv("NUAGE_RUN_TESTS") then print(install_cmd) print(test_cmd) @@ -683,6 +695,7 @@ local function addfile(file, defer) end local n = { + shell_escape = shell_escape, warn = warnmsg, err = errmsg, chmod = chmod, diff --git a/libexec/nuageinit/nuageinit b/libexec/nuageinit/nuageinit index a1ebd3f52b25..fc8d9582b9c6 100755 --- a/libexec/nuageinit/nuageinit +++ b/libexec/nuageinit/nuageinit @@ -67,7 +67,14 @@ local function open_resolv_conf() end local function open_resolvconf_conf() - return openat("/etc", "resolvconf.conf") + local path_dir = root .. "/etc" + local path_name = path_dir .. "/resolvconf.conf" + nuage.mkdir_p(path_dir) + local f, err = io.open(path_name, "a") + if not f then + nuage.err("unable to open " .. path_name .. ": " .. err) + end + return f, path_name end local function get_ifaces_by_mac() @@ -271,8 +278,9 @@ local function nameservers(interface, obj) end -- Only call resolvconf with interface if interface is provided + local resolvconf_command if interface then - resolvconf_command = "resolvconf -a " .. interface .. " < " .. resolv_conf + resolvconf_command = "resolvconf -a " .. nuage.shell_escape(interface) .. " < " .. resolv_conf else resolvconf_command = "resolvconf -u" end @@ -738,6 +746,11 @@ local function load_userdata() return line, obj end +-- Clean up stale resolvconf.conf from previous boot +if citype ~= "postnet" then + os.remove(root .. "/etc/resolvconf.conf") +end + if citype == "config-2" then -- network config2_network(ni_path) diff --git a/libexec/nuageinit/tests/nuageinit.sh b/libexec/nuageinit/tests/nuageinit.sh index 1fd68d5a178e..89207fdf0aca 100644 --- a/libexec/nuageinit/tests/nuageinit.sh +++ b/libexec/nuageinit/tests/nuageinit.sh @@ -801,7 +801,7 @@ packages: - yeah/plop EOF chmod 755 "${PWD}"/media/nuageinit/user_data - atf_check -s exit:0 -o inline:"pkg install -y yeah/plop\npkg info -q yeah/plop\n" /usr/libexec/nuageinit "${PWD}"/media/nuageinit postnet + atf_check -s exit:0 -o inline:"pkg install -y 'yeah/plop'\npkg info -q 'yeah/plop'\n" /usr/libexec/nuageinit "${PWD}"/media/nuageinit postnet cat > media/nuageinit/user_data << 'EOF' #cloud-config @@ -809,7 +809,7 @@ packages: - curl EOF chmod 755 "${PWD}"/media/nuageinit/user_data - atf_check -o inline:"pkg install -y curl\npkg info -q curl\n" /usr/libexec/nuageinit "${PWD}"/media/nuageinit postnet + atf_check -o inline:"pkg install -y 'curl'\npkg info -q 'curl'\n" /usr/libexec/nuageinit "${PWD}"/media/nuageinit postnet cat > media/nuageinit/user_data << 'EOF' #cloud-config @@ -818,7 +818,7 @@ packages: - meh: bla EOF chmod 755 "${PWD}"/media/nuageinit/user_data - atf_check -o inline:"pkg install -y curl\npkg info -q curl\n" -e inline:"nuageinit: Invalid type: table for packages entry number 2\n" /usr/libexec/nuageinit "${PWD}"/media/nuageinit postnet + atf_check -o inline:"pkg install -y 'curl'\npkg info -q 'curl'\n" -e inline:"nuageinit: Invalid type: table for packages entry number 2\n" /usr/libexec/nuageinit "${PWD}"/media/nuageinit postnet } config2_userdata_update_packages_body() From nobody Wed May 13 11:26:33 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gFrky1Qlmz6dF33 for ; Wed, 13 May 2026 11:26: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFrkx4hQjz3ZRZ for ; Wed, 13 May 2026 11:26:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778671593; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MbYL3xQ57cZnjqC7wJ9sDrCscgCq6PZL0Z8liGAng9A=; b=aJ1oV19BuYnuFAnL7DVAOxRxc2xRPmaUBonkg/PrGLLhHNjfT3BfxOX10yifn4ynpImmip DlQWRntKZAzJTUs4SolAOQlMQnOlKJTgBS6VoaDd6nXV46OswqH+IoSCD/F/grjGjpSXm3 40smZT6MGhJhAK3BZDBT7iw3jcxr3NzexgeSaddNs/88QS6fq77mt3nO2fJ4sWDVsoXnTF ldmN2+FBYAyeo7rR4NYbLMvKA5C4Crz7F9wvI8iny1ExMopEiqvJYa0Pag9/1zFc85J+Ma WwI2kPMWb2Gnyn06vTx/DdfyjsZ8Z3eC3d5Tqg7nHvtBnmXRs2jUp2ri7fo0gA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778671593; a=rsa-sha256; cv=none; b=yFcbj5kBrjc91Fa3pgUK58BuHM+x6twpZdWp+MxGkLYkLheRRNei0cq3Ikc7452Lzkq44Q e4j5q4pG1qhYrulXw3Ns27/d7nR1HSUWebXOHgrlY0t/ZZqMX/FXyyneEEZ04/kBs/g1mt 3UifJOMN5EjW8GnY7+1qgu1wfC8o2oT+NdAtZg1ruBVimOV0vAsMuGD11SU3z7Hi+1Ux4Y hxse9Jbb1O5nCuZeVg0bZsZbBpcmR0Q/+6Mqe+j4yGpnksuSOZy8lQ5tMQVr983xgUMNF2 pA3wV5JWFO92iakcM5ZVgoYfain6bt912baqdEB6S83j0ItvbzYOS2IIIVo0pQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778671593; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MbYL3xQ57cZnjqC7wJ9sDrCscgCq6PZL0Z8liGAng9A=; b=GUj1rGJUfSYFCHfou590w5fl3tllSTEuAslLelu6RXm2uniljRkXHp21F1O8A4HGMmUPPL VkU18XPhSsFw8Dd3h6YL+sM07ScoYKThi6es2TYIYJjucOJ18I1NKG0cgqFVkQJjFt6mLy voc6aJsEIqX6BbHVDIvn/txVSbs5wXAysMGm+BtUpKjV17759XsXrLd1VEMUUxgTYNmArX T4uP+Qz0foTh6u9uaBNAuQVnnyzz1ZqlxGOxM9Z1dTIN+dj80j6kbAy044xBwvz2L0okvW pK0kSO4L8AjZ8U9l35ewZRjrRFP8KUlns7E5FGh8n+Wb2j0R7+C5m3HM1WNtaQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFrkx486tzp60 for ; Wed, 13 May 2026 11:26:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 43907 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 11:26:33 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Pouria Mousavizadeh Tehrani Subject: git: 4329663a861e - main - rtnetlink: Align RTA_MULTIPATH length validation in nlattr_get List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pouria X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4329663a861ef74796b79b6b0872cfe10d31c591 Auto-Submitted: auto-generated Date: Wed, 13 May 2026 11:26:33 +0000 Message-Id: <6a045fe9.43907.49e26815@gitrepo.freebsd.org> The branch main has been updated by pouria: URL: https://cgit.FreeBSD.org/src/commit/?id=4329663a861ef74796b79b6b0872cfe10d31c591 commit 4329663a861ef74796b79b6b0872cfe10d31c591 Author: Pouria Mousavizadeh Tehrani AuthorDate: 2026-05-12 11:34:28 +0000 Commit: Pouria Mousavizadeh Tehrani CommitDate: 2026-05-13 09:44:28 +0000 rtnetlink: Align RTA_MULTIPATH length validation in nlattr_get Fix length validation of RTA_MULTIPATH attributes in nlattr_get_multipath() by making sure the user request is align. PR: 295102 Reported by: Robert Morris Reviewed by: markj Fixes: 7e5bf68495cc ("netlink: add netlink support") MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D56963 --- sys/netlink/route/rt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/netlink/route/rt.c b/sys/netlink/route/rt.c index 4d7b0a3e1fa3..dfc501e11299 100644 --- a/sys/netlink/route/rt.c +++ b/sys/netlink/route/rt.c @@ -479,8 +479,9 @@ nlattr_get_multipath(struct nlattr *nla, struct nl_pstate *npt, for (rtnh = (struct rtnexthop *)(nla + 1); data_len > 0; ) { struct rta_mpath_nh *mpnh; + len = NL_ITEM_ALIGN(rtnh->rtnh_len); if (__predict_false(rtnh->rtnh_len <= sizeof(*rtnh) || - rtnh->rtnh_len > data_len)) { + len < rtnh->rtnh_len || len > data_len)) { NLMSG_REPORT_ERR_MSG(npt, "%s: bad length %u", __func__, rtnh->rtnh_len); return (EINVAL); @@ -494,7 +495,6 @@ nlattr_get_multipath(struct nlattr *nla, struct nl_pstate *npt, mp->num_nhops - 1); return (error); } - len = NL_ITEM_ALIGN(rtnh->rtnh_len); data_len -= len; rtnh = (struct rtnexthop *)((char *)rtnh + len); } From nobody Wed May 13 11:26:32 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gFrl16d7vz6dDtw for ; Wed, 13 May 2026 11:26: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFrl14fvqz3ZRx for ; Wed, 13 May 2026 11:26:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778671597; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5I3NOXC8XL68RKdET1nWduse8nArF9yxz4k2/POW5YM=; b=asemwWcJi0zKbeHFnDLtVRtJhHrYt7rMzEmrSHpIoTQ1z8k6p5q3jrWKwELg/GT5eZEE8i RK58IKQff/pzc//PvSjnFanv0/4PGbiq4UIfDvz2TLbN2fzpbpXic/qnPzUDnKEP6ww7h7 2NVM9ANEBUzpAXvaq8KoCM38x8Hlq20PThYELsPVrq15CF8/ov4jXI+/mY4fNd2OL0aghF a34+OTh4WfsKgYy01g6n++nQrpazoglTnsmylxLBfbG138gfzVeW1iQ/VG8Q3kHBRKAGNJ 9W+OiauLY7MTkDOycCI7Lqih9npBR/LHaEcr3J3sZeuH7N4BeRRoNsQ85+03zQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778671597; a=rsa-sha256; cv=none; b=UJolw7juYqBbks+hpPqKCD3eKVCrM3j0lqs//2XNJQwODqjIv69HbKZ4MebnFzFjG5/O4m 9npRTvIP7NuJ423S1JVhw2Jnd9TH9a+MO/eqc47d8Q+11zMYE5B6n3vBlIxLhEXybM8mwn wBRra7zNzxVnvyTC4DssaDgkZJ6HPdLk+gQE9DAFdSqll/KP9Djjeuq6j+YYZHTYUKxSdf 0tmGsPXZTgI+Cdm2A+X2P+L7eqVoEDUJZU9HPjtIu+oiSLrp8NBQjdqqQBUj3+6OCCyxzp XqB+I+0sJSDX2IBAxzzwJkf08iQMnmpvE3APzwUl6ko+FJ+wuKJv66k3XnZymQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778671597; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5I3NOXC8XL68RKdET1nWduse8nArF9yxz4k2/POW5YM=; b=MP50rGMEGZIKdEKBPlLoWCQ9G80mTe3z3wNwJRu4TMqkLSI8IOf4KRi1FqYghUPuuADXv4 T+yy12M2N4dVx1ic+arz37WuHhxvv1Q3LUZ4E/AwhqkCkWD3TkatZdyqnIgp10uJ/f0nM2 lq68qkUOJOEK0elAqDL70VvQ15IxxuJH+wUITZHa4/Hc4jumg1rCweZKYUuvDd2uc2jgsa K4fuWt7xukZQFzLraBC7c45gEEXuMCyNKvYYt6NlVXuWeq0YdGlqiw6eZLYZqPomZ4ShZu 9wG5JyrtSYe3SamR27FDy7zoo36PX3iG5aKki4sAIGsMamsObNSI3aIniSvDFQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFrl141GCzpQh for ; Wed, 13 May 2026 11:26:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 43d94 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 11:26:32 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Pouria Mousavizadeh Tehrani Subject: git: 188631e43a1a - main - rtnetlink: Check for allocation failure in nlattr_get_multipath() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pouria X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 188631e43a1a5d2985156141c2e244a925670683 Auto-Submitted: auto-generated Date: Wed, 13 May 2026 11:26:32 +0000 Message-Id: <6a045fe8.43d94.6e31bd14@gitrepo.freebsd.org> The branch main has been updated by pouria: URL: https://cgit.FreeBSD.org/src/commit/?id=188631e43a1a5d2985156141c2e244a925670683 commit 188631e43a1a5d2985156141c2e244a925670683 Author: Pouria Mousavizadeh Tehrani AuthorDate: 2026-05-11 19:53:21 +0000 Commit: Pouria Mousavizadeh Tehrani CommitDate: 2026-05-13 09:44:19 +0000 rtnetlink: Check for allocation failure in nlattr_get_multipath() Check for alloction failure on `npt_alloc()` for RTA_MULTIPATH attributes in `nlattr_get_multipath()`. Also, add tests for maximum number of rtnexthop in rtnetlink. Reported by: Joshua Rogers of AISLE Research Team Reviewed by: markj MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D56954 --- sys/netlink/route/rt.c | 4 +++ tests/sys/netlink/test_rtnl_route.c | 55 +++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+) diff --git a/sys/netlink/route/rt.c b/sys/netlink/route/rt.c index cb2d737f34e3..4d7b0a3e1fa3 100644 --- a/sys/netlink/route/rt.c +++ b/sys/netlink/route/rt.c @@ -470,6 +470,10 @@ nlattr_get_multipath(struct nlattr *nla, struct nl_pstate *npt, max_nhops = data_len / sizeof(struct rtnexthop); mp = npt_alloc(npt, (max_nhops + 2) * sizeof(struct rta_mpath_nh)); + if (mp == NULL) { + NLMSG_REPORT_ERR_MSG(npt, "%s: too many RTA_MULTIPATH", __func__); + return (ENOMEM); + } mp->num_nhops = 0; for (rtnh = (struct rtnexthop *)(nla + 1); data_len > 0; ) { diff --git a/tests/sys/netlink/test_rtnl_route.c b/tests/sys/netlink/test_rtnl_route.c index 84d73db11cc7..334d1fea9fe9 100644 --- a/tests/sys/netlink/test_rtnl_route.c +++ b/tests/sys/netlink/test_rtnl_route.c @@ -18,6 +18,7 @@ #include #include +#include #include #include @@ -310,12 +311,66 @@ ATF_TC_BODY(rtnl_nhgrp_expire, tc) cleanup_route_by_dst(&ss, &nw, "203.0.113.0"); } +ATF_TC(rtnl_nhgrp_big_nhops); +ATF_TC_HEAD(rtnl_nhgrp_big_nhops, tc) +{ + atf_tc_set_md_var(tc, "descr", "test RTA_MULTIPATH with too many nhops using netlink"); + atf_tc_set_md_var(tc, "require.user", "root"); + atf_tc_set_md_var(tc, "require.kmods", "netlink"); +} + +ATF_TC_BODY(rtnl_nhgrp_big_nhops, tc) +{ + struct snl_state ss; + struct snl_writer nw; + struct nlmsghdr *hdr, *rx_hdr; + struct in_addr gw; + struct snl_errmsg_data e = {}; + struct snl_parsed_route r = { .rtax_weight = RT_DEFAULT_WEIGHT }; + struct rtmsg *rtm; + struct rtnexthop *rtnh; + int nhop, max_nhop, off, off2; + + max_nhop = 25; + ATF_REQUIRE_MSG(snl_init(&ss, NETLINK_ROUTE), "snl_init() failed"); + + inet_pton(AF_INET, "127.0.2.1", &gw); + + /* create new multipath route */ + snl_init_writer(&ss, &nw); + ATF_REQUIRE((hdr = snl_create_msg_request(&nw, RTM_NEWROUTE)) != NULL); + hdr->nlmsg_flags |= NLM_F_CREATE; + ATF_REQUIRE((rtm = prepare_rtm_by_dst(&nw, "203.0.113.0")) != NULL); + + off = snl_add_msg_attr_nested(&nw, RTA_MULTIPATH); + for (nhop = 0; nhop < max_nhop; nhop++) { + off2 = snl_get_msg_offset(&nw); + rtnh = snl_reserve_msg_object(&nw, struct rtnexthop); + rtnh->rtnh_flags = 0; + rtnh->rtnh_hops = nhop + 1; + rtnh->rtnh_ifindex = 0; + snl_add_msg_attr_ip4(&nw, RTA_GATEWAY, &gw); + rtnh = snl_restore_msg_offset(&nw, off2, struct rtnexthop); + rtnh->rtnh_len = snl_get_msg_offset(&nw) - off2; + } + snl_end_attr_nested(&nw, off); + + ATF_REQUIRE((hdr = snl_finalize_msg(&nw)) != NULL); + ATF_REQUIRE(snl_send_message(&ss, hdr)); + ATF_REQUIRE((rx_hdr = snl_read_reply(&ss, hdr->nlmsg_seq)) != NULL); + ATF_REQUIRE(snl_parse_errmsg(&ss, rx_hdr, &e)); + ATF_REQUIRE_INTEQ(e.error, ENOMEM); + + cleanup_route_by_dst(&ss, &nw, "203.0.113.0"); +} + ATF_TP_ADD_TCS(tp) { ATF_TP_ADD_TC(tp, rtnl_nhgrp); ATF_TP_ADD_TC(tp, rtnl_nhgrp_expire); ATF_TP_ADD_TC(tp, rtnl_nhop_merge); + ATF_TP_ADD_TC(tp, rtnl_nhgrp_big_nhops); return (atf_no_error()); } From nobody Wed May 13 11:56:55 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gFsQ44qn3z6dHPk for ; Wed, 13 May 2026 11:57: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFsQ44BxNz3ptD for ; Wed, 13 May 2026 11:57:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778673420; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nwmVawtIieAvC9ekV7+jYwunabZV2QtQenMOHU0irVI=; b=LwN7ojmRZL+OEQWWqhx/PdNWyDHC3ugOTnlZs/CHJNaGPFJWrJVs3SjlEUTORERkR6l8Yz ymlsht4JnlfvopGn1ove6Ze/yArBs5X4zoDjATObAN2i+uHKyYd5pxXZT1wzxrXGlhZo08 zDWJqBqIPziiAV7uvWz1onV1aA3HHIUJ0P8zaDuvhFjCvD81xZQz4JVg3bDljw+zU9Wb/O k1ZeODA/aDlrmMFfMDQ12jPuu0NuaXkbITozhaaNoN8Mmd05JfNEgZrV4MRm0VzA27Dup4 3ZhZAGchsVoAslutfA5Qey9Bw6ePc1JrICH62r1SfucFfyaV8V0T3e8c1d1BQQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778673420; a=rsa-sha256; cv=none; b=j3paGVMNfJ2kl/pDujBIabNmgWCgHZSw/0J0IHVM7iezEJ5ZVdTNbL3CD0pu32Hs4jkjp4 9Osl/who6XAZxNOz99+Sgfak6+8b2Zs/cEuzUjjdDBhYof3BE1rCfQ2WSfljmM0Rm3yoI4 xN2fIZ7bsto758EeNrSUvXGOkJO8Q4SVqFdWNFwIzp9bnn038eikYjBGnFxxbsWPE1+PrB thEw9B3EfU3FJsvQ25PXVeWtUfC0Ou7I8oOoy5NXamfg4+OhcD4WlGJ/KB1Esx6MXMNtUz XaVTfxZXq4LqL8r1+xLt0suln7Q4Onbizf4ArP28I6RoWts5WrCaKbrqDd2JiQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778673420; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nwmVawtIieAvC9ekV7+jYwunabZV2QtQenMOHU0irVI=; b=fE3mSKGNalWiHfhtP5fhlA3QunAWssEO0XPZPGErMJhdeRMXhzwhcLk9sAgAy4EFnvxA7U pX1BXQlRUJITvlmdzMaOkGAuAcEQZMtNoUORjj/dQFFIAg2oT/Djnqmcii/HLJVgvPC3bK PmjoYn8K5AcotQcV+XsxKcqsJDVeGppg1XlkzJH7Botav6k94X2Zn3S2TZHs6ouf+swOfQ NfmsEuPn8cTx07hFLgybrGXwrxvNhAq+oqlzISfE5QYuIOz0FfqdP/025d6V2TmYBSBLQt yqIPevzjpyfRrg3XU17JVwEo+EaX54BVC1f/sqpvvTkcIC4Dzx+oUC2tanbUyA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFsQ43bskzqRK for ; Wed, 13 May 2026 11:57:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 46877 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 11:56:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Aymeric Wibo Subject: git: d649825e8348 - main - power: Power device and ioctl for state transitions List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: d649825e83482f796f492f2000b20ce1b5db6f63 Auto-Submitted: auto-generated Date: Wed, 13 May 2026 11:56:55 +0000 Message-Id: <6a046707.46877.4d9fa1a9@gitrepo.freebsd.org> The branch main has been updated by obiwac: URL: https://cgit.FreeBSD.org/src/commit/?id=d649825e83482f796f492f2000b20ce1b5db6f63 commit d649825e83482f796f492f2000b20ce1b5db6f63 Author: Aymeric Wibo AuthorDate: 2026-05-10 09:04:32 +0000 Commit: Aymeric Wibo CommitDate: 2026-05-13 11:55:48 +0000 power: Power device and ioctl for state transitions Create new /dev/power node with super simple ioctl for initiating sleep state transitions. This is meant as a generic interface to replace the ACPI- and APM-specific interfaces. This allows for non-ACPI states to be entered, such as suspend-to-idle when setting kern.power.suspend=suspend_to_idle. Reviewed by: markj, olce Approved by: markj, olce Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55508 --- sys/dev/acpi_support/acpi_ibm.c | 2 +- sys/dev/syscons/syscons.c | 4 +-- sys/dev/vt/vt_core.c | 4 +-- sys/kern/subr_power.c | 59 ++++++++++++++++++++++++++++++++++++++--- sys/sys/power.h | 31 ++++++++++++++-------- 5 files changed, 81 insertions(+), 19 deletions(-) diff --git a/sys/dev/acpi_support/acpi_ibm.c b/sys/dev/acpi_support/acpi_ibm.c index 2967832a0878..693d793532c1 100644 --- a/sys/dev/acpi_support/acpi_ibm.c +++ b/sys/dev/acpi_support/acpi_ibm.c @@ -1453,7 +1453,7 @@ acpi_ibm_eventhandler(struct acpi_ibm_softc *sc, int arg) * instead of suspend-to-RAM. */ case IBM_EVENT_SUSPEND_TO_RAM: - power_pm_suspend(POWER_TRANSITION_SUSPEND); + (void)power_pm_suspend(POWER_TRANSITION_SUSPEND); break; case IBM_EVENT_BLUETOOTH: diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c index fe440b68f209..9167da23efd8 100644 --- a/sys/dev/syscons/syscons.c +++ b/sys/dev/syscons/syscons.c @@ -3987,10 +3987,10 @@ next_code: break; case SUSP: - power_pm_suspend(POWER_TRANSITION_SUSPEND); + (void)power_pm_suspend(POWER_TRANSITION_SUSPEND); break; case STBY: - power_pm_suspend(POWER_TRANSITION_STANDBY); + (void)power_pm_suspend(POWER_TRANSITION_STANDBY); break; case DBG: diff --git a/sys/dev/vt/vt_core.c b/sys/dev/vt/vt_core.c index 641f6c014937..db54cb426844 100644 --- a/sys/dev/vt/vt_core.c +++ b/sys/dev/vt/vt_core.c @@ -804,11 +804,11 @@ vt_machine_kbdevent(struct vt_device *vd, int c) return (1); case SPCLKEY | STBY: /* XXX Not present in kbdcontrol parser. */ /* Put machine into Stand-By mode. */ - power_pm_suspend(POWER_TRANSITION_STANDBY); + (void)power_pm_suspend(POWER_TRANSITION_STANDBY); return (1); case SPCLKEY | SUSP: /* kbdmap(5) keyword `susp`. */ /* Suspend machine. */ - power_pm_suspend(POWER_TRANSITION_SUSPEND); + (void)power_pm_suspend(POWER_TRANSITION_SUSPEND); return (1); } diff --git a/sys/kern/subr_power.c b/sys/kern/subr_power.c index 47682a0ee75e..ffd91db83e96 100644 --- a/sys/kern/subr_power.c +++ b/sys/kern/subr_power.c @@ -31,7 +31,10 @@ */ #include +#include #include +#include +#include #include #include #include @@ -49,6 +52,54 @@ static void *power_pm_arg = NULL; static bool power_pm_supported[POWER_STYPE_COUNT] = {0}; static struct task power_pm_task; +static d_ioctl_t power_ioctl; + +static struct cdevsw power_cdevsw = { + .d_version = D_VERSION, + .d_ioctl = power_ioctl, + .d_name = "power", +}; + +static void +power_init(void *unused) +{ + struct make_dev_args args; + struct cdev *dev; + + make_dev_args_init(&args); + args.mda_devsw = &power_cdevsw; + args.mda_uid = UID_ROOT; + args.mda_gid = GID_OPERATOR; + args.mda_mode = 0660; + if (make_dev_s(&args, &dev, "power") != 0) + printf("Failed to create power device"); +} +SYSINIT(powerdev, SI_SUB_PSEUDO, SI_ORDER_ANY, power_init, NULL); + +static int +power_ioctl(struct cdev *dev, u_long cmd, caddr_t data, int fflag, + struct thread *td) +{ + int err = 0; + uint32_t trans; + + if ((fflag & FWRITE) == 0) + return (EPERM); + + switch (cmd) { + case PIOTRANSITION: + trans = *(uint32_t *)data; + /* Check for overflow */ + if ((enum power_transition)trans != trans) + return (EINVAL); + err = power_pm_suspend((enum power_transition)trans); + break; + default: + err = EINVAL; + } + return (err); +} + enum power_stype power_name_to_stype(const char *name) { @@ -175,13 +226,13 @@ power_pm_get_type(void) return (power_pm_type); } -void +int power_pm_suspend(enum power_transition trans) { enum power_stype stype; if (power_pm_fn == NULL) - return; + return (ENXIO); switch (trans) { case POWER_TRANSITION_STANDBY: @@ -196,11 +247,13 @@ power_pm_suspend(enum power_transition trans) default: printf("%s: unknown sleep state transition %d\n", __func__, trans); - return; + return (EINVAL); } power_pm_task.ta_context = (void *)(intptr_t)stype; taskqueue_enqueue(taskqueue_thread, &power_pm_task); + + return (0); } /* diff --git a/sys/sys/power.h b/sys/sys/power.h index e420717e1aa7..a1497d1a6524 100644 --- a/sys/sys/power.h +++ b/sys/sys/power.h @@ -3,7 +3,7 @@ * * Copyright (c) 2001 Mitsuru IWASAKI * All rights reserved. - * Copyright (c) 2025 The FreeBSD Foundation + * Copyright (c) 2025-2026 The FreeBSD Foundation * * Portions of this software were developed by Aymeric Wibo * under sponsorship from the FreeBSD Foundation. @@ -32,17 +32,9 @@ #ifndef _SYS_POWER_H_ #define _SYS_POWER_H_ -#ifdef _KERNEL -#include #include - -/* Power management system type */ -#define POWER_PM_TYPE_ACPI 0x01 -#define POWER_PM_TYPE_NONE 0xff - -/* Commands for Power management function */ -#define POWER_CMD_SUSPEND 0x00 +#include /* * Sleep state transition requests. @@ -55,8 +47,25 @@ enum power_transition { POWER_TRANSITION_STANDBY, POWER_TRANSITION_SUSPEND, POWER_TRANSITION_HIBERNATE, + POWER_TRANSITION_COUNT, }; +/* + * Power ioctls. + */ +#define PIOTRANSITION _IOW('T', 1, uint32_t) + +#ifdef _KERNEL + +#include + +/* Power management system type */ +#define POWER_PM_TYPE_ACPI 0x01 +#define POWER_PM_TYPE_NONE 0xff + +/* Commands for Power management function */ +#define POWER_CMD_SUSPEND 0x00 + /* * Sleep type. * @@ -97,7 +106,7 @@ extern int power_pm_register(u_int _pm_type, power_pm_fn_t _pm_fn, void *_pm_arg, bool _pm_supported[static POWER_STYPE_COUNT]); extern u_int power_pm_get_type(void); -extern void power_pm_suspend(enum power_transition _trans); +extern int power_pm_suspend(enum power_transition _trans); /* * System power API. From nobody Wed May 13 12:39:36 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gFtMD6f9Rz6dL9D for ; Wed, 13 May 2026 12:39: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFtMD3SQSz3vk6 for ; Wed, 13 May 2026 12:39:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778675976; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X4pjMafmaVeSqkQbpwVySNoMd1Mc2vvGjGYgy4ICC4I=; b=iLqorsOs3os2L77SO9enWtH47jy1g/sOopfrnZjR3vrLx2lsIExDooZnXH502tFlLWKloZ QmGc8PjXvIGdTn6xh1w0a5j2gt3h4ti2T4erVy3FxJWRUGtK1S9MkkFDaYEtY+kMaGprn1 0hRblp6knAMTUx1In9tEhtZHlxLpjnU519+cdOguJTJ83nazLZfr1w4IagNnANlSG7MQbO DdDKuLpWyyeQK11y3k15OIS1U9hFEEbLwQqInduvkziJkyAvgV302GDEa8GESITaHPYw8o Djnb+1vBGlYy5cEUbxgEa4MBr8aiX6nZGazeCtQ6bzKEQ5o4580p+sSV7f7KGg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778675976; a=rsa-sha256; cv=none; b=U36Zg+NGFfBPrpD6y/+Qut9mPhilFdD/3/2uLPmx7MoJFYygP6aHzsPa4d3mQrzT8XRDhO PDA0GeUmF3DuVF0FcS1zlo0VXgqk9zpEzNE5mDJ3Rv2xbP93yF2UmSJzl+yUQBxxpR+ZdL UXOv2QYIWt/k5Zqd+AU2WFesCuJKPQGYxBhhu+sBxM9nR7GABMaJIJu0u2n0HHHcoqMJTG n4I258BlZJccgxziY/I0+lGjO5QJW/H3bKB6BvcjmUpeNYLmTedvcCwA5kaZagTEKyYfn0 gjK/UVAzH2K+cf5NQJiyNzLY54p0upbF5svep/Ixmk/gHaz2TVcyaVbVWjCd/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778675976; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X4pjMafmaVeSqkQbpwVySNoMd1Mc2vvGjGYgy4ICC4I=; b=kTVMA6Ma5ZByRsIG1iycVewD16JO0UTRU6TNofq3LDwRwUwpajOHjzKfWv75eI+wlbJlbJ scUhXHWQ/bxkqMBjEaR0op2yGRhNZs8YgyjTmFc6yNpdCh0/I99e7psGu8MNzGl2hNhh62 dOejXGXRZDQqNU3rTHz8ZvNBSE+6EkoeXippuG7/FrH6yzy2Ch+8KelaQfMxNlog+wGOFU fYniRTIeBkkfZznX2IGIWm03TZT/K+J8qijRhxvrfjkvBuwbqhKSNaQJbGhe/SD4wkvDhX z4+PibWl4nMcGI9a1xL/L6pfSbMS4mHUjsIkELVtRPHI3J4WOhDc0tB4xOHixQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFtMD2nG5zr6H for ; Wed, 13 May 2026 12:39:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 195e9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 12:39:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: beca41dfb55f - main - acpi_spmc(4): Remove XXX from a comment about retrieving constraints List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: beca41dfb55f0b83612fe8a2aec508944c4b2138 Auto-Submitted: auto-generated Date: Wed, 13 May 2026 12:39:36 +0000 Message-Id: <6a047108.195e9.25848f99@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=beca41dfb55f0b83612fe8a2aec508944c4b2138 commit beca41dfb55f0b83612fe8a2aec508944c4b2138 Author: Olivier Certner AuthorDate: 2026-05-04 11:56:52 +0000 Commit: Olivier Certner CommitDate: 2026-05-13 12:38:18 +0000 acpi_spmc(4): Remove XXX from a comment about retrieving constraints There is really nothing we can do about a DSM function that works on first call but fails on subsequent calls, except calling it only once, which we already do. While here, soften the comment message, as failure was observed with some specific machines only. No functional change. Reviewed by: emaste, obiwac Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D56799 --- sys/dev/acpica/acpi_spmc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/acpica/acpi_spmc.c b/sys/dev/acpica/acpi_spmc.c index d8fa5617c8bf..36a2c20e6be8 100644 --- a/sys/dev/acpica/acpi_spmc.c +++ b/sys/dev/acpica/acpi_spmc.c @@ -451,7 +451,7 @@ acpi_spmc_get_constraints(device_t dev) dsm_index.regular = DSM_GET_DEVICE_CONSTRAINTS; } - /* XXX It seems like this DSM fails if called more than once. */ + /* It seems like this DSM can fail if called more than once. */ status = acpi_EvaluateDSMTyped(sc->handle, (uint8_t *)&dsm_set->uuid, dsm_set->revision, dsm_index.i, NULL, &result, ACPI_TYPE_PACKAGE); From nobody Wed May 13 12:39:37 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gFtMF5tMtz6dL4l for ; Wed, 13 May 2026 12:39: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFtMF49XVz3vbF for ; Wed, 13 May 2026 12:39:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778675977; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tQtx/NJTZCG8NM0U1xppqORrafD59KLVJtIijnIB4K8=; b=Xe0rE6EzEYqe06Zn00LgS50JH6bzHVY0Z65Ll4mvO+W2BAnIRvYaP3qoAMlgDrukqHPm3i SMkmZyUMtM1U3fosw+w0EhoHlzpj9EN3DwQIh2QhwmDBKkTTSnWn/GN1eEzch0qo0ozXgX +4OzH01ugbyH7WWQQNh1pAz/UCcd/jULaiPA+2IlxwhHIlQdOecLSwG5zQS3y5cN9uFPED oXI1XTYx4kyYWyeIsTFCnKLwlGaYh2cdmFnesxk2LQbUuvw9WdHjjjIt/ytvFOToBuQGrk CQihs9f/GgzRaD9slP0hkOaewP4NyEd+RFNSDfw7oq60UdlQcicRz3nkZO9gUg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778675977; a=rsa-sha256; cv=none; b=WAh7vB5norLA9F3zhIeaktwYg6nq2N5vQczirN4oS1/bB7BFNcboyA+kIiFQp5X4aEtwEU DYqOCRxLMnxvF8Bd551uamA2myGiWDuQKCnxsVXjMHyIQ/1HHdfvDIxXbcHkW+XDNCtcTU 4c/XOnDu2ogx+qWOpJqkC94KdRJeZmTWyzBfvMHdx4LEqTGWV5pfHv8a62Sv/R4V6QAk/i vQKMEibcOfWbogWITdGGGs6qbYuztuUKzyrbKed9zBDz0ARneGZFfWv1C4g0j+kzducZSX UdP3dSd9izoWXfe71tsH049mcGLVwnBrq29alextW3fkY0wj5TkqRiYk6TwNsA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778675977; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tQtx/NJTZCG8NM0U1xppqORrafD59KLVJtIijnIB4K8=; b=Im6sqRLdGdoGfNCaCan/19/+VXPCQYZd3gatyiFsgfgNrT9Jy32HWRvXbPYl0ksilQdC42 4CkvhpdKKEpNl5cktCd2XQRbutrq5UM6fsdWd0EU1o1mmiyirGFnqVKpgZ4/sPkOTgyB9Z KHQaZyyGrmlHXV3W9PzLrDq3Aac1vh17G5JOXZSncHbGfHAKTwmShnX68SFqqMUd5d1avh 5SIcYBKT5mnwhyY/wjJZBozgyx1PbcCJNEwcmGiolqgIyWb00ec/kVlzUA0+DW8xV/5Os/ TvKypSgCmKjQVNOLCpDEIMNIaG2BiZJeu0EY5acU6ll4HONnB4T1QD1R2knxDQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFtMF3ZgSzr9P for ; Wed, 13 May 2026 12:39:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1bd18 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 12:39:37 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 704b96509d3c - main - acpi_spmc(4): Constraints: Rename the Intel-format parser List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 704b96509d3c720be382f13d3d020b40acc21e31 Auto-Submitted: auto-generated Date: Wed, 13 May 2026 12:39:37 +0000 Message-Id: <6a047109.1bd18.1ee2c15@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=704b96509d3c720be382f13d3d020b40acc21e31 commit 704b96509d3c720be382f13d3d020b40acc21e31 Author: Olivier Certner AuthorDate: 2026-05-04 12:57:05 +0000 Commit: Olivier Certner CommitDate: 2026-05-13 12:38:19 +0000 acpi_spmc(4): Constraints: Rename the Intel-format parser ...from acpi_spmc_get_constraints_spec() to acpi_spmc_get_constraints_intel(), as really there is no ACPI specification proper and parsing the constraints is done according to some *Intel* specification (even if it is true that, by contrast, AMD has none). No functional change (intended). Reviewed by: obiwac, imp Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D56800 --- sys/dev/acpica/acpi_spmc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/acpica/acpi_spmc.c b/sys/dev/acpica/acpi_spmc.c index 36a2c20e6be8..b13e78b8000b 100644 --- a/sys/dev/acpica/acpi_spmc.c +++ b/sys/dev/acpica/acpi_spmc.c @@ -301,7 +301,7 @@ acpi_spmc_free_constraints(struct acpi_spmc_softc *sc) } static int -acpi_spmc_get_constraints_spec(struct acpi_spmc_softc *sc, ACPI_OBJECT *object) +acpi_spmc_get_constraints_intel(struct acpi_spmc_softc *sc, ACPI_OBJECT *object) { struct acpi_spmc_constraint *constraint; int revision; @@ -465,7 +465,7 @@ acpi_spmc_get_constraints(device_t dev) if (is_amd) rv = acpi_spmc_get_constraints_amd(sc, object); else - rv = acpi_spmc_get_constraints_spec(sc, object); + rv = acpi_spmc_get_constraints_intel(sc, object); AcpiOsFree(object); if (rv != 0) return (rv); From nobody Wed May 13 12:39:38 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gFtMG6HZTz6dL9H for ; Wed, 13 May 2026 12:39:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFtMG4pD7z3vS9 for ; Wed, 13 May 2026 12:39:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778675978; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dbUHUuJaLELGZ7j7wniwGfVNiol2bzqkTxEAADKqtLY=; b=K/Aatu9oQnvWZNgyDdBniFomgem0G7r9RzyhJ32EjQh+QJvXlKpo/fDwOzNdXnl1kcEtrq kIti03fDrKhLmmvx9XYP7bHW5ZAC+lucEpQXJ95Wjkf9noh9PwI6K+2vwU8Jxz6peu6BZ4 RniOOqerLk1taxIqoHZy5FK7XnyAfVOhQX+yedL4E4IacIpqPT4/2zaHKE79TF0V0g0yBX taU1B4BA7g6p1DedNRNw864mJBo1RfBRL/hmhO2kRu60PWf2PFbaNndR9nVQzl39Iiqjcb /R1oXoHV1Vi4ZJYOMuWL0RHSviQUeFeGoS8TeMg8VugeRRR9FIk8saBA2IOozA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778675978; a=rsa-sha256; cv=none; b=NJ96AYSfaon4mIYBYB0qthukNW3EI6VLd3/s9soR0+Zm+jiAnHMIr8Ec4kw2C2J8QndMmw BhGs9cDoz5l88IVfck2QyUHzo14wKNSzjSHpZEjELIFQdr97PWB3IIdfmIAXvsDtnk3ksv dRgMURugjOedOs7DEbvPV8d/i47+CjSHOhUt6eQUsoKaUBFpSh50kBD04wlGZiHhoB70ip KHC+qF/hO5v54qqbBabsrLdAAnDHaqC23T0/5hs/ntwqZQiQ+riFXvhW9UbuSiwRcUiyCR fIVImvvxOevpVWKm2l1/5rVB3O5+9U4prKgvqHEkiEN6yz+CP580m1Dc2ZanqQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778675978; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dbUHUuJaLELGZ7j7wniwGfVNiol2bzqkTxEAADKqtLY=; b=SIOOtoIJm2B4HoMYGA3TX+cqJ5rFVGt/jhD10sDQeRdFgNSdyehvpH2U7UoXr/rpLGYCit ENRp5uI9Q1/GXNgu7UKvdPk0dSeEqhIAycOxteoT39QXeYkuSyNt1lAtfJz7bRZnliNdma wcG5DgpEOoI4eQXaX8QhdI95du9JRmC2L7HA+qqzkdbqZPdb6wjqB68UONcrDL0SDnzfyx XxCjFhD0ADgwmej5EH193zato0MteEv0vJCnWBhWxrkfWGLaZi8ZWVZKB6KlJ+iBth7pXI dKjh46J0FI/6azmGOUohFfN9DFglhfA3Wafs8knykc3VFEDGid753bZi9TKqzw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFtMG4P4jzrDx for ; Wed, 13 May 2026 12:39:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 195ed by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 12:39:38 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: a648c45c9dc1 - main - acpi_spmc(4): Factor out code to test for a DSM's presence List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a648c45c9dc13de0457ea51d1ebd333b06ccff8e Auto-Submitted: auto-generated Date: Wed, 13 May 2026 12:39:38 +0000 Message-Id: <6a04710a.195ed.44ed3b8@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=a648c45c9dc13de0457ea51d1ebd333b06ccff8e commit a648c45c9dc13de0457ea51d1ebd333b06ccff8e Author: Olivier Certner AuthorDate: 2026-05-04 13:16:08 +0000 Commit: Olivier Certner CommitDate: 2026-05-13 12:38:19 +0000 acpi_spmc(4): Factor out code to test for a DSM's presence ...through a new function has_dsm(), which slightly simplifies reading. No functional change (intended). Reviewed by: obiwac, imp Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D56801 --- sys/dev/acpica/acpi_spmc.c | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/sys/dev/acpica/acpi_spmc.c b/sys/dev/acpica/acpi_spmc.c index b13e78b8000b..478887660e16 100644 --- a/sys/dev/acpica/acpi_spmc.c +++ b/sys/dev/acpica/acpi_spmc.c @@ -172,6 +172,12 @@ struct acpi_spmc_softc { struct acpi_spmc_constraint *constraints; }; +static bool +has_dsm(const struct acpi_spmc_softc *const sc, const int dsm_set_bit) +{ + return ((sc->dsm_sets & dsm_set_bit) != 0); +} + static void acpi_spmc_check_dsm_set(struct acpi_spmc_softc *sc, ACPI_HANDLE handle, struct dsm_set *dsm_set); static int acpi_spmc_get_constraints(device_t dev); @@ -442,7 +448,7 @@ acpi_spmc_get_constraints(device_t dev) return (0); /* The Microsoft DSM set doesn't have this DSM. */ - is_amd = (sc->dsm_sets & DSM_SET_AMD) != 0; + is_amd = has_dsm(sc, DSM_SET_AMD); if (is_amd) { dsm_set = &amd_dsm_set; dsm_index.amd = AMD_DSM_GET_DEVICE_CONSTRAINTS; @@ -562,11 +568,11 @@ acpi_spmc_display_off_notif(device_t dev) { struct acpi_spmc_softc *sc = device_get_softc(dev); - if ((sc->dsm_sets & DSM_SET_INTEL) != 0) + if (has_dsm(sc, DSM_SET_INTEL)) acpi_spmc_run_dsm(dev, &intel_dsm_set, DSM_DISPLAY_OFF_NOTIF); - if ((sc->dsm_sets & DSM_SET_MS) != 0) + if (has_dsm(sc, DSM_SET_MS)) acpi_spmc_run_dsm(dev, &ms_dsm_set, DSM_DISPLAY_OFF_NOTIF); - if ((sc->dsm_sets & DSM_SET_AMD) != 0) + if (has_dsm(sc, DSM_SET_AMD)) acpi_spmc_run_dsm(dev, &amd_dsm_set, AMD_DSM_DISPLAY_OFF_NOTIF); } @@ -575,11 +581,11 @@ acpi_spmc_display_on_notif(device_t dev) { struct acpi_spmc_softc *sc = device_get_softc(dev); - if ((sc->dsm_sets & DSM_SET_INTEL) != 0) + if (has_dsm(sc, DSM_SET_INTEL)) acpi_spmc_run_dsm(dev, &intel_dsm_set, DSM_DISPLAY_ON_NOTIF); - if ((sc->dsm_sets & DSM_SET_MS) != 0) + if (has_dsm(sc, DSM_SET_MS)) acpi_spmc_run_dsm(dev, &ms_dsm_set, DSM_DISPLAY_ON_NOTIF); - if ((sc->dsm_sets & DSM_SET_AMD) != 0) + if (has_dsm(sc, DSM_SET_AMD)) acpi_spmc_run_dsm(dev, &amd_dsm_set, AMD_DSM_DISPLAY_ON_NOTIF); } @@ -590,13 +596,13 @@ acpi_spmc_entry_notif(device_t dev) acpi_spmc_check_constraints(sc); - if ((sc->dsm_sets & DSM_SET_AMD) != 0) + if (has_dsm(sc, DSM_SET_AMD)) acpi_spmc_run_dsm(dev, &amd_dsm_set, AMD_DSM_ENTRY_NOTIF); - if ((sc->dsm_sets & DSM_SET_MS) != 0) { + if (has_dsm(sc, DSM_SET_MS)) { acpi_spmc_run_dsm(dev, &ms_dsm_set, DSM_MODERN_ENTRY_NOTIF); acpi_spmc_run_dsm(dev, &ms_dsm_set, DSM_ENTRY_NOTIF); } - if ((sc->dsm_sets & DSM_SET_INTEL) != 0) + if (has_dsm(sc, DSM_SET_INTEL)) acpi_spmc_run_dsm(dev, &intel_dsm_set, DSM_ENTRY_NOTIF); } @@ -605,11 +611,11 @@ acpi_spmc_exit_notif(device_t dev) { struct acpi_spmc_softc *sc = device_get_softc(dev); - if ((sc->dsm_sets & DSM_SET_INTEL) != 0) + if (has_dsm(sc, DSM_SET_INTEL)) acpi_spmc_run_dsm(dev, &intel_dsm_set, DSM_EXIT_NOTIF); - if ((sc->dsm_sets & DSM_SET_AMD) != 0) + if (has_dsm(sc, DSM_SET_AMD)) acpi_spmc_run_dsm(dev, &amd_dsm_set, AMD_DSM_EXIT_NOTIF); - if ((sc->dsm_sets & DSM_SET_MS) != 0) { + if (has_dsm(sc, DSM_SET_MS)) { acpi_spmc_run_dsm(dev, &ms_dsm_set, DSM_EXIT_NOTIF); if (ms_dsm_set.dsms_supported & (1 << DSM_MODERN_TURN_ON_DISPLAY)) From nobody Wed May 13 12:39:39 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gFtMJ38Lrz6dKnZ for ; Wed, 13 May 2026 12:39:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFtMJ0SdQz3vbQ for ; Wed, 13 May 2026 12:39:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778675980; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=O6ULrsUoYFiEyd+d7ZkOY4LNjvmkukUeZw5huJ/HUa0=; b=gEfsGzwUOavpIwNC1Pzuyu8Yw78TSWzf9xB2nZJhSVrIHbdpV7+DbEy05gu+BwAX9x7tvs 2Hk/y195PhlunJkTaJWHvN7h/tb1qT/DLCqojwjEZg9Uh6e5iuSbFk3pABJHYQWW759jun 07P/7hE9kzBWZ/CLYNEPtmUmLbZpulojQAQvcc1tIKXI+NR3KNH8LCN2Zc8HeDUCw9Hgxy 8U3xNCSblIyW+4cWSdc8m8qsifPEsms13r+UdNGeG9uvsGJu1xEmAdIbPgJTYYLlDZUKtx r6HXl5pUlUaW7ePWuCAq6vj+Iu814hiMTPrl2n5+MjBcsztPSpXLmpdK78Wgmw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778675980; a=rsa-sha256; cv=none; b=e15jje/U7qG/1ksq/yHsAUBeOGkKSYDLStAnfX/HxuCsogKfV1JmOqn1ozJoUQprcs8uhd kqu059vVl/Z2RgDaWrZssOqlPUWGwtgr13s+HKvlmA7UHoA7JBuDMlCeACA+J+C/WVoz/g DfWjQ8xqUzyH8hS8+MTZLwOZAM+kfxtJncFGBZNrQ79IQl7YOTApSYQ74ByQLw820swzMz kAemymeLytdOTuQGlpThIadilz+IGcMS9oMsWGnoH0yoFxvmyXwU1185DBQQqqYWksGJQ/ 5iNnRSh9SFwfmnj9e1NLY/Kf7zIrOYYx1k9RoBUULIO2QhD2sWljxrD++MhNRw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778675980; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=O6ULrsUoYFiEyd+d7ZkOY4LNjvmkukUeZw5huJ/HUa0=; b=icFassGV9bpPwTkXOKXjax62fkO0FMWimghDMSW6kuoreTRTZ8kp/foGdD4cXlxQwyFGuz ov88N3NV4GOhtOrA4aeA3OmbgKug/+hRp/I2wVc1nBpySGroeiHUBCP54wegapLiEpAhmI hjp+4vrR0KyWz5nQrLO06svWytDdZ0B5y5gPsMExxiNeFLCsdkO/nvpKe+FSntguZywd4N UX1gu/nF5/GYOiiXWgQBOoMxJjo0MQgnlXFVHilFGXNECYNHZA3Cdf6ydNH/K5398L76AO pyEI5xiTGgrubDGqbAkpYG+Np753R+yAWgcIFt1KprGbpnbhrqAQE/kb047vVw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFtMH5DFjzqyJ for ; Wed, 13 May 2026 12:39:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 196d3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 12:39:39 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 27d99ff07908 - main - acpi_spmc(4): Clear confusion between DSMs and their functions List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 27d99ff07908a0333774b4c364a798154ae9fa8c Auto-Submitted: auto-generated Date: Wed, 13 May 2026 12:39:39 +0000 Message-Id: <6a04710b.196d3.7de397fe@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=27d99ff07908a0333774b4c364a798154ae9fa8c commit 27d99ff07908a0333774b4c364a798154ae9fa8c Author: Olivier Certner AuthorDate: 2026-05-04 14:48:10 +0000 Commit: Olivier Certner CommitDate: 2026-05-13 12:38:19 +0000 acpi_spmc(4): Clear confusion between DSMs and their functions Stick to the ACPI specification's terminology where DSM means "device specific method", but is in fact a set of multiple functions (actually, there is one set of functions per DSM revision, with the set for some revision in theory including those of the previous revisions), by renaming some of the fields of 'struct acpi_spmc_softc' and local variables accordingly. To this end, rename appropriate structures, fields, parameters and variables, mechanically. No functional change (intended). Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D56802 --- sys/dev/acpica/acpi_spmc.c | 204 ++++++++++++++++++++++----------------------- 1 file changed, 102 insertions(+), 102 deletions(-) diff --git a/sys/dev/acpica/acpi_spmc.c b/sys/dev/acpica/acpi_spmc.c index 478887660e16..e7f658dbcad0 100644 --- a/sys/dev/acpica/acpi_spmc.c +++ b/sys/dev/acpica/acpi_spmc.c @@ -42,7 +42,7 @@ enum intel_dsm_index { DSM_DISPLAY_ON_NOTIF = 4, DSM_ENTRY_NOTIF = 5, DSM_EXIT_NOTIF = 6, - /* Only for Microsoft DSM set. */ + /* Only for Microsoft DSM. */ DSM_MODERN_ENTRY_NOTIF = 7, DSM_MODERN_EXIT_NOTIF = 8, DSM_MODERN_TURN_ON_DISPLAY = 9, @@ -57,24 +57,24 @@ enum amd_dsm_index { AMD_DSM_DISPLAY_ON_NOTIF = 5, }; -enum dsm_set_flags { - DSM_SET_INTEL = 1 << 0, - DSM_SET_MS = 1 << 1, - DSM_SET_AMD = 1 << 2, +enum dsm_flags { + DSM_INTEL = 1 << 0, + DSM_MS = 1 << 1, + DSM_AMD = 1 << 2, }; -struct dsm_set { - enum dsm_set_flags flag; +struct dsm_desc { + enum dsm_flags flag; const char *name; - int revision; - struct uuid uuid; - uint64_t dsms_supported; - uint64_t dsms_expected; - uint64_t extra_dsms; + int revision; + struct uuid uuid; + uint64_t supported_functions; + uint64_t expected_functions; + uint64_t extra_functions; }; -static struct dsm_set intel_dsm_set = { - .flag = DSM_SET_INTEL, +static struct dsm_desc dsm_intel = { + .flag = DSM_INTEL, .name = "Intel", /* * XXX Linux uses 1 for the revision on Intel DSMs, but doesn't explain @@ -89,32 +89,32 @@ static struct dsm_set intel_dsm_set = { 0xc4eb40a0, 0x6cd2, 0x11e2, 0xbc, 0xfd, {0x08, 0x00, 0x20, 0x0c, 0x9a, 0x66}, }, - .dsms_expected = (1 << DSM_GET_DEVICE_CONSTRAINTS) | + .expected_functions = (1 << DSM_GET_DEVICE_CONSTRAINTS) | (1 << DSM_DISPLAY_OFF_NOTIF) | (1 << DSM_DISPLAY_ON_NOTIF) | (1 << DSM_ENTRY_NOTIF) | (1 << DSM_EXIT_NOTIF), }; SYSCTL_INT(_debug_acpi_spmc, OID_AUTO, intel_dsm_revision, CTLFLAG_RW, - &intel_dsm_set.revision, 0, + &dsm_intel.revision, 0, "Revision to use when evaluating Intel SPMC DSMs"); -static struct dsm_set ms_dsm_set = { - .flag = DSM_SET_MS, +static struct dsm_desc dsm_ms = { + .flag = DSM_MS, .name = "Microsoft", .revision = 0, .uuid = { /* 11e00d56-ce64-47ce-837b-1f898f9aa461 */ 0x11e00d56, 0xce64, 0x47ce, 0x83, 0x7b, {0x1f, 0x89, 0x8f, 0x9a, 0xa4, 0x61}, }, - .dsms_expected = (1 << DSM_DISPLAY_OFF_NOTIF) | + .expected_functions = (1 << DSM_DISPLAY_OFF_NOTIF) | (1 << DSM_DISPLAY_ON_NOTIF) | (1 << DSM_ENTRY_NOTIF) | (1 << DSM_EXIT_NOTIF) | (1 << DSM_MODERN_ENTRY_NOTIF) | (1 << DSM_MODERN_EXIT_NOTIF), - .extra_dsms = (1 << DSM_MODERN_TURN_ON_DISPLAY), + .extra_functions = (1 << DSM_MODERN_TURN_ON_DISPLAY), }; -static struct dsm_set amd_dsm_set = { - .flag = DSM_SET_AMD, +static struct dsm_desc dsm_amd = { + .flag = DSM_AMD, .name = "AMD", /* * XXX Linux uses 0 for the revision on AMD DSMs, but at least on the @@ -130,13 +130,13 @@ static struct dsm_set amd_dsm_set = { 0xe3f32452, 0xfebc, 0x43ce, 0x90, 0x39, {0x93, 0x21, 0x22, 0xd3, 0x77, 0x21}, }, - .dsms_expected = (1 << AMD_DSM_GET_DEVICE_CONSTRAINTS) | + .expected_functions = (1 << AMD_DSM_GET_DEVICE_CONSTRAINTS) | (1 << AMD_DSM_ENTRY_NOTIF) | (1 << AMD_DSM_EXIT_NOTIF) | (1 << AMD_DSM_DISPLAY_OFF_NOTIF) | (1 << AMD_DSM_DISPLAY_ON_NOTIF), }; SYSCTL_INT(_debug_acpi_spmc, OID_AUTO, amd_dsm_revision, CTLFLAG_RW, - &amd_dsm_set.revision, 0, "Revision to use when evaluating AMD SPMC DSMs"); + &dsm_amd.revision, 0, "Revision to use when evaluating AMD SPMC DSMs"); union dsm_index { int i; @@ -162,7 +162,7 @@ struct acpi_spmc_softc { device_t dev; ACPI_HANDLE handle; ACPI_OBJECT *obj; - enum dsm_set_flags dsm_sets; + enum dsm_flags dsms; struct eventhandler_entry *eh_suspend; struct eventhandler_entry *eh_resume; @@ -173,13 +173,13 @@ struct acpi_spmc_softc { }; static bool -has_dsm(const struct acpi_spmc_softc *const sc, const int dsm_set_bit) +has_dsm(const struct acpi_spmc_softc *const sc, const int dsm_bit) { - return ((sc->dsm_sets & dsm_set_bit) != 0); + return ((sc->dsms & dsm_bit) != 0); } -static void acpi_spmc_check_dsm_set(struct acpi_spmc_softc *sc, - ACPI_HANDLE handle, struct dsm_set *dsm_set); +static void acpi_spmc_check_dsm(struct acpi_spmc_softc *sc, + ACPI_HANDLE handle, struct dsm_desc *dsm); static int acpi_spmc_get_constraints(device_t dev); static void acpi_spmc_free_constraints(struct acpi_spmc_softc *sc); @@ -212,18 +212,18 @@ acpi_spmc_probe(device_t dev) sc = device_get_softc(dev); sc->dev = dev; - /* Check which sets of DSMs are supported. */ - sc->dsm_sets = 0; + /* Check which DSMs are supported. */ + sc->dsms = 0; - acpi_spmc_check_dsm_set(sc, handle, &intel_dsm_set); - acpi_spmc_check_dsm_set(sc, handle, &ms_dsm_set); - acpi_spmc_check_dsm_set(sc, handle, &amd_dsm_set); + acpi_spmc_check_dsm(sc, handle, &dsm_intel); + acpi_spmc_check_dsm(sc, handle, &dsm_ms); + acpi_spmc_check_dsm(sc, handle, &dsm_amd); - if (sc->dsm_sets == 0) + if (sc->dsms == 0) return (ENXIO); - device_set_descf(dev, "System Power Management Controller " - "(DSM sets 0x%x)", sc->dsm_sets); + device_set_descf(dev, "System Power Management Controller (DSMs 0x%x)", + sc->dsms); return (0); } @@ -265,34 +265,34 @@ acpi_spmc_detach(device_t dev) } static void -acpi_spmc_check_dsm_set(struct acpi_spmc_softc *sc, ACPI_HANDLE handle, - struct dsm_set *dsm_set) +acpi_spmc_check_dsm(struct acpi_spmc_softc *sc, ACPI_HANDLE handle, + struct dsm_desc *dsm) { - uint64_t dsms_supported = acpi_DSMQuery(handle, - (uint8_t *)&dsm_set->uuid, dsm_set->revision); - const uint64_t min_dsms = dsm_set->dsms_expected; - const uint64_t max_dsms = min_dsms | dsm_set->extra_dsms; + uint64_t supported_functions = acpi_DSMQuery(handle, + (uint8_t *)&dsm->uuid, dsm->revision); + const uint64_t min_dsms = dsm->expected_functions; + const uint64_t max_dsms = min_dsms | dsm->extra_functions; /* - * Check if DSM set supported at all. We do this by checking the - * existence of "enum functions". + * Check if DSM supported at all. We do this by checking the existence + * of "enum functions". */ - if ((dsms_supported & 1) == 0) + if ((supported_functions & 1) == 0) return; - dsms_supported &= ~1; - dsm_set->dsms_supported = dsms_supported; - sc->dsm_sets |= dsm_set->flag; - - if ((dsms_supported & min_dsms) != min_dsms) - device_printf(sc->dev, "DSM set %s does not support expected " - "DSMs (%#" PRIx64 " vs %#" PRIx64 "). " - "Some methods may fail.\n", - dsm_set->name, dsms_supported, min_dsms); - - if ((dsms_supported & ~max_dsms) != 0) - device_printf(sc->dev, "DSM set %s supports more DSMs than " - "expected (%#" PRIx64 " vs %#" PRIx64 ").\n", dsm_set->name, - dsms_supported, max_dsms); + supported_functions &= ~1; + dsm->supported_functions = supported_functions; + sc->dsms |= dsm->flag; + + if ((supported_functions & min_dsms) != min_dsms) + device_printf(sc->dev, "DSM %s does not support expected " + "functions (%#" PRIx64 " vs %#" PRIx64 "). " + "Some may fail.\n", + dsm->name, supported_functions, min_dsms); + + if ((supported_functions & ~max_dsms) != 0) + device_printf(sc->dev, "DSM %s supports more functions than " + "expected (%#" PRIx64 " vs %#" PRIx64 ").\n", dsm->name, + supported_functions, max_dsms); } static void @@ -435,7 +435,7 @@ acpi_spmc_get_constraints(device_t dev) { struct acpi_spmc_softc *sc; union dsm_index dsm_index; - struct dsm_set *dsm_set; + struct dsm_desc *dsm; ACPI_STATUS status; ACPI_BUFFER result; ACPI_OBJECT *object; @@ -447,23 +447,23 @@ acpi_spmc_get_constraints(device_t dev) if (sc->constraints_populated) return (0); - /* The Microsoft DSM set doesn't have this DSM. */ - is_amd = has_dsm(sc, DSM_SET_AMD); + /* The Microsoft DSM doesn't have this function. */ + is_amd = has_dsm(sc, DSM_AMD); if (is_amd) { - dsm_set = &amd_dsm_set; + dsm = &dsm_amd; dsm_index.amd = AMD_DSM_GET_DEVICE_CONSTRAINTS; } else { - dsm_set = &intel_dsm_set; + dsm = &dsm_intel; dsm_index.regular = DSM_GET_DEVICE_CONSTRAINTS; } /* It seems like this DSM can fail if called more than once. */ - status = acpi_EvaluateDSMTyped(sc->handle, (uint8_t *)&dsm_set->uuid, - dsm_set->revision, dsm_index.i, NULL, &result, + status = acpi_EvaluateDSMTyped(sc->handle, (uint8_t *)&dsm->uuid, + dsm->revision, dsm_index.i, NULL, &result, ACPI_TYPE_PACKAGE); if (ACPI_FAILURE(status)) { device_printf(dev, "%s failed to call %s DSM %d (rev %d)\n", - __func__, dsm_set->name, dsm_index.i, dsm_set->revision); + __func__, dsm->name, dsm_index.i, dsm->revision); return (ENXIO); } @@ -536,7 +536,7 @@ acpi_spmc_check_constraints(struct acpi_spmc_softc *sc) } static void -acpi_spmc_run_dsm(device_t dev, struct dsm_set *dsm_set, int index) +acpi_spmc_run_dsm(device_t dev, struct dsm_desc *dsm, int function_index) { struct acpi_spmc_softc *sc; ACPI_STATUS status; @@ -544,12 +544,12 @@ acpi_spmc_run_dsm(device_t dev, struct dsm_set *dsm_set, int index) sc = device_get_softc(dev); - status = acpi_EvaluateDSMTyped(sc->handle, (uint8_t *)&dsm_set->uuid, - dsm_set->revision, index, NULL, &result, ACPI_TYPE_ANY); + status = acpi_EvaluateDSMTyped(sc->handle, (uint8_t *)&dsm->uuid, + dsm->revision, function_index, NULL, &result, ACPI_TYPE_ANY); if (ACPI_FAILURE(status)) { device_printf(dev, "%s failed to call %s DSM %d (rev %d)\n", - __func__, dsm_set->name, index, dsm_set->revision); + __func__, dsm->name, function_index, dsm->revision); return; } @@ -557,9 +557,9 @@ acpi_spmc_run_dsm(device_t dev, struct dsm_set *dsm_set, int index) } /* - * Try running the DSMs from all the DSM sets we have, as them failing costs us + * Try running the functions from all the DSMs we have, as them failing costs us * nothing, and it seems like on AMD platforms, both the AMD entry and Microsoft - * "modern" DSM's are required for it to enter modern standby. + * "modern" functions are required for it to enter modern standby. * * This is what Linux does too. */ @@ -568,12 +568,12 @@ acpi_spmc_display_off_notif(device_t dev) { struct acpi_spmc_softc *sc = device_get_softc(dev); - if (has_dsm(sc, DSM_SET_INTEL)) - acpi_spmc_run_dsm(dev, &intel_dsm_set, DSM_DISPLAY_OFF_NOTIF); - if (has_dsm(sc, DSM_SET_MS)) - acpi_spmc_run_dsm(dev, &ms_dsm_set, DSM_DISPLAY_OFF_NOTIF); - if (has_dsm(sc, DSM_SET_AMD)) - acpi_spmc_run_dsm(dev, &amd_dsm_set, AMD_DSM_DISPLAY_OFF_NOTIF); + if (has_dsm(sc, DSM_INTEL)) + acpi_spmc_run_dsm(dev, &dsm_intel, DSM_DISPLAY_OFF_NOTIF); + if (has_dsm(sc, DSM_MS)) + acpi_spmc_run_dsm(dev, &dsm_ms, DSM_DISPLAY_OFF_NOTIF); + if (has_dsm(sc, DSM_AMD)) + acpi_spmc_run_dsm(dev, &dsm_amd, AMD_DSM_DISPLAY_OFF_NOTIF); } static void @@ -581,12 +581,12 @@ acpi_spmc_display_on_notif(device_t dev) { struct acpi_spmc_softc *sc = device_get_softc(dev); - if (has_dsm(sc, DSM_SET_INTEL)) - acpi_spmc_run_dsm(dev, &intel_dsm_set, DSM_DISPLAY_ON_NOTIF); - if (has_dsm(sc, DSM_SET_MS)) - acpi_spmc_run_dsm(dev, &ms_dsm_set, DSM_DISPLAY_ON_NOTIF); - if (has_dsm(sc, DSM_SET_AMD)) - acpi_spmc_run_dsm(dev, &amd_dsm_set, AMD_DSM_DISPLAY_ON_NOTIF); + if (has_dsm(sc, DSM_INTEL)) + acpi_spmc_run_dsm(dev, &dsm_intel, DSM_DISPLAY_ON_NOTIF); + if (has_dsm(sc, DSM_MS)) + acpi_spmc_run_dsm(dev, &dsm_ms, DSM_DISPLAY_ON_NOTIF); + if (has_dsm(sc, DSM_AMD)) + acpi_spmc_run_dsm(dev, &dsm_amd, AMD_DSM_DISPLAY_ON_NOTIF); } static void @@ -596,14 +596,14 @@ acpi_spmc_entry_notif(device_t dev) acpi_spmc_check_constraints(sc); - if (has_dsm(sc, DSM_SET_AMD)) - acpi_spmc_run_dsm(dev, &amd_dsm_set, AMD_DSM_ENTRY_NOTIF); - if (has_dsm(sc, DSM_SET_MS)) { - acpi_spmc_run_dsm(dev, &ms_dsm_set, DSM_MODERN_ENTRY_NOTIF); - acpi_spmc_run_dsm(dev, &ms_dsm_set, DSM_ENTRY_NOTIF); + if (has_dsm(sc, DSM_AMD)) + acpi_spmc_run_dsm(dev, &dsm_amd, AMD_DSM_ENTRY_NOTIF); + if (has_dsm(sc, DSM_MS)) { + acpi_spmc_run_dsm(dev, &dsm_ms, DSM_MODERN_ENTRY_NOTIF); + acpi_spmc_run_dsm(dev, &dsm_ms, DSM_ENTRY_NOTIF); } - if (has_dsm(sc, DSM_SET_INTEL)) - acpi_spmc_run_dsm(dev, &intel_dsm_set, DSM_ENTRY_NOTIF); + if (has_dsm(sc, DSM_INTEL)) + acpi_spmc_run_dsm(dev, &dsm_intel, DSM_ENTRY_NOTIF); } static void @@ -611,17 +611,17 @@ acpi_spmc_exit_notif(device_t dev) { struct acpi_spmc_softc *sc = device_get_softc(dev); - if (has_dsm(sc, DSM_SET_INTEL)) - acpi_spmc_run_dsm(dev, &intel_dsm_set, DSM_EXIT_NOTIF); - if (has_dsm(sc, DSM_SET_AMD)) - acpi_spmc_run_dsm(dev, &amd_dsm_set, AMD_DSM_EXIT_NOTIF); - if (has_dsm(sc, DSM_SET_MS)) { - acpi_spmc_run_dsm(dev, &ms_dsm_set, DSM_EXIT_NOTIF); - if (ms_dsm_set.dsms_supported & + if (has_dsm(sc, DSM_INTEL)) + acpi_spmc_run_dsm(dev, &dsm_intel, DSM_EXIT_NOTIF); + if (has_dsm(sc, DSM_AMD)) + acpi_spmc_run_dsm(dev, &dsm_amd, AMD_DSM_EXIT_NOTIF); + if (has_dsm(sc, DSM_MS)) { + acpi_spmc_run_dsm(dev, &dsm_ms, DSM_EXIT_NOTIF); + if (dsm_ms.supported_functions & (1 << DSM_MODERN_TURN_ON_DISPLAY)) - acpi_spmc_run_dsm(dev, &ms_dsm_set, + acpi_spmc_run_dsm(dev, &dsm_ms, DSM_MODERN_TURN_ON_DISPLAY); - acpi_spmc_run_dsm(dev, &ms_dsm_set, DSM_MODERN_EXIT_NOTIF); + acpi_spmc_run_dsm(dev, &dsm_ms, DSM_MODERN_EXIT_NOTIF); } } From nobody Wed May 13 12:39:40 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gFtMK35WPz6dL7L for ; Wed, 13 May 2026 12:39: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFtMK0bf9z3vSM for ; Wed, 13 May 2026 12:39:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778675981; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bEgMcNlp8wcLt9eOVDDiN2owflpWR61NVR2deRdUqmw=; b=GfwIAZG1gDd7QQsbSZ5szCVHBoqOAC88oHuSw9MH6nmWwGTdOE9YJoifolqf87Pno6x6hL qRh6cbpnws8qRfshqHPZq8KWlZByC/8r4C9gxpUBljEPPPFBemCTIuT1qUHowMBfyq6Ftj U4+PeRDrthYOR8unKV6+DrQc3krp+1TUBONbwYlfWrWqXXu6O+kMfesD0D6NiFjylWdvfp QZnlq1wqrT8zrOXQe/T+1hWb/XdKfFVi/QkU3z9cvvuQK3KxmzqZ4N9nI8gezdC0dG8upI EkOYYJF0dQr7+U0stnMn2EGsmaNCGHJsQCdYq9aSy3/nftnoOXhN2hYMfp8oBg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778675981; a=rsa-sha256; cv=none; b=jaDdiV6BWTgcCTnlDl11iXpzv4Mwxqaz1oYJg0XrAN0F/SQxplf6jbMkEdDx+8z6GFPWW2 s7/35i+WzhYHK88eFznu10fCYsmKykvn/5FJYwHrg8IMmlluCQxExHHF5+x1nVcdLjXXmx 9uEp2jdgE+hlKXaH+6i5fZq3FiRNmpMD1U9YSTsELiKD/+xecHA3ci3Ba2mwX+OiSji+D8 CGXdPLfEJ4RCouoTRrTl/sxKqKd/aBtIWpBtikTKHjAjs42rwO7FSKFZSgtKcjoQve0ZGT Idd/2NSITTr0iCD1evkSxc5Tj+O6I83UPy0pYQn5wVp1p0kzLoqakMMA41rgMA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778675981; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bEgMcNlp8wcLt9eOVDDiN2owflpWR61NVR2deRdUqmw=; b=wxxJAoLpaUeNtBTUp6h2CbBOEH07coLHEFXe2FD6207wez1GEaz4/Uw+giAyDGUEjnjycl la7KEp6SdO4/XEyranAluQ1pAzojRFPYWGAG04lq34QX0bKyDozLQvyzmtCr+/uJDFDJNX B/Fsq6wQWoO/cGr9j1Ls0PkU3L1kobkRfnibSH7GeIaVcXAvlVEBvH3Yuz5lOE6MGkDbFv sETbE+J472MndA2GpOmZM5jGOWctk8y8TTSvv0AvblbvxToiUXgv2Um9uOL2nrTCAWZ5ka VfEfMqDZ7p6itr5jOXD4AIQ/unqP69elkRerEREWda2J/+uLn4yTkMQjEsqrog== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFtMJ61VLzr6L for ; Wed, 13 May 2026 12:39:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1973a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 12:39:40 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: f77731ee95c1 - main - acpi_spmc(4): Introduce supports_function() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f77731ee95c179cede7dec0e87bc8146a2c546bc Auto-Submitted: auto-generated Date: Wed, 13 May 2026 12:39:40 +0000 Message-Id: <6a04710c.1973a.14acb230@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=f77731ee95c179cede7dec0e87bc8146a2c546bc commit f77731ee95c179cede7dec0e87bc8146a2c546bc Author: Olivier Certner AuthorDate: 2026-05-04 14:52:31 +0000 Commit: Olivier Certner CommitDate: 2026-05-13 12:38:19 +0000 acpi_spmc(4): Introduce supports_function() For better readability and because this stance will be used in many more places in a subsequent commit. No functional change (intended). Reviewed by: imp (older version), obiwac Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D56803 --- sys/dev/acpica/acpi_spmc.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/sys/dev/acpica/acpi_spmc.c b/sys/dev/acpica/acpi_spmc.c index e7f658dbcad0..a6b18767e91b 100644 --- a/sys/dev/acpica/acpi_spmc.c +++ b/sys/dev/acpica/acpi_spmc.c @@ -34,6 +34,9 @@ static char *spmc_ids[] = { NULL }; +/* Conversion of an index to a mask. */ +#define IDX_TO_BIT(idx) (1ull << (idx)) + enum intel_dsm_index { DSM_ENUM_FUNCTIONS = 0, DSM_GET_DEVICE_CONSTRAINTS = 1, @@ -172,6 +175,12 @@ struct acpi_spmc_softc { struct acpi_spmc_constraint *constraints; }; +static bool +supports_function(const struct dsm_desc *const dsm, const int function_index) +{ + return ((dsm->supported_functions & IDX_TO_BIT(function_index)) != 0); +} + static bool has_dsm(const struct acpi_spmc_softc *const sc, const int dsm_bit) { @@ -617,8 +626,7 @@ acpi_spmc_exit_notif(device_t dev) acpi_spmc_run_dsm(dev, &dsm_amd, AMD_DSM_EXIT_NOTIF); if (has_dsm(sc, DSM_MS)) { acpi_spmc_run_dsm(dev, &dsm_ms, DSM_EXIT_NOTIF); - if (dsm_ms.supported_functions & - (1 << DSM_MODERN_TURN_ON_DISPLAY)) + if (supports_function(&dsm_ms, DSM_MODERN_TURN_ON_DISPLAY)) acpi_spmc_run_dsm(dev, &dsm_ms, DSM_MODERN_TURN_ON_DISPLAY); acpi_spmc_run_dsm(dev, &dsm_ms, DSM_MODERN_EXIT_NOTIF); From nobody Wed May 13 12:39:35 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gFtMK22dgz6dL3K for ; Wed, 13 May 2026 12:39: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFtMJ5zpVz3vVs for ; Wed, 13 May 2026 12:39:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778675980; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eYhZhJ78SLSArMzTGfU+YqHQY+9NIrv15vl6PrEyAbc=; b=n2arq8XKPjtDC6krftvQNv+G6WxdgXQMBcsATO2N3/7bgUoFnKRZAts4tKLLtJR/xB7oGp HU9fL8a9DBvsL5DFnn0Lk9QpoN39/QqQAhmH891dayjt/7Rbh7sSLx+rxxZGwC3aa4q9/C O8uRFh0ZrRzqrxFFSCG/Zjauh3m0I1nGIz9D461CLEtFJctfp2V8ZcY0ZZShdwXEU3qwVE WgNkWTfeNq8r4sx0V5Mq3v9rIOqqWysCodWKRrLTTcR9KgcSF29U/AbD8GJYuRT8p4ebcx OoUrv/3mruPbxMXsN4WS5k9dBN1S/fkTzxjfZ+wif5jzL98G1u1rNQMEGor4lg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778675980; a=rsa-sha256; cv=none; b=rnG6JFWtePv8K000+zBcP5e26sPMcQMMceahKBHmdFa7kbsXO863sShvEv1uvOy7wq2X3G iL1jYx20ykR2eyC1Xlg66YBrF6+14JPCOqfw0usmB5z3UkBLeE6cQs2pGo4DtVFQShPQhc JpJ5GG374kOelfjJSC3fR6BYIFvOcZIUuPNJGMnNOJ36vaiqHaI2X4aUd8NCxvfyEXdF4D qnBbGyG9NpSBCnrIqHc7+bf0erzM8CTX+dtIzQIOw3alkEtrRQpDcpkyp7heFtxMC2atgX YNgbWr8XfUHN1ArP9rT6GcSpGukekwTnU2IVypkJFDISEBXh7TFCM6Lw8ngDSQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778675980; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eYhZhJ78SLSArMzTGfU+YqHQY+9NIrv15vl6PrEyAbc=; b=JhsirpijGNHYIkdxBP9WsnMr5gv0+YxzHB6BFLs+ggkv6fsj3dVtU2ofPGCCziOQhUkRTl alvWp91xFb7tQt2H2bMRfVSUU0Bg/qH5xbfZgxDXcV9wXJies0Y3YQCKN0lpwLSiO0fH2V TL88XeKTau0TXxn7tX2VMcd5QVQeMIG61S3y0wrRfqwbckBPrxfPCTMGazFkgpsQuKTFC9 RaiQOTwFnZB1Fn5VMU/SO/o2hICf5/KnyfNEQV53EZDRC1Kn7UjlqNbOvfjjtk0hF4JkmP wskRBKUXOyrzEQVnT2J5ZMMa1Nq61fiIxKzp2Ii42J+lQihp2owsT8barocHYA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFtMJ2NMQzrR3 for ; Wed, 13 May 2026 12:39:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 19dae by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 12:39:35 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: a652d9763059 - main - acpi_spmc(4): Fix comments on constraints storage List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a652d97630599c089a722d4cb881e2731c5336a8 Auto-Submitted: auto-generated Date: Wed, 13 May 2026 12:39:35 +0000 Message-Id: <6a047107.19dae.672f43a2@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=a652d97630599c089a722d4cb881e2731c5336a8 commit a652d97630599c089a722d4cb881e2731c5336a8 Author: Olivier Certner AuthorDate: 2026-05-04 11:38:58 +0000 Commit: Olivier Certner CommitDate: 2026-05-13 12:38:13 +0000 acpi_spmc(4): Fix comments on constraints storage The fields themselves are not unused, we actually fill them, but once filled we indeed do not use their values (yet). See the '#ifdef notyet' section in acpi_spmc_check_constraints(). No functional change. Reviewed by: emaste, obiwac, imp Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D56798 --- sys/dev/acpica/acpi_spmc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/acpica/acpi_spmc.c b/sys/dev/acpica/acpi_spmc.c index 03944800327d..d8fa5617c8bf 100644 --- a/sys/dev/acpica/acpi_spmc.c +++ b/sys/dev/acpica/acpi_spmc.c @@ -150,11 +150,11 @@ struct acpi_spmc_constraint { int min_d_state; ACPI_HANDLE handle; - /* Unused, spec only. */ + /* Intel only. Currently filled but unused. */ uint64_t lpi_uid; uint64_t min_dev_specific_state; - /* Unused, AMD only. */ + /* AMD only. Currently filled but unused. */ uint64_t function_states; }; From nobody Wed May 13 12:39:41 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gFtML2JSPz6dLFY for ; Wed, 13 May 2026 12:39: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFtML068Hz3vYv for ; Wed, 13 May 2026 12:39:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778675982; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=taGU3aDeZfhxxTgBIiD4OUJcwU8G1Bc+Lo9/LQ3u+Z0=; b=fp5JzwJBbqVnVixMmZHaiIsA46MfLyVouySZxcM0zos74c/D3yfCDfJvtUuev8TgTnna+1 Zf7CnKU5PH0hQ7xdNmlIRlqZaujr4Ko/MnRngaLrHHc0eZKQw8BU5nkt/Bn4oT9kGSLxzg OJJanKrBZVqi+peDIHpCgz7/yxjeAmC6l9XSMtTSIkkfQca7Oy3L51/vGoo4IqXYIn4kQa OGoW4ThbPmKYisRegDr1v2jTWaNwF1nFdb9GwDVHrtJHr5OfckVkJtSsPyNH3ignG4Ml01 yOOHYb70BRu5HdMFJf46ilC6w5rs1tPdv0Ik34d4tm900zjGF1F3lJr1593loQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778675982; a=rsa-sha256; cv=none; b=N03ybJ8CiVkZ5b5yPNS1I86lbCcqn6GkUhTzUlevpZ0V8k4LW2vbR4LncgfEZXLNDnTgzk Q9QhrZrdHPKejJHTKrcJAS06jUZZdN0Bc3plRMrmYSc34dRmFSylS3UOnjI00kkpdLD21B 8jRPEb1J2Njovv6k20CptzhSjRAEaRO+goaMquC5dWVkXZBEJoBUK4l2h0ScCIc1G9EB7I j5OxFMrErc7nn7gxtosYLNSx/GSFKpFLgBSx/6awdZnPe/X/hfBYNCfGxfCvWG4SK3Ebbn UmY8gyJmTPvg/QPwl0IsTLx7HIRwAlDHnn0ydnS0Wd67hzd0SEIP4Mqpp/GRFg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778675982; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=taGU3aDeZfhxxTgBIiD4OUJcwU8G1Bc+Lo9/LQ3u+Z0=; b=X/rUxIjiZCRmAXCkkV4HMXw29+y4hkMdxK20M8vCeJW6cKqEMCHx6/JFkA0xSNnqc6dqRf 1e6dVKhASi1Zmivnq3snnibUKmjQJS+jNKedZefw/IrWkOVehPT5aUVPJIGaboMnxlMxeW OC/o4AGHg7idDtoe9FVuePw60q9Lq9ocYvMIHTvPeoOd0FEJvD60IgcexdHUjhBQZzXb7E /SDgXjZqUWqmRhO8Om8dyii1HKXBSXcagIw1pREv0vTd/6tG5EVdxI6FiSI0HRZ+fvqhVg vjX2juDlTzzhos1TIzmrdvfTTLE+/NsPSrsORB/XuAFIBccUw6GW+/X/PW57EQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFtMK6mr7zr9S for ; Wed, 13 May 2026 12:39:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1bf3e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 12:39:41 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 868f50f64980 - main - acpi_spmc(4): softc: Remove unused 'obj' List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 868f50f649808320e9433ab321f450fa22bcddba Auto-Submitted: auto-generated Date: Wed, 13 May 2026 12:39:41 +0000 Message-Id: <6a04710d.1bf3e.57ec19f0@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=868f50f649808320e9433ab321f450fa22bcddba commit 868f50f649808320e9433ab321f450fa22bcddba Author: Olivier Certner AuthorDate: 2026-05-04 15:03:05 +0000 Commit: Olivier Certner CommitDate: 2026-05-13 12:38:20 +0000 acpi_spmc(4): softc: Remove unused 'obj' No functional change (intended). Reviewed by: imp (older version), obiwac Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D56804 --- sys/dev/acpica/acpi_spmc.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sys/dev/acpica/acpi_spmc.c b/sys/dev/acpica/acpi_spmc.c index a6b18767e91b..30be1b4a32e7 100644 --- a/sys/dev/acpica/acpi_spmc.c +++ b/sys/dev/acpica/acpi_spmc.c @@ -164,7 +164,6 @@ struct acpi_spmc_constraint { struct acpi_spmc_softc { device_t dev; ACPI_HANDLE handle; - ACPI_OBJECT *obj; enum dsm_flags dsms; struct eventhandler_entry *eh_suspend; From nobody Wed May 13 12:39:43 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gFtMM2k02z6dLFZ for ; Wed, 13 May 2026 12:39: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFtMM12J1z3vdx for ; Wed, 13 May 2026 12:39:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778675983; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uQ5vp5oKOZaSE/B0ATd7BWcUO7zIzunyL76FYC910DU=; b=NVW0PBw+48OCewdTa3YIWtkNz2fzW3Jkix/wapPqxy4UJFcLwASxzJjfvN5cYUGemhFtoS asFY8o7FQY+D34yNm/17ZJ8DogRYausO5RCREx4RkPEBWBjt1RNyrfXZX4rPEvb0gc1+DE t0GOd6BO0untZAq2g6iZWq8vGrb6kzoVoOIODTHiBL3+NISwT3flM2xF0A7C7XS+G9ItxA rBI+6B75RkglqWdQ3cXVkLiTScBKcflj/2WuleLmPDLJvbimVRwD5mN6kj2P6V3kGc48bk XPR9/DUbSwPQwCWhGA4nKM//zAr8sg+q+b9ZiWCtphvDC1tDLdVwwz8TbxGvCg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778675983; a=rsa-sha256; cv=none; b=cdmgzBJytvoyTYI7x2FOWrc4mswdmv0EWyd2G+X4UbQVFUncbCsDL0yohDTb0JdOSqVpJq FPftBYYrulA3oD90CtCE7Cnm7fu6xmtiaWTP3lVV/X+aS/f19IjtrQhtb4d6XDvjs+zq/b QAgxt4MUbwfPLUHrKZFqoQKx+BPEGBPYCp/oB+T+JmoqSZVdmhdfeI2P8XB1kRlPWWlEYt tPWfnqBPg/o0T+DfVC8yGdtIN4Xf2oGPp/Rs5Cg0vK6fj+ptG7Fp6ZDVyesL1e47PM/Gx1 SeJiMlUnYj6PBX2/qVI8lJOuwxck4Em8sWCmVf550YD6oQYTeZ9uSSWSQ5u2zQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778675983; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uQ5vp5oKOZaSE/B0ATd7BWcUO7zIzunyL76FYC910DU=; b=YN/ehbhs+IizMoNRvimzy3UhmY0L1xDXq95ytkF8UXKJHpFZE/reMqa5UIMPhTtWu9TBJp EDHfvwx0eLLIwhwKh8doF4UgI9clDAZRw3o8XW3485nTHzebLqRImCaQ/57dOTQC4bnkZj Cuqw0DRaS9GnMp7hdWpnX9SHrHXdVygKxXobTm5tVqKlfJrZVCA7pjuZh1WWSIhZdqqIKH /0YFb9BeDDSCv6XsHHrCCtxG9dq9m1R7eSbGRQuEzxE5X2e2kC1mjrvmfOHsEK/QMEkCr4 ztQmEkNatX2UDjrIhGNwSHtOZBaN8DvB8qv2pG3CnQfKsPnOaqSIVvUlgHefFg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFtMM0VDzzr22 for ; Wed, 13 May 2026 12:39:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1be1c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 12:39:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 3c2d2bcc6f5d - main - acpi_spmc(4): Factor out printing DSM call error, delineate function List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3c2d2bcc6f5d6e7819f0675afb8464e525c87cb3 Auto-Submitted: auto-generated Date: Wed, 13 May 2026 12:39:43 +0000 Message-Id: <6a04710f.1be1c.6ab03c7e@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=3c2d2bcc6f5d6e7819f0675afb8464e525c87cb3 commit 3c2d2bcc6f5d6e7819f0675afb8464e525c87cb3 Author: Olivier Certner AuthorDate: 2026-05-04 15:40:46 +0000 Commit: Olivier Certner CommitDate: 2026-05-13 12:38:20 +0000 acpi_spmc(4): Factor out printing DSM call error, delineate function Introduce failed_to_call_dsm(), which prepends "function" before the function index for better clarity. For now, it prints the function number, as before, but will soon print a human-readable name. Reviewed by: imp (older version), obiwac Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D56805 --- sys/dev/acpica/acpi_spmc.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/sys/dev/acpica/acpi_spmc.c b/sys/dev/acpica/acpi_spmc.c index 30be1b4a32e7..f5951a4809d5 100644 --- a/sys/dev/acpica/acpi_spmc.c +++ b/sys/dev/acpica/acpi_spmc.c @@ -186,6 +186,15 @@ has_dsm(const struct acpi_spmc_softc *const sc, const int dsm_bit) return ((sc->dsms & dsm_bit) != 0); } +static void +failed_to_call_dsm(const struct acpi_spmc_softc *const sc, + const struct dsm_desc *const dsm, const int function_index) +{ + (void)device_printf(sc->dev, + "Failed to call DSM %s (rev %u) function %d\n", + dsm->name, dsm->revision, function_index); +} + static void acpi_spmc_check_dsm(struct acpi_spmc_softc *sc, ACPI_HANDLE handle, struct dsm_desc *dsm); static int acpi_spmc_get_constraints(device_t dev); @@ -470,8 +479,7 @@ acpi_spmc_get_constraints(device_t dev) dsm->revision, dsm_index.i, NULL, &result, ACPI_TYPE_PACKAGE); if (ACPI_FAILURE(status)) { - device_printf(dev, "%s failed to call %s DSM %d (rev %d)\n", - __func__, dsm->name, dsm_index.i, dsm->revision); + failed_to_call_dsm(sc, dsm, dsm_index.i); return (ENXIO); } @@ -555,13 +563,10 @@ acpi_spmc_run_dsm(device_t dev, struct dsm_desc *dsm, int function_index) status = acpi_EvaluateDSMTyped(sc->handle, (uint8_t *)&dsm->uuid, dsm->revision, function_index, NULL, &result, ACPI_TYPE_ANY); - if (ACPI_FAILURE(status)) { - device_printf(dev, "%s failed to call %s DSM %d (rev %d)\n", - __func__, dsm->name, function_index, dsm->revision); - return; - } - - AcpiOsFree(result.Pointer); + if (ACPI_FAILURE(status)) + failed_to_call_dsm(sc, dsm, function_index); + else + AcpiOsFree(result.Pointer); } /* From nobody Wed May 13 12:39:44 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gFtMP0MMSz6dLJ4 for ; Wed, 13 May 2026 12:39: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFtMN1nlWz3vc1 for ; Wed, 13 May 2026 12:39:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778675984; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vgIoNCajo/UREHJlRyNTq3tqZfAPd4NWW0JXm2BM8Vw=; b=lWyYmjxLngNcjrSNhtIlk/zcWJrF6lCW96Ul6STO7mCXg/oGMv/bl26PhU2LeyVUHpe3Kj I2DvlP6Qg/StGXHX7CLqQLmn9Rc1xgMmf8HoVgWHuePnz47cImBoD15dW/hV/TjW/vgN7h vtZCosjh2xLkXXh1nvEUGFIXqr7gkar0UoLkwy29fF20RjVRAK9+nTNzQXsAqmPlqfBRFg pz+LIZYBW+9xE7hqpaXis8b7QO7UgWnAXzbOeltHUB/23gXeHwL6tUrhaOV+AoCmcVgfF4 M4nyOvDoO5WhVGFwjBnXj7QConMXEB9SLLwPBvexTyLMy3lMPrQ2E3CIwCHukw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778675984; a=rsa-sha256; cv=none; b=ByJOTGAxTpKchtYXhG0Cv6OEnDEpJkzZjieR8UQ4mSyEKi8g5G1Bmu3JXpcWcfGFOwSz4S 3B21ky5VMP5oigoC9FmH40C4NLWJUnm/x19Xh2Z4rAxkMreFplKwZY+gJNe/u/WEoMhV9g boerpXWpbJs/lpx0RcoahhLWtwzEwvpt8qdeIX7C1sj8e5c4QN744pjDZkSzFOVEniJPgX X05K5bzPoo/BNu7y8jKuFmIcLXCZ1/EZ+9IMn+hFlVQVbvh/UbO27dzQtlKX7jJOsqsZIo fwj5i/8NMfyV0tgDtTfWYl8tIyyq7g3khdugOhqCvbK4bsR3FDVsR5XJWWGWiw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778675984; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vgIoNCajo/UREHJlRyNTq3tqZfAPd4NWW0JXm2BM8Vw=; b=P9YXC5UOq+0VZanIbepccm7gOQA+SZCOwhHOMZ4VwezC5/C3Ojrs3/LFr7lf8OJ0VqMQiQ vr3xvaF2HWVgIuoZoeU3vyN9Wh6kOwVKzGHk8QghBVhlKWl8PS+QvHXfaY4Ohe7moet2xG if73lZWxjvNSo72Xh6rhaMU0Sbu7tmIhIxtrqdYZTeadaj5n//T6CRfsaCw3EKSP5YvO8C wiYMWtOblhtE0lybRq8/Zva2cILYeMAVB0zhqAxQW1V1bgqBULlT+Yb3JjE6c7J722kD5B dLPB5BiJAQ64wtpG1bysKnNkOt0CVIfQPI+1U8v23Dq5k2E+FlnzgXvcS+oFMQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFtMN1Lr8zr6N for ; Wed, 13 May 2026 12:39:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 18ee1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 12:39:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: cc628a66b4c4 - main - acpi_spmc(4): Human-readably print supported DSMs and their functions List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cc628a66b4c4d8423830491ebfd69333f7d02378 Auto-Submitted: auto-generated Date: Wed, 13 May 2026 12:39:44 +0000 Message-Id: <6a047110.18ee1.5d9ff4f2@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=cc628a66b4c4d8423830491ebfd69333f7d02378 commit cc628a66b4c4d8423830491ebfd69333f7d02378 Author: Olivier Certner AuthorDate: 2026-05-04 15:54:40 +0000 Commit: Olivier Certner CommitDate: 2026-05-13 12:38:20 +0000 acpi_spmc(4): Human-readably print supported DSMs and their functions To this end, revamp how DSMs and their functions are represented. Replace enumerations, which only bring minimal advantages, with plain macros, allowing to get rid of 'union dsm_index' and in passing the associated bug that an underlying type smaller than 'int' is aliased to an 'int', which assumes little-endian architectures. Associate to each function a printable name, in the form of a per-DSM array that maps a function index into a string. Make sure that every used array and their number of items are sized at compile-time and are declared constant, and that as little code as possible depends on the particular set of present DSMs and associated functions. Since the set of DSMs and sets of per-DSM functions are represented as bitsets, introduce print_bit_field() to print such sets. This new function is akin to printf("%b", ...) but with more flexibility. It takes a function associating a name to some bit index and an opaque pointer, allowing to leverage existing structures containing names instead of imposing the use of a separate string containing all names to be printed. It also provides a default name to bits without an explicit name, composed of a common prefix and the bit index as a suffix. Reviewed by: imp (older version), obiwac Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D56756 --- sys/dev/acpica/acpi_spmc.c | 407 +++++++++++++++++++++++++++++++-------------- 1 file changed, 279 insertions(+), 128 deletions(-) diff --git a/sys/dev/acpica/acpi_spmc.c b/sys/dev/acpica/acpi_spmc.c index f5951a4809d5..641ed269c6b6 100644 --- a/sys/dev/acpica/acpi_spmc.c +++ b/sys/dev/acpica/acpi_spmc.c @@ -22,13 +22,11 @@ #include + /* Hooks for the ACPI CA debugging infrastructure */ #define _COMPONENT ACPI_SPMC ACPI_MODULE_NAME("SPMC") -static SYSCTL_NODE(_debug_acpi, OID_AUTO, spmc, CTLFLAG_RD | CTLFLAG_MPSAFE, - NULL, "SPMC debugging"); - static char *spmc_ids[] = { "PNP0D80", NULL @@ -37,48 +35,69 @@ static char *spmc_ids[] = { /* Conversion of an index to a mask. */ #define IDX_TO_BIT(idx) (1ull << (idx)) -enum intel_dsm_index { - DSM_ENUM_FUNCTIONS = 0, - DSM_GET_DEVICE_CONSTRAINTS = 1, - DSM_GET_CRASH_DUMP_DEVICE = 2, - DSM_DISPLAY_OFF_NOTIF = 3, - DSM_DISPLAY_ON_NOTIF = 4, - DSM_ENTRY_NOTIF = 5, - DSM_EXIT_NOTIF = 6, - /* Only for Microsoft DSM. */ - DSM_MODERN_ENTRY_NOTIF = 7, - DSM_MODERN_EXIT_NOTIF = 8, - DSM_MODERN_TURN_ON_DISPLAY = 9, -}; +/* List of supported DSMs. */ +#define DSM_INTEL 0 +#define DSM_MS 1 +#define DSM_AMD 2 -enum amd_dsm_index { - AMD_DSM_ENUM_FUNCTIONS = 0, - AMD_DSM_GET_DEVICE_CONSTRAINTS = 1, - AMD_DSM_ENTRY_NOTIF = 2, - AMD_DSM_EXIT_NOTIF = 3, - AMD_DSM_DISPLAY_OFF_NOTIF = 4, - AMD_DSM_DISPLAY_ON_NOTIF = 5, -}; +/* List of DSM function indices. */ +#define DSM_ENUM_FUNCTIONS 0 /* Common to all DSMs */ +#define DSM_GET_DEVICE_CONSTRAINTS 1 /* AMD and Intel, MS N/A */ + +#define DSM_GET_CRASH_DUMP_DEVICE 2 /* Intel, MS N/A */ +#define DSM_INTEL_MS_DISPLAY_OFF_NOTIF 3 +#define DSM_INTEL_MS_DISPLAY_ON_NOTIF 4 +#define DSM_INTEL_MS_LPI_ENTRY_NOTIF 5 +#define DSM_INTEL_MS_LPI_EXIT_NOTIF 6 + +#define DSM_MS_SLEEP_ENTRY_NOTIF 7 +#define DSM_MS_SLEEP_EXIT_NOTIF 8 +#define DSM_MS_TURN_ON_DISPLAY 9 + +#define DSM_AMD_LPI_ENTRY_NOTIF 2 +#define DSM_AMD_LPI_EXIT_NOTIF 3 +#define DSM_AMD_DISPLAY_OFF_NOTIF 4 +#define DSM_AMD_DISPLAY_ON_NOTIF 5 -enum dsm_flags { - DSM_INTEL = 1 << 0, - DSM_MS = 1 << 1, - DSM_AMD = 1 << 2, -}; + +/* Descriptors for the DSMs we support. */ struct dsm_desc { - enum dsm_flags flag; const char *name; + /* Index in the dsms[] array below. */ + int index; + /* + * Revisions are zero or a positive number. Strictly speaking, next + * field should be a 'uint64_t' as per the ACPI spec, but our ACPI DSM + * interface takes an 'int' and anyway actual revision numbers never + * even exceed the limits of a 'uint8_t'. + */ int revision; struct uuid uuid; uint64_t supported_functions; uint64_t expected_functions; uint64_t extra_functions; + /* Human-friendly names of known functions. */ + const char *const *function_names; + int function_names_nb; +}; + +static const char *const dsm_intel_function_names[] = { + [DSM_GET_DEVICE_CONSTRAINTS] = "DEVICE_CONSTRAINTS", + [DSM_GET_CRASH_DUMP_DEVICE] = "CRASH_DUMP_DEVICE", + [DSM_INTEL_MS_DISPLAY_OFF_NOTIF] = "DISPLAY_OFF", + [DSM_INTEL_MS_DISPLAY_ON_NOTIF] = "DISPLAY_ON", + [DSM_INTEL_MS_LPI_ENTRY_NOTIF] = "LPI_ENTRY", + [DSM_INTEL_MS_LPI_EXIT_NOTIF] = "LPI_EXIT", }; static struct dsm_desc dsm_intel = { - .flag = DSM_INTEL, + .index = DSM_INTEL, .name = "Intel", + .uuid = { /* c4eb40a0-6cd2-11e2-bcfd-0800200c9a66 */ + 0xc4eb40a0, 0x6cd2, 0x11e2, 0xbc, 0xfd, + {0x08, 0x00, 0x20, 0x0c, 0x9a, 0x66} + }, /* * XXX Linux uses 1 for the revision on Intel DSMs, but doesn't explain * why. The commit that introduces this links to a document mentioning @@ -88,65 +107,100 @@ static struct dsm_desc dsm_intel = { * this just in case. */ .revision = 0, - .uuid = { /* c4eb40a0-6cd2-11e2-bcfd-0800200c9a66 */ - 0xc4eb40a0, 0x6cd2, 0x11e2, 0xbc, 0xfd, - {0x08, 0x00, 0x20, 0x0c, 0x9a, 0x66}, - }, - .expected_functions = (1 << DSM_GET_DEVICE_CONSTRAINTS) | - (1 << DSM_DISPLAY_OFF_NOTIF) | (1 << DSM_DISPLAY_ON_NOTIF) | - (1 << DSM_ENTRY_NOTIF) | (1 << DSM_EXIT_NOTIF), + .expected_functions = + IDX_TO_BIT(DSM_GET_DEVICE_CONSTRAINTS) | + IDX_TO_BIT(DSM_INTEL_MS_DISPLAY_OFF_NOTIF) | + IDX_TO_BIT(DSM_INTEL_MS_DISPLAY_ON_NOTIF) | + IDX_TO_BIT(DSM_INTEL_MS_LPI_ENTRY_NOTIF) | + IDX_TO_BIT(DSM_INTEL_MS_LPI_EXIT_NOTIF), + .extra_functions = + IDX_TO_BIT(DSM_GET_CRASH_DUMP_DEVICE), /* Not used. */ + .function_names = dsm_intel_function_names, + .function_names_nb = nitems(dsm_intel_function_names), }; -SYSCTL_INT(_debug_acpi_spmc, OID_AUTO, intel_dsm_revision, CTLFLAG_RW, - &dsm_intel.revision, 0, - "Revision to use when evaluating Intel SPMC DSMs"); +static const char *const dsm_ms_function_names[] = { + [DSM_INTEL_MS_DISPLAY_OFF_NOTIF] = "DISPLAY_OFF", + [DSM_INTEL_MS_DISPLAY_ON_NOTIF] = "DISPLAY_ON", + [DSM_INTEL_MS_LPI_ENTRY_NOTIF] = "LPI_ENTRY", + [DSM_INTEL_MS_LPI_EXIT_NOTIF] = "LPI_EXIT", + [DSM_MS_SLEEP_ENTRY_NOTIF] = "SLEEP_ENTRY", + [DSM_MS_SLEEP_EXIT_NOTIF] = "SLEEP_EXIT", + [DSM_MS_TURN_ON_DISPLAY] = "TURN_ON", +}; static struct dsm_desc dsm_ms = { - .flag = DSM_MS, + .index = DSM_MS, .name = "Microsoft", - .revision = 0, .uuid = { /* 11e00d56-ce64-47ce-837b-1f898f9aa461 */ 0x11e00d56, 0xce64, 0x47ce, 0x83, 0x7b, - {0x1f, 0x89, 0x8f, 0x9a, 0xa4, 0x61}, + {0x1f, 0x89, 0x8f, 0x9a, 0xa4, 0x61} }, - .expected_functions = (1 << DSM_DISPLAY_OFF_NOTIF) | - (1 << DSM_DISPLAY_ON_NOTIF) | (1 << DSM_ENTRY_NOTIF) | - (1 << DSM_EXIT_NOTIF) | (1 << DSM_MODERN_ENTRY_NOTIF) | - (1 << DSM_MODERN_EXIT_NOTIF), - .extra_functions = (1 << DSM_MODERN_TURN_ON_DISPLAY), + .revision = 0, + .expected_functions = + IDX_TO_BIT(DSM_INTEL_MS_DISPLAY_OFF_NOTIF) | + IDX_TO_BIT(DSM_INTEL_MS_DISPLAY_ON_NOTIF) | + IDX_TO_BIT(DSM_INTEL_MS_LPI_ENTRY_NOTIF) | + IDX_TO_BIT(DSM_INTEL_MS_LPI_EXIT_NOTIF) | + IDX_TO_BIT(DSM_MS_SLEEP_ENTRY_NOTIF) | + IDX_TO_BIT(DSM_MS_SLEEP_EXIT_NOTIF), + .extra_functions = + IDX_TO_BIT(DSM_MS_TURN_ON_DISPLAY), + .function_names = dsm_ms_function_names, + .function_names_nb = nitems(dsm_ms_function_names), +}; + +static const char *const dsm_amd_function_names[] = { + [DSM_GET_DEVICE_CONSTRAINTS] = "DEVICE_CONSTRAINTS", + [DSM_AMD_DISPLAY_OFF_NOTIF] = "DISPLAY_OFF", + [DSM_AMD_DISPLAY_ON_NOTIF] = "DISPLAY_ON", + [DSM_AMD_LPI_ENTRY_NOTIF] = "LPI_ENTRY", + [DSM_AMD_LPI_EXIT_NOTIF] = "LPI_EXIT", }; static struct dsm_desc dsm_amd = { - .flag = DSM_AMD, + .index = DSM_AMD, .name = "AMD", + .uuid = { /* e3f32452-febc-43ce-9039-932122d37721 */ + 0xe3f32452, 0xfebc, 0x43ce, 0x90, 0x39, + {0x93, 0x21, 0x22, 0xd3, 0x77, 0x21} + }, /* * XXX Linux uses 0 for the revision on AMD DSMs, but at least on the - * Framework 13 AMD 7040 series, the enum functions DSM only returns a - * function mask that covers all the DSMs we need to call when called - * with revision 2. + * Framework 13 AMD 7040 series, the "enumerate functions" DSM function + * needs to be called with revision 2 to return a mask that covers all + * the functions we would like to call. * * The debug.acpi.spmc.amd_dsm_revision sysctl may be used to configure * this just in case. */ .revision = 2, - .uuid = { /* e3f32452-febc-43ce-9039-932122d37721 */ - 0xe3f32452, 0xfebc, 0x43ce, 0x90, 0x39, - {0x93, 0x21, 0x22, 0xd3, 0x77, 0x21}, - }, - .expected_functions = (1 << AMD_DSM_GET_DEVICE_CONSTRAINTS) | - (1 << AMD_DSM_ENTRY_NOTIF) | (1 << AMD_DSM_EXIT_NOTIF) | - (1 << AMD_DSM_DISPLAY_OFF_NOTIF) | (1 << AMD_DSM_DISPLAY_ON_NOTIF), + .expected_functions = + IDX_TO_BIT(DSM_GET_DEVICE_CONSTRAINTS) | + IDX_TO_BIT(DSM_AMD_DISPLAY_OFF_NOTIF) | + IDX_TO_BIT(DSM_AMD_DISPLAY_ON_NOTIF) | + IDX_TO_BIT(DSM_AMD_LPI_ENTRY_NOTIF) | + IDX_TO_BIT(DSM_AMD_LPI_EXIT_NOTIF), + .function_names = dsm_amd_function_names, + .function_names_nb = nitems(dsm_amd_function_names), }; +static struct dsm_desc *const dsms[] = { + [DSM_INTEL] = &dsm_intel, + [DSM_MS] = &dsm_ms, + [DSM_AMD] = &dsm_amd, +}; + +static SYSCTL_NODE(_debug_acpi, OID_AUTO, spmc, CTLFLAG_RD | CTLFLAG_MPSAFE, + NULL, "SPMC debugging"); + +SYSCTL_INT(_debug_acpi_spmc, OID_AUTO, intel_dsm_revision, CTLFLAG_RW, + &dsm_intel.revision, 0, + "Revision to use when evaluating Intel SPMC DSMs"); + SYSCTL_INT(_debug_acpi_spmc, OID_AUTO, amd_dsm_revision, CTLFLAG_RW, &dsm_amd.revision, 0, "Revision to use when evaluating AMD SPMC DSMs"); -union dsm_index { - int i; - enum intel_dsm_index regular; - enum amd_dsm_index amd; -}; - struct acpi_spmc_constraint { bool enabled; char *name; @@ -164,7 +218,7 @@ struct acpi_spmc_constraint { struct acpi_spmc_softc { device_t dev; ACPI_HANDLE handle; - enum dsm_flags dsms; + int dsms; struct eventhandler_entry *eh_suspend; struct eventhandler_entry *eh_resume; @@ -174,6 +228,14 @@ struct acpi_spmc_softc { struct acpi_spmc_constraint *constraints; }; + +static const struct dsm_desc * +resolve_dsm(int dsm_index) +{ + MPASS(0 <= dsm_index && dsm_index < nitems(dsms)); + return (dsms[dsm_index]); +} + static bool supports_function(const struct dsm_desc *const dsm, const int function_index) { @@ -181,9 +243,78 @@ supports_function(const struct dsm_desc *const dsm, const int function_index) } static bool -has_dsm(const struct acpi_spmc_softc *const sc, const int dsm_bit) +has_dsm(const struct acpi_spmc_softc *const sc, const int dsm_index) +{ + return ((sc->dsms & IDX_TO_BIT(dsm_index)) != 0); +} + +typedef const char *pbf_get_name_t(const int, const void *const); + +static const char * +pbf_dsm_name(const int dsm_index, const void *const opaque __unused) +{ + return (resolve_dsm(dsm_index)->name); +} + +static const char * +dsm_function_name(const struct dsm_desc *const dsm, const int function_index) +{ + MPASS(function_index >= 0); + if (function_index >= dsm->function_names_nb) + return (NULL); + /* May be NULL. */ + return (dsm->function_names[function_index]); +} + +static const char * +pbf_function_name(const int function_index, const void *const opaque) { - return ((sc->dsms & dsm_bit) != 0); + return (dsm_function_name(opaque, function_index)); +} + +static int +print_bit_field(char *const buf, const size_t buf_size, + const uint64_t bit_field, const char *const fallback_prefix, + pbf_get_name_t get_name, const void *const opaque) +{ + uint64_t bf = bit_field; + char *const buf_end = buf + buf_size; + char *p = buf; + int ret = 0; + bool one_set = false; + +#define PBF_PRINT(...) \ + do { \ + const __ptrdiff_t rem = MAX(buf_end - p, 0); \ + const int lret = snprintf(p, rem, __VA_ARGS__); \ + \ + MPASS(lret >= 0); \ + p += MIN(lret, rem); \ + ret += lret; \ + } while (0) + + if (bf == 0) { + PBF_PRINT(""); + return (ret); + } + + do { + const int b_idx = ffsll(bf) - 1; + const char *const name = get_name(b_idx, opaque); + + PBF_PRINT(one_set ? "," : "<"); + one_set = true; + if (name != NULL) + PBF_PRINT("%s", name); + else + PBF_PRINT("%s_%d", fallback_prefix, b_idx); + + bf &= ~IDX_TO_BIT(b_idx); + } while (bf != 0); + PBF_PRINT(">"); +#undef PBF_PRINT + + return (ret); } static void @@ -191,14 +322,17 @@ failed_to_call_dsm(const struct acpi_spmc_softc *const sc, const struct dsm_desc *const dsm, const int function_index) { (void)device_printf(sc->dev, - "Failed to call DSM %s (rev %u) function %d\n", - dsm->name, dsm->revision, function_index); + "Failed to call DSM %s (rev %u) function %s\n", + dsm->name, dsm->revision, dsm_function_name(dsm, function_index)); } static void acpi_spmc_check_dsm(struct acpi_spmc_softc *sc, - ACPI_HANDLE handle, struct dsm_desc *dsm); + ACPI_HANDLE handle, struct dsm_desc *const dsm); +static void acpi_spmc_dsm_print_functions( + const struct acpi_spmc_softc *const sc, + const struct dsm_desc *const dsm); static int acpi_spmc_get_constraints(device_t dev); -static void acpi_spmc_free_constraints(struct acpi_spmc_softc *sc); +static void acpi_spmc_free_constraints(struct acpi_spmc_softc *const sc); static void acpi_spmc_suspend(device_t dev, enum power_stype stype); static void acpi_spmc_resume(device_t dev, enum power_stype stype); @@ -207,8 +341,9 @@ static int acpi_spmc_probe(device_t dev) { char *name; - ACPI_HANDLE handle; + ACPI_HANDLE handle; struct acpi_spmc_softc *sc; + char buf[32]; /* Check that this is an enabled device. */ if (acpi_get_type(dev) != ACPI_TYPE_DEVICE || acpi_disabled("spmc")) @@ -232,15 +367,15 @@ acpi_spmc_probe(device_t dev) /* Check which DSMs are supported. */ sc->dsms = 0; - acpi_spmc_check_dsm(sc, handle, &dsm_intel); - acpi_spmc_check_dsm(sc, handle, &dsm_ms); - acpi_spmc_check_dsm(sc, handle, &dsm_amd); + for (int i = 0; i < nitems(dsms); ++i) + acpi_spmc_check_dsm(sc, handle, dsms[i]); if (sc->dsms == 0) return (ENXIO); - device_set_descf(dev, "System Power Management Controller (DSMs 0x%x)", - sc->dsms); + print_bit_field(buf, sizeof(buf), sc->dsms, "DSM", pbf_dsm_name, NULL); + device_set_descf(dev, "System Power Management Controller (DSMs %s)", + buf); return (0); } @@ -281,39 +416,57 @@ acpi_spmc_detach(device_t dev) return (0); } +static void +acpi_spmc_dsm_print_functions(const struct acpi_spmc_softc *const sc, + const struct dsm_desc *const dsm) +{ + const uint64_t missing = dsm->expected_functions & + ~dsm->supported_functions; + const uint64_t unknown = dsm->supported_functions & + ~(dsm->expected_functions | dsm->extra_functions); + char buf[128]; + + print_bit_field(buf, sizeof(buf), dsm->supported_functions, + "FUNC", pbf_function_name, dsm); + device_printf(sc->dev, "DSM %s: Supported functions: %#" PRIx64 "%s\n", + dsm->name, dsm->supported_functions, buf); + + if (missing != 0) { + print_bit_field(buf, sizeof(buf), missing, "FUNC", + pbf_function_name, dsm); + device_printf(sc->dev, "DSM %s: Does not enumerate expected " + "functions %#" PRIx64 "%s. Calls to them may fail.\n", + dsm->name, missing, buf); + } + + if (unknown != 0) { + print_bit_field(buf, sizeof(buf), unknown, "FUNC", + pbf_function_name, dsm); + device_printf(sc->dev, "DSM %s: Supports more functions than " + "used (%#" PRIx64 "%s), driver might need an upgrade.\n", + dsm->name, unknown, buf); + } +} + static void acpi_spmc_check_dsm(struct acpi_spmc_softc *sc, ACPI_HANDLE handle, - struct dsm_desc *dsm) + struct dsm_desc *const dsm) { - uint64_t supported_functions = acpi_DSMQuery(handle, + const uint64_t supported_functions = acpi_DSMQuery(handle, (uint8_t *)&dsm->uuid, dsm->revision); - const uint64_t min_dsms = dsm->expected_functions; - const uint64_t max_dsms = min_dsms | dsm->extra_functions; /* - * Check if DSM supported at all. We do this by checking the existence - * of "enum functions". + * DSM is supported if bit 0 is set. */ if ((supported_functions & 1) == 0) return; - supported_functions &= ~1; - dsm->supported_functions = supported_functions; - sc->dsms |= dsm->flag; - - if ((supported_functions & min_dsms) != min_dsms) - device_printf(sc->dev, "DSM %s does not support expected " - "functions (%#" PRIx64 " vs %#" PRIx64 "). " - "Some may fail.\n", - dsm->name, supported_functions, min_dsms); - - if ((supported_functions & ~max_dsms) != 0) - device_printf(sc->dev, "DSM %s supports more functions than " - "expected (%#" PRIx64 " vs %#" PRIx64 ").\n", dsm->name, - supported_functions, max_dsms); + dsm->supported_functions = supported_functions & ~1; + sc->dsms |= IDX_TO_BIT(dsm->index); + acpi_spmc_dsm_print_functions(sc, dsm); } static void -acpi_spmc_free_constraints(struct acpi_spmc_softc *sc) +acpi_spmc_free_constraints(struct acpi_spmc_softc *const sc) { for (size_t i = 0; i < sc->constraint_count; i++) free(sc->constraints[i].name, M_TEMP); @@ -451,7 +604,6 @@ static int acpi_spmc_get_constraints(device_t dev) { struct acpi_spmc_softc *sc; - union dsm_index dsm_index; struct dsm_desc *dsm; ACPI_STATUS status; ACPI_BUFFER result; @@ -466,20 +618,14 @@ acpi_spmc_get_constraints(device_t dev) /* The Microsoft DSM doesn't have this function. */ is_amd = has_dsm(sc, DSM_AMD); - if (is_amd) { - dsm = &dsm_amd; - dsm_index.amd = AMD_DSM_GET_DEVICE_CONSTRAINTS; - } else { - dsm = &dsm_intel; - dsm_index.regular = DSM_GET_DEVICE_CONSTRAINTS; - } + dsm = is_amd ? &dsm_amd : &dsm_intel; /* It seems like this DSM can fail if called more than once. */ status = acpi_EvaluateDSMTyped(sc->handle, (uint8_t *)&dsm->uuid, - dsm->revision, dsm_index.i, NULL, &result, + dsm->revision, DSM_GET_DEVICE_CONSTRAINTS, NULL, &result, ACPI_TYPE_PACKAGE); if (ACPI_FAILURE(status)) { - failed_to_call_dsm(sc, dsm, dsm_index.i); + failed_to_call_dsm(sc, dsm, DSM_GET_DEVICE_CONSTRAINTS); return (ENXIO); } @@ -552,7 +698,7 @@ acpi_spmc_check_constraints(struct acpi_spmc_softc *sc) } static void -acpi_spmc_run_dsm(device_t dev, struct dsm_desc *dsm, int function_index) +acpi_spmc_run_dsm(device_t dev, const struct dsm_desc *dsm, int function_index) { struct acpi_spmc_softc *sc; ACPI_STATUS status; @@ -560,7 +706,7 @@ acpi_spmc_run_dsm(device_t dev, struct dsm_desc *dsm, int function_index) sc = device_get_softc(dev); - status = acpi_EvaluateDSMTyped(sc->handle, (uint8_t *)&dsm->uuid, + status = acpi_EvaluateDSMTyped(sc->handle, (const uint8_t *)&dsm->uuid, dsm->revision, function_index, NULL, &result, ACPI_TYPE_ANY); if (ACPI_FAILURE(status)) @@ -582,11 +728,13 @@ acpi_spmc_display_off_notif(device_t dev) struct acpi_spmc_softc *sc = device_get_softc(dev); if (has_dsm(sc, DSM_INTEL)) - acpi_spmc_run_dsm(dev, &dsm_intel, DSM_DISPLAY_OFF_NOTIF); + acpi_spmc_run_dsm(dev, &dsm_intel, + DSM_INTEL_MS_DISPLAY_OFF_NOTIF); if (has_dsm(sc, DSM_MS)) - acpi_spmc_run_dsm(dev, &dsm_ms, DSM_DISPLAY_OFF_NOTIF); + acpi_spmc_run_dsm(dev, &dsm_ms, + DSM_INTEL_MS_DISPLAY_OFF_NOTIF); if (has_dsm(sc, DSM_AMD)) - acpi_spmc_run_dsm(dev, &dsm_amd, AMD_DSM_DISPLAY_OFF_NOTIF); + acpi_spmc_run_dsm(dev, &dsm_amd, DSM_AMD_DISPLAY_OFF_NOTIF); } static void @@ -595,11 +743,13 @@ acpi_spmc_display_on_notif(device_t dev) struct acpi_spmc_softc *sc = device_get_softc(dev); if (has_dsm(sc, DSM_INTEL)) - acpi_spmc_run_dsm(dev, &dsm_intel, DSM_DISPLAY_ON_NOTIF); + acpi_spmc_run_dsm(dev, &dsm_intel, + DSM_INTEL_MS_DISPLAY_ON_NOTIF); if (has_dsm(sc, DSM_MS)) - acpi_spmc_run_dsm(dev, &dsm_ms, DSM_DISPLAY_ON_NOTIF); + acpi_spmc_run_dsm(dev, &dsm_ms, + DSM_INTEL_MS_DISPLAY_ON_NOTIF); if (has_dsm(sc, DSM_AMD)) - acpi_spmc_run_dsm(dev, &dsm_amd, AMD_DSM_DISPLAY_ON_NOTIF); + acpi_spmc_run_dsm(dev, &dsm_amd, DSM_AMD_DISPLAY_ON_NOTIF); } static void @@ -610,13 +760,14 @@ acpi_spmc_entry_notif(device_t dev) acpi_spmc_check_constraints(sc); if (has_dsm(sc, DSM_AMD)) - acpi_spmc_run_dsm(dev, &dsm_amd, AMD_DSM_ENTRY_NOTIF); + acpi_spmc_run_dsm(dev, &dsm_amd, DSM_AMD_LPI_ENTRY_NOTIF); if (has_dsm(sc, DSM_MS)) { - acpi_spmc_run_dsm(dev, &dsm_ms, DSM_MODERN_ENTRY_NOTIF); - acpi_spmc_run_dsm(dev, &dsm_ms, DSM_ENTRY_NOTIF); + acpi_spmc_run_dsm(dev, &dsm_ms, DSM_MS_SLEEP_ENTRY_NOTIF); + acpi_spmc_run_dsm(dev, &dsm_ms, DSM_INTEL_MS_LPI_ENTRY_NOTIF); } if (has_dsm(sc, DSM_INTEL)) - acpi_spmc_run_dsm(dev, &dsm_intel, DSM_ENTRY_NOTIF); + acpi_spmc_run_dsm(dev, &dsm_intel, + DSM_INTEL_MS_LPI_ENTRY_NOTIF); } static void @@ -625,15 +776,15 @@ acpi_spmc_exit_notif(device_t dev) struct acpi_spmc_softc *sc = device_get_softc(dev); if (has_dsm(sc, DSM_INTEL)) - acpi_spmc_run_dsm(dev, &dsm_intel, DSM_EXIT_NOTIF); + acpi_spmc_run_dsm(dev, &dsm_intel, DSM_INTEL_MS_LPI_EXIT_NOTIF); if (has_dsm(sc, DSM_AMD)) - acpi_spmc_run_dsm(dev, &dsm_amd, AMD_DSM_EXIT_NOTIF); + acpi_spmc_run_dsm(dev, &dsm_amd, DSM_AMD_LPI_EXIT_NOTIF); if (has_dsm(sc, DSM_MS)) { - acpi_spmc_run_dsm(dev, &dsm_ms, DSM_EXIT_NOTIF); - if (supports_function(&dsm_ms, DSM_MODERN_TURN_ON_DISPLAY)) + acpi_spmc_run_dsm(dev, &dsm_ms, DSM_INTEL_MS_LPI_EXIT_NOTIF); + if (supports_function(&dsm_ms, DSM_MS_TURN_ON_DISPLAY)) acpi_spmc_run_dsm(dev, &dsm_ms, - DSM_MODERN_TURN_ON_DISPLAY); - acpi_spmc_run_dsm(dev, &dsm_ms, DSM_MODERN_EXIT_NOTIF); + DSM_MS_TURN_ON_DISPLAY); + acpi_spmc_run_dsm(dev, &dsm_ms, DSM_MS_SLEEP_EXIT_NOTIF); } } From nobody Wed May 13 12:39:45 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gFtMP6gmmz6dL7S for ; Wed, 13 May 2026 12:39: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFtMP2dL8z3vhZ for ; Wed, 13 May 2026 12:39:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778675985; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/ZePbyAbtKiqYUKijChAincAafjmIdajPxW0s8CyHwk=; b=vyrBbD19kzyd/uE2qH8Tx5OyiuktgE64JrzhN2IuMQfyCwG6qkQ2QPU+TccH92WB0HCXT2 2Y6TcBg7TYR0UrPqZFMkg2Cqk4g6e3swDa1zpne1fhJErqBeRgC75budH3fM+vVDZ8jWqG 6zmPcqW43ws0q4uZJ6wvNDAW+JvDLT7piflXysCmDo7VN2UfPlILxi7JHq9EbCrIced4or 6E1d6r1hTsOlLpx0Zl/CFhZm8MTi+4aWUvts5fambFn72Lcr+0KoxojckHbcIqZmYMT4xN s0HxYI9N9dTeybkyfEPv4Qa61lwYKRdu+oLyKp0c7Pul7GVJ1dCe8tMAUhS3ZA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778675985; a=rsa-sha256; cv=none; b=QW0dbmTAJ9EKH/6GU/jHkcaO6Fu4U22QOEH1l20/tiUHTfd/5nJ+nnRSNDH5ZHL2lsMpa2 4z4Ttk7ctnWBRf5RcJI97HBoyC32ShByPAziKbtFP+M5zEeK6wrM65lUkdDUPKlE1hOkJI elud6BA1soTUVsg02Tb5pAJpuQgScJyDeq6xewHMu1It+eXokgrJigOtF/1EeRYDDIEkZJ K1+gLp0aiv9N5Qd3p0sseCDv02+evnCdbcpkw1cSn3XWVxCB0X9mY1L4UHnFCMSFAKR6qk rJQ6p9C8NmAh9pLvpi2USQFYhhZACsXt6tveehLCV9EnEboLMWZbxcNBS78acg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778675985; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/ZePbyAbtKiqYUKijChAincAafjmIdajPxW0s8CyHwk=; b=ykN1m8eYfEGLT8jvWhDJFim0wmgyHVXl2Cr+qt/xmdEunthgp4LyPpZ9yghE94mcQTbU9Z ZbD3KBbrvbfSdQoYBxGA6Aq51UN2m0hC8fst7GsHqPvQN6HKJvXiPSIu5IJFPIJniijiLl yMxS1TSoaJynIMkPNwB/hHCpGSIeE9EH9L7/qlGSCUgkVQU5E/S4zuAtpWzwzDZvL6lBS8 Kxc9gWsb9Rn0DEfADp5+D4VWyY3x54kP+trQkyssShqBJoIbGFcutUvq8UJWc1QCmBL8Rh 7d2iNUpqPRXj9mtRg+m05/b4uTGtI3JOeh+YB6NeNL7xWHSAMgsFrP/yrn9r+A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFtMP28X8zr9T for ; Wed, 13 May 2026 12:39:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 195f1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 12:39:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: ee00031940d6 - main - acpi_spmc(4): Rename functions parsing constraints List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ee00031940d647962457d64e86a2e433a2f7a2ed Auto-Submitted: auto-generated Date: Wed, 13 May 2026 12:39:45 +0000 Message-Id: <6a047111.195f1.70aff99c@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=ee00031940d647962457d64e86a2e433a2f7a2ed commit ee00031940d647962457d64e86a2e433a2f7a2ed Author: Olivier Certner AuthorDate: 2026-05-04 11:35:23 +0000 Commit: Olivier Certner CommitDate: 2026-05-13 12:38:20 +0000 acpi_spmc(4): Rename functions parsing constraints Rename acpi_spmc_get_constraints_intel() and acpi_spmc_get_constraints_amd() ("get" => "parse") to reflect that they are actually just parsing the constraints passed by acpi_spmc_get_constraints(). No functional change (intended). Reviewed by: imp, obiwac Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D56806 --- sys/dev/acpica/acpi_spmc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/dev/acpica/acpi_spmc.c b/sys/dev/acpica/acpi_spmc.c index 641ed269c6b6..45231038fd42 100644 --- a/sys/dev/acpica/acpi_spmc.c +++ b/sys/dev/acpica/acpi_spmc.c @@ -477,7 +477,7 @@ acpi_spmc_free_constraints(struct acpi_spmc_softc *const sc) } static int -acpi_spmc_get_constraints_intel(struct acpi_spmc_softc *sc, ACPI_OBJECT *object) +acpi_spmc_parse_constraints_intel(struct acpi_spmc_softc *sc, ACPI_OBJECT *object) { struct acpi_spmc_constraint *constraint; int revision; @@ -540,7 +540,7 @@ acpi_spmc_get_constraints_intel(struct acpi_spmc_softc *sc, ACPI_OBJECT *object) } static int -acpi_spmc_get_constraints_amd(struct acpi_spmc_softc *sc, ACPI_OBJECT *object) +acpi_spmc_parse_constraints_amd(struct acpi_spmc_softc *sc, ACPI_OBJECT *object) { size_t constraint_count; ACPI_OBJECT *constraint_obj; @@ -631,9 +631,9 @@ acpi_spmc_get_constraints(device_t dev) object = (ACPI_OBJECT *)result.Pointer; if (is_amd) - rv = acpi_spmc_get_constraints_amd(sc, object); + rv = acpi_spmc_parse_constraints_amd(sc, object); else - rv = acpi_spmc_get_constraints_intel(sc, object); + rv = acpi_spmc_parse_constraints_intel(sc, object); AcpiOsFree(object); if (rv != 0) return (rv); From nobody Wed May 13 12:39:46 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gFtMQ73STz6dLCj for ; Wed, 13 May 2026 12:39: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFtMQ3WYFz3vlP for ; Wed, 13 May 2026 12:39:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778675986; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZfKLNfkny0HX7uQjbAskpBnG9wvhdnRF9FqXmLaWrhY=; b=oECoisX+AWtC9y2bZSe533CCxtbsCUYVZzeR6aCk/JEzRhlH4oyiCKybVhqeNwjlzGQXeP zWtUrdFp+52rl5w1PSf3Pd4i64IoqAxrzdD4OasLwewiM6Qc0zNurDF4aBcni5nLpDVNiW XNI/pW13EOsEt2PELOWXe22ot11WcgU8YlE/TSBUHInIEDYBhlQk4SDoAMc/9nkU3RzCwf goNy9wQC2zTZRgR5HSkj7sCaIyD2Dv/jpZdq48g22zBDBbHpcTBWEicT/KbWO7b/phRh1+ Ij2w1Q1KPQ7LMbfJgWBJP90MNm87yBAXRZGXQNXrbi33UYSjLdkKI6a34dLa8w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778675986; a=rsa-sha256; cv=none; b=YlzIxfgJbgqSwyTORzuZ9FPYfDCF66gay6JSJgI/oucHsFcqvd1QoUBbUy/lL8//ximrvE uRf5ULeocpgG+Az5kN55bKNQhhWlyIpC5vPpi4FUXxRx82NoS+8PovR72LuwWY64quoqLL y12a1WzRuNVD2B2UWbMhE+ujgJ4SP8lvuHuZh401a9s4FALX7d23SN/JpoiF1VtWMtlM0K /ZLhtGKz5gYiFlTkcTOoUWe0KdOx6nluz+7h94Hd+4dmwcLySSSiUP7cwU9QRAoJOk6jjZ B8HDYzP6wBHwEfXddQoN5LeRfGNUe8zB3zIjGQxrPGIer8DpEp+/zWQHWfemjA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778675986; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZfKLNfkny0HX7uQjbAskpBnG9wvhdnRF9FqXmLaWrhY=; b=mmB+nfg8DS+4xpmIg6VRXVex+0aVxrQfOh7O1j1dllYUJ4zWKdbDzLYsrgffl3ty9omfGu smhwuzT7IREm/D3NYHmAaIoow0lHWgSFdCHv6zZSqRUB5dUIvg0X+MztkZlZbumXUkbMbk se+u3e4hIkfG63eCAXSNSM6zYIrtQXS47Ehk+6YzQbqgbllw6fWlARvfk0GUrt5DXnpieK ZPjYOmzxatxmr75ZoJ1hifWTLB7aZaqijdKNGibrFkhnAbeSUbXdNT2tJF98iGTeibiNi0 u41+X9tRmbJXyzkoNMQxk+n6a+NNsVfwQWbYVKRweS25vO5WSVtDeUdrx6iUzQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFtMQ2z4bzr24 for ; Wed, 13 May 2026 12:39:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1973e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 12:39:46 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 98ad729f3e98 - main - acpi_spmc(4): Constraints: Simplify some assertions List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 98ad729f3e98b75ae79cd4b539fe2767f8a6f89e Auto-Submitted: auto-generated Date: Wed, 13 May 2026 12:39:46 +0000 Message-Id: <6a047112.1973e.fc59e99@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=98ad729f3e98b75ae79cd4b539fe2767f8a6f89e commit 98ad729f3e98b75ae79cd4b539fe2767f8a6f89e Author: Olivier Certner AuthorDate: 2026-05-04 11:48:16 +0000 Commit: Olivier Certner CommitDate: 2026-05-13 12:38:21 +0000 acpi_spmc(4): Constraints: Simplify some assertions While here, capitalize their messages. Reviewed by: imp, obiwac Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D56807 --- sys/dev/acpica/acpi_spmc.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/sys/dev/acpica/acpi_spmc.c b/sys/dev/acpica/acpi_spmc.c index 45231038fd42..530d719fd66e 100644 --- a/sys/dev/acpica/acpi_spmc.c +++ b/sys/dev/acpica/acpi_spmc.c @@ -486,8 +486,7 @@ acpi_spmc_parse_constraints_intel(struct acpi_spmc_softc *sc, ACPI_OBJECT *objec ACPI_OBJECT *detail; ACPI_OBJECT *constraint_package; - KASSERT(sc->constraints_populated == false, - ("constraints already populated")); + KASSERT(!sc->constraints_populated, ("Constraints already populated")); sc->constraint_count = object->Package.Count; sc->constraints = malloc(sc->constraint_count * sizeof *sc->constraints, @@ -548,8 +547,7 @@ acpi_spmc_parse_constraints_amd(struct acpi_spmc_softc *sc, ACPI_OBJECT *object) struct acpi_spmc_constraint *constraint; ACPI_OBJECT *name_obj; - KASSERT(sc->constraints_populated == false, - ("constraints already populated")); + KASSERT(!sc->constraints_populated, ("Constraints already populated")); /* * First element in the package is unknown. @@ -658,7 +656,7 @@ acpi_spmc_check_constraints(struct acpi_spmc_softc *sc) { bool violation = false; - KASSERT(sc->constraints_populated, ("constraints not populated")); + KASSERT(sc->constraints_populated, ("Constraints not populated")); for (size_t i = 0; i < sc->constraint_count; i++) { struct acpi_spmc_constraint *constraint = &sc->constraints[i]; From nobody Wed May 13 12:39:47 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gFtMS0CLbz6dLB1 for ; Wed, 13 May 2026 12:39: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFtMR3sHSz3vqN for ; Wed, 13 May 2026 12:39:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778675987; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c7aXjPiWgRtT+ou8uKWWvpah0VXPIx6Sj3KzDtBQciQ=; b=JbkvuJWL9dE0kZ9QLGnqT0BUHzkfMnp9rdRJTsSHuVSOIXMlXwh29DSFk0CZMxnoA8vZu2 HLOsGYzxq/xvvAN1inOJRJyMAp9kJ5cth8nJWnt5nvSAdIOoYH0dJNNuGoFUndEJktCzgk qlSc9m0msZXag1MHNcqyjpfl0/uhN0UzkYOn3/jg9ADrOg2nKwAWXA5AGXnYCAQdIP7IgB loQaI/bJ36V156IXRE2l66WlP5tq/7pNbce2QoxWfOfdy81YLD0VVNxXC/RHbcDLLu4x5f KfFV3O/pqkDeyfsBLJBbZvezwIjJ35S+gwieERDSYP5DlXqcu2HcGTerUZHtrQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778675987; a=rsa-sha256; cv=none; b=n1WRhOUsKPTEB9kph7oTQ3zMuH5CTYepxytXVzQ127OuJtzyc87GTODAsxxxWOfTkdoAs9 flXewN/lVeGnv7WiqHbZ7kN8UWvrk3S1girGDvNrGGFteW/zcUwTQqZRFJ4gQuzwHr+OtC HUNfZwIJ5LjS1msZ1iM0kD1BJZYhNfgIaE7a1wVz+hO2OkkKygItrivRfKD1JX2oUfPeFq PGPCFiDl+fKd2UO8Ro7jdAY177dnb+PLi7rEC23GFIe9JYzvGc+6BmbS37ejYY9vnEVSyN jI/l0Z+ugUGsT2smCLDFE91l9aOD6RsS/0KrV/l5sP0Nuny/579F6CmRj/CdxQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778675987; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c7aXjPiWgRtT+ou8uKWWvpah0VXPIx6Sj3KzDtBQciQ=; b=QF55wDEQKT4of2yL7ps1Ygk5cvsHSN1lZURX2J77WEwSXnXEfsgECyHvPDsZpRV9ycG22g hIKJQ5qA4CDzqaRKYnYaAKrAGatBIv3QSaXEGoGiF0kY9vfwV3J9AjfV+FbY0K2AygKYvJ 1b3CB9lGO19j0YtAIzCj671++0wNaQc9OCzYnhuphvRtMANUTNktHiT88zqrsmNETP259J zy9KG/aQvcbNeT7RhdGEBJOeHyEr0YHSG2opzmfj/CyKPjSevsjxvcAS6SnRulqjd5MMQT jb1hGAyIHRBr/oa/jBd1MFlFxEZ/rg0NN1TXFCc96NtSyALZMt2horF48Dz1aA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFtMR3Sp5zqyL for ; Wed, 13 May 2026 12:39:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 19545 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 12:39:47 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: a78c9a2a47f2 - main - acpi_spmc(4): Constraints: Clearer message on handle retrieve error List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a78c9a2a47f2209328bd25e527bd20cfab6d3665 Auto-Submitted: auto-generated Date: Wed, 13 May 2026 12:39:47 +0000 Message-Id: <6a047113.19545.5c5a6a90@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=a78c9a2a47f2209328bd25e527bd20cfab6d3665 commit a78c9a2a47f2209328bd25e527bd20cfab6d3665 Author: Olivier Certner AuthorDate: 2026-05-04 12:00:39 +0000 Commit: Olivier Certner CommitDate: 2026-05-13 12:38:21 +0000 acpi_spmc(4): Constraints: Clearer message on handle retrieve error Currently, the "failed to get handle for ..." log messages on attach are a bit alarming and no context is provided. Print out that these are retrieved when trying to match constraints and that such failures are ignored, which should make administrators worry less. While here, remove duplicated handle retrieving code in acpi_spmc_check_constraints() because: 1. As is, it is dead code: We 'continue' if the handle is NULL, i.e., not already resolved, before trying to resolve it again. 2. This code is called after device suspension, which might make some objects disappear from the ACPI namespace. In any case, it seems unlikely that, suddenly, new objects would appear. Reviewed by: imp, obiwac Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D56808 --- sys/dev/acpica/acpi_spmc.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/sys/dev/acpica/acpi_spmc.c b/sys/dev/acpica/acpi_spmc.c index 530d719fd66e..15b97347e8eb 100644 --- a/sys/dev/acpica/acpi_spmc.c +++ b/sys/dev/acpica/acpi_spmc.c @@ -643,7 +643,8 @@ acpi_spmc_get_constraints(device_t dev) status = acpi_GetHandleInScope(sc->handle, __DECONST(char *, constraint->name), &constraint->handle); if (ACPI_FAILURE(status)) { - device_printf(dev, "failed to get handle for %s\n", + device_printf(dev, + "Constraints: Cannot get handle for %s, ignoring\n", constraint->name); constraint->handle = NULL; } @@ -665,16 +666,6 @@ acpi_spmc_check_constraints(struct acpi_spmc_softc *sc) if (constraint->handle == NULL) continue; - ACPI_STATUS status = acpi_GetHandleInScope(sc->handle, - __DECONST(char *, constraint->name), &constraint->handle); - if (ACPI_FAILURE(status)) { - device_printf(sc->dev, "failed to get handle for %s\n", - constraint->name); - constraint->handle = NULL; - } - if (constraint->handle == NULL) - continue; - #ifdef notyet int d_state; if (ACPI_FAILURE(acpi_pwr_get_state(constraint->handle, &d_state))) From nobody Wed May 13 12:39:48 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gFtMS6tL1z6dKtM for ; Wed, 13 May 2026 12:39: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFtMS4p3Jz3vqX for ; Wed, 13 May 2026 12:39:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778675988; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zFZWJar+cNW7vwqbEdnXghkPisnCLu+N2SdNd/AWx/4=; b=i0NkDcrHY1+ybph2wCQouY5Wzo9AjAoNzt2sw8el8cLOLM0LUK5uaoOcrINJ0HDRxfElvC c8maOvPGVxfY4MBwbONxxQAfyUQLyMbO1dX5UYPTtarQJ0cmdBV27bIfVlhG+y9Vh8/68o 4Hh4TAUNsuXU52l7pxXB+snICiOL/RRJYDv2E0+KiDmfpUW0L6xfgez9E+UIm8zh17kP/3 sAmin3JmRjtLvgB5QTuVAwMOC2HgtM1/KITxhtHRa/e/XYkVS/2mGuu0nXteC066igz9t9 Ck5zbArZ8pwBEvwYFAaZ7uHj8U+UWOeC2MYGqKPQVJP7VnNA4LO5XE0odmPkHg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778675988; a=rsa-sha256; cv=none; b=nL2XF/+/VFqnUhzg+aKVKLcAB7ipTNTVPgnHn/EYKxRQLBvd3VsTLg1gtARM0/+j/1XduY jHfaeV0zOSSlq9PNFf7vVuhp6ux+TNECJ5bYsd9z88YFslHZdYNeyLbdUPcgHBrKAcUY5s YCGfmZtfRtl1CTddVRkJt/OEoqpWEb7O2R5jUYn7Fdl3I9d1+yrs7r7DdV4Hu8sPU7hO7M 398CZn6VGo8+8bPBN0ijW/lUxjkiIVzU62yT2ljz2zrBALMeTeOLkd38VAYgadrVie6wTu JwPfxUhcRjuqvN0Ww0KzzDeXaZz7xbbeWOYPJDnWLTCmrZ+MmK85RtLWmvUmPg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778675988; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zFZWJar+cNW7vwqbEdnXghkPisnCLu+N2SdNd/AWx/4=; b=GGvuAOW5VCjcKownXkRLU663IlF4hdViYCY+LWo4/1tfF4y3+v6j5LMmucckQb8umibQDG vWMHchN65xLZXjREve/h1Cnc1mklZi6H5X8cNG3afURwUPlG1s0HGTyY/KWu+BAkyFr0Q2 6/2LTd9+ywyIvCBXnO0jNoLOgtiC/vo9dnvAVIYxpi/79iDJySP2+Oh8YLXSlHNZKhu5HR Us2SZa53J6jU1caAPWZZm0Ocpyxrv73cFXasUbQ26UgwyJEN0rARVmEJYK2pIKUEirw9Qc tgBkc4KJ7rtxfmZrH/B4n4XyBMP4lBL4GAWnXl1kBe2EF+mIXCdLCm3Wvv9G6A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFtMS4Gnszr25 for ; Wed, 13 May 2026 12:39:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1a5a4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 12:39:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 0cef5efbbf93 - main - acpi_spmc(4): Stop pretending that all constraints are verified List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0cef5efbbf939c3ca89bd29047a230cbedb2c9bb Auto-Submitted: auto-generated Date: Wed, 13 May 2026 12:39:48 +0000 Message-Id: <6a047114.1a5a4.25314d00@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=0cef5efbbf939c3ca89bd29047a230cbedb2c9bb commit 0cef5efbbf939c3ca89bd29047a230cbedb2c9bb Author: Olivier Certner AuthorDate: 2026-05-04 12:04:08 +0000 Commit: Olivier Certner CommitDate: 2026-05-13 12:38:21 +0000 acpi_spmc(4): Stop pretending that all constraints are verified We do not check these constraints (yet), so stop printing that they are verified. While here, make the (not compiled in at the moment) "constraint violated" message more terse, and move the warning it contains to outside of the loop (no need to print it repeatedly if multiple constraints are violated). While here, bail out early if there are no constraints to avoid printing (in the future) that constraints are respected even when there are none. Reviewed by: imp (older version), obiwac Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D56809 --- sys/dev/acpica/acpi_spmc.c | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/sys/dev/acpica/acpi_spmc.c b/sys/dev/acpica/acpi_spmc.c index 15b97347e8eb..58197242ff92 100644 --- a/sys/dev/acpica/acpi_spmc.c +++ b/sys/dev/acpica/acpi_spmc.c @@ -655,9 +655,17 @@ acpi_spmc_get_constraints(device_t dev) static void acpi_spmc_check_constraints(struct acpi_spmc_softc *sc) { +#ifdef notyet bool violation = false; +#endif KASSERT(sc->constraints_populated, ("Constraints not populated")); + /* + * Avoid printing that constraints are respected when there are no + * constraints at all. + */ + if (sc->constraint_count == 0) + return; for (size_t i = 0; i < sc->constraint_count; i++) { struct acpi_spmc_constraint *constraint = &sc->constraints[i]; @@ -671,19 +679,24 @@ acpi_spmc_check_constraints(struct acpi_spmc_softc *sc) if (ACPI_FAILURE(acpi_pwr_get_state(constraint->handle, &d_state))) continue; if (d_state < constraint->min_d_state) { - device_printf(sc->dev, "constraint for device %s" - " violated (minimum D-state required was %s, actual" - " D-state is %s), might fail to enter LPI state\n", + device_printf(sc->dev, "Constraint for device %s" + " violated (current D-state: %s, " + "required minimum D-state: %s).\n" constraint->name, - acpi_d_state_to_str(constraint->min_d_state), - acpi_d_state_to_str(d_state)); + acpi_d_state_to_str(d_state), + acpi_d_state_to_str(constraint->min_d_state)); violation = true; } #endif } - if (!violation) +#ifdef notyet + if (violation) + device_printf(sc->dev, "Some constraints violated, " + "might fail to enter a Low-Power Idle state\n"); + else device_printf(sc->dev, - "all device power constraints respected!\n"); + "All device power constraints respected!\n"); +#endif } static void From nobody Wed May 13 12:39:49 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gFtMV2WXgz6dLBg for ; Wed, 13 May 2026 12:39: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFtMT58jPz3vwZ for ; Wed, 13 May 2026 12:39:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778675989; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uGcCzeE4V4vt9KULNs1x8NYBh3g8e03W9kv8mX/JyHg=; b=kqHqDYMwq9lMSphnnR4mxOaQg41Wq1nTHWsImcgUVekR7uDjVuLrvcrqEbfb89QtV4DnGt d3m/o/F5x5ra6Q2i04xOuDT/zVsX6RwRK1UcE5ayZq6KONahXqQRwqirVIpGmcARHXe3HG UyMVgu7AAFkk/cUeWdk0ThG6CirgSl2rKmrohWY7Lnfm3Kftc7dHXEWQfYpXsWJVCu39as vEgT+RgRwLcCYK4EmWypj4BGO1Y8LO5Eh+OBYZvJAi0w6UFXv3Qgj5C/WJcht5wv/ChHIh jG3i58SND2WegFukrQhwea0rWiOMZLfjmgkhZYI9SXzroDHMHtNCGV2iW4GwyQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778675989; a=rsa-sha256; cv=none; b=OGPrKM+YlJxEfyksBT/K19TDbqCHNC2wg5oIN/TMOVfVQTkq/L8JRF6yzBwqSge53wZaeL F052rLdXdRM0SR5SWrPuy+MNkNIfnqjfqEprgaGy/UxneVLZOQ2HRxFG+xDSDswp4fH63l ZW4WWStjq5W7eYUztEGl/WXWctUyI0n0OxKg1H6NCLRV8m3LuTYDicl+ke32z1+fONsKV+ TbFAOe2baUAHzPufJT/OfjbKh3WocaCF8QZSuJDRehjkCkOKHuo1IRcmWokdAoBVtaAVPe tLnzHOQseGtS5R9DoZNXFMol5bM5LbydIs6jYn3UyTWi6kllJeoM2XHqK09JaA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778675989; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uGcCzeE4V4vt9KULNs1x8NYBh3g8e03W9kv8mX/JyHg=; b=T6iu9Di3XoaD6/Qk5fELSDfchkano5YrTQaq9WRcIXCBMgxEOoQBZWU31LSsioXav4xwzC snkfj3s4epLTwBpwJjptz4JRRSX1jkhMu3zEn/gzeta+Ei448fxQz5nR7FYrcYdP65Kvjf 33osWbX1crzdneAgGdrpXiGQaTdNFVSDwVJK2h0okivm0ssR+Eut0LGsgHg+Q0SyqA2phK 1v+c+l8fvzkMpqaEZB6Trxg1Inm4qDs1OpWeFNZCSRHayAY1XnXvkg3vEgP+vmfEcvPCDj OQeLLgHq/XTUd1dKL+JEGHwLFHgC3AFQONjDSVRwS50khii5qg3uPrqz3WLn/w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFtMT4jz9zrR5 for ; Wed, 13 May 2026 12:39:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1a5a8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 12:39:49 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 6bd543f7a82a - main - acpi_spmc(4): Check DSMs only on attach, do not return 0 on probe List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6bd543f7a82a3cbb10db3a79590d5179be403660 Auto-Submitted: auto-generated Date: Wed, 13 May 2026 12:39:49 +0000 Message-Id: <6a047115.1a5a8.2a65c03@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=6bd543f7a82a3cbb10db3a79590d5179be403660 commit 6bd543f7a82a3cbb10db3a79590d5179be403660 Author: Olivier Certner AuthorDate: 2026-05-04 12:40:44 +0000 Commit: Olivier Certner CommitDate: 2026-05-13 12:38:21 +0000 acpi_spmc(4): Check DSMs only on attach, do not return 0 on probe Once we have recognized a device by PNP ID, declare support unconditionally on probe, and only check for DSMs in attach. We do this for these reasons: 1. PNP0D80 is de-facto a device supposed to hold DSMs related to suspend-to-idle, so we assume it cannot be used for other purposes. And if that changes, we need another architecture anyway (e.g., have a new driver claiming those devices and behaving like a bus, to which this driver would be a sub-driver). 2. If there are no DSMs that we support on such a device, then a new DSM was added that the driver does not know about and which "replaces" (in terms of functionality) the known ones, or the firmware is buggy. In both cases, failing the attach instead of the probe is reasonable, as that leads to printing some error which we (and probably users too) would like to know about. 3. This is a step to enable multiple instances of this driver (just to be a good citizen, and also to be future proof against weird firmwares that would, e.g., implement the Microsoft DSM on another device than the Intel one). Reviewed by: imp (older version), obiwac Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D56810 --- sys/dev/acpica/acpi_spmc.c | 56 ++++++++++++++++++++++------------------------ 1 file changed, 27 insertions(+), 29 deletions(-) diff --git a/sys/dev/acpica/acpi_spmc.c b/sys/dev/acpica/acpi_spmc.c index 58197242ff92..939f254fbf7f 100644 --- a/sys/dev/acpica/acpi_spmc.c +++ b/sys/dev/acpica/acpi_spmc.c @@ -340,10 +340,7 @@ static void acpi_spmc_resume(device_t dev, enum power_stype stype); static int acpi_spmc_probe(device_t dev) { - char *name; - ACPI_HANDLE handle; - struct acpi_spmc_softc *sc; - char buf[32]; + char *name; /* Check that this is an enabled device. */ if (acpi_get_type(dev) != ACPI_TYPE_DEVICE || acpi_disabled("spmc")) @@ -357,41 +354,42 @@ acpi_spmc_probe(device_t dev) return (ENXIO); } - handle = acpi_get_handle(dev); - /* ACPI_ID_PROBE() above cannot succeed without a handle. */ + device_set_desc(dev, "System Power Management Controller"); + + return (BUS_PROBE_DEFAULT); +} + +static int +acpi_spmc_attach(device_t dev) +{ + struct acpi_spmc_softc *const sc = device_get_softc(dev); + const ACPI_HANDLE handle = acpi_get_handle(dev); + char buf[32]; + + /* + * ACPI_ID_PROBE() in acpi_spmc_probe() cannot succeed without a handle. + */ MPASS(handle != NULL); - sc = device_get_softc(dev); sc->dev = dev; + sc->handle = handle; - /* Check which DSMs are supported. */ - sc->dsms = 0; + for (int i = 0; i < nitems(dsms); ++i) { + KASSERT(dsms[i] != NULL, ("%s: Sparse dsms[]!", __func__)); + KASSERT(dsms[i]->index == i, + ("%s: Inconsistent indices for DSM %s", __func__, + dsms[i]->name)); - for (int i = 0; i < nitems(dsms); ++i) acpi_spmc_check_dsm(sc, handle, dsms[i]); + } - if (sc->dsms == 0) + if (sc->dsms == 0) { + device_printf(dev, "No DSM supported!"); return (ENXIO); + } print_bit_field(buf, sizeof(buf), sc->dsms, "DSM", pbf_dsm_name, NULL); - device_set_descf(dev, "System Power Management Controller (DSMs %s)", - buf); - - return (0); -} - -static int -acpi_spmc_attach(device_t dev) -{ - struct acpi_spmc_softc *sc = device_get_softc(dev); - - sc->handle = acpi_get_handle(dev); - if (sc->handle == NULL) - return (ENXIO); - - sc->constraints_populated = false; - sc->constraint_count = 0; - sc->constraints = NULL; + device_printf(dev, "DSMs supported: %s\n", buf); /* Get device constraints. We can only call this once so do this now. */ acpi_spmc_get_constraints(dev); From nobody Wed May 13 12:39:50 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gFtMW0ZHfz6dKtp for ; Wed, 13 May 2026 12:39: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFtMV620gz3vqf for ; Wed, 13 May 2026 12:39:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778675990; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ibP/A95FBWE1zAZOj+/FNiCs6vZY7X3hTHiIxsrFzrs=; b=xOqLFawuxNR9lw9Dxs5nPWlzowxsBJ1fSSa9FN46LdPBaWdejlyfU4gPWKf44xbCsOEYbz s/WiMnmVH0yrWbrv5LWyzxU2IkUosgRPuJFHM2gNR3SK9TAEdwJ/YYq3s7NmXecPlya1s4 ufm8vWdA6ixKhK9TqeG56dvw4YJWvS66IaV3Js4ABfygZRTSYb6/an3NLAIBuKqqmW7zKr /OvDFLtEu/IrZBfuYfkPTBJbAxYGt3HY3HYt4/iNQ2yxg+O/Kl6yOs7DK8dXIQr6h5JUhu qAhZj0k0eK7nX063rS21LtHpdT93FK9GCKVGMgfUaIgj/pgjTI5yasR3pAoPdQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778675990; a=rsa-sha256; cv=none; b=RGpeLCdxYLBwR1IvChKMiCyuH30IPMnt9Fbc9M0K2Lm5tYRDD0ukA171YNfg3Uy4Corigm 2rfr328UDdOPqNLT0kxsZbEiRjuznGMwW5R5gVL5thIWeb7csv2LvtaoBF1MUbNiTFbM+a WrzZ6GAxhq6ED+zFAMF8URf8m2vsMWyz9VcSOeu7gL3I7Qt6Xva5AV8R9crOg2nPls1F6O 3i8rT8AT84Q5T/BRSJwogHltmw7ILZPnhjtkQKkANi/56Yx7RJVfXitqhl8Kk/BKNsHPf4 xEA3CBkuuUcehpDJFJzNSVr1zn2GpQBWjd5J9SP1UGt0NXYgkNm7CNJq67lPmA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778675990; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ibP/A95FBWE1zAZOj+/FNiCs6vZY7X3hTHiIxsrFzrs=; b=gLkfzNRcKat21kzlqBzpgNQfrULP0E1QMifawSAuGgzbCYntP1tYb7edLK0vvd0qvSfAiy MVTv7MspELC+K403bppphtxjfnX3Ccdo82EzNwG2y8wRceSPhswb3R8L6iRQiKoo05nnV6 DnOZWAg99MEk5rT70XHlhQAiGK96pAbjJTcRy/phzKfHyREwQqfVzB4TmeNICF0H6nrh9c TvpqOGdQ7dwKtr3053FNKOoTHaf4pfse/v01S/ndRZi0D/WrBXUH2I1H6VC/rGb536/fKL Ew7NdH1RO/ezi4wzgkgmX5mJVcFN2KaubWDfWgkYOzUGD/6k5QbnvTLx4EEm+A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFtMV5X7qzr6Q for ; Wed, 13 May 2026 12:39:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 19f4c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 12:39:50 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: ebad66abbc1f - main - acpi_spmc(4): Print supported functions after DSMs List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ebad66abbc1f25a761add6481de99abf474b2d87 Auto-Submitted: auto-generated Date: Wed, 13 May 2026 12:39:50 +0000 Message-Id: <6a047116.19f4c.69d42c69@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=ebad66abbc1f25a761add6481de99abf474b2d87 commit ebad66abbc1f25a761add6481de99abf474b2d87 Author: Olivier Certner AuthorDate: 2026-05-04 16:19:31 +0000 Commit: Olivier Certner CommitDate: 2026-05-13 12:38:22 +0000 acpi_spmc(4): Print supported functions after DSMs This makes things more top-down, as expected when probing devices. Reviewed by: imp, obiwac Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D56811 --- sys/dev/acpica/acpi_spmc.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/sys/dev/acpica/acpi_spmc.c b/sys/dev/acpica/acpi_spmc.c index 939f254fbf7f..33915b536667 100644 --- a/sys/dev/acpica/acpi_spmc.c +++ b/sys/dev/acpica/acpi_spmc.c @@ -326,7 +326,7 @@ failed_to_call_dsm(const struct acpi_spmc_softc *const sc, dsm->name, dsm->revision, dsm_function_name(dsm, function_index)); } -static void acpi_spmc_check_dsm(struct acpi_spmc_softc *sc, +static void acpi_spmc_probe_dsm(struct acpi_spmc_softc *sc, ACPI_HANDLE handle, struct dsm_desc *const dsm); static void acpi_spmc_dsm_print_functions( const struct acpi_spmc_softc *const sc, @@ -380,7 +380,7 @@ acpi_spmc_attach(device_t dev) ("%s: Inconsistent indices for DSM %s", __func__, dsms[i]->name)); - acpi_spmc_check_dsm(sc, handle, dsms[i]); + acpi_spmc_probe_dsm(sc, handle, dsms[i]); } if (sc->dsms == 0) { @@ -391,6 +391,11 @@ acpi_spmc_attach(device_t dev) print_bit_field(buf, sizeof(buf), sc->dsms, "DSM", pbf_dsm_name, NULL); device_printf(dev, "DSMs supported: %s\n", buf); + /* Print supported functions of usable DSMs. */ + for (int i = 0; i < nitems(dsms); ++i) + if (has_dsm(sc, i)) + acpi_spmc_dsm_print_functions(sc, dsms[i]); + /* Get device constraints. We can only call this once so do this now. */ acpi_spmc_get_constraints(dev); @@ -447,7 +452,7 @@ acpi_spmc_dsm_print_functions(const struct acpi_spmc_softc *const sc, } static void -acpi_spmc_check_dsm(struct acpi_spmc_softc *sc, ACPI_HANDLE handle, +acpi_spmc_probe_dsm(struct acpi_spmc_softc *sc, ACPI_HANDLE handle, struct dsm_desc *const dsm) { const uint64_t supported_functions = acpi_DSMQuery(handle, @@ -460,7 +465,6 @@ acpi_spmc_check_dsm(struct acpi_spmc_softc *sc, ACPI_HANDLE handle, return; dsm->supported_functions = supported_functions & ~1; sc->dsms |= IDX_TO_BIT(dsm->index); - acpi_spmc_dsm_print_functions(sc, dsm); } static void From nobody Wed May 13 12:39:51 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gFtMX2LQzz6dLLn for ; Wed, 13 May 2026 12:39: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFtMW6qZqz3w6l for ; Wed, 13 May 2026 12:39:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778675992; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iK+vCNCO0tolrFdbZGv+U0Eq6Dms14KNC3efOEZClLU=; b=YpKyiB6deJPjVSLqPNXaTqYusYFvDQhFNjpQABcGcq4xzLF8IG+v8rGvkHY5paKihZz4jQ br0N3MtJowlvoabhI3GaTnwzsmkKgGh4vwCeqkEKgKy8Z6sZNcitV1y9KfjrSjWtL1T+n4 R/0PsAGqLIM/D0sUDZnpJbZuiqLpxeeQrLH0jfCxue/InbrX/pVVm4N1SKaRtpr1A0ez4f Xj4kN3WO7KQx9N46SUIqwfkK+kqKyW9MMq4ocsW1/kanDyhCUyWaEk73WzWBFEhUz8uvUB 3vBgwy1POUJz6ntsH+9BriN3dj3EsJwdJLJ0zvA92WFxRpLfr+X6mQAlvgypfg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778675992; a=rsa-sha256; cv=none; b=hX68aAFLMU79wT67X4zAwwoLQQ2YugNsIERpYjKaNuoYDok6ROiV5+dheRg0HuI0ZhCZic ySMONZjhBFYKRkOKdzdvQdIyxOv4zHuz5JLJ9Tfwf/jGM1erpxWNmnimY08zIOOfe/FIda S+kHVWwWgudnH4EkVv5PyExnrl11PiLsworCAmMSvnHcxPdVC/i413kxXOMf6PVbjlpOmG /TsKxxeS90Shx6xWMQOylJUpvaXjpR+FoJajLtvLIEPd67yBCexGRP1fmbSHvislP1pzNy ZNAZ6ZVj+9p3887n1thKQ9ghgAaMuCWz95NCMfffVRcyVlX9fl9+4tZcAMLrOQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778675992; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iK+vCNCO0tolrFdbZGv+U0Eq6Dms14KNC3efOEZClLU=; b=clFSs0EaoRTJ83oYo5FJ+zTqwm+LD/0C69yyiIMHRNX5EYY4lhBJLfCpUCFDyBfDpdvBV+ bmXASKatuc9lBJcn0Ki18ApG9uEcLbRlZO2JW6v9mlLHt+DfOJ97RHdVUOIXOpp+o3RhNV fqGeL+MBLmBoi1AfI+Y+6GJYqnYeNbmpJP01vcnOdE7++0dY99BHhN2XstwNP1xt+ccxi7 l2vXf1gfEzwP2fOSXwV2uZ35MCgyNTeA1NCVMeZGF46tJyeex6JiRfc164bi3oY2aCO2nr myulJqJnTtNjPyE1eLkFPbwZA0SGldVUfcJjLBlw9np7k160isPwrQOkdgsOkg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFtMW6Nhbzr9X for ; Wed, 13 May 2026 12:39:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c0eb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 12:39:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: e5615cd8094f - main - acpi_spmc(4): INVARIANTS: Do not panic on getting constraints failure List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e5615cd8094f75a17572b3dae810f48ae8401d6c Auto-Submitted: auto-generated Date: Wed, 13 May 2026 12:39:51 +0000 Message-Id: <6a047117.1c0eb.3a123f6c@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=e5615cd8094f75a17572b3dae810f48ae8401d6c commit e5615cd8094f75a17572b3dae810f48ae8401d6c Author: Olivier Certner AuthorDate: 2026-05-04 19:10:25 +0000 Commit: Olivier Certner CommitDate: 2026-05-13 12:38:22 +0000 acpi_spmc(4): INVARIANTS: Do not panic on getting constraints failure Just continue without constraints checking in this case. To this end, remove the 'constraints_populated' field from 'struct acpi_spmc_softc' and any reference to it. However, we introduce another boolean, 'sc->get_constraints_succeeded', in order to check (under INVARIANTS) that acpi_spmc_get_constraints() is called only once on success. Calling that function another time after a success would leak memory. It would be easy to change that function to support multiple calls (e.g., by adding a call to acpi_spmc_free_constraints() near its start), however trying to retrieve the constraints again simply looks like wasted time as the same results are expected to be returned on each call. Reviewed by: imp, obiwac Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D56812 --- sys/dev/acpica/acpi_spmc.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/sys/dev/acpica/acpi_spmc.c b/sys/dev/acpica/acpi_spmc.c index 33915b536667..9a4264d6785b 100644 --- a/sys/dev/acpica/acpi_spmc.c +++ b/sys/dev/acpica/acpi_spmc.c @@ -223,7 +223,9 @@ struct acpi_spmc_softc { struct eventhandler_entry *eh_suspend; struct eventhandler_entry *eh_resume; - bool constraints_populated; +#ifdef INVARIANTS + bool get_constraints_succeeded; +#endif size_t constraint_count; struct acpi_spmc_constraint *constraints; }; @@ -488,8 +490,6 @@ acpi_spmc_parse_constraints_intel(struct acpi_spmc_softc *sc, ACPI_OBJECT *objec ACPI_OBJECT *detail; ACPI_OBJECT *constraint_package; - KASSERT(!sc->constraints_populated, ("Constraints already populated")); - sc->constraint_count = object->Package.Count; sc->constraints = malloc(sc->constraint_count * sizeof *sc->constraints, M_TEMP, M_WAITOK | M_ZERO); @@ -536,7 +536,6 @@ acpi_spmc_parse_constraints_intel(struct acpi_spmc_softc *sc, ACPI_OBJECT *objec constraint_package->Package.Elements[2].Integer.Value; } - sc->constraints_populated = true; return (0); } @@ -549,8 +548,6 @@ acpi_spmc_parse_constraints_amd(struct acpi_spmc_softc *sc, ACPI_OBJECT *object) struct acpi_spmc_constraint *constraint; ACPI_OBJECT *name_obj; - KASSERT(!sc->constraints_populated, ("Constraints already populated")); - /* * First element in the package is unknown. * Second element is the number of device constraints. @@ -596,7 +593,6 @@ acpi_spmc_parse_constraints_amd(struct acpi_spmc_softc *sc, ACPI_OBJECT *object) constraint_obj->Package.Elements[3].Integer.Value; } - sc->constraints_populated = true; return (0); } @@ -613,8 +609,8 @@ acpi_spmc_get_constraints(device_t dev) struct acpi_spmc_constraint *constraint; sc = device_get_softc(dev); - if (sc->constraints_populated) - return (0); + + MPASS(!sc->get_constraints_succeeded); /* The Microsoft DSM doesn't have this function. */ is_amd = has_dsm(sc, DSM_AMD); @@ -651,6 +647,10 @@ acpi_spmc_get_constraints(device_t dev) constraint->handle = NULL; } } + +#ifdef INVARIANTS + sc->get_constraints_succeeded = true; +#endif return (0); } @@ -661,7 +661,6 @@ acpi_spmc_check_constraints(struct acpi_spmc_softc *sc) bool violation = false; #endif - KASSERT(sc->constraints_populated, ("Constraints not populated")); /* * Avoid printing that constraints are respected when there are no * constraints at all. From nobody Wed May 13 12:39:53 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gFtMY2wDhz6dLD3 for ; Wed, 13 May 2026 12:39: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFtMY0bFWz3vtP for ; Wed, 13 May 2026 12:39:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778675993; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6eGrSWeqCHwcizrYoJmErCjXAbWYSSsHAONUK3Gvv0M=; b=pyhdj0+BF4yg5hdPAyiZ4W1ifcq7Pf2Z1gVIEz9NLopfhPUW0cwd9CPcYkkx+SziHyGJ6C YbJKabWiRLo469+kQQ5W1aVsylSCAi1vW6pDCkp2TAM9RD271cs6pbu3rslR0nf52qb9O9 FPL7avbEyE65Q7cmQ7o3uz+YBcGfSAdHvRdONviYSo3c9YgL6mSFulJvroJr/Yv4YfLxox xtd9ihsXtdz0C7omcW0CDYLUY3pXCu4OAwB7DYSX7hCW1CSnXYkQGi7g9jOPTTOAq5wPja BWdHfydv8wG4wub18DOapqgpSKYfzjfewCgHLA4yPccgNcFcmd9iCV3cugxIpQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778675993; a=rsa-sha256; cv=none; b=lY8jx8yooVQyngh1hnPUMGinkvJ3GESpRgQP3+GkQ4EkQ50QYAkru5UQ6ueTaPf9dyTDLS 7Ch9VllHLg/uZh8j6qUIH8y/cE+CT0rg7YF+2J+IQl+hHjXiK9P2EDXXaazMRaMpb9NgyK Ahnu3a3Ws19Tdp4CCILxusD9bGcky/NXo7AW75Ey/FZDOw4dSf5RQSYs3GvG2ZxfIa9k35 fqTslENy9lV6rlxx5TWuFwmd/zSLuL84u5udY7pa3u5iWOPWC2s0xthqm4V/bxfpEvyoLd R+FEx6R7Pfi3Cbq1Tuuvzfuhp7UvupSZkqtgGkfdTYdifACRmUnBoAqniSWXhg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778675993; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6eGrSWeqCHwcizrYoJmErCjXAbWYSSsHAONUK3Gvv0M=; b=G/FoUV/Is3ajUxjPW7yYBPe9b8HaJitt58egSoYqDudZL93WBif/k5lY2SNgYsPLm9Juyu yWYPgDiZudjM9Rr/mYha8IW9lJQGmOyYZKyXl7GsF54h+SfesoC2ho/6H8+wNqMY72E3lJ Qw4sTDH4HSFunvDnymeDya8Y8Z11aZRZ+eLhqdKno336rHC8ljW0k83eV+GjiBbxgVsjkx ft0j3GlEarsnogZaIvaVrpxliSaN1JDNBb764ezrlBlDhBxCLzXvh74NbUIhb8rSfiQGa4 uzplGIB9j/zXWuG8PwSg/bdk/CQyN15QiCAAST1K/OHB85r8KOcmhxpU9bnQ2g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFtMY04V6zrR6 for ; Wed, 13 May 2026 12:39:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 19bdf by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 12:39:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 921a6d6c38f5 - main - acpi_spmc(4): Gracefully support a standalone Microsoft DSM List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 921a6d6c38f5b099b1290a614689d70df2e0f0d4 Auto-Submitted: auto-generated Date: Wed, 13 May 2026 12:39:53 +0000 Message-Id: <6a047119.19bdf.1c924158@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=921a6d6c38f5b099b1290a614689d70df2e0f0d4 commit 921a6d6c38f5b099b1290a614689d70df2e0f0d4 Author: Olivier Certner AuthorDate: 2026-05-04 19:17:21 +0000 Commit: Olivier Certner CommitDate: 2026-05-13 12:38:22 +0000 acpi_spmc(4): Gracefully support a standalone Microsoft DSM In acpi_spmc_get_constraints(), stop assuming that if there is no AMD DSM, then the Intel one is present. Although this is likely to be the overwhelming majority of cases on amd64, there is no technical reason nor constraint in our code that really needs assuming that. On (so far hypothetical) machines with only the Microsoft DSM, this assumption would cause a cryptic and irrelevant error message (and, prior to the previous commit, a panic on INVARIANTS). Warn the user if both the Intel and AMD DSMs are present, and use the constraints reported by the Intel one (see the comment for why). Reviewed by: imp (older version), obiwac Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D56813 --- sys/dev/acpica/acpi_spmc.c | 52 +++++++++++++++++++++++++++++----------------- 1 file changed, 33 insertions(+), 19 deletions(-) diff --git a/sys/dev/acpica/acpi_spmc.c b/sys/dev/acpica/acpi_spmc.c index 9a4264d6785b..fde803bdd15d 100644 --- a/sys/dev/acpica/acpi_spmc.c +++ b/sys/dev/acpica/acpi_spmc.c @@ -333,7 +333,7 @@ static void acpi_spmc_probe_dsm(struct acpi_spmc_softc *sc, static void acpi_spmc_dsm_print_functions( const struct acpi_spmc_softc *const sc, const struct dsm_desc *const dsm); -static int acpi_spmc_get_constraints(device_t dev); +static int acpi_spmc_get_constraints(struct acpi_spmc_softc *const sc); static void acpi_spmc_free_constraints(struct acpi_spmc_softc *const sc); static void acpi_spmc_suspend(device_t dev, enum power_stype stype); @@ -399,7 +399,7 @@ acpi_spmc_attach(device_t dev) acpi_spmc_dsm_print_functions(sc, dsms[i]); /* Get device constraints. We can only call this once so do this now. */ - acpi_spmc_get_constraints(dev); + acpi_spmc_get_constraints(sc); sc->eh_suspend = EVENTHANDLER_REGISTER(acpi_post_dev_suspend, acpi_spmc_suspend, dev, 0); @@ -597,24 +597,36 @@ acpi_spmc_parse_constraints_amd(struct acpi_spmc_softc *sc, ACPI_OBJECT *object) } static int -acpi_spmc_get_constraints(device_t dev) +acpi_spmc_get_constraints(struct acpi_spmc_softc *const sc) { - struct acpi_spmc_softc *sc; - struct dsm_desc *dsm; - ACPI_STATUS status; - ACPI_BUFFER result; - ACPI_OBJECT *object; - bool is_amd; - int rv; + struct dsm_desc *dsm; + ACPI_STATUS status; + ACPI_BUFFER result; + ACPI_OBJECT *object; + int rv; struct acpi_spmc_constraint *constraint; - sc = device_get_softc(dev); MPASS(!sc->get_constraints_succeeded); - - /* The Microsoft DSM doesn't have this function. */ - is_amd = has_dsm(sc, DSM_AMD); - dsm = is_amd ? &dsm_amd : &dsm_intel; + /* + * Constraints are not supported by the Microsoft DSM. Since we do not + * expect both Intel and AMD DSMs to be present at once, we only have + * a single storage for common information ('min_d_state'). In case + * some day both happen to be present, warn the user so that he can + * report that condition to us, and somewhat arbitrarily favor the Intel + * one because it at least has a written specification. + */ + if (has_dsm(sc, DSM_INTEL)) { + dsm = &dsm_intel; + + if (has_dsm(sc, DSM_AMD)) + device_printf(sc->dev, "Constraints: Both Intel and " + "AMD DSMs are present!\n" + "Using constraints from Intel.\nPlease report.\n"); + } else if (has_dsm(sc, DSM_AMD)) + dsm = &dsm_amd; + else + return (0); /* It seems like this DSM can fail if called more than once. */ status = acpi_EvaluateDSMTyped(sc->handle, (uint8_t *)&dsm->uuid, @@ -626,10 +638,12 @@ acpi_spmc_get_constraints(device_t dev) } object = (ACPI_OBJECT *)result.Pointer; - if (is_amd) - rv = acpi_spmc_parse_constraints_amd(sc, object); - else + if (dsm == &dsm_intel) rv = acpi_spmc_parse_constraints_intel(sc, object); + else { + MPASS(dsm == &dsm_amd); + rv = acpi_spmc_parse_constraints_amd(sc, object); + } AcpiOsFree(object); if (rv != 0) return (rv); @@ -641,7 +655,7 @@ acpi_spmc_get_constraints(device_t dev) status = acpi_GetHandleInScope(sc->handle, __DECONST(char *, constraint->name), &constraint->handle); if (ACPI_FAILURE(status)) { - device_printf(dev, + device_printf(sc->dev, "Constraints: Cannot get handle for %s, ignoring\n", constraint->name); constraint->handle = NULL; From nobody Wed May 13 12:39:54 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gFtMZ6Lr0z6dLLq for ; Wed, 13 May 2026 12:39: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFtMZ1MB3z3w4t for ; Wed, 13 May 2026 12:39:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778675994; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JsWkWVdz80EZPKgPCnk4AaLmLAOKYJoZ9CPFY54OCkQ=; b=F49jsWHgMlB2p5sjZLjhSaJonJky8mWDn9F7+rjNkFDgosOBZI6YZMSny6aZ4BaGpMQ2R0 Qyh/wWiG+EwJRHJoGJZBACJKDMmK1x7iSvI7t8U0Vml86haDf4+i43pMuOjLXIHAg3nkP6 kbrr8td/kULF0DTdP6RQH9nJjD7+v+B3aXfK3udqo5vGWd6CqJQNDYgCoSwXjewT3wDhJE ffzRQxwSdyXgr6lkw7zzWniMwd/hl9/2PtSdhe6Cf7ljUC2QPu5TjINN2KaQvZfn3AvBoq w7z2zQj/zHmm/f3CczKErnnY0bYmQ25iQFlzGN2rVCc6R0NuAh5PKe5j3YCfRw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778675994; a=rsa-sha256; cv=none; b=A/IEZDCzWfYuGU5LFyXbSoDmY4hl2XMo8Q4au4WAh0WepL3RCLbYdUhpOBrQD1vMPj9vPw wC2tUI3bac+6OtsjEa9Vy2S6fhBPXSXCSawH5zKO3Nw/I0KunoxBXLCIZ22nBC4WwWTZtI IMe6M6ceEF5pvEmJUtm4bkTWRRbcnZNHDr91xv03sv/qYOqIfdiEREiSHPUax9JlrEEl1R Tp65oPVnAyVokaIaxpoTGAcrFRwM8sbWxfEiyh8EgCe1ICV/cdi48m21dgm0Yte/mS1/M0 zhG7Ky/1g5Yksp+2nVQemq/7ci+5jTqpQR0gi6gNBH+cnFKHqzKLAJjJexeutg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778675994; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JsWkWVdz80EZPKgPCnk4AaLmLAOKYJoZ9CPFY54OCkQ=; b=SrJn4GtZKBGft7szwIpFuICPIeZAOmwpJp0Rf3kc+jsZOl9DYiTB1sku/tQ/tT2ZRERtw4 2V211oI+pBJ4zNNrYHdtdq4VqtR8jHXYg5YOOMCNtLLStFOvPK6TCb6dYlGvFobfrQDNSR 9zT8LbMqrgPEIgRv2KX3UruMMwOkSvyStp1eRKpOuiwvKoMwXFFnnLL/FRItYaRXDb6mvk Ic+06S25SNy8Evy0+KITNJWRsvFzXg/Q8bw1oJivZkjACki985x83/2QPXxKU6KH+xZpUM hK/a8aRk81ufG8EWn39L6wO72zI1Ow2/pZpmtV0goYaSyiK570zza7fL0AK38g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFtMZ0p6mzqlx for ; Wed, 13 May 2026 12:39:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1a621 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 12:39:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 0813dc032547 - main - acpi_spmc(4): In-kernel strdup() cannot fail, remove dead code List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0813dc0325476599841268f405d4bce8b341b2db Auto-Submitted: auto-generated Date: Wed, 13 May 2026 12:39:54 +0000 Message-Id: <6a04711a.1a621.8ae3d91@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=0813dc0325476599841268f405d4bce8b341b2db commit 0813dc0325476599841268f405d4bce8b341b2db Author: Olivier Certner AuthorDate: 2026-05-04 19:41:14 +0000 Commit: Olivier Certner CommitDate: 2026-05-13 12:38:22 +0000 acpi_spmc(4): In-kernel strdup() cannot fail, remove dead code No functional change (intended). Reviewed by: imp, obiwac Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D56814 --- sys/dev/acpica/acpi_spmc.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/sys/dev/acpica/acpi_spmc.c b/sys/dev/acpica/acpi_spmc.c index fde803bdd15d..95d802f7688d 100644 --- a/sys/dev/acpica/acpi_spmc.c +++ b/sys/dev/acpica/acpi_spmc.c @@ -508,10 +508,6 @@ acpi_spmc_parse_constraints_intel(struct acpi_spmc_softc *sc, ACPI_OBJECT *objec name_obj = &constraint_obj->Package.Elements[0]; constraint->name = strdup(name_obj->String.Pointer, M_TEMP); - if (constraint->name == NULL) { - acpi_spmc_free_constraints(sc); - return (ENOMEM); - } detail = &constraint_obj->Package.Elements[2]; /* @@ -582,10 +578,6 @@ acpi_spmc_parse_constraints_amd(struct acpi_spmc_softc *sc, ACPI_OBJECT *object) name_obj = &constraint_obj->Package.Elements[1]; constraint->name = strdup(name_obj->String.Pointer, M_TEMP); - if (constraint->name == NULL) { - acpi_spmc_free_constraints(sc); - return (ENOMEM); - } constraint->function_states = constraint_obj->Package.Elements[2].Integer.Value; From nobody Wed May 13 12:39:56 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gFtMc6W5Wz6dLJd for ; Wed, 13 May 2026 12:39: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFtMc34DVz3w7H for ; Wed, 13 May 2026 12:39:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778675996; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pzFOoHPKHH6L2pqCC7wlho1PXqmHvsxeIXjwOLCv6cs=; b=x5qkkz7CuRfWzpUNqWnKTKDEtBEpneQBWbb4kd/Wb2jFg29OSvhgVXhDVXHxRbn2NpYOOT 5clymZFiwvjjrbJrB6fIufI57k7FY/v5LOqiPgrs+6KpjCDAiqx1xYGAfIL7kiNBxP9APq /WVwaytE/1M2KkSShCV5Z673RNkJe6u/DmGgTmNQHS5sKySUuCSZW8mMdl+uei1Z16HAi3 u4jiyp6Clgo762/gv8prLns2I0+k4AdL9VuROeVVEhHpI9wFMW29TSvv68W210Ux1WodtP gBLuIWrNhsQ3PuApcYRFBWqopyw2I7cTwofvrzZqhv7+Dqovv+UA8cS7N6JcgQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778675996; a=rsa-sha256; cv=none; b=vSEkJoXE7qWvlvPJHhg94IXB7Lxpi4FYEprYFqlgPV4kW6l1G8PMBbOVrMuhNrNuSF4cW4 OSN19NW0VbT0200T2zHg1V9RnjmF44Gz+n8h6goo9xIJXE/SWX2ON/Rd0Hk/WpROzfmnEx quKZkIspgi+/usRcHUSN7PtVlIvZGcB9V6afQ5nsRK5TWqpIVYyitSP/0+Lu3V84L7vUI7 nACczHhBEAKfR1IXtGWg7MaxRI1IG944JlLDIBrF5DfD/J9Vex/55nmr3DY9FcOi9/laQd P+TSd5aBcz6HUw4v97INVqZNKc+Lj8ixcXSQRJooVMOb+ATy8jKEtQWeR9O8cQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778675996; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pzFOoHPKHH6L2pqCC7wlho1PXqmHvsxeIXjwOLCv6cs=; b=sKrfZXaRwtaapey7TOyM5VKfhQaoFS0nRgMiLVTnnpa5iRcqkYD2hBitZJeEMEcsNOyuo1 APiwwE+rMW3gXGyShsqO7fCKwQwmLOl/y8jXQ9AWdQ6pVM1WnAhh6YiIduGVI+Yaandt4E drQwOyPW51ltJv00HWgHZ1/XVUpOshtRk+vUmM8QoTXGVs77Ll3k54zG+8bq00kLBCqWLm /9pcdKlr1ZCN5EBE9AMnKu8jYKj7kEHdTFeWc/V7YzJdH2oTVHf9EmW6GqehKYTBsTiM2C C+NfU00ae6Z3PBirToRF7Wim/3WR20rt6orivbOBjB3sxz6c9tPb9BW4jcK/uw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFtMc2LfLzqyR for ; Wed, 13 May 2026 12:39:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 18646 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 12:39:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 5ba100a35cc5 - main - acpi_spmc(4): Global message on constraints parsing failure List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5ba100a35cc5999d86a975fea9383d279f12e177 Auto-Submitted: auto-generated Date: Wed, 13 May 2026 12:39:56 +0000 Message-Id: <6a04711c.18646.5b796bdb@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=5ba100a35cc5999d86a975fea9383d279f12e177 commit 5ba100a35cc5999d86a975fea9383d279f12e177 Author: Olivier Certner AuthorDate: 2026-05-04 19:49:32 +0000 Commit: Olivier Certner CommitDate: 2026-05-13 12:38:23 +0000 acpi_spmc(4): Global message on constraints parsing failure ...in order to indicate to users that power state constraints will not be checked at all. Reviewed by: imp, obiwac Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D56816 --- sys/dev/acpica/acpi_spmc.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/sys/dev/acpica/acpi_spmc.c b/sys/dev/acpica/acpi_spmc.c index 5aed9ad3e5e4..751b4c8f0641 100644 --- a/sys/dev/acpica/acpi_spmc.c +++ b/sys/dev/acpica/acpi_spmc.c @@ -367,6 +367,7 @@ acpi_spmc_attach(device_t dev) struct acpi_spmc_softc *const sc = device_get_softc(dev); const ACPI_HANDLE handle = acpi_get_handle(dev); char buf[32]; + int error; /* * ACPI_ID_PROBE() in acpi_spmc_probe() cannot succeed without a handle. @@ -399,7 +400,12 @@ acpi_spmc_attach(device_t dev) acpi_spmc_dsm_print_functions(sc, dsms[i]); /* Get device constraints. We can only call this once so do this now. */ - acpi_spmc_get_constraints(sc); + error = acpi_spmc_get_constraints(sc); + if (error != 0) + /* acpi_spmc_get_constraints() takes care of cleaning up. */ + device_printf(dev, + "Could not parse power state constraints (%d), " + "will not check for them before suspend\n", error); sc->eh_suspend = EVENTHANDLER_REGISTER(acpi_post_dev_suspend, acpi_spmc_suspend, dev, 0); From nobody Wed May 13 12:39:55 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gFtMb6mhKz6dL5P for ; Wed, 13 May 2026 12:39: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFtMb3lH4z3w0J for ; Wed, 13 May 2026 12:39:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778675995; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6SFC3oa0cRcKm/ZCtjU9bbz6SY67Ij1rol32dV9L8bE=; b=ViPY+p1s7MUVGJeM9jfknVSBVJFZXyMJ89Nkwi9pzB/KNWpMTnbfb4SQXmDZW7fl32utkX pGdVgBkhlpS8r81087MWPfWe26JCcF+mNkCqPn353IE+oEw+h9MGdto4GafXtu07/TDO1+ hwWSY2W+6yij8ehMRZZ8P9UztQZcJNLrl34vk+KmZIdFhJuYYvgL8/VKbZCGBCoGVSmz6L 2U0jxsU6lJqBvYxNZRiXaKcZPCvksYCHs+xXuflyzox+p42I69OABXaPZusdk9oKH95gpo rQbDWSklt6r0c1nf9XovOSsFjRMLAnGR37dWYGskBLP3m4IVmmy23ArCXIC1Gg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778675995; a=rsa-sha256; cv=none; b=vmwdXPigzgmd7BstISkO8x2NTPiKYKDAoQdKTIvMmovytounjs1UalEIQwyofMPncxoeWH HJThjvYixHeL1SzcU4W/esF5tHBLnvoCpMDHxV9cF9MiR5I0KQhxcQ1Io/8zCJkup6GXV+ DoI2JIYmOjTzguJrhLkDyWzNVVhU2aNhyal5o2JIR+lzgo5MK3vNKNI85YPieSJqHpoyW4 s/kK/HtO7yOo+Vrjg7TW6DGkjZ+wjnJzVIw2pV4g9JbzOho0OXqKuAtpdUB965IzIPOKPB 7GQKTvmxl/QqAVOsrejKY/bXrX6/KJRIwe8lwbzJG8hMxhBGQUtDJS2y9mZuFQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778675995; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6SFC3oa0cRcKm/ZCtjU9bbz6SY67Ij1rol32dV9L8bE=; b=E2RKRDMib0ckUvUOFNn1mGjT/IA+3l79YsgXmdCNNfh0Uxl+lPKwXekfmmeLRCPAf5Cx8T bfvOYwxcPRL3PuPmyEqUteAeftTRfKLboiOasxIZBx44a65+a8CbBoEKvgcbACUMBTa35O lNhWGdMtRc4DMDknvcMga6x+oVSHsoapuqQddmVVg5CQao1KcSystr4Ldj0oEGJlUOguiy AvQY6QE2gVDM8FSb2f0tkYcGRbmO6aY0pZ9F0pkwnH2f9qwc5Yv3X8s1RTNDUTxP5OVBIN S8zu09SyVhqa1ZkG1H1G7skDkSjudM+yD7eDGDrRL1pKxo6CRbSXKfn5p2ZDvA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFtMb1cCdzr6R for ; Wed, 13 May 2026 12:39:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c0ef by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 12:39:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: ee13d62417f2 - main - acpi_spmc(4): Constraint parsing: Clearer error messages List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ee13d62417f28ee22331ab81ecac2ed3457ea1e1 Auto-Submitted: auto-generated Date: Wed, 13 May 2026 12:39:55 +0000 Message-Id: <6a04711b.1c0ef.41b2638c@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=ee13d62417f28ee22331ab81ecac2ed3457ea1e1 commit ee13d62417f28ee22331ab81ecac2ed3457ea1e1 Author: Olivier Certner AuthorDate: 2026-05-04 19:42:40 +0000 Commit: Olivier Certner CommitDate: 2026-05-13 12:38:23 +0000 acpi_spmc(4): Constraint parsing: Clearer error messages Reviewed by: imp, obiwac Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D56815 --- sys/dev/acpica/acpi_spmc.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/sys/dev/acpica/acpi_spmc.c b/sys/dev/acpica/acpi_spmc.c index 95d802f7688d..5aed9ad3e5e4 100644 --- a/sys/dev/acpica/acpi_spmc.c +++ b/sys/dev/acpica/acpi_spmc.c @@ -516,8 +516,8 @@ acpi_spmc_parse_constraints_intel(struct acpi_spmc_softc *sc, ACPI_OBJECT *objec */ revision = detail->Package.Elements[0].Integer.Value; if (revision != 0) { - device_printf(sc->dev, "Unknown revision %d for " - "device constraint detail package\n", revision); + device_printf(sc->dev, "Intel: Unknown revision %d for " + "constraint %zu's detail package\n", revision, i); sc->constraint_count--; continue; } @@ -553,7 +553,8 @@ acpi_spmc_parse_constraints_amd(struct acpi_spmc_softc *sc, ACPI_OBJECT *object) constraints = &object->Package.Elements[2]; if (constraints->Package.Count != constraint_count) { - device_printf(sc->dev, "constraint count mismatch (%d to %zu)\n", + device_printf(sc->dev, + "AMD: Constraints: Count mismatch (%d to %zu)\n", constraints->Package.Count, constraint_count); return (ENXIO); } @@ -566,7 +567,8 @@ acpi_spmc_parse_constraints_amd(struct acpi_spmc_softc *sc, ACPI_OBJECT *object) /* Parse the constraint package. */ constraint_obj = &constraints->Package.Elements[i]; if (constraint_obj->Package.Count != 4) { - device_printf(sc->dev, "constraint %zu has %d elements\n", + device_printf(sc->dev, + "AMD: Constraint %zu has %d elements, not 4\n", i, constraint_obj->Package.Count); acpi_spmc_free_constraints(sc); return (ENXIO); From nobody Wed May 13 12:39:58 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gFtMf5hjNz6dL5f for ; Wed, 13 May 2026 12:39: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFtMf43nqz3vvF for ; Wed, 13 May 2026 12:39:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778675998; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mqXiqwsMcgtRt+ohdZbTvxWvNOu1PoLjIowie72xpZ0=; b=IHVaNfOmhVO+cKT3NfLub8Ax0hmNhIOYrnnge8kE+b9U24LUaeW4/S2Wg7wgU0zlkF2tA+ Bz9uEymjyAUi7K1RedNG9mKt600pwJA/17OQlfU45VgKUYf6tF/0siEicb17VTHeww+9ho G4ke5fysOorevkVl/XYOFDdSfCDwBPJujUZcb0J/1QmYIt81d/ZXRypdFTYM6ZJ5JCHrv4 AI6jzMqlmLs6GMnlg4EJcHuruj6cMrC2Y/QFwwjUHNlVTuli9zsW4q+GJkyWdrUVJiETKu br71EhuXd06A9LWLKveyX3AxrAKqpS9gVR3Ef4hJVNeEpODCwXQAhcbk6pTnBA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778675998; a=rsa-sha256; cv=none; b=kT+SIWcpOYmIzXjtQiltN9pMsBFGzFUhZvJTOQJ8RANQWXPz48boUwdQvEtDz5siRQ5cvA t4IY+RCbS9EdL0e9tQsm/FyewbU+ocvbRHmy2NC4wc2yY5kpCZg3OC/SbAvgYdD8GRXZyl Ha79EZ1vewlghE7+UiPhsLfhISX5izLWQ3ScYtDRWrABFf+jInpTVlzBZJoLYDk8WdsTPR Ea3nOU4MWKA9CtgDde1SLdiyyDTI0+SDGyBuceiR7jLZnp1x2xPK/ZXxWkVYPwvjKQ58uQ aLhyzYcQr3AjGAGL9N+qkZHUBWpE7U+96KZaHix/kns/KnMgGhh8VWK0Z8auVg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778675998; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mqXiqwsMcgtRt+ohdZbTvxWvNOu1PoLjIowie72xpZ0=; b=eO1Ddg2K9EjtFf1iOiWlZ/+QNCIYW3j/M4sf35390vAc0Ewks+h02cU+44+70otoQZKxiB VvdIWpXo6qbfxTmxNBNHzWa/DxDBzeNx8s/jL6CJiu0QRdZCxSdo/OodVpCm2Jzl1BHfIl nLaiEIwNtNyOTEUf04L3G/OhWZiQ17zKdKoIpC7QMIqCIflnIjeTPrVTdenVCj9q72lbgq I+QoonjYg5zi0HuBmXK5Rrf6YPvfqjTHy1R4RGZIQfrHirtNZuv9oFiVSmJaMwR58CUbhw QQ2v7h152ahEuS0O0qsVXlv8j8tD2MGZY2Deg0giCPEG0KPn7m9+GzZE8PP0GQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFtMf3d0Zzqly for ; Wed, 13 May 2026 12:39:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1bd10 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 12:39:58 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: f56201cee3e8 - main - acpi_spmc(4): acpi_spmc_probe_dsm(): Remove passing superfluous handle List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f56201cee3e8f90dd17ec287b43997983d23fdfe Auto-Submitted: auto-generated Date: Wed, 13 May 2026 12:39:58 +0000 Message-Id: <6a04711e.1bd10.15cdbec1@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=f56201cee3e8f90dd17ec287b43997983d23fdfe commit f56201cee3e8f90dd17ec287b43997983d23fdfe Author: Olivier Certner AuthorDate: 2026-05-04 20:21:41 +0000 Commit: Olivier Certner CommitDate: 2026-05-13 12:38:24 +0000 acpi_spmc(4): acpi_spmc_probe_dsm(): Remove passing superfluous handle The handle is already held by the softc, which is also passed. No functional change (intended). Reviewed by: imp, obiwac Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D56818 --- sys/dev/acpica/acpi_spmc.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/dev/acpica/acpi_spmc.c b/sys/dev/acpica/acpi_spmc.c index b12723a14bee..96050705c5e5 100644 --- a/sys/dev/acpica/acpi_spmc.c +++ b/sys/dev/acpica/acpi_spmc.c @@ -332,8 +332,8 @@ failed_to_call_dsm(const struct acpi_spmc_softc *const sc, dsm->name, dsm->revision, dsm_function_name(dsm, function_index)); } -static void acpi_spmc_probe_dsm(struct acpi_spmc_softc *sc, - ACPI_HANDLE handle, const struct dsm_desc *const dsm); +static void acpi_spmc_probe_dsm(struct acpi_spmc_softc *const sc, + const struct dsm_desc *const dsm); static void acpi_spmc_dsm_print_functions( const struct acpi_spmc_softc *const sc, const struct dsm_desc *const dsm); @@ -382,7 +382,7 @@ acpi_spmc_attach(device_t dev) ("%s: Inconsistent indices for DSM %s", __func__, dsms[i]->name)); - acpi_spmc_probe_dsm(sc, handle, dsms[i]); + acpi_spmc_probe_dsm(sc, dsms[i]); } if (sc->dsms == 0) { @@ -460,10 +460,10 @@ acpi_spmc_dsm_print_functions(const struct acpi_spmc_softc *const sc, } static void -acpi_spmc_probe_dsm(struct acpi_spmc_softc *sc, ACPI_HANDLE handle, +acpi_spmc_probe_dsm(struct acpi_spmc_softc *const sc, const struct dsm_desc *const dsm) { - const uint64_t supported_functions = acpi_DSMQuery(handle, + const uint64_t supported_functions = acpi_DSMQuery(sc->handle, (const uint8_t *)&dsm->uuid, dsm->revision); /* From nobody Wed May 13 12:39:57 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gFtMd4gVHz6dLPJ for ; Wed, 13 May 2026 12:39: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFtMd3WTXz3w2h for ; Wed, 13 May 2026 12:39:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778675997; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fHV8ETbufWdOHS7LbbCeNVmSNPoIYovMkYDZNUWUCyg=; b=n141Y9fsuGWoVrQvkYLoo5OPp3fd0ncFfeUpv7u6EwJKWJQrBEaS1ODxLCYd+h5m/YfDUT SmcvP6gb1uwgPvkvh2zg2qvj6/2PToc1JtPeKkWwaLyTIFZfvbYkdrABcNcB2SV91rhDwP MvpM6RbwKUQgFdSOyWSf46ukV5LLObAbTa6Qf5Tyd/EXns1xHPLMPi+D7Qcuka+oPqVCOB 9o+1mnif5VTByzKWnV14MiEeiS7/xI+1phjP5OBU4RkkVWjLvYGnzJOb/JGm1GTS+7Db6R 5F7+rT/Pgg57ZZOlIoglYxSI3tUQHPZy6MrwyeGOA3/CFULOw9YTu3Q+heQfhQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778675997; a=rsa-sha256; cv=none; b=r3zJA+XQJzK628vR8olQhupI7iWWTg2/J42vf7Rqsp5NT2wkPqzaGT88f4bhnZGS7EKNh9 2Kz5Q/mbEX0IAymz8RK1r3Ndarnz9L36SRQ+37/bcWB8YYFMHhC1JNqEbjbuajUWtXRjKU 1YfbZzWgpnL7MH/GG+QSNXfBFjMQ6kjEwZxpt+dmYTvJAeLy1CDYiSOCGyuuChgcJcpC3e aPlqwAGCtlNah3a9F4Cz6vjlbMokqtMmczaL2xnJ1USKL4aSBYJa7hLj0NhYMFTDB1ilyU U64NU6xDC3Lu5Hua1WOxGELQc3jo0hzSq1/omEpWlAFKdv6mc020Pzq877tbBA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778675997; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fHV8ETbufWdOHS7LbbCeNVmSNPoIYovMkYDZNUWUCyg=; b=uPPw3uXODBsxrvGmhMDBNC8FJ6JVu0SXjqzTqnQEEr8GQAkcbRz8sdYzN95sj6HSo8bH27 bD4FmwkrPeH0AUdNi1A05SRgoM6tHd0i79vqDsHfSrmR+g8C67ou6tQiNgkNN/TnTaozjH BP8zxJ0RxWPoNTWtpZyyh8AmfmzhV6WELU22xkM8vWz6chSEwb3VAGVYqCAKAoZ0yrAwUW 0jmte79xJ/GtaVVNN+2K0txstDGof34WhUJNI2XV3su9+TNj/vadnHjDMLhnqSJbclnzq0 iHfk2JAnjWN3lbSwn9urNLwEASPIaPSMjYeEbRScuvRhtvRAQWWU9KmBlLL/Yg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFtMd37FdzqyS for ; Wed, 13 May 2026 12:39:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1bd0a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 12:39:57 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 310cbb8924fa - main - acpi_spmc(4): Enable multiple instances List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 310cbb8924fa8f0ace9c5f555cf74b7c1e4396a2 Auto-Submitted: auto-generated Date: Wed, 13 May 2026 12:39:57 +0000 Message-Id: <6a04711d.1bd0a.2145462d@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=310cbb8924fa8f0ace9c5f555cf74b7c1e4396a2 commit 310cbb8924fa8f0ace9c5f555cf74b7c1e4396a2 Author: Olivier Certner AuthorDate: 2026-05-04 20:19:40 +0000 Commit: Olivier Certner CommitDate: 2026-05-13 12:38:23 +0000 acpi_spmc(4): Enable multiple instances Support the (so far hypothetical) case of a machine with multiple instances of the PNP0D80 device (e.g., if multiple DSMs are not implemented on the same device), by allowing multiple instances of the device to co-exist. This is achieved by moving 'supported_functions' from 'struct dsm' into the softc, so each instance has its own view of which functions are supported. Consequently, the check on the instance unit on probe can be removed. Reviewed by: imp (older version), obiwac Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D56817 --- sys/dev/acpica/acpi_spmc.c | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/sys/dev/acpica/acpi_spmc.c b/sys/dev/acpica/acpi_spmc.c index 751b4c8f0641..b12723a14bee 100644 --- a/sys/dev/acpica/acpi_spmc.c +++ b/sys/dev/acpica/acpi_spmc.c @@ -74,7 +74,6 @@ struct dsm_desc { */ int revision; struct uuid uuid; - uint64_t supported_functions; uint64_t expected_functions; uint64_t extra_functions; /* Human-friendly names of known functions. */ @@ -129,7 +128,7 @@ static const char *const dsm_ms_function_names[] = { [DSM_MS_TURN_ON_DISPLAY] = "TURN_ON", }; -static struct dsm_desc dsm_ms = { +static const struct dsm_desc dsm_ms = { .index = DSM_MS, .name = "Microsoft", .uuid = { /* 11e00d56-ce64-47ce-837b-1f898f9aa461 */ @@ -185,7 +184,7 @@ static struct dsm_desc dsm_amd = { .function_names_nb = nitems(dsm_amd_function_names), }; -static struct dsm_desc *const dsms[] = { +static const struct dsm_desc *const dsms[] = { [DSM_INTEL] = &dsm_intel, [DSM_MS] = &dsm_ms, [DSM_AMD] = &dsm_amd, @@ -219,6 +218,7 @@ struct acpi_spmc_softc { device_t dev; ACPI_HANDLE handle; int dsms; + uint64_t supported_functions[nitems(dsms)]; struct eventhandler_entry *eh_suspend; struct eventhandler_entry *eh_resume; @@ -239,9 +239,13 @@ resolve_dsm(int dsm_index) } static bool -supports_function(const struct dsm_desc *const dsm, const int function_index) +supports_function(const struct acpi_spmc_softc *const sc, const int dsm_index, + const int function_index) { - return ((dsm->supported_functions & IDX_TO_BIT(function_index)) != 0); + MPASS(0 <= dsm_index && dsm_index < nitems(sc->supported_functions)); + + return ((sc->supported_functions[dsm_index] & + IDX_TO_BIT(function_index)) != 0); } static bool @@ -329,7 +333,7 @@ failed_to_call_dsm(const struct acpi_spmc_softc *const sc, } static void acpi_spmc_probe_dsm(struct acpi_spmc_softc *sc, - ACPI_HANDLE handle, struct dsm_desc *const dsm); + ACPI_HANDLE handle, const struct dsm_desc *const dsm); static void acpi_spmc_dsm_print_functions( const struct acpi_spmc_softc *const sc, const struct dsm_desc *const dsm); @@ -351,11 +355,6 @@ acpi_spmc_probe(device_t dev) if (ACPI_ID_PROBE(device_get_parent(dev), dev, spmc_ids, &name) > 0) return (ENXIO); - if (device_get_unit(dev) > 0) { - device_printf(dev, "shouldn't have more than one SPMC"); - return (ENXIO); - } - device_set_desc(dev, "System Power Management Controller"); return (BUS_PROBE_DEFAULT); @@ -431,16 +430,17 @@ static void acpi_spmc_dsm_print_functions(const struct acpi_spmc_softc *const sc, const struct dsm_desc *const dsm) { - const uint64_t missing = dsm->expected_functions & - ~dsm->supported_functions; - const uint64_t unknown = dsm->supported_functions & + const uint64_t supported_functions = + sc->supported_functions[dsm->index]; + const uint64_t missing = dsm->expected_functions & ~supported_functions; + const uint64_t unknown = supported_functions & ~(dsm->expected_functions | dsm->extra_functions); char buf[128]; - print_bit_field(buf, sizeof(buf), dsm->supported_functions, + print_bit_field(buf, sizeof(buf), supported_functions, "FUNC", pbf_function_name, dsm); device_printf(sc->dev, "DSM %s: Supported functions: %#" PRIx64 "%s\n", - dsm->name, dsm->supported_functions, buf); + dsm->name, supported_functions, buf); if (missing != 0) { print_bit_field(buf, sizeof(buf), missing, "FUNC", @@ -461,17 +461,17 @@ acpi_spmc_dsm_print_functions(const struct acpi_spmc_softc *const sc, static void acpi_spmc_probe_dsm(struct acpi_spmc_softc *sc, ACPI_HANDLE handle, - struct dsm_desc *const dsm) + const struct dsm_desc *const dsm) { const uint64_t supported_functions = acpi_DSMQuery(handle, - (uint8_t *)&dsm->uuid, dsm->revision); + (const uint8_t *)&dsm->uuid, dsm->revision); /* * DSM is supported if bit 0 is set. */ if ((supported_functions & 1) == 0) return; - dsm->supported_functions = supported_functions & ~1; + sc->supported_functions[dsm->index] = supported_functions & ~1; sc->dsms |= IDX_TO_BIT(dsm->index); } @@ -798,7 +798,7 @@ acpi_spmc_exit_notif(device_t dev) acpi_spmc_run_dsm(dev, &dsm_amd, DSM_AMD_LPI_EXIT_NOTIF); if (has_dsm(sc, DSM_MS)) { acpi_spmc_run_dsm(dev, &dsm_ms, DSM_INTEL_MS_LPI_EXIT_NOTIF); - if (supports_function(&dsm_ms, DSM_MS_TURN_ON_DISPLAY)) + if (supports_function(sc, DSM_MS, DSM_MS_TURN_ON_DISPLAY)) acpi_spmc_run_dsm(dev, &dsm_ms, DSM_MS_TURN_ON_DISPLAY); acpi_spmc_run_dsm(dev, &dsm_ms, DSM_MS_SLEEP_EXIT_NOTIF); From nobody Wed May 13 12:39:59 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gFtMg71r3z6dLM6 for ; Wed, 13 May 2026 12:39: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFtMg4qNSz3wCf for ; Wed, 13 May 2026 12:39:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778675999; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cu31TaVMLIdz5M6lHVkS7BzJ84YxxCpaeW3E0WQS4ts=; b=jo8lJkCKIusv8eHinwUddNpYWGT88+fC34ofsITN/MxEt18Q23fR674bjLnTIzG2RKiE6v WqJdBhiZz+MROe0hjg97tsPReqvoWjz0i+cXRC8C8vuociNWcj3MOeau028kOTVMMXqa2N Ox4luopzLL3TtmJQj+/tFoTo3REXdkzxYHix+jelyQQOTG9BkRgmAxGdb5DLqNMYaRe2sU YeI7v3R/5qUeKW5dNDVmM9jf9bJe19I6HrjBFxObZtyocQ29ADxL85oYP6/s+jmV3UZS72 RXw2c+9wqX9lS2B1KPoPd/teok0iAR2dg/Bwv2sJYvJhaFu77nf17Y2+1Oh+0w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778675999; a=rsa-sha256; cv=none; b=euhM4ebDB2RAsc+3lJGwGip65eB5GNRU6i8oSLV5WAnpSDh5p9AoKvMU/i2iJtqIJh0HyK e6L5kprOQS62pPcqdCG56ukvcMm+IVqp6T1kwl41fchGU8At1kUB2rxaVqsvqO/0E3T/Kl h4AnE7XOgPpIzCUJf4otcL1UrTwuTnQS5Dnfh/Q+JWiC7t5g/9h1AePoBhHG2lsCN2+bB+ /dieIJDpy3h2kad2W2rsonMEr4/pMRbwTblWqPZmD5n5EFKkT3Ad4uBg5g2yRvLCT5HjG4 h0fqBz+d5/v6Z8UVmcahoC0ZtWN3H3xZlXHtCS4aVHTrJu8hsT/y4lkVbViw+A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778675999; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cu31TaVMLIdz5M6lHVkS7BzJ84YxxCpaeW3E0WQS4ts=; b=mkB+TS/8D+VnjUg2an3ythIGDLZD7ahJ8G/GKwxRyjMgLSsuSapJjwXK3qHKeXmvkE4JzV Cf188tGE+cqOnYgk3qqlAAmoU5MXZsu+JDZZsJkM7ghZW37uuS1gQQx6pBBUziUUmmKVTS AoxAb6qhqnbz1S3IA5rbL4jV9qRjplztzhei2LIh5f2KSlt7DVoaPV+PDV/ek+SkSdpX0a NHiOtdYUeDMSkK2tYilHzi/3SDiR58haj6ckmLpGX1pb5KYV6aQ5OZIA6/xdYEML5wwwAp z3l0cWQD8dhYja7PU00BNKfnfHmC0j9RJoawlOWInwIdTBTCnFWPkqSuvJ9Qzw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFtMg4Q7Tzr6T for ; Wed, 13 May 2026 12:39:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 18ee5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 12:39:59 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 37c59fdc3b4d - main - acpi_spmc(4): Add a sysctl knob to request verbosity List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 37c59fdc3b4d25304982a4d39931da5c2ec4c2e6 Auto-Submitted: auto-generated Date: Wed, 13 May 2026 12:39:59 +0000 Message-Id: <6a04711f.18ee5.3ee731fe@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=37c59fdc3b4d25304982a4d39931da5c2ec4c2e6 commit 37c59fdc3b4d25304982a4d39931da5c2ec4c2e6 Author: Olivier Certner AuthorDate: 2026-05-07 15:59:37 +0000 Commit: Olivier Certner CommitDate: 2026-05-13 12:38:24 +0000 acpi_spmc(4): Add a sysctl knob to request verbosity The driver will be more verbose on this knob being non-zero or 'bootverbose' being set. The corresponding variable is typed as an integer to leave room for expansion. To be used in subsequent commits. Reviewed by: obiwac Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D56875 --- sys/dev/acpica/acpi_spmc.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sys/dev/acpica/acpi_spmc.c b/sys/dev/acpica/acpi_spmc.c index 96050705c5e5..d67ac2770f7e 100644 --- a/sys/dev/acpica/acpi_spmc.c +++ b/sys/dev/acpica/acpi_spmc.c @@ -200,6 +200,12 @@ SYSCTL_INT(_debug_acpi_spmc, OID_AUTO, intel_dsm_revision, CTLFLAG_RW, SYSCTL_INT(_debug_acpi_spmc, OID_AUTO, amd_dsm_revision, CTLFLAG_RW, &dsm_amd.revision, 0, "Revision to use when evaluating AMD SPMC DSMs"); +static int verbose; +SYSCTL_INT(_debug_acpi_spmc, OID_AUTO, verbose, CTLFLAG_RW, + &verbose, 0, "acpi_spmc(4) verbosity"); + +#define VERBOSE() (verbose || bootverbose) + struct acpi_spmc_constraint { bool enabled; char *name; From nobody Wed May 13 12:40:00 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gFtMj1v5tz6dLPV for ; Wed, 13 May 2026 12:40: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFtMh5T1pz3w60 for ; Wed, 13 May 2026 12:40:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778676000; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+nNHoX3QxvgPNSRcw54T7d6M64JyHefePEHHSDdJ7/w=; b=EEXnQ4j6BaWX/hG9D75SqwwZj+MWkXjQBiNOOZ9Ra6zFPJ4KcmOciWhbyoD0eLql97ISUv oGihF6zT+D/KLFCqnTKPB3PZN0tTnC2m+vetqN9YwsXJPKKyZM8Mc3w8R+O7PIQNBWhglp DMuWm5w+1Wor7iktwOdEnL89BoFVO9KGR2l0L5TPc8l8h4E5zsRaza/3+L3liddHMVt0FC 5uRd+5B8vc+ehdjsnMnUk6ovLMuri7PRFUN+/BFmT11qeqOK1JqWBKlbXZ8U436PTCvmxu Oa/6Ne61I8UTFwCqEvE2nsPZELkucu4PFb1K4A18gTtj1QohojBiZMUf8adiVA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778676000; a=rsa-sha256; cv=none; b=EYoAWqSELY8HcX8ziSKpE5j298c5hA2T80iiryncxu0TO5yTxGo4wEsyGqvmcRwR5oKrJp 7Vnp1f4PiFgLoe8MIjwG5BZkNit11CP96UhSLzqICUa2dOoErFAizQ+E6pDA+RGjvBO7pa uxBBikROl+3/GcQff1csWG2MyniZHsEV8Y19GJ1/SgBXnpCd6Wvp2zTqTd8CmLBOT+rk4H aPZ2vTt82uQ24EUx3Oxb8eYrIA4b7Def7HttBIzjnojecSggdGb8RjKTGAFCG5duQrog2m er5qaUa4tuvoS8XvzUmG7HcY2MyOWwE4U0B8GObj7/rHt9w2ijqWTOMspue9AA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778676000; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+nNHoX3QxvgPNSRcw54T7d6M64JyHefePEHHSDdJ7/w=; b=Zwj9lFN9XKV96GUAbjK2zlV+/4zKXXTK961swmTuPM8YYA8CGv5ygF/8uEKhtozblovv6V z1E3L4pLWPSzNRcP9l0IYG1ainY5pI8QZtBkKRjyKOcvYDO5yWZx9JVoDHqtiU6XHBQGFS L2r7F5MmMLptAz4qqne3oL4Mlvw4h2+xdgW/IqyA8dtF+eKBoi7dbA5sA/NZ/SPWXLzQF8 hSDNVb9RQ1NtE67L8TK6k+Bb+fuI1cjuNI7p5u91Krh8nbzRErYPjQEgqZkrGsna1ViVMQ mCSD2NftiWEOEMgHpqdeJ+yNwI8roaptG07lDBcRldAkfxVTlUMNu3ninXfIwg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFtMh4lTLzr27 for ; Wed, 13 May 2026 12:40:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c68a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 12:40:00 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 6da01f06ef79 - main - acpi_spmc(4): Be less verbose by default List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6da01f06ef7964f8a58369e7d1605ce10a49b82c Auto-Submitted: auto-generated Date: Wed, 13 May 2026 12:40:00 +0000 Message-Id: <6a047120.1c68a.31982544@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=6da01f06ef7964f8a58369e7d1605ce10a49b82c commit 6da01f06ef7964f8a58369e7d1605ce10a49b82c Author: Olivier Certner AuthorDate: 2026-05-05 12:36:57 +0000 Commit: Olivier Certner CommitDate: 2026-05-13 12:38:24 +0000 acpi_spmc(4): Be less verbose by default Do not print by default details of failures that are unlikely to help a normal user and to have a crucial influence on whether suspension works correctly. Do so only on a verbose boot or if requested explicitly by the user via 'debug.acpi.spmc.verbose'. In particular: - On an Intel Framework laptop, the Microsoft DSM only reports the SLEEP_ENTRY and SLEEP_EXIT functions. That makes some sense since, according to its specification, all functions of a Microsoft DSM except these two are in fact redundant with Intel DSM's ones (also, that of AMD DSM's ones). Those functions being missing are only a potential problem if there is no other DSM than Microsoft's (yet to be observed in the field). - The details of malformed/unapplicable constraints or ones with a newer format the driver does not know about are not readily actionable pieces of information, but rather debug/developer-oriented ones. When verbosity is not requested, only print the details of the first such failure to encourage reporting and at the same time avoid cluttering the output. - Detecting and printing unknown DSM functions is not directly actionable either, and the driver not using these functions may not prevent suspending (but might, e.g., prevent reaching deeper sleep states). Reviewed by: obiwac Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D56876 --- sys/dev/acpica/acpi_spmc.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/sys/dev/acpica/acpi_spmc.c b/sys/dev/acpica/acpi_spmc.c index d67ac2770f7e..1ce4401ebcf4 100644 --- a/sys/dev/acpica/acpi_spmc.c +++ b/sys/dev/acpica/acpi_spmc.c @@ -448,7 +448,7 @@ acpi_spmc_dsm_print_functions(const struct acpi_spmc_softc *const sc, device_printf(sc->dev, "DSM %s: Supported functions: %#" PRIx64 "%s\n", dsm->name, supported_functions, buf); - if (missing != 0) { + if (VERBOSE() && missing != 0) { print_bit_field(buf, sizeof(buf), missing, "FUNC", pbf_function_name, dsm); device_printf(sc->dev, "DSM %s: Does not enumerate expected " @@ -456,7 +456,7 @@ acpi_spmc_dsm_print_functions(const struct acpi_spmc_softc *const sc, dsm->name, missing, buf); } - if (unknown != 0) { + if (VERBOSE() && unknown != 0) { print_bit_field(buf, sizeof(buf), unknown, "FUNC", pbf_function_name, dsm); device_printf(sc->dev, "DSM %s: Supports more functions than " @@ -528,8 +528,13 @@ acpi_spmc_parse_constraints_intel(struct acpi_spmc_softc *sc, ACPI_OBJECT *objec */ revision = detail->Package.Elements[0].Integer.Value; if (revision != 0) { - device_printf(sc->dev, "Intel: Unknown revision %d for " - "constraint %zu's detail package\n", revision, i); + /* Only print this error message once if not verbose. */ + if (VERBOSE() || sc->constraint_count == + object->Package.Count) + device_printf(sc->dev, + "Intel: Unknown revision %d for " + "constraint %zu's detail package\n", + revision, i); sc->constraint_count--; continue; } @@ -661,9 +666,11 @@ acpi_spmc_get_constraints(struct acpi_spmc_softc *const sc) status = acpi_GetHandleInScope(sc->handle, __DECONST(char *, constraint->name), &constraint->handle); if (ACPI_FAILURE(status)) { - device_printf(sc->dev, - "Constraints: Cannot get handle for %s, ignoring\n", - constraint->name); + if (VERBOSE()) + device_printf(sc->dev, + "Constraints: Cannot get handle for %s, " + "ignoring\n", + constraint->name); constraint->handle = NULL; } } From nobody Wed May 13 12:40:01 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gFtMk1Mskz6dLPZ for ; Wed, 13 May 2026 12:40: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFtMj5qRmz3w9c for ; Wed, 13 May 2026 12:40:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778676001; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C2IrRUvpk0XEAq5J/OgHTuxfQbrsxL/MG4bo2pWeBvw=; b=lC+wWektVLPRoFcc0qLUhGTT0JmlX7XzfPsZjK6XAOSvrGfCMFtv9DJcSolGc+6cVI/ZIv +UPGcdzhF24se/pKfHdicAIaLYvEx/GPqGk1yDznt2eu8po0pjQw1aOYNeNAtRpWyX4Hp6 fAkbc1W2bQ6BW0aTe3kosflle6GzANNAPwW7uuZsigQ1a9RuV5A8bX6R0jpt1nrjCh/Fdx zo4P05TR1dZwpVQHysdXWUqdrckib7thcqs7b92i6RAVUcKEbfXQz15lBxudVDXPnReCI4 QqhioBGhAPj283BdiR0L5GNvXEPqfpg2i8Ng71i+Re7+NoT2gP4EntPeniVc0g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778676001; a=rsa-sha256; cv=none; b=l8cQKPkoI8l+HDgx/nsVUlUlvA8eKfExpXBG64KKq4jsfnNyDC/QvpMMweJXGptf0H/f6g WGlliiNA8V1tV7wfn8emcrT+GVgVcwo4yexMl0Rmydf9tR5J/JjOLVylUHhA8m/Fifyt31 hxFTsWpS4OTFwDRwtw296lBB4guxcmqW0XwrlSmYEV1o9X5EE9/lj6wGsEL+5QZ7k/wCF9 4UE6PcKVWa2EPwTjEuxhW0sl5bHbr86bhpyv8ScDElBdg6GxvBwvdSGua3utQK/yoxJpsP dO8NBYBY/ER/b8rtVFA+BQEfrCw6iy+S3cDdp0SkEz1EK8+Bh0H4cSTCjQ5Rxg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778676001; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C2IrRUvpk0XEAq5J/OgHTuxfQbrsxL/MG4bo2pWeBvw=; b=wTB6sIDdKbJ9umJC2Dwac6zHR6ChcY8RaAIRl/RhzhPkYI654UTbF514JOXp4IxtHfcNYS B15jqlNjNro3cB5YRtOElJtahOBxTNOPlr7GvjcL9FPat6dayDuBR9VRK3uXboBNpcYvfT 6+rN6MxVtHNQzO6CYmph3hZA4AJZPoHGHgAvx+uUu2hNyxLWQ83BL4NzO1Ak38CbcFFytb bCxUOVFQaNJEv/siJYGaPfpTpKvfxOd6eGYkV11kPNNatXK4k7CFP5+NHFCir6rWcMmYrX 8zxZdZxZsQghjDdfbgKUmP09J5rECtNDHN1xFuJzNSNtsP5gUkuD5Su39txQEQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFtMj58KBzqyX for ; Wed, 13 May 2026 12:40:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 196fb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 12:40:01 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: d765d209c3dc - main - acpi_spmc(4): acpi_spmc_run_dsm(): Rename, rename parameters, constify List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d765d209c3dc5d1eca781cab97c8579969b1e7d5 Auto-Submitted: auto-generated Date: Wed, 13 May 2026 12:40:01 +0000 Message-Id: <6a047121.196fb.7554a77d@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=d765d209c3dc5d1eca781cab97c8579969b1e7d5 commit d765d209c3dc5d1eca781cab97c8579969b1e7d5 Author: Olivier Certner AuthorDate: 2026-05-06 12:02:25 +0000 Commit: Olivier Certner CommitDate: 2026-05-13 12:38:24 +0000 acpi_spmc(4): acpi_spmc_run_dsm(): Rename, rename parameters, constify This function actually runs a function of a given DSM. Remove the '_dsm' suffix to remove the inaccuracy and make things simpler. Reviewed by: obiwac Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D56877 --- sys/dev/acpica/acpi_spmc.c | 46 +++++++++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 21 deletions(-) diff --git a/sys/dev/acpica/acpi_spmc.c b/sys/dev/acpica/acpi_spmc.c index 1ce4401ebcf4..b2da99864581 100644 --- a/sys/dev/acpica/acpi_spmc.c +++ b/sys/dev/acpica/acpi_spmc.c @@ -727,14 +727,18 @@ acpi_spmc_check_constraints(struct acpi_spmc_softc *sc) #endif } +/* + * Run a single DSM function. + * + * Discards the result, but prints a message on error. + */ static void -acpi_spmc_run_dsm(device_t dev, const struct dsm_desc *dsm, int function_index) +acpi_spmc_run(device_t dev, const struct dsm_desc *const dsm, + const int function_index) { - struct acpi_spmc_softc *sc; - ACPI_STATUS status; - ACPI_BUFFER result; - - sc = device_get_softc(dev); + const struct acpi_spmc_softc *const sc = device_get_softc(dev); + ACPI_STATUS status; + ACPI_BUFFER result; status = acpi_EvaluateDSMTyped(sc->handle, (const uint8_t *)&dsm->uuid, dsm->revision, function_index, NULL, &result, ACPI_TYPE_ANY); @@ -758,13 +762,13 @@ acpi_spmc_display_off_notif(device_t dev) struct acpi_spmc_softc *sc = device_get_softc(dev); if (has_dsm(sc, DSM_INTEL)) - acpi_spmc_run_dsm(dev, &dsm_intel, + acpi_spmc_run(dev, &dsm_intel, DSM_INTEL_MS_DISPLAY_OFF_NOTIF); if (has_dsm(sc, DSM_MS)) - acpi_spmc_run_dsm(dev, &dsm_ms, + acpi_spmc_run(dev, &dsm_ms, DSM_INTEL_MS_DISPLAY_OFF_NOTIF); if (has_dsm(sc, DSM_AMD)) - acpi_spmc_run_dsm(dev, &dsm_amd, DSM_AMD_DISPLAY_OFF_NOTIF); + acpi_spmc_run(dev, &dsm_amd, DSM_AMD_DISPLAY_OFF_NOTIF); } static void @@ -773,13 +777,13 @@ acpi_spmc_display_on_notif(device_t dev) struct acpi_spmc_softc *sc = device_get_softc(dev); if (has_dsm(sc, DSM_INTEL)) - acpi_spmc_run_dsm(dev, &dsm_intel, + acpi_spmc_run(dev, &dsm_intel, DSM_INTEL_MS_DISPLAY_ON_NOTIF); if (has_dsm(sc, DSM_MS)) - acpi_spmc_run_dsm(dev, &dsm_ms, + acpi_spmc_run(dev, &dsm_ms, DSM_INTEL_MS_DISPLAY_ON_NOTIF); if (has_dsm(sc, DSM_AMD)) - acpi_spmc_run_dsm(dev, &dsm_amd, DSM_AMD_DISPLAY_ON_NOTIF); + acpi_spmc_run(dev, &dsm_amd, DSM_AMD_DISPLAY_ON_NOTIF); } static void @@ -790,13 +794,13 @@ acpi_spmc_entry_notif(device_t dev) acpi_spmc_check_constraints(sc); if (has_dsm(sc, DSM_AMD)) - acpi_spmc_run_dsm(dev, &dsm_amd, DSM_AMD_LPI_ENTRY_NOTIF); + acpi_spmc_run(dev, &dsm_amd, DSM_AMD_LPI_ENTRY_NOTIF); if (has_dsm(sc, DSM_MS)) { - acpi_spmc_run_dsm(dev, &dsm_ms, DSM_MS_SLEEP_ENTRY_NOTIF); - acpi_spmc_run_dsm(dev, &dsm_ms, DSM_INTEL_MS_LPI_ENTRY_NOTIF); + acpi_spmc_run(dev, &dsm_ms, DSM_MS_SLEEP_ENTRY_NOTIF); + acpi_spmc_run(dev, &dsm_ms, DSM_INTEL_MS_LPI_ENTRY_NOTIF); } if (has_dsm(sc, DSM_INTEL)) - acpi_spmc_run_dsm(dev, &dsm_intel, + acpi_spmc_run(dev, &dsm_intel, DSM_INTEL_MS_LPI_ENTRY_NOTIF); } @@ -806,15 +810,15 @@ acpi_spmc_exit_notif(device_t dev) struct acpi_spmc_softc *sc = device_get_softc(dev); if (has_dsm(sc, DSM_INTEL)) - acpi_spmc_run_dsm(dev, &dsm_intel, DSM_INTEL_MS_LPI_EXIT_NOTIF); + acpi_spmc_run(dev, &dsm_intel, DSM_INTEL_MS_LPI_EXIT_NOTIF); if (has_dsm(sc, DSM_AMD)) - acpi_spmc_run_dsm(dev, &dsm_amd, DSM_AMD_LPI_EXIT_NOTIF); + acpi_spmc_run(dev, &dsm_amd, DSM_AMD_LPI_EXIT_NOTIF); if (has_dsm(sc, DSM_MS)) { - acpi_spmc_run_dsm(dev, &dsm_ms, DSM_INTEL_MS_LPI_EXIT_NOTIF); + acpi_spmc_run(dev, &dsm_ms, DSM_INTEL_MS_LPI_EXIT_NOTIF); if (supports_function(sc, DSM_MS, DSM_MS_TURN_ON_DISPLAY)) - acpi_spmc_run_dsm(dev, &dsm_ms, + acpi_spmc_run(dev, &dsm_ms, DSM_MS_TURN_ON_DISPLAY); - acpi_spmc_run_dsm(dev, &dsm_ms, DSM_MS_SLEEP_EXIT_NOTIF); + acpi_spmc_run(dev, &dsm_ms, DSM_MS_SLEEP_EXIT_NOTIF); } } From nobody Wed May 13 12:40:03 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gFtMm2xLTz6dLV3 for ; Wed, 13 May 2026 12:40: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFtMl6NR3z3w6P for ; Wed, 13 May 2026 12:40:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778676003; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+5OzVmBXPuBqH/fa7aNFoyFgNTQ7V5qsJD/wGuipYe8=; b=ZnccIY2JYNrJBZjhE0yZ2u9yiF8D15Cw+tvqKM+aZyWhRe4ULmTxSNvCrGXjaw929qm1oi o1FYzgOwI6cXNdANF1B7FiXgRbyWxEefL/v8cukUqpBygpFujODVj8RMzcQEmOQ2SMcErp xXw98ZQtSgBHQZ1VsoBzx9NmhIDBnTnovJrdfsdYaEIqdXWTHYhwRZ5oFvkaiAoZLQeQdQ LriShR31bvzZkGTfbacvzysVTcdirhq7i+mxNMJIHLoZXBHvpaQwot4+gp3zfsNz71WdzB 197KmPplvnPw1uZkJG9wvjOkfUTwzFzSr/QUHoT0f8pnG/pm1cqoQoBFyBmCFg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778676003; a=rsa-sha256; cv=none; b=dIOB6389bnYsiD0n97slOesXMzjU/Lt78DHHsRRi+JVHVfy8Yqq+VTlpyx30MQle4WvAwa eaMFI2me8Sa01c0FNHdyMLEYa5gYM3S1jQbl1LnZ4I4eLnlMx2SjmG8pYBSaYdv/rtTD44 amNnN/jHI3PVVoWJ3HLpT8t7Eke5mLftHAr0hJFqlxgh0EUdQewnY3u2RNrBKbETkZsNmw hGdsVZ1HfXtt9wZ8EHRXWOuM0pvSB0fAmr4lrTS3hTNsQIb5M+EymJpaVujahQsXBGoEsV dvWp1NHAIm+fszz2VtD+w5OLn+Rjp3R1fN4qkPc5r0AJ+J3wtrAiEougJsbEHA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778676003; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+5OzVmBXPuBqH/fa7aNFoyFgNTQ7V5qsJD/wGuipYe8=; b=WwnzRam42b4dBHQ2egscEEe5WL1qfm+oCK4rqbQuSCKKCLHSg/v3xJgdDAOScvQNSZG2yL NSJY0/nwHMsuuKu68E1aurxiUiEOtDY0DiYZgJTyJ/wwBiV//gZudNsxPb57L+EcDpQXGi NK6hu+6vz15iGTv18wBbnx6YaOAl6m7xFzqeDnPOkZpSrcNyCmtCBS2j9n1pkTVJdnJ1LH JJ+2IxsXm5sHVaJF1sDrG+j7ZEI1pX1qXnYLADjawaMmK/4mvkim5Lq+Nej8CkhVcxBH1p N3XpwpttnkLK2UrSdWWheGrN35RsICvcR86eS/RukeaZPPhaQkilb1JybTKaow== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFtMl5xCDzr9c for ; Wed, 13 May 2026 12:40:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c88f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 12:40:03 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 65ecfb4a66f3 - main - acpi_spmc(4): Only run DSM functions reported present List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 65ecfb4a66f377ca72569d7a96de0347b4541b52 Auto-Submitted: auto-generated Date: Wed, 13 May 2026 12:40:03 +0000 Message-Id: <6a047123.1c88f.689dad22@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=65ecfb4a66f377ca72569d7a96de0347b4541b52 commit 65ecfb4a66f377ca72569d7a96de0347b4541b52 Author: Olivier Certner AuthorDate: 2026-05-06 11:53:02 +0000 Commit: Olivier Certner CommitDate: 2026-05-13 12:38:25 +0000 acpi_spmc(4): Only run DSM functions reported present Examination of the DSDT in a Framework laptop generally hints at firmware designers sometimes providing ACPI methods for convenience (e.g., same firmware for multiple models) but not using them (or not expecting them to be used) depending on tweaks or the actual hardware platform. On an Intel Framework laptop, we specifically observe the presence of a Microsoft DSM that just reports availability of the SLEEP_ENTRY and SLEEP_EXIT (7 and 8) functions although the Microsoft specification requires other functions, whose purpose is similar to corresponding Intel DSM's ones (such as DISPLAY_OFF). However, we currently always call the latter even on the Microsoft DSM. On that laptop, fortunately, the way the code is structured in the _DSM method leads to nothing being executed on this call. Given the similarity of intent between most functions from the Microsoft DSM on one side and those of ADM and Intel on the other, it is imaginable that other firmware developers could use a strategy where functions are in fact aliased, in which case insisting on calling the Microsoft's DSM function even if not enumerated would cause the action to be performed twice (because we also call the corresponding function on the Intel/AMD DSM), which may or may not cause other problems and in any case seems a waste. So, by default, do not try to run any function that is not enumerated, as that looks like the safest approach. Add a debug sysctl(8) knob to revert to the previous behavior, just in case ('debug.acpi.spmc.force_call_expected_functions'). acpi_spmc_run() now checks if a DSM/function combination has been enumerated, and skips the actual call if it does not. This allows to remove all checks from the acpi_spmc_*_notif() functions, making the code much more compact. acpi_spmc_get_constraints() now checks whether DSM_GET_DEVICE_CONSTRAINTS is supported in order to determine which DSM to use and whether to call the function at all. Reviewed by: obiwac Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D56879 --- sys/dev/acpica/acpi_spmc.c | 89 +++++++++++++++++++--------------------------- 1 file changed, 37 insertions(+), 52 deletions(-) diff --git a/sys/dev/acpica/acpi_spmc.c b/sys/dev/acpica/acpi_spmc.c index da9c80266952..c33336d10ec3 100644 --- a/sys/dev/acpica/acpi_spmc.c +++ b/sys/dev/acpica/acpi_spmc.c @@ -206,6 +206,11 @@ SYSCTL_INT(_debug_acpi_spmc, OID_AUTO, verbose, CTLFLAG_RW, #define VERBOSE() (verbose || bootverbose) +static bool force_call_expected_functions; +SYSCTL_BOOL(_debug_acpi_spmc, OID_AUTO, always_call_expected_functions, + CTLFLAG_RW, &force_call_expected_functions, 0, + "Call all expected functions on a present DSM, even those not enumerated."); + struct acpi_spmc_constraint { bool enabled; char *name; @@ -461,7 +466,7 @@ acpi_spmc_dsm_print_functions(const struct acpi_spmc_softc *const sc, print_bit_field(buf, sizeof(buf), missing, "FUNC", pbf_function_name, dsm); device_printf(sc->dev, "DSM %s: Does not enumerate expected " - "functions %#" PRIx64 "%s. Calls to them may fail.\n", + "functions %#" PRIx64 "%s. Will skip calling them.\n", dsm->name, missing, buf); } @@ -635,14 +640,14 @@ acpi_spmc_get_constraints(struct acpi_spmc_softc *const sc) * report that condition to us, and somewhat arbitrarily favor the Intel * one because it at least has a written specification. */ - if (has_dsm(sc, DSM_INTEL)) { + if (supports_function(sc, DSM_INTEL, DSM_GET_DEVICE_CONSTRAINTS)) { dsm = &dsm_intel; - if (has_dsm(sc, DSM_AMD)) + if (supports_function(sc, DSM_AMD, DSM_GET_DEVICE_CONSTRAINTS)) device_printf(sc->dev, "Constraints: Both Intel and " - "AMD DSMs are present!\n" + "AMD DSMs support getting them!\n" "Using constraints from Intel.\nPlease report.\n"); - } else if (has_dsm(sc, DSM_AMD)) + } else if (supports_function(sc, DSM_AMD, DSM_GET_DEVICE_CONSTRAINTS)) dsm = &dsm_amd; else return (0); @@ -690,8 +695,9 @@ acpi_spmc_get_constraints(struct acpi_spmc_softc *const sc) } static void -acpi_spmc_check_constraints(struct acpi_spmc_softc *sc) +acpi_spmc_check_constraints(device_t dev) { + const struct acpi_spmc_softc *const sc = device_get_softc(dev); #ifdef notyet bool violation = false; #endif @@ -703,7 +709,8 @@ acpi_spmc_check_constraints(struct acpi_spmc_softc *sc) if (sc->constraint_count == 0) return; for (size_t i = 0; i < sc->constraint_count; i++) { - struct acpi_spmc_constraint *constraint = &sc->constraints[i]; + const struct acpi_spmc_constraint *constraint = + &sc->constraints[i]; if (!constraint->enabled) continue; @@ -738,6 +745,7 @@ acpi_spmc_check_constraints(struct acpi_spmc_softc *sc) /* * Run a single DSM function. * + * Only runs the function if it was reported present during enumeration. * Discards the result, but prints a message on error. */ static void @@ -748,6 +756,10 @@ acpi_spmc_run(device_t dev, const struct dsm_desc *const dsm, ACPI_STATUS status; ACPI_BUFFER result; + if (!(supports_function(sc, dsm->index, function_index) || + (force_call_expected_functions && has_dsm(sc, dsm->index)))) + return; + status = acpi_EvaluateDSMTyped(sc->handle, (const uint8_t *)&dsm->uuid, dsm->revision, function_index, NULL, &result, ACPI_TYPE_ANY); @@ -767,67 +779,40 @@ acpi_spmc_run(device_t dev, const struct dsm_desc *const dsm, static void acpi_spmc_display_off_notif(device_t dev) { - struct acpi_spmc_softc *sc = device_get_softc(dev); - - if (has_dsm(sc, DSM_INTEL)) - acpi_spmc_run(dev, &dsm_intel, - DSM_INTEL_MS_DISPLAY_OFF_NOTIF); - if (has_dsm(sc, DSM_MS)) - acpi_spmc_run(dev, &dsm_ms, - DSM_INTEL_MS_DISPLAY_OFF_NOTIF); - if (has_dsm(sc, DSM_AMD)) - acpi_spmc_run(dev, &dsm_amd, DSM_AMD_DISPLAY_OFF_NOTIF); + acpi_spmc_run(dev, &dsm_intel, DSM_INTEL_MS_DISPLAY_OFF_NOTIF); + acpi_spmc_run(dev, &dsm_ms, DSM_INTEL_MS_DISPLAY_OFF_NOTIF); + acpi_spmc_run(dev, &dsm_amd, DSM_AMD_DISPLAY_OFF_NOTIF); } static void acpi_spmc_display_on_notif(device_t dev) { - struct acpi_spmc_softc *sc = device_get_softc(dev); - - if (has_dsm(sc, DSM_INTEL)) - acpi_spmc_run(dev, &dsm_intel, - DSM_INTEL_MS_DISPLAY_ON_NOTIF); - if (has_dsm(sc, DSM_MS)) - acpi_spmc_run(dev, &dsm_ms, - DSM_INTEL_MS_DISPLAY_ON_NOTIF); - if (has_dsm(sc, DSM_AMD)) - acpi_spmc_run(dev, &dsm_amd, DSM_AMD_DISPLAY_ON_NOTIF); + acpi_spmc_run(dev, &dsm_intel, DSM_INTEL_MS_DISPLAY_ON_NOTIF); + acpi_spmc_run(dev, &dsm_ms, DSM_INTEL_MS_DISPLAY_ON_NOTIF); + acpi_spmc_run(dev, &dsm_amd, DSM_AMD_DISPLAY_ON_NOTIF); } static void acpi_spmc_entry_notif(device_t dev) { - struct acpi_spmc_softc *sc = device_get_softc(dev); + /* XXX - No real check currently. Check return code when it does. */ + acpi_spmc_check_constraints(dev); - acpi_spmc_check_constraints(sc); - - if (has_dsm(sc, DSM_AMD)) - acpi_spmc_run(dev, &dsm_amd, DSM_AMD_LPI_ENTRY_NOTIF); - if (has_dsm(sc, DSM_MS)) { - acpi_spmc_run(dev, &dsm_ms, DSM_MS_SLEEP_ENTRY_NOTIF); - acpi_spmc_run(dev, &dsm_ms, DSM_INTEL_MS_LPI_ENTRY_NOTIF); - } - if (has_dsm(sc, DSM_INTEL)) - acpi_spmc_run(dev, &dsm_intel, - DSM_INTEL_MS_LPI_ENTRY_NOTIF); + acpi_spmc_run(dev, &dsm_amd, DSM_AMD_LPI_ENTRY_NOTIF); + acpi_spmc_run(dev, &dsm_ms, DSM_MS_SLEEP_ENTRY_NOTIF); + acpi_spmc_run(dev, &dsm_ms, DSM_INTEL_MS_LPI_ENTRY_NOTIF); + acpi_spmc_run(dev, &dsm_intel, DSM_INTEL_MS_LPI_ENTRY_NOTIF); } static void acpi_spmc_exit_notif(device_t dev) { - struct acpi_spmc_softc *sc = device_get_softc(dev); - - if (has_dsm(sc, DSM_INTEL)) - acpi_spmc_run(dev, &dsm_intel, DSM_INTEL_MS_LPI_EXIT_NOTIF); - if (has_dsm(sc, DSM_AMD)) - acpi_spmc_run(dev, &dsm_amd, DSM_AMD_LPI_EXIT_NOTIF); - if (has_dsm(sc, DSM_MS)) { - acpi_spmc_run(dev, &dsm_ms, DSM_INTEL_MS_LPI_EXIT_NOTIF); - if (supports_function(sc, DSM_MS, DSM_MS_TURN_ON_DISPLAY)) - acpi_spmc_run(dev, &dsm_ms, - DSM_MS_TURN_ON_DISPLAY); - acpi_spmc_run(dev, &dsm_ms, DSM_MS_SLEEP_EXIT_NOTIF); - } + acpi_spmc_run(dev, &dsm_intel, DSM_INTEL_MS_LPI_EXIT_NOTIF); + acpi_spmc_run(dev, &dsm_amd, DSM_AMD_LPI_EXIT_NOTIF); + acpi_spmc_run(dev, &dsm_ms, DSM_INTEL_MS_LPI_EXIT_NOTIF); + /* Hint to the platform we are soon going to turn on the display. */ + acpi_spmc_run(dev, &dsm_ms, DSM_MS_TURN_ON_DISPLAY); + acpi_spmc_run(dev, &dsm_ms, DSM_MS_SLEEP_EXIT_NOTIF); } static void From nobody Wed May 13 12:40:02 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gFtMl1tW8z6dLDh for ; Wed, 13 May 2026 12:40: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFtMk6SKxz3w8P for ; Wed, 13 May 2026 12:40:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778676002; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LgbIJQeJu5dxRlkzQ1aRS7fhRLhmesH56SK5oXQ3Fc0=; b=LcrmVpPaBBAtUwilcDNB8CNPSFCL/aUS02+yIl9/qChII7bXkw6gPIzCK2dSG3D0V3cXgq 3EWeFL+57BNB7Fgg7xmhwhYlAVcWe3hVqQMJNT+ErE97+0R5rvViiqkOUqPYqVaeEH3d6I g1I40EVsBQGMsOsebDVkSisaBl9XkbiR2RIoSRvmAuHbDObiv9AXHS6yteKovbWVxYvSLy AhzfUlPO7JuEsuFr16pU29dl6ZUBWSkU9ZVLuSLaN0WhG7qh2T2UeqT1aR509OWMh0pHWs batSItEqV0exIYGN8riJL8iqAAPqJ1TF0nAHL4dqC1Z70MoXbNl7tHd9jDmpGA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778676002; a=rsa-sha256; cv=none; b=P/YkdTbOwHZ12DcJDvKkXyqW6oQicYbQIrUQvpjZbengQjuWmTONgXaAvtLOvPtGvWoYD6 M66hwi7iPnpD4l5r+wQLccvOkNERasiOxjppB4C7UoHlWmLZbOsUQ/iT3kmHBuFVYpwLbb KKtW+i/Olv7rMvUAfTXSUVZh22Zr7B8BHo5MJzVRk4FYcAJ/g81SkLnpdKO0YKXdOIis7v YlYY+o7AoueATEfo2W22P9nx8j+V6lMs/Ho+kDHu0ViSsCflxSbnldXzRLrZ3ZMOC0rmnC BEghk0x3mBfvTGNLCulPxeDCFVakxuJr504laagG9RVIBqJjvblqBeIYCG+qbQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778676002; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LgbIJQeJu5dxRlkzQ1aRS7fhRLhmesH56SK5oXQ3Fc0=; b=mZB+gQuCt3sWV53YXcfhRV5dk8/l1wphbLrBe6G6Kj/GoT6Qf0N2IK7LnPIIA4+i22U0E6 dgQUE2vQ38MgXce2xRLfjiRkGunENxcgSy+GSV3h6YrXTYFHpfNqt1CjiZriQ+Q7PYcUUv oz5DTtxmCJjE6JhBy20D6NVGXsyGStlx8daFCzeeb3cGg7r711KJGKV+NDGoIM01k2Yu9O M7WHSLSlLzJE1/2hQLmtB6DUrhwaFz0nm0fldGbgxx4WujKHN9cdSoW21VMB8VYZV/QJeK mmZjFsmbHhsfMS/m9nMNoFgkt0nPItLyEok2O5TBWGfW5SODkFaMTK0WAOnh7g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFtMk5XLWzr9b for ; Wed, 13 May 2026 12:40:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 19769 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 12:40:02 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: ba4f05b55fb4 - main - acpi_spmc(4): Factor out testing for present DSMs/functions List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ba4f05b55fb4b006f1bbe26d3ad3527f48e85939 Auto-Submitted: auto-generated Date: Wed, 13 May 2026 12:40:02 +0000 Message-Id: <6a047122.19769.3dee4ae6@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=ba4f05b55fb4b006f1bbe26d3ad3527f48e85939 commit ba4f05b55fb4b006f1bbe26d3ad3527f48e85939 Author: Olivier Certner AuthorDate: 2026-05-06 09:31:19 +0000 Commit: Olivier Certner CommitDate: 2026-05-13 12:38:25 +0000 acpi_spmc(4): Factor out testing for present DSMs/functions Since we are now keeping in the softc the information about which DSM functions are available (in supported_functions[]), the 'dsms' field there is somewhat redundant. Make it completely redundant by keeping the bit representing the enumeration function itself in each element of supported_functions[], and then remove the field. As a result, convert has_dsm() to rely on supports_function(). Adapt acpi_spmc_dsm_check_functions() so that it does not take into account the enumeration function bit. While here, use the self-explanatory stance IDX_TO_BIT(DSM_ENUM_FUNCTIONS) instead of a hardcoded 1. Reviewed by: obiwac Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D56878 --- sys/dev/acpica/acpi_spmc.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/sys/dev/acpica/acpi_spmc.c b/sys/dev/acpica/acpi_spmc.c index b2da99864581..da9c80266952 100644 --- a/sys/dev/acpica/acpi_spmc.c +++ b/sys/dev/acpica/acpi_spmc.c @@ -223,7 +223,6 @@ struct acpi_spmc_constraint { struct acpi_spmc_softc { device_t dev; ACPI_HANDLE handle; - int dsms; uint64_t supported_functions[nitems(dsms)]; struct eventhandler_entry *eh_suspend; @@ -257,7 +256,7 @@ supports_function(const struct acpi_spmc_softc *const sc, const int dsm_index, static bool has_dsm(const struct acpi_spmc_softc *const sc, const int dsm_index) { - return ((sc->dsms & IDX_TO_BIT(dsm_index)) != 0); + return (supports_function(sc, dsm_index, DSM_ENUM_FUNCTIONS)); } typedef const char *pbf_get_name_t(const int, const void *const); @@ -371,6 +370,7 @@ acpi_spmc_attach(device_t dev) { struct acpi_spmc_softc *const sc = device_get_softc(dev); const ACPI_HANDLE handle = acpi_get_handle(dev); + int supported_dsms; char buf[32]; int error; @@ -382,6 +382,7 @@ acpi_spmc_attach(device_t dev) sc->dev = dev; sc->handle = handle; + supported_dsms = 0; for (int i = 0; i < nitems(dsms); ++i) { KASSERT(dsms[i] != NULL, ("%s: Sparse dsms[]!", __func__)); KASSERT(dsms[i]->index == i, @@ -389,14 +390,17 @@ acpi_spmc_attach(device_t dev) dsms[i]->name)); acpi_spmc_probe_dsm(sc, dsms[i]); + if (has_dsm(sc, i)) + supported_dsms |= IDX_TO_BIT(i); } - if (sc->dsms == 0) { + if (supported_dsms == 0) { device_printf(dev, "No DSM supported!"); return (ENXIO); } - print_bit_field(buf, sizeof(buf), sc->dsms, "DSM", pbf_dsm_name, NULL); + print_bit_field(buf, sizeof(buf), supported_dsms, "DSM", + pbf_dsm_name, NULL); device_printf(dev, "DSMs supported: %s\n", buf); /* Print supported functions of usable DSMs. */ @@ -436,7 +440,12 @@ static void acpi_spmc_dsm_print_functions(const struct acpi_spmc_softc *const sc, const struct dsm_desc *const dsm) { - const uint64_t supported_functions = + /* + * Remove the enumeration function bit, which we do not care about when + * printing which functions are supported and which we do not want to + * report as unknown. + */ + const uint64_t supported_functions = ~IDX_TO_BIT(DSM_ENUM_FUNCTIONS) & sc->supported_functions[dsm->index]; const uint64_t missing = dsm->expected_functions & ~supported_functions; const uint64_t unknown = supported_functions & @@ -475,10 +484,9 @@ acpi_spmc_probe_dsm(struct acpi_spmc_softc *const sc, /* * DSM is supported if bit 0 is set. */ - if ((supported_functions & 1) == 0) + if ((supported_functions & IDX_TO_BIT(DSM_ENUM_FUNCTIONS)) == 0) return; - sc->supported_functions[dsm->index] = supported_functions & ~1; - sc->dsms |= IDX_TO_BIT(dsm->index); + sc->supported_functions[dsm->index] = supported_functions; } static void From nobody Wed May 13 12:40:04 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gFtMn29pHz6dLMc for ; Wed, 13 May 2026 12:40: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFtMm6wWJz3wMP for ; Wed, 13 May 2026 12:40:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778676005; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1EYw45XSfUpQuHeOQoz/NXQRHmANtRO70zB0QTrllYw=; b=NxR0T9Qfwtx/ClRYRFdcwc34S3l4BClti7ZOy8ox46lEMmnQs/hoS9KGgsHVkzF3gG/qmU oNxN3ztWHoQ+C8Zs7jf8ZfBF57bbSRAjB/A5FaALYQlFLNRsHe3EMCTTqKIgkpPYHTpH+V 3l2oC5HOq9d6bKBjCUVP2peE63bLV8CKOvb2XNMoFPP8nN3nSZQnd2rr5k/iiIih+EyPbj wO5rrs8IwfZEwQ2gOBkWzjvwXU+HSmdlrtN24zeBjgru/f3NqV71tloGKy80L7xMM9K1xU JWpnx1Nf0v8+0f1R2eG2y+/hCSLdXzFpUMLBW6z1ZRMIpUg4IT0fNhYlSmBtJw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778676005; a=rsa-sha256; cv=none; b=L2gcGXRfs/NvyK3d9XfAxjUXc+6GXOlWSjgxgB66MEsJspsLoZMCZNIFQdgIOjqc97rY9I hYqYldkHr3ZXJOyXxE1VREIeVP+nQDCHX0kw71sscCodSWyLNlV+vsdJDKoulHe00EEgtg 5hCoMjZMcR4KblHbm62ZhxnfIJl0mgFQl9ACjX5rrwmds7UIu01xxBQi7cVDuzM0h6j33U ivEFnL0h/WGRsEnBKCvgJWfZLPF8wzhu/zunoJuh1MT2iz+Athw6F7HuzAfC6xgkyKgniN 0IJO6SpFz9G9rBk42flzSHUHL0y5OSkAAx5y+GJp8/p8x0P7oHzTZoDhKt+PtQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778676005; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1EYw45XSfUpQuHeOQoz/NXQRHmANtRO70zB0QTrllYw=; b=bilNPoApA8nIojZF3zdv7P3iGUznLlwrQm+8GrgnurOx0n0/On3KW4U3vqOXnGDViuM8NE TWb3RyylVVXL+0HhBSnffrz+MRxhP5wAyLceqdhuhEcQcqs2TiC4F8WkhfoY0A20kdfvQn bC/ARF5p/5ZvJAjhteQ+PH69W0lsL3zewuT+9WySZNDXrbue47WBYW9iROOEx0I2H/GY5g GSkzqfLmZwXVvMSZpgS+Y5LXkailTCaAgMyUkYvtbzygiDZvrn44ZwgAdwIiAVlpfzf0f1 aNUND4FeTzMOTsvc7MUPjG6Td6gKtI541wFSzdD9AC9CV0pDTjYlBpXXpZY5Lw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFtMm6LT9zqm1 for ; Wed, 13 May 2026 12:40:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c893 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 12:40:04 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: b092ee520618 - main - acpi_spmc(4): softc: Move supported functions into a DSM info structure List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b092ee520618a8e8df7f4d7fb095e8940dd0d305 Auto-Submitted: auto-generated Date: Wed, 13 May 2026 12:40:04 +0000 Message-Id: <6a047124.1c893.3b4c14cf@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=b092ee520618a8e8df7f4d7fb095e8940dd0d305 commit b092ee520618a8e8df7f4d7fb095e8940dd0d305 Author: Olivier Certner AuthorDate: 2026-05-06 13:15:27 +0000 Commit: Olivier Certner CommitDate: 2026-05-13 12:38:25 +0000 acpi_spmc(4): softc: Move supported functions into a DSM info structure This is in preparation to adding the revision as a probed information. Reviewed by: obiwac Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D56880 --- sys/dev/acpica/acpi_spmc.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/sys/dev/acpica/acpi_spmc.c b/sys/dev/acpica/acpi_spmc.c index c33336d10ec3..244e7795ba84 100644 --- a/sys/dev/acpica/acpi_spmc.c +++ b/sys/dev/acpica/acpi_spmc.c @@ -211,6 +211,11 @@ SYSCTL_BOOL(_debug_acpi_spmc, OID_AUTO, always_call_expected_functions, CTLFLAG_RW, &force_call_expected_functions, 0, "Call all expected functions on a present DSM, even those not enumerated."); +/* Per DSM probed information. */ +struct dsm_info { + uint64_t supported_functions; +}; + struct acpi_spmc_constraint { bool enabled; char *name; @@ -228,7 +233,7 @@ struct acpi_spmc_constraint { struct acpi_spmc_softc { device_t dev; ACPI_HANDLE handle; - uint64_t supported_functions[nitems(dsms)]; + struct dsm_info dsms_info[nitems(dsms)]; struct eventhandler_entry *eh_suspend; struct eventhandler_entry *eh_resume; @@ -252,9 +257,9 @@ static bool supports_function(const struct acpi_spmc_softc *const sc, const int dsm_index, const int function_index) { - MPASS(0 <= dsm_index && dsm_index < nitems(sc->supported_functions)); + MPASS(0 <= dsm_index && dsm_index < nitems(dsms)); - return ((sc->supported_functions[dsm_index] & + return ((sc->dsms_info[dsm_index].supported_functions & IDX_TO_BIT(function_index)) != 0); } @@ -451,7 +456,7 @@ acpi_spmc_dsm_print_functions(const struct acpi_spmc_softc *const sc, * report as unknown. */ const uint64_t supported_functions = ~IDX_TO_BIT(DSM_ENUM_FUNCTIONS) & - sc->supported_functions[dsm->index]; + sc->dsms_info[dsm->index].supported_functions; const uint64_t missing = dsm->expected_functions & ~supported_functions; const uint64_t unknown = supported_functions & ~(dsm->expected_functions | dsm->extra_functions); @@ -491,7 +496,7 @@ acpi_spmc_probe_dsm(struct acpi_spmc_softc *const sc, */ if ((supported_functions & IDX_TO_BIT(DSM_ENUM_FUNCTIONS)) == 0) return; - sc->supported_functions[dsm->index] = supported_functions; + sc->dsms_info[dsm->index].supported_functions = supported_functions; } static void From nobody Wed May 13 12:40:05 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gFtMp2Pdbz6dLGT for ; Wed, 13 May 2026 12:40: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFtMp026tz3w8r for ; Wed, 13 May 2026 12:40:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778676006; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QyCxTPFCuPQ8OlXeLI3wWPC4B/aHckc22yU0ZvLWz90=; b=lfCavwabprP3jDD6Eh1k12A4gY+je9lf0lL8v0ZTB8udw7ey11tg4JO4oboQGHH19ZlLEg Kh1CUdij1dcfShZGwZq+QmLAemoGk7P/0EoQmUHLfm6G3nCrvyf2HzazdOfL5R10vmg6Z+ Im59/3jKjKZVgz8hK3lHUdi+WionVL1+xZSdlqwCBB1HXYhxrmr1INH/cGd2QrTd+KGuOb z/WcoA7GWSFMwOIWzPZrP+rPxPgRtMG3NMIV3WWgrNIUrT9XQwj5CpdwXTktPkY0c4uNkw 9T3RtUFKjji1s//9ZYDjSkWc/sfOioEn3au8rq3fCdJ4b3wpOcXdib6vpKuABQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778676006; a=rsa-sha256; cv=none; b=My2yvm2kHoVwOnD9ymEx7o4NJC2hY9UKt065vviGJheMJolyaluOqOltLPWrOgaXZ3RWBg 00Y9fOjqxuPlY13sEz90xSp8LIzMZXUzXxttgt5EO98Egp0ZINvyVqFwbNVJAW+yvf+x0a +psf8BFCUaU4Xs5apvW7fwMTPk6Sxih7VOv16SYPQ5H+FT+DvNqam6QNOoIcZwf4PVBSzQ Wj9cyGRPu0C2ESqfh8gJPGW4UI3F6m57evcKeD09jy2AQ2UTHXPBzjc4qGY6etpebmt9iM laWEM6EN4HLkqCurqaSHCxKJu6xefO/TZYrI4nmT5mXaR9CbbUqOwpqVoOhbNQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778676006; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QyCxTPFCuPQ8OlXeLI3wWPC4B/aHckc22yU0ZvLWz90=; b=tJHtgnTrkKUSOcJVLgfnrYuMzuD48NG3D1wE/OMgCPTSWAQVfQd6+bZgyfgh7n9M3wUfSl cenFD3294Z35VQCGjLbZlRalleZVUbaDayRoEefjXLmcFZ8FxwDapv+x3dt8N0yoxBiN8r XYyNlGhKBhoNW6jfgdC0f+mMnpjFiLc++D7DN18p/puhF0/Z8TUeqF2kuruzUknQzBa3ur gQtI1XKrxH5VDZB5QB7CA9s+5QWwTbMsud/1DvYEQGamMp2D+FO/P0IEByIWAAAwYYXW3i 9TKANLDqBZ5j0myDNWAf5epV/ErKNz+89RIflgwxN3281B170m425Wgf3vxgRw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFtMn6kMZzrRF for ; Wed, 13 May 2026 12:40:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c897 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 12:40:05 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: b82e41d39405 - main - acpi_spmc(4): Trivial simplification in detach function List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b82e41d394054fdc357bc9e03b9a48a2e6983a91 Auto-Submitted: auto-generated Date: Wed, 13 May 2026 12:40:05 +0000 Message-Id: <6a047125.1c897.604bf252@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=b82e41d394054fdc357bc9e03b9a48a2e6983a91 commit b82e41d394054fdc357bc9e03b9a48a2e6983a91 Author: Olivier Certner AuthorDate: 2026-05-07 07:53:36 +0000 Commit: Olivier Certner CommitDate: 2026-05-13 12:38:25 +0000 acpi_spmc(4): Trivial simplification in detach function Reviewed by: obiwac Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D56881 --- sys/dev/acpica/acpi_spmc.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/dev/acpica/acpi_spmc.c b/sys/dev/acpica/acpi_spmc.c index 244e7795ba84..b1f97685e50c 100644 --- a/sys/dev/acpica/acpi_spmc.c +++ b/sys/dev/acpica/acpi_spmc.c @@ -441,8 +441,7 @@ acpi_spmc_detach(device_t dev) EVENTHANDLER_DEREGISTER(acpi_post_dev_suspend, sc->eh_suspend); EVENTHANDLER_DEREGISTER(acpi_pre_dev_resume, sc->eh_resume); - - acpi_spmc_free_constraints(device_get_softc(dev)); + acpi_spmc_free_constraints(sc); return (0); } From nobody Wed May 13 12:40:06 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gFtMq2fGdz6dLXf for ; Wed, 13 May 2026 12:40: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFtMq1DYyz3wQ8 for ; Wed, 13 May 2026 12:40:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778676007; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HSZHrGaj2Dpcnct4YrhIMEiAzQjl5KJRm2ZJm3RcPA4=; b=f2F1ZR/DSBe6E20WLeRsFMXgoAncMoOazblUAC/wcRspIxvPU6OCMsDBNMwI/EdSWL6gQl 2XGUdGZZIt36Mtum98vSwBBRqdZR4hBMWIrphH2bL2bqB8cG5YY4hATjICCqjib/WZqUYS rduK0pe0sYrwleGi13LdMgtoBMLwQvL1TbDax65K089wHOgngnzBqYXQ7/B7MoDvXWQmCE zBLyegPbGuj8y0Oyod/PEaWRU7h/awrEJS2lw5aOA0aUHcAFVmbeesYwg5akusUfdoPSr0 7QK/4rjX184/pQsk8BJNiLkkULQ4p3w6dvt/fNjg2B1KtfliOJ4qbfWEjhBD6w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778676007; a=rsa-sha256; cv=none; b=psXwDix16gClLmIG4s8oPGK9eqGYaOW/RDqbibo+Aa233sBwvfwUS1wd6kvjKhwK6fbGHh tyIlAcSRWlNCdWNg25b0y3slhThT/idUnx86qXoH7SDWqm+b6wF5jTXNhhZ1t2t6imqdbC lxSnBYVagGkP7+RV6DdbDUMNDKiOVfWVzmOZeoNTuRbnlCpP3MP4Or+72F5Li6/c6HSTu1 gvfoPzcXz8cUZNALjOOiGLNQS9X59SE6QLO4MnWjKCoMv3s1ar2bHiE51JfiNJGTzYZxyh jcPKLkVsNHy9pDFvvgKKzMsVvYb5KrY4baH14F4NeOan0ascue9t80w8/iEeTQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778676007; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HSZHrGaj2Dpcnct4YrhIMEiAzQjl5KJRm2ZJm3RcPA4=; b=PfmYSfNm6m0FlasmQZy1A+FwOI4BrHCCibf663vpGbkq/O9enmIGfCa/NQE+jfgBFaNURy 3488dGasUphAKsWhfpCcgRk4KwVFEmsQOMs/aKF5b1HP4uwnrMyaVSIAodlzD2ktt5I/o6 yand15b603o9qTIh0u+oRvosYBgjY8bv8TcyiP4Byzq9viC4r2i2LvuTi/OdeBrUdQI/1w x3iMzJyAGkg8jsez7vRx5RdShAD2Tly6+GtIqT5XVmpkM4DSOUNoCEOyQaMjHE1qfY8/tY p2JySKg3y5fC3PAbQNdSb4crqqT078kQHZ4wNENakRHEt1Z4H9AYLA02a94i4g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFtMq01DhzrTN for ; Wed, 13 May 2026 12:40:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c692 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 12:40:06 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 69a303ace76f - main - acpi_spmc(4): Auto-detect DSM revisions by default List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 69a303ace76f42630ca07bcc5d2d090774a0364d Auto-Submitted: auto-generated Date: Wed, 13 May 2026 12:40:06 +0000 Message-Id: <6a047126.1c692.59049bab@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=69a303ace76f42630ca07bcc5d2d090774a0364d commit 69a303ace76f42630ca07bcc5d2d090774a0364d Author: Olivier Certner AuthorDate: 2026-05-07 08:22:13 +0000 Commit: Olivier Certner CommitDate: 2026-05-13 12:38:26 +0000 acpi_spmc(4): Auto-detect DSM revisions by default Which revisions to use for the Intel and AMD DSMs is unclear. For the Intel one, the written specification indicates only 0, but Linux uses 1 (possibly an oversight). For the AMD one, for which there is no specification, Linux uses 0, but at least on the Framework 13 AMD 7040 series, the "enumerate functions" function only returns a mask that covers all the functions we expect when called with revision 2. Introduce an auto-detection strategy where each revision starting from 0 is tried in turn up to some limit (included; default: 15). As soon as a revision implements all expected functions, we stop the loop and use that one, in effect selecting the minimum revision that implements all we need, which should avoid potential backwards-compatibility problems. If no revision implements all expected functions, the highest available revision in the checked range is selected, but higher revisions that do not bring new functions are discarded (see the explanatory comment in acpi_spmc_probe_dsm()). The revision policy is still tunable using the same existing sysctl(8) knobs 'debug.acpi.spmc.intel_dsm_revision' and 'debug.acpi.spmc.amd_dsm_revision'. They have been extended so that a negative value indicates to use the auto-detection mechanism up to a revision of minus the value. As before, a 0 or positive value requests a specific revision. A new knob is introduced for the Microsoft DSM just in case ('debug.acpi.spmc.ms_dsm_revision'). Since now the revision can be auto-detected, and thus depends on a particular device instance, move it into 'struct dsm_info' on the softc. This also enables finishing the split between static and dynamic/tunable information, allowing to constify all the DSM descriptors. Print the revision eventually used along with the supported functions. Tested on an Intel Framework laptop. Reviewed by: obiwac Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D56882 --- sys/dev/acpica/acpi_spmc.c | 249 +++++++++++++++++++++++++++++++-------------- 1 file changed, 175 insertions(+), 74 deletions(-) diff --git a/sys/dev/acpica/acpi_spmc.c b/sys/dev/acpica/acpi_spmc.c index b1f97685e50c..fcd4105b2a76 100644 --- a/sys/dev/acpica/acpi_spmc.c +++ b/sys/dev/acpica/acpi_spmc.c @@ -32,6 +32,39 @@ static char *spmc_ids[] = { NULL }; +/* sysctl(8) knobs */ +static SYSCTL_NODE(_debug_acpi, OID_AUTO, spmc, CTLFLAG_RD | CTLFLAG_MPSAFE, + NULL, "SPMC debugging"); + +int8_t dsm_intel_revision = -15; +SYSCTL_S8(_debug_acpi_spmc, OID_AUTO, intel_dsm_revision, CTLFLAG_RW, + &dsm_intel_revision, 0, + "Revision to use with the Intel DSM " + "(negative: auto, try from 0 to minus the value)"); + +int8_t dsm_amd_revision = -15; +SYSCTL_S8(_debug_acpi_spmc, OID_AUTO, amd_dsm_revision, CTLFLAG_RW, + &dsm_amd_revision, 0, + "Revision to use with the AMD DSM " + "(negative: auto, try from 0 to minus the value)"); + +int8_t dsm_ms_revision = -15; +SYSCTL_S8(_debug_acpi_spmc, OID_AUTO, ms_dsm_revision, CTLFLAG_RW, + &dsm_ms_revision, 0, + "Revision to use with the Microsoft DSM " + "(negative: auto, try from 0 to minus the value)"); + +static int verbose; +SYSCTL_INT(_debug_acpi_spmc, OID_AUTO, verbose, CTLFLAG_RW, + &verbose, 0, "acpi_spmc(4) verbosity"); + +#define VERBOSE() (verbose || bootverbose) + +static bool force_call_expected_functions; +SYSCTL_BOOL(_debug_acpi_spmc, OID_AUTO, always_call_expected_functions, + CTLFLAG_RW, &force_call_expected_functions, 0, + "Call all expected functions on a present DSM, even those not enumerated."); + /* Conversion of an index to a mask. */ #define IDX_TO_BIT(idx) (1ull << (idx)) @@ -64,21 +97,20 @@ static char *spmc_ids[] = { struct dsm_desc { const char *name; - /* Index in the dsms[] array below. */ - int index; + struct uuid uuid; /* - * Revisions are zero or a positive number. Strictly speaking, next - * field should be a 'uint64_t' as per the ACPI spec, but our ACPI DSM - * interface takes an 'int' and anyway actual revision numbers never - * even exceed the limits of a 'uint8_t'. + * Points to an integer which, if negative, indicates to auto-detect the + * revision by trying all revisions between 0 and minus the value, else + * is the sole revision to try. */ - int revision; - struct uuid uuid; + const int8_t *revision_spec; uint64_t expected_functions; uint64_t extra_functions; /* Human-friendly names of known functions. */ const char *const *function_names; int function_names_nb; + /* Index in the dsms[] array below. */ + int index; }; static const char *const dsm_intel_function_names[] = { @@ -90,22 +122,14 @@ static const char *const dsm_intel_function_names[] = { [DSM_INTEL_MS_LPI_EXIT_NOTIF] = "LPI_EXIT", }; -static struct dsm_desc dsm_intel = { +static const struct dsm_desc dsm_intel = { .index = DSM_INTEL, .name = "Intel", .uuid = { /* c4eb40a0-6cd2-11e2-bcfd-0800200c9a66 */ 0xc4eb40a0, 0x6cd2, 0x11e2, 0xbc, 0xfd, {0x08, 0x00, 0x20, 0x0c, 0x9a, 0x66} }, - /* - * XXX Linux uses 1 for the revision on Intel DSMs, but doesn't explain - * why. The commit that introduces this links to a document mentioning - * revision 0, so default this to 0. - * - * The debug.acpi.spmc.intel_dsm_revision sysctl may be used to configure - * this just in case. - */ - .revision = 0, + .revision_spec = &dsm_intel_revision, .expected_functions = IDX_TO_BIT(DSM_GET_DEVICE_CONSTRAINTS) | IDX_TO_BIT(DSM_INTEL_MS_DISPLAY_OFF_NOTIF) | @@ -135,7 +159,7 @@ static const struct dsm_desc dsm_ms = { 0x11e00d56, 0xce64, 0x47ce, 0x83, 0x7b, {0x1f, 0x89, 0x8f, 0x9a, 0xa4, 0x61} }, - .revision = 0, + .revision_spec = &dsm_ms_revision, .expected_functions = IDX_TO_BIT(DSM_INTEL_MS_DISPLAY_OFF_NOTIF) | IDX_TO_BIT(DSM_INTEL_MS_DISPLAY_ON_NOTIF) | @@ -157,23 +181,14 @@ static const char *const dsm_amd_function_names[] = { [DSM_AMD_LPI_EXIT_NOTIF] = "LPI_EXIT", }; -static struct dsm_desc dsm_amd = { +static const struct dsm_desc dsm_amd = { .index = DSM_AMD, .name = "AMD", .uuid = { /* e3f32452-febc-43ce-9039-932122d37721 */ 0xe3f32452, 0xfebc, 0x43ce, 0x90, 0x39, {0x93, 0x21, 0x22, 0xd3, 0x77, 0x21} }, - /* - * XXX Linux uses 0 for the revision on AMD DSMs, but at least on the - * Framework 13 AMD 7040 series, the "enumerate functions" DSM function - * needs to be called with revision 2 to return a mask that covers all - * the functions we would like to call. - * - * The debug.acpi.spmc.amd_dsm_revision sysctl may be used to configure - * this just in case. - */ - .revision = 2, + .revision_spec = &dsm_amd_revision, .expected_functions = IDX_TO_BIT(DSM_GET_DEVICE_CONSTRAINTS) | IDX_TO_BIT(DSM_AMD_DISPLAY_OFF_NOTIF) | @@ -190,30 +205,16 @@ static const struct dsm_desc *const dsms[] = { [DSM_AMD] = &dsm_amd, }; -static SYSCTL_NODE(_debug_acpi, OID_AUTO, spmc, CTLFLAG_RD | CTLFLAG_MPSAFE, - NULL, "SPMC debugging"); - -SYSCTL_INT(_debug_acpi_spmc, OID_AUTO, intel_dsm_revision, CTLFLAG_RW, - &dsm_intel.revision, 0, - "Revision to use when evaluating Intel SPMC DSMs"); - -SYSCTL_INT(_debug_acpi_spmc, OID_AUTO, amd_dsm_revision, CTLFLAG_RW, - &dsm_amd.revision, 0, "Revision to use when evaluating AMD SPMC DSMs"); - -static int verbose; -SYSCTL_INT(_debug_acpi_spmc, OID_AUTO, verbose, CTLFLAG_RW, - &verbose, 0, "acpi_spmc(4) verbosity"); - -#define VERBOSE() (verbose || bootverbose) - -static bool force_call_expected_functions; -SYSCTL_BOOL(_debug_acpi_spmc, OID_AUTO, always_call_expected_functions, - CTLFLAG_RW, &force_call_expected_functions, 0, - "Call all expected functions on a present DSM, even those not enumerated."); - /* Per DSM probed information. */ struct dsm_info { uint64_t supported_functions; + /* + * Revisions are zero or a positive number. Strictly speaking, next + * field should be a 'uint64_t' as per the ACPI spec, but our ACPI DSM + * interface takes an 'int' and anyway actual revision numbers never + * even exceed the limits of a 'uint8_t'. + */ + uint8_t revision; }; struct acpi_spmc_constraint { @@ -253,20 +254,60 @@ resolve_dsm(int dsm_index) return (dsms[dsm_index]); } +static struct dsm_info * +get_dsm_info(struct acpi_spmc_softc *const sc, const int dsm_index) +{ + MPASS(0 <= dsm_index && dsm_index < nitems(dsms)); + return (&sc->dsms_info[dsm_index]); +} + +static const struct dsm_info * +get_const_dsm_info(const struct acpi_spmc_softc *const sc, const int dsm_index) +{ + MPASS(0 <= dsm_index && dsm_index < nitems(dsms)); + return (&sc->dsms_info[dsm_index]); +} + +static const uint64_t +get_supported_functions(const struct acpi_spmc_softc *const sc, + const int dsm_index) +{ + return (get_const_dsm_info(sc, dsm_index)->supported_functions); +} + +static const uint8_t +get_revision(const struct acpi_spmc_softc *const sc, const int dsm_index) +{ + return (get_const_dsm_info(sc, dsm_index)->revision); +} + +static bool +supports_function_bitset(const uint64_t supported_functions, + const int function_index) +{ + return ((supported_functions & IDX_TO_BIT(function_index)) != 0); +} + static bool supports_function(const struct acpi_spmc_softc *const sc, const int dsm_index, const int function_index) { - MPASS(0 <= dsm_index && dsm_index < nitems(dsms)); + return (supports_function_bitset(get_supported_functions(sc, dsm_index), + function_index)); +} - return ((sc->dsms_info[dsm_index].supported_functions & - IDX_TO_BIT(function_index)) != 0); +static bool +has_dsm_bitset(const uint64_t supported_functions) +{ + /* DSM is supported if bit DSM_ENUM_FUNCTIONS (0) is set. */ + return (supports_function_bitset(supported_functions, + DSM_ENUM_FUNCTIONS)); } static bool has_dsm(const struct acpi_spmc_softc *const sc, const int dsm_index) { - return (supports_function(sc, dsm_index, DSM_ENUM_FUNCTIONS)); + return (has_dsm_bitset(get_supported_functions(sc, dsm_index))); } typedef const char *pbf_get_name_t(const int, const void *const); @@ -344,12 +385,13 @@ failed_to_call_dsm(const struct acpi_spmc_softc *const sc, { (void)device_printf(sc->dev, "Failed to call DSM %s (rev %u) function %s\n", - dsm->name, dsm->revision, dsm_function_name(dsm, function_index)); + dsm->name, get_revision(sc, dsm->index), + dsm_function_name(dsm, function_index)); } static void acpi_spmc_probe_dsm(struct acpi_spmc_softc *const sc, const struct dsm_desc *const dsm); -static void acpi_spmc_dsm_print_functions( +static void acpi_spmc_dsm_print( const struct acpi_spmc_softc *const sc, const struct dsm_desc *const dsm); static int acpi_spmc_get_constraints(struct acpi_spmc_softc *const sc); @@ -416,7 +458,7 @@ acpi_spmc_attach(device_t dev) /* Print supported functions of usable DSMs. */ for (int i = 0; i < nitems(dsms); ++i) if (has_dsm(sc, i)) - acpi_spmc_dsm_print_functions(sc, dsms[i]); + acpi_spmc_dsm_print(sc, dsms[i]); /* Get device constraints. We can only call this once so do this now. */ error = acpi_spmc_get_constraints(sc); @@ -445,8 +487,15 @@ acpi_spmc_detach(device_t dev) return (0); } +static uint64_t +dsm_missing_functions(const struct dsm_desc *const dsm, + uint64_t supported_functions) +{ + return (dsm->expected_functions & ~supported_functions); +} + static void -acpi_spmc_dsm_print_functions(const struct acpi_spmc_softc *const sc, +acpi_spmc_dsm_print(const struct acpi_spmc_softc *const sc, const struct dsm_desc *const dsm) { /* @@ -455,16 +504,17 @@ acpi_spmc_dsm_print_functions(const struct acpi_spmc_softc *const sc, * report as unknown. */ const uint64_t supported_functions = ~IDX_TO_BIT(DSM_ENUM_FUNCTIONS) & - sc->dsms_info[dsm->index].supported_functions; - const uint64_t missing = dsm->expected_functions & ~supported_functions; + get_supported_functions(sc, dsm->index); + const uint64_t missing = dsm_missing_functions(dsm, supported_functions); const uint64_t unknown = supported_functions & ~(dsm->expected_functions | dsm->extra_functions); char buf[128]; print_bit_field(buf, sizeof(buf), supported_functions, "FUNC", pbf_function_name, dsm); - device_printf(sc->dev, "DSM %s: Supported functions: %#" PRIx64 "%s\n", - dsm->name, supported_functions, buf); + device_printf(sc->dev, + "DSM %s, revision %d: Supported functions: %#" PRIx64 "%s\n", + dsm->name, get_revision(sc, dsm->index), supported_functions, buf); if (VERBOSE() && missing != 0) { print_bit_field(buf, sizeof(buf), missing, "FUNC", @@ -483,19 +533,69 @@ acpi_spmc_dsm_print_functions(const struct acpi_spmc_softc *const sc, } } +/* Returns whether the DSM is supported (enumeration succeeds). */ +static bool +probe_dsm_revision(const struct acpi_spmc_softc *const sc, + const struct dsm_desc *const dsm, const uint8_t revision, + uint64_t *const supported_functions) +{ + *supported_functions = acpi_DSMQuery(sc->handle, + (const uint8_t *)&dsm->uuid, revision); + return (has_dsm_bitset(*supported_functions)); +} + +static void +set_dsm_revision(struct acpi_spmc_softc *const sc, + const struct dsm_desc *const dsm, const uint8_t revision, + uint64_t supported_functions) +{ + struct dsm_info *const dsm_info = get_dsm_info(sc, dsm->index); + + MPASS(has_dsm_bitset(supported_functions)); + dsm_info->supported_functions = supported_functions; + dsm_info->revision = revision; +} + static void acpi_spmc_probe_dsm(struct acpi_spmc_softc *const sc, const struct dsm_desc *const dsm) { - const uint64_t supported_functions = acpi_DSMQuery(sc->handle, - (const uint8_t *)&dsm->uuid, dsm->revision); + const int8_t revision_spec = *dsm->revision_spec; + uint64_t supported_functions; + + if (revision_spec >= 0) { + /* Specific revision specified. */ + if (probe_dsm_revision(sc, dsm, revision_spec, + &supported_functions)) + set_dsm_revision(sc, dsm, revision_spec, + supported_functions); + return; + } /* - * DSM is supported if bit 0 is set. + * Auto-detect. We try revisions in ascending order, selecting the + * first that has all the functions we expect in the hope to avoid potential + * backwards-compatibility problems, else continuing with higher ones + * but adopting them only if they actually add new functions (it seems + * common that firmwares do not care about the revision, or will return + * the same supported functions after a revision limit). */ - if ((supported_functions & IDX_TO_BIT(DSM_ENUM_FUNCTIONS)) == 0) - return; - sc->dsms_info[dsm->index].supported_functions = supported_functions; + for (uint8_t revision = 0; revision <= -revision_spec; ++revision) { + if (!probe_dsm_revision(sc, dsm, revision, + &supported_functions)) + continue; + if ((~get_supported_functions(sc, dsm->index) & + supported_functions) == 0) + /* This revision adds no new function, skip it. */ + continue; + + set_dsm_revision(sc, dsm, revision, supported_functions); + + if (dsm_missing_functions(dsm, ~IDX_TO_BIT(DSM_ENUM_FUNCTIONS) & + supported_functions) == 0) + /* We have all expected functions, bail out. */ + break; + } } static void @@ -627,7 +727,7 @@ acpi_spmc_parse_constraints_amd(struct acpi_spmc_softc *sc, ACPI_OBJECT *object) static int acpi_spmc_get_constraints(struct acpi_spmc_softc *const sc) { - struct dsm_desc *dsm; + const struct dsm_desc *dsm; ACPI_STATUS status; ACPI_BUFFER result; ACPI_OBJECT *object; @@ -657,9 +757,9 @@ acpi_spmc_get_constraints(struct acpi_spmc_softc *const sc) return (0); /* It seems like this DSM can fail if called more than once. */ - status = acpi_EvaluateDSMTyped(sc->handle, (uint8_t *)&dsm->uuid, - dsm->revision, DSM_GET_DEVICE_CONSTRAINTS, NULL, &result, - ACPI_TYPE_PACKAGE); + status = acpi_EvaluateDSMTyped(sc->handle, (const uint8_t *)&dsm->uuid, + get_revision(sc, dsm->index), DSM_GET_DEVICE_CONSTRAINTS, NULL, + &result, ACPI_TYPE_PACKAGE); if (ACPI_FAILURE(status)) { failed_to_call_dsm(sc, dsm, DSM_GET_DEVICE_CONSTRAINTS); return (ENXIO); @@ -765,7 +865,8 @@ acpi_spmc_run(device_t dev, const struct dsm_desc *const dsm, return; status = acpi_EvaluateDSMTyped(sc->handle, (const uint8_t *)&dsm->uuid, - dsm->revision, function_index, NULL, &result, ACPI_TYPE_ANY); + get_revision(sc, dsm->index), function_index, NULL, + &result, ACPI_TYPE_ANY); if (ACPI_FAILURE(status)) failed_to_call_dsm(sc, dsm, function_index); From nobody Wed May 13 12:40:08 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gFtMr3C3Gz6dLMh for ; Wed, 13 May 2026 12:40: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFtMr0rGlz3wBW for ; Wed, 13 May 2026 12:40:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778676008; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dBhUFxwZhNFmlSvbnDBAZ+GvUWfzTyb3fUG19AuFA3o=; b=iwmr2YvyYS5Z1GQ4Phg9yb367pJ/22R4MEEZNSOe8bGyjEtNr88MMysiC4JF+Q02V0XHYF BnGWqDf+ZCAYz/hPR9WEVqxY3koIWeFemHJp3lK3BPva9nQN1VIXsF3Po+I7j6R15L1/in /oKzziijMSZfmsxx5IsjoE2k5PVvprFtBN72kxJ85R/NgPF1QcVoony+Ncl1YHxRGJWx/N nWAkZBdY2Ah8K+OWSIqbj+WJSo8dfesuUUSvW1GeLjmxy/aTtKnM/fcn9LzjnyzMeSPcel /D6QTnSLk3UeyQ5w1DGCljz3NegMOJkG7z87Pw1iHrh5OU1B0zi7gnYMQx5Apg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778676008; a=rsa-sha256; cv=none; b=ZoiIjrmlee6qrn8atOTQMv7906ZXe2wg8iTe26ad4OiMfvw1gUgvHIpqPIthSxfcNSFT0f yJmaCHwzFk35DQSmfCAMeG0uRtshmLRwTEmE4WhxVugX1DwNRaCGYXFDva1S2ExX//X8hs u27ZyUtglJpc2aW6avLdIb9u/wLIdX5krKSEGrq4HzTIrhBztBMe/5GZDJR+7O0SClexb6 Pr32k89T9al3on6MvBB9pYLScv1Egx5oMj11yYFH6JcYN5AjSpJM1aSg5J9IERyh7iCsPb YL00XOm5FJdqaKhV1JA4M11NDzrJLIFR+JwsXawqcwQsKaMF15TkngrjywHFkA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778676008; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dBhUFxwZhNFmlSvbnDBAZ+GvUWfzTyb3fUG19AuFA3o=; b=HJY4je+Wr6KVMqsbKoaX2+MdB6nqWdNvWjvr/H5OIR+d19uw2jYJDqaoVYxq6nErpZSAbE 3yjTbUI/nkuitbQ6GdKPO+fIOuZ5f5SMuVVGk99V3k4t0F4E5bnCRnh8uawhDUkqR5novA +LFH/EGS0muIgP6sYoz2KvSoRt7zzbRpFWYt+frzXcJnVZHT58cNJFlAIq4nSa7qNSWG2G mD5Hy4TgH2NYKhSfZrrkW+mcvHJzm6+4ykGvMnOaYPqDhKSuaJc3xINdmXaV0ppz2cu2eI Dw1QYWfEvbqLIJcWg+enTXhTKzC/zh7bD7dmox5MDpNegYhSfOZSpC35B21Qmg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFtMr0Nzpzqm2 for ; Wed, 13 May 2026 12:40:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1be79 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 12:40:08 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 91d3fb31e858 - main - acpi_spmc(4): If verbose, print called functions List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 91d3fb31e858404f62d4a3afae2e209796968c3d Auto-Submitted: auto-generated Date: Wed, 13 May 2026 12:40:08 +0000 Message-Id: <6a047128.1be79.3709ba8d@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=91d3fb31e858404f62d4a3afae2e209796968c3d commit 91d3fb31e858404f62d4a3afae2e209796968c3d Author: Olivier Certner AuthorDate: 2026-05-07 16:15:21 +0000 Commit: Olivier Certner CommitDate: 2026-05-13 12:38:26 +0000 acpi_spmc(4): If verbose, print called functions ...as a debugging aid, in order to be able to check that some functions are effectively called and to identify them quickly if they cause a hang. Reviewed by: obiwac Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D56883 --- sys/dev/acpica/acpi_spmc.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/sys/dev/acpica/acpi_spmc.c b/sys/dev/acpica/acpi_spmc.c index fcd4105b2a76..8cb1d2878d88 100644 --- a/sys/dev/acpica/acpi_spmc.c +++ b/sys/dev/acpica/acpi_spmc.c @@ -763,7 +763,8 @@ acpi_spmc_get_constraints(struct acpi_spmc_softc *const sc) if (ACPI_FAILURE(status)) { failed_to_call_dsm(sc, dsm, DSM_GET_DEVICE_CONSTRAINTS); return (ENXIO); - } + } else if (VERBOSE()) + device_printf(sc->dev, "Constraints: Retrieved successfully\n"); object = (ACPI_OBJECT *)result.Pointer; if (dsm == &dsm_intel) @@ -864,14 +865,21 @@ acpi_spmc_run(device_t dev, const struct dsm_desc *const dsm, (force_call_expected_functions && has_dsm(sc, dsm->index)))) return; + if (VERBOSE()) + device_printf(dev, "DSM %s: Calling function %s\n", + dsm->name, dsm_function_name(dsm, function_index)); status = acpi_EvaluateDSMTyped(sc->handle, (const uint8_t *)&dsm->uuid, get_revision(sc, dsm->index), function_index, NULL, &result, ACPI_TYPE_ANY); if (ACPI_FAILURE(status)) failed_to_call_dsm(sc, dsm, function_index); - else + else { + if (VERBOSE()) + device_printf(dev, "DSM %s: Function %s successful\n", + dsm->name, dsm_function_name(dsm, function_index)); AcpiOsFree(result.Pointer); + } } /* From nobody Wed May 13 12:40:09 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gFtMs40Ghz6dLVR for ; Wed, 13 May 2026 12:40: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFtMs1C4vz3wSm for ; Wed, 13 May 2026 12:40:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778676009; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3F7wPUanrRv0WAl+lg63W/6EnpARV1xDIISAhJssQlE=; b=MYCvF+eaTnZt0flRfV1jcmU+yFtvLczaSIDA72zFwO5dIe9U5Gi2dJjcOBSQCf1D2VC02O aGH+cLFg4vsbCuDZKXH/hSRTwpFoxCVo/uqLNWP+zMthn5gA8qVlsifhqLC8GURqt8E914 3y7XUbf59+e5Co52LyJ/Cc3BLzE6QE2nsnEoVl4UipiclSaUKboWa6ebC8/7N7liDW7OUY inXwcGvoKospI0YAt8933qqZo3/ZQriKfnbOTGUsr2UsGS3XpM+1u/LgdxKpacIhtDivBS HykUWFBbIDb8zFg12SrAheNUEaWMSAPXB+vK+iEM0oWQUUP0a6uvXPHe0byeQQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778676009; a=rsa-sha256; cv=none; b=hUwWNFOV35DZ1ZZfNwd8nmTNN6iRSmriApgf4GVTnXSedg7zhNzajz1leFTki4fZzDrklW brDs3lR3wW8YuR3W8LjWGHpVKoqw2SSvZiOXo9/AJO5iLyKmlwXc0a6PuOtPgMSMIXTAiX +DajwCBKyuXLVhzrc3eS7mNjxLOijoVmJ4j4Py7TbQ3ITckhmYWLJwiOMAYk+/fQ+vr1Lk jlbwIbx1tBXiWC0CISAOvT+eauIJCM4Mv9/+7nWKt54+2qJlcxx+mfXuzmKh2gAvttCfkM bCul+JBmRBUNMs4vrkMwbCwFjJIe7eN8CgCnRcgB5SA6dLvAV1y8+O2bNFN9EA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778676009; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3F7wPUanrRv0WAl+lg63W/6EnpARV1xDIISAhJssQlE=; b=V+lf0mEhGklnaesR7tEFs8s1cWuUxiD+2O3E8TaB9A+SJt1jDAZy1tyRxtD/9bL1mv3KCY xVoA96nps4AKboWYH2oDdI++3tC9cyDMdFDanDvPs7c1GrmrLcP5RZjy8yHDK47Y+wj3GL apT3XVrVKnkcl/C1psIWkpgGnKhyB7Xw/r5GGtIAvNORARjKm7dOTHD+W3FFhhAgz9z24+ hIYh3Uwk7/rW2KcV5sfH2fsK3hK50aSzYlSGpiQmGOf/ADjjRY8wgcjFvaIpah/1P+Qi+w ifYq5u7rADyTluMWdXCnHR1cFgpuQbVzYazF9I01M/HL8zxKiHtR5Pkt2SIeig== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFtMs0hwRzrRH for ; Wed, 13 May 2026 12:40:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c715 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 12:40:09 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 23005ed3a1c8 - main - acpi_spmc(4): Update copyright List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 23005ed3a1c8f6c111dff71b17daa6549b59a98a Auto-Submitted: auto-generated Date: Wed, 13 May 2026 12:40:09 +0000 Message-Id: <6a047129.1c715.545886b8@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=23005ed3a1c8f6c111dff71b17daa6549b59a98a commit 23005ed3a1c8f6c111dff71b17daa6549b59a98a Author: Olivier Certner AuthorDate: 2026-05-12 15:10:34 +0000 Commit: Olivier Certner CommitDate: 2026-05-13 12:38:26 +0000 acpi_spmc(4): Update copyright Sponsored by: The FreeBSD Foundation --- sys/dev/acpica/acpi_spmc.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/dev/acpica/acpi_spmc.c b/sys/dev/acpica/acpi_spmc.c index 8cb1d2878d88..c8e2cf4c3733 100644 --- a/sys/dev/acpica/acpi_spmc.c +++ b/sys/dev/acpica/acpi_spmc.c @@ -5,6 +5,10 @@ * * This software was developed by Aymeric Wibo * under sponsorship from the FreeBSD Foundation. + * + * Portions of this software were developed by Olivier Certner + * at Kumacom SARL under sponsorship from the FreeBSD + * Foundation. */ #include From nobody Wed May 13 13:41:24 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gFvkd53qSz6dQM3 for ; Wed, 13 May 2026 13:41: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFvkd24qBz3JhM for ; Wed, 13 May 2026 13:41:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778679689; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Bk1OTKUcq7whnQk+pc/fHsnAtZ3rb2GrDLhHBx4WMqI=; b=AzsyJrh3JUeEkjmGwwLKn7715uWMjLItTnZDIkNj3r3dB/UJnXli76Tj4xR3t7Cn4Nonrn EAJU6nx64bNT6MuF9/HnOxQVWje3yoYjsNTnBTF/QHCbuVjakC5011qFHRmY/Dbef1teQL xavO4irdKqmFIzG6tlva3GUKUt38i0aU66oXaa72svCjeb5rckLyAIyfvEKCC0baSkCtYs YkdgfJUBP8hvnUnfAYBDdzlVmPJqKhz3NwcuFPTPpUH6srHKpQpaKx/iz8vaqff+OjLRUx meUlrSXJZoSj2xAuFRlltNmrl3V3eoD6ua4GK9xl5xllCGMT8412luk2V6RxDw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778679689; a=rsa-sha256; cv=none; b=DG+D7amtZfxfr0J5PiVZ1gZDXDTSW+TSqVnN00rJhezmnAy1M/GFSX9AZpfQkoDaBCtzDK BT1eQ8NorX8O248e2xEjKE43yXh18TdmAdneQ5c1C4MUSy/O+r4WxS4f5ozTuzxdeUwnvE 7cTCL2ekECJz7lb6g2VWMZTN0YxQr18qNxN28Nf2bez5IFXlsaNwubfaSFMLyZUqomEmsN neo0JcO5wxaStrdYQ866ASUuQ/fRTJRl9Pu6I3xO7e9wEJZeR0UthAjA8J0Z+fLO0d3hXN SxK1xTMFdqcraaH6VmzUvT+LWSb9e2BqNtl76Ln4mNzRAcsD1St2ddwTZzy0lw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778679689; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Bk1OTKUcq7whnQk+pc/fHsnAtZ3rb2GrDLhHBx4WMqI=; b=MyOLe3uxLACb1VgzerdEXNTf+fn4AaOCAb8f1PyLSPHr3idgM+W8Y1oeCA3MSsWulzKuOd ad7529nytmdELrxgGfrCfPeNAgSi1rBYdT1A8HaO7V0cC8HI1hjgARa1ZC7W16NH5k5Hn3 DnTm9C9N+6OSFm7em3g5TfQSdR8v63Olv8d7mk2o6CPzcLrmlSpPxpURO8XEuwiXp2ip4T PouEooyCjEPgz7HA4iIhSDg1FuRiwwEidUZj1eGVRLB7bH8uXeh+5GWP02B7WNnsu3Kxdx qDZgV08dd+ofArCv29QkiSqhXOiR0E6dlIO5QPl7zT+UDfmyeCNiAxOd//0J/A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFvkd1g2gztLR for ; Wed, 13 May 2026 13:41:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 23161 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 13:41:24 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: f6178451eea5 - main - src.opts.mk: Comment about CTF & DTRACE relationship List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: f6178451eea5b1ce6802fbb0e6eceb555c7b4841 Auto-Submitted: auto-generated Date: Wed, 13 May 2026 13:41:24 +0000 Message-Id: <6a047f84.23161.627f2390@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=f6178451eea5b1ce6802fbb0e6eceb555c7b4841 commit f6178451eea5b1ce6802fbb0e6eceb555c7b4841 Author: Ed Maste AuthorDate: 2026-05-12 17:19:46 +0000 Commit: Ed Maste CommitDate: 2026-05-13 13:37:58 +0000 src.opts.mk: Comment about CTF & DTRACE relationship WITH_CTF enables building userland components with CTF, and not the ctf* tools as one might expect. The tools are actually included with the DTRACE knob. Add a comment where the dependency is handled, as this has caused confusion. Reported by: ivy Reviewed by: markj Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D56977 --- share/mk/src.opts.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index 506b36b3d4b0..1fd63eb0db31 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -429,6 +429,8 @@ MK_KERBEROS_SUPPORT:= no MK_MITKRB5:= no .endif +# MK_DTRACE also gates ctf tools, so we cannot build userland with CTF +# if it is off. .if ${MK_DTRACE} == "no" MK_CTF:= no .endif From nobody Wed May 13 14:04:50 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gFwFh0Yh3z6dRkb for ; Wed, 13 May 2026 14:04: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFwFh03KPz3NGG for ; Wed, 13 May 2026 14:04:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778681096; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RKR5F62MMUGjaP5g5vavRqs+9xRHYuSC17XieKPUY5M=; b=N1lwX1NgioLADLBGjXN95rZ8xMZC6GfJkQxu+iAZF7/txXluBcXKunWt1VFgDoiNzpwdKu MAGMXJ4cNJ7Eiq3a/RR6VZTVVC8RA+8CK9QgO5DBMDawnw+W39UUKf6Ohy1kSgKbfr/2Dd 3YQRLWvxcjocT+o4JebT9kc8k9xYD2lGxeyb39Id26sa3WDBLRIsQj9psBNbNYCilWSlQK soEQsqzYjbnOIG3bQaKDyA2lc92whRbvvRwmoMrxRagTRIJ4BxVuSL19NM1zMmSfutj2qj A9pDg6vU+JdAqXNdMSdsvnSEWO5lbU7EMQvntsp0GqTzB8Uf8xgZouAhtkWfsw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778681096; a=rsa-sha256; cv=none; b=fL65jPBX8UA0yb1LWFFUV5rxRyb9veg1waivx/yL+0f97PEW7tD0zk7O85ZihMwVlBd/yW QBmq6QiusAO/ZtcThEC9QFFO7YxVOiUXb6LQGeTL8uwbVjeE5ScizPFTQeRq2zkmIkAZI/ vpGwFsB9hDLGs9iGRY9reBUDbfFf+Qr1jZZ3CXmIRxufP4BIN505b3dZ41LnSPQYHJB2tn zhLOVQJi/3zwAL5vBsTMcymmpnI0I3vTtm61xgBITdMIM1A+ec8y/t6w42PA9mL+q895qk t0noifiZptQFy1Hzrj7VMJjIP3dnuQ8xIgpZPZGE739eEUbQHq7mqfUjuDK2WQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778681096; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RKR5F62MMUGjaP5g5vavRqs+9xRHYuSC17XieKPUY5M=; b=Nzu5iMEbVSf448uNECagdJVS+bExPdPbeFSJuM1QY77fvv2JvdP+HSC+vT4+FgDPk/7JxL uWjJiX6KZtdyAN2cmBtqbHMV2amQVw++e/r+Ltq3RFezVtBEn6xhE0AdmLnN1+YTGy/MkA lv9KKrcqcoFyvEmYIfVlEuVdbyEbVvb6uLd5tuRMNkP+nw1UTAze+yBqbcxwje7jMyAr5t G9NSnyjzzF/pM9twCksuP9/XMnwpNwjvNdE77NVvpNdCmzCTZ66eEzy+tHO2QncbIwOB/g b76TEmNZv8SJXMkqs2v93rQYHvKM80bRfFPAs4v0ussJUmhx3h8qefF6JbMmgg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFwFg6kFdztNX for ; Wed, 13 May 2026 14:04:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 23e72 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 14:04:50 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 0cef1a9ae5ec - stable/15 - sys: Fix heap disclosure in compat7 kern.proc.filedesc sysctl List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 0cef1a9ae5ec90b2c4717de9bc33fc7c3b1fd705 Auto-Submitted: auto-generated Date: Wed, 13 May 2026 14:04:50 +0000 Message-Id: <6a048502.23e72.4f47b8e5@gitrepo.freebsd.org> The branch stable/15 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=0cef1a9ae5ec90b2c4717de9bc33fc7c3b1fd705 commit 0cef1a9ae5ec90b2c4717de9bc33fc7c3b1fd705 Author: Ed Maste AuthorDate: 2026-05-12 16:25:01 +0000 Commit: Ed Maste CommitDate: 2026-05-13 14:04:27 +0000 sys: Fix heap disclosure in compat7 kern.proc.filedesc sysctl Reported by: Yuxiang Yang, Yizhou Zhao, Ao Wang, Xuewei Feng, Qi Li, and Ke Xu from Tsinghua University using GLM-5.1 from Z.ai Reviewed by: markj Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D56976 (cherry picked from commit e68433e1990d5f1bcc1bdd270d65f1e4792a8e1b) --- sys/kern/kern_descrip.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c index 2fa0621bdfca..ec9fbdae2fa7 100644 --- a/sys/kern/kern_descrip.c +++ b/sys/kern/kern_descrip.c @@ -5107,7 +5107,7 @@ sysctl_kern_proc_ofiledesc(SYSCTL_HANDLER_ARGS) return (ENOENT); } kif = malloc(sizeof(*kif), M_TEMP, M_WAITOK); - okif = malloc(sizeof(*okif), M_TEMP, M_WAITOK); + okif = malloc(sizeof(*okif), M_TEMP, M_WAITOK | M_ZERO); PWDDESC_XLOCK(pdp); pwd = pwd_hold_pwddesc(pdp); if (pwd != NULL) { From nobody Wed May 13 14:05:40 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gFwGY0mpTz6dRnD for ; Wed, 13 May 2026 14:05: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFwGX6wJvz3NP3 for ; Wed, 13 May 2026 14:05:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778681141; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xd/JOfT7065sShucdnRzFWONc1umgYe2CixI7Cn2r4I=; b=mu7DI9myQ7q7e2ozbQIkeYEzvfwlkqU9/l+fC0Y98v4xjNnPeyWnBdUrEn7HCEMDECeDAI L20fYRwLehRiO1HMGLhsSuuiB+IHgC5++kwhBahozCUJLd5Am7tafTscxSE6nReKW2ojNK rHtxt0UJJ+ZhK9dObiu+p1zt8477ut5mwhB5tqnqDezBiEncQxxiD1HNFTXcgVB+apkdNq sd3igyIze1BX0V5jwNQMyt66DZQOM8JcviAKhEsO/sAnk4PPY293drRID99/lpTYVGYQ3m 8ayUU34ozLLCmdlcP+hlImXSvvGkU7T8dZqGJWtLMNHUKS8nPt9/9El3VorGHg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778681141; a=rsa-sha256; cv=none; b=afI2kjPxGsv6ENT90Pd3uwyzKlZIKYsp13gXFmyjOmzbh3E9yVCrmbgI3UAC1lfJ+u9C1+ 1Jq0RidXjHLQbPuJUGxLG/5L5YwdFfIElk+scqttUYikPZiny2qArRKNW9vp92IrEqfb5t Nu+UJsLuIZ+KtFZGHm2pwS7t5Gc94IKKhcWzvFh6ahfAuheAh9wL794Dig4x+nZBZtRQqP b9LOeGrJhe1sC8/3/ny+ktKDPsrVW9vi4srn5uy/Nj5olIZzNTPPAUlT6p7aUOraKjOaHA K4xYDIcLqaYuhjS8oH8fEH1gTy25XV0QpXU7RgBh/EQV9lPgAX6WZ/uK+qDwGQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778681141; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xd/JOfT7065sShucdnRzFWONc1umgYe2CixI7Cn2r4I=; b=YS6sQKT693uht1FveUFOZyhRslFcLa4I0JpRWJ27orqE9SPGfpPPjHNajxedgNCuO3CvVZ tStCaMNX6txkTKLPVpPQeX2I9vgAun+ZxPHVMqs/PY3CN+PxK32jOvYaZPDu35x1Fu2RaY /tVICF/sCFdPQ7Khtq9vLvWvuPlwYvIjkxL5qxeQHQ/Ij1nJP/QOiH7+Qhu9WzVC0hzWAH MsTzxHyawIVdO8ozVP9FnkNroI4UMp8VzZeso766TQamSMwZjTbhV47Pavm6lzW4xSLt+X DPoP3g1npONyk7MV55ulSD2vwP8H0n5NF2cMDS2QYSe5gvjHBQAl1lfWEN/QVg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFwGX6T27ztNY for ; Wed, 13 May 2026 14:05:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 259dc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 14:05:40 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 5e6b16f4555c - stable/14 - sys: Fix heap disclosure in compat7 kern.proc.filedesc sysctl List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 5e6b16f4555cba4422dde7c63344359019a23722 Auto-Submitted: auto-generated Date: Wed, 13 May 2026 14:05:40 +0000 Message-Id: <6a048534.259dc.63389add@gitrepo.freebsd.org> The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=5e6b16f4555cba4422dde7c63344359019a23722 commit 5e6b16f4555cba4422dde7c63344359019a23722 Author: Ed Maste AuthorDate: 2026-05-12 16:25:01 +0000 Commit: Ed Maste CommitDate: 2026-05-13 14:05:26 +0000 sys: Fix heap disclosure in compat7 kern.proc.filedesc sysctl Reported by: Yuxiang Yang, Yizhou Zhao, Ao Wang, Xuewei Feng, Qi Li, and Ke Xu from Tsinghua University using GLM-5.1 from Z.ai Reviewed by: markj Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D56976 (cherry picked from commit e68433e1990d5f1bcc1bdd270d65f1e4792a8e1b) (cherry picked from commit 0cef1a9ae5ec90b2c4717de9bc33fc7c3b1fd705) --- sys/kern/kern_descrip.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c index 51752aa8ab33..9980c4c9a99d 100644 --- a/sys/kern/kern_descrip.c +++ b/sys/kern/kern_descrip.c @@ -4963,7 +4963,7 @@ sysctl_kern_proc_ofiledesc(SYSCTL_HANDLER_ARGS) return (ENOENT); } kif = malloc(sizeof(*kif), M_TEMP, M_WAITOK); - okif = malloc(sizeof(*okif), M_TEMP, M_WAITOK); + okif = malloc(sizeof(*okif), M_TEMP, M_WAITOK | M_ZERO); PWDDESC_XLOCK(pdp); pwd = pwd_hold_pwddesc(pdp); if (pwd != NULL) { From nobody Wed May 13 14:06:19 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gFwHN4xwgz6dRyn for ; Wed, 13 May 2026 14:06: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFwHN4LW8z3NvQ for ; Wed, 13 May 2026 14:06:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778681184; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/0kSFQDUD1jygMxBkkhXLtAt7oFEe4edJ8k97v4hDJc=; b=tYGVXLkrXVCNXwlMZ7AvJKfpEAgi60cH5bHrdXRTK0lyCEmf/0+R6zLLT7Ch5z46emCafv WLlK4Zoo/EoVnkdBMC7Xhzc7DG69Us/spY9JjVDCGbSPlgaOfxDIBZYu1AeiQX3sgDdQcO C3/q1h1YmYoujdXtgxRiliH1zW3qqUz7y7yBM1M8WzUjX/e3IqcItVxZpPgAys5QD3BFcQ 83AqpjnZpRodmtrCAr9bKew3nLyldqOnpZIi/WtmrX6xAPH3jy7gZjDhaoOtvfFDNueOof 0cwZEEwzfCD/kqPJEbkITAXM2fdW6YoeC+MeS8EPrypyU8VFdsCSmWJxQl7RcA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778681184; a=rsa-sha256; cv=none; b=Av8zax2WhQoKtpx86qchN5YyiI8DluOLbcoruyp2js1oLpNI2lpNWqb3itrk5T9ynlmOWH Pr6j5/WfeX3ujQ1DbzQ3deVUSj/V+gwUP7+LTPtCLY/sYl9NdtdWIkJvel/D/7uU3WW4U2 HHU/VlSY/P63q/SFSvmFVFtFj6TC8XR5IShMw5NBt8k2696aJCsIFCGasiCyl8BolSF1tb z1x31bVFd3uw+F0oI2quw38FdFjz0tZHNetvBObue0sTuPRO+MimNqRilqKMT6/OKJ9cYs quR8dJTeG1gdKSvnDcARr8+dZUeK1bNeGUUD8SNzTTlZnnM62qbN9Kumy0Z8oQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778681184; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/0kSFQDUD1jygMxBkkhXLtAt7oFEe4edJ8k97v4hDJc=; b=Y+5ikCMo2A8OuXi2RQzr616ND7DjUNw62jyY4iZIWOXpxPf6pCh3RxHz2BDCCqVoh8Gk1Z NOvGAlzWJ0Gy+bq9IfszR8QPZecrR1hojE+rqPnRf/al3qMMFS2Zl5bl5BpmbflcfT/ZFM On2ulg4PUXiLX70eITpS52zjlJn1+2YNLUBzgAtTs67S/f45W+AOdxfi3Yh5RC9YAAIt9K a+Zep2Wwf/BcEOtO/5j50q9KJBqdxgIlt+x4Ni6Z0JJdceHiJibPF+JpnfG9h+HkUdUoXo nOFHurk8DxYVrg8mc/qN91xcWp4mxlvj6+e7BfvgMe7BvbSqP2xEf6G36CRGsg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFwHN3nvZztNZ for ; Wed, 13 May 2026 14:06:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 25093 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 14:06:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: c5c5705e6496 - stable/13 - sys: Fix heap disclosure in compat7 kern.proc.filedesc sysctl List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: c5c5705e649642810552559a3b849d9ff5d573b6 Auto-Submitted: auto-generated Date: Wed, 13 May 2026 14:06:19 +0000 Message-Id: <6a04855b.25093.3d2661ff@gitrepo.freebsd.org> The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=c5c5705e649642810552559a3b849d9ff5d573b6 commit c5c5705e649642810552559a3b849d9ff5d573b6 Author: Ed Maste AuthorDate: 2026-05-12 16:25:01 +0000 Commit: Ed Maste CommitDate: 2026-05-13 14:06:04 +0000 sys: Fix heap disclosure in compat7 kern.proc.filedesc sysctl Reported by: Yuxiang Yang, Yizhou Zhao, Ao Wang, Xuewei Feng, Qi Li, and Ke Xu from Tsinghua University using GLM-5.1 from Z.ai Reviewed by: markj Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D56976 (cherry picked from commit e68433e1990d5f1bcc1bdd270d65f1e4792a8e1b) (cherry picked from commit 0cef1a9ae5ec90b2c4717de9bc33fc7c3b1fd705) (cherry picked from commit 5e6b16f4555cba4422dde7c63344359019a23722) --- sys/kern/kern_descrip.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c index 2412c5e4e332..40046ef9110f 100644 --- a/sys/kern/kern_descrip.c +++ b/sys/kern/kern_descrip.c @@ -4902,7 +4902,7 @@ sysctl_kern_proc_ofiledesc(SYSCTL_HANDLER_ARGS) return (ENOENT); } kif = malloc(sizeof(*kif), M_TEMP, M_WAITOK); - okif = malloc(sizeof(*okif), M_TEMP, M_WAITOK); + okif = malloc(sizeof(*okif), M_TEMP, M_WAITOK | M_ZERO); PWDDESC_XLOCK(pdp); pwd = pwd_hold_pwddesc(pdp); if (pwd != NULL) { From nobody Wed May 13 14:19:32 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gFwZY19pyz6dSrB for ; Wed, 13 May 2026 14:19:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFwZY0R26z3Pyj for ; Wed, 13 May 2026 14:19:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778681973; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=F7z4sYc+KF+OUrcT/tUi+v9UqTdIFpOX3lhaQkJ9BEM=; b=SPYemfmoUtAWP8YJQ4772zUNDE1o6Kjc/VBVsQWoi7T+tNA09uCARr3Eb1H3+7Q7qSS1IG Nx/GXge2gXjg4kGISAtagey57IhzlEfS5+SRAd7b+AoUdZmv64ctd2lvsZSXWH1LQadRB5 h0cBMeAdZgFZNeIEAvWEiquE0/RY2mViPqYiN+IQHQD9k8CeAywVLm8uImIgRaebnjB0G1 CozQxmQ+6I5Zcwtu65mGnECwzardTP9NXcirVqyBjcgDN5HO90ECzfYAL7N8ovqRKiQlH9 XDQC7P/D9grSNb1am9Zo22FYIxcIvh86Wfghlunpkgylpb/uevTd90rCT5x32A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778681973; a=rsa-sha256; cv=none; b=rhfylO9S0H6pIxiwNZ3r2gr7YZsNHkDhWd7Zok1DCRv2Pd9WP6A+IuTBul/bwTA8nYs9ti nlsvieRsyhX8FnXx4JcetUbVtJtqEeYKeTQHp2WhRK68Ajj7IKx3jx0uJOK17Fc8jPJ4Ou VkdegtvHbfP2J2gM3Q8fqhbQp5qdfFIW+lmncB2Y6bejCDDSt9GHQku4tsz3f3gGr8jof+ 4HL4UVM89medbNruj38BHIQqcJr5CxnQ3iqZBph7j3VhJxKrKR2gJQOiqou98qNbaRByMD HHXyqVuY/Qog9zOyPPGLfWPnz0kAHZImWa/IFiPzuhIMx31I8Ja5MM1S2H/hAA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778681973; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=F7z4sYc+KF+OUrcT/tUi+v9UqTdIFpOX3lhaQkJ9BEM=; b=OOn3XGPV9gvLSNf3aZ7zONbGJJ9Hditv3R+pm9TMIPA+BBw6NDcLECdK9t77Y4/9UiVAU3 gB2rJuk8aiGs60GGMXXi76Rb9hcRTcXVtviaoKRHrjGrtbZORAQrDkT020J/7dbyNTBQse Jf3l6R1+mT8WweEQN0xvJGjAS9fk5kove9zDm4ZuQgEsnBTeG9pcLiBlZLRXW71lGx+4cI PWrQyRPoI3BceYnV2cTpSX97Bt5oyLts4gk6SJSFLNBWRsaIqAewT4Q5na5vCDRsx0KQvJ +peacAx2dTsii9pMPziWVXijNYwnWTbcCTPQ73c3tXU/Nhsvl5c686u6c5uviQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFwZY024Vzv5y for ; Wed, 13 May 2026 14:19:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26658 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 14:19:32 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: c3aa964109a8 - stable/13 - shm: Zero struct kinfo_file in sysctl handler List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: c3aa964109a8fdf0ee0f84bae5ccb1f0c386b485 Auto-Submitted: auto-generated Date: Wed, 13 May 2026 14:19:32 +0000 Message-Id: <6a048874.26658.6e9b46b7@gitrepo.freebsd.org> The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=c3aa964109a8fdf0ee0f84bae5ccb1f0c386b485 commit c3aa964109a8fdf0ee0f84bae5ccb1f0c386b485 Author: Ed Maste AuthorDate: 2026-03-11 01:59:07 +0000 Commit: Ed Maste CommitDate: 2026-05-13 14:06:05 +0000 shm: Zero struct kinfo_file in sysctl handler Reported by: Calif.io in collaboration with Claude and Anthropic Research Reviewed by: jhb Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55806 (cherry picked from commit 25cc459286a02b646751541ccde5a33319471c73) (cherry picked from commit 6348a5fd0d4792e752cb714f2a536c3287b8d580) (cherry picked from commit e61804ae6380c8d1db4b8c43bf7821e5d31ca04e) --- sys/kern/uipc_shm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/uipc_shm.c b/sys/kern/uipc_shm.c index 1df3a0967b09..150d82c89b69 100644 --- a/sys/kern/uipc_shm.c +++ b/sys/kern/uipc_shm.c @@ -2012,7 +2012,7 @@ sysctl_posix_shm_list(SYSCTL_HANDLER_ARGS) { struct shm_mapping *shmm; struct sbuf sb; - struct kinfo_file kif; + struct kinfo_file kif = {}; u_long i; ssize_t curlen; int error, error2; From nobody Wed May 13 14:19:34 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gFwZZ3kwWz6dSlZ for ; Wed, 13 May 2026 14:19:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFwZZ1Sy8z3QHQ for ; Wed, 13 May 2026 14:19:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778681974; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KG7pM/YfZQMJWW0XRZz599BzbsW8NRf2pjewOFH/dGU=; b=FZhtyc6L8P7N6J4CYTeh6Jz6WWSJL1zT5CX9ZARfQwWJUs+g4Q485WiwUx6FLvUT4hvpgD eUEFhMvF+6ijN8/w1jBOkgXE6cGOD+jsi8h99AXH0AJN/g22hmgmRfvw114fhe0g27Nn2v 0IpERooTeYFZYG4rI+3CCOj7fjvID7BrTweNZ2FPm2HGFcJerLFZyWaHz+LJnk4Mv9miHZ x5u+2sGtiCrwLeuSVHcrFgN7vnyjEbnMz60pyZFvKirpLh1IKeC93OEpORucFQz1SnQTs4 qrGOEs+uqgHIFzxz0VpjQ8U1gAmIZBD5IiOBU4/lbGONUBZ9n4tYAwlrno37uQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778681974; a=rsa-sha256; cv=none; b=Fu4EBmJv7LGPi3aVg8IJopnNw93chn78rpI8XZnIsr7tt3AAHwG3EQtobrlVjAMfy6vCGI yCuKeTCzQgAUecan41WXX+m5TQfE9Bj3aGWn91GbyYVGNQkaTZcLg7PSj6M5RZQAle05Zf x2O/8HChlB0AN/N4VsZr4xQhQl3FG0t59vzKK++FA4UtDkpGivGmJ5BQ3BUga2UF0Vi8Zv idYb8ydgeV4fEqfGWugC9sB+BPF5jnfs4YLSLEZkhhOfgfDyKcszObtDwAJqW+6Wgv7e6c mX3GhJf5nEoVKOPAaSXGU3JJEQiVFmIYOkLxnCVCkCGGS06urp7L7eXeBJOlHw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778681974; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KG7pM/YfZQMJWW0XRZz599BzbsW8NRf2pjewOFH/dGU=; b=IjYqieChWEWnC/oYOjTarsJugKYYpsA+KCydWgAdMn/yrLrtJq7oCd9pr2Lwrkpo8INv7D ZyLNTHnZE4ielaU8Ck7FojWNujxKNeF2/FY0slVfLyc5BIfNXCUi22O0OaK+WqiQ43nnPh dcHC49Zb4g1Az2QIGKWAfU4y+LGZlSRuEtc5HPt0R8kDypcw2FE6ZiqFDA5ASAhZ75jZXP n43XbQsIvxuY8lK3EamwcDlkwWWf4riBdKeNv7M4YdGbkT8e6JIneDlXWo49x43u4S153m fROeowpeswLmhpydVVZvGTb/CmZcq0Xnl/E9yqM16jCYkR+tOc/ZxDEdJ8SHfA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFwZZ0nJvztx3 for ; Wed, 13 May 2026 14:19:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 262b3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 14:19:34 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 7f4bc4555a53 - stable/13 - compat32: Zero struct to avoid stack disclosure List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 7f4bc4555a53f32c5990d16afe4cfab7aaf6f053 Auto-Submitted: auto-generated Date: Wed, 13 May 2026 14:19:34 +0000 Message-Id: <6a048876.262b3.2d386f29@gitrepo.freebsd.org> The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=7f4bc4555a53f32c5990d16afe4cfab7aaf6f053 commit 7f4bc4555a53f32c5990d16afe4cfab7aaf6f053 Author: Ed Maste AuthorDate: 2026-03-11 15:02:18 +0000 Commit: Ed Maste CommitDate: 2026-05-13 14:06:05 +0000 compat32: Zero struct to avoid stack disclosure Reported by: Adam Crosser, Praetorian Reviewed by: philip Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55811 (cherry picked from commit 097cb4e9f0432c543c704cec712ce1cd3302335c) (cherry picked from commit 4551ea3b3f04650cd5300a9eae8994bdb080db91) (cherry picked from commit 6a808cd7534802d30010fb0a7f46381ff9f6ef3f) --- sys/compat/freebsd32/freebsd32_misc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/compat/freebsd32/freebsd32_misc.c b/sys/compat/freebsd32/freebsd32_misc.c index ee0119dba5af..316578f9bb97 100644 --- a/sys/compat/freebsd32/freebsd32_misc.c +++ b/sys/compat/freebsd32/freebsd32_misc.c @@ -619,7 +619,7 @@ static int freebsd32_kevent_copyout(void *arg, struct kevent *kevp, int count) { struct freebsd32_kevent_args *uap; - struct kevent32 ks32[KQ_NEVENTS]; + struct kevent32 ks32[KQ_NEVENTS] = {}; uint64_t e; int i, j, error; From nobody Wed May 13 14:19:35 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gFwZb3PGwz6dSP6 for ; Wed, 13 May 2026 14:19:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFwZb1vPlz3QNC for ; Wed, 13 May 2026 14:19:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778681975; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ls3GftVxjATmkaZy0Arwsus0DyrUd5fwCNhTWgfhzKs=; b=m/IjbaNAb4b1Rnal7NOnJHGIsBESHZVmQWcXFst4f+c5/5slKKK3yD+oqp5tmsf6Rw2mWp W4iA1p+82L5lZR+70igpQUdyU5Lp1qtyFlm2HYyGP3i5dr7x/gKesTOqX3NF5EhssIRBna fsNqwOeyU08EaJY660M7YHtMqtrynyWaFt81Ka5MfZk/NemZ0nwT9IAw27xBdMsMeeSknE wXSvCOZdBxId84o3BIUji/8fkC2OQYMMofNz6eNJRAzdG3BvZoQs3WikDM/Bu3U/XJvLS4 mfTiZNIJpIcH0azhOd0spTs4I6mtIblVF+z2r9uQ6jvexNabzYdXhYM0cO2MMA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778681975; a=rsa-sha256; cv=none; b=javTftu2Ds+VlgwouP5ZL58Ka4H7+JHGLSSGJ+hiI4jC8Eebe3tVMwp8PQpZjy9P8evbay IEoT6F4ncpnXOC4+ttoFvFvPR2QTarxFfkZQKGaxc5PkX/6BTIQlISZ0rOgAJhNBudDvQB EdF318PHzoRZJlkFiT4ylKXYDG6l6kR+vVBJUqC7gziSPpgyOmc2iJQYE9g3zA6W9QuPW7 rTmJjOhNonxjy0LCNmymgraycSFAIfpOBwb8ryhBtTG2DgVlcsNBMD33k2yzzFaht23ndP byU2tAws9CGnkETiHZcDBJO3GsziGXiqPwwT5VBrcgXiwsGSYWGcKXkSSSuNyg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778681975; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ls3GftVxjATmkaZy0Arwsus0DyrUd5fwCNhTWgfhzKs=; b=okiOVxOWsB/JyC115zf4EGtgLftl1FwqmglJC76bETycvWyalGz6dzRGHLrG1vgY4jioY5 ykwOTDtuLWiS4oKGbTDsBpS4Ficn+NAZsdXzrA8IZ1bogjULliwJxQ/oFp3rKAgLBuAZrw E8k00BCRn1wj/0UypzLxNJ6zWRBBn0adT9W2Du3f1jSLUyeD31GwVpnXCjJFgp3KBWAtx6 Ts7/SXliT40vU5nQkIhZkDa4IuTm806ii7OVxrfJwK9UQgQDL5GJyk7EvGBGsoto0ivJ9k hUWrO6Ciu7j7shKGtWCtf8qx2ebF/TMWsZBxns3dQDa/QhZAg03iirNETzDrCg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFwZb1JFGzv61 for ; Wed, 13 May 2026 14:19:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 24fd1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 14:19:35 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 815eb5a26eb4 - stable/13 - compat/linux: Avoid waitid() kernel stack disclosure List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 815eb5a26eb45418bfd1ae564c532cbd37599b02 Auto-Submitted: auto-generated Date: Wed, 13 May 2026 14:19:35 +0000 Message-Id: <6a048877.24fd1.706d7a7b@gitrepo.freebsd.org> The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=815eb5a26eb45418bfd1ae564c532cbd37599b02 commit 815eb5a26eb45418bfd1ae564c532cbd37599b02 Author: Ed Maste AuthorDate: 2026-03-10 13:53:46 +0000 Commit: Ed Maste CommitDate: 2026-05-13 14:06:05 +0000 compat/linux: Avoid waitid() kernel stack disclosure Reported by: Adam Crosser, Praetorian Reviewed by: philip Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55812 (cherry picked from commit 9a9f93bcf1aa0059d759b2f3ea6faeb2760a11bd) (cherry picked from commit 9f8db9cc67fb86eeb2b645ce7f8aa748e99241a9) (cherry picked from commit a347e6e20e75ad6224afefcf650ef738c3de094d) --- sys/compat/linux/linux_misc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/compat/linux/linux_misc.c b/sys/compat/linux/linux_misc.c index fa6b7eff601a..3895c6da057c 100644 --- a/sys/compat/linux/linux_misc.c +++ b/sys/compat/linux/linux_misc.c @@ -756,6 +756,7 @@ linux_common_wait(struct thread *td, idtype_t idtype, int id, int *statusp, error = linux_copyout_rusage(&wru.wru_self, rup); if (error == 0 && infop != NULL && td->td_retval[0] != 0) { sig = bsd_to_linux_signal(siginfo.si_signo); + memset(&lsi, 0, sizeof(lsi)); siginfo_to_lsiginfo(&siginfo, &lsi, sig); error = copyout(&lsi, infop, sizeof(lsi)); } From nobody Wed May 13 14:20:01 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gFwb574Szz6dSrZ for ; Wed, 13 May 2026 14:20: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFwb55Qgqz3RDB for ; Wed, 13 May 2026 14:20:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778682001; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1uCsAsgxrR+NEw2ck9KOkpGF2oDy8WnZ0ATi4VizL6c=; b=t7rPuBaxj1UvmUlj68CZiiHyLdTt1+H0+oFcwiQSbs966YzG8HhL9X6I2rzU4SZbj2wZ6Z 8+jGEbczoWL2gH019rQcEiyCwe7UKghlM6CqgdvDTfAGLzR1hn05tr8HRwp/Cpjf8khW4w Lx9tiyGx/CZzVXWfSL/hQYhyaMlU61/vbGO8zw3R29ZJKeNl1ZdpKDXae/BMLMh3u0kdPh En18z75is5FlpVz/ZyLLCw8AOnrcwbAEF9hEmehdR0CNWiIhKkTkIymwSG+4O0/YF8PO0i ec3LfFKOQZj1Pc0Xq7soReopBAMUx7Mwnnxgg+oK/XWbl/GJgkafGbTJiFZcTg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778682001; a=rsa-sha256; cv=none; b=SsKesBBmlIwJpymQ7N8KLxh81z0RYn/sG5BvM/TYvVvC24Lb0pSXGf3UaJEi/29wvWZqIz 3K7aWeBSY8bVFShJxn2DhzcPl/8YcLGwYaN/mWJhvkAn5rTXUcWY8z79WiUzJG3VLbbnz2 ytWHS6EC79Hq4weuDs4wlq/jN51PGlx/orWDlfFKef8MfGtYRy9wHTfS+gSm1qzvnqB4kp 7zJs2hvRbZ/oHc4IM/ksfg6WgI7g+Lxdv06nFHVpsVOtn4vFQi3tUMdW3Lfi2nXB7rdoPc BfQVQ9PT5P93HkvhqkMGcKPPUQY61WJIuCvj9Z4X5QP7Uug7NkDhivEWJcosuQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778682001; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1uCsAsgxrR+NEw2ck9KOkpGF2oDy8WnZ0ATi4VizL6c=; b=OMyP5H+cG/Yyw3usM3nzDdURzFt25SJSMe7OQxhXiPQK1f/dpMSLlZeCkMxOMUFDNKCwkm WSKGYB3n7lp+oBGwNB1JPKJSrWX8vhuLRX4Cjd1yOA2qG3r1xSKb1FAfif2iya7Gr3ZBd4 mNaA4jZ2Gd1lazJU0hda3+14r0vFXH4aUJv/UfHdOTRAfdFDlTi5sWaY/0BO1VaM0bjkF1 Va5aK5gmDSG4b4HQb7d6pcRYUUDTVU4+TqXRVgG2q6vXVBeCNNHfA+1jr/TbVi4OhVp/MZ FI7dhJ8rEh88VdaPECbw1MwlN1evi2HJNDOb/8NaDSkRrJRWNBuvIwBQm4Ku5g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFwb552Jdzv63 for ; Wed, 13 May 2026 14:20:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2709d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 14:20:01 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: efba864f11d5 - stable/14 - elf_common.h: Add some AArch32 relocations List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: efba864f11d508a55c159330d8d3b2174288d3d1 Auto-Submitted: auto-generated Date: Wed, 13 May 2026 14:20:01 +0000 Message-Id: <6a048891.2709d.322b76d@gitrepo.freebsd.org> The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=efba864f11d508a55c159330d8d3b2174288d3d1 commit efba864f11d508a55c159330d8d3b2174288d3d1 Author: Ed Maste AuthorDate: 2026-02-12 21:18:32 +0000 Commit: Ed Maste CommitDate: 2026-05-13 14:05:26 +0000 elf_common.h: Add some AArch32 relocations Reviewed by: mmel Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55268 (cherry picked from commit 10ac7413c060b1496ef54e2338f487ea84f66206) (cherry picked from commit 50a7a38ea79f05b2da38352629802c346aeb55d6) --- sys/sys/elf_common.h | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/sys/sys/elf_common.h b/sys/sys/elf_common.h index b0b940b4cae3..2152efdee8b6 100644 --- a/sys/sys/elf_common.h +++ b/sys/sys/elf_common.h @@ -1117,6 +1117,19 @@ typedef struct { #define R_ARM_GOTPC 25 /* Add PC-relative GOT table address. */ #define R_ARM_GOT32 26 /* Add PC-relative GOT offset. */ #define R_ARM_PLT32 27 /* Add PC-relative PLT offset. */ +#define R_ARM_CALL 28 +#define R_ARM_JUMP24 29 +#define R_ARM_THM_JUMP24 30 +#define R_ARM_BASE_ABS 31 +#define R_ARM_MOVW_ABS_NC 43 +#define R_ARM_MOVT_ABS 44 +#define R_ARM_MOVW_PREL_NC 45 +#define R_ARM_MOVT_PREL 46 +#define R_ARM_THM_MOVW_ABS_NC 47 +#define R_ARM_THM_MOVT_ABS 48 +#define R_ARM_THM_MOVW_PREL_NC 49 +#define R_ARM_THM_MOVT_PREL 50 +#define R_ARM_THM_JUMP19 51 #define R_ARM_GNU_VTENTRY 100 #define R_ARM_GNU_VTINHERIT 101 #define R_ARM_RSBREL32 250 From nobody Wed May 13 14:20:02 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gFwb710bkz6dSm1 for ; Wed, 13 May 2026 14:20: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFwb66N2Cz3RB6 for ; Wed, 13 May 2026 14:20:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778682002; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2EWQ5eQofLe6DbZjRSfVKbZ6HMY6g2qlVqG3X6yfnlo=; b=vHnN8xNQgJaLDY351TTVURI7Gkpu2A78LuFk9VHdfoJsha/XXC6IKMV8FYd4fbBTByjaYl s36jlWiSuqbO6FAowrhKDTl/qU12n53mR7e63on0M2OLr5jkeY/hyAVKT6ZH1c8Vm8xluY 4GzYgV44KJTafgn0BnOTrX82ypIhhrESmMttfLs/f0rs40Fg0QnPwZJAgYEMrjY5bO67Rk sG4MvnLg2rfITjD3ObDGtlZA7d//5AFRUPWEgcTUZQOICiLPa+GckcVowFhMETJlVtWrJT MTqslR5h+5+tJpR2hvNr0gFrc2xtNJLNXS5Zn2Vr96pIrIP+8axVnJW5Q6MP/w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778682002; a=rsa-sha256; cv=none; b=qHSBXofRV19Ahhtk5Kf2yGB+eZd148+NgOQ5cmoCVSIWMDmAyPfLKgFyOD10gPMYRK7Fkf WonRsZEApW/tESAukOIchMiVD8edk+cE3+TSka1+HsOCLyR7mhPYVXQklF5eg8Ak5yfLJ1 O0bfx1tG9UXLonrDVILoEQWLB/ECAPc77X/BurEtKJ86X9JeD5/h5abso3hqNq+kzrhSQy u256clhvvAZYwCOeeIIWgOqdtaYCi3dKqz38t/8CdEuft/PA2PO9st57SuxKfHVFFqA5W+ 5n49XsGMZf2WkyBhAag946a05HwBG75iIlDo+Cfp+K7oUEFMMr5bBRJBSN+a6Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778682002; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2EWQ5eQofLe6DbZjRSfVKbZ6HMY6g2qlVqG3X6yfnlo=; b=ZgAuIUG5p8OTGjyrqCteQxJ/5mez1Lf1Tcwd6qvyAggM342E/akXpLIZecPe1FSTnryOXy vZzn/Gym9Xz/+tj/bKE1mmp+jgM4/BdCJ3UKJAgAifRC1+BYgwa9IjV5I6YFVb0GIYx3F8 GG1fjq0UycWbsvfIJRkj1QK96JvFONvR16B30d4Q5+wW2Kpk2toSjmON02127mpA6vQhyj HoF4hZu8IC8oV7bYRJv5iAqvz0IClsfZAuQH+AiOv4MocBNzCi9QPzF5FEZRRm81pgHLpn JkfHrX1Zx15l9si97UM/b9ExRW6uGYhd+vyZNPbu0XQZ6aF0rbV86DM0x4oSjQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFwb65NfXzv9k for ; Wed, 13 May 2026 14:20:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27281 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 14:20:02 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: f62ab5c293f6 - stable/14 - elf_common.h: Add AArch64 Memtag ABI constants List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f62ab5c293f64cf492c2a20ee99ded008e9a1457 Auto-Submitted: auto-generated Date: Wed, 13 May 2026 14:20:02 +0000 Message-Id: <6a048892.27281.7eadf65a@gitrepo.freebsd.org> The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=f62ab5c293f64cf492c2a20ee99ded008e9a1457 commit f62ab5c293f64cf492c2a20ee99ded008e9a1457 Author: Ed Maste AuthorDate: 2026-02-23 21:23:49 +0000 Commit: Ed Maste CommitDate: 2026-05-13 14:05:26 +0000 elf_common.h: Add AArch64 Memtag ABI constants Obtained from the Memtag ABI Extension to ELF for the Arm® 64-bit Architecture (AArch64) [1] [1] https://github.com/ARM-software/abi-aa/blob/main/memtagabielf64/memtagabielf64.rst#dynamic-section Reviewed by: andrew Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55486 (cherry picked from commit d971bc5220f7adb8a2bdfadc8e3ca7ffcf9ca843) (cherry picked from commit 9712b5e4b58bc3ff9402413ce7a149c956774263) --- sys/sys/elf_common.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sys/sys/elf_common.h b/sys/sys/elf_common.h index 2152efdee8b6..8419dfddfe41 100644 --- a/sys/sys/elf_common.h +++ b/sys/sys/elf_common.h @@ -469,6 +469,9 @@ typedef struct { #define SHT_HIOS 0x6fffffff /* Last of OS specific semantics */ #define SHT_LOPROC 0x70000000 /* reserved range for processor */ +#define SHT_AARCH64_MEMTAG_GLOBALS_STATIC 0x70000007 +#define SHT_AARCH64_MEMTAG_GLOBALS_DYNAMIC 0x70000008 + #define SHT_ARM_EXIDX 0x70000001 /* Exception index table. */ #define SHT_ARM_PREEMPTMAP 0x70000002 /* BPABI DLL dynamic linking pre-emption map. */ @@ -703,6 +706,11 @@ typedef struct { #define DT_AARCH64_BTI_PLT 0x70000001 #define DT_AARCH64_PAC_PLT 0x70000003 #define DT_AARCH64_VARIANT_PCS 0x70000005 +#define DT_AARCH64_MEMTAG_MODE 0x70000009 +#define DT_AARCH64_MEMTAG_HEAP 0x7000000b +#define DT_AARCH64_MEMTAG_STACK 0x7000000c +#define DT_AARCH64_MEMTAG_GLOBALS 0x7000000d +#define DT_AARCH64_MEMTAG_GLOBALSSZ 0x7000000f #define DT_ARM_SYMTABSZ 0x70000001 #define DT_ARM_PREEMPTMAP 0x70000002 From nobody Wed May 13 14:20:44 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gFwbx1rYQz6dT0g for ; Wed, 13 May 2026 14:20: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFwbw75nzz3RmW for ; Wed, 13 May 2026 14:20:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778682045; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2WEQCZE9xKVet05xT/V2FP9v5nxjg7TH2bH3aNVEZns=; b=AToHs3N6FcgglYW/wY7YkuCHJUS1UGlDgZSoPO/5VyV2owa3uJBG14pDUL/Uzrb5Aa6MXh sE1ezffEgE2s2WelGbwVqzQ9E4+23ydosk3Wj4meKGm0gD29A1ZLdCv2yX25PaE2yrH5JN fRFv77ZsdiyBqtCaZS5vIupEly5NFneq767X+nXKXa7Gs4mNTWqoYqvSYolDn3oEamRIgK HGT2701K9Hi3AGMaAM3w3Unq9dfdBA2dnGgC+cBSrflgYMKT9249VcFDOg3ATa5ZqyV+x7 0OKAKKKohVS/f4s944vCYvOWKkWRYAdHn1ftU5KCz4wTnGGh0y5ZJa/pG3juRw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778682045; a=rsa-sha256; cv=none; b=xwCopLEb/lzCm8XxqSCqKCe91Uo5heEdH04byp9BuhKwRixZbglhpHg7J4uWEgEYtMGQp0 eyuyB2KXV9l27hVYoQbKa4HULq17HQg7EhGutlGTTQSz5Qyzb+rer1YVmH6aMg90gr9xP+ KJGY0GhIH6sxeTvuhbckBzi5CjMwPWyQDW2TY7OBudZ30tsMHqCtvM8TXrDYl0zpEKyNFi NvJL2jhi3p8F984m55tPlJSnIyR0jvE9kgsNxgYAzIew8+pvevS6QtxxtWeZjaG7laG6yJ soMLBNp7ltaKklYFjNnDKoqBTizQruENat4/Eysff2FqBlm/pzA7qYBZX8mK5g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778682045; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2WEQCZE9xKVet05xT/V2FP9v5nxjg7TH2bH3aNVEZns=; b=ppeuGgoSyyXOsSRcXGB/gGxj5YJ7XZIqndmTSiPhfyqvwC/AB0UItrDzADSYHnTRJvD08q tjN0urMTS3wM6Qy6iOY22XnGKgNF6a7sssn27J9rtyquYh3PSd/ZlR4Z6K/GZBZax8bYz4 /bdAr+RfaAR65YkzMnDrkiaZ9oHt2f6QZkHiPvAx48wUgqKjuYqhu43wKW6FUa5Pe1RiJf WETPY7JMeIGX8tBB9tyUf1LhIb7P09Og5EZMsX7BWbEE+rtCMUwmeP8Ci+RxuGTM8Qyt17 LiteIx+LpJ6ueNzacoSS2P5EOcGMrmQXf+zvzAvcKFNeaQQ4K6la5kyKCdQncA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFwbw6bhSzv9n for ; Wed, 13 May 2026 14:20:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26969 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 14:20:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: cc921088d9ee - stable/14 - release: Use make's `:H` rather than `/..` List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: cc921088d9ee9ec0ba79893fdeaf271f2955a1bb Auto-Submitted: auto-generated Date: Wed, 13 May 2026 14:20:44 +0000 Message-Id: <6a0488bc.26969.6504c2dd@gitrepo.freebsd.org> The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=cc921088d9ee9ec0ba79893fdeaf271f2955a1bb commit cc921088d9ee9ec0ba79893fdeaf271f2955a1bb Author: Ed Maste AuthorDate: 2025-12-26 16:36:43 +0000 Commit: Ed Maste CommitDate: 2026-05-13 14:20:27 +0000 release: Use make's `:H` rather than `/..` In general we want to strip subdir components, rather than appending `..`s. Reviewed by: lwhsu Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D54373 (cherry picked from commit 3949c2b8c4691a6dff8be7b38805d56faab91187) (cherry picked from commit 61f0453b3aa71e640a42085f67ce556ca3283c6c) --- release/Makefile | 4 ++-- release/Makefile.vm | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/release/Makefile b/release/Makefile index d71449fa78bc..7dbded45e2e6 100644 --- a/release/Makefile +++ b/release/Makefile @@ -36,7 +36,7 @@ # TARGET/TARGET_ARCH: architecture of built release # -WORLDDIR?= ${.CURDIR}/.. +WORLDDIR?= ${.CURDIR:H} PORTSDIR?= /usr/ports .include "${WORLDDIR}/share/mk/bsd.compat.pre.mk" @@ -57,7 +57,7 @@ DISTDIR= dist # Define OSRELEASE by using newvers.sh .if !defined(OSRELEASE) || empty(OSRELEASE) .for _V in TYPE BRANCH REVISION -${_V}!= eval $$(awk '/^${_V}=/{print}' ${.CURDIR}/../sys/conf/newvers.sh); echo $$${_V} +${_V}!= eval $$(awk '/^${_V}=/{print}' ${.CURDIR:H}/sys/conf/newvers.sh); echo $$${_V} .endfor .for _V in ${TARGET_ARCH} .if !empty(TARGET:M${_V}) diff --git a/release/Makefile.vm b/release/Makefile.vm index e0e69deaaf28..3533fe4b797f 100644 --- a/release/Makefile.vm +++ b/release/Makefile.vm @@ -71,7 +71,7 @@ CLOUDWARE?= ${CLOUDWARE_GEN} .for _V in TYPE BRANCH REVISION . if !defined(${_V}) || empty(${_V}) -${_V}!= eval $$(awk '/^${_V}=/{print}' ${.CURDIR}/../sys/conf/newvers.sh); echo $$${_V} +${_V}!= eval $$(awk '/^${_V}=/{print}' ${.CURDIR:H}/sys/conf/newvers.sh); echo $$${_V} . endif .endfor From nobody Wed May 13 16:00:37 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gFyqG5cPfz6dZmY for ; Wed, 13 May 2026 16:00: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFyqG4Pz6z3kj8 for ; Wed, 13 May 2026 16:00:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778688042; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Jvnf+Z+IPoYLYXoIOYYvZzstAz0z5RAahpKpQytstrU=; b=blDJr7ztg6Usml7RZ1Fkskbf/wXYKM0fOWwa31eF50i4y6QbgXEmaf8LM8bdVS1DkL0wIj +5/mj1ycOMWSglZ0/SlcLLlrwpQwlAI7Xq0P7As/tCLVvS2sOS8/Wrp9yKY1/hDl93lNKu krViOJZ6MYQgSsrQYpWYVa9mLzG571v9HuazSnvSuR4dc28bny9ndA4fuc+iA9dtsAZIxe 5Wzw/EdUVL+SM+m+Ud/kksZUV5pKH2KxGeWpB7B8OOc7x8hZ1b3fC3NkDAUhizFkHCXiWh U6Fqun54rvQYS4MsyXHLlVN/Gh1BKakT24tXvHoMALo2i8q/06QPNFK8A+hJOQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778688042; a=rsa-sha256; cv=none; b=f6JNnLw/CrBTzUEKJmK0g0g91NZohIhoq8rNU42PdhPdvLYUF963QdTFrfk621/ofwhB6K FJY9i4n1rhQ1BWC9xTvXn4E4lhqWHzFWdnQteN4LL+1rc2omFH0y0CF07AyllLpLu0pqZf 0l5tztTbLwRfqZBSEBv3JPaTG7IZmTnkVCBZFuMm5zMIXDNCqRfEM34ShRgB1pgqQIWHQ6 7vKMorymc0/fGWrF+2A06PGKwqaar4+z7nOjzGsdG4Qdu2VVh+55TsUS1QIhtX3wYSArbM MJMN8QUZpGYlgv0zfLrm//osWiYqdBOf0Riu10tWPYPncaoGJmS/qyZAnhdOlg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778688042; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Jvnf+Z+IPoYLYXoIOYYvZzstAz0z5RAahpKpQytstrU=; b=ZFl6sCquZkj7EDBTTsWQ1Mvkbira6WHJtTFZEQXTNGGEAkpvXjAiwfI24Mx9i7QmIZGkfw D3TwZIIlOWeev2bnioPLh4nNr/hrAb3Qxo/5lyGfKFU9TqDkCnyxfEf3b3oh19A5hCHN7h eIY0FJfvNr12tuC2nfLm6jM2EU226aUHGgmBTlbrCdPJk9on6fCiWdTmRySA1WfyzlA/kT f8s87K9bKY6tD1XaYYwUfbI8+iEf8A6/BObNNwRA97JO+i0xpua38O2Tfs2XSttGoEt2m+ FTmKE9H0Ac5S4B8DQ1zquBFenmXTjZ7YEfNWmHNh3zAZn7I/3kOAManm2rS+gA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFyqG3tvkzx2r for ; Wed, 13 May 2026 16:00:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3a555 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 16:00:37 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Navdeep Parhar Subject: git: e03c00b47b1a - main - cxgbe(4): Query and report IPsec offload related parameters List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: np X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e03c00b47b1af560b280c32576e7fc06b0a58224 Auto-Submitted: auto-generated Date: Wed, 13 May 2026 16:00:37 +0000 Message-Id: <6a04a025.3a555.7202e86e@gitrepo.freebsd.org> The branch main has been updated by np: URL: https://cgit.FreeBSD.org/src/commit/?id=e03c00b47b1af560b280c32576e7fc06b0a58224 commit e03c00b47b1af560b280c32576e7fc06b0a58224 Author: Navdeep Parhar AuthorDate: 2026-05-12 18:04:55 +0000 Commit: Navdeep Parhar CommitDate: 2026-05-13 15:51:46 +0000 cxgbe(4): Query and report IPsec offload related parameters MFC after: 2 weeks Sponsored by: Chelsio Communications --- sys/dev/cxgbe/common/common.h | 4 ++++ sys/dev/cxgbe/t4_main.c | 33 ++++++++++++++++++++++++++++++++- 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/sys/dev/cxgbe/common/common.h b/sys/dev/cxgbe/common/common.h index 2033967ffb94..fcc728a8bf31 100644 --- a/sys/dev/cxgbe/common/common.h +++ b/sys/dev/cxgbe/common/common.h @@ -457,6 +457,10 @@ struct adapter_params { unsigned int max_ordird_qp; /* Max read depth per RDMA QP */ unsigned int max_ird_adapter; /* Max read depth per adapter */ + unsigned int nipsec_tunnel; + unsigned int nipsec_transport; + unsigned int nofld_ipsec_tunnel; + /* These values are for all ports (8b/port, upto 4 ports) */ uint32_t mps_bg_map; /* MPS rx buffer group map */ uint32_t tp_ch_map; /* TPCHMAP from firmware */ diff --git a/sys/dev/cxgbe/t4_main.c b/sys/dev/cxgbe/t4_main.c index d73204eb808c..07906dac00a8 100644 --- a/sys/dev/cxgbe/t4_main.c +++ b/sys/dev/cxgbe/t4_main.c @@ -5998,7 +5998,29 @@ get_params__post_init(struct adapter *sc) sc->vres.key.start = val[0]; sc->vres.key.size = val[1] - val[0] + 1; } - + if (sc->cryptocaps & FW_CAPS_CONFIG_IPSEC_INLINE) { + param[0] = FW_PARAM_PFVF(NIPSEC_TUNNEL); + param[1] = FW_PARAM_PFVF(NIPSEC_TRANSPORT); + rc = -t4_query_params(sc, sc->mbox, sc->pf, 0, 2, param, val); + if (rc == 0) { + sc->params.nipsec_tunnel = val[0]; + sc->params.nipsec_transport = val[1]; + } else { + CH_ERR(sc, "failed to query IPsec params: %d.\n", rc); + MPASS(sc->params.nipsec_tunnel == 0); + MPASS(sc->params.nipsec_transport == 0); + } + } + if (sc->cryptocaps & FW_CAPS_CONFIG_OFLD_OVER_IPSEC_INLINE) { + param[0] = FW_PARAM_PFVF(OFLD_NIPSEC_TUNNEL); + rc = -t4_query_params(sc, sc->mbox, sc->pf, 0, 1, param, val); + if (rc == 0) { + sc->params.nofld_ipsec_tunnel = val[0]; + } else { + CH_ERR(sc, "failed to query TOE IPsec params: %d.\n", rc); + MPASS(sc->params.nofld_ipsec_tunnel == 0); + } + } /* * We've got the params we wanted to query directly from the firmware. * Grab some others via other means. @@ -7987,6 +8009,15 @@ t4_sysctls(struct adapter *sc) SYSCTL_ADD_INT(ctx, children, OID_AUTO, "nfilters", CTLFLAG_RD, NULL, sc->tids.nftids, "number of filters"); + SYSCTL_ADD_UINT(ctx, children, OID_AUTO, "nipsec_tunnel", CTLFLAG_RD, + NULL, sc->params.nipsec_tunnel, "max hw IPsec tunnels"); + + SYSCTL_ADD_UINT(ctx, children, OID_AUTO, "nipsec_transport", CTLFLAG_RD, + NULL, sc->params.nipsec_transport, "max hw IPsec transport pairs"); + + SYSCTL_ADD_UINT(ctx, children, OID_AUTO, "nofld_ipsec_tunnel", CTLFLAG_RD, + NULL, sc->params.nofld_ipsec_tunnel, "max hw IPsec tunnels (TOE)"); + SYSCTL_ADD_PROC(ctx, children, OID_AUTO, "temperature", CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_MPSAFE, sc, 0, sysctl_temperature, "I", "chip temperature (in Celsius)"); From nobody Wed May 13 16:34:25 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gFzZ94Ykkz6ddMl for ; Wed, 13 May 2026 16:34: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFzZ93FYyz3sCm for ; Wed, 13 May 2026 16:34:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778690065; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6Bji0aiOLoL/y1S/GWy5pVXXTQ5kH1ncdmM1DNifjKg=; b=j3D2eVOGkSiNCDb5B8i5cpBjy+V+vnP4UBQvoQ5J7IH2ODgtoTn4xHGAkuqSimm3Sxi/Dx eIfFg0s52KDSTjdeps3lw+ckEVixnIEkeGcNLBEtuegZNF1MmobsSK7Oe/x+cmVHlsQq8E ZBGShHBzF0YLf8gxaLYu3tLUJfUBkcr28AvjQdoJNv3WH6eSoZzMOXWHdm33H5jOcLKCbt s4HMrynIKpZw8PZ5jk3LCQcZvsEZVW9gCrQDAs01ru8GEHDL9JvmbhPt3QTn5C7OqrLGBG O0bm3Rs99djE06Cfu6RSf2NlsjpUpKRcIFmh49XQLCCKBbhfJ8RchkIFaySYaQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778690065; a=rsa-sha256; cv=none; b=xoxyKgiwwP6yg2WbXLgdV/mF1IC5mDvVLy9L4CCWU/hsj62rZLX2mJrAAx8SdMosOQJqAH w12xEtUG3MeiuCnn1jMB7mSbtBN+ah/elOXPw83DVylrZFhnFo9ud6bWnfLdDiou9uKW5v 5sbsQsmfRAXA2jV8kBcjmHsmWYEen1yhaWhop6vWEFmAUghr8iCmGXwLq402HZ2TfUFH5z Pa/406PV42KltgorQmThCAxryDDA0o9mX49vJIK51xqpxbI02z0bu/phvVa+BNZ9tL65xK ZuGrCSZLkoyqWE9DpnMWQbJVoiW4Vw7KJu3UFEsTlZTk63SIdZO4Au2jTqR/SA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778690065; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6Bji0aiOLoL/y1S/GWy5pVXXTQ5kH1ncdmM1DNifjKg=; b=knqotUGIrttQG1byrgAImGzpgLnBvm3sciKQdTC+E9G/rAQw0CQMCI+XsTu6bo9THE0PoZ zpNVtMKtIqTde9XBY45KjUcaFCJ7r+srbCVyVzHTO2/BsaLIOYbnktjRlnxYcQh2yU+eJG 0jfM8CZPthvpseq0ZG9fiYDblUWt9NyXRetMxQE8Q2TJOLnj9X7qFgaU0Azc9ZaOwzsiWO pWIPtcmNxUEOSqTX/UdoZYYwRqJmldphRnW2OMvj779S6zXvai7eppL7f4sibQt72qYlFj aZq9vvrM9VNQDdb3vkXL3LNaRariEyBCYw1rnN/8XJV9hRWGLUqS/Qz5o9vxXA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFzZ92TXpzylY for ; Wed, 13 May 2026 16:34:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3be57 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 16:34:25 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 8766e2122ac0 - main - mandoc: Updating FreeBSD thead library descriptions List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: 8766e2122ac02ff4d86c254d8ef1c41d4a7f76a0 Auto-Submitted: auto-generated Date: Wed, 13 May 2026 16:34:25 +0000 Message-Id: <6a04a811.3be57.aea6532@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=8766e2122ac02ff4d86c254d8ef1c41d4a7f76a0 commit 8766e2122ac02ff4d86c254d8ef1c41d4a7f76a0 Author: John Baldwin AuthorDate: 2026-05-13 16:33:29 +0000 Commit: John Baldwin CommitDate: 2026-05-13 16:33:29 +0000 mandoc: Updating FreeBSD thead library descriptions Remove libkse as it has been obsolete for many years and drop 1:1 from description of libthr. Reviewed by: brooks Sponsored by: AFRL, DARPA Differential Revision: https://reviews.freebsd.org/D56850 --- contrib/mandoc/lib.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/contrib/mandoc/lib.in b/contrib/mandoc/lib.in index dcea23cf81ea..04d86f9add1e 100644 --- a/contrib/mandoc/lib.in +++ b/contrib/mandoc/lib.in @@ -74,7 +74,6 @@ LINE("libisns", "Internet Storage Name Service Library (libisns, \\-lisns)") LINE("libjail", "Jail Library (libjail, \\-ljail)") LINE("libkcore", "Kernel Memory Core Access Library (libkcore, \\-lkcore)") LINE("libkiconv", "Kernel-side iconv Library (libkiconv, \\-lkiconv)") -LINE("libkse", "N:M Threading Library (libkse, \\-lkse)") LINE("libkvm", "Kernel Data Access Library (libkvm, \\-lkvm)") LINE("libm", "Math Library (libm, \\-lm)") LINE("libm68k", "m68k Architecture Library (libm68k, \\-lm68k)") @@ -126,7 +125,7 @@ LINE("libtacplus", "TACACS+ Client Library (libtacplus, \\-ltacplus)") LINE("libtcplay", "TrueCrypt-compatible API library (libtcplay, \\-ltcplay)") LINE("libtermcap", "Termcap Access Library (libtermcap, \\-ltermcap)") LINE("libterminfo", "Terminal Information Library (libterminfo, \\-lterminfo)") -LINE("libthr", "1:1 Threading Library (libthr, \\-lthr)") +LINE("libthr", "Threading Library (libthr, \\-lthr)") LINE("libufs", "UFS File System Access Library (libufs, \\-lufs)") LINE("libugidfw", "File System Firewall Interface Library (libugidfw, \\-lugidfw)") LINE("libulog", "User Login Record Library (libulog, \\-lulog)") From nobody Wed May 13 16:34:26 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gFzZB5KC0z6ddXp for ; Wed, 13 May 2026 16:34: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFzZB3h43z3s7T for ; Wed, 13 May 2026 16:34:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778690066; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=szOBREqrT1CSw1ZcTQ/gbMa9x8uHL7ycgyWOesk1KWc=; b=tdS1sxwDGiHeOoCKlwfaGsaWtOZoyH0dh3G6KTK4oNJ0l15OtH/IRtoMdetO3TvhOzwU0H 0zRN2IJc/IRkpxQ3TJoO3z+MjK8j6m2MfJlZXnjUNgodaREQ5yxTZqs/RjKFCgu1X3F9n7 fAA9p6b/CqvkXp6hKE2iUQRHYO02MpDto3cBS3NLHO7jwh4KYWEXmZ5tL4nutM2+QKDhe1 UeV7Oa202fPwW+vhn769tenrDf0SHXyk3P7nwuXbqD67uspauX8C9lAdPcGSLNAF2K4is+ IKPC135N6eOBlCsuwZCixo+jlEINN8UEwPLCLWIqu5ImVFGk3dk5rG4lWkEpNw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778690066; a=rsa-sha256; cv=none; b=MGXi+8my+Kgk57zRup6fxqFvSEuLEQlvVWPweeH9FpXtBMpH+vhEGG7OlYduDHoA9i6uEP k6LsTaZ4Vt84OLj/F8zhE15wINdYfGG4mDVfGyedLmT3igyCvKPRQxVjnWlK87eMnms2jX ZkJfBlo8z8aH4h5FheHRx67XUrLals069+L4poaKPE8DjZEaUvzzrdFv6hixpy/Q3m6Wkx NA1Z0UKeEojEuCAX4aZXfiG6Ig5ygbtMeJqgQ4P0w+8q3v2Ao0o6u60q2l/+PN+5kUl08s xPGa30VTFXKQeo7rz0XAJbNWVf8q+3UbpAXGvAudS/6zm6J+Lj123yX8fReiqg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778690066; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=szOBREqrT1CSw1ZcTQ/gbMa9x8uHL7ycgyWOesk1KWc=; b=c5hJ+9XuV6vjd7+PCHAUwaRuO7vQ908La04dnkDlCApojEg87z5iRlZykG9+tOs4ncpASx FRJZM/RDa0F4LtV/VdNjA0gDcRmRLuIQfGohmuwInCocdBhCCcWkC93YmAm6uA6YnOYQO3 a2LMeiFkOdH2DvPGQ5uPJSwiFSKzH32pHBMxkPqQ3Nb08W3A36Px4fw8+T9WwX6YRL7Svd ummaf3JafgNAChmTkHxgGAUqv623tmtGgPmVxIprCivcYZxt9oIb0JADEZcQcvfOYv+7ud 1CCWlZOpHFzIIVwdiLHBESatgs+oPz4+lVxAk/fSWU1m6nSliNN7z8Y57LYK1w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFzZB3HXXzyG0 for ; Wed, 13 May 2026 16:34:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3c5b4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 16:34:26 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 04987aa1d809 - main - arm64/vmm: Enforce a data barrier before tlbi for non-VHE List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: 04987aa1d8099e5f8f5dd8c68e65f315b3f1fd6c Auto-Submitted: auto-generated Date: Wed, 13 May 2026 16:34:26 +0000 Message-Id: <6a04a812.3c5b4.5614f8fb@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=04987aa1d8099e5f8f5dd8c68e65f315b3f1fd6c commit 04987aa1d8099e5f8f5dd8c68e65f315b3f1fd6c Author: John Baldwin AuthorDate: 2026-05-13 16:33:52 +0000 Commit: John Baldwin CommitDate: 2026-05-13 16:33:52 +0000 arm64/vmm: Enforce a data barrier before tlbi for non-VHE Exception entry does not include an implicit, architectural data barrier. Reported by: Ben Simner Reviewed by: andrew Fixes: 5577bb2f67ff ("arm64/vmm: Support tlbi from VHE") Differential Revision: https://reviews.freebsd.org/D56855 --- sys/arm64/vmm/vmm_hyp.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/sys/arm64/vmm/vmm_hyp.c b/sys/arm64/vmm/vmm_hyp.c index 75c15f06dd08..27fdf18e4700 100644 --- a/sys/arm64/vmm/vmm_hyp.c +++ b/sys/arm64/vmm/vmm_hyp.c @@ -708,9 +708,7 @@ VMM_HYP_FUNC(s2_tlbi_range)(uint64_t vttbr, vm_offset_t sva, vm_offset_t eva, uint64_t host_tcr; #endif -#ifdef VMM_VHE dsb(ishst); -#endif #define TLBI_VA_SHIFT 12 #define TLBI_VA_MASK ((1ul << 44) - 1) @@ -768,9 +766,7 @@ VMM_HYP_FUNC(s2_tlbi_all)(uint64_t vttbr) { uint64_t host_vttbr; -#ifdef VMM_VHE dsb(ishst); -#endif /* Switch to the guest vttbr */ /* TODO: Handle Cortex-A57/A72 erratum 131936 */ From nobody Wed May 13 16:34:24 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gFzZF6zRBz6ddFW for ; Wed, 13 May 2026 16:34: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFzZF3Lt6z3sKP for ; Wed, 13 May 2026 16:34:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778690069; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WyfBzbbvQn49u/XBDMs34h1MFP85NqU4GKuGvHEPVLc=; b=QsLTUxyNeXGaP/CzsMFNKx0/vaM5U41FOCSFdaoWx4eKLxsxTbNnwF6OJJHLspW5UBtz/a dG4jpEIXZk6E49Imb9dFuYnA0+Byejl/H98GgJ4hqTgDgdPdwdrPn68rEKH3rS7azf0cnM /hC1QndWMQOJW7mK9LrLcYbN7+uinSAeWIyz6Pcj++LrEEZ0X6n/p45kUTXnqsz+z+GNG2 y7nMWJnfxptYfeRYinoyq3Qrqr8egy4RIzoPM1f+x1XfKIbT5eJHNpc253cjh5ER7MvLAm m+DzfPfVy1Da05QkjSoCa5cgbP3Ac1FELln8Rp8kE1FTGOidvNaOcE0oPs6omQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778690069; a=rsa-sha256; cv=none; b=H/GkJhTgjBqPexMXsOjTc7s930lvL1AXNbRo44WIyBSNYs4oR1i1CwZqw9h0QIAQMbyVhZ CYijyyDVVlSASpZDphvfYokxB3O+Q0qA0xbwuQKkw44U4WjZ2lyS9Y9isxGuEkYyt81YUI JTH4Us2ioJE8sX46Br77BI4rjn/zcDT4yxZC71/Sf8KJ1VcWG1IfVksBvqsT78GQqOPEHn FcIeJz5ZslXGarY4+jXfX7tanJFxxugBEJhDQOUd7RcMc8J1w9f2Xx3/LZwez8K96IG8rn RjshwzeJCYeYorkYgOf3R9sdoduPHrHP7yiQm8lOGC1MN8t0gwSNcCwaLsrVbg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778690069; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WyfBzbbvQn49u/XBDMs34h1MFP85NqU4GKuGvHEPVLc=; b=CxJYt6w4VMNtCj7a5CHFjKHXlDIJ2/5nA701gpq1lOWODzumBc63wlSRp8XE4mmq8yOmBb ClexGymGq8LVhhclC45xTyT6ImMkc0i78w16d/6vl4EDHH/ZoyZeH3T5FA9xsnKOxjvCkP wmWWaeF16Do1pJG/LQZy13LqqC1Je3rFI6eE20KnGhNRXNQfsX6ZEH0kBbxCLBFuolsu3e cp1Nifty1sIHAft/xxC0x2jYffyTAypu1dSHLo70xKaf5YH4tvErk72oF0KsMWdPeTHAFB 05d4zk5eZHooRgCjK4lj2kitdpbmBeHJvUZ4PMYAK7Uzl7o9KP2iUtYxhImifw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFzZF2v8KzySQ for ; Wed, 13 May 2026 16:34:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3bf3e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 16:34:24 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 538f0564c119 - main - mandoc: Add an entry for libsys to lib.in List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: 538f0564c1197605d7ab80ba39cbf27cc9c90fed Auto-Submitted: auto-generated Date: Wed, 13 May 2026 16:34:24 +0000 Message-Id: <6a04a810.3bf3e.71e401ab@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=538f0564c1197605d7ab80ba39cbf27cc9c90fed commit 538f0564c1197605d7ab80ba39cbf27cc9c90fed Author: John Baldwin AuthorDate: 2026-05-13 16:33:12 +0000 Commit: John Baldwin CommitDate: 2026-05-13 16:33:12 +0000 mandoc: Add an entry for libsys to lib.in Reviewed by: brooks, emaste Obtained from: CheriBSD Sponsored by: AFRL, DARPA Differential Revision: https://reviews.freebsd.org/D56849 --- contrib/mandoc/lib.in | 1 + 1 file changed, 1 insertion(+) diff --git a/contrib/mandoc/lib.in b/contrib/mandoc/lib.in index 134614aa6478..dcea23cf81ea 100644 --- a/contrib/mandoc/lib.in +++ b/contrib/mandoc/lib.in @@ -120,6 +120,7 @@ LINE("libsdp", "Bluetooth Service Discovery Protocol User Library (libsdp, \\-l LINE("libssp", "Buffer Overflow Protection Library (libssp, \\-lssp)") LINE("libstdthreads", "C11 Threads Library (libstdthreads, \\-lstdthreads)") LINE("libSystem", "System Library (libSystem, \\-lSystem)") +LINE("libsys", "System Call Library (libsys, \\-lsys)") LINE("libsysdecode", "System Argument Decoding Library (libsysdecode, \\-lsysdecode)") LINE("libtacplus", "TACACS+ Client Library (libtacplus, \\-ltacplus)") LINE("libtcplay", "TrueCrypt-compatible API library (libtcplay, \\-ltcplay)") From nobody Wed May 13 16:46:02 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gFzqg5PNSz6cg8c for ; Wed, 13 May 2026 16:46: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFzqg4xLMz3tR9 for ; Wed, 13 May 2026 16:46:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778690767; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cEGt6iOEedXRDife2WG883uzx77fIBiCY4NRk9b75Zk=; b=mX/gPERN8dB9eyq83n6EzpQEEbyJby7Xns5uqC2VPsBVQwrNzaqCEHWaAIOQ/bhNgljGsK jTk7Tq18KmIoi+D5KPH8lIyVHdWRoRgtgzXnqBy60v25yB15RYAHhPG135wE1a/1spsfhL Xpv8xi0WSTiF79XK8KIAaNurKTGeOrapkp4d0CrdOSHDVl/LHwpWRgZYhJDb4rbvRn9TdJ 8kHb6JKnywntXrALkh439o2WUuDD8ZIBv6PJGu7p8OeaFKuqRMgRpOA7ELE0Gw6cpR8/6h Cf5XmQwAbsgMHN/FERk9+FxNFFTxynzaiuuAtD/ESv4zt507zjX5WbrxROKYSQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778690767; a=rsa-sha256; cv=none; b=AXXVbCZPYAzO6biuPosOImPXC6FQ3DICWFGr1CtoWQtsR/nzTaNzufmEbMXLYPT/guW13n RgQEJgZQ/k/2IZiSwuDbtFDvofYkGeW5C0mjXvYChGLNLUgkeghjVM++/qj++yQ7w0MZ+Q N/dy4fuYxrW2+ArejFpEps9QjWBoq35Lnu5NYst8NDt6xWITmnHkuHNBDJratq2r+RGFJ1 NZCZOeiH5SeOL36vU2mTOy7lGftWb8XiwI2MF6nTFfQDPmVLN1ABxfr4d239WVwdvzVq06 N9IWxUJho/vj5rSXvLBQZRNGKMHSpWAEOclLoqqR7/fSPVVm/NU6Ek44U/ZdTw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778690767; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cEGt6iOEedXRDife2WG883uzx77fIBiCY4NRk9b75Zk=; b=RXKaEPabjEpvptz5DDpTabYiFz9s/XeuII4HTYvVFHYX/vYujSDebEZnky5Face2vBnWzt LPG31imrR9SBbbQaiZdqq+jd7zYSvmFHJpPro46uwkdK9zcXG1cNFqk8hD4bFEHZJWYYvN SwzvSr4O4OwgacJeaCPahI0D0o4LgDTeLjEoRbY2NYV1QODksz3OArtBWShid5SXPiRapo JfP7YyDxwcwa7xHkjOMbb/GfrlkHNnSnLqi63vpPe0yqNWU7PJ2LbSZI7qwkGmdufh5yEk hrLwKbRvxb979+NSAxeyyg0cBpwhHKBa2quJNdptc8dlM1VoZ5RpClrFAOaZJQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFzqg4GMMzyqT for ; Wed, 13 May 2026 16:46:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3dba7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 16:46:02 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mariusz Zaborski Subject: git: ee04ee95ab38 - main - cap_net: fix error propagation for ENOTCAPABLE in cap_getaddrinfo List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: oshogbo X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ee04ee95ab386147c57d3b4efcc5774e8d64330b Auto-Submitted: auto-generated Date: Wed, 13 May 2026 16:46:02 +0000 Message-Id: <6a04aaca.3dba7.5cc94167@gitrepo.freebsd.org> The branch main has been updated by oshogbo: URL: https://cgit.FreeBSD.org/src/commit/?id=ee04ee95ab386147c57d3b4efcc5774e8d64330b commit ee04ee95ab386147c57d3b4efcc5774e8d64330b Author: Mariusz Zaborski AuthorDate: 2026-05-12 09:48:56 +0000 Commit: Mariusz Zaborski CommitDate: 2026-05-13 16:42:45 +0000 cap_net: fix error propagation for ENOTCAPABLE in cap_getaddrinfo Fixes: b60053fde172 ("libcasper: Fix inconsistent error codes of cap_get{addr,name}info()") --- lib/libcasper/services/cap_net/cap_net.c | 4 ++-- lib/libcasper/services/cap_net/tests/net_test.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/libcasper/services/cap_net/cap_net.c b/lib/libcasper/services/cap_net/cap_net.c index 5887fe3c407e..59124e3cb54f 100644 --- a/lib/libcasper/services/cap_net/cap_net.c +++ b/lib/libcasper/services/cap_net/cap_net.c @@ -1011,12 +1011,12 @@ net_getaddrinfo(const nvlist_t *limits, const nvlist_t *nvlin, nvlist_t *nvlout) } if (!net_allowed_family(funclimit, family)) { - errno = ENOTCAPABLE; + serrno = ENOTCAPABLE; error = EAI_SYSTEM; goto out; } if (!net_allowed_hosts(funclimit, hostname, servname)) { - errno = ENOTCAPABLE; + serrno = ENOTCAPABLE; error = EAI_SYSTEM; goto out; } diff --git a/lib/libcasper/services/cap_net/tests/net_test.c b/lib/libcasper/services/cap_net/tests/net_test.c index adf5773233c8..21d620e0f8d8 100644 --- a/lib/libcasper/services/cap_net/tests/net_test.c +++ b/lib/libcasper/services/cap_net/tests/net_test.c @@ -73,7 +73,7 @@ test_getnameinfo_v4(cap_channel_t *chan, int family, const char *ip) capret = cap_getnameinfo(chan, (struct sockaddr *)&ipaddr, sizeof(ipaddr), capfn, sizeof(capfn), NULL, 0, NI_NAMEREQD); - if (capret != 0 && capret == ENOTCAPABLE) + if (capret == EAI_SYSTEM && errno == ENOTCAPABLE) return (ENOTCAPABLE); sysret = getnameinfo((struct sockaddr *)&ipaddr, sizeof(ipaddr), origfn, @@ -102,7 +102,7 @@ test_getnameinfo_v6(cap_channel_t *chan, const char *ip) capret = cap_getnameinfo(chan, (struct sockaddr *)&ipaddr, sizeof(ipaddr), capfn, sizeof(capfn), NULL, 0, NI_NAMEREQD); - if (capret != 0 && capret == ENOTCAPABLE) + if (capret == EAI_SYSTEM && errno == ENOTCAPABLE) return (ENOTCAPABLE); sysret = getnameinfo((struct sockaddr *)&ipaddr, sizeof(ipaddr), origfn, @@ -196,8 +196,8 @@ test_getaddrinfo(cap_channel_t *chan, int family, const char *domain, hints.ai_socktype = SOCK_STREAM; capret = cap_getaddrinfo(chan, domain, servname, &hints, &capres); - if (capret != 0 && capret == ENOTCAPABLE) - return (capret); + if (capret == EAI_SYSTEM && errno == ENOTCAPABLE) + return (ENOTCAPABLE); sysret = getaddrinfo(domain, servname, &hints, &origres); if (sysret != 0) From nobody Wed May 13 17:22:50 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gG0f26SGYz6ck8Y for ; Wed, 13 May 2026 17:22: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gG0f21wCHz41rP for ; Wed, 13 May 2026 17:22:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778692970; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=G0SDCrdDGQavxBks7jqetSeBcdVploVk6p3D/C2XxI8=; b=huJSPH4u9XTafJxlmckSUmFwwHby8IZL9fk3l29duj585i6HXcZk0ZCE+f4dlktI4kKbUs zTVT/QCAglIcOImPMH9dhTEA7v/IojkTkm5zYMfvLueKgzDDXgJYlfoy2jY8kjDxEgzOOs pMoD7K/Zk5iE6mBWaM0GxfW+eBh48/SNoGVyg9/f6qT3CXtVmheGYelVMFQ8HVqAS8xTUr aoK4qgInhmHCvyh5UPWiIh8tjgAzNuFWVv/F0v5WqktOoQPNe7zvFwqrSxYBllr08dBqS8 Z8FwP0sUCbaqrZ/J16/O0zMFSr7F8Y9TcSJPHFNrTYKX/pb7mzoN5UHHRwev1Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778692970; a=rsa-sha256; cv=none; b=m5rMT59dHOVztbz5Qsc8vpIaBgKOCvTf0H3kYGXOIP6Z+j7VRAW2mhLxXcTmc5wWRn5XSu 7JXJjg5t9j39cEuKzQm47ES5jEeltAOdTtcpDbo5Ym7izTFHPiaROyg921TJmwHpi0pDzp IYjxZJd99QffVhcDfM/ImadnOU/KyZS1qxbsVqzFim17CA5x9Zg8P9pO+L+ug/1iaRH1AS C6+pGSrPJ8E13dcfWSBnYyENe/mFy8sjOF4gIMODsNkPy6YUEvho2ZHsr1rFrJi57FtJRA y0RqzBzYIiWmoHyEtERxcp3qROvhi1G4aO8Bu/QES19XOay30mNgg16pRMEh0Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778692970; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=G0SDCrdDGQavxBks7jqetSeBcdVploVk6p3D/C2XxI8=; b=i861U8IYMdtx+gYmhoqdifqYrywF+Hqw+bxPrMC/g0GWu/+LczjuX020+oQzV1uiHNfHMK GWieAd8ryVh6+qLt9nfFQqYr4U7lvL7GbVOfvCVkyJ2UgZrsriV/07tseJ9EXh543muri7 LPxeyA8CqnrYwaeUA5kgtM//OhYg0tnYOKs68RFaYNCg8ds795k36BQ0KBa3A1b9UMeT7b 44dWBdvz8PDhUS1gULRi+W0z+OR5Ud5AtwUHzF1jF3R5NRvMa2/VMkX7FZkvgh3IxqWAFc PIY0QfDTszQSiiIB3zRAVDucl0DLl45UzdlM2NDH7DxIpy8M9RbR2AvgAuxkVg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gG0f20x9Pz10XY for ; Wed, 13 May 2026 17:22:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 19d83 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 17:22:50 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alan Somers Subject: git: 3298d82ea340 - stable/15 - Fix LOCAL_PEERCRED in 32-bit compat mode List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 3298d82ea34059354dc1ff1a60d8b7d3e495c2cd Auto-Submitted: auto-generated Date: Wed, 13 May 2026 17:22:50 +0000 Message-Id: <6a04b36a.19d83.51259bdf@gitrepo.freebsd.org> The branch stable/15 has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=3298d82ea34059354dc1ff1a60d8b7d3e495c2cd commit 3298d82ea34059354dc1ff1a60d8b7d3e495c2cd Author: Alan Somers AuthorDate: 2026-04-27 23:46:53 +0000 Commit: Alan Somers CommitDate: 2026-05-13 16:54:53 +0000 Fix LOCAL_PEERCRED in 32-bit compat mode Previously the cr_pid field would be incorrectly copied to userland, due to a size mismatch between the structure as defined in 32-bit vs 64-bit builds. Fix it by converting the structure before copying it to userland. PR: 294833 Sponsored by: ConnectWise Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D56675 (cherry picked from commit 1d24638d3e8875e4b99a4b5e39f4241e37221b3d) --- sys/kern/uipc_usrreq.c | 21 +++++++++++++++++++-- sys/sys/ucred.h | 11 +++++++++++ 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c index 44d0185e9d1c..8e8261c9644e 100644 --- a/sys/kern/uipc_usrreq.c +++ b/sys/kern/uipc_usrreq.c @@ -83,6 +83,7 @@ #include #include #include +#include #include #include #include @@ -2755,8 +2756,24 @@ uipc_ctloutput(struct socket *so, struct sockopt *sopt) error = EINVAL; } UNP_PCB_UNLOCK(unp); - if (error == 0) - error = sooptcopyout(sopt, &xu, sizeof(xu)); + if (error != 0) + break; +#ifdef COMPAT_FREEBSD32 + if (SV_PROC_FLAG(sopt->sopt_td->td_proc, SV_ILP32)) { + struct xucred32 xu32 = {}; + int i; + + xu32.cr_version = xu.cr_version; + xu32.cr_uid = xu.cr_uid; + xu32.cr_ngroups = xu.cr_ngroups; + for (i = 0; i < XU_NGROUPS; i++) + xu32.cr_groups[i] = xu.cr_groups[i]; + xu32.cr_pid = xu.cr_pid; + error = sooptcopyout(sopt, &xu32, sizeof(xu32)); + break; + } +#endif + error = sooptcopyout(sopt, &xu, sizeof(xu)); break; case LOCAL_CREDS: diff --git a/sys/sys/ucred.h b/sys/sys/ucred.h index ba241cf9ff3a..4bf48a5e4b87 100644 --- a/sys/sys/ucred.h +++ b/sys/sys/ucred.h @@ -193,6 +193,17 @@ struct setcred32 { uint32_t sc_label; /* struct mac32 [*] */ }; +#ifdef COMPAT_FREEBSD32 +/* 32-bit compatible version of xucred */ +struct xucred32 { + u_int cr_version; /* structure layout version */ + uid_t cr_uid; /* effective user id */ + short cr_ngroups; /* number of groups (incl. cr_gid). */ + gid_t cr_groups[XU_NGROUPS]; /* groups */ + pid_t cr_pid; +}; +#endif + struct thread; /* Common native and 32-bit compatibility entry point. */ From nobody Wed May 13 17:45:29 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gG189246Rz6cl4X for ; Wed, 13 May 2026 17:45: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gG1891bW1z44gy for ; Wed, 13 May 2026 17:45:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778694329; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Z7wvWoLdeY40G4NUhJtjHZRID9MdHaiLX2yNHlNGcVI=; b=SFfFTfFTRF9aHzrcxaWeTCB5BrdzxFnv6v5FUt1CTpRXL1WbUYfhEb/2Uus8wHdtAO22Kn SNjML9c9v85rw4cYwHg+Ix6/5/O5fUmJ6Gil4yzVZV2d7qelpsTo3YmKS/6KfdRKstEJ1g FgW8HqrgUZLSBP8GyhLl3tZOnfwUYw7vx0lL4OFXFE4IDlCC58j+wHqj1bN3oWvAf4Jj0P +n6+JlHP6EGd4lEm5nhL5JZx47X8W+cTvTqv2JqMtXnmuy939XnkAXLLnPF0jCcsRyMXuj FDA0KWcMuVlVwWAJeV/2cE5gVruTQBkjSqyTbrZo94CbFaO+jYXwmG204oEDGw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778694329; a=rsa-sha256; cv=none; b=WIWeB1mAM02zNIAdSSw1Ir8Y9MJP2j0n8cS61M3jaxzaY/maWPHryYIBB1KW+dBot+07Ut IYP5np4wBv1GlC2grF4O2KY84RAl636wwLteW7AmxEagfKStteSPA1FddHGiiFle0+LpTO 9YXuaNmXC3igAr+qy6UV8uLGGlEEOHFIdqECbwqQ4Xwe1EPbXZ1fCeFGK+5dgmQIFhf8r2 cLigBGbsmYR9GKQjR56DdqTrBRy6YnoqK7p7VOLKDz87Twyl89AYoc2oqxBFbGsua2BiHN TxRjbawB9t1X4FH8NnvsU9MfQFgqYLX+2clEuVHH21LEsS8VAV2r/dZoHskbmA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778694329; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Z7wvWoLdeY40G4NUhJtjHZRID9MdHaiLX2yNHlNGcVI=; b=JN4YEoZXdzQb0Ufh05Xado/V47Fv255HczHnxyhxKZZgYvfdgXNSWoiRWaJLuJqkJtCJA+ nlNHl8yoghpqEnf0aVHPRSU52WxRRce9I7+FwI8XO/IWiS96qSYzmceZH1mGOdQgr++0Lv 8q68Heu0WwtncXHRyiX0Jqo3z1wm1y6+BRxM95v6Rzs2aJ0R8aP7isXydLqdSL/OwfDfw1 nkY1ZEWtuuARP9GlP9cqwtZY7t0V1KNI3zvtmLLg0L6AKVfM0RjDElxcbkMyQly6jKBY4N +Eywd8rPRgvelvimuqZcJwtMSNrsquM25ooCzcKWklJCb6evTtZMGYTk6iDNBA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gG1890w71z11Xc for ; Wed, 13 May 2026 17:45:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1df81 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 17:45:29 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ryan Libby Subject: git: e30e507a7737 - main - vfs_bio: mark uma zone pointer __read_mostly List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rlibby X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e30e507a7737eb7cc2d2592a26171a2d5cf6c4f5 Auto-Submitted: auto-generated Date: Wed, 13 May 2026 17:45:29 +0000 Message-Id: <6a04b8b9.1df81.e9f2546@gitrepo.freebsd.org> The branch main has been updated by rlibby: URL: https://cgit.FreeBSD.org/src/commit/?id=e30e507a7737eb7cc2d2592a26171a2d5cf6c4f5 commit e30e507a7737eb7cc2d2592a26171a2d5cf6c4f5 Author: Ryan Libby AuthorDate: 2026-05-13 17:43:21 +0000 Commit: Ryan Libby CommitDate: 2026-05-13 17:43:21 +0000 vfs_bio: mark uma zone pointer __read_mostly Reviewed by: kib, olce Sponsored by: Dell Inc. Differential Revision: https://reviews.freebsd.org/D56949 --- sys/kern/vfs_bio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c index 181f2907c245..cb45ca7c75b7 100644 --- a/sys/kern/vfs_bio.c +++ b/sys/kern/vfs_bio.c @@ -405,7 +405,7 @@ struct bufqueue __exclusive_cache_line bqempty; /* * per-cpu empty buffer cache. */ -uma_zone_t buf_zone; +uma_zone_t __read_mostly buf_zone; static int sysctl_runningspace(SYSCTL_HANDLER_ARGS) From nobody Wed May 13 17:45:30 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gG18B6Gx8z6clFL for ; Wed, 13 May 2026 17:45: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gG18B31bJz450f for ; Wed, 13 May 2026 17:45:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778694330; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TuqZFTqSdwB+KIcZSx1SMR1VM/avxwHfFHSpGdyq4qY=; b=oloC/V7aGMFYWDYMp6coAY6GJWFmI8EZssBoT1n+YgQZBTnhMShtFS/nlB8/aNQ5ne6B05 65sPU8SNDQIeRyCM1j7/XOMFh+w12M17/P3BIY5iJ7jAkatMzRkzgZRZwjAnnC/Je53so+ R3vV1AFmIrjv8YzKtRcb81CCeW+L0XP8KQuxOl216qEHn4hPksXLewiyS9JJNScBoXiBXD QuBzIM5TomrORekKIJ/ArFflJtsaU9IFAk3kZhI9HHjELm3BbwC5POrjrMAIH28MyXCxto Ry6S1nCUBWMmbcJaYX8cboOLKkH+c/HsiR51oczfU+VyjwOMxYw0KnyWE5LxXQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778694330; a=rsa-sha256; cv=none; b=LIAJrjt+6JwijsyesAcx2KWfiY4HebJKQji9AmIOQWIt5ZvOinpRJqQ3cyZgG3FYi3z3gh rDcl00+J3DqRa7EskNV+y12BaNrV8mg1qHfPIA4YU+aE33qpXeH1W0L9/LPwxVvnlV5GkT 4l2YplXj6F9/D00ZvqJIU5OTrM0y2xFZRkkw0JQc6aSV1Yf48s0iWSdBiJ6o5D+yugBZj0 YAuRnox1m4HfNKMgS2mhrszgOosIehu/BWybPBwFnUWtFoGrEkzmBDft2FcAdh9OdKrR1f glHOhYckXUcQDvq/DQij/nDb9ht5Vlc9wBhgDBlAWbEgSAM5OLgtomWgljfOqA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778694330; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TuqZFTqSdwB+KIcZSx1SMR1VM/avxwHfFHSpGdyq4qY=; b=bWfW5QBck+rHE4IwiHvfJ7990A9puTWLFTfTTW5KEqWVblwFEZ2ZjvF0QjT17bu0FHmUM+ l9Wugogm87ZAiCNPuEkThZrx4nPvD8FXEGS40iFVjUKTl0IFjrCvgHd+kV5bjM2GzsRsSH 1YCCTuo1ZBtX5lBcgTvzvufMZgDq8+1zLBM4D1TK+/3ORLeZCNcsJNdnuDQimqTTbwwNsU AR2D7XXqJyco03ewpJA1JalF+CQVE/UBw4HQghKJSN+ExXyAExpXTr7tbqPCx2RnnVefrE pdY++2Uad4rknB2egxdv9YDPe+K3ABUqr1ocCv4hPU1tMrBUkPtkcV4XIeiRCA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gG18B24fCz11Jt for ; Wed, 13 May 2026 17:45:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c03d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 17:45:30 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ryan Libby Subject: git: 33355275247c - main - vnlru: avoid cache line contention List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rlibby X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 33355275247c462e1204bd1db5905a7d132eb502 Auto-Submitted: auto-generated Date: Wed, 13 May 2026 17:45:30 +0000 Message-Id: <6a04b8ba.1c03d.78f0936@gitrepo.freebsd.org> The branch main has been updated by rlibby: URL: https://cgit.FreeBSD.org/src/commit/?id=33355275247c462e1204bd1db5905a7d132eb502 commit 33355275247c462e1204bd1db5905a7d132eb502 Author: Ryan Libby AuthorDate: 2026-05-13 17:43:21 +0000 Commit: Ryan Libby CommitDate: 2026-05-13 17:43:21 +0000 vnlru: avoid cache line contention Reviewed by: kib, olce Sponsored by: Dell Inc. Differential Revision: https://reviews.freebsd.org/D56951 --- sys/kern/vfs_subr.c | 35 +++++++++++++++++++++-------------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index 4bfbc0a7057e..54e883038046 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -160,13 +160,6 @@ int vttoif_tab[10] = { S_IFSOCK, S_IFIFO, S_IFMT, S_IFMT }; -/* - * List of allocates vnodes in the system. - */ -static TAILQ_HEAD(freelst, vnode) vnode_list; -static struct vnode *vnode_list_free_marker; -static struct vnode *vnode_list_reclaim_marker; - /* * "Free" vnode target. Free vnodes are rarely completely free, but are * just ones that are cheap to recycle. Usually they are for files which @@ -190,7 +183,7 @@ static struct vnode *vnode_list_reclaim_marker; * E.g., 9% of 75% of MAXVNODES is more than 566000 vnodes to reclaim * whenever vnlru_proc() becomes active. */ -static long wantfreevnodes; +static long __read_mostly wantfreevnodes; static long __exclusive_cache_line freevnodes; static long freevnodes_old; @@ -326,12 +319,26 @@ static enum { SYNCER_RUNNING, SYNCER_SHUTTING_DOWN, SYNCER_FINAL_DELAY } syncer_state; /* Target for maximum number of vnodes. */ -u_long desiredvnodes; -static u_long gapvnodes; /* gap between wanted and desired */ -static u_long vhiwat; /* enough extras after expansion */ +u_long __read_mostly desiredvnodes; static u_long vlowat; /* minimal extras before expansion */ static bool vstir; /* nonzero to stir non-free vnodes */ -static volatile int vsmalltrigger = 8; /* pref to keep if > this many pages */ +/* pref to keep vnode if > this many resident pages */ +static volatile int __read_mostly vsmalltrigger = 8; + +/* Group globals accessed only under vnode_list_mtx together. */ +struct { + /* List of allocated vnodes in the system. */ + TAILQ_HEAD(freelst, vnode) vnode_list; + struct vnode *vnode_list_free_marker; + struct vnode *vnode_list_reclaim_marker; + u_long gapvnodes; /* gap between wanted and desired */ + u_long vhiwat; /* enough extras after expansion */ +} g_vnlru __exclusive_cache_line; +#define vnode_list g_vnlru.vnode_list +#define vnode_list_free_marker g_vnlru.vnode_list_free_marker +#define vnode_list_reclaim_marker g_vnlru.vnode_list_reclaim_marker +#define gapvnodes g_vnlru.gapvnodes +#define vhiwat g_vnlru.vhiwat static u_long vnlru_read_freevnodes(void); @@ -1345,7 +1352,7 @@ next_iter: return (done); } -static int max_free_per_call = 10000; +static int __read_mostly max_free_per_call = 10000; SYSCTL_INT(_debug, OID_AUTO, max_vnlru_free, CTLFLAG_RW, &max_free_per_call, 0, "limit on vnode free requests per call to the vnlru_free routine (legacy)"); SYSCTL_INT(_vfs_vnode_vnlru, OID_AUTO, max_free_per_call, CTLFLAG_RW, @@ -1535,7 +1542,7 @@ vnlru_recalc(void) * Calling vlrurecycle() from the bowels of filesystem code has some * interesting deadlock problems. */ -static struct proc *vnlruproc; +static struct proc * __read_mostly vnlruproc; static int vnlruproc_sig; static u_long vnlruproc_kicks; From nobody Wed May 13 17:45:28 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gG18F5C0xz6clTJ for ; Wed, 13 May 2026 17:45:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gG18F2gBcz451H for ; Wed, 13 May 2026 17:45:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778694333; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IwvzIg28aU1VG2f9X8Q3WbPs4kSkjYwj9lNZWRBpd0Y=; b=Cr4q4C6xKGUjtsnGPXpbdfeiGGrOulipj2lwR/yWGlc0GwMnZzLFrNl6yRxQ2DobrgHd5L 6uq5oNlCA30xJIN0BLjeeIzVNMD2qouWdJGQrsv+h+xHgp+TDHlKoSpN2pVruxTK1wJrpK nE3W3HQTrFF0WSNv8iSs1Ius+r8Oi/34rOJHZGf++PO9d09DRUaccxkcSpocLC6zdjidP8 Gcy+THeHr6F18Meeq2Iz0qUfdfPAJQVDECEzH6Mas8VORGn5+7P+SGdMRTg/x1j3lGEEsf 50JhJyostqC57I5kob4PkwVxdAg5dwT5phukJTpGUpMp3O88eItDe1RAMaWD1w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778694333; a=rsa-sha256; cv=none; b=jS9pGkD/kpqyzYnAqbzoETnWyEfebW352t2HPzMCMGm4gD9K7E1FbKa9DYjtvDBacwqlaB SdYn10ua/eHQf6WKgM/7oidkTxSMIkqYxn5QCYfOHsJoKlo7BwvXgbd7EjY0l+X7plQBVh ZHScRHZ4EdcZxAzf30UxDIu5GaMak5OU5+0CAtCUnQrzllc2oYjvnawYreESBD3/7O6Z7T s345inPp+NGghUDc+DxFDfxQQLSzjxw47jFFTlj4aBtncTjs/5n7SYx7uxZG44b39c5nu9 omo2abgNe2WFFPW5UF9PFSTpdc/zwQ39SyH8K/9Aii176SYXfRdROWLnbidyzQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778694333; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IwvzIg28aU1VG2f9X8Q3WbPs4kSkjYwj9lNZWRBpd0Y=; b=EVnZcR1hctRn5qutt1+KVFeU/HAgTt5NndGhSPAwrNySeu1MU75NMoExMw7X1bxr4xTelW M3Vwfq0MlhnNhgD7/cjJ9ueAAKPkUGTzaOPahWXHDYVJkS03i9GnyEgFl6zvNiZJQX8HLb /iU94o/NE1R45++FiJmLvD3I7LPqtXF75ETNuNbzPMz+DBevnxHTVxY8kWqsznSxZWPab/ H3+HsStGQJhCOlIuTnwUXtuITlWlXdBrsqYH4isj7bpX3gdUQxR3W18JahjCSHMh2FlwuQ PVjlTP9SDhphKwyVPgHeZ0GiNSSAP5M2/1N1CiKBM6ucc0xMLhIbdA8FhGt6qw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gG18F2Gwpz11Fv for ; Wed, 13 May 2026 17:45:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1d59a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 17:45:28 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ryan Libby Subject: git: 2a56cedac2e4 - main - bq_insert: delay the BUF_UNLOCK if not bd_flush()ing List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rlibby X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2a56cedac2e43c77e037e2d0c7e5af2ccb083c53 Auto-Submitted: auto-generated Date: Wed, 13 May 2026 17:45:28 +0000 Message-Id: <6a04b8b8.1d59a.24dd7c7c@gitrepo.freebsd.org> The branch main has been updated by rlibby: URL: https://cgit.FreeBSD.org/src/commit/?id=2a56cedac2e43c77e037e2d0c7e5af2ccb083c53 commit 2a56cedac2e43c77e037e2d0c7e5af2ccb083c53 Author: Ryan Libby AuthorDate: 2026-05-13 17:43:21 +0000 Commit: Ryan Libby CommitDate: 2026-05-13 17:43:21 +0000 bq_insert: delay the BUF_UNLOCK if not bd_flush()ing Reduce bufqueue lock contention by delaying the BUF_UNLOCK to after dropping the bufqueue lock. Still do the early BUF_UNLOCK if we actually have to bd_flush. Reviewed by: kib, markj Sponsored by: Dell Inc. Differential Revision: https://reviews.freebsd.org/D56948 --- sys/kern/vfs_bio.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c index 675f6fb4e526..181f2907c245 100644 --- a/sys/kern/vfs_bio.c +++ b/sys/kern/vfs_bio.c @@ -2053,22 +2053,26 @@ bq_insert(struct bufqueue *bq, struct buf *bp, bool unlock) bp->b_qindex = bq->bq_index; bp->b_subqueue = bq->bq_subqueue; - /* - * Unlock before we notify so that we don't wakeup a waiter that - * fails a trylock on the buf and sleeps again. - */ - if (unlock) - BUF_UNLOCK(bp); - if (bp->b_qindex == QUEUE_CLEAN) { /* * Flush the per-cpu queue and notify any waiters. + * + * Unlock before we notify so that we don't wakeup a waiter + * that fails a trylock on the buf and sleeps again. */ if (bd->bd_wanted || (bq != bd->bd_cleanq && - bq->bq_len >= bd->bd_lim)) + bq->bq_len >= bd->bd_lim)) { + if (unlock) { + BUF_UNLOCK(bp); + unlock = false; + } bd_flush(bd, bq); + } } BQ_UNLOCK(bq); + + if (unlock) + BUF_UNLOCK(bp); } /* From nobody Wed May 13 17:49:22 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gG1Dk29QDz6clf1; Wed, 13 May 2026 17:49:26 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gG1Dj754kz46px; Wed, 13 May 2026 17:49:25 +0000 (UTC) (envelope-from ivy@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778694566; 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=hkl5VMJzR3pK1LZlSj7H1e9SwHfSMX+ahAuMzsthJNY=; b=jDUjtA6XHrRm6PYgUaV50zvJppG0BpRZPfHcPkJcuG1qCg+W/v97uK/L3pXgdID9wBPfzF 1lIyyJSoAsm/aUB/gfhamd7AMB72Klg2OzleaDLB1sv6mBKutRbieOsO4yZY+dz07S+xzn jHfCpsEEuCiMMqSTCfxBNyaVLa3mRIuMyq54irX0ofD/8QTYvf/vuNCOs8q2MRL8moi3+R RGgf1PrJwXbe6K8LdN+a/keGdDcdFtHNYThWoP/6EckVV3/M308Qu8dcTulLLeOGW+Gy8E HX675VJ09v3fb3HfDYzsCftfyLkVMqLiZNTRfZBb2TyZt1HHdbMh0YOz/9cIBA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778694566; a=rsa-sha256; cv=none; b=S2XNSUKbb4Dc/zg0RXwKmQg5bZolwqZfA9zwQueUQEECfa+rfneep3CnAswA9CYCXHuJnl zdRHrZFMnHK79v7z4RO/DYHDysFS45AhndUYK4fO7UPUv4nswZT0GoutoS3gCYbTaAgAQs wg2hlGjFmq6+PwAtimB/FoAyaU3i4PG51mBv/l3d1SnyWvYkbahtz6flhPjXzaoZJuvEE1 dZ28LpQ6DzaDlSDWQ+0/6V32WSb9EPYRHw1QLa/OQlvDCvv1XrdcwS42Ls+uG96sbm4gjg E+TZOmuCjBqjtSSUEs6utWfhQ1AV7f1VgPvRZtnX8qLyLR5IXBqhZ0JwrknGzw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778694566; 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=hkl5VMJzR3pK1LZlSj7H1e9SwHfSMX+ahAuMzsthJNY=; b=lOf+KMTyqyvsScM2SaNZgJIKQpjHqu+kDZi/i2/Tz8iA54DFcF+syPyhgVsEwdKBiqaqPP VhbPKquHTtmGszw0LfqkMJVjkYF8FXExyVSJrD9sWVIM1JYzUyQA3htOWi761hx44B727H 9j6M2CUZ09KQkd10yQvNF6Lulh4uK89OKF5wWugT1utxoE9AA3jrNmmCujzlbQtygrttFB I7i9L502aA4NMah1iQRoMc+wXicp7jKRwBOVrQ6rSLsusmQZPkRA9ww1VhFA5fQtR4LWhI SRSrpetD9VNXBLTC3jeREBrOdtbo3moZROGFN/L8JpLmn0ywQyjWD/QX7DG1jQ== Received: from rose.le-fay.org (rose.le-fay.org [IPv6:2a00:1098:6b:400::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: ivy/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4gG1Dj2879zFMj; Wed, 13 May 2026 17:49:24 +0000 (UTC) (envelope-from ivy@freebsd.org) Date: Wed, 13 May 2026 18:49:22 +0100 From: Lexi Winter To: Andrew Turner Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org, Sarah Walker Subject: Re: git: 76a2904c352b - main - arm64: Add RSI detection for CCA Message-ID: Mail-Followup-To: Andrew Turner , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org, Sarah Walker References: <6a035b82.3e295.91ae8c3@gitrepo.freebsd.org> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="WPl1nKXF5nSvLU5e" Content-Disposition: inline In-Reply-To: <6a035b82.3e295.91ae8c3@gitrepo.freebsd.org> --WPl1nKXF5nSvLU5e Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable hello, Andrew Turner wrote in <6a035b82.3e295.91ae8c3@gitrepo.freebsd.org>: > commit 76a2904c352b497b32fc902523e3e485f7b06ffd > Author: Sarah Walker > AuthorDate: 2026-05-12 11:27:13 +0000 > Commit: Andrew Turner > CommitDate: 2026-05-12 16:54:40 +0000 >=20 > arm64: Add RSI detection for CCA i think this commit (or a related one) has broken the aarch64 LINT-ACPI kernel build: --- rsi.o --- In file included from /aux0/ci/worker/main-linux-clang-aarch64/build/sys/ar= m64/arm64/rsi.c:35: In file included from /aux0/ci/worker/main-linux-clang-aarch64/build/sys/vm= /vm_page.h:68: In file included from /aux0/ci/worker/main-linux-clang-aarch64/build/sys/vm= /pmap.h:88: =2E/machine/pmap.h:151:48: error: unknown type name 'vm_prot_t'; did you me= an 'vm_page_t'? 151 | int pmap_change_prot(void *va, vm_size_t size, vm_prot_t prot); | ^~~~~~~~~ | vm_page_t /aux0/ci/worker/main-linux-clang-aarch64/build/sys/sys/types.h:293:25: note= : 'vm_page_t' declared here 293 | typedef struct vm_page *vm_page_t; | ^ --WPl1nKXF5nSvLU5e Content-Type: application/pgp-signature; name=signature.asc -----BEGIN PGP SIGNATURE----- iHUEABYKAB0WIQSyjTg96lp3RifySyn1nT63mIK/YAUCagS5ngAKCRD1nT63mIK/ YGfLAP0TGl5pue2SS6h28oOiGSWxo8Hcrg6PKzNJ8c7uLCM+6gD8DEHtTCsAoLJM hDqqn/rDRfaFzfGIQ17N0Nr/bHTKvQ0= =SIXX -----END PGP SIGNATURE----- --WPl1nKXF5nSvLU5e-- From nobody Wed May 13 18:11:43 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gG1kX2dKcz6cn7Z for ; Wed, 13 May 2026 18:11: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gG1kX1KQ4z49R9 for ; Wed, 13 May 2026 18:11:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778695908; h=from:from:reply-to:subject:subject: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+ltc75VaCgSKgSIljHOGu+91tPq6Vok+rxeF3LgS9I=; b=OFDSpXolnsbUSSUe6sgDfcoP+cZMoGzMfuubNrDYZ41hesjCIUYSkH53a7zQbWCXTn6WMO 6FNrbo1IYQ3SSv3ZLp6w3hxFRCsPqJCOxejmRkcTu/FN+7F0c9zeAWPz1BfOp40V66GpK5 iwlXMC250GATsE4tl580rzg/86vrHxGQxd7uMFxFAp8Rl5bEcTr4XPdLf4NGgmmx7EATMe TsnmUkLnIp1RUw3AS196talPkrMv+oD0vA9oG/ackaUZaIJElZStJ3cggf1IPvRrBmeQa4 AWAXaRsWd8C/DKH8l6PvtziAx0T1z0OeRZU5YD+GqH9xDhOw57QXlL1QDO5ZEQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778695908; a=rsa-sha256; cv=none; b=SipMDJDifUBAybOvUS6sO/uLN8//ZKMK0R9A0eDSYSayhKNxurkbh+LSvr8jM64HIWAyFV l9nO0a4X2XQPfJ+DW6l5fVjaFm793BcLFoUMXHqgSnIVVbQfHxHcwYHdBpf1Xr0h5g3jX2 0Rhr22zsKRG6x1WgozlbpuHQqKF5SHX+h9RWWw2nu+PgcjSqbYw5qFnPaFgZt+6Kp0pb4V nAV0Rnbw+paSAjdrm3OoNoBr1jWeAbIpMEpvtFEOyUaH4MyhRfc/xjljSTlojmIub14y0K R1TSS36vphWH513GZ/VjPpW4vtUwnR2ysAINkGZ3smjY+U5BcV/McwxtQjzb6w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778695908; h=from:from:reply-to:subject:subject: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+ltc75VaCgSKgSIljHOGu+91tPq6Vok+rxeF3LgS9I=; b=sPLaRvEEnGBlAc6hG7Px3YKGcyleA9Z1TkYvytJA5kf8LjjgYrKRtqcLBRXPluunG8lwLS CS6iB6UAgxIcIqDxf2V9DNEtMYkuG29C9vw49hXfumYRCW14hxuIU/Tq385PbgnkrHgKWv JSZyeuhaCyxUbFiXSXxzVyVGvb90PjyfYRfR2qhGFiDiXqnTE1Jshd9urrPI4hdUevbdH3 gU/HQ7UiuNHW/c0gDdLoyzxXXBp3iqYPUTj+cf6KJ8tYNIqRLNUfFzmOJmQrSRzGUggt59 QfRjlrabpts2omAlCOFqAeiB7QDxbPyFf9euO5RWfGcrg8BFizkO0W0jTZIQKA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gG1kX0tZ1z11dS for ; Wed, 13 May 2026 18:11:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 20cd3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 18:11:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 52fa2f9f8d57 - main - clock_gettime.2: Fix a couple of typos List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: 52fa2f9f8d57e4dde555567794c6b3e0e242b8a1 Auto-Submitted: auto-generated Date: Wed, 13 May 2026 18:11:43 +0000 Message-Id: <6a04bedf.20cd3.1ddaf401@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=52fa2f9f8d57e4dde555567794c6b3e0e242b8a1 commit 52fa2f9f8d57e4dde555567794c6b3e0e242b8a1 Author: John Baldwin AuthorDate: 2026-05-13 18:11:26 +0000 Commit: John Baldwin CommitDate: 2026-05-13 18:11:26 +0000 clock_gettime.2: Fix a couple of typos Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D56990 --- lib/libsys/clock_gettime.2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/libsys/clock_gettime.2 b/lib/libsys/clock_gettime.2 index 841673648dfc..746be2e03d8b 100644 --- a/lib/libsys/clock_gettime.2 +++ b/lib/libsys/clock_gettime.2 @@ -71,7 +71,7 @@ Increments in SI seconds like a wall clock. It uses a 1970 epoch and implements the UTC timescale. The count of physical SI seconds since 1970, adjusted by subtracting the number of positive leap seconds and adding the number of negative leap seconds. -Behavior during a leap second is not defined by and POSIX standard. +Behavior during a leap second is not defined by any POSIX standard. .It Dv CLOCK_MONOTONIC .It Dv CLOCK_MONOTONIC_PRECISE .It Dv CLOCK_MONOTONIC_FAST @@ -108,7 +108,7 @@ It will increase monotonically during a leap second. Will return .Er EINVAL if the current offset between TAI and UTC is not known, -which may be the case early in boot before NTP or other time daemon has +which may be the case early in boot before NTP or another time daemon has synchronized. .El .Pp From nobody Wed May 13 18:52:02 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gG2cz0v0jz6cqnH for ; Wed, 13 May 2026 18:52: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gG2cz0Jy8z3JJH for ; Wed, 13 May 2026 18:52:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778698323; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kENZp8ByCAeb0rO6MPZogCxP3iuRo0WaJgFF4ALB/wI=; b=dr2qT0lloAFsImVQ6zznT36SdShaQkYFSR+TsfsiCtRNibK36tekF+IsVshwaHTiYKJHRT mZ9cWDGsMdc+uIB3UGtG3isbeWzU83YDT7m35Jv7cTm2ZKSrI/1knDkO5OujazW3ZPDtF3 4rlZ8wDauNkeqjyy83QLYpytat3HR5zD0tPtWu4B9pVZ0u7cOyKLY9lR6LTO6/0CfFAbkx nh+ZtasSh0bWGEfIPWPsLKG9k8at5lmiD4C2e9uIyXkcobjbIukwgKdAv81GyhDSje3bcq weOnaWg13BKTQmIekLHx/gVRGIb10LP5Uh04IanSp9oWpPBnHQJgbXQTHxGXqg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778698323; a=rsa-sha256; cv=none; b=nu/VgqXRStyb8c73dOkyGi7HWhA6uRj5UGlAilihNHpt7hd8Tp/eiBs+FzBfYtSe0JNTYu /BfmcnCqfg4x+sPLd8oW69ZyNmDuxCeaQ/3aTlIVUkCNnDDtFanc2lRKU9chF1KsrMvDmn 82+m+cnOwefMI2OOVCGnOUJOewZK12zzsxTmqKP3FK0RbOI9T6+zlAlmDmftntQm1C5Zn6 +AzF0lLaHHEZj9+FlOI6UU11eN5xOdDl3/JlePnhbaumw+jn6c7k59FgMWW6kUMywAy2j6 DUsjMzF20YbIK5NKHhhR/ItpRNBEBvVPZ96WRTEzIMhQDDKhsLBlm2ZfPMv3yQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778698323; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kENZp8ByCAeb0rO6MPZogCxP3iuRo0WaJgFF4ALB/wI=; b=a0RgoTjuDsOOMikFr5b1I4I8QjCS402MwcLItlAqNZH/uxL1N9sjOlGQ/HOsS7H0SDde+Z vO49CVlZpsXoVzyud/AC9yOPmMJRSEsmUZ0Z32YqmsGYxVzvx1xtAL6h52RuwyJoeaIn7c yxN/zwYznlUVdnv5NjAMQHzMXyfoAdkkLkqUiG/pSt9OLigaDYB73ZBpuigsZYcxyzgqsh bIoOwECwdRjTFP+mmFkUHE9RSfwpQCHIVYcVT+3T2X7OzEHWBFErcd2LDVFJWCNn8qKjjX TbWtuV8e9QtTYrIsKzgxknLCx9m0rLthCMIyiZRaUCwWKU+G4L5JlZ6Zu2X9sw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gG2cy6zJGz12bf for ; Wed, 13 May 2026 18:52:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 244a6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 18:52:02 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Martin Matuska Subject: git: 1c702dda346a..6330a45b06d2 - vendor/openzfs/zfs-2.4-release - vendor branch updated List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/vendor/openzfs/zfs-2.4-release X-Git-Reftype: branch X-Git-Commit: 6330a45b06d20125de679aae5f63ba14082671ef X-Git-Oldrev: 1c702dda346a59e05cfd3029569bbb1d5d91c54b X-Git-Newrev: 6330a45b06d20125de679aae5f63ba14082671ef Auto-Submitted: auto-generated Date: Wed, 13 May 2026 18:52:02 +0000 Message-Id: <6a04c852.244a6.19aff93a@gitrepo.freebsd.org> The branch vendor/openzfs/zfs-2.4-release has been updated by mm: URL: https://cgit.FreeBSD.org/src/log/?id=1c702dda346a..6330a45b06d2 fc44c73021c3 build: add SPDX license tags to build system files 423466063dea spdxcheck: enforce SPDX license tags on build system files faddb7f5cab1 Linux 7.0: explicitly set setlease handler to kernel implementation ca18f1ad5fbc build: get objtool from $kernelbuild 786b7c2a90e5 Linux 7.0: blk_queue_nonrot() renamed to blk_queue_rot() ffa0a5af30e4 Linux 7.0: posix_acl_to_xattr() now allocates memory 20a30acc5407 Linux 7.0: add shims for the fs_context-based mount API 04daeffe7c41 CI: Remove deprecated Fedora 41 1ace2bf889e0 zpl_super: prefer "new" mount API when available 02ed091060ca Fix check for .cfi_negate_ra_state on aarch64 a94b137aac36 FreeBSD: Improve dmesg kernel message prefix cb2e2f9c4fb9 libzfs: use mount_setattr for selective remount including legacy mounts 5445c3720bb4 config: remove minimum kernel version check 12cd6ffa3937 README: describe specific kernels/distros we target 33961142a2fa Fix deadlock on dmu_tx_assign() from vdev_rebuild() 938c8c98b1be draid: fix data corruption after disk clear 97949da7097d config: fix STATX_MNT_ID detection 7894a5e88473 ZTS: redundancy_draid_spare{1,3} exceptions 1bc922516ec4 ZTS: Add back redundancy_draid_spare3 exception 59185c569155 Linux 7.0: also set setlease handler on directories (#18331) bec56a4c10af config: refuse to build without fs_context 0edbfbfb2dd2 linux/super: remove support for old mount API 7c3f75af2f15 linux/super: flatten mount/remount into get_tree/reconfigure 04692b29da86 linux/super: flatten zpl_mount_impl into zpl_get_tree 20b8936c1ab8 linux/super: flatten zpl_fill_super into zpl_get_tree 2c861ebcdec4 CI: Support repository variable override for ZTS OS selection 0d42a6c35733 CI: Add ARM builder 6756fd47401c Linux 7.0: autoconf: Remove copy-from-user-inatomic API checks (#18348) (#18354) 74052404c64c ci: update FreeBSD CI images from 14.3 to 14.4 3ca81f610b39 Linux 7.0: ensure LSMs get to process mount options 9b8ccbd2cbf5 draid: fix import failure after disks replacements 7843c42b273d linux/vfsops: add vfs_t allocator, make public 36ae5a65aad1 linux/vfsops: remove old options parser f5a60b6caedb linux/super: remove zpl_parse_monolithic 43eed9ee417b linux/super: match vfs_t lifetime to fs_context 0b223ef57730 linux/super: implement new mount params parser a8942fdb8940 linux/super: work around kernels that enforce "forbidden" mount options fc285caa841d linux/vfsops: remove zfs_mnt_t, pass directly 26e9a69feac9 CI: Free 35GB of unused files on the runner 63b8da8ff7b0 Linux: Refactor zpl_fadvise() e9a8c6e080ef draid: allow seq resilver reads from degraded vdevs f4e5eb7e51d0 CI: set /etc/hostid in zloop runner eec8b9b929dc CI: Disable ZIP file artifacts, update versions da44040bbb53 draid: fix cksum errors after rebuild with degraded disks a6b3ff9bab40 deb.am: propagate build errors in native-deb targets eb3331a83e91 Linux 7.0 compat: META 6cb1e850b206 CI: Do not set scheduler in qemu-1-setup.sh f99954c01f6f CI: tolerate missing artifacts afc6e0816068 CI: Add more debugging to qemu-1-setup.sh aba3ed30a393 fix memleak in spa_errlog.c b40cd919130f Fix s_active leak in zfsvfs_hold() when z_unmounted is true 5d569358c8a9 Fix options memory leak in zfsctl_snapshot_mount b2602a400a47 Fix snapshot automount deadlock during concurrent zfs recv e7524594a907 Fix read corruption after block clone after truncate 9edfdd6e416b [zfs-2.4.2] Whitelist some Makefile.am files from SPDX b06caaeec479 range_tree: use zfs_panic_recover() for partial-overlap remove 7590972f76e5 Prevent range tree corruption race by updating dnode_sync() b8addf92216a dmu_direct: avoid UAF in dmu_write_direct_done() aa62ae87dd18 Fix 'kernel BUG at mm/usercopy.c' 19354abc53ad CI: curl fallback, print killed tests, FreeBSD URL 887bfc1a64bd build: use pax tar format for make dist b0c1dcb5310f ZTS: add targeted redundancy_draid_spare exception 76fd64ac9f62 Fix rare cksum errors after rebuild fc87e269e291 Initialize vr_last_txg for rebuild 65b4a5c5518f Linux 7.1: access dentry d_alias directly 7534fa4df71f CI/GCC: Add Fedora 44, fix build errors and threadsappend 7b10409fbfeb CI: FreeBSD 15.1 PRERELEASE (#18490) 9f92266b76dd Fix redundant declaration of dsl_pool_t 3862aadf78ec Fix vdev_rebuild_range() tx commit 0b58f1db893f libspl/mnttab: follow symlinks when resolving path via statx (#18469) 91c87648a72d [2.4.2-only] GCC: Fix uu_ident.c strchr() 6f14581e1ace Cleanup allocation class selection 4bb759274508 Add support for POSIX_FADV_DONTNEED 38501e182131 Fix long POSIX_FADV_DONTNEED for single block files f07458737c68 initramfs: fix incorrect variable rename 6330a45b06d2 Tag zfs-2.4.2 From nobody Wed May 13 19:24:20 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gG3LL0B8pz6css2 for ; Wed, 13 May 2026 19:24: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gG3LK6jPfz3QYk for ; Wed, 13 May 2026 19:24:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778700266; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=h6r5iO42P5Sw+TGZT+bVahHEsfIkbTx+DHtMi5G4Zqg=; b=S8LuDlzBhYCwyUzwQvN1mtC/OnqaXffuwgkpCihe0qnNPZ+9RK6pRVwBcPmSTU496AdQbr B/4gQQt3SHqnyeGFNvrMtx2FFCJGpeZnYKFU5Ew5hLGG4O8iaXXpbIUVAEStAr910sje0+ RA2WknIwYGs5nSFH2pmS8LOkvsEBxzkrHf24g4QciB6nxZnOlGUjOHL90BgN3+okSBoxqt g0kFnmYbBHPmQ5XzCAOljbGxav2L/jsOZzyeBr2v65quvzZndCHwmaCLcR3ENUIsac3z2S BggW2s2WyA9ie5BOrjnbcOFTXaQC+V15R1KUA7//5KOwr5GVbAgKEKDvTbGEwQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778700265; a=rsa-sha256; cv=none; b=dVTl0tKA5+MUawfIetmmw+2UvPn5MMvi/mxWWvfBumVkAhIvY5QgKLr/G02vcPGfD3S8yr ALgejY4SMOPUJqPxVE7qkRJZjjEQ+ESFRvIfv751i5wXtroQ9kb+Hj3oaS9G/+A2Ha3HEi npa6Odvn9QxFGdYLjNtU/4L+vG+lssdtU0+HN68u5jnR7AD10DPR8pN3dt19/YVAVRJu4T ziHVLHOxMvedRrwCiEAb1rlXHShvqHJQsK24wq4ChLheX9h4ZlnguUS0FwnEmjJgsbURNO FcKg6fw4TOZjFgTAxVeD2J9ACAMiavVDDBuQQVdHw7SDTGpXo1jxLvz4Oq1VDg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778700265; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=h6r5iO42P5Sw+TGZT+bVahHEsfIkbTx+DHtMi5G4Zqg=; b=hnsKjMdmPnmp404kIOKhMjRuVuN5UsadeS0QpxUAR+tX6FYVVk/2ZjjLArG1mdHusZKqre 55FbU8ap6Zwo2fTaw6c3EzfD5rR8Za56hOB9CAfk/sPNnScjyXrNAxeB4+YSUpfNsGsId2 qS+N6E0zRyaohqKkwqPHqS5n1KeX8YySNDIQZR4OBTIOyj2nbaErIu3P8+2rgLKuvkd8pf 4LRqEGIb/TERY8XFW6sjP1K1xInOEPmyXm2vukYliY5RBSQKqvnLEbyXRviO7d6qrDzjMF veJmiLrimylWR6EvFPI/D39y5SsJ7xyO9Fw13o+1U78CE6YahEvM4nP2hEdL8A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gG3LK6Dw3z14DG for ; Wed, 13 May 2026 19:24:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 276ab by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 19:24:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alan Somers Subject: git: 89a0148521ae - stable/15 - Make "make update-packages" idempotent List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 89a0148521aefe0a190d4b62749186c705962d32 Auto-Submitted: auto-generated Date: Wed, 13 May 2026 19:24:20 +0000 Message-Id: <6a04cfe4.276ab.2e6106ed@gitrepo.freebsd.org> The branch stable/15 has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=89a0148521aefe0a190d4b62749186c705962d32 commit 89a0148521aefe0a190d4b62749186c705962d32 Author: Alan Somers AuthorDate: 2026-05-07 18:18:29 +0000 Commit: Alan Somers CommitDate: 2026-05-13 17:23:07 +0000 Make "make update-packages" idempotent If the user runs "make update-packages" without bumping BRANCH, then it isn't possible to copy packages from the old location to the new one (because the two locations are the same). So just skip that step. Sponsored by: ConnectWise PR: 295085 Reviewed by: ivy, emaste Differential Revision: https://reviews.freebsd.org/D56872 (cherry picked from commit bd1e789b8452a8c2f166a3b4defb95330c71dadd) --- Makefile.inc1 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 2255b61a30ff..2c79a8c7920a 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2116,7 +2116,7 @@ real-packages: stage-packages create-packages sign-packages .PHONY real-update-packages: stage-packages .PHONY ${_+_}${MAKE} -C ${.CURDIR} PKG_VERSION=${PKG_VERSION} create-packages -.if defined(PKG_VERSION_FROM_DIR) +.if defined(PKG_VERSION_FROM_DIR) && ${PKG_VERSION} != ${PKG_VERSION_FROM} @echo "==> Checking for new packages (comparing ${PKG_VERSION} to ${PKG_VERSION_FROM})" @for pkg in ${PKG_VERSION_FROM_DIR}/${PKG_NAME_PREFIX}-*; do \ pkgname=$$(pkg query -F $${pkg} '%n' | sed 's/${PKG_NAME_PREFIX}-\(.*\)/\1/') ; \ @@ -2134,6 +2134,8 @@ real-update-packages: stage-packages .PHONY echo "==> New package $${newpkgname}" ; \ fi ; \ done +.elif defined(PKG_VERSION_FROM_DIR) + @echo "==> Package version ${PKG_VERSION} unchanged, keeping old package set" .else @echo "==> Bootstrapping repository, not checking for new packages" .endif From nobody Wed May 13 19:31:32 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gG3VX44kyz6ctWs for ; Wed, 13 May 2026 19:31: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gG3VX3WP2z3S8w for ; Wed, 13 May 2026 19:31:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778700692; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rPChTGNA8D/vsCxJxy0DBKzOMSqCmOQHQ/g+S+lrM9M=; b=fJQPuS6gVt6CCIJQQjluC/SLbs4CLdN8vSwFaMGZwh3jBY9Fik6DW3IpKPMK40hZ4e2/Jt ExB7xMNnowGSvDICtgfC6Sl8l/IXnw9CwXj+37Fn+hl7T0XtlRNkcezi9pUVnBuA+J563B gv0VT2EbBYAetux7ArpzuT6qgeh9hxFoTyQ/HpxY4W7pxN64jnDaeIr45/q0C3KzyhJL3d oJWmANONscRHlkzaE2IukR/lk85yGbB+Ww6L+svgDodMuKV+PpKivmnwUXMlRY2+/Qn4v3 w7FPNVeavTMPQ3s5+xbwcBVjyG6hIcRFhlAWkzTfrHrlKigYtglgnJafR7cSnw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778700692; a=rsa-sha256; cv=none; b=rmt7iFut7J4XMRCn3bq3JdqMmLeuLqUZhOQdBhh55ifVeXB6sIQEWFnCmZIrLhsKSvekO/ LF/XG3TtEyDGr7eFfbzvm0uQz7saZGSt1+Z6bnWms7OKg4iGHwVU398f6wcxNVzI465xW1 5n3inB8aKeVj0IAtd8GH6WePIp25tEGr3ldXblqK9UXtv7Z/REqMraTKz/d17CI9JxU+h1 YaloltTb2iT94iE7jRk+THaf163+xCndCgIPRqU9L8Vy9oVZMeRS2p3a4HEzBNSVg2QuWK kc4owOQqHjGfKFSGzIQCdb4D9DsdyeCgyFDR956KEseAJWoMNqydHMLBmX2g8w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778700692; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rPChTGNA8D/vsCxJxy0DBKzOMSqCmOQHQ/g+S+lrM9M=; b=xD1BmV4orCrhdTjsfG5paJ00Wgv8EiG+kQgHlerkHG8CE8l1Czle5b/DFGoHLc7BAMSb0u yF+zj77qhQKB03sYWA/FUn7EG3TCwjh+CN0zzPivVH1nMUhW3Kq2Jutri1tbZwK4dVdIvw dYHis/NKbfKaAg8USkFobDIX0UrKm6JpGJU6FbhWOHN5Z+LUAft9Mgy4xbXDwAtOHVUb2P UicZeG/gL4dUma/0fagqXhAbsazsbfqdQtc/ib+joFIngoMYxDV3WBL1sbGinTZpRivmdO pUFuOSOeDR+UHda98anTUSnvh18JPY41Qy2qi7W+ghP88O8dDe9WGbgMHTIkgg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gG3VX325pz13rG for ; Wed, 13 May 2026 19:31:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26ce0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 19:31:32 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alan Somers Subject: git: 1f5869130f6e - stable/15 - bsdinstall: do pkgbase installations with the "script" command List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 1f5869130f6ebd299e65a627eff23a8c3d360afb Auto-Submitted: auto-generated Date: Wed, 13 May 2026 19:31:32 +0000 Message-Id: <6a04d194.26ce0.d7af0b5@gitrepo.freebsd.org> The branch stable/15 has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=1f5869130f6ebd299e65a627eff23a8c3d360afb commit 1f5869130f6ebd299e65a627eff23a8c3d360afb Author: Alan Somers AuthorDate: 2026-04-28 17:27:17 +0000 Commit: Alan Somers CommitDate: 2026-05-13 19:27:34 +0000 bsdinstall: do pkgbase installations with the "script" command "bsdinstall script" will now do a pkgbase installation by default. The system components to install can be specified in the COMPONENTS variable, and have the same names as those used in the interactive installer. bsdinstall will still do a legacy distset installation if DISTRIBUTIONS is defined in the installerconfig file. PR: 290375 Sponsored by: ConnectWise Reviewed by: ziaee, ivy, jduran Differential Revision: https://reviews.freebsd.org/D56717 (cherry picked from commit dc14ae4217a0babb1240f813b642edc2d7b955a6) --- UPDATING | 5 +++ usr.sbin/bsdinstall/bsdinstall.8 | 45 ++++++++++++++++----- usr.sbin/bsdinstall/scripts/pkgbase.in | 15 ++++++- usr.sbin/bsdinstall/scripts/script | 71 ++++++++++++++++++++-------------- 4 files changed, 95 insertions(+), 41 deletions(-) diff --git a/UPDATING b/UPDATING index 034dabc4da81..137d2aa78e6c 100644 --- a/UPDATING +++ b/UPDATING @@ -12,6 +12,11 @@ Items affecting the ports and packages system can be found in /usr/ports/UPDATING. Please read that file before updating system packages and/or ports. +20260512: + "bsdinstall script" will now do a pkgbase installation by default. To + revert to the legacy distset installation, set "DISTRIBUTIONS" in + your installerconfig. + 20260422: Bump __FreeBSD_version to 1500508 for LinuxKPI after merges of changes to eventfd and changes for DRM 6.11, as well as diff --git a/usr.sbin/bsdinstall/bsdinstall.8 b/usr.sbin/bsdinstall/bsdinstall.8 index 282b88328e99..a35c8f56ada7 100644 --- a/usr.sbin/bsdinstall/bsdinstall.8 +++ b/usr.sbin/bsdinstall/bsdinstall.8 @@ -29,7 +29,7 @@ .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd April 20, 2026 +.Dd May 12, 2026 .Dt BSDINSTALL 8 .Os .Sh NAME @@ -109,9 +109,12 @@ for more information on this target. .Pp The .Ev DISTRIBUTIONS -environment variable is set to -.Dq base.txz kernel.txz -by default for this target. +environment variable is unset by default for this target. +Instead, the +.Ev COMPONENTS +environment variable is effectively set to +.Dq base kernel kernel-dbg +for this target. .It Cm keymap If the current controlling TTY is a .Xr syscons 4 @@ -321,8 +324,17 @@ overridden when making scripted or customized installers. The directory to use for temporary files. Default: .Dq Pa /tmp +.It Ev COMPONENTS +The set of components to install for scripted installations using +base system packages, e.g., +.Dq base lib32 kernel-dbg tests . +Default: "base kernel-dbg" .It Ev DISTRIBUTIONS -The set of distributions to install, e.g., "base.txz kernel.txz ports.txz". +The set of distributions to install for traditional installations, e.g., +.Dq base.txz kernel.txz ports.txz . +If unset, then +.Nm +will install using base system packages. Default: unset unless noted otherwise in the .Sx TARGETS section. @@ -609,18 +621,18 @@ A typical bsdinstall script, using the default filesystem layout and the UFS filesystem, looks like this: .Bd -literal -offset indent PARTITIONS=DEFAULT -DISTRIBUTIONS="kernel.txz base.txz" +COMPONENTS="base debug" #!/bin/sh sysrc ifconfig_DEFAULT=DHCP sysrc sshd_enable=YES -pkg install puppet +pkg install -y puppet .Ed .Pp For a scripted installation involving a ZFS pool spanning multiple disks, the script instead looks like this: .Bd -literal -offset indent -DISTRIBUTIONS="kernel.txz base.txz" +COMPONENTS="base debug" export ZFSBOOT_VDEV_TYPE=stripe export ZFSBOOT_DISKS="ada0 ada1" export nonInteractive="YES" @@ -628,7 +640,20 @@ export nonInteractive="YES" #!/bin/sh echo "ifconfig_DEFAULT=DHCP" >> /etc/rc.conf echo "sshd_enable=YES" >> /etc/rc.conf -pkg install puppet +pkg install -y puppet +.Ed +.Pp +To install using traditional distributions sets instead of packages, set +.Ev DISTRIBUTIONS +to the list of distribution sets to install, like this: +.Bd -literal -offset indent +PARTITIONS=DEFAULT +DISTRIBUTIONS="kernel.txz base.txz" + +#!/bin/sh +sysrc ifconfig_DEFAULT=DHCP +sysrc sshd_enable=YES +pkg install -y puppet .Ed .Pp On @@ -653,7 +678,7 @@ arbitrary commands can be run here to extend the installer. In addition to the variables in .Sx ENVIRONMENT VARIABLES , in particular -.Ev DISTRIBUTIONS , +.Ev COMPONENTS , the preamble can contain a variable .Ev PARTITIONS which is passed to the diff --git a/usr.sbin/bsdinstall/scripts/pkgbase.in b/usr.sbin/bsdinstall/scripts/pkgbase.in index 89ddc244171e..2c7d6bcae904 100755 --- a/usr.sbin/bsdinstall/scripts/pkgbase.in +++ b/usr.sbin/bsdinstall/scripts/pkgbase.in @@ -180,7 +180,18 @@ local function select_components(components, options) } append_list(bsddialog_args, checklist_items) - local exit_code, output = bsddialog(bsddialog_args) + local exit_code = 0 + local output = "" + if options.non_interactive then + local env_components = os.getenv("COMPONENTS") + if env_components then + output = env_components:gsub(" ", "\n") + else + output = "base\nkernel-dbg" + end + else + exit_code, output = bsddialog(bsddialog_args) + end -- This should only be possible if bsddialog is killed by a signal -- or buggy, we disable the cancel option and esc key. -- If this does happen, there's not much we can do except exit with a @@ -300,6 +311,8 @@ local function parse_options() for _, a in ipairs(arg) do if a == "--jail" then options.jail = true + elseif a == "--non-interactive" then + options.non_interactive = true else io.stderr:write("Error: unknown option " .. a .. "\n") os.exit(1) diff --git a/usr.sbin/bsdinstall/scripts/script b/usr.sbin/bsdinstall/scripts/script index 21da2ea7c366..93d07c7899c3 100755 --- a/usr.sbin/bsdinstall/scripts/script +++ b/usr.sbin/bsdinstall/scripts/script @@ -40,6 +40,7 @@ f_include $BSDCFG_SHARE/variable.subr # PARTITIONS # DISTRIBUTIONS # BSDINSTALL_DISTDIR +# COMPONENTS # # Default name of the ZFS boot-pool @@ -97,7 +98,6 @@ awk 'BEGIN {pathb=ARGV[2]; ARGV[2]=""} /^#!/{b=1} { >$TMPDIR/bsdinstall-installscript-preamble . $TMPDIR/bsdinstall-installscript-preamble -: ${DISTRIBUTIONS="kernel.txz base.txz"}; export DISTRIBUTIONS export BSDINSTALL_DISTDIR # Re-initialize a new log if preamble changed BSDINSTALL_LOG @@ -118,37 +118,48 @@ else fi bsdinstall mount -# Fetch missing distribution files, if any -exec 5>&1 -export BSDINSTALL_DISTDIR=$(`dirname $0`/fetchmissingdists 2>&1 1>&5) -FETCH_RESULT=$? -exec 5>&- +if [ -n "$COMPONENTS" -a -n "$DISTRIBUTIONS" ]; then + error "Cannot set both COMPONENTS and DISTRIBUTIONS" +elif [ -z "$DISTRIBUTIONS" ]; then + # If COMPONENTS is set, or neither is, install with pkgbase + bsdinstall pkgbase --non-interactive +else + # Otherwise, unpack distsets -[ $FETCH_RESULT -ne 0 ] && error "Could not fetch remote distributions" + # Fetch missing distribution files, if any + exec 5>&1 + export BSDINSTALL_DISTDIR=$(`dirname $0`/fetchmissingdists 2>&1 1>&5) + FETCH_RESULT=$? + exec 5>&- -# Unpack distributions -bsdinstall checksum -if [ -t 0 ]; then - # If install is a tty, use distextract as normal - bsdinstall distextract -else - # Otherwise, we need to use tar (see https://reviews.freebsd.org/D10736) - for set in $DISTRIBUTIONS; do - f_dprintf "Extracting $BSDINSTALL_DISTDIR/$set" - # XXX: The below fails if any mountpoints are FAT, due to - # inability to set ctime/mtime on the root of FAT partitions, - # which is needed to support e.g. EFI system partitions. tar has - # no option to ignore this (distextract ignores them internally - # through a hack), and returns 1 on any warning or error, - # effectively turning all warnings into fatal errors. - # - # Work around this in an extremely lame way for the specific - # case of EFI system partitions only. This *ONLY WORKS* if - # /boot/efi is empty and does not handle analogous problems on - # other systems (ARM, PPC64). - tar -xf "$BSDINSTALL_DISTDIR/$set" -C $BSDINSTALL_CHROOT --exclude boot/efi - mkdir -p $BSDINSTALL_CHROOT/boot/efi - done + [ $FETCH_RESULT -ne 0 ] && error "Could not fetch remote distributions" + + bsdinstall checksum + if [ -t 0 ]; then + # If install is a tty, use distextract as normal + bsdinstall distextract + else + # Otherwise, we need to use tar (see + # https://reviews.freebsd.org/D10736) + for set in $DISTRIBUTIONS; do + f_dprintf "Extracting $BSDINSTALL_DISTDIR/$set" + # XXX: The below fails if any mountpoints are FAT, due + # to inability to set ctime/mtime on the root of FAT + # partitions, which is needed to support e.g. EFI + # system partitions. tar has no option to ignore this + # (distextract ignores them internally through a hack), + # and returns 1 on any warning or error, effectively + # turning all warnings into fatal errors. + # + # Work around this in an extremely lame way for the + # specific case of EFI system partitions only. This + # *ONLY WORKS* if /boot/efi is empty and does not + # handle analogous problems on other systems (ARM, + # PPC64). + tar -xf "$BSDINSTALL_DISTDIR/$set" -C $BSDINSTALL_CHROOT --exclude boot/efi + mkdir -p $BSDINSTALL_CHROOT/boot/efi + done + fi fi # Configure bootloader if needed From nobody Wed May 13 19:37:32 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gG3dZ1CRNz6cvCr for ; Wed, 13 May 2026 19:37:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gG3dY6Y6Sz3V66 for ; Wed, 13 May 2026 19:37:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778701057; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PDsEfwKPC8oOUz8DHlQH6Jjb3YlLH7tSqgzFU3gTgME=; b=ThA3Hg57tqM11OyC8b7Taax8jvS+QrXUTzRtMzUQJtoAjGyuWWUaBc/05hvqFw0EmFgymx lcd7nWvJ+QD8rmCJZB2ZNq7TYGrtZrVJ1Mndey0kESpYyDZ/N+i7sr8ARDO6HXzybJQWjF Z8RPsSyAx+U7tS7K5Jg165570rdWzp7hlhVJcCXM4oR9c2QD6RrPI+VmzvIHOiGHN/1QNE jgbec3lt9aqvnC/+qpHh+DvYYikTOO1bZ53DVD9iwsDdfCwAj18kNE1U+ooyboG5B7ebHz 3L9QufbwstZMxrB2emrd5u1D1o9LWdJuPgVdiJzRE5zLbtb5euR3AnQLiyTkBQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778701057; a=rsa-sha256; cv=none; b=SDFH3ODCeS2Ob/PxRpYcWAHqHELQQHZETfpng5JRFwtKH7Y64OHeYBoxgONSzdavIruB5c wZ1IQ6awQ6juXf6ZUs6F95xzMAZerA6Td11GEeqmbDXCl6ELmcp3Rjqq3aQGhYyiLiV+Cd T36PBcwc33zF6r5D73rXEYLdK4wt7ACWtjP9P+Je7qeJ+K6CbyPesIZX6decZdDxMRft1J 1pfWIx04DbsbIFLFxEwU6SBPoMTu6pWEcilpk7dkpfPnWxxZ6NUjbaX3r3kU9mOWvjvQL6 pTcb3auPvIzJdgk2mx0aae5jw6FZAkItGvXyI757L5mSafrdGhplY6oyj6J5tg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778701057; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PDsEfwKPC8oOUz8DHlQH6Jjb3YlLH7tSqgzFU3gTgME=; b=ZYgpblel1HZHh6dT4ucZCXfkA+U8O4eF0avZ67E6F6Kzt04xJ5xMA69pdo5Qy3G5i3oEls 7N5YtWXchNZvcYpLfciZopx73prlhgKMWDC42Syhia8pMZc6p42qMzF3RuX1f8WTvVaetK 9VDWMw40Hmk7fwEnnvuwlKu9zvu+YieHI78a7zsUM1LjWtdSyVOuKWDkCEIzLsL32fwEx8 NFh23M5+zrxMtkXwdVj/clVhswVWA3/bYcWPMCMQ+oyd4sl933/zuIoDyfj25qr9egBCD0 qgERk7hWfknZ1eD+hjbMFqikdDUY41pNDEInE48B47qPyV6F7qC1aqjdM/6H8A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gG3dY61mmz14N7 for ; Wed, 13 May 2026 19:37:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 305b9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 19:37:32 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: 54d0ae979d95 - main - gpart.8: add entry for xbootldr partition type List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: 54d0ae979d9596399f33dc7d7245866f86ab7f8e Auto-Submitted: auto-generated Date: Wed, 13 May 2026 19:37:32 +0000 Message-Id: <6a04d2fc.305b9.5b806a77@gitrepo.freebsd.org> The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=54d0ae979d9596399f33dc7d7245866f86ab7f8e commit 54d0ae979d9596399f33dc7d7245866f86ab7f8e Author: Mitchell Horne AuthorDate: 2026-05-12 14:13:12 +0000 Commit: Mitchell Horne CommitDate: 2026-05-13 19:35:11 +0000 gpart.8: add entry for xbootldr partition type Reviewed by: emaste, markj Sponsored by: The FreeBSD Foundation Fixes: dab8138e13de ("g_part,mkimg: Add additional GPT partition types") Differential Revision: https://reviews.freebsd.org/D56969 --- lib/geom/part/gpart.8 | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/lib/geom/part/gpart.8 b/lib/geom/part/gpart.8 index 89bfc3be6f8a..887a07932f60 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 May 9, 2026 +.Dd May 12, 2026 .Dt GPART 8 .Os .Sh NAME @@ -1042,6 +1042,12 @@ A partition claimed by VMware VSAN. The scheme-specific type is .Qq Li "!381cfccc-7288-11e0-92ee-000c2911d0b2" for GPT. +.It Cm xbootldr +An Extended Boot Loader Partition (XBOOTLDR), secondary to the EFI system +partition, used to store additional firmware or boot loader menu entries. +The scheme-specific type is +.Qq Li "!bc13c2ff-59e6-4262-a352-b275fd6f7172" +for GPT. .El .Sh ATTRIBUTES The scheme-specific attributes for EBR: From nobody Wed May 13 19:40:31 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gG3j037yZz6cvPH for ; Wed, 13 May 2026 19:40:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gG3j01R1Hz3VfP for ; Wed, 13 May 2026 19:40:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778701236; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dprnyI8lpzFMEiqu3+pk5T2eHp0hhGIvnVppjwrHBRs=; b=L5QemH15vDwz0eckKIX0fGMeu9QsmKtNgFrwA9D2W3wagC6o3NgkoIRtSbH6iR43F1IaTq 9Oqa3ndUXMRHhf8z18f+QPEjhyiUCb83FehPiSC74lR7XKboWfxgc5m9F8SepzxqCwULE7 xYsMcD2sK2YxrxmeYEQkLvGZjLdw2wtCvx7Szf/poflsWzYSC2bMapYWH6+NVFP++jFkJ8 BpwDqNGjhsjgt3kXsMbicicvDTWKeQ+1emlrRGOuJzCtGgxFty21u6FvN7PDoOc0engD3S 7EwFLwvO9XTxYq2G8BiQVHTSjObqe3ES1MJA0G3L4eJl1/7Wczk/JUIreQWOJQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778701236; a=rsa-sha256; cv=none; b=vq9CcK0xBk8p2jYmEyGfHZC0JcskO5QoQWqLWL2QBlQZrAo+pRseiyOPB/but/Od3UT/SN 29R94UNyqde9N7B29fN1DBIhf+fKs75o1JZ1XUoqkNP6Ay+JP5+7BhH2ddnacYkzmAaCeX T9SM/KDvZPHmeRDv7E0DOlPCt5QM74c4x3He2JodMZI3wKAf29G+MWDc47CQIuzCSiZZDw pUNtr9u8X/73TRgLds25X1jxNKTwa12MWNyTX5i6iwuXEvioKFFZ4Jm5EJAAVxR3JN7mEE JdhaCuUTCCVBOr+JTUY/eo13DdBUhWl1RNU/RBgmrc9Lsm1FW7Wcn4ANt5wYFQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778701236; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dprnyI8lpzFMEiqu3+pk5T2eHp0hhGIvnVppjwrHBRs=; b=quEez816oxL5v3/ucnF3sldWrS2u+BtoqwzEBKx2ST6SI83hpgbV63zMxlREbWVV3S0H78 d8I3z3GpNlLEzYeKzc9GNZrNKOLAYMiDSI0oScDlHR/U0m+LW8g9+MFXMXGi1DcdClOC4q gqJJZQ9eGrQlSNWHgVWtnrTLsHu0LP6kW38xsl67IUGA6oT8XT7ez4epGTZMVClTiQ0bip 57VyodQtQ7HkcesWHJgAhL3UOvoHZQb7i+HAny2GhQKuXaM6Nx+IX+StlnQAogaEpPTWA4 fLQ4psoXMMBDCDVTagVuUuK6Zjr4jRf0f3iImKsOSlvzxRUXhpLDZDain+QLiA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gG3j00mKfz140K for ; Wed, 13 May 2026 19:40:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31ba9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 19:40:31 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: cb31a266167c - main - ptrace: clear TDP_USERWR after transparent attach only on attach List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: cb31a266167c8bde3488fbdd6bf24c38b6f59977 Auto-Submitted: auto-generated Date: Wed, 13 May 2026 19:40:31 +0000 Message-Id: <6a04d3af.31ba9.20680c0e@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=cb31a266167c8bde3488fbdd6bf24c38b6f59977 commit cb31a266167c8bde3488fbdd6bf24c38b6f59977 Author: Konstantin Belousov AuthorDate: 2026-05-11 01:12:30 +0000 Commit: Konstantin Belousov CommitDate: 2026-05-13 19:40:03 +0000 ptrace: clear TDP_USERWR after transparent attach only on attach The flag indicates that the modifying ptrace op was issued, and clearing it after transparent attach is needed to not leak the flag to later operations, since it is cleared on the syscall enter. But clearing it there unconditionally is too strong. The clearing should be only done for attach situation. Reported by: Alex S Fixes: 99976934274de6fa19f049a0b6eac10856710f96 Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D56928 --- sys/kern/sys_process.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/sys/kern/sys_process.c b/sys/kern/sys_process.c index dece6457a4bf..5effc6fbe2d7 100644 --- a/sys/kern/sys_process.c +++ b/sys/kern/sys_process.c @@ -1411,17 +1411,16 @@ kern_ptrace(struct thread *td, int req, pid_t pid, void *addr, int data) * register file or specifying the pc, make the thread * xstopped by waking it up. */ - if ((td2->td_dbgflags & TDB_USERWR) != 0) { - if (pt_attach_transparent) { - thread_lock(td2); - if (TD_ON_SLEEPQ(td2) && - (td2->td_flags & TDF_SINTR) != 0) { - sleepq_abort(td2, EINTR); - } else { - thread_unlock(td2); - } + if ((td2->td_dbgflags & TDB_USERWR) != 0 && + pt_attach_transparent) { + thread_lock(td2); + if (TD_ON_SLEEPQ(td2) && + (td2->td_flags & TDF_SINTR) != 0) { + td2->td_dbgflags &= ~TDB_USERWR; + sleepq_abort(td2, EINTR); + } else { + thread_unlock(td2); } - td2->td_dbgflags &= ~TDB_USERWR; } /* From nobody Wed May 13 19:47:58 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gG3sb6WdTz6cw3X for ; Wed, 13 May 2026 19:48: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gG3sb5m7Cz3WGW for ; Wed, 13 May 2026 19:48:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778701683; 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; bh=8JfDlnkcp7YbH/ldCs3a0JzrUW1CPtOQkTAYgWJpPU0=; b=aOS02XVRwWKLgVRh65epNGF80+LOAUphtcW7AXPQi6En2g8tFCBeDueCPgCDV3Oo86CoM0 P0sDU1JEk1mOVMl3We2DxY8xhycjum8nxOcaZOgeRTkU43XGmdhpPBIQlsvmdPMGOMUZWK tfHVq7kkTIhzbpk2gLux3cIcRb30vbcmd+Tcipdwt/RmqBtIghtaKk6/So9aa47eDxlyic 6ZXyfFSvtvPoeHboQSC/SaEOq7N0sKVnE4FhSuHDVxLJ1CM9D+1F6KMT38HtubIdhJ6P4f yS1DBJQWKAc08CUZCZarFEAFvzocZyBMvv67o0YVORXer4oBB7AnPqUA+kz9xg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778701683; a=rsa-sha256; cv=none; b=rYkMpkmUxE4EBmntBvcg7QbNW1n0Ey4x6E2H9REYdeAX4w2SgbG0l1X8VajX8pzypRGFhG 5KG7zNoEpEaeOO008q7bAdCJvTZb90nvlLNy+6TJMtICEn88WQ1IbYeqT4MvdBF6tqfpXo nxONuEVBiFBJ2OG+0n50w7kfmxXumjXbTuyYPm1Ilt6GDSLXCzaCigXi4ijcHC2wf80gbK dhpRSrRMqFE+iJRI6vTN7oCPZpn4iPc1Q9zX2x5CprYO4SF2CwfPdFOgq+0lApBlF1vd1A NgYtciGC5pyhp56IK5DdHOFufT2xKCOg9ya8vYMIbdo8FDbPixCzhV+uJ2/XDg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778701683; 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; bh=8JfDlnkcp7YbH/ldCs3a0JzrUW1CPtOQkTAYgWJpPU0=; b=nI8pqbJBWReCBxp7vDdJxmU3R4p6oB9UprOaK6yLvJgWOucA4YQIe43hXWobmuACs52OUR 9stmhoFmx8v1z0BMIgpYI74udkdWFQD2K+71JRKRso8/WyytJ99eI7e+4GSwh/58MwYkai VJObDQ1m5sEEYNmMr5euZPIM/E4Taj7bXUAkdF1y4pFaZpJf2KLbDrSXkqf5BkeiMJyvPB k4oY5cDdwvqFFh02IgzeXu3Ga+wCZ94SbSwCSrCTz6AYLPNca+a6BRs0OxBneObP5oI1wA RxjnFRFjYGfWcdN0GypJWE7pLop2Z9gkCOSNzIcU8A6Ill7nLstqeKyze7VlUw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gG3sb557Dz14P0 for ; Wed, 13 May 2026 19:48:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 314e9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 19:47:58 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Chuck Silvers From: Konstantin Belousov Subject: git: bab04ddf1fd4 - main - ufs: support unmapped bufs for indirect blocks in bmap List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: bab04ddf1fd4b7a77d1cfae4a67ededf1f35ee0d Auto-Submitted: auto-generated Date: Wed, 13 May 2026 19:47:58 +0000 Message-Id: <6a04d56e.314e9.6d1b1b68@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=bab04ddf1fd4b7a77d1cfae4a67ededf1f35ee0d commit bab04ddf1fd4b7a77d1cfae4a67ededf1f35ee0d Author: Chuck Silvers AuthorDate: 2026-05-07 12:43:53 +0000 Commit: Konstantin Belousov CommitDate: 2026-05-13 19:46:00 +0000 ufs: support unmapped bufs for indirect blocks in bmap Use unmapped bufs for indirect block buffers in bmap, and use sf_bufs for transient mapping them when we need to read the specific pointer. [kib note: I changed the original patch to use sf_buf instead of explicit DMAP utilization, making the change MI]. Tested by: pho Reviewed by: kib MFC after: 1 week Differential revision: https://reviews.freebsd.org/D53424 --- sys/ufs/ufs/ufs_bmap.c | 143 +++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 134 insertions(+), 9 deletions(-) diff --git a/sys/ufs/ufs/ufs_bmap.c b/sys/ufs/ufs/ufs_bmap.c index 9d21eaa0cb56..edfcabb1a607 100644 --- a/sys/ufs/ufs/ufs_bmap.c +++ b/sys/ufs/ufs/ufs_bmap.c @@ -34,7 +34,6 @@ * SUCH DAMAGE. */ -#include #include #include #include @@ -44,10 +43,13 @@ #include #include #include +#include +#include #include #include #include +#include #include #include @@ -59,6 +61,11 @@ static ufs_lbn_t lbn_count(struct ufsmount *, int); static int readindir(struct vnode *, ufs_lbn_t, ufs2_daddr_t, struct buf **); +static int ufs_bmap_use_unmapped = 1; + +SYSCTL_INT(_vfs_ufs, OID_AUTO, bmap_use_unmapped, CTLFLAG_RWTUN, + &ufs_bmap_use_unmapped, 0, "UFS bmap uses unmapped bufs"); + /* * Bmap converts the logical block number of a file to its physical block * number on the disk. The conversion is done by using the logical block @@ -102,12 +109,15 @@ readindir(struct vnode *vp, struct buf *bp; struct mount *mp; struct ufsmount *ump; - int error; + struct inode *ip; + int error, gbflags; mp = vp->v_mount; ump = VFSTOUFS(mp); + ip = VTOI(vp); - bp = getblk(vp, lbn, mp->mnt_stat.f_iosize, 0, 0, 0); + gbflags = !I_IS_UFS1(ip) && ufs_bmap_use_unmapped ? GB_UNMAPPED : 0; + bp = getblk(vp, lbn, mp->mnt_stat.f_iosize, 0, 0, gbflags); if ((bp->b_flags & B_CACHE) == 0) { KASSERT(daddr != 0, ("readindir: indirect block not in cache")); @@ -151,6 +161,24 @@ readindir(struct vnode *vp, * next block and the disk address of the block (if it is assigned). */ +static void * +ufs_bm_sf_get(struct buf *bp, int32_t pgidx, struct sf_buf **sfp) +{ + struct sf_buf *sf; + + sched_pin(); + sf = sf_buf_alloc(bp->b_pages[pgidx], SFB_CPUPRIVATE); + *sfp = sf; + return (sf_buf_kva(sf)); +} + +static void +ufs_bm_sf_put(struct sf_buf *sf) +{ + sf_buf_free(sf); + sched_unpin(); +} + int ufs_bmaparray(struct vnode *vp, ufs2_daddr_t bn, @@ -164,10 +192,16 @@ ufs_bmaparray(struct vnode *vp, struct ufsmount *ump; struct mount *mp; struct indir a[UFS_NIADDR+1], *ap; + struct sf_buf *sf; ufs2_daddr_t daddr; ufs_lbn_t metalbn; int error, num, maxrun = 0; int *nump; + ufs1_daddr_t *daddr1p; + ufs2_daddr_t pgbn, daddrppg, prevdaddr, *daddr2p; + int32_t daddrsz, boff, pgidx, pgoff; + void *pgaddr; + bool isseq; ap = NULL; ip = VTOI(vp); @@ -261,17 +295,71 @@ ufs_bmaparray(struct vnode *vp, if (error != 0) return (error); - if (I_IS_UFS1(ip)) - daddr = ((ufs1_daddr_t *)bp->b_data)[ap->in_off]; - else - daddr = ((ufs2_daddr_t *)bp->b_data)[ap->in_off]; + daddrsz = I_IS_UFS1(ip) ? sizeof(ufs1_daddr_t) : sizeof(ufs2_daddr_t); + if (!buf_mapped(bp)) { + boff = ap->in_off * daddrsz; + pgidx = boff / PAGE_SIZE; + pgoff = (boff & PAGE_MASK) / daddrsz; + pgaddr = ufs_bm_sf_get(bp, pgidx, &sf); + if (I_IS_UFS1(ip)) + daddr = ((ufs1_daddr_t *)pgaddr)[pgoff]; + else + daddr = ((ufs2_daddr_t *)pgaddr)[pgoff]; + ufs_bm_sf_put(sf); + } else { + if (I_IS_UFS1(ip)) + daddr = ((ufs1_daddr_t *)bp->b_data)[ap->in_off]; + else + daddr = ((ufs2_daddr_t *)bp->b_data)[ap->in_off]; + } + if ((error = UFS_CHECK_BLKNO(mp, ip->i_number, daddr, mp->mnt_stat.f_iosize)) != 0) { bqrelse(bp); return (error); } + if (num > 1 || daddr == 0 || runp == NULL) + continue; + + daddrppg = PAGE_SIZE / daddrsz; if (I_IS_UFS1(ip)) { - if (num == 1 && daddr && runp) { + if (!buf_mapped(bp)) { + prevdaddr = daddr; + isseq = true; + for (bn = ap->in_off + 1; + bn < MNINDIR(ump) && *runp < maxrun && isseq; ) { + boff = bn * daddrsz; + pgidx = boff / PAGE_SIZE; + pgoff = (boff & PAGE_MASK) / daddrsz; + KASSERT(pgidx >= 0 && pgidx < bp->b_npages, + ("pgidx %d vs b_npages %d", pgidx, bp->b_npages)); + pgaddr = ufs_bm_sf_get(bp, pgidx, &sf); + daddr1p = (ufs1_daddr_t *)pgaddr; + for (pgbn = pgoff; + pgbn < daddrppg && *runp < maxrun && + (isseq = is_sequential(ump, prevdaddr, daddr1p[pgbn])); + prevdaddr = daddr1p[pgbn], ++pgbn, ++bn, ++*runp); + ufs_bm_sf_put(sf); + } + prevdaddr = daddr; + bn = ap->in_off; + if (runb && bn) { + isseq = true; + for (--bn; bn >= 0 && *runb < maxrun && isseq; ) { + boff = bn * daddrsz; + pgidx = boff / PAGE_SIZE; + pgoff = (boff & PAGE_MASK) / daddrsz; + KASSERT(pgidx >= 0 && pgidx < bp->b_npages, + ("pgidx %d vs b_npages %d", pgidx, bp->b_npages)); + pgaddr = ufs_bm_sf_get(bp, pgidx, &sf); + daddr1p = (ufs1_daddr_t *)pgaddr; + for (pgbn = pgoff; pgbn >= 0 && *runb < maxrun && + (isseq = is_sequential(ump, daddr1p[pgbn], prevdaddr)); + prevdaddr = daddr1p[pgbn], --pgbn, --bn, ++*runb); + ufs_bm_sf_put(sf); + } + } + } else { for (bn = ap->in_off + 1; bn < MNINDIR(ump) && *runp < maxrun && is_sequential(ump, @@ -289,7 +377,44 @@ ufs_bmaparray(struct vnode *vp, } continue; } - if (num == 1 && daddr && runp) { + + if (!buf_mapped(bp)) { + prevdaddr = daddr; + isseq = true; + for (bn = ap->in_off + 1; + bn < MNINDIR(ump) && *runp < maxrun && isseq; ) { + boff = bn * daddrsz; + pgidx = boff / PAGE_SIZE; + pgoff = (boff & PAGE_MASK) / daddrsz; + KASSERT(pgidx >= 0 && pgidx < bp->b_npages, + ("pgidx %d vs b_npages %d", pgidx, bp->b_npages)); + pgaddr = ufs_bm_sf_get(bp, pgidx, &sf); + daddr2p = (ufs2_daddr_t *)pgaddr; + for (pgbn = pgoff; + pgbn < daddrppg && *runp < maxrun && + (isseq = is_sequential(ump, prevdaddr, daddr2p[pgbn])); + prevdaddr = daddr2p[pgbn], ++pgbn, ++bn, ++*runp); + ufs_bm_sf_put(sf); + } + prevdaddr = daddr; + bn = ap->in_off; + if (runb && bn) { + isseq = true; + for (--bn; bn >= 0 && *runb < maxrun && isseq; ) { + boff = bn * daddrsz; + pgidx = boff / PAGE_SIZE; + pgoff = (boff & PAGE_MASK) / daddrsz; + KASSERT(pgidx >= 0 && pgidx < bp->b_npages, + ("pgidx %d vs b_npages %d", pgidx, bp->b_npages)); + pgaddr = ufs_bm_sf_get(bp, pgidx, &sf); + daddr2p = (ufs2_daddr_t *)pgaddr; + for (pgbn = pgoff; pgbn >= 0 && *runb < maxrun && + (isseq = is_sequential(ump, daddr2p[pgbn], prevdaddr)); + prevdaddr = daddr2p[pgbn], --pgbn, --bn, ++*runb); + ufs_bm_sf_put(sf); + } + } + } else { for (bn = ap->in_off + 1; bn < MNINDIR(ump) && *runp < maxrun && is_sequential(ump, From nobody Wed May 13 19:56:00 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gG4301cM6z6cwQ9 for ; Wed, 13 May 2026 19: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gG4301K8zz3YPS for ; Wed, 13 May 2026 19: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=1778702172; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FOalfL25vT8e2Euk6tyEF5v4t+pj4nzykBk2NqUi1zA=; b=TgzPbPggPevh8oJvjWu37wt2u6e8ZQjnBk7Wx9vIJq8BcM/A6tRPfIozqpl4e3RpjWQdJV lWSscwCPszo9+/jiidT+55qsBAWFr7wfeT7A9wLe+2zaRsST/Sgzs+UFaPrrJIMWo7Gtkt Mnibinwed34dk+hQX43zQ6a/eu8qLpEGDBxl7s0V9iyAKdsoFKJwj3JaCsT6qvLJ7kE19p O0yoCvMAVNcWAaVKCqwSDGa6du1YmEgT/BBYNmeMHZDVp58X3xstG8VObnVp4XcJxpPfpH JNTZDQLp/3gctLSTymXVhjX+ttmhLb9k8xNjGlrtd2rY5vPddl5Dod1IjJOLZw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778702172; a=rsa-sha256; cv=none; b=ffZc0iXQYI/rvD++MDA4jZWT0eH8lZrnR+vkd2CU9BXbB139d2FIlPHrvL30jbodezYQhK 7jhgNy3RLrGSPPUKtICz1i5uZmcOf+FU4rxy+HAnRqli9TZQZja2sJIR8UVJOGggdeijFH dsnApA4PWu8QiyQ2ow9pXlYZYWeKUQJDdJDDHpqdwAL+lFSqoRQSu0s7IQSavhP6Uf2bWj nTdATm1KdhVGJRuFcafehNX8VEaLNP5msMOXAM7lz2h7/M3Vnas4EkK2whGQT6dJmqrtdZ e3rzGdrrvw3hiEgHiz05+ullEqkFVDeLTzsb5Q8+Gja81StriFkGcGth94V64w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778702172; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FOalfL25vT8e2Euk6tyEF5v4t+pj4nzykBk2NqUi1zA=; b=PW8Kryj+aVh0YNE/i5C0GgpKagZWxKVjghkwfi5iEN497PvMjb538q/e1VF3eiEs/Bdh6C rABNzXhju0MZfvXvb1XPPP/nAj/nwGWJ3L5GyCMChhHWhe8TckWddNJaUoQxFIaMk8/kcR 8hC2xLnsuDF8dx/Qwo+FqUUXUQUgDgyWYaIBSRR/hanYFyw/hGPtcUFTdmm+j0Ua5TUAVd JNU8TCDgKySFenGqNMiwZCqzC7bAl52KCaRri2iERG1wBiPzU1+vbST2FPHTz1/na1z5Rw 95P5AR6B+JhivPpzzl2avFusHziqJuqerks3OjVQSslEP7avc3RfqpOgOYWqng== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gG4300l3Vz14lL for ; Wed, 13 May 2026 19:56:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33383 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 19:56:00 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Martin Matuska Subject: git: a40f24ec2855 - stable/15 - zfs: merge openzfs/zfs@6330a45b0 (zfs-2.4-release) into stable/15 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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/stable/15 X-Git-Reftype: branch X-Git-Commit: a40f24ec28554c2387e766a47d2d4cb910d95865 Auto-Submitted: auto-generated Date: Wed, 13 May 2026 19:56:00 +0000 Message-Id: <6a04d750.33383.d8fa67b@gitrepo.freebsd.org> The branch stable/15 has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=a40f24ec28554c2387e766a47d2d4cb910d95865 commit a40f24ec28554c2387e766a47d2d4cb910d95865 Merge: 1f5869130f6e 6330a45b06d2 Author: Martin Matuska AuthorDate: 2026-05-13 19:53:01 +0000 Commit: Martin Matuska CommitDate: 2026-05-13 19:53:41 +0000 zfs: merge openzfs/zfs@6330a45b0 (zfs-2.4-release) into stable/15 OpenZFS 2.4.2 Notable upstream pull request merges: #18208 6f14581e1 Cleanup allocation class selection #18235 7590972f7 Prevent range tree corruption race by updating dnode_sync() #18255 b06caaeec range_tree: use zfs_panic_recover() for partial-overlap remove #18258 33961142a Fix deadlock on dmu_tx_assign() from vdev_rebuild() #18262 02ed09106 Fix check for .cfi_negate_ra_state on aarch64 #18263 9f92266b7 Fix redundant declaration of dsl_pool_t #18276 3862aadf7 Fix vdev_rebuild_range() tx commit #18290 a94b137aa FreeBSD: Improve dmesg kernel message prefix #18294 938c8c98b draid: fix data corruption after disk clear #18310 b40cd9191 Fix s_active leak in zfsvfs_hold() when z_unmounted is true #18380 9b8ccbd2c draid: fix import failure after disks replacements #18399 4bb759274 Add support for POSIX_FADV_DONTNEED #18403 aba3ed30a fix memleak in spa_errlog.c #18405 e9a8c6e08 draid: allow seq resilver reads from degraded vdevs #18414 da44040bb draid: fix cksum errors after rebuild with degraded disks #18421 e7524594a Fix read corruption after block clone after truncate #18440 b8addf922 dmu_direct: avoid UAF in dmu_write_direct_done() #18473 76fd64ac9 Fix rare cksum errors after rebuild #18482 fc87e269e Initialize vr_last_txg for rebuild #18489 38501e182 Fix long POSIX_FADV_DONTNEED for single block files Obtained from: OpenZFS OpenZFS commit: 6330a45b06d20125de679aae5f63ba14082671ef OpenZFS tag: zfs-2.4.2 .../openzfs/.github/workflows/checkstyle.yaml | 7 +- sys/contrib/openzfs/.github/workflows/codeql.yml | 2 +- .../.github/workflows/scripts/generate-ci-type.py | 33 +- .../.github/workflows/scripts/merge_summary.awk | 38 ++ .../.github/workflows/scripts/qemu-1-setup.sh | 43 +- .../.github/workflows/scripts/qemu-2-start.sh | 81 ++- .../.github/workflows/scripts/qemu-3-deps-vm.sh | 22 +- .../.github/workflows/scripts/qemu-4-build-vm.sh | 11 +- .../.github/workflows/scripts/qemu-6-tests.sh | 4 +- .../.github/workflows/scripts/qemu-7-prepare.sh | 47 +- .../.github/workflows/scripts/qemu-8-summary.sh | 8 +- .../workflows/scripts/qemu-9-summary-page.sh | 4 +- sys/contrib/openzfs/.github/workflows/smatch.yml | 4 +- sys/contrib/openzfs/.github/workflows/zfs-arm.yml | 40 ++ .../.github/workflows/zfs-qemu-packages.yml | 25 +- sys/contrib/openzfs/.github/workflows/zfs-qemu.yml | 46 +- sys/contrib/openzfs/.github/workflows/zloop.yml | 7 +- sys/contrib/openzfs/META | 4 +- sys/contrib/openzfs/Makefile.am | 1 + sys/contrib/openzfs/README.md | 42 +- sys/contrib/openzfs/autogen.sh | 1 + sys/contrib/openzfs/cmd/Makefile.am | 1 + sys/contrib/openzfs/cmd/raidz_test/Makefile.am | 1 + sys/contrib/openzfs/cmd/zdb/Makefile.am | 1 + sys/contrib/openzfs/cmd/zed/Makefile.am | 1 + sys/contrib/openzfs/cmd/zed/zed.d/Makefile.am | 1 + sys/contrib/openzfs/cmd/zed/zed_event.c | 2 +- sys/contrib/openzfs/cmd/zfs/Makefile.am | 1 + sys/contrib/openzfs/cmd/zfs/zfs_main.c | 2 +- sys/contrib/openzfs/cmd/zinject/Makefile.am | 1 + sys/contrib/openzfs/cmd/zpool/Makefile.am | 1 + sys/contrib/openzfs/cmd/zpool_influxdb/Makefile.am | 1 + sys/contrib/openzfs/cmd/zstream/Makefile.am | 1 + sys/contrib/openzfs/config/CppCheck.am | 1 + sys/contrib/openzfs/config/Rules.am | 1 + sys/contrib/openzfs/config/Shellcheck.am | 1 + sys/contrib/openzfs/config/Substfiles.am | 1 + sys/contrib/openzfs/config/always-arch.m4 | 1 + .../openzfs/config/always-compiler-options.m4 | 1 + sys/contrib/openzfs/config/always-cppcheck.m4 | 1 + sys/contrib/openzfs/config/always-parallel.m4 | 1 + sys/contrib/openzfs/config/always-python.m4 | 1 + sys/contrib/openzfs/config/always-pyzfs.m4 | 1 + sys/contrib/openzfs/config/always-sed.m4 | 1 + sys/contrib/openzfs/config/always-shellcheck.m4 | 1 + sys/contrib/openzfs/config/always-system.m4 | 1 + sys/contrib/openzfs/config/ax_compare_version.m4 | 1 + sys/contrib/openzfs/config/ax_count_cpus.m4 | 1 + sys/contrib/openzfs/config/ax_python_devel.m4 | 1 + sys/contrib/openzfs/config/ax_restore_flags.m4 | 1 + sys/contrib/openzfs/config/ax_save_flags.m4 | 1 + sys/contrib/openzfs/config/deb.am | 21 +- sys/contrib/openzfs/config/find_system_library.m4 | 1 + sys/contrib/openzfs/config/gettext.m4 | 1 + sys/contrib/openzfs/config/host-cpu-c-abi.m4 | 1 + sys/contrib/openzfs/config/iconv.m4 | 1 + .../openzfs/config/kernel-access-ok-type.m4 | 1 + sys/contrib/openzfs/config/kernel-acl.m4 | 32 + sys/contrib/openzfs/config/kernel-add-disk.m4 | 1 + sys/contrib/openzfs/config/kernel-assign_str.m4 | 1 + sys/contrib/openzfs/config/kernel-automount.m4 | 1 + sys/contrib/openzfs/config/kernel-bio.m4 | 1 + sys/contrib/openzfs/config/kernel-bio_max_segs.m4 | 1 + sys/contrib/openzfs/config/kernel-blk-queue.m4 | 27 + sys/contrib/openzfs/config/kernel-blkdev.m4 | 1 + .../config/kernel-block-device-operations.m4 | 1 + .../openzfs/config/kernel-commit-metadata.m4 | 1 + .../openzfs/config/kernel-config-defined.m4 | 1 + .../config/kernel-copy-from-user-inatomic.m4 | 29 - .../openzfs/config/kernel-cpu_has_feature.m4 | 1 + .../openzfs/config/kernel-declare-event-class.m4 | 1 + sys/contrib/openzfs/config/kernel-dentry-alias.m4 | 32 + .../openzfs/config/kernel-dentry-operations.m4 | 1 + .../openzfs/config/kernel-discard-granularity.m4 | 1 + sys/contrib/openzfs/config/kernel-drop-inode.m4 | 1 + sys/contrib/openzfs/config/kernel-file.m4 | 1 + sys/contrib/openzfs/config/kernel-filelock.m4 | 23 + .../openzfs/config/kernel-filemap-splice-read.m4 | 1 + .../openzfs/config/kernel-flush_dcache_page.m4 | 1 + sys/contrib/openzfs/config/kernel-fmode-t.m4 | 1 + .../openzfs/config/kernel-follow-down-one.m4 | 1 + sys/contrib/openzfs/config/kernel-fpu.m4 | 1 + sys/contrib/openzfs/config/kernel-free-inode.m4 | 1 + sys/contrib/openzfs/config/kernel-fs-context.m4 | 36 ++ sys/contrib/openzfs/config/kernel-fst-mount.m4 | 30 - sys/contrib/openzfs/config/kernel-fsync-bdev.m4 | 1 + .../openzfs/config/kernel-generic_fadvise.m4 | 1 + .../openzfs/config/kernel-generic_fillattr.m4 | 1 + .../openzfs/config/kernel-generic_io_acct.m4 | 1 + sys/contrib/openzfs/config/kernel-genhd-flags.m4 | 1 + sys/contrib/openzfs/config/kernel-get-disk-ro.m4 | 1 + sys/contrib/openzfs/config/kernel-iattr-vfsid.m4 | 1 + sys/contrib/openzfs/config/kernel-idmap_mnt_api.m4 | 1 + sys/contrib/openzfs/config/kernel-inode-create.m4 | 1 + sys/contrib/openzfs/config/kernel-inode-getattr.m4 | 1 + sys/contrib/openzfs/config/kernel-inode-lookup.m4 | 1 + .../openzfs/config/kernel-inode-permission.m4 | 1 + sys/contrib/openzfs/config/kernel-inode-setattr.m4 | 1 + sys/contrib/openzfs/config/kernel-inode-state.m4 | 1 + sys/contrib/openzfs/config/kernel-inode-times.m4 | 1 + .../openzfs/config/kernel-insert-inode-locked.m4 | 1 + .../openzfs/config/kernel-is_owner_or_cap.m4 | 1 + sys/contrib/openzfs/config/kernel-kasan-enabled.m4 | 1 + .../openzfs/config/kernel-kmap-atomic-args.m4 | 1 + .../openzfs/config/kernel-kmap-local-page.m4 | 1 + sys/contrib/openzfs/config/kernel-kmem.m4 | 1 + sys/contrib/openzfs/config/kernel-kthread.m4 | 1 + sys/contrib/openzfs/config/kernel-kuid-helpers.m4 | 1 + sys/contrib/openzfs/config/kernel-kuidgid.m4 | 1 + .../openzfs/config/kernel-make-request-fn.m4 | 1 + sys/contrib/openzfs/config/kernel-misc-minor.m4 | 1 + sys/contrib/openzfs/config/kernel-mkdir.m4 | 1 + sys/contrib/openzfs/config/kernel-mknod.m4 | 1 + sys/contrib/openzfs/config/kernel-mm-page-flags.m4 | 1 + sys/contrib/openzfs/config/kernel-mm-pagemap.m4 | 1 + sys/contrib/openzfs/config/kernel-namespace.m4 | 1 + sys/contrib/openzfs/config/kernel-objtool.m4 | 1 + .../config/kernel-pagemap-folio_wait_bit.m4 | 1 + .../config/kernel-pagemap-readahead-page.m4 | 1 + sys/contrib/openzfs/config/kernel-pde-data.m4 | 1 + sys/contrib/openzfs/config/kernel-percpu.m4 | 1 + .../openzfs/config/kernel-pin-user-pages.m4 | 1 + .../openzfs/config/kernel-proc-operations.m4 | 1 + sys/contrib/openzfs/config/kernel-reclaim_state.m4 | 1 + .../openzfs/config/kernel-register_sysctl_table.m4 | 1 + sys/contrib/openzfs/config/kernel-rename.m4 | 1 + .../openzfs/config/kernel-revalidate-disk-size.m4 | 1 + sys/contrib/openzfs/config/kernel-sb-dying.m4 | 1 + sys/contrib/openzfs/config/kernel-sb-wb-err.m4 | 1 + sys/contrib/openzfs/config/kernel-sched.m4 | 1 + .../openzfs/config/kernel-security-inode-init.m4 | 1 + sys/contrib/openzfs/config/kernel-set-nlink.m4 | 1 + .../openzfs/config/kernel-setattr-prepare.m4 | 1 + sys/contrib/openzfs/config/kernel-sget-args.m4 | 1 + sys/contrib/openzfs/config/kernel-show-options.m4 | 1 + sys/contrib/openzfs/config/kernel-shrink.m4 | 1 + sys/contrib/openzfs/config/kernel-siginfo.m4 | 1 + sys/contrib/openzfs/config/kernel-stdarg.m4 | 1 + sys/contrib/openzfs/config/kernel-strlcpy.m4 | 1 + sys/contrib/openzfs/config/kernel-symlink.m4 | 1 + sys/contrib/openzfs/config/kernel-sysfs.m4 | 1 + sys/contrib/openzfs/config/kernel-timer.m4 | 1 + sys/contrib/openzfs/config/kernel-tmpfile.m4 | 1 + .../openzfs/config/kernel-totalhigh_pages.m4 | 1 + .../openzfs/config/kernel-totalram-pages-func.m4 | 1 + .../openzfs/config/kernel-truncate-setsize.m4 | 1 + sys/contrib/openzfs/config/kernel-types.m4 | 1 + sys/contrib/openzfs/config/kernel-usleep_range.m4 | 1 + .../openzfs/config/kernel-vfs-file_range.m4 | 1 + .../config/kernel-vfs-filemap_dirty_folio.m4 | 1 + sys/contrib/openzfs/config/kernel-vfs-fsync.m4 | 1 + sys/contrib/openzfs/config/kernel-vfs-iov_iter.m4 | 1 + .../openzfs/config/kernel-vfs-migrate_folio.m4 | 1 + .../openzfs/config/kernel-vfs-migratepage.m4 | 1 + .../openzfs/config/kernel-vfs-read_folio.m4 | 1 + sys/contrib/openzfs/config/kernel-vfs-readpages.m4 | 1 + .../openzfs/config/kernel-vfs-set_page_dirty.m4 | 1 + sys/contrib/openzfs/config/kernel-vfs-writepage.m4 | 1 + sys/contrib/openzfs/config/kernel-writeback.m4 | 1 + sys/contrib/openzfs/config/kernel-xattr-handler.m4 | 1 + sys/contrib/openzfs/config/kernel-zero_page.m4 | 1 + sys/contrib/openzfs/config/kernel.m4 | 22 +- sys/contrib/openzfs/config/lib-ld.m4 | 1 + sys/contrib/openzfs/config/lib-link.m4 | 1 + sys/contrib/openzfs/config/lib-prefix.m4 | 1 + sys/contrib/openzfs/config/mount-helper.m4 | 1 + sys/contrib/openzfs/config/nls.m4 | 1 + sys/contrib/openzfs/config/pkg.m4 | 1 + sys/contrib/openzfs/config/po.m4 | 1 + sys/contrib/openzfs/config/progtest.m4 | 1 + sys/contrib/openzfs/config/rpm.am | 1 + sys/contrib/openzfs/config/tgz.am | 1 + sys/contrib/openzfs/config/toolchain-cfi.m4 | 33 + sys/contrib/openzfs/config/toolchain-simd.m4 | 1 + sys/contrib/openzfs/config/user-aio.h.m4 | 1 + sys/contrib/openzfs/config/user-backtrace.m4 | 1 + sys/contrib/openzfs/config/user-clock_gettime.m4 | 1 + sys/contrib/openzfs/config/user-dracut.m4 | 1 + sys/contrib/openzfs/config/user-gettext.m4 | 1 + sys/contrib/openzfs/config/user-libaio.m4 | 1 + sys/contrib/openzfs/config/user-libatomic.m4 | 1 + sys/contrib/openzfs/config/user-libblkid.m4 | 1 + sys/contrib/openzfs/config/user-libcrypto.m4 | 1 + sys/contrib/openzfs/config/user-libexec.m4 | 1 + sys/contrib/openzfs/config/user-libfetch.m4 | 1 + sys/contrib/openzfs/config/user-libtirpc.m4 | 1 + sys/contrib/openzfs/config/user-libudev.m4 | 1 + sys/contrib/openzfs/config/user-libunwind.m4 | 1 + sys/contrib/openzfs/config/user-libuuid.m4 | 1 + sys/contrib/openzfs/config/user-makedev.m4 | 1 + sys/contrib/openzfs/config/user-mount-setattr.m4 | 27 + sys/contrib/openzfs/config/user-pam.m4 | 1 + sys/contrib/openzfs/config/user-runstatedir.m4 | 1 + sys/contrib/openzfs/config/user-statx.m4 | 2 + sys/contrib/openzfs/config/user-systemd.m4 | 1 + sys/contrib/openzfs/config/user-sysvinit.m4 | 1 + sys/contrib/openzfs/config/user-udev.m4 | 1 + sys/contrib/openzfs/config/user-zlib.m4 | 1 + sys/contrib/openzfs/config/user.m4 | 2 + sys/contrib/openzfs/config/zfs-build.m4 | 4 +- sys/contrib/openzfs/config/zfs-meta.m4 | 1 + sys/contrib/openzfs/configure.ac | 2 +- sys/contrib/openzfs/contrib/Makefile.am | 1 + .../openzfs/contrib/bash_completion.d/Makefile.am | 1 + sys/contrib/openzfs/contrib/bpftrace/Makefile.am | 1 + sys/contrib/openzfs/contrib/debian/Makefile.am | 1 + sys/contrib/openzfs/contrib/dracut/Makefile.am | 1 + sys/contrib/openzfs/contrib/initramfs/Makefile.am | 1 + sys/contrib/openzfs/contrib/initramfs/scripts/zfs | 8 +- .../openzfs/contrib/pam_zfs_key/Makefile.am | 1 + sys/contrib/openzfs/contrib/pyzfs/Makefile.am | 1 + sys/contrib/openzfs/contrib/zcp/Makefile.am | 1 + sys/contrib/openzfs/etc/Makefile.am | 1 + .../system-generators/zfs-mount-generator.c | 5 +- sys/contrib/openzfs/include/Makefile.am | 1 + sys/contrib/openzfs/include/os/freebsd/Makefile.am | 1 + sys/contrib/openzfs/include/os/linux/Makefile.am | 1 + .../include/os/linux/kernel/linux/dcache_compat.h | 2 + .../include/os/linux/kernel/linux/xattr_compat.h | 17 + .../include/os/linux/zfs/sys/zfs_vfsops_os.h | 14 +- sys/contrib/openzfs/include/sys/dbuf.h | 2 + sys/contrib/openzfs/include/sys/dmu.h | 2 + sys/contrib/openzfs/include/sys/dnode.h | 13 + sys/contrib/openzfs/include/sys/spa.h | 1 + sys/contrib/openzfs/include/sys/vdev_raidz_impl.h | 1 + sys/contrib/openzfs/include/sys/vdev_rebuild.h | 4 +- sys/contrib/openzfs/lib/Makefile.am | 1 + sys/contrib/openzfs/lib/libavl/Makefile.am | 1 + sys/contrib/openzfs/lib/libefi/Makefile.am | 1 + sys/contrib/openzfs/lib/libicp/Makefile.am | 1 + sys/contrib/openzfs/lib/libnvpair/Makefile.am | 1 + sys/contrib/openzfs/lib/libspl/Makefile.am | 1 + sys/contrib/openzfs/lib/libspl/include/Makefile.am | 1 + .../openzfs/lib/libspl/os/linux/getmntany.c | 9 +- sys/contrib/openzfs/lib/libuutil/uu_ident.c | 2 +- sys/contrib/openzfs/lib/libzdb/Makefile.am | 1 + sys/contrib/openzfs/lib/libzfs/Makefile.am | 1 + sys/contrib/openzfs/lib/libzfs/libzfs_dataset.c | 49 +- sys/contrib/openzfs/lib/libzfs/libzfs_diff.c | 4 +- sys/contrib/openzfs/lib/libzfs/libzfs_impl.h | 17 + sys/contrib/openzfs/lib/libzfs/libzfs_mount.c | 43 +- sys/contrib/openzfs/lib/libzfs/libzfs_pool.c | 2 +- sys/contrib/openzfs/lib/libzfs/libzfs_sendrecv.c | 2 +- .../openzfs/lib/libzfs/os/freebsd/libzfs_zmount.c | 11 + .../openzfs/lib/libzfs/os/linux/libzfs_mount_os.c | 143 +++++ sys/contrib/openzfs/lib/libzfs_core/Makefile.am | 1 + sys/contrib/openzfs/lib/libzfsbootenv/Makefile.am | 1 + sys/contrib/openzfs/lib/libzpool/Makefile.am | 1 + sys/contrib/openzfs/lib/libzstd/Makefile.am | 1 + sys/contrib/openzfs/lib/libzutil/Makefile.am | 1 + .../lib/libzutil/os/linux/zutil_device_path_os.c | 16 +- sys/contrib/openzfs/man/Makefile.am | 1 + .../icp/asm-aarch64/blake3/b3_aarch64_sse2.S | 4 +- .../icp/asm-aarch64/blake3/b3_aarch64_sse41.S | 4 +- sys/contrib/openzfs/module/nvpair/nvpair.c | 5 +- .../openzfs/module/os/freebsd/spl/spl_cmn_err.c | 10 +- .../openzfs/module/os/freebsd/zfs/zfs_vnops_os.c | 4 +- .../openzfs/module/os/linux/zfs/vdev_disk.c | 4 + .../openzfs/module/os/linux/zfs/zfs_ctldir.c | 35 +- sys/contrib/openzfs/module/os/linux/zfs/zfs_uio.c | 13 +- .../openzfs/module/os/linux/zfs/zfs_vfsops.c | 231 +------ sys/contrib/openzfs/module/os/linux/zfs/zpl_file.c | 44 +- .../openzfs/module/os/linux/zfs/zpl_super.c | 681 ++++++++++++++++++--- sys/contrib/openzfs/module/zfs/dbuf.c | 78 ++- sys/contrib/openzfs/module/zfs/dmu.c | 39 +- sys/contrib/openzfs/module/zfs/dmu_direct.c | 8 +- sys/contrib/openzfs/module/zfs/dmu_objset.c | 2 +- sys/contrib/openzfs/module/zfs/dnode.c | 2 + sys/contrib/openzfs/module/zfs/dnode_sync.c | 105 ++-- sys/contrib/openzfs/module/zfs/dsl_bookmark.c | 18 +- sys/contrib/openzfs/module/zfs/dsl_dir.c | 2 +- sys/contrib/openzfs/module/zfs/range_tree.c | 2 +- sys/contrib/openzfs/module/zfs/spa.c | 2 +- sys/contrib/openzfs/module/zfs/spa_errlog.c | 2 +- sys/contrib/openzfs/module/zfs/spa_misc.c | 48 +- sys/contrib/openzfs/module/zfs/vdev.c | 29 +- sys/contrib/openzfs/module/zfs/vdev_draid.c | 76 ++- sys/contrib/openzfs/module/zfs/vdev_mirror.c | 13 +- sys/contrib/openzfs/module/zfs/vdev_raidz.c | 44 +- sys/contrib/openzfs/module/zfs/vdev_rebuild.c | 56 +- sys/contrib/openzfs/module/zfs/zfs_ioctl.c | 1 + sys/contrib/openzfs/module/zfs/zio.c | 6 +- sys/contrib/openzfs/rpm/Makefile.am | 1 + sys/contrib/openzfs/scripts/Makefile.am | 1 + sys/contrib/openzfs/scripts/spdxcheck.pl | 35 +- sys/contrib/openzfs/scripts/zfs-tests.sh | 16 +- sys/contrib/openzfs/tests/Makefile.am | 1 + sys/contrib/openzfs/tests/runfiles/common.run | 15 +- sys/contrib/openzfs/tests/runfiles/linux.run | 4 + .../openzfs/tests/test-runner/bin/zts-report.py.in | 3 +- sys/contrib/openzfs/tests/zfs-tests/Makefile.am | 1 + sys/contrib/openzfs/tests/zfs-tests/cmd/.gitignore | 2 + .../openzfs/tests/zfs-tests/cmd/Makefile.am | 4 + .../tests/zfs-tests/cmd/clone_after_trunc.c | 117 ++++ sys/contrib/openzfs/tests/zfs-tests/cmd/setlease.c | 126 ++++ .../openzfs/tests/zfs-tests/cmd/threadsappend.c | 8 +- .../openzfs/tests/zfs-tests/include/commands.cfg | 6 +- .../openzfs/tests/zfs-tests/include/libtest.shlib | 15 + .../openzfs/tests/zfs-tests/tests/Makefile.am | 11 + .../block_cloning/block_cloning_after_trunc.ksh | 31 + .../tests/functional/cli_root/zfs_list/cleanup.ksh | 30 + .../tests/functional/cli_root/zfs_list/setup.ksh | 32 + .../cli_root/zfs_list/zfs_list_009_pos.ksh | 69 +++ .../tests/functional/fadvise/fadvise_dontneed.ksh | 70 +++ .../zfs-tests/tests/functional/lease/cleanup.ksh | 26 + .../tests/functional/lease/lease_setlease.ksh | 44 ++ .../zfs-tests/tests/functional/lease/setup.ksh | 27 + .../tests/functional/redundancy/redundancy.kshlib | 71 ++- .../functional/redundancy/redundancy_draid.ksh | 12 +- .../redundancy/redundancy_draid_damaged1.ksh | 7 +- .../redundancy/redundancy_draid_damaged2.ksh | 14 +- .../redundancy/redundancy_draid_degraded1.ksh | 136 ++++ .../redundancy/redundancy_draid_degraded2.ksh | 152 +++++ .../redundancy/redundancy_draid_spare1.ksh | 13 +- .../redundancy/redundancy_draid_spare2.ksh | 8 +- .../redundancy/redundancy_draid_spare3.ksh | 28 +- sys/contrib/openzfs/udev/Makefile.am | 1 + sys/modules/zfs/zfs_config.h | 29 +- sys/modules/zfs/zfs_gitrev.h | 2 +- 319 files changed, 3254 insertions(+), 837 deletions(-) diff --cc sys/contrib/openzfs/.github/workflows/zfs-arm.yml index 000000000000,6039e4736c42..6039e4736c42 mode 000000,100644..100644 --- a/sys/contrib/openzfs/.github/workflows/zfs-arm.yml +++ b/sys/contrib/openzfs/.github/workflows/zfs-arm.yml diff --cc sys/contrib/openzfs/README.md index a39b88fedd12,000000000000..1f823b594433 mode 100644,000000..100644 --- a/sys/contrib/openzfs/README.md +++ b/sys/contrib/openzfs/README.md @@@ -1,35 -1,0 +1,71 @@@ +![img](https://openzfs.github.io/openzfs-docs/_static/img/logo/480px-Open-ZFS-Secondary-Logo-Colour-halfsize.png) + +OpenZFS is an advanced file system and volume manager which was originally +developed for Solaris and is now maintained by the OpenZFS community. +This repository contains the code for running OpenZFS on Linux and FreeBSD. + +[![codecov](https://codecov.io/gh/openzfs/zfs/branch/master/graph/badge.svg)](https://codecov.io/gh/openzfs/zfs) +[![coverity](https://scan.coverity.com/projects/1973/badge.svg)](https://scan.coverity.com/projects/openzfs-zfs) + +# Official Resources + + * [Documentation](https://openzfs.github.io/openzfs-docs/) - for using and developing this repo + * [ZoL site](https://zfsonlinux.org) - Linux release info & links + * [Mailing lists](https://openzfs.github.io/openzfs-docs/Project%20and%20Community/Mailing%20Lists.html) + * [OpenZFS site](https://openzfs.org/) - for conference videos and info on other platforms (illumos, OSX, Windows, etc) + +# Installation + +Full documentation for installing OpenZFS on your favorite operating system can +be found at the [Getting Started Page](https://openzfs.github.io/openzfs-docs/Getting%20Started/index.html). + +# Contribute & Develop + +We have a separate document with [contribution guidelines](./.github/CONTRIBUTING.md). + +We have a [Code of Conduct](./CODE_OF_CONDUCT.md). + +# Release + +OpenZFS is released under a CDDL license. +For more details see the NOTICE, LICENSE and COPYRIGHT files; `UCRL-CODE-235197` + - # Supported Kernels - * The `META` file contains the officially recognized supported Linux kernel versions. - * Supported FreeBSD versions are any supported branches and releases starting from 13.0-RELEASE. ++# Supported Kernels and Distributions ++ ++## Linux ++ ++Given the wide variety of Linux environments, we prioritize development and testing on stable, supported kernels and distributions. ++ ++### Kernel ([kernel.org](https://kernel.org)) ++ ++All **longterm** kernels from [kernel.org](https://kernel.org) are supported. **stable** kernels are usually supported in the next OpenZFS release. ++ ++**Supported longterm kernels**: **6.18**, **6.12**, **6.6**, **6.1**, **5.15**, **5.10**. ++ ++### Red Hat Enterprise Linux (RHEL) ++ ++All RHEL (and compatible systems: AlmaLinux OS, Rocky Linux, etc) on the **full** or **maintenance** support tracks are supported. ++ ++**Supported RHEL releases**: **8.10**, **9.7**, **10.1**. ++ ++### Ubuntu ++ ++All Ubuntu **LTS** releases are supported. ++ ++**Supported Ubuntu releases**: **24.04 “Noble”**, **22.04 “Jammy”**. ++ ++### Debian ++ ++All Debian **stable** and **LTS** releases are supported. ++ ++**Supported Debian releases**: **13 “Trixie”**, **12 “Bookworm”**, **11 “Bullseye”**. ++ ++### Other Distributions ++ ++Generally, if a distribution is following an LTS kernel, it should work well with OpenZFS. ++ ++## FreeBSD ++ ++All FreeBSD releases receiving **security support** are supported by OpenZFS. ++ ++**Supported FreeBSD releases**: **15.0**, **14.3**, **13.5**. diff --cc sys/contrib/openzfs/config/kernel-dentry-alias.m4 index 000000000000,0baf1a06d3ce..0baf1a06d3ce mode 000000,100644..100644 --- a/sys/contrib/openzfs/config/kernel-dentry-alias.m4 +++ b/sys/contrib/openzfs/config/kernel-dentry-alias.m4 diff --cc sys/contrib/openzfs/config/kernel-filelock.m4 index 000000000000,5e8d7c784692..5e8d7c784692 mode 000000,100644..100644 --- a/sys/contrib/openzfs/config/kernel-filelock.m4 +++ b/sys/contrib/openzfs/config/kernel-filelock.m4 diff --cc sys/contrib/openzfs/config/kernel-fs-context.m4 index 000000000000,317ddc21273d..317ddc21273d mode 000000,100644..100644 --- a/sys/contrib/openzfs/config/kernel-fs-context.m4 +++ b/sys/contrib/openzfs/config/kernel-fs-context.m4 diff --cc sys/contrib/openzfs/config/toolchain-cfi.m4 index 000000000000,f1ad2b23934d..f1ad2b23934d mode 000000,100644..100644 --- a/sys/contrib/openzfs/config/toolchain-cfi.m4 +++ b/sys/contrib/openzfs/config/toolchain-cfi.m4 diff --cc sys/contrib/openzfs/config/user-mount-setattr.m4 index 000000000000,efcfd66b2e9a..efcfd66b2e9a mode 000000,100644..100644 --- a/sys/contrib/openzfs/config/user-mount-setattr.m4 +++ b/sys/contrib/openzfs/config/user-mount-setattr.m4 diff --cc sys/contrib/openzfs/tests/zfs-tests/cmd/clone_after_trunc.c index 000000000000,631432928984..631432928984 mode 000000,100644..100644 --- a/sys/contrib/openzfs/tests/zfs-tests/cmd/clone_after_trunc.c +++ b/sys/contrib/openzfs/tests/zfs-tests/cmd/clone_after_trunc.c diff --cc sys/contrib/openzfs/tests/zfs-tests/cmd/setlease.c index 000000000000,12bcbd91beb5..12bcbd91beb5 mode 000000,100644..100644 --- a/sys/contrib/openzfs/tests/zfs-tests/cmd/setlease.c +++ b/sys/contrib/openzfs/tests/zfs-tests/cmd/setlease.c diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/block_cloning/block_cloning_after_trunc.ksh index 000000000000,977ec16042b7..977ec16042b7 mode 000000,100755..100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/block_cloning/block_cloning_after_trunc.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/block_cloning/block_cloning_after_trunc.ksh diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_list/cleanup.ksh index 000000000000,138dfe0473cc..138dfe0473cc mode 000000,100755..100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_list/cleanup.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_list/cleanup.ksh diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_list/setup.ksh index 000000000000,912fcfc40f69..912fcfc40f69 mode 000000,100755..100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_list/setup.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_list/setup.ksh diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_list/zfs_list_009_pos.ksh index 000000000000,758aa7608d3e..758aa7608d3e mode 000000,100755..100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_list/zfs_list_009_pos.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_list/zfs_list_009_pos.ksh diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/fadvise/fadvise_dontneed.ksh index 000000000000,53f3ad999d3b..53f3ad999d3b mode 000000,100755..100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/fadvise/fadvise_dontneed.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/fadvise/fadvise_dontneed.ksh diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/lease/cleanup.ksh index 000000000000,5e73dd34936e..5e73dd34936e mode 000000,100755..100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/lease/cleanup.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/lease/cleanup.ksh diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/lease/lease_setlease.ksh index 000000000000,8647d01995c3..8647d01995c3 mode 000000,100755..100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/lease/lease_setlease.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/lease/lease_setlease.ksh diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/lease/setup.ksh index 000000000000,09da91b0f93f..09da91b0f93f mode 000000,100755..100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/lease/setup.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/lease/setup.ksh diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/redundancy/redundancy_draid_degraded1.ksh index 000000000000,31444850f76c..31444850f76c mode 000000,100755..100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/redundancy/redundancy_draid_degraded1.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/redundancy/redundancy_draid_degraded1.ksh diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/redundancy/redundancy_draid_degraded2.ksh index 000000000000,22e1f2dfb310..22e1f2dfb310 mode 000000,100755..100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/redundancy/redundancy_draid_degraded2.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/redundancy/redundancy_draid_degraded2.ksh diff --cc sys/modules/zfs/zfs_config.h index 635fb0a7e91f,000000000000..e3e3437d438a mode 100644,000000..100644 --- a/sys/modules/zfs/zfs_config.h +++ b/sys/modules/zfs/zfs_config.h @@@ -1,904 -1,0 +1,925 @@@ +/* + */ + +/* 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 + ++/* Define if your assembler supports .cfi_negate_ra_state. */ ++/* #undef HAVE_AS_CFI_PSEUDO_OP */ ++ +#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_rot() is available */ ++/* #undef HAVE_BLK_QUEUE_ROT */ ++ +/* 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 */ + ++/* dentry aliases are in d_u member */ ++/* #undef HAVE_DENTRY_D_U_ALIASES */ ++ +/* 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 */ + ++/* linux/filelock.h exists */ ++/* #undef HAVE_FILELOCK_HEADER */ ++ +/* 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 */ + ++/* fs_context exists */ ++/* #undef HAVE_FS_CONTEXT */ ++ +/* 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 */ + +/* inode_state_read_once() exists */ +/* #undef HAVE_INODE_STATE_READ_ONCE */ + +/* 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 *** 491 LINES SKIPPED *** From nobody Wed May 13 20:02:52 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gG4Bh3Npxz6cxDL for ; Wed, 13 May 2026 20: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gG4Bh0nLKz3ZnG for ; Wed, 13 May 2026 20: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=1778702572; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=s2XzrzwgTQS+4QStN+gwC8L6lNXlNe5dN0SRcNh2OqE=; b=yO+asMf/tX9jtHAzECM0aBb52oZGadXugFIAEAfP6SkVOC5VplTHnHwZcUfDv3qAz4l14g 8WfoGPELtpgfXbIQeK/07toVHJSzzS9Gg/aAu3UjTYeX2yKpifUR8guZ5xsq5bJmxDbx83 Vfqty/WVVwSGUUGsQJ0d6LcgplFVaFNhcyUB18HLBD85zzOiayIOAQqc+yH2Agnk+NtEql kETOEc/WloJ+Kir/lHnhx8hGb7Zyr1phZ+v17Bl0P4XDCTt7+GhHWggXe4nvTqyIasQWqf tPhAoXjXuQYYNclXJDsY3TE3Uhrw3EC6gbQg1WodncZEhjB6jk30PTUSUCabZQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778702572; a=rsa-sha256; cv=none; b=OPC2ur5yGSmLTdoea8AX6dwo1RN1JoLm4hbtxKsjMKLbrUniwOZJu4Vi3as5VigevfizCB q8Cu5aid5OHZl1wmZtBCwXV5/XdM6SKJYUi5bVGKddyNA+k61hJtnZwqezQJyqc0gMmYEV dxQVlI2+wLFGAIInFMkil3NuAFTwQcx54vSfrsIThzAVN0mfzxs25V8gqqFopYQqu4/tIu HP8Gwbhds0cE+XiHcTscSeyyPPdMRvTX69PbDFCvVBFHFk8E6Z5s+XRpQ5c7lclhA6Jm1X wtaksAfL7hQr7c+aGHBvHuPxfqzaqBLkhX9EjcXgJM5qukgUao+KlBsjJCru2Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778702572; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=s2XzrzwgTQS+4QStN+gwC8L6lNXlNe5dN0SRcNh2OqE=; b=JIbFlszULnYheK9WP264MrpVfM9DUn++Wv0or98Z0YaA/DJkoHFe9rRm+WGO2HdnoKQy4g SmiGgTBJdXbHpnMBonjuZFjEAw8u1j0f8XdPjMPXSvZdOWQyM2bXGo2ltKPa1MJ3NTsSIq I1aBM1JHMh1iNHJ+3qrTkoa/dPdIuU1eFl3FpoSTlCdQsf+NzPO/EPT7AvkMnH6jha1+Xu ZTbLyX91k+HTRp7b5mWGmdxzcrKVLwHYpMWOhCjmFGEZB896T9R0o2lJ4X7ZMJ80g7vpBM bOWmD/NPtsymSfJVyUKX60YzxRWs7iFMdjerH5a42IfhgILd/HMRb+1g5hLGVA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gG4Bh0NJkz14hv for ; Wed, 13 May 2026 20:02:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33f48 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 20:02:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mariusz Zaborski Subject: git: 69e9d5d30669 - main - cap_fileargs: fix typo List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: oshogbo X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 69e9d5d306699d40148256722d7240dbb5da8fb5 Auto-Submitted: auto-generated Date: Wed, 13 May 2026 20:02:52 +0000 Message-Id: <6a04d8ec.33f48.2f85b074@gitrepo.freebsd.org> The branch main has been updated by oshogbo: URL: https://cgit.FreeBSD.org/src/commit/?id=69e9d5d306699d40148256722d7240dbb5da8fb5 commit 69e9d5d306699d40148256722d7240dbb5da8fb5 Author: Mariusz Zaborski AuthorDate: 2026-05-13 19:51:44 +0000 Commit: Mariusz Zaborski CommitDate: 2026-05-13 19:59:37 +0000 cap_fileargs: fix typo --- lib/libcasper/services/cap_fileargs/cap_fileargs.3 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/libcasper/services/cap_fileargs/cap_fileargs.3 b/lib/libcasper/services/cap_fileargs/cap_fileargs.3 index 6a69fe7e1f4a..601d2aa72717 100644 --- a/lib/libcasper/services/cap_fileargs/cap_fileargs.3 +++ b/lib/libcasper/services/cap_fileargs/cap_fileargs.3 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd August 8, 2025 +.Dd May 13, 2026 .Dt CAP_FILEARGS 3 .Os .Sh NAME @@ -208,7 +208,7 @@ The following arguments are required: Specifies access permissions for opened files. .It mode Pq Dv NV_TYPE_NUMBER Required when the -.Dv O_CREATE +.Dv O_CREAT flag is set in .Va flags . Specifies the permissions to use when creating new files. From nobody Wed May 13 20:02:54 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gG4Bk4XLVz6cxH9 for ; Wed, 13 May 2026 20:02: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gG4Bk28RTz3Zd1 for ; Wed, 13 May 2026 20:02:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778702574; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xvPSyKQJI3ixMAYFi6MLPD/g/SSMJcQpOzlyFT2K5Nc=; b=M79iE3PVREcGkcoKXTfNze/DYYv3kSD80hSxIjDS7c9mZWRGbo9ZBnYm8/+CLHxqlKaEVT VnrmdoBt99/vYVMScXHyroyXDp8YSPcHQpbGunVdO2vycLOM2FB9Ghg+GooNOtVCdExkHo bOUjvCGwItKa5puiNImNbny/tJDriqyrTID9W6u36NFZQDDi/iJRA21W63UWI7CC8pOCwG DR2oVHAc88TKhl9WQOYnSIYAwNCLuGX/ov0Kh6BdA/sV8aZP52sP7Ch00f4JCJ+m8wS78D +QLQJpaFtiWU/70JHzTVIU7trtLSecUcuN6YHOmnaPilqHzXa1YCxBbK1N4Jtw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778702574; a=rsa-sha256; cv=none; b=dvO+srel3C+/8SNgI5lBCSE/o6Zvyv/1+fJeQFLFk5qLr/uA/PCD98R+3FRrBAcmxvvRAM nvMwgsrYuwJNg/PdFGqnJDXWss5wo2gWq/1z51C2WbKAx7fAdTKjUVxmD+2pCm3tpO20Ma CVARGNfKPp5q14NcFcRMEIHVXzNjti156NKXM4us+PR4oaFNlOHm4uWF/3yamiYzO94cxS gmZkSkgnhz987SiN4IEeohm4SQWHtO4ydiJ/6oIBgJ2dhw4IYJSz5GyGNs3MfxWwCn7/ob rGA9fAH4LLQAPH5hmw1mj8/8mFux9TcbJTlwST+sMrROMNajAE0gEwJv88jEHQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778702574; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xvPSyKQJI3ixMAYFi6MLPD/g/SSMJcQpOzlyFT2K5Nc=; b=wETk4v/D+F8JITmhg+GxcrtsKXkKfWcU0kIGpoISbR8kwDBSdZ6eAL3a1nwBztRIZ9wtgc VQqy11glbYBB0ZnFwgEcCVRZGz9rxsk4/0yduEG+bIhhGkhvidJLg52dYmpkhkx/BTI3kP kVo9Ra2WQb3Is2AQTkLg91NXBq7gQOdeSOd92l1/nDswLuVVoXZu/5zKa0I5E4+X37AQcV Xz48VqJfGdXxhgljXfsshp9QHUqSSwzOCIO+ytmZAH5fd1qEv671JZEKJnBNhywGiSJS8X o6UMkraWMaZHlJd21kQug3s0dQad8GBHLH7YQ6p7l08eH6WAyDXRtpka9qmX3A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gG4Bk1dYPz14xT for ; Wed, 13 May 2026 20:02:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3388a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 20:02:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mariusz Zaborski Subject: git: efc1f50ec499 - main - cap_net: fix typos List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: oshogbo X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: efc1f50ec4999e4222e1f1b3d6d2f668f9169afb Auto-Submitted: auto-generated Date: Wed, 13 May 2026 20:02:54 +0000 Message-Id: <6a04d8ee.3388a.32b14fcf@gitrepo.freebsd.org> The branch main has been updated by oshogbo: URL: https://cgit.FreeBSD.org/src/commit/?id=efc1f50ec4999e4222e1f1b3d6d2f668f9169afb commit efc1f50ec4999e4222e1f1b3d6d2f668f9169afb Author: Mariusz Zaborski AuthorDate: 2026-05-13 19:56:09 +0000 Commit: Mariusz Zaborski CommitDate: 2026-05-13 19:59:38 +0000 cap_net: fix typos --- lib/libcasper/services/cap_net/cap_net.3 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/libcasper/services/cap_net/cap_net.3 b/lib/libcasper/services/cap_net/cap_net.3 index e322222e866f..ae9a6d820ae3 100644 --- a/lib/libcasper/services/cap_net/cap_net.3 +++ b/lib/libcasper/services/cap_net/cap_net.3 @@ -21,7 +21,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd December 6, 2023 +.Dd May 13, 2026 .Dt CAP_NET 3 .Os .Sh NAME @@ -217,7 +217,7 @@ Multiple calls to .Fn cap_net_limit_connect , and .Fn cap_net_limit_bind -is supported, each call is extending preview capabilities. +is supported, each call is extending previous capabilities. .Sh EXAMPLES The following example first opens a capability to casper and then uses this capability to create the @@ -250,7 +250,7 @@ if (capnet == NULL) /* Close Casper capability. */ cap_close(capcas); -/* Limit system.net to reserve IPv4 addresses, to host example.com . */ +/* Limit system.net to resolve IPv4 addresses, to host example.com . */ limit = cap_net_limit_init(capnet, CAPNET_NAME2ADDR | CAPNET_CONNECTDNS); if (limit == NULL) err(1, "Unable to create limits."); From nobody Wed May 13 20:02:53 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gG4Bj3xfqz6cx6P for ; Wed, 13 May 2026 20: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gG4Bj1HSxz3ZQG for ; Wed, 13 May 2026 20: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=1778702573; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZzaO7JiBgGl65PQnnFGb9dWqlnKb02lBPCqa6ybF7ac=; b=oAvzOXPuOKG0KJOSKuBIejEbWbmpMeN5aUucNs8tyE0qnj2Qbl5zSLadP6/qfayUs56PcK 3uu2VA4Q4u4DWDf2C3NilLkpmG0LPE3TXzchI/y8hJKzlBOa8h9qeFNVKUE1F74P32jjRF XX0ge5GWSWu2ajHuT9+vG5rxNEUEwlk5zDlcxWHTR/DsohnkktH8CjbqvWsss145fFrag1 T6ljEnEQ+EcOAnQOehsxOkk7yI1tqnhn07pyZtK70YWd9qpZqAvzTqq7mjpE7JRP2HGmMe xHToOkiD9KFe8vVCoYgRAaVsdEBLIHJUDXSG7QBcTgOymqBr9Hbw0vls/ijfWg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778702573; a=rsa-sha256; cv=none; b=Dz8EbIZ94El0l/2enJjiPkdB7I6jJxhZSaJKvl0gz8u1dwJzDxXaRMPpMi0Box7x5hvh0D cjJ5/ZRROyj1cZc1qDHnpQLYsDweHuHsBhAbGIjdk1RjAUx1zng7Wtxcr4iUzu/9yhnO2m Nv28+hGnw9J4NzyHOMx/4fFV6IZjRB9Rm/QdTsS2p7feYvqFQFRCFiecGFO2kKNn5AR01E krhYZ+quh/K11rtSDZHygwzV1EnTGzr0F5lXHH2LPzV5UXshqFAnLwVdmBs4q+US2gzvhU Kt4ZvMXDYq5C6SR5ReEFV70iaU1KGFuGhz8MftRSaz+VoRmhWbiFTN+Rrn4C0A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778702573; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZzaO7JiBgGl65PQnnFGb9dWqlnKb02lBPCqa6ybF7ac=; b=CgKvo8s9oR0/qiWCOW+0yZ8gW23qu1sqFftDNQTlJ5UL8VGc1yxCiXIvuWf9wdvXqEtOoo EqLIxRCAsa6fIXfdJTbVCCIxVfUyobKErI6HAYAclPosZAbVTuQGI/76oJR+2jgbrCSlpW NnY0GmGPJ9H+ndgC7y+Exc5Z6nlxJnRkCZCgddKCLS/8AOjBdHq0GXb5pSY+1eSw9IRVRE nesRv8jT+D6nVXXII6NkKKUuszub7VOp43br8nae+7o9KAvOFl/CiXh4quqHByQrgFG/fO 9tfOg970V12PSQlw/uK9bFNWHvh7JGwX5tZ0NmdjhqFhW/lJjDlV1DC6ZYOqKQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gG4Bj0v9Gz14xS for ; Wed, 13 May 2026 20:02:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3333c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 20:02:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mariusz Zaborski Subject: git: 4569c022db0b - main - cap_dns: fix typos List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: oshogbo X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4569c022db0bd2242eed883c33207980ddb00019 Auto-Submitted: auto-generated Date: Wed, 13 May 2026 20:02:53 +0000 Message-Id: <6a04d8ed.3333c.3ffc1e99@gitrepo.freebsd.org> The branch main has been updated by oshogbo: URL: https://cgit.FreeBSD.org/src/commit/?id=4569c022db0bd2242eed883c33207980ddb00019 commit 4569c022db0bd2242eed883c33207980ddb00019 Author: Mariusz Zaborski AuthorDate: 2026-05-13 19:55:29 +0000 Commit: Mariusz Zaborski CommitDate: 2026-05-13 19:59:37 +0000 cap_dns: fix typos --- lib/libcasper/services/cap_dns/cap_dns.3 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/libcasper/services/cap_dns/cap_dns.3 b/lib/libcasper/services/cap_dns/cap_dns.3 index d6bbb6bd1263..23e09d1f8c13 100644 --- a/lib/libcasper/services/cap_dns/cap_dns.3 +++ b/lib/libcasper/services/cap_dns/cap_dns.3 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd August 15, 2020 +.Dd May 13, 2026 .Dt CAP_DNS 3 .Os .Sh NAME @@ -74,7 +74,7 @@ functions. The functions .Fn cap_gethostbyname , .Fn cap_gethostbyname2 , -.Fn cep_gethostbyaddr +.Fn cap_gethostbyaddr and .Fn cap_getnameinfo are respectively equivalent to @@ -100,7 +100,7 @@ See the .Sx LIMITS section for more details. The -.Fa ntpyes +.Fa ntypes variable contains the number of .Fa types provided. @@ -190,7 +190,7 @@ if (capdns == NULL) /* Close Casper capability, we don't need it anymore. */ cap_close(capcas); -/* Limit system.dns to reserve IPv4 addresses */ +/* Limit system.dns to resolve IPv4 addresses */ familylimit = AF_INET; if (cap_dns_family_limit(capdns, &familylimit, 1) < 0) err(1, "Unable to limit access to the system.dns service"); From nobody Wed May 13 20:02:55 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gG4Bl5LhSz6cx6X for ; Wed, 13 May 2026 20:02:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gG4Bl2xT5z3ZQH for ; Wed, 13 May 2026 20:02:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778702575; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Tip19L8x91G9TBgWiXPsKAq4lhvSVzwvhfoHal3zIPI=; b=V+jtzb7ZDWv/C5WXDmLo15UtrlowXIMQbRIeAYfEg0oANoqNsswmvBBxfBG2Gks2HLbVrz qvOhs3vRR000uBdxnq57OVmF1buAVpJA7Sa/930SpFn1/htsNUQ8iDF8bjJtYcSBUVn/sC Y1FwOzhzICZGwbhvVD5uEVulRPSxZI3JoS4qy1deZkSwzMI/jZYD864Z8DSMHLa0nrONpX 0KjWE9duXwkTFXdXDVPLE9tpu0bO7h/y2Wbq6sgA1uM8gWWyjSCfQqVZCf7dZdzkzLrq99 ZIze0U5YceJVvg9vZnvKPXEklchem1cgxIP8mEPh8kvzy+gobSwXn3HOmjoAfg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778702575; a=rsa-sha256; cv=none; b=F0Om7lv8Jhl4Y148EWFy9h4rr8vRmhko1w5fck0Hcl5sUNK3zOP7DAxYslCIll3iqx6HZk bjkq5rWUJAQwMyrkd0/7cTuV1rngDvmvyY6pwkffI8YJnAIxpc7XWpIS8RT7FXR4KTmzzc nZUpd2UlsDrX99KCS4INTwuRQPV3slFSo5eYZq8c2/bAybOh86m5P1zmh4f8xAqg0pX5pf x9EvsKAQIdI7Y8N4BL5hnxElOUULNoNYjBWmftplIzrTss8Cg5C2VQ5y8tww4OLevI2y4S 1f09Mx1NWUyaLTt7zW4T6jkj+nj6ukTocM6UV1K3wATaSqoW2FfTfWII9XXmmw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778702575; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Tip19L8x91G9TBgWiXPsKAq4lhvSVzwvhfoHal3zIPI=; b=NPhvL9JHpHuEyCTVFVZDKf8Mi2Jqcke8Qk69jbUDb5XDLyaBM+o9qU+p6Z61q7iQTo9XjA slXcH8bWJLGIWspZmKvVbjFkLReOyPrbAyyCXwkQf1rKdpfNLFSxDIz8JaNm1gnjMSEr99 VBakMe8hb9SOLIQZKNzb6iAzFybP8wXA7VvfY74WJfbGRQ7lSSZhe00E3u0BuozOLeQvUf LtVK8WOoT0pItlxx2rsE25amiK+R7QEnyf0HSpjAK/7Cw5TEjk/8IGA6Sv7EAg0jAyz+XJ KAHn89b4bgNZ7yrAbGBpZtox+26GXPvKPZnr9emPWLtX5Dt1mBuXY9HAimIwdA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gG4Bl2MpKz14hy for ; Wed, 13 May 2026 20:02:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 32bb7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 20:02:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mariusz Zaborski Subject: git: 45fa572b94e7 - main - cap_sysctl: fix typo List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: oshogbo X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 45fa572b94e7c61de5797ea877af3dade91af23f Auto-Submitted: auto-generated Date: Wed, 13 May 2026 20:02:55 +0000 Message-Id: <6a04d8ef.32bb7.3313a45f@gitrepo.freebsd.org> The branch main has been updated by oshogbo: URL: https://cgit.FreeBSD.org/src/commit/?id=45fa572b94e7c61de5797ea877af3dade91af23f commit 45fa572b94e7c61de5797ea877af3dade91af23f Author: Mariusz Zaborski AuthorDate: 2026-05-13 19:57:20 +0000 Commit: Mariusz Zaborski CommitDate: 2026-05-13 19:59:38 +0000 cap_sysctl: fix typo --- lib/libcasper/services/cap_sysctl/cap_sysctl.3 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/libcasper/services/cap_sysctl/cap_sysctl.3 b/lib/libcasper/services/cap_sysctl/cap_sysctl.3 index 2c7a491a1f8b..6acbe38d874e 100644 --- a/lib/libcasper/services/cap_sysctl/cap_sysctl.3 +++ b/lib/libcasper/services/cap_sysctl/cap_sysctl.3 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd December 6, 2023 +.Dd May 13, 2026 .Dt CAP_SYSCTL 3 .Os .Sh NAME @@ -93,7 +93,7 @@ Rights are encoded using the following flags: CAP_SYSCTL_READ allow reads of the sysctl variable CAP_SYSCTL_WRITE allow writes of the sysctl variable CAP_SYSCTL_RDWR allow reads and writes of the sysctl variable -CAP_RECURSIVE permit access to any child of the sysctl variable +CAP_SYSCTL_RECURSIVE permit access to any child of the sysctl variable .Ed .Pp The From nobody Wed May 13 20:40:36 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gG52K2yhYz6d0wc for ; Wed, 13 May 2026 20:40: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gG52K22QNz3n6r for ; Wed, 13 May 2026 20:40:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778704841; 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; bh=l3knK7iRgcuDKCwYbJPYnFzLtisUjU8I1rJcGyaFS0s=; b=ARUhLVkkoWzotNmhxcqPd6Z9uIAgpoB7zWnYC82amfvcZEd97shmPJOoimCqmcb+QbAqlQ 5iqfAwNnBbDdx/jE3l6Byb9iHTkmBmiR3SIXtOsDbH4EeCrZFX5CPp2oN6GRRNIOJ07h92 lKLGFmscDsIwfydUoO9Y5tSJre1do4iP30Gz24MSG3cC+xQLO2bpakTMQyLvGqnyvUA/41 i6lKMZhKTAqc8WUZs15d45s/QJC4m3phDe5f7N3FrkNQYOJp6MSOj8uDwozYtoKijGUQB8 ujq45p1WpRshwe/qCWYMF5UCY30fXqWNeMXeHFJY+7jsiuqzASbvB4EWhWLYnQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778704841; a=rsa-sha256; cv=none; b=CyuiJhUjNFaHck83UD7UqF8L+y6i8m+Bmp+W4C33qnO000K6swFdVAQ+Z1uir/t5TAYL01 DQF91A1erszoPejnVJe4b5qxbSnPBC+SRP9/QmRRH80dDnFGcF0bKCMKIEH2+V9/DGewcE VLdgc8rvJwKSrZNfJ9VSrgoYSFqY+pttU5jIMA5tlcrLVdRen+oNMG2hSxvUmSl/+umiAI 96DOs1EkhH73y0/9SeDkR/lcsLIE9dXeVjjT5c69v198Kj+IKlNOucLfX28rbpLoZYW64e vP0zBnMtQ9afZaYQUYIcEYj3oc5kvuIBtzgviRY/kqmlKSE1m76cTTH+NWA2YQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778704841; 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; bh=l3knK7iRgcuDKCwYbJPYnFzLtisUjU8I1rJcGyaFS0s=; b=lud7IV5bXorhlujkUJ0+OAmySXl4LMX5A8TGhR+hYxhxsu9uw83YPJRy8WvnQAcgxjM+Dm Q1E9n7ElJyAegyCMY5hUAy4bsYjjlN+ODhFuHKSYXllaeKuycL9uVsccVYDhO6GzQdH2Iq lmGCKU5oYuTAsLHsS25M0NODluVkpOobAWby4O0ubjjIcv+aY4ux+kKgbaHmSDVh/Rgftc scW/n2y6Le1BciB7d6jNAxOI9YCRT2xUOUSrwbcqYHhjln6m6dn30sAcQDVUAZYPQDS4/J KS1/glfJcBsNsEfQmH4+/LPiiG2+kgAqgk2DRXENUmCn7YUaK+5hcSagHdhntw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gG52K1bgYz15l5 for ; Wed, 13 May 2026 20:40:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38cc7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 20:40:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Alex S From: Ed Maste Subject: git: 96f262dcacdb - main - tests/sys/arch/amd64: Add a basic ptrace syscall tampering test List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: 96f262dcacdbfb56e94c60985b07f9f8ee2d046b Auto-Submitted: auto-generated Date: Wed, 13 May 2026 20:40:36 +0000 Message-Id: <6a04e1c4.38cc7.3dade40b@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=96f262dcacdbfb56e94c60985b07f9f8ee2d046b commit 96f262dcacdbfb56e94c60985b07f9f8ee2d046b Author: Alex S AuthorDate: 2026-05-11 23:52:20 +0000 Commit: Ed Maste CommitDate: 2026-05-13 20:40:16 +0000 tests/sys/arch/amd64: Add a basic ptrace syscall tampering test Signed-off-by: Alex S Reviewed-by: kib Pull-request: https://github.com/freebsd/freebsd-src/pull/2190 --- tests/sys/arch/amd64/Makefile | 1 + tests/sys/arch/amd64/ptrace-sce-tamper.c | 89 ++++++++++++++++++++++++++++++++ 2 files changed, 90 insertions(+) diff --git a/tests/sys/arch/amd64/Makefile b/tests/sys/arch/amd64/Makefile index 34f3c90c4082..d4cf00237f9b 100644 --- a/tests/sys/arch/amd64/Makefile +++ b/tests/sys/arch/amd64/Makefile @@ -1,6 +1,7 @@ TESTSDIR= ${TESTSBASE}/sys/arch/amd64 PLAIN_TESTS_C+= int0x80 +PLAIN_TESTS_C+= ptrace-sce-tamper BINDIR= ${TESTSDIR} diff --git a/tests/sys/arch/amd64/ptrace-sce-tamper.c b/tests/sys/arch/amd64/ptrace-sce-tamper.c new file mode 100644 index 000000000000..0645f62a7e9b --- /dev/null +++ b/tests/sys/arch/amd64/ptrace-sce-tamper.c @@ -0,0 +1,89 @@ +/* + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2026 Alex S + */ + +#include +#include +#include +#include + +#include +#include +#include +#include +#include + +#ifndef __amd64__ +#error "amd64 only" +#endif + +/* + * This test substitutes exit(42) instead of getpid() using ptrace. + */ + +static const int EXPECTED_EXIT_CODE = 42; + +static void +tamper(pid_t pid) +{ + struct ptrace_lwpinfo info; + struct reg regs; + + if (ptrace(PT_LWPINFO, pid, (caddr_t)&info, sizeof(info)) == -1) + err(1, "ptrace(PT_LWPINFO)"); + + if ((info.pl_flags & PL_FLAG_SCE) != 0 && + info.pl_syscall_code == SYS_getpid) { + if (ptrace(PT_GETREGS, pid, (caddr_t)®s, sizeof(regs)) == -1) + err(1, "ptrace(PT_GETREGS)"); + + regs.r_rax = SYS_exit; + regs.r_rdi = EXPECTED_EXIT_CODE; + + if (ptrace(PT_SETREGS, pid, (caddr_t)®s, sizeof(regs)) == -1) + err(1, "ptrace(PT_SETREGS)"); + } +} + +int +main(void) +{ + pid_t pid; + int status; + + pid = fork(); + if (pid == -1) + err(1, "fork"); + + if (pid == 0) { + (void)ptrace(PT_TRACE_ME, 0, 0, 0); + (void)getpid(); + exit(0); + } else { + if (ptrace(PT_ATTACH, pid, 0, 0) == -1) + err(1, "ptrace(PT_ATTACH)"); + + for (;;) { + if (wait(&status) == -1) + err(1, "wait"); + + if (WIFEXITED(status)) { + if (WEXITSTATUS(status) == EXPECTED_EXIT_CODE) { + printf("exit code changed\n"); + exit(0); + } else { + printf("unable to change exit code\n"); + exit(1); + } + } + + assert(WIFSTOPPED(status)); + tamper(pid); + + if (ptrace(PT_TO_SCE, pid, (caddr_t)1, 0) == -1) + err(1, "ptrace(PT_TO_SCE)"); + } + } +} From nobody Thu May 14 00:57:08 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gGBkD3Dtgz6dKkp for ; Thu, 14 May 2026 00:57: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gGBkD1MtNz49x8 for ; Thu, 14 May 2026 00:57:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778720228; 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; bh=R3LKJ8VFQlpnJ2Xl73LghMnjmbKu3O87GDcCkdIqO6Q=; b=XGDPVN3pCJeYmWvMjiPhG/VgxTUGDN5o9qM44FHUi66DJtdW36yP0tbuk1go2Xf6edu3Ad uw2yzSCgGlKtk6LU8GqDWVLyINbXxjOU8/Z5pELjHlbndq22bb7f5HgoN96PCks8zC9YX2 j/JNNRzO2Ioy0mIivGLJ+H+O4QGgbSFETwqrmZAEiJ5O65qrNA5xt7OTA0OCaId8TGeVxW roYUpihG2JiZ4LT49TWUILOWiGf/UEQY4sm0l60cgmh+EZKL5CCMtTi9RYh8KIN/UVmcqZ cj5cFUZ2ttUqW5GHisxASCOSzMTDkcwVKGAM/wq/jH14v4nU5SSwOMNEMr9NOg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778720228; a=rsa-sha256; cv=none; b=SlMCbzkDzkOtZEAIXs/d8dHS3P+OK2+NS2LphVW5OvQsKKhXu+pO95kmM7LgmEFr5XsUVZ S1ogDlBm0IXcFRCbo5aQ5pIGo4mgbpaaKjU0sYUuea1vM5JXZPpn/ic52pygavzvdURv1/ ThMETVyhZUHVHJbNX7w3Zh9f1lEzh/+JKovQhRc066fXBTYidon6wBKbc8vwcNC4P8mQfp 7PViTjMmUbuI6BgKHixfOBGY4wxdb0sxBPc4bSfiwInttzfNVb2Us46uatVyC0U+vWWZe1 0lvMjQ1ad8paJEAZ91H5sf9mRD7HsVFrMHFObcnRgykTg8oGSquUztXX1Iwu8w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778720228; 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; bh=R3LKJ8VFQlpnJ2Xl73LghMnjmbKu3O87GDcCkdIqO6Q=; b=rIkSVH97tqLCf8QeZ9yciJJfpQlnMSZ2XxqJZPyCjYC84KtIHD822udcVStQTZ24YQ5kRz p0vLU8Pemvwx5lTuJ3K/d0o6xDN4qESq9Id4iFRZe4RdCRoaxMTBG3TTD+4PeQcjG5BbvX w4P+9kBpg3hoFrSQKoHvAXi+b+3N5LasRC5zHRSEPqisPXx6w5fKK2GxZym8+88VH9y3+b AZf6Y2d850hPshArcsiNxf4KkuahaILMj2bqA8QbocR2Jx17RPQkMMjUE0vR5oRIH2q3As 3sv8+aFMQTSukzYdPoD9dWOaww4H92dfvWBSJIzSr4AiofYaHiheN2AxDqhLIQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gGBkD0JSgzXG for ; Thu, 14 May 2026 00:57:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 21d60 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 14 May 2026 00:57:08 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Ryan Libby From: Konstantin Belousov Subject: git: cd1e479361bf - stable/15 - amd/int0x80 test: fix inline asm for gcc List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: cd1e479361bf3919019f27f28a4314449b30c764 Auto-Submitted: auto-generated Date: Thu, 14 May 2026 00:57:08 +0000 Message-Id: <6a051de4.21d60.19c6081@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=cd1e479361bf3919019f27f28a4314449b30c764 commit cd1e479361bf3919019f27f28a4314449b30c764 Author: Ryan Libby AuthorDate: 2026-05-04 16:34:41 +0000 Commit: Konstantin Belousov CommitDate: 2026-05-14 00:48:03 +0000 amd/int0x80 test: fix inline asm for gcc (cherry picked from commit d5728351a58b87764f3302eb8c4ca9f35e99e8b6) --- tests/sys/arch/amd64/int0x80.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/sys/arch/amd64/int0x80.c b/tests/sys/arch/amd64/int0x80.c index e03462a6dccd..fbe98fb341a1 100644 --- a/tests/sys/arch/amd64/int0x80.c +++ b/tests/sys/arch/amd64/int0x80.c @@ -46,12 +46,13 @@ fire(void) { int res; + res = SYS_getpid; asm volatile( ".globl\tafter_int0x80\n" "\tint\t$0x80\n" "after_int0x80:" - : "=a" (res) - : "%0" (SYS_getpid) + : "+a" (res) + : : "rdx", "memory", "cc"); return (res); } From nobody Thu May 14 00:57:09 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gGBkF2zmxz6dLGp for ; Thu, 14 May 2026 00:57:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gGBkF1GZhz4Bqf for ; Thu, 14 May 2026 00:57:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778720229; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gbMkLGlHw8B61Yt9vZgB0eIlQDld9iQZOrxfzqTNm5E=; b=nCHiXQDQfbqdwqNlphS/9G3wDBX2+pw0EN57rEX0uW6Zhl3Kdtp/U7YDGeCR9LXmS+tUIC 3LXeUMhZaJKtZ9QSYJn/LX0AvcBZ6yLVeAYQphX0tD7d1WY+BkgFErR9uLVN/UGfyn7wZc tmbX4K8Iz8FYS1BZGqTbNx34sS2HP2+24EFEg+mfdFs2yNGIEbK4OY6TtKxRcR7TizJsjU yJqOMZSUo5JmkdbtApwUZqXns3B2kgxjDE5OkOP1ZbjrXxdpgAsIJt4QwMSgHBkJOBGaJ3 z6XgY5fPPfMzp1jXLXGbSSwMo3rIMnXsasEdWh8ufoMdVdYtjc5mG8rDy7wRCQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778720229; a=rsa-sha256; cv=none; b=km64kCE3V8m/dZGEaLtzp3weshDpjx3rUdM3/FS/saXMRtZGsitLy4/RZg+Bbk90ukja4x sNZ+CgueU0TvOyVzjaRO71KRaHONR1WoWK0QzamCJqtfDIJ2Q7WGc6Glj0h8CpdphIy0Be WIeHkVvdKMHeGGF/UL8k9nhxH3H66o2yPPQSE9kZuTDAktU4+8BC/qX+Ts4DHyuxzGEyFV TdPHT6ejyJnk4m0WGnwPDBcLGehF1UrWOR8g0iF7hIqk3xcm82DngaE0F1EfHabLIRLsWE u+snbxvvT7wyPb+yUZQ+F9M9iMIpmkMnOKZVN+VuyLUxJ6hq/3jkKpHqBpfBug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778720229; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gbMkLGlHw8B61Yt9vZgB0eIlQDld9iQZOrxfzqTNm5E=; b=Gw+YiLeZQmyk3ANfSNPqjC9eJnJt+ENUJssIuQPrQU69iITRzTy/EI7C0R1cVsq33CMkvU yw2V7tZwg1fMLy2QXQeJwvxsapL/LrdHI9kmMOMYnPuq3nYVoTKorjUJn6fXSL/cYNk3QD qfKD1dQ6o3v9MsZgjH6xiV0eh76p2/JVNdECRBe+W188dcAR+sFhIXRqcjmwoksktLrg+n l4ZFhd4aaryiR17aME6XOr+iODMxeeltqpFgf8sVOPVU87roLNdQXxown+NGIbM73XcNn3 1oE5zkafoG1Xxq3qzMqRyD+pYJiWJ4GPGPhMsuYRknExPMkzoHvugXUOnUIP9w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gGBkF0mHqzXH for ; Thu, 14 May 2026 00:57:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 216c4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 14 May 2026 00:57:09 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 43c00fbfe676 - stable/15 - bufspace_wait(): only try to help bufdaemon if there is a chance to help List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 43c00fbfe6763570b9cf69ec7bbfb7d62a3d8ca9 Auto-Submitted: auto-generated Date: Thu, 14 May 2026 00:57:09 +0000 Message-Id: <6a051de5.216c4.4e74dcc4@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=43c00fbfe6763570b9cf69ec7bbfb7d62a3d8ca9 commit 43c00fbfe6763570b9cf69ec7bbfb7d62a3d8ca9 Author: Konstantin Belousov AuthorDate: 2026-04-22 05:09:34 +0000 Commit: Konstantin Belousov CommitDate: 2026-05-14 00:48:03 +0000 bufspace_wait(): only try to help bufdaemon if there is a chance to help (cherry picked from commit ce4e8c478a261ce6c7af7d81817f86420c5239b9) --- sys/kern/vfs_bio.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c index 2368f863a248..5b8d4a87c1ab 100644 --- a/sys/kern/vfs_bio.c +++ b/sys/kern/vfs_bio.c @@ -727,7 +727,8 @@ bufspace_wait(struct bufdomain *bd, struct vnode *vp, int gbflags, BD_LOCK(bd); while (bd->bd_wanted) { if (vp != NULL && vp->v_type != VCHR && - (td->td_pflags & TDP_BUFNEED) == 0) { + (td->td_pflags & TDP_BUFNEED) == 0 && + vp->v_bufobj.bo_dirty.bv_cnt > 0) { BD_UNLOCK(bd); /* * getblk() is called with a vnode locked, and From nobody Thu May 14 00:57:10 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gGBkG5pCQz6dKks for ; Thu, 14 May 2026 00:57: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gGBkG3WyXz4B7t for ; Thu, 14 May 2026 00:57:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778720230; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fFNIzHVd6Y1/R5j90RjPPEf613eeRzcKhG5vLAGuKNk=; b=lkX6gvVKSpeB5j4pslBhER4NGV7OoWPg5MEceinE4aB6PzpMrbHH9KKcZueuTlByT4Ozjv c8r3qoYeWZVEat0gz5gPauRRAIm7UFMV9xkJBU/Zk3RxuPxIMwezoZBien+5Hvucm1ksSz PLfkQYoVGTg+Jy0BC5cd0i2BNEiNclEePlgema0jINshmYHwkDl70SUUT7C8791wHg2Eod mbaw8KQLiOHY9zfR+R4+CXh2FbNa1Ays5hm+89E+me1+b03xq4U7ox/G7Pg9Skgy/iGts6 wSSsm6Sw62mjyIb/XJFElvJDKLGji7KaXcw1ryDAImH08Lpgpl5lp/uU+zXI2g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778720230; a=rsa-sha256; cv=none; b=g1E6zQ0QfgVlDc2CHoqtBc2utXEzx2XHDSdbSdcko35nzPOt8+1RhWZboVc1Awc/GIBn6q K1ez8U8+0oMnBEa4hkEc6GAwVSfB/ZQXNl7h4roy8cIXE7WQguoFoqZyq+u3RfBTq6BgAB sJk7+KiyYZ63LHVTazA6iDlBaLEyTu3Y46AjWqgT3NgAM2zNydSXn2ZaijStHsZYKANXVU +j9SrglJD061/f15QJiixUCrBioKve/V4P9ZB/aKy/R1RqhbVj0eWPGZyIW7v1UetB5c8I xG/1b7jk3SHdckUdTMKlJqiIJbaeAt/n5rioago8cSjIqLpBuydOpgpTCA+0gA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778720230; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fFNIzHVd6Y1/R5j90RjPPEf613eeRzcKhG5vLAGuKNk=; b=oazRc3wI7ZL/2236hjXTt6Qa7Lh5Y/1WRNyvwZ6Q25Wu2ShWt9xmKBHLDQKiQM0LtreqAj qp3DdkvUvX513B2yCWdAwWbQzOUHtCoqvilh3iyUbE7A/cO6rhdePTSzTjrV7VCE7Uyx4B Bz4192VYjCHrXKdhvSkiFmaIgySp99CcoTfOdNkhPeOOLoEMtbzzmLCoCEIomQJDeZ8vq8 JtKOW8Uvmi7RngooLMKKLxzGjQrW7MYOS620FYTs3JaWwu1syoh8DiZPiNEaes/JKGHzpM BXY6zwprc0PA/DKcFCTLujyzMsFQ1Qoq/GsKEnUsQFDHRC/+jiFT103StiPAAQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gGBkG1fzXzm7 for ; Thu, 14 May 2026 00:57:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 21e4b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 14 May 2026 00:57:10 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: e0e4d7b1f1c2 - stable/15 - vm_map_growstack(): consistently use local vars instead of curthread/proc List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: e0e4d7b1f1c256fb47a8eb8a7932b9e7769d1bf0 Auto-Submitted: auto-generated Date: Thu, 14 May 2026 00:57:10 +0000 Message-Id: <6a051de6.21e4b.6165e525@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=e0e4d7b1f1c256fb47a8eb8a7932b9e7769d1bf0 commit e0e4d7b1f1c256fb47a8eb8a7932b9e7769d1bf0 Author: Konstantin Belousov AuthorDate: 2026-05-07 16:00:31 +0000 Commit: Konstantin Belousov CommitDate: 2026-05-14 00:48:03 +0000 vm_map_growstack(): consistently use local vars instead of curthread/proc (cherry picked from commit 642dd17ee94377c3d5533d05d0d9a58b88f60387) --- sys/vm/vm_map.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c index 63bdce9d60f8..0a81e62d2d63 100644 --- a/sys/vm/vm_map.c +++ b/sys/vm/vm_map.c @@ -4731,6 +4731,7 @@ static int vm_map_growstack(vm_map_t map, vm_offset_t addr, vm_map_entry_t gap_entry) { vm_map_entry_t stack_entry; + struct thread *td; struct proc *p; struct vmspace *vm; vm_offset_t gap_end, gap_start, grow_start; @@ -4746,7 +4747,8 @@ vm_map_growstack(vm_map_t map, vm_offset_t addr, vm_map_entry_t gap_entry) int error __diagused; #endif - p = curproc; + td = curthread; + p = td->td_proc; vm = p->p_vmspace; /* @@ -4760,9 +4762,9 @@ vm_map_growstack(vm_map_t map, vm_offset_t addr, vm_map_entry_t gap_entry) MPASS(!vm_map_is_system(map)); - lmemlim = lim_cur(curthread, RLIMIT_MEMLOCK); - stacklim = lim_cur(curthread, RLIMIT_STACK); - vmemlim = lim_cur(curthread, RLIMIT_VMEM); + lmemlim = lim_cur(td, RLIMIT_MEMLOCK); + stacklim = lim_cur(td, RLIMIT_STACK); + vmemlim = lim_cur(td, RLIMIT_VMEM); retry: /* If addr is not in a hole for a stack grow area, no need to grow. */ if (gap_entry == NULL && !vm_map_lookup_entry(map, addr, &gap_entry)) @@ -4778,8 +4780,8 @@ retry: } else { return (KERN_FAILURE); } - guard = ((curproc->p_flag2 & P2_STKGAP_DISABLE) != 0 || - (curproc->p_fctl0 & NT_FREEBSD_FCTL_STKGAP_DISABLE) != 0) ? 0 : + guard = ((p->p_flag2 & P2_STKGAP_DISABLE) != 0 || + (p->p_fctl0 & NT_FREEBSD_FCTL_STKGAP_DISABLE) != 0) ? 0 : gap_entry->next_read; max_grow = gap_entry->end - gap_entry->start; if (guard > max_grow) From nobody Thu May 14 00:57:11 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gGBkJ07DLz6dLJr for ; Thu, 14 May 2026 00:57: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gGBkH3t0zz4CB3 for ; Thu, 14 May 2026 00:57:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778720231; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=z8vnQ6h0U7Z9tHygR5aauNWHvLhyqVqeIS/x6p25BZU=; b=yuSNsFJwQ0Ii6xU8tRdZpXuqQ1zINHNVsZ4Ro3dQ+KN1mlTXkoNeta0Gk5glFSh0nyZBq8 p+WVE1oOhRoYD+IlEGgJAx0Va26PkOyHnNf+93qRXu+xsGNGMB4+KGOIXNXzYqt0Q9YXH5 3viwgdLqpZQWinJbbaiBOJckINh1uxheYbuJZOsPIpXK3jnwJj3idsBZn/JeRguLYFWVa2 TuLZ9aMRPg4dHbtdu7NWxoUo2TLMpfrGUWVBSnH+8szHp4EljWKORjD6w0Ytt1Bo5M2Jds TawcA77O/gorHNNB2IDG6R1aaLmbJWFvoKGirFr7MaDE0+IpVoZe2CxVOm8JPQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778720231; a=rsa-sha256; cv=none; b=t3M95+TRRmaKaJ1wXdGx15+cXNcLM1mtvbpPTz5wvEkeUSfp02nP0W1rlESNrZFhwaeHP5 cPk7GweAmo/6gztb5z2nnScxNccOh7cs1tjI9Z+L8FPlgHBdKHo5rdY7hb20/OoKnwAvCH qt3UJJNkmcRczMBUcVb76ilqJW9tp3yXRyAhndSrdkA9bvX4YZZFYvNN0kc73yeT5apTaH 7m6q3+ONYq1xiR2G5ElX2wv1JmBr6JYDUO5N0ylmhUl0ApCdgL2yUG8KbQas736pxQiosb KiGgRFKDrXd4ED60/Tq758Oz2Hh+rRRip3W9xXJFhQVfsaK7cUyA4YP4DA8s9w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778720231; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=z8vnQ6h0U7Z9tHygR5aauNWHvLhyqVqeIS/x6p25BZU=; b=Et0pEIRi368E1SrlZvXy+2Ujl0lbsHmiZloiFCj4rwcI7qmNXGFp1xnLRjodUJ0HYeHBgg TI6ntsjO1Td6JB/MjtTbomGnuB25hH5ly9AKpr4vCI6VtLoAOZ+k7PdX5YuiMSmsNUmFM4 e6gyWVmceOx62pWk2BafmS2EyPW5Ae6b3KsteKW0Tng9Bad8MfnStHsLFKwED1Ggo3OLuk x/UOzzC71jmNTWVFc/6FztFEdZGbg3owltNVRW/G9E4PqbxGN6IRyjVA17wNaWymmZy5sM gzx+ta4k2qithXhTV2eV8ei6U5fdRbNpg7hETORzqZazDxZOSlwYaiSp8uQYBw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gGBkH25YTzJc for ; Thu, 14 May 2026 00:57:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2065e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 14 May 2026 00:57:11 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 1aa72148d19f - stable/15 - vm_map_growstack(): give a hint to user that stack was blown out List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 1aa72148d19fbf73ec1c864ac9efbc9c37c4d8d3 Auto-Submitted: auto-generated Date: Thu, 14 May 2026 00:57:11 +0000 Message-Id: <6a051de7.2065e.642938a5@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=1aa72148d19fbf73ec1c864ac9efbc9c37c4d8d3 commit 1aa72148d19fbf73ec1c864ac9efbc9c37c4d8d3 Author: Konstantin Belousov AuthorDate: 2026-05-06 22:53:59 +0000 Commit: Konstantin Belousov CommitDate: 2026-05-14 00:48:03 +0000 vm_map_growstack(): give a hint to user that stack was blown out (cherry picked from commit 18c5a26f8a747583b9bca3a6a1ae9db1ed4591a3) --- sys/vm/vm_map.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c index 0a81e62d2d63..7ead7d7e6472 100644 --- a/sys/vm/vm_map.c +++ b/sys/vm/vm_map.c @@ -4723,6 +4723,11 @@ vm_map_stack_locked(vm_map_t map, vm_offset_t addrbos, vm_size_t max_ssize, return (rv); } +static bool report_stackoverflow = true; +SYSCTL_BOOL(_vm, OID_AUTO, report_stackoverflow, CTLFLAG_RWTUN, + &report_stackoverflow, 0, + "uprintf() on stack overflow"); + /* * Attempts to grow a vm stack entry. Returns KERN_SUCCESS if we * successfully grow the stack. @@ -4787,8 +4792,12 @@ retry: if (guard > max_grow) return (KERN_NO_SPACE); max_grow -= guard; - if (grow_amount > max_grow) + if (grow_amount > max_grow) { + if (report_stackoverflow) + uprintf("pid %d comm %s tid %d stack overflow\n", + p->p_pid, p->p_comm, td->td_tid); return (KERN_NO_SPACE); + } /* * If this is the main process stack, see if we're over the stack @@ -4796,8 +4805,12 @@ retry: */ is_procstack = addr >= (vm_offset_t)vm->vm_maxsaddr && addr < (vm_offset_t)vm->vm_stacktop; - if (is_procstack && (ctob(vm->vm_ssize) + grow_amount > stacklim)) + if (is_procstack && (ctob(vm->vm_ssize) + grow_amount > stacklim)) { + if (report_stackoverflow) + uprintf("pid %d comm %s tid %d stack overflow\n", + p->p_pid, p->p_comm, td->td_tid); return (KERN_NO_SPACE); + } #ifdef RACCT if (racct_enable) { From nobody Thu May 14 00:57:06 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gGBkJ4n8Rz6dL4c for ; Thu, 14 May 2026 00:57: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gGBkJ0gPzz4C8v for ; Thu, 14 May 2026 00:57:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778720232; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xM95WSV2I8l9Ov64k11N6cf4PGyXTGAoAr5pgfRAHhE=; b=xzf4e1jksWmLVG9aGFJTvTqJwq2rqOLHVpkV4FuTRmBqdQLyoxCibe08l2xwc1IibUH2Bl Henj0x3qYhGMxnEA3rUsRPlOU/xZZ1pcPNQzGqTi5l8zHioWkEsU6fnKxDEPKlBdhOOy2/ 3/4jy3jocQHVSHqkGz97I6iNoX1m0P3Qw6hBhwesqHYI49pv1EtKqCoBxgYkKZALnXlcoo Rtv6O8rz0YsAgAue+WsvwBjB84XVpDspRR4b5JN+EIacYpVpvBdzUi5dOEqNvr2oE+AFJE flPbKVV3yjYkItLvhkjQSsHCDUv02a8sB5T8S/cB/aIy+HPt0kBlMDxj1SgHrw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778720232; a=rsa-sha256; cv=none; b=hGSLN1+0kX2M/KrAVfPH6mH7A4M13ztivHCvjytuAEq6Tiazi7cGmDRtnJUz0/IMnTnmx/ uN9f4iAbI54K8LewVYf76VeOdXDPgPDHmyYm02/gn9trLHcZmxF3ul5JGPUCu/uxSJyST2 KWMw0xsAmpl7GzLNQldYREVHUG2MyLc9S6GlfcmkQ1rqj0GymSLiDbNm1ekTAwmG82/KtH DB/e45kDJdaLllI7erIF2G313hevR+YIwCuY5XDssIt4KdC+4jFbt7IF+X/cYdx1gVTkSI rmms59lRuq9nKu7SyGDFkVKQYGpEhN/2pxftB1VmWeDCxzLWU/9RJcyuJfIvUw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778720232; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xM95WSV2I8l9Ov64k11N6cf4PGyXTGAoAr5pgfRAHhE=; b=aBTV409BjkeFkyxHQgh41TzMn1NwUuJk7tWICqzdoPzH0siYXGmlARLuOcw04fsMGh/HT3 j26SrcXTGEVu4Ps0vyqI6mFQ9moqjk6lNwTtbo1cHUv4o1R2Mx9awhgzq8/ttT5P6n4qrU 1cMmGElLtRMI4ImJbv2oJpjJLRVM+yVCg+2PK1Nio1b79rL+wzrkc0EAz6K2pXHysGKVNL 8xt2xCY1ZNTQQNvL6nWkszW/5fPpXbZcYmmLdQ5FBIjdcpEhMr7kGnF1IYuittPixQiuRh WFwFKLRkZAjkT10Y8ax+rmeZ6zy4TxLRsVPnKwBUdC8Ay10nqER+l+uhZX+F1Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gGBkH6nTfzV9 for ; Thu, 14 May 2026 00:57:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 21bb5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 14 May 2026 00:57:06 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 5af938fb03d0 - stable/15 - fdescfs: do not change vnode type on VOP_GETATTR() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 5af938fb03d004ef97621f4c9319446f2fb8f77c Auto-Submitted: auto-generated Date: Thu, 14 May 2026 00:57:06 +0000 Message-Id: <6a051de2.21bb5.5ef9e75e@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=5af938fb03d004ef97621f4c9319446f2fb8f77c commit 5af938fb03d004ef97621f4c9319446f2fb8f77c Author: Konstantin Belousov AuthorDate: 2026-05-03 19:09:15 +0000 Commit: Konstantin Belousov CommitDate: 2026-05-14 00:48:03 +0000 fdescfs: do not change vnode type on VOP_GETATTR() PR: 294768 (cherry picked from commit fbecfc4aa028964f972a0457809aa041d415f61b) --- sys/fs/fdescfs/fdesc_vnops.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sys/fs/fdescfs/fdesc_vnops.c b/sys/fs/fdescfs/fdesc_vnops.c index 58a22b8bdc50..05630ef5e48c 100644 --- a/sys/fs/fdescfs/fdesc_vnops.c +++ b/sys/fs/fdescfs/fdesc_vnops.c @@ -469,7 +469,6 @@ fdesc_getattr(struct vop_getattr_args *ap) break; } - vp->v_type = vap->va_type; return (0); } From nobody Thu May 14 00:57:12 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gGBkJ50gtz6dLJw for ; Thu, 14 May 2026 00:57: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gGBkJ45rBz4C91 for ; Thu, 14 May 2026 00:57:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778720232; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZrzOQdCjjn4xl+g02UqmJ+igXYfdk0tiZkH8kfqC3Yk=; b=PofeplzknkTz6pe9o3YF8/zLfRHSKWAdbD8jqooy/dgnIDDowHcIPuwbuPjRDajeww6sZG HlAYWByq/izRv6A0zRF8K00NWcurGJjNtUrosX8aAzhbNpf/h6RcHhYXo1MWtGJdBlPuIU qORTMEGdERseLlel/VvTqsuKcHFuJvJSNLScKM8w4qu6V1U3uwmbu6tPXw1QP0LCIvY3a4 iXKP/wZo50KwhGzFPWXMdc+qGLT8asRuP/8LMVObGDH/vlzo7ChDw6u8t2Sra+qGNESl/i QjY1uvF5qzWuvuf9KtiIdGvX09P1qiAwKe5VK/A80xR5XcupxL8fbp2lmZHb0A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778720232; a=rsa-sha256; cv=none; b=xFGP2WhldYtuH952Pqg3W3jJrdqcMFs0qKC5GiB3zhOZtF3mRyuA/6PPSQarqlOjk/RVcA DTsYjWeKRa2hp+V+Y1y4LiA20GYSMwqALT7oMpbwYhrcbaP2uCzPRV91fc8GDVgJTmoV0t iF2+0pYr33BwJ9AdU7DHUnkuyfeKmeKt2iydiSSHcr13bKocsDuA8culrFFCCVWQTRuDyI r4n+k2nwVfmr9H7WvuNlGHCzb8m1w7i5BqlUCSA4DOLamlbS1ZUH8V537UZv3TVIPJCc2G T9ulA2huqRxEQ76/+jQAHyTDEhhWe0Z8bsQt+Yk1fLBxrorg3HctGBcDdXN+hw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778720232; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZrzOQdCjjn4xl+g02UqmJ+igXYfdk0tiZkH8kfqC3Yk=; b=yzJRLon+Cr2o5iYTPDNb3+Do5FqmZ89SZalOFE5gzqs+5Zq1tY49WL992qrrsl9PcdJotw gArecJkrsNYxhsaQL8KNg4Z9f0RIzcnLzzRXGge3vgdlMLlkegqTvLXGd4pxULqlZydUrq sHA9ZESgFFG4UigiOR68PMIdI1MkXy2AOAkIdaqkHhhQ373yA8R98u6Bm0qkczheKZmYpq otdAVUQmrNtPLsgO/gmnegQgIWx4f1c71Jo8YiU6RFT2LZ1ERYFaUw72IbrNZOIPIAqGUN bBLFK1GhdaqJFWLL3BAqd1LpEAEEzdp1j1jLDX639Ub7sais1c/zaytNPKrx3w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gGBkJ3JXlzm8 for ; Thu, 14 May 2026 00:57:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2319b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 14 May 2026 00:57:12 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 871bf8a8a063 - stable/15 - vm_map_growstack(): use local for p->p_vmspace List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 871bf8a8a063aea22b91ac12460042f4c800398a Auto-Submitted: auto-generated Date: Thu, 14 May 2026 00:57:12 +0000 Message-Id: <6a051de8.2319b.28609003@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=871bf8a8a063aea22b91ac12460042f4c800398a commit 871bf8a8a063aea22b91ac12460042f4c800398a Author: Konstantin Belousov AuthorDate: 2026-05-07 19:58:18 +0000 Commit: Konstantin Belousov CommitDate: 2026-05-14 00:48:03 +0000 vm_map_growstack(): use local for p->p_vmspace (cherry picked from commit 8eef59db254283eaaee47be94d4ea9f2fef4f2ad) --- sys/vm/vm_map.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c index 7ead7d7e6472..94dd7d3a19bc 100644 --- a/sys/vm/vm_map.c +++ b/sys/vm/vm_map.c @@ -4761,8 +4761,7 @@ vm_map_growstack(vm_map_t map, vm_offset_t addr, vm_map_entry_t gap_entry) * debugger or AIO daemon. The reason is that the wrong * resource limits are applied. */ - if (p != initproc && (map != &p->p_vmspace->vm_map || - p->p_textvp == NULL)) + if (p != initproc && (map != &vm->vm_map || p->p_textvp == NULL)) return (KERN_FAILURE); MPASS(!vm_map_is_system(map)); From nobody Thu May 14 01:02:26 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gGBrL2y34z6dLhL for ; Thu, 14 May 2026 01:02:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gGBrL1dlRz4FWm for ; Thu, 14 May 2026 01:02:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778720546; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OkYjtMteP+DPOZ5XGV1oDEjzaimgUAVH278biQXtyr4=; b=PDbvfWVpV0xEscQdhDI/vsmASPSK3Y/vBAXaVYdzPT1BWisXDPnAdhtHntzRAq2joohgTT xhTFtHIKmT0ztIzNR783tJkVyLX2dMykr3GdcGylsLitzP6zSiMJeP8mql8sKkcKl7MthM dz+xWPJPLpO9Q6zOgxFl8uUVsdBAcyOdFnAy8Cu9oLUpY3SYxr+erwVaOMmyPKogc+8X9X XdKbKVOa7Z0kOLuubtzdYAHS2vjIsmvH7cs+1OLjMo9wOg+sdsV2w8jbOquVpnoAD4ni2M 2H4fyLjeMa59gCMM8o1RyZFRH5z1aO4FMsaqpp8dYy/Si1a9A2Kkho/5Kub7zg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778720546; a=rsa-sha256; cv=none; b=rtET8FTU/JGuHIPfQg1v9qt28e75Xd65xItju5AIl6kqH0zRuiu6CKiE+gE0f0UNg1LL+r h6cda2Wrlm/Sit7oraNGRTWvzXhvmOFrwclhZYjFM0p/6It/nvWw4VO9HVErDUmFQZxqpE PuUUyAinWfIc8sQj9PiPE/lewVT6g44TE8RqQeiY1ut/zRAKJnf63l4crfA/Woo7r0NoXa E9vh58bYzayIu7d9VLbKvWaBA/hMlzlg9RXaAce8rwei7R1RhNMGlx6mtW3XySm8z94/KS vtXEWOV0nYIvfyru+k74Lr40oBEpIotKDziIaX92sxIN6TgB47pmBcyD7lkxMw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778720546; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OkYjtMteP+DPOZ5XGV1oDEjzaimgUAVH278biQXtyr4=; b=raMQkN8MhYvKBQz1Wia1y6Zfi5iIdx1IcYehIjIANiBsZbn0V6aTGQUbBDSMl96A4jaKYU J2QxOGKApVj0cZxzLnMrG68TQ4YAbZXRrwdnN5Y3yVKuN+SC9PjOLPcNShdpR2/6N22UcT 4yA1ChEIVKPnRVZXaFE/7x1OEC4kWxUZc0RxKMjYSckZYS3dMiq6Fd/P/Np+C/x7SJ3QA7 7kUjFqnba0COereekqd1g7Yp3Iv3QbDF7qi9N0ktqq3kuniY3bPoWaMTiQ47pfCFh+nTqH 7kLk7S9e2/yvxK/TaiOfTfVLsN2ZLDktaeoheFPfTdpJ7anDsQx6gsZI3S1vmQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gGBrL1BfPzXv for ; Thu, 14 May 2026 01:02:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 242d2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 14 May 2026 01:02:26 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: 49937a6face3 - stable/15 - nfscl: Disable use of callbacks for NFSv4.0 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 49937a6face3cc78353adacac8f5040ac6abb324 Auto-Submitted: auto-generated Date: Thu, 14 May 2026 01:02:26 +0000 Message-Id: <6a051f22.242d2.222798ca@gitrepo.freebsd.org> The branch stable/15 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=49937a6face3cc78353adacac8f5040ac6abb324 commit 49937a6face3cc78353adacac8f5040ac6abb324 Author: Rick Macklem AuthorDate: 2026-04-30 21:37:36 +0000 Commit: Rick Macklem CommitDate: 2026-05-14 01:00:52 +0000 nfscl: Disable use of callbacks for NFSv4.0 The only use for callbacks for NFSv4.0 is delegations and delegations rarely work well for NFSv4.0 anyhow. Therefore, this patch disables callbacks for the NFSv4.0 client. This is the same behavior as occurred when the nfscbd(8) daemon was not running. This change allowed a function called nfscl_getmyip() to be removed from the kernel, which is nice since maintaining this function was bothersome, due to its use of routing, etc. (cherry picked from commit 71ac1ec5c9d990e7881e75f04140eb0bfe473a21) --- sys/fs/nfs/nfs_commonport.c | 4 --- sys/fs/nfs/nfs_var.h | 1 - sys/fs/nfsclient/nfs_clport.c | 79 ----------------------------------------- sys/fs/nfsclient/nfs_clrpcops.c | 50 +++----------------------- 4 files changed, 5 insertions(+), 129 deletions(-) diff --git a/sys/fs/nfs/nfs_commonport.c b/sys/fs/nfs/nfs_commonport.c index dbc2b3b942e9..91d9188d30c5 100644 --- a/sys/fs/nfs/nfs_commonport.c +++ b/sys/fs/nfs/nfs_commonport.c @@ -62,7 +62,6 @@ int newnfs_numnfsd = 0; struct nfsstatsv1 nfsstatsv1; int nfs_numnfscbd = 0; int nfscl_debuglevel = 0; -char nfsv4_callbackaddr[INET6_ADDRSTRLEN]; int nfsrv_lughashsize = 100; struct mtx nfsrv_dslock_mtx; struct nfsdevicehead nfsrv_devidhead; @@ -90,9 +89,6 @@ SYSCTL_INT(_vfs_nfs, OID_AUTO, realign_test, CTLFLAG_RW, &nfs_realign_test, 0, "Number of realign tests done"); SYSCTL_INT(_vfs_nfs, OID_AUTO, realign_count, CTLFLAG_RW, &nfs_realign_count, 0, "Number of mbuf realignments done"); -SYSCTL_STRING(_vfs_nfs, OID_AUTO, callback_addr, CTLFLAG_RW, - nfsv4_callbackaddr, sizeof(nfsv4_callbackaddr), - "NFSv4 callback addr for server to use"); SYSCTL_INT(_vfs_nfs, OID_AUTO, debuglevel, CTLFLAG_RW, &nfscl_debuglevel, 0, "Debug level for NFS client"); SYSCTL_INT(_vfs_nfs, OID_AUTO, userhashsize, CTLFLAG_RDTUN, &nfsrv_lughashsize, diff --git a/sys/fs/nfs/nfs_var.h b/sys/fs/nfs/nfs_var.h index 2f81905f6c36..8d8de381cbaf 100644 --- a/sys/fs/nfs/nfs_var.h +++ b/sys/fs/nfs/nfs_var.h @@ -373,7 +373,6 @@ int nfsrpc_destroysession(struct nfsmount *, struct nfsclsession *, /* nfs_clcomsubs.c */ int nfsm_uiombuf(struct nfsrv_descript *, struct uio *, int); struct mbuf *nfsm_uiombuflist(struct uio *, int, u_int); -u_int8_t *nfscl_getmyip(struct nfsmount *, struct in6_addr *, int *); int nfsm_getfh(struct nfsrv_descript *, struct nfsfh **); int nfscl_mtofh(struct nfsrv_descript *, struct nfsfh **, struct nfsvattr *, int *); diff --git a/sys/fs/nfsclient/nfs_clport.c b/sys/fs/nfsclient/nfs_clport.c index d23051058ce4..bc5f74b79749 100644 --- a/sys/fs/nfsclient/nfs_clport.c +++ b/sys/fs/nfsclient/nfs_clport.c @@ -34,8 +34,6 @@ */ #include -#include "opt_inet.h" -#include "opt_inet6.h" #include @@ -47,11 +45,6 @@ #include #include #include -#include -#include -#include -#include -#include #include @@ -1046,78 +1039,6 @@ nfscl_loadfsinfo(struct nfsmount *nmp, struct nfsfsinfo *fsp, nmp->nm_state |= NFSSTA_GOTFSINFO; } -/* - * Lookups source address which should be used to communicate with - * @nmp and stores it inside @pdst. - * - * Returns 0 on success. - */ -u_int8_t * -nfscl_getmyip(struct nfsmount *nmp, struct in6_addr *paddr, int *isinet6p) -{ -#if defined(INET6) || defined(INET) - int fibnum; - - fibnum = curthread->td_proc->p_fibnum; -#endif -#ifdef INET - if (nmp->nm_nam->sa_family == AF_INET) { - struct epoch_tracker et; - struct nhop_object *nh; - struct sockaddr_in *sin; - struct in_addr addr = {}; - - sin = (struct sockaddr_in *)nmp->nm_nam; - NET_EPOCH_ENTER(et); - CURVNET_SET(CRED_TO_VNET(nmp->nm_sockreq.nr_cred)); - nh = fib4_lookup(fibnum, sin->sin_addr, 0, NHR_NONE, 0); - if (nh != NULL) { - addr = IA_SIN(ifatoia(nh->nh_ifa))->sin_addr; - if (IN_LOOPBACK(ntohl(addr.s_addr))) { - /* Ignore loopback addresses */ - nh = NULL; - } - } - CURVNET_RESTORE(); - NET_EPOCH_EXIT(et); - - if (nh == NULL) - return (NULL); - *isinet6p = 0; - *((struct in_addr *)paddr) = addr; - - return (u_int8_t *)paddr; - } -#endif -#ifdef INET6 - if (nmp->nm_nam->sa_family == AF_INET6) { - struct epoch_tracker et; - struct sockaddr_in6 *sin6; - int error; - - sin6 = (struct sockaddr_in6 *)nmp->nm_nam; - - NET_EPOCH_ENTER(et); - CURVNET_SET(CRED_TO_VNET(nmp->nm_sockreq.nr_cred)); - error = in6_selectsrc_addr(fibnum, &sin6->sin6_addr, - sin6->sin6_scope_id, NULL, paddr, NULL); - CURVNET_RESTORE(); - NET_EPOCH_EXIT(et); - if (error != 0) - return (NULL); - - if (IN6_IS_ADDR_LOOPBACK(paddr)) - return (NULL); - - /* Scope is embedded in */ - *isinet6p = 1; - - return (u_int8_t *)paddr; - } -#endif - return (NULL); -} - /* * Copy NFS uid, gids from the cred structure. */ diff --git a/sys/fs/nfsclient/nfs_clrpcops.c b/sys/fs/nfsclient/nfs_clrpcops.c index 308c45462002..43fc0af299b1 100644 --- a/sys/fs/nfsclient/nfs_clrpcops.c +++ b/sys/fs/nfsclient/nfs_clrpcops.c @@ -74,7 +74,6 @@ extern struct timeval nfsboottime; extern u_int32_t newnfs_false, newnfs_true; extern nfstype nfsv34_type[9]; extern int nfsrv_useacl; -extern char nfsv4_callbackaddr[INET6_ADDRSTRLEN]; extern int nfscl_debuglevel; extern int nfs_pnfsiothreads; extern u_long sb_max_adj; @@ -1040,13 +1039,10 @@ nfsrpc_setclient(struct nfsmount *nmp, struct nfsclclient *clp, int reclaim, u_int32_t *tl; struct nfsrv_descript nfsd; struct nfsrv_descript *nd = &nfsd; - u_int8_t *cp = NULL, *cp2, addr[INET6_ADDRSTRLEN + 9]; - u_short port; - int error, isinet6 = 0, callblen; + int error; nfsquad_t confirm; static u_int32_t rev = 0; struct nfsclds *dsp, *odsp; - struct in6_addr a6; struct nfsclsession *tsep; struct rpc_reconupcall recon; struct nfscl_reconarg *rcp; @@ -1204,49 +1200,13 @@ nfsrpc_setclient(struct nfsmount *nmp, struct nfsclclient *clp, int reclaim, (void) nfsm_strtom(nd, clp->nfsc_id, clp->nfsc_idlen); /* - * set up the callback address + * Always set the callback address to 0.0.0.0.0.0 so NFSv4.0 + * callbacks are disabled. */ NFSM_BUILD(tl, u_int32_t *, NFSX_UNSIGNED); *tl = txdr_unsigned(NFS_CALLBCKPROG); - callblen = strlen(nfsv4_callbackaddr); - if (callblen == 0) - cp = nfscl_getmyip(nmp, &a6, &isinet6); - if (nfscl_enablecallb && nfs_numnfscbd > 0 && - (callblen > 0 || cp != NULL)) { - port = htons(nfsv4_cbport); - cp2 = (u_int8_t *)&port; -#ifdef INET6 - if ((callblen > 0 && - strchr(nfsv4_callbackaddr, ':')) || isinet6) { - char ip6buf[INET6_ADDRSTRLEN], *ip6add; - - (void) nfsm_strtom(nd, "tcp6", 4); - if (callblen == 0) { - ip6_sprintf(ip6buf, (struct in6_addr *)cp); - ip6add = ip6buf; - } else { - ip6add = nfsv4_callbackaddr; - } - snprintf(addr, INET6_ADDRSTRLEN + 9, "%s.%d.%d", - ip6add, cp2[0], cp2[1]); - } else -#endif - { - (void) nfsm_strtom(nd, "tcp", 3); - if (callblen == 0) - snprintf(addr, INET6_ADDRSTRLEN + 9, - "%d.%d.%d.%d.%d.%d", cp[0], cp[1], - cp[2], cp[3], cp2[0], cp2[1]); - else - snprintf(addr, INET6_ADDRSTRLEN + 9, - "%s.%d.%d", nfsv4_callbackaddr, - cp2[0], cp2[1]); - } - (void) nfsm_strtom(nd, addr, strlen(addr)); - } else { - (void) nfsm_strtom(nd, "tcp", 3); - (void) nfsm_strtom(nd, "0.0.0.0.0.0", 11); - } + (void)nfsm_strtom(nd, "tcp", 3); + (void)nfsm_strtom(nd, "0.0.0.0.0.0", 11); NFSM_BUILD(tl, u_int32_t *, NFSX_UNSIGNED); *tl = txdr_unsigned(clp->nfsc_cbident); nd->nd_flag |= ND_USEGSSNAME; From nobody Thu May 14 02:35:19 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gGDvc3yfvz6dSZS for ; Thu, 14 May 2026 02:35:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gGDvc3P2Qz4MSb for ; Thu, 14 May 2026 02:35:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778726124; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AipcIvnmUxa5M2IurqUswpNJJGZ1d3rRJ3hEeX1W7fk=; b=fgxEu3UzTK5vSkdtv624MI4ihOvyLkkWrlMZDWB8b2/JeeWoGdEhUnZthl/iHFwM3PqmzQ 6aRrczG3r1d5CyINuVG6jlOJaJ3S5bRVC7r9PbSUlINhezNugkmf1Sv4TJu5YShoHVho/C VYS8DGdd6AI7ZtKGonkEyabyxVYJlPDWRKF0GcouCNc3yoZBxTbhzeo1Snvf5C8vxF/AS9 lRzy0A9qyzZY6O99FntqjPK7pgVmYiq/vVsiWzOMfhCy46yqoDp69v+iGoBLbS2yla8xBp +ZCb3LjFOS/HzzJFBsZQhjUM+tFfYQ2kpaU4XxR8kncJOZEsQu3IaeLncRV9Uw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778726124; a=rsa-sha256; cv=none; b=fIS8al5/gkIPLx62b87OojLMdt+tGtlFCBJxQRRJvo1YhnSSU0lEF9oAX4x5yNycjhs7I2 x0pZK/+j9aBQyZaGqG7ifQYLy3C4qlU6QLxnYloZHnPzfnNV9HUP1o79Pv937m2edlTYNO WPEXZN9lhhwZuRf4VuTHKGe+r3irpLXA3EqS9zyz/Ofm4kgPuevTrjhQ4FjfEyGnFD2/kw Gpuh71TcK5M62aLrAMQbJ/Vv8aCgd2qLn6448l9+POsWv4rCrS7zMQmaxCif5PJ44GZNhM O760XILigcmhTB0Pl0tXOenDCWUdtbxJnTvcV/QfHBgseDSIrheuk++7aESi1Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778726124; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AipcIvnmUxa5M2IurqUswpNJJGZ1d3rRJ3hEeX1W7fk=; b=tIYW3OjMdaA9sf86SMu/adWDTOUvk9np88zS4qPiOmth7cKht05TUGCFVyBqdBq/IOE66k Zmtsbig1Nj9/012PWwL3Gs6svXQ2VIfxXNgg6of4UAbbhVNgBB58Ry2B9aYV1NukjWTeKp KLfASA44Y7fK/f1FCQam3luTiu2OlUJ3c6x1lyva3zPsMk3NgKYjqayMZXbvca6S8L59xn L+YD0LDPP54YNPhWxZwHPDDdNGL8UystRWIMtpuc7B5R2INuJqDzf4INNKOFcm1601j1nM RZw7v9xML4xd03FlTJSqyDk/byT7gbXB/a80EQE91qK/aSBUBnF3opJZhe/cQg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gGDvc2zWsz35n for ; Thu, 14 May 2026 02:35:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 366c4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 14 May 2026 02:35:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: e71e7dd6176e - stable/14 - fdescfs: do not change vnode type on VOP_GETATTR() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e71e7dd6176ebb8e5169e8845f3b7c92c94c5dff Auto-Submitted: auto-generated Date: Thu, 14 May 2026 02:35:19 +0000 Message-Id: <6a0534e7.366c4.17ba9f9b@gitrepo.freebsd.org> The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=e71e7dd6176ebb8e5169e8845f3b7c92c94c5dff commit e71e7dd6176ebb8e5169e8845f3b7c92c94c5dff Author: Konstantin Belousov AuthorDate: 2026-05-03 19:09:15 +0000 Commit: Konstantin Belousov CommitDate: 2026-05-14 02:35:03 +0000 fdescfs: do not change vnode type on VOP_GETATTR() PR: 294768 (cherry picked from commit fbecfc4aa028964f972a0457809aa041d415f61b) --- sys/fs/fdescfs/fdesc_vnops.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sys/fs/fdescfs/fdesc_vnops.c b/sys/fs/fdescfs/fdesc_vnops.c index f4b3eba91ef3..70120eddc947 100644 --- a/sys/fs/fdescfs/fdesc_vnops.c +++ b/sys/fs/fdescfs/fdesc_vnops.c @@ -471,7 +471,6 @@ fdesc_getattr(struct vop_getattr_args *ap) break; } - vp->v_type = vap->va_type; return (0); } From nobody Thu May 14 09:48:08 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gGQW13p3zz6cpnj for ; Thu, 14 May 2026 09:48:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gGQW11hSYz41tm for ; Thu, 14 May 2026 09:48:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778752093; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=moA8VqDseh+Iw7YXRH9OD8LVe6EeOmUiB5TVj72NBow=; b=idwq1HbIgrIl0bGX7biHimSa8Q0wb+1PfhwNJB2Y/wUjCUESZkTup+rs8Ym+ywXFNNFv4W sXLWdt/hwYNsjGq+PYzxNQ/H6UzuZPdfy5ekCHkBh6biHQJmTvEWt2PYHAYYNAGlL9SnfQ RdCaQa+NMkEIoZo9AoZBRO9SghfGKqZ7uJmJpLyKSWVxE8lQ3RFg9pujlmmPO0ZtquPUrh JUs2NTLAVi0Qqto5ddk58U5vVlvaJ/pc6IyJdZneZ7Y8DR5XkyfYDvxki7IuBxq4vLjtYt bMSij4QMCuyuzMF1ue2BvO+hwmh6FdhsLYnEvDZb9C8GKjU1aO9FDKZAd7isoA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778752093; a=rsa-sha256; cv=none; b=VbpFhe4n1BfoLTmyxcEJTL8ho1sOD/axS3+dIF4E14gZ3NdyVyupQjWq+yLSya/Z67qIme yyeWTtTtAQJrshUvLr7pxmS/24ThHwgay6/Qn+khOfr7c1BVf2PEPAIu05U3dkYgUdxIdE hm5cXwtbkBw5rnrlR6UnJcftJt1MGZzH/F3G2iI9U+N9CfADtVofyvufehLDAOVNK0ui0u b7XLOBANGL523kLe6fh8sFfzAQq3plmBn1GcqvgDXQz5hZ7okNQ0u/31t5/9GdjunFdDVB UIKn0UHsxJM3PMJYJNAYVdUP9hR27EXzTMHCu6KPsolHL/pBXUvLnUOJDo8l+w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778752093; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=moA8VqDseh+Iw7YXRH9OD8LVe6EeOmUiB5TVj72NBow=; b=M1OUfky7ycQD7S5rOtgLADymuogznaXWm/nqGMc5WuFHtsKbQqxmwSWqj8rBF82Vx9UHy5 63krNvmuBoOFg0BF7HVIivIzQ1SSjcRjXeXPTKibcQwA7xPO/H6QgQEyQ95MXhw9fUo+9j MPNULkhG5LPCaasc+SyM71a0HQJWAi/sqxkBdSTrXtqRw3I3tSqU9mlKjoUE7mlmolJhcN XY1eKB1vNCdp7RuNidSSShPNuQIJtJjSAt17t50fAs3AZu+2uhc0jpU4LAlRBmD8kTre4D GJHjl/LhZLOZk3FOllsPrMFmhkN+upYgn0ZdaaQs9gne2K8gS62qvjI/utbpVg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gGQW115M9zY9g for ; Thu, 14 May 2026 09:48:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3a272 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 14 May 2026 09:48:08 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: b8606c3406ea - main - arm64: Fix the includes for rsi.c List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: b8606c3406eab69637be616260c977c9a8f14ff3 Auto-Submitted: auto-generated Date: Thu, 14 May 2026 09:48:08 +0000 Message-Id: <6a059a58.3a272.24fcb57d@gitrepo.freebsd.org> The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=b8606c3406eab69637be616260c977c9a8f14ff3 commit b8606c3406eab69637be616260c977c9a8f14ff3 Author: Andrew Turner AuthorDate: 2026-05-14 08:31:06 +0000 Commit: Andrew Turner CommitDate: 2026-05-14 09:25:14 +0000 arm64: Fix the includes for rsi.c This depended on header pollution only present when FDT is defined. As FDT isn't check for in this file we can remove opt_platform.h and include the correct set of vm header files. Reported by: ivy Fixes: 76a2904c352b ("arm64: Add RSI detection for CCA") Sponsored by: Arm Ltd --- sys/arm64/arm64/rsi.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sys/arm64/arm64/rsi.c b/sys/arm64/arm64/rsi.c index 85c7896e13ce..f5af8c977529 100644 --- a/sys/arm64/arm64/rsi.c +++ b/sys/arm64/arm64/rsi.c @@ -25,14 +25,13 @@ * SUCH DAMAGE. */ -#include "opt_platform.h" - #include #include #include #include -#include +#include +#include #include #include From nobody Thu May 14 10:35:19 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gGRYM5WYVz6ctWN for ; Thu, 14 May 2026 10: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gGRYM14Cyz46Yr for ; Thu, 14 May 2026 10:35:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778754919; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2oTRSHvhTv/SDc9wE6CEnVdQH/iG7yCDRBWes45jG40=; b=TeywFCD2d646/qPLLlXzUR3YgismIbXon40CltfH2WoooKn9df68Pu1FnThPTXUUIA/JuO z2X6SysTcAouW3OCK4I+D5jcgdKfRvIqdJgL3bpoxaYL61D5L4LwXrQfcA6+PfMZnqkhLP 0zk4aOHjWprhJQ18Vdmf7uCk5VKU5LOS9gljh5T4mqyu1GWNd/P1bQUu3dRUU+yN493zgo 0dgBFAAH3IdZwoz8+09b3z0gIGp9YTaz/oDFSahqPjXRlH2Mxe29bcSvQILMMwkDBPewQh LGsm9BHKU4zmsim+9K5s322FhpqXjvtzO1qb2Ehg2OhTv3SEXKXMCXlaNUVMbQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778754919; a=rsa-sha256; cv=none; b=MupXNNRwvLL3oBpxtki1BU8TNoYq4QrNaNJ26UBQBoMjqPU+d22Pch0oDGAqe8b40AoMkr /ULkzJq/KFET4rQ5AH7yidBWAagMc0l73T8JWaxjSiEqivPUX3DcdhRX/hrWt8KZWW/alI xjS11qFNt63H+xgRfzgHIOcDjwZWpSMRgY+XlPed90YtJSyShpgM6YvAN77qBJiRW9J/DR JInBoF8XAL+pzRcUyekJTPbWwxF6JrHaYprxhPvR9o88wtIKXgvcDGzdXW91W5Pjj+0AiX UmYjWoBL9Bdiz0AhUwyC/Jrlr7hizzviPTPmctNIPyNax4/XnhgbjCxO+NS0xg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778754919; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2oTRSHvhTv/SDc9wE6CEnVdQH/iG7yCDRBWes45jG40=; b=EPdY1UXUlVikMb/6i5KZQwhqI51tSDkvfPCd1N5gDRKE5Vfe6keJJiDyzIzYx/MUGvd5w5 AJl/d85ay/BfDSGashsxp5lAYhOV3EbciHlo97THk0PqjSmUM1eE2bAz1/ghSlGXgHd8WU xGRGGVYddS504icvmnrB1qDHZORt9/2rfsL52qW8+YrAOUdup9A/HGrkPsZvVH2WZ0VF6J U8Vkb0k0nrQ5LMGv3I2ATvk96XMxFeGTvS5x0PW0QXcdT2JNtOCSM1h+l3LzGUAPugpTM0 fd84U0BY+3/l1E4t5hpIu+E/tT19Z55+SjTknrm3xqz21BRyy7ZlpOqmdWdr0Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gGRYM0S3pzZ3F for ; Thu, 14 May 2026 10:35:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 40780 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 14 May 2026 10:35:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Clausecker Subject: git: aa92784fcb8a - main - libc/timespec_get*.3: expose STANDARDS section List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: aa92784fcb8a375231058d67f7ccaeaa3e42ed33 Auto-Submitted: auto-generated Date: Thu, 14 May 2026 10:35:19 +0000 Message-Id: <6a05a567.40780.37a0e322@gitrepo.freebsd.org> The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=aa92784fcb8a375231058d67f7ccaeaa3e42ed33 commit aa92784fcb8a375231058d67f7ccaeaa3e42ed33 Author: Robert Clausecker AuthorDate: 2026-05-14 10:32:11 +0000 Commit: Robert Clausecker CommitDate: 2026-05-14 10:34:47 +0000 libc/timespec_get*.3: expose STANDARDS section We now have .St -isoC-2023, so the STANDARDS section can go live. Fixes: 9b5d724cad10087e34165199e55f15f2df744ed5 MFC after: 1 week --- lib/libc/gen/timespec_get.3 | 10 +++++----- lib/libc/gen/timespec_getres.3 | 12 ++++++------ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/lib/libc/gen/timespec_get.3 b/lib/libc/gen/timespec_get.3 index 7edf4fe17c30..f6cb578db55e 100644 --- a/lib/libc/gen/timespec_get.3 +++ b/lib/libc/gen/timespec_get.3 @@ -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 August 21, 2023 +.Dd May 14, 2026 .Dt TIMESPEC_GET 3 .Os .Sh NAME @@ -85,10 +85,10 @@ of .Dv TIME_UTC conforms to .St -isoC-2011 . -.\" The -.\" .Dv TIME_MONOTONIC -.\" base conforms to -.\" -isoC-2023 . +The +.Dv TIME_MONOTONIC +base conforms to +.St -isoC-2023 . .Sh HISTORY This interface first appeared in .Fx 12 . diff --git a/lib/libc/gen/timespec_getres.3 b/lib/libc/gen/timespec_getres.3 index e00af6758f1a..1b65cad4a056 100644 --- a/lib/libc/gen/timespec_getres.3 +++ b/lib/libc/gen/timespec_getres.3 @@ -3,7 +3,7 @@ .\" .\" SPDX-License-Identifier: BSD-2-Clause .\" -.Dd August 21, 2023 +.Dd May 14, 2026 .Dt TIMESPEC_GETRES 3 .Os .Sh NAME @@ -36,11 +36,11 @@ if successful and zero otherwise. .Sh SEE ALSO .Xr clock_getres 2 , .Xr timespec_get 3 -.\" .Sh STANDARDS -.\" The -.\" .Nm -.\" function conforms to -.\" .St -isoC-2023 . +.Sh STANDARDS +The +.Nm +function conforms to +.St -isoC-2023 . .Sh HISTORY This interface first appeared in .Fx 14 . From nobody Thu May 14 10:35:17 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gGRYR37zcz6ctSj for ; Thu, 14 May 2026 10:35: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gGRYR2NXvz46jL for ; Thu, 14 May 2026 10:35:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778754923; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OX6lCt6NCt5hSuPqt/8I1KbqWOUirH/dgZGzC9SY/Qg=; b=ZcA0Hru8OSA2u5lIFFzDBtG1ojozZsk6DB8R2h8Qkk6u/WWgpUBb01x4z4eJFVtpYVgFjp H6o2BftrA70uGQLK24SZWws8kLwvBosNOrlGuJttlvdwFM3mfrsT5g6iJRee4zRQgBTBoY eTpOn5tO4sDNFwfLuAypfZuy6V2XGHKaFed1t9I0an1Of1ONSaqw4rgHTbT8uDqxm8Ajqf sRE+rc4AJ3o1IpIwpH3acHZprIawyinFsN7H8VwHkFL+hRbvY76aV8bxc1DSEDDPFlPo9w x9YB4V+yQl7GsDI8CiefJrwEb5pJ+ExcjLzzYl87htOXluKAMIUGcvooIzJaBw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778754923; a=rsa-sha256; cv=none; b=I/d15FskiFt3T7PlYANbtA3RzormVpb/tk0GFE4FK/SJIfhV/xU/RX7wC1GMP/8fjalnQl GegUJuiHDie/UKI4lBvtx2H0PdZk8ceb1zcLQX3kS5dJpvXntt4xKrOL4OSc/9X5w6AVuF oegVDUGKgDwAF0OqKe06FB5ePwR6AXTwlL1MVDSp7wc1tIDwqDzbCySf8aSo9dNpzd79Yo 4KywDSXahQ6VcfnOub2oqesz5gEBAvZDIz5pr0ZI2DyMw7WRHBzd43WzUkvP5Jzex9AkUi I0JY0AwJipDYgl1tcD3oJCUG8ia8/HFLKK3rOr7B1oNxYO3iJ/FSLAjqlUrU8Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778754923; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OX6lCt6NCt5hSuPqt/8I1KbqWOUirH/dgZGzC9SY/Qg=; b=ulBtDD/0l82zUSJnpoCgVUtVIpwXsaXGGCRvdsLU9c+pvd3LDxummOS6w5gn1NJidjHb91 CMR3yJuagHxJ26bh+538e84jdImg2OTKaRHasgZUXHw+ZDwPXP7X5B4G3/8QX0BUbWLvWW YRoI7qHqmHuOaoWfwPmGF+i7rwX69GEMlsw+/hpgkkZcjR5Evs68yFMgJLGu1OnLZ1u8zE Q4cHCu6+CzS5c0ofNVXFljDE42HavxZM3MrH+zpotCl8OujxfQhMXc+y1ZqVHcU1EDoKh0 3Q1ggsMltglGP+IMWKbKYQT+hqb91Id79+5m7CtNyQfDjdR0tudv6U1Yuv4UGg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gGRYR1wmqzZ08 for ; Thu, 14 May 2026 10:35:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3fb72 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 14 May 2026 10:35:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Clausecker Subject: git: 68251761c77b - main - libc/ctime.3: timegm() is in C23. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: 68251761c77b2f5ff927cf19bba7d4efa88799de Auto-Submitted: auto-generated Date: Thu, 14 May 2026 10:35:17 +0000 Message-Id: <6a05a565.3fb72.25821ac7@gitrepo.freebsd.org> The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=68251761c77b2f5ff927cf19bba7d4efa88799de commit 68251761c77b2f5ff927cf19bba7d4efa88799de Author: Robert Clausecker AuthorDate: 2026-05-14 10:24:30 +0000 Commit: Robert Clausecker CommitDate: 2026-05-14 10:34:40 +0000 libc/ctime.3: timegm() is in C23. See also: D53951, https://wiki.freebsd.org/C23 MFC after: 1 week --- lib/libc/stdtime/ctime.3 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/libc/stdtime/ctime.3 b/lib/libc/stdtime/ctime.3 index 6384e8bd959b..e51cb5d52f94 100644 --- a/lib/libc/stdtime/ctime.3 +++ b/lib/libc/stdtime/ctime.3 @@ -27,7 +27,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd September 23, 2025 +.Dd May 14, 2026 .Dt CTIME 3 .Os .Sh NAME @@ -354,8 +354,9 @@ table). .Pp The .Fn timegm -function is not specified by any standard; its function cannot be -completely emulated using the standard functions described above. +function is expected to conform to +.St -isoC-2023 +with the same constraint. .Sh HISTORY This manual page is derived from the time package contributed to Berkeley by From nobody Thu May 14 13:59:48 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gGX5P4tYpz6dBNt for ; Thu, 14 May 2026 13:59: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gGX5P4Dr7z3Spl for ; Thu, 14 May 2026 13:59:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778767193; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lTNQHwK2P/Hqv4JRYRG+tCuTe9qD3LycfhKTN3DfTu0=; b=qDGG5p0rEqlbNi14oKA9RP6rLNfqqPU/ItSRogfSCjPt2uWZbEnw/wYAxrhF8/Hwsj7h8T EtD5loeawzruQ/yHPEdEZluWa1290LBoEPgF7tY3eco55sXLnDfHEQa9VY0lgniDyw7vi8 XRRSoTUmGghdoqeuAVfzomvUurtQJhW7cy5LYiR87vuLxdieTSIKIyYM1CRW8aOQFDuZrx DxdmqaDbZKaziBFSMcdVXQ9JpEfuVp0JFzCkyvcuL2GzG8xWwsE/d5rQ4O5GF0XcafboPv at4vo7+/ohX2nLVnzGSmLP7wH5IL2bG6jjrFMEmk212rJX8MxN31U/KVWnWM+Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778767193; a=rsa-sha256; cv=none; b=sDVOyjos/hbwiIHqF7KUHivAC8Myia+jKv4oVpv6ysIt9Z6yHn6ukoLCyfuarLiYnb0bKO C1vzu+VKEns4sQJUZXV4qFE8QRJk9U9z03EGgAWkWEl/i5SVi1wEC2nNxfrfoxuINrBz/2 e5knMZTq7GOrEbJFuZAgqSE1rONfA/xGnCncC6VT9ccez76nmARK5v0KJZbznA9LZmJ9jC RuE6fNfqew4dnVEkl1rNssWBl8ctKHxEAPRnEnBHERetG8ZLoNYcHTcf5sejziCt6oSyrD FrjWJoRWpSuNiNAwtcWqRfAGJQrNJXb6YOzrOtetAyRkKQIslAqwiyUu3NzJJQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778767193; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lTNQHwK2P/Hqv4JRYRG+tCuTe9qD3LycfhKTN3DfTu0=; b=kKuFMvKx6dituFdrh2CFmzGWicl5b13bgMF/jrSZ58CKj3Fbe+RIS1C/MpAiiNzBzSaZVS RQ92K6UurRYpUW/J+aPRqpc7Q5qoisEAluk09vqlypkEarppZi91xnua5DP7WlvSjXwfAZ rW8CxVeVrLAD5111PRvDDPO4aRrolYQkn7quPDW92qf8oUUOSS0BBzzV7QM2ZjSPcVxjOF dY0bIkUZXYfN9WFP7BQ6p4URr3vesbOV7xizrYLf3Xr4QsCAHhsZJA5RU3Bqwzv5zRB9ia tNLoaRQkUhO0ajPIiwzfN7mMgJsR9eTjeSHs3MeWT0fU80nAYMfsiSDJTFQIzw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gGX5P3YsBzgXx for ; Thu, 14 May 2026 13:59:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 221f3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 14 May 2026 13:59:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 4cdcacb9b296 - main - usbdevs: Add TP-Link UB500 (RTL8761BUV) USB ID List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: 4cdcacb9b2969b681b9547da61535b09e9e67478 Auto-Submitted: auto-generated Date: Thu, 14 May 2026 13:59:48 +0000 Message-Id: <6a05d554.221f3.45cb92ac@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=4cdcacb9b2969b681b9547da61535b09e9e67478 commit 4cdcacb9b2969b681b9547da61535b09e9e67478 Author: Ed Maste AuthorDate: 2026-05-14 13:32:45 +0000 Commit: Ed Maste CommitDate: 2026-05-14 13:50:46 +0000 usbdevs: Add TP-Link UB500 (RTL8761BUV) USB ID This device is not yet supported. Unfortunately some recently purchased UB400 dongles also contain this Realtek IC. Sponsored by: The FreeBSD Foundation --- sys/dev/usb/usbdevs | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs index ff4a6fd82f07..a6a240d62186 100644 --- a/sys/dev/usb/usbdevs +++ b/sys/dev/usb/usbdevs @@ -4862,6 +4862,7 @@ product TPLINK T2UV3 0x011f Archer T2U ver 3 product TPLINK T2UPLUS 0x0120 Archer T2U Plus product TPLINK RTL8153 0x0601 RTL8153 USB 10/100/1000 LAN product TPLINK RTL8153_2 0x0602 RTL8153 USB 10/100/1000 LAN +product TPLINK UB500 0x0604 UB500 RTL8761BUV Bluetooth /* Trek Technology products */ product TREK THUMBDRIVE 0x1111 ThumbDrive From nobody Thu May 14 14:25:31 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gGXg010Ynz6dDG2 for ; Thu, 14 May 2026 14:25: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gGXg00KK7z3WHT for ; Thu, 14 May 2026 14:25:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778768732; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sx9vSnI7IaE2lZg6S9flXg59MaYcLCqsNDeFlWmjyos=; b=Mvw/DKVLKdaZEr0uYxrNSUzPkDHeteSLyAdZ8ddSWW36AwNR2ppT0v26HvBLrvJ1Vo28gY xEX3d275nIi+kUDL+l9ab7xB3HSh7RuBb1QgauCHFstbUEKhlfoCkaZPbl7RogMoY16rXH FVwqCxDjQvriyajrL5nSUPTFgijipjtpiQd2QJi/qk8JCT4u2Tn7GBoYHNh2896EuhCJdM fVFE1JALRFo2yMCs1qMDZ72Ky70ykmtC3AUyoNUlUJgeFqFVPj18lG4b5S08D3nO6ZcfVk jaBGVSMSflP+lQo6wL6pHp3rl56ExeqOAdvEj3WU9tlS5gQ8G12ZBFgjmCt33A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778768732; a=rsa-sha256; cv=none; b=L+CXfmrwHbmE5H2nkqoQixdC+D9v3BfNWV0St0B9ZFZ2HTjYHgwUJmjyP6RnIiY6c7qOZ+ E1+mh5yRoO0OkcDJpdEiNJi2APe+vOI7OEozwm+r/oMK/yWR1JK+9G4EC/z6bVxW4tkR8g CFuv4weTdFjLEoD1lm6+FJkcO50VbVUwmj9nmlJU2WNq6wFSFwhyBsasom3Y0NoYXlUwPk wGo2816i4uearlQqqDS7TmFYxNLkQLV/xv8jCj7v7EQQgWKhJ5MkA5Uq/o6hkX6WUyhNTZ jcRQYDECisfxOtoC0nSWZQjKnM6JIgWBYPPMvqsTJ+EBCJsK0FDaIGvSbcEbJQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778768732; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sx9vSnI7IaE2lZg6S9flXg59MaYcLCqsNDeFlWmjyos=; b=PhCq7fLygzFzTb3Ry/w2JFNp7KzYy0ucIccYpEQXwD/1t3oYSNiqya/fuEK8YPseyWFPel VCs8j3hshtyb3/3qOqgwdxA//hVH3AU2nFgtR8J/2A0ttbA2LoqxiU/kHKSxGcbsGaA8tm /eGl9CBbhmTLDqP0gpyp3Llvnw/3t+xiXzzifDloGfCK/rhetg5Zw2mYiFhj9gWe2efZF3 bPLFJKAnLjnY3c4yd6izGyzNfQo5VrUmrr8kEO1GafXjue8YbGUXTPz/cjvAjYXTxxm5LY LAmdjSNAGia33G7Upy2ur14YlBSoFhLBYaFq+AWJQdgbzx/FeCDbDFslavMBtw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gGXfz72F3zhSR for ; Thu, 14 May 2026 14:25:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 30187 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 14 May 2026 14:25:31 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: 988c03980452 - main - linux/io: handle memtype_wc mapping for !DMAP range List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: 988c03980452a56fb0fbb15e18b0a644602d0ab3 Auto-Submitted: auto-generated Date: Thu, 14 May 2026 14:25:31 +0000 Message-Id: <6a05db5b.30187.4ea0a4f2@gitrepo.freebsd.org> The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=988c03980452a56fb0fbb15e18b0a644602d0ab3 commit 988c03980452a56fb0fbb15e18b0a644602d0ab3 Author: Mitchell Horne AuthorDate: 2026-05-14 14:20:22 +0000 Commit: Mitchell Horne CommitDate: 2026-05-14 14:25:09 +0000 linux/io: handle memtype_wc mapping for !DMAP range The amdgpu driver in drm-kmod will attempt to update/reserve certain GPU VRAM ranges as write-combining. Depending on the system, this address range may fall outside of FreeBSD's constructed DMAP. We cannot use pmap_change_attr() in this case. When INVARIANTS is enabled, this results in the following: panic: physical address 0x880000000 not covered by the DMAP Add a guard against triggering the KASSERT in PHYS_TO_DMAP(). This limitation in our implementation of arch_io_reserve_memtype_wc() is already known in drm-kmod's amdgpu_bo_init(), and errors are ignored there (see "BSDFIXME"). This change is only to eliminate the preventable assertion failure within this scheme. Tested by: kevans Reviewed by: kib, emaste MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D56971 --- sys/compat/linuxkpi/common/include/linux/io.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sys/compat/linuxkpi/common/include/linux/io.h b/sys/compat/linuxkpi/common/include/linux/io.h index f89c150e7a3b..4dfc04b3f3fc 100644 --- a/sys/compat/linuxkpi/common/include/linux/io.h +++ b/sys/compat/linuxkpi/common/include/linux/io.h @@ -544,6 +544,9 @@ arch_io_reserve_memtype_wc(resource_size_t start, resource_size_t size) #if defined(__amd64__) void *va; + if (!PHYS_IN_DMAP(start) || !PHYS_IN_DMAP(start + size)) + return (-EINVAL); + va = PHYS_TO_DMAP(start); return (-pmap_change_attr(va, size, VM_MEMATTR_WRITE_COMBINING)); #else @@ -557,8 +560,10 @@ arch_io_free_memtype_wc(resource_size_t start, resource_size_t size) #if defined(__amd64__) void *va; - va = PHYS_TO_DMAP(start); + if (!PHYS_IN_DMAP(start) || !PHYS_IN_DMAP(start + size)) + return; + va = PHYS_TO_DMAP(start); pmap_change_attr(va, size, VM_MEMATTR_WRITE_BACK); #endif } From nobody Thu May 14 15:36:45 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gGZFG55ydz6dKbN for ; Thu, 14 May 2026 15:36: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gGZFG2Rgvz3gxB for ; Thu, 14 May 2026 15:36:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778773010; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4nXjW7roiQZ7s+PyxuUo2+6K3jSpfxpiH8rzv0o1p3I=; b=M01DbcuEAfjCGi5PyTh3KBYNdOASITfLHOYAzqwVhofWBuWtcmSmALbZMHWjMcMN2tFx/h JWi7a4zXsMoCGTYkyQAnHBKc/8v9w6ARV4/0IpiOOtUISAlzzwD6btCW08UTSDPTDiy3Vb kEDz73QxGYnl1Ee9Zi/ghHodJqjU5ftV4sUsIJFOMapkcqpR3DKEIzfvnU/oTlYz2NumSw 0NC6EetmX6hxlr/fmuRI/U/7cgWvjzvC7AQlFnED4hoiktE/n3IurtElAAbAoCk9MNwFNN /y1nJCWDPnFjoM4F+LJjczFbASqmdU9Zn+egJlqYlnibhyD4kJYRAyRZc8m0zw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778773010; a=rsa-sha256; cv=none; b=kJTTZnW/fvVYoh+Dyz4XoAhGEtfqcEr4HCtLFIwHcRYd2jvGEeCKdbErrgQi3d1A2Xcww/ 8c8dOA4nOMkXbUIBgJn3OMBN79+TBpRWbQvpGJsgMOTyH7wzZSTd+ouNjxKqWCkw4X7iue jhXz7fUqLwMQ4LSBN+tMs99BkvFdnzAdxCW0j8FmWpYsEPqx4vhNIMUo+iG7njxr14wBLT WqrJtcwLADyEQ/pWRkdcJHFnBpCXerdJnuNQzC4MdDgoYI1JhzaLquzrvBnnzxYS/YJHQi O/z9qFcQglJLaZN53AbH4BJ8IWmF+tR42hJfvPIC1KixOq5heOv8lsm/p2XX8A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778773010; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4nXjW7roiQZ7s+PyxuUo2+6K3jSpfxpiH8rzv0o1p3I=; b=IVWWIP67yqKcVcwxmEDRKzpDFL1HK+zyIRTsfmOox3xwldmdyIfTMnravGH0AdaYL1vEfA lnWivzhUm+xYxwpSwv5vfU+SrhpO2BS2xiItiZrqsE5dEfEkb13WdyNbXTjr4o2GRuiIpZ 8li4vWsBY6fZ2YaGWPDOpzJTESKASLmYDBlMJB2M9zjIUQr7E3Wha31btud61Syxi9NCga hPGLS4NjwxG649arYSwRD5GTU4hGVarucpMRcQkgrEMDmaWnicWzmhCVCa3KoloXbQ9Rjd MgDZlOpQHect4Nki442FpDn9E2i8SaVrQLWkDnJb9cv6SQmwlnkOhuMk5TFKFQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gGZFG1XQtzkL6 for ; Thu, 14 May 2026 15:36:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3626e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 14 May 2026 15:36:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: fb4e7898a359 - main - Revert "nvme: Only attach to storage NVMe devices" List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: fb4e7898a359a5044e6794c7fe8a698d29af1fd3 Auto-Submitted: auto-generated Date: Thu, 14 May 2026 15:36:45 +0000 Message-Id: <6a05ec0d.3626e.6afe0cb9@gitrepo.freebsd.org> The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=fb4e7898a359a5044e6794c7fe8a698d29af1fd3 commit fb4e7898a359a5044e6794c7fe8a698d29af1fd3 Author: Warner Losh AuthorDate: 2026-05-14 15:35:35 +0000 Commit: Warner Losh CommitDate: 2026-05-14 15:35:35 +0000 Revert "nvme: Only attach to storage NVMe devices" This reverts commit 0a19464bf7afa35ce2aa7649152bc3a7629faa98. It's incorrect for ahci attachments. Reverting to merge to stable/15 to merge to releng/15.1 for the release. Sponsored by: Netflix --- sys/cam/cam_ccb.h | 2 +- sys/dev/nvme/nvme_sim.c | 9 +-------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/sys/cam/cam_ccb.h b/sys/cam/cam_ccb.h index cedb3a9ad61c..e0516fb37850 100644 --- a/sys/cam/cam_ccb.h +++ b/sys/cam/cam_ccb.h @@ -651,7 +651,7 @@ struct ccb_pathinq_settings_nvme { uint8_t bus; uint8_t slot; uint8_t function; - uint8_t progif; + uint8_t extra; char dev_name[NVME_DEV_NAME_LEN]; /* nvme controller dev name for this device */ }; _Static_assert(sizeof(struct ccb_pathinq_settings_nvme) == 64, diff --git a/sys/dev/nvme/nvme_sim.c b/sys/dev/nvme/nvme_sim.c index b9f09c8d1f61..a6ba1a498185 100644 --- a/sys/dev/nvme/nvme_sim.c +++ b/sys/dev/nvme/nvme_sim.c @@ -208,7 +208,7 @@ nvme_sim_action(struct cam_sim *sim, union ccb *ccb) cpi->xport_specific.nvme.bus = pci_get_bus(dev); cpi->xport_specific.nvme.slot = pci_get_slot(dev); cpi->xport_specific.nvme.function = pci_get_function(dev); - cpi->xport_specific.nvme.progif = pci_get_progif(dev); + cpi->xport_specific.nvme.extra = 0; strlcpy(cpi->xport_specific.nvme.dev_name, device_get_nameunit(dev), sizeof(cpi->xport_specific.nvme.dev_name)); cpi->hba_vendor = pci_get_vendor(dev); @@ -314,13 +314,6 @@ nvme_sim_probe(device_t dev) { if (nvme_use_nvd) return (ENXIO); - /* - * Only do storage devices with CAM. NVMHCI 1.0 interfaces are the only - * ones that have namespaces with LBA ranges on them. - */ - if (pci_get_progif(device_get_parent(dev)) != - PCIP_STORAGE_NVM_ENTERPRISE_NVMHCI_1_0) - return (ENXIO); device_set_desc(dev, "nvme cam"); return (BUS_PROBE_DEFAULT); From nobody Thu May 14 18:53:32 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gGfcD6m1Xz5WqYT for ; Thu, 14 May 2026 18:53: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gGfcD6Bs5z44Vn for ; Thu, 14 May 2026 18:53:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778784812; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bISKC17dpedfZ6IVdiQ3kp4k6vZBcfJzptlYG6MyRNI=; b=F54RoGxXlTmRvUxno/G98I+66tbx3PoJTJOa8DJTswCQPyK2JIS0daCbhTci5fz15x4jcS SHtrbYvY2EaaHK35r/k01Ay21LYgdibvD0gdnQ2+mGFmJEo4eSqeeq2+6h9GtHuo09D30l 5LzsSmq4t9UCBvQuRBOyVXe5VUVChHWruxRKfIruKzIBrYDgAjJQodOu6npVcOtfumr2Aj ysRMG7EQx/lTP8fsSWbqD+I6KF0XRQMiXXkg5kt4AdxLSZmhPakdB0DTopn01y4Jgy9Fws iJZ6XCZWDZZlDgBH/p9la763wRAdeQkZ8fa8ibIjQneohTGgPY+JAf2gX9rsxA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778784812; a=rsa-sha256; cv=none; b=yefvEV7yR60pZNBuPdS6/9+d9F3vvrd4DnacOOA2dqoAht5AEwaTDqjL29GR5tqcAyDNr3 q68LmiiO9hjcu3FSUpC+Z4vLliDH+ShyQNfVrxJn96Ei6w5Gc+PsKn2N3AZgc/JvmjZT/L 6QQVBlVBYjuWzdVVlHDjVPmmnJ57HPQAI9L3fNibMGGgFomGW4mNky7bysUpFcioQw5+FO 8C2oVMAVlVTKTyMuydtEm79LUoIORScAlaYlt4I3yNXayyrcSt3lwiIsgGx9TMr+K9t8sQ FqjKU6GULillMU7ktZsSycLhsUWBZynjb41yXvh0MXCkX6i4m+h5iw14D8+Dlw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778784812; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bISKC17dpedfZ6IVdiQ3kp4k6vZBcfJzptlYG6MyRNI=; b=sjYacj4so3MSgccOG78XaxvsK32prtHZtD1J+RyZwHiNchF4dS1hxFDiB558uYTZqHddoC DPM3/FpEeBTWjAS6SvEbw1ppGEVzDkHZRumWzn/wg4UjHN7i0o+ic7RkwgnACRkK4EpN0t yco8MjiLuAVHlUq16h905GyqLTYA73P/D+tGlcHygKk4D0qYxBudQJZTzqZrwVjGH7kS6k R1v/Ww4kudzT/jUXehDLcoQT/IikZOxXKyAburS34ihaie/1G7SlV7mwI9zic7TJi2E4rk pkhNb4OPFhY9rssWTUlKOg6T1OVWvmyKBGWyB+Jm5GkM1rUKs2Cl6mh6gXIUGQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gGfcD3wQrzqXZ for ; Thu, 14 May 2026 18:53:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 25c2f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 14 May 2026 18:53:32 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 01d5910b8766 - stable/15 - pkg-stage.sh: Add ext2 and ntfs List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 01d5910b8766671afdbd9e274fd62b397aca9e1a Auto-Submitted: auto-generated Date: Thu, 14 May 2026 18:53:32 +0000 Message-Id: <6a061a2c.25c2f.7465fc96@gitrepo.freebsd.org> The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=01d5910b8766671afdbd9e274fd62b397aca9e1a commit 01d5910b8766671afdbd9e274fd62b397aca9e1a Author: Colin Percival AuthorDate: 2026-02-22 00:38:01 +0000 Commit: Colin Percival CommitDate: 2026-05-14 18:53:15 +0000 pkg-stage.sh: Add ext2 and ntfs Having these packages available on release media may help users who need to sneakernet other packages (e.g. firmware) from systems running Linux or Windows. Suggested by: vladlen, ziaee MFC after: 3 days (cherry picked from commit 6881fd278d80ac63b4d511fc130a79ff16d1bb48) --- release/scripts/pkg-stage.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/release/scripts/pkg-stage.sh b/release/scripts/pkg-stage.sh index 5c4ec76150da..2f56cf794973 100755 --- a/release/scripts/pkg-stage.sh +++ b/release/scripts/pkg-stage.sh @@ -16,6 +16,8 @@ comms/usbmuxd devel/git@lite editors/emacs@nox editors/vim +filesystems/ext2 +filesystems/ntfs misc/freebsd-doc-all net/mpd5 net/rsync From nobody Thu May 14 18:56:38 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gGfgq5XYSz5WqWg; Thu, 14 May 2026 18:56:39 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gGfgq4jx0z45QV; Thu, 14 May 2026 18:56:39 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778784999; 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=UcbCV7NXBCYnq+OR6DAgi7n0vIFgzFJUmDzoVvK7Ndg=; b=m38h2Nrz6qGkrO9iNMElSdCjbZ5JdAzFYnvNex7S3mSS/d0nVHI0MSLc+KNUbyKZnvtTPm TUxK5CHmQBbre2zvOXNwZ/j1aUJS0mFdn/tCU/qNEMFw1AcnmgiE4HoWGGMeq8CiUHWNOn DkGMayUANBbEQ+IsrH8ecdyDsqQcXssveGtJNMUVkGqU66dHshdsyJ2S0+EQPfmkZYbpXr dP8Pjf2X2nks9nXszqe7wKJ9d3mWyhRwGcPbN+SVdYq8wdzO5dSF0tmpueKCp2xc23W3Lq UVI6UfOcdQIb3cXrEvYbB/wLIixtJEQB2Zf2AxZ6H5bv0rQs0R7X4n/j7jCVRA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778784999; a=rsa-sha256; cv=none; b=QOejl1txY5swb4QA9BeO5LiDHDaG0jmXOizZEadNJx94TbGRfkF7TeQ6HAsKyfaWAZlc5O UPGl+MgnB5/6lAscWoGxvuXjHITEs/dGMVFEMwbMlcBQI8yZetPRMgaXab5NXKPnrUZ1e9 hSJTPKlC4J+Rza8C+1UsHtgCwn2IjmwBIQvewS2vHRmcyrCVSrUPBocMjCRo+QoihmG6xD ISzP7q4m2jyOVviF3pbVJwVPNPQjo55I+9It/eSn7HBaygLhDjMnpIsW3IXqyLwvcn9rom D3TN8zMke+NAeOpFofd9OxCPCets1Eb9n9nndBfmF66bSqCNSubpAuuN5fqwow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778784999; 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=UcbCV7NXBCYnq+OR6DAgi7n0vIFgzFJUmDzoVvK7Ndg=; b=aqZj4UyvMYrrGCe/8oxDSA9fxrlAKhAuR0jCij8vqkwJ8+Fi7iHNhHuGjZBzDo69mENLBQ bBoOhLURLfdBLveJUwDxOEByKngZJKMkvO7j4tbSmTYrhTDBHn5uwTtEOE7A5h+W7pzDFU woVAwP+nTlhykqchPDtIHrCNwyDgL8v9xmRB7g92rCcQElDWqVMvGu3iBPZ+x82zt6bE15 v+3QuQoxDEI+HqJ2NspUBiJMZ4R8ilqu9mSjPyUmP/vBF9Q1/7Wy9fOsovOoKpBxWvfaN7 1nsuWAssCLSwOTgYG6DDx7LItr3HZtpitqjE//iCCMXji/8p6K4S1TgUNIdkRg== Received: from [IPV6:2601:5c0:4202:5670:f9f4:5f18:1426:342d] (unknown [IPv6:2601:5c0:4202:5670:f9f4:5f18:1426:342d]) (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 4gGfgq2cj3z14Nd; Thu, 14 May 2026 18:56:39 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: <501769a6-e12b-428d-9dd3-c6764083e578@FreeBSD.org> Date: Thu, 14 May 2026 14:56:38 -0400 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 8766e2122ac0 - main - mandoc: Updating FreeBSD thead library descriptions Content-Language: en-US To: Konstantin Belousov Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org References: <6a04a811.3be57.aea6532@gitrepo.freebsd.org> From: John Baldwin In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 5/13/26 22:47, Konstantin Belousov wrote: > On Wed, May 13, 2026 at 04:34:25PM +0000, John Baldwin wrote: >> The branch main has been updated by jhb: >> >> URL: https://cgit.FreeBSD.org/src/commit/?id=8766e2122ac02ff4d86c254d8ef1c41d4a7f76a0 >> >> commit 8766e2122ac02ff4d86c254d8ef1c41d4a7f76a0 >> Author: John Baldwin >> AuthorDate: 2026-05-13 16:33:29 +0000 >> Commit: John Baldwin >> CommitDate: 2026-05-13 16:33:29 +0000 >> >> mandoc: Updating FreeBSD thead library descriptions >> >> Remove libkse as it has been obsolete for many years and drop 1:1 from >> description of libthr. >> >> Reviewed by: brooks >> Sponsored by: AFRL, DARPA >> Differential Revision: https://reviews.freebsd.org/D56850 >> --- >> contrib/mandoc/lib.in | 3 +-- >> 1 file changed, 1 insertion(+), 2 deletions(-) >> >> diff --git a/contrib/mandoc/lib.in b/contrib/mandoc/lib.in >> index dcea23cf81ea..04d86f9add1e 100644 >> --- a/contrib/mandoc/lib.in >> +++ b/contrib/mandoc/lib.in >> @@ -74,7 +74,6 @@ LINE("libisns", "Internet Storage Name Service Library (libisns, \\-lisns)") >> LINE("libjail", "Jail Library (libjail, \\-ljail)") >> LINE("libkcore", "Kernel Memory Core Access Library (libkcore, \\-lkcore)") >> LINE("libkiconv", "Kernel-side iconv Library (libkiconv, \\-lkiconv)") >> -LINE("libkse", "N:M Threading Library (libkse, \\-lkse)") >> LINE("libkvm", "Kernel Data Access Library (libkvm, \\-lkvm)") >> LINE("libm", "Math Library (libm, \\-lm)") >> LINE("libm68k", "m68k Architecture Library (libm68k, \\-lm68k)") >> @@ -126,7 +125,7 @@ LINE("libtacplus", "TACACS+ Client Library (libtacplus, \\-ltacplus)") >> LINE("libtcplay", "TrueCrypt-compatible API library (libtcplay, \\-ltcplay)") >> LINE("libtermcap", "Termcap Access Library (libtermcap, \\-ltermcap)") >> LINE("libterminfo", "Terminal Information Library (libterminfo, \\-lterminfo)") >> -LINE("libthr", "1:1 Threading Library (libthr, \\-lthr)") >> +LINE("libthr", "Threading Library (libthr, \\-lthr)") > Arguably the suggested linker argument should be -lpthread instead. I think there is a "libpthread" entry already and we could just use that in our manpages going forward instead of .Lb libthr which would have that effect. Actually, .Lib libthr is only used in a few places, and several of those could either be removed (e.g. the IMPLEMENTATION NOTES section in pthread(3) can probably just be removed, it was more relevant when there were multiple libraries) or updated (_umtx_op.2 can just reference libpthread instead of libthr). It's not clear to me if there is true value in renaming the real library, though if we ever bump the major version for libthr we should probably use the opportunity to install it as libpthread for real. Given it uses symbol versioning it seems unlikely we will ever do that though. If we really cared we could rename it for 16 I guess. The compat15 package would just need to contain libthr.so.3. -- John Baldwin From nobody Thu May 14 19:01:13 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gGfn56pxpz5Wqtg for ; Thu, 14 May 2026 19:01: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gGfn56Gzcz46QQ for ; Thu, 14 May 2026 19:01:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778785273; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3p/1L+a8eF0y+IdEjle/fPH1TNXbGfMGVOUH+0hwot0=; b=nQIzsiDiEILoJGhManzY10XFYdwnbQqbRdWkqEaLOozZZEbecE8RiBTSStzF3fKzCGu9xX +3UzBy5g7+CXPgpOQ65yzXFJneBVf7Gw8SUxiJUra79jZi+4ggJjLYqqQHT1u3dY9DK17v 4SAIfWqW+nn1VRb0DVHGJsTLWStb6/FnwKXYyOgo6YIWTRIr5Cp2N1DWMmueL7eaGEXA9u dYBsq3/r+fTI4IoSJ69NSO7Wu3OASZMMtUiWqwlBXQyQn+g0mHJaS4D2pbVgDGN7vDozPr kF4IbCLIRxHQvCpLW+EfrX+qMGd2MlNWjVhZOhxqOar8xrhDpO/f9v/KjI8/KA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778785273; a=rsa-sha256; cv=none; b=juE/Kg/kbqs0lucGzWdFlFFb8jqV1cdSQVGe6gjn4UZsQJYkZKCFHa5ScmOuBeQkZgajUK +GdIxzQZu/UaqeO1f8cBWc98PJwmo/VanFGZ5XnXnRNvkLXbdFiIpMfn8ERZMsigcOT68v 352Lig4D9xMsuTObvKRPq+nSEKWe9W9kWhlUvklhAuBlb5SLNRtZ4oyfNux/EiWJdhow65 6i9yiapX2vdqTvnL7lh5MPo3+iLHoKGdfNnGl7jfl6Z0vwyFrdLRK5cLHSpUugt8xJHwRK EjbdOqeeN5VsRwqdDI7WGWdfayK1c6vJ0bdX6OIEz+Wd6seD9/xrL1pQ0oggJA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778785273; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3p/1L+a8eF0y+IdEjle/fPH1TNXbGfMGVOUH+0hwot0=; b=hTjV2b2pEjpvXIEKO2a7Em/jnHaR+cYR9RUSvpYr84fElWObPdMVw+b/Zh43bQNo5Iz4YB gcHVT8KQGYT5qYb3pwPT8W7CNa38TgiPxe8LogVO708ws923PBH8hvs97squAQEU7EFsrs K5STMFkVdM9NUzZopO/3nYQRLCEC7GkopaQaDoydl6MmQl9qkwMeAJVslf2lIZYWRDXkqo OWrMwrcXTrZu8T+U1oO3gpEK6NSAFhbg8ZPTRtSRIwzX2Bq3SWzSLeJ4FHHDDTo8gA+nzl 6oT6DhUwsoZRob+wr6vzjzVmGQEP7f3CFFoZ3wPBSyzD3fP3h7RZQlrtvWu57w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gGfn55pnYzqVc for ; Thu, 14 May 2026 19:01:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2672e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 14 May 2026 19:01:13 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 2574974648c6 - main - OpenSSH: Update to 10.3p1 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: 2574974648c68c738aec3ff96644d888d7913a37 Auto-Submitted: auto-generated Date: Thu, 14 May 2026 19:01:13 +0000 Message-Id: <6a061bf9.2672e.364c778f@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=2574974648c68c738aec3ff96644d888d7913a37 commit 2574974648c68c738aec3ff96644d888d7913a37 Merge: fb4e7898a359 2c72d8219c56 Author: Ed Maste AuthorDate: 2026-05-14 18:59:30 +0000 Commit: Ed Maste CommitDate: 2026-05-14 18:59:30 +0000 OpenSSH: Update to 10.3p1 Full release notes are available at https://www.openssh.com/txt/release-10.3 Selected highlights from the release notes: * ssh(1), sshd(8): remove bug compatibility for implementations that don't support rekeying. If such an implementation tries to interoperate with OpenSSH, it will now eventually fail when the transport needs rekeying. * ssh(1), sshd(8): support IANA-assigned codepoints for SSH agent forwarding, as per draft-ietf-sshm-ssh-agent. Support for the new names is advertised via the EXT_INFO message. If a server offers support for the new names, then they are used preferentially. * ssh(1): add a ~I escape option that shows information about the current SSH connection. * sshd(8): add 'invaliduser' penalty to PerSourcePenalties, which is applied to login attempts for usernames that do not match real accounts. Defaults to 5s to match 'authfail' but allows administrators to block such attempts for longer if desired. * Support the ed25519 signature scheme via libcrypto. Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D56999 crypto/openssh/.depend | 345 +- crypto/openssh/.github/ci-status.md | 5 + crypto/openssh/.github/configs | 29 +- crypto/openssh/.github/run_test.sh | 5 + crypto/openssh/.github/setup_ci.sh | 8 +- crypto/openssh/.github/workflows/c-cpp.yml | 9 +- crypto/openssh/.github/workflows/selfhosted.yml | 1 + crypto/openssh/.github/workflows/upstream.yml | 10 +- crypto/openssh/.github/workflows/vm.yml | 127 +- crypto/openssh/.gitignore | 3 +- crypto/openssh/.skipped-commit-ids | 1 + crypto/openssh/ChangeLog | 13627 +++++++++--------- crypto/openssh/INSTALL | 9 +- crypto/openssh/Makefile.in | 16 +- crypto/openssh/PROTOCOL | 2 +- crypto/openssh/README | 2 +- crypto/openssh/README.md | 9 +- crypto/openssh/addr.c | 4 +- crypto/openssh/addr.h | 8 +- crypto/openssh/addrmatch.c | 7 +- crypto/openssh/audit-bsm.c | 6 +- crypto/openssh/auth-bsdauth.c | 10 +- crypto/openssh/auth-krb5.c | 2 +- crypto/openssh/auth-options.c | 3 +- crypto/openssh/auth-pam.c | 220 +- crypto/openssh/auth-pam.h | 2 +- crypto/openssh/auth.c | 36 +- crypto/openssh/auth.h | 4 +- crypto/openssh/auth2-chall.c | 38 +- crypto/openssh/auth2-gss.c | 21 +- crypto/openssh/auth2-hostbased.c | 13 +- crypto/openssh/auth2-none.c | 7 - crypto/openssh/auth2-pubkey.c | 17 +- crypto/openssh/auth2-pubkeyfile.c | 28 +- crypto/openssh/auth2.c | 14 +- crypto/openssh/authfd.c | 73 +- crypto/openssh/authfd.h | 6 +- crypto/openssh/authfile.c | 8 +- crypto/openssh/canohost.c | 5 +- crypto/openssh/chacha.c | 4 +- crypto/openssh/channels.c | 435 +- crypto/openssh/channels.h | 26 +- crypto/openssh/cipher-aesctr.c | 6 +- crypto/openssh/cipher-chachapoly-libcrypto.c | 4 +- crypto/openssh/cipher.c | 3 +- crypto/openssh/clientloop.c | 58 +- crypto/openssh/clientloop.h | 6 +- crypto/openssh/compat.c | 6 +- crypto/openssh/config.h | 21 +- crypto/openssh/configure.ac | 135 +- crypto/openssh/contrib/redhat/openssh.spec | 2 +- crypto/openssh/contrib/suse/openssh.spec | 2 +- crypto/openssh/crypto_api.h | 32 +- crypto/openssh/defines.h | 15 +- crypto/openssh/dh.c | 5 +- crypto/openssh/digest-libc.c | 11 +- crypto/openssh/dispatch.c | 8 +- crypto/openssh/dispatch.h | 8 +- crypto/openssh/dns.c | 19 +- crypto/openssh/ed25519-openssl.c | 207 + crypto/openssh/ed25519.c | 4 + crypto/openssh/entropy.c | 24 +- crypto/openssh/entropy.h | 9 +- crypto/openssh/gss-genr.c | 2 +- crypto/openssh/gss-serv-krb5.c | 2 +- crypto/openssh/gss-serv.c | 12 +- crypto/openssh/hash.c | 43 - crypto/openssh/hmac.c | 3 +- crypto/openssh/hostfile.c | 6 +- crypto/openssh/kex-names.c | 4 +- crypto/openssh/kex.c | 26 +- crypto/openssh/kex.h | 9 +- crypto/openssh/kexdh.c | 7 +- crypto/openssh/kexecdh.c | 4 +- crypto/openssh/kexgen.c | 10 +- crypto/openssh/kexgex.c | 2 +- crypto/openssh/kexgexc.c | 13 +- crypto/openssh/kexgexs.c | 12 +- crypto/openssh/krb5_config.h | 9 + crypto/openssh/krl.c | 41 +- crypto/openssh/krl.h | 8 +- crypto/openssh/libcrux_mlkem768_sha3.h | 13878 +++++++++---------- crypto/openssh/log.c | 7 +- crypto/openssh/loginrec.c | 9 +- crypto/openssh/loginrec.h | 1 + crypto/openssh/mac.c | 8 +- crypto/openssh/mac.h | 6 +- crypto/openssh/mdoc2man.awk | 8 + crypto/openssh/misc-agent.c | 2 +- crypto/openssh/misc.c | 234 +- crypto/openssh/misc.h | 37 +- crypto/openssh/mlkem768.sh | 124 +- crypto/openssh/moduli | 1011 +- crypto/openssh/moduli.c | 50 +- crypto/openssh/monitor.c | 67 +- crypto/openssh/monitor.h | 6 +- crypto/openssh/monitor_fdpass.c | 5 +- crypto/openssh/monitor_wrap.c | 30 +- crypto/openssh/monitor_wrap.h | 3 +- crypto/openssh/msg.c | 5 +- crypto/openssh/mux.c | 167 +- crypto/openssh/myproposal.h | 5 +- crypto/openssh/nchan.c | 4 +- crypto/openssh/openbsd-compat/bcrypt_pbkdf.c | 6 +- crypto/openssh/openbsd-compat/bsd-misc.c | 9 + crypto/openssh/openbsd-compat/bsd-misc.h | 4 + crypto/openssh/openbsd-compat/bsd-openpty.c | 1 + crypto/openssh/openbsd-compat/bsd-poll.h | 4 + .../openssh/openbsd-compat/{sha2.h => bsd-sha2.h} | 0 crypto/openssh/openbsd-compat/fake-rfc2553.c | 6 +- crypto/openssh/openbsd-compat/include/glob.h | 1 + crypto/openssh/openbsd-compat/include/sys/queue.h | 1 + crypto/openssh/openbsd-compat/include/sys/tree.h | 1 + crypto/openssh/openbsd-compat/openbsd-compat.h | 2 +- crypto/openssh/openbsd-compat/openssl-compat.c | 23 +- crypto/openssh/openbsd-compat/openssl-compat.h | 2 +- crypto/openssh/openbsd-compat/sha2.c | 2 +- crypto/openssh/packet.c | 304 +- crypto/openssh/packet.h | 30 +- crypto/openssh/pathnames.h | 11 +- crypto/openssh/progressmeter.c | 6 +- crypto/openssh/readconf.c | 181 +- crypto/openssh/readconf.h | 9 +- crypto/openssh/readpass.c | 3 +- crypto/openssh/regress/Makefile | 12 +- crypto/openssh/regress/cert-hostkey.sh | 47 +- crypto/openssh/regress/cert-userkey.sh | 12 +- crypto/openssh/regress/cfgmatch.sh | 23 +- crypto/openssh/regress/check-perm.c | 2 - crypto/openssh/regress/gss-auth.sh | 196 + crypto/openssh/regress/hostbased.sh | 27 +- crypto/openssh/regress/kbdint.sh | 86 + crypto/openssh/regress/misc/sk-dummy/Makefile | 11 +- crypto/openssh/regress/misc/sk-dummy/fatal.c | 32 +- .../regress/misc/ssh-verify-attestation/Makefile | 11 +- crypto/openssh/regress/modpipe.c | 6 +- crypto/openssh/regress/multiplex.sh | 47 +- crypto/openssh/regress/percent.sh | 6 +- crypto/openssh/regress/proxyjump.sh | 102 + crypto/openssh/regress/scp.sh | 15 +- crypto/openssh/regress/scp3.sh | 17 +- crypto/openssh/regress/sftp-cmds.sh | 187 +- crypto/openssh/regress/sftp-resume.sh | 4 +- crypto/openssh/regress/ssh-pkcs11.sh | 40 + crypto/openssh/regress/ssh-tty.sh | 179 + crypto/openssh/regress/test-exec.sh | 36 +- crypto/openssh/regress/unittests/Makefile.inc | 6 +- crypto/openssh/regress/unittests/authopt/Makefile | 8 +- crypto/openssh/regress/unittests/authopt/tests.c | 3 +- crypto/openssh/regress/unittests/bitmap/Makefile | 3 +- .../openssh/regress/unittests/conversion/Makefile | 4 +- crypto/openssh/regress/unittests/hostkeys/Makefile | 9 +- .../regress/unittests/hostkeys/test_iterate.c | 4 +- crypto/openssh/regress/unittests/kex/Makefile | 10 +- crypto/openssh/regress/unittests/kex/tests.c | 4 + crypto/openssh/regress/unittests/match/Makefile | 4 +- crypto/openssh/regress/unittests/misc/Makefile | 4 +- .../openssh/regress/unittests/misc/test_convtime.c | 37 +- crypto/openssh/regress/unittests/misc/test_misc.c | 39 + crypto/openssh/regress/unittests/sshbuf/Makefile | 6 +- .../openssh/regress/unittests/sshbuf/test_sshbuf.c | 39 +- .../regress/unittests/sshbuf/test_sshbuf_fuzz.c | 4 +- .../unittests/sshbuf/test_sshbuf_getput_basic.c | 123 +- .../unittests/sshbuf/test_sshbuf_getput_crypto.c | 6 +- .../unittests/sshbuf/test_sshbuf_getput_fuzz.c | 10 +- crypto/openssh/regress/unittests/sshkey/Makefile | 10 +- .../openssh/regress/unittests/sshkey/test_sshkey.c | 4 +- crypto/openssh/regress/unittests/sshkey/tests.c | 2 + crypto/openssh/regress/unittests/sshsig/Makefile | 9 +- .../regress/unittests/test_helper/test_helper.c | 53 +- .../regress/unittests/test_helper/test_helper.h | 26 +- crypto/openssh/regress/unittests/utf8/Makefile | 3 +- crypto/openssh/rijndael.c | 2 +- crypto/openssh/sandbox-seccomp-filter.c | 6 + crypto/openssh/scp.c | 37 +- crypto/openssh/servconf.c | 202 +- crypto/openssh/servconf.h | 59 +- crypto/openssh/serverloop.c | 19 +- crypto/openssh/session.c | 34 +- crypto/openssh/sftp-client.c | 61 +- crypto/openssh/sftp-client.h | 40 +- crypto/openssh/sftp-common.c | 6 +- crypto/openssh/sftp-common.h | 16 +- crypto/openssh/sftp-glob.c | 1 + crypto/openssh/sftp-server.c | 176 +- crypto/openssh/sftp-usergroup.c | 3 +- crypto/openssh/sftp.c | 73 +- crypto/openssh/sntrup761.c | 22 +- crypto/openssh/sntrup761.sh | 24 +- crypto/openssh/srclimit.c | 42 +- crypto/openssh/srclimit.h | 2 + crypto/openssh/ssh-add.1 | 9 +- crypto/openssh/ssh-add.c | 62 +- crypto/openssh/ssh-agent.1 | 2 +- crypto/openssh/ssh-agent.c | 134 +- crypto/openssh/ssh-ecdsa-sk.c | 20 +- crypto/openssh/ssh-ecdsa.c | 6 +- crypto/openssh/ssh-ed25519-sk.c | 4 +- crypto/openssh/ssh-ed25519.c | 3 +- crypto/openssh/ssh-keygen.1 | 34 +- crypto/openssh/ssh-keygen.c | 55 +- crypto/openssh/ssh-keyscan.c | 5 +- crypto/openssh/ssh-keysign.c | 8 +- crypto/openssh/ssh-pkcs11-client.c | 3 +- crypto/openssh/ssh-pkcs11-helper.c | 4 +- crypto/openssh/ssh-pkcs11.c | 25 +- crypto/openssh/ssh-pkcs11.h | 8 +- crypto/openssh/ssh-rsa.c | 6 +- crypto/openssh/ssh-sk-client.c | 44 +- crypto/openssh/ssh-sk-helper.c | 1 - crypto/openssh/ssh.1 | 10 +- crypto/openssh/ssh.c | 92 +- crypto/openssh/ssh_api.c | 4 +- crypto/openssh/ssh_api.h | 3 +- crypto/openssh/ssh_config.5 | 19 +- crypto/openssh/ssh_namespace.h | 59 +- crypto/openssh/sshbuf-getput-basic.c | 72 +- crypto/openssh/sshbuf-getput-crypto.c | 2 +- crypto/openssh/sshbuf-misc.c | 4 +- crypto/openssh/sshbuf.c | 22 +- crypto/openssh/sshbuf.h | 83 +- crypto/openssh/sshconnect.c | 28 +- crypto/openssh/sshconnect.h | 3 +- crypto/openssh/sshconnect2.c | 113 +- crypto/openssh/sshd-auth.c | 26 +- crypto/openssh/sshd-session.c | 61 +- crypto/openssh/sshd.c | 27 +- crypto/openssh/sshd_config | 2 +- crypto/openssh/sshd_config.5 | 71 +- crypto/openssh/ssherr-libcrypto.c | 59 + crypto/openssh/ssherr-nolibcrypto.c | 26 + crypto/openssh/ssherr.c | 7 +- crypto/openssh/ssherr.h | 4 +- crypto/openssh/sshkey.c | 155 +- crypto/openssh/sshkey.h | 16 +- crypto/openssh/sshlogin.c | 3 +- crypto/openssh/sshpty.c | 4 +- crypto/openssh/sshsig.c | 8 +- crypto/openssh/ttymodes.c | 3 +- crypto/openssh/uidswap.c | 5 +- crypto/openssh/umac.c | 15 +- crypto/openssh/version.h | 6 +- secure/lib/libssh/Makefile | 4 +- secure/libexec/sftp-server/Makefile | 2 +- secure/libexec/ssh-sk-helper/Makefile | 2 +- secure/ssh.mk | 2 +- 246 files changed, 19635 insertions(+), 16449 deletions(-) diff --cc crypto/openssh/.gitignore index df0f2ce0464e,000000000000..907533067c8b mode 100644,000000..100644 --- a/crypto/openssh/.gitignore +++ b/crypto/openssh/.gitignore @@@ -1,40 -1,0 +1,39 @@@ ++*~ +Makefile +buildpkg.sh +config.h - config.h.in~ +config.log +config.status +openbsd-compat/Makefile +openbsd-compat/regress/Makefile +openbsd-compat/include +openssh.xml +opensshd.init +survey.sh +**/*.o +**/*.lo +**/*.so +**/*.dylib +**/*.dll +**/*.out +**/*.a - **/*.un~ +**/.*.swp +autom4te.cache/ +scp +sftp +sftp-server +ssh +ssh-add +ssh-agent +ssh-keygen +ssh-keyscan +ssh-keysign +ssh-pkcs11-helper +ssh-sk-helper +sshd +sshd-session +sshd-auth +!regress/misc/**/Makefile +!regress/unittests/**/Makefile +tags + diff --cc crypto/openssh/INSTALL index 32f2e9ad53b5,000000000000..ec7c29be57d7 mode 100644,000000..100644 --- a/crypto/openssh/INSTALL +++ b/crypto/openssh/INSTALL @@@ -1,295 -1,0 +1,298 @@@ +1. Prerequisites +---------------- + +A C compiler. Any C89 or better compiler that supports variadic macros +should work. Where supported, configure will attempt to enable the +compiler's run-time integrity checking options. Some notes about +specific compilers: + - clang: -ftrapv and -sanitize=integer require the compiler-rt runtime + (CC=clang LDFLAGS=--rtlib=compiler-rt ./configure) + +To support Privilege Separation (which is now required) you will need +to create the user, group and directory used by sshd for privilege +separation. See README.privsep for details. + + +The remaining items are optional. + +A working installation of zlib: +Zlib 1.1.4 or 1.2.1.2 or greater (earlier 1.2.x versions have problems): +https://zlib.net/ + - libcrypto from either of LibreSSL or OpenSSL. Building without libcrypto - is supported but severely restricts the available ciphers and algorithms. ++libcrypto from one of LibreSSL, OpenSSL, AWS-LC or BoringSSL. Building ++without libcrypto is supported but severely restricts the available ++ciphers and algorithms. + - LibreSSL (https://www.libressl.org/) 3.1.0 or greater + - OpenSSL (https://www.openssl.org) 1.1.1 or greater ++ - AWS-LC (https://github.com/aws/aws-lc) ++ - BoringSSL (https://github.com/google/boringssl) + - LibreSSL/OpenSSL should be compiled as a position-independent library ++libcrypto should be compiled as a position-independent library +(i.e. -fPIC, eg by configuring OpenSSL as "./config [options] -fPIC" +or LibreSSL as "CFLAGS=-fPIC ./configure") otherwise OpenSSH will not +be able to link with it. If you must use a non-position-independent +libcrypto, then you may need to configure OpenSSH --without-pie. + +If you build either from source, running the OpenSSL self-test ("make +tests") or the LibreSSL equivalent ("make check") and ensuring that all +tests pass is strongly recommended. + +NB. If you operating system supports /dev/random, you should configure +libcrypto (LibreSSL/OpenSSL) to use it. OpenSSH relies on libcrypto's +direct support of /dev/random, or failing that, either prngd or egd. + +PRNGD: + +If your system lacks kernel-based random collection, the use of Lutz +Jaenicke's PRNGd is recommended. If you are using libcrypto it requires +that the libcrypto is configured to support it. If you are building +--without-openssl then the --with-prngd-socket option must match the +socket provided by prngd. + +http://prngd.sourceforge.net/ + +EGD: + +The Entropy Gathering Daemon (EGD) supports the same interface as prngd. +The same caveats about configuration for prngd also apply. + +http://egd.sourceforge.net/ + +PAM: + +OpenSSH can utilise Pluggable Authentication Modules (PAM) if your +system supports it. PAM is standard most Linux distributions, Solaris, +HP-UX 11, AIX >= 5.2, FreeBSD, NetBSD and Mac OS X. + +Information about the various PAM implementations are available: + +Solaris PAM: http://www.sun.com/software/solaris/pam/ +Linux PAM: http://www.kernel.org/pub/linux/libs/pam/ +OpenPAM: http://www.openpam.org/ + +If you wish to build the GNOME passphrase requester, you will need the GNOME +libraries and headers. + +GNOME: +http://www.gnome.org/ + +Alternatively, Jim Knoble has written an excellent X11 +passphrase requester. This is maintained separately at: + +http://www.jmknoble.net/software/x11-ssh-askpass/ + +TCP Wrappers: + +If you wish to use the TCP wrappers functionality you will need at least +tcpd.h and libwrap.a, either in the standard include and library paths, +or in the directory specified by --with-tcp-wrappers. Version 7.6 is +known to work. + +http://ftp.porcupine.org/pub/security/index.html + +LibEdit: + +sftp supports command-line editing via NetBSD's libedit. If your platform +has it available natively you can use that, alternatively you might try +these multi-platform ports: + +http://www.thrysoee.dk/editline/ +http://sourceforge.net/projects/libedit/ + +LDNS: + +LDNS is a DNS BSD-licensed resolver library which supports DNSSEC. + +http://nlnetlabs.nl/projects/ldns/ + +Autoconf: + +If you modify configure.ac or configure doesn't exist (eg if you checked +the main git branch) then you will need autoconf-2.69 and automake-1.16.1 +or newer to rebuild the automatically generated files by running +"autoreconf". Earlier versions may also work but this is not guaranteed. + +http://www.gnu.org/software/autoconf/ +http://www.gnu.org/software/automake/ + +Basic Security Module (BSM): + +Native BSM support is known to exist in Solaris from at least 2.5.1, +FreeBSD 6.1 and OS X. Alternatively, you may use the OpenBSM +implementation (http://www.openbsm.org). + +makedepend: + +https://www.x.org/archive/individual/util/ + +If you are making significant changes to the code you may need to rebuild +the dependency (.depend) file using "make depend", which requires the +"makedepend" tool from the X11 distribution. + +libfido2: + +libfido2 allows the use of hardware security keys over USB. libfido2 +in turn depends on libcbor. libfido2 >= 1.5.0 is strongly recommended. +Limited functionality is possible with earlier libfido2 versions. + +https://github.com/Yubico/libfido2 +https://github.com/pjk/libcbor + + +2. Building / Installation +-------------------------- + +To install OpenSSH with default options: + +./configure +make +make install + +This will install the OpenSSH binaries in /usr/local/bin, configuration files +in /usr/local/etc, the server in /usr/local/sbin, etc. To specify a different +installation prefix, use the --prefix option to configure: + +./configure --prefix=/opt +make +make install + +Will install OpenSSH in /opt/{bin,etc,lib,sbin}. You can also override +specific paths, for example: + +./configure --prefix=/opt --sysconfdir=/etc/ssh +make +make install + +This will install the binaries in /opt/{bin,lib,sbin}, but will place the +configuration files in /etc/ssh. + +If you are using PAM, you may need to manually install a PAM control +file as "/etc/pam.d/sshd" (or wherever your system prefers to keep +them). Note that the service name used to start PAM is __progname, +which is the basename of the path of your sshd (e.g., the service name +for /usr/sbin/osshd will be osshd). If you have renamed your sshd +executable, your PAM configuration may need to be modified. + +A generic PAM configuration is included as "contrib/sshd.pam.generic", +you may need to edit it before using it on your system. If you are +using a recent version of Red Hat Linux, the config file in +contrib/redhat/sshd.pam should be more useful. Failure to install a +valid PAM file may result in an inability to use password +authentication. On HP-UX 11 and Solaris, the standard /etc/pam.conf +configuration will work with sshd (sshd will match the other service +name). + +There are a few other options to the configure script: + +--with-audit=[module] enable additional auditing via the specified module. +Currently, drivers for "debug" (additional info via syslog) and "bsm" +(Sun's Basic Security Module) are supported. + +--with-pam enables PAM support. If PAM support is compiled in, it must +also be enabled in sshd_config (refer to the UsePAM directive). + +--with-prngd-socket=/some/file allows you to enable EGD or PRNGD +support and to specify a PRNGd socket. Use this if your Unix lacks +/dev/random. + +--with-prngd-port=portnum allows you to enable EGD or PRNGD support +and to specify a EGD localhost TCP port. Use this if your Unix lacks +/dev/random. + +--with-lastlog=FILE will specify the location of the lastlog file. +./configure searches a few locations for lastlog, but may not find +it if lastlog is installed in a different place. + +--without-lastlog will disable lastlog support entirely. + +--with-osfsia, --without-osfsia will enable or disable OSF1's Security +Integration Architecture. The default for OSF1 machines is enable. + +--with-tcp-wrappers will enable TCP Wrappers (/etc/hosts.allow|deny) +support. + +--with-utmpx enables utmpx support. utmpx support is automatic for +some platforms. + +--without-shadow disables shadow password support. + +--with-ipaddr-display forces the use of a numeric IP address in the +$DISPLAY environment variable. Some broken systems need this. + +--with-default-path=PATH allows you to specify a default $PATH for sessions +started by sshd. This replaces the standard path entirely. + +--with-pid-dir=PATH specifies the directory in which the sshd.pid file is +created. + +--with-xauth=PATH specifies the location of the xauth binary + +--with-ssl-dir=DIR allows you to specify where your Libre/OpenSSL +libraries are installed. + +--with-ssl-engine enables Libre/OpenSSL's (hardware) ENGINE support + +--without-openssl builds without using OpenSSL. Only a subset of ciphers +and algorithms are supported in this configuration. + +--without-zlib builds without zlib. This disables the Compression option. + +--with-4in6 Check for IPv4 in IPv6 mapped addresses and convert them to +real (AF_INET) IPv4 addresses. Works around some quirks on Linux. + +If you need to pass special options to the compiler or linker, you +can specify these as environment variables before running ./configure. +For example: + +CC="/usr/foo/cc" CFLAGS="-O" LDFLAGS="-s" LIBS="-lrubbish" ./configure + +3. Configuration +---------------- + +The runtime configuration files are installed by in ${prefix}/etc or +whatever you specified as your --sysconfdir (/usr/local/etc by default). + +The default configuration should be instantly usable, though you should +review it to ensure that it matches your security requirements. + +To generate a host key, run "make host-key". Alternately you can do so +manually using the following commands: + + ssh-keygen -t [type] -f /etc/ssh/ssh_host_key -N "" + +for each of the types you wish to generate (rsa, ed25519 or ecdsa) or + + ssh-keygen -A + +to generate keys for all supported types. + +Replacing /etc/ssh with the correct path to the configuration directory. +(${prefix}/etc or whatever you specified with --sysconfdir during +configuration). + +If you have configured OpenSSH with EGD/prngd support, ensure that EGD or +prngd is running and has collected some entropy first. + +For more information on configuration, please refer to the manual pages +for sshd, ssh and ssh-agent. + +4. (Optional) Send survey +------------------------- + +$ make survey +[check the contents of the file "survey" to ensure there's no information +that you consider sensitive] +$ make send-survey + +This will send configuration information for the currently configured +host to a survey address. This will help determine which configurations +are actually in use, and what valid combinations of configure options +exist. The raw data is available only to the OpenSSH developers, however +summary data may be published. + +5. Problems? +------------ + +If you experience problems compiling, installing or running OpenSSH, +please refer to the "reporting bugs" section of the webpage at +https://www.openssh.com/ diff --cc crypto/openssh/README.md index 2ad6471386e2,000000000000..1cfcd7bb9feb mode 100644,000000..100644 --- a/crypto/openssh/README.md +++ b/crypto/openssh/README.md @@@ -1,86 -1,0 +1,89 @@@ +# Portable OpenSSH + - [![C/C++ CI](https://github.com/openssh/openssh-portable/actions/workflows/c-cpp.yml/badge.svg)](https://github.com/openssh/openssh-portable/actions/workflows/c-cpp.yml) - [![Fuzzing Status](https://oss-fuzz-build-logs.storage.googleapis.com/badges/openssh.svg)](https://bugs.chromium.org/p/oss-fuzz/issues/list?sort=-opened&can=1&q=proj:openssh) ++[![C/C++ CI](../../actions/workflows/c-cpp.yml/badge.svg)](../../actions/workflows/c-cpp.yml) ++[![VM CI](../../actions/workflows/vm.yml/badge.svg)](../../actions/workflows/vm.yml) ++[![C/C++ CI self-hosted](https://github.com/openssh/openssh-portable-selfhosted/actions/workflows/selfhosted.yml/badge.svg)](https://github.com/openssh/openssh-portable-selfhosted/actions/workflows/selfhosted.yml) ++[![CIFuzz](../../actions/workflows/cifuzz.yml/badge.svg)](../../actions/workflows/cifuzz.yml) ++[![Fuzzing Status](https://oss-fuzz-build-logs.storage.googleapis.com/badges/openssh.svg)](https://issues.oss-fuzz.com/issues?q="Project:+openssh"+is:open) +[![Coverity Status](https://scan.coverity.com/projects/21341/badge.svg)](https://scan.coverity.com/projects/openssh-portable) + +OpenSSH is a complete implementation of the SSH protocol (version 2) for secure remote login, command execution and file transfer. It includes a client ``ssh`` and server ``sshd``, file transfer utilities ``scp`` and ``sftp`` as well as tools for key generation (``ssh-keygen``), run-time key storage (``ssh-agent``) and a number of supporting programs. + +This is a port of OpenBSD's [OpenSSH](https://openssh.com) to most Unix-like operating systems, including Linux, OS X and Cygwin. Portable OpenSSH polyfills OpenBSD APIs that are not available elsewhere, adds sshd sandboxing for more operating systems and includes support for OS-native authentication and auditing (e.g. using PAM). + +## Documentation + +The official documentation for OpenSSH are the man pages for each tool: + +* [ssh(1)](https://man.openbsd.org/ssh.1) +* [sshd(8)](https://man.openbsd.org/sshd.8) +* [ssh-keygen(1)](https://man.openbsd.org/ssh-keygen.1) +* [ssh-agent(1)](https://man.openbsd.org/ssh-agent.1) +* [scp(1)](https://man.openbsd.org/scp.1) +* [sftp(1)](https://man.openbsd.org/sftp.1) +* [ssh-keyscan(8)](https://man.openbsd.org/ssh-keyscan.8) +* [sftp-server(8)](https://man.openbsd.org/sftp-server.8) + +## Stable Releases + +Stable release tarballs are available from a number of [download mirrors](https://www.openssh.com/portable.html#downloads). We recommend the use of a stable release for most users. Please read the [release notes](https://www.openssh.com/releasenotes.html) for details of recent changes and potential incompatibilities. + +## Building Portable OpenSSH + +### Dependencies + +Portable OpenSSH is built using autoconf and make. It requires a working C compiler, standard library and headers. + - ``libcrypto`` from either [LibreSSL](https://www.libressl.org/) or [OpenSSL](https://www.openssl.org) may also be used. OpenSSH may be built without either of these, but the resulting binaries will have only a subset of the cryptographic algorithms normally available. ++``libcrypto`` from one of [LibreSSL](https://www.libressl.org/), [OpenSSL](https://www.openssl.org), [AWS-LC](https://github.com/aws/aws-lc) or [BoringSSL](https://github.com/google/boringssl) may also be used. OpenSSH may be built without either of these, but the resulting binaries will have only a subset of the cryptographic algorithms normally available. + +[zlib](https://www.zlib.net/) is optional; without it transport compression is not supported. + +FIDO security token support needs [libfido2](https://github.com/Yubico/libfido2) and its dependencies and will be enabled automatically if they are found. + +In addition, certain platforms and build-time options may require additional dependencies; see README.platform for details about your platform. + +### Building a release + +Release tarballs and release branches in git include a pre-built copy of the ``configure`` script and may be built using: + +``` +tar zxvf openssh-X.YpZ.tar.gz +cd openssh +./configure # [options] +make && make tests +``` + +See the [Build-time Customisation](#build-time-customisation) section below for configure options. If you plan on installing OpenSSH to your system, then you will usually want to specify destination paths. + +### Building from git + +If building from the git master branch, you'll need [autoconf](https://www.gnu.org/software/autoconf/) installed to build the ``configure`` script. The following commands will check out and build portable OpenSSH from git: + +``` +git clone https://github.com/openssh/openssh-portable # or https://anongit.mindrot.org/openssh.git +cd openssh-portable +autoreconf +./configure +make && make tests +``` + +### Build-time Customisation + +There are many build-time customisation options available. All Autoconf destination path flags (e.g. ``--prefix``) are supported (and are usually required if you want to install OpenSSH). + +For a full list of available flags, run ``./configure --help`` but a few of the more frequently-used ones are described below. Some of these flags will require additional libraries and/or headers be installed. + +Flag | Meaning +--- | --- +``--with-pam`` | Enable [PAM](https://en.wikipedia.org/wiki/Pluggable_authentication_module) support. [OpenPAM](https://www.openpam.org/), [Linux PAM](http://www.linux-pam.org/) and Solaris PAM are supported. +``--with-libedit`` | Enable [libedit](https://www.thrysoee.dk/editline/) support for sftp. +``--with-kerberos5`` | Enable Kerberos/GSSAPI support. Both [Heimdal](https://www.h5l.org/) and [MIT](https://web.mit.edu/kerberos/) Kerberos implementations are supported. +``--with-selinux`` | Enable [SELinux](https://en.wikipedia.org/wiki/Security-Enhanced_Linux) support. + +## Development + +Portable OpenSSH development is discussed on the [openssh-unix-dev mailing list](https://lists.mindrot.org/mailman/listinfo/openssh-unix-dev) ([archive mirror](https://marc.info/?l=openssh-unix-dev)). Bugs and feature requests are tracked on our [Bugzilla](https://bugzilla.mindrot.org/). + +## Reporting bugs + +_Non-security_ bugs may be reported to the developers via [Bugzilla](https://bugzilla.mindrot.org/) or via the mailing list above. Security bugs should be reported to [openssh@openssh.com](mailto:openssh.openssh.com). diff --cc crypto/openssh/auth.c index 496a0194b100,000000000000..da1a674126d1 mode 100644,000000..100644 --- a/crypto/openssh/auth.c +++ b/crypto/openssh/auth.c @@@ -1,787 -1,0 +1,791 @@@ - /* $OpenBSD: auth.c,v 1.163 2025/09/15 04:39:15 djm Exp $ */ ++/* $OpenBSD: auth.c,v 1.164 2026/02/11 22:57:16 djm Exp $ */ +/* + * Copyright (c) 2000 Markus Friedl. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include "includes.h" + +#include +#include +#include +#include + +#include + +#include +#include +#include +#include +#include +#ifdef HAVE_LOGIN_H +#include +#endif +#ifdef USE_SHADOW +#include +#endif +#include +#include +#include +#include +#include +#include +#include + +#include "xmalloc.h" +#include "match.h" +#include "groupaccess.h" +#include "log.h" +#include "sshbuf.h" +#include "misc.h" +#include "servconf.h" +#include "sshkey.h" +#include "hostfile.h" +#include "auth.h" +#include "auth-options.h" +#include "canohost.h" +#include "uidswap.h" +#include "packet.h" +#include "loginrec.h" +#ifdef GSSAPI +#include "ssh-gss.h" +#endif +#include "authfile.h" +#include "monitor_wrap.h" +#include "ssherr.h" +#include "channels.h" +#include "blocklist_client.h" + +/* import */ +extern ServerOptions options; +extern struct include_list includes; +extern struct sshbuf *loginmsg; +extern struct passwd *privsep_pw; +extern struct sshauthopt *auth_opts; + +/* Debugging messages */ +static struct sshbuf *auth_debug; + +/* + * Check if the user is allowed to log in via ssh. If user is listed + * in DenyUsers or one of user's groups is listed in DenyGroups, false + * will be returned. If AllowUsers isn't empty and user isn't listed + * there, or if AllowGroups isn't empty and one of user's groups isn't + * listed there, false will be returned. + * If the user's shell is not executable, false will be returned. + * Otherwise true is returned. + */ +int +allowed_user(struct ssh *ssh, struct passwd * pw) +{ + struct stat st; + const char *hostname = NULL, *ipaddr = NULL; - u_int i; + int r; ++ u_int i; + + /* Shouldn't be called if pw is NULL, but better safe than sorry... */ + if (!pw || !pw->pw_name) + return 0; + + if (!options.use_pam && platform_locked_account(pw)) { + logit("User %.100s not allowed because account is locked", + pw->pw_name); + return 0; + } + + /* + * Deny if shell does not exist or is not executable unless we + * are chrooting. + */ + if (options.chroot_directory == NULL || + strcasecmp(options.chroot_directory, "none") == 0) { + char *shell = xstrdup((pw->pw_shell[0] == '\0') ? + _PATH_BSHELL : pw->pw_shell); /* empty = /bin/sh */ + + if (stat(shell, &st) == -1) { + logit("User %.100s not allowed because shell %.100s " + "does not exist", pw->pw_name, shell); + free(shell); + return 0; + } + if (S_ISREG(st.st_mode) == 0 || + (st.st_mode & (S_IXOTH|S_IXUSR|S_IXGRP)) == 0) { + logit("User %.100s not allowed because shell %.100s " + "is not executable", pw->pw_name, shell); + free(shell); + return 0; + } + free(shell); + } + + if (options.num_deny_users > 0 || options.num_allow_users > 0 || + options.num_deny_groups > 0 || options.num_allow_groups > 0) { + hostname = auth_get_canonical_hostname(ssh, options.use_dns); + ipaddr = ssh_remote_ipaddr(ssh); + } + + /* Return false if user is listed in DenyUsers */ + if (options.num_deny_users > 0) { + for (i = 0; i < options.num_deny_users; i++) { + r = match_user(pw->pw_name, hostname, ipaddr, + options.deny_users[i]); + if (r < 0) { + fatal("Invalid DenyUsers pattern \"%.100s\"", + options.deny_users[i]); + } else if (r != 0) { + logit("User %.100s from %.100s not allowed " + "because listed in DenyUsers", + pw->pw_name, hostname); + return 0; + } + } + } + /* Return false if AllowUsers isn't empty and user isn't listed there */ + if (options.num_allow_users > 0) { + for (i = 0; i < options.num_allow_users; i++) { + r = match_user(pw->pw_name, hostname, ipaddr, + options.allow_users[i]); + if (r < 0) { + fatal("Invalid AllowUsers pattern \"%.100s\"", + options.allow_users[i]); + } else if (r == 1) + break; + } + /* i < options.num_allow_users iff we break for loop */ + if (i >= options.num_allow_users) { + logit("User %.100s from %.100s not allowed because " + "not listed in AllowUsers", pw->pw_name, hostname); + return 0; + } + } + if (options.num_deny_groups > 0 || options.num_allow_groups > 0) { + /* Get the user's group access list (primary and supplementary) */ + if (ga_init(pw->pw_name, pw->pw_gid) == 0) { + logit("User %.100s from %.100s not allowed because " + "not in any group", pw->pw_name, hostname); + return 0; + } + + /* Return false if one of user's groups is listed in DenyGroups */ + if (options.num_deny_groups > 0) + if (ga_match(options.deny_groups, + options.num_deny_groups)) { + ga_free(); + logit("User %.100s from %.100s not allowed " + "because a group is listed in DenyGroups", + pw->pw_name, hostname); + return 0; + } + /* + * Return false if AllowGroups isn't empty and one of user's groups + * isn't listed there + */ + if (options.num_allow_groups > 0) + if (!ga_match(options.allow_groups, + options.num_allow_groups)) { + ga_free(); + logit("User %.100s from %.100s not allowed " + "because none of user's groups are listed " + "in AllowGroups", pw->pw_name, hostname); + return 0; + } + ga_free(); + } + +#ifdef CUSTOM_SYS_AUTH_ALLOWED_USER + if (!sys_auth_allowed_user(pw, loginmsg)) + return 0; +#endif + + /* We found no reason not to let this user try to log on... */ + return 1; +} + +/* + * Formats any key left in authctxt->auth_method_key for inclusion in + * auth_log()'s message. Also includes authxtct->auth_method_info if present. + */ +static char * +format_method_key(Authctxt *authctxt) +{ + const struct sshkey *key = authctxt->auth_method_key; + const char *methinfo = authctxt->auth_method_info; + char *fp, *cafp, *ret = NULL; + + if (key == NULL) + return NULL; + + if (sshkey_is_cert(key)) { + fp = sshkey_fingerprint(key, *** 15259 LINES SKIPPED *** From nobody Thu May 14 19:05:03 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gGfsW49HNz5WrN6 for ; Thu, 14 May 2026 19:05: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gGfsW39xQz47Jk for ; Thu, 14 May 2026 19:05:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778785503; 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; bh=QywnHLg6+DXbHKghz2sZYQYLBV5Ff2mV9PTerx8OITA=; b=YowmhNCGIkI/k6sH3MghBNBTwwdiytBYHEbDZ0HQkfUDF7gX9OpFNtRajcyXZBY0+py2ew uiGEbH1Oc4UFDO3RPIh1SY394dSkaletQzfIr9ABuosIl11IxPRXygyLvV0E7GwXolZUgg Rdv7zNCl5CT/2g5Dn6hrRCSzGFpFBTOCSwxnEdqOAWlCSxTnylm0O9/07lLkOorbgo9URo io1EMQTSqDCzjH+bCP9vmd/NvwGbaDP4HbUglMy5octIOBxVT4QP0vCnqRPDUk+i8S6PFr La/fivbbVPoVJ26gFuVJIuFRXHRS3JfmvfC+qMg5ohWWet69DCZ5KI/+WkGGDg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778785503; a=rsa-sha256; cv=none; b=smqu6TDupe83qD/D4T/BbXihSd4V6SitQJNtjWoSPtzKS5u4ZmSTDKDm2HqKGzy25t6os6 rqcwATQFpdkIQ3o4EqfV1BsQ93jrsufnq90S0+Q0LqDueFR+WBbCYN5q24KtkCfl1Z0mol 8tRywbbIY17p+ZR4+nCmVcbwuNRG7aIYmzdeAuD8ZSS432qAV0PLlJcoL9cdyxdrbaGdjV LufewajgYdMAb01rwAOt3qZq0AJPpONJ33CDWBiAYy1F052k9awAFjYTvJi6wy1aMkdN6Y DsB7uWhV7WgvuOcUyduPBWmCvnn23WzYpnqg4KGENjZDTYpujyiOMOtSZAE7cQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778785503; 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; bh=QywnHLg6+DXbHKghz2sZYQYLBV5Ff2mV9PTerx8OITA=; b=BX9o9IRb6rJTxspokUm0fpkWXsALxHAY2rMDfJyWRVbip7PUlBXXLsr/Qj+4f8ATwmP6De xMfnGXxOMYhkjGyrVT6gfQnz2BX648ynJlHcLIB9qPS4l7NyGtBbGi0og5hlgGnnjw7HD6 AyhQbqpKaZv8n/buzyxxP9aK55i0rFEEFTS6ZzZLJykbqG3SXbuzWvuIe4PNxzY4S/R1hn BJ3e8E7RAhdH9XNiIybPSZbV4pMhwAF9H1nphBI0z5zA1+0LvBr6USorvFL1+ua/a2Gw2s 2IKkUcPawnD4sV/0V9IhxeAd0fL2g5Mtobsc0f0nzW8BxhL0BCMiiYp/noyjsg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gGfsW2V54zq5Y for ; Thu, 14 May 2026 19:05:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 25cd5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 14 May 2026 19:05:03 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Cy Schubert From: Colin Percival Subject: git: 92eeed88a416 - releng/15.1 - krb5: Fix two NegoEx parsing vulnerabilities List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.1 X-Git-Reftype: branch X-Git-Commit: 92eeed88a416ec63d4fb1ad88df8d76fd70a528c Auto-Submitted: auto-generated Date: Thu, 14 May 2026 19:05:03 +0000 Message-Id: <6a061cdf.25cd5.7d9b6eec@gitrepo.freebsd.org> The branch releng/15.1 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=92eeed88a416ec63d4fb1ad88df8d76fd70a528c commit 92eeed88a416ec63d4fb1ad88df8d76fd70a528c Author: Cy Schubert AuthorDate: 2026-04-30 19:27:31 +0000 Commit: Colin Percival CommitDate: 2026-05-14 19:04:13 +0000 krb5: Fix two NegoEx parsing vulnerabilities Bring in upstream commit 2e75f0d93 fixing two CVEs. Upstream commit log is: In parse_nego_message(), check the result of the second call to vector_base() before dereferencing it. In parse_message(), check for a short header_len to prevent an integer underflow when calculating the remaining message length. Reported by Cem Onat Karagun. CVE-2026-40355: In MIT krb5 release 1.18 and later, if an application calls gss_accept_sec_context() on a system with a NegoEx mechanism registered in /etc/gss/mech, an unauthenticated remote attacker can trigger a null pointer dereference, causing the process to terminate. CVE-2026-40356: In MIT krb5 release 1.18 and later, if an application calls gss_accept_sec_context() on a system with a NegoEx mechanism registered in /etc/gss/mech, an unauthenticated remote attacker can trigger a read overrun of up to 52 bytes, possibly causing the process to terminate. Exfiltration of the bytes read does not appear possible. Approved by: re (cperciva) (cherry picked from commit c9dd7bffa58c50b2f7ed9e66ace39197c468d8e6) (cherry picked from commit a22ad16deb2ce23050c949b43210f5c6feb5afa8) --- crypto/krb5/src/lib/gssapi/spnego/negoex_util.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/crypto/krb5/src/lib/gssapi/spnego/negoex_util.c b/crypto/krb5/src/lib/gssapi/spnego/negoex_util.c index edc5462e8441..a65238e57305 100644 --- a/crypto/krb5/src/lib/gssapi/spnego/negoex_util.c +++ b/crypto/krb5/src/lib/gssapi/spnego/negoex_util.c @@ -253,6 +253,10 @@ parse_nego_message(OM_uint32 *minor, struct k5input *in, offset = k5_input_get_uint32_le(in); count = k5_input_get_uint16_le(in); p = vector_base(offset, count, EXTENSION_LENGTH, msg_base, msg_len); + if (p == NULL) { + *minor = ERR_NEGOEX_INVALID_MESSAGE_SIZE; + return GSS_S_DEFECTIVE_TOKEN; + } for (i = 0; i < count; i++) { extension_type = load_32_le(p + i * EXTENSION_LENGTH); if (extension_type & EXTENSION_FLAG_CRITICAL) { @@ -391,7 +395,8 @@ parse_message(OM_uint32 *minor, spnego_gss_ctx_id_t ctx, struct k5input *in, msg_len = k5_input_get_uint32_le(in); conv_id = k5_input_get_bytes(in, GUID_LENGTH); - if (in->status || msg_len > token_remaining || header_len > msg_len) { + if (in->status || msg_len > token_remaining || + header_len < (size_t)(in->ptr - msg_base) || header_len > msg_len) { *minor = ERR_NEGOEX_INVALID_MESSAGE_SIZE; return GSS_S_DEFECTIVE_TOKEN; } From nobody Thu May 14 19:05:04 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gGfsX60r3z5Wr1k for ; Thu, 14 May 2026 19:05: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gGfsX3s8Gz47H6 for ; Thu, 14 May 2026 19:05:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778785504; 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; bh=gtxYwusQNroB+h2BlDyTDgXwnd2n0ayXKY/MpNFsZw0=; b=XAVe4K/K7CIOa9MpTgPILpchVUa0npgaImm9uiX3tIkwKwGH73jRjRsokuvRC8108VIa7O XH8i7Rf+OkRcUqWBxCEN7SWeYg30a7JemkBmaUZ1r7qf1vgZ8aumyyAjo+ydGeGDCESR44 gQlMHIrd+UG/itHy3amIdoB61RqgoJqpa7lkp8sdCfLE3nHmxGIS9wbFai+ZqhBzaKRcHR 2eGpiO5BqRyZr4nmAlYZPFEoVpjjiWTEsYgczaMKyrMmIVs4m8tGsCtNVHPb3HdoSAhIFV LN2pagsWHtPThADGTd7UNk++P5MTelI37GUKqBgzataNVpP1Y/AwAzHdo5qBKA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778785504; a=rsa-sha256; cv=none; b=Uybdrq9cMDkK8dxJMZzMVZH6GG0+/W9wpP3y25Y5/X7wU/JcjBAVI+f+RH16KpT8fu4wYq 44PwjGBmMYJSH0ttKlydFumXxZa2dCSR5MvxiBdQACeSBoDWWopcJKFyLKlToNVQEFxnSS m/HR2XReKXMsHscsfr/aMvOHECJ8wKZ1JeQ7y+jQ+OcVX913PbECDoG2Cq+udXL1lWMcv3 fXeEbd6z5jCiClOrd3aUBF7IzCXjvoh7e3QtYas2AfiWF8P3NCHlqBpsO1sRgzOy9Qd4zB lz9Pcce/fFZKNpPPJjSuhJxqlvxlpsyd6VIlqVwvE1c7kXL/tTMicYLG+ulDww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778785504; 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; bh=gtxYwusQNroB+h2BlDyTDgXwnd2n0ayXKY/MpNFsZw0=; b=I/y4Dhy2jM/VuQ0IwQ128MQJd6v+r5NgRlq57ixAQzNAt3LAJ8l/byh6qeP69iw5puoieI Deg1Rzb/ADgaYdX5/zvrhsAny01y2TWMHjfpTuB9qEZe4pB6yeFGeyzYRGpAm9WdAKTQ+V /uMOCxx8LVqPa++0rw3AuwnMyptb/VXc87j4VZGERHJ0Yui+i/sQ83kWjHbKPZxLWYe35A pBo6N/rBb83JscjDyGgUnD84Qqt8FjqWh67kYs3ZkvWCZHE/kzbRuWHbcOMSvGFKtl7DcO h6yXBoTrHBsGiUPHUSwZpMJgjkXTJjywOUkPBaDf8JPNoX7PXCiPkfNVipy9bA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gGfsX3Dbbzr2G for ; Thu, 14 May 2026 19:05:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 258c2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 14 May 2026 19:05:04 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Cy Schubert From: Colin Percival Subject: git: 3ee9a0f8924d - releng/15.1 - krb5: Adjust version to 1.22.2 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.1 X-Git-Reftype: branch X-Git-Commit: 3ee9a0f8924d58ccf460ae1894557245b06fe5e2 Auto-Submitted: auto-generated Date: Thu, 14 May 2026 19:05:04 +0000 Message-Id: <6a061ce0.258c2.6cfbc2d5@gitrepo.freebsd.org> The branch releng/15.1 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=3ee9a0f8924d58ccf460ae1894557245b06fe5e2 commit 3ee9a0f8924d58ccf460ae1894557245b06fe5e2 Author: Cy Schubert AuthorDate: 2026-05-01 00:57:39 +0000 Commit: Colin Percival CommitDate: 2026-05-14 19:04:16 +0000 krb5: Adjust version to 1.22.2 Approved by: re (cperciva) Fixes: 736e411a737b (cherry picked from commit 8f46ba065143d9d89968a20b23844287d54c04a2) (cherry picked from commit ea93554de436e84d27200d12f3a3b6dc1670fac9) --- krb5/Makefile.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/krb5/Makefile.inc b/krb5/Makefile.inc index 34d04daab0b1..e3f85fdded3c 100644 --- a/krb5/Makefile.inc +++ b/krb5/Makefile.inc @@ -10,7 +10,7 @@ .include PACKAGE?= kerberos -KRB5_VERSION= 1.22.1 +KRB5_VERSION= 1.22.2 # MIT KRB5 uses KRB5_DIR. Heimdal uses KRB5DIR. KRB5_SRCTOP= ${SRCTOP}/krb5 From nobody Thu May 14 19:05:05 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gGfsZ152Wz5Wr1l for ; Thu, 14 May 2026 19:05: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gGfsY4zVbz47BM for ; Thu, 14 May 2026 19:05:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778785505; 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; bh=eMTiyKIk47IRD9t43fV0PmqwWgwCxisCxckTY8YI+AU=; b=rSRIWl7+2JVKywUvVMJXBnjf2feKT3hsmdO46O5kW7mf10d6kIP2hP4mzB71FglN0FHdli ZPK3b+RL4uxilGTq93Pjg0sCpWTCYhkqyppFApiPGTDWL2NLsz9rqT22kUrKKorj1gnNKg 3MNwHksydupkwHQoq7LcEpWTnALxDIvwE6gPjzZa8aKPy7ghla5UCOQFE//onBwKHQvQxn UuWIkyK6eG48zpEUoHZH3d2a6zBCfbk+tmdVF8uiTXJzLWDVLUG1wQUFRQd5ujy5h1So77 uwRBYTwZnAYKpCDfxcdctYFUZjrUg88DrOZuvP52I93Vb+tEK3P0DToyXbw2Zw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778785505; a=rsa-sha256; cv=none; b=WCTXp3zE/fedN3idOaiIQOAUlwo5sEPrXFK6ES++X+t5MkJyxzoELXmZ4Jpg0wtAHR7F41 yTI+evqm8Hyifo81Si/M/VtJ6elOGLzHaY52ZAejTjUcNbcqNoc6n/EuLqgkbsYSQ+Mt2U SYw8Ne1v7gugxfQp0nnT9NSBOkAJ+uNzt5NXZ27TQr5SwmI3AG7wbFtfD2IF2rGPLkaswu EMwhQbJL4qtcnnWvkGqp1Y6Gv2AOaVVpcEORRonAWR6W2iJ3LUWJ2Vv6nhh9iRuV6jjN9G /m0xTAAoHy6UH+HAwxTISMo/f0wv+Hk6qOHyUmizUunmwaF/gEad5UlFC+q6mA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778785505; 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; bh=eMTiyKIk47IRD9t43fV0PmqwWgwCxisCxckTY8YI+AU=; b=DJxinTne59f0FkQ+iAUabEYMyQcbiX6967/NqzA4k5aO+YQTGj4XZsSk5xBdiGJUPAO9Yl Fo/1kLncxfqOBNhrF399uh+BQ+whSXypd7QgTWyUluCDyYBZ+VGHB12RudDRXplnlLTSkQ h3WVBl+4VstdqzA3HQ8OSoOIOX1VNhVs/TKvPef+bOieHxJGglTwzM/GvlNs7Q8rpmIBOU u2P4cEYTXGFqXjNqnqU98goPd3qNXA/Fwpcu2SfWqhClYN+On6JFsB3fp1ILrA9wtyDfi6 zYPwYvZa9cdrqjhCGVYNi6Y2PgWACjU3mQJ02DW2GWBCXf0mAvFn2DuZlbmiiQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gGfsY445LzqKv for ; Thu, 14 May 2026 19:05:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26e96 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 14 May 2026 19:05:05 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Cy Schubert From: Colin Percival Subject: git: 684cb0d678d2 - releng/15.1 - krb5: Adjust additional version strings List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.1 X-Git-Reftype: branch X-Git-Commit: 684cb0d678d233c08fdc008a2b95e64be04d5dab Auto-Submitted: auto-generated Date: Thu, 14 May 2026 19:05:05 +0000 Message-Id: <6a061ce1.26e96.7eaa386f@gitrepo.freebsd.org> The branch releng/15.1 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=684cb0d678d233c08fdc008a2b95e64be04d5dab commit 684cb0d678d233c08fdc008a2b95e64be04d5dab Author: Cy Schubert AuthorDate: 2026-05-01 14:40:19 +0000 Commit: Colin Percival CommitDate: 2026-05-14 19:04:18 +0000 krb5: Adjust additional version strings Approved by: re (cperciva) Fixes: 736e411a737b (cherry picked from commit c64ee36e5d09ecee4ce4951047014c8461734fb5) (cherry picked from commit e3fc367366319466dd91fe0217a06c0655e35a8a) --- krb5/include/autoconf.h | 4 ++-- krb5/util/build-tools/Makefile | 1 + krb5/util/build-tools/krb5-config.sh | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/krb5/include/autoconf.h b/krb5/include/autoconf.h index 760aca79176b..ef6a1fa2090d 100644 --- a/krb5/include/autoconf.h +++ b/krb5/include/autoconf.h @@ -641,7 +641,7 @@ #define PACKAGE_NAME "Kerberos 5" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "Kerberos 5 1.22.1" +#define PACKAGE_STRING "Kerberos 5 1.22.2" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "krb5" @@ -650,7 +650,7 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "1.22.1" +#define PACKAGE_VERSION "1.22.2" /* Default PKCS11 module name */ #define PKCS11_MODNAME "opensc-pkcs11.so" diff --git a/krb5/util/build-tools/Makefile b/krb5/util/build-tools/Makefile index 8bafbb777c07..bf8396dfd939 100644 --- a/krb5/util/build-tools/Makefile +++ b/krb5/util/build-tools/Makefile @@ -8,6 +8,7 @@ # .include "../Makefile.inc" +.include "../../Makefile.pc" SCRIPTS= krb5-config.sh BINDIR?= /usr/bin diff --git a/krb5/util/build-tools/krb5-config.sh b/krb5/util/build-tools/krb5-config.sh index 9980f054b88f..401c19474f84 100755 --- a/krb5/util/build-tools/krb5-config.sh +++ b/krb5/util/build-tools/krb5-config.sh @@ -26,7 +26,7 @@ # Configurable parameters set by autoconf # Disreagard the above. Edit this by hand in the bespoke FreeBSD build. -version_string="Kerberos 5 release 1.22.1" +version_string="Kerberos 5 release 1.22.2" prefix=/usr exec_prefix=${prefix} From nobody Thu May 14 19:05:06 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gGfsb0tsYz5WqwL for ; Thu, 14 May 2026 19:05:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gGfsZ560bz47Bm for ; Thu, 14 May 2026 19:05:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778785506; 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; bh=HJoo3aZLA8p9XE4mkya0nph2/Nlt3GXQ+myNHvxpxg8=; b=DDx827TRMC/W21Gw22gH2bPBznq0tSLQmggIWkHjoSS0Q8x7zCdmuxXdheOTFLC9FKaelj nYQymf7ehu+IkD2WFCdAu0jEADl/wTKuvx2qRFluHmi+tycN3UZJRluUeudC7MssHr350y uV38bS1r2jrSdOjMHxfAgv72h87KBtJ1LOwnmFp/0FkwfbewsFD8gPA/DJNTnJ3ykPS+tI SMRX0etWt0EEMHEPrU02so9otyshVAbQlmUtB4CtqzJ10o9MQLJhecwUOdHhFNhVliFKJk OywRdAjAV2vJBn8SK+7KwhpyDRVnNeIAr6vRORHSEI/mtj43Wxj0IjwgS/l/4g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778785506; a=rsa-sha256; cv=none; b=AMKRK/Y+bNNvjb8XAZUY3siDQ+uyENkPp9e+o2hxjjL054txcuT99IPfH7lTvDau0u8EnY 6/dm5mEfpraqAT4I/RI8NWDLiihqlyKMIxDZfaeJsbkG4X1mUSsCC6wppdOPmtw8e9iB8k RSqUVbZp5zXKwjkyS1FIssXIa/80QK799njrl6l6h52SQFkyKTUnquNCFYX9egjoczz3dM clAVtYhwfSHslRu3knhoNsWujcfs5CPROPQsyH0OAJFpXlPaSpNwTx9Hyjl2A2KScLOXSU 9wjUhGOHz7v/UclMvI+DOpPdW4TNN8OnqqVjOnjg2soSVqb79Shpgm9xh38iPQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778785506; 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; bh=HJoo3aZLA8p9XE4mkya0nph2/Nlt3GXQ+myNHvxpxg8=; b=WGH3PP32Tg6nDf4afuOnBcZ5EgAAmrXQ4iaIGYSaLurhEW1Jzu/Ru4ozk0OMF0+aIRDGlM G1vhkzmZNswiqXvLH8JS70gizH+rlbH9yR+R+yPVELkVA4hCa8ZqcMZH49QVxewghd5+N9 jnxV3/FGwNlDdqnHBjOBW2XGRJqMMQvQcDSSP4Cj6a8XaQA0R6lh3HI5+zTAacspDW/NOS W5bXbeGcr7K5bV29Rct3CnZ4DsfE0Pw4qbQmPt1r6E6Hcdkk8GDR/m2SxcessAh0ttYRLx b9kqFL66HGfRhqufTTyoHmYSPbOA4c0/+shW6GIsivPA/P4UkaX46r8/hh4Waw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gGfsZ4gx9zqY9 for ; Thu, 14 May 2026 19:05:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27684 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 14 May 2026 19:05:06 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Mateusz Piotrowski <0mp@FreeBSD.org> From: Colin Percival Subject: git: 628c42a28e76 - releng/15.1 - bsdinstall.8: Document DISTRIBUTIONS defaults correctly List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.1 X-Git-Reftype: branch X-Git-Commit: 628c42a28e76e281045c7b3225fbe6b9bb4f1e3b Auto-Submitted: auto-generated Date: Thu, 14 May 2026 19:05:06 +0000 Message-Id: <6a061ce2.27684.56d40927@gitrepo.freebsd.org> The branch releng/15.1 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=628c42a28e76e281045c7b3225fbe6b9bb4f1e3b commit 628c42a28e76e281045c7b3225fbe6b9bb4f1e3b Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2026-04-20 15:52:25 +0000 Commit: Colin Percival CommitDate: 2026-05-14 19:04:19 +0000 bsdinstall.8: Document DISTRIBUTIONS defaults correctly Some targets override the default value of DISTRIBUTIONS. Document that in the manual page. Approved by: re (cperciva) Reported by: Nia Alarie Reviewed by: jlduran MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D56528 (cherry picked from commit 4029e765436ff1633139c1afe1bc25185a0f4ef1) (cherry picked from commit f4678f7613538c63567e2e44cd5aceaee4b4a383) --- usr.sbin/bsdinstall/bsdinstall.8 | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/usr.sbin/bsdinstall/bsdinstall.8 b/usr.sbin/bsdinstall/bsdinstall.8 index ee141e1d4296..282b88328e99 100644 --- a/usr.sbin/bsdinstall/bsdinstall.8 +++ b/usr.sbin/bsdinstall/bsdinstall.8 @@ -29,7 +29,7 @@ .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd October 3, 2025 +.Dd April 20, 2026 .Dt BSDINSTALL 8 .Os .Sh NAME @@ -79,6 +79,12 @@ targets. .Bl -tag -width "-D file" .It Cm auto Run the standard interactive installation, including disk partitioning. +.Pp +The +.Ev DISTRIBUTIONS +environment variable is set to +.Dq base.txz kernel.txz +by default for this target. .It Cm jail Ar destination Sets up a new chroot system at .Pa destination , @@ -88,12 +94,24 @@ Behavior is generally similar to .Cm auto , except that disk partitioning and network setup are skipped and a kernel is not installed into the new system. +.Pp +The +.Ev DISTRIBUTIONS +environment variable is set to +.Dq base.txz +by default for this target. .It Cm script Ar script Runs the installation script at .Pa script . See .Sx SCRIPTING for more information on this target. +.Pp +The +.Ev DISTRIBUTIONS +environment variable is set to +.Dq base.txz kernel.txz +by default for this target. .It Cm keymap If the current controlling TTY is a .Xr syscons 4 @@ -305,7 +323,9 @@ Default: .Dq Pa /tmp .It Ev DISTRIBUTIONS The set of distributions to install, e.g., "base.txz kernel.txz ports.txz". -Default: unset +Default: unset unless noted otherwise in the +.Sx TARGETS +section. .It Ev PARTITIONS The partitioning of the disk onto which the system is being installed. See From nobody Thu May 14 19:05:02 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gGfsb5SHPz5Wr08 for ; Thu, 14 May 2026 19:05:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gGfsb3QqQz47FD for ; Thu, 14 May 2026 19:05:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778785507; 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; bh=Gy0a5HRFiaUEOZy+yIAZ88n8bOhEjP/oP+xLbrCiPdk=; b=MHTON9l4zccrcPyYa0brChESnxXeUmrTifBiXcYJ8EnZMg3fztBhUKoGgvJ0RoFNCvbcwT 56IFY/6sDJiNYyG9L2GpDVFy5P+Y1yb/flz3Oxn3BNSHS8X9ejYZDCZuprN+gVeh5+ZlnF ZBAkKx+hSBs2xicthrUlkQ+29ryxQOzlGyoiOAdeiEY6iIijusFJ0kr1HH8NwcfeJgQBtj s0ukSdT0kWrcu71s6zBeiSfn+aWRQbDYqeHOZvlny3vWuGb38dPXZ6727qlUoo/AD47PGx c2yfazRucRoh/Fa9pJtHPYQrpSczSIaHT7b5nXRO/+7aFwxxC37l4QNI8IpsiA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778785507; a=rsa-sha256; cv=none; b=A9FYNGkAzl3yGqZ1M/KGEeRVRah2VnQ48pRpxe1C2c7k2RbNjcpfPg1ZTEoxB6hK+Z+dff ZBfzhAfk8OG0MdVRqnm32ghCjQBF/tuWRj7yNn7oQroNNvJcE89OLiXEj0Fxdl79B7uIYa GSL/K/8VQDl8SJirEE/FQCVpgE+t9FhvX835rj/aTjEgDByW9l+gWtQl95V3jfemAGKexZ jaBx8KNeioA1i0T0Sh9pqA0oLFPQTQVxi4Y4Xv1SE41wV1QI8zckk74WluoRev2AkT81e8 llRHOAOm4V010Hfg+MQ+BP3VUirrmnp2lbiPhKZhHxOYg3pqa4g8TI8xu3eN7g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778785507; 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; bh=Gy0a5HRFiaUEOZy+yIAZ88n8bOhEjP/oP+xLbrCiPdk=; b=ZeBEofCff1TMl+BxHZhAv93x+6mbw+VKsWQ5m8Isdtn1i03lWDbpX4LX1sAxKa3qY8VWcK vlhsvLzcOWWGn+MBRyrWqFLCNTk9J60DHQuEn6Ges8/5THw26PzrVmAi2efzoKr85yRDPj L8heiBrYCsgF9gDrEg4v8nlLsWGuQLNBFCRjI2G66jggehyiP9+ciPQZ8L5Xuo3eym3QFd 7S7PeOJbTYzCbFBBbcEx1YyE3h+K0HUgxm8T3aDhGQr4ZDy4ay5qoKL5NzSVxCIJHgJMjq NlR5NIBmoc55bZggibIyGrJRhd3pSNkEktazAASIyfxcAfnVhzA6XQBOirsldA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gGfsb2tYrzqr9 for ; Thu, 14 May 2026 19:05:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2688d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 14 May 2026 19:05:02 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Cy Schubert From: Colin Percival Subject: git: 3de8ca652d93 - releng/15.1 - krb5: import MIT 1.22.2 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.1 X-Git-Reftype: branch X-Git-Commit: 3de8ca652d9308858a9504265c7c88a71f058859 Auto-Submitted: auto-generated Date: Thu, 14 May 2026 19:05:02 +0000 Message-Id: <6a061cde.2688d.653d2d3d@gitrepo.freebsd.org> The branch releng/15.1 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=3de8ca652d9308858a9504265c7c88a71f058859 commit 3de8ca652d9308858a9504265c7c88a71f058859 Author: Cy Schubert AuthorDate: 2026-04-30 19:24:20 +0000 Commit: Colin Percival CommitDate: 2026-05-14 19:04:09 +0000 krb5: import MIT 1.22.2 Merge commit '90c687295e2d62f9411fc5b571f5af4e8ee187a7' Approved by: re (cperciva) (cherry picked from commit 736e411a737b9f57c1303e6d15c5afd4f63af0d3) (cherry picked from commit 919b10729753336ef16338295c61ebd085348fb9) --- crypto/krb5/NOTICE | 2 +- crypto/krb5/README | 24 +++++++++++++++- crypto/krb5/src/configure | 20 ++++++------- crypto/krb5/src/lib/gssapi/krb5/acquire_cred.c | 1 + crypto/krb5/src/lib/gssapi/krb5/iakerb.c | 1 + crypto/krb5/src/lib/gssapi/spnego/spnego_mech.c | 2 +- crypto/krb5/src/lib/krad/packet.c | 2 +- crypto/krb5/src/lib/krb5/ccache/cc_file.c | 8 ++++++ crypto/krb5/src/lib/krb5/ccache/cc_mslsa.c | 37 ++++++++++--------------- crypto/krb5/src/man/k5identity.man | 4 +-- crypto/krb5/src/man/k5login.man | 4 +-- crypto/krb5/src/man/k5srvutil.man | 4 +-- crypto/krb5/src/man/kadm5.acl.man | 4 +-- crypto/krb5/src/man/kadmin.man | 4 +-- crypto/krb5/src/man/kadmind.man | 4 +-- crypto/krb5/src/man/kdb5_ldap_util.man | 4 +-- crypto/krb5/src/man/kdb5_util.man | 4 +-- crypto/krb5/src/man/kdc.conf.man | 4 +-- crypto/krb5/src/man/kdestroy.man | 4 +-- crypto/krb5/src/man/kerberos.man | 4 +-- crypto/krb5/src/man/kinit.man | 4 +-- crypto/krb5/src/man/klist.man | 4 +-- crypto/krb5/src/man/kpasswd.man | 4 +-- crypto/krb5/src/man/kprop.man | 4 +-- crypto/krb5/src/man/kpropd.man | 4 +-- crypto/krb5/src/man/kproplog.man | 4 +-- crypto/krb5/src/man/krb5-config.man | 4 +-- crypto/krb5/src/man/krb5.conf.man | 4 +-- crypto/krb5/src/man/krb5kdc.man | 4 +-- crypto/krb5/src/man/ksu.man | 4 +-- crypto/krb5/src/man/kswitch.man | 4 +-- crypto/krb5/src/man/ktutil.man | 4 +-- crypto/krb5/src/man/kvno.man | 4 +-- crypto/krb5/src/man/sclient.man | 4 +-- crypto/krb5/src/man/sserver.man | 4 +-- crypto/krb5/src/patchlevel.h | 6 ++-- crypto/krb5/src/po/mit-krb5.pot | 4 +-- crypto/krb5/src/prototype/prototype.c | 2 +- crypto/krb5/src/prototype/prototype.h | 2 +- crypto/krb5/src/windows/version.rc | 2 +- 40 files changed, 120 insertions(+), 97 deletions(-) diff --git a/crypto/krb5/NOTICE b/crypto/krb5/NOTICE index 3d78b73035cf..20d8ef24e604 100644 --- a/crypto/krb5/NOTICE +++ b/crypto/krb5/NOTICE @@ -1,4 +1,4 @@ -Copyright (C) 1985-2025 by the Massachusetts Institute of Technology. +Copyright (C) 1985-2026 by the Massachusetts Institute of Technology. All rights reserved. diff --git a/crypto/krb5/README b/crypto/krb5/README index d1de8357e388..73eafa585dc9 100644 --- a/crypto/krb5/README +++ b/crypto/krb5/README @@ -6,7 +6,7 @@ Copyright and Other Notices --------------------------- -Copyright (C) 1985-2025 by the Massachusetts Institute of Technology +Copyright (C) 1985-2026 by the Massachusetts Institute of Technology and its contributors. All rights reserved. Please see the file named NOTICE for additional notices. @@ -97,6 +97,24 @@ removed. Beginning with the krb5-1.18 release, all support for single-DES encryption types has been removed. +Major changes in 1.22.2 (2026-01-29) +------------------------------------ + +This is a bug fix release. + +* Fix a SPNEGO packet parsing bug which could cause GSS mechanism + negotiation failure. + +krb5-1.22.2 changes by ticket ID +-------------------------------- + +9183 Fix SPNEGO mechListMIC parsing +9188 Improve MSLSA ccache timestamp conversion +9189 Fix krb5 gss_acquire_cred() leak on some errors +9190 Make atomic ccache replacement work on Windows +9193 Fix uninitialized pointer dereference in libkrad +9194 Fix IAKERB realm discovery state machine logic + Major changes in 1.22.1 (2025-08-20) ------------------------------------ @@ -378,6 +396,7 @@ reports, suggestions, and valuable resources: Gerald Combs Simon Cooper Sylvain Cortes + Robert Crowston Ian Crowther Arran Cudbard-Bell Adam Dabrowski @@ -475,6 +494,7 @@ reports, suggestions, and valuable resources: Tomas Kuthan Pierre Labastie Andreas Ladanyi + Yubi Lee Chris Leick Volker Lendecke Jan iankko Lieskovsky @@ -519,6 +539,7 @@ reports, suggestions, and valuable resources: Felipe Ortega Michael Osipov Andrej Ota + Dmitry Ovsyannikov Dmitri Pal Javier Palacios Dilyan Palauzov @@ -530,6 +551,7 @@ reports, suggestions, and valuable resources: Zoran Pericic W. Michael Petullo Mark Phalan + Ben Pope Sharwan Ram Brett Randall Jonathan Reams diff --git a/crypto/krb5/src/configure b/crypto/krb5/src/configure index c8dc43de1380..ed823e9244a1 100755 --- a/crypto/krb5/src/configure +++ b/crypto/krb5/src/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for Kerberos 5 1.22.1. +# Generated by GNU Autoconf 2.71 for Kerberos 5 1.22.2. # # Report bugs to . # @@ -615,8 +615,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='Kerberos 5' PACKAGE_TARNAME='krb5' -PACKAGE_VERSION='1.22.1' -PACKAGE_STRING='Kerberos 5 1.22.1' +PACKAGE_VERSION='1.22.2' +PACKAGE_STRING='Kerberos 5 1.22.2' PACKAGE_BUGREPORT='krb5-bugs@mit.edu' PACKAGE_URL='' @@ -1506,7 +1506,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures Kerberos 5 1.22.1 to adapt to many kinds of systems. +\`configure' configures Kerberos 5 1.22.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1577,7 +1577,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Kerberos 5 1.22.1:";; + short | recursive ) echo "Configuration of Kerberos 5 1.22.2:";; esac cat <<\_ACEOF @@ -1739,7 +1739,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Kerberos 5 configure 1.22.1 +Kerberos 5 configure 1.22.2 generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -2439,7 +2439,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Kerberos 5 $as_me 1.22.1, which was +It was created by Kerberos 5 $as_me 1.22.2, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -8159,7 +8159,7 @@ fi -KRB5_VERSION=1.22.1 +KRB5_VERSION=1.22.2 @@ -15366,7 +15366,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by Kerberos 5 $as_me 1.22.1, which was +This file was extended by Kerberos 5 $as_me 1.22.2, which was generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15430,7 +15430,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -Kerberos 5 config.status 1.22.1 +Kerberos 5 config.status 1.22.2 configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" diff --git a/crypto/krb5/src/lib/gssapi/krb5/acquire_cred.c b/crypto/krb5/src/lib/gssapi/krb5/acquire_cred.c index aa1a486dcaa0..12e6b7ea805b 100644 --- a/crypto/krb5/src/lib/gssapi/krb5/acquire_cred.c +++ b/crypto/krb5/src/lib/gssapi/krb5/acquire_cred.c @@ -912,6 +912,7 @@ error_out: if (cred->name) kg_release_name(context, &cred->name); krb5_free_principal(context, cred->impersonator); + krb5_free_principal(context, cred->acceptor_mprinc); zapfreestr(cred->password); k5_mutex_destroy(&cred->lock); xfree(cred); diff --git a/crypto/krb5/src/lib/gssapi/krb5/iakerb.c b/crypto/krb5/src/lib/gssapi/krb5/iakerb.c index 90a9bce11ad7..7cc4710e25d3 100644 --- a/crypto/krb5/src/lib/gssapi/krb5/iakerb.c +++ b/crypto/krb5/src/lib/gssapi/krb5/iakerb.c @@ -631,6 +631,7 @@ iakerb_initiator_step(iakerb_ctx_id_t ctx, cred->name->princ->realm = server_realm; server_realm = empty_data(); + ctx->state = IAKERB_AS_REQ; /* Done with realm discovery; fall through to AS request. */ case IAKERB_AS_REQ: if (ctx->icc == NULL) { diff --git a/crypto/krb5/src/lib/gssapi/spnego/spnego_mech.c b/crypto/krb5/src/lib/gssapi/spnego/spnego_mech.c index 43ba63ab2a7b..4a778364336e 100644 --- a/crypto/krb5/src/lib/gssapi/spnego/spnego_mech.c +++ b/crypto/krb5/src/lib/gssapi/spnego/spnego_mech.c @@ -3515,7 +3515,7 @@ get_negTokenResp(OM_uint32 *minor_status, struct k5input *in, return GSS_S_DEFECTIVE_TOKEN; } - if (k5_der_get_value(&seq, CONTEXT | 0x04, &field)) { + if (k5_der_get_value(&seq, CONTEXT | 0x03, &field)) { *mechListMIC = get_octet_string(&field); /* Handle Windows 2000 duplicate response token */ diff --git a/crypto/krb5/src/lib/krad/packet.c b/crypto/krb5/src/lib/krad/packet.c index ed19385f71a6..22128350428c 100644 --- a/crypto/krb5/src/lib/krad/packet.c +++ b/crypto/krb5/src/lib/krad/packet.c @@ -565,7 +565,7 @@ krad_packet_decode_request(krb5_context ctx, const char *secret, if (cb != NULL) { for (tmp = (*cb)(data, FALSE); tmp != NULL; tmp = (*cb)(data, FALSE)) { - if (pkt_id_get(*reqpkt) == pkt_id_get(tmp)) + if (pkt_id_get(req) == pkt_id_get(tmp)) break; } diff --git a/crypto/krb5/src/lib/krb5/ccache/cc_file.c b/crypto/krb5/src/lib/krb5/ccache/cc_file.c index 198152a9ecd0..f34c0f1064aa 100644 --- a/crypto/krb5/src/lib/krb5/ccache/cc_file.c +++ b/crypto/krb5/src/lib/krb5/ccache/cc_file.c @@ -1311,6 +1311,14 @@ fcc_replace(krb5_context context, krb5_ccache id, krb5_principal princ, goto errno_cleanup; st = rename(tmpname, data->filename); +#ifdef _WIN32 + /* Windows cannot rename over an existing file under most circumstances. + * Try ReplaceFile() (which only works if the destination file exists). */ + if (st != 0) { + if (ReplaceFile(data->filename, tmpname, NULL, 0, NULL, NULL)) + st = 0; + } +#endif if (st != 0) goto errno_cleanup; tmpfile_exists = FALSE; diff --git a/crypto/krb5/src/lib/krb5/ccache/cc_mslsa.c b/crypto/krb5/src/lib/krb5/ccache/cc_mslsa.c index 4931e6c172a5..675cf4d11206 100644 --- a/crypto/krb5/src/lib/krb5/ccache/cc_mslsa.c +++ b/crypto/krb5/src/lib/krb5/ccache/cc_mslsa.c @@ -249,24 +249,15 @@ KerbExternalNameToMITPrinc(KERB_EXTERNAL_NAME *msprinc, WCHAR *realm, krb5_conte return FALSE; } -static time_t -FileTimeToUnixTime(LARGE_INTEGER *ltime) +/* + * Convert a Windows file time (number of 100-nanosecond intervals since + * 1601-01-01 UTC) to a POSIX timestamp (number of seconds since 1970-01-01 + * UTC). + */ +static inline time_t +FileTimeToUnixTime(int64_t ft) { - FILETIME filetime, localfiletime; - SYSTEMTIME systime; - struct tm utime; - filetime.dwLowDateTime=ltime->LowPart; - filetime.dwHighDateTime=ltime->HighPart; - FileTimeToLocalFileTime(&filetime, &localfiletime); - FileTimeToSystemTime(&localfiletime, &systime); - utime.tm_sec=systime.wSecond; - utime.tm_min=systime.wMinute; - utime.tm_hour=systime.wHour; - utime.tm_mday=systime.wDay; - utime.tm_mon=systime.wMonth-1; - utime.tm_year=systime.wYear-1900; - utime.tm_isdst=-1; - return(mktime(&utime)); + return ft / 10000000 - 11644473600; } static void @@ -346,9 +337,9 @@ MSCredToMITCred(KERB_EXTERNAL_TICKET *msticket, UNICODE_STRING ClientRealm, MSSessionKeyToMITKeyblock(&msticket->SessionKey, context, &creds->keyblock); MSFlagsToMITFlags(msticket->TicketFlags, &creds->ticket_flags); - creds->times.starttime=FileTimeToUnixTime(&msticket->StartTime); - creds->times.endtime=FileTimeToUnixTime(&msticket->EndTime); - creds->times.renew_till=FileTimeToUnixTime(&msticket->RenewUntil); + creds->times.starttime=FileTimeToUnixTime(msticket->StartTime.QuadPart); + creds->times.endtime=FileTimeToUnixTime(msticket->EndTime.QuadPart); + creds->times.renew_till=FileTimeToUnixTime(msticket->RenewUntil.QuadPart); creds->addresses = NULL; @@ -377,9 +368,9 @@ CacheInfoEx2ToMITCred(KERB_TICKET_CACHE_INFO_EX2 *info, creds->keyblock.enctype = info->SessionKeyType; creds->ticket_flags = info->TicketFlags; MSFlagsToMITFlags(info->TicketFlags, &creds->ticket_flags); - creds->times.starttime=FileTimeToUnixTime(&info->StartTime); - creds->times.endtime=FileTimeToUnixTime(&info->EndTime); - creds->times.renew_till=FileTimeToUnixTime(&info->RenewTime); + creds->times.starttime=FileTimeToUnixTime(info->StartTime.QuadPart); + creds->times.endtime=FileTimeToUnixTime(info->EndTime.QuadPart); + creds->times.renew_till=FileTimeToUnixTime(info->RenewTime.QuadPart); /* MS Tickets are addressless. MIT requires an empty address * not a NULL list of addresses. diff --git a/crypto/krb5/src/man/k5identity.man b/crypto/krb5/src/man/k5identity.man index a7d533f077fd..40962b7a49c2 100644 --- a/crypto/krb5/src/man/k5identity.man +++ b/crypto/krb5/src/man/k5identity.man @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "K5IDENTITY" "5" " " "1.22.1" "MIT Kerberos" +.TH "K5IDENTITY" "5" " " "1.22.2" "MIT Kerberos" .SH NAME k5identity \- Kerberos V5 client principal selection rules .SH DESCRIPTION @@ -96,6 +96,6 @@ kerberos(1), \fI\%krb5.conf\fP .SH AUTHOR MIT .SH COPYRIGHT -1985-2025, MIT +1985-2026, MIT .\" Generated by docutils manpage writer. . diff --git a/crypto/krb5/src/man/k5login.man b/crypto/krb5/src/man/k5login.man index 906f8854f87c..d0e327d1bfa4 100644 --- a/crypto/krb5/src/man/k5login.man +++ b/crypto/krb5/src/man/k5login.man @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "K5LOGIN" "5" " " "1.22.1" "MIT Kerberos" +.TH "K5LOGIN" "5" " " "1.22.2" "MIT Kerberos" .SH NAME k5login \- Kerberos V5 acl file for host access .SH DESCRIPTION @@ -87,6 +87,6 @@ kerberos(1) .SH AUTHOR MIT .SH COPYRIGHT -1985-2025, MIT +1985-2026, MIT .\" Generated by docutils manpage writer. . diff --git a/crypto/krb5/src/man/k5srvutil.man b/crypto/krb5/src/man/k5srvutil.man index 537ed15d8f3b..e926a1eb3b3f 100644 --- a/crypto/krb5/src/man/k5srvutil.man +++ b/crypto/krb5/src/man/k5srvutil.man @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "K5SRVUTIL" "1" " " "1.22.1" "MIT Kerberos" +.TH "K5SRVUTIL" "1" " " "1.22.2" "MIT Kerberos" .SH NAME k5srvutil \- host key table (keytab) manipulation utility .SH SYNOPSIS @@ -90,6 +90,6 @@ variables. .SH AUTHOR MIT .SH COPYRIGHT -1985-2025, MIT +1985-2026, MIT .\" Generated by docutils manpage writer. . diff --git a/crypto/krb5/src/man/kadm5.acl.man b/crypto/krb5/src/man/kadm5.acl.man index 3517c08bd6fe..95cf849d7493 100644 --- a/crypto/krb5/src/man/kadm5.acl.man +++ b/crypto/krb5/src/man/kadm5.acl.man @@ -28,7 +28,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "KADM5.ACL" "5" " " "1.22.1" "MIT Kerberos" +.TH "KADM5.ACL" "5" " " "1.22.2" "MIT Kerberos" .SH NAME kadm5.acl \- Kerberos ACL file .SH DESCRIPTION @@ -271,6 +271,6 @@ To operate without an ACL file, set the \fIacl_file\fP variable in .SH AUTHOR MIT .SH COPYRIGHT -1985-2025, MIT +1985-2026, MIT .\" Generated by docutils manpage writer. . diff --git a/crypto/krb5/src/man/kadmin.man b/crypto/krb5/src/man/kadmin.man index 005c2add8135..15ddc17dc573 100644 --- a/crypto/krb5/src/man/kadmin.man +++ b/crypto/krb5/src/man/kadmin.man @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "KADMIN" "1" " " "1.22.1" "MIT Kerberos" +.TH "KADMIN" "1" " " "1.22.2" "MIT Kerberos" .SH NAME kadmin \- Kerberos V5 database administration program .SH SYNOPSIS @@ -1089,6 +1089,6 @@ variables. .SH AUTHOR MIT .SH COPYRIGHT -1985-2025, MIT +1985-2026, MIT .\" Generated by docutils manpage writer. . diff --git a/crypto/krb5/src/man/kadmind.man b/crypto/krb5/src/man/kadmind.man index c0b355c79a9b..842b5082c8b7 100644 --- a/crypto/krb5/src/man/kadmind.man +++ b/crypto/krb5/src/man/kadmind.man @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "KADMIND" "8" " " "1.22.1" "MIT Kerberos" +.TH "KADMIND" "8" " " "1.22.2" "MIT Kerberos" .SH NAME kadmind \- KADM5 administration server .SH SYNOPSIS @@ -156,6 +156,6 @@ activation is used. .SH AUTHOR MIT .SH COPYRIGHT -1985-2025, MIT +1985-2026, MIT .\" Generated by docutils manpage writer. . diff --git a/crypto/krb5/src/man/kdb5_ldap_util.man b/crypto/krb5/src/man/kdb5_ldap_util.man index 7cfda216e399..23461beafc60 100644 --- a/crypto/krb5/src/man/kdb5_ldap_util.man +++ b/crypto/krb5/src/man/kdb5_ldap_util.man @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "KDB5_LDAP_UTIL" "8" " " "1.22.1" "MIT Kerberos" +.TH "KDB5_LDAP_UTIL" "8" " " "1.22.2" "MIT Kerberos" .SH NAME kdb5_ldap_util \- Kerberos configuration utility .SH SYNOPSIS @@ -500,6 +500,6 @@ variables. .SH AUTHOR MIT .SH COPYRIGHT -1985-2025, MIT +1985-2026, MIT .\" Generated by docutils manpage writer. . diff --git a/crypto/krb5/src/man/kdb5_util.man b/crypto/krb5/src/man/kdb5_util.man index 0e5f1d1bf5fe..a777ad8ec933 100644 --- a/crypto/krb5/src/man/kdb5_util.man +++ b/crypto/krb5/src/man/kdb5_util.man @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "KDB5_UTIL" "8" " " "1.22.1" "MIT Kerberos" +.TH "KDB5_UTIL" "8" " " "1.22.2" "MIT Kerberos" .SH NAME kdb5_util \- Kerberos database maintenance utility .SH SYNOPSIS @@ -563,6 +563,6 @@ variables. .SH AUTHOR MIT .SH COPYRIGHT -1985-2025, MIT +1985-2026, MIT .\" Generated by docutils manpage writer. . diff --git a/crypto/krb5/src/man/kdc.conf.man b/crypto/krb5/src/man/kdc.conf.man index 33bbb13c6157..ca82a2f1796e 100644 --- a/crypto/krb5/src/man/kdc.conf.man +++ b/crypto/krb5/src/man/kdc.conf.man @@ -28,7 +28,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "KDC.CONF" "5" " " "1.22.1" "MIT Kerberos" +.TH "KDC.CONF" "5" " " "1.22.2" "MIT Kerberos" .SH NAME kdc.conf \- Kerberos V5 KDC configuration file .sp @@ -1178,6 +1178,6 @@ Here\(aqs an example of a kdc.conf file: .SH AUTHOR MIT .SH COPYRIGHT -1985-2025, MIT +1985-2026, MIT .\" Generated by docutils manpage writer. . diff --git a/crypto/krb5/src/man/kdestroy.man b/crypto/krb5/src/man/kdestroy.man index 88888d590133..e91ed47d35bf 100644 --- a/crypto/krb5/src/man/kdestroy.man +++ b/crypto/krb5/src/man/kdestroy.man @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "KDESTROY" "1" " " "1.22.1" "MIT Kerberos" +.TH "KDESTROY" "1" " " "1.22.2" "MIT Kerberos" .SH NAME kdestroy \- destroy Kerberos tickets .SH SYNOPSIS @@ -90,6 +90,6 @@ Default location of Kerberos 5 credentials cache .SH AUTHOR MIT .SH COPYRIGHT -1985-2025, MIT +1985-2026, MIT .\" Generated by docutils manpage writer. . diff --git a/crypto/krb5/src/man/kerberos.man b/crypto/krb5/src/man/kerberos.man index 64d9290688cb..295d154c44d3 100644 --- a/crypto/krb5/src/man/kerberos.man +++ b/crypto/krb5/src/man/kerberos.man @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "KERBEROS" "7" " " "1.22.1" "MIT Kerberos" +.TH "KERBEROS" "7" " " "1.22.2" "MIT Kerberos" .SH NAME kerberos \- Overview of using Kerberos .SH DESCRIPTION @@ -210,6 +210,6 @@ Institute of Technology .SH AUTHOR MIT .SH COPYRIGHT -1985-2025, MIT +1985-2026, MIT .\" Generated by docutils manpage writer. . diff --git a/crypto/krb5/src/man/kinit.man b/crypto/krb5/src/man/kinit.man index 9934f21b6895..6153166a1165 100644 --- a/crypto/krb5/src/man/kinit.man +++ b/crypto/krb5/src/man/kinit.man @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "KINIT" "1" " " "1.22.1" "MIT Kerberos" +.TH "KINIT" "1" " " "1.22.2" "MIT Kerberos" .SH NAME kinit \- obtain and cache Kerberos ticket-granting ticket .SH SYNOPSIS @@ -250,6 +250,6 @@ default location for the local host\(aqs keytab. .SH AUTHOR MIT .SH COPYRIGHT -1985-2025, MIT +1985-2026, MIT .\" Generated by docutils manpage writer. . diff --git a/crypto/krb5/src/man/klist.man b/crypto/krb5/src/man/klist.man index e4e505bc6573..aa5e44ab4298 100644 --- a/crypto/krb5/src/man/klist.man +++ b/crypto/krb5/src/man/klist.man @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "KLIST" "1" " " "1.22.1" "MIT Kerberos" +.TH "KLIST" "1" " " "1.22.2" "MIT Kerberos" .SH NAME klist \- list cached Kerberos tickets .SH SYNOPSIS @@ -151,6 +151,6 @@ Default location for the local host\(aqs keytab file. .SH AUTHOR MIT .SH COPYRIGHT -1985-2025, MIT +1985-2026, MIT .\" Generated by docutils manpage writer. . diff --git a/crypto/krb5/src/man/kpasswd.man b/crypto/krb5/src/man/kpasswd.man index 7577b9213beb..0321cac4d0a2 100644 --- a/crypto/krb5/src/man/kpasswd.man +++ b/crypto/krb5/src/man/kpasswd.man @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "KPASSWD" "1" " " "1.22.1" "MIT Kerberos" +.TH "KPASSWD" "1" " " "1.22.2" "MIT Kerberos" .SH NAME kpasswd \- change a user's Kerberos password .SH SYNOPSIS @@ -63,6 +63,6 @@ variables. .SH AUTHOR MIT .SH COPYRIGHT -1985-2025, MIT +1985-2026, MIT .\" Generated by docutils manpage writer. . diff --git a/crypto/krb5/src/man/kprop.man b/crypto/krb5/src/man/kprop.man index c21bd9692735..f3fc60a71b43 100644 --- a/crypto/krb5/src/man/kprop.man +++ b/crypto/krb5/src/man/kprop.man @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "KPROP" "8" " " "1.22.1" "MIT Kerberos" +.TH "KPROP" "8" " " "1.22.2" "MIT Kerberos" .SH NAME kprop \- propagate a Kerberos V5 principal database to a replica server .SH SYNOPSIS @@ -77,6 +77,6 @@ variables. .SH AUTHOR MIT .SH COPYRIGHT -1985-2025, MIT +1985-2026, MIT .\" Generated by docutils manpage writer. . diff --git a/crypto/krb5/src/man/kpropd.man b/crypto/krb5/src/man/kpropd.man index b1caad000718..182ecfe8b7f7 100644 --- a/crypto/krb5/src/man/kpropd.man +++ b/crypto/krb5/src/man/kpropd.man @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "KPROPD" "8" " " "1.22.1" "MIT Kerberos" +.TH "KPROPD" "8" " " "1.22.2" "MIT Kerberos" .SH NAME kpropd \- Kerberos V5 replica KDC update server .SH SYNOPSIS @@ -164,6 +164,6 @@ variables. .SH AUTHOR MIT .SH COPYRIGHT -1985-2025, MIT +1985-2026, MIT .\" Generated by docutils manpage writer. . diff --git a/crypto/krb5/src/man/kproplog.man b/crypto/krb5/src/man/kproplog.man index 8d404de88b48..95a4b0800ca6 100644 --- a/crypto/krb5/src/man/kproplog.man +++ b/crypto/krb5/src/man/kproplog.man @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "KPROPLOG" "8" " " "1.22.1" "MIT Kerberos" +.TH "KPROPLOG" "8" " " "1.22.2" "MIT Kerberos" .SH NAME kproplog \- display the contents of the Kerberos principal update log .SH SYNOPSIS @@ -108,6 +108,6 @@ variables. .SH AUTHOR MIT .SH COPYRIGHT -1985-2025, MIT +1985-2026, MIT .\" Generated by docutils manpage writer. . diff --git a/crypto/krb5/src/man/krb5-config.man b/crypto/krb5/src/man/krb5-config.man index 0b743cf5d124..ecc696a7919e 100644 --- a/crypto/krb5/src/man/krb5-config.man +++ b/crypto/krb5/src/man/krb5-config.man @@ -28,7 +28,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "KRB5-CONFIG" "1" " " "1.22.1" "MIT Kerberos" +.TH "KRB5-CONFIG" "1" " " "1.22.2" "MIT Kerberos" .SH NAME krb5-config \- tool for linking against MIT Kerberos libraries .SH SYNOPSIS @@ -135,6 +135,6 @@ shell% krb5\-config \-\-libs krb5 .SH AUTHOR MIT .SH COPYRIGHT -1985-2025, MIT +1985-2026, MIT .\" Generated by docutils manpage writer. . diff --git a/crypto/krb5/src/man/krb5.conf.man b/crypto/krb5/src/man/krb5.conf.man index 2590f2151eaf..eaba2b4cdab0 100644 --- a/crypto/krb5/src/man/krb5.conf.man +++ b/crypto/krb5/src/man/krb5.conf.man @@ -28,7 +28,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "KRB5.CONF" "5" " " "1.22.1" "MIT Kerberos" +.TH "KRB5.CONF" "5" " " "1.22.2" "MIT Kerberos" .SH NAME krb5.conf \- Kerberos configuration file .sp @@ -1500,6 +1500,6 @@ syslog(3) .SH AUTHOR MIT .SH COPYRIGHT -1985-2025, MIT +1985-2026, MIT .\" Generated by docutils manpage writer. . diff --git a/crypto/krb5/src/man/krb5kdc.man b/crypto/krb5/src/man/krb5kdc.man index bcbd19d01a98..3f38828b8b0f 100644 --- a/crypto/krb5/src/man/krb5kdc.man +++ b/crypto/krb5/src/man/krb5kdc.man @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "KRB5KDC" "8" " " "1.22.1" "MIT Kerberos" +.TH "KRB5KDC" "8" " " "1.22.2" "MIT Kerberos" .SH NAME krb5kdc \- Kerberos V5 KDC .SH SYNOPSIS @@ -140,6 +140,6 @@ caller\-provided sockets will be ignored if socket activation is used. .SH AUTHOR MIT .SH COPYRIGHT -1985-2025, MIT +1985-2026, MIT .\" Generated by docutils manpage writer. . diff --git a/crypto/krb5/src/man/ksu.man b/crypto/krb5/src/man/ksu.man index 59015c2dd4dc..e1f1c16efab6 100644 --- a/crypto/krb5/src/man/ksu.man +++ b/crypto/krb5/src/man/ksu.man @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "KSU" "1" " " "1.22.1" "MIT Kerberos" +.TH "KSU" "1" " " "1.22.2" "MIT Kerberos" .SH NAME ksu \- Kerberized super-user .SH SYNOPSIS @@ -462,6 +462,6 @@ variables. .SH AUTHOR MIT .SH COPYRIGHT -1985-2025, MIT +1985-2026, MIT .\" Generated by docutils manpage writer. . diff --git a/crypto/krb5/src/man/kswitch.man b/crypto/krb5/src/man/kswitch.man index 7c21199fcee4..0ed5168aaa67 100644 --- a/crypto/krb5/src/man/kswitch.man +++ b/crypto/krb5/src/man/kswitch.man @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "KSWITCH" "1" " " "1.22.1" "MIT Kerberos" +.TH "KSWITCH" "1" " " "1.22.2" "MIT Kerberos" .SH NAME kswitch \- switch primary ticket cache .SH SYNOPSIS @@ -66,6 +66,6 @@ Default location of Kerberos 5 credentials cache .SH AUTHOR MIT .SH COPYRIGHT -1985-2025, MIT +1985-2026, MIT .\" Generated by docutils manpage writer. . diff --git a/crypto/krb5/src/man/ktutil.man b/crypto/krb5/src/man/ktutil.man index 8e4ec837732a..53077975bb87 100644 --- a/crypto/krb5/src/man/ktutil.man +++ b/crypto/krb5/src/man/ktutil.man @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "KTUTIL" "1" " " "1.22.1" "MIT Kerberos" +.TH "KTUTIL" "1" " " "1.22.2" "MIT Kerberos" .SH NAME ktutil \- Kerberos keytab file maintenance utility .SH SYNOPSIS @@ -157,6 +157,6 @@ variables. .SH AUTHOR MIT .SH COPYRIGHT -1985-2025, MIT +1985-2026, MIT .\" Generated by docutils manpage writer. . diff --git a/crypto/krb5/src/man/kvno.man b/crypto/krb5/src/man/kvno.man index f068f0664ab4..b63ba3b238d2 100644 --- a/crypto/krb5/src/man/kvno.man +++ b/crypto/krb5/src/man/kvno.man @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "KVNO" "1" " " "1.22.1" "MIT Kerberos" +.TH "KVNO" "1" " " "1.22.2" "MIT Kerberos" .SH NAME kvno \- print key version numbers of Kerberos principals .SH SYNOPSIS @@ -136,6 +136,6 @@ Default location of the credentials cache .SH AUTHOR MIT .SH COPYRIGHT -1985-2025, MIT +1985-2026, MIT .\" Generated by docutils manpage writer. . diff --git a/crypto/krb5/src/man/sclient.man b/crypto/krb5/src/man/sclient.man index e697bd44b281..10976c05a46a 100644 --- a/crypto/krb5/src/man/sclient.man +++ b/crypto/krb5/src/man/sclient.man @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "SCLIENT" "1" " " "1.22.1" "MIT Kerberos" +.TH "SCLIENT" "1" " " "1.22.2" "MIT Kerberos" .SH NAME sclient \- sample Kerberos version 5 client .SH SYNOPSIS @@ -49,6 +49,6 @@ variables. .SH AUTHOR MIT .SH COPYRIGHT -1985-2025, MIT +1985-2026, MIT .\" Generated by docutils manpage writer. . diff --git a/crypto/krb5/src/man/sserver.man b/crypto/krb5/src/man/sserver.man index c71194e59aaa..e60cb696d9c3 100644 --- a/crypto/krb5/src/man/sserver.man +++ b/crypto/krb5/src/man/sserver.man @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "SSERVER" "8" " " "1.22.1" "MIT Kerberos" +.TH "SSERVER" "8" " " "1.22.2" "MIT Kerberos" .SH NAME sserver \- sample Kerberos version 5 server .SH SYNOPSIS @@ -177,6 +177,6 @@ variables. .SH AUTHOR MIT .SH COPYRIGHT -1985-2025, MIT +1985-2026, MIT .\" Generated by docutils manpage writer. . diff --git a/crypto/krb5/src/patchlevel.h b/crypto/krb5/src/patchlevel.h index 1a6d3e47098f..7cde36884833 100644 --- a/crypto/krb5/src/patchlevel.h +++ b/crypto/krb5/src/patchlevel.h @@ -51,7 +51,7 @@ */ #define KRB5_MAJOR_RELEASE 1 #define KRB5_MINOR_RELEASE 22 -#define KRB5_PATCHLEVEL 1 +#define KRB5_PATCHLEVEL 2 /* #undef KRB5_RELTAIL */ -#define KRB5_RELDATE "20250820" -#define KRB5_RELTAG "krb5-1.22.1-final" +#define KRB5_RELDATE "20260129" +#define KRB5_RELTAG "krb5-1.22.2-final" diff --git a/crypto/krb5/src/po/mit-krb5.pot b/crypto/krb5/src/po/mit-krb5.pot index 6358f57081b2..6b4ba3bc3121 100644 --- a/crypto/krb5/src/po/mit-krb5.pot +++ b/crypto/krb5/src/po/mit-krb5.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: mit-krb5 1.22.1\n" +"Project-Id-Version: mit-krb5 1.22.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-08-20 15:43-0400\n" +"POT-Creation-Date: 2026-01-28 19:53-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/crypto/krb5/src/prototype/prototype.c b/crypto/krb5/src/prototype/prototype.c index a9c225f92b0f..ada2a0d8b7ed 100644 --- a/crypto/krb5/src/prototype/prototype.c +++ b/crypto/krb5/src/prototype/prototype.c @@ -1,7 +1,7 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ /* prototype/prototype.c - <<< One-line description of file >>> */ /* - * Copyright (C) 2025 by the Massachusetts Institute of Technology. + * Copyright (C) 2026 by the Massachusetts Institute of Technology. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/crypto/krb5/src/prototype/prototype.h b/crypto/krb5/src/prototype/prototype.h index 94ab86d5859d..d17862561a6f 100644 --- a/crypto/krb5/src/prototype/prototype.h +++ b/crypto/krb5/src/prototype/prototype.h @@ -1,7 +1,7 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ /* prototype/prototype.h - <<< One-line description of file >>> */ /* - * Copyright (C) 2025 by the Massachusetts Institute of Technology. + * Copyright (C) 2026 by the Massachusetts Institute of Technology. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/crypto/krb5/src/windows/version.rc b/crypto/krb5/src/windows/version.rc index 491daf417785..8d36ec6c682e 100644 --- a/crypto/krb5/src/windows/version.rc +++ b/crypto/krb5/src/windows/version.rc @@ -41,7 +41,7 @@ #define K5_PRODUCT_VERSION_STRING MAJOR_MINOR MAYBE_PATCH RELTAIL "\0" #define K5_PRODUCT_VERSION KRB5_MAJOR_RELEASE, KRB5_MINOR_RELEASE, KRB5_PATCHLEVEL, KRB5_BUILDLEVEL -#define K5_COPYRIGHT "Copyright (C) 1997-2025 by the Massachusetts Institute of Technology\0" +#define K5_COPYRIGHT "Copyright (C) 1997-2026 by the Massachusetts Institute of Technology\0" #define K5_COMPANY_NAME "Massachusetts Institute of Technology.\0" /* From nobody Thu May 14 19:05:07 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gGfsb6xg2z5WrTW for ; Thu, 14 May 2026 19:05:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gGfsb5wHMz47Kb for ; Thu, 14 May 2026 19:05:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778785507; 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; bh=JRJV+TT96T8kLszzKN6Nd9fBRf1d+fzYUA9nK0L9ncc=; b=kp/wkL0MZaux2N9lQ/5WtTtNsmQSEGGGE1nQa53Wo3wad75ySW1Ruczd2+FvYTHP15ZJkb C8BPM25Lb1XiXuJA6H6/LfcAQ8syIfG5Vhf6z02WeK06TMkBRVkRiCpBFyeNapI/0taUvp 1mBzjn4orqanlRtX8hFUMpccvjcw1/1W1MMgIeiqhaNiD9XpCf2G31F7wWkZvrwSsbNydU XTXCWHZSr8y1UTz2V3cRT13RKdO9NHqgdRaOxv27rpyLcaVks5M1hjoX5YMVc1Y2BAsz3K aHfcsiwnGvMkWd7msz3WzmU18jWY4KNvgfFjN2KIKmB/HF1C6v4cgzkj4JcEFA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778785507; a=rsa-sha256; cv=none; b=n6RtsC/DmOHaldhtw1FnIh2E6/ovitTKHXUow6AQGoCzFwxfrSTntBsB/i5qFF6r/5slMl +mjUBU7xdZYWrKCZWRv2UKPQyQYxY6Rl1LA9LzMI8boK6RDw3RQE4k2wA3+8mt7fMLyuP7 RCG/NL8pcmVrUzqC2Nz1KLnZ3Qn7fGY6xVO27Uywsq/VNGRLBVzWwUIO/aq8lOlcFyO+uj p+5XS1jjnemdkpyru7xCit55qhVw1V1jktzfFJpXGT8t2IhxjKZPi/64cePS/9gAsVokfC kdktxHouRS+pqDH35of4aqDmruYCkKdL1mOorljXsTDbiiTkpWZFDLzLt2aPtQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778785507; 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; bh=JRJV+TT96T8kLszzKN6Nd9fBRf1d+fzYUA9nK0L9ncc=; b=R56xXJvPQXmiRGCgSDEB6thfZARYtgo61Nwht/89jPzx6sa/apIjBop5aTzVpKWfCvlu1O KAVnqx3kL2lPUQhfN3vS1BOeC0i/iiIhbLejE1jOzTsPY2VPhpuhyaN9BOhrZtMdRcyNhM 3NI/lejXm77Aubu0qWm4vMFRtu5KI7Odmx+fJs+zQ3O0LUkXTpXutLpXVGfvOA2Ta6tnER sS0rvOG9i6RsxRBqorwY7XlMOyer9A41Ov8zKdpOHYSfuw5bJJwQc3zfSlF9Fz04OGq/Tl xGzmfXb7Wataj5ZSrExgwwFhqnt9IkjDdbQmaHEvKH6y+9myzRy4vpOhBZC4LQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gGfsb5L1wzql3 for ; Thu, 14 May 2026 19:05:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 25cda by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 14 May 2026 19:05:07 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Alan Somers From: Colin Percival Subject: git: cb7880bb0900 - releng/15.1 - bsdinstall: do pkgbase installations with the "script" command List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.1 X-Git-Reftype: branch X-Git-Commit: cb7880bb09009c977d3fb70a66b0f57f9fbe83ed Auto-Submitted: auto-generated Date: Thu, 14 May 2026 19:05:07 +0000 Message-Id: <6a061ce3.25cda.7c9c4d16@gitrepo.freebsd.org> The branch releng/15.1 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=cb7880bb09009c977d3fb70a66b0f57f9fbe83ed commit cb7880bb09009c977d3fb70a66b0f57f9fbe83ed Author: Alan Somers AuthorDate: 2026-04-28 17:27:17 +0000 Commit: Colin Percival CommitDate: 2026-05-14 19:04:21 +0000 bsdinstall: do pkgbase installations with the "script" command "bsdinstall script" will now do a pkgbase installation by default. The system components to install can be specified in the COMPONENTS variable, and have the same names as those used in the interactive installer. bsdinstall will still do a legacy distset installation if DISTRIBUTIONS is defined in the installerconfig file. Approved by: re (cperciva) PR: 290375 Sponsored by: ConnectWise Reviewed by: ziaee, ivy, jduran Differential Revision: https://reviews.freebsd.org/D56717 (cherry picked from commit dc14ae4217a0babb1240f813b642edc2d7b955a6) (cherry picked from commit 1f5869130f6ebd299e65a627eff23a8c3d360afb) --- UPDATING | 5 +++ usr.sbin/bsdinstall/bsdinstall.8 | 45 ++++++++++++++++----- usr.sbin/bsdinstall/scripts/pkgbase.in | 15 ++++++- usr.sbin/bsdinstall/scripts/script | 71 ++++++++++++++++++++-------------- 4 files changed, 95 insertions(+), 41 deletions(-) diff --git a/UPDATING b/UPDATING index 034dabc4da81..137d2aa78e6c 100644 --- a/UPDATING +++ b/UPDATING @@ -12,6 +12,11 @@ Items affecting the ports and packages system can be found in /usr/ports/UPDATING. Please read that file before updating system packages and/or ports. +20260512: + "bsdinstall script" will now do a pkgbase installation by default. To + revert to the legacy distset installation, set "DISTRIBUTIONS" in + your installerconfig. + 20260422: Bump __FreeBSD_version to 1500508 for LinuxKPI after merges of changes to eventfd and changes for DRM 6.11, as well as diff --git a/usr.sbin/bsdinstall/bsdinstall.8 b/usr.sbin/bsdinstall/bsdinstall.8 index 282b88328e99..a35c8f56ada7 100644 --- a/usr.sbin/bsdinstall/bsdinstall.8 +++ b/usr.sbin/bsdinstall/bsdinstall.8 @@ -29,7 +29,7 @@ .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd April 20, 2026 +.Dd May 12, 2026 .Dt BSDINSTALL 8 .Os .Sh NAME @@ -109,9 +109,12 @@ for more information on this target. .Pp The .Ev DISTRIBUTIONS -environment variable is set to -.Dq base.txz kernel.txz -by default for this target. +environment variable is unset by default for this target. +Instead, the +.Ev COMPONENTS +environment variable is effectively set to +.Dq base kernel kernel-dbg +for this target. .It Cm keymap If the current controlling TTY is a .Xr syscons 4 @@ -321,8 +324,17 @@ overridden when making scripted or customized installers. The directory to use for temporary files. Default: .Dq Pa /tmp +.It Ev COMPONENTS +The set of components to install for scripted installations using +base system packages, e.g., +.Dq base lib32 kernel-dbg tests . +Default: "base kernel-dbg" .It Ev DISTRIBUTIONS -The set of distributions to install, e.g., "base.txz kernel.txz ports.txz". +The set of distributions to install for traditional installations, e.g., +.Dq base.txz kernel.txz ports.txz . +If unset, then +.Nm +will install using base system packages. Default: unset unless noted otherwise in the .Sx TARGETS section. @@ -609,18 +621,18 @@ A typical bsdinstall script, using the default filesystem layout and the UFS filesystem, looks like this: .Bd -literal -offset indent PARTITIONS=DEFAULT -DISTRIBUTIONS="kernel.txz base.txz" +COMPONENTS="base debug" #!/bin/sh sysrc ifconfig_DEFAULT=DHCP sysrc sshd_enable=YES -pkg install puppet +pkg install -y puppet .Ed .Pp For a scripted installation involving a ZFS pool spanning multiple disks, the script instead looks like this: .Bd -literal -offset indent -DISTRIBUTIONS="kernel.txz base.txz" +COMPONENTS="base debug" export ZFSBOOT_VDEV_TYPE=stripe export ZFSBOOT_DISKS="ada0 ada1" export nonInteractive="YES" @@ -628,7 +640,20 @@ export nonInteractive="YES" #!/bin/sh echo "ifconfig_DEFAULT=DHCP" >> /etc/rc.conf echo "sshd_enable=YES" >> /etc/rc.conf -pkg install puppet +pkg install -y puppet +.Ed +.Pp +To install using traditional distributions sets instead of packages, set +.Ev DISTRIBUTIONS +to the list of distribution sets to install, like this: +.Bd -literal -offset indent +PARTITIONS=DEFAULT +DISTRIBUTIONS="kernel.txz base.txz" + +#!/bin/sh +sysrc ifconfig_DEFAULT=DHCP +sysrc sshd_enable=YES +pkg install -y puppet .Ed .Pp On @@ -653,7 +678,7 @@ arbitrary commands can be run here to extend the installer. In addition to the variables in .Sx ENVIRONMENT VARIABLES , in particular -.Ev DISTRIBUTIONS , +.Ev COMPONENTS , the preamble can contain a variable .Ev PARTITIONS which is passed to the diff --git a/usr.sbin/bsdinstall/scripts/pkgbase.in b/usr.sbin/bsdinstall/scripts/pkgbase.in index 89ddc244171e..2c7d6bcae904 100755 --- a/usr.sbin/bsdinstall/scripts/pkgbase.in +++ b/usr.sbin/bsdinstall/scripts/pkgbase.in @@ -180,7 +180,18 @@ local function select_components(components, options) } append_list(bsddialog_args, checklist_items) - local exit_code, output = bsddialog(bsddialog_args) + local exit_code = 0 + local output = "" + if options.non_interactive then + local env_components = os.getenv("COMPONENTS") + if env_components then + output = env_components:gsub(" ", "\n") + else + output = "base\nkernel-dbg" + end + else + exit_code, output = bsddialog(bsddialog_args) + end -- This should only be possible if bsddialog is killed by a signal -- or buggy, we disable the cancel option and esc key. -- If this does happen, there's not much we can do except exit with a @@ -300,6 +311,8 @@ local function parse_options() for _, a in ipairs(arg) do if a == "--jail" then options.jail = true + elseif a == "--non-interactive" then + options.non_interactive = true else io.stderr:write("Error: unknown option " .. a .. "\n") os.exit(1) diff --git a/usr.sbin/bsdinstall/scripts/script b/usr.sbin/bsdinstall/scripts/script index 21da2ea7c366..93d07c7899c3 100755 --- a/usr.sbin/bsdinstall/scripts/script +++ b/usr.sbin/bsdinstall/scripts/script @@ -40,6 +40,7 @@ f_include $BSDCFG_SHARE/variable.subr # PARTITIONS # DISTRIBUTIONS # BSDINSTALL_DISTDIR +# COMPONENTS # # Default name of the ZFS boot-pool @@ -97,7 +98,6 @@ awk 'BEGIN {pathb=ARGV[2]; ARGV[2]=""} /^#!/{b=1} { >$TMPDIR/bsdinstall-installscript-preamble . $TMPDIR/bsdinstall-installscript-preamble -: ${DISTRIBUTIONS="kernel.txz base.txz"}; export DISTRIBUTIONS export BSDINSTALL_DISTDIR # Re-initialize a new log if preamble changed BSDINSTALL_LOG @@ -118,37 +118,48 @@ else fi bsdinstall mount -# Fetch missing distribution files, if any -exec 5>&1 -export BSDINSTALL_DISTDIR=$(`dirname $0`/fetchmissingdists 2>&1 1>&5) -FETCH_RESULT=$? -exec 5>&- +if [ -n "$COMPONENTS" -a -n "$DISTRIBUTIONS" ]; then + error "Cannot set both COMPONENTS and DISTRIBUTIONS" +elif [ -z "$DISTRIBUTIONS" ]; then + # If COMPONENTS is set, or neither is, install with pkgbase + bsdinstall pkgbase --non-interactive +else + # Otherwise, unpack distsets -[ $FETCH_RESULT -ne 0 ] && error "Could not fetch remote distributions" + # Fetch missing distribution files, if any + exec 5>&1 + export BSDINSTALL_DISTDIR=$(`dirname $0`/fetchmissingdists 2>&1 1>&5) + FETCH_RESULT=$? + exec 5>&- -# Unpack distributions -bsdinstall checksum -if [ -t 0 ]; then - # If install is a tty, use distextract as normal - bsdinstall distextract -else - # Otherwise, we need to use tar (see https://reviews.freebsd.org/D10736) - for set in $DISTRIBUTIONS; do - f_dprintf "Extracting $BSDINSTALL_DISTDIR/$set" - # XXX: The below fails if any mountpoints are FAT, due to - # inability to set ctime/mtime on the root of FAT partitions, - # which is needed to support e.g. EFI system partitions. tar has - # no option to ignore this (distextract ignores them internally - # through a hack), and returns 1 on any warning or error, - # effectively turning all warnings into fatal errors. - # - # Work around this in an extremely lame way for the specific - # case of EFI system partitions only. This *ONLY WORKS* if - # /boot/efi is empty and does not handle analogous problems on - # other systems (ARM, PPC64). - tar -xf "$BSDINSTALL_DISTDIR/$set" -C $BSDINSTALL_CHROOT --exclude boot/efi - mkdir -p $BSDINSTALL_CHROOT/boot/efi - done + [ $FETCH_RESULT -ne 0 ] && error "Could not fetch remote distributions" + + bsdinstall checksum + if [ -t 0 ]; then + # If install is a tty, use distextract as normal + bsdinstall distextract + else + # Otherwise, we need to use tar (see + # https://reviews.freebsd.org/D10736) + for set in $DISTRIBUTIONS; do + f_dprintf "Extracting $BSDINSTALL_DISTDIR/$set" + # XXX: The below fails if any mountpoints are FAT, due + # to inability to set ctime/mtime on the root of FAT + # partitions, which is needed to support e.g. EFI + # system partitions. tar has no option to ignore this + # (distextract ignores them internally through a hack), + # and returns 1 on any warning or error, effectively + # turning all warnings into fatal errors. + # + # Work around this in an extremely lame way for the + # specific case of EFI system partitions only. This + # *ONLY WORKS* if /boot/efi is empty and does not + # handle analogous problems on other systems (ARM, + # PPC64). + tar -xf "$BSDINSTALL_DISTDIR/$set" -C $BSDINSTALL_CHROOT --exclude boot/efi + mkdir -p $BSDINSTALL_CHROOT/boot/efi + done + fi fi # Configure bootloader if needed From nobody Thu May 14 19:05:08 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gGfsd2Cgmz5WrNk for ; Thu, 14 May 2026 19:05: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gGfsc6VK3z47FP for ; Thu, 14 May 2026 19:05:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778785509; 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; bh=Y/k/LgJDLCHERGJvUtjrejjxMV0DD+ShDWRGuYdi2a4=; b=HHjzIcX/+QujU6qAEQ5r/HQTOEG7s6dKpoBB1piJFroKbw3J9XE/2rq1B0G6VTuwKqIfUq FFXbMYNYccoruV8SNAVv4t1R7Sx4KPu9Rf9/qPIuTLhi5gyL1qSRj0K1XN8BnH6EQaTNs4 WLkLYgeD+2Oafq2OWbEdHNNZeuwUc+xu8gKHdCQ5sYgKIxKuknqUFIBIMFnWsCd16ClSQX 733YIbwvk4nJ5Z4lsMEG5Oa5IhO67EAfeGpeyO2HM/IEwyTDhHGNFPTYtFHEbGLKbpDGh8 Zo0owctaqAcj5gu8Q8sFlY0PcODvvZBNINDym+AIW3WcsDPPS1kjQny2sHiavA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778785508; a=rsa-sha256; cv=none; b=GalQy02whYToP2eT96IK+FR+ND+U5Zp6dPzMZK23SF4wsYXap71AKovOYOwOU0CqdGJT79 F7jqgkwchPcy5NWWqRvcpm0kHzb72OB1q3/P6Yo7+kYSoRuOn1/bpobTLkYBDLfr4EJuwX NkpSnw8seG4LJBx5L6lsLMmt+V9sW3tlpXOk2mx2opAxhmd67NCnwhKWs+n3BOtEOeDv7D 6O6NF8nS+I0mk624OW16AXVCuU7ESg8XlgaiSsdg9cRg6BF997uRDaLPZCMtq6SGSCnwwc amjb6OM3vDReLUJoZjHw8U/+uENZAU8c9n+4IYfotOBlV9qxylYDMI8+w7/tFg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778785508; 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; bh=Y/k/LgJDLCHERGJvUtjrejjxMV0DD+ShDWRGuYdi2a4=; b=i51kanaXWmJi9YE8CLizM+1mG3KfqjM+RSEwDr70VqOetZYPL8ILSfP7myiTTBzYAbN1V0 1tjshoThMigRU4jcW4duN0b5Ap0bt9k8aqVGjCaz383cQIHsxNHjAhSA5+knUzBnNSCGNL w9uZuYxlCTNADEmpOXLNYIQ+yZGIAZocHDmsWP5XGIWEQv0TdJcv3wjundHy2tzzAh6LGk mOKRDCcSdkjZQgo9jDmUKul3vx/zLwJ3XGyILSUOoZoaz6c8+yH8bBYWHRp44JEt7Epp+7 Le4RJ7p/mTzZs5x7/UsoUy70d6S3ZgwgQ13+/d3KVXNGL2NPA83qh9L3dr40UQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gGfsc5rJSzqnn for ; Thu, 14 May 2026 19:05:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26e0e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 14 May 2026 19:05:08 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Konstantin Belousov From: Colin Percival Subject: git: 8484cb490a7d - releng/15.1 - fdescfs: do not change vnode type on VOP_GETATTR() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.1 X-Git-Reftype: branch X-Git-Commit: 8484cb490a7dafe3f5509c40fbb4d660665ac8b9 Auto-Submitted: auto-generated Date: Thu, 14 May 2026 19:05:08 +0000 Message-Id: <6a061ce4.26e0e.14edadbf@gitrepo.freebsd.org> The branch releng/15.1 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=8484cb490a7dafe3f5509c40fbb4d660665ac8b9 commit 8484cb490a7dafe3f5509c40fbb4d660665ac8b9 Author: Konstantin Belousov AuthorDate: 2026-05-03 19:09:15 +0000 Commit: Colin Percival CommitDate: 2026-05-14 19:04:22 +0000 fdescfs: do not change vnode type on VOP_GETATTR() Approved by: re (cperciva) PR: 294768 (cherry picked from commit fbecfc4aa028964f972a0457809aa041d415f61b) (cherry picked from commit 5af938fb03d004ef97621f4c9319446f2fb8f77c) --- sys/fs/fdescfs/fdesc_vnops.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sys/fs/fdescfs/fdesc_vnops.c b/sys/fs/fdescfs/fdesc_vnops.c index 58a22b8bdc50..05630ef5e48c 100644 --- a/sys/fs/fdescfs/fdesc_vnops.c +++ b/sys/fs/fdescfs/fdesc_vnops.c @@ -469,7 +469,6 @@ fdesc_getattr(struct vop_getattr_args *ap) break; } - vp->v_type = vap->va_type; return (0); } From nobody Thu May 14 19:05:09 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gGfsf2Hdlz5WrTc for ; Thu, 14 May 2026 19:05: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gGfsf0FRBz47Kt for ; Thu, 14 May 2026 19:05:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778785510; 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; bh=ptj2KUnI1m9z6rQ1DfxFdUO0EramDQSMZwHZTByhCDM=; b=V29vhE0H97wJpdkL3doyw7740sKMxDVbWaj2iuUWgK2XUcWYrBZFa5HhfSaPex9cOS+1XN BObnQYMyah8AMkZ/TLORzT8qm68DCY6V+8EayZ8BWFPfGJImwQpUYAXgoFINO1QLHc6myb HQuhmohg/43dqZfHEK4+yWbjQLZCLdqiRh494ZouMka39XWIDW0EJRVnM7zAipf0IsWgGQ QMmKcN/tMwDciGxeweBCHaihoW/u6LUqMURZt0UObbsHdFiwwSR9xTsVyJ7lG0krnDLMSn 3RukeQgAOE7Jof21oiBPYAmmTVxjH+eorIOFUCofPGYnUe5/Nk7NRh/UJ2I/Ag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778785510; a=rsa-sha256; cv=none; b=Jkh8gBC1pwMq1rml+bd+9hGA0lwRe3lMfs/6NJhTivMvjGyErL9kpMWjAgvRep12h5/F76 AwV6xjaR/ocjo58GAmJoqFiVdwC5XpBC/AsyqJLyI/Hh/nIM9ORegKp32KwP0+icohquG1 sANfcDPHZH5r8URV2TfqEPVxu2/tlgAyrlUf3A+kOuAR5rMUXG8nhRthzz5vqyjqDN2OIL zaknPTOfTkjM4b+zAviB+SFjW62NqQs3sI7RHY9JeOAyQoumSev09sE0EwGz7C5xjXPkyb ac1kwtJjx63BtTUSVdj6yek5VWAU5a+CKKTUqZBkGDN2T/50YkVR/rug5gQk5g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778785510; 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; bh=ptj2KUnI1m9z6rQ1DfxFdUO0EramDQSMZwHZTByhCDM=; b=k8cDpCXWNJwrVADRiSWXikqacqyHABrImlcu+7AVWL2y+tQGRnd53vgDAtpytaKy2sCI0J 4JZlnOu3dAFpA8TSH+PTbTi5GowUg2dSOikeRwYCoOgQWUTIaTMSSB1TXzSIOK1M+wAe9P 8kc4iSmJA8jITHJdcHA92Q4okf5RRpvrSo/wJgFeBkGGamii11c2Fuey1gazOlo7uVq8XN HaDdiOqERio675o5RPEikiuj1bArp6qVO58gYtwQxVGOpplEGRXFDHh/M55SPZ4SIo/Qmo Cx7XG9fmW+E0V5b5lZy5m2ECyrnzgpv6QjZHVkv6aKTH00JcBhSjfkEpuLNaVQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gGfsd6jFhzqYB for ; Thu, 14 May 2026 19:05:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26732 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 14 May 2026 19:05:09 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Dave Cottlehuber From: Colin Percival Subject: git: 5457f05b201f - releng/15.1 - release/tools: use same pkg settings in containers as in /etc/pkg/FreeBSD.conf List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.1 X-Git-Reftype: branch X-Git-Commit: 5457f05b201f6f5aa0bf9a8739096a3c0ac037d4 Auto-Submitted: auto-generated Date: Thu, 14 May 2026 19:05:09 +0000 Message-Id: <6a061ce5.26732.4488118b@gitrepo.freebsd.org> The branch releng/15.1 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=5457f05b201f6f5aa0bf9a8739096a3c0ac037d4 commit 5457f05b201f6f5aa0bf9a8739096a3c0ac037d4 Author: Dave Cottlehuber AuthorDate: 2026-01-27 22:51:22 +0000 Commit: Colin Percival CommitDate: 2026-05-14 19:04:23 +0000 release/tools: use same pkg settings in containers as in /etc/pkg/FreeBSD.conf Instructions in /etc/pkg/FreeBSD.conf and elsewhere recommend putting changes in /usr/local/etc/pkg/repos/FreeBSD.conf so bring OCI containers into line as well. Reviewed by: dfr, ivy Differential Revision: https://reviews.freebsd.org/D54090 Approved by: re (cperciva) MFC after: 5 days Sponsored by: SkunkWerks, GmbH (cherry picked from commit c73ae67348998a0056145e88debbea9ff6860c4f) (cherry picked from commit d889f6c466d4cec73c34bc71093d08b25e321071) --- release/tools/oci-image-static.conf | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/release/tools/oci-image-static.conf b/release/tools/oci-image-static.conf index 8e642d9defce..e2231d951268 100644 --- a/release/tools/oci-image-static.conf +++ b/release/tools/oci-image-static.conf @@ -36,12 +36,8 @@ oci_image_build() { ;; esac mkdir -p $m/usr/local/etc/pkg/repos - cat > $m/usr/local/etc/pkg/repos/base.conf < $m/usr/local/etc/pkg/repos/FreeBSD.conf <; Thu, 14 May 2026 19:05: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gGfsg0kF3z47YN for ; Thu, 14 May 2026 19:05:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778785511; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4qVi7sjZl48FPtdC3NF+wkTUUae2ZeMQSuvD6t4MIAI=; b=CnftHR7Xm6a/o7RFSg/w4/Ip1aWsFPe+vYs7be8nRkL6ikx2SY1vPoUsKHCYSyiD10k09p 7Ikkkb67dHTOUitDKP2Q9b471CqHHRfdqHRQFb3k8ZFvgciYLfU7dnEEPhkbudvQOVPyNB PZtp1gbo9GhKJfNuwewE5TCS1rjqARQhBh0qGT2h11dXVp0562Q2S/dZUxuym1pjv+yF8Z pJPOblFL9/j+vcJVvaTrYAJabTt5bfY6BTI4SVdjjSMxs/sA5PpxfBIQHAtPzszmF3FU9I VqbR05OEt++j2VPOShmxVfFvIIkU/HRj8nJq0BkcyFK2tqvA/UYT0ghplkm9kw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778785511; a=rsa-sha256; cv=none; b=dm9I0YMGrYr1+T7EJBwK+4IC6ockaoB4gU6Iwcu+dDPbiabzt8Z3GrprwoXOWjX1fYnCmy mZffDNaYgeyISg1fWTPHb2+iOGISQ9evpqjnqk5bA0G7dfapk3myvCPft5zfuovnXyTjho upk2kF7RleKn9q6j4F3pZ2MaMAK50CyZVzSYAEEFd/PexFxYICf9Hbc+rEhAVDYdBlj6Qp DzHmG9IYgqF9ds2Xrm1n7Ikrym1oNYB36amBxBj02Fhmle8ZlcTCexfP4tJRG7qRl5mFaS mFsu2jeMMjsYzu0uO3g3+JudWmsZ4O1ebMUHV6OWKD+TvPPxhLu8S2s7BvDfuQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778785511; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4qVi7sjZl48FPtdC3NF+wkTUUae2ZeMQSuvD6t4MIAI=; b=eTI7ZvymJ/4yEttZ4VxQPQMomKUcGviZXGR1i7yB38mOvPF31yKviMyzSTRdCPQUOxq1dD VeaG+WgGSG4jXQEe7HI5kFyEIS+MEEtRWUxTJBidnn6RpUUSLjAv1bLNJ1Lsv2DMggvyGG +MMUrOQqYpFoDQUM5fcGU9mcnSCuaJ9P0AFBvPFQtnDJzLCO6GwM3X9dIh2IWAeHSaWfOK vxp1s6NGwAmNxchOVbEQ8VDJDclCOUfQ2w4tnCyTdRO80hktf/uaVyPNv53w7rwRAEDKMk N9tidQeyugUrnKFAn8riCALg03bZ6PY7weuipch9U5KKnTq/g89o4uYCuYHYnw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gGfsg0J87zqrD for ; Thu, 14 May 2026 19:05:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 257cc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 14 May 2026 19:05:11 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 8c8ec2cdc9a9 - releng/15.1 - pkg-stage.sh: Add ext2 and ntfs List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.1 X-Git-Reftype: branch X-Git-Commit: 8c8ec2cdc9a9cfa44ecb98a387f426faa1c9f055 Auto-Submitted: auto-generated Date: Thu, 14 May 2026 19:05:11 +0000 Message-Id: <6a061ce7.257cc.5fc5391c@gitrepo.freebsd.org> The branch releng/15.1 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=8c8ec2cdc9a9cfa44ecb98a387f426faa1c9f055 commit 8c8ec2cdc9a9cfa44ecb98a387f426faa1c9f055 Author: Colin Percival AuthorDate: 2026-02-22 00:38:01 +0000 Commit: Colin Percival CommitDate: 2026-05-14 19:04:25 +0000 pkg-stage.sh: Add ext2 and ntfs Having these packages available on release media may help users who need to sneakernet other packages (e.g. firmware) from systems running Linux or Windows. Approved by: re (cperciva) Suggested by: vladlen, ziaee MFC after: 3 days (cherry picked from commit 6881fd278d80ac63b4d511fc130a79ff16d1bb48) (cherry picked from commit 01d5910b8766671afdbd9e274fd62b397aca9e1a) --- release/scripts/pkg-stage.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/release/scripts/pkg-stage.sh b/release/scripts/pkg-stage.sh index 6c9f176cce6a..823c369f011f 100755 --- a/release/scripts/pkg-stage.sh +++ b/release/scripts/pkg-stage.sh @@ -16,6 +16,8 @@ comms/usbmuxd devel/git@lite editors/emacs@nox editors/vim +filesystems/ext2 +filesystems/ntfs misc/freebsd-doc-all net/mpd5 net/rsync From nobody Thu May 14 19:05:12 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gGfsh4KRZz5WqtL for ; Thu, 14 May 2026 19:05: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gGfsh1gkgz47Yg for ; Thu, 14 May 2026 19:05:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778785512; 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; bh=6BxkH8yyHsJBlSglF/6hP7gVHcO1Bk6K7i6tBigN/Jk=; b=vAR/l9sV+BKKlmRIRDmk1k+X4HcY4Xpz3N+0c7bIpYE53eAIHhBi0G0lwrI/w2CmnCA9bG fQc/By1z/swpVpdxAQTsfPYdTTy17v22LpZ5fCxwVvKRivMwHiEgmG2IuPAT+TWjMwfy+N ZQkJtCyLUoT2LDAQTTsK+oQdJ/76DHygNDJe12ahjuxO9acZHg8JKsXuw5fViIlwUS9QG8 fGnBMtdaYdxTkecKsjf7h1DIn+ylsTkBj5St1+7x54oO27FpF2kHcU37PFrIp4x91xyfHU u50nPfKo6367Clt50jXU4YxSYioHSHW7+yD6J0932UNWRPXSNn3BHA0Psctxaw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778785512; a=rsa-sha256; cv=none; b=YOnh2FH0CeSxKEQbF5HG/K9iKuSSKb6jYAJ3XY2FZ6o1q4b7VeqGV1S45wzu3HChJvn/+Y G4e2VPgJpLsqQ6qSBDRRHGiiC/Ad62h4bXCmOGOINkP4DuDeo5DWPZnPvw9rA1KMuS0ana qR/Z/jkVlSTsrU+UgX3qm07meH5tJPLstGIPhoXmpLIGklBagwr7chBt2Y12yERh4Oo6IF d6+ILpkXhtg2qfS3HXgNJvkFMnkmo7OzQYSPN6awg1Hl+5aX5RBrN5lst9ZnBl+Qo1GD7+ x2gLLJGFqTgIqhgZpKw6pUKP4v6hQ6oFA9BmJsugQ3iz0yCUMfom8DOh9IrT8Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778785512; 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; bh=6BxkH8yyHsJBlSglF/6hP7gVHcO1Bk6K7i6tBigN/Jk=; b=l2LUTEPKe0ydJWFjI/NH5Xo8k7E1NBw6YIUTjaGbrf/kl6nbQEopvzEgATcDMwmutqthtg yMIWGiSqWxhk6NJCZffB7XNBL78N25qWHvzw9G6NizUq9Ss3DcNtEPYMzi7w70HzB9ABON YPOTIRSTqSiUoCIvbdxQFyg64MYEpedlGyr0HY+5rXbMWRRhbBUUQAPiaZiWm90V1oSO9h P+rCrDDrI1czn6Rd7u5VAOdsIxX6UBjmlZU0v4ZUnUQXZO2PD4m8pktVf3dw3fmEVK1d2Q MaaGqy2SZ5Ryw2L46E0W6f3Bj6XkMIw+J7TZcZUaEbWRZYMev7YsvA0F8uhhgQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gGfsh14zJzr1h for ; Thu, 14 May 2026 19:05:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2555b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 14 May 2026 19:05:12 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Alan Somers From: Colin Percival Subject: git: 39fcfcc64bba - releng/15.1 - Fix LOCAL_PEERCRED in 32-bit compat mode List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.1 X-Git-Reftype: branch X-Git-Commit: 39fcfcc64bbae6ff8792c8598c6147e3c63b60c1 Auto-Submitted: auto-generated Date: Thu, 14 May 2026 19:05:12 +0000 Message-Id: <6a061ce8.2555b.4afcf4e8@gitrepo.freebsd.org> The branch releng/15.1 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=39fcfcc64bbae6ff8792c8598c6147e3c63b60c1 commit 39fcfcc64bbae6ff8792c8598c6147e3c63b60c1 Author: Alan Somers AuthorDate: 2026-04-27 23:46:53 +0000 Commit: Colin Percival CommitDate: 2026-05-14 19:04:38 +0000 Fix LOCAL_PEERCRED in 32-bit compat mode Previously the cr_pid field would be incorrectly copied to userland, due to a size mismatch between the structure as defined in 32-bit vs 64-bit builds. Fix it by converting the structure before copying it to userland. Approved by: re (cperciva) PR: 294833 Sponsored by: ConnectWise Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D56675 (cherry picked from commit 1d24638d3e8875e4b99a4b5e39f4241e37221b3d) (cherry picked from commit 3298d82ea34059354dc1ff1a60d8b7d3e495c2cd) --- sys/kern/uipc_usrreq.c | 21 +++++++++++++++++++-- sys/sys/ucred.h | 11 +++++++++++ 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c index 44d0185e9d1c..8e8261c9644e 100644 --- a/sys/kern/uipc_usrreq.c +++ b/sys/kern/uipc_usrreq.c @@ -83,6 +83,7 @@ #include #include #include +#include #include #include #include @@ -2755,8 +2756,24 @@ uipc_ctloutput(struct socket *so, struct sockopt *sopt) error = EINVAL; } UNP_PCB_UNLOCK(unp); - if (error == 0) - error = sooptcopyout(sopt, &xu, sizeof(xu)); + if (error != 0) + break; +#ifdef COMPAT_FREEBSD32 + if (SV_PROC_FLAG(sopt->sopt_td->td_proc, SV_ILP32)) { + struct xucred32 xu32 = {}; + int i; + + xu32.cr_version = xu.cr_version; + xu32.cr_uid = xu.cr_uid; + xu32.cr_ngroups = xu.cr_ngroups; + for (i = 0; i < XU_NGROUPS; i++) + xu32.cr_groups[i] = xu.cr_groups[i]; + xu32.cr_pid = xu.cr_pid; + error = sooptcopyout(sopt, &xu32, sizeof(xu32)); + break; + } +#endif + error = sooptcopyout(sopt, &xu, sizeof(xu)); break; case LOCAL_CREDS: diff --git a/sys/sys/ucred.h b/sys/sys/ucred.h index ba241cf9ff3a..4bf48a5e4b87 100644 --- a/sys/sys/ucred.h +++ b/sys/sys/ucred.h @@ -193,6 +193,17 @@ struct setcred32 { uint32_t sc_label; /* struct mac32 [*] */ }; +#ifdef COMPAT_FREEBSD32 +/* 32-bit compatible version of xucred */ +struct xucred32 { + u_int cr_version; /* structure layout version */ + uid_t cr_uid; /* effective user id */ + short cr_ngroups; /* number of groups (incl. cr_gid). */ + gid_t cr_groups[XU_NGROUPS]; /* groups */ + pid_t cr_pid; +}; +#endif + struct thread; /* Common native and 32-bit compatibility entry point. */ From nobody Thu May 14 19:05:13 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gGfsj5Qqlz5WrRC for ; Thu, 14 May 2026 19:05: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gGfsj2rJ7z47R8 for ; Thu, 14 May 2026 19:05:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778785513; 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; bh=jnbRur8/I1bR/BDntt9muU0uOtKNbuy0sZVAyqijNgk=; b=D1oSP0eVqDuTwDZrD50dBkaEHuZlwZ0PY35g7ZOfLc8JyjnS+/YE3igPnBlmzKQYRtZGv1 JrjoItaj8X6Fe7eoqoPyKuh01Z7LOPb1C8WF4O4V+b9VWeiVW101DiJZ4S/6D6SrdQop1/ J1g9o25I8mLzgFVAEiQtMnZbh+uCyDFxrSayzjGH5ZeqrxiMNe+L8tDLeOPDEI3vgqhH46 9l5AAcFSqw3IvS4YglvBql/hNNIAIC+feOxWj4b2A17pgz1dy0VJ8e+7PeLzGgW16u8HJT S7FYw4IW9ZR4GEQt4oBwZcmv2COtmwYb00H/2/Y8CfFPxG3QO51zX8PdLVH30w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778785513; a=rsa-sha256; cv=none; b=se/Jt0bbyIeuD84ZZHojgUIGcuYxnoUhWii5qCuUWb1b4mRRC4L6Y/ouTmynLz72oHavzg zYAi7pySKoGYFet6FhlGNfb7kSBB9bPQr/ORtwO/Zpoy3hBPr5VJ1WmQ5utQuj5Dh5AAC4 wrjf+FxGFbVZ/IytoYkczuGjCzJlweiBCi7taQ6rJmMKbrQCOabxazaM1j/zB0d84iyqn7 gZNQ6aTpQWgBcXR8iTt9TsFD1SfrvC0QBCVXa9BketHFvz+41o2dy61U/Sw8X1FlHvF+H8 a2/SpgruQk1VUY1T5rCWRsjhkms8JqhVgvwM9fXkxKNT4CfJAOuXLuIfEWpDRQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778785513; 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; bh=jnbRur8/I1bR/BDntt9muU0uOtKNbuy0sZVAyqijNgk=; b=u1HUpzzepYyvcfYKEwurE8Wgv/HaLoblRoQgvfkSWOrGLwRmm6M1pvvUYV7gN8KAsi+xzE tVB60gWgOkgsagrnhTw6FNXynssuDtdhkft5jEFtzvOhkOUDiKL4dA3fewCwSVwdSguujP JZpBew1kVnBCbDXz4CP08zGgTOt5SoXFz2repxSLRfMJ8oVqQ92vw03Nzd8Vu4rL6c/H0y I/DroZEh1XgUrgP1Z3N0O76vQHJE4jSJ/0v9uvIbQW7dNMX1UsZN3JYtPqGVguXgR/4i96 3KqmrFPjgzX78pT5TNHBq7JvsTKUTrCtvoDWYw7+9u7Woay2GuwHOON8fmQJLA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gGfsj1sGrzqrF for ; Thu, 14 May 2026 19:05:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27641 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 14 May 2026 19:05:13 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Alan Somers From: Colin Percival Subject: git: 09a53a56b7a6 - releng/15.1 - Make "make update-packages" idempotent List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.1 X-Git-Reftype: branch X-Git-Commit: 09a53a56b7a6892935509e2cda1954fff8078c3f Auto-Submitted: auto-generated Date: Thu, 14 May 2026 19:05:13 +0000 Message-Id: <6a061ce9.27641.6ade658@gitrepo.freebsd.org> The branch releng/15.1 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=09a53a56b7a6892935509e2cda1954fff8078c3f commit 09a53a56b7a6892935509e2cda1954fff8078c3f Author: Alan Somers AuthorDate: 2026-05-07 18:18:29 +0000 Commit: Colin Percival CommitDate: 2026-05-14 19:04:52 +0000 Make "make update-packages" idempotent If the user runs "make update-packages" without bumping BRANCH, then it isn't possible to copy packages from the old location to the new one (because the two locations are the same). So just skip that step. Approved by: re (cperciva) Sponsored by: ConnectWise PR: 295085 Reviewed by: ivy, emaste Differential Revision: https://reviews.freebsd.org/D56872 (cherry picked from commit bd1e789b8452a8c2f166a3b4defb95330c71dadd) (cherry picked from commit 89a0148521aefe0a190d4b62749186c705962d32) --- Makefile.inc1 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 2255b61a30ff..2c79a8c7920a 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2116,7 +2116,7 @@ real-packages: stage-packages create-packages sign-packages .PHONY real-update-packages: stage-packages .PHONY ${_+_}${MAKE} -C ${.CURDIR} PKG_VERSION=${PKG_VERSION} create-packages -.if defined(PKG_VERSION_FROM_DIR) +.if defined(PKG_VERSION_FROM_DIR) && ${PKG_VERSION} != ${PKG_VERSION_FROM} @echo "==> Checking for new packages (comparing ${PKG_VERSION} to ${PKG_VERSION_FROM})" @for pkg in ${PKG_VERSION_FROM_DIR}/${PKG_NAME_PREFIX}-*; do \ pkgname=$$(pkg query -F $${pkg} '%n' | sed 's/${PKG_NAME_PREFIX}-\(.*\)/\1/') ; \ @@ -2134,6 +2134,8 @@ real-update-packages: stage-packages .PHONY echo "==> New package $${newpkgname}" ; \ fi ; \ done +.elif defined(PKG_VERSION_FROM_DIR) + @echo "==> Package version ${PKG_VERSION} unchanged, keeping old package set" .else @echo "==> Bootstrapping repository, not checking for new packages" .endif From nobody Thu May 14 19:07:18 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gGfwC5gQ1z5WrRx for ; Thu, 14 May 2026 19:07:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gGfwC2sQPz3DWq for ; Thu, 14 May 2026 19:07:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778785643; 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; bh=KneRFxc5jZMFA9/JOtPGp83jChN0gyTj2aB+KNK78SY=; b=ZLRgE1mLxG31aVbPGcmnSpcyjM0f6SRokWMXiOSXLHGtfLaAzUnoI0Epk5osSGbp2OS3QO H7eiqFWhgo3sGagLqGi/RlkCtwCO4xNpWP2Ohe/slG31kdXLcqRq+dGH059R2pcSrZ9LX9 LoswGEcHzpa53M0iYlqj/WZh2CkAWbW/R7+wApe4HYsywtYnrD+NZUWox7dTiVA3PVf1Ls rSWCq9yJvlqUB0XSwI3ytDAZUT4SzWvCyia/ZxRq7aVIdmxUQ5gafaYwZaoLWASBgVXaip zE/iJml1M82Z6g+m9ehf8r7ssW32HHmKXBgpBN8q4VCFAiSbNIQxNHQi0a/3hQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778785643; a=rsa-sha256; cv=none; b=H2xppf8rSCEDbUQUQllyUflAy5B5fQERE7tTKbly6RW7QdU4Sa2PcJZf2VvC/b9bPZlZ5y bpzJshWpq1fYJxePosvvAZDgB1DmQKHkljs8HlSmo6p0qPribvoAO+PT09E1FGfHPHbOdC PA1fVtO8dR/OBP6llMZ34yJ48YCcDIUu0eryzcvGLgAeXQGDyfaB8c+0d/wdg8l6lLaSX9 KyJKOBhD0WPbhktOIg2Vdy/PO4wZw2+5ZUUBbkkKOPD/m1zYAfi0Xa3+USxBZy/o4lib70 33nkLs6nVanHfiBBawmkx1NydmHLtBd0gFD2fGGhmzjBN7R1Yjnnj4H11De2Uw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778785643; 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; bh=KneRFxc5jZMFA9/JOtPGp83jChN0gyTj2aB+KNK78SY=; b=L6oyB7ZsUo9TJUL6pBPNcD57AiL0F7HF2kFqaMIGi44cwownjKQyMm1yvDqaMXTYQEjHlY MOcBmG8gXJpA4rDlrTehNOINHHbpYLSHA1q+pMVOfx/BO03nrgQogIjwBEDJorgqrbM58C aiX4wdUU5ZnaUBcWke/qdS2q9sRHRGnGWkaSTqmC0ktF/lCJ3xf2JDJHxVIVIXliFy7tJ1 hGCjoDtYGy2uIq7AL9MATNGgg24nh53Ap/cC2VFGmzZMywlm7R6dDClJz9JCfFjO7ic0y/ iIIbIfVDlSLQlY6pTSaOZ32n7BnTxsv+nvL51iG7NdPgQXgcGmHk3ljForC/7A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gGfwC2NRFzqL5 for ; Thu, 14 May 2026 19:07:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 25a30 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 14 May 2026 19:07:18 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Baptiste Daroussin From: Colin Percival Subject: git: 2ebec3c7ead5 - releng/15.1 - nuageinit: fix command injection and related issues List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.1 X-Git-Reftype: branch X-Git-Commit: 2ebec3c7ead5f5b477a5ab47136562777f2bb495 Auto-Submitted: auto-generated Date: Thu, 14 May 2026 19:07:18 +0000 Message-Id: <6a061d66.25a30.368aaaca@gitrepo.freebsd.org> The branch releng/15.1 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=2ebec3c7ead5f5b477a5ab47136562777f2bb495 commit 2ebec3c7ead5f5b477a5ab47136562777f2bb495 Author: Baptiste Daroussin AuthorDate: 2026-05-07 18:22:14 +0000 Commit: Colin Percival CommitDate: 2026-05-14 19:06:56 +0000 nuageinit: fix command injection and related issues - Add shell_escape() helper to safely escape shell arguments - Apply shell_escape to all user-controlled values in shell commands: adduser (usershow, useradd, lock, primary_group, groups) addgroup (groupshow, groupadd, members) exec_change_password (usermod) settimezone (tzsetup root and timezone) install_package (pkg package names) - Escape double quotes in hostname when writing rc.conf.d/hostname - Add missing 'local' declaration for resolvconf_command in nameservers() - Escape interface name in resolvconf -a command - Change open_resolvconf_conf() from 'w' to 'a' mode to prevent data loss when nameservers() is called multiple times - Clean up stale resolvconf.conf at the start of each boot (skip on postnet to preserve config written by first call) Approved by: re (cperciva) MFC After: 1 day (cherry picked from commit 8b70a203be10411c560ed303ab25713d70b316e9) (cherry picked from commit 87b18b611ec9a70347fdd239345fa23977bcb2d0) --- libexec/nuageinit/nuage.lua | 43 +++++++++++++++++++++++------------- libexec/nuageinit/nuageinit | 17 ++++++++++++-- libexec/nuageinit/tests/nuageinit.sh | 6 ++--- 3 files changed, 46 insertions(+), 20 deletions(-) diff --git a/libexec/nuageinit/nuage.lua b/libexec/nuageinit/nuage.lua index 2d962b540b23..f3c23a7c3eb8 100644 --- a/libexec/nuageinit/nuage.lua +++ b/libexec/nuageinit/nuage.lua @@ -52,6 +52,10 @@ local function decode_base64(input) return table.concat(result) end +local function shell_escape(s) + return "'" .. string.gsub(s, "'", "'\\''") .. "'" +end + local function warnmsg(str, prepend) if not str then return @@ -121,7 +125,7 @@ local function sethostname(hostname) warnmsg("Impossible to open " .. hostnamepath .. ":" .. err) return end - f:write('hostname="' .. hostname .. '"\n') + f:write('hostname="' .. hostname:gsub('"', '\\"') .. '"\n') f:close() end @@ -199,7 +203,7 @@ local function adduser(pwd) if root then cmd = cmd .. "-R " .. root .. " " end - local f = io.popen(cmd .. " usershow " .. pwd.name .. " -7 2> /dev/null") + local f = io.popen(cmd .. " usershow " .. shell_escape(pwd.name) .. " -7 2> /dev/null") local pwdstr = f:read("*a") f:close() if pwdstr:len() ~= 0 then @@ -220,13 +224,17 @@ local function adduser(pwd) -- a warning but creates the user anyway. list = purge_group(list) if #list > 0 then - extraargs = " -G " .. table.concat(list, ",") + local escaped_list = {} + for _, g in ipairs(list) do + table.insert(escaped_list, shell_escape(g)) + end + extraargs = " -G " .. table.concat(escaped_list, ",") end end -- pw will automatically create a group named after the username -- do not add a -g option in this case if pwd.primary_group and pwd.primary_group ~= pwd.name then - extraargs = extraargs .. " -g " .. pwd.primary_group + extraargs = extraargs .. " -g " .. shell_escape(pwd.primary_group) end if not pwd.no_create_home then extraargs = extraargs .. " -m " @@ -248,9 +256,9 @@ local function adduser(pwd) if root then cmd = cmd .. "-R " .. root .. " " end - cmd = cmd .. "useradd -n " .. pwd.name .. " -M 0755 -w none " - cmd = cmd .. extraargs .. " -c '" .. pwd.gecos - cmd = cmd .. "' -d '" .. pwd.homedir .. "' -s " .. pwd.shell .. postcmd + cmd = cmd .. "useradd -n " .. shell_escape(pwd.name) .. " -M 0755 -w none " + cmd = cmd .. extraargs .. " -c " .. shell_escape(pwd.gecos) + cmd = cmd .. " -d " .. shell_escape(pwd.homedir) .. " -s " .. shell_escape(pwd.shell) .. postcmd f = io.popen(cmd, "w") if input then @@ -267,7 +275,7 @@ local function adduser(pwd) if root then cmd = cmd .. "-R " .. root .. " " end - cmd = cmd .. "lock " .. pwd.name + cmd = cmd .. "lock " .. shell_escape(pwd.name) os.execute(cmd) end return pwd.homedir @@ -283,7 +291,7 @@ local function addgroup(grp) if root then cmd = cmd .. "-R " .. root .. " " end - local f = io.popen(cmd .. " groupshow " .. grp.name .. " 2> /dev/null") + local f = io.popen(cmd .. " groupshow " .. shell_escape(grp.name) .. " 2> /dev/null") local grpstr = f:read("*a") f:close() if grpstr:len() ~= 0 then @@ -292,13 +300,17 @@ local function addgroup(grp) local extraargs = "" if grp.members then local list = splitlist(grp.members) - extraargs = " -M " .. table.concat(list, ",") + local escaped_list = {} + for _, m in ipairs(list) do + table.insert(escaped_list, shell_escape(m)) + end + extraargs = " -M " .. table.concat(escaped_list, ",") end cmd = "pw " if root then cmd = cmd .. "-R " .. root .. " " end - cmd = cmd .. "groupadd -n " .. grp.name .. extraargs + cmd = cmd .. "groupadd -n " .. shell_escape(grp.name) .. extraargs local r = os.execute(cmd) if not r then warnmsg("fail to add group " .. grp.name) @@ -484,7 +496,7 @@ local function exec_change_password(user, password, type, expire) postcmd = " -w random" end end - cmd = cmd .. "usermod " .. user .. postcmd + cmd = cmd .. "usermod " .. shell_escape(user) .. postcmd if expire then cmd = cmd .. " -p 1" else @@ -577,7 +589,7 @@ local function settimezone(timezone) root = "/" end - local f, _, rc = os.execute("tzsetup -s -C " .. root .. " " .. timezone) + local f, _, rc = os.execute("tzsetup -s -C " .. shell_escape(root) .. " " .. shell_escape(timezone)) if not f then warnmsg("Impossible to configure time zone ( rc = " .. rc .. " )") @@ -600,8 +612,8 @@ local function install_package(package) if package == nil then return true end - local install_cmd = "pkg install -y " .. package - local test_cmd = "pkg info -q " .. package + local install_cmd = "pkg install -y " .. shell_escape(package) + local test_cmd = "pkg info -q " .. shell_escape(package) if os.getenv("NUAGE_RUN_TESTS") then print(install_cmd) print(test_cmd) @@ -683,6 +695,7 @@ local function addfile(file, defer) end local n = { + shell_escape = shell_escape, warn = warnmsg, err = errmsg, chmod = chmod, diff --git a/libexec/nuageinit/nuageinit b/libexec/nuageinit/nuageinit index a1ebd3f52b25..fc8d9582b9c6 100755 --- a/libexec/nuageinit/nuageinit +++ b/libexec/nuageinit/nuageinit @@ -67,7 +67,14 @@ local function open_resolv_conf() end local function open_resolvconf_conf() - return openat("/etc", "resolvconf.conf") + local path_dir = root .. "/etc" + local path_name = path_dir .. "/resolvconf.conf" + nuage.mkdir_p(path_dir) + local f, err = io.open(path_name, "a") + if not f then + nuage.err("unable to open " .. path_name .. ": " .. err) + end + return f, path_name end local function get_ifaces_by_mac() @@ -271,8 +278,9 @@ local function nameservers(interface, obj) end -- Only call resolvconf with interface if interface is provided + local resolvconf_command if interface then - resolvconf_command = "resolvconf -a " .. interface .. " < " .. resolv_conf + resolvconf_command = "resolvconf -a " .. nuage.shell_escape(interface) .. " < " .. resolv_conf else resolvconf_command = "resolvconf -u" end @@ -738,6 +746,11 @@ local function load_userdata() return line, obj end +-- Clean up stale resolvconf.conf from previous boot +if citype ~= "postnet" then + os.remove(root .. "/etc/resolvconf.conf") +end + if citype == "config-2" then -- network config2_network(ni_path) diff --git a/libexec/nuageinit/tests/nuageinit.sh b/libexec/nuageinit/tests/nuageinit.sh index 3a01413f8487..9f7dc7d38a3c 100644 --- a/libexec/nuageinit/tests/nuageinit.sh +++ b/libexec/nuageinit/tests/nuageinit.sh @@ -799,7 +799,7 @@ packages: - yeah/plop EOF chmod 755 "${PWD}"/media/nuageinit/user_data - atf_check -s exit:0 -o inline:"pkg install -y yeah/plop\npkg info -q yeah/plop\n" /usr/libexec/nuageinit "${PWD}"/media/nuageinit postnet + atf_check -s exit:0 -o inline:"pkg install -y 'yeah/plop'\npkg info -q 'yeah/plop'\n" /usr/libexec/nuageinit "${PWD}"/media/nuageinit postnet cat > media/nuageinit/user_data << 'EOF' #cloud-config @@ -807,7 +807,7 @@ packages: - curl EOF chmod 755 "${PWD}"/media/nuageinit/user_data - atf_check -o inline:"pkg install -y curl\npkg info -q curl\n" /usr/libexec/nuageinit "${PWD}"/media/nuageinit postnet + atf_check -o inline:"pkg install -y 'curl'\npkg info -q 'curl'\n" /usr/libexec/nuageinit "${PWD}"/media/nuageinit postnet cat > media/nuageinit/user_data << 'EOF' #cloud-config @@ -816,7 +816,7 @@ packages: - meh: bla EOF chmod 755 "${PWD}"/media/nuageinit/user_data - atf_check -o inline:"pkg install -y curl\npkg info -q curl\n" -e inline:"nuageinit: Invalid type: table for packages entry number 2\n" /usr/libexec/nuageinit "${PWD}"/media/nuageinit postnet + atf_check -o inline:"pkg install -y 'curl'\npkg info -q 'curl'\n" -e inline:"nuageinit: Invalid type: table for packages entry number 2\n" /usr/libexec/nuageinit "${PWD}"/media/nuageinit postnet } config2_userdata_update_packages_body() From nobody Thu May 14 21:06:10 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gGjYN28b1z5X3Ql for ; Thu, 14 May 2026 21:06: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gGjYN1fmWz3RbD for ; Thu, 14 May 2026 21:06:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778792776; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LOue5QeK3z55OIzs/7q6znxqgmvQPJ3Xvn24nHGA1MY=; b=l5UWIEjDZG6rtfetOwb6Kx9dRZSj01xMzFDpekyHhHLQf2NoXCzGVjurbnSvDGPoEUX8wj 5U3oEVrRd5lVKZvN4kukjTPOIb1M8kIs4xRRCWX/fLl2tGpyR+xVB3075nbF/5tfo4q2rm 8CMECdChjIc2HutGbktqIuJ4J76p77O1bTGMCKsS9KcLS4es4V5glz8X3TDzIelMRlpqAG tdtIT7TQzHCHmDnp5ubA4m84AwlQ4lLMWnfs4XsgZqcH7QZtj8HhSPpF6ISylSAJ06ow9L SNjz34MQS5AcmZXRGq5k/aX9k6GnPyCxtFE4gRsjgMHDtFni3gOFhQtS7RvgyQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778792776; a=rsa-sha256; cv=none; b=hFxkgdvFB2jrRMIopwqrPlr8zVRncJAf75v0Pz+RkETW/+rFWQWho0BOzNPlqM/0FdFBsv pAQkfBfCYLHSSBhNsg8k+E9K4BXz2ZF84YfV6RDJPk22Fv9eolzw1C0WQg2RTLFfIWDaJm InKpPlYvlc9QmwerNf19Y4dPtsCXAjVxhTREDUfAF8du7SgAQYWb0gwFUS6ETCzwznPqEo 0eOSrgE8+XeLSXqM1tKc3YnZ38COiSPwyLLyk+HDnbb2GeTW1kBL/Iyg9MdiSnDDs4USS4 33fmgA7pRFvpnjgXnFq0T92qoqsGK0kf9LM75Je3s3AiR0JoXhZBiGuHbzkA3A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778792776; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LOue5QeK3z55OIzs/7q6znxqgmvQPJ3Xvn24nHGA1MY=; b=sOUVev4G9tcxW1IRhJHthJ6pXjq2sS79cbl31xjBGo9aQ89OV6bnDvV4qWp3on50wtbbU4 C8zFj3daKGjq3Yqj8/frbSqetzet83CcDgOmlA+GctAa9qQr0lcUdbaEMn4Gm3PfFYzEBt nEg1BBIoe2O+SFopg+dLqdOO878mXzN+9n/g9AvfVxnDTEgMKvEtF3CSbuugXTizr7yZZy Skoph3g854BIYwEWJQ2raRcFGD3OsaxJTE2qMqJ46UYDbCdPdnuuqctx5uRS7DqQcHpSjd bM/C0IbqOQDvxN8/xR85vQqmP8do8PWZig8fkot35ZgFR6C7Dsg6NZnvuo+rzw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gGjYN0kLHzstZ for ; Thu, 14 May 2026 21:06:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3b972 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 14 May 2026 21:06:10 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Ziaee Subject: git: 464a351267dc - main - Cloud releases: Switch to firstboot_pkg_upgrade List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 464a351267dc0d1843b919dd72ad1c70c24815ce Auto-Submitted: auto-generated Date: Thu, 14 May 2026 21:06:10 +0000 Message-Id: <6a063942.3b972.2845a80a@gitrepo.freebsd.org> The branch main has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=464a351267dc0d1843b919dd72ad1c70c24815ce commit 464a351267dc0d1843b919dd72ad1c70c24815ce Author: Alexander Ziaee AuthorDate: 2026-05-14 21:05:07 +0000 Commit: Alexander Ziaee CommitDate: 2026-05-14 21:05:12 +0000 Cloud releases: Switch to firstboot_pkg_upgrade Cloud images are deployed with base system packages. Introduce a firstboot package auto updater to patch the base system on first boot. MFC after: 1 hour MFC to: stable/15 Reviewed by: cperciva Sponsored by: Google Cloud Differential Revision: https://reviews.freebsd.org/D56890 --- release/tools/azure.conf | 5 +++-- release/tools/ec2-base.conf | 9 ++++++--- release/tools/gce.conf | 5 +++-- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/release/tools/azure.conf b/release/tools/azure.conf index 7a4f0b5027cf..9a5c12424bd3 100644 --- a/release/tools/azure.conf +++ b/release/tools/azure.conf @@ -6,10 +6,10 @@ export VMSIZE=30g # Set to a list of packages to install. -export VM_EXTRA_PACKAGES="azure-agent python python3 firstboot-freebsd-update firstboot-pkgs" +export VM_EXTRA_PACKAGES="azure-agent python python3 firstboot-pkg-upgrade firstboot-pkgs" # Set to a list of third-party software to enable in rc.conf(5). -export VM_RC_LIST="ntpd sshd waagent firstboot_freebsd_update firstboot_pkgs" +export VM_RC_LIST="ntpd sshd waagent firstboot_pkg_upgrade firstboot_pkgs" # No swap space; waagent will allocate swap space on the resource disk. # See ResourceDisk.EnableSwap and ResourceDisk.SwapSizeMB in waagent.conf @@ -43,6 +43,7 @@ vm_extra_pre_umount() { cat << EOF >> ${DESTDIR}/etc/rc.conf ifconfig_hn0="SYNCDHCP" ntpd_sync_on_start="YES" +firstboot_pkg_upgrade_repos="FreeBSD-base" EOF cat << EOF >> ${DESTDIR}/boot/loader.conf diff --git a/release/tools/ec2-base.conf b/release/tools/ec2-base.conf index ffe2646240a5..24b2feb5f0d7 100644 --- a/release/tools/ec2-base.conf +++ b/release/tools/ec2-base.conf @@ -7,15 +7,15 @@ # * amazon-ssm-agent (not enabled by default, but some users need to use # it on systems not connected to the internet), # * ec2-scripts, which provides a range of EC2ification startup scripts, -# * firstboot-freebsd-update, to install security updates at first boot, +# * firstboot-pkg-upgrade, to install security updates at first boot, # * firstboot-pkgs, to install packages at first boot, and # * isc-dhcp44-client, used for IPv6 network setup. export VM_EXTRA_PACKAGES="${VM_EXTRA_PACKAGES} amazon-ssm-agent ec2-scripts \ - firstboot-freebsd-update firstboot-pkgs isc-dhcp44-client" + firstboot-pkg-upgrade firstboot-pkgs isc-dhcp44-client" # Services to enable in rc.conf(5). export VM_RC_LIST="${VM_RC_LIST} ec2_configinit ec2_ephemeral_swap \ - ec2_fetchkey ec2_loghostkey firstboot_freebsd_update firstboot_pkgs \ + ec2_fetchkey ec2_loghostkey firstboot_pkg_upgrade firstboot_pkgs \ growfs sshd" vm_extra_pre_umount() { @@ -24,6 +24,9 @@ vm_extra_pre_umount() { # via EC2 user-data. echo 'firstboot_pkgs_list="devel/py-awscli"' >> ${DESTDIR}/etc/rc.conf + # Limit firstboot_pkg_upgrade to the base system. + echo 'firstboot_pkg_upgrade_repos="FreeBSD-base"' >> ${DESTDIR}/etc/rc.conf + # Any EC2 ephemeral disks seen when the system first boots will # be "new" disks; there is no "previous boot" when they might have # been seen and used already. diff --git a/release/tools/gce.conf b/release/tools/gce.conf index 7298aabf3956..938672ac92e0 100644 --- a/release/tools/gce.conf +++ b/release/tools/gce.conf @@ -6,14 +6,14 @@ export VMSIZE=20g # Set to a list of packages to install. -export VM_EXTRA_PACKAGES="${VM_EXTRA_PACKAGES} firstboot-freebsd-update \ +export VM_EXTRA_PACKAGES="${VM_EXTRA_PACKAGES} firstboot-pkg-upgrade \ firstboot-pkgs google-cloud-sdk panicmail sudo \ sysutils/py-google-compute-engine lang/python \ lang/python3" # Set to a list of third-party software to enable in rc.conf(5). export VM_RC_LIST="ntpd sshd growfs \ - firstboot_pkgs firstboot_freebsd_update google_startup \ + firstboot_pkgs firstboot_pkg_upgrade google_startup \ google_accounts_daemon google_clock_skew_daemon \ google_instance_setup google_network_daemon" @@ -47,6 +47,7 @@ ifconfig_DEFAULT="SYNCDHCP mtu 1460" ntpd_sync_on_start="YES" # need to fill in something here #firstboot_pkgs_list="" +firstboot_pkg_upgrade_repos="FreeBSD-base" panicmail_autosubmit="YES" EOF From nobody Thu May 14 21:59:48 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gGklF4bpWz5vt54 for ; Thu, 14 May 2026 21:59: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gGklF3r9Nz3Whk for ; Thu, 14 May 2026 21:59:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778795993; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3sFrKT+NmZsZqr601HMUze46ZOzdjnPRhFmaH+ogAck=; b=GP2+W/CYFbft7pfFpdLj78eNzf+6DBNBum0Do2FZrcxvfQxwrDLKKJ8RaP8jVmUTDDDXCv bknw/GvnJbHUd033YifFj5g40BhV1RMTAXd8eT/BAdpTTYiqbYDm3obtzH7Ioj1fw/QK19 EiOOupomLDBCX5NIKuh6MHHP0zMqsdM0NeQ1oUjMKJYar0lqjruLBkbJUeiTUJybNASxXl j4+X6Ds31Mj9z/BWzZChInpj+xFrO2BmsasFjosmB+IPFm9FGTtgCUJU4rNRfRBYQjHQf0 bae6R8uZG875rBgK85ed80IQDIyOxKY3vYN/5iciq7ZHHT6uKtJSIhcMH63+DA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778795993; a=rsa-sha256; cv=none; b=crywUupqMlULiiVled8ZU4IfkUJENa6to3PvUStlwSSC9X+WZqssu82ozmSEES1iNI8C40 qpo5XTnWlJxYxY+g/YGm1YEKJqfTddTWpqq+fcQcBDWoxVVoFr0EE2fJfet7p74DETGJfI B6ag1ExDjVd7bOVBGGgnBgPDzL+RbOBi+Tafg6dRJEMvqKgXJc1FRNapXqIXq/5X64lKu6 oeCIlt+suSnc0zN2gLu75buXFdd+tZO61Khfs1kUYhEzPVgcamEUb8vYejMFRE4yGHUCoF 7a3DiiCQoLF6tmQFI8wznOGBcrc3+OKASa+gOi3ehZv3L/xPsnRRBztGiugpeA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778795993; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3sFrKT+NmZsZqr601HMUze46ZOzdjnPRhFmaH+ogAck=; b=ZPYVlbryrlY2oZhjOy06QeJzCxiBsaWl56E3ADExB2+K6ESwrthXzkYJO8vbx7lfGiDhih Kjzxz0KkqbJ3q95ooCLkPGTHU+cB6WrQpps5I6PEsVEHScxSSkkFFsWrrGUqitrcM+2y1t erneKIpvY+/GZ0I1mC9zePaXPdqSzNCXK+Ctsd3eR6UXbtnfzgNVJqYpymIcCEs0+ihBRq BHE+zMcwdvM1VI2Rdj6VDBiSdq5Y0PjOc03fwN7IdlHf3AkjIYSThuUllqZgpxsbLkjaA3 iIj6y3cVWdQQqZv7gcSGsaUJiwvLL3aP4S4KCngUmeEVAoYMYQo47teQq0e80A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gGklF3Ns2zvq6 for ; Thu, 14 May 2026 21:59:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3f4d6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 14 May 2026 21:59:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: 4080419d9a2d - main - Cloud releases: More firstboot_pkg_upgrade List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: 4080419d9a2d88d44d20baaf3ea01934561819c1 Auto-Submitted: auto-generated Date: Thu, 14 May 2026 21:59:48 +0000 Message-Id: <6a0645d4.3f4d6.29c3838d@gitrepo.freebsd.org> The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=4080419d9a2d88d44d20baaf3ea01934561819c1 commit 4080419d9a2d88d44d20baaf3ea01934561819c1 Author: Colin Percival AuthorDate: 2026-05-14 21:14:09 +0000 Commit: Colin Percival CommitDate: 2026-05-14 21:59:11 +0000 Cloud releases: More firstboot_pkg_upgrade Update a couple more cloudware images which I forgot about earlier. Reviewed by: ziaee Fixes: 464a351267dc ("Cloud releases: Switch to firstboot_pkg_upgrade") Differential Revision: https://reviews.freebsd.org/D57006 --- release/tools/basic-cloudinit.conf | 7 ++++--- release/tools/ec2-small.conf | 9 ++++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/release/tools/basic-cloudinit.conf b/release/tools/basic-cloudinit.conf index 98e11f0bb08b..621165ea1669 100644 --- a/release/tools/basic-cloudinit.conf +++ b/release/tools/basic-cloudinit.conf @@ -8,16 +8,17 @@ export CONFIG_DRIVE=YES export CONFIG_DRIVE_SIZE=1M # Packages to install into the image we're creating. -# * firstboot-freebsd-update, to install security updates at first boot. -export VM_EXTRA_PACKAGES="${VM_EXTRA_PACKAGES} firstboot-freebsd-update" +# * firstboot-pkg-upgrade, to install security updates at first boot. +export VM_EXTRA_PACKAGES="${VM_EXTRA_PACKAGES} firstboot-pkg-upgrade" # Set to a list of third-party software to enable in rc.conf(5). -export VM_RC_LIST="${VM_RC_LIST} firstboot_freebsd_update growfs sshd nuageinit" +export VM_RC_LIST="${VM_RC_LIST} firstboot_pkg_upgrade growfs sshd nuageinit" vm_extra_pre_umount() { cat << EOF >> ${DESTDIR}/etc/rc.conf dumpdev="AUTO" ifconfig_DEFAULT="SYNCDHCP accept_rtadv" +firstboot_pkg_upgrade_repos="FreeBSD-base" # RSA host keys are obsolete and also very slow to generate sshd_rsa_enable="NO" EOF diff --git a/release/tools/ec2-small.conf b/release/tools/ec2-small.conf index 6564a59c2cf6..f5904d5ea4ba 100644 --- a/release/tools/ec2-small.conf +++ b/release/tools/ec2-small.conf @@ -25,18 +25,21 @@ vm_extra_filter_base_packages() { # Packages to install into the image we're creating. In addition to packages # present on all EC2 AMIs, we install: # * ec2-scripts, which provides a range of EC2ification startup scripts, -# * firstboot-freebsd-update, to install security updates at first boot, +# * firstboot-pkg-upgrade, to install security updates at first boot, # * firstboot-pkgs, to install packages at first boot, and # * isc-dhcp44-client, used for IPv6 network setup. export VM_EXTRA_PACKAGES="${VM_EXTRA_PACKAGES} ec2-scripts \ - firstboot-freebsd-update firstboot-pkgs isc-dhcp44-client" + firstboot-pkg-upgrade firstboot-pkgs isc-dhcp44-client" # Services to enable in rc.conf(5). export VM_RC_LIST="${VM_RC_LIST} ec2_configinit ec2_ephemeral_swap \ - ec2_fetchkey ec2_loghostkey firstboot_freebsd_update firstboot_pkgs \ + ec2_fetchkey ec2_loghostkey firstboot_pkg_upgrade firstboot_pkgs \ growfs sshd" vm_extra_pre_umount() { + # Limit firstboot_pkg_upgrade to the base system. + echo 'firstboot_pkg_upgrade_repos="FreeBSD-base"' >> ${DESTDIR}/etc/rc.conf + # Any EC2 ephemeral disks seen when the system first boots will # be "new" disks; there is no "previous boot" when they might have # been seen and used already. From nobody Thu May 14 22:19:35 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gGlB50KWHz5vvH6 for ; Thu, 14 May 2026 22:19:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gGlB45zTlz3Z10 for ; Thu, 14 May 2026 22:19:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778797180; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Z158jur/VXZn1BbIc1S/f9oChT6EqNTCcvTOw1VFon0=; b=g4u3yor09NSOFRbb6HH05uf7MCe+FgSSPdeace+ZfVWpZgJQgJvvbN9Ye9vJ1jI8AeSm81 3h7T3JIiSRb3Ll9V2LxsgDvm/CNd+JqSIaB5tJt0zJYrC+N9ZZKDedGROYLvn7gJqZ3IAG UlwUtArGcpFzvHNM4ONXF5/vEoUIHWmGYPIAOeP3NDdAetIHuVJfc25Jq7sM6j54lPAC1w hmG0O9cb6ns7/tiqqaiV+xit1CQBJqJJvuhBrlnw1budd3CxMi7kFWk5Ptil85LLTjlIAC M9SbOh29YLK0KGXZV05naqRM18VtxH6OFRlBOGVzsMnM+AK5VKcvhzS2IejmJw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778797180; a=rsa-sha256; cv=none; b=oHKZI/R0Kic5YxDI9QTCH/9uPQpNwLw8OXqzLXNug3i3WPZNSgbTgx7zv3ShAYSnpmMxo9 pGwbSh+h+11YlmKNK8XiS+PdZHeIy0KpF+ZBdGO/e4DcG3TQcIgmZfnEWdqS30gs6CaliM jtQEIg/g7y3L3aW+iQxRrE6CLBJ38l5JaewYGpHHBnKqNVq9wvCqcD33mfiG9fi6o6dQN1 3e/sE610ul4SDf4Z7XIEugiWMZYogztm6vapnnd0xqxIJ6YRfESb1bml/A2JkCco/dejdx M//oY5EHKFjWAcObHtoOXibT1qrGUfSdTg5vj9XNz7hqqiMnK2RM2ju0/SRm9w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778797180; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Z158jur/VXZn1BbIc1S/f9oChT6EqNTCcvTOw1VFon0=; b=ApJELtma168uOa01ZdYdlqdjmE6JNjhgbHyCOMM8fcJkSTmjAFL2chjL4V/KPzKIlazjb+ gbfbRiJZThk3EsKvCQx2noGeZJ469THc7F0X6SvsKBPZ6cZy7q+DB42V+MhyXyBxEOD9K0 5rSYsXT522sHIZaBrmj+Oog+YM2SO3zoan9NJkfukb1lC/QLMvv9OA2FXcxypaY+Qh0cBW v5H22vV+ZBcn5xWz8NV3dBmgkwn+dFP1i4cyovF9mXOo7CWvSyrVBGylxnGAhCV53TwsOR 88RZPamQzgXknclb2LbG2t96Ds4USiTJXUBpSv5pM69yqJJ7vM6MGoChr7tBMw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gGlB458lczvlf for ; Thu, 14 May 2026 22:19:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 422a5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 14 May 2026 22:19:35 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: 13d3bd165e22 - main - subr_uio.c: Remove a KASSERT() for large NFS server I/O List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: 13d3bd165e225eec9af91b6e3361c2482931f95b Auto-Submitted: auto-generated Date: Thu, 14 May 2026 22:19:35 +0000 Message-Id: <6a064a77.422a5.5d3744f6@gitrepo.freebsd.org> The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=13d3bd165e225eec9af91b6e3361c2482931f95b commit 13d3bd165e225eec9af91b6e3361c2482931f95b Author: Rick Macklem AuthorDate: 2026-05-14 22:17:55 +0000 Commit: Rick Macklem CommitDate: 2026-05-14 22:17:55 +0000 subr_uio.c: Remove a KASSERT() for large NFS server I/O When the NFS server is set to allow an I/O size greater than 1Mbyte (not allowed in FreeBSD's main yet), a KASSERT() in allocuio() can fail when: zfs_freebsd_write()->zfs_write()->zfs_uiocopy() ->cloneuio()->allocuio() is called for a large NFS server write. Since the userland API callers to allocuio() already check that the size does not exceed UIO_MAXIOV, there does not seem to be a need to a KASSERT() here. Removing the KASSERT() allows NFS server writes of greater than 1Mbyte to work, once the NFS code is patched to allow them. Reviewed by: kib MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D57005 --- sys/kern/subr_uio.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys/kern/subr_uio.c b/sys/kern/subr_uio.c index 6ac932fb6690..fa5865fbe938 100644 --- a/sys/kern/subr_uio.c +++ b/sys/kern/subr_uio.c @@ -441,8 +441,6 @@ allocuio(u_int iovcnt) struct uio *uio; int iovlen; - KASSERT(iovcnt <= UIO_MAXIOV, - ("Requested %u iovecs exceed UIO_MAXIOV", iovcnt)); iovlen = iovcnt * sizeof(struct iovec); uio = malloc(iovlen + sizeof(*uio), M_IOV, M_WAITOK); uio->uio_iov = (struct iovec *)(uio + 1); From nobody Thu May 14 22:35:01 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gGlWt4vlMz5vwSM for ; Thu, 14 May 2026 22:35:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gGlWt2RLqz3d3s for ; Thu, 14 May 2026 22:35:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778798106; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0LwtV8TrJ+wo9Ee5e/sNrUw3W5+b0Mlhea+gXrRlfpo=; b=W0kDUSXfz9upYKJ5IGrmKf1p6tuyF1mJHuoB7XjYa5HZlHyr1QTf2gSmlz+/yAfpH9AOaf 9h0TBFCrgvc4TiCmNsS/3BgN1dge/4wliHGRMWCtaEX7X3Gyg70WvxbdU8MNaKa9AF2I5f O0/uMDzHywdz1ai4IQIp7sVNonNuV+czUBraIZxM6BdnNPzz6qP2VE5wIL2iyCQzxkLVf0 vlHxOt67KCgS2dJfWnqYRp6wCmOG4/mm6R83btfTnHws64KfoQxlZ4OxLl7eOhkCzOEXdv KkRiBFa2y0tkejQT0H+xWJZ8r9v4YKhLLsfBAEI1uFXuQck6889q1nZ60NurGw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778798106; a=rsa-sha256; cv=none; b=ZawhhrBXHsHfuP/1I76YgLy+dAfN84zWPO3paqA3ygjnNwP9wJ6q5bih4G/qqiTZ9R8iGz l3kZGo3QapMZ+RLSCW7W8SEndiPbHxOxvjjXIF7DbdIpgsa1sHetZ/Cmi5bWZjdr8Lr7rM PLITQazGX6CoXAAwTNsgLxOzI64LyjSCXTAVJyQYyO9Kp72SN9QCf5eO2nziA/3W+Nqzxh qEEN8sWOCYmddqciox0YQAls8gW9vkpKB2YLDtrKfbF2GR89gLFbzoPoLbCc7F7UGg30Yt 9XS0llbamL56GTh8ptszJ/0NhVEDvRI0WFMnMqGZZy3o1W6nSO36vyqOqU3VJg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778798106; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0LwtV8TrJ+wo9Ee5e/sNrUw3W5+b0Mlhea+gXrRlfpo=; b=v2JLpXkMi0H8V9LMOYDwwCeFyNRMplVw+oXirPxVx5BhnqG5Ir03bRG7+zV062uOP+3mEV EEUjjFt+fR4t0ZZJxlQ7WF/YPqJFXzCmoxj7HZ5dtwI1E9g/yM81GURfleyN5+61dgmLrs 01zKbg689nidmUpgnds4+TCVOsdhedmfLccAHZyUDgNYgLN9HtG/Z/XVaeCQNYMuyWU/nf 5nhdYLYb7I3k2pSOdQ4akLk9j6GdJhO6pAAJJ6WnMu+/BE+79H7wCRiQ4bgq43ZAxlfTUR Fl38H7Qvspday/PiwK4NNiDRZn/69nk3PYJ43QfjOtQfDAfXxx+txDo/rmlUGg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gGlWt1cSJzwdr for ; Thu, 14 May 2026 22:35:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 44875 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 14 May 2026 22:35:01 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: b92b9da33006 - main - nfsd: Allow vfs.nfsd.srvmaxio to be up to 4Mbytes List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: b92b9da3300655c86dcd42ea8a5ba45badd90847 Auto-Submitted: auto-generated Date: Thu, 14 May 2026 22:35:01 +0000 Message-Id: <6a064e15.44875.4253434b@gitrepo.freebsd.org> The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=b92b9da3300655c86dcd42ea8a5ba45badd90847 commit b92b9da3300655c86dcd42ea8a5ba45badd90847 Author: Rick Macklem AuthorDate: 2026-05-14 22:33:23 +0000 Commit: Rick Macklem CommitDate: 2026-05-14 22:33:23 +0000 nfsd: Allow vfs.nfsd.srvmaxio to be up to 4Mbytes Without this patch, the maximum setting for vfs.nfsd.srvmaxio was 1Mbyte. This patch increases that to 4Mbytes. The same as for any setting above 128Kbytes, settings up to 4Mbytes require that kern.ipc.maxsockbuf be increased. (A message generated after setting vfs.nfsd.srvmaxio via the /etc/rc.conf variable nfs_server_maxio will indicate the minimum setting, which will be somewhat greater than four times the setting of vfs.nfsd.srvmaxio.) Requested by: Cedric Blancher MFC after: 2 weeks Fixes: 13d3bd165e22 ("subr_uio.c: Remove a KASSERT() for large NFS server I/O") --- sys/fs/nfs/nfsproto.h | 3 +++ sys/fs/nfsserver/nfs_nfsdport.c | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/sys/fs/nfs/nfsproto.h b/sys/fs/nfs/nfsproto.h index 6e67c5be3416..1054c85d8e8f 100644 --- a/sys/fs/nfs/nfsproto.h +++ b/sys/fs/nfs/nfsproto.h @@ -89,8 +89,11 @@ * It used to be called NFS_MAXDATA, but has been renamed to clarify that * it refers to server side only and doesn't conflict with the NFS_MAXDATA * defined in rpcsvc/nfs_prot.h for userland. + * NFS_SRVMAXIO is the default setting for vfs.nfsd.srvmaxio + * NFS_SRVLIMITIO is the maximum setting allowed for vfs.nfsd.srvmaxio */ #define NFS_SRVMAXIO (128 * 1024) +#define NFS_SRVLIMITIO (4 * 1024 * 1024) /* Stat numbers for rpc returns (version 2, 3 and 4) */ /* diff --git a/sys/fs/nfsserver/nfs_nfsdport.c b/sys/fs/nfsserver/nfs_nfsdport.c index e42d5ca1e0a3..1e6936ed351c 100644 --- a/sys/fs/nfsserver/nfs_nfsdport.c +++ b/sys/fs/nfsserver/nfs_nfsdport.c @@ -241,8 +241,9 @@ sysctl_srvmaxio(SYSCTL_HANDLER_ARGS) printf("nfsd: vfs.nfsd.srvmaxio can only be increased\n"); return (EINVAL); } - if (newsrvmaxio > 1048576) { - printf("nfsd: vfs.nfsd.srvmaxio cannot be > 1Mbyte\n"); + if (newsrvmaxio > NFS_SRVLIMITIO) { + printf("nfsd: vfs.nfsd.srvmaxio cannot be > %d\n", + NFS_SRVLIMITIO); return (EINVAL); } if ((newsrvmaxio & (newsrvmaxio - 1)) != 0) { From nobody Thu May 14 22:38:44 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gGlc45HKlz5vwrs for ; Thu, 14 May 2026 22:38: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gGlc44VtJz3dLy for ; Thu, 14 May 2026 22:38:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778798324; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mtGvXsGsX2T/1aptzL1iqxQ9eVc8jU2KqCOiDX+I3g0=; b=p7Z+hJM/XHAL/FDugMazGXeE/jlNviN6w0SM27uSlrgrQtnhPyrYVWb2uBZrRDvlElidB5 +IM78TbOfLTCY9x68oNeEkX4iWA3Dh5AO3e/bOewXtCNj1K0GJQJfNE7tJkt/GXdWWMrcM rgNu9xko4oEq09NoBCtIQHR+WbK+x8zV0xDKXicrG8KlorW2M1vcC4vyjFg6+OM2JulFY6 lSktsOXzHGA6QH5lGOWII5YFYOsT1qS6W0eAX9h7MKv1fRmjpjrBFqmMJA354V8wG3dosf bqLQ0Te7hhqdXFHzDNb1QMc8ToQ1DcXdHuKW80D/Iubgj0KWTVM/xG8EDH9Kug== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778798324; a=rsa-sha256; cv=none; b=GvQJdN1t5y907yF2a05PTF9i6W7KaDClPC+4kp74nGMvdoKScE9/oUA2m0xIGHg9ELjcOj C6acSuV3N4CMhLfVs3NAOUnfDqbeeQ1/YzGOxxkqVtYE7rBwGtnerbV+H+CpxhDiTnHj6g miqCCpx0DaB+eCgYyH4Hc01JEQfhP3CQegbhVQkGlsaiOZmSOPPLsq/qzxR0rgtLZsYiGW WxBSbFoCf5ieK/goE3atBzut/tsf+icEnrSWo62kSxaC1OG7TQoSt4jTzt1wQey0fbv6Wa pnFqluDPNMt8lxqu0D7yCjurcnUNccGb9OYukUnI1p3qBcNZQO8yhb6HIroqhw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778798324; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mtGvXsGsX2T/1aptzL1iqxQ9eVc8jU2KqCOiDX+I3g0=; b=gPVasdf70vHhuJEdlsi8TXYSWpOUhSCnqzA9XEhgNWyoMXeWcfN7ry160zNVMSvMYVeEps qhIKEIRBcUJ/t4djCMNi1X+MDxc+4B0aY3k6y0R0ltyj6yNL72FPre8A7DZm3hC+LGT9eK TqW/c99VEdF1B2NfjZWLH1dc3aROsmhNNc4f5bMXhuyPq1f/aCq03pN2rAP1x5mmmKbxNb pJqNGxm00dy/PkV2g2BfMRr5wALTjy6cN1RRbT7gYJIyBfkpnEpKP0+jvdLWfECLMcIoHl WJOc70eIk4KYfoHeg3UJ2YgJ9EHG6bnudwuEGA06vLrq63Im9agbHFIJvYPZ0Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gGlc43svLzwvY for ; Thu, 14 May 2026 22:38:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 44aec by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 14 May 2026 22:38:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 1ae97c95d025 - stable/15 - Cloud releases: More firstboot_pkg_upgrade List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 1ae97c95d025277fb542936b0a2686180dd4a7b7 Auto-Submitted: auto-generated Date: Thu, 14 May 2026 22:38:44 +0000 Message-Id: <6a064ef4.44aec.1e46ff59@gitrepo.freebsd.org> The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=1ae97c95d025277fb542936b0a2686180dd4a7b7 commit 1ae97c95d025277fb542936b0a2686180dd4a7b7 Author: Colin Percival AuthorDate: 2026-05-14 21:14:09 +0000 Commit: Colin Percival CommitDate: 2026-05-14 22:38:12 +0000 Cloud releases: More firstboot_pkg_upgrade Update a couple more cloudware images which I forgot about earlier. Reviewed by: ziaee Fixes: 464a351267dc ("Cloud releases: Switch to firstboot_pkg_upgrade") Differential Revision: https://reviews.freebsd.org/D57006 (cherry picked from commit 4080419d9a2d88d44d20baaf3ea01934561819c1) --- release/tools/basic-cloudinit.conf | 7 ++++--- release/tools/ec2-small.conf | 9 ++++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/release/tools/basic-cloudinit.conf b/release/tools/basic-cloudinit.conf index 98e11f0bb08b..621165ea1669 100644 --- a/release/tools/basic-cloudinit.conf +++ b/release/tools/basic-cloudinit.conf @@ -8,16 +8,17 @@ export CONFIG_DRIVE=YES export CONFIG_DRIVE_SIZE=1M # Packages to install into the image we're creating. -# * firstboot-freebsd-update, to install security updates at first boot. -export VM_EXTRA_PACKAGES="${VM_EXTRA_PACKAGES} firstboot-freebsd-update" +# * firstboot-pkg-upgrade, to install security updates at first boot. +export VM_EXTRA_PACKAGES="${VM_EXTRA_PACKAGES} firstboot-pkg-upgrade" # Set to a list of third-party software to enable in rc.conf(5). -export VM_RC_LIST="${VM_RC_LIST} firstboot_freebsd_update growfs sshd nuageinit" +export VM_RC_LIST="${VM_RC_LIST} firstboot_pkg_upgrade growfs sshd nuageinit" vm_extra_pre_umount() { cat << EOF >> ${DESTDIR}/etc/rc.conf dumpdev="AUTO" ifconfig_DEFAULT="SYNCDHCP accept_rtadv" +firstboot_pkg_upgrade_repos="FreeBSD-base" # RSA host keys are obsolete and also very slow to generate sshd_rsa_enable="NO" EOF diff --git a/release/tools/ec2-small.conf b/release/tools/ec2-small.conf index 6564a59c2cf6..f5904d5ea4ba 100644 --- a/release/tools/ec2-small.conf +++ b/release/tools/ec2-small.conf @@ -25,18 +25,21 @@ vm_extra_filter_base_packages() { # Packages to install into the image we're creating. In addition to packages # present on all EC2 AMIs, we install: # * ec2-scripts, which provides a range of EC2ification startup scripts, -# * firstboot-freebsd-update, to install security updates at first boot, +# * firstboot-pkg-upgrade, to install security updates at first boot, # * firstboot-pkgs, to install packages at first boot, and # * isc-dhcp44-client, used for IPv6 network setup. export VM_EXTRA_PACKAGES="${VM_EXTRA_PACKAGES} ec2-scripts \ - firstboot-freebsd-update firstboot-pkgs isc-dhcp44-client" + firstboot-pkg-upgrade firstboot-pkgs isc-dhcp44-client" # Services to enable in rc.conf(5). export VM_RC_LIST="${VM_RC_LIST} ec2_configinit ec2_ephemeral_swap \ - ec2_fetchkey ec2_loghostkey firstboot_freebsd_update firstboot_pkgs \ + ec2_fetchkey ec2_loghostkey firstboot_pkg_upgrade firstboot_pkgs \ growfs sshd" vm_extra_pre_umount() { + # Limit firstboot_pkg_upgrade to the base system. + echo 'firstboot_pkg_upgrade_repos="FreeBSD-base"' >> ${DESTDIR}/etc/rc.conf + # Any EC2 ephemeral disks seen when the system first boots will # be "new" disks; there is no "previous boot" when they might have # been seen and used already. From nobody Thu May 14 22:38:43 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gGlc8716Rz5vwwq for ; Thu, 14 May 2026 22:38: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gGlc85D0Pz3dGd for ; Thu, 14 May 2026 22:38:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778798328; 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; bh=p/xYAuUwwM1U2OtI7Hk7YVORpKOXkkj1BAxp+lINC0A=; b=RKNYdiv4OcpKHelzTuR63sRVzbwNsPm/5thULp1W+KVz0VJi9gUKhfyGV4JC76fIn4Rl9m g17/seElBY4dNurCKUzY+xoFKHODe1g62zDrGZTXwucG75onSQjRQOzWsgG3/6R230jVNT EX6JAWUCBnDP3LNX4wFsNMf1n4jMzrH8qxJDrluST5Iy8aGIEuzcmDBTDLO+md1wHgn9RP bTD+bKwev2u0KG4IhLagYBGdtcIhSuHTtKysorlXgfbAn+z/WADNYJx+gG6hMusfrNMOGY rMR0LPCfmcXiZ2ATMJXd50EcXiM/4/vEVTIQ1YkEdFosgDmNxWZI+5l9AWlU9g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778798328; a=rsa-sha256; cv=none; b=vHR6IHrkyyIixOt1DvZnFPeNbGVkeBpHqrDvu8uw98LztpdusjZiQd+h49zrmevntC3U8k ill0iAPmgjn53aNt7mX5/1ScbB6ONhxo++9MwNn/Khnit/uQD6uBqBhNy5/vT4do5vgt1A UyvY7UnTd2Fz0XjHKWcWcO6kxapkn1nWhWEepGhsKTjY+mEbCs7RJbZ6vEoIwPVziQs+dx vM8H431FclDCS/bKolmzk3q2rQx9yqWajw7Y42SAMNMwnhE9nqWCAEnRGMgxsl8et5+0Wh loKC0MJLpDOVvyWczs4ga2Gy9A6ph1d3YyTrFBlrkUh+9Sw6j0uIVhOAiyNeCA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778798328; 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; bh=p/xYAuUwwM1U2OtI7Hk7YVORpKOXkkj1BAxp+lINC0A=; b=B5dZTDpHPyySLctc3DD60LAjexV5WbT4FBRPwB7tkUdggfwN9Ku3bfwBpJM1Xr3WLDJC0F P+FEaVJwq66LTRd6n41yH5aSaWLHxGyN2SmDycvEefFLeaZDbZl0q4+2YpaulASGU2n+93 VAfyW01/PNerKcS9MAGB/ue868UIJZoG1tlj/Yg15yUxCD72Yz5og8qLKkjJEr7VYO+6k2 WfavJt8+NAr5H+OPqrMgjAcUt7mExxnby584PXCNf3fMh67HXKP/fY+0LwLi2jZKYeGtCf 1FQZbYiac0l992YFx5N18HIHJ2OGuwtMxy4jFwEeBefruFcpUwivDQEVg6zmHA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gGlc84mGyzwdt for ; Thu, 14 May 2026 22:38:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4455f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 14 May 2026 22:38:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Alexander Ziaee From: Colin Percival Subject: git: 0bb2b2a45f3c - stable/15 - Cloud releases: Switch to firstboot_pkg_upgrade List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 0bb2b2a45f3c0c147d7c55e010be45e55af8df87 Auto-Submitted: auto-generated Date: Thu, 14 May 2026 22:38:43 +0000 Message-Id: <6a064ef3.4455f.62432907@gitrepo.freebsd.org> The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=0bb2b2a45f3c0c147d7c55e010be45e55af8df87 commit 0bb2b2a45f3c0c147d7c55e010be45e55af8df87 Author: Alexander Ziaee AuthorDate: 2026-05-14 21:05:07 +0000 Commit: Colin Percival CommitDate: 2026-05-14 22:38:12 +0000 Cloud releases: Switch to firstboot_pkg_upgrade Cloud images are deployed with base system packages. Introduce a firstboot package auto updater to patch the base system on first boot. MFC after: 1 hour MFC to: stable/15 Reviewed by: cperciva Sponsored by: Google Cloud Differential Revision: https://reviews.freebsd.org/D56890 (cherry picked from commit 464a351267dc0d1843b919dd72ad1c70c24815ce) --- release/tools/azure.conf | 5 +++-- release/tools/ec2-base.conf | 9 ++++++--- release/tools/gce.conf | 5 +++-- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/release/tools/azure.conf b/release/tools/azure.conf index 7a4f0b5027cf..9a5c12424bd3 100644 --- a/release/tools/azure.conf +++ b/release/tools/azure.conf @@ -6,10 +6,10 @@ export VMSIZE=30g # Set to a list of packages to install. -export VM_EXTRA_PACKAGES="azure-agent python python3 firstboot-freebsd-update firstboot-pkgs" +export VM_EXTRA_PACKAGES="azure-agent python python3 firstboot-pkg-upgrade firstboot-pkgs" # Set to a list of third-party software to enable in rc.conf(5). -export VM_RC_LIST="ntpd sshd waagent firstboot_freebsd_update firstboot_pkgs" +export VM_RC_LIST="ntpd sshd waagent firstboot_pkg_upgrade firstboot_pkgs" # No swap space; waagent will allocate swap space on the resource disk. # See ResourceDisk.EnableSwap and ResourceDisk.SwapSizeMB in waagent.conf @@ -43,6 +43,7 @@ vm_extra_pre_umount() { cat << EOF >> ${DESTDIR}/etc/rc.conf ifconfig_hn0="SYNCDHCP" ntpd_sync_on_start="YES" +firstboot_pkg_upgrade_repos="FreeBSD-base" EOF cat << EOF >> ${DESTDIR}/boot/loader.conf diff --git a/release/tools/ec2-base.conf b/release/tools/ec2-base.conf index ffe2646240a5..24b2feb5f0d7 100644 --- a/release/tools/ec2-base.conf +++ b/release/tools/ec2-base.conf @@ -7,15 +7,15 @@ # * amazon-ssm-agent (not enabled by default, but some users need to use # it on systems not connected to the internet), # * ec2-scripts, which provides a range of EC2ification startup scripts, -# * firstboot-freebsd-update, to install security updates at first boot, +# * firstboot-pkg-upgrade, to install security updates at first boot, # * firstboot-pkgs, to install packages at first boot, and # * isc-dhcp44-client, used for IPv6 network setup. export VM_EXTRA_PACKAGES="${VM_EXTRA_PACKAGES} amazon-ssm-agent ec2-scripts \ - firstboot-freebsd-update firstboot-pkgs isc-dhcp44-client" + firstboot-pkg-upgrade firstboot-pkgs isc-dhcp44-client" # Services to enable in rc.conf(5). export VM_RC_LIST="${VM_RC_LIST} ec2_configinit ec2_ephemeral_swap \ - ec2_fetchkey ec2_loghostkey firstboot_freebsd_update firstboot_pkgs \ + ec2_fetchkey ec2_loghostkey firstboot_pkg_upgrade firstboot_pkgs \ growfs sshd" vm_extra_pre_umount() { @@ -24,6 +24,9 @@ vm_extra_pre_umount() { # via EC2 user-data. echo 'firstboot_pkgs_list="devel/py-awscli"' >> ${DESTDIR}/etc/rc.conf + # Limit firstboot_pkg_upgrade to the base system. + echo 'firstboot_pkg_upgrade_repos="FreeBSD-base"' >> ${DESTDIR}/etc/rc.conf + # Any EC2 ephemeral disks seen when the system first boots will # be "new" disks; there is no "previous boot" when they might have # been seen and used already. diff --git a/release/tools/gce.conf b/release/tools/gce.conf index 7298aabf3956..938672ac92e0 100644 --- a/release/tools/gce.conf +++ b/release/tools/gce.conf @@ -6,14 +6,14 @@ export VMSIZE=20g # Set to a list of packages to install. -export VM_EXTRA_PACKAGES="${VM_EXTRA_PACKAGES} firstboot-freebsd-update \ +export VM_EXTRA_PACKAGES="${VM_EXTRA_PACKAGES} firstboot-pkg-upgrade \ firstboot-pkgs google-cloud-sdk panicmail sudo \ sysutils/py-google-compute-engine lang/python \ lang/python3" # Set to a list of third-party software to enable in rc.conf(5). export VM_RC_LIST="ntpd sshd growfs \ - firstboot_pkgs firstboot_freebsd_update google_startup \ + firstboot_pkgs firstboot_pkg_upgrade google_startup \ google_accounts_daemon google_clock_skew_daemon \ google_instance_setup google_network_daemon" @@ -47,6 +47,7 @@ ifconfig_DEFAULT="SYNCDHCP mtu 1460" ntpd_sync_on_start="YES" # need to fill in something here #firstboot_pkgs_list="" +firstboot_pkg_upgrade_repos="FreeBSD-base" panicmail_autosubmit="YES" EOF From nobody Thu May 14 23:06:59 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gGmDm2z3kz5w0QR for ; Thu, 14 May 2026 23:07: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gGmDm2M1Jz3jh2 for ; Thu, 14 May 2026 23:07:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778800024; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YwtsxHU074/RVroGOJcUe/gadotTGvs/4jPz02QMmGg=; b=RDzLnSAgW/nM87EXPgRVNhjl30g8YrRDAWx+gobvathGBlflglyIfbIHG4YYJtQqKRkM/p PD6f8DSNYlY8BnStG+8N5S8ru3JVzwbO261hCPBsIpSXAHQ6ltn+ycPTMzUUIN2c9Ur3BH PUPN2437gXNvbIwhuIklnsPBKG6iJcGVTKLSirPILXgD3GILJDtwf6/qeNH+N7E7XhopvI pS/kIRpDgTVqKFPhCvNpz4dyf/C+5wYtvG4r5dXyMSHu+XSGG5WM2+sN72v0v2MZ3cR261 3CiPslUlCmoUZhjFolECKSYBijEWbWQLAQS1aqP+yYQmHD+wCCxD3MeqAWwwxA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778800024; a=rsa-sha256; cv=none; b=Qt/giOCRIjDr9jiwhg7zA96DcHCufPvFUAQnMzkuG2bLD7Ph63OVu19zffLjbx5u9eY0y0 D6bSvx0AQjPFdPYkuv1L0LjF7yGqgY4bj3ei9yDQYRjsVMkIxV1WLErzGVZQeT/9IlhF2X PXMZKCOm+9+se1i3gToezyG+k3vKhajP4lTZIXqqvH0I8U7FXyyvlj3AowY5MUefLh48xz Um4VM2oimdAGSWetrmna/4n0rChNgI6JeHfx1sjxuePmhZOef4YJI5yGFtVxDTQON14FMw qqIXOELIyy0cZ4fiCca+jJENXHFaeEx+adRXXd+yAhwhjlnfkIE7QI+IWQ8VJQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778800024; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YwtsxHU074/RVroGOJcUe/gadotTGvs/4jPz02QMmGg=; b=TTPEQJNeQXCK8p6dWyw5uvQMEZuqm/95d8u79hrFm3eNRKB3YKRyhowmJ+sb07E3W3x1sB 6XqrAQn+AJSUp1iMENfTgwUEDjQr5vdUFb+w0sG7lQp5K7mpnx7psIcUsPXGhD44b+Bz2t 0KnSNhbAS2qJdfFTTTBL5ApTwJVO0GDpGfrMctF5mGVMuplJITvTNGdjRStD6BxWfmXYPW /8gL8sZr7tx4JLjdU6A42T055WKCqrU5oZVxmxyv9i1Y0897TDnJeXPTCm2AeHyOpYwCVo AOCgkP1D1n1kYyb2fhRfOEWU+2XfsCn1w9AqEqGUgHWc4E3UPsZytmIvn/7TBg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gGmDm1yrPzxqh for ; Thu, 14 May 2026 23:07:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4662f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 14 May 2026 23:06:59 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: 074c42ade353 - main - RELNOTES: Add an entry for commit b92b9da33006 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: 074c42ade353caedca05e3234c3cb20f28bf5231 Auto-Submitted: auto-generated Date: Thu, 14 May 2026 23:06:59 +0000 Message-Id: <6a065593.4662f.4707b2c3@gitrepo.freebsd.org> The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=074c42ade353caedca05e3234c3cb20f28bf5231 commit 074c42ade353caedca05e3234c3cb20f28bf5231 Author: Rick Macklem AuthorDate: 2026-05-14 23:04:26 +0000 Commit: Rick Macklem CommitDate: 2026-05-14 23:04:26 +0000 RELNOTES: Add an entry for commit b92b9da33006 --- RELNOTES | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/RELNOTES b/RELNOTES index d8c64f989830..0a25313d3f77 100644 --- a/RELNOTES +++ b/RELNOTES @@ -10,6 +10,11 @@ newline. Entries should be separated by a newline. Changes to this file should not be MFCed. +b92b9da33006, 13d3bd165e22: + This patch allows vfs.nfsd.srvmaxio to be set to + a value as high as 4Mbytes. It is usually set + via the nfs_server_maxio variable in /etc/rc.conf. + 4c486fe40267: The multicast routing modules, ip_mroute and ip6_mroute, are now FIB-aware. That is, there is a multicast routing table per FIB, rather than a global From nobody Thu May 14 23:34:40 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gGmrd0fsXz5w2v3 for ; Thu, 14 May 2026 23:34: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gGmrc5ByYz3q3M for ; Thu, 14 May 2026 23:34:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778801680; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RYljEDdkQp9FuqLYtqXf0EqLtOVKZhUx3lxWmQq6HGM=; b=EeJBtspEyZJvn+TdtnpQMLBl09e50qGTxsXbbdcvkLxrpfz9VteFjpzcSJfcIeENoUyO/H UIz+nwsuqhvVZiY0QQ5DL9ui2RK1EtfudpJgolAoa14JylL1+gi9HZIh2lKj94NpQ76iPo gyTuzVIUenJ2NS+pdBRbd3kqrAED/3J2gqKix7BNjrSZCIDM9v5hl2n1U/Abbe64X+PrlX cGu3K3dpAGQtdo6XyUpt2OQqNOke1U7jjF2oRdgZniL5ruGEsgwMxAZp3lPatABXmdiYHM QQRJW53es4qHP4k7qvf+Cz2bX6COxPBsL1yEE4nf2Zqqhc2xiQcnzNvXwmKoeg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778801680; a=rsa-sha256; cv=none; b=ANSIQKW4NgeSHnkMPhkHMksncRCMpii+tXwlgMDzIh7AZvkzQRQMiqhHn3wv8tgQH/K0SM PhJjF/phgvGMJqtVuAw98VwZrwcAdMD8FoXALofqGG8egyX8rS9PjCNEro4cEJMD/+bAbs rVSnO+3BePVAtLq5J68ijm43VVno/lEl5X6YtDGVEy4hbxmuq7RAYMwT28XvXhL4Ar8uBG gl2Yj7PWsiRhww5k1XJfan9+uMSsO2OmkhF+BjroJ9+Ifiibtw0BxgQI2L4O+DZs2/NA1f Irih1ckZffAbzez1E9NizRZ6ppTa0Ji/Ah3SN+UYBal7+ogxYuJv+GL4QtfocA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778801680; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RYljEDdkQp9FuqLYtqXf0EqLtOVKZhUx3lxWmQq6HGM=; b=ZlIQmqFwo2xT6bdLMSxioHUX2NJevWi+KTZ5AXdiDpscT1OMGMh4M33QdiwGOLEDUcsE7+ KwLBgaS4jDVVNr9i1jm+CL+ahslVGt5TzmuM5IZ9O/HKMAOcFayCCWYwqYUkBAdTdJsC3p djq80+mk8Jx3IXbPOXrGN/z8eIwEw7skvtGYnrNYTieR79EklxSGu4aCEtZoLAQAEVHjHb DW9ElHroAljcdhdsq8lMIzaH5Hn2/+kkhA+s+E9BSSAe0rGnyFIB9gO65DjA2QS1p+pbcv Y2I9cS6mMeM5phe9HvXS6o2P5tTO//nqy4VbRcFB1fHCM0trkXUAuGi8WFwqZA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gGmrc4Vd8zyd3 for ; Thu, 14 May 2026 23:34:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1a5a0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 14 May 2026 23:34:40 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Ziaee Subject: git: 635743c6ec35 - stable/15 - freebsd-base.7: Document adding a local repo List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 635743c6ec35f11434339f79222fb0a259ed8bfb Auto-Submitted: auto-generated Date: Thu, 14 May 2026 23:34:40 +0000 Message-Id: <6a065c10.1a5a0.6c2263d6@gitrepo.freebsd.org> The branch stable/15 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=635743c6ec35f11434339f79222fb0a259ed8bfb commit 635743c6ec35f11434339f79222fb0a259ed8bfb Author: Alexander Ziaee AuthorDate: 2026-05-06 21:23:52 +0000 Commit: Alexander Ziaee CommitDate: 2026-05-14 23:34:06 +0000 freebsd-base.7: Document adding a local repo MFC after: 1 day Discussed with: bcr, ivy, kevans, ngie Differential Revision: https://reviews.freebsd.org/D56608 (cherry picked from commit c4af3f13a4e9932968d92872aaf22312a6e79e4e) --- share/man/man7/freebsd-base.7 | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/share/man/man7/freebsd-base.7 b/share/man/man7/freebsd-base.7 index 51de679ea9d1..d1857b2dbbec 100644 --- a/share/man/man7/freebsd-base.7 +++ b/share/man/man7/freebsd-base.7 @@ -14,7 +14,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd April 14, 2026 +.Dd April 23, 2026 .Dt FREEBSD-BASE 7 .Os .Sh NAME @@ -217,6 +217,27 @@ for a different target than the host system): pkg -r /ppcdev -oABI=FreeBSD:16:powerpc64le \e install FreeBSD-set-devel .Ed +.Ss Adding a locally built repository for snapshots +Disable the predefined repository, +and add a local repo for locally built base system packages: +.Bd -literal -offset indent +cat << EOF > /usr/local/etc/pkg/repos/FreeBSD.conf +FreeBSD-base: { enabled: no } +FreeBSD-local: { + url: "file:///usr/obj/usr/src/repo/${ABI}/latest", + enabled: yes +} +EOF +.Ed +.Pp +The packages are created by the +.Xr build 7 +system at +.Pa ${REPODIR}/${PKG_ABI}/ , +which defaults to the example directory. +.Pp +.Sy Note : +The repo must have a different name than the predefined repository. .Ss Unregister a currently running system Systems managed through .Xr pkg 8 From nobody Fri May 15 00:00:53 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gGnQt2DtHz5w4hF for ; Fri, 15 May 2026 00:00: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gGnQt0tQqz3t9n for ; Fri, 15 May 2026 00:00:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778803254; 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; bh=ptEF0e/tcQC1ujudPG7KiZLdIY1R4vz6xM8cJc/WYeE=; b=lrvrOJlEi9tAihbKXwSuu5L7Wibiq8kRcW0iVjZLHzSo7fB2zeD/E11Gm6zlJJbfXpscuo q4ehmsm4u3vrOh0DVvyXbbmeLayDPCbSpzmkOOg9h7vANtPId90uUqu32iOuOP1Q4IPtB9 C7zgLTrEDpGr0byn62qDgSu4jTZClxyg3viz5Xcz1gtAK2t21wdOmCjxuKOHkWw6tWHlfo +gZa4c8qrzfda+buFcYHsMFNtnWizuPoywTbG30kpAZveubGFHYBooCMGYoexnDXl6PZg3 +Hz2xRKob0nOf2TOWvaGXu//ydsu1p8d5CPd2oHcBI9fXbRSXfidSRYZ2IR76g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778803254; a=rsa-sha256; cv=none; b=QBcJPoQQrBBM//sLTshWUh92QtktS5DyA1Ex/fMldlzzdc1L2FDKvR0CE6/DN1+xbxBE8/ qnVATbcKzWKRoWG+g436ekbIZPoAn8UMdoS5TtRQJJFJAdj5QUBFhOFrACacocEVGkJKBe nSbZWQAAp6mBnWi3V7uEPRJkNi5alhBxbyzBZoIcFcy9vCtPvZ2jrL5QZVm+XV28iV3O4m 0A4XhZuuEWidt3o5SbzJRauY4P1fFz/0ko+/8+kSfrnP9LbB0hchiru/voAtRWu1n99hBE LKfKhbLE7K+b1+0i8MaHxm6HOE6gdxUw/gpE9HapTc+g0KiHVosmrwUdG6raig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778803254; 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; bh=ptEF0e/tcQC1ujudPG7KiZLdIY1R4vz6xM8cJc/WYeE=; b=opsqeXx5U2rW06FD0y2E+gVJ6jA9Pefs98CcVZMmjoX+1lmYjI1Oyv0BJI3sQLWuXYmBzY GR5GHmJcuWZtX6xxDU0qURGIu1L0qqbrU2+TfXlNluKUyFSLbsP0fMdvHxz1NegYxHEDId Saif5uLVuOSyRJfps7psfrkXJwgEqZfO8dOjLBFcpRzJ4EwcD5RZD8we7oydVtroVf/3cm otwwtdjiLP1OJqG4qKkvHXn4QmWtEm+sZojt39vPpV8eTzhu4aTStkkU3giV2EEZEBvuRS ZEyaX4LbI2qEmsBeTsT2rjlhgOtYEQ3L6mQg91NJD1/1hDEBMQA7yvqaTmZ4MQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gGnQs73hszysg for ; Fri, 15 May 2026 00:00:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e955 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 15 May 2026 00:00:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Alexander Ziaee From: Colin Percival Subject: git: a02091d590aa - releng/15.1 - freebsd-base.7: Document adding a local repo List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.1 X-Git-Reftype: branch X-Git-Commit: a02091d590aaf35000a6c6dafdfe076d33f2b291 Auto-Submitted: auto-generated Date: Fri, 15 May 2026 00:00:53 +0000 Message-Id: <6a066235.1e955.7baa8d6a@gitrepo.freebsd.org> The branch releng/15.1 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=a02091d590aaf35000a6c6dafdfe076d33f2b291 commit a02091d590aaf35000a6c6dafdfe076d33f2b291 Author: Alexander Ziaee AuthorDate: 2026-05-06 21:23:52 +0000 Commit: Colin Percival CommitDate: 2026-05-14 23:58:52 +0000 freebsd-base.7: Document adding a local repo Approved by: re (cperciva) MFC after: 1 day Discussed with: bcr, ivy, kevans, ngie Differential Revision: https://reviews.freebsd.org/D56608 (cherry picked from commit c4af3f13a4e9932968d92872aaf22312a6e79e4e) (cherry picked from commit 635743c6ec35f11434339f79222fb0a259ed8bfb) --- share/man/man7/freebsd-base.7 | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/share/man/man7/freebsd-base.7 b/share/man/man7/freebsd-base.7 index 51de679ea9d1..d1857b2dbbec 100644 --- a/share/man/man7/freebsd-base.7 +++ b/share/man/man7/freebsd-base.7 @@ -14,7 +14,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd April 14, 2026 +.Dd April 23, 2026 .Dt FREEBSD-BASE 7 .Os .Sh NAME @@ -217,6 +217,27 @@ for a different target than the host system): pkg -r /ppcdev -oABI=FreeBSD:16:powerpc64le \e install FreeBSD-set-devel .Ed +.Ss Adding a locally built repository for snapshots +Disable the predefined repository, +and add a local repo for locally built base system packages: +.Bd -literal -offset indent +cat << EOF > /usr/local/etc/pkg/repos/FreeBSD.conf +FreeBSD-base: { enabled: no } +FreeBSD-local: { + url: "file:///usr/obj/usr/src/repo/${ABI}/latest", + enabled: yes +} +EOF +.Ed +.Pp +The packages are created by the +.Xr build 7 +system at +.Pa ${REPODIR}/${PKG_ABI}/ , +which defaults to the example directory. +.Pp +.Sy Note : +The repo must have a different name than the predefined repository. .Ss Unregister a currently running system Systems managed through .Xr pkg 8 From nobody Fri May 15 00:00:55 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gGnQv4VR0z5w4YX for ; Fri, 15 May 2026 00:00: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gGnQv0tGvz3tLJ for ; Fri, 15 May 2026 00:00:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778803255; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sqJU6uECUD78tEk7JvCTw97N+63yuNSxZEbLOW9+ZOE=; b=QSVY5iil7VpZf5f9iF7k/Jy+x8WEp36PXjv8nK4ZeeTPQ4fpmehOf9FfDfHigZL94WE0lm 3AgrMbGVPpJElbe6e8A1t3fdhrEMs6rl+TEILj9nTi1meNCT4MdLawMPoAJ9PAkhT8wxBu NS10wo3HXFwqmI56sCVLsxlvtawPfmMoW4MW51cC+crCIg2zf7pgWdHo+PH8LfFy/aazc2 qmMHGmPeA2VmfeFyOdsetOGV+5xP6L3zzwdB/y3OShM2cshEnT2MjpjxeTLfsz3/eA5lc5 Kmi8ll285NR5dUeqLL9g8vb7mR9Jr/2vJN7xH7ixY88JQ8gsSBv0quHIySiVGA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778803255; a=rsa-sha256; cv=none; b=ZGQn7URllNREmZHOu5Wc7ad8TBWEpu+pHjNdT9b6gwr8TzSdgVP6CJUjKmSULAPdyKVI3D S8j6EZ6VO/RSsyB2NwzYxqaX+L5BDiaOQMop4Ug80EYjDiv6GEzL2OuVUKI9UpJ1aP0I6p q0CA32o4bHHiwyVdg41Y/6EWLRNUPL7ZaCznzsZs+oCrY+2yECq/dnxyQawY1wMTtQFTkX 5vfqP9rg2T7YZnggF+KAqPnmtXupB85+IdTQoyz+QYdHbzqD2thtJM3bpbXvtaMQxd1zQ6 vslymKRyKcfOFJEzF7yJd0fB8Q3ahPDwolvrp1GbHFK7YNvCbxAAGEmsyUAmXQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778803255; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sqJU6uECUD78tEk7JvCTw97N+63yuNSxZEbLOW9+ZOE=; b=IzhhplGPbb6X7xQPWIANyMy+BSGHAsPslvc5FsW9UXxo832PKJgL3HDtPSfd5wTg7NroCi N8YNcb8fRaQey8UfQ5SV+F+CCN5FUsQ10DSQy3LEHWGYJVgJSXSk396pMyrUV0EYbDzL0J /Jo/VAYNJ8IRhxZbuaDp57GLThLCOvC91ao2N7BMKCXP1amfWfktm+ZBo6a8h8mzL7qEcQ C5ONvPSrW8rHUdV+EVdaTTQ5b545IepoCpMvTHFMYmF5qZIoukNnKQ4l+B/5xgDcWluith BiSMmG1D+dWThEUMa2qTZqVWyS+kd30pEhhtWWyIA2OEV4ygLakEYbbHM9uonQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gGnQv0NLRzyfV for ; Fri, 15 May 2026 00:00:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e48b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 15 May 2026 00:00:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: ac2daab55062 - releng/15.1 - 15.1: Update to BETA3 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.1 X-Git-Reftype: branch X-Git-Commit: ac2daab5506280a2fa271c476a7f51ca8d9f13c0 Auto-Submitted: auto-generated Date: Fri, 15 May 2026 00:00:55 +0000 Message-Id: <6a066237.1e48b.306a0b1f@gitrepo.freebsd.org> The branch releng/15.1 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=ac2daab5506280a2fa271c476a7f51ca8d9f13c0 commit ac2daab5506280a2fa271c476a7f51ca8d9f13c0 Author: Colin Percival AuthorDate: 2026-05-15 00:00:36 +0000 Commit: Colin Percival CommitDate: 2026-05-15 00:00:36 +0000 15.1: Update to BETA3 Approved by: re (implicit) Sponsored by: OpenSats Initiative --- sys/conf/newvers.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index cbf4cab89dc5..39986494bbf6 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -51,7 +51,7 @@ TYPE="FreeBSD" REVISION="15.1" -BRANCH="BETA2" +BRANCH="BETA3" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi From nobody Fri May 15 00:00:52 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gGnQz0mmJz5w4Ys for ; Fri, 15 May 2026 00: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gGnQy5263z3tNx for ; Fri, 15 May 2026 00: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=1778803258; 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; bh=VqhXZ1EFvVZb+F8ZstLjUkv6te2Es62zfMFHbjzKAIY=; b=RzL0u6rb+O/0hr9fJLEL6/8eVjLQsnGNbGNg7Tc0Qw4YJflNefj9Au0amXrkIIjmtAYY5e 8arRD2pcEUcT3oLeB3XlSEN0mTD24Swtx3Dif5XSKeQB26yhd7mDlnwW2u0h5t9+oX+BFH Ox1l3ZuQsHEY8DcMuvy7Omw/Sx5mma2mXfexepRdk9zH9+4bs8ILmM+PvtvIJa0ZYr4yPo obhIc+AdyTiDERc3KM7HRcsuYNzvLn2wNwWsA0u5RgmWQuZkD2+6s/wkaKY4SfNoObjHQA +WjLbCHZ32FHNQI6wHzCkxlcIhHV7YUNISY02DnIlh7e1cQpGD+o3I3HJMfJxA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778803258; a=rsa-sha256; cv=none; b=g20eh0BB/15lVafQAwl/1KYFeKPsIRkF0DcuqXwCyXNiZXbUn4yWk+hGifFMJMq82MhNBa 9rqo1rGWTNlh/jaY7S77ZLOKE3cX/n5T2601o6w+DojJenl0U5r7bc67rZDGUzFc6Wm7qe NCHCSwFl5nEbnOhW12nV/ogRfeEmZtMccm17ARfh4ceyEmI+7XUZp+xx0V/oGtqE0JM1gi y9tGr3CNd47P8HIEA/ZXRbgjLBsaDK41ZEKTpPmvs+qw+hcnV6BCkB+QOVm2zziyd4nygt mh0xL3S0w85isluoSvtCywqeGk4Wji8kCoQbWypgTZjvjvqJZQ82q871ErBq9g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778803258; 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; bh=VqhXZ1EFvVZb+F8ZstLjUkv6te2Es62zfMFHbjzKAIY=; b=qnh1+doUgJUVOIijvt+NPPdyh3kzFQscytv+N/zUQYyNGrWLGzaZZsG0PieHs+Nn6khVeu QEOXfmAiLHACthaRwAwuC6R5ttjneuQ9rhPRQCLeStQyQdd20cad/hBESaC7kVAVEx0Edp SYD8k6mg28MfWxPiD4mInobBV0U+lz+niam805KkogMlTpv6y1yomrmtDe525L5qxbKJzO BkrK/JmMKIgKtaWySuE9OlO7l7z0UxkYtn4SG0rzVtpmybRQbAQ0CX46T8bTndC/7NRyoY 2CD5kK+C47FlbXxPG6BoEzfgRm1gi1nT5owzHqMksYphRPda3XI3t7JoStY0qw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gGnQy1MhszyfW for ; Fri, 15 May 2026 00:00:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1d57e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 15 May 2026 00:00:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Martin Matuska From: Colin Percival Subject: git: 409247a6cbd1 - releng/15.1 - zfs: merge openzfs/zfs@6330a45b0 (zfs-2.4-release) into stable/15 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.1 X-Git-Reftype: branch X-Git-Commit: 409247a6cbd11e3510025e025f3b82184c3de17c Auto-Submitted: auto-generated Date: Fri, 15 May 2026 00:00:52 +0000 Message-Id: <6a066234.1d57e.6807ba65@gitrepo.freebsd.org> The branch releng/15.1 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=409247a6cbd11e3510025e025f3b82184c3de17c commit 409247a6cbd11e3510025e025f3b82184c3de17c Author: Martin Matuska AuthorDate: 2026-05-13 19:53:01 +0000 Commit: Colin Percival CommitDate: 2026-05-14 23:58:46 +0000 zfs: merge openzfs/zfs@6330a45b0 (zfs-2.4-release) into stable/15 OpenZFS 2.4.2 Notable upstream pull request merges: #18208 6f14581e1 Cleanup allocation class selection #18235 7590972f7 Prevent range tree corruption race by updating dnode_sync() #18255 b06caaeec range_tree: use zfs_panic_recover() for partial-overlap remove #18258 33961142a Fix deadlock on dmu_tx_assign() from vdev_rebuild() #18262 02ed09106 Fix check for .cfi_negate_ra_state on aarch64 #18263 9f92266b7 Fix redundant declaration of dsl_pool_t #18276 3862aadf7 Fix vdev_rebuild_range() tx commit #18290 a94b137aa FreeBSD: Improve dmesg kernel message prefix #18294 938c8c98b draid: fix data corruption after disk clear #18310 b40cd9191 Fix s_active leak in zfsvfs_hold() when z_unmounted is true #18380 9b8ccbd2c draid: fix import failure after disks replacements #18399 4bb759274 Add support for POSIX_FADV_DONTNEED #18403 aba3ed30a fix memleak in spa_errlog.c #18405 e9a8c6e08 draid: allow seq resilver reads from degraded vdevs #18414 da44040bb draid: fix cksum errors after rebuild with degraded disks #18421 e7524594a Fix read corruption after block clone after truncate #18440 b8addf922 dmu_direct: avoid UAF in dmu_write_direct_done() #18473 76fd64ac9 Fix rare cksum errors after rebuild #18482 fc87e269e Initialize vr_last_txg for rebuild #18489 38501e182 Fix long POSIX_FADV_DONTNEED for single block files Approved by: re (cperciva) Obtained from: OpenZFS OpenZFS commit: 6330a45b06d20125de679aae5f63ba14082671ef OpenZFS tag: zfs-2.4.2 (cherry picked from commit a40f24ec28554c2387e766a47d2d4cb910d95865) --- .../openzfs/.github/workflows/checkstyle.yaml | 7 +- sys/contrib/openzfs/.github/workflows/codeql.yml | 2 +- .../.github/workflows/scripts/generate-ci-type.py | 33 +- .../.github/workflows/scripts/merge_summary.awk | 38 ++ .../.github/workflows/scripts/qemu-1-setup.sh | 43 +- .../.github/workflows/scripts/qemu-2-start.sh | 81 ++- .../.github/workflows/scripts/qemu-3-deps-vm.sh | 22 +- .../.github/workflows/scripts/qemu-4-build-vm.sh | 11 +- .../.github/workflows/scripts/qemu-6-tests.sh | 4 +- .../.github/workflows/scripts/qemu-7-prepare.sh | 47 +- .../.github/workflows/scripts/qemu-8-summary.sh | 8 +- .../workflows/scripts/qemu-9-summary-page.sh | 4 +- sys/contrib/openzfs/.github/workflows/smatch.yml | 4 +- sys/contrib/openzfs/.github/workflows/zfs-arm.yml | 40 ++ .../.github/workflows/zfs-qemu-packages.yml | 25 +- sys/contrib/openzfs/.github/workflows/zfs-qemu.yml | 46 +- sys/contrib/openzfs/.github/workflows/zloop.yml | 7 +- sys/contrib/openzfs/META | 4 +- sys/contrib/openzfs/Makefile.am | 1 + sys/contrib/openzfs/README.md | 42 +- sys/contrib/openzfs/autogen.sh | 1 + sys/contrib/openzfs/cmd/Makefile.am | 1 + sys/contrib/openzfs/cmd/raidz_test/Makefile.am | 1 + sys/contrib/openzfs/cmd/zdb/Makefile.am | 1 + sys/contrib/openzfs/cmd/zed/Makefile.am | 1 + sys/contrib/openzfs/cmd/zed/zed.d/Makefile.am | 1 + sys/contrib/openzfs/cmd/zed/zed_event.c | 2 +- sys/contrib/openzfs/cmd/zfs/Makefile.am | 1 + sys/contrib/openzfs/cmd/zfs/zfs_main.c | 2 +- sys/contrib/openzfs/cmd/zinject/Makefile.am | 1 + sys/contrib/openzfs/cmd/zpool/Makefile.am | 1 + sys/contrib/openzfs/cmd/zpool_influxdb/Makefile.am | 1 + sys/contrib/openzfs/cmd/zstream/Makefile.am | 1 + sys/contrib/openzfs/config/CppCheck.am | 1 + sys/contrib/openzfs/config/Rules.am | 1 + sys/contrib/openzfs/config/Shellcheck.am | 1 + sys/contrib/openzfs/config/Substfiles.am | 1 + sys/contrib/openzfs/config/always-arch.m4 | 1 + .../openzfs/config/always-compiler-options.m4 | 1 + sys/contrib/openzfs/config/always-cppcheck.m4 | 1 + sys/contrib/openzfs/config/always-parallel.m4 | 1 + sys/contrib/openzfs/config/always-python.m4 | 1 + sys/contrib/openzfs/config/always-pyzfs.m4 | 1 + sys/contrib/openzfs/config/always-sed.m4 | 1 + sys/contrib/openzfs/config/always-shellcheck.m4 | 1 + sys/contrib/openzfs/config/always-system.m4 | 1 + sys/contrib/openzfs/config/ax_compare_version.m4 | 1 + sys/contrib/openzfs/config/ax_count_cpus.m4 | 1 + sys/contrib/openzfs/config/ax_python_devel.m4 | 1 + sys/contrib/openzfs/config/ax_restore_flags.m4 | 1 + sys/contrib/openzfs/config/ax_save_flags.m4 | 1 + sys/contrib/openzfs/config/deb.am | 21 +- sys/contrib/openzfs/config/find_system_library.m4 | 1 + sys/contrib/openzfs/config/gettext.m4 | 1 + sys/contrib/openzfs/config/host-cpu-c-abi.m4 | 1 + sys/contrib/openzfs/config/iconv.m4 | 1 + .../openzfs/config/kernel-access-ok-type.m4 | 1 + sys/contrib/openzfs/config/kernel-acl.m4 | 32 + sys/contrib/openzfs/config/kernel-add-disk.m4 | 1 + sys/contrib/openzfs/config/kernel-assign_str.m4 | 1 + sys/contrib/openzfs/config/kernel-automount.m4 | 1 + sys/contrib/openzfs/config/kernel-bio.m4 | 1 + sys/contrib/openzfs/config/kernel-bio_max_segs.m4 | 1 + sys/contrib/openzfs/config/kernel-blk-queue.m4 | 27 + sys/contrib/openzfs/config/kernel-blkdev.m4 | 1 + .../config/kernel-block-device-operations.m4 | 1 + .../openzfs/config/kernel-commit-metadata.m4 | 1 + .../openzfs/config/kernel-config-defined.m4 | 1 + .../config/kernel-copy-from-user-inatomic.m4 | 29 - .../openzfs/config/kernel-cpu_has_feature.m4 | 1 + .../openzfs/config/kernel-declare-event-class.m4 | 1 + sys/contrib/openzfs/config/kernel-dentry-alias.m4 | 32 + .../openzfs/config/kernel-dentry-operations.m4 | 1 + .../openzfs/config/kernel-discard-granularity.m4 | 1 + sys/contrib/openzfs/config/kernel-drop-inode.m4 | 1 + sys/contrib/openzfs/config/kernel-file.m4 | 1 + sys/contrib/openzfs/config/kernel-filelock.m4 | 23 + .../openzfs/config/kernel-filemap-splice-read.m4 | 1 + .../openzfs/config/kernel-flush_dcache_page.m4 | 1 + sys/contrib/openzfs/config/kernel-fmode-t.m4 | 1 + .../openzfs/config/kernel-follow-down-one.m4 | 1 + sys/contrib/openzfs/config/kernel-fpu.m4 | 1 + sys/contrib/openzfs/config/kernel-free-inode.m4 | 1 + sys/contrib/openzfs/config/kernel-fs-context.m4 | 36 ++ sys/contrib/openzfs/config/kernel-fst-mount.m4 | 30 - sys/contrib/openzfs/config/kernel-fsync-bdev.m4 | 1 + .../openzfs/config/kernel-generic_fadvise.m4 | 1 + .../openzfs/config/kernel-generic_fillattr.m4 | 1 + .../openzfs/config/kernel-generic_io_acct.m4 | 1 + sys/contrib/openzfs/config/kernel-genhd-flags.m4 | 1 + sys/contrib/openzfs/config/kernel-get-disk-ro.m4 | 1 + sys/contrib/openzfs/config/kernel-iattr-vfsid.m4 | 1 + sys/contrib/openzfs/config/kernel-idmap_mnt_api.m4 | 1 + sys/contrib/openzfs/config/kernel-inode-create.m4 | 1 + sys/contrib/openzfs/config/kernel-inode-getattr.m4 | 1 + sys/contrib/openzfs/config/kernel-inode-lookup.m4 | 1 + .../openzfs/config/kernel-inode-permission.m4 | 1 + sys/contrib/openzfs/config/kernel-inode-setattr.m4 | 1 + sys/contrib/openzfs/config/kernel-inode-state.m4 | 1 + sys/contrib/openzfs/config/kernel-inode-times.m4 | 1 + .../openzfs/config/kernel-insert-inode-locked.m4 | 1 + .../openzfs/config/kernel-is_owner_or_cap.m4 | 1 + sys/contrib/openzfs/config/kernel-kasan-enabled.m4 | 1 + .../openzfs/config/kernel-kmap-atomic-args.m4 | 1 + .../openzfs/config/kernel-kmap-local-page.m4 | 1 + sys/contrib/openzfs/config/kernel-kmem.m4 | 1 + sys/contrib/openzfs/config/kernel-kthread.m4 | 1 + sys/contrib/openzfs/config/kernel-kuid-helpers.m4 | 1 + sys/contrib/openzfs/config/kernel-kuidgid.m4 | 1 + .../openzfs/config/kernel-make-request-fn.m4 | 1 + sys/contrib/openzfs/config/kernel-misc-minor.m4 | 1 + sys/contrib/openzfs/config/kernel-mkdir.m4 | 1 + sys/contrib/openzfs/config/kernel-mknod.m4 | 1 + sys/contrib/openzfs/config/kernel-mm-page-flags.m4 | 1 + sys/contrib/openzfs/config/kernel-mm-pagemap.m4 | 1 + sys/contrib/openzfs/config/kernel-namespace.m4 | 1 + sys/contrib/openzfs/config/kernel-objtool.m4 | 1 + .../config/kernel-pagemap-folio_wait_bit.m4 | 1 + .../config/kernel-pagemap-readahead-page.m4 | 1 + sys/contrib/openzfs/config/kernel-pde-data.m4 | 1 + sys/contrib/openzfs/config/kernel-percpu.m4 | 1 + .../openzfs/config/kernel-pin-user-pages.m4 | 1 + .../openzfs/config/kernel-proc-operations.m4 | 1 + sys/contrib/openzfs/config/kernel-reclaim_state.m4 | 1 + .../openzfs/config/kernel-register_sysctl_table.m4 | 1 + sys/contrib/openzfs/config/kernel-rename.m4 | 1 + .../openzfs/config/kernel-revalidate-disk-size.m4 | 1 + sys/contrib/openzfs/config/kernel-sb-dying.m4 | 1 + sys/contrib/openzfs/config/kernel-sb-wb-err.m4 | 1 + sys/contrib/openzfs/config/kernel-sched.m4 | 1 + .../openzfs/config/kernel-security-inode-init.m4 | 1 + sys/contrib/openzfs/config/kernel-set-nlink.m4 | 1 + .../openzfs/config/kernel-setattr-prepare.m4 | 1 + sys/contrib/openzfs/config/kernel-sget-args.m4 | 1 + sys/contrib/openzfs/config/kernel-show-options.m4 | 1 + sys/contrib/openzfs/config/kernel-shrink.m4 | 1 + sys/contrib/openzfs/config/kernel-siginfo.m4 | 1 + sys/contrib/openzfs/config/kernel-stdarg.m4 | 1 + sys/contrib/openzfs/config/kernel-strlcpy.m4 | 1 + sys/contrib/openzfs/config/kernel-symlink.m4 | 1 + sys/contrib/openzfs/config/kernel-sysfs.m4 | 1 + sys/contrib/openzfs/config/kernel-timer.m4 | 1 + sys/contrib/openzfs/config/kernel-tmpfile.m4 | 1 + .../openzfs/config/kernel-totalhigh_pages.m4 | 1 + .../openzfs/config/kernel-totalram-pages-func.m4 | 1 + .../openzfs/config/kernel-truncate-setsize.m4 | 1 + sys/contrib/openzfs/config/kernel-types.m4 | 1 + sys/contrib/openzfs/config/kernel-usleep_range.m4 | 1 + .../openzfs/config/kernel-vfs-file_range.m4 | 1 + .../config/kernel-vfs-filemap_dirty_folio.m4 | 1 + sys/contrib/openzfs/config/kernel-vfs-fsync.m4 | 1 + sys/contrib/openzfs/config/kernel-vfs-iov_iter.m4 | 1 + .../openzfs/config/kernel-vfs-migrate_folio.m4 | 1 + .../openzfs/config/kernel-vfs-migratepage.m4 | 1 + .../openzfs/config/kernel-vfs-read_folio.m4 | 1 + sys/contrib/openzfs/config/kernel-vfs-readpages.m4 | 1 + .../openzfs/config/kernel-vfs-set_page_dirty.m4 | 1 + sys/contrib/openzfs/config/kernel-vfs-writepage.m4 | 1 + sys/contrib/openzfs/config/kernel-writeback.m4 | 1 + sys/contrib/openzfs/config/kernel-xattr-handler.m4 | 1 + sys/contrib/openzfs/config/kernel-zero_page.m4 | 1 + sys/contrib/openzfs/config/kernel.m4 | 22 +- sys/contrib/openzfs/config/lib-ld.m4 | 1 + sys/contrib/openzfs/config/lib-link.m4 | 1 + sys/contrib/openzfs/config/lib-prefix.m4 | 1 + sys/contrib/openzfs/config/mount-helper.m4 | 1 + sys/contrib/openzfs/config/nls.m4 | 1 + sys/contrib/openzfs/config/pkg.m4 | 1 + sys/contrib/openzfs/config/po.m4 | 1 + sys/contrib/openzfs/config/progtest.m4 | 1 + sys/contrib/openzfs/config/rpm.am | 1 + sys/contrib/openzfs/config/tgz.am | 1 + sys/contrib/openzfs/config/toolchain-cfi.m4 | 33 + sys/contrib/openzfs/config/toolchain-simd.m4 | 1 + sys/contrib/openzfs/config/user-aio.h.m4 | 1 + sys/contrib/openzfs/config/user-backtrace.m4 | 1 + sys/contrib/openzfs/config/user-clock_gettime.m4 | 1 + sys/contrib/openzfs/config/user-dracut.m4 | 1 + sys/contrib/openzfs/config/user-gettext.m4 | 1 + sys/contrib/openzfs/config/user-libaio.m4 | 1 + sys/contrib/openzfs/config/user-libatomic.m4 | 1 + sys/contrib/openzfs/config/user-libblkid.m4 | 1 + sys/contrib/openzfs/config/user-libcrypto.m4 | 1 + sys/contrib/openzfs/config/user-libexec.m4 | 1 + sys/contrib/openzfs/config/user-libfetch.m4 | 1 + sys/contrib/openzfs/config/user-libtirpc.m4 | 1 + sys/contrib/openzfs/config/user-libudev.m4 | 1 + sys/contrib/openzfs/config/user-libunwind.m4 | 1 + sys/contrib/openzfs/config/user-libuuid.m4 | 1 + sys/contrib/openzfs/config/user-makedev.m4 | 1 + sys/contrib/openzfs/config/user-mount-setattr.m4 | 27 + sys/contrib/openzfs/config/user-pam.m4 | 1 + sys/contrib/openzfs/config/user-runstatedir.m4 | 1 + sys/contrib/openzfs/config/user-statx.m4 | 2 + sys/contrib/openzfs/config/user-systemd.m4 | 1 + sys/contrib/openzfs/config/user-sysvinit.m4 | 1 + sys/contrib/openzfs/config/user-udev.m4 | 1 + sys/contrib/openzfs/config/user-zlib.m4 | 1 + sys/contrib/openzfs/config/user.m4 | 2 + sys/contrib/openzfs/config/zfs-build.m4 | 4 +- sys/contrib/openzfs/config/zfs-meta.m4 | 1 + sys/contrib/openzfs/configure.ac | 2 +- sys/contrib/openzfs/contrib/Makefile.am | 1 + .../openzfs/contrib/bash_completion.d/Makefile.am | 1 + sys/contrib/openzfs/contrib/bpftrace/Makefile.am | 1 + sys/contrib/openzfs/contrib/debian/Makefile.am | 1 + sys/contrib/openzfs/contrib/dracut/Makefile.am | 1 + sys/contrib/openzfs/contrib/initramfs/Makefile.am | 1 + sys/contrib/openzfs/contrib/initramfs/scripts/zfs | 8 +- .../openzfs/contrib/pam_zfs_key/Makefile.am | 1 + sys/contrib/openzfs/contrib/pyzfs/Makefile.am | 1 + sys/contrib/openzfs/contrib/zcp/Makefile.am | 1 + sys/contrib/openzfs/etc/Makefile.am | 1 + .../system-generators/zfs-mount-generator.c | 5 +- sys/contrib/openzfs/include/Makefile.am | 1 + sys/contrib/openzfs/include/os/freebsd/Makefile.am | 1 + sys/contrib/openzfs/include/os/linux/Makefile.am | 1 + .../include/os/linux/kernel/linux/dcache_compat.h | 2 + .../include/os/linux/kernel/linux/xattr_compat.h | 17 + .../include/os/linux/zfs/sys/zfs_vfsops_os.h | 14 +- sys/contrib/openzfs/include/sys/dbuf.h | 2 + sys/contrib/openzfs/include/sys/dmu.h | 2 + sys/contrib/openzfs/include/sys/dnode.h | 13 + sys/contrib/openzfs/include/sys/spa.h | 1 + sys/contrib/openzfs/include/sys/vdev_raidz_impl.h | 1 + sys/contrib/openzfs/include/sys/vdev_rebuild.h | 4 +- sys/contrib/openzfs/lib/Makefile.am | 1 + sys/contrib/openzfs/lib/libavl/Makefile.am | 1 + sys/contrib/openzfs/lib/libefi/Makefile.am | 1 + sys/contrib/openzfs/lib/libicp/Makefile.am | 1 + sys/contrib/openzfs/lib/libnvpair/Makefile.am | 1 + sys/contrib/openzfs/lib/libspl/Makefile.am | 1 + sys/contrib/openzfs/lib/libspl/include/Makefile.am | 1 + .../openzfs/lib/libspl/os/linux/getmntany.c | 9 +- sys/contrib/openzfs/lib/libuutil/uu_ident.c | 2 +- sys/contrib/openzfs/lib/libzdb/Makefile.am | 1 + sys/contrib/openzfs/lib/libzfs/Makefile.am | 1 + sys/contrib/openzfs/lib/libzfs/libzfs_dataset.c | 49 +- sys/contrib/openzfs/lib/libzfs/libzfs_diff.c | 4 +- sys/contrib/openzfs/lib/libzfs/libzfs_impl.h | 17 + sys/contrib/openzfs/lib/libzfs/libzfs_mount.c | 43 +- sys/contrib/openzfs/lib/libzfs/libzfs_pool.c | 2 +- sys/contrib/openzfs/lib/libzfs/libzfs_sendrecv.c | 2 +- .../openzfs/lib/libzfs/os/freebsd/libzfs_zmount.c | 11 + .../openzfs/lib/libzfs/os/linux/libzfs_mount_os.c | 143 +++++ sys/contrib/openzfs/lib/libzfs_core/Makefile.am | 1 + sys/contrib/openzfs/lib/libzfsbootenv/Makefile.am | 1 + sys/contrib/openzfs/lib/libzpool/Makefile.am | 1 + sys/contrib/openzfs/lib/libzstd/Makefile.am | 1 + sys/contrib/openzfs/lib/libzutil/Makefile.am | 1 + .../lib/libzutil/os/linux/zutil_device_path_os.c | 16 +- sys/contrib/openzfs/man/Makefile.am | 1 + .../icp/asm-aarch64/blake3/b3_aarch64_sse2.S | 4 +- .../icp/asm-aarch64/blake3/b3_aarch64_sse41.S | 4 +- sys/contrib/openzfs/module/nvpair/nvpair.c | 5 +- .../openzfs/module/os/freebsd/spl/spl_cmn_err.c | 10 +- .../openzfs/module/os/freebsd/zfs/zfs_vnops_os.c | 4 +- .../openzfs/module/os/linux/zfs/vdev_disk.c | 4 + .../openzfs/module/os/linux/zfs/zfs_ctldir.c | 35 +- sys/contrib/openzfs/module/os/linux/zfs/zfs_uio.c | 13 +- .../openzfs/module/os/linux/zfs/zfs_vfsops.c | 231 +------ sys/contrib/openzfs/module/os/linux/zfs/zpl_file.c | 44 +- .../openzfs/module/os/linux/zfs/zpl_super.c | 681 ++++++++++++++++++--- sys/contrib/openzfs/module/zfs/dbuf.c | 78 ++- sys/contrib/openzfs/module/zfs/dmu.c | 39 +- sys/contrib/openzfs/module/zfs/dmu_direct.c | 8 +- sys/contrib/openzfs/module/zfs/dmu_objset.c | 2 +- sys/contrib/openzfs/module/zfs/dnode.c | 2 + sys/contrib/openzfs/module/zfs/dnode_sync.c | 105 ++-- sys/contrib/openzfs/module/zfs/dsl_bookmark.c | 18 +- sys/contrib/openzfs/module/zfs/dsl_dir.c | 2 +- sys/contrib/openzfs/module/zfs/range_tree.c | 2 +- sys/contrib/openzfs/module/zfs/spa.c | 2 +- sys/contrib/openzfs/module/zfs/spa_errlog.c | 2 +- sys/contrib/openzfs/module/zfs/spa_misc.c | 48 +- sys/contrib/openzfs/module/zfs/vdev.c | 29 +- sys/contrib/openzfs/module/zfs/vdev_draid.c | 76 ++- sys/contrib/openzfs/module/zfs/vdev_mirror.c | 13 +- sys/contrib/openzfs/module/zfs/vdev_raidz.c | 44 +- sys/contrib/openzfs/module/zfs/vdev_rebuild.c | 56 +- sys/contrib/openzfs/module/zfs/zfs_ioctl.c | 1 + sys/contrib/openzfs/module/zfs/zio.c | 6 +- sys/contrib/openzfs/rpm/Makefile.am | 1 + sys/contrib/openzfs/scripts/Makefile.am | 1 + sys/contrib/openzfs/scripts/spdxcheck.pl | 35 +- sys/contrib/openzfs/scripts/zfs-tests.sh | 16 +- sys/contrib/openzfs/tests/Makefile.am | 1 + sys/contrib/openzfs/tests/runfiles/common.run | 15 +- sys/contrib/openzfs/tests/runfiles/linux.run | 4 + .../openzfs/tests/test-runner/bin/zts-report.py.in | 3 +- sys/contrib/openzfs/tests/zfs-tests/Makefile.am | 1 + sys/contrib/openzfs/tests/zfs-tests/cmd/.gitignore | 2 + .../openzfs/tests/zfs-tests/cmd/Makefile.am | 4 + .../tests/zfs-tests/cmd/clone_after_trunc.c | 117 ++++ sys/contrib/openzfs/tests/zfs-tests/cmd/setlease.c | 126 ++++ .../openzfs/tests/zfs-tests/cmd/threadsappend.c | 8 +- .../openzfs/tests/zfs-tests/include/commands.cfg | 6 +- .../openzfs/tests/zfs-tests/include/libtest.shlib | 15 + .../openzfs/tests/zfs-tests/tests/Makefile.am | 11 + .../block_cloning/block_cloning_after_trunc.ksh | 31 + .../tests/functional/cli_root/zfs_list/cleanup.ksh | 30 + .../tests/functional/cli_root/zfs_list/setup.ksh | 32 + .../cli_root/zfs_list/zfs_list_009_pos.ksh | 69 +++ .../tests/functional/fadvise/fadvise_dontneed.ksh | 70 +++ .../zfs-tests/tests/functional/lease/cleanup.ksh | 26 + .../tests/functional/lease/lease_setlease.ksh | 44 ++ .../zfs-tests/tests/functional/lease/setup.ksh | 27 + .../tests/functional/redundancy/redundancy.kshlib | 71 ++- .../functional/redundancy/redundancy_draid.ksh | 12 +- .../redundancy/redundancy_draid_damaged1.ksh | 7 +- .../redundancy/redundancy_draid_damaged2.ksh | 14 +- .../redundancy/redundancy_draid_degraded1.ksh | 136 ++++ .../redundancy/redundancy_draid_degraded2.ksh | 152 +++++ .../redundancy/redundancy_draid_spare1.ksh | 13 +- .../redundancy/redundancy_draid_spare2.ksh | 8 +- .../redundancy/redundancy_draid_spare3.ksh | 28 +- sys/contrib/openzfs/udev/Makefile.am | 1 + sys/modules/zfs/zfs_config.h | 29 +- sys/modules/zfs/zfs_gitrev.h | 2 +- 319 files changed, 3254 insertions(+), 837 deletions(-) diff --git a/sys/contrib/openzfs/.github/workflows/checkstyle.yaml b/sys/contrib/openzfs/.github/workflows/checkstyle.yaml index a01a4fe8587c..ddcc2b8581fa 100644 --- a/sys/contrib/openzfs/.github/workflows/checkstyle.yaml +++ b/sys/contrib/openzfs/.github/workflows/checkstyle.yaml @@ -56,9 +56,10 @@ jobs: - name: Prepare artifacts if: failure() && steps.CheckABI.outcome == 'failure' run: | - find -name *.abi | tar -cf abi_files.tar -T - - - uses: actions/upload-artifact@v4 + find -name *.abi | tar -cjf abi_files.tar.bz2 -T - + - uses: actions/upload-artifact@v7 if: failure() && steps.CheckABI.outcome == 'failure' with: name: New ABI files (use only if you're sure about interface changes) - path: abi_files.tar + path: abi_files.tar.bz2 + archive: false diff --git a/sys/contrib/openzfs/.github/workflows/codeql.yml b/sys/contrib/openzfs/.github/workflows/codeql.yml index e975d7dd00b9..689fe71fddc3 100644 --- a/sys/contrib/openzfs/.github/workflows/codeql.yml +++ b/sys/contrib/openzfs/.github/workflows/codeql.yml @@ -28,7 +28,7 @@ jobs: echo "MAKEFLAGS=-j$(nproc)" >> $GITHUB_ENV - name: Checkout repository - uses: actions/checkout@v4 + uses: actions/checkout@v6 - name: Initialize CodeQL uses: github/codeql-action/init@v3 diff --git a/sys/contrib/openzfs/.github/workflows/scripts/generate-ci-type.py b/sys/contrib/openzfs/.github/workflows/scripts/generate-ci-type.py index 059d6ad3872b..b1910ab630af 100755 --- a/sys/contrib/openzfs/.github/workflows/scripts/generate-ci-type.py +++ b/sys/contrib/openzfs/.github/workflows/scripts/generate-ci-type.py @@ -3,13 +3,16 @@ """ Determine the CI type based on the change list and commit message. -Prints "quick" if (explicity required by user): +Output format: " " where source is "manual" (from +ZFS-CI-Type commit tag) or "auto" (from file change heuristics). + +Prints "quick manual" if: - the *last* commit message contains 'ZFS-CI-Type: quick' -or if (heuristics): +or "quick auto" if (heuristics): - the files changed are not in the list of specified directories, and - all commit messages do not contain 'ZFS-CI-Type: (full|linux|freebsd)' -Otherwise prints "full". +Otherwise prints "full auto" (or " manual" if explicitly requested). """ import sys @@ -58,9 +61,10 @@ if __name__ == '__main__': head, base = sys.argv[1:3] - def output_type(type, reason): - print(f'{prog}: will run {type} CI: {reason}', file=sys.stderr) - print(type) + def output_type(type, source, reason): + print(f'{prog}: will run {type} CI ({source}): {reason}', + file=sys.stderr) + print(f'{type} {source}') sys.exit(0) # check last (HEAD) commit message @@ -70,7 +74,8 @@ if __name__ == '__main__': for line in last_commit_message_raw.stdout.decode().splitlines(): if line.strip().lower() == 'zfs-ci-type: quick': - output_type('quick', f'requested by HEAD commit {head}') + output_type('quick', 'manual', + f'requested by HEAD commit {head}') # check all commit messages all_commit_message_raw = subprocess.run([ @@ -84,11 +89,14 @@ if __name__ == '__main__': if line.startswith('ZFS-CI-Commit:'): commit_ref = line.lstrip('ZFS-CI-Commit:').rstrip() if line.strip().lower() == 'zfs-ci-type: freebsd': - output_type('freebsd', f'requested by commit {commit_ref}') + output_type('freebsd', 'manual', + f'requested by commit {commit_ref}') if line.strip().lower() == 'zfs-ci-type: linux': - output_type('linux', f'requested by commit {commit_ref}') + output_type('linux', 'manual', + f'requested by commit {commit_ref}') if line.strip().lower() == 'zfs-ci-type: full': - output_type('full', f'requested by commit {commit_ref}') + output_type('full', 'manual', + f'requested by commit {commit_ref}') # check changed files changed_files_raw = subprocess.run([ @@ -104,9 +112,10 @@ if __name__ == '__main__': for r in FULL_RUN_REGEX: if r.match(f): output_type( - 'full', + 'full', 'auto', f'changed file "{f}" matches pattern "{r.pattern}"' ) # catch-all - output_type('quick', 'no changed file matches full CI patterns') + output_type('quick', 'auto', + 'no changed file matches full CI patterns') diff --git a/sys/contrib/openzfs/.github/workflows/scripts/merge_summary.awk b/sys/contrib/openzfs/.github/workflows/scripts/merge_summary.awk index 2b00d00226c9..8a4ce9a2be06 100755 --- a/sys/contrib/openzfs/.github/workflows/scripts/merge_summary.awk +++ b/sys/contrib/openzfs/.github/workflows/scripts/merge_summary.awk @@ -17,6 +17,7 @@ BEGIN { pass=0 fail=0 skip=0 + killed=0 state="" cl=0 el=0 @@ -49,6 +50,37 @@ BEGIN { /PASS/{ if (state=="pass_count") {pass += $2}} /FAIL/{ if (state=="pass_count") {fail += $2}} /SKIP/{ if (state=="pass_count") {skip += $2}} + +# If the test was killed, you'll get a line like: +# +# [2026-04-22T03:34:17.694616] Test (Linux): /usr/share/zfs/zfs-tests/tests/functional/io/setup (run as root) [10:00] [KILLED] +# +# Parse out the test name minus the /usr/share/zfs/zfs-tests/tests/functional/' +# part, and include the optional "(Linux): " line, as you can have the killed +# tests in two categories, like: +# +# KILLED (Linux): io/setup +# KILLED io/setup +# +/KILLED/{ + extra="" + for(i=1; i<=NF; i++) { + # Look for optional "(Linux):" field + if ($i ~ "\\("){ + extra=$i" "} + + # Look for a field with a '/' in it. It is the test name. + if($i ~ "/") { + testname=$i + # Remove /usr/share/zfs/zfs-test/test/functional string + sub(/\/usr\/share\/zfs\/zfs-tests\/tests\/functional\//,"",testname) + testname=extra""testname + killed_tests[killed] = testname + killed++ + break + } + } +} /Running Time/{ state=""; running[i]=$3; @@ -106,4 +138,10 @@ END { asort(unexpected_lines, sorted) for (j in sorted) print sorted[j] + + # We don't want to sort killed tests, as the first test that was killed + # most likely caused the others to be killed. + print "\n\nTests that were killed:" + for (j in killed_tests) + print " KILLED "killed_tests[j] } diff --git a/sys/contrib/openzfs/.github/workflows/scripts/qemu-1-setup.sh b/sys/contrib/openzfs/.github/workflows/scripts/qemu-1-setup.sh index 3d111561272d..5c41a4d6a497 100755 --- a/sys/contrib/openzfs/.github/workflows/scripts/qemu-1-setup.sh +++ b/sys/contrib/openzfs/.github/workflows/scripts/qemu-1-setup.sh @@ -6,6 +6,27 @@ set -eu +# The default runner has a bunch of development tools and other things +# that we do not need. Remove them here to free up a total of 35GB. +# +# First remove packages - this frees up ~10GB +echo "Disk space before purge:" +df -h / +sudo docker image prune --all --force +sudo docker builder prune -a +unneeded="microsoft-edge-stable|azure-cli|google-cloud|google-chrome-stable|"\ +"temurin|llvm|firefox|mysql-server|snapd|android|dotnet|haskell|ghcup|"\ +"powershell|julia|swift|miniconda|chromium" +sudo apt-get -y remove $(dpkg-query -f '${binary:Package}\n' -W | grep -E "'$unneeded'") +sudo apt-get -y autoremove + +# Next, remove unneeded files in /usr. This frees up an additional 25GB. +sudo rm -fr /usr/local/lib/android /usr/share/dotnet /usr/local/.ghcup \ + /usr/share/swift /usr/local/share/powershell /usr/local/julia* \ + /usr/share/miniconda /usr/local/share/chromium +echo "Disk space after:" +df -h / + # The default 'azure.archive.ubuntu.com' mirrors can be really slow. # Prioritize the official Ubuntu mirrors. # @@ -42,7 +63,7 @@ sudo swapoff -a # configurations. On one config you get two 75GB block devices, and on the # other you get a single 150GB block device. Here's what both look like: # -# --- Two 75GB block devices --- +# --- One 150GB block device --- # NAME MAJ:MIN RM SIZE RO TYPE MOUNTPOINTS # sda 8:0 0 150G 0 disk # ├─sda1 8:1 0 149G 0 part / @@ -56,7 +77,7 @@ sudo swapoff -a # lrwxrwxrwx 1 root root 11 Jan 29 18:07 azure_root-part15 -> ../../sda15 # lrwxrwxrwx 1 root root 11 Jan 29 18:07 azure_root-part16 -> ../../sda16 # -# --- One 150GB block device --- +# --- Two 75GB block devices --- # NAME MAJ:MIN RM SIZE RO TYPE MOUNTPOINTS # sda 8:0 0 75G 0 disk # ├─sda1 8:1 0 74G 0 part / @@ -118,18 +139,20 @@ fi sudo mkswap $SWAP sudo swapon $SWAP +echo "Block devices:" +lsblk + # adjust zfs module parameter and create pool -exec 1>/dev/null ARC_MIN=$((1024*1024*256)) ARC_MAX=$((1024*1024*512)) -echo $ARC_MIN | sudo tee /sys/module/zfs/parameters/zfs_arc_min -echo $ARC_MAX | sudo tee /sys/module/zfs/parameters/zfs_arc_max -echo 1 | sudo tee /sys/module/zfs/parameters/zvol_use_blk_mq +echo $ARC_MIN | sudo tee /sys/module/zfs/parameters/zfs_arc_min >/dev/null +echo $ARC_MAX | sudo tee /sys/module/zfs/parameters/zfs_arc_max >/dev/null +echo 1 | sudo tee /sys/module/zfs/parameters/zvol_use_blk_mq >/dev/null sudo zpool create -f -o ashift=12 zpool $DISKS -O relatime=off \ -O atime=off -O xattr=sa -O compression=lz4 -O sync=disabled \ -O redundant_metadata=none -O mountpoint=/mnt/tests +echo "Status:" +zpool status -# no need for some scheduler -for i in /sys/block/s*/queue/scheduler; do - echo "none" | sudo tee $i -done +echo "Last dmesg:" +sudo dmesg | tail -n 10 diff --git a/sys/contrib/openzfs/.github/workflows/scripts/qemu-2-start.sh b/sys/contrib/openzfs/.github/workflows/scripts/qemu-2-start.sh index 9a18ca659c44..e63aece389c0 100755 --- a/sys/contrib/openzfs/.github/workflows/scripts/qemu-2-start.sh +++ b/sys/contrib/openzfs/.github/workflows/scripts/qemu-2-start.sh @@ -78,11 +78,6 @@ case "$OS" in OPTS[0]="--boot" OPTS[1]="uefi=on" ;; - fedora41) - OSNAME="Fedora 41" - OSv="fedora-unknown" - URL="https://download.fedoraproject.org/pub/fedora/linux/releases/41/Cloud/x86_64/images/Fedora-Cloud-Base-Generic-41-1.4.x86_64.qcow2" - ;; fedora42) OSNAME="Fedora 42" OSv="fedora-unknown" @@ -93,6 +88,11 @@ case "$OS" in OSv="fedora-unknown" URL="https://download.fedoraproject.org/pub/fedora/linux/releases/43/Cloud/x86_64/images/Fedora-Cloud-Base-Generic-43-1.6.x86_64.qcow2" ;; + fedora44) + OSNAME="Fedora 44" + OSv="fedora-unknown" + URL="https://download.fedoraproject.org/pub/fedora/linux/releases/44/Cloud/x86_64/images/Fedora-Cloud-Base-Generic-44-1.7.x86_64.qcow2" + ;; freebsd13-5r) FreeBSD="13.5-RELEASE" OSNAME="FreeBSD $FreeBSD" @@ -101,13 +101,20 @@ case "$OS" in KSRC="$FREEBSD_REL/../amd64/$FreeBSD/src.txz" NIC="rtl8139" ;; - freebsd14-3r) - FreeBSD="14.3-RELEASE" + freebsd14-4r) + FreeBSD="14.4-RELEASE" OSNAME="FreeBSD $FreeBSD" OSv="freebsd14.0" URLxz="$FREEBSD_REL/$FreeBSD/amd64/Latest/FreeBSD-$FreeBSD-amd64-BASIC-CI.raw.xz" KSRC="$FREEBSD_REL/../amd64/$FreeBSD/src.txz" ;; + freebsd15-0r) + FreeBSD="15.0-RELEASE" + OSNAME="FreeBSD $FreeBSD" + OSv="freebsd15.0" + URLxz="$FREEBSD_REL/$FreeBSD/amd64/Latest/FreeBSD-$FreeBSD-amd64-BASIC-CI-ufs.raw.xz" + KSRC="$FREEBSD_REL/../amd64/$FreeBSD/src.txz" + ;; freebsd13-5s) FreeBSD="13.5-STABLE" OSNAME="FreeBSD $FreeBSD" @@ -116,15 +123,15 @@ case "$OS" in KSRC="$FREEBSD_SNAP/../amd64/$FreeBSD/src.txz" NIC="rtl8139" ;; - freebsd14-3s) - FreeBSD="14.3-STABLE" + freebsd14-4s) + FreeBSD="14.4-STABLE" OSNAME="FreeBSD $FreeBSD" OSv="freebsd14.0" URLxz="$FREEBSD_SNAP/$FreeBSD/amd64/Latest/FreeBSD-$FreeBSD-amd64-BASIC-CI-ufs.raw.xz" KSRC="$FREEBSD_SNAP/../amd64/$FreeBSD/src.txz" ;; - freebsd15-0s) - FreeBSD="15.0-STABLE" + freebsd15-1s) + FreeBSD="15.1-PRERELEASE" OSNAME="FreeBSD $FreeBSD" OSv="freebsd14.0" URLxz="$FREEBSD_SNAP/$FreeBSD/amd64/Latest/FreeBSD-$FreeBSD-amd64-BASIC-CI-ufs.raw.xz" @@ -193,17 +200,49 @@ DISK="/dev/zvol/zpool/openzfs" sudo zfs create -ps -b 64k -V 80g zpool/openzfs while true; do test -b $DISK && break; sleep 1; done -# we are downloading via axel, curl and wget are mostly slower and -# require more return value checking +# We first try to download with 'axel', which is faster than curl, but fallback +# to curl if that doesn't work. It is hoped that the curl fallback will get +# around the occasional "ERROR 502: Bad Gateway" errors. IMG="/mnt/tests/cloud-image" -if [ ! -z "$URLxz" ]; then - echo "Loading $URLxz ..." - time axel -q -o "$IMG" "$URLxz" - echo "Loading $KSRC ..." - time axel -q -o ~/src.txz $KSRC -else - echo "Loading $URL ..." - time axel -q -o "$IMG" "$URL" +for cmd in 'axel -q -o' 'curl --fail -LSs -o' ; do + if [ ! -z "$URLxz" ]; then + echo "Loading $URLxz with $cmd..." + time eval "$cmd $IMG $URLxz" || true + + if [ ! -s ~/src.txz ] ; then + echo "Loading $KSRC with $cmd..." + time eval "$cmd ~/src.txz $KSRC" || true + fi + else + echo "Loading $URL with $cmd..." + time eval "$cmd $IMG $URL" || true + fi + + if [ -s "$IMG" ] ; then + # Successful download + break + fi +done + +# SPECIAL CASE +# FreeBSD sometimes has broken links in their "current/" URL. Go back up a +# level and look for other images that might work. For example: +# +# https://download.freebsd.org/snapshots/CI-IMAGES/16.0-CURRENT/amd64/: +# +# 20251110/ +# 20251209/ +# 20260420/ +# current/ +# +# In this case let's say the raw.xz link in current/ is bad, so look though the +# other snapshot links for the newest existing raw.xz file. +if [ ! -z "$URLxz" ] && [ ! -s "$IMG" ] ; then + URLxz=$(wget --accept "*.raw.xz" --spider -np --recursive --no-verbose \ + $(dirname $(dirname $URLxz)) 2>&1 | awk '/200 OK/{print $(NF-2)}' | \ + sort -n | tail -n 1) + echo "Couldn't download FreeBSD raw.xz. Trying fallback snapshot $URLxz" + curl --fail -LSs -o $IMG $URLxz fi echo "Importing VM image to zvol..." diff --git a/sys/contrib/openzfs/.github/workflows/scripts/qemu-3-deps-vm.sh b/sys/contrib/openzfs/.github/workflows/scripts/qemu-3-deps-vm.sh index c8e1a015abd9..6a83ef45fd26 100755 --- a/sys/contrib/openzfs/.github/workflows/scripts/qemu-3-deps-vm.sh +++ b/sys/contrib/openzfs/.github/workflows/scripts/qemu-3-deps-vm.sh @@ -3,8 +3,11 @@ ###################################################################### # 3) install dependencies for compiling and loading # -# $1: OS name (like 'fedora41') -# $2: (optional) Experimental Fedora kernel version, like "6.14" to +# qemu-3-deps-vm.sh [--poweroff] OS_NAME [FEDORA_VERSION] +# +# --poweroff: Power off the VM after installing dependencies +# OS_NAME: OS name (like 'fedora41') +# FEDORA_VERSION: (optional) Experimental Fedora kernel version, like "6.14" to # install instead of Fedora defaults. ###################################################################### @@ -153,6 +156,12 @@ function install_fedora_experimental_kernel { sudo dnf -y copr disable @kernel-vanilla/mainline } +POWEROFF="" +if [ "$1" == "--poweroff" ] ; then + POWEROFF=1 + shift +fi + # Install dependencies case "$1" in almalinux8) @@ -212,6 +221,11 @@ case "$1" in sudo apt-get install -yq linux-tools-common libtirpc-dev \ linux-modules-extra-$(uname -r) sudo apt-get install -yq dh-sequence-dkms + + # Need 'build-essential' explicitly for ARM builder + # https://github.com/actions/runner-images/issues/9946 + sudo apt-get install -yq build-essential + echo "##[endgroup]" echo "##[group]Delete Ubuntu OpenZFS modules" for i in $(find /lib/modules -name zfs -type d); do sudo rm -rvf $i; done @@ -306,5 +320,7 @@ esac # reset cloud-init configuration and poweroff sudo cloud-init clean --logs -sleep 2 && sudo poweroff & +if [ "$POWEROFF" == "1" ] ; then + sleep 2 && sudo poweroff & +fi exit 0 diff --git a/sys/contrib/openzfs/.github/workflows/scripts/qemu-4-build-vm.sh b/sys/contrib/openzfs/.github/workflows/scripts/qemu-4-build-vm.sh index 38255cf39966..bbfa2ec85b8f 100755 --- a/sys/contrib/openzfs/.github/workflows/scripts/qemu-4-build-vm.sh +++ b/sys/contrib/openzfs/.github/workflows/scripts/qemu-4-build-vm.sh @@ -350,7 +350,16 @@ fi # save some sysinfo uname -a > /var/tmp/uname.txt -cd $HOME/zfs +# Check if we're running this script from within a VM or on the runner itself. +# Most of the time we will be running in a VM, but the ARM builder actually +# runs this script on the runner. If we happen to be running on the ARM +# runner, we will start in the ZFS source directory. If we're running on a VM +# then we'll just start in our home directory, and will need to 'cd' into our +# source directory. +if [ ! -e META ] ; then + cd $HOME/zfs +fi + export PATH="$PATH:/sbin:/usr/sbin:/usr/local/sbin" extra="" diff --git a/sys/contrib/openzfs/.github/workflows/scripts/qemu-6-tests.sh b/sys/contrib/openzfs/.github/workflows/scripts/qemu-6-tests.sh index 8dad30fe4a5a..c261cbfca06d 100755 --- a/sys/contrib/openzfs/.github/workflows/scripts/qemu-6-tests.sh +++ b/sys/contrib/openzfs/.github/workflows/scripts/qemu-6-tests.sh @@ -222,9 +222,9 @@ TAGS=$NUM/$DEN sudo dmesg -c > dmesg-prerun.txt mount > mount.txt df -h > df-prerun.txt -$TDIR/zfs-tests.sh -vKO -s 3GB -T $TAGS +RV=0 +$TDIR/zfs-tests.sh -vKO -s 3GB -T $TAGS || RV=$? -RV=$? df -h > df-postrun.txt echo $RV > tests-exitcode.txt sync diff --git a/sys/contrib/openzfs/.github/workflows/scripts/qemu-7-prepare.sh b/sys/contrib/openzfs/.github/workflows/scripts/qemu-7-prepare.sh index 98a5c24c2521..51ae82567c2c 100755 --- a/sys/contrib/openzfs/.github/workflows/scripts/qemu-7-prepare.sh +++ b/sys/contrib/openzfs/.github/workflows/scripts/qemu-7-prepare.sh @@ -13,16 +13,29 @@ source env.txt mkdir -p $RESPATH +TARNAME=qemu-$OS + # check if building the module has failed if [ -z ${VMs:-} ]; then cd $RESPATH echo ":exclamation: ZFS module didn't build successfully :exclamation:" \ | tee summary.txt | tee /tmp/summary.txt cp /var/tmp/*.txt . - tar cf /tmp/qemu-$OS.tar -C $RESPATH -h . || true + + # rename /var/tmp/test_results to /var/tmp/qemu-$OS + mv $RESPATH $(dirname $RESPATH)/$TARNAME + tar cjf /tmp/$TARNAME.tar.bz2 -C $(dirname $RESPATH) -h $TARNAME || true + # move it back to /var/tmp/test_results (needed for next script) + mv $(dirname $RESPATH)/$TARNAME $RESPATH + exit 0 fi +if ! grep -q vm /etc/hosts ; then + echo "No vm* hostnames, VMs probably didn't startup" + exit 0 +fi + # build was okay BASE="$HOME/work/zfs/zfs" MERGE="$BASE/.github/workflows/scripts/merge_summary.awk" @@ -38,6 +51,11 @@ cd $RESPATH # prepare result files for summary for ((i=1; i<=VMs; i++)); do + + # no results, VM either didn't start or was unreachable, create + # the missing directory which is expected by subsequent steps + test -d vm$i || mkdir -p vm$i + file="vm$i/build-stderr.txt" test -s $file && mv -f $file build-stderr.txt @@ -48,12 +66,14 @@ for ((i=1; i<=VMs; i++)); do test -s $file && mv -f $file uname.txt file="vm$i/tests-exitcode.txt" - if [ ! -s $file ]; then - # XXX - add some tests for kernel panic's here - # tail -n 80 vm$i/console.txt | grep XYZ - echo 1 > $file + if [ ! -s "$file" ]; then + # Print in bold red + echo -e "\033[1;31mVM$i didn't finish ZTS and may have crashed!\033[0m" >> extra + + # ENOENT=2 + echo 2 > "$file" fi - rv=$(cat vm$i/tests-exitcode.txt) + rv=$(cat "$file") test $rv != 0 && touch /tmp/have_failed_tests file="vm$i/current/log" @@ -76,6 +96,14 @@ done if [ -s summary ]; then $MERGE summary | grep -v '^/' > summary.txt $MERGE summary | $BASE/scripts/zfs-tests-color.sh > /tmp/summary.txt + + # Add in additional 'extra' text at the end, if file is present. + if [ -s extra ] ; then + echo "" >> /tmp/summary.txt + cat extra >> /tmp/summary.txt + rm -f extra + fi + rm -f summary else touch summary.txt /tmp/summary.txt @@ -121,4 +149,9 @@ if [ ! -s uname.txt ]; then fi # artifact ready now -tar cf /tmp/qemu-$OS.tar -C $RESPATH -h . || true +# +# rename /var/tmp/test_results to /var/tmp/qemu-$OS +mv $RESPATH $(dirname $RESPATH)/$TARNAME +tar cjf /tmp/$TARNAME.tar.bz2 -C $(dirname $RESPATH) -h $TARNAME || true +# move it back to /var/tmp/test_results (needed for next script) +mv $(dirname $RESPATH)/$TARNAME $RESPATH diff --git a/sys/contrib/openzfs/.github/workflows/scripts/qemu-8-summary.sh b/sys/contrib/openzfs/.github/workflows/scripts/qemu-8-summary.sh index 00a4bf1ae325..39b3d124c794 100755 --- a/sys/contrib/openzfs/.github/workflows/scripts/qemu-8-summary.sh +++ b/sys/contrib/openzfs/.github/workflows/scripts/qemu-8-summary.sh @@ -37,9 +37,11 @@ function showfile_tail() { echo "##[endgroup]" } -# overview -cat /tmp/summary.txt -echo "" +# overview if available +if [ -f /tmp/summary.txt -a -s /tmp/summary.txt ]; then + cat /tmp/summary.txt + echo "" +fi if [ -f /tmp/have_failed_tests -a -s /tmp/failed.txt ]; then echo "Debuginfo of failed tests:" diff --git a/sys/contrib/openzfs/.github/workflows/scripts/qemu-9-summary-page.sh b/sys/contrib/openzfs/.github/workflows/scripts/qemu-9-summary-page.sh index 737dda01b565..1200f4de2b94 100755 --- a/sys/contrib/openzfs/.github/workflows/scripts/qemu-9-summary-page.sh +++ b/sys/contrib/openzfs/.github/workflows/scripts/qemu-9-summary-page.sh @@ -33,7 +33,9 @@ function send2github() { # first call, generate all summaries if [ ! -f out-1.md ]; then logfile="1" - for tarfile in Logs-functional-*/qemu-*.tar; do + # The bz2 files are put into directories with the same name, like: + # "qemu-debian12.tar.bz2/qemu-debian12.tar.bz2" + for tarfile in qemu-*.tar.bz2/qemu-*.tar.bz2; do rm -rf vm* *.txt if [ ! -s "$tarfile" ]; then output "\n## Functional Tests: unknown\n" diff --git a/sys/contrib/openzfs/.github/workflows/smatch.yml b/sys/contrib/openzfs/.github/workflows/smatch.yml index ac6454244f93..305a1f0179bd 100644 --- a/sys/contrib/openzfs/.github/workflows/smatch.yml +++ b/sys/contrib/openzfs/.github/workflows/smatch.yml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-24.04 steps: - name: Checkout smatch - uses: actions/checkout@v4 + uses: actions/checkout@v6 with: repository: error27/smatch ref: master @@ -26,7 +26,7 @@ jobs: cd $GITHUB_WORKSPACE/smatch make -j$(nproc) - name: Checkout OpenZFS - uses: actions/checkout@v4 + uses: actions/checkout@v6 with: ref: ${{ github.event.pull_request.head.sha }} *** 7802 LINES SKIPPED *** From nobody Fri May 15 00:04:04 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gGnVX26y2z6cPjJ for ; Fri, 15 May 2026 00:04: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gGnVX1Mjdz3vGT for ; Fri, 15 May 2026 00:04:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778803444; 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; bh=+/bFV12+g+IPpgTYCPd/kP0huWhbdZiPHJfqE+eU2zo=; b=kKtRhDW+sQUdIuXT4W52C3Yv4+z6qud3FR/tbTJxUTQ2NEAT9g356nTC4n/rTS9UnUVb22 gWkmqIJnBIA/WTtiSkxgWL3YbzT71qNhIfiZO/IT+jtbKTymFubO4H4Mhx9o3K0QSNdllR FxvB4aVNYojJInk77SS2bbFdHV5mTxTQA4yq46mQOj8fioPDpFDl9LdUIn2mR98Erhlc+I IIMnITUz5grrcdmRy59y6X5uU2/ZUVdaqtpIZlLCJvS7UwGuBgfXtfG8+FJUHwnlbwC9rb VuxRXvVpkdcsh6/SWSt2uzCcEibWkosnskEpGDPmLdPPTfHfsHoIjMTC3s9Mgw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778803444; a=rsa-sha256; cv=none; b=O17Gnh5p7Q7nVU939jIOgaLu6mZzv1VfyemjYrEy9TJsPK27jxPipyEZZbmsQq1ff3uHGr QFDt/bzW8Mp2yrsogQWiIKoLB8gd/iroDDogQqZKJc7YI39AV8YZRhF4+sSAEn1duO78Pl tiMtyi6JG+Y+EzOJS03gUe8d+mCJpJyGILFiQ7rNcDfgmj7TlbvqZd/SPUjtvTDoycgrFN h/rqUcfbcVKpIxx2jp6TMgC7upN8jGPalsU5w/V9RNodgHxJBsqSFKjPWu/9oL5G9NMQc1 I1PAjfh/9w7D0rn+A60iIi1Y7+rHzYSNqsSCSdsi6gB9OQusiWrSsv72TuDd4A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778803444; 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; bh=+/bFV12+g+IPpgTYCPd/kP0huWhbdZiPHJfqE+eU2zo=; b=y0XxNDUrKAy0OzsHeeeCr9qixvFRsR9Z/cJp32T4+zfgNhsAoxlIxprXqWqqF/v2tKRzon bn7rrZbgEq4yK1CJ/6OxG6S+uJ1rQELNKwPjW8Oe9ugPjZQ4EBjtThCXkRmsnq+NMuSgpN K5MATJgxsPcPbg32cSEfZ6kucWN3mJ7qQBAr5VHiNHBWlQtkIYRIlY/+EO2eNw10ACGEAF SXHSQKPA8YUiavOrGvQp0K146yG9V+W4jmqyj6dMRU9QNKKiEjTc9ikWOw5E5nam+YeJtp hK4joEkg6USWyZMo04jDJYR2wrqt7771h9Dp/wwSU0lBNCzpv1hGdntnbZbkFA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gGnVX0ggkz10Nj for ; Fri, 15 May 2026 00:04:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1d7fc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 15 May 2026 00:04:04 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Alexander Ziaee From: Colin Percival Subject: git: 10c4498f93d2 - releng/15.1 - Cloud releases: Switch to firstboot_pkg_upgrade List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.1 X-Git-Reftype: branch X-Git-Commit: 10c4498f93d29b1f2b672299c5bf8c0ee6ee3774 Auto-Submitted: auto-generated Date: Fri, 15 May 2026 00:04:04 +0000 Message-Id: <6a0662f4.1d7fc.2d11ba2f@gitrepo.freebsd.org> The branch releng/15.1 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=10c4498f93d29b1f2b672299c5bf8c0ee6ee3774 commit 10c4498f93d29b1f2b672299c5bf8c0ee6ee3774 Author: Alexander Ziaee AuthorDate: 2026-05-14 21:05:07 +0000 Commit: Colin Percival CommitDate: 2026-05-15 00:03:35 +0000 Cloud releases: Switch to firstboot_pkg_upgrade Cloud images are deployed with base system packages. Introduce a firstboot package auto updater to patch the base system on first boot. Approved by: re (cperciva) MFC after: 1 hour MFC to: stable/15 Reviewed by: cperciva Sponsored by: Google Cloud Differential Revision: https://reviews.freebsd.org/D56890 (cherry picked from commit 464a351267dc0d1843b919dd72ad1c70c24815ce) (cherry picked from commit 0bb2b2a45f3c0c147d7c55e010be45e55af8df87) --- release/tools/azure.conf | 5 +++-- release/tools/ec2-base.conf | 9 ++++++--- release/tools/gce.conf | 5 +++-- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/release/tools/azure.conf b/release/tools/azure.conf index 7a4f0b5027cf..9a5c12424bd3 100644 --- a/release/tools/azure.conf +++ b/release/tools/azure.conf @@ -6,10 +6,10 @@ export VMSIZE=30g # Set to a list of packages to install. -export VM_EXTRA_PACKAGES="azure-agent python python3 firstboot-freebsd-update firstboot-pkgs" +export VM_EXTRA_PACKAGES="azure-agent python python3 firstboot-pkg-upgrade firstboot-pkgs" # Set to a list of third-party software to enable in rc.conf(5). -export VM_RC_LIST="ntpd sshd waagent firstboot_freebsd_update firstboot_pkgs" +export VM_RC_LIST="ntpd sshd waagent firstboot_pkg_upgrade firstboot_pkgs" # No swap space; waagent will allocate swap space on the resource disk. # See ResourceDisk.EnableSwap and ResourceDisk.SwapSizeMB in waagent.conf @@ -43,6 +43,7 @@ vm_extra_pre_umount() { cat << EOF >> ${DESTDIR}/etc/rc.conf ifconfig_hn0="SYNCDHCP" ntpd_sync_on_start="YES" +firstboot_pkg_upgrade_repos="FreeBSD-base" EOF cat << EOF >> ${DESTDIR}/boot/loader.conf diff --git a/release/tools/ec2-base.conf b/release/tools/ec2-base.conf index ffe2646240a5..24b2feb5f0d7 100644 --- a/release/tools/ec2-base.conf +++ b/release/tools/ec2-base.conf @@ -7,15 +7,15 @@ # * amazon-ssm-agent (not enabled by default, but some users need to use # it on systems not connected to the internet), # * ec2-scripts, which provides a range of EC2ification startup scripts, -# * firstboot-freebsd-update, to install security updates at first boot, +# * firstboot-pkg-upgrade, to install security updates at first boot, # * firstboot-pkgs, to install packages at first boot, and # * isc-dhcp44-client, used for IPv6 network setup. export VM_EXTRA_PACKAGES="${VM_EXTRA_PACKAGES} amazon-ssm-agent ec2-scripts \ - firstboot-freebsd-update firstboot-pkgs isc-dhcp44-client" + firstboot-pkg-upgrade firstboot-pkgs isc-dhcp44-client" # Services to enable in rc.conf(5). export VM_RC_LIST="${VM_RC_LIST} ec2_configinit ec2_ephemeral_swap \ - ec2_fetchkey ec2_loghostkey firstboot_freebsd_update firstboot_pkgs \ + ec2_fetchkey ec2_loghostkey firstboot_pkg_upgrade firstboot_pkgs \ growfs sshd" vm_extra_pre_umount() { @@ -24,6 +24,9 @@ vm_extra_pre_umount() { # via EC2 user-data. echo 'firstboot_pkgs_list="devel/py-awscli"' >> ${DESTDIR}/etc/rc.conf + # Limit firstboot_pkg_upgrade to the base system. + echo 'firstboot_pkg_upgrade_repos="FreeBSD-base"' >> ${DESTDIR}/etc/rc.conf + # Any EC2 ephemeral disks seen when the system first boots will # be "new" disks; there is no "previous boot" when they might have # been seen and used already. diff --git a/release/tools/gce.conf b/release/tools/gce.conf index 7298aabf3956..938672ac92e0 100644 --- a/release/tools/gce.conf +++ b/release/tools/gce.conf @@ -6,14 +6,14 @@ export VMSIZE=20g # Set to a list of packages to install. -export VM_EXTRA_PACKAGES="${VM_EXTRA_PACKAGES} firstboot-freebsd-update \ +export VM_EXTRA_PACKAGES="${VM_EXTRA_PACKAGES} firstboot-pkg-upgrade \ firstboot-pkgs google-cloud-sdk panicmail sudo \ sysutils/py-google-compute-engine lang/python \ lang/python3" # Set to a list of third-party software to enable in rc.conf(5). export VM_RC_LIST="ntpd sshd growfs \ - firstboot_pkgs firstboot_freebsd_update google_startup \ + firstboot_pkgs firstboot_pkg_upgrade google_startup \ google_accounts_daemon google_clock_skew_daemon \ google_instance_setup google_network_daemon" @@ -47,6 +47,7 @@ ifconfig_DEFAULT="SYNCDHCP mtu 1460" ntpd_sync_on_start="YES" # need to fill in something here #firstboot_pkgs_list="" +firstboot_pkg_upgrade_repos="FreeBSD-base" panicmail_autosubmit="YES" EOF From nobody Fri May 15 00:04:05 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gGnVY3rWgz5w4tn for ; Fri, 15 May 2026 00:04: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gGnVY1sNjz3vNm for ; Fri, 15 May 2026 00:04:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778803445; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ms2W2S1GM1Zi4ELEwgHo1Dhx9mT0+nNluoI6TUqwxz8=; b=UeLt9ciXUy6bLgVhlXG0tHfm8hZkjUgVBxaEj14GC1pf//SwBn+dUwlOHBF0XBtsSSQ65O JSmxMCmOM0kauBG+7mVHz1N8hkkpKU+1LnRm51Tdyga3QfSh+7xZcjAH1KxRKkSnDPf1eL 0epyzXrQKhhwyqwitGC4lObpemgX9CdnvWslIr2p8QUFybMRR9cYZifkerixJ52xekDWnJ yOIJdUCl4T3do4pbgkj5T674v5292iwtCoIxpXYP5JVQ8emQiARtLOcCHJhfnRpc44YKeF gpeFPvjKIhwTuIa+f3G7hoFg8qIqGd8dKKCOnLPULeVtfAJdl6SWaf303DPpOA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778803445; a=rsa-sha256; cv=none; b=PvBlJiZwsjWVE2Wwqi41XpnDkoQ3Fws4anXzTB86VgJPbILmrGcclrjJ1OaQv75FIrQKjA liaAFjJpptIfRpkGonhVhBGtZC2iUcbtcyobpfgUGHDaGfmwjRZhBazfken2KCY+PUnbq1 41Cj3rUuUpxF3xdON9R4hPItVjy5U7ZuZ+HuwKt0KXrVMuA9MZLlkJjYRojvIVvFlroMXJ gD5DI9jaB3Jy7xLdcEGctk0fhR3cKrVvAZd9HMeYz3/oBeSorzqPjfKw6HLa/hno1aORBZ ias3EHjKXSz+wf1Y4SGByNkpI23G5Qm8lpJ6zqIR1g6F2OUWR3Wx0uc6GZm1kg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778803445; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ms2W2S1GM1Zi4ELEwgHo1Dhx9mT0+nNluoI6TUqwxz8=; b=vEF/670aMAXgXCbpcAHNMMSmKq6TqNmNIJrkQQN7oyl1eysjNMulqJXLl7rg9NiYsjKu/G 7VdWpwoTM86Sh/lgYBgarpGoyvHuT5rsRwneXpioKxVMNQH4w5avJwwOQoLFIYjxRA5+g6 +wg8sivJpxHbdeub3Gj7pu3Zu8pODaTX4Hi5h2NHbQo73PbRmNyC2FVlwxF2lnrCzcVh+F OBNPMZccbygMkVMi255FtVM99JUXR4IuV5JAVz58oIWXoMMTvi58I44gbd7475Nqi0ekLs KdCovQQvU94TN4jvnp77dIoDP9g9n19mIw4b09u1yFUn/shZsKBVoPqrzIQxwA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gGnVY1PmRz10Pw for ; Fri, 15 May 2026 00:04:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e491 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 15 May 2026 00:04:05 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 73ec43ab702f - releng/15.1 - Cloud releases: More firstboot_pkg_upgrade List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.1 X-Git-Reftype: branch X-Git-Commit: 73ec43ab702fb06bf870af161919ad9423cddd19 Auto-Submitted: auto-generated Date: Fri, 15 May 2026 00:04:05 +0000 Message-Id: <6a0662f5.1e491.2b84b0ca@gitrepo.freebsd.org> The branch releng/15.1 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=73ec43ab702fb06bf870af161919ad9423cddd19 commit 73ec43ab702fb06bf870af161919ad9423cddd19 Author: Colin Percival AuthorDate: 2026-05-14 21:14:09 +0000 Commit: Colin Percival CommitDate: 2026-05-15 00:03:49 +0000 Cloud releases: More firstboot_pkg_upgrade Update a couple more cloudware images which I forgot about earlier. Approved by: re (cperciva) Reviewed by: ziaee Fixes: 464a351267dc ("Cloud releases: Switch to firstboot_pkg_upgrade") Differential Revision: https://reviews.freebsd.org/D57006 (cherry picked from commit 4080419d9a2d88d44d20baaf3ea01934561819c1) (cherry picked from commit 1ae97c95d025277fb542936b0a2686180dd4a7b7) --- release/tools/basic-cloudinit.conf | 7 ++++--- release/tools/ec2-small.conf | 9 ++++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/release/tools/basic-cloudinit.conf b/release/tools/basic-cloudinit.conf index 98e11f0bb08b..621165ea1669 100644 --- a/release/tools/basic-cloudinit.conf +++ b/release/tools/basic-cloudinit.conf @@ -8,16 +8,17 @@ export CONFIG_DRIVE=YES export CONFIG_DRIVE_SIZE=1M # Packages to install into the image we're creating. -# * firstboot-freebsd-update, to install security updates at first boot. -export VM_EXTRA_PACKAGES="${VM_EXTRA_PACKAGES} firstboot-freebsd-update" +# * firstboot-pkg-upgrade, to install security updates at first boot. +export VM_EXTRA_PACKAGES="${VM_EXTRA_PACKAGES} firstboot-pkg-upgrade" # Set to a list of third-party software to enable in rc.conf(5). -export VM_RC_LIST="${VM_RC_LIST} firstboot_freebsd_update growfs sshd nuageinit" +export VM_RC_LIST="${VM_RC_LIST} firstboot_pkg_upgrade growfs sshd nuageinit" vm_extra_pre_umount() { cat << EOF >> ${DESTDIR}/etc/rc.conf dumpdev="AUTO" ifconfig_DEFAULT="SYNCDHCP accept_rtadv" +firstboot_pkg_upgrade_repos="FreeBSD-base" # RSA host keys are obsolete and also very slow to generate sshd_rsa_enable="NO" EOF diff --git a/release/tools/ec2-small.conf b/release/tools/ec2-small.conf index 6564a59c2cf6..f5904d5ea4ba 100644 --- a/release/tools/ec2-small.conf +++ b/release/tools/ec2-small.conf @@ -25,18 +25,21 @@ vm_extra_filter_base_packages() { # Packages to install into the image we're creating. In addition to packages # present on all EC2 AMIs, we install: # * ec2-scripts, which provides a range of EC2ification startup scripts, -# * firstboot-freebsd-update, to install security updates at first boot, +# * firstboot-pkg-upgrade, to install security updates at first boot, # * firstboot-pkgs, to install packages at first boot, and # * isc-dhcp44-client, used for IPv6 network setup. export VM_EXTRA_PACKAGES="${VM_EXTRA_PACKAGES} ec2-scripts \ - firstboot-freebsd-update firstboot-pkgs isc-dhcp44-client" + firstboot-pkg-upgrade firstboot-pkgs isc-dhcp44-client" # Services to enable in rc.conf(5). export VM_RC_LIST="${VM_RC_LIST} ec2_configinit ec2_ephemeral_swap \ - ec2_fetchkey ec2_loghostkey firstboot_freebsd_update firstboot_pkgs \ + ec2_fetchkey ec2_loghostkey firstboot_pkg_upgrade firstboot_pkgs \ growfs sshd" vm_extra_pre_umount() { + # Limit firstboot_pkg_upgrade to the base system. + echo 'firstboot_pkg_upgrade_repos="FreeBSD-base"' >> ${DESTDIR}/etc/rc.conf + # Any EC2 ephemeral disks seen when the system first boots will # be "new" disks; there is no "previous boot" when they might have # been seen and used already. From nobody Fri May 15 01:06:12 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gGptW5NNcz6cTj3; Fri, 15 May 2026 01:06:27 +0000 (UTC) (envelope-from kib@freebsd.org) 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 4gGptW1p0zz423X; Fri, 15 May 2026 01:06:27 +0000 (UTC) (envelope-from kib@freebsd.org) 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 64F16COe031860; Fri, 15 May 2026 04:06:15 +0300 (EEST) (envelope-from kib@freebsd.org) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 64F16COe031860 Received: (from kostik@localhost) by tom.home (8.18.1/8.18.1/Submit) id 64F16CRc031859; Fri, 15 May 2026 04:06:12 +0300 (EEST) (envelope-from kib@freebsd.org) X-Authentication-Warning: tom.home: kostik set sender to kib@freebsd.org using -f Date: Fri, 15 May 2026 04:06:12 +0300 From: Konstantin Belousov To: John Baldwin Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 8766e2122ac0 - main - mandoc: Updating FreeBSD thead library descriptions Message-ID: References: <6a04a811.3be57.aea6532@gitrepo.freebsd.org> <501769a6-e12b-428d-9dd3-c6764083e578@FreeBSD.org> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <501769a6-e12b-428d-9dd3-c6764083e578@FreeBSD.org> X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED,BAYES_00 autolearn=ham autolearn_force=no version=4.0.2 X-Spam-Checker-Version: SpamAssassin 4.0.2 (2025-08-27) on tom.home 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-Queue-Id: 4gGptW1p0zz423X X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated On Thu, May 14, 2026 at 02:56:38PM -0400, John Baldwin wrote: > On 5/13/26 22:47, Konstantin Belousov wrote: > > On Wed, May 13, 2026 at 04:34:25PM +0000, John Baldwin wrote: > > > The branch main has been updated by jhb: > > > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=8766e2122ac02ff4d86c254d8ef1c41d4a7f76a0 > > > > > > commit 8766e2122ac02ff4d86c254d8ef1c41d4a7f76a0 > > > Author: John Baldwin > > > AuthorDate: 2026-05-13 16:33:29 +0000 > > > Commit: John Baldwin > > > CommitDate: 2026-05-13 16:33:29 +0000 > > > > > > mandoc: Updating FreeBSD thead library descriptions > > > Remove libkse as it has been obsolete for many years and drop 1:1 from > > > description of libthr. > > > Reviewed by: brooks > > > Sponsored by: AFRL, DARPA > > > Differential Revision: https://reviews.freebsd.org/D56850 > > > --- > > > contrib/mandoc/lib.in | 3 +-- > > > 1 file changed, 1 insertion(+), 2 deletions(-) > > > > > > diff --git a/contrib/mandoc/lib.in b/contrib/mandoc/lib.in > > > index dcea23cf81ea..04d86f9add1e 100644 > > > --- a/contrib/mandoc/lib.in > > > +++ b/contrib/mandoc/lib.in > > > @@ -74,7 +74,6 @@ LINE("libisns", "Internet Storage Name Service Library (libisns, \\-lisns)") > > > LINE("libjail", "Jail Library (libjail, \\-ljail)") > > > LINE("libkcore", "Kernel Memory Core Access Library (libkcore, \\-lkcore)") > > > LINE("libkiconv", "Kernel-side iconv Library (libkiconv, \\-lkiconv)") > > > -LINE("libkse", "N:M Threading Library (libkse, \\-lkse)") > > > LINE("libkvm", "Kernel Data Access Library (libkvm, \\-lkvm)") > > > LINE("libm", "Math Library (libm, \\-lm)") > > > LINE("libm68k", "m68k Architecture Library (libm68k, \\-lm68k)") > > > @@ -126,7 +125,7 @@ LINE("libtacplus", "TACACS+ Client Library (libtacplus, \\-ltacplus)") > > > LINE("libtcplay", "TrueCrypt-compatible API library (libtcplay, \\-ltcplay)") > > > LINE("libtermcap", "Termcap Access Library (libtermcap, \\-ltermcap)") > > > LINE("libterminfo", "Terminal Information Library (libterminfo, \\-lterminfo)") > > > -LINE("libthr", "1:1 Threading Library (libthr, \\-lthr)") > > > +LINE("libthr", "Threading Library (libthr, \\-lthr)") > > Arguably the suggested linker argument should be -lpthread instead. > > I think there is a "libpthread" entry already and we could just use > that in our manpages going forward instead of .Lb libthr which would > have that effect. Actually, .Lib libthr is only used in a few places, > and several of those could either be removed (e.g. the IMPLEMENTATION > NOTES section in pthread(3) can probably just be removed, it was more > relevant when there were multiple libraries) or updated (_umtx_op.2 > can just reference libpthread instead of libthr). We do have libthr(3), and it should not be dropped. The reference from pthread(3) to libthr(3) in its current form IMO makes sense. What I mean is only to stop suggesting in any way to link against libthr.so, instead of libpthread.so. I do not envision that we ever would bump libthr major version number, but libpthread.so might become linker script instead of the symlink. > > It's not clear to me if there is true value in renaming the real > library, though if we ever bump the major version for libthr we should > probably use the opportunity to install it as libpthread for real. > Given it uses symbol versioning it seems unlikely we will ever do that > though. If we really cared we could rename it for 16 I guess. The > compat15 package would just need to contain libthr.so.3. I am only about man pages. From nobody Fri May 15 01:10:27 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gGpzD6234z6cVBF for ; Fri, 15 May 2026 01:10: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gGpzD5Hzwz42Sm for ; Fri, 15 May 2026 01:10:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778807432; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hQf8y5Om6uVWQfhltnplLZmrhhBQFxBaZXFiqmgo05s=; b=cWx3LR0gdJb39Tch8EAEfeWwkwHuw/+f3ervWm3iKatBlJSyy27vpJb5S8OOxYH0PqYEEG Sdh3WksG5tqxRmQOfH/H1eGXP6cs20k5DXOicDE45vvzXE/4ohJ5B9WVpRnAQAYhLQmMBL IKyA+Ny5TH4K0SVwPhsol1BplyPkmH4OZocM/ykAo7aS57Vl5wQdC/SA4R1XVVfc4Rfi6u yn+q7jY9jxPN+igXd9CC5CkQ6cz6xv+wSQaQVGgMx8xjfB7I236+we6R8JDgIukooRj9Xw ATFSsxs8pU2widcg4wrTjHlLpY5+4/qdwWfZTa4021shfBKKqzdOlQGstf5jbg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778807432; a=rsa-sha256; cv=none; b=T96zVV8ET+nCFyLaiQr+nOEdvhQZp7nOwydyHggwY4KtNhFD1P4NUVNwBnw39/h1qKBkon hztkZzWy+hNyEr5QG9VkZ1kmF9LiTGRPbRGS/tr2DX4e9Ras4T+pQMUIIzd8mNdIjzbCMK AAEbnygsAnca0Ig60Denl1giaQKAAov8Ag5sUzLTYngZiMgXIjYZRn4Jj6BgnnPTFxfwNb BJEERGp2dGl4oiarQUUcbMBDe9ObnCZSFX8MFONZYnxEhTVcFlyEtkeI34oIGYP1g+bUIL aAzC/8yBbaruMVotxetR27FzKdwd+UYDACk3kbQDxcGclCNGYNItjxJFZG6n7g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778807432; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hQf8y5Om6uVWQfhltnplLZmrhhBQFxBaZXFiqmgo05s=; b=WeHpPQV78iD3TbiJzfzNKgnPRU9aQBNxu/PDN4ACrtlI9N/sp0FUmfEOoAboVJFeM4Cyj+ atJeggLq7Mh2oXScFl58qU5k9LZRvkKp7DnG3xVvlYRpgW2nmFVFmT8C38CNPCUq60/A9b 2OkEnqzCUALdzp62ML3RoGqo4DibyVvYMUQc+btT2tfxtHOvKRAvrV3WkGLBZ2HleP18ne frfzc9xfDja/h34Y1AdAuys3PVtj5WwqJS6n5ae18HT3HG5Zo8aeSbxhNLLna4OQgOynGM 3avYsx+HwZbIE0ikD7/Vt8KpWrw6yyrhxo/WMuC05jCd4Pg31YiiYNZRkmG3ng== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gGpzD4sgPz11tV for ; Fri, 15 May 2026 01:10:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22cf0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 15 May 2026 01:10:27 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: b99954433d42 - main - linux: Fix some problems with header pollution List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: b99954433d42d978b257e846dbfe568e9af7b140 Auto-Submitted: auto-generated Date: Fri, 15 May 2026 01:10:27 +0000 Message-Id: <6a067283.22cf0.6eb8afc4@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=b99954433d42d978b257e846dbfe568e9af7b140 commit b99954433d42d978b257e846dbfe568e9af7b140 Author: Mark Johnston AuthorDate: 2026-05-15 00:39:25 +0000 Commit: Mark Johnston CommitDate: 2026-05-15 00:39:25 +0000 linux: Fix some problems with header pollution - Avoid including sys/proc.h in linux_vdso_gtod.c. It's not needed, but the implicit inclusion of sys/param.h via sys/ucred.h->bsm/audit.h was bringing in some required definitions. - Include a couple of required headers: sys/time.h (for struct bintime), and limits.h (for INT_MAX). - Move some helpers from linux.h, which depend on sys/param.h for NODEV, to the one CU where they're actually used. No functional change intended. Reviewed by: imp, kib, emaste MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D56982 --- sys/amd64/linux/linux_vdso_gtod.c | 4 ++- sys/amd64/linux32/linux32_vdso_gtod.c | 4 ++- sys/arm64/linux/linux_vdso_gtod.c | 4 ++- sys/compat/linux/linux.h | 50 ----------------------------------- sys/compat/linux/linux_stats.c | 46 ++++++++++++++++++++++++++++++++ sys/i386/linux/linux_vdso_gtod.c | 4 ++- 6 files changed, 58 insertions(+), 54 deletions(-) diff --git a/sys/amd64/linux/linux_vdso_gtod.c b/sys/amd64/linux/linux_vdso_gtod.c index abe42d51a3ac..12c5c96dcead 100644 --- a/sys/amd64/linux/linux_vdso_gtod.c +++ b/sys/amd64/linux/linux_vdso_gtod.c @@ -27,12 +27,14 @@ #include #include -#include #include #include +#include #define _KERNEL #include #undef _KERNEL + +#include #include #include diff --git a/sys/amd64/linux32/linux32_vdso_gtod.c b/sys/amd64/linux32/linux32_vdso_gtod.c index f32db30057d0..ff4b372ea3bc 100644 --- a/sys/amd64/linux32/linux32_vdso_gtod.c +++ b/sys/amd64/linux32/linux32_vdso_gtod.c @@ -27,12 +27,14 @@ #include #include -#include #include #include +#include #define _KERNEL #include #undef _KERNEL + +#include #include #include diff --git a/sys/arm64/linux/linux_vdso_gtod.c b/sys/arm64/linux/linux_vdso_gtod.c index 203c76b6e3a9..55f039b74593 100644 --- a/sys/arm64/linux/linux_vdso_gtod.c +++ b/sys/arm64/linux/linux_vdso_gtod.c @@ -28,12 +28,14 @@ #include #include -#include #include #include +#include #define _KERNEL #include #undef _KERNEL + +#include #include #include diff --git a/sys/compat/linux/linux.h b/sys/compat/linux/linux.h index 67acd726a503..a9f753cd55b7 100644 --- a/sys/compat/linux/linux.h +++ b/sys/compat/linux/linux.h @@ -28,58 +28,8 @@ #ifndef _LINUX_MI_H_ #define _LINUX_MI_H_ -/* - * Machine independent set of types for the Linux types. - */ typedef uint32_t l_dev_t; -/* - * Linux dev_t conversion routines. - * - * As of version 2.6.0 of the Linux kernel, dev_t is a 32-bit quantity - * with 12 bits set asaid for the major number and 20 for the minor number. - * The in-kernel dev_t encoded as MMMmmmmm, where M is a hex digit of the - * major number and m is a hex digit of the minor number. - * The user-space dev_t encoded as mmmM MMmm, where M and m is the major - * and minor numbers accordingly. This is downward compatible with legacy - * systems where dev_t is 16 bits wide, encoded as MMmm. - * In glibc dev_t is a 64-bit quantity, with 32-bit major and minor numbers, - * encoded as MMMM Mmmm mmmM MMmm. This is downward compatible with the Linux - * kernel and with legacy systems where dev_t is 16 bits wide. - * - * In the FreeBSD dev_t is a 64-bit quantity. The major and minor numbers - * are encoded as MMMmmmMm, therefore conversion of the device numbers between - * Linux user-space and FreeBSD kernel required. - */ -static __inline l_dev_t -linux_encode_dev(int _major, int _minor) -{ - - return ((_minor & 0xff) | ((_major & 0xfff) << 8) | - (((_minor & ~0xff) << 12) & 0xfff00000)); -} - -static __inline l_dev_t -linux_new_encode_dev(dev_t _dev) -{ - - return (_dev == NODEV ? 0 : linux_encode_dev(major(_dev), minor(_dev))); -} - -static __inline int -linux_encode_major(dev_t _dev) -{ - - return (_dev == NODEV ? 0 : major(_dev) & 0xfff); -} - -static __inline int -linux_encode_minor(dev_t _dev) -{ - - return (_dev == NODEV ? 0 : minor(_dev) & 0xfffff); -} - static __inline int linux_decode_major(l_dev_t _dev) { diff --git a/sys/compat/linux/linux_stats.c b/sys/compat/linux/linux_stats.c index 6f96a219003b..5ac9394f3601 100644 --- a/sys/compat/linux/linux_stats.c +++ b/sys/compat/linux/linux_stats.c @@ -58,6 +58,52 @@ #include #include +/* + * Linux dev_t conversion routines. + * + * As of version 2.6.0 of the Linux kernel, dev_t is a 32-bit quantity + * with 12 bits set asaid for the major number and 20 for the minor number. + * The in-kernel dev_t encoded as MMMmmmmm, where M is a hex digit of the + * major number and m is a hex digit of the minor number. + * The user-space dev_t encoded as mmmM MMmm, where M and m is the major + * and minor numbers accordingly. This is downward compatible with legacy + * systems where dev_t is 16 bits wide, encoded as MMmm. + * In glibc dev_t is a 64-bit quantity, with 32-bit major and minor numbers, + * encoded as MMMM Mmmm mmmM MMmm. This is downward compatible with the Linux + * kernel and with legacy systems where dev_t is 16 bits wide. + * + * In the FreeBSD dev_t is a 64-bit quantity. The major and minor numbers + * are encoded as MMMmmmMm, therefore conversion of the device numbers between + * Linux user-space and FreeBSD kernel required. + */ +static l_dev_t +linux_encode_dev(int _major, int _minor) +{ + + return ((_minor & 0xff) | ((_major & 0xfff) << 8) | + (((_minor & ~0xff) << 12) & 0xfff00000)); +} + +static l_dev_t +linux_new_encode_dev(dev_t _dev) +{ + + return (_dev == NODEV ? 0 : linux_encode_dev(major(_dev), minor(_dev))); +} + +static int +linux_encode_major(dev_t _dev) +{ + + return (_dev == NODEV ? 0 : major(_dev) & 0xfff); +} + +static int +linux_encode_minor(dev_t _dev) +{ + + return (_dev == NODEV ? 0 : minor(_dev) & 0xfffff); +} static int linux_kern_fstat(struct thread *td, int fd, struct stat *sbp) diff --git a/sys/i386/linux/linux_vdso_gtod.c b/sys/i386/linux/linux_vdso_gtod.c index 00367d82139e..336f8d4c290d 100644 --- a/sys/i386/linux/linux_vdso_gtod.c +++ b/sys/i386/linux/linux_vdso_gtod.c @@ -27,12 +27,14 @@ #include #include -#include #include #include +#include #define _KERNEL #include #undef _KERNEL + +#include #include #include From nobody Fri May 15 03:37:30 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gGtDq0Ls4z6cjSQ; Fri, 15 May 2026 03:37:31 +0000 (UTC) (envelope-from danfe@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "freefall.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gGtDp6dlKz4GrR; Fri, 15 May 2026 03:37:30 +0000 (UTC) (envelope-from danfe@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778816250; 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=/2ftWnyZU0bYSOlqka7YVcTba/Fs5ljHGcldewOGI6Y=; b=vmeNKDsNqFrpLFrXjOwi0hgfCpepIgW2YPwDAxszWj9Bqn0J4jHl4kOiu6CSlwJ22gN1zz jNsiXPpSMBTUBBI5v5eeWg5PmedJ2UHNVvwiyLubCTzIJdh3A7S/6lRmZwHlruJEAUBzzb Hrx1/1IyH84OOtbDFhWZR1SzQbG6Un+vkQKIIYuHiMZ0a2+aQjFDWYw+0VTNN9/qFP520z CVIa31yYNKUKocz49+EEQduAJOxxHNNOaXe5CKdTi41QWhsIu6BeSk/TTUkss/DaJ/qHjV BMOWtQVj7mSrYSxcY/mOzV+6Jktro6Egd/BKF3PoP9i5oempQM55x+O2mpUwTA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778816250; a=rsa-sha256; cv=none; b=gVJvwM+2JWc3KCDjzUeyLcTKg+LOetXYFFAkKCB1km3x8RYLOFmUazWMxfWkunAxw5NE7u ZPNryCLzWrOegEMaeZQNuPY4bFlVrMFQsV9rMJvQEXMm4gFoxxlBhfpBpIrqAZ+ZepV7Mu R1qiqcynXh0ce3zkaZBfFGhQpB96cWQt/xLyN/llqQIK2Y2oSfyuBc2PbMxlS+u9ntvp96 e56AP48KMlsAQ4koPp8bY2tQuBlv/uaYQpdL37GNQARUXnjKWnlLV9c1tB0/ZzxE18DNaS 9z899r5z9U8ZWPL5g/F3IQUTVLLgozij6gHHmwiEkqj5O9NE8xZr2K9xE6f1Pg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778816250; 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=/2ftWnyZU0bYSOlqka7YVcTba/Fs5ljHGcldewOGI6Y=; b=VVMyI8yrnmBfRel1+i7hfO2TfGKanUlREJZ77aswAL73egR0hCo4ends4L1ssvTkIPG0PW YIHiWyXO1fb6zswUDTuaMDJ5mZ5xEBIRqSC8gqk/AARlvmfB+tK8/SNUblBF1k1CGHgiSb h7XUnePjjIFVXvXeavZB818FCeKZDP8Lt4n8g0AWc73WhsJSPMHtducbLn/PV8DMQ2HLZJ ks7SVt61LWyzDs5534o0OrQzxWCgQOAV3tysTEKnVcy6L9e4WmeAScNMVZBG5LZsEIhYco BJBq+YyJG7ckIRAYdvE8+1NGbEqM3DNq9lLAx3zp/6ODgHfzt5/1JY+dgYiZ0w== Received: by freefall.freebsd.org (Postfix, from userid 1033) id C89EA15C97; Fri, 15 May 2026 03:37:30 +0000 (UTC) Date: Fri, 15 May 2026 03:37:30 +0000 From: Alexey Dokuchaev To: Colin Percival Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-branches@freebsd.org Subject: Re: git: 01d5910b8766 - stable/15 - pkg-stage.sh: Add ext2 and ntfs Message-ID: References: <6a061a2c.25c2f.7465fc96@gitrepo.freebsd.org> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <6a061a2c.25c2f.7465fc96@gitrepo.freebsd.org> On Thu, May 14, 2026 at 06:53:32PM +0000, Colin Percival wrote: > commit 01d5910b8766671afdbd9e274fd62b397aca9e1a > > pkg-stage.sh: Add ext2 and ntfs > > Having these packages available on release media may help users who > need to sneakernet other packages (e.g. firmware) from systems running > Linux or Windows. FreeBSD supports extfs (rw) natively, what's the need for FUSE-ext2? ./danfe From nobody Fri May 15 06:24:07 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gGxx53L4Bz6cy6G; Fri, 15 May 2026 06:24:09 +0000 (UTC) (envelope-from cperciva@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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gGxx52j3Kz3KML; Fri, 15 May 2026 06:24:09 +0000 (UTC) (envelope-from cperciva@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778826249; 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:autocrypt:autocrypt; bh=TYM0NFHB4HJIO9iceERJj3Zd1q3SiOvawH3LwonKUNQ=; b=daSwZkicpT6BnHTNospKluegpqBH+4ebDjCEf7L4htRmuG49fXc5+c0Hr45a3Qo9C6eNTA e1Tfh2ElKfmCfBNz7kUuMFWrFgwi0uk/hmhdmWKy18c/QihsRVPWBw+CVF4/I8FmuDpScb t9fCs7tMWckdObud9ZXR5lc7TnZURpvDBr2eMo7D7zmye6Oow69/sIJc6pk8cHIwtb6xFV olyQ2Am2nDQA7vZp4I0dji9wV/bjfuWRlpzwyswHZ6XlnIK4JHZTi6+qfxPnPjLdAYx3a0 yL2JhUE9iMvduyJRDn6KtGy4dc5N0Kxnm6OKimVcktU3SkRQxqxTUe94skm6mQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778826249; a=rsa-sha256; cv=none; b=kTm2rsjyzoPFnTipezD6/RQ2LHEIUGs37T+9W7l5nV2G0IZnROBezDZ9r7ujlYygh0743R qh+clDq1j0KuSPydTbPVvYf2gyHgR9AEMV7OQ3Nx3tIY91R658PCuVTjZgeLakvevzRLpu rWzklpr8XHSdAsMR8FPLlDB0tVxq1fWKZLphAxPwMfxlqw9UkzYrJl3mT3rG1uayQmbZ6p 12VbFvoAXPFRUvr+ZtSx71ODxRVGfW18SXzE/h9v4DdHndnDq/tOZyL9KUhVTXQIPsQfaw xBuTYbhh+2o4WwxutoWoHzzLtExkZVtJwD2M8kkaefqg/lj6LzBFbS7O9NkE/w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778826249; 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:autocrypt:autocrypt; bh=TYM0NFHB4HJIO9iceERJj3Zd1q3SiOvawH3LwonKUNQ=; b=cnYfr9y/VpuhfihqEfei+sT0u+73QAAuLzgKj+zOORaClsS/1k9uZ2L3l6f9jQV/3ZHMNz ZtBeJxQdLuWHVxWR/BnNhW8/rKs1bYfxZOOC9vRbeb5We/mOPaxEMZsyEr6f+rJEzjwBvz GQamerUxUPFqOtMsw0oT1crs4q5D5M7t13A3fpgxPxkkiycLsZF08jD/uyPk8FM7KxaQVq uF2Xc9kngOjo/sedA67uDkNWERZarxuAnBG7q+RH6KukFF6Y55sPy/c3GkSIG0b+R+NKWt 59K0kTuNSF+Z6sePFAtdGrXlZQ1eKCMabGsGZrJ3uEdNx5XAXZ+AU9T7u1tkHg== Received: from [192.168.4.34] (S0106684a76304d01.vf.shawcable.net [70.69.240.84]) (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: cperciva/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4gGxx46JQ5z5dB; Fri, 15 May 2026 06:24:08 +0000 (UTC) (envelope-from cperciva@freebsd.org) Message-ID: Date: Thu, 14 May 2026 23:24:07 -0700 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 01d5910b8766 - stable/15 - pkg-stage.sh: Add ext2 and ntfs To: Alexey Dokuchaev Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-branches@freebsd.org References: <6a061a2c.25c2f.7465fc96@gitrepo.freebsd.org> Content-Language: en-US From: Colin Percival Autocrypt: addr=cperciva@freebsd.org; keydata= xsFNBGWMSrYBEACdWRqDn3B3SKO7IG0/fGHYtfs26f3Q5QeAcasy1fQLniwGQWn5rlILhbCD K/jdNoDm5Zxq20eqyffoDNObCjnHgg4tGANdi+RmDy+7CDpE789H8dss9y7Pt5DlGGAXQQnt hxush3EYS/Ctprd9UUL/lzOOLOU1aNtzB84tNrJBtcJmL7OYHfyTSNFxvedqJrrasejIQOLI t/DQ89BPzz+vsKHz7FJPXh3fsVkzLA00DJYcfkgxyABfJNA7U6yMwd4DVSdx/SsvfIDMVXnu UXCXswo106WPZbYGlZPpq0wW6iibtTerJix+8AeuwXvl9O1p8yESK4ErkIxCnmghTSz+pdzj z/6xBRkdDM9VdZ0r+CzsaNXMpDOzFuKyjaiYBdgCLljbDnXIHFcqXenrZ7Xwkm09g/M4uVSh pIUG2RYa6tsHSQoGCp3f2RZv1znfViKQFbbL83QjtPA20AhseZSYbHp1FPhXyy9J0wkGL16L e99g6gdGeIRE82BZjBjKGDkoyDPq+oDRSFl8NtzmIKy+cfz00nViqcTF4bREXEawFGhlpO0X O9q8mijI9iFB6zaPBiSdJGBL5ML5qLTNCl8Zlf4m1TBvmRTqF/lzMHVXHidDoUhpSh/y3AFZ 1KrYc27ztJQywDJPJPWPbtY8YhFLFs377gfP8WldsZjzp8nvoQARAQABzSVDb2xpbiBQZXJj aXZhbCA8Y3BlcmNpdmFARnJlZUJTRC5vcmc+wsGRBBMBCAA7FiEEglY7hNBiDtwN+4ZBOJfy 4i5lrT8FAmWMSrYCGwMICwkNCAwHCwMFFQoJCAsFFgMCAQACHgUCF4AACgkQOJfy4i5lrT++ ig/9GZKdN2fHSyrANKZX38ivd7IX2wAYouqH9DrQM94W8IciaDLmarN4Pl9mY+aucMwQUSyp uNtKOJwKqhVVaalF9Zw0sRMH4CJuvT7vKCtZ3q1Okb7soRvFte4d+vXhvPxCvBFDA5JzU7Lg DR5eqqcvF1dN1OuCq16pl0zCOSH/Jr5ToE3LM3Av1KBGcZD7ZSzHRWsFjV5AOUJKySuA3GwJ e/jASQcQ0YfCnru8ntLmYg/2SKvZFlfthZiCBnAppMt4n4BUAw3TDvf10HIDtdneejawcbLS gofLCvGqumwbZYAMKWrFzT4+7KQvr0pOw8QD7EbxnB4f9hQ7UiVF8qWsyKU3iv6b5JLhbS59 ooKRccyOvdMLcVJ0ZdpqoxrNv061ZUqLL5RiWjBlc1qjBnDxeg5oyM0rT8WLftdgvyH6RQt0 KWngumBAT5AT2DUYL8Uz1490cqfO9K4yEGZAJB9XRVX1g2IWTOjae+0g9ZII+h91UngFz+Rz aKDeseKBbCGDOFXx1TqKiHl2g255ZnUxKYTlucFtguv4gDGBgEk4G9JaEWBw1IWblcKhxH7L 2vWsUhvwghjIxHdO/RkeIeHvSp4YZxCJ7a3TaJLYAlwYopfTKVzNhcDY5h5syEuoHjyJCxXK SyoJYAVu8Yl2KUhvOtOmL1VZ6xyHnpdMRWKJZ5jOwU0EZYxKtgEQANYfgbtUMVnhjxDHhWLp g5kLHK3YW0TfJKzpXqDB7NiqxHofn4OcbZnVC3MKggcbs9o1/UtsjnlsG8550PfiYkDXvPiO RJwgbGs6MGIDK797C6cnBLQ8xwBa9SL4cl5iQFnhWmt6vwnJ+an/cm5JpYves3wL7jV09qU9 57hkHXEUcl38r4FssZzVcLKPUVTa3Un+QGRTGDGe/f4ctjMaqv0ZCM+l2ixPhf/vqESrfSLv V/+T3dmtUfXjazO3SABvsHwxgGuTTYOlKoPCaebr+BRdqm0xeIShoIlhvTI8y4clchqx/Uxg UG5X2kvU13k3DS3Q8uLE4Et9x1CcZT6WGgBZSR6R0WfD0SDnzufNnRWJ0dEPA2MtJHE7+85R Vi9j/IgZV+y5Ur+bnPkjDG1s2SVciX5v9HQ0oilcBhvx0j5lGE9hhurD9F+fCvkr4KdbCknE 6Y8ce8pCNBUoB/DqibJivOzTk9K9MGB5x0De5TerIrFiaw3/mQC9nGeO9dtE7wvDJetWeoTq 4BEaCzpufNqbkpOaTQILr4V6Gp7M6v97g83TVAwZntz/q8ptwuKQPZ2JaSFLZn7oWUpYXA5s +SIODFHLn6iMoYpBQskHQjnj4lEPJadl4qj+ZKA89iDAKsniyoFXsbJe2CPbMS1yzBxKZq6K D/jpt7BOnuHr/JrXABEBAAHCwXYEGAEIACAWIQSCVjuE0GIO3A37hkE4l/LiLmWtPwUCZYxK tgIbDAAKCRA4l/LiLmWtP3jmEACQrh9gWe8F1Tkw3m6VoHKwLc5he4tX3WpQa//soPO6iGG3 S3WPruQ46NrAaAojoOcKI9UONDO5rxG0ZTX53S+lu2EO47jbcLwOCjaEpjKpDRt9ZXBQE8Xl mtBE9Bp3W9gpjB1nE3KNM1mJYgsK0QdRpwwfh4pVgGpOj8j23I6MCK+v99zEBnpgCn2GX8W/ kctRXHqWwndHysOJtRP/zrl7dDaABF1f9efUl0LL3TD3GJ9VDz+DNOin/uK2a1hiJo8QzTRk PpfUQ2ebzDsrd1i/pOWkMSkdH+rEu4AGrXWtaBwrMyrGkL6Icb6yO+P9/z0W2wlgBf3P1YRt JPgQt/Dj3yvA/UnaV/QmuVQPjl13o24UnJGsZM8XGnNdfWBKkC1Q6VXC4QT+dyBHYH9MuE9d 6oGl8pFM1+cTfEfbM62/rRoPkF1yHMsI/903VxEvuUIKfhEZAVLFyHldooNxuchntHQP9y8J 8Ou9bWYQP7MnEn+kwSwrZkjurfPkan+xQvp6dDYnj3V0GwA5pprBMaB928VIDVOv+1PNQI3t Cvk5VPv/skq+TJRMHW7bFSt8PRa91cUf1FOLIz9APDiJOzXkwxUEHGV3zPSaUhs1JYjyBeGT wDAvtLUdjOnRhEUOwlnIrztmvyciutjJoVzKEEjj5WXnHk9L9kQ1bpAjkjTONw== In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 5/14/26 20:37, Alexey Dokuchaev wrote: > On Thu, May 14, 2026 at 06:53:32PM +0000, Colin Percival wrote: >> commit 01d5910b8766671afdbd9e274fd62b397aca9e1a >> >> pkg-stage.sh: Add ext2 and ntfs >> >> Having these packages available on release media may help users who >> need to sneakernet other packages (e.g. firmware) from systems running >> Linux or Windows. > > FreeBSD supports extfs (rw) natively, what's the need for FUSE-ext2? The "ext2" fusefs port also handles ext3 and ext4. Poorly named port, I suppose... -- Colin Percival FreeBSD Release Engineering Lead & EC2 platform maintainer Founder, Tarsnap | www.tarsnap.com | Online backups for the truly paranoid From nobody Fri May 15 09:57:27 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gH2gD0rbnz6cXBH for ; Fri, 15 May 2026 09:57: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gH2gC6qr7z3drt for ; Fri, 15 May 2026 09:57:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778839048; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ooa7zEO8o8ker7VleaskMOgalQIQGy0ptmgHZxwjcL8=; b=FcfFeNBgLWfv8EIK3efp3l0q0mUnsweHy+jfAKB/SWJFFEfUzCBYr2rckaicXkotfM2vE7 igatyUj8RvjJiWdLh0ndu5USKBrTHSKEWmJILhH/Q+PfTkuR/r6HWkOrENX5b/hlLYJAzS wWBbu4dZclMHWwQCPCp6JePNj9tN47QN5L1BD09Lda65+pdt92UyvV4YET5xoxhw/VkmYm 6ha1e2vxVF+EHO1IZj0wCQU/BHjwqQxar3a+Z/IF/9FmlyA4MLfcbdPcGK4u6N6Ej7mr5u ulIo2AZe/WlAA06cGmxf0dWbIei4HcVzoqPqxZS+ctjkDRF8ZU4RWgv8OQrL3g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778839048; a=rsa-sha256; cv=none; b=UCJeqYtpCBu0WuynFouwfcV+Ody0AnJ2VWb1uO+guKc4BBRz8YMkdo1ETC5nYZUDePVhg7 uWKtk4kbD7fvDbLrmgk9nc930gOXDRSp3yL0qGnGZynRFXcqXMNiTzCieGpr4i/bZOc1tK YU/5tsOk0QNwL5MKQhyclfsnJ+K+KQcYIp1nDxaGUH7vXN6ytFd/1gdlXwm9j89fqIsRjy TBRGgJa1tU41Oy1h0WUo65wYwwQV33qqTYVoh8/2wWvH8hcYe39KmvkYsrNwRLhy3Wv1Hm 6DL9JO0RlV88V/flaRxjdLlyHXBE6JfFVLlv7Hmn+8vkDdl1ffFHFxkEataBBA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778839048; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ooa7zEO8o8ker7VleaskMOgalQIQGy0ptmgHZxwjcL8=; b=eYrcabsIoywU8jRz7uPBFTcMV8uMrF0SbT29tOHYXzyw5hmF/AZA6Wkzd25qyc+Q19wWyK CWk6IYpKfiHJakQdrpigOUWOMuS/O2KuT3zx/qbi1IhXxpnf4yX3xq9aZuw96twJIeIsAy CwC7shR+tgR/V1nZ++9Pw2tl6nDsNNYcG9LHnSpB8gU0UbXZyo0JT7On/btja7HcdhYgW0 WnoAfUzifzfRmYt7tIuaDNU7swN7EwX+TpPTloeKSRRU+Zbjfi0hwQNfNojNbfZ9qVEGCX a3yIQTmHEpqcF8N1b1sXwyDhF7F1nMbnhBrrEHwNbdod0tsiUGYJcGIZAPCVpQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gH2gC5jMwz1HWd for ; Fri, 15 May 2026 09:57:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d3dc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 15 May 2026 09:57:27 +0000 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: e0c3d21e3b43 - main - bhyve.8: Improve readability by not breaking -f's synopsis List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: e0c3d21e3b43c664fbec3b070612c17a72c39482 Auto-Submitted: auto-generated Date: Fri, 15 May 2026 09:57:27 +0000 Message-Id: <6a06ee07.3d3dc.4a8bb0f3@gitrepo.freebsd.org> The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=e0c3d21e3b43c664fbec3b070612c17a72c39482 commit e0c3d21e3b43c664fbec3b070612c17a72c39482 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2026-05-15 09:49:43 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2026-05-15 09:49:43 +0000 bhyve.8: Improve readability by not breaking -f's synopsis MFC after: 3 days --- usr.sbin/bhyve/bhyve.8 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/bhyve/bhyve.8 b/usr.sbin/bhyve/bhyve.8 index dd9b5b992415..5118974baace 100644 --- a/usr.sbin/bhyve/bhyve.8 +++ b/usr.sbin/bhyve/bhyve.8 @@ -46,8 +46,8 @@ .Op Cm ,threads= Ar n .Oc .Sm on -.Oo Fl f .Sm off +.Oo Fl f\~ .Ar name Cm \&, .Oo .Cm string No | Cm file From nobody Fri May 15 09:57:26 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gH2gH6Tksz6cXH9 for ; Fri, 15 May 2026 09:57: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gH2gH5smYz3f3C for ; Fri, 15 May 2026 09:57:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778839051; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4qjfctbEJ9F9u2yA3d7C91ZfCZBa3IEApSo8ZUNF87c=; b=uk6aJRW+foNWBvFxSKcmiv9/5o4tKuWmc5H2Wb4U/BxOejuNfc7VOjwJ4VAidaMVft9jQj 4tq/z5Nbb1pohJIHt2nxlMKDf/Wgrft3helWItbGsGie6bHbu2fhf3ShzXw4mWgZfCekD4 LZIFrBW59jQzkG4vFndwUWMmGwErnVHBJlaYu+n9zwyPvvAaItpp2zzO8YzzM65OXz6cKd dP0e9Kr537l38Q0pwjSPiEN/FzjdOATrLiapl9LlRSpi3PHhpLt7kMPeP7i1myiRkXmftQ 9hWnKV3DTyf/MT1hWeEv5VPgjb5yz8nVtswBwmyz0Y5KvRffYLxzyo0TiU8guQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778839051; a=rsa-sha256; cv=none; b=j8eWN+eN7q0tbS9YGD+WUJkL3lDXYxHkgKwZE9ll75FtqSnrc3QRPITPi7XDHcdEgX5/zQ Vf8r172jFD5WO0eZIe5pcVNS2ueCzitFxezYpPw06ViXQ5DTZqzoz0JuVUnhOw5Cwwl8b6 rwxqvX3VKTWh6qZCwmC37YEHbXUNllQ5yN7RSRWqyfc/wkX6T0AvnvpUwfmq/lqZ7OErNH pdlmzvR/Q7cMLsKSGfb3BcIEK+T/7kf3xYfZf3g/+vMKy5wayg/+IcHHkjC6EUKpHDubJW uzj44RiotQ8vW0Q/QYDv+snmizcQ6KHvslZUFBm3YHF+XRG/fGL1DqtiXnrVhg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778839051; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4qjfctbEJ9F9u2yA3d7C91ZfCZBa3IEApSo8ZUNF87c=; b=Pm4E7wA//q1sRL7sbaU3HVSeRYdbOzdSt9oGRH/0rdDGcYYojnGUsZ4Kp7tPodhpQDxfpJ WAtkesk7EM+saNqaIkSy1fJAjxTPLHM4pAWHNIF1Keup5lp3L7eRD6u4tHBNbIsMdsPsiN HLtlwPvtsxO0nD58CIes2emI9QcPBf7hQG+CWvk6/z1n8cKJxwfvXIF1sG8ltWQ3KuWuID X8n8yohkXW30/AQru6tvgxlzlq+Z41tH+TVpWj84fOLidy6NWr6kKcioQNdKbeL61PT7/U 4c4EcSG0zVQ1lD1cPa5L2lEZpC95fHO2lE2IixGpPtn2g6MDtZ/iD+tSkzMY+w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gH2gH5M08z1HWf for ; Fri, 15 May 2026 09:57:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3c3d9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 15 May 2026 09:57:26 +0000 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: 7abddbb3cdee - main - bhyve.8: Fix formatting of -G's "w" prefix List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: 7abddbb3cdeeff0d4d991aee52e92382e847e8a2 Auto-Submitted: auto-generated Date: Fri, 15 May 2026 09:57:26 +0000 Message-Id: <6a06ee06.3c3d9.270864dc@gitrepo.freebsd.org> The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=7abddbb3cdeeff0d4d991aee52e92382e847e8a2 commit 7abddbb3cdeeff0d4d991aee52e92382e847e8a2 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2026-05-15 09:48:43 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2026-05-15 09:48:43 +0000 bhyve.8: Fix formatting of -G's "w" prefix "w" is a command modifier, not an argument. Use Cm. Fixes: 2cdff9918e79 byhve: add option to specify IP address for gdb MFC after: 3 days --- usr.sbin/bhyve/bhyve.8 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/usr.sbin/bhyve/bhyve.8 b/usr.sbin/bhyve/bhyve.8 index be906419d74e..dd9b5b992415 100644 --- a/usr.sbin/bhyve/bhyve.8 +++ b/usr.sbin/bhyve/bhyve.8 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd January 23, 2026 +.Dd May 15, 2026 .Dt BHYVE 8 .Os .Sh NAME @@ -58,7 +58,7 @@ .Oo .Sm off .Fl G\~ -.Oo Ar w Oc +.Oo Cm w Oc .Oo Ar bind_address Cm \&: Oc .Ar port .Sm on @@ -194,7 +194,7 @@ If a is specified, bhyve reads the file and adds the file content as fw_cfg data. .It Fl G Xo .Sm off -.Oo Ar w Oc +.Oo Cm w Oc .Oo Ar bind_address Cm \&: Oc .Ar port .Sm on @@ -208,7 +208,7 @@ and to listen for debugger connections. Only a single debugger may be attached to the debug server at a time. If the option begins with -.Sq w , +.Cm w , .Nm will pause execution at the first instruction waiting for a debugger to attach. .It Fl H From nobody Fri May 15 12:13:35 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gH5hH3Slvz6dCxR for ; Fri, 15 May 2026 12:13: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gH5hH2fdbz3rBK for ; Fri, 15 May 2026 12:13:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778847215; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=v8Tyn+uYZ6DAgoLtTrfLECThuVrgzPkfCOIHMo1Opbs=; b=tNvPxINeGRT6pATV/QDK5v2l3gq/K98lDudW/mDS7da9dqe3nW/3QdR9Xq4fvPTVBfyfJq cooIkXsjO9t9y18PonYisxEx98nvLrRglrOewDCgEwho4gzA4MRau2KlxBw2jlJa06KUWm G5fwQfvFm+7SJwWaAfBVPUfYgPk9mQ8bg5d7zOF9CC39aD86A3TbG5A9IAABy8c31u9/wG tQY8wxrLuy2mKfFFGE9VHtVwuxU0AMvvaF55htR28acOfDCDwpVnh7RGAhEQBydGZqB79J Ha6XVwYPRfTbay4NxrEnHRGrlLl1J+JV3IYhHLdaJuc6e8YgOI0prk71e7sY5g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778847215; a=rsa-sha256; cv=none; b=WlzrUosNl0u+zNi5uIB6vLFzlb2J/ByP1Pd8ZfjEaSEGyWCPm6qqAVCPFikH8Ncpj/S5sJ j7pCabaFm++FPpq2y8p7oldi4Y3ZkW3BajVYJj6hQszebzIEbVIWE5p7wMolcLzDS1mFbV reK8GUGgigKv+tpVr7e97LG4gI8tGReLD6fdWLwPMZH8HPuWQn45jltiooIY/gIWs0ux0O qqbV4Tbxj3WMwcOdyOce19Iec2RWRcctJM9mvYO61O170d2HATgXuBve36vae8DkPP4xK4 QNypDDLva+CxsqpB+3C0sAZ8y6cUTKHbF4jA+L9C1Zr6eRc5we88F0Glp1fpgw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778847215; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=v8Tyn+uYZ6DAgoLtTrfLECThuVrgzPkfCOIHMo1Opbs=; b=QL+ttzgj00fGfKoaXjuKZbjM/Ad0kshLJXKrDnBUmnmWS+YvpUGRSf5eLVKUrq9AUzli99 QIHG9UvLrTAfOQ/I+vXA8SU1T6W7imxjxFUY0m/P1ySXGZeJG4+f2BaQtaprKma3t5+7sP 5rdtlN4FTn6dC3soHNrQipEi59r9lLAz5t8o1l1iC2cCbGg/YegSBPb6pvgJRBmDg5jSwc 4av/RwVQs0zg3R7MufEdBBa1VlkIh+mEaVKnYuL6tcw1kyKqVv0LtTL8TtaT3Y5Hn4nk8O pI3/+Dl2IWaeKVGcBgp92NkbRDJTOEe9KGuwWqgNSvp3EbuBPLnip9XiKH5QFQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gH5hH2CBSz1LyK for ; Fri, 15 May 2026 12:13:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1bbaf by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 15 May 2026 12:13:35 +0000 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: ae0fd05a333b - main - p9fs.4: Cross-reference mount(8) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: ae0fd05a333b0ab9e6f020b07a0e483e6f85538a Auto-Submitted: auto-generated Date: Fri, 15 May 2026 12:13:35 +0000 Message-Id: <6a070def.1bbaf.22e56fe1@gitrepo.freebsd.org> The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=ae0fd05a333b0ab9e6f020b07a0e483e6f85538a commit ae0fd05a333b0ab9e6f020b07a0e483e6f85538a Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2026-05-15 10:11:29 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2026-05-15 10:13:20 +0000 p9fs.4: Cross-reference mount(8) MFC after: 3 days --- sbin/mount/mount.8 | 3 ++- share/man/man4/p9fs.4 | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/sbin/mount/mount.8 b/sbin/mount/mount.8 index 877001727a8f..b651fb53bf2c 100644 --- a/sbin/mount/mount.8 +++ b/sbin/mount/mount.8 @@ -28,7 +28,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd October 28, 2025 +.Dd May 15, 2026 .Dt MOUNT 8 .Os .Sh NAME @@ -584,6 +584,7 @@ support for a particular file system might be provided either on a static .Xr ext2fs 4 , .Xr ffs 4 , .Xr mac 4 , +.Xr p9fs 4 , .Xr procfs 4 , .Xr tarfs 4 , .Xr tmpfs 4 , diff --git a/share/man/man4/p9fs.4 b/share/man/man4/p9fs.4 index a49053d461d4..c50720b6ebc8 100644 --- a/share/man/man4/p9fs.4 +++ b/share/man/man4/p9fs.4 @@ -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 November 7, 2024 +.Dd May 15, 2026 .Dt P9FS 4 .Os .Sh NAME @@ -104,7 +104,8 @@ or .Pa /var/tmp have the expected semantics. .Sh SEE ALSO -.Xr fstab 5 +.Xr fstab 5 , +.Xr mount 8 .Sh HISTORY The 9P protocol first appeared in the Plan 9 operating system. More recently, the protocol has been widely used with virtual machines From nobody Fri May 15 12:52:20 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gH6Y03cX7z6dGC9 for ; Fri, 15 May 2026 12:52:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gH6Y02h1Gz3tv8 for ; Fri, 15 May 2026 12:52:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778849540; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LpZjN/MJBBne6HliI1WKBWCoKMm0i21xlQUwSAwSBnI=; b=BhhoMSGWVDqBIUNyqFNh7AgVYQCsFOhALX5DsMHgfyTPwZlFfUcBAPl4dL1tRxSc6NSmsE P1W5OPYHgm//aOGZcZlE76imzxtDtBxyRcMDUxCDDWVyNPUFmles3phB0YFx2SFlmdl7bM MA9SDE6uZ88EE4wjAOhi1bsUEFrJEDv6MtxSwsUaQWrL5Kv5ZdyQuBOzxlLMcLnsRnsr// e/gvqu+TsIhr9fj4BoLt6wH7zBwIMnflEry3Nd4z9qj+ZKXpdRUMaeshO4uoVh/FdHZVOF gdCnuRnJBPPmWitARnSIeLwfngX9Phr+j9q4bB2J/CO4DivCFNHUX4AiMdn4Aw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778849540; a=rsa-sha256; cv=none; b=CRulJhPc4wTUNjNfSr/Wj1+BPVIH7uzHYAovu5Ye8rm79VTcGOhCK4M2te1uj90Hd4PfJj +17nunoJvOzdF3vbTsi4JCxK7lRwp110kav+TWUFYB2CMCPc0mJAkEbUEUlTAq+mWS24W8 eSGFUATYdJ73vbIKVtnjtWf4OHs25pW7ktCEA/KRo4pIwAyoG0rntnbgU5t6Pi2hm2ApNQ 8Th5j9Y3jtpR0qBM2iwMBLjgB3yIuLIpVO/ZN0rvLiyJQI3j1KL4qmASazUZAA8/Q6fYPq xn22/ITLPlJJ3a+NEZjGQstRLbqzupzjvtk7Z1G3GoWAKdC+2t28E8GtUS9e/Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778849540; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LpZjN/MJBBne6HliI1WKBWCoKMm0i21xlQUwSAwSBnI=; b=RTfQgPQWfBYt3Bs1DWxxU57wJD142OHO4lQMm6tcgbxJw449MDSTb4u0I6hGE5cu/1O1Kb R9tK53W5eHSu1THScRBWTYDyQ18qLwDAeCchB3lA0DdNeliuvrpJ1q1zGK8bBPOWJ/6DJK JuhOty4ryqIxgEuW9M7l6DAFaXQq+IdVWHsxL8To1KdjvYsRfYbyI8Xihh2IIcxpWWeH/o 3GpX3UrUVyg7OazlEW333riZSjFRlg59fS2BPo6nrCW2eDXqlzvHDMQ/OGRDNQpeIoCX/V eGKl38QUYDkWksdC+Ge70GEherK3r02j8QaYpI0oKgeanqLic80Txu7NWcfxFA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gH6Y024Mfz1MhL for ; Fri, 15 May 2026 12:52:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1edeb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 15 May 2026 12:52:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Ziaee Subject: git: bcd50fe5c3c6 - main - style.mdoc: Explain why not to abuse Nm List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bcd50fe5c3c6e70c710e13378999814e9df43d3c Auto-Submitted: auto-generated Date: Fri, 15 May 2026 12:52:20 +0000 Message-Id: <6a071704.1edeb.3d5b357f@gitrepo.freebsd.org> The branch main has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=bcd50fe5c3c6e70c710e13378999814e9df43d3c commit bcd50fe5c3c6e70c710e13378999814e9df43d3c Author: Alexander Ziaee AuthorDate: 2026-05-15 12:49:20 +0000 Commit: Alexander Ziaee CommitDate: 2026-05-15 12:50:42 +0000 style.mdoc: Explain why not to abuse Nm MFC after: 3 days Reviewed by: 0mp Differential Revision: https://reviews.freebsd.org/D55299 --- share/man/man5/style.mdoc.5 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/share/man/man5/style.mdoc.5 b/share/man/man5/style.mdoc.5 index 64e2291d1c75..c4c2aa7b3695 100644 --- a/share/man/man5/style.mdoc.5 +++ b/share/man/man5/style.mdoc.5 @@ -41,6 +41,12 @@ which renders as: Then run .Ql Nm make Cm install Cm clean . .Ed +.Pp +This pollutes the +.Xr whatis 1 +database, causing +.Ql whatis clean +to incorrectly show the page it was written in. .El .Ss Copyright Header Refer to From nobody Fri May 15 14:43:11 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gH91654fDz6dPsL for ; Fri, 15 May 2026 14:43:22 +0000 (UTC) (envelope-from marklmi@yahoo.com) Received: from sonic305-20.consmr.mail.gq1.yahoo.com (sonic305-20.consmr.mail.gq1.yahoo.com [98.137.64.83]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4gH9162v15z45M5 for ; Fri, 15 May 2026 14:43:22 +0000 (UTC) (envelope-from marklmi@yahoo.com) Authentication-Results: mx1.freebsd.org; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1778856195; bh=SVdL1+XbaUKSsknQ39a/z3JnhV9UR6LyXuDygsFv3Qw=; h=Date:Subject:To:Cc:References:From:In-Reply-To:From:Subject:Reply-To; b=ug9tAl1kYqG68AXbsV9jqqcEU7Jiyc5HKA2yy11GiiTn7d/LpkEBTbmluhQRy2kpKyFNDwHXremmPH+dai+M5uwZw2x7rfmhiOGQzj5HY3IZbg2RzQ1LxvKHK/MtC/u7QT1Iuuuftpe0gxKYb15jyccF18nq/Mp5jsbVLTonT8nVUEBUtKN79W0orRxAquFR4EkJNXnQY9eWbTS02j1nPLCDzG2u0v1LRQpaE4XS3wARjPpE/AdeM8v+ezd6TtfEMsHM6q3duApNjvKHladCzfkEonYyuyCGg7mw39ITgT+Tf4Rok9Gn7aA3hkU8LmFjyyCm5lXvfpuHnxYUE9zJww== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1778856195; bh=52F9qMZ2x7SbhzV2Ss8Xw1wCmFgP9SbIy1SSVfP1UO5=; h=X-Sonic-MF:Date:Subject:To:From:From:Subject; b=s0aN1GkRvhRoT831mhD5icy/Q4wQ3vlpcBoqqZfhdfDHxpMXO7zBj6jOaUR4Gxq8CyFThHtRxkiRrqA1AhK6tTLMhlUO2BMTnd6pZo7310T+ZnrmGZdLqSslVFiHYlyLtdzcHQo8b4dbsq7aaHXokuMOYu/QkZvTGSxsC4JOPIE0Uk3Abbtm1HQN3qu6J50smU+xRXiB58vAeX8end16tkG2LKan7KTbz1jNznGYFGMng742QwppcoFXIBV/oe6r0wHZUO3swp7sffIz6k/wf8AB80zTjhWlDYzWLmahGFBhDryF+rDxverP2LVPGtGOo3pkveD/NMbC3pDhU9UPhA== X-YMail-OSG: ArpasIYVM1mS6HuIaIX3vihYdNIoWpIWelJDMg7Un8SW.4suaumZvATuGUMOThX nhmhisn9z79UoQQbZdC6ClzGjatTeRk644geR2AC0v7OEzsRHTpJaoR9NioGkim8jjMx3k71yXzw 6HuSagadEsIO4RMclN4YRjBwV70AAPXbIWFSV_LZExpsHt65Y_NSjIjAQz7n0bht.Na3Re9ImSoY xhh8BUjsdbxFoDkSmou1JegNcpanvYZM8WLYV0Kek0p4b9hS183ur364xmQrli.tkORFjXgZBy.y OHzh0GYfm1brgPN3dHWVuROHzZl.2d1wKERUC_OEY6f5yytxA6.1c3LwyLwXQ1X5IvR9UbZWYSgc IpclSVGGG5LY4dPg8diawRlN.3.pcfExWvGreWJV4dlIGZtCckuDhCrmhOYqo.CKtMd3oCROQpos Tboln40DT.f8V4fe8xOE.UB0oxdC25Fr7neVaSovdVVNgfa953pS25PdS2K7qF7nYb33yrjdJskA mxOWB2pyxaouXhRfogbiJjlDMsnMk7ZyDhTajx0jIUpttn2OeVt1fcBPOm.RhLaQfLm_3i49kxAI mQHCgSwq_oqUmTsp77QZyu1gBhhbNJVoq1pmvCxAfFYliJGkJ6W_Ws8PQKYsEICXXqJMngQ_NTE6 d2_rJBZYTzLWm8oB8M9Qt9Fhbif2v0on8cggTqaQHwmm.NoCZD0NOeUY.mT0AO1b63W2DavTgdpf q0psuWZQboT4OK1SOABvatanloES10HbfR0zwNoL3ABxqe8lRWNW5pII7DxMAJykonugU55VthV7 539FnMvA6yVA_I9.WhnU3pt1wVUgoGRpG07uFbo67K9DxZXbz9MSU0MvkREaDG_dMUEE9XTAfiyV S7.y_AzPOKT1sZzyt1xs9Acwyc4z6RIEFBcZDPRVSwwqEYk7EVTnVfWz70LE0CNTkeVq9_nLKf54 WCXjekEuRgqZpDzFya6pldvXZ0SuyF706xUQd9_WxvtIng0p4Z2Fb1u5jXQdQ.16BHnrm04G0erS dX7fFskzSsq0Cc5Eg4KONb_9W42kmNz9.NIYTCWvEBg9yMKY4_DmIbgO0LK4qq5FhHCXYOPc15ig pEa3Eqfd3pyd_BhLMzY76oZJI32h7tbmdl8RroBFIp5M1YWvdgTxIZKQuzIz_Il5pwvuRVVwHwPw EzkMBNCF2xqWRfjXVVR1EKmRkkw.xpioVJxowoaQmQGM97N4cjgM7PD9KlCO_CeZegVzDgeKmH2K kxHGEv3sHRypXC9jHSeCEN0KgY7mgiMPCgbuumVuKheHPz9V9C7jRayqDUgfjxZL8Z7DBlsUGjdq HOvXBETYw.rh0HkTB2mGQvctZYfO9H8NyQqwj4AkAzrEtdzlw7UefWpnd1IW2qNLHYBL.mpKxdm1 8PbGag2v4RDFNzUXmZGqmUGAoteUS13k6kufL_uyblIEWCjUIQbeEbQ3GpQ9RgcjR3Mm97YMGxAZ Kgiijd0YNUrWGJPW1oM2UZrJykkB_njG4CKwNz1o.ObhrvWPwV9bybsc9q3gEUlDbXtR2TrlatSg tJPGdGzNrDIlrV2FPcXxH8Ie_6Rt7Xls.6NQGlIVztxGDasEDUMmYshx5dmsoFkHOMWt6NxTJMhp kSIW.ehXl4K7zvyAh3DSU956nB35b1Wf5SYAkMjT5iO.e3h9RpdV.rNp5BAxR7H9fdkmwiGPS9fs MyiNwwhlZwPD828aKsNHx7dA65iBJPwU7buR8TSkIQnTuVI2Jjg.FEYbYCP8qbsoPAFhX8VsH7hh jgXmC_I4d2Xi085gGmuv9s3TTJBqKomYvuzJqAzASibRNRaHwhJHCxP5ViwQJ_RhBpQv851y_zju Ox8zjY1DhajDOFKzvGqPnUJE4qU7wDT9.YScmQUYoq5BE81wWVmr42nM3RvsNNln3V5DcntP7OFb hsJiEV.WsUsS6S8CH4mmQbEEUTqPc4gU7zkL8nbX.5VGBofenHxaaHEnHkLpqW2zgzbD5ZDzvLaq LJNYqEyxHSvb9TKBmsBmHoogCSp6c3agoZM7FSfw9Qm1LyTc_eJ1wpu1UHgWo0BrjuaAWe43mDst CVCmhhRnIBB69PMLtG4p9bWF94RXdSfx_o6n1kNSbyW_dQ2epaPAzqApJ4crkYWvYsidiJow7Ms6 2geuQS5nsBr5EQilxi3tY6QW431Tp3BBxTYBXwiynTEqvV0xOsp20fg4h5pOc5.d0xOCQE5PNYgo zgLyiwRDrvid2hd9gpthLd3he8TnVlVqykeNBDt3XlEfOUSUG8B9EWt96gTMR6REnL7gbR2hnOpn JRMM0IUW46VWZMBHSMPIGRkG4ghT.hpDUCHhH6QbY6bS2nx3OmzOr9hirTbA958ZG7EJYEWS3TvW dew-- X-Sonic-MF: X-Sonic-ID: 8f7dd9dd-89de-4d50-82bb-a05c3c017852 Received: from sonic.gate.mail.ne1.yahoo.com by sonic305.consmr.mail.gq1.yahoo.com with HTTP; Fri, 15 May 2026 14:43:15 +0000 Received: by hermes--production-gq1-7bb7df5c46-hjhbv (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID 16a7498e0c8376a548bf837f8d842d05; Fri, 15 May 2026 14:43:12 +0000 (UTC) Message-ID: <3fda2a13-fdde-42bb-8c18-a9482b7ee321@yahoo.com> Date: Fri, 15 May 2026 07:43:11 -0700 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 01d5910b8766 - stable/15 - pkg-stage.sh: Add ext2 and ntfs To: Colin Percival , Alexey Dokuchaev Cc: dev-commits-src-all@freebsd.org, dev-commits-src-branches@freebsd.org References: <6a061a2c.25c2f.7465fc96@gitrepo.freebsd.org> Content-Language: en-US From: Mark Millard In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Mailer: WebService/1.1.25725 mail.backend.jedi.jws.acl:role.jedi.acl.token.atz.jws.hermes.yahoo X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:36647, ipnet:98.137.64.0/20, country:US] X-Rspamd-Queue-Id: 4gH9162v15z45M5 X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated On 5/14/26 23:24, Colin Percival wrote: > On 5/14/26 20:37, Alexey Dokuchaev wrote: >> On Thu, May 14, 2026 at 06:53:32PM +0000, Colin Percival wrote: >>> commit 01d5910b8766671afdbd9e274fd62b397aca9e1a >>> >>>    pkg-stage.sh: Add ext2 and ntfs >>> >>>    Having these packages available on release media may help users who >>>    need to sneakernet other packages (e.g. firmware) from systems >>> running >>>    Linux or Windows. >> >> FreeBSD supports extfs (rw) natively, what's the need for FUSE-ext2? > > The "ext2" fusefs port also handles ext3 and ext4.  Poorly named port, I > suppose... > https://wiki.freebsd.org/Ext2fs reports about ext2fs.ko : QUOTE This page serves to keep some notes related to FreeBSD's kernel implementation that supports the original ext2 and sufficient features to support newer versions of the popular filesystem. . . . In FreeBSD ext2, ext3 and ext4 are not different filesystems: ext2 is the base filesystem and some features from ext3 and ext4 are supported. All features in FreeBSD's implementation follow UFS semantics and this can sometimes impose important differences. All supported FreeBSD versions support ext2/3/4 read and write with most of the features, except for journaling. FreeBSD 13-current supports Big Endian Platforms, including PowerPC, through byteswapping. FreeBSD 12.1 and later have support for DTrace to enable debugging in production. FreeBSD 12+ includes initial support for writing ext4 filesystems (thanks to Fedor Uporov). FreeBSD 10.1-12 used by default reallocblk. This comes from UFS and helps preventing defragmentation issues. Linux doesn't have an exact equivalent but Ext4 does delayed allocation which is similar in concept. In freeBSD 12 the feature was disabled by default as it proved to be unstable. FreeBSD 9.x+ fully supports the async mode, which is the default on Linux. Unlike Linux, the default is to use the sync mode which will make your filesystem more reliable at the cost of some performance. . . . Known issues We don't support the inline_data feature: it is doable, just no one has done it. We support Extended Attributes, but we don't have the calls to support ACLs in a similar way to other BSD filesystems (namely UFS). We lack support for journaling which is inconvenient but is not necessarily a problem if you are OK with running in sync mode. Furthermore, at least in the Linux implementation, journaling is known to reduce performance. We don't support the SSD trim command: the code to merge this feature from UFS is relatively simple but while on Linux this is a mount option, in FreeBSD's UFS this is set in tunefs. For convenience we always choose to keep the same semantics as in UFS, so it's unsupported (for now). Starting from ext2fsprogs v1.43, Linux distributions are activated the 64 bit feature even when partitions are smaller than 16T. This feature caused problems for some Linux bootloaders and utilities. This is supported in FreeBSD as of FreeBSD 12+. END QUOTE (Not mentioned is lack of encryption, if other things I read are correct.) -- === Mark Millard marklmi at yahoo.com From nobody Fri May 15 14:53:18 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gH9DZ68JYz6dQMg for ; Fri, 15 May 2026 14: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gH9DZ5K4Xz46nD for ; Fri, 15 May 2026 14: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=1778856798; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XzxjeAwRyPqVuEJKNKsnmciZVR+wDuIUPrSLSaFouSs=; b=TbwoKaqHGO/uBCG3wV3dI1H1JaaAX/0D0piJbLxMaMFvgCjYE4Zlu/dvq1LAvaoNFSXIbJ 9xQSiZC19VL/98BgdzSScyNpNaNByt2xQANf4TmyIUQmfDBTPKU53UlS5rgO+lFYEwBEOb 6+sFidmEAo46S/J0NBChDj0BikF19cTbiAkMjgR4KCHwFdnOmH4i6RblNMmhhvbWl0u+R2 sN1ihUmXZ4nobcKIm9owy2VjnyJwSii4ybPMR2oT2KLaFuvxVJ72wpimQUKE+P2Ct52hHj 9a0B8h2aBj7XcNNw0f0VC3d/73jMVz+2d5uuGsZQFgPsr1UgtZ+dMFLG3YcAlA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778856798; a=rsa-sha256; cv=none; b=IH05oe5JWp/bK8WRSRQFJ7LFjlBcCEKJnIZ4GVwjgi/9j/kCrxmmqZpZjeae06bl3cD47B o4MmV5JHmwoHT98o6L5/4oS2LXi+GblRSdRtc/xXChQc/8ToPfVde6sl6upbKyZjABcRVU 4wCaKdxL1M31vQEeFtzR+Ki56x/1WXwRbDP8gE+lbY+HLjnxQq0EI8V2cmzwny03uzsHm8 64LjSZYjzU2HfrjcifneQX+tNR9HbKadaoY2bHPm8JgeM4iGg9ZpuT84gfOvabG7WtlaeQ 3lDr2UkeiGAlBKlaS4GxrYiZtSx5p6Bjij4pCYmzqAH4wFCvjDhCHjrZzL7Ztg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778856798; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XzxjeAwRyPqVuEJKNKsnmciZVR+wDuIUPrSLSaFouSs=; b=kc5O+Hs0+Nbt+gv3IIeHqKTWSqFDCi781HHZQ98Mpd7AGkuH9tCb/q2F7UpHZbFzCTQV0v XSMrOfiCPsKXTXcvaeYDbLc0Wta7OH9W7egP22sgYn2bejSgw3iXzkc3WvynRGPLyelqQH ukf6UoklXNz8OLlh4xd0O9qHBTDyvwLFlk5D1M+VJGuJqfA83ht1Tn2DiIqaonySefmz+h unueWsZom7lWPBCvKnLQGkKqva0+Z/0aSUaxdBHtO6Pvlwsi003avzFb5Bi8cjCkRqgTyC C7D/K4ohZPC85OCq3xmM5PqjUOTPmX0UHFMvRfERzjJJf0a8S4TiX+BF7F/g9w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gH9DZ4sKmz1RHp for ; Fri, 15 May 2026 14:53:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 35e7b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 15 May 2026 14:53:18 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: ShengYi Hung Subject: git: 776584319fb4 - main - sound: Fix lock order reversal in dsp_poll() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: aokblast X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 776584319fb4d66cdb1c2f91bed154dfe6a74e5e Auto-Submitted: auto-generated Date: Fri, 15 May 2026 14:53:18 +0000 Message-Id: <6a07335e.35e7b.6354f4f2@gitrepo.freebsd.org> The branch main has been updated by aokblast: URL: https://cgit.FreeBSD.org/src/commit/?id=776584319fb4d66cdb1c2f91bed154dfe6a74e5e commit 776584319fb4d66cdb1c2f91bed154dfe6a74e5e Author: ShengYi Hung AuthorDate: 2026-05-15 08:43:47 +0000 Commit: ShengYi Hung CommitDate: 2026-05-15 14:52:48 +0000 sound: Fix lock order reversal in dsp_poll() chn_poll() may hold both rdch and wrch channel locks while calling chn_trigger(rdch). chn_trigger() switches the lock order from "channel -> dsp dev" to "dsp dev -> channel" by temporarily dropping the channel lock before acquiring the dsp lock. However, only rdch was unlocked during the transition while wrch remained locked. Since wrch is also a channel lock and witness had already established the lock order requirement: dsp dev -> channel witness reports a lock order reversal when pcm_lock() is acquired while wrch is still held. Avoid holding rdch and wrch simultaneously during chn_trigger() lock-order switching by only keeping the channel locks when needed. The issue can be reliably reproduced by starting pipewire, pipewire-pulse, and pavucontrol. Reviewed by: christos MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D57009 --- sys/dev/sound/pcm/dsp.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sys/dev/sound/pcm/dsp.c b/sys/dev/sound/pcm/dsp.c index 797bfba81023..7bc1decc283b 100644 --- a/sys/dev/sound/pcm/dsp.c +++ b/sys/dev/sound/pcm/dsp.c @@ -1877,24 +1877,25 @@ dsp_poll(struct cdev *i_dev, int events, struct thread *td) ret = 0; - dsp_lock_chans(priv, FREAD | FWRITE); wrch = priv->wrch; rdch = priv->rdch; if (wrch != NULL && !(wrch->flags & CHN_F_DEAD)) { + CHN_LOCK(wrch); e = (events & (POLLOUT | POLLWRNORM)); if (e) ret |= chn_poll(wrch, e, td); + CHN_UNLOCK(wrch); } if (rdch != NULL && !(rdch->flags & CHN_F_DEAD)) { + CHN_LOCK(rdch); e = (events & (POLLIN | POLLRDNORM)); if (e) ret |= chn_poll(rdch, e, td); + CHN_UNLOCK(rdch); } - dsp_unlock_chans(priv, FREAD | FWRITE); - PCM_GIANT_LEAVE(d); return (ret); From nobody Fri May 15 14:59:15 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gH9Md1cLcz6dR01 for ; Fri, 15 May 2026 14:59:25 +0000 (UTC) (envelope-from marklmi@yahoo.com) Received: from sonic306-20.consmr.mail.gq1.yahoo.com (sonic306-20.consmr.mail.gq1.yahoo.com [98.137.68.83]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4gH9Mc5Xl3z477l for ; Fri, 15 May 2026 14:59:24 +0000 (UTC) (envelope-from marklmi@yahoo.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=yahoo.com header.s=s2048 header.b=WA+6gXZY; dmarc=pass (policy=reject) header.from=yahoo.com; spf=pass (mx1.freebsd.org: domain of marklmi@yahoo.com designates 98.137.68.83 as permitted sender) smtp.mailfrom=marklmi@yahoo.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1778857158; bh=sIu+cDyHnG2DTUkqZpbg+ApcUux6E5wIM/BJt+QzqmI=; h=Date:Subject:From:To:Cc:References:In-Reply-To:From:Subject:Reply-To; b=WA+6gXZYcAHPbOjJJtTz8HSFtIlQ2l1NVDxqkrcFYsS4THNIjTqJ6qgdMfdpDnewELXdBGJbzLdDwv8T0OtKMZQ25zio/IjlBXAUlZ6+R5V0e321p8f/stEuU/ji8hfYtvOaBmTEQ7itGv+bXMGFSFBOW4yfZCbSgcvbjs7JBqcF3mjJbGieF+4VbrrS9XE3fjbQB3i0hBclhQq/FccBOznqHEW4WdROqTxz3vG3av+CRc6P64wouuh4/W84h+qPInpNET3MN9jNsG/8egTR+I2A6wNNkGd2CJvPgE/Z4xDHeaxLtrdHNFYURuN48diXqzOHHAo38xGlFQWQIRqOkQ== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1778857158; bh=rNNcF4U+dAGhwspcl4bI3sOdL7X3vIFSzgrTCL8Rssm=; h=X-Sonic-MF:Date:Subject:From:To:From:Subject; b=BDwK0uupl51nt35qhDI0wrLNwvOjSWoSN5NkP87GDoVxavzAbxTFOMzXa/lib2GalfaOMEo4BnK4XYgaUqJKGZ8UEPjiAO3FjAL+6dObN1nZhnuf0LiYRmcecR5ndE4hoauActNH60vtt4AZggQdgEWgWrfkLOXfsAqYyT2Cb/gRVMT1srlb4DPjiGpBOIg94cl3moRDqHCIx6qOqX6LzmhadsZrDkU0py3YmybinXsYGyPaaenc4BcdpfTSgXgFr+KXJe13yJz7Ilx5WOfx12/akzggFihvKhS4lvrgGgm/ZdySy0gMhIh5OCcWh8Sn+XPy02goiOLWVxJfgugh0Q== X-YMail-OSG: kW__g4sVM1leiUQ5S2wrG49V8.F0bnKQpeaNyVEwshDwjYfrH9bVcOCQtg.u84z HMpjdyMA.m7RGeUYnS0CimSUehDSpWjX_zW3TZC.VcJpO9dlzj64e3MZ0S0RxeIVogP21M3c5e6. o75EiEBoeFo6mAfIn1zBsm0BFHpOQo5S_3js8b82pW8a8MFZRevEcPn1Eb2FTcVv3Mq1bZznpKDw Hudkyrmk.tMMbSy7s3TgPLeChJXQvHdykZalKGV2kRkvSq6JGTgRWUAqTw9hDlWLmkv64sBmqU7d XqPlKoYU3e2V1qJ45LlaOr4u2HsRScJd9QUT_3JLDwDoJBlBWELdITvuEj5D2zXvpS7biIiHCG0s 5p0EzE__9yh1lYh3Vi0WSOfbiI8M7dlzreP6mlzpP1tfwEbKHQK88q9TKp2KHppQF6dfN81oLLmv dTF2syK2.QnSfOiE8uuxdgFzg.AdrJj_.ipEKgirEnVv4VJGVxRu_BCaGtz1AsrusdqiWqqh60tW jWroxt0KoqeYMB71c.vGbLat4qgOPXnnHgGgEbVnJ0kobR6NpLR_xPuLAJQBb_7lWZTgwO60qwlw EmugMwSZEVeMTzg931_mlaCKJchiL.GvpGiHyIwqEnbFtHz1.pFpmid1hKympI3YBU0ad4ad7ZUO D_0qqARKR._arRWMnfFIQtnG4LGTwCW5RzC.aDoDNpPqKp5_S5eYvzjQnPsMmAkQQPLkBdelLLRE MEeu7YstgObZDu0vgjOo.6HkbxgqKuV0qtZ8crZjJNgnn1d1IBKTsFWbAo.Qo04J9b93dasbRMo7 lrz21YeWhw8Xjo_04yFAyfn8o5183NooxmpxDAQ6kREixL4Zhvg4gmjbGn.3Xb6DMGOBpwi8G64j ZtfI_bRaXbo5BK9iTdNeIS2ap4_F_k4vwiFcukd15UtsUdRJHa3P5YjTjmOuH6H78zzs0mGnFsRl zysQ8rLmfnvuYcaksEiFE_O0ciqlvsRWWmA8Z8nyQS3rUFYnLSl6Dl3P9Ks5txDP23qccueNothv gP5GRlqmrKsMx0izLYgenawTzy4hJ_63Q0tvZSYPV3mGk4DNG4JJqyGoai2q4YiqNZtGI9PwaqGf Ej.eSmM1ll1aTplgjNtCuSOpNmPJkLbS32SlJ5Xl1NuepLwMKDAK3ltyIcFN7sGRjkpWRdujZYv5 RlI17V5LYwc7MnVOdzpvcs5koQDbWiQ7dIF3RcmTA2tS_D0fNCIn_10.D0u4xcueq8ftIjjmp_18 .VBm1geagmrkUb4RNHo.IMdxlKZc8L0z7aaHaENzeAnJFR2fAXwgaIvdQyrMCCLN7MxN6x3wc6Mg gB5MlTJL57U.wpAOrOajf0dIEm0kVJbxyjs4Oxf4blmT9viP0G7CzvNS8Hk2vf5vMx1qcrwZJAYk N7qZ9ojLlowB5dm_IDYqvc0lyjtlZEKiVP6ER1_y5z8KqW0lyeWrcIzCvZGs.ImPqlMsfazaSjCD zHMeD6ptURXimxhDA9oWqoycWg1LRBJ64TCliTatZItparzg7mQWbHnr8CmC2GM0yH.1RBQhz6zX FaEGinS8B77aCsTRhx6pwibhPmhsAZPiHEqPWJ0N6fpNlQZn5xzvLKdzZSet4jFONGdznApDDL9k nzgBk949uM9fnOe6F1z1.fquYDP69p5idh4UW.bxtA2Y5LlSTQAspYI5NBJZue.RPYSbTbebi9Ef KoNbb5zkmofvF8nhBdsbK07cGwL9wnXr_dC59rxoVe.ZdHNPfa.MIxsTIkFazD7BxYkH3Sim.sJv DmLcBK4PqcZlqwScfzzoIIyo8a.kxwUU.A9QazSppBixK_JZEd8CzplYjBI04EK_ZKRlv8A_Akzz GpV3jWDqt.3Z_ENPeJcCJ_e4f8vAzRkt3.e3T5DZ5CyaZnmULE9jj5JQ1GbYm.A95dUHa4e1YMzk aCVRjuOtXUkTCmpOCmTENIilBh_jHexCn2x7JoO3_1BMMKK9E8PC3LPOfmfLhlT.1HudXY17k.hS BrYSrhjr5zUYQxn7XlzoX3BNveux7gconXIdaXwkzzorpjm0Kplmqy9bnw2jypunRQ_v7Og1Yaon Sjx3wY_PffPzjqhI9oNifeaQ6rEd2co3PTjvHhelOUEHq1R7tz61t_pvOcOQfmjiOPmAE_J_rbIu lfIXjcN5_JPCu54LSLXlNHDMj2GTt7uze5KmG5PhhtH.RcKMF.KvqkDSCCe3elV11TWjWna2dvst JNhjXgk1Qq8SWdd7fIGhdUWFWRqTlecU7y2FnCqeoF.l7Mor6Ag.QF3Czb1v5RANEW8BwWNLotEv FPw6ltp0oRI9uaMG3V7BuaWDaXBbffeI8m1Uss1JA.eB1t.cj2twiuNcZh5IjdWSMK.JehrZvcJ4 8 X-Sonic-MF: X-Sonic-ID: c56c0e88-6d94-4cce-a534-6a0f9d08b3a2 Received: from sonic.gate.mail.ne1.yahoo.com by sonic306.consmr.mail.gq1.yahoo.com with HTTP; Fri, 15 May 2026 14:59:18 +0000 Received: by hermes--production-gq1-7bb7df5c46-2m55j (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID 00a762060c41b058e1cd0317f8a5c345; Fri, 15 May 2026 14:59:16 +0000 (UTC) Message-ID: <896706d9-d149-4b3a-8f25-596c9cd5f3ac@yahoo.com> Date: Fri, 15 May 2026 07:59:15 -0700 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 01d5910b8766 - stable/15 - pkg-stage.sh: Add ext2 and ntfs From: Mark Millard To: Colin Percival , Alexey Dokuchaev Cc: dev-commits-src-all@freebsd.org, dev-commits-src-branches@freebsd.org References: <6a061a2c.25c2f.7465fc96@gitrepo.freebsd.org> <3fda2a13-fdde-42bb-8c18-a9482b7ee321@yahoo.com> Content-Language: en-US In-Reply-To: <3fda2a13-fdde-42bb-8c18-a9482b7ee321@yahoo.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Mailer: WebService/1.1.25725 mail.backend.jedi.jws.acl:role.jedi.acl.token.atz.jws.hermes.yahoo X-Spamd-Result: default: False [-3.99 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.99)[-0.994]; DMARC_POLICY_ALLOW(-0.50)[yahoo.com,reject]; R_DKIM_ALLOW(-0.20)[yahoo.com:s=s2048]; R_SPF_ALLOW(-0.20)[+ptr:yahoo.com]; MIME_GOOD(-0.10)[text/plain]; RCVD_TLS_LAST(0.00)[]; FROM_HAS_DN(0.00)[]; ARC_NA(0.00)[]; TO_DN_SOME(0.00)[]; MIME_TRACE(0.00)[0:+]; DWL_DNSWL_NONE(0.00)[yahoo.com:dkim]; FREEMAIL_FROM(0.00)[yahoo.com]; DKIM_TRACE(0.00)[yahoo.com:+]; ASN(0.00)[asn:36647, ipnet:98.137.64.0/20, country:US]; FREEMAIL_ENVFROM(0.00)[yahoo.com]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org]; RWL_MAILSPIKE_POSSIBLE(0.00)[98.137.68.83:from]; MID_RHS_MATCH_FROM(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[98.137.68.83:from] X-Spamd-Bar: --- X-Rspamd-Queue-Id: 4gH9Mc5Xl3z477l On 5/15/26 07:43, Mark Millard wrote: > On 5/14/26 23:24, Colin Percival wrote: >> On 5/14/26 20:37, Alexey Dokuchaev wrote: >>> On Thu, May 14, 2026 at 06:53:32PM +0000, Colin Percival wrote: >>>> commit 01d5910b8766671afdbd9e274fd62b397aca9e1a >>>> >>>>    pkg-stage.sh: Add ext2 and ntfs >>>> >>>>    Having these packages available on release media may help users who >>>>    need to sneakernet other packages (e.g. firmware) from systems >>>> running >>>>    Linux or Windows. >>> >>> FreeBSD supports extfs (rw) natively, what's the need for FUSE-ext2? >> >> The "ext2" fusefs port also handles ext3 and ext4.  Poorly named port, I >> suppose... >> > > https://wiki.freebsd.org/Ext2fs reports about ext2fs.ko : > > QUOTE > This page serves to keep some notes related to FreeBSD's kernel > implementation that supports the original ext2 and sufficient features > to support newer versions of the popular filesystem. > . . . > In FreeBSD ext2, ext3 and ext4 are not different filesystems: ext2 is > the base filesystem and some features from ext3 and ext4 are supported. > All features in FreeBSD's implementation follow UFS semantics and this > can sometimes impose important differences. > > All supported FreeBSD versions support ext2/3/4 read and write with most > of the features, except for journaling. > FreeBSD 13-current supports Big Endian Platforms, including PowerPC, > through byteswapping. > FreeBSD 12.1 and later have support for DTrace to enable debugging in > production. > FreeBSD 12+ includes initial support for writing ext4 filesystems > (thanks to Fedor Uporov). > FreeBSD 10.1-12 used by default reallocblk. This comes from UFS and > helps preventing defragmentation issues. Linux doesn't have an exact > equivalent but Ext4 does delayed allocation which is similar in concept. > In freeBSD 12 the feature was disabled by default as it proved to be > unstable. > FreeBSD 9.x+ fully supports the async mode, which is the default on > Linux. Unlike Linux, the default is to use the sync mode which will make > your filesystem more reliable at the cost of some performance. > . . . > Known issues > > We don't support the inline_data feature: it is doable, just no one has > done it. > We support Extended Attributes, but we don't have the calls to support > ACLs in a similar way to other BSD filesystems (namely UFS). > We lack support for journaling which is inconvenient but is not > necessarily a problem if you are OK with running in sync mode. > Furthermore, at least in the Linux implementation, journaling is known > to reduce performance. > We don't support the SSD trim command: the code to merge this feature > from UFS is relatively simple but while on Linux this is a mount option, > in FreeBSD's UFS this is set in tunefs. For convenience we always choose > to keep the same semantics as in UFS, so it's unsupported (for now). > Starting from ext2fsprogs v1.43, Linux distributions are activated the > 64 bit feature even when partitions are smaller than 16T. This feature > caused problems for some Linux bootloaders and utilities. This is > supported in FreeBSD as of FreeBSD 12+. > END QUOTE > > (Not mentioned is lack of encryption, if other things I read are correct.) > > > It looks like: https://forums.ghostbsd.org/d/694-hi-new-here-and-to-bsd documents more detailed tradeoffs between FreeBSD's ext2fs and fuse-ext2, as of early this year. I've not found such for sysutils/fusefs-lkl for ext4. -- === Mark Millard marklmi at yahoo.com From nobody Fri May 15 15:08:52 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gH9ZX5jRmz6dRcP for ; Fri, 15 May 2026 15:08: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gH9ZX4grLz48BP for ; Fri, 15 May 2026 15:08:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778857732; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1C3JEEy3wbbumeWGaz4nZIqYZBH8wFSRANh4rR0VwcY=; b=JFcliadSL4ZSLHC3wibzigqsDa3ObeM5lCo3EH35PpBwb5UwzkSU64qMOxikJWxYpfMxE+ mVoDtUPk5G9yDwN6QP5fygNQVHIWwsQc8Gnq4CG64GNOz9t9sIwSwFwf4UNq+sfD8f47P5 X++P3wx90Js00rtpAwrnvcM+U4CpM15DoGZ1uiT/t82YSk39SHdvdEBVkrLzJcTE4wGnln lo2d6fl/TqHIUsLjQHmkMN7yEBV3QdCCpM+he5VIWKpDaQ44btPdKIu8/GM56Wg0O8Ensd KbjggG91MKg17xZVF44hfxveMYwBG5AvQc/0BYdIxRFpqWIXvVrS5ogqI+x8wQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778857732; a=rsa-sha256; cv=none; b=hAxiZh2uZR6ice3WTjE1tAg8jNAZMtkWpyf4OpgS5SMmdrIJ2tgK5NshL1cbcT9oKDfTfL YiNneOQhwohAkeN7zBpHbFKTvcxEg0FJu/WCSxvrxI568T1f5feSvuuf8CDZW1MGDMUPGu 6d40ZZNGnp6lxPxjZdIgPq4AeKeaXVuuCotv2W0oQXuZp80Hdpy7NGBkxfVsqd8YkQRWcl IThAbH+wAg/dBPpCO3rRU0NDPgSADT3zITVBsszjMTFhJ0eBOXUwdFEJ6lSwNDefWn/kWs 6E8BDQsuU2FRXm9A+U3SVQFSFDVhoKUGpQdI4z551MVsG8IQZ1L/noDcIwWH2Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778857732; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1C3JEEy3wbbumeWGaz4nZIqYZBH8wFSRANh4rR0VwcY=; b=ou+9UtIRCfAVVbJ5NOy2zX9WEM0CiHfP2IJx5DbWBoH79uRIW+qBBumXkOP0/jaRwG8o0W LdQcjaC1DHBluwPM0gqpQDBK9ZSMIwzqd4izAnL+sOxfCKKbsu/+qEgFDi7WAvkT+6vzjD G3rqTUbB/wmf8WsgSr0HKHz70XHwYsO2bdNMHSsj6fXjhnV3sYHPits19qjPm7A5BSU8SK ubY0xZMiGnfs4zn8Bp7WEITMeDdtL5xyuRTWZWv3ms1Exd3d2LiLOidHSUK/T6vv8tEbaI KM61vryKyw376g7IB4UqiFYhzdxlqqVmOhN1mDIuWA9a2QWqFgN5vEYyMIBHlQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gH9ZX3yJgz1RGG for ; Fri, 15 May 2026 15:08:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 36027 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 15 May 2026 15:08:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: 9354e204f5ac - main - sound: Force-disable hw.snd.compat_linux_mmap by default List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: 9354e204f5ac797cbf1ef8e05294703c378bc9b6 Auto-Submitted: auto-generated Date: Fri, 15 May 2026 15:08:52 +0000 Message-Id: <6a073704.36027.aff631@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=9354e204f5ac797cbf1ef8e05294703c378bc9b6 commit 9354e204f5ac797cbf1ef8e05294703c378bc9b6 Author: Christos Margiolis AuthorDate: 2026-05-15 14:47:10 +0000 Commit: Christos Margiolis CommitDate: 2026-05-15 15:08:11 +0000 sound: Force-disable hw.snd.compat_linux_mmap by default Eventually this hack will be removed, so start by disabling it by default. Sponsored by: The FreeBSD Foundation MFC after: 12 months Reviewed by: emaste Pull Request: https://ron-dev.freebsd.org/FreeBSD/src/pulls/29 --- share/man/man4/pcm.4 | 2 +- sys/dev/sound/pcm/dsp.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/share/man/man4/pcm.4 b/share/man/man4/pcm.4 index 8a92cefa3549..4e70d95d5441 100644 --- a/share/man/man4/pcm.4 +++ b/share/man/man4/pcm.4 @@ -267,7 +267,7 @@ call, which .Fx does not. .Pp -The following values are supported (default is 0): +The following values are supported (default is -1): .Bl -tag -width 2n .It -1 Force-disable PROT_EXEC diff --git a/sys/dev/sound/pcm/dsp.c b/sys/dev/sound/pcm/dsp.c index d9726ffdd6bb..7b4f3f15645e 100644 --- a/sys/dev/sound/pcm/dsp.c +++ b/sys/dev/sound/pcm/dsp.c @@ -55,7 +55,7 @@ struct dsp_cdevpriv { }; #ifdef SV_ABI_LINUX -static int dsp_mmap_allow_prot_exec = 0; +static int dsp_mmap_allow_prot_exec = -1; SYSCTL_INT(_hw_snd, OID_AUTO, compat_linux_mmap, CTLFLAG_RWTUN, &dsp_mmap_allow_prot_exec, 0, "linux mmap compatibility (-1=force-disable 0=auto)"); From nobody Fri May 15 15:08:51 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gH9Zd2K59z6dRlZ for ; Fri, 15 May 2026 15:08:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gH9Zc5ql6z47yn for ; Fri, 15 May 2026 15:08:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778857736; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9HXRzzbNo5OwEOVe/OpJWvz+kGoIeANdlh0xflbgD/4=; b=aL1QfZALEqiqNxttVIirxvuvbPprozo6EfxO2Uj6+nrrXctWR30CqFQCsVguXAmt8nL4Jn OCW2934ovgPaT27hX9FRs82yudr8SOWVlKYigKotfztyIjM6UTb6sSxaAASE0keGbpp01L +bFcLPJY23tksDxwIQNI1vfla+Vq+SNMgBtF1mMD12/cvcLbXLxrG4AXrtEwm7bgIyS8kd 6NN3Kz+Al9BtilU4033xuC4F361uCDH2yZairn1g+5sZdWIRTc4XONUCeo7IcnTmNfQxyW yC7x3VOUncO90K0tlfinLeQLORq/ll5mF2JYZOpEu/Pi9kCKuITiXPIwfrJ7kA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778857736; a=rsa-sha256; cv=none; b=c3qOM+/MEVJi0WodSsOw46VGkjFaDqVXE+u7xKHIq5xX58hPuHXsT0g9sS6NveRCYQG3ez rX8c/I+JGPsWOJKcgNyMq27LoYCQPePVCqwbjUFt+KYgiYo9ODvlE9iLBVDwN1UOSuT2oO /0cHnhUM7EQitbQY728L+eMgui+nmpdpLw0/LvJKh0AcjraRkOFNncx9Icf61CP6ZhSQog wmjfRZD3AwqR4lL8s9b3yO8uDFy/iwnESEhMlVRKVDxp35zy4POAGsTYTq77Bm0G+ZuqXW jbpIv/lm+m9611HVSAR3z0aWCJl2Vc+rdJp+rqBivvvuBS7xioNFmNemHd9x/g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778857736; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9HXRzzbNo5OwEOVe/OpJWvz+kGoIeANdlh0xflbgD/4=; b=vhIBkeBLNzGvJT0YMrrzUm2aqP2OFfJ5Y8CLT7eylbG5LAAg/ouUIHNKs6ibSnUjl00LOx dKo37agFPQ3wZRgGLk5hsl3MMQKXogcDU0nzXMKUuR1QQfCd+Jxtb39q3tONxvvuZSy2Wx JgBAdEcZjMGXWngtgz93RHFA4+lbIIAT63BItslQ/yzg29N8aeEw8WWVXSkWdJntBfuPKF lgLNhHSNGwJIY6o/nW0WFWJyNuEEV+yj+uEifQeAv1Uaq39adHy4Z/J+herA0dJ5mdQM9U nEAG/4PfWXF+DVsyDGvGJ7NBqy+ZRXyBxmo/sQV2taRd/DQT9QlbEvDF9L8Lxw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gH9Zc41cWz1QqJ for ; Fri, 15 May 2026 15:08:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3403a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 15 May 2026 15:08:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: b9c10eeb380b - main - sound: Improve hw.snd.compat_linux_mmap List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: b9c10eeb380b3ba629421062af8658e79a9171cd Auto-Submitted: auto-generated Date: Fri, 15 May 2026 15:08:51 +0000 Message-Id: <6a073703.3403a.3477a5a@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=b9c10eeb380b3ba629421062af8658e79a9171cd commit b9c10eeb380b3ba629421062af8658e79a9171cd Author: Christos Margiolis AuthorDate: 2026-05-15 14:07:59 +0000 Commit: Christos Margiolis CommitDate: 2026-05-15 15:08:11 +0000 sound: Improve hw.snd.compat_linux_mmap - Reject PROT_EXEC in all cases when Linux support is not compiled in. - Define sysctl only when Linux support is compiled in. - Document better. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: emaste Pull Request: https://ron-dev.freebsd.org/FreeBSD/src/pulls/29 --- share/man/man4/pcm.4 | 26 +++++++++++++++++--------- sys/dev/sound/pcm/dsp.c | 13 +++++-------- 2 files changed, 22 insertions(+), 17 deletions(-) diff --git a/share/man/man4/pcm.4 b/share/man/man4/pcm.4 index 518c37b54f1d..8a92cefa3549 100644 --- a/share/man/man4/pcm.4 +++ b/share/man/man4/pcm.4 @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd February 15, 2025 +.Dd May 15, 2026 .Dt SOUND 4 .Os .Sh NAME @@ -254,21 +254,29 @@ are global settings and are device specific. .Bl -tag -width indent .It Va hw.snd.compat_linux_mmap -Linux +This +.Xr sysctl 8 +variable is available only when Linux application support is compiled into the +kernel, and affects Linux binaries only. +It is a hack to get around the fact that, for i386 emulation, +.Xr linux 4 +historically set PROT_EXEC automatically when PROT_READ or PROT_WRITE was set +during an .Xr mmap 2 -compatibility. +call, which +.Fx +does not. +.Pp The following values are supported (default is 0): .Bl -tag -width 2n .It -1 -Force disabling/denying PROT_EXEC +Force-disable PROT_EXEC .Xr mmap 2 -requests. +requests, even for Linux applications. .It 0 -Auto detect proc/ABI type, allow +Allow PROT_EXEC .Xr mmap 2 -for Linux applications, and deny for everything else. -.It 1 -Always allow PROT_EXEC page mappings. +requests for Linux applications only. .El .It Va hw.snd.default_auto Automatically assign the default sound unit. diff --git a/sys/dev/sound/pcm/dsp.c b/sys/dev/sound/pcm/dsp.c index 7bc1decc283b..d9726ffdd6bb 100644 --- a/sys/dev/sound/pcm/dsp.c +++ b/sys/dev/sound/pcm/dsp.c @@ -54,10 +54,12 @@ struct dsp_cdevpriv { struct pcm_channel *wrch; }; +#ifdef SV_ABI_LINUX static int dsp_mmap_allow_prot_exec = 0; SYSCTL_INT(_hw_snd, OID_AUTO, compat_linux_mmap, CTLFLAG_RWTUN, &dsp_mmap_allow_prot_exec, 0, - "linux mmap compatibility (-1=force disable 0=auto 1=force enable)"); + "linux mmap compatibility (-1=force-disable 0=auto)"); +#endif static int dsp_basename_clone = 1; SYSCTL_INT(_hw_snd, OID_AUTO, basename_clone, CTLFLAG_RWTUN, @@ -1923,20 +1925,15 @@ dsp_mmap_single(struct cdev *i_dev, vm_ooffset_t *offset, struct pcm_channel *wrch, *rdch, *c; int err; +#ifdef SV_ABI_LINUX /* - * Reject PROT_EXEC by default. It just doesn't makes sense. - * Unfortunately, we have to give up this one due to linux_mmap - * changes. - * * https://lists.freebsd.org/pipermail/freebsd-emulation/2007-June/003698.html - * */ -#ifdef SV_ABI_LINUX if ((nprot & PROT_EXEC) && (dsp_mmap_allow_prot_exec < 0 || (dsp_mmap_allow_prot_exec == 0 && SV_CURPROC_ABI() != SV_ABI_LINUX))) #else - if ((nprot & PROT_EXEC) && dsp_mmap_allow_prot_exec < 1) + if (nprot & PROT_EXEC) #endif return (EINVAL); From nobody Fri May 15 16:20:30 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gHC9H5z5Sz6dddB for ; Fri, 15 May 2026 16:20:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gHC9H4kYzz3c2r for ; Fri, 15 May 2026 16:20:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778862035; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rB5SjsAga/UXifgIAhGSY1JKp2yUoUTvjkf3bhx7R9E=; b=RGqhVBIkYDOjjaSqq/9OLy9QkHtJLM4lfrxDyWv0/2Oq8IPOzE4nIIahjXZ278dR7xTppi Spm0JWlqD3OgV3zDzI5rLu3Ih47tYfCW0JCoAlX9ee7/CEGhlsmXUjB7PiEzsYHWiDTrei 3xQjVpC2ZJ5MfbR6mcJsyc486dlLi9gMF5BBQZTbIfcOZDGf3TXIznoMsG8gh7JHLLZAR0 Q5cDSC3mmI354iLrxtqELoDqnriLRd7yV5YiTf1ZuFNPcsNE5uL5hY0sZCBU1PyqC2ajbM uQoIJ5UKmUdtuQVP0DY95uPETI+RiPaX6qGLyBLoAbkBdn7xMHEUIgX9CcaREQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778862035; a=rsa-sha256; cv=none; b=jnFZKsf+TvAyRUmtls75hcpyj0CEVJM2PLyFfTOOlWPAiecsPeTLAha/XyOuBdqFZFaCaG sDZdg3P7uvR1KLK5XeaiDYlCr9cngAciDDtBRXKW/AZrmqQ3zRN0IKygtFK2wEXC4pTlk2 6lk0e1fz5B0wZr8uhV3Cjb3BWomJNEHdWptQXisTGzqCK2CCceHU4KA5KMfFPdhsnPWnix xLjK6zQrPkcCne1aryy5m1HkyTokKTsMkAkU0qkAXYapZM1XvyG+085Bj7rRWKPVu/BLHd v+e/+498wr3eGij3S6j177ll2qOMPsh0TjSDas+V2ia9mtqNAgmMBG7VB+RxbA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778862035; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rB5SjsAga/UXifgIAhGSY1JKp2yUoUTvjkf3bhx7R9E=; b=RFEOaL2+hHr+tWauAbQp3IiVYNKurDi2IAAuf4dJnl2X0q0oS7MBZdH7MKkC+rJeFkuVqQ SUhkOrOR3LcMJSkJGActTRoDuG4g0F10/PbTM6DiWA5lMoJVRqyfntJ91QJaWNJozv6RDb 47kaHF5c6s+/SUxdZa2Gp16G7A9+JbM++Xib0SpdEJ8PDHSBHYN9mE99IfgBrChh/haYe/ G/nuA9x7voGFfyMLIvkaNTo1luIB4tadLb48Ll8xkWjAQH0IOj0T2NRiSEDCN5JPsYP6p3 snDlqcyOuVU/iEOmpoShHFGWhzdvQ62v9Wv7FjenYvBErBsZc4jvJF8l2ggjcg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gHC9H3s4yz1Gd for ; Fri, 15 May 2026 16:20:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d4a9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 15 May 2026 16:20:30 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 6531070132b0 - main - openssh: Add reference for another local patch List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: 6531070132b0210aaaeb08c0dc93cb272bed348e Auto-Submitted: auto-generated Date: Fri, 15 May 2026 16:20:30 +0000 Message-Id: <6a0747ce.3d4a9.54faa201@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=6531070132b0210aaaeb08c0dc93cb272bed348e commit 6531070132b0210aaaeb08c0dc93cb272bed348e Author: Ed Maste AuthorDate: 2026-05-15 16:16:45 +0000 Commit: Ed Maste CommitDate: 2026-05-15 16:19:49 +0000 openssh: Add reference for another local patch A bug fix was committed locally and submitted upstream. Document it in our upgrade instructions, as these sometimes take a long time before getting merged. Sponsored by: The FreeBSD Foundation --- crypto/openssh/FREEBSD-upgrade | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/crypto/openssh/FREEBSD-upgrade b/crypto/openssh/FREEBSD-upgrade index 815c11a8f8ca..6987956ce163 100644 --- a/crypto/openssh/FREEBSD-upgrade +++ b/crypto/openssh/FREEBSD-upgrade @@ -188,6 +188,11 @@ internet protocols are supported by the kernel before trying to connect to the target host. This avoids confusing the user with spurious error messages. + +12) EVP_CIPHER_CTX_get_iv() stub bugfix + + Bug fix submitted upstream at + https://bugzilla.mindrot.org/show_bug.cgi?id=3873 This port was brought to you by (in no particular order) DARPA, NAI From nobody Fri May 15 17:53:51 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gHFDw3jkzz6dlMP for ; Fri, 15 May 2026 17:53: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gHFDv2gcjz3nRH for ; Fri, 15 May 2026 17:53:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778867632; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5JYwjw5u+U1u6xcd/6PUalgEYEQYzneclbOHolcecU4=; b=TSZ/s2gruE9vO8z7edAmb9PbPchAUP8TBYboaNqTJfpfytQCeVyZoEK+yja7TsZcTrr5Rm Un5yK21HImYf4ahALDMU7hGJN/ZuTURdW7emo+YdyR3MV0j0hwSMPIJ3J469yIy6gE0dmY yBGUFo/S40iXUKC1gfY4gm15kkf4utJwUDuQwv+IY5oeTzL3b2/VQ87vkxSlD133DuMcHU uOcpL2PmShVWEdWGE/9Ciq+nuss9H4+Myok6+NNEFTwxdBTzMboafzHNtIZvFoW5QQ3tz+ 8ath9sK2kkGELCxUQG73cGlsjP3CsP6Abb56YHq9zoX3Dn/Mxw+rZ/x3pwboPw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778867632; a=rsa-sha256; cv=none; b=OVp88mgcjUt+uB0l5vLGiY/YM1pHFZYdysn09dfQFsQQ9s8wwX4O+wjs+wT3RUye+djzV7 GC2MhIIJ8B7TsOxc4WwRmjjAA64DS2vbpZsnf8gGeoHYu+VYHmK4xu2Fn4i9WjNft4AWEm OyyMs/vlU4S75neiRF/Xk3XMw64yqJYANmJUXhI0lmTptvoWempD/PlCg6HHZ6vk9xiWzi T57WX0CLdFbrjFPcIsqn/oN8gD3bZT02wkoADQhtVY/yNjIRbGnySSQjO+ekFHiP9EpNmu Hn+mwC6Rya84ockVQ1YAFDlOEPnkWbedkewhKroVLAy2w2rqAM016a1QxRX9zA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778867632; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5JYwjw5u+U1u6xcd/6PUalgEYEQYzneclbOHolcecU4=; b=l6hlKifzeoTlr+XB2fCE/w8JGAILn/ocu+efgu2Div9vBUpb8s6loZx95pGEvM+jHhhE56 Y4/IJ2Oy7EbM5FOyy08E52CxswuOBV/+jivAH0VW0oGpic1wYC3gO4VcBK1qC6xgrdiKWw X4r/eBLF8gj917g94ta/BVkNwGUWEEIU/8LFyHFSIQcarnXToni1N4OR92kCcnax/HepWB KfqeYlJyXFINOZcDjnKtvNc/s8MyoxcNicoplSQnXVgwCD3qMv+FDzxWWwzKTh6fpr1u/R ouLlZz9h12igkwjrxoWsehybYhFbbH82cuxVEApxlGGyRmnXiW7eD1K1BxBHiA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gHFDv2BGSz3sV for ; Fri, 15 May 2026 17:53:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1fdc9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 15 May 2026 17:53:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mariusz Zaborski Subject: git: 394f8ff461e6 - main - jail: replace PR_ALLOW_ALL_STATIC hex constant with symbolic OR List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: oshogbo X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 394f8ff461e69e30c36570618bb24fd474856f6a Auto-Submitted: auto-generated Date: Fri, 15 May 2026 17:53:51 +0000 Message-Id: <6a075daf.1fdc9.19f075a3@gitrepo.freebsd.org> The branch main has been updated by oshogbo: URL: https://cgit.FreeBSD.org/src/commit/?id=394f8ff461e69e30c36570618bb24fd474856f6a commit 394f8ff461e69e30c36570618bb24fd474856f6a Author: Mariusz Zaborski AuthorDate: 2026-05-15 12:31:31 +0000 Commit: Mariusz Zaborski CommitDate: 2026-05-15 17:38:44 +0000 jail: replace PR_ALLOW_ALL_STATIC hex constant with symbolic OR No functional change intended. Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D57014 --- sys/sys/jail.h | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/sys/sys/jail.h b/sys/sys/jail.h index 5ac4c5f9008d..c0ad53eec3cf 100644 --- a/sys/sys/jail.h +++ b/sys/sys/jail.h @@ -280,7 +280,15 @@ struct prison_racct { * build time. PR_ALLOW_ALL_STATIC should contain any bit above that we expect * to be used on the system, while PR_ALLOW_PRISON0 will be some subset of that. */ -#define PR_ALLOW_ALL_STATIC 0x00ff87ff +#define PR_ALLOW_ALL_STATIC \ + (PR_ALLOW_SET_HOSTNAME | PR_ALLOW_SYSVIPC | PR_ALLOW_RAW_SOCKETS | \ + PR_ALLOW_CHFLAGS | PR_ALLOW_MOUNT | PR_ALLOW_QUOTAS | \ + PR_ALLOW_SOCKET_AF | PR_ALLOW_MLOCK | PR_ALLOW_READ_MSGBUF | \ + PR_ALLOW_UNPRIV_DEBUG | PR_ALLOW_SUSER | PR_ALLOW_RESERVED_PORTS | \ + PR_ALLOW_KMEM_ACCESS | PR_ALLOW_NFSD | PR_ALLOW_EXTATTR | \ + PR_ALLOW_ADJTIME | PR_ALLOW_SETTIME | PR_ALLOW_ROUTING | \ + PR_ALLOW_UNPRIV_PARENT_TAMPER | PR_ALLOW_SETAUDIT) + #define PR_ALLOW_PRISON0 \ (PR_ALLOW_ALL_STATIC & ~(PR_ALLOW_UNPRIV_PARENT_TAMPER)) From nobody Fri May 15 18:39:05 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gHGFC1d0Tz6dnj7 for ; Fri, 15 May 2026 18:39:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gHGFC0Vhfz3vRk for ; Fri, 15 May 2026 18:39:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778870351; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Fkwbf4NIJJtLqyNRq19QMIKVjcOcFCI6nq5UbmdTEfc=; b=XjP0Q0FvswHIZ0+2IjdQwYRC1ozbZugrQrehkKfC55UeZfREjUV/R6oEiXDYrFCP689hXl FJfWKtIYQdgxuvhJMACbX3D7v3a3WCDOt0TWnykfQ8CFQlzvgp0gcMymlZj5hmX1PzbS0H VhtHF5Z0hLRAh9SOylmw5RIHfV5Cwd0vt3iLuHiOYF5v/lRye4hHg7jtOtQ0VSa4FwF4if kDMjko+EeeAdb+pm21LiW3dJdPziKZGzej34w1P2KbkYIQe6sUk9tnNApNaT1Er/ClDBER NSZ+kQhzrTdcQMyH6T9OJMI9UOSadjqlnlZHKqoDzkKd2Hjm6K4L54V/KVAhYg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778870351; a=rsa-sha256; cv=none; b=NvPHkAghrA5J181MKQ1p2BZ4ht6+e5BJ0qWN9//AwZtRj0sdGGLebJdfjjNobsKMChJINu f8OJG7DdCk8XQpeqJ9Cz1J+488bUoancxZFOgmavtVlAqKM5hf4LGhsu8k/oPnbPD3005z xeUrejiLzCY16z82PNWj/anW6iNbjwZ3reJMu3BZE/+wUO0DcyIrS0ktzRQ95r9J06JWyW YjTNaMDANjdUQL8VbhVIjZloem6OJpcFZEMuaVwzWOiK5kjU1giTFbfJso0ykNclGCwk8z OdEG8vVfBuO+UtnI3kCmbF2xx9OxnBBT65Tgx+rnri0rcvvQNUiD1WRm3u/Pgg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778870351; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Fkwbf4NIJJtLqyNRq19QMIKVjcOcFCI6nq5UbmdTEfc=; b=uy0HC5hJURE7ERW8PfLB/jAgZGIvwe+Pywzn1ZXTgcOHo24xGL0rp7EfXzGGhaORX7J9L/ PrJeF4Ffhl4ykwCiaJ86ljakHhq65Lcy4MEsVoG2Avo1dE/ZPg0I+6YR0JqyVuxiUXfVVh Q+tH0B32k2FJ9CK/J7XS9itbZOfQ+WGtuf32QxxjzCLWWyJcqg4rs1SAf+WpXEmq7vcLJq SnlH1MNOR7IUnF+vQJmQLICsD12Ry72fas7kI+tnr7MVCGp4zSMBTm7ZnDoxsdVHEkXRTu T8+hDByJcYjFZeFjZPkRWFvP0Pd/4pLG6LWl8lUy5odAtJY7QoAmtdkHwy9Bmw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gHGFB6csNz4m5 for ; Fri, 15 May 2026 18:39:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22d6f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 15 May 2026 18:39:05 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 0a2f7683bf0c - main - man: iwlwifi/rtw88/rtw89: update man pages for Linux v7.0 based updates List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: 0a2f7683bf0cbd57d7cdba0713a3e30b24cbf9b4 Auto-Submitted: auto-generated Date: Fri, 15 May 2026 18:39:05 +0000 Message-Id: <6a076849.22d6f.1b3a13da@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=0a2f7683bf0cbd57d7cdba0713a3e30b24cbf9b4 commit 0a2f7683bf0cbd57d7cdba0713a3e30b24cbf9b4 Author: Bjoern A. Zeeb AuthorDate: 2026-05-15 16:29:48 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-05-15 18:38:52 +0000 man: iwlwifi/rtw88/rtw89: update man pages for Linux v7.0 based updates For all: - harmonize Copyright/license section according to style.9 and used SPDX only. - mention that the current generation of the driver is based on Linux version 7.0. - make linuxkpi.4 and linuxkpi_wlan.4 .Xr as the man pages do exist these days. iwlwifi: update the card/chipset names supported (while we still can) iwlwififw: leave a comment only that we can no longer update the man page and it will be removed in the future. rtw88: update supported chipsets and add note to BUGS sections rtw89: update supported chipsets and add note to BUGS sections Sponsored by: The FreeBSD Foundation MFC after: 3 days Reviewed by: ziaee Differential Revision: https://reviews.freebsd.org/D57019 --- share/man/man4/iwlwifi.4 | 154 +++++++++++++++++++++------------------------ share/man/man4/iwlwififw.4 | 28 ++------- share/man/man4/rtw88.4 | 27 +++++--- share/man/man4/rtw89.4 | 26 +++++--- 4 files changed, 116 insertions(+), 119 deletions(-) diff --git a/share/man/man4/iwlwifi.4 b/share/man/man4/iwlwifi.4 index 411af54be9fb..71825507f7c7 100644 --- a/share/man/man4/iwlwifi.4 +++ b/share/man/man4/iwlwifi.4 @@ -1,33 +1,12 @@ .\" -.\" SPDX-License-Identifier: BSD-2-Clause -.\" -.\" Copyright (c) 2021-2025 The FreeBSD Foundation +.\" Copyright (c) 2021-2026 The FreeBSD Foundation .\" .\" This documentation was written by Bj\xc3\xb6rn Zeeb under sponsorship from .\" the FreeBSD Foundation. .\" -.\" Redistribution and use in source and binary forms, with or without -.\" modification, are permitted provided that the following conditions -.\" are met: -.\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. -.\" 2. Redistributions in binary form must reproduce the above copyright -.\" notice, this list of conditions and the following disclaimer in the -.\" documentation and/or other materials provided with the distribution. -.\" -.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND -.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE -.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -.\" SUCH DAMAGE. +.\" SPDX-License-Identifier: BSD-2-Clause .\" -.Dd August 19, 2025 +.Dd May 15, 2026 .Dt IWLWIFI 4 .Os .Sh NAME @@ -62,7 +41,7 @@ The driver provides support for Intel Wireless network devices. .Pp .Nm -is derived from Intel's Linux iwlwifi driver. +is derived from Intel's Linux iwlwifi driver based on Linux version 7.0. The .Xr iwm 4 and @@ -72,7 +51,7 @@ driver. .Pp In addition .Nm -already supports Intel's Linux iwlwifi/mld chipsets. +supports the chipsets based on Intel's Linux iwlwifi/mld driver. .Pp .Nm still complements the @@ -83,10 +62,9 @@ Intel's Linux iwlwifi/dvm, which does not support. .Pp The driver uses the -.\" No LinuxKPI man pages so no .Xr here. -.Sy linuxkpi_wlan +.Xr linuxkpi_wlan 4 and -.Sy linuxkpi +.Xr linuxkpi 4 compat framework to bridge between the Linux and native .Fx @@ -147,117 +125,129 @@ Intel(R) Wireless N 7260 .It Intel(R) Dual Band Wireless AC 3160 .It +Intel(R) Wireless N 3160 +.It Intel(R) Dual Band Wireless N 3160 .It -Intel(R) Wireless N 3160 +Intel(R) Dual Band Wireless-AC 3165 .It -Intel(R) Dual Band Wireless AC 3165 +Intel(R) Dual Band Wireless-AC 3168 .It -Intel(R) Dual Band Wireless AC 3168 +Intel(R) Dual Band Wireless-AC 7265 .It -Intel(R) Dual Band Wireless AC 7265 +Intel(R) Dual Band Wireless-N 7265 .It -Intel(R) Wireless N 7265 +Intel(R) Wireless-N 7265 .It -Intel(R) Dual Band Wireless N 7265 +Intel(R) Dual Band Wireless-AC 8260 .It -Intel(R) Dual Band Wireless AC 8260 +Intel(R) Dual Band Wireless-N 8260 .It -Intel(R) Dual Band Wireless N 8260 +Intel(R) Dual Band Wireless-AC 4165 .It -Intel(R) Dual Band Wireless AC 4165 +Intel(R) Dual Band Wireless-AC 8265 .It -Intel(R) Dual Band Wireless AC 8265 +Intel(R) Dual Band Wireless-AC 8275 .It -Intel(R) Dual Band Wireless AC 8275 +Killer(R) Wireless-AC 1435i Wireless Network Adapter (8265D2W) .It -Killer (R) Wireless-AC 1550 Wireless Network Adapter (9260NGW) 160MHz +Killer(R) Wireless-AC 1435-KIX Wireless Network Adapter (8265NGW) .It -Killer (R) Wireless-AC 1550s Wireless Network Adapter (9560NGW) +Intel(R) Wireless-AC 9461 160MHz .It -Killer (R) Wireless-AC 1550i Wireless Network Adapter (9560NGW) +Intel(R) Wireless-AC 9461 .It -Killer(R) Wireless-AC 1550s Wireless Network Adapter (9560D2W) 160MHz +Intel(R) Wireless-AC 9462 160MHz .It -Killer(R) Wireless-AC 1550i Wireless Network Adapter (9560NGW) 160MHz +Intel(R) Wireless-AC 9462 .It -Killer(R) Wi-Fi 6E AX1690s 160MHz Wireless Network Adapter (411D2W) +Intel(R) Wireless-AC 9260 160MHz .It -Killer(R) Wi-Fi 6E AX1690i 160MHz Wireless Network Adapter (411NGW) +Intel(R) Wireless-AC 9260 +.It +Intel(R) Wireless-AC 9560 160MHz +.It +Intel(R) Wireless-AC 9560 +.It +Intel(R) Wi-Fi 6 AX201 160MHz .It -Intel(R) Wireless-AC 9260-1 +Intel(R) Wi-Fi 6 AX101 +.It +Intel(R) Wi-Fi 6 AX203 .It Intel(R) Wi-Fi 6 AX200 160MHz .It -Killer(R) Wi-Fi 6 AX1650w 160MHz Wireless Network Adapter (200D2W) +Intel(R) Wi-Fi 6E AX211 160MHz .It -Killer(R) Wi-Fi 6 AX1650x 160MHz Wireless Network Adapter (200NGW) +Intel(R) Wi-Fi 6E AX411 160MHz .It -Intel(R) Wi-Fi 6 AX201 160MHz +Intel(R) Wi-Fi 6E AX210 160MHz .It -Killer(R) Wi-Fi 6 AX1650s 160MHz Wireless Network Adapter (201D2W) +Killer(R) Wireless-AC 1550 Wireless Network Adapter (9260NGW) 160MHz .It -Killer(R) Wi-Fi 6 AX1650i 160MHz Wireless Network Adapter (201NGW) +Killer(R) Wireless-AC 1550s Wireless Network Adapter (9560D2W) 160MHz +.It +Killer(R) Wireless-AC 1550i Wireless Network Adapter (9560NGW) 160MHz .It -Killer(R) Wi-Fi 6 AX1650s 160MHz Wireless Network Adapter (201NGW) +Killer(R) Wi-Fi 6 AX1650s 160MHz Wireless Network Adapter (201D2W) .It -Killer(R) Wi-Fi 6 AX1650i 160MHz Wireless Network Adapter (201D2W) +Killer(R) Wi-Fi 6 AX1650i 160MHz Wireless Network Adapter (201NGW) .It -Intel(R) Wi-Fi 6E AX211 160MHz +Killer(R) Wi-Fi 6E AX1675s 160MHz Wireless Network Adapter (211D2W) .It -Intel(R) Wi-Fi 6 AX210 160MHz +Killer(R) Wi-Fi 6E AX1675i 160MHz Wireless Network Adapter (211NGW) .It Killer(R) Wi-Fi 6E AX1675w 160MHz Wireless Network Adapter (210D2W) .It Killer(R) Wi-Fi 6E AX1675x 160MHz Wireless Network Adapter (210NGW) .It -Intel(R) Wi-Fi 6E AX411 160MHz +Killer(R) Wi-Fi 6E AX1690s 160MHz Wireless Network Adapter (411D2W) .It -Killer(R) Wi-Fi 6E AX1675s 160MHz Wireless Network Adapter (211NGW) +Killer(R) Wi-Fi 6E AX1690i 160MHz Wireless Network Adapter (411NGW) .It -Killer(R) Wi-Fi 6E AX1675i 160MHz Wireless Network Adapter (211NGW) +Killer(R) Wi-Fi 6 AX1650w 160MHz Wireless Network Adapter (200D2W) .It -Intel(R) Wireless-AC 9461 160MHz +Killer(R) Wi-Fi 6 AX1650x 160MHz Wireless Network Adapter (200NGW) .It -Intel(R) Wireless-AC 9461 +Intel(R) Wi-Fi 7 BE201 320MHz .It -Intel(R) Wireless-AC 9462 160MHz +Intel(R) Wi-Fi 7 BE401 320MHz .It -Intel(R) Wireless-AC 9462 +Intel(R) Wi-Fi 7 BE200 320MHz .It -Intel(R) Wireless-AC 9560 160MHz +Intel(R) Wi-Fi 7 BE202 160MHz .It -Intel(R) Wireless-AC 9560 +Killer(R) Wi-Fi 7 BE1750s 320MHz Wireless Network Adapter (BE201D2W) .It -Intel(R) Wireless-AC 9270 160MHz +Killer(R) Wi-Fi 7 BE1750i 320MHz Wireless Network Adapter (BE201NGW) .It -Intel(R) Wireless-AC 9270 +Killer(R) Wi-Fi 7 BE1790s 320MHz Wireless Network Adapter (BE401D2W) .It -Intel(R) Wireless-AC 9162 160MHz +Killer(R) Wi-Fi 7 BE1790i 320MHz Wireless Network Adapter (BE401NGW) .It -Intel(R) Wireless-AC 9162 +Killer(TM) Wi-Fi 7 BE1750w 320MHz Wireless Network Adapter (BE200D2W) .It -Intel(R) Wireless-AC 9260 160MHz +Killer(TM) Wi-Fi 7 BE1750x 320MHz Wireless Network Adapter (BE200NGW) .It -Intel(R) Wireless-AC 9260 +Intel(R) Wi-Fi 7 BE211 320MHz .It -Intel(R) Wi-Fi 6 AX101 +Intel(R) Wi-Fi 6E AX221 160MHz .It -Intel(R) Wi-Fi 6 AX203 +Intel(R) Wi-Fi 7 BE213 160MHz .It -Intel(R) Wi-Fi 6E AX231 160MHz +Intel(R) Wi-Fi 8 BN201 .It -Intel(R) Wi-Fi 7 BE201 320MHz +Intel(R) Wi-Fi 7 BE223 .It -Intel(R) Wi-Fi 7 BE200 320MHz +Intel(R) Wi-Fi 8 BN203 .It -Intel(R) Wi-Fi 7 BE202 160MHz +Killer(R) Wi-Fi 7 BE1775s 320MHz Wireless Network Adapter (BE211D2W) .It -Intel(R) TBD Sc device +Killer(R) Wi-Fi 7 BE1775i 320MHz Wireless Network Adapter (BE211NGW) .It -Intel(R) TBD Sc2 device +Killer(R) Wi-Fi 8 BN1850w2 320MHz Wireless Network Adapter (BN201.D2W) .It -Intel(R) TBD Sc2f device +Killer(R) Wi-Fi 8 BN1850i 320MHz Wireless Network Adapter (BN201.NGW) .\" -------------------------------------------------------------------- .El .Sh LOADER TUNABLES @@ -318,6 +308,8 @@ directory. .Xr iwm 4 , .Xr iwn 4 , .Xr iwx 4 , +.Xr linuxkpi 4, +.Xr linuxkpi_wlan 4, .Xr wlan 4 , .Xr networking 7 , .Xr fwget 8 , diff --git a/share/man/man4/iwlwififw.4 b/share/man/man4/iwlwififw.4 index 45ee0e757c07..32c9e974b60d 100644 --- a/share/man/man4/iwlwififw.4 +++ b/share/man/man4/iwlwififw.4 @@ -1,31 +1,15 @@ .\" -.\" SPDX-License-Identifier: BSD-2-Clause -.\" -.\" Copyright (c) 2021-2025 The FreeBSD Foundation +.\" Copyright (c) 2021-2026 The FreeBSD Foundation .\" .\" This documentation was written by Bj\xc3\xb6rn Zeeb under sponsorship from .\" the FreeBSD Foundation. .\" -.\" Redistribution and use in source and binary forms, with or without -.\" modification, are permitted provided that the following conditions -.\" are met: -.\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. -.\" 2. Redistributions in binary form must reproduce the above copyright -.\" notice, this list of conditions and the following disclaimer in the -.\" documentation and/or other materials provided with the distribution. +.\" SPDX-License-Identifier: BSD-2-Clause .\" -.\" 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. +.\" NOTE: this man page is obsolete and will be removed in future versions +.\" of FreeBSD as there is (easy) no way to extract the information anymore +.\" from the driver. We do leave it currently for completeness until the +.\" next generation of cards start shipping. .\" .Dd May 12, 2025 .Dt IWLWIFIFW 4 diff --git a/share/man/man4/rtw88.4 b/share/man/man4/rtw88.4 index e01f508ef80e..6f60861cf623 100644 --- a/share/man/man4/rtw88.4 +++ b/share/man/man4/rtw88.4 @@ -1,9 +1,13 @@ -.\"- -.\" SPDX-License-Identifier: BSD-2-Clause .\" .\" Copyright (c) 2022-2026 Bjoern A. Zeeb +.\" Copyright (c) 2026 The FreeBSD Foundation +.\" +.\" Portions of this documentation were written by Bj\xc3\xb6rn Zeeb +.\" under sponsorship from the FreeBSD Foundation. +.\" +.\" SPDX-License-Identifier: BSD-2-Clause .\" -.Dd February 10, 2026 +.Dd May 15, 2026 .Dt RTW88 4 .Os .Sh NAME @@ -28,7 +32,7 @@ It is not possible to load the driver from .Sh DESCRIPTION The .Nm -driver is derived from Realtek's Linux rtw88 driver. +driver is derived from Realtek's Linux rtw88 driver based on Linux version 7.0. .Pp This driver requires firmware to be loaded before it will work. The package @@ -45,10 +49,9 @@ One can use to install the correct firmware package. .Pp The driver uses the -.\" No LinuxKPI man pages so no .Xr here. -.Sy linuxkpi_wlan +.Xr linuxkpi_wlan 4 and -.Sy linuxkpi +.Xr linuxkpi 4 compat framework to bridge between the Linux and native .Fx @@ -64,6 +67,8 @@ driver supports PCIe devices with the following chipsets: .It Realtek 802.11n wireless 8723de (RTL8723DE) .It +Realtek 802.11ac wireless 8814ae (RTL8814AE) +.It Realtek 802.11ac wireless 8821ce (RTL8821CE) .It Realtek 802.11ac wireless 8822be (RTL8822BE) @@ -84,6 +89,8 @@ for network buffer memory to the lower 32bit of physical memory and make the driver work. .El .Sh SEE ALSO +.Xr linuxkpi 4, +.Xr linuxkpi_wlan 4, .Xr wlan 4 , .Xr networking 7 , .Xr fwget 8 , @@ -95,14 +102,16 @@ The driver first appeared in .Fx 13.2 . .Sh BUGS -Certainly. -.Pp Does not seem to work (reliably) on machines with more than 4GB of main memory. See in the .Sx LOADER TUNABLES section above. .Pp +At least the 8821CE and 8822BE chipsets have trouble associating, +which seems to be due to the software scan fallback, the chandef emulation, +and net80211 interactions, along with a 6s timeout observed in the driver. +.Pp While .Nm supports 802.11a/b/g/n/ac modes, diff --git a/share/man/man4/rtw89.4 b/share/man/man4/rtw89.4 index 8c7132673db5..95d75781f995 100644 --- a/share/man/man4/rtw89.4 +++ b/share/man/man4/rtw89.4 @@ -1,9 +1,13 @@ -.\"- -.\" SPDX-License-Identifier: BSD-2-Clause .\" .\" Copyright (c) 2023-2025 Bjoern A. Zeeb +.\" Copyright (c) 2026 The FreeBSD Foundation +.\" +.\" Portions of this documentation were written by Bj\xc3\xb6rn Zeeb +.\" under sponsorship from the FreeBSD Foundation. +.\" +.\" SPDX-License-Identifier: BSD-2-Clause .\" -.Dd June 13, 2025 +.Dd May 15, 2026 .Dt RTW89 4 .Os .Sh NAME @@ -28,7 +32,7 @@ It is not possible to load the driver from .Sh DESCRIPTION The .Nm -driver is derived from Realtek's Linux rtw89 driver. +driver is derived from Realtek's Linux rtw89 driver based on Linux version 7.0. .Pp This driver requires firmware to be loaded before it will work. The package @@ -45,10 +49,9 @@ One should use to install the correct firmware package. .Pp The driver uses the -.\" No LinuxKPI man pages so no .Xr here. -.Sy linuxkpi_wlan +.Xr linuxkpi_wlan 4 and -.Sy linuxkpi +.Xr linuxkpi 4 compat framework to bridge between the Linux and native .Fx @@ -68,6 +71,8 @@ Realtek 8852AE Wi-Fi 6 (RTL8852AE) .It Realtek 8852BE Wi-Fi 6 (RTL8852BE) .It +Realtek 8852BTE Wi-Fi 6 (RTL8852BE-VT) +.It Realtek 8852CE Wi-Fi 6E (RTL8852CE) .It Realtek 8922AE Wi-Fi 7 (RTL8922AE) @@ -86,6 +91,8 @@ for network buffer memory to the lower 32bit of physical memory and make the driver work. .El .Sh SEE ALSO +.Xr linuxkpi 4, +.Xr linuxkpi_wlan 4, .Xr wlan 4 , .Xr networking 7 , .Xr fwget 8 , @@ -105,6 +112,11 @@ See in the .Sx LOADER TUNABLES section above. .Pp +We observe various stability issues leading up to driver crashes and +kernel panics with the current set of chipsets at least in combination +with +.Xr linuxkpi_wlan 4 . +.Pp While .Nm supports 802.11a/b/g/n/ac/ax modes, From nobody Fri May 15 19:42:20 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gHHf84my8z6dt65 for ; Fri, 15 May 2026 19:42:24 +0000 (UTC) (envelope-from oliver.pntr@gmail.com) Received: from mail-yx1-xb134.google.com (mail-yx1-xb134.google.com [IPv6:2607:f8b0:4864:20::b134]) (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 4gHHf82gbNz41xG for ; Fri, 15 May 2026 19:42:24 +0000 (UTC) (envelope-from oliver.pntr@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-yx1-xb134.google.com with SMTP id 956f58d0204a3-65dd9b25829so308403d50.3 for ; Fri, 15 May 2026 12:42:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1778874142; cv=none; d=google.com; s=arc-20240605; b=JHTbnSTdpwjCTT+AdjDuvg82lqBXH5UOAJIaLEPJQ6kIxEaRKG98OfhFWiO7p0+oHG pVFZgnJWLVmzNIigxwDd50vxz5OJz5U4F3zQLafWXzBfinft+Lm8V/NlQUMk9YpXSmST ZsPkFI0h0bjUcRe/1I3XaRDm56ebiAVwusPtedQ94D/2xYkajzW2LiSuI3r3yAC9Gxwr NV3iSHf4zuKl2X6lkhMtYDbnWa7cMDLkUFqH7gwWv3K5Ir4WEtD7AjtBPWZgppw00+Z0 GefhjxT/ebkOw3CiNkKFiezC0jc1s49e7a0dg4XXCC+FtlWNSma2X/3phYZrIJsNMmO/ eFZw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=cc:to:subject:message-id:date:from:references:in-reply-to :mime-version:dkim-signature; bh=WGhiDaaL4v1Gsdz2nsFKiiqvR0PXQwS1OTLPeVdENjA=; fh=hBlj4sgAQWIVVA2MKtP0oEPiUEaCK5IGYZLcTLvGclE=; b=iM2mHtdnOu8j8NGYpPV7zQSp9XGsDW2QI3I8uopc61kMqZceiVVyp+2R46tqW/PETd +G2Qb7m8VoehsdhsEZ8gbfgvfk7xMIa/xpuaB8NbIp5lr5QRSZrxS8V+ycfbcEKQGncz JTQ1A1GRF92XsOeUeeu4DjrDRNxfokVBECprwboAoCHjblah7hm6dETBlhkB8tZtwY9T TOzdmnIL9On21nWQN3Yh3FYPFjno677Dlzwdi2uCUycJxE/DGolY7EjYpVgtK0cyQJ+L A9mnG81NmbLrhXKyDtGJG1W5ythHIv/PWv32ymeLwf6uoyKcMK9wX0fa43JGX8cWTthp 5hSg==; darn=freebsd.org ARC-Authentication-Results: i=1; mx.google.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1778874142; x=1779478942; darn=freebsd.org; h=cc:to:subject:message-id:date:from:references:in-reply-to :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=WGhiDaaL4v1Gsdz2nsFKiiqvR0PXQwS1OTLPeVdENjA=; b=X6Xq5N3A+6BOgt7I1KsAQLQLqQqOayF5M1clyRHpndqvqk0f8zNzjknyPl3jwWqmwt cRCPlDt+DNHTFS2vF10q7L8SPgwXeTGJFByLOfm0JQsu0Xz2/o0UesULuJOO8jA8HBVW A8/IS2O541kBk7C0LjUlLE9i+4fomWP0g3BgftM4TOcCKr4HDAe6ltqo+rBa1CTlLgIZ HioIsUPK6zZy3yI+u1J9QwAfpCeeh05pz2vjupX0avbjofSt4wGTStGN9jDmLBB4rO+g H6NQD8MUYcAWIMWaJx/EZJT0Vu9oDyXqZ8OGbc0vzKB2dQJhaFwYVkDfU3Zl/gbDfXx8 MFuQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778874142; x=1779478942; h=cc:to:subject:message-id:date:from:references:in-reply-to :mime-version:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=WGhiDaaL4v1Gsdz2nsFKiiqvR0PXQwS1OTLPeVdENjA=; b=fxuYJja5WmR2vGjWBvdMExaEsWtqOhMAI3qPVl+bLNIKnIeHktlhcwJanvW8lHNxOy XQgSazWIevDt2OyH5ZglzdzHlWMpmeotL0eHtFeHhtqkfvHvElJ57WRT1lUgF/nEUch9 8bUzKoSv5HysZZ9p2+NMoPLeOAh5kFcXaU4I4JslAJZpqHCfvWYLtsvJurtzXIA/GXH0 jAUtU7z/7zLwRiHMufWgeEI41UKKtQ5Uiq+alisNnNhfSQ7mWx3Md9P+fWcRPsMJpQBj MfsVIChYSyz5V2++eY57By36vMsygbCj4aCm9iaLxNicHvSfXUgGMqueLg6lTKwdKeAr Ihpg== X-Forwarded-Encrypted: i=1; AFNElJ/K30+rj9AdEd2QS0VSFTaEWhmQz79xgJOFKjdu9s4xJFT/ltJ0+PsM93OfSAfVLr9s8p5t7MXoFhHYYxDEc7vmPOt8@freebsd.org X-Gm-Message-State: AOJu0Yx5UBjG2M4yQ5GXf8ADeUGgOP37y86q8aP/fv7hqcz6XnK6s1/Y k4rTtLp+Yiw3ZgWo0gYEsyB2ltxSeY9l6oqRAq5exCVHVg8osHjJGaLd2eBxIuQLI5zuS47g9er cyPO0di2U0682jFmxj8JKuQrkafGhuPA= X-Gm-Gg: Acq92OELTZVxBGSlXkbY+LTYFb352TPFVU+Ns3aAaD/gNUttAh5958jz0omLH3Mmfu5 RdRBBr4WFTN+ai4TM50pnktPDSY2YGZ+lCXvLiF25IZbpbMXPz7n6FYy7ghHeBdBETbY5ibXD4R zTqih7JkDbN0mF6J893AHdsvXLxpMvBIYneLH1OUcui6f9HYryoyWtiu/pngBR29MAnHuJHVRIj plFO6dtY0ujeQAOzyeMDz1AaeBjziQYtm5H6xHStXLdx1t00SdTMmzPhzhsOT5R5ApKHlvouLZG 2ZQwf6mGDCKNBu0s14DGrFyW7ZCLMl5+nQAAmsWtYBH5FdbrthU= X-Received: by 2002:a05:690e:1402:b0:65d:6f10:d42a with SMTP id 956f58d0204a3-65e227cfff6mr5395860d50.39.1778874142364; Fri, 15 May 2026 12:42:22 -0700 (PDT) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Received: by 2002:a05:7011:c9a:b0:514:c31c:db89 with HTTP; Fri, 15 May 2026 12:42:20 -0700 (PDT) In-Reply-To: <6a064e15.44875.4253434b@gitrepo.freebsd.org> References: <6a064e15.44875.4253434b@gitrepo.freebsd.org> From: Oliver Pinter Date: Fri, 15 May 2026 20:42:20 +0100 X-Gm-Features: AVHnY4KHqD2ECw2L6wgkbEZgWe3CrVi5X3X0ChNljK0_PYUDWiepeylSSfHkyGA Message-ID: Subject: Re: git: b92b9da33006 - main - nfsd: Allow vfs.nfsd.srvmaxio to be up to 4Mbytes To: Rick Macklem Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Type: multipart/alternative; boundary="0000000000005b16ab0651e0699c" X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; TAGGED_FROM(0.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] X-Rspamd-Queue-Id: 4gHHf82gbNz41xG X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated --0000000000005b16ab0651e0699c Content-Type: text/plain; charset="UTF-8" Hi! On Friday, May 15, 2026, Rick Macklem wrote: > The branch main has been updated by rmacklem: > > URL: https://cgit.FreeBSD.org/src/commit/?id= > b92b9da3300655c86dcd42ea8a5ba45badd90847 > > commit b92b9da3300655c86dcd42ea8a5ba45badd90847 > Author: Rick Macklem > AuthorDate: 2026-05-14 22:33:23 +0000 > Commit: Rick Macklem > CommitDate: 2026-05-14 22:33:23 +0000 > > nfsd: Allow vfs.nfsd.srvmaxio to be up to 4Mbytes > > Without this patch, the maximum setting for > vfs.nfsd.srvmaxio was 1Mbyte. This patch increases > that to 4Mbytes. > > The same as for any setting above 128Kbytes, settings up to > 4Mbytes require that kern.ipc.maxsockbuf be increased. > (A message generated after setting vfs.nfsd.srvmaxio via > the /etc/rc.conf variable nfs_server_maxio will indicate > the minimum setting, which will be somewhat greater than > four times the setting of vfs.nfsd.srvmaxio.) > > Requested by: Cedric Blancher > MFC after: 2 weeks > Fixes: 13d3bd165e22 ("subr_uio.c: Remove a KASSERT() for large NFS > server I/O") Wouldn't be better to introduce an MFC with tag, rater than abusing the Fixes tag? This seems to me like a new "feature", rather than a bug. And it will may be added to releasenotes also. > --- > sys/fs/nfs/nfsproto.h | 3 +++ > sys/fs/nfsserver/nfs_nfsdport.c | 5 +++-- > 2 files changed, 6 insertions(+), 2 deletions(-) > > diff --git a/sys/fs/nfs/nfsproto.h b/sys/fs/nfs/nfsproto.h > index 6e67c5be3416..1054c85d8e8f 100644 > --- a/sys/fs/nfs/nfsproto.h > +++ b/sys/fs/nfs/nfsproto.h > @@ -89,8 +89,11 @@ > * It used to be called NFS_MAXDATA, but has been renamed to clarify that > * it refers to server side only and doesn't conflict with the NFS_MAXDATA > * defined in rpcsvc/nfs_prot.h for userland. > + * NFS_SRVMAXIO is the default setting for vfs.nfsd.srvmaxio > + * NFS_SRVLIMITIO is the maximum setting allowed for vfs.nfsd.srvmaxio > */ > #define NFS_SRVMAXIO (128 * 1024) > +#define NFS_SRVLIMITIO (4 * 1024 * 1024) > > /* Stat numbers for rpc returns (version 2, 3 and 4) */ > /* > diff --git a/sys/fs/nfsserver/nfs_nfsdport.c b/sys/fs/nfsserver/nfs_ > nfsdport.c > index e42d5ca1e0a3..1e6936ed351c 100644 > --- a/sys/fs/nfsserver/nfs_nfsdport.c > +++ b/sys/fs/nfsserver/nfs_nfsdport.c > @@ -241,8 +241,9 @@ sysctl_srvmaxio(SYSCTL_HANDLER_ARGS) > printf("nfsd: vfs.nfsd.srvmaxio can only be increased\n"); > return (EINVAL); > } > - if (newsrvmaxio > 1048576) { > - printf("nfsd: vfs.nfsd.srvmaxio cannot be > 1Mbyte\n"); > + if (newsrvmaxio > NFS_SRVLIMITIO) { > + printf("nfsd: vfs.nfsd.srvmaxio cannot be > %d\n", > + NFS_SRVLIMITIO); > return (EINVAL); > } > if ((newsrvmaxio & (newsrvmaxio - 1)) != 0) { > > --0000000000005b16ab0651e0699c Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Hi!

On Friday, May 15, 2026, Rick Macklem <rmacklem@freebsd.org> wrote:
The branch main has been updated by rmacklem:

URL: https://cgit.FreeBSD.org/src/commit/?id=3Db92b9da3300655c86dcd42ea8a5ba45badd90847

commit b92b9da3300655c86dcd42ea8a5ba45badd90847
Author:=C2=A0 =C2=A0 =C2=A0Rick Macklem <rmacklem@FreeBSD.org>
AuthorDate: 2026-05-14 22:33:23 +0000
Commit:=C2=A0 =C2=A0 =C2=A0Rick Macklem <rmacklem@FreeBSD.org>
CommitDate: 2026-05-14 22:33:23 +0000

=C2=A0 =C2=A0 nfsd: Allow vfs.nfsd.srvmaxio to be up to 4Mbytes

=C2=A0 =C2=A0 Without this patch, the maximum setting for
=C2=A0 =C2=A0 vfs.nfsd.srvmaxio was 1Mbyte.=C2=A0 This patch increases
=C2=A0 =C2=A0 that to 4Mbytes.

=C2=A0 =C2=A0 The same as for any setting above 128Kbytes, settings up to =C2=A0 =C2=A0 4Mbytes require that kern.ipc.maxsockbuf be increased.
=C2=A0 =C2=A0 (A message generated after setting vfs.nfsd.srvmaxio via
=C2=A0 =C2=A0 the /etc/rc.conf variable nfs_server_maxio will indicate
=C2=A0 =C2=A0 the minimum setting, which will be somewhat greater than
=C2=A0 =C2=A0 four times the setting of vfs.nfsd.srvmaxio.)

=C2=A0 =C2=A0 Requested by:=C2=A0 =C2=A0Cedric Blancher <cedric.blancher@gmail.com>
=C2=A0 =C2=A0 MFC after:=C2=A0 =C2=A0 =C2=A0 2 weeks
=C2=A0 =C2=A0 Fixes:=C2=A0 13d3bd165e22 ("subr_uio.c: Remove a KASSERT= () for large NFS server I/O")

Wouldn&#= 39;t be better to introduce an MFC with tag, rater than abusing the Fixes t= ag? This seems to me like a new "feature", rather than a bug. And= it will may be added to releasenotes also.
=C2=A0
---
=C2=A0sys/fs/nfs/nfsproto.h=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0| 3 +++=
=C2=A0sys/fs/nfsserver/nfs_nfsdport.c | 5 +++--
=C2=A02 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/sys/fs/nfs/nfsproto.h b/sys/fs/nfs/nfsproto.h
index 6e67c5be3416..1054c85d8e8f 100644
--- a/sys/fs/nfs/nfsproto.h
+++ b/sys/fs/nfs/nfsproto.h
@@ -89,8 +89,11 @@
=C2=A0 * It used to be called NFS_MAXDATA, but has been renamed to clarify = that
=C2=A0 * it refers to server side only and doesn't conflict with the NF= S_MAXDATA
=C2=A0 * defined in rpcsvc/nfs_prot.h for userland.
+ * NFS_SRVMAXIO is the default setting for vfs.nfsd.srvmaxio
+ * NFS_SRVLIMITIO is the maximum setting allowed for vfs.nfsd.srvmaxio
=C2=A0 */
=C2=A0#define=C2=A0 =C2=A0 =C2=A0 =C2=A0 NFS_SRVMAXIO=C2=A0 =C2=A0 (128 * 1= 024)
+#define=C2=A0 =C2=A0 =C2=A0 =C2=A0 NFS_SRVLIMITIO=C2=A0 (4 * 1024 * 1024)<= br>
=C2=A0/* Stat numbers for rpc returns (version 2, 3 and 4) */
=C2=A0/*
diff --git a/sys/fs/nfsserver/nfs_nfsdport.c b/sys/fs/nfsserver/nfs_nfsdport.c
index e42d5ca1e0a3..1e6936ed351c 100644
--- a/sys/fs/nfsserver/nfs_nfsdport.c
+++ b/sys/fs/nfsserver/nfs_nfsdport.c
@@ -241,8 +241,9 @@ sysctl_srvmaxio(SYSCTL_HANDLER_ARGS)
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 printf("nfsd: = vfs.nfsd.srvmaxio can only be increased\n");
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 return (EINVAL); =C2=A0 =C2=A0 =C2=A0 =C2=A0 }
-=C2=A0 =C2=A0 =C2=A0 =C2=A0if (newsrvmaxio > 1048576) {
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0printf("nfsd: = vfs.nfsd.srvmaxio cannot be > 1Mbyte\n");
+=C2=A0 =C2=A0 =C2=A0 =C2=A0if (newsrvmaxio > NFS_SRVLIMITIO) {
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0printf("nfsd: = vfs.nfsd.srvmaxio cannot be > %d\n",
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0NFS_S= RVLIMITIO);
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 return (EINVAL); =C2=A0 =C2=A0 =C2=A0 =C2=A0 }
=C2=A0 =C2=A0 =C2=A0 =C2=A0 if ((newsrvmaxio & (newsrvmaxio - 1)) !=3D = 0) {

--0000000000005b16ab0651e0699c-- From nobody Fri May 15 19:44:01 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gHHh64RcGz6dt8Y for ; Fri, 15 May 2026 19:44:06 +0000 (UTC) (envelope-from oliver.pntr@gmail.com) Received: from mail-yx1-xb136.google.com (mail-yx1-xb136.google.com [IPv6:2607:f8b0:4864:20::b136]) (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 4gHHh5533wz41yy for ; Fri, 15 May 2026 19:44:05 +0000 (UTC) (envelope-from oliver.pntr@gmail.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20251104 header.b=fP9jZIjQ; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (mx1.freebsd.org: domain of oliver.pntr@gmail.com designates 2607:f8b0:4864:20::b136 as permitted sender) smtp.mailfrom=oliver.pntr@gmail.com; arc=pass ("google.com:s=arc-20240605:i=1") Received: by mail-yx1-xb136.google.com with SMTP id 956f58d0204a3-65318dafbcbso400146d50.2 for ; Fri, 15 May 2026 12:44:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1778874243; cv=none; d=google.com; s=arc-20240605; b=Nxy/G55FfZkPVqAi5O0Wt0YMK821WUWzHjBPZCTtuT/agQE33JDA7iS6L+8Sn+IIyi 40sDo/IdOy4qMCVqUVSQ+34km6QjD/FfYV0LnMUvPrEhm9Ud57KVZ0yM6DYbNiqXyJ/S mmck8qt8a/7Q8XUWCxEW5iFCn0vPronfi/6QtAGLFEREUm+ytz98l2hS8pHHv82H219V lY9kkISadM0rIr465yUUWpYw+erRPUYWEOuWgvG6gdXMTuhPAlmNTYGU9fEhPnDFXnjt apOC9bIJSXMGOtxA0wUSkb4p510t3fN+93qsaXGmCMaRsogTm42bXTrUNhWTwrh+qiYx vFbw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=cc:to:subject:message-id:date:from:references:in-reply-to :mime-version:dkim-signature; bh=yrxKU7fENYV8hR1/De76nQ91++TDZJQe0H4RwN3ODhU=; fh=AtOI9e/zBYfhnWy5XN41iT6MF1lM0Yq2eEVQOxseOGc=; b=MqnJ+QgALyHqxPgiQBcHSYYiY3610u3jUxPXpn0WymwjJMnZVwlX+IHwnb74Ei4FdK 1UwEk9kGp2pVy3XHvjblwHTLK8ABqVsQN+hZmal+53G8/N5j5tI0cqYp/YI+u6RxHFOx F/KhhlMzLzK5Is8fNeiKViDBau5v3lKNDL5w8K5yR3/+8X0AG+OaXnOuLUR0N1AbG4UR dFVL5BDcqHTyc57usj1/jr4NkV9nabLE4wdjA56ltEcVy+2F9UpSc4Rz//SuK9dW1c+I bqazHs4yB3Ji8EmBIJtmmtVREKj0rNCGLe4guJZzfiD+xBBIZitNMXU4b3mHGI5rSxw+ Bbzg==; darn=freebsd.org ARC-Authentication-Results: i=1; mx.google.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1778874243; x=1779479043; darn=freebsd.org; h=cc:to:subject:message-id:date:from:references:in-reply-to :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=yrxKU7fENYV8hR1/De76nQ91++TDZJQe0H4RwN3ODhU=; b=fP9jZIjQ60kc5utmR1bipUiQctvFZxs8FilqyMkvmnM9c3FjZP/rbp4KGIED+euAqY XwmeChzQW9db/ITR2Hs898kJcmOZV8YNeYtXFFKYFEOYgvkmESGGGcmvL0qPPKg7IQqF cCe7lhzyCmgDwipUgmXC6BtJmcmt/xI/kiKJELEpztHlw1zzz4sD0Khmpw4HVBRZprs2 ZNmLphnIrrRd1bNu0tckzLp65bijANgJbf0o7Xb4Bf9rqaE9k38CwfOlOss+P9k0HD6W fuLCw8al5LGoz1vWUo2WvrfkUkV3VVNneextx3u8Gqt7yi1diY/hFsTluOa0+DyfRgRe ya1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778874243; x=1779479043; h=cc:to:subject:message-id:date:from:references:in-reply-to :mime-version:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=yrxKU7fENYV8hR1/De76nQ91++TDZJQe0H4RwN3ODhU=; b=oROb8mDPMQFt8yG6wJOG1e1sUHuANb9EJj+yvvDzjDQIbaf5dmS+0E5pj3F5NDP++y JC8+dWcGFvLEuVHjmBSaHjdE+W6T8cIpnYgi7rGVwXWNX2Y1UHpIYVjBTUwLCfn06kis 4bcDsjjU1m9gxcsPBJoy4sb80DPqjFdC1rZDLbE/CukGjg/vDp5U3iw0NJ+V68L3vik2 wpq3vEhzSLz9uCTbps3G+w0lpWwmRf9z9Ftz+aQ1LsA4l/wtfL/i8jl3Uk6m0m2iXa1F 7xSCWWbJnnERpPmXPa6Fte75A8kmGelt6NQvtIet9fVFCeUNyh/Wr91l98RD+NgyNoHa HdEw== X-Forwarded-Encrypted: i=1; AFNElJ+oHw7CMdIN7RtUhMFUYVHg2HbUv5/hesLZ81i3Am4Xn5HfDJawUycTazrv9dC9HkNjPEv9BXX/VQKZZUlNqy2BYU+a@freebsd.org X-Gm-Message-State: AOJu0YwMlCGi1N01ni0VEm29xWgKut8DjSTMPxG5qNC2hbFIf6/1jIY8 HVNM/XrUO2GNd/tz3xonUJNOyAmpjmOwn4tiODidREXJgEZWHjOUlrKbA8LgDmK36r87s8EXz+Z //fbfUQqo2cp4UB45wQMpzGwEnkmd5io= X-Gm-Gg: Acq92OGl9qQOsi0LBq94K5EZ6HdCkXfOrGXAJSdvnc7ywvd2fyYMjYeY/HMSRtZvvG0 qPiLiHn0Zh9Mx13oyKrrz5CF2IKe6gn2SxnEKp3k4+Dp4sQ1xEb4DB0BJA39LDLQ8Q6Ymnfzoq6 7cQggqiW6pFqsvpAzxmPZwsgfjMenH1xBmJ0LcXGc+lDD7Z0s/2SaEOZMD7mit3Ix94U5Xyn4ZE cF+0us3Bi/Ci9lSLkjxEL8YrSjWOzRtfMoYzDG/BWNn7SbyKN7kyZD9o5hkKZWMLi2oBmkAoqu2 yeKoqBw3JoWQpb1fGBWOk8lzAzqiqSUhfeY929hL X-Received: by 2002:a05:690e:4806:b0:650:a6d:d6bf with SMTP id 956f58d0204a3-65e2282a752mr3961703d50.51.1778874243448; Fri, 15 May 2026 12:44:03 -0700 (PDT) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Received: by 2002:a05:7011:1b89:b0:518:4b65:6f6d with HTTP; Fri, 15 May 2026 12:44:01 -0700 (PDT) In-Reply-To: References: <6a064e15.44875.4253434b@gitrepo.freebsd.org> From: Oliver Pinter Date: Fri, 15 May 2026 20:44:01 +0100 X-Gm-Features: AVHnY4IC9OLCdRqd-o7eXF-nlG1X0nc_yb7PXAIBMUCV9xQ_77_Qr7z4MW1F12c Message-ID: Subject: Re: git: b92b9da33006 - main - nfsd: Allow vfs.nfsd.srvmaxio to be up to 4Mbytes To: Rick Macklem Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Type: multipart/alternative; boundary="0000000000006184be0651e06f17" X-Spamd-Result: default: False [-5.00 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; ARC_ALLOW(-1.00)[google.com:s=arc-20240605:i=1]; NEURAL_HAM_SHORT(-1.00)[-1.000]; DMARC_POLICY_ALLOW(-0.50)[gmail.com,none]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4864::/56:c]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20251104]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; TAGGED_FROM(0.00)[]; RCVD_TLS_LAST(0.00)[]; FROM_HAS_DN(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:~]; FREEMAIL_ENVFROM(0.00)[gmail.com]; TO_DN_EQ_ADDR_SOME(0.00)[]; FREEMAIL_FROM(0.00)[gmail.com]; TO_DN_SOME(0.00)[]; DKIM_TRACE(0.00)[gmail.com:+]; MISSING_XM_UA(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::b136:from]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; PREVIOUSLY_DELIVERED(0.00)[dev-commits-src-all@freebsd.org]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org]; MID_RHS_MATCH_FROMTLD(0.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; DWL_DNSWL_NONE(0.00)[gmail.com:dkim] X-Spamd-Bar: ---- X-Rspamd-Queue-Id: 4gHHh5533wz41yy --0000000000006184be0651e06f17 Content-Type: text/plain; charset="UTF-8" On Friday, May 15, 2026, Oliver Pinter wrote: > Hi! > > On Friday, May 15, 2026, Rick Macklem wrote: > >> The branch main has been updated by rmacklem: >> >> URL: https://cgit.FreeBSD.org/src/commit/?id=b92b9da3300655c86dcd >> 42ea8a5ba45badd90847 >> >> commit b92b9da3300655c86dcd42ea8a5ba45badd90847 >> Author: Rick Macklem >> AuthorDate: 2026-05-14 22:33:23 +0000 >> Commit: Rick Macklem >> CommitDate: 2026-05-14 22:33:23 +0000 >> >> nfsd: Allow vfs.nfsd.srvmaxio to be up to 4Mbytes >> >> Without this patch, the maximum setting for >> vfs.nfsd.srvmaxio was 1Mbyte. This patch increases >> that to 4Mbytes. >> >> The same as for any setting above 128Kbytes, settings up to >> 4Mbytes require that kern.ipc.maxsockbuf be increased. >> (A message generated after setting vfs.nfsd.srvmaxio via >> the /etc/rc.conf variable nfs_server_maxio will indicate >> the minimum setting, which will be somewhat greater than >> four times the setting of vfs.nfsd.srvmaxio.) >> >> Requested by: Cedric Blancher >> MFC after: 2 weeks >> Fixes: 13d3bd165e22 ("subr_uio.c: Remove a KASSERT() for large NFS >> server I/O") > > > Wouldn't be better to introduce an MFC with tag, rater than abusing the > Fixes tag? This seems to me like a new "feature", rather than a bug. And it > will may be added to releasenotes also. > > (sorry, I've just seen now, the release notes, I'm going through on the commit from oldest to newest, but the other part is still relevant) > --- >> sys/fs/nfs/nfsproto.h | 3 +++ >> sys/fs/nfsserver/nfs_nfsdport.c | 5 +++-- >> 2 files changed, 6 insertions(+), 2 deletions(-) >> >> diff --git a/sys/fs/nfs/nfsproto.h b/sys/fs/nfs/nfsproto.h >> index 6e67c5be3416..1054c85d8e8f 100644 >> --- a/sys/fs/nfs/nfsproto.h >> +++ b/sys/fs/nfs/nfsproto.h >> @@ -89,8 +89,11 @@ >> * It used to be called NFS_MAXDATA, but has been renamed to clarify that >> * it refers to server side only and doesn't conflict with the >> NFS_MAXDATA >> * defined in rpcsvc/nfs_prot.h for userland. >> + * NFS_SRVMAXIO is the default setting for vfs.nfsd.srvmaxio >> + * NFS_SRVLIMITIO is the maximum setting allowed for vfs.nfsd.srvmaxio >> */ >> #define NFS_SRVMAXIO (128 * 1024) >> +#define NFS_SRVLIMITIO (4 * 1024 * 1024) >> >> /* Stat numbers for rpc returns (version 2, 3 and 4) */ >> /* >> diff --git a/sys/fs/nfsserver/nfs_nfsdport.c >> b/sys/fs/nfsserver/nfs_nfsdport.c >> index e42d5ca1e0a3..1e6936ed351c 100644 >> --- a/sys/fs/nfsserver/nfs_nfsdport.c >> +++ b/sys/fs/nfsserver/nfs_nfsdport.c >> @@ -241,8 +241,9 @@ sysctl_srvmaxio(SYSCTL_HANDLER_ARGS) >> printf("nfsd: vfs.nfsd.srvmaxio can only be increased\n"); >> return (EINVAL); >> } >> - if (newsrvmaxio > 1048576) { >> - printf("nfsd: vfs.nfsd.srvmaxio cannot be > 1Mbyte\n"); >> + if (newsrvmaxio > NFS_SRVLIMITIO) { >> + printf("nfsd: vfs.nfsd.srvmaxio cannot be > %d\n", >> + NFS_SRVLIMITIO); >> return (EINVAL); >> } >> if ((newsrvmaxio & (newsrvmaxio - 1)) != 0) { >> >> --0000000000006184be0651e06f17 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

On Friday, May 15, 2026, Oliver Pinter <oliver.pntr@gmail.com> wrote:
Hi!

On Friday, May 15, 2026, Rick Macklem <rmacklem@freebsd.org= > wrote:
The branch main has been upda= ted by rmacklem:

URL: https://cgit.FreeBSD.org/src/commit/?id=3Db92b9da3300655c86dcd42ea8a5ba45badd90847

commit b92b9da3300655c86dcd42ea8a5ba45badd90847
Author:=C2=A0 =C2=A0 =C2=A0Rick Macklem <rmacklem@FreeBSD.org>
AuthorDate: 2026-05-14 22:33:23 +0000
Commit:=C2=A0 =C2=A0 =C2=A0Rick Macklem <rmacklem@FreeBSD.org>
CommitDate: 2026-05-14 22:33:23 +0000

=C2=A0 =C2=A0 nfsd: Allow vfs.nfsd.srvmaxio to be up to 4Mbytes

=C2=A0 =C2=A0 Without this patch, the maximum setting for
=C2=A0 =C2=A0 vfs.nfsd.srvmaxio was 1Mbyte.=C2=A0 This patch increases
=C2=A0 =C2=A0 that to 4Mbytes.

=C2=A0 =C2=A0 The same as for any setting above 128Kbytes, settings up to =C2=A0 =C2=A0 4Mbytes require that kern.ipc.maxsockbuf be increased.
=C2=A0 =C2=A0 (A message generated after setting vfs.nfsd.srvmaxio via
=C2=A0 =C2=A0 the /etc/rc.conf variable nfs_server_maxio will indicate
=C2=A0 =C2=A0 the minimum setting, which will be somewhat greater than
=C2=A0 =C2=A0 four times the setting of vfs.nfsd.srvmaxio.)

=C2=A0 =C2=A0 Requested by:=C2=A0 =C2=A0Cedric Blancher <cedric.blancher@gmail.com>
=C2=A0 =C2=A0 MFC after:=C2=A0 =C2=A0 =C2=A0 2 weeks
=C2=A0 =C2=A0 Fixes:=C2=A0 13d3bd165e22 ("subr_uio.c: Remove a KASSERT= () for large NFS server I/O")


---
=C2=A0sys/fs/nfs/nfsproto.h=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0| 3 +++=
=C2=A0sys/fs/nfsserver/nfs_nfsdport.c | 5 +++--
=C2=A02 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/sys/fs/nfs/nfsproto.h b/sys/fs/nfs/nfsproto.h
index 6e67c5be3416..1054c85d8e8f 100644
--- a/sys/fs/nfs/nfsproto.h
+++ b/sys/fs/nfs/nfsproto.h
@@ -89,8 +89,11 @@
=C2=A0 * It used to be called NFS_MAXDATA, but has been renamed to clarify = that
=C2=A0 * it refers to server side only and doesn't conflict with the NF= S_MAXDATA
=C2=A0 * defined in rpcsvc/nfs_prot.h for userland.
+ * NFS_SRVMAXIO is the default setting for vfs.nfsd.srvmaxio
+ * NFS_SRVLIMITIO is the maximum setting allowed for vfs.nfsd.srvmaxio
=C2=A0 */
=C2=A0#define=C2=A0 =C2=A0 =C2=A0 =C2=A0 NFS_SRVMAXIO=C2=A0 =C2=A0 (128 * 1= 024)
+#define=C2=A0 =C2=A0 =C2=A0 =C2=A0 NFS_SRVLIMITIO=C2=A0 (4 * 1024 * 1024)<= br>
=C2=A0/* Stat numbers for rpc returns (version 2, 3 and 4) */
=C2=A0/*
diff --git a/sys/fs/nfsserver/nfs_nfsdport.c b/sys/fs/nfsserver/nfs_nf= sdport.c
index e42d5ca1e0a3..1e6936ed351c 100644
--- a/sys/fs/nfsserver/nfs_nfsdport.c
+++ b/sys/fs/nfsserver/nfs_nfsdport.c
@@ -241,8 +241,9 @@ sysctl_srvmaxio(SYSCTL_HANDLER_ARGS)
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 printf("nfsd: = vfs.nfsd.srvmaxio can only be increased\n");
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 return (EINVAL); =C2=A0 =C2=A0 =C2=A0 =C2=A0 }
-=C2=A0 =C2=A0 =C2=A0 =C2=A0if (newsrvmaxio > 1048576) {
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0printf("nfsd: = vfs.nfsd.srvmaxio cannot be > 1Mbyte\n");
+=C2=A0 =C2=A0 =C2=A0 =C2=A0if (newsrvmaxio > NFS_SRVLIMITIO) {
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0printf("nfsd: = vfs.nfsd.srvmaxio cannot be > %d\n",
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0NFS_S= RVLIMITIO);
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 return (EINVAL); =C2=A0 =C2=A0 =C2=A0 =C2=A0 }
=C2=A0 =C2=A0 =C2=A0 =C2=A0 if ((newsrvmaxio & (newsrvmaxio - 1)) !=3D = 0) {

--0000000000006184be0651e06f17-- From nobody Fri May 15 21:01:09 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gHKP528jXz6dyDP; Fri, 15 May 2026 21:01:13 +0000 (UTC) (envelope-from bz@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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gHKP51Nxtz49bK; Fri, 15 May 2026 21:01:13 +0000 (UTC) (envelope-from bz@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778878873; 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=hhmW/ELtik9uN5OlF1LRm2eKZBxW/byqEDMV7/ZUM3A=; b=P2W9mCIi18Ttk+L1Afv/ocvcdC/JJDuBQ99tHVvPnTGIxPfUWxkeqxZTN9mkgBajqTTkyj t2TZlBnqFEBNgpxbaFJlj3EU5X90Wp/YKYN6U0t9T98rxWrVrbTUPhY3qUYwBbvLTbfGuo lnyg2/6Y9lXz5M04oNt5UuW8nD/ehHAwOKpxoG2dzkuXDEhJVhLPbORbSQLxFzVlIOWLQu t8luKn0fpM/mPbuxafKzOickKsWOtR9s3spITsNduDstPR1ZsedI73SvSNFm6PpZpSVJLJ X9V23gdn+iKZbY9G32JVdagFnSkli6AgAhKejV9AmGpDxNU+F3gbAJAdCR9nqQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778878873; a=rsa-sha256; cv=none; b=LU8yhkYXd0PTaEvE/TjNGP+G8snUEBLBaHjU3zGUsPoNJNWwpr+P+d8BNPsqX3+sVmSqfs EQAaNs4OTjdspOZa9tzX2qDuUUEG518gKg/abZqi5Vuxj61lr146eLK2T5YmLtpMCoco8+ Ij/FeLEbj36yCqnnjFcZrzBNqGCUMrXyU8G/zxTL8nrvBm+6t58ZqHFGHshLYmX8nAst78 POR9SdCNkQ6cD61GfBkRIxz1AvCwOa2va7WrPBUg3Ioh+P+PFPxxsBpxcj+b7sz6hHT1mX cOnzyAVujdNtn4rEfDpQrlTM9EFRLKrVp8EPQPdzbtcyOLGNqlAhCDUszxz9Qw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778878873; 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=hhmW/ELtik9uN5OlF1LRm2eKZBxW/byqEDMV7/ZUM3A=; b=qD/umICkrVWVJiIYAC0LClPz8G3bhIpkg8Xvr520xio633oYvVUMSbELeyhgJ8m/jIWu1y zoPfRgw5zxT0y2zFV1bBmSMAe1inSGHgxfPd4UMwoPo3qaPiVoHaoFAle4ERjcaCdYMg8C HG5kljid4oI1PcxfIC6DCptX8HZbZNIDp6+fVmQ87m9XduAoGA5fC1x11pesN1SLV1zr4f CbgAqixUYG6VkDyA6RD+vrzjq9miEYNQOAybW+Y+QgT5dcAZFjKKSb7LOqokTRiN0Nc3fz pGd33Vw+7TwOmCy34d2N2w9KxqF5f/yJE06kuF80Hz9kXALWiI0NP60m1NE1HA== 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 "E7" (not verified)) (Authenticated sender: bz/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4gHKP501VLzQbq; Fri, 15 May 2026 21:01:12 +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 535C2A64806; Fri, 15 May 2026 21:00:47 +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 5F7452D029E9; Fri, 15 May 2026 21:01:11 +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 6QCkehKAaZTP; Fri, 15 May 2026 21:01:10 +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 4E35F2D029D8; Fri, 15 May 2026 21:01:10 +0000 (UTC) Date: Fri, 15 May 2026 21:01:09 +0000 (UTC) From: "Bjoern A. Zeeb" To: Ruslan Bukin cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: bcecad2c24aa - main - riscv: IOMMU support In-Reply-To: <6a02fef9.3c055.3a6526da@gitrepo.freebsd.org> Message-ID: References: <6a02fef9.3c055.3a6526da@gitrepo.freebsd.org> X-OpenPGP-Key-Id: 0x14003F198FEFA3E77207EE8D2B58B8F83CCF1842 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII; format=flowed On Tue, 12 May 2026, Ruslan Bukin wrote: > The branch main has been updated by br: > > URL: https://cgit.FreeBSD.org/src/commit/?id=bcecad2c24aa500913559c00f1be8b364a3ff150 > > commit bcecad2c24aa500913559c00f1be8b364a3ff150 > Author: Ruslan Bukin > AuthorDate: 2026-05-12 10:09:04 +0000 > Commit: Ruslan Bukin > CommitDate: 2026-05-12 10:11:32 +0000 > > riscv: IOMMU support > > Support for RISC-V IOMMU spec v1.0.1 (ratified) > https://github.com/riscv-non-isa/riscv-iommu > > Supports translation for PCI devices only. > Supports 1 or 2-level device-directory-table (DDT). > Supports SV39 and SV48 virtual memory system (on per-device basis). > Supports both "standard" and "extended" device-context (DC) structure. > Supports "bypass" mode to disable translation for a particular device. > Supports WSI (Wire-Signalled Interrupts) only. > > This includes both PCI-bus and FDT attachment drivers. > > Note in case of PCI-bus attachment, interrupts are not available. In this > case no error report is provided in case of translation fault. Otherwise > interrupts are not needed. > > Differential Revision: https://reviews.freebsd.org/D55922 > --- > sys/conf/files.riscv | 9 + > sys/riscv/conf/GENERIC | 1 + > sys/riscv/include/bus_dma_impl.h | 3 + > sys/riscv/include/iommu.h | 10 + > sys/riscv/iommu/iommu.c | 1351 ++++++++++++++++++++++++++++++++++++++ > sys/riscv/iommu/iommu.h | 359 ++++++++++ > sys/riscv/iommu/iommu_fdt.c | 145 ++++ > sys/riscv/iommu/iommu_frontend.c | 505 ++++++++++++++ > sys/riscv/iommu/iommu_frontend.h | 38 ++ > sys/riscv/iommu/iommu_if.m | 147 +++++ > sys/riscv/iommu/iommu_pci.c | 172 +++++ > sys/riscv/iommu/iommu_pmap.c | 629 ++++++++++++++++++ > sys/riscv/iommu/iommu_pmap.h | 49 ++ > 13 files changed, 3418 insertions(+) There are some accesses to sp_resident_count which are not guarded by INVARIANTS which makes kernel compiles fail. -- Bjoern A. Zeeb r15:7 From nobody Fri May 15 21:03:57 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gHKSJ2lHpz6dyhC; Fri, 15 May 2026 21:04:00 +0000 (UTC) (envelope-from bz@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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gHKSJ25qkz4CSk; Fri, 15 May 2026 21:04:00 +0000 (UTC) (envelope-from bz@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778879040; 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=qt+IrCmqtvIyBPv9TWHlxlrYI5yIUdtwbBq1JjrJgfw=; b=ByBeFFfvSSQCO7kZ28GLO2k/c+o+mxEVBTUSqbkamBbxYBhVps3N9DNPyldvpI8lBebymZ 0JFgXj9VO4yZqW0PgRiS6FZuhIbEDz/yCXO0sP4J58SxcKRPhdfplampyTAvWYScLxAUSI j8cWoV1m/awiBUAIBJ3T3LUm9+Bpim0ohZNuG4JDGTwBLdsVjpAUjMs2N/XU+yTz+KmAh4 +aE9aE+WeoXA+Cg3zXS2JZ9ZWVKPUA3cUTo6ddVqX2ucVgFug+5LdNqjsPvnmzKDD8Q459 wpZsIsrKBd/+1RS3l4wmkRKs5HmYBvy9E6NR8IPNit1VQ38XD++okRuNl/LtaA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778879040; a=rsa-sha256; cv=none; b=T18wodA/RX4qmxo6xQRkkWglRLsSob+FnNA1DvWEWChtYm9h/WcCXgDVtnG1tNm/Jlbx27 GrgyvSiiBR8fCXqOyqYt2+BlCXgREYp8j6aYN0GbsB+Pz6frziGY3iksc7eMaToDmL5vkX L0h03ocYD1Z2Mj7xMr/BZvWqT8Wt9O86RX7g7plf0pyo12r59CXKWLMWGRqMMuzeO5Q1pH RN4i4pu0ZkL4hgevvrxCLdz8gX/8BFUHnk4W+43o/yk30w+l7jPlEdP4pQPYlOJoV9jdjR ZUNnFSQVLtH1xIfAcB9CPcbFeO9YIcz4vpCc4LESjzsz7f19iaHfmSECxrW41w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778879040; 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=qt+IrCmqtvIyBPv9TWHlxlrYI5yIUdtwbBq1JjrJgfw=; b=tWrOnUBgGqHQ3qXBrntWR9C20nYT3L3GxaEQ6IBkcO1+Y8wz2V7pNT2tXTq/+ERLMfYWay /2AAyAwqwHflvS4eqSCSshNSc14/wf12N0MyJsHXulqFyDSuHzD/iXPa3NnqH+pmTjW4KW mUowh0CcmkVqMyqA0RYa7MYGylj+1TJWyqj0oh4141GTIyNs6XDbAqXqVqIJyBI24ccE83 lBQTb1FfMDD36k9Pvqi7r0Iwuh4rKE9S4j/BNwV+PUGK6N7cC/GwG2CJxZvt5LiFAp2vjq 2LtB/vsjcumNRhl7W86oGJpkMvQ9s1xFOtKLKSUel3M8fhW0MqBut/Vx4nhPkg== 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 "E7" (not verified)) (Authenticated sender: bz/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4gHKSJ0dpxzPm2; Fri, 15 May 2026 21:04:00 +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 6EA3CA64805; Fri, 15 May 2026 21:03:34 +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 64DD32D029E9; Fri, 15 May 2026 21:03:58 +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 GHvb6Jy-DUNA; Fri, 15 May 2026 21:03:57 +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 568952D029D8; Fri, 15 May 2026 21:03:57 +0000 (UTC) Date: Fri, 15 May 2026 21:03:57 +0000 (UTC) From: "Bjoern A. Zeeb" To: Ruslan Bukin cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: bcecad2c24aa - main - riscv: IOMMU support In-Reply-To: <6a02fef9.3c055.3a6526da@gitrepo.freebsd.org> Message-ID: <5poorp6p-3r7-317r-p54q-355r73r852r@mnoonqbm.arg> References: <6a02fef9.3c055.3a6526da@gitrepo.freebsd.org> X-OpenPGP-Key-Id: 0x14003F198FEFA3E77207EE8D2B58B8F83CCF1842 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII; format=flowed On Tue, 12 May 2026, Ruslan Bukin wrote: > The branch main has been updated by br: > > URL: https://cgit.FreeBSD.org/src/commit/?id=bcecad2c24aa500913559c00f1be8b364a3ff150 > > commit bcecad2c24aa500913559c00f1be8b364a3ff150 > Author: Ruslan Bukin > AuthorDate: 2026-05-12 10:09:04 +0000 > Commit: Ruslan Bukin > CommitDate: 2026-05-12 10:11:32 +0000 > > riscv: IOMMU support > > Support for RISC-V IOMMU spec v1.0.1 (ratified) > https://github.com/riscv-non-isa/riscv-iommu > > Supports translation for PCI devices only. > Supports 1 or 2-level device-directory-table (DDT). > Supports SV39 and SV48 virtual memory system (on per-device basis). > Supports both "standard" and "extended" device-context (DC) structure. > Supports "bypass" mode to disable translation for a particular device. > Supports WSI (Wire-Signalled Interrupts) only. > > This includes both PCI-bus and FDT attachment drivers. > > Note in case of PCI-bus attachment, interrupts are not available. In this > case no error report is provided in case of translation fault. Otherwise > interrupts are not needed. > > Differential Revision: https://reviews.freebsd.org/D55922 > --- > sys/conf/files.riscv | 9 + > sys/riscv/conf/GENERIC | 1 + > sys/riscv/include/bus_dma_impl.h | 3 + > sys/riscv/include/iommu.h | 10 + > sys/riscv/iommu/iommu.c | 1351 ++++++++++++++++++++++++++++++++++++++ > sys/riscv/iommu/iommu.h | 359 ++++++++++ > sys/riscv/iommu/iommu_fdt.c | 145 ++++ > sys/riscv/iommu/iommu_frontend.c | 505 ++++++++++++++ > sys/riscv/iommu/iommu_frontend.h | 38 ++ > sys/riscv/iommu/iommu_if.m | 147 +++++ > sys/riscv/iommu/iommu_pci.c | 172 +++++ > sys/riscv/iommu/iommu_pmap.c | 629 ++++++++++++++++++ > sys/riscv/iommu/iommu_pmap.h | 49 ++ > 13 files changed, 3418 insertions(+) It seems that sys/riscv/conf/NOTES needs to include iommu now as otherwise the build fails with missing symbols. -- Bjoern A. Zeeb r15:7 From nobody Fri May 15 21:31:04 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gHL3f1JP8z6f1NL for ; Fri, 15 May 2026 21:31: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gHL3f021Tz4G2K for ; Fri, 15 May 2026 21:31:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778880670; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7FJDbbmbjOhHlhbA0HXs33eud9x39WT20b37DHAwGUg=; b=Sy3RPLQSfR31vD7qKsTUl9dAfkKIC8pS3VWepns1NRANZNVlh4PNeiHnVqryRD40sZfTgk tw2ppahuQyeAXMBTXw836pdgdFvYyJZyFEbVk+cTbiP1MPH9OBXc86zbcz/WQBZsluCk3K 3jcMafyXrLMi0S447uHh9z+CBoDe5SvanV3rJFTF0L7YrzAvbUcrLHgGtj0kYHQMKnArbG YfrbQ1QRq81C/Gaj7VCVJCBS4vViVZldU1fHA27iD8DY2B+9LyW2AuDDnvUNRY0DoebVYs tN77arV0YD2PcTr3Uc4UVzhQtQ/ODd+peXj14UbienVqgNnFfFrMBamc74FG7Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778880670; a=rsa-sha256; cv=none; b=h7XLDwWHkm1XXdVVNXJDsxysn5pZTMKnUbLT5ucqpujx5WyuzI3ghyhyAYxpLI4V/C7CET xGHLe7zxK41SGkb3a7rWyNbVAj+d+u3hvsIWavzSq2FjRdftQEFYwPmS/Hz4jnh3BOPRX7 vw6B6kybGi3taRgoEtVHipBvs01so/2qgSrKajYT4+ulXAHOfp3HxXJqPIgs+FIo7z14h+ zobfVofG41va3MRjudW2+RTiVyEJrtjNZl5KhZ+JrSY/Zkf2p1hCY7Hzf/SE0iabDLGdct 0hzua8S1ruqiE8euZ3c0rGI9DThKFDfvdUOanP1aAj4r9a10g9IKt6AosF/R8g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778880670; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7FJDbbmbjOhHlhbA0HXs33eud9x39WT20b37DHAwGUg=; b=LUUKPRWEr0LkezOwfPTbdTKJ1BvKzSM638HTYqqQ5Wvd2/IcFUOLHyqV2ZvT/6Vy2DJ22W J/G80zhb7sBbUtqxhn+2xfQKH19NkNGNrU2EOE16rjTeMa8AI3ofxfHpE4CqY2pR84OG8z Lk/ss9dSpexIqvNJn0Pgh5L1QV5vbhEBoBUZ6PINmvOpqACEJePkRqCu2yH0WtTzEVIJ8O eX21elznYtPDy1GdmTCgKQoMSdqV4viDBjj2qdZAYsxpnk2Jpn4py5A25Lf+FYjyrxQIAc 05Ks6pjbvdVg1FG3T2jrYCwP8CoZMu5QzojVB3i0ykmYXHlz5EJCY2mAQ5yTow== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gHL3d6gFTz9Pb for ; Fri, 15 May 2026 21:31:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3eb7b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 15 May 2026 21:31:04 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Pouria Mousavizadeh Tehrani Subject: git: 355989b21712 - main - route.8: Describe weight modifier List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pouria X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 355989b21712cbb7173cbec4a036c541e6f08c0e Auto-Submitted: auto-generated Date: Fri, 15 May 2026 21:31:04 +0000 Message-Id: <6a079098.3eb7b.7273e83a@gitrepo.freebsd.org> The branch main has been updated by pouria: URL: https://cgit.FreeBSD.org/src/commit/?id=355989b21712cbb7173cbec4a036c541e6f08c0e commit 355989b21712cbb7173cbec4a036c541e6f08c0e Author: Pouria Mousavizadeh Tehrani AuthorDate: 2026-04-14 07:49:29 +0000 Commit: Pouria Mousavizadeh Tehrani CommitDate: 2026-05-15 21:29:49 +0000 route.8: Describe weight modifier Describe `-weight` argument in the route manual. Reviewed by: glebius, ziaee Differential Revision: https://reviews.freebsd.org/D56246 --- sbin/route/route.8 | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/sbin/route/route.8 b/sbin/route/route.8 index 572781ef59c8..5cb16120c8d8 100644 --- a/sbin/route/route.8 +++ b/sbin/route/route.8 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd November 12, 2024 +.Dd May 16, 2026 .Dt ROUTE 8 .Os .Sh NAME @@ -297,6 +297,17 @@ Note that the qualifier works only for .Dv AF_INET6 address family. .Pp +For +.Li ECMP +routes, the +.Fl weight +modifier can be used to influence nexthop selection. +For example, a destination with two nexthops defined as +.Dq Fl gateway Ar 3fff::1 Fl weight Ar 100 +and +.Dq Fl gateway Ar 3fff::2 Fl weight Ar 200 +will make the nexthop 3fff::2 twice as likely to be chosen as 3fff::1. +.Pp Routes have associated flags which influence operation of the protocols when sending to destinations matched by the routes. These flags may be set (or sometimes cleared) From nobody Fri May 15 21:59:46 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gHLhf655Hz6f3Bq for ; Fri, 15 May 2026 21:59: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gHLhf4pJnz4MQb for ; Fri, 15 May 2026 21:59:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778882386; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ewQ3if3gufoOX5xgQ63tQqGNAfphKA685RAhTcNOn8U=; b=Cg5DO+2LOVmeNgWl6QLTWqcpvXW3lALJ6moX1YanCjfIqtYSRXw1nyh//VKew20RBgBeZa U6HJX4sMfPozEkb5fZBr0tgw+Lg2yRx0cxlYFTwmIajJ14EP/x7Sx3KPeQm+fz3dwQz523 cCgUaB4oD/8qRWq9ruvW50A8N6HaIGgU2EFHsbWYiDqFAezOppdIHdHea738/u4KhEQSYh dgzlPK0+c88+/1Rf0EobqJPpMRMkSj8tRnsDBAjpV1CUQE4o8Fvh30u81iFhsSSAMpH9yI DCts0E7b75D0QQtzCQWaPVCwM8ueUhySSSDkIBqoL150vVX8BoVidZkC/F6kVA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778882386; a=rsa-sha256; cv=none; b=RQEVWEL6G5qD4hbgLlz4cZJeQKCLF6aBon7rspgFEbe7qgcxb9p3vZt00wa4L9PmR3aQMh V+r3XD9c93MUU8ocCSJUPHpOnCEwjnro0H1/wF25ino8bV9YWnSbb5l8hs4w7LwyJ6Qi1l uPK9o2sw40tcXuj4Epq6rmbY8xFyZnUIBKEQn2JFoPZueJzW4xgpzuOzweDRuH4z9NcKEM N4ShdgOjXG+1sYoboevAqE8gEGL0og3AqvznOQEmVfU+Jv+dBGKWpWm0OdVXYtJmMFl5xu yewWAi/kLJf9kSmagb7I0URk3Y36fwI+nnRUEsg/APzI+0jZuHAmuGAcAO9o6A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778882386; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ewQ3if3gufoOX5xgQ63tQqGNAfphKA685RAhTcNOn8U=; b=CpgPRb9C+fjluhtK3y6ekJIuuBhc/hB18fmaawkjXMDfPmvvMvkDpj/l8AqSiHRvkNHdb6 fM0I2O9oXQ+487zc3Zj1aEGCbOxwobUaMnCcNHEUcp+Oi291dSmwkAL86nB5AI7Y9Flf+Q YVv4q1zauXhEi31033bhD0ySiij6V/ytmJTddT5+YQl/Triu1N+v8hdJCqcidsE7+kfdbR LClhIEsRbqkB+hfupmLqBvc31w+q4TpSVvsWxsRCL3ymt6MH69PmxBmNK2CvCeFKSkXBzJ udYjyDMZsUVRdEb23+Jyl9dJ9SS3Vv+Sceyu5lQLfKY1KX9Cp0CG4SuRsYip0g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gHLhf4LYxzBLS for ; Fri, 15 May 2026 21:59:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 41d0c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 15 May 2026 21:59:46 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 96eaa6857ffe - main - net80211: define a type for rssi values List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: 96eaa6857ffe009c141c5a6dbea88f96efed9b2d Auto-Submitted: auto-generated Date: Fri, 15 May 2026 21:59:46 +0000 Message-Id: <6a079752.41d0c.2e7c8c1a@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=96eaa6857ffe009c141c5a6dbea88f96efed9b2d commit 96eaa6857ffe009c141c5a6dbea88f96efed9b2d Author: Bjoern A. Zeeb AuthorDate: 2025-06-19 00:05:27 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-05-15 21:59:07 +0000 net80211: define a type for rssi values Due to net80211 keeping values in 0.5dBm relative to the noise floor an int8_t is not good enough to prevent a double wrap around, which means the reported rssi values can be wrong (see D50928 or likely a commit in the future for more information). In order to address the problem and not break the userspace API, start by defining a type within the kernel and use that. In a next step we will then update the int8_t to int16_t to avoid the problem up to the ioctl code. This will then allow us to work on the the user space API indepedently (see PR 293016 for possible impact outside the base system). No functional changes intended. Sponsored by: The FreeBSD Foundation MFC after: 3 days Reviewed by: adrian Differential Revision: https://reviews.freebsd.org/D57021 --- sys/dev/ath/if_ath.c | 4 ++-- sys/dev/mwl/if_mwl.c | 4 ++-- sys/net80211/_ieee80211.h | 15 ++++++++++----- sys/net80211/ieee80211_adhoc.c | 4 ++-- sys/net80211/ieee80211_hostap.c | 4 ++-- sys/net80211/ieee80211_ioctl.c | 4 +++- sys/net80211/ieee80211_mesh.c | 4 ++-- sys/net80211/ieee80211_monitor.c | 4 ++-- sys/net80211/ieee80211_node.c | 18 +++++++++--------- sys/net80211/ieee80211_node.h | 4 ++-- sys/net80211/ieee80211_ratectl.h | 2 +- sys/net80211/ieee80211_scan.h | 2 +- sys/net80211/ieee80211_sta.c | 4 ++-- sys/net80211/ieee80211_var.h | 6 +++--- sys/net80211/ieee80211_wds.c | 7 ++++--- 15 files changed, 47 insertions(+), 39 deletions(-) diff --git a/sys/dev/ath/if_ath.c b/sys/dev/ath/if_ath.c index 1304b597c545..2d52afcf62aa 100644 --- a/sys/dev/ath/if_ath.c +++ b/sys/dev/ath/if_ath.c @@ -179,7 +179,7 @@ static struct ieee80211_node *ath_node_alloc(struct ieee80211vap *, static void ath_node_cleanup(struct ieee80211_node *); static void ath_node_free(struct ieee80211_node *); static void ath_node_getsignal(const struct ieee80211_node *, - int8_t *, int8_t *); + net80211_rssi_t *, int8_t *); static void ath_txq_init(struct ath_softc *sc, struct ath_txq *, int); static struct ath_txq *ath_txq_setup(struct ath_softc*, int qtype, int subtype); static int ath_tx_setup(struct ath_softc *, int, int); @@ -3957,7 +3957,7 @@ ath_node_free(struct ieee80211_node *ni) } static void -ath_node_getsignal(const struct ieee80211_node *ni, int8_t *rssi, int8_t *noise) +ath_node_getsignal(const struct ieee80211_node *ni, net80211_rssi_t *rssi, int8_t *noise) { struct ieee80211com *ic = ni->ni_ic; struct ath_softc *sc = ic->ic_softc; diff --git a/sys/dev/mwl/if_mwl.c b/sys/dev/mwl/if_mwl.c index 513c3d9c60e4..b7f85e65cfd9 100644 --- a/sys/dev/mwl/if_mwl.c +++ b/sys/dev/mwl/if_mwl.c @@ -129,7 +129,7 @@ static struct ieee80211_node *mwl_node_alloc(struct ieee80211vap *, static void mwl_node_cleanup(struct ieee80211_node *); static void mwl_node_drain(struct ieee80211_node *); static void mwl_node_getsignal(const struct ieee80211_node *, - int8_t *, int8_t *); + net80211_rssi_t *, int8_t *); static void mwl_node_getmimoinfo(const struct ieee80211_node *, struct ieee80211_mimo_info *); static int mwl_rxbuf_init(struct mwl_softc *, struct mwl_rxbuf *); @@ -2390,7 +2390,7 @@ mwl_node_drain(struct ieee80211_node *ni) } static void -mwl_node_getsignal(const struct ieee80211_node *ni, int8_t *rssi, int8_t *noise) +mwl_node_getsignal(const struct ieee80211_node *ni, net80211_rssi_t *rssi, int8_t *noise) { *rssi = ni->ni_ic->ic_node_getrssi(ni); #ifdef MWL_ANT_INFO_SUPPORT diff --git a/sys/net80211/_ieee80211.h b/sys/net80211/_ieee80211.h index 566b12befeb3..c970ba6be70d 100644 --- a/sys/net80211/_ieee80211.h +++ b/sys/net80211/_ieee80211.h @@ -374,6 +374,11 @@ struct ieee80211_channel { #define IEEE80211_AID_DEF 128 #define IEEE80211_AID_MIN 16 +/* + * Definitions for (internal, basic) types. + */ +typedef int8_t net80211_rssi_t; + /* * 802.11 rate set. */ @@ -618,14 +623,14 @@ struct ieee80211_rx_stats { uint64_t c_rx_tsf; /* 32 or 64 bit TSF */ /* All DWORD aligned */ - int16_t c_nf_ctl[IEEE80211_MAX_CHAINS]; /* per-chain NF */ - int16_t c_nf_ext[IEEE80211_MAX_CHAINS]; /* per-chain NF */ - int16_t c_rssi_ctl[IEEE80211_MAX_CHAINS]; /* per-chain RSSI */ - int16_t c_rssi_ext[IEEE80211_MAX_CHAINS]; /* per-chain RSSI */ + net80211_rssi_t c_nf_ctl[IEEE80211_MAX_CHAINS]; /* per-chain NF */ + net80211_rssi_t c_nf_ext[IEEE80211_MAX_CHAINS]; /* per-chain NF */ + net80211_rssi_t c_rssi_ctl[IEEE80211_MAX_CHAINS]; /* per-chain RSSI */ + net80211_rssi_t c_rssi_ext[IEEE80211_MAX_CHAINS]; /* per-chain RSSI */ /* 32 bits */ int8_t c_nf; /* global NF */ - int8_t c_rssi; /* global RSSI */ + net80211_rssi_t c_rssi; /* global RSSI */ uint8_t c_chain; /* number of RX chains involved */ uint8_t c_rate; /* legacy; 11n rate code; VHT MCS */ diff --git a/sys/net80211/ieee80211_adhoc.c b/sys/net80211/ieee80211_adhoc.c index 22c28ee4fef9..16f20c0c636b 100644 --- a/sys/net80211/ieee80211_adhoc.c +++ b/sys/net80211/ieee80211_adhoc.c @@ -68,7 +68,7 @@ static void adhoc_vattach(struct ieee80211vap *); static int adhoc_newstate(struct ieee80211vap *, enum ieee80211_state, int); static int adhoc_input(struct ieee80211_node *, struct mbuf *, - const struct ieee80211_rx_stats *, int, int); + const struct ieee80211_rx_stats *, net80211_rssi_t, int); static void adhoc_recv_mgmt(struct ieee80211_node *, struct mbuf *, int subtype, const struct ieee80211_rx_stats *, int, int); static void ahdemo_recv_mgmt(struct ieee80211_node *, struct mbuf *, @@ -301,7 +301,7 @@ doprint(struct ieee80211vap *vap, int subtype) */ static int adhoc_input(struct ieee80211_node *ni, struct mbuf *m, - const struct ieee80211_rx_stats *rxs, int rssi, int nf) + const struct ieee80211_rx_stats *rxs, net80211_rssi_t rssi, int nf) { struct ieee80211vap *vap = ni->ni_vap; struct ieee80211com *ic = ni->ni_ic; diff --git a/sys/net80211/ieee80211_hostap.c b/sys/net80211/ieee80211_hostap.c index 9074878e17e4..3505f7ba66e0 100644 --- a/sys/net80211/ieee80211_hostap.c +++ b/sys/net80211/ieee80211_hostap.c @@ -66,7 +66,7 @@ static void hostap_vattach(struct ieee80211vap *); static int hostap_newstate(struct ieee80211vap *, enum ieee80211_state, int); static int hostap_input(struct ieee80211_node *ni, struct mbuf *m, const struct ieee80211_rx_stats *, - int rssi, int nf); + net80211_rssi_t rssi, int nf); static void hostap_deliver_data(struct ieee80211vap *, struct ieee80211_node *, struct mbuf *); static void hostap_recv_mgmt(struct ieee80211_node *, struct mbuf *, @@ -466,7 +466,7 @@ doprint(struct ieee80211vap *vap, int subtype) */ static int hostap_input(struct ieee80211_node *ni, struct mbuf *m, - const struct ieee80211_rx_stats *rxs, int rssi, int nf) + const struct ieee80211_rx_stats *rxs, net80211_rssi_t rssi, int nf) { struct ieee80211vap *vap = ni->ni_vap; struct ieee80211com *ic = ni->ni_ic; diff --git a/sys/net80211/ieee80211_ioctl.c b/sys/net80211/ieee80211_ioctl.c index 4c3e5fa94243..09cb39cfcf6f 100644 --- a/sys/net80211/ieee80211_ioctl.c +++ b/sys/net80211/ieee80211_ioctl.c @@ -379,6 +379,7 @@ get_sta_info(void *arg, struct ieee80211_node *ni) struct ieee80211_node_txrate tr; struct ieee80211vap *vap = ni->ni_vap; struct ieee80211req_sta_info *si; + net80211_rssi_t rssi; size_t ielen, len; uint8_t *cp; @@ -398,7 +399,8 @@ get_sta_info(void *arg, struct ieee80211_node *ni) si->isi_flags = ni->ni_chan->ic_flags; si->isi_state = ni->ni_flags; si->isi_authmode = ni->ni_authmode; - vap->iv_ic->ic_node_getsignal(ni, &si->isi_rssi, &si->isi_noise); + vap->iv_ic->ic_node_getsignal(ni, &rssi, &si->isi_noise); + si->isi_rssi = rssi; vap->iv_ic->ic_node_getmimoinfo(ni, &si->isi_mimo); si->isi_capinfo = ni->ni_capinfo; si->isi_erp = ni->ni_erp; diff --git a/sys/net80211/ieee80211_mesh.c b/sys/net80211/ieee80211_mesh.c index 7f2e8bdcb963..900b0c2ad4cd 100644 --- a/sys/net80211/ieee80211_mesh.c +++ b/sys/net80211/ieee80211_mesh.c @@ -83,7 +83,7 @@ static void mesh_transmit_to_gate(struct ieee80211vap *, struct mbuf *, static void mesh_forward(struct ieee80211vap *, struct mbuf *, const struct ieee80211_meshcntl *); static int mesh_input(struct ieee80211_node *, struct mbuf *, - const struct ieee80211_rx_stats *rxs, int, int); + const struct ieee80211_rx_stats *rxs, net80211_rssi_t, int); static void mesh_recv_mgmt(struct ieee80211_node *, struct mbuf *, int, const struct ieee80211_rx_stats *rxs, int, int); static void mesh_recv_ctl(struct ieee80211_node *, struct mbuf *, int); @@ -1525,7 +1525,7 @@ mesh_recv_group_data(struct ieee80211vap *vap, struct mbuf *m, static int mesh_input(struct ieee80211_node *ni, struct mbuf *m, - const struct ieee80211_rx_stats *rxs, int rssi, int nf) + const struct ieee80211_rx_stats *rxs, net80211_rssi_t rssi, int nf) { #define HAS_SEQ(type) ((type & 0x4) == 0) #define MC01(mc) ((const struct ieee80211_meshcntl_ae01 *)mc) diff --git a/sys/net80211/ieee80211_monitor.c b/sys/net80211/ieee80211_monitor.c index fc262f172f12..c77d67a00d73 100644 --- a/sys/net80211/ieee80211_monitor.c +++ b/sys/net80211/ieee80211_monitor.c @@ -58,7 +58,7 @@ static void monitor_vattach(struct ieee80211vap *); static int monitor_newstate(struct ieee80211vap *, enum ieee80211_state, int); static int monitor_input(struct ieee80211_node *ni, struct mbuf *m, - const struct ieee80211_rx_stats *rxs, int rssi, int nf); + const struct ieee80211_rx_stats *rxs, net80211_rssi_t rssi, int nf); void ieee80211_monitor_attach(struct ieee80211com *ic) @@ -123,7 +123,7 @@ monitor_newstate(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg) */ static int monitor_input(struct ieee80211_node *ni, struct mbuf *m, - const struct ieee80211_rx_stats *rxs, int rssi, int nf) + const struct ieee80211_rx_stats *rxs, net80211_rssi_t rssi, int nf) { struct ieee80211vap *vap = ni->ni_vap; struct ifnet *ifp = vap->iv_ifp; diff --git a/sys/net80211/ieee80211_node.c b/sys/net80211/ieee80211_node.c index 49ba00299fee..970268851af1 100644 --- a/sys/net80211/ieee80211_node.c +++ b/sys/net80211/ieee80211_node.c @@ -91,8 +91,8 @@ static int node_init(struct ieee80211_node *); static void node_cleanup(struct ieee80211_node *); static void node_free(struct ieee80211_node *); static void node_age(struct ieee80211_node *); -static int8_t node_getrssi(const struct ieee80211_node *); -static void node_getsignal(const struct ieee80211_node *, int8_t *, int8_t *); +static net80211_rssi_t node_getrssi(const struct ieee80211_node *); +static void node_getsignal(const struct ieee80211_node *, net80211_rssi_t *, int8_t *); static void node_getmimoinfo(const struct ieee80211_node *, struct ieee80211_mimo_info *); @@ -1341,7 +1341,7 @@ node_age(struct ieee80211_node *ni) ieee80211_ht_node_age(ni); } -static int8_t +static net80211_rssi_t node_getrssi(const struct ieee80211_node *ni) { uint32_t avgrssi = ni->ni_avgrssi; @@ -1354,7 +1354,7 @@ node_getrssi(const struct ieee80211_node *ni) } static void -node_getsignal(const struct ieee80211_node *ni, int8_t *rssi, int8_t *noise) +node_getsignal(const struct ieee80211_node *ni, net80211_rssi_t *rssi, int8_t *noise) { *rssi = node_getrssi(ni); *noise = ni->ni_noise; @@ -3039,7 +3039,7 @@ get_hostap_rssi(void *arg, struct ieee80211_node *ni) { struct rssiinfo *info = arg; struct ieee80211vap *vap = ni->ni_vap; - int8_t rssi; + net80211_rssi_t rssi; /* only associated stations */ if (ni->ni_associd == 0) @@ -3056,7 +3056,7 @@ get_adhoc_rssi(void *arg, struct ieee80211_node *ni) { struct rssiinfo *info = arg; struct ieee80211vap *vap = ni->ni_vap; - int8_t rssi; + net80211_rssi_t rssi; /* only neighbors */ /* XXX check bssid */ @@ -3075,7 +3075,7 @@ get_mesh_rssi(void *arg, struct ieee80211_node *ni) { struct rssiinfo *info = arg; struct ieee80211vap *vap = ni->ni_vap; - int8_t rssi; + net80211_rssi_t rssi; /* only neighbors that peered successfully */ if (ni->ni_mlstate != IEEE80211_NODE_MESH_ESTABLISHED) @@ -3088,7 +3088,7 @@ get_mesh_rssi(void *arg, struct ieee80211_node *ni) } #endif /* IEEE80211_SUPPORT_MESH */ -int8_t +net80211_rssi_t ieee80211_getrssi(struct ieee80211vap *vap) { #define NZ(x) ((x) == 0 ? 1 : (x)) @@ -3126,7 +3126,7 @@ ieee80211_getrssi(struct ieee80211vap *vap) } void -ieee80211_getsignal(struct ieee80211vap *vap, int8_t *rssi, int8_t *noise) +ieee80211_getsignal(struct ieee80211vap *vap, net80211_rssi_t *rssi, int8_t *noise) { if (vap->iv_bss == NULL) /* NB: shouldn't happen */ diff --git a/sys/net80211/ieee80211_node.h b/sys/net80211/ieee80211_node.h index f1246dd12419..7b32370c2c54 100644 --- a/sys/net80211/ieee80211_node.h +++ b/sys/net80211/ieee80211_node.h @@ -528,8 +528,8 @@ struct ieee80211_node *ieee80211_add_neighbor(struct ieee80211vap *, const struct ieee80211_scanparams *); void ieee80211_node_join(struct ieee80211_node *,int); void ieee80211_node_leave(struct ieee80211_node *); -int8_t ieee80211_getrssi(struct ieee80211vap *); -void ieee80211_getsignal(struct ieee80211vap *, int8_t *, int8_t *); +net80211_rssi_t ieee80211_getrssi(struct ieee80211vap *); +void ieee80211_getsignal(struct ieee80211vap *, net80211_rssi_t *, int8_t *); /* TX sequence space related routines */ ieee80211_seq ieee80211_tx_seqno_fetch_incr(struct ieee80211_node *, diff --git a/sys/net80211/ieee80211_ratectl.h b/sys/net80211/ieee80211_ratectl.h index 0e5beb5185cb..a52c4a517d77 100644 --- a/sys/net80211/ieee80211_ratectl.h +++ b/sys/net80211/ieee80211_ratectl.h @@ -63,7 +63,7 @@ struct ieee80211_ratectl_tx_status { int final_rate; /* transmission rate */ uint_fast8_t short_retries; /* RTS/CTS retries */ uint_fast8_t long_retries; /* ACK retries */ - int8_t rssi; /* ACK RSSI */ + net80211_rssi_t rssi; /* ACK RSSI */ uint8_t spare[15]; /* for future use */ }; diff --git a/sys/net80211/ieee80211_scan.h b/sys/net80211/ieee80211_scan.h index 1afe767ef052..5336386c8e1d 100644 --- a/sys/net80211/ieee80211_scan.h +++ b/sys/net80211/ieee80211_scan.h @@ -282,7 +282,7 @@ struct ieee80211_scan_entry { uint8_t se_fhindex; /* FH only */ uint8_t se_dtimperiod; /* DTIM period */ uint16_t se_erp; /* ERP from beacon/probe resp */ - int8_t se_rssi; /* avg'd recv ssi */ + net80211_rssi_t se_rssi; /* avg'd recv ssi */ int8_t se_noise; /* noise floor */ uint8_t se_cc[2]; /* captured country code */ uint8_t se_meshid[2+IEEE80211_MESHID_LEN]; diff --git a/sys/net80211/ieee80211_sta.c b/sys/net80211/ieee80211_sta.c index 3522b1b24742..550f837a0013 100644 --- a/sys/net80211/ieee80211_sta.c +++ b/sys/net80211/ieee80211_sta.c @@ -67,7 +67,7 @@ static void sta_vattach(struct ieee80211vap *); static void sta_beacon_miss(struct ieee80211vap *); static int sta_newstate(struct ieee80211vap *, enum ieee80211_state, int); static int sta_input(struct ieee80211_node *, struct mbuf *, - const struct ieee80211_rx_stats *, int, int); + const struct ieee80211_rx_stats *, net80211_rssi_t, int); static void sta_recv_mgmt(struct ieee80211_node *, struct mbuf *, int subtype, const struct ieee80211_rx_stats *, int rssi, int nf); static void sta_recv_ctl(struct ieee80211_node *, struct mbuf *, int subtype); @@ -530,7 +530,7 @@ doprint(struct ieee80211vap *vap, int subtype) */ static int sta_input(struct ieee80211_node *ni, struct mbuf *m, - const struct ieee80211_rx_stats *rxs, int rssi, int nf) + const struct ieee80211_rx_stats *rxs, net80211_rssi_t rssi, int nf) { struct ieee80211vap *vap = ni->ni_vap; struct ieee80211com *ic = ni->ni_ic; diff --git a/sys/net80211/ieee80211_var.h b/sys/net80211/ieee80211_var.h index 7b45261f59b1..2f11fa7c887f 100644 --- a/sys/net80211/ieee80211_var.h +++ b/sys/net80211/ieee80211_var.h @@ -325,9 +325,9 @@ struct ieee80211com { void (*ic_node_age)(struct ieee80211_node *); void (*ic_node_drain)(struct ieee80211_node *); - int8_t (*ic_node_getrssi)(const struct ieee80211_node*); + net80211_rssi_t (*ic_node_getrssi)(const struct ieee80211_node*); void (*ic_node_getsignal)(const struct ieee80211_node*, - int8_t *, int8_t *); + net80211_rssi_t *, int8_t *); void (*ic_node_getmimoinfo)( const struct ieee80211_node*, struct ieee80211_mimo_info *); @@ -543,7 +543,7 @@ struct ieee80211vap { int (*iv_input)(struct ieee80211_node *, struct mbuf *, const struct ieee80211_rx_stats *, - int, int); + net80211_rssi_t, int); void (*iv_recv_mgmt)(struct ieee80211_node *, struct mbuf *, int, const struct ieee80211_rx_stats *, diff --git a/sys/net80211/ieee80211_wds.c b/sys/net80211/ieee80211_wds.c index 1c05a40e632f..75c37e49423a 100644 --- a/sys/net80211/ieee80211_wds.c +++ b/sys/net80211/ieee80211_wds.c @@ -62,7 +62,7 @@ static void wds_vattach(struct ieee80211vap *); static int wds_newstate(struct ieee80211vap *, enum ieee80211_state, int); static int wds_input(struct ieee80211_node *ni, struct mbuf *m, - const struct ieee80211_rx_stats *rxs, int, int); + const struct ieee80211_rx_stats *rxs, net80211_rssi_t, int); static void wds_recv_mgmt(struct ieee80211_node *, struct mbuf *, int subtype, const struct ieee80211_rx_stats *, int, int); @@ -101,7 +101,8 @@ wds_flush(struct ieee80211_node *ni) { struct ieee80211com *ic = ni->ni_ic; struct mbuf *m, *next; - int8_t rssi, nf; + net80211_rssi_t rssi; + int8_t nf; m = ieee80211_ageq_remove(&ic->ic_stageq, (void *)(uintptr_t) ieee80211_mac_hash(ic, ni->ni_macaddr)); @@ -404,7 +405,7 @@ wds_newstate(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg) */ static int wds_input(struct ieee80211_node *ni, struct mbuf *m, - const struct ieee80211_rx_stats *rxs, int rssi, int nf) + const struct ieee80211_rx_stats *rxs, net80211_rssi_t rssi, int nf) { struct ieee80211vap *vap = ni->ni_vap; struct ieee80211com *ic = ni->ni_ic; From nobody Fri May 15 21:59:45 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gHLhl0xM3z6f3By for ; Fri, 15 May 2026 21:59: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gHLhk5Mmfz4MfG for ; Fri, 15 May 2026 21:59:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778882390; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XdqtFy2ex9sHtPWnZqtLvxLLRKWaS7jhIfvcFfaLc/A=; b=yCME5ZjRMd0P1QhBgPA8LehunoSTWr6ajCinhQDUb8i0znheYKOkKlOux0EKQ4LzNhER7r QllLDHhzrDSeEImfex4rrzx1Hsk7qhtCi3rcb+whpXbKJpODTrvOt/F6A0ccFbXmV+JPDx fSzeuJsT0TSMWcVVY/OexsgLUvNuUTS4d5ay9YxZ5mxTgyOEs9xEBkjmKdG4X/nYuBg6je 2TFaOgSdlcX6DemVF2nI7iRx2fCNOvWHte3VxpZkK3DPhDrkye6WYDns61IEEZgK0XuJG3 KfjEkxyAZ9NmMrJwPIntYo1lxlEU2irue8ulDNMuCE6fJ8LA86sCHQTxcga+jA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778882390; a=rsa-sha256; cv=none; b=f2E7sDwyb3wLWsIaTFVUPt2qSsIzo3vUj8A+KjBHPH/kG9NraEuRxBatHq/1LVtKzB2c0G IzlsNDsHlAvRfz3xYgQvVAlTZwxeWMV2zPm5lquylViSDHRRANKqQCVAU9MgoyEu7XHqaJ EAYJ/SslwClJG4iJ7mois5PBKMuYzOoXKUlClDIJKsIlzE2dwR6qJsanRIg7UvdaM/XGxJ SX4+apzEPsEb8cfS7BgPIspk8SfPtwvLGTNI49xX1hmFGjbDcpRnT+vGjQ7nw/lk4F3U0G VznOGTFQtdBHtNwkXherrKZXq4g31TCDjJ9/SlbsQLhSD+iUgYORS6Q6P9nTgQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778882390; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XdqtFy2ex9sHtPWnZqtLvxLLRKWaS7jhIfvcFfaLc/A=; b=KJ2vjHw1MCA3FN+ccIyR+w7u8MJgKJcc4dydR83YbX2jiVc0KF/xevgUTN9B3Ml7VWShBQ FncM9hIkCPDWXO7YZBQ44VU7rCKVIvmSCkCRrIu5zZfIzn861KWx4ydgpKbrkwSpiCGxvE s6MqZDp4dbmvOnC1AHb+nvckO+6Y4npZ1NRaIGZMvZ+IvDCS4UhLnzzrjXGjP0o5ECXOhZ bHVanUh05PjQT2amPx+FagtdlnfM44qd8gN1aN4qpo8sJ/rLcOX214BaaS+cuIQXXQrVM8 2EJBqEaALJya74yvgRBgrpaj0c2eylYfVwuP4WWSQbPpG5rdlQ0qbMDRbrtc/g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gHLhk3rpBz9ld for ; Fri, 15 May 2026 21:59:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 418a8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 15 May 2026 21:59:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: d201e4e84919 - main - wtap: use typed rssi and noise floor values List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: d201e4e8491901d1de6bcaeb581a0bf958bf86f2 Auto-Submitted: auto-generated Date: Fri, 15 May 2026 21:59:45 +0000 Message-Id: <6a079751.418a8.2996337e@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=d201e4e8491901d1de6bcaeb581a0bf958bf86f2 commit d201e4e8491901d1de6bcaeb581a0bf958bf86f2 Author: Bjoern A. Zeeb AuthorDate: 2026-05-13 21:14:39 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-05-15 21:59:07 +0000 wtap: use typed rssi and noise floor values Adjust the rssi and nf arguments to typed int8_t and adjust the maths for rssi to be consistant with what net80211 expects. Sponsored by: The FreeBSD Foundation MFC after: 3 days Reviewed by: lwhsu, adrian Differential Revision: https://reviews.freebsd.org/D57020 --- sys/dev/wtap/if_wtap.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/sys/dev/wtap/if_wtap.c b/sys/dev/wtap/if_wtap.c index dd332c538c8f..376b63e38f2b 100644 --- a/sys/dev/wtap/if_wtap.c +++ b/sys/dev/wtap/if_wtap.c @@ -495,6 +495,7 @@ wtap_rx_proc(void *arg, int npending) struct mbuf *m; struct ieee80211_node *ni; struct wtap_buf *bf; + int8_t rssi, nf; #if 0 DWTAP_PRINTF("%s\n", __func__); @@ -528,6 +529,15 @@ wtap_rx_proc(void *arg, int npending) ieee80211_dump_pkt(ic, mtod(m, caddr_t), 0,0,0); #endif + /* + * Use arbitrary but sane values, and do the correct conversion + * for net80211 using 0.5 dBm values relative to the noise floor. + */ + nf = -95; + rssi = 42; + rssi -= nf; + rssi *= 2; + /* * Locate the node for sender, track state, and then * pass the (referenced) node up to the 802.11 layer @@ -540,10 +550,10 @@ wtap_rx_proc(void *arg, int npending) /* * Sending station is known, dispatch directly. */ - ieee80211_input(ni, m, 1<<7, 10); + ieee80211_input(ni, m, rssi, nf); ieee80211_free_node(ni); } else { - ieee80211_input_all(ic, m, 1<<7, 10); + ieee80211_input_all(ic, m, rssi, nf); } /* The mbufs are freed by the Net80211 stack */ From nobody Fri May 15 23:38:08 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gHNtD05HTz6cRf6; Fri, 15 May 2026 23:38:12 +0000 (UTC) (envelope-from bz@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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gHNtC59Btz3mw4; Fri, 15 May 2026 23:38:11 +0000 (UTC) (envelope-from bz@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778888291; 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=7OcPsjbAw4fo5SvzY5/g5GO/iQUg0WivsVMkc2Ema2A=; b=i2o6kuYtKAz2KJ99RLpKutbSciP7txNxm7DoX6OwLNtATxKV1yMrs8P/9Z+1SdHjdShAi7 kyu7e3vNMqgjizDLLkl/neN6UTUkXfpIXzktKSRRCaIHtyq4x9REVbwALZbkv8wsCRtfmY sOfsAj84sgcM35Lxr094lKTCGGMMKbvjx6K913rrp/58EEnNfLMHQn2MOReemTXYhf5xnk 1P5xjBVQqVf9HvMUUK24ko6w6pogujI828SAVnD3gU34zf9N66JUeZQ8Nnh+TCvGl2QAzX aFdpFmvp+u+7ulBetXbimZs2i4ECoakd+ahvibXWLuu1b/irRlSWTTslM+gMRw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778888291; a=rsa-sha256; cv=none; b=ct+wKHIOvEip54Mx8bKJXwCXrkLA+fH3BDagYzqLJDhoG7FBCu4LmLGYhMUyVjf+AfEjU5 Cn5201I7+6H54tTcoFIVlUjeXnE3mYFfYntwokAKl1oyDfEukNTPXF+GLcOGYIZR1P51PZ SjFYGhakYRWuJlcuTI6ynisUdP/QLsBa7Mey53aXcnSVqpaWXo8QkLQDssRnHCkQ+UoXFp tOmLcTXrWAuHLjwyoPGHF1q/2LnbPV6Hk7s3oYwHeUUm0yOg0+t5o8JOO4tXlmXL22VwiA Gc1JgqOKaW/gLTqE2pbsW1ZTvpNlCXf78mxXzahFpU5K6YDmP7V6ljjWB1hzqA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778888291; 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=7OcPsjbAw4fo5SvzY5/g5GO/iQUg0WivsVMkc2Ema2A=; b=S4aP7tiJc7rqHjQeJzGnaLHYYgQbHIAbu827BOyVukBLkNsKqBMK+dyZw+rm9Jduz4Elx3 FCfGUcbTBwi0k6fqCDJuIdD6UklydtSErzHW9cOYD1BQRhY6qpG9cDV+aFdzhDb35v6uU+ T6Yv6eAahUbQUbM0rsInhxjd1ESnJqe66MRCNOB4NWDEVBdREOPv9pgda8Jb1tXT1qaUWP 0j+r4echCQl5bvGApkontkzeySNRUZ1wKIvvlWELA888im8HzbqpRoUIfO6ze5JFWln8bv M7y3i55TUQPdu3HRkeG/y188s25Cspv79wOxeuWBBw1s5Q8i40NpYNJexgbCnw== 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 "E7" (not verified)) (Authenticated sender: bz/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4gHNtC2xZpzjxy; Fri, 15 May 2026 23:38:11 +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 A62BDA64806; Fri, 15 May 2026 23:37:45 +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 B3FEB2D029EC; Fri, 15 May 2026 23:38:09 +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 U5oLsYKqq_2R; Fri, 15 May 2026 23:38:08 +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 5B5CD2D029D8; Fri, 15 May 2026 23:38:08 +0000 (UTC) Date: Fri, 15 May 2026 23:38:08 +0000 (UTC) From: "Bjoern A. Zeeb" To: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 70fde0ed6bbb - main - md5: Encode non-printable filenames In-Reply-To: <69f250e0.37a65.1d7c90ca@gitrepo.freebsd.org> Message-ID: <95sp1227-9sp1-60q4-3qp6-4r598q63o152@mnoonqbm.arg> References: <69f250e0.37a65.1d7c90ca@gitrepo.freebsd.org> X-OpenPGP-Key-Id: 0x14003F198FEFA3E77207EE8D2B58B8F83CCF1842 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="0-493607577-1778888288=:11296" This message is in MIME format. The first part should be readable text, while the remaining parts are likely unreadable without MIME-aware tools. --0-493607577-1778888288=:11296 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8BIT On Wed, 29 Apr 2026, Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav wrote: > The branch main has been updated by des: > > URL: https://cgit.FreeBSD.org/src/commit/?id=70fde0ed6bbbb1f84c440190ba1e5435f8c90e13 > > commit 70fde0ed6bbbb1f84c440190ba1e5435f8c90e13 > Author: Dag-Erling Smørgrav > AuthorDate: 2026-04-29 18:41:05 +0000 > Commit: Dag-Erling Smørgrav > CommitDate: 2026-04-29 18:41:05 +0000 > > md5: Encode non-printable filenames > > Encode filenames in the VIS_CSTYLE | VIS_OCTAL style regardless of > output mode. When reading filenames from a checksum file, attempt to > decode them, and use the decoded name unless the decoded name does not > exist but the undecoded one does. > > This breaks compatibility with GNU coreutils, which unfortunately uses > a non-reversible encoding when outputting filenames containing > non-printable characters. > > While here, drop a sentence about preimage attacks against MD5 and SHA1 > from the manual page, as I no longer trust it to be true. > > MFC after: 1 week > Reviewed by: bcr, markj > Differential Revision: https://reviews.freebsd.org/D56615 > --- > sbin/md5/md5.1 | 30 ++++++++++++++++++++++-------- > sbin/md5/md5.c | 41 +++++++++++++++++++++++++++++++++++------ > 2 files changed, 57 insertions(+), 14 deletions(-) This breaks make makesum and related in ports for, e.g., filenames/URLs which have a '?' in them. If you, on an updated system, run make makesum in net/wifi-firmware-rtw88-kmod for example, you can see that the '?' are now quoted for the SHA256 lines while they were not previously. -TIMESTAMP = 1765584880 -SHA256 (linux-firmware/rtw88fw/rtw88/rtw8703b_fw.bin?h=20251125) = 5e32bd891c74a0719c871726b74490cf5e1a05cdcefb8fe2414f80fffdeb9f9d +TIMESTAMP = 1778888000 +SHA256 (linux-firmware/rtw88fw/rtw88/rtw8703b_fw.bin\?h=20251125) = 5e32bd891c74a0719c871726b74490cf5e1a05cdcefb8fe2414f80fffdeb9f9d SIZE (linux-firmware/rtw88fw/rtw88/rtw8703b_fw.bin?h=20251125) = 20290 -SHA256 (linux-firmware/rtw88fw/rtw88/rtw8703b_wow_fw.bin?h=20251125) = 7156b0d2b4580e63d11a3a78258c35ff28e840c7c6428953920ae6a1cd5d05ac +SHA256 (linux-firmware/rtw88fw/rtw88/rtw8703b_wow_fw.bin\?h=20251125) = 7156b0d2b4580e63d11a3a78258c35ff28e840c7c6428953920ae6a1cd5d05ac SIZE (linux-firmware/rtw88fw/rtw88/rtw8703b_wow_fw.bin?h=20251125) = 23074 -SHA256 (linux-firmware/rtw88fw/rtw88/rtw8723d_fw.bin?h=20251125) = 9c64e079815a333a3f7b731be7cc0be65206ebc883891659dc8ff5ed36a5e2f5 +SHA256 (linux-firmware/rtw88fw/rtw88/rtw8723d_fw.bin\?h=20251125) = 9c64e079815a333a3f7b731be7cc0be65206ebc883891659dc8ff5ed36a5e2f5 SIZE (linux-firmware/rtw88fw/rtw88/rtw8723d_fw.bin?h=20251125) = 28884 -SHA256 (linux-firmware/rtw88fw/rtw88/rtw8812a_fw.bin?h=20251125) = abdcca4e8bf76ebfba23d433de310ffefebd0ff9d01990639d4cd9602b32b71a +SHA256 (linux-firmware/rtw88fw/rtw88/rtw8812a_fw.bin\?h=20251125) = abdcca4e8bf76ebfba23d433de310ffefebd0ff9d01990639d4cd9602b32b71a SIZE (linux-firmware/rtw88fw/rtw88/rtw8812a_fw.bin?h=20251125) = 27030 -SHA256 (linux-firmware/rtw88fw/rtw88/rtw8814a_fw.bin?h=20251125) = aa6bf9d62b2d2d8a37254fd6d917ba2839888cdedc21850d4481874cb1d3d7cb +SHA256 (linux-firmware/rtw88fw/rtw88/rtw8814a_fw.bin\?h=20251125) = aa6bf9d62b2d2d8a37254fd6d917ba2839888cdedc21850d4481874cb1d3d7cb SIZE (linux-firmware/rtw88fw/rtw88/rtw8814a_fw.bin?h=20251125) = 68320 -SHA256 (linux-firmware/rtw88fw/rtw88/rtw8821a_fw.bin?h=20251125) = 4693ece655044d96f81bd3f3e8db14dc352b493219c4fd0a75788a6fbd9eac3c +SHA256 (linux-firmware/rtw88fw/rtw88/rtw8821a_fw.bin\?h=20251125) = 4693ece655044d96f81bd3f3e8db14dc352b493219c4fd0a75788a6fbd9eac3c SIZE (linux-firmware/rtw88fw/rtw88/rtw8821a_fw.bin?h=20251125) = 31898 ... That then results in trying to build the port: => No SHA256 checksum recorded for linux-firmware/rtw88fw/rtw88/rtw8703b_fw.bin?h=20251125. => No suitable checksum found for linux-firmware/rtw88fw/rtw88/rtw8703b_fw.bin?h=20251125. => No SHA256 checksum recorded for linux-firmware/rtw88fw/rtw88/rtw8703b_wow_fw.bin?h=20251125. => No suitable checksum found for linux-firmware/rtw88fw/rtw88/rtw8703b_wow_fw.bin?h=20251125. => No SHA256 checksum recorded for linux-firmware/rtw88fw/rtw88/rtw8723d_fw.bin?h=20251125. => No suitable checksum found for linux-firmware/rtw88fw/rtw88/rtw8723d_fw.bin?h=20251125. ... -- Bjoern A. Zeeb r15:7 --0-493607577-1778888288=:11296-- From nobody Sat May 16 01:00:53 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gHQjl1TK3z6cZyS for ; Sat, 16 May 2026 01: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gHQjk6tCGz43hn for ; Sat, 16 May 2026 01: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=1778893259; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=syTlzwpQvdMP2LTvabtKk1QX3ybi3RzNqJyQglR6dzY=; b=V5vQT/JR8Iq0KG+FngzEy5qKSjvtTDSveC02YlubRJ8Ykopznhw0jAqTc7IvX4e2Vz/Rc7 6KolLhnWWz73MEquZRn4snHY1MbvIVqchrE4Iq26WnvEyKxLKmLpAeZLIaz6vtojfia6ID VZQjaNvauV9NM3ttHWoCCrBdvcyPtZkwsywO+kAP475kMl19U9B7fhBpyoEswxhYUMKfpB 0E6zcvra56gvxZLGDsnDiREPu+68y5WvAxIN1WIaqAGU5QBoxPdzuQnNM8tXcNWO/0vIRO 9quIT+CVH2hToaerwoPGrkNtSOOzyYJ7QKRZETDabnmnU6lkdW6RuN0DTne59Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778893259; a=rsa-sha256; cv=none; b=OYin7ooYJv8xQKHuPKahlFp1OOfxqU2XzbBKmelWHLEQrCThzFsvtAo6/lChXjQQ4S6nDY Fq1ZU+/WkM9DbS1mPNCJ8McZvaiVl8Gw0STa7wKWRQco8/cKvq8/ZlZ5XXmoXtpPtCAIsP etbYVyUaQhs1DvhQtmiKzeKEwL0UkUSUQ3SMAV+Z7hkKHG+GZaUkKbLR5X9239v5PU2lMW FRdy25aGeBwFT56XsPYr9z6dPhKzozkq4ADOLrrB8RPvyBEzEtA4xrXhjMpafRn71aYt6m 9MrBSP0AMre2HUAgsfrXcZS+SDmZfh1imeCS3A0oxFQkM8s8EEnyg11u7kERDA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778893259; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=syTlzwpQvdMP2LTvabtKk1QX3ybi3RzNqJyQglR6dzY=; b=uyrYd62UJSBL8iDE/UTNNaMO0SPuTgGpLzGrCaBLpEYOgdKBhwK9K/hXDQvh0aJtJeZR2+ ETrzP1S0HAYsC5dObV/CBWRUovt11HE5Fp4v8NCE8LRLWr3aJhqb4E6BnjgVV1U6y4w5h7 OMWW8l5IGO19gSFi8n3TQ1M39MZrUH/RbHzJKuiAgThi8kgRcWzDnQ4PKO0+2VUfjKto/W TMjoLb4pQyIOS/LZXD5ZEDeSe45c5BTsiif8p4gXRHhyJuPXIQl1AfNhTxGfPUmJuhc44T VkkIuzqDNALXleGB9Tc2hbkTLTjQbsETj38tWv+K48S/5ahollUCv15pgCMXFg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gHQjk6HHjzYvN for ; Sat, 16 May 2026 01:00:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26750 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 16 May 2026 01:00:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Enji Cooper Subject: git: 183633079178 - main - thunderbolt: make code -Wunused clean List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ngie X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1836330791789f18d0c9f0a63322a7f33b373c5b Auto-Submitted: auto-generated Date: Sat, 16 May 2026 01:00:53 +0000 Message-Id: <6a07c1c5.26750.273515b1@gitrepo.freebsd.org> The branch main has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=1836330791789f18d0c9f0a63322a7f33b373c5b commit 1836330791789f18d0c9f0a63322a7f33b373c5b Author: Enji Cooper AuthorDate: 2026-02-26 08:06:49 +0000 Commit: Enji Cooper CommitDate: 2026-05-16 01:00:36 +0000 thunderbolt: make code -Wunused clean This change modifies code paths and uses `__diagused` to address `-Wunused` issues that occur when `THUNDERBOLT_DEBUG` == `0`. MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D55575 --- sys/dev/thunderbolt/nhi.c | 18 +++++++++++------- sys/dev/thunderbolt/router.c | 11 +++++++---- sys/dev/thunderbolt/tb_acpi_pcib.c | 2 +- sys/dev/thunderbolt/tb_debug.c | 6 +++--- sys/dev/thunderbolt/tb_debug.h | 2 +- sys/dev/thunderbolt/tb_pcib.c | 2 +- 6 files changed, 24 insertions(+), 17 deletions(-) diff --git a/sys/dev/thunderbolt/nhi.c b/sys/dev/thunderbolt/nhi.c index 9550de258dab..6cbe79779c13 100644 --- a/sys/dev/thunderbolt/nhi.c +++ b/sys/dev/thunderbolt/nhi.c @@ -788,8 +788,11 @@ nhi_tx_schedule(struct nhi_ring_pair *r, struct nhi_cmd_frame *cmd) int nhi_tx_synchronous(struct nhi_ring_pair *r, struct nhi_cmd_frame *cmd) { + struct nhi_softc *sc __diagused; int error, count; + sc = r->sc; + if ((error = nhi_tx_schedule(r, cmd)) != 0) return (error); @@ -812,16 +815,16 @@ nhi_tx_synchronous(struct nhi_ring_pair *r, struct nhi_cmd_frame *cmd) if ((cmd->flags & CMD_REQ_COMPLETE) == 0) error = ETIMEDOUT; - tb_debug(r->sc, DBG_TXQ|DBG_FULL, "tx_synchronous done waiting, " + tb_debug(sc, DBG_TXQ|DBG_FULL, "tx_synchronous done waiting, " "err= %d, TX_COMPLETE= %d\n", error, !!(cmd->flags & CMD_REQ_COMPLETE)); if (error == ERESTART) { - tb_printf(r->sc, "TX command interrupted\n"); + tb_printf(sc, "TX command interrupted\n"); } else if ((error == EWOULDBLOCK) || (error == ETIMEDOUT)) { - tb_printf(r->sc, "TX command timed out\n"); + tb_printf(sc, "TX command timed out\n"); } else if (error != 0) { - tb_printf(r->sc, "TX command failed error= %d\n", error); + tb_printf(sc, "TX command failed error= %d\n", error); } return (error); @@ -831,7 +834,7 @@ static int nhi_tx_complete(struct nhi_ring_pair *r, struct nhi_tx_buffer_desc *desc, struct nhi_cmd_frame *cmd) { - struct nhi_softc *sc; + struct nhi_softc *sc __diagused; struct nhi_pdf_dispatch *txpdf; u_int sof; @@ -865,9 +868,10 @@ static int nhi_rx_complete(struct nhi_ring_pair *r, struct nhi_rx_post_desc *desc, struct nhi_cmd_frame *cmd) { - struct nhi_softc *sc; + struct nhi_softc *sc __diagused; struct nhi_pdf_dispatch *rxpdf; - u_int eof, len; + u_int eof; + u_int len __diagused; sc = r->sc; eof = desc->eof_len >> RX_BUFFER_DESC_EOF_SHIFT; diff --git a/sys/dev/thunderbolt/router.c b/sys/dev/thunderbolt/router.c index a3b418d77fac..fe7ad7026b2e 100644 --- a/sys/dev/thunderbolt/router.c +++ b/sys/dev/thunderbolt/router.c @@ -277,7 +277,8 @@ _tb_router_attach(struct router_softc *sc) { struct tb_cfg_router *cfg; uint32_t *buf; - int error, up; + int error; + int up __diagused; buf = malloc(9 * 4, M_THUNDERBOLT, M_NOWAIT|M_ZERO); if (buf == NULL) @@ -297,8 +298,9 @@ _tb_router_attach(struct router_softc *sc) sc->uuid[1] = cfg->uuid_hi; sc->uuid[2] = 0xffffffff; sc->uuid[3] = 0xffffffff; - tb_debug(sc, DBG_ROUTER, "Router upstream_port= %d, max_port= %d, " - "depth= %d\n", up, sc->max_adap, sc->depth); + tb_debug(sc, DBG_ROUTER, + "Router upstream_port= %d, max_port= %d, depth= %d\n", + up, sc->max_adap, sc->depth); free(buf, M_THUNDERBOLT); /* Downstream adapters are indexed in the array allocated here. */ @@ -718,7 +720,8 @@ router_notify_intr(void *context, union nhi_ring_desc *ring, struct nhi_cmd_fram struct router_softc *sc; struct router_command *cmd; struct tb_cfg_notify event; - u_int ev, adap; + u_int adap __diagused; + u_int ev; KASSERT(context != NULL, ("context cannot be NULL\n")); diff --git a/sys/dev/thunderbolt/tb_acpi_pcib.c b/sys/dev/thunderbolt/tb_acpi_pcib.c index 947df3688535..57ad916d4435 100644 --- a/sys/dev/thunderbolt/tb_acpi_pcib.c +++ b/sys/dev/thunderbolt/tb_acpi_pcib.c @@ -120,7 +120,7 @@ tb_acpi_pcib_attach(device_t dev) ACPI_OBJECT_LIST list; ACPI_OBJECT arg; ACPI_BUFFER buf; - ACPI_STATUS s; + ACPI_STATUS s __diagused; tb_debug(sc, DBG_BRIDGE, "Executing OSUP\n"); diff --git a/sys/dev/thunderbolt/tb_debug.c b/sys/dev/thunderbolt/tb_debug.c index f455ee72e9f6..fe65b2a5c034 100644 --- a/sys/dev/thunderbolt/tb_debug.c +++ b/sys/dev/thunderbolt/tb_debug.c @@ -206,7 +206,7 @@ int tb_debug_sysctl(SYSCTL_HANDLER_ARGS) { struct sbuf *sbuf; -#if defined (THUNDERBOLT_DEBUG) && (THUNDERBOLT_DEBUG > 0) +#ifdef THUNDERBOLT_DEBUG struct tb_debug_string *string; char *buffer; size_t sz; @@ -221,7 +221,7 @@ tb_debug_sysctl(SYSCTL_HANDLER_ARGS) sbuf = sbuf_new_for_sysctl(NULL, NULL, 128, req); -#if defined (THUNDERBOLT_DEBUG) && (THUNDERBOLT_DEBUG > 0) +#ifdef THUNDERBOLT_DEBUG debug = (u_int *)arg1; sbuf_printf(sbuf, "%#x", *debug); @@ -317,7 +317,7 @@ tb_parse_debug(u_int *debug, char *list) void tbdbg_dprintf(device_t dev, u_int debug, u_int val, const char *fmt, ...) { -#if defined(THUNDERBOLT_DEBUG) && (THUNDERBOLT_DEBUG > 0) +#ifdef THUNDERBOLT_DEBUG va_list ap; u_int lvl, dbg; diff --git a/sys/dev/thunderbolt/tb_debug.h b/sys/dev/thunderbolt/tb_debug.h index 4f5584420882..6ce479a42389 100644 --- a/sys/dev/thunderbolt/tb_debug.h +++ b/sys/dev/thunderbolt/tb_debug.h @@ -81,7 +81,7 @@ enum { */ void tbdbg_dprintf(device_t dev, u_int debug, u_int val, const char *fmt, ...) __printflike(4, 5); -#if defined(THUNDERBOLT_DEBUG) && (THUNDERBOLT_DEBUG > 0) +#ifdef THUNDERBOLT_DEBUG #define tb_debug(sc, level, fmt...) \ tbdbg_dprintf((sc)->dev, (sc)->debug, level, ##fmt) #else diff --git a/sys/dev/thunderbolt/tb_pcib.c b/sys/dev/thunderbolt/tb_pcib.c index b30de5a7493c..65ff42e4f831 100644 --- a/sys/dev/thunderbolt/tb_pcib.c +++ b/sys/dev/thunderbolt/tb_pcib.c @@ -304,7 +304,7 @@ static int tb_pcib_detach(device_t dev) { struct tb_pcib_softc *sc; - int error; + int error __diagused; sc = device_get_softc(dev); From nobody Sat May 16 08:52:32 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gHd9t02HWz6dDWG; Sat, 16 May 2026 08:52:34 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gHd9s6Gj7z3slS; Sat, 16 May 2026 08:52:33 +0000 (UTC) (envelope-from des@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778921553; 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=r90EdCWpBmzk+OH+WBdsLUk3FhbanKn1FiG+4Fe1m9o=; b=BgZqCF2Yw+Z3RFCwEz/DTlGZCek9VwrPeXDrsfoGA6TgxzfTf+vKq4SAxRYPILpKj63OZv I5Qfjaq7up6R418zZpRWc78rM47E9wg7o7sKHty/0IQpw9Kmbc5wdG1hpOqbdXnnlJ6xF1 BwgDrrWvqYd/mlaM5aCNl5mdbbVFYXQvq1dQXgsSeTWL9+martMYrjKKl34iXcMlfqVHs2 /iEY1bjTbYsC5jg31amJfg387xy6AXmy5ldxDQxNa6iuUMphUJRGcM2wwF7s7SQLP2D+C3 eVqLQEdaGHOu7bh+ZswfDp0UyWVbphK4p60xv67jLnA4pQMQirqtYQO874Pp3Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778921553; a=rsa-sha256; cv=none; b=JAIgk/1BmHoD4BI0a1X5Qjddzewm22Lh1KuiwKpBiJE1f6WJ/Qw6lC0YG5MSpEuCNVzoxr G4GB4FBNp15HyvMKiazhxgbi0Qe3Pxx1Vo20P8mi3h+UpBfxb+gLi2wFB1Tlo3KZfwUX0c MByf/qV/vDdNu2NhqpFjtZl5lAQ8UOyTvOfwKDw/DECZm56lXaXnHJ9m3Ev4koGb3guq5H GE1Hvg7yaP3JOwrYyZeii2idgF1ZP25o78veG6Dt93V8qD96qW3RsiQb/lR958c+PI/1+V 7wdGEubCifoCUMl2hQV6iul8FoqzxWcniI5cCShelWoydbrmkgtA7tzIPWRtgw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778921553; 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=r90EdCWpBmzk+OH+WBdsLUk3FhbanKn1FiG+4Fe1m9o=; b=Wr2/IT+XUtWpu68ZSA0DJhzvT8D5KnieZketvJeV3NfraVq0V0/RPtzmX8F1Q6J+lOcfuG cfCmryBQ/yD1d0rPjQaIjuc0gJiiUUlAGjxc71IlUGHYWYQfF2v7SaEJf+8+v0IDB4p7Eu /YXaiXfAlaMQoGftRoc8IlMwefXXY0LHvR73yT+m2qMen/aSMCnNHJ7EqH/L/1snOgNUu/ E/C4TwH8mgilUB6+eOtCY/h8kyyoTnnD8WlBDDTl21Od+GxRNDyuy6+xYQ24psCUxf/2Ar eLSdTrgOmc+nZ4ckMnzdSv9cuYxM+RdZ7jOp+9AGxoPhDXXGgRY1Xdvd6FpCzA== Received: from ltc.des.dev (2a01cb0585070b00922e16fffef1acef.ipv6.abo.wanadoo.fr [IPv6:2a01:cb05:8507:b00: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/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4gHd9s5Bj4zw2v; Sat, 16 May 2026 08:52:33 +0000 (UTC) (envelope-from des@freebsd.org) Received: by ltc.des.dev (Postfix, from userid 1001) id A99BDAA311; Sat, 16 May 2026 10:52:32 +0200 (CEST) From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= To: "Bjoern A. Zeeb" Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 70fde0ed6bbb - main - md5: Encode non-printable filenames In-Reply-To: <95sp1227-9sp1-60q4-3qp6-4r598q63o152@mnoonqbm.arg> (Bjoern A. Zeeb's message of "Fri, 15 May 2026 23:38:08 +0000 (UTC)") References: <69f250e0.37a65.1d7c90ca@gitrepo.freebsd.org> <95sp1227-9sp1-60q4-3qp6-4r598q63o152@mnoonqbm.arg> User-Agent: Gnus/5.13 (Gnus v5.13) Date: Sat, 16 May 2026 10:52:32 +0200 Message-ID: <86se7renxr.fsf@ltc.des.dev> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable "Bjoern A. Zeeb" writes: > This breaks make makesum and related in ports for, e.g., > filenames/URLs which have a '?' in them. Then I suggest those ports (17 out of 34,469) fix their distnames. The usual trick is to add a `dummy=3D/my-preferred-file-name` CGI argument at the end of the URL. A quick `git grep -l dummy=3D/` will provide plenty of examples to emulate. DES --=20 Dag-Erling Sm=C3=B8rgrav - des@FreeBSD.org From nobody Sat May 16 12:12:56 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gHjd60RzRz6c2fk; Sat, 16 May 2026 12:12:58 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gHjd56yc7z3MS6; Sat, 16 May 2026 12:12:57 +0000 (UTC) (envelope-from des@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778933578; 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=/g6agyLZPSbAcp0V0d447RJQAxVuMqNO8trO6Vpn9/8=; b=P8Xan3w+VgfmVghF5T2hPir0AjF7V3AmAqCCNUVAn5Ygcwoi/DNcCy6VQ8JEf6qY01TrMj A4AHJrV+UbHSU9ER0Or6BRjxOVyuW0kFAinO1j1qNq16QWKTIexZAXN8jRRRxRO9pYUrgd Q63xVLhK3FgJmdi5wr59qSTd3aInbSRWr1mV1rDjVGzw15Zn/hvlDD57/kMERQtKWZKoqv AnOiu1qBycXy976LVfyKs+h3Wpx9Pa1GShNaoiBIA48DB+bEX7y8/9RvAeedYBXkb0mIj/ 3MJ4LDwSpJY56Mx0Qhx3sNXfsSMuK3U+ERYQnZPZGI2uX16LhfTZpory8YstMQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778933578; a=rsa-sha256; cv=none; b=k7WuYleDKlUrtad6RxQAwD0QqBU2SJJVxKr0BOtAsVTmAdGua6/BpHd0Y3qB/LNT9tWhZg /NEdKZTYljYgT4hHsD2NgLye5NOAC3hwGwWzxlWHlSXWh8CiM1mJyWM7M6pI6Urhn7fHw2 Z8ALV3QoBM9Jrs1Qh+kTOY3JVIRXvrBaSLqNdIAob6Gq2cA6C0k2+qelt9ABwXf2QiNz/p SCeHqmC9Ml1l4PVX99ye7OwPTWPBIgPOjd16j3sfy7LLx8cMVj+c0wX4xRPQWmntGEF1P4 +lnPafqlcSXRtXPr7jl0E9NE0Yio338EyTIqyYN9+/O2M83grSu4uLjV6ogp3A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778933578; 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=/g6agyLZPSbAcp0V0d447RJQAxVuMqNO8trO6Vpn9/8=; b=ZELQPScYi/d1RSrz8I7hqx0sEX9Oq846dMN+9SWwWyihahPDAsgh8YMGMZzbNFUUord0Il ijuRVxpP3fZOoMZdEVZEj/IKBzGDFvkUj44WeVGW/J4FXxWBjhBxJM0Gj5gXHS7ibcAjJL rX5ldnFDwu14o8IU8lakI8Uz/c+cSHRrm0RjCmqYtue+t/irMUgGqKEFytZJAoFd0csEN+ psocbXY2jsgirRl2np1JO1jEwgJzOxAYUiphr8QHhYE0b6zqG6EVbi6PxdLDl0xRpg5W4f yql6fLZUsJvdExrdN+7D0bf7O07pz1dDdnpzVhCh+P4pU34X3EWs3smw/ib8Qw== Received: from ltc.des.dev (unknown [92.183.12.56]) (using TLSv1.3 with cipher TLS_AES_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/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4gHjd55mHLz10Nh; Sat, 16 May 2026 12:12:57 +0000 (UTC) (envelope-from des@freebsd.org) Received: by ltc.des.dev (Postfix, from userid 1001) id 8B16FAA122; Sat, 16 May 2026 14:12:56 +0200 (CEST) From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= To: Alexander Ziaee Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 809504f331fd - main - man: Kill off MANSUBDIRs In-Reply-To: <69f79438.38a23.3196f451@gitrepo.freebsd.org> (Alexander Ziaee's message of "Sun, 03 May 2026 18:30:16 +0000") References: <69f79438.38a23.3196f451@gitrepo.freebsd.org> User-Agent: Gnus/5.13 (Gnus v5.13) Date: Sat, 16 May 2026 14:12:56 +0200 Message-ID: <86h5o7eenr.fsf@ltc.des.dev> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Alexander Ziaee writes: > commit 809504f331fd3588e36b54255196379bdb59890a > Author: Alexander Ziaee > AuthorDate: 2026-05-03 17:53:25 +0000 > Commit: Alexander Ziaee > CommitDate: 2026-05-03 17:53:25 +0000 > > man: Kill off MANSUBDIRs >=20=20=20=20=20 > Three architecture dependent manuals are installed to MANSUBDIRs, > creating at least two empty manual page directories on everyone's > boxxen. Move those manuals to their canonical area, enhancing clarity, > grepability, removing useless inodes, and increasing consistency with > the rest of the architecture dependent manuals which are unconditiona= lly > installed, and noted at the top of the rendered manual. >=20=20=20=20=20 > MFC after: 3 days You can't just proclaim that you want these directories gone, you need to actually remove them from the mtree file(s). DES --=20 Dag-Erling Sm=C3=B8rgrav - des@FreeBSD.org From nobody Sat May 16 16:17:14 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gHq336zfjz6cdK9 for ; Sat, 16 May 2026 16:17: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gHq335Tq3z3tWX for ; Sat, 16 May 2026 16:17:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778948239; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EfcL6y3KxYb7dLBmik7g2mFaCVtxgTossY3IccOkm04=; b=MgEzAk5SJoh46M3I+7qdF67XOPqyjfjUkRd9JMa3hzvQgKh6TZUXovxUK16vval64DV9jC jksPBNrlVMbFc0CM00Zw3XQK+ZKKrJFuFA4ugcYVmAdO5hr1Uu8cX6yG4bfewSnX/9fJ6B FM/ip/BG0LoxezbLQuX5oFHIQAvRziYIXLub1hzOTqSMFipllsQzF1dwpDzJ4DkhHwhFNX Ki669n41+mYoUd2IrguB/r1IJ1BnEq7/GdqHT/V4HgjzRNSD4bjmdc4sCEUp/nhvoXdrNn mFAUhkMebKPt9Ra6Q6ZDBIqB+PQwjT0cZ7ADp7feNuMheJIYehlCDnhf7x2AOw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778948239; a=rsa-sha256; cv=none; b=LA3in2sP3lLnoC/loCVzHs3vqtjsvaIVvXumtpoRahBiw01ez5QeTiaWvnFGVckAmgdCs8 ZxrpiS7fzQi2bFwbyxonuhYh0aApyo1Udqvhb9YIz2zYLlqnRZfPMkd/Yctnk3h5fxXt+R MUeydaMCITlFxSxugLl7cnmEq5nal2FLZuNHbHzh92WVFvKGY0IO2TdKFuGf0DwMDJjBsN kuPBsOcEsKS6D6QERnoXXTds8Y1l0vSjHchraU48fp3+W+sMcAt6Mf/eBxijsscftkjTLd LMD24g7IR48jQlotLjea8mG07doPDsvD2GDtkiZrBhq8KCI7vQucrHz5CI/ngQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778948239; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EfcL6y3KxYb7dLBmik7g2mFaCVtxgTossY3IccOkm04=; b=kVhqWcvxcxZ6wUiNVkt6RC632VWZ1X9mP37N9aB+TZFdA1lTQ0RuoDVaaAvkzUHVvbgBnR gwIO07bopupWUiqaBlxbaJq63CNoFW2oiQaXRzzw2oEpZymhDGDukvW01IE6yfyrG9Q7Yi FO+OVbOUx1Xr6NBctUDU68EkVso6BQHoQnPm5oKwbxNzcljeHp6q3X62UL2DceohAqhQft pYaybLq9h7oToTbb4RUi/rVnkwJ2whwTvjGtljiHsnUA5OZU/Zy3Eidrs7awjqg2i2zKuU naJRNPp5iF3ebJ9tM78/RhMN7haf45LWdSSIZ/CbSlIoc+UbPF0wGNkiqMoE9Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gHq3354w1z11s4 for ; Sat, 16 May 2026 16:17:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e0b5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 16 May 2026 16:17:14 +0000 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=B8rg?=rav Subject: git: 1dc1b95163b9 - main - mtree: Remove unused MANSUBDIRs List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: 1dc1b95163b9e5cf5cbd52c2b979568724746eac Auto-Submitted: auto-generated Date: Sat, 16 May 2026 16:17:14 +0000 Message-Id: <6a08988a.3e0b5.2b6a6f55@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=1dc1b95163b9e5cf5cbd52c2b979568724746eac commit 1dc1b95163b9e5cf5cbd52c2b979568724746eac Author: Dag-Erling Smørgrav AuthorDate: 2026-05-16 16:16:57 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-05-16 16:16:57 +0000 mtree: Remove unused MANSUBDIRs MFC after: 3 days Fixes: 809504f331fd ("man: Kill off MANSUBDIRs") Reviewed by: ziaee Differential Revision: https://reviews.freebsd.org/D57029 --- ObsoleteFiles.inc | 1 + etc/mtree/BSD.usr.dist | 8 -------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 524ebcd8c61e..3785f5ac30e1 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -52,6 +52,7 @@ # done # 20260503: Kill off MANSUBDIRs +OLD_DIRS+=usr/share/man/man4/amd64 OLD_FILES+=usr/share/man/man8/amd64/apm.8.gz OLD_FILES+=usr/share/man/man8/amd64/apmconf.8.gz OLD_FILES+=usr/share/man/man8/i386/apmd.8.gz diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist index d580cbceb062..00abc75d5bbb 100644 --- a/etc/mtree/BSD.usr.dist +++ b/etc/mtree/BSD.usr.dist @@ -503,8 +503,6 @@ man4 aarch64 .. - amd64 - .. arm .. i386 @@ -519,12 +517,6 @@ man7 .. man8 - amd64 - .. - i386 - .. - powerpc - .. .. man9 .. From nobody Sat May 16 16:44:41 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gHqfk5cx5z6cghx for ; Sat, 16 May 2026 16:44:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gHqfk43Lyz3wm4 for ; Sat, 16 May 2026 16:44:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778949886; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8y1LwbebhMA85JfRh2QuH1XnA09Z80eNKEjQQdhRqf8=; b=EpcrCUq1pyP/BJMpisrNmTKRlZu04ZZdjiOYwO+WYVcx7IPnASnTXcjVVLzBED9Gb4nJYT cfDRJyGaM/7A81Mj2CfHaa1XpPOQBduEAXhZ/uIyShG+5sduIhDYqxRpkpG/l7/u8aUdVG MW3gpNihHmU4DVPs2sVuSN000K8CSLokH0dYMkR0AET+vDCK9c6uOJC7UxV/drh9uiVuxQ S58BhhqlmUntpCmlY7nY67T4ZEOL7YR2pcWTY/SweerEqP7dYARpQ/oJyE2ax2SIDbP4FN jN3uAR6fvkQoLYEPxj8GYkZtTUNV4g6Z4UTqch5/p5K9RJXPzmpHuX0a0xfufQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778949886; a=rsa-sha256; cv=none; b=uo7p7FRnRUIGCda1kKa3WfdWGlYQyYTw8vKRYFadV1POdYR7+LXySs/1M+hAkpQ45k7J1B mtdjaN8/pcmFiEcEayf8TR0t3858WCr3lI77BMvBTvWiJi01Wf5ziYkOWL4fpLDW+IQZQK 2QzzwdBKHfi+LQVdvmhk+nQ52pHD63kdMRe5XB9u2lz6tqRm+X4P0b2x60OCEd2kga5J7t ErYKoeZ5HUxNkE6M3Hxbi7QXTTOefQpKwl2lXGYdbaXmT0Tf9GPfQ4d2SfAOwQMSKWqz10 YyQO+GAKFSVEpeAb3ibaFWLNx6/jPHOYvzy4qMNNsp5jzz+bcrpkzpj0Mgf+SA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778949886; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8y1LwbebhMA85JfRh2QuH1XnA09Z80eNKEjQQdhRqf8=; b=pYpa3hL/qjgELcllvUJt8fGvr5keqN4zTlf82B9bWG7cWrhElqaX8JCgizjJmyaquY57ne ncEuGP2JpqGRUis8VuHL9pkNgXZqQtFkzp0UWzBKqV7P617hvo5CFN+dvz26juXkZuJ4PE V5QJmVx1wOVO869jguwmeMgGzkbbakmNBFh473nXGqzA+waOxGDRVAc1kLgohrorzsbinD KSCRc06+KwKb5R0zMZMnWdpowTKhssqISCMlFH8qH25A2bMu+1+kvgwchNRHZXA+zJlyEG S/syV5uwyqQvkizcsRRS+veg/SyzTs3SbQhMq5gGekBPiyQt8t+tboUjsomKcA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gHqfk3M3wz12Jp for ; Sat, 16 May 2026 16:44:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 18969 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 16 May 2026 16:44:41 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 9d0b771caa49 - stable/15 - pfctl: relax interface name requirement List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 9d0b771caa49eb77176d8f8cece8d1232dffe7f2 Auto-Submitted: auto-generated Date: Sat, 16 May 2026 16:44:41 +0000 Message-Id: <6a089ef9.18969.685b873a@gitrepo.freebsd.org> The branch stable/15 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=9d0b771caa49eb77176d8f8cece8d1232dffe7f2 commit 9d0b771caa49eb77176d8f8cece8d1232dffe7f2 Author: Kristof Provost AuthorDate: 2026-05-07 09:58:17 +0000 Commit: Kristof Provost CommitDate: 2026-05-16 16:44:00 +0000 pfctl: relax interface name requirement The FreeBSD network stack, for better or worse, does not impose any requirements on interface names. As such it's valid for an interface name to start with a number (or indeed, be something like '⭐'). Allow this in pfctl, and add a test case for the specific case of interface names starting with a number. Note that we don't support UTF-8 names fully, so those may still fail. PR: 295064 MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit 4e7c1ff95a5187faee524055f22c4cf4134d1147) --- sbin/pfctl/parse.y | 2 +- tests/sys/netpfil/pf/names.sh | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 1 deletion(-) diff --git a/sbin/pfctl/parse.y b/sbin/pfctl/parse.y index c733a9496a59..aea30cb33481 100644 --- a/sbin/pfctl/parse.y +++ b/sbin/pfctl/parse.y @@ -3764,7 +3764,7 @@ dynaddr : '(' STRING ')' { char *p, *op; op = $2; - if (!isalpha(op[0])) { + if (op[0] == '\0') { yyerror("invalid interface name '%s'", op); free(op); YYERROR; diff --git a/tests/sys/netpfil/pf/names.sh b/tests/sys/netpfil/pf/names.sh index e47b0917cfec..c6f2a06c15f9 100644 --- a/tests/sys/netpfil/pf/names.sh +++ b/tests/sys/netpfil/pf/names.sh @@ -95,8 +95,48 @@ group_cleanup() pft_cleanup } +atf_test_case "start_number" "cleanup" +start_number_head() +{ + atf_set descr 'Test interface names starting with a number' + atf_set require.user root +} + +start_number_body() +{ + pft_init + + epair=$(vnet_mkepair) + ifconfig ${epair}a 192.0.2.1/24 up + + vnet_mkjail alcatraz ${epair}b + jexec alcatraz ifconfig ${epair}b 192.0.2.2/24 up + jexec alcatraz ifconfig ${epair}b name 4ever + jexec alcatraz pfctl -e + + jexec alcatraz ifconfig + + pft_set_rules alcatraz \ + "block" \ + "pass in from any to (4ever)" + + atf_check -o ignore ping -c 3 192.0.2.2 + + # Negative test, if the interface doesn't exist we don't pass packets + pft_set_rules alcatraz \ + "block" \ + "pass in from any to (5ever)" + atf_check -s exit:2 -o ignore ping -c 1 -t 1 192.0.2.2 +} + +start_number_cleanup() +{ + pft_cleanup +} + atf_init_test_cases() { atf_add_test_case "names" atf_add_test_case "group" + atf_add_test_case "start_number" } From nobody Sat May 16 16:44:49 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gHqfn3FpHz6cgnd for ; Sat, 16 May 2026 16:44:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gHqfn1sdgz3wZf for ; Sat, 16 May 2026 16:44:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778949889; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bqtVtaw0cqspcxMHvkN+uEWCk8QtwXWRDi3FxJU7ZCU=; b=XAgFqUOgg6+/iNwC5m3VvWCR79M1bfbYS2Bu5POsVmxZo50wBsoTvCLL+qe6JYPApaPSwZ eOV8yDKLr8Kn9dDF10RKOnyzpiNiR0Jvy93MLvh+AysbXuhCPzNh0iIaSdFx5AHavnZiH2 j+OJ90yghTCF4ThFNJxDiHC5DIrklQ3tqA3R7azAD63grzQBNMyeBXSLW4bJHcrV8edAYD /hf4ikv0ngVbPXTwWHnJ3IpHbgwb2IaVeODzS634HUdSHW3wVGgGHkExn1mgjM4J3jTmRs FzQPpUdFbzlsa2geMeuXxFCj6VLjn0VIPucuNV1ETaPDZXI/FX3A+Q1SsLuvSA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778949889; a=rsa-sha256; cv=none; b=N6TGp4+VSfT3ojQNUaE7RZZAlG6R2Z0vSSxpI007RpYvbsMizCIpcD0O1mtBhFCtlafffO GNr+zo+BrYbZKD+cM+WgNtDTNoVJlK++c9MG580RthM+iRqQpkKm6pKoMR5rFdfEeneIHl /unbC7dPdGO6rtVe4gV/amWorXH1pH2l2cB3hGpFnZA3mZnCWvdQY97DRX56Q1LC+2l6cY 5w5dckXLhfBHRZO66m90I8uNN0jYqt3986sKsY8myB00UYsPftrk7pRPi7apjb4EKtZNJH QGtqR6M/Vn+4+AhmP9Wgl3+yuZzR99tb/u4MuNHK8DFU0eqTAagk+3HSpWKgug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778949889; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bqtVtaw0cqspcxMHvkN+uEWCk8QtwXWRDi3FxJU7ZCU=; b=GlZr0RSIyobMW+AqPgc0J/CsPDENRjn+yEvoUOd2zncj2iUe/W6buW9IeHsor+SOd3+dKT EMV5F3ucdbFR0JeaWRcrzhEGeKfLICfwatjW50DVbrocL7bQafY/K4FZh5mt6esoE6xDrY sT0FgbV5WQK/C4HA3dylKAtTt83A50zTC4KLHwA9NCTHM/YK91fdEGJJj6Js1cH5b5pJ61 iruc2ZWDaep+fwY7tjiS8nXFLbNq/MC19ZLKka94WMY75mQFGXetL9eAKzvh/QfcvVj07T l4HrjbrHLa5k0x1aJzxZVfgN+GmYvOGb01DKFGF3baUo3G1bq+7Z6xqN/T6L4g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gHqfn1Bl5z12Ft for ; Sat, 16 May 2026 16:44:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 19089 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 16 May 2026 16:44:49 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: e5536b061033 - stable/14 - pfctl: relax interface name requirement List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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/stable/14 X-Git-Reftype: branch X-Git-Commit: e5536b061033bdc56cee7c1d42ab4fc17f5b8051 Auto-Submitted: auto-generated Date: Sat, 16 May 2026 16:44:49 +0000 Message-Id: <6a089f01.19089.5fbc9155@gitrepo.freebsd.org> The branch stable/14 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=e5536b061033bdc56cee7c1d42ab4fc17f5b8051 commit e5536b061033bdc56cee7c1d42ab4fc17f5b8051 Author: Kristof Provost AuthorDate: 2026-05-07 09:58:17 +0000 Commit: Kristof Provost CommitDate: 2026-05-14 19:04:19 +0000 pfctl: relax interface name requirement The FreeBSD network stack, for better or worse, does not impose any requirements on interface names. As such it's valid for an interface name to start with a number (or indeed, be something like '⭐'). Allow this in pfctl, and add a test case for the specific case of interface names starting with a number. Note that we don't support UTF-8 names fully, so those may still fail. PR: 295064 MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit 4e7c1ff95a5187faee524055f22c4cf4134d1147) --- sbin/pfctl/parse.y | 2 +- tests/sys/netpfil/pf/names.sh | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 1 deletion(-) diff --git a/sbin/pfctl/parse.y b/sbin/pfctl/parse.y index 58245ca642e0..df17486a5d45 100644 --- a/sbin/pfctl/parse.y +++ b/sbin/pfctl/parse.y @@ -3728,7 +3728,7 @@ dynaddr : '(' STRING ')' { char *p, *op; op = $2; - if (!isalpha(op[0])) { + if (op[0] == '\0') { yyerror("invalid interface name '%s'", op); free(op); YYERROR; diff --git a/tests/sys/netpfil/pf/names.sh b/tests/sys/netpfil/pf/names.sh index e47b0917cfec..c6f2a06c15f9 100644 --- a/tests/sys/netpfil/pf/names.sh +++ b/tests/sys/netpfil/pf/names.sh @@ -95,8 +95,48 @@ group_cleanup() pft_cleanup } +atf_test_case "start_number" "cleanup" +start_number_head() +{ + atf_set descr 'Test interface names starting with a number' + atf_set require.user root +} + +start_number_body() +{ + pft_init + + epair=$(vnet_mkepair) + ifconfig ${epair}a 192.0.2.1/24 up + + vnet_mkjail alcatraz ${epair}b + jexec alcatraz ifconfig ${epair}b 192.0.2.2/24 up + jexec alcatraz ifconfig ${epair}b name 4ever + jexec alcatraz pfctl -e + + jexec alcatraz ifconfig + + pft_set_rules alcatraz \ + "block" \ + "pass in from any to (4ever)" + + atf_check -o ignore ping -c 3 192.0.2.2 + + # Negative test, if the interface doesn't exist we don't pass packets + pft_set_rules alcatraz \ + "block" \ + "pass in from any to (5ever)" + atf_check -s exit:2 -o ignore ping -c 1 -t 1 192.0.2.2 +} + +start_number_cleanup() +{ + pft_cleanup +} + atf_init_test_cases() { atf_add_test_case "names" atf_add_test_case "group" + atf_add_test_case "start_number" } From nobody Sat May 16 18:34:06 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gHt500ySNz6cqNw for ; Sat, 16 May 2026 18:34: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gHt4z4BQ0z3F7N for ; Sat, 16 May 2026 18:34:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778956451; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ulWmzmUlrjV8Cf4w1Qz1AWOnzc4iXoIy7FBqyDcTf0I=; b=jVr7l1IWHonmUGEDxe5SVvzn2qXkjSYP5S8PB1LHKqqv3o9Us4xQ0aqb4bNur8O3mt8zxZ pR0DQBLnNaIeMVWQzzc1py9NBkPPUr/wUvRtDWfQkyL4EHhRQGDba9TK4TvgWwcsRqK+dR TOepZweaKDl9hipwTIWTNWuNUQvcYBPWqa8Z1vi18a7A5jaY94WvqBxCzLF56gwuEkUtia 81ufYj6nXo3TJaFVGE/cWcyfE0UDx4GAfgGbhfRT2KGSmG5VAWE88bRDA5OMeFTVkqz1MN DOFjHJp1BQh9C1uUHSFaKlRlMS9lhGt4y8AMdpouJilJHjn3VdYb4RfIG1f2vw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778956451; a=rsa-sha256; cv=none; b=kSDYVR/D2OBtuMd28xXc5J5l6TBR094v4ndAuWY0WM6XmzAJKF2PzY+8e5naYyGDsr0jHu qkPGiu+tdSd77JsQo+lQ4f2imdzPKt/MvATNJMQHyyIPj8gzuNjU8kxtkmiPPgFgVlslNM 2RBqajxWR3QZt8TUZjC6oa3XDP4bSZnJQq6Ab8IXL8Kk+6fiATyCf7Gq0aAMl5rpQ71sgs jZRKmB50l9yTCnyJe13DZSqMG8OFQR1jdc4ZK9sqVpIIbDf7jg4VC96OobzDvLxVaqno+8 ZFkQHI6d9ClfoDks3itZQDsy3gbR8yilT/WahwxgTtalo4IguOWzqzoY940WOg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778956451; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ulWmzmUlrjV8Cf4w1Qz1AWOnzc4iXoIy7FBqyDcTf0I=; b=oCizazW7lGgNcOFvbSnIJb5YKL/lDur7WU/Bd+8pk/bhGe4dlWhdJCiKptK786V2YHRKTv 2VvGqf4rEqZ+8RrxFsO/VYgSrs2bEHPZZs3QO0CrykiHld57dxKAZ0GTXbA7ghoTJCcbKt UsWM0Fx4qIK5uF5bRl4rbVCEyYHRLcvWWUJUC44N88Ur9bQDrpCJvAXRo3sUhPrkcpZYOs CW6iDWg1JOBbjCFhBUwdWAEYujSwdZkC0p4B4qD9nEXmcK5UC9/2eDIUYd8AquUq1rLiQt QpfM9QHP2QTygwk4JNPyb1VYxM8ZwgMEtm0rJDuI4ajcnqiwNbsXKz+cWv6Mcw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gHt4z3fCNz159x for ; Sat, 16 May 2026 18:34:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2599d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 16 May 2026 18:34:06 +0000 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=B8rg?=rav Subject: git: 5f60d8a8f297 - main - riscv: Add IOMMU to NOTES List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: 5f60d8a8f2978f998da55d4e3cd0cb0e073bfc21 Auto-Submitted: auto-generated Date: Sat, 16 May 2026 18:34:06 +0000 Message-Id: <6a08b89e.2599d.732052@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=5f60d8a8f2978f998da55d4e3cd0cb0e073bfc21 commit 5f60d8a8f2978f998da55d4e3cd0cb0e073bfc21 Author: Dag-Erling Smørgrav AuthorDate: 2026-05-16 18:32:25 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-05-16 18:33:37 +0000 riscv: Add IOMMU to NOTES Reported by: bz, ivy Fixes: bcecad2c24aa ("riscv: IOMMU support") --- sys/riscv/conf/NOTES | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/riscv/conf/NOTES b/sys/riscv/conf/NOTES index 102ee26811b3..6ae74bd51eb5 100644 --- a/sys/riscv/conf/NOTES +++ b/sys/riscv/conf/NOTES @@ -16,6 +16,7 @@ options KDTRACE_FRAME # Ensure frames are compiled in options KDTRACE_HOOKS # Kernel DTrace hooks options DDB_CTF # Kernel ELF linker loads CTF data options RACCT_DEFAULT_TO_DISABLED # Set kern.racct.enable=0 by default +options IOMMU # Enable detailed accounting by the PV entry allocator. options PV_STATS From nobody Sat May 16 19:09:56 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gHttF6PC5z6csys; Sat, 16 May 2026 19:09:57 +0000 (UTC) (envelope-from des@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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gHttF4CVBz3Lwl; Sat, 16 May 2026 19:09:57 +0000 (UTC) (envelope-from des@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778958597; 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=wLNNFy50y5M+rWfbVhAFCP0J1zFJIKJqHPY41CxYi+E=; b=Bag45y6Q0wdOfICl/oUPK1T13Z4W0CMxfj5RHp2u79y1duvSKpAIT8pgfkduiw/GGj02jk 8dEsDaz46Zs8iFOaYZwDvqf3osOoN1or0GBZiv4OS1HqULzcfNFXTvhb4pFTHoXn21xL+s ooH67yMgks/pI/GYIqv728zjHupEIDo3DlTxsqOPO3juPW7wYLXblevwUu6jmFGyDGB8ay TEk/2BMw2OZtsykvqIN8JLdVDik4DNBX4jZEj8q9bTnqfj0BOE5uMbsHVBaLgwNeX1RhSZ 7uICg+mYt3HtjzBJ97QeiQ9fiMbVUrhAp4niv7XHTAXubFGNcbCZimbGW4FWhw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778958597; a=rsa-sha256; cv=none; b=o2cuasfpgAK71Ikl1xqPY+D5h6aZWIYXeWlq/9XNu0/J9FWypWvN9LkXjbRT+rfw61bmoc tFNM4pqWPtyW7om5Z43rVFkO1ZCa4fdCu8jiBELzSQsneSGep/XUIOE70xqLvnTUazeyoT IGSFV3m/7vgns6HIe5f1qbswc6hozdEhS+qwqpZ2H48XqYlI1zxutMmgdN89RUPNm64NsO 4PdpJthglceVs8B6tc2OVVOKBOyWRvE4EF3mBBGnG/cwk9eGZprnMBhopMVja5lDdcwg4M hWANUUUNI1ouZ8HbD+8OrtuSEBTAEnW4FHzNOVftFd02AubNYFZrv6jYaenRdg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778958597; 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=wLNNFy50y5M+rWfbVhAFCP0J1zFJIKJqHPY41CxYi+E=; b=tIHC9xQOsXbY/DRwsGWEpDOykBEyVgwWF86yjGANh+y0zHhxoUKgFOGgp3PV1kk60Qni97 K5S6jRAKiyo1463azcjE+88u/k10mg5QXhx0XQvkKH7RW88TnF4bbUZ+Zp8iS/dnZaNKSI 8fsNqsWwmtrDgexcHm+BdMXVLbRCF8PACvuCRIKd0cvj5GjoOotWhYsanvDBHVAC1GysZB qywAFM4ezP7osY+f4BmTE+qWlyFGlU6tpXSp56j2X9ZfPl/Nj246Dme4c2lIf1kqG6N41w PaXZP2nWIGAc+3+l/QE3k8Tz04qarLnmUD0uUolLQAAxBLdfiYxtWTVfszF0iw== Received: from ltc.des.dev (unknown [92.183.12.56]) (using TLSv1.3 with cipher TLS_AES_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/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4gHttF2t4sz1900; Sat, 16 May 2026 19:09:57 +0000 (UTC) (envelope-from des@freebsd.org) Received: by ltc.des.dev (Postfix, from userid 1001) id 3E028A9BF2; Sat, 16 May 2026 21:09:56 +0200 (CEST) From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= To: Ed Maste Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 2574974648c6 - main - OpenSSH: Update to 10.3p1 In-Reply-To: <6a061bf9.2672e.364c778f@gitrepo.freebsd.org> (Ed Maste's message of "Thu, 14 May 2026 19:01:13 +0000") References: <6a061bf9.2672e.364c778f@gitrepo.freebsd.org> User-Agent: Gnus/5.13 (Gnus v5.13) Date: Sat, 16 May 2026 21:09:56 +0200 Message-ID: <86tss7b27v.fsf@ltc.des.dev> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Ed Maste writes: > commit 2574974648c68c738aec3ff96644d888d7913a37 > Merge: fb4e7898a359 2c72d8219c56 > Author: Ed Maste > AuthorDate: 2026-05-14 18:59:30 +0000 > Commit: Ed Maste > CommitDate: 2026-05-14 18:59:30 +0000 > > OpenSSH: Update to 10.3p1 > [...] > diff --git a/crypto/openssh/config.h b/crypto/openssh/config.h > index b7f432596b55..69bc79c92bb5 100644 > --- a/crypto/openssh/config.h > +++ b/crypto/openssh/config.h > [...] > @@ -1915,11 +1921,7 @@ > #define SIZEOF_SHORT_INT 2 >=20=20 > /* The size of 'time_t', as computed by sizeof. */ > -#ifdef __i386__ > -#define SIZEOF_TIME_T 4 > -#else > #define SIZEOF_TIME_T 8 > -#endif >=20=20 > /* Define as const if snprintf() can declare const char *fmt */ > #define SNPRINTF_CONST const This breaks i386. DES --=20 Dag-Erling Sm=C3=B8rgrav - des@FreeBSD.org From nobody Sat May 16 19:19:06 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gHv4w21Xtz6ctdB for ; Sat, 16 May 2026 19:19: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gHv4v730Nz3PgX for ; Sat, 16 May 2026 19:19:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778959152; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xs/0+uxsG3xQ2ggyBApKDGUsdEHox4NqpxPib6pfmDo=; b=rVQbNfK9IimQKFSiJmO0TWd8MtELQbP95OnQHvLg1lekxY1r2pY+whBm08yjDlZfTx48Hz APHZVaRBSZkVBR4mni/ea/ljmZTdCyXL96O0RdeFJbFxaHunr0ANS6mX4jJuZOqEi9TPbo tt9s/Qd8el1ZLrkA2YWTpbVQinCLHRD9yRW0n2eFPb1FRxL4iTIWwTz8r1Wj06uWX0X/r5 tBPxqnYlzdFcva6cVRdakJxVHu8rSLKi7pXf4AG7yojX5BX/8/LM7BIwBFjqCPLpfTBjQv TzoYRDYak8UXW5mmzGKF4MAYu9NFEOfwTTRAhTb+ch9pRl+hqQVXL9X7rjEMvg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778959152; a=rsa-sha256; cv=none; b=jNGbXVX+lHZLaOcro9L2KTqR/cuvbjHSjTkWU+d/e12os9+Ra8WIGRJ65B2UlmDXTl4PJe g4+Pjnsl9aOmlKHYfeXglhNee6yaZEzFQggcNANflNJ5LJRTAAdT6fd5Pu8D2Yb8fTjzQJ K26dt5PXFXr1WI3R4ksxNH9k8Vb5Jns9pUOqs23xXy4PbDu44VtkR6h1NL4IDBDxp15jiX w7VEPEU2L00WLcJ7w++1fqUPhOeAq8mbyl/Y+cZkyCekMhAEtpCEXILoG7i9zfHaH+JHbt XmN6H+0EI/v0cxpPl6JuAqdA8xcKmdcxeUYiQpGscTbIEdF961E2woNtvfw2wQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778959152; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xs/0+uxsG3xQ2ggyBApKDGUsdEHox4NqpxPib6pfmDo=; b=s/gCx6uKhUHyndsXfHBlYrcqeBFiRBpoIN+wRa8gB78rBDyEsFUOuiVuxW0sapFoXA9A6A NLDoTc8Wwi2ZS1CINQzzm2vwiDomZnJ+P9+izZRQsxdIbw5CT1NMUJNj3jrrvBz66FqJ2Y gqjP4FUXm2b6EHtpDAuf0EHOLAsuKovO8d0fuJVoOr2Wgy7zS0UzIztPeiIcFHkTQr/wBQ lsdELYJ8vbyP42oEVeNk/ctFMhxa5YQssH7xay2fT31Ko72y2WwWrim7SrpDO48xbS5drj 2rEY5vA6Yn8uCV/sqGzh//WFlbi1IwEY/eOS0Q3OUCqxEuk034LaTVa4exE/ZA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gHv4v4ZwWz16LT for ; Sat, 16 May 2026 19:19:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31cbc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 16 May 2026 19:19:06 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: 61df4be487cf - main - EC2: Don't enable firstboot_pkgs in small flavour List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: 61df4be487cfbfd27b0959e1eb66ef0d8f84562f Auto-Submitted: auto-generated Date: Sat, 16 May 2026 19:19:06 +0000 Message-Id: <6a08c32a.31cbc.30915665@gitrepo.freebsd.org> The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=61df4be487cfbfd27b0959e1eb66ef0d8f84562f commit 61df4be487cfbfd27b0959e1eb66ef0d8f84562f Author: Colin Percival AuthorDate: 2026-05-16 18:58:13 +0000 Commit: Colin Percival CommitDate: 2026-05-16 19:18:52 +0000 EC2: Don't enable firstboot_pkgs in small flavour The EC2 "base" flavour installs the devel/py-awscli package at boot time by default; we don't do this in the "small" flavour, so the default behaviour was to update the FreeBSD-ports repository and then do nothing with it. Turn off firstboot_pkgs by default; if someone is using the "small" flavour of AMIs and wants to install packages at instance launch time, they simply need to add 'firstboot_pkgs_enable="YES"' to /etc/rc.conf (which they must already be editing via user-data, in order to provide the list of packages they want installed). Sponsored by: Amazon MFC after: 3 days MFC to: stable/15 Relnotes: EC2 "small" images now have firstboot_pkgs_enable="NO". --- release/tools/ec2-small.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/tools/ec2-small.conf b/release/tools/ec2-small.conf index f5904d5ea4ba..6da4444bc835 100644 --- a/release/tools/ec2-small.conf +++ b/release/tools/ec2-small.conf @@ -33,7 +33,7 @@ export VM_EXTRA_PACKAGES="${VM_EXTRA_PACKAGES} ec2-scripts \ # Services to enable in rc.conf(5). export VM_RC_LIST="${VM_RC_LIST} ec2_configinit ec2_ephemeral_swap \ - ec2_fetchkey ec2_loghostkey firstboot_pkg_upgrade firstboot_pkgs \ + ec2_fetchkey ec2_loghostkey firstboot_pkg_upgrade \ growfs sshd" vm_extra_pre_umount() { From nobody Sat May 16 19:42:26 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gHvbr2Rxwz6cwQL for ; Sat, 16 May 2026 19:42: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gHvbr1Sv3z3Tpc for ; Sat, 16 May 2026 19:42:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778960552; 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; bh=R436QAqpSmGSwVgPK5AnG6XpFVCXGKu7GEfHt2no16E=; b=x3B0BiHeTTBr6Wn6B6SLid6GUjILvYY98RKcrE1hQEjUPocmMOoXb/kK9okHbp7CAHxY2V ENjHb8hd3jexSlaX8schYcYJ+KlxriSAVf8VlAoO4zf3byi3cTkiUXidU0liUyZpP+H8mB t4kXqjwZ5YnCl3GIBCTpvb3g0YkTf1ChqyFZ/eLjHj2BA7ERRc14uCPYDqCKEgfcuXBz32 T5Jsnp0r/VNzr9luDOViufUo0UcL1JbyC4Vea0qqMf8N7WMWanHRfuhiqe7wm+pJktJ1g7 klNEZmjIgOiLP8+eqemTomwG5yXYU3P7ZKHWbJ9B1iduu1V0yo4mTzblJd3TBQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778960552; a=rsa-sha256; cv=none; b=tBC/7EQs4g/+q/znyAw6/4ZfXlVJhvGCVSTSQJY+wDML5UjGjbcr9fRVuTcJS8Z3m4okg9 s3znuZaopCHfmQqrE4UBPplRnah1jA9RbsvLTHKtY0WrYk1kNQS0jbwQCobgK6hHwzNY5e xLquUmdS6BZe7EKDQSY81XJQduGVNLg2fu9807Zr1tlCR335q9TThM/g9rFALcmqf9N9G5 OeYsv7tCfxc7Anj9NjE/+Glu2hXh549lHrD365TQlTJxSG1tALX3LotB9nHrBcSfGpiF8+ yWQqO4ujd+L2ENy+sh4+VVKlrLkyYSPg4We4AGnfpGDa5hdOc9M+n/pXVD8uyQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778960552; 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; bh=R436QAqpSmGSwVgPK5AnG6XpFVCXGKu7GEfHt2no16E=; b=uEn+WQrjjvjHqagTncznygjVGT076q21LH1j3UxFIgVgT0ab9LHz1ldFAodjb09rS0f5fZ 8TxHnRcNirZ2toCZG6B8yqEagY89YUFlVMhohJnKkaBMZuEBYoUoq+a513v+ESARTkNcbK kzrjl8DfldN97ItYGLDrefr2UxKgbCt8v0auwqNXMxKs3Noe+XJvX2iaGzf3+E5y86ouwC tJmA//7XfygL/prBHFnWJBTew5Mxwsmmy1DMYGub9UkjWuWYXKYrn3+8K7zp5eOZcClsO+ SKVsP0wZi9kvldPHepYJK2Em0ByWymF8BwUZTbkOzImz32vdUi9uZLzN0hzZTQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gHvbr0shqz17JM for ; Sat, 16 May 2026 19:42:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 35d02 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 16 May 2026 19:42:26 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Alex S From: Konstantin Belousov Subject: git: 8dd43304b397 - main - amd64/ptrace-sce-tamper test: get rid of PT_TRACE_ME List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: 8dd43304b397715a4313bcaebbf493b607a7099f Auto-Submitted: auto-generated Date: Sat, 16 May 2026 19:42:26 +0000 Message-Id: <6a08c8a2.35d02.7126c6cd@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=8dd43304b397715a4313bcaebbf493b607a7099f commit 8dd43304b397715a4313bcaebbf493b607a7099f Author: Alex S AuthorDate: 2026-05-16 01:16:32 +0000 Commit: Konstantin Belousov CommitDate: 2026-05-16 19:41:26 +0000 amd64/ptrace-sce-tamper test: get rid of PT_TRACE_ME PT_TRACE_ME is only useful in combination with exec and there is no exec in this test. Signed-off-by: Alex S MFC after: 1 week --- tests/sys/arch/amd64/ptrace-sce-tamper.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/sys/arch/amd64/ptrace-sce-tamper.c b/tests/sys/arch/amd64/ptrace-sce-tamper.c index 0645f62a7e9b..9bdedad6597b 100644 --- a/tests/sys/arch/amd64/ptrace-sce-tamper.c +++ b/tests/sys/arch/amd64/ptrace-sce-tamper.c @@ -11,6 +11,7 @@ #include #include +#include #include #include #include @@ -58,7 +59,7 @@ main(void) err(1, "fork"); if (pid == 0) { - (void)ptrace(PT_TRACE_ME, 0, 0, 0); + raise(SIGSTOP); (void)getpid(); exit(0); } else { From nobody Sat May 16 20:20:35 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gHwRr33Cvz6d0SW for ; Sat, 16 May 2026 20:20:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gHwRr2SMTz3d77 for ; Sat, 16 May 2026 20:20:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778962840; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zxxgCifDhmPEs0TAJgVgRlNH10KErbFAS/ZwmKB1mfU=; b=xMFIBIPtLD8ffKdxPzYUyZC23WVS8tYiMf0svfRjU701tzmOJpTLZkSLljRRq0kv+r0sFQ 5ilC6yvkHARVTJZgCW5Qmx25lDz6ghqU/o+0fHopCmxHN5U6BC9TqYjsckrPaA9DMHYkcH JNBZAluyy+EQQdHS6iQA98yhzg6REDiuUpfRMSMJ7eE8gjvTgTY9YuuBd2JJVT5ffeIgPJ A/TKgYI/ki2wmMHyhYzFi5//YaAcjbDEgHewQj86hiRggZINL4QiHQ1wwTWnc18N1jaSyu 73/KygWkYYZLQmmzORA2LxCqV0/dVSVtyW92E1SS5vTUL8/40oFaS4qr4r8DWg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778962840; a=rsa-sha256; cv=none; b=dNie1orjOzOLowIC8ux1nO3thIlXOSlyFk8Wq+lHcC7HswBS9YM1MiJlzxyXZs7DI61/ux Fj8bJ5KKzvzGwM4EEMl1X7/dwAYePPnDhLmhs2ypPBAqS8OtN7RMg081zvlGp5Xkier0rP s2ZBaEzdr67X4pirH1A9UfTnETMCDtkDbtC1yIOeG512ri3CgFeiIPUi+8y6C6fzPqm1DL JQUX3TgN9GbSWr86vvkj5grGavmioDKTX8KJpKPzvqlyyFIT5H3UTEpwxD13eLjSpIH4mB zda8chekivcjoes1u0lvv12ZLfVzvHdSgel39evw5ncGxNfQ9vlryAQm6LmkcA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778962840; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zxxgCifDhmPEs0TAJgVgRlNH10KErbFAS/ZwmKB1mfU=; b=slPD+WutgEhUS+kNz4p1PXspkw86p3tOtKOfFV2aLPsyZzjgrXZXQcZVFMsTlbEG7eeYw7 2QYD5p1LkFKGyt6BWnx2JouuMUaxOZYYHwsWmJ8eI+vAl0j0+qB+5SUGwQ4UHomFVFq1V7 OkgstgvTJLPpS2/llBCHxcnfgp5pcY15C/xwOK/yGvsK6tT9ObfrXg8/VAqsly743WhW0k B4U7lKBxJlQNgo3HoRf0X9Bmvo85spHhFYzqVJV4Ro17u3/cT+WJgf+3GrsW82aQn81o6H RXtydDoAsC3smDX8Zouwe1rQpzxan+zHQfgiap3tZRDtOGdJBnkhBr6QMo9vPA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gHwRr1tG6z17Zx for ; Sat, 16 May 2026 20:20:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 39c1e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 16 May 2026 20:20:35 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ruslan Bukin Subject: git: 7eb71fd267c6 - main - riscv: fix GENERIC-NODEBUG build List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: br X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7eb71fd267c6cab43650720b9ed89f72cdcc5a3b Auto-Submitted: auto-generated Date: Sat, 16 May 2026 20:20:35 +0000 Message-Id: <6a08d193.39c1e.4948f08d@gitrepo.freebsd.org> The branch main has been updated by br: URL: https://cgit.FreeBSD.org/src/commit/?id=7eb71fd267c6cab43650720b9ed89f72cdcc5a3b commit 7eb71fd267c6cab43650720b9ed89f72cdcc5a3b Author: Ruslan Bukin AuthorDate: 2026-05-16 20:17:44 +0000 Commit: Ruslan Bukin CommitDate: 2026-05-16 20:17:44 +0000 riscv: fix GENERIC-NODEBUG build Reported by: bz --- sys/riscv/iommu/iommu_pmap.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/sys/riscv/iommu/iommu_pmap.c b/sys/riscv/iommu/iommu_pmap.c index 751ba4cf1ac3..a760f9d922e6 100644 --- a/sys/riscv/iommu/iommu_pmap.c +++ b/sys/riscv/iommu/iommu_pmap.c @@ -179,6 +179,7 @@ pmap_l3(struct riscv_iommu_pmap *pmap, vm_offset_t va) return (pmap_l2_to_l3(l2, va)); } +#ifdef INVARIANTS static __inline void pmap_resident_count_inc(struct riscv_iommu_pmap *pmap, int count) { @@ -197,6 +198,17 @@ pmap_resident_count_dec(struct riscv_iommu_pmap *pmap, int count) pmap->sp_resident_count, count)); pmap->sp_resident_count -= count; } +#else +static __inline void +pmap_resident_count_inc(struct riscv_iommu_pmap *pmap, int count) +{ +} + +static __inline void +pmap_resident_count_dec(struct riscv_iommu_pmap *pmap, int count) +{ +} +#endif /*************************************************** * Page table page management routines..... From nobody Sat May 16 20:25:21 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gHwYF4qtcz6d1K4 for ; Sat, 16 May 2026 20:25: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gHwYF4Br9z3f7P for ; Sat, 16 May 2026 20:25:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778963121; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AiuvMQPrkjm2/autpHpfklPFo0glfXqUNzfi4B7wSSI=; b=Ngq+Dx+Y0ZeaPKB1T1cF3ZoQ32uH8HNOvySy45T7+V6kZDZoJpsnVk4k1U3L1yrxXZC50N HFhlMumapfkd+splz82zUPqooqAC3gVDfZPjg2bsdQaPBhDWEsmtQ/PHKbJPhpNL/d3AgI ph/SbjvXjIdduEioSp0uCu4VKG4rw9BIqN/KVbpJh1MZih7tlik+lHOoFRA2u5WLSc9LY8 k6uzmi38waLVhTfQ/I1EFMwDrzSy/PeciE13vgaFSsTYIX0v8EnJsOLTEGzRUt4DQvUuQL 2O0kGO+jXRQuUiAx4gQckUPiJmYHQHmX26EulOpHrAST+zu3OHxQY1QQLcjBlg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778963121; a=rsa-sha256; cv=none; b=s9g43ZM7HhjjYIU9kn3XkZ7847sLxs2I43/rrIwGYUtZ5wTR/GrzB3uG2dN5BoKyy1NWQF EGLApjPQZmahyG+4u6VvrF1+Ca+yznQ7S3DmbSb7CYK0lJyxMUu63fAjB1HzGd5Pq7MWem xHWaNOwz3Z/UN3wM0Iuil3eb59ZlkoH++7T4ahcOYeVBNcmFT1UfquwCGmbbA3SC4kPrZt Cya34kQ63upyYbhY4WkVJd3BIvLL1gA7Z3ldXdGmonCCCb06T1iJZNk6UmWaJTqkkXeWar DIxzuYY4+aa0Two3gbS5hvReskwQqAupj/cVJVKSvHs+hbrRmN8kY0g5u3FMxg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778963121; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AiuvMQPrkjm2/autpHpfklPFo0glfXqUNzfi4B7wSSI=; b=kAnEWUD3BuXGMLXlqOHKVha6NwbgkAOHXoDFeYuUl1NLNev+Cstv6Q16OYCASBqlm+7bqo CV5q2s9gCY6/PpwX04H86h4Atbfj37rihia7FL37H1mRGHc12VP2QCrRvMv1in27hZu3xs LkELKVlGXriaqDtw3iHnSLeYuU344pp1LlTkLFNkcwy9CugNPfomm2tVXelAjM9gbEAJOR AvitiTJccj6BjfOjKJMlgaF95H6/c/hMgr445dBG/ixx7UUXCUU0SosAioVL6Xd5AWYnWV DatES3qU29HjOHZamkZDfhj5vrvwA7g+9Y7uhYHOjY1kaNfr467KH3kk42WhrQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gHwYF3m9Dz17Nx for ; Sat, 16 May 2026 20:25:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3a300 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 16 May 2026 20:25:21 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ryan Libby Subject: git: 755c1e039adf - main - kernel: address executable stack warnings in amd64 gcc build List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rlibby X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 755c1e039adfd68ecf4d5954e13fe54263c34a03 Auto-Submitted: auto-generated Date: Sat, 16 May 2026 20:25:21 +0000 Message-Id: <6a08d2b1.3a300.184d4a75@gitrepo.freebsd.org> The branch main has been updated by rlibby: URL: https://cgit.FreeBSD.org/src/commit/?id=755c1e039adfd68ecf4d5954e13fe54263c34a03 commit 755c1e039adfd68ecf4d5954e13fe54263c34a03 Author: Ryan Libby AuthorDate: 2026-05-16 20:24:45 +0000 Commit: Ryan Libby CommitDate: 2026-05-16 20:24:45 +0000 kernel: address executable stack warnings in amd64 gcc build Mark assembly files as not requiring executable stacks. Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D56946 --- sys/amd64/amd64/cpu_switch.S | 2 ++ sys/amd64/amd64/efirt_support.S | 2 ++ sys/amd64/amd64/exception.S | 2 ++ sys/amd64/amd64/kexec_tramp.S | 2 ++ sys/amd64/amd64/locore.S | 2 ++ sys/amd64/amd64/mpboot.S | 2 ++ sys/amd64/amd64/support.S | 2 ++ sys/amd64/amd64/xen-locore.S | 2 ++ sys/amd64/ia32/ia32_sigtramp.S | 2 ++ sys/amd64/sgx/sgx_support.S | 2 ++ sys/amd64/vmm/amd/svm_support.S | 2 ++ sys/amd64/vmm/intel/vmx_support.S | 2 ++ sys/crypto/aesni/aeskeys_amd64.S | 2 ++ sys/dev/hyperv/vmbus/amd64/vmbus_vector.S | 2 ++ sys/tools/vdso_wrap.S | 2 ++ 15 files changed, 30 insertions(+) diff --git a/sys/amd64/amd64/cpu_switch.S b/sys/amd64/amd64/cpu_switch.S index 17ff8005e3cd..21e55e64d74a 100644 --- a/sys/amd64/amd64/cpu_switch.S +++ b/sys/amd64/amd64/cpu_switch.S @@ -496,3 +496,5 @@ sw1wait: cmpq %rcx, %rdx je 1b jmp sw1cont + + .section .note.GNU-stack,"",%progbits diff --git a/sys/amd64/amd64/efirt_support.S b/sys/amd64/amd64/efirt_support.S index 54578f573750..671fd52e5016 100644 --- a/sys/amd64/amd64/efirt_support.S +++ b/sys/amd64/amd64/efirt_support.S @@ -117,3 +117,5 @@ ENTRY(efi_rt_fault) END(efi_rt_fault) efi_rt_panic_str: .asciz "efi_rt_arch_call: too many args" + + .section .note.GNU-stack,"",%progbits diff --git a/sys/amd64/amd64/exception.S b/sys/amd64/amd64/exception.S index babfbacf92ef..5ff75fb65740 100644 --- a/sys/amd64/amd64/exception.S +++ b/sys/amd64/amd64/exception.S @@ -1373,3 +1373,5 @@ gsbase_load_fault: #ifdef HWPMC_HOOKS ENTRY(end_exceptions) #endif + + .section .note.GNU-stack,"",%progbits diff --git a/sys/amd64/amd64/kexec_tramp.S b/sys/amd64/amd64/kexec_tramp.S index 6a2de676bc35..297a2a715a10 100644 --- a/sys/amd64/amd64/kexec_tramp.S +++ b/sys/amd64/amd64/kexec_tramp.S @@ -89,3 +89,5 @@ CNAME(kexec_saved_image): CNAME(kexec_do_reboot_size): .globl kexec_do_reboot_size .quad . - kexec_do_reboot + + .section .note.GNU-stack,"",%progbits diff --git a/sys/amd64/amd64/locore.S b/sys/amd64/amd64/locore.S index 2be555b25160..d0b67d8872b9 100644 --- a/sys/amd64/amd64/locore.S +++ b/sys/amd64/amd64/locore.S @@ -194,3 +194,5 @@ ENTRY(la57_trampoline_end) .globl bootstack .space BOOTSTACK_SIZE /* space for bootstack - temporary stack */ bootstack: + + .section .note.GNU-stack,"",%progbits diff --git a/sys/amd64/amd64/mpboot.S b/sys/amd64/amd64/mpboot.S index e3d940088f14..5929b529147b 100644 --- a/sys/amd64/amd64/mpboot.S +++ b/sys/amd64/amd64/mpboot.S @@ -276,3 +276,5 @@ entry_64: wrmsr jmp init_secondary + + .section .note.GNU-stack,"",%progbits diff --git a/sys/amd64/amd64/support.S b/sys/amd64/amd64/support.S index 27694a95653c..09d4ef85b087 100644 --- a/sys/amd64/amd64/support.S +++ b/sys/amd64/amd64/support.S @@ -1996,3 +1996,5 @@ ENTRY(cpu_sync_core) pushq %rdx iretq END(cpu_sync_core) + + .section .note.GNU-stack,"",%progbits diff --git a/sys/amd64/amd64/xen-locore.S b/sys/amd64/amd64/xen-locore.S index ed2aae038b6d..8ee135f45400 100644 --- a/sys/amd64/amd64/xen-locore.S +++ b/sys/amd64/amd64/xen-locore.S @@ -206,3 +206,5 @@ gdt32: .long 0x0000ffff # %ds, %es, %ss .long 0x00cf9200 gdt32end: + + .section .note.GNU-stack,"",%progbits diff --git a/sys/amd64/ia32/ia32_sigtramp.S b/sys/amd64/ia32/ia32_sigtramp.S index 1a80f78a3234..8d700e1fe912 100644 --- a/sys/amd64/ia32/ia32_sigtramp.S +++ b/sys/amd64/ia32/ia32_sigtramp.S @@ -138,3 +138,5 @@ __vdso_lcall_tramp: ud2 #endif .p2align 1 + + .section .note.GNU-stack,"",%progbits diff --git a/sys/amd64/sgx/sgx_support.S b/sys/amd64/sgx/sgx_support.S index 4816f178e657..53fe359f3f41 100644 --- a/sys/amd64/sgx/sgx_support.S +++ b/sys/amd64/sgx/sgx_support.S @@ -66,3 +66,5 @@ sgx_onfault: popq %rbx POP_FRAME_POINTER ret + + .section .note.GNU-stack,"",%progbits diff --git a/sys/amd64/vmm/amd/svm_support.S b/sys/amd64/vmm/amd/svm_support.S index 26bf36b98f71..225a2a83e7b1 100644 --- a/sys/amd64/vmm/amd/svm_support.S +++ b/sys/amd64/vmm/amd/svm_support.S @@ -155,3 +155,5 @@ ENTRY(svm_launch) VLEAVE ret END(svm_launch) + + .section .note.GNU-stack,"",%progbits diff --git a/sys/amd64/vmm/intel/vmx_support.S b/sys/amd64/vmm/intel/vmx_support.S index 877e377f892d..9a3c6b3fd80b 100644 --- a/sys/amd64/vmm/intel/vmx_support.S +++ b/sys/amd64/vmm/intel/vmx_support.S @@ -268,3 +268,5 @@ ENTRY(vmx_call_isr) VLEAVE ret END(vmx_call_isr) + + .section .note.GNU-stack,"",%progbits diff --git a/sys/crypto/aesni/aeskeys_amd64.S b/sys/crypto/aesni/aeskeys_amd64.S index 667e64f441a5..8ae4a54a3d8d 100644 --- a/sys/crypto/aesni/aeskeys_amd64.S +++ b/sys/crypto/aesni/aeskeys_amd64.S @@ -219,3 +219,5 @@ ENTRY(aesni_set_deckey) retq .cfi_endproc END(aesni_set_deckey) + + .section .note.GNU-stack,"",%progbits diff --git a/sys/dev/hyperv/vmbus/amd64/vmbus_vector.S b/sys/dev/hyperv/vmbus/amd64/vmbus_vector.S index a15041ae7e32..f7479dc1f6f8 100644 --- a/sys/dev/hyperv/vmbus/amd64/vmbus_vector.S +++ b/sys/dev/hyperv/vmbus/amd64/vmbus_vector.S @@ -40,3 +40,5 @@ movq %rsp, %rdi call vmbus_handle_intr jmp doreti + + .section .note.GNU-stack,"",%progbits diff --git a/sys/tools/vdso_wrap.S b/sys/tools/vdso_wrap.S index 5a815fd6f499..865a7f1e14aa 100644 --- a/sys/tools/vdso_wrap.S +++ b/sys/tools/vdso_wrap.S @@ -46,3 +46,5 @@ VDSO_BLOB_START(VDSO_NAME): VDSO_BLOB_END(VDSO_NAME): .globl VDSO_BLOB_SIZE(VDSO_NAME) .set VDSO_BLOB_SIZE(VDSO_NAME), . - VDSO_BLOB_START(VDSO_NAME) + + .section .note.GNU-stack,"",%progbits From nobody Sat May 16 21:22:06 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gHxpq2pCSz6d5YQ for ; Sat, 16 May 2026 21:22: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gHxpq2FX1z3nGy for ; Sat, 16 May 2026 21:22:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778966531; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CDYKfU7+72Tx2niolu346e6Is+s7i7xwwXzsc4KREnY=; b=XGWXxi4463XmzDC4daXxMO+IWgEMBuexLsekAMxSdAy87d8dmTy9qdsgnjLHMo/YypL83E hp28fNkS3Ovp0gZwGkiVtIm7IB1UoTZ1K39CbOrHFDxG84Ibkfar93gqmjoG9kBeH6WKup Q6bBf7prWmB+OO2dYGQmkd+q/HIV5N51U0zMJcm5U3RJB5xb5odvBlr3BclxGV0VbEfL9n DMngWQIFk/vIl1GeIOAuZcONm+/9EPAAkjQePgn0UImazgqnWGXWy0eHwpNkHRJItt27qu emU1MuaSwG8vGTwnRvAZaFgxyz6TX9LkJ2vRNoyF8PmnXlhvAvb5ZUa+Rv+QGA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778966531; a=rsa-sha256; cv=none; b=tRiTbXQEfwZeY1mvBLP3E9DAyBveGcz/q4vH39DLETkKUcU48TTTrpthCfeTPHEoiDpryR s2bQ7723MFr2wWiYKjJeMrwQj6fXw8kQcC8YBTZ5ztJJ/akhQHfowf+Zc4BjF0OaMLPPOm 9/qqCH5g84TNSsNgaB27w4JJ6BlxcRAFwtYHNQhzLCoXmesB0f+p3xInQ86kCQI0UMA897 a04ZSnYbObJGLhGnShItLwGFnrxsfWRkdmXZG/rOsWeLrW+YWZzMThgKaTba5AMO1FooVu pf8w/Sxr2ujU4BcdH8FXZ2gPKEkeaS9Y6T8sZAr3bhbci/WdSqX2ArAtXwXs+g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778966531; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CDYKfU7+72Tx2niolu346e6Is+s7i7xwwXzsc4KREnY=; b=ll/hhXVkP6wjOEnHhZliezWNpsQYHPnlnVm7xQ0mj2Z7teRM4njpotdNJiVA7eJ91x1URm 132ODHrRw4nwrXEnE8eCpYteSyTPKex9cjjx0hCqsaUCzEeVx5E+LTYulcwaHlrBRwvoM8 BcZtaabew4jNz/CJYIxg4Qx9DJmBDax0n3naF1VMscl2kV2GdoT4H6u2IHc5OObu6Ksfba UyL2/rcIXMoFyI5RRxpSdhuLzSCg1AACTjr8Y+yQJsx+zkcsEUj1tnL8LO9lZYhgehcwkE /gTj/9rzahMNmLlhjgJBvla+B8E3OJwQoUfPqerzNS05BOVJHFLEMFc65+RG1A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gHxpq1k46z19mW for ; Sat, 16 May 2026 21:22:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3f315 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 16 May 2026 21:22:06 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Pouria Mousavizadeh Tehrani Subject: git: 2c6617658f0c - stable/15 - rtnetlink: Align RTA_MULTIPATH length validation in nlattr_get List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pouria X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 2c6617658f0cabb1e83a47da02882454e4210bd9 Auto-Submitted: auto-generated Date: Sat, 16 May 2026 21:22:06 +0000 Message-Id: <6a08dffe.3f315.34bbd51a@gitrepo.freebsd.org> The branch stable/15 has been updated by pouria: URL: https://cgit.FreeBSD.org/src/commit/?id=2c6617658f0cabb1e83a47da02882454e4210bd9 commit 2c6617658f0cabb1e83a47da02882454e4210bd9 Author: Pouria Mousavizadeh Tehrani AuthorDate: 2026-05-12 11:34:28 +0000 Commit: Pouria Mousavizadeh Tehrani CommitDate: 2026-05-16 21:21:50 +0000 rtnetlink: Align RTA_MULTIPATH length validation in nlattr_get Fix length validation of RTA_MULTIPATH attributes in nlattr_get_multipath() by making sure the user request is align. PR: 295102 Reported by: Robert Morris Reviewed by: markj Fixes: 7e5bf68495cc ("netlink: add netlink support") MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D56963 (cherry picked from commit 4329663a861ef74796b79b6b0872cfe10d31c591) --- sys/netlink/route/rt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/netlink/route/rt.c b/sys/netlink/route/rt.c index 4d7f676d2aec..7641417a8e77 100644 --- a/sys/netlink/route/rt.c +++ b/sys/netlink/route/rt.c @@ -452,8 +452,9 @@ nlattr_get_multipath(struct nlattr *nla, struct nl_pstate *npt, for (rtnh = (struct rtnexthop *)(nla + 1); data_len > 0; ) { struct rta_mpath_nh *mpnh; + len = NL_ITEM_ALIGN(rtnh->rtnh_len); if (__predict_false(rtnh->rtnh_len <= sizeof(*rtnh) || - rtnh->rtnh_len > data_len)) { + len < rtnh->rtnh_len || len > data_len)) { NLMSG_REPORT_ERR_MSG(npt, "%s: bad length %u", __func__, rtnh->rtnh_len); return (EINVAL); @@ -467,7 +468,6 @@ nlattr_get_multipath(struct nlattr *nla, struct nl_pstate *npt, mp->num_nhops - 1); return (error); } - len = NL_ITEM_ALIGN(rtnh->rtnh_len); data_len -= len; rtnh = (struct rtnexthop *)((char *)rtnh + len); } From nobody Sat May 16 21:25:48 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gHxv609jTz6d5x5 for ; Sat, 16 May 2026 21:25: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gHxv56kT7z3nmx for ; Sat, 16 May 2026 21:25:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778966753; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MupTa/AJc1W3SYIvCcBMLRKYIu7QXb3LRyrPWSWQn9Y=; b=tbCz2855roNfavUcLYRYEOf4nBYBfWWzkjIx9BYlm0eQu2whDjJ7qY8coAAgHJLl0ks6Is cXPNn8ZDjBKT90BcIruWlHPaeQNKQ5ughAPVIZzflLCBX2JqtG3ijPe7YrRVX6mgmTgSh7 Avr2tY8ooUKzcmvfn32M2n82wzN58CHrTYsubsfwTYSyaR5U5i5R+n9TNnEgpMb7RR2ITQ FftYbbfnPx6hzni4yTwDMTuW3frvYMMKj9Q2LYjDzJXlM1YXKYPsx6zOqEzTL9POAGh3dw Lbdy3u3E+/z6Ecxz1xJfMapvTjkG9a6Vwmdjojz2KWdUwDqTKxf0RCamPqNSZA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778966753; a=rsa-sha256; cv=none; b=xYaNIIWFbvMn9bEpGjPQcFQ/rYrY2C0auJKyuF8JERwFBpkmf3e4+isvzzlNiJHKiWNUBy kMKMHymn47z6zU0nlKm+v6g8dMJpeuogp1QIZ1DVKpxXJYUBINY+dqNrDqRkg2cPh6evdi H1Ja8euv8TpCRlYtynea1HOK9mKDvDoejn28HANEYRA8rckPGkTWNMwmu7MYpN4mZuWaEn 69ImHn38ccw7pz7BkMouayYlPnqgJxOy03AF7oi0uXredhaL5VCZd5sXe50kY2R0zDixLV QICEqAnkvynZePtMdU4CcLLvoeBeWCfNqA72dWYGmfq+a3tr8AZ5rdY/ami5fQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778966753; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MupTa/AJc1W3SYIvCcBMLRKYIu7QXb3LRyrPWSWQn9Y=; b=hLM0bzh2M0dzZQ5gudDBXEA7ioVyUBgwAVw+M1As0K3h0wYNcPlPVOchvK3V6AEMZjM7vM yCaOsGgWizK8tnyYQN+zrG8WU1QbaD+9wPNW2/ciXCfC3/IXyI1gIeLtNyzAetduiJEXTt P7nwn+1LyS+XCa+EIBmmlEscsgqk4PWgBxjrCNdXOue7JG0ClsUYQ3hd7JmzKNqBqEdHOb 4Ldyvrs9l22B/X1w4wQOeTno2MOzn0dQD0I1cq1DDbiSriqwtE7nsMqA068tMiTGs0Btxj VBav33MB2hiBrsUMd3ZGj3n/B0s+t0xTE96c0ayAuDlvLwleFFQLPfCSJq2KBA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gHxv56HdTz1B43 for ; Sat, 16 May 2026 21:25:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3f89d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 16 May 2026 21:25:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Pouria Mousavizadeh Tehrani Subject: git: 3e2308d57080 - stable/15 - rtnetlink: Check for allocation failure in nlattr_get_multipath() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pouria X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 3e2308d57080a2345e3db1139683368b504ee0bd Auto-Submitted: auto-generated Date: Sat, 16 May 2026 21:25:48 +0000 Message-Id: <6a08e0dc.3f89d.3a118d23@gitrepo.freebsd.org> The branch stable/15 has been updated by pouria: URL: https://cgit.FreeBSD.org/src/commit/?id=3e2308d57080a2345e3db1139683368b504ee0bd commit 3e2308d57080a2345e3db1139683368b504ee0bd Author: Pouria Mousavizadeh Tehrani AuthorDate: 2026-05-11 19:53:21 +0000 Commit: Pouria Mousavizadeh Tehrani CommitDate: 2026-05-16 21:24:19 +0000 rtnetlink: Check for allocation failure in nlattr_get_multipath() Check for alloction failure on `npt_alloc()` for RTA_MULTIPATH attributes in `nlattr_get_multipath()`. Reported by: Joshua Rogers of AISLE Research Team Reviewed by: markj MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D56954 (cherry picked from commit 188631e43a1a5d2985156141c2e244a925670683) --- sys/netlink/route/rt.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/netlink/route/rt.c b/sys/netlink/route/rt.c index 7641417a8e77..a76e00d34502 100644 --- a/sys/netlink/route/rt.c +++ b/sys/netlink/route/rt.c @@ -447,6 +447,10 @@ nlattr_get_multipath(struct nlattr *nla, struct nl_pstate *npt, max_nhops = data_len / sizeof(struct rtnexthop); mp = npt_alloc(npt, (max_nhops + 2) * sizeof(struct rta_mpath_nh)); + if (mp == NULL) { + NLMSG_REPORT_ERR_MSG(npt, "%s: too many RTA_MULTIPATH", __func__); + return (ENOMEM); + } mp->num_nhops = 0; for (rtnh = (struct rtnexthop *)(nla + 1); data_len > 0; ) { From nobody Sat May 16 21:33:02 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gHy3L62mCz6d6Xs for ; Sat, 16 May 2026 21: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gHy3L5BD1z3pSc for ; Sat, 16 May 2026 21: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=1778967182; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SoRard80J+gNIx+OIGQBUzEBKiyqyP2pebtC9sqycdc=; b=SHR18u5lkFBMQhuasbD414Fkpupy7a/c705sSq6C15zXs/OLyKM5/Xf5hB1ZftrEyRccru WztTR4XxE1C4s1Tu8VX+Vnb7Qt0x62RNst72+iRxqNdEUav+IcRvfHhYVsef8/Inkc+/QZ p+F1T6rUfJJHeBLsCzGArVWRRL26q+GBEy6EXMMPj35qksNzWeHXgcyDfs7AeurPFLsmGh 4w3ybMMO05Wav0EX9bmsKKwkD1xDhyHKjarQN7AgPpaE7/VUnPOCm18mWvpqNfPcTwvkls KcT0ciZ/0kNB6HLA0gIQtROZWcNY+qlLwLjYmtdFy1IGdOra/HkuqBTnP9QnDA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778967182; a=rsa-sha256; cv=none; b=yGL1t4FVsjW+P31FOCd++XtDZPhY7CUUZxCYGq99cOACR5715NISRWZyK+QY3ZC/pAWhk3 o56V6jWdb0Q9mEuchsxQWRjMTHgBmJqzcsPaXNB682/yOyMX96Yrmx0chQxvzz5iL7x866 o3+pCagIBvVeafSzztnS6cxvtCrEADNh6jm/xF4thb0ppGpzfXyQk7mO6MzDDvQ0rtNy89 oWLLpqLtDrYIVvddvGidpmhHqDeuAjsVWgiInztUdWpiH2Zr3s4rPG1fqIVEoSTD4vH80h mGs1pYZSxjIu0IFrLL635IioH9ly8JhW+rJZxTCWbhXCfUX1iPgDMQELCqW/zA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778967182; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SoRard80J+gNIx+OIGQBUzEBKiyqyP2pebtC9sqycdc=; b=apxr30/QZVRPZGlvEXlBSWbb+EW5Mj38eL81pnOr7vnVWJxM/56VbPi0PVwQcEZ2c+d55i BmKgzcmeckvqZRqRbz9VGh7tfGuPcT3h/NMfPYF8DNCJj+h4XXYXUirEf8FCUqkTYSKzVw yAhPk2omgxmh8oyPWfIznCWJyZ9DtxEB9jv+cAxtlzEe+/S5da9m54tQBEPNOIS8k4qNRA Iks9iSArvDX/CmcIl/mlV9qU3X2deI/ZBocIji/IPrzw9AiPIweB/HiwNzYvvZYGXrwGQN dgWxV+sC48Ww4ouUZFUZrCsZQqQ9cTt1LK/t8NkuqADFaQZ44H/d6Iwr00hokA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gHy3L4gzrz1B9C for ; Sat, 16 May 2026 21:33:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e9ef by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 16 May 2026 21:33:02 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Pouria Mousavizadeh Tehrani Subject: git: 44be923a2b6b - stable/14 - rtnetlink: Align RTA_MULTIPATH length validation in nlattr_get List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pouria X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 44be923a2b6bacd664b7e87e486cccd6fcc7cbad Auto-Submitted: auto-generated Date: Sat, 16 May 2026 21:33:02 +0000 Message-Id: <6a08e28e.3e9ef.c86f21b@gitrepo.freebsd.org> The branch stable/14 has been updated by pouria: URL: https://cgit.FreeBSD.org/src/commit/?id=44be923a2b6bacd664b7e87e486cccd6fcc7cbad commit 44be923a2b6bacd664b7e87e486cccd6fcc7cbad Author: Pouria Mousavizadeh Tehrani AuthorDate: 2026-05-12 11:34:28 +0000 Commit: Pouria Mousavizadeh Tehrani CommitDate: 2026-05-16 21:28:09 +0000 rtnetlink: Align RTA_MULTIPATH length validation in nlattr_get Fix length validation of RTA_MULTIPATH attributes in nlattr_get_multipath() by making sure the user request is align. PR: 295102 Reported by: Robert Morris Reviewed by: markj Fixes: 7e5bf68495cc ("netlink: add netlink support") MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D56963 (cherry picked from commit 4329663a861ef74796b79b6b0872cfe10d31c591) (cherry picked from commit 2c6617658f0cabb1e83a47da02882454e4210bd9) --- sys/netlink/route/rt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/netlink/route/rt.c b/sys/netlink/route/rt.c index 7a6ba6ef27c5..8e9203182d76 100644 --- a/sys/netlink/route/rt.c +++ b/sys/netlink/route/rt.c @@ -448,8 +448,9 @@ nlattr_get_multipath(struct nlattr *nla, struct nl_pstate *npt, for (rtnh = (struct rtnexthop *)(nla + 1); data_len > 0; ) { struct rta_mpath_nh *mpnh; + len = NL_ITEM_ALIGN(rtnh->rtnh_len); if (__predict_false(rtnh->rtnh_len <= sizeof(*rtnh) || - rtnh->rtnh_len > data_len)) { + len < rtnh->rtnh_len || len > data_len)) { NLMSG_REPORT_ERR_MSG(npt, "%s: bad length %u", __func__, rtnh->rtnh_len); return (EINVAL); @@ -463,7 +464,6 @@ nlattr_get_multipath(struct nlattr *nla, struct nl_pstate *npt, mp->num_nhops - 1); return (error); } - len = NL_ITEM_ALIGN(rtnh->rtnh_len); data_len -= len; rtnh = (struct rtnexthop *)((char *)rtnh + len); } From nobody Sat May 16 21:33:03 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gHy3N3NlBz6d6Vb for ; Sat, 16 May 2026 21: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gHy3M6SBjz3p8j for ; Sat, 16 May 2026 21:33:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778967183; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Q6scHIhUVZthHUmIJBkpn09ZI3l+uevuG0zmT0Yfssg=; b=vFbwUS2DmBubM7tw5/pGy16+JmSBuwZ4uSH3ExWFvyZ1lHJ2A00b37dsYqYP4Ppx73GzVz pmVDuD7JagpF7hKYEKkWor5nk5YP8PH7F+CAbSdJuFrEieO/Hlo2a4jcVxleiPwhg/BKql beKnf6upSII+gYYAj7Yu7QaiP7RtwOje6uyThBApIDcll6YJSfI/QDBFT53nfYpD+ABnvY 6G0H6SEsi4wYaY/Mq4ax7sG22QR3Mi0GSTTiNJYbLRqUKBUuCfWXXaY6ugxE5Gt/0aCHpM fNzDaKTvKfoM99YgdnNudotTfLkyx+e6YStyWUVddyHDw29QgYEwmpI8eUJ2Gg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778967183; a=rsa-sha256; cv=none; b=SvTXKrIKiIpxesdcqYQ0gSQQJo3ocBy6izlQySLVzQQIHZsGPyR9a18oTO8qGgZdIilyxd +3ry1P/w2ik2Q4oDyJEe/aRXspKAqq+yewI8YAvIOCWZ8aAKSUyXbfdrnHgK4NLIXiKnmL y8tclP2tFXuxH1aBbWkj9SiG/zu1oScFQpsoXpvOajAVqM+6SCtbnkVePSif96hVHvLvGC NUjXgtwYqtGv8czF1VGvyUQxdg92kfPr+1LX2P99+isCS4GEnARqRGLOCCcjgl/DqQxlGr 09uUefeb+t1vGEb/kN8odcLCeR3lFefhVg9YeJnmaaI1eC40dk94K3giPsC28g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778967183; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Q6scHIhUVZthHUmIJBkpn09ZI3l+uevuG0zmT0Yfssg=; b=JzP9iMGtdPr41iOklaELoj5WJUvTaq/Oi5hF06R76DD6rgsNdCdvH7iFp6Oz9KFWxGuKW1 A7FF5RV8EroyY+mqtzmtmtGsJyqXfpplzNTfDRknrBOKR5cQRslKQu+UD3rT6yUGPg8JnP qJIC+X4AyY8L8z8CJ5gdsp/Vd+smKrbZSFLPfMhnhyTlC7wBs6AI2cbfhWkpMVMFfd9fxm slSwsaklw5Y0v62P4/sAmGALlQfOrWpjobGOLDCj4UnnH/vmUqOlrZ0/MI/3ohcyg/yHiX smIINS3d7Qd8JYr3nxNq9eT7NCgBLsV5rdqov3HLsrGY+cuQUIJaM0fATlJx2A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gHy3M5XN5z1BD4 for ; Sat, 16 May 2026 21:33:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4011c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 16 May 2026 21:33:03 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Pouria Mousavizadeh Tehrani Subject: git: c9b5ce2422cc - stable/14 - rtnetlink: Check for allocation failure in nlattr_get_multipath() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pouria X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c9b5ce2422cc1494a0dffee4c4e5864e39217472 Auto-Submitted: auto-generated Date: Sat, 16 May 2026 21:33:03 +0000 Message-Id: <6a08e28f.4011c.6e6e6a59@gitrepo.freebsd.org> The branch stable/14 has been updated by pouria: URL: https://cgit.FreeBSD.org/src/commit/?id=c9b5ce2422cc1494a0dffee4c4e5864e39217472 commit c9b5ce2422cc1494a0dffee4c4e5864e39217472 Author: Pouria Mousavizadeh Tehrani AuthorDate: 2026-05-11 19:53:21 +0000 Commit: Pouria Mousavizadeh Tehrani CommitDate: 2026-05-16 21:28:30 +0000 rtnetlink: Check for allocation failure in nlattr_get_multipath() Check for alloction failure on `npt_alloc()` for RTA_MULTIPATH attributes in `nlattr_get_multipath()`. Reported by: Joshua Rogers of AISLE Research Team Reviewed by: markj MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D56954 (cherry picked from commit 188631e43a1a5d2985156141c2e244a925670683) (cherry picked from commit 3e2308d57080a2345e3db1139683368b504ee0bd) --- sys/netlink/route/rt.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/netlink/route/rt.c b/sys/netlink/route/rt.c index 8e9203182d76..fac174e01efd 100644 --- a/sys/netlink/route/rt.c +++ b/sys/netlink/route/rt.c @@ -443,6 +443,10 @@ nlattr_get_multipath(struct nlattr *nla, struct nl_pstate *npt, max_nhops = data_len / sizeof(struct rtnexthop); mp = npt_alloc(npt, (max_nhops + 2) * sizeof(struct rta_mpath_nh)); + if (mp == NULL) { + NLMSG_REPORT_ERR_MSG(npt, "%s: too many RTA_MULTIPATH", __func__); + return (ENOMEM); + } mp->num_nhops = 0; for (rtnh = (struct rtnexthop *)(nla + 1); data_len > 0; ) { From nobody Sat May 16 21:42:18 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gHyG22tDFz6d6g8 for ; Sat, 16 May 2026 21:42:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gHyG222xvz3qvJ for ; Sat, 16 May 2026 21: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=1778967738; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2YOXJ+fgzQp1VUHWBKCfxVyRNQvmh0NQwna+VtOdSdg=; b=cbAWCTgw+DGYZ0OoxizPNXZg2LkuR+uC7dE1fUv4tKdDsxVk+TNPAbK6HY5p5+s57C3IXY ibhEzsg+VmOj4x6tVNuz0+o0k/B6yPyFbg5g0wWhGgNWwoJrVsbkCwxS3OW39463DjdecN xSVmNLZmrAVb4GlfqEayG0rEBtYZHuAccUQQFlUDQSTvXRxu+ajXcalOMLLBZlEXhFg6WK CaSs+ToiBwuw0QcOmqSyGPCmCSzo51GrRBNrIoF3DflNYyYFvWdmxE+fsyr2HvRkglqyd1 0KgKkiFUxtR+G7H+fIBYwME1eYhzzFUE4ylaZk/00PpABuFmdQUzi5XriS0mEA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778967738; a=rsa-sha256; cv=none; b=jA9Tlpy7cDkJQkRXKe9AI86jh+8FhPW2ugq0Ei5XiSQv200Gd5qQsau6F2SJux7aALSQtK RUGqKAyJeK6LZ7hS3xvhowvl7lQc98COqP9PANcv9s92MmDZsH7g28lP4uIUzDCJlinnGd AXHLDlldAXQh3UM99AUMI1c9qLbDi2vRAr0oiyEDaIMzUBVCoNib6onS1WFozsLfTUq/oH AuNmf3Ae/WN0Dny9CVqzjP3Rt45rM4TXDc4Mw6YPDfDMsRBgbYG+UQN9wTKmf3fSaMsj4Q HA2Ju89RltT+rvBUKU2qGI89XEdUTwPKAs1JRiYFMqKqTl0tCViQpdEOHp5k2A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778967738; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2YOXJ+fgzQp1VUHWBKCfxVyRNQvmh0NQwna+VtOdSdg=; b=f13uyzQf981D+FCgtdPcqQ//Qdpxgq24CSeuDpFGe77ZrP6VQxB1DT3Zr4sU6LBSzry1Ol vRnAQVFdhpt4j0YlE2mpkm2a5Ie0i9mF8Fhaoh0MStD0g2YHoIJVhACiGhVcubKPSpsfrs UhCjkAQoake3gHQfaRto17s3Tq9h0mWoSxMM5y3Z7Yoq7BS6Hp63V5TriDGchyulE/8RgT GY1eYi2m6KgWCJYGs3qwqButVxyp7SHMlTKttgcLLIsS8KkMzHTU/dUmPDxhty1eZ6A2Qg 7LCzDdDRrMmBcAAPraXmLYdkdFuj6SnTTmxwcTK3+w9QY4nKRDztnutCKMSSuw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gHyG21dpgz1Bdm for ; Sat, 16 May 2026 21:42:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 409b8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 16 May 2026 21:42:18 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 72ab129799a2 - main - x86: remove sys/mount.h from genassym.c List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: 72ab129799a231e322b119de3f9c1263e76527b8 Auto-Submitted: auto-generated Date: Sat, 16 May 2026 21:42:18 +0000 Message-Id: <6a08e4ba.409b8.4c0777e2@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=72ab129799a231e322b119de3f9c1263e76527b8 commit 72ab129799a231e322b119de3f9c1263e76527b8 Author: Konstantin Belousov AuthorDate: 2026-05-16 19:27:40 +0000 Commit: Konstantin Belousov CommitDate: 2026-05-16 21:40:31 +0000 x86: remove sys/mount.h from genassym.c The header is not needed, and causes some issues with build because it requires vnode_if.h generated due to transient dependency from vnode.h. While there, remove unneeded explicit sys/cdefs.h and sys/param.h usage. Reported and tested by: thierry Fixes: 1d5e4020e36e ("vnode: add VIRF_KNOTE flag") Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/amd64/amd64/genassym.c | 3 --- sys/i386/i386/genassym.c | 3 --- 2 files changed, 6 deletions(-) diff --git a/sys/amd64/amd64/genassym.c b/sys/amd64/amd64/genassym.c index 2716784ee871..875c536166d1 100644 --- a/sys/amd64/amd64/genassym.c +++ b/sys/amd64/amd64/genassym.c @@ -32,11 +32,9 @@ * SUCH DAMAGE. */ -#include #include "opt_hwpmc_hooks.h" #include "opt_kstack_pages.h" -#include #include #include #include @@ -46,7 +44,6 @@ #include #endif #include -#include #include #include #include diff --git a/sys/i386/i386/genassym.c b/sys/i386/i386/genassym.c index d4d80fbb38ac..1a31f6b3428c 100644 --- a/sys/i386/i386/genassym.c +++ b/sys/i386/i386/genassym.c @@ -32,12 +32,10 @@ * SUCH DAMAGE. */ -#include #include "opt_apic.h" #include "opt_hwpmc_hooks.h" #include "opt_kstack_pages.h" -#include #include #include #include @@ -47,7 +45,6 @@ #endif #include #include -#include #include #include #include From nobody Sat May 16 22:03:05 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gHyk65T7Yz6d8RY for ; Sat, 16 May 2026 22:03: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gHyk63m7Yz3t8x for ; Sat, 16 May 2026 22:03:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778968990; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DXoxkCex8htvS+hTlJ5EJuIY1xQf7UjQLNKLVVUVR2w=; b=Ux5ibQmABtWSY2yF6mGtN2e4by+6/CeYi8XCWoQ8QdQeox0TYPpLRDVKV4Wi4jDHXAkRf6 VH5bEN68RaqxEQc2WLAsDAqmKRMXX0Sh6ktXcxr01uvaLAHUYlqACUSBHr2uLuYD9spLlz 9OY3l0OwFsBZCv4sxq8Qv2kuXR/1hsTJpX6WLeWFkZBs05uH1qwDx9QdzZ6t6tQqh7Wta4 bEyiAt3pRe6lTV/amnWPk4tXXmnd4zUikeOwDORrlcS8ZyN0HgYClx5EpFtlL66TutACBK QPuJ1O+qstFo4OYGitPud+oCyM18Tai6CgGIs/kw9int5Ee3+l/30YRbsGWc7w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778968990; a=rsa-sha256; cv=none; b=ZjWoDEMjIqvf//JRLIDkWwvEMbu4ykYvZZ3qyV3Z4fDkKTCeAQ14hFYtqNrNSdBuz3p7+F GoGlO1LmrKPNY8CKu0gjqRxvZxmQGbsrhhW9NKlopnnC7CexQN1LFddWRj4KodubCHb9b9 S/ba77MayoJP3cneSVhfV90x5xSXP+7MdophsA3mgTL2p9tK//lrpxr7d2ZWeT5g35fkxS HgazIZ4Wg0TH56zNJhjKcsmXbyxeFHqrZk0XOMCL0DibrmH3wvFSBasYB1PBqWo3ShlUL/ f42AgsbcyBkX7a7+jAOiBSWURX2U4KAR1/Rf7MNa0n8i8izH8EdD59NcDiy5MQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778968990; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DXoxkCex8htvS+hTlJ5EJuIY1xQf7UjQLNKLVVUVR2w=; b=yRKSJ4Difdh/zYaEgcfJEEgNTEp+vVaOcYuN5+yUR9PbA6HjBNyaBVnhHl+vZ+QVCmq7E6 ulBl559CS6KN0ESl/O++CZtNayLfjKeX2PqLilhzVQ+UyjiChdteUsCNdaMzyWYGSutYLY kwy+j/lGTJxbZlu0No+2RC/mL1Ky1uP1waYZH2sKN76CwOPLSHVeP1i+PjQRqvHc6p1br3 IxHqYfHA4tRKwuO7K2eeYyDfR2kTh5TztCJ+YnYAnudB7Mo8B8/KebPsiOv1knNU/H86ta pRfv3LKKqokjbfq0aoNcI6/Lj5/xnPU6C0FYxF3jVBic+vZ0uf6mnjq1dR1lKQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gHyk63Mncz1C7c for ; Sat, 16 May 2026 22:03:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 43ff1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 16 May 2026 22:03:05 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jose Luis Duran Subject: git: 3d246db08333 - main - blocklist: Add back probes List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: 3d246db08333c06df343281d5aaebfd07ea08252 Auto-Submitted: auto-generated Date: Sat, 16 May 2026 22:03:05 +0000 Message-Id: <6a08e999.43ff1.491de9e2@gitrepo.freebsd.org> The branch main has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=3d246db08333c06df343281d5aaebfd07ea08252 commit 3d246db08333c06df343281d5aaebfd07ea08252 Author: Jose Luis Duran AuthorDate: 2026-05-16 22:00:02 +0000 Commit: Jose Luis Duran CommitDate: 2026-05-16 22:00:02 +0000 blocklist: Add back probes The banner exchange was moved to the sshd-auth process in upstream commit bb781f02d4efd178e329a62a838962bee16e3e9b. Add it back. Add back fatal exit probe. NetBSD PR: bin/60270 (GNATS) Reviewed by: emaste Fixes: 2574974648c6 ("OpenSSH: Update to 10.3p1") Differential Revision: https://reviews.freebsd.org/D57027 --- crypto/openssh/sshd-auth.c | 5 ++++- crypto/openssh/sshd-session.c | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/crypto/openssh/sshd-auth.c b/crypto/openssh/sshd-auth.c index 76350a2a3501..e335bda8ee48 100644 --- a/crypto/openssh/sshd-auth.c +++ b/crypto/openssh/sshd-auth.c @@ -96,6 +96,7 @@ #include "srclimit.h" #include "ssh-sandbox.h" #include "dh.h" +#include "blocklist_client.h" /* Privsep fds */ #define PRIVSEP_MONITOR_FD (STDERR_FILENO + 1) @@ -812,8 +813,10 @@ do_ssh2_kex(struct ssh *ssh) free(hkalgs); if ((r = kex_exchange_identification(ssh, -1, - options.version_addendum)) != 0) + options.version_addendum)) != 0) { + BLOCKLIST_NOTIFY(ssh, BLOCKLIST_AUTH_FAIL, "Banner exchange"); sshpkt_fatal(ssh, r, "banner exchange"); + } mm_sshkey_setcompat(ssh); /* tell monitor */ if ((ssh->compat & SSH_BUG_NOREKEY)) diff --git a/crypto/openssh/sshd-session.c b/crypto/openssh/sshd-session.c index ae41b4d7595f..26a361fe621e 100644 --- a/crypto/openssh/sshd-session.c +++ b/crypto/openssh/sshd-session.c @@ -1369,8 +1369,11 @@ cleanup_exit(int i) audit_event(the_active_state, SSH_CONNECTION_ABANDON); #endif /* Override default fatal exit value when auth was attempted */ - if (i == 255 && monitor_auth_attempted()) + if (i == 255 && monitor_auth_attempted()) { + BLOCKLIST_NOTIFY(the_active_state, BLOCKLIST_AUTH_FAIL, + "Fatal exit"); _exit(EXIT_AUTH_ATTEMPTED); + } if (i == 255 && monitor_invalid_user()) _exit(EXIT_INVALID_USER); _exit(i); From nobody Sat May 16 23:24:27 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gJ0X10xjfz6dGfN for ; Sat, 16 May 2026 23:24: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gJ0X10KDyz45q5 for ; Sat, 16 May 2026 23:24:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778973873; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jd9NqqUomoOxEJKxnACsAaQeHX9d4dku61FGCZZcbNI=; b=Gp+4YsS1tJx/ksONETmzqfZZneDTTiR0xEAsfGEjSfn4iWYZ0/SbeS7poeZ9Q06HDohFB8 1vdSTA40X3v/QVDvx1itxEnBNaoXq2gaubZ/mwsjNpknVKKSTmD6hB0NQHdYWITC/T/BPu bVaLjDouHKb0RIv3gqF0OuDddtqEm8yibjo0iKM1/mLjGuJ6JL32c3325M/qeBpwBXOLJl K7GIZdLCCkuPHzed0TmMNHLBesNElOdVBlk824bvgmNykbEvNJmYJeBzCUsM3epOp1OS1t pKB1cAxtYBSGABmePHzWXiu0awVb2/x70NdlszhPkeRl8RNvGRPkWUbvZcGQmw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778973873; a=rsa-sha256; cv=none; b=MnZuuB6qPZqC/bXk/vLgi0DFjXqwXD4iRgNTTRAjOHAsbLodrl9ZhLdRff8lAqFhhM/pjL RQz8nbrZE9Daix9LYIi7lg0Of6MFIXAlt2ChO2Lt/B1+IGKOZqWByDLQW1KCl6LfEhfSOL QutW/2rqEKMrQukQNSLhpn2D3CnRKrX3JujpetdyuazgETCmPL+UYjYr+FtfP09ni7J9DB DYou5x2jAP5bGDAiPMcekWXBCD8yLwXFug7eCZcQwaDa6oepoPdbhjnO1KrkoGjsuN/WW7 pXnAGJLVxI1FfIRJWJjENYISH9IdlB/TJqo1Ep3yCwFWPPOQa4VrEIItn1bLpw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778973873; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jd9NqqUomoOxEJKxnACsAaQeHX9d4dku61FGCZZcbNI=; b=AHo6i7hqX1MNd4+jODTqiWc+lQJcXgT1ch5wCQernDZ/ItUvG1BUOcavEvCRXc3p+CjeAQ EgdwgIAYVbyXyatJ1zLquiPQmfe3V9Bxa8umxzj4MJ1jz2vSBsVDZbXOIEHMoJR1WX4CbM dlzLtSH1xa3Akg3nCQEVy12ZVW1QmL7okMAoUYHRpp+ay9Mho5V5+o5EFN744BHG7P3MYr Ors7Jf/WXmzcfWCxIXDUtJ9d6b8w7O8MjLfbA7V5Z8k6t3e4Y7QKtlmEYC3+xw99SH4yks OAbCQBqvaxIHx6ZAe/SMnh9NHNtdDScE7/4R3fMkSL8hg4jlDN8FRzAKPFEmZA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gJ0X06xTTz1Dx for ; Sat, 16 May 2026 23:24:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c6f7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 16 May 2026 23:24:27 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 43a8585cb2bb - main - sys/mount.h: restore KNF_NOKQLOCK in VFS_KNOTE_{,UN}LOCKED() call to KNOTE() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: 43a8585cb2bb0e284df672174a57780e53107d27 Auto-Submitted: auto-generated Date: Sat, 16 May 2026 23:24:27 +0000 Message-Id: <6a08fcab.1c6f7.2f21ecdb@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=43a8585cb2bb0e284df672174a57780e53107d27 commit 43a8585cb2bb0e284df672174a57780e53107d27 Author: Konstantin Belousov AuthorDate: 2026-05-16 19:11:43 +0000 Commit: Konstantin Belousov CommitDate: 2026-05-16 23:24:10 +0000 sys/mount.h: restore KNF_NOKQLOCK in VFS_KNOTE_{,UN}LOCKED() call to KNOTE() ZFS needs to take internal sleepable lock in its implementation of VOP_GETATTR(). Due to this, kq must be unlocked around calls to the vfs filter methods. Fixes: 1d5e4020e36e ("vnode: add VIRF_KNOTE flag") Reported and tested by: des Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/sys/mount.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/sys/mount.h b/sys/sys/mount.h index d6696bba0a4f..2e880bac9068 100644 --- a/sys/sys/mount.h +++ b/sys/sys/mount.h @@ -968,8 +968,8 @@ static inline void VFS_KNOTE_LOCKED(struct vnode *vp, int hint) { if ((vn_irflag_read(vp) & VIRF_KNOTE) != 0) { - KNOTE_LOCKED(&vp->v_pollinfo->vpi_selinfo.si_note, - hint); + KNOTE(&vp->v_pollinfo->vpi_selinfo.si_note, + hint, KNF_LISTLOCKED | KNF_NOKQLOCK); } } @@ -977,8 +977,8 @@ static inline void VFS_KNOTE_UNLOCKED(struct vnode *vp, int hint) { if ((vn_irflag_read(vp) & VIRF_KNOTE) != 0) { - KNOTE_UNLOCKED(&vp->v_pollinfo->vpi_selinfo.si_note, - hint); + KNOTE(&vp->v_pollinfo->vpi_selinfo.si_note, + hint, KNF_NOKQLOCK); } } From nobody Sun May 17 00:29:38 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gJ1z64S2sz6dM2d for ; Sun, 17 May 2026 00:29:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gJ1z62hgqz4Dbw for ; Sun, 17 May 2026 00:29:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778977778; 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; bh=mhTiCpn9WqMD34QKDU+uEzJ0k27fpOhViESH4w5G9XM=; b=rLWcdteMYTAMPjx5+G4Taf4CfuIIb0HZ+IwIHjulTpGKCQIPicqar9Td7ExW2RsJkWc+R2 zECgbuu0xSzBaOHG9IEY4vbuwyUyH+FUtpb5zvghbFhjhAQ/9JOIBIw6bGYCJsTSmkqakl 7yKnyJQHlYExStJPt91IUPmQBs7rDe7snM7QV+4qBw1MLd5uV405RafSJSRKdIMQvc3NsZ EDlCr8JICuwnwNxSC4JVWFVUmLUc8bRG15pEDv6XhNVRdXOQKTVtuxpDqx5hn6y1feZfrO pwlitlm+HoRyOuNa1szDgIE2bxyh1JiSeEWIXn89ucJCzO77L43zlUhkd4Z7zA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778977778; a=rsa-sha256; cv=none; b=FlrFFD3Df3ij4I7Cv3YuIveFj+qjkvYLBvgUvgzG0J+PsjYQzgMoSXQoAS0KnfKauW+vDh CHDyiqahiuROqkXmhwEetxEJ5OcHGuLqGRGtocacXBne7YrwidVxfLjhTR8dL68Fhpk27T fJEb7MZ+8bj/PS1qC5RldNbDV4rsaw+dik11qY2WRhzZYaRUBfIGw9N4tyT5DnBiVrzI+G n8hQBam3RxZxeeW4oeJps7pH8oPv3phzVt5/LLw+18nmhiJb5pTyBrjzMwh8QJTwnNK8S1 6JR1chUBJ/WpoCwOcja8K0RYqSwAwy8vkqa5XbsKP5L4YeGtoliO/O8NB0Nx+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778977778; 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; bh=mhTiCpn9WqMD34QKDU+uEzJ0k27fpOhViESH4w5G9XM=; b=ieYD6qkGPvXv645MhsGJwmWoCUYRV8wvc6Qqv11bDyxjH90qhkwMlPqO1Yi9OKb0ypfLuy VUmJiFHROg6NtFknSKTLzeOu9aUTrwgkjehkONuoRJzKJOx1lCkksq96qrarwk5lM0WArj Cc9kVyHLUDi+byJah1EknS9aosbfQhmBkw6BHdlLpr3oasH02IbiGVCGCJiCTRYqp3TSC3 gy3pmKNhbo50ASugRL+r70wcgWuG2mhhn6YDdv7XzBv8mnN4EsJP/fCmN+6JPLNzNcXtCT O+AOsqyqMsjpW0inBvA5vDjdzpzU4lxuGmJ0gJDk5i+IS5X7UZBjNh+UR/Pcow== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gJ1z620qRz2QC for ; Sun, 17 May 2026 00:29:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22f85 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 17 May 2026 00:29:38 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Steve Kargl From: Konstantin Belousov Subject: git: 0093bb670537 - stable/15 - [libm] implementation of rsqrt, rsqrtf, and rsqrtl List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 0093bb670537f19e99fff2d46b4831d7b9d44b4c Auto-Submitted: auto-generated Date: Sun, 17 May 2026 00:29:38 +0000 Message-Id: <6a090bf2.22f85.265ea657@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=0093bb670537f19e99fff2d46b4831d7b9d44b4c commit 0093bb670537f19e99fff2d46b4831d7b9d44b4c Author: Steve Kargl AuthorDate: 2026-05-08 14:06:08 +0000 Commit: Konstantin Belousov CommitDate: 2026-05-17 00:27:48 +0000 [libm] implementation of rsqrt, rsqrtf, and rsqrtl PR: 295089 (cherry picked from commit 3085fc9d97bd83785ba3ba43e0378d7d67987d1f) --- lib/msun/Makefile | 6 +- lib/msun/Symbol.map | 3 + lib/msun/man/sqrt.3 | 53 +++++++++++- lib/msun/src/math.h | 3 + lib/msun/src/math_private.h | 83 ++++++++++++++++++ lib/msun/src/s_rsqrt.c | 153 +++++++++++++++++++++++++++++++++ lib/msun/src/s_rsqrtf.c | 155 +++++++++++++++++++++++++++++++++ lib/msun/src/s_rsqrtl.c | 203 ++++++++++++++++++++++++++++++++++++++++++++ 8 files changed, 654 insertions(+), 5 deletions(-) diff --git a/lib/msun/Makefile b/lib/msun/Makefile index d61f4e9a1659..75917b9b6abe 100644 --- a/lib/msun/Makefile +++ b/lib/msun/Makefile @@ -86,7 +86,7 @@ COMMON_SRCS= b_tgamma.c \ s_lround.c s_lroundf.c s_lroundl.c s_modff.c \ s_nan.c s_nearbyint.c s_nextafter.c s_nextafterf.c \ s_nexttowardf.c s_remquo.c s_remquof.c \ - s_rint.c s_rintf.c s_round.c s_roundf.c \ + s_rint.c s_rintf.c s_round.c s_roundf.c s_rsqrt.c s_rsqrtf.c \ s_scalbln.c s_scalbn.c s_scalbnf.c s_signbit.c \ s_signgam.c s_significand.c s_significandf.c s_sin.c \ s_sincos.c s_sincosf.c s_sinf.c \ @@ -139,7 +139,7 @@ COMMON_SRCS+= b_tgammal.c catrigl.c \ s_fminl.c s_fminimuml.c s_fminimum_magl.c s_fminimum_numl.c \ s_frexpl.c s_logbl.c s_logl.c s_nanl.c \ s_nextafterl.c s_nexttoward.c s_remquol.c s_rintl.c s_roundl.c \ - s_scalbnl.c s_sinl.c s_sincosl.c s_sinpil.c \ + s_scalbnl.c s_sinl.c s_sincosl.c s_sinpil.c s_rsqrtl.c \ s_tanhl.c s_tanl.c s_tanpil.c s_truncl.c w_cabsl.c # Work around this warning from gcc: # lib/msun/ld80/e_powl.c:275:1: error: floating constant exceeds range of @@ -281,7 +281,7 @@ MLINKS+=sincos.3 sincosf.3 sin.3 sincosl.3 MLINKS+=sinh.3 sinhf.3 sinh.3 sinhl.3 MLINKS+=sinpi.3 sinpif.3 sinpi.3 sinpil.3 MLINKS+=sqrt.3 cbrt.3 sqrt.3 cbrtf.3 sqrt.3 cbrtl.3 sqrt.3 sqrtf.3 \ - sqrt.3 sqrtl.3 + sqrt.3 sqrtl.3 sqrt.3 rsqrt.3 sqrt.3 rsqrtf.3 sqrt.3 rsqrtl.3 MLINKS+=tan.3 tanf.3 tan.3 tanl.3 MLINKS+=tanh.3 tanhf.3 tanh.3 tanhl.3 MLINKS+=tanpi.3 tanpif.3 tanpi.3 tanpil.3 diff --git a/lib/msun/Symbol.map b/lib/msun/Symbol.map index 35addfcee3d5..245a72984f72 100644 --- a/lib/msun/Symbol.map +++ b/lib/msun/Symbol.map @@ -338,4 +338,7 @@ FBSD_1.9 { fminimum_num; fminimum_numf; fminimum_numl; + rsqrt; + rsqrtf; + rsqrtl; }; diff --git a/lib/msun/man/sqrt.3 b/lib/msun/man/sqrt.3 index f4a217353af0..6da6407ecc4b 100644 --- a/lib/msun/man/sqrt.3 +++ b/lib/msun/man/sqrt.3 @@ -25,17 +25,20 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd February 15, 2020 +.Dd May 7, 2026 .Dt SQRT 3 .Os .Sh NAME .Nm cbrt , .Nm cbrtf , .Nm cbrtl , +.Nm rsqrt , +.Nm rsqrtf , +.Nm rsqrtl, .Nm sqrt , .Nm sqrtf , .Nm sqrtl -.Nd cube root and square root functions +.Nd cube root, square root, and inverse square root functions .Sh LIBRARY .Lb libm .Sh SYNOPSIS @@ -47,6 +50,12 @@ .Ft long double .Fn cbrtl "long double x" .Ft double +.Fn rsqrt "double x" +.Ft float +.Fn rsqrtf "float x" +.Ft long double +.Fn rsqrtl "long double x" +.Ft double .Fn sqrt "double x" .Ft float .Fn sqrtf "float x" @@ -63,6 +72,15 @@ the cube root of .Fa x . .Pp The +.Fn rsqrt , +.Fn rsqrtf , +and +.Fn rsqrtl +functions compute +the inverse square root of +.Fa x . +.Pp +The .Fn sqrt , .Fn sqrtf , and @@ -77,6 +95,23 @@ The and .Fn cbrtl functions return the requested cube root. +.Pp +The +.Fn rsqrt , +.Fn rsqrtf , +and +.Fn rsqrtl +functions return 1 divided by the square root of +.Fa x +unless an error occurs. +An attempt to take the +.Fn rsqrt +of negative +.Fa x +raises an invalid exception and causes an \*(Na to be returned. +The inverse square root of \*(Pm0 returns \*(Pm\(if and +raises a divide-by-zero exception. +.Pp The .Fn sqrt , .Fn sqrtf , @@ -104,6 +139,13 @@ and .Fn sqrtl functions conform to .St -isoC-99 . +The +.Fn rsqrt , +.Fn rsqrtf , +and +.Fn rsqrtl +functions conform to ISO/IEC 9899:2024 ("ISO C23"). +.\" .St -isoC-24 . .Sh HISTORY The .Fn cbrt @@ -120,3 +162,10 @@ The .Fn cbrtl function appeared in .Fx 9.0 . +The +.Fn rsqrt , +.Fn rsqrtf , +and +.Fn rsqrtl +functions appeared in +.Fx 16.0 . diff --git a/lib/msun/src/math.h b/lib/msun/src/math.h index 853984953a91..7a91ed13da9c 100644 --- a/lib/msun/src/math.h +++ b/lib/msun/src/math.h @@ -538,6 +538,9 @@ long double fmaximum_numl(long double, long double); double fminimum_num(double, double); float fminimum_numf(float, float); long double fminimum_numl(long double, long double); +double rsqrt(double); +float rsqrtf(float); +long double rsqrtl(long double); #endif /* __ISO_C_VISIBLE >= 2023 */ __END_DECLS diff --git a/lib/msun/src/math_private.h b/lib/msun/src/math_private.h index fbd84e246ca7..e9055a9a8c61 100644 --- a/lib/msun/src/math_private.h +++ b/lib/msun/src/math_private.h @@ -471,6 +471,89 @@ do { \ (a) = __tmp; \ } while (0) +/* + * Split x into high and low bits where CC is 0x1p(N/2) + 1 where + * N is rounded up for types with odd precisions. + * + * #define _CC (0x1p12F + 1) // float + * #define _CC (0x1p27 + 1) // double + * #define _CC (0x1p32L + 1) // long double (LD80) + * #define _CC (0x1p57L + 1) // long double (LD128) + */ +#define _SPLIT(x, xh, xl) \ +do { \ + typeof(x) __t1; \ + __t1 = (x) * _CC; \ + xh = __t1 + ((x) - __t1); \ + xl = (x) - xh; \ +} while(0) + +/* + * FAST2SUM requires |x| >= |y|. x and y are full precision. + * Note, _2SUMF(x,y) above destroys x and y. + */ +#define _FAST2SUM(x, y, hi, lo) \ +do { \ + hi = (x) + (y); \ + lo = (y) - (hi - (x)); \ +} while(0) + +/* + * SLOW2SUM does not require |x| >= |y|. Here, x and y are full precision. + * The t1 temporary variable is volatile to prevent compiler optimizations. + * Note, _2SUM(x,y) above destroys x and y. + */ +#define _SLOW2SUM(x, y, hi, lo) \ +do { \ + volatile typeof(x) __t1; \ + typeof(x) __t2; \ + hi = (x) + (y); \ + __t1 = hi - (y); \ + __t2 = hi - __t1; \ + lo = ((x) - __t1) + ((y) - __t2); \ +} while(0) + +/* + * x and y are full precision quantities that have been split into high + * and low parts via the _SPLIT macro. x and y are added to give z as + * high and low parts. + */ +#define _XADD(xh, xl, yh, yl, zh, zl) \ +do { \ + typeof(xh) __s1, __s2, __s3, __s4, __s5, __s6; \ + _SLOW2SUM(xh, yh, __s1, __s2); \ + _SLOW2SUM(xl, yl, __s3, __s4); \ + _FAST2SUM(__s1, __s2 + __s3, __s5, __s6); \ + _FAST2SUM(__s5, __s6 + __s4, zh, zl); \ +} while(0) + +/* + * x and y are full precision quantities. r1 and r2 are full precision + * high and low parts of the multiplication x * y. + */ +#define _MUL(x, y, r1 ,r2) \ +do { \ + typeof(x) __xh, __xl, __yh, __yl; \ + typeof(x) __t1; \ + _SPLIT(x, __xh, __xl); \ + _SPLIT(y, __yh, __yl); \ + r1 = (x) * (y); \ + __t1 = __xh * __yl + (__xh * __yh - r1); \ + r2 = __xl * __yl + (__xl * __yh + __t1); \ +} while(0) + +/* + * x and y are full precision quantities that have been split into high + * and low parts via the _SPLIT macro. x and y are multiplied to give z + * as high and low parts. + */ +#define _XMUL(xh, xl, yh, yl, ph, pl) \ +do { \ + _MUL(xh, yh, ph, pl); \ + pl += xl * yl + xl * yh + xh * yl; \ +} while(0) + + /* * Common routine to process the arguments to nan(), nanf(), and nanl(). */ diff --git a/lib/msun/src/s_rsqrt.c b/lib/msun/src/s_rsqrt.c new file mode 100644 index 000000000000..0a513afe8ed2 --- /dev/null +++ b/lib/msun/src/s_rsqrt.c @@ -0,0 +1,153 @@ +/*- + * Copyright (c) 2026 Steven G. Kargl + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice unmodified, this list of conditions, and the following + * disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** + * Compute the inverse sqrt of x, i.e., rsqrt(x) = 1 / sqrt(x). + * + * First, filter out special cases: + * + * 1. rsqrt(+-0) = +-inf, and raise FE_DIVBYZERO exception. + * 2. rsqrt(nan) = NaN. + * 3. rsqrt(+inf) returns +0. + * 2. rsqrt(x<0) = NaN, and raises FE_INVALID. + * + * If x is a subnormal, scale x into the normal range by x*0x1pN; while + * recording the exponent of the scale factor N. Split the possibly + * scaled x into f*2^n with f in [0.5,1). Set m=n or m=n-N (subnormal). + * If n is odd, then set f = f/2 and increase n to n+1. Thus, f is + * in [0.25,1) with n even. + * + * An initial estimate of y = rqrt[f](x) is 1 / sqrt[f](x). Exhaustive + * testing of rsqrtf() gave a max ULP of 1.49; while testing 500M x in + * [0,1000] gave a max ULP of 1.24 for rsqrt(). The value of y is then + * used with one iteration of Goldschmidt's algorithm: + * + * z = x * y + * h = y / 2 + * r = 0.5 - h * z + * y = h * r + h + * + * A factor of 2 appears missing in the above, but it is included in the + * exponent m. + */ +#include +#include +#include "math.h" +#include "math_private.h" + +#pragma STDC FENV_ACCESS ON + +#ifdef _CC +#undef _CC +#endif +#define _CC (0x1p27 + 1) + +double +rsqrt(double x) +{ + volatile static const double vzero = 0; + static const double half = 0.5; + int hx, m, rnd; + uint32_t lx, ux; + double h, ph, pl, rh, rl, y, zh, zl; + + EXTRACT_WORDS(hx, lx, x); + ux = (uint32_t)hx & 0x7fffffff; + + /* x = +-0. Raise exception. */ + if ((ux | lx) == 0) + return (1 / x); + + /* x is NaN. */ + if (ux > 0x7ff00000) + return (x + x); + + /* x is +-inf. */ + if (ux == 0x7ff00000) + return (hx & 0x80000000 ? vzero / vzero : 0.); + + /* x < 0. Raise exception. */ + if (hx < 0) + return (vzero / vzero); + + /* + * If x is subnormal, then scale it into the normal range. + * Split x into significand and exponent, x = f * 2^m, with + * f in [0.5,1) and m a biased exponent. + */ + m = 0; + if (hx < 0x00100000) { /* Subnormal */ + x *= 0x1p54; + GET_HIGH_WORD(hx, x); + m = -54; + } + m += (hx >> 20) - 1022; + hx = (hx & 0x000fffff) | 0x3fe00000; + SET_HIGH_WORD(x, hx); + + /* m is odd. Put x into [0.25,5) and increase m. */ + if (m & 1) { + x /= 2; + m += 1; + } + m = -(m >> 1); /* Prepare for 2^(-m/2). */ + + y = 1 / sqrt(x); /* ~52-bit estimate. */ + + h = y / 2; + + /* + * For values of x with a representation of 0x1.ffffffffffffepN + * with N an odd integer, the computed rsqrt() is not correctly + * rounded in round-to-nearest without toggling the rounding mode + * to FE_TOWARDZERO. Note, FE_DOWNWARD also works. However, + * messing with the rounding mode is expensive, so only do it + * when necessary. Example, x = 3.9999999999999991 + * gives y --> hx = 0x3ff00000, lx = 0x00000001 + */ + EXTRACT_WORDS(hx, lx, y); + if ((hx & 0x000fffff) == 0 && lx == 1) { + rnd = fegetround(); + fesetround(FE_TOWARDZERO); + _MUL(x, y, zh, zl); + _XMUL(zh, zl, h, 0, ph, pl); + fesetround(rnd); + } else { + _MUL(x, y, zh, zl); + _XMUL(zh, zl, h, 0, ph, pl); + } + + _XADD(-ph, -pl, half, 0, rh, rl); + y = rh * h + h; + + ux = (m + 1024) << 20; + INSERT_WORDS(x, ux, 0); + return (y *= x); +} + +#if LDBL_MANT_DIG == 53 +__weak_reference(rsqrt, rsqrtl); +#endif diff --git a/lib/msun/src/s_rsqrtf.c b/lib/msun/src/s_rsqrtf.c new file mode 100644 index 000000000000..b71f7baf5657 --- /dev/null +++ b/lib/msun/src/s_rsqrtf.c @@ -0,0 +1,155 @@ +/*- + * Copyright (c) 2026 Steven G. Kargl + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice unmodified, this list of conditions, and the following + * disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** + * Compute the inverse sqrt of x, i.e., rsqrt(x) = 1 / sqrt(x). + * + * First, filter out special cases: + * + * 1. rsqrt(+-0) = +-inf, and raise FE_DIVBYZERO exception. + * 2. rsqrt(nan) = NaN. + * 3. rsqrt(+inf) returns +0. + * 2. rsqrt(x<0) = NaN, and raises FE_INVALID. + * + * If x is a subnormal, scale x into the normal range by x*0x1pN; while + * recording the exponent of the scale factor N. Split the possibly + * scaled x into f*2^n with f in [0.5,1). Set m=n or m=n-N (subnormal). + * If n is odd, then set f = f/2 and increase n to n+1. Thus, f is + * in [0.25,1) with n even. + * + * An initial estimate of y = rqrt[f](x) is 1 / sqrt[f](x). Exhaustive + * testing of rsqrtf() gave a max ULP of 1.49; while testing 500M x in + * [0,1000] gave a max ULP of 1.24 for rsqrt(). The value of y is then + * used with one iteration of Goldschmidt's algorithm: + * + * z = x * y + * h = y / 2 + * r = 0.5 - h * z + * y = h * r + h + * + * A factor of 2 appears missing in the above, but it is included in the + * exponent m. + */ +#include +#include +#include "math.h" +#include "math_private.h" + +#pragma STDC FENV_ACCESS ON + +#ifdef _CC +#undef _CC +#endif +#define _CC (0x1p12F + 1) + +float +rsqrtf(float x) +{ + volatile static const float vzero = 0; + static const float half = 0.5; + uint32_t ix, ux; + int m, rnd; + float h, ph, pl, rh, rl, y, zh, zl; + + GET_FLOAT_WORD(ix, x); + ux = ix & 0x7fffffff; + + /* x = +-0. Raise exception. */ + if (ux == 0) + return (1 / x); + + /* x is NaN. */ + if (ux > 0x7f800000) + return (x + x); + + /* x is +-inf. */ + if (ux == 0x7f800000) + return (ix & 0x80000000 ? vzero / vzero : 0.F); + + /* x < 0. Raise exception. */ + if (ix & 0x80000000) + return (vzero / vzero); + + /* + * If x is subnormal, then scale it into the normal range. + * Split x into significand and exponent, x = f * 2^m, with + * f in [0.5,1) and m a biased exponent. + */ + m = 0; + if (ux < 0x00800000) { /* Subnormal */ + x *= 0x1p25f; + GET_FLOAT_WORD(ix, x); + m = -25; + } + m += (ix >> 23) - 126; /* Unbiased exponent */ + ix = (ix & 0x007fffff) | 0x3f000000; + SET_FLOAT_WORD(x, ix); /* x is in [0.5,1). */ + + /* m is odd. Put x into [0.25,5) and increase m. */ + if (m & 1) { + x /= 2; + m += 1; + } + m = -(m >> 1); /* Prepare for 2^(-m/2). */ + + /* + * Exhaustive testing of rsqrtf(x) = 1 / sqrtf(x) with x in + * [0x1p-127,0x1p126] shows the this approximation gives a + * 22- to 23-bit estimate of rsqrt(f). This is equivalent to + * a max ulp of ~1.49. + */ + y = 1 / sqrtf(x); + + h = y / 2; + + /* + * For values of x with a representation of 0x1.fffffcpN with + * N an odd integer, the computed rsqrtf() is not correctly + * rounded in round-to-nearest without toggling the rounding + * mode to FE_TOWARDZERO. Note, FE_DOWNWARD also works. + * However, messing with the rounding mode is expensive, so + * only do it when necessary. Example, x = 0x1.fffffcp3 gives + * y --> 0x3f800001. + */ + GET_FLOAT_WORD(ix, y); + if ((ix & 0x000fffff) == 1) { + rnd = fegetround(); + fesetround(FE_TOWARDZERO); + _MUL(x, y, zh, zl); + _XMUL(zh, zl, h, 0, ph, pl); + fesetround(rnd); + } else { + _MUL(x, y, zh, zl); + _XMUL(zh, zl, h, 0, ph, pl); + } + + _XADD(-ph, -pl, half, 0, rh, rl); + y = h * rh + h; + + ix = (uint32_t)(m + 128) << 23; + SET_FLOAT_WORD(x, ix); + return (y *= x); +} diff --git a/lib/msun/src/s_rsqrtl.c b/lib/msun/src/s_rsqrtl.c new file mode 100644 index 000000000000..34d5cdc48173 --- /dev/null +++ b/lib/msun/src/s_rsqrtl.c @@ -0,0 +1,203 @@ +/*- + * Copyright (c) 2026 Steven G. Kargl + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice unmodified, this list of conditions, and the following + * disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** + * Compute the inverse sqrt of x, i.e., rsqrt(x) = 1 / sqrt(x). + * + * First, filter out special cases: + * + * 1. rsqrt(+-0) = +-inf, and raise FE_DIVBYZERO exception. + * 2. rsqrt(nan) = NaN. + * 3. rsqrt(+inf) returns +0. + * 2. rsqrt(x<0) = NaN, and raises FE_INVALID. + * + * If x is a subnormal, scale x into the normal range by x*0x1pN; while + * recording the exponent of the scale factor N. Split the possibly + * scaled x into f*2^n with f in [0.5,1). Set m=n or m=n-N (subnormal). + * If n is odd, then set f = f/2 and increase n to n+1. Thus, f is + * in [0.25,1) with n even. + * + * An initial estimate of y = rqrt[f](x) is 1 / sqrt[f](x). Exhaustive + * testing of rsqrtf() gave a max ULP of 1.49; while testing 500M x in + * [0,1000] gave a max ULP of 1.24 for rsqrt(). The value of y is then + * used with one iteration of Goldschmidt's algorithm: + * + * z = x * y + * h = y / 2 + * r = 0.5 - h * z + * y = h * r + h + * + * A factor of 2 appears missing in the above, but it is included in the + * exponent m. + */ +#include +#include +#include "math.h" +#include "math_private.h" +#include "fpmath.h" + +#pragma STDC FENV_ACCESS ON + +#if LDBL_MANT_DIG == 64 + +#ifdef _CC +#undef _CC +#endif +#define _CC (0x1p32L + 1) + +long double +rsqrtl(long double x) +{ + volatile static const double vzero = 0; + static const double half = 0.5; + uint32_t ux; + int m, rnd; + long double h, ph, pl, rh, rl, y, zh, zl; + union IEEEl2bits u; + + u.e = x; + ux = (u.bits.manl | u.bits.manh); + + /* x = +-0. Raise exception. */ + if ((u.bits.exp | ux) == 0) + return (1 / x); + + /* x is NaN or x is +-inf. */ + if (u.bits.exp == 0x7fff) + return (ux ? (x + x) : (u.bits.sign ? vzero / vzero : 0)); + + /* x < 0. Raise exception. */ + if (u.bits.sign) + return (vzero / vzero); + + /* + * If x is subnormal, then scale it into the normal range. + * Split x into significand and exponent, x = f * 2^m, with + * f in [0.5,1) and m a biased exponent. + */ + ENTERI(); + + if (u.bits.exp == 0) { /* Subnormal */ + u.e *= 0x1p512; + m = u.bits.exp - 0x41fe; + } else { + m = u.bits.exp - 0x3ffe; + } + u.bits.exp = 0x3ffe; + + /* m is odd. Put x into [0.25,5) and increase m. */ + if (m & 1) { + u.e /= 2; + m += 1; + } + m = -(m >> 1); /* Prepare for 2^(-m/2). */ + + y = 1 / sqrt((double)u.e); /* ~52-bit estimate. */ + y -= y * (u.e * y * y - 1) / 2; /* ~63-bit estimate. */ + + h = y / 2; + + _MUL(u.e, y, zh, zl); + _XMUL(zh, zl, h, 0, ph, pl); + _XADD(-ph, -pl, half, 0, rh, rl); + y = rh * h + h; + + u.e = 1; + u.xbits.expsign = 0x3fff + m + 1; + RETURNI(y * u.e); +} + +#else + +#ifdef _CC +#undef _CC +#endif +#define _CC (0x1p57L + 1) + +long double +rsqrtl(long double x) +{ + volatile static const double vzero = 0; + int hx, m, rnd; + long double y; + + /* x = +-0. Raise exception. */ + if (x == 0) + return (1 / x); + + /* x is NaN. */ + if (isnan(x)) + return (x + x); + + /* x is +-inf. */ + if (isinf(x)) + return (x > 0 ? 0 : vzero / vzero); + + /* x < 0. Raise exception. */ + if (x < 0) + return (vzero / vzero); + + /* + * If x is subnormal, then scale it into the normal range. + * Split x into significand and exponent, x = f * 2^m, with + * f in [0.5,1) and m a biased exponent. + */ + m = 0; + if (!isnormal(x)) { + x *= 0x1p114L; + m = -114; + } + x = frexpl(x, &hx); + m += hx; + + /* m is odd. Put x into [0.25,5) and increase m. */ + if (m & 1) { + x /= 2; + m += 1; + } + m = -(m >> 1); /* Prepare for 2^(-m/2). */ + + y = 1 / sqrt((double)x); /* ~52-bit estimate. */ + y -= y * (x * y * y - 1) / 2; /* ~104-bit estimate. */ + + static const double half = 0.5; + long double h, ph, pl, rh, rl, zh, zl; + + h = y / 2; + + rnd = fegetround(); + fesetround(FE_TOWARDZERO); + _MUL(x, y, zh, zl); + _XMUL(zh, zl, -h, 0, ph, pl); + fesetround(rnd); + + _XADD(ph, pl, half, 0, rh, rl); + y = rh * h + h; + m++; + + RETURNI(ldexpl(y, m)); +} +#endif From nobody Sun May 17 00:29:39 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gJ1z74Qgqz6dM0Q for ; Sun, 17 May 2026 00:29: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gJ1z72rVyz4DnV for ; Sun, 17 May 2026 00:29:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778977779; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hlN3of1Dz+srJ0e0nOOTHnvPOuZi21W6nwmwWnc7xLA=; b=fSAv/7f6gU2lY3rUk/TV+0JG8BUTE6XL2zfY9fpDNvW2VHgPOXi/TtCF4zO98zw4EQkfKF VXpk1hLoQESAr0vyRuIbGxdsr4qC5RRU/fqOITblKiRK89hK0k87Eekqvf8UHR+RSA9XIK wkcm2cZSDhAVBV85DQb+MVYoxj3hxNJl6J3TTQ+ChWjZX00W5Ym/90BDu8hAxo5vC131L/ ZmMh0pPMh4kkPZkNpdx9AWtRUQTGQJChEnigQt16seXAX5eoEPZ8SYaI+Rh/FlLEe2bUYn HHmJuIIjG8EpQjVBC2URLqCacYY9ZTkgpjWc3fmAtWzPND9TlCoKcW5P1cixFQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778977779; a=rsa-sha256; cv=none; b=uyBuaBDUK4hEZyB7PDKdgegudw8G7VcgMEtVlkY8F6Fkn4tYhrHDjrX4ndEj4kNWeG0Bav G/dFsn8SYd/KBytpeck2VsSgkWJJJZlBhcd41PW55GcSNDm8g3EvCuoDRy56c/t8cxcEJf wyYMheAXdPQ6Gp1msqligrb/eojXRG38VW58DMBMbw+JOU6ckw3H20+Mybo8wPloklfsUQ WwbM02eiNQ+DLLjj/UR+dWZfdEweykHEmTVUwe6v2Cyy+DHbM2r1EG5I+e/ZefHEqscCSp XXdQO81qjBnt7bZtg2IUb2a+RoktTsXQwE4sBpJf5MVDvgbJ4amvxSmrYhKeGg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778977779; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hlN3of1Dz+srJ0e0nOOTHnvPOuZi21W6nwmwWnc7xLA=; b=iOps+u4OI1uDoTDyV5HOW1dqFFbQGK1kjKaO22G4j4QuwGaEJ58a/Mf7v5rW6abOxI1ftg ulgq6SFmPB87OVS3qpEyQ2pquiu2cxKlTSJNe1A77XAaI0AtSdgd/JZxveAMlEwnCTjWSt eW/Xy/0gcI/DqE9cNgBeVTiD6/qwbXboFJb2loTAjYEfHEfgtwTylbOyNHZg9OORVyxxyT mDh5NdhQu1kMWlHC2obdN6mAr6DNGjIvnpELFYVrJoddavyrpj4T5SviWPE+H1SaYuRjOq 1MMYHHAUXjHRIyAISVdOHIA+EOx6TP2OtB4exybltK9gEbAX206euUkELZ8HZg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gJ1z72Nxqz2t6 for ; Sun, 17 May 2026 00:29:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 21cc0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 17 May 2026 00:29:39 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: bce6e0e90328 - stable/15 - ptrace: clear TDP_USERWR after transparent attach only on attach List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: bce6e0e903288aa128bdd8ec45005d1416c4c764 Auto-Submitted: auto-generated Date: Sun, 17 May 2026 00:29:39 +0000 Message-Id: <6a090bf3.21cc0.455dca74@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=bce6e0e903288aa128bdd8ec45005d1416c4c764 commit bce6e0e903288aa128bdd8ec45005d1416c4c764 Author: Konstantin Belousov AuthorDate: 2026-05-11 01:12:30 +0000 Commit: Konstantin Belousov CommitDate: 2026-05-17 00:27:48 +0000 ptrace: clear TDP_USERWR after transparent attach only on attach (cherry picked from commit cb31a266167c8bde3488fbdd6bf24c38b6f59977) --- sys/kern/sys_process.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/sys/kern/sys_process.c b/sys/kern/sys_process.c index c67996ad7df1..7225a63328b4 100644 --- a/sys/kern/sys_process.c +++ b/sys/kern/sys_process.c @@ -1377,17 +1377,16 @@ kern_ptrace(struct thread *td, int req, pid_t pid, void *addr, int data) * register file or specifying the pc, make the thread * xstopped by waking it up. */ - if ((td2->td_dbgflags & TDB_USERWR) != 0) { - if (pt_attach_transparent) { - thread_lock(td2); - if (TD_ON_SLEEPQ(td2) && - (td2->td_flags & TDF_SINTR) != 0) { - sleepq_abort(td2, EINTR); - } else { - thread_unlock(td2); - } + if ((td2->td_dbgflags & TDB_USERWR) != 0 && + pt_attach_transparent) { + thread_lock(td2); + if (TD_ON_SLEEPQ(td2) && + (td2->td_flags & TDF_SINTR) != 0) { + td2->td_dbgflags &= ~TDB_USERWR; + sleepq_abort(td2, EINTR); + } else { + thread_unlock(td2); } - td2->td_dbgflags &= ~TDB_USERWR; } /* From nobody Sun May 17 00:29:37 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gJ1zB5FbRz6dLQh for ; Sun, 17 May 2026 00:29:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gJ1zB3b0Pz4Dvj for ; Sun, 17 May 2026 00:29:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778977782; h=from:from:reply-to:subject:subject: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+WhIpwUGHV63I1nxs7UdFc3C+4HhnEIEYUVSADrji8=; b=fW5YIO7gJASGP2g5FDoQWOi8vL1bHHzZ8QFlthB7nYgZ5dNozniGRCBl021vKyBti5xeD6 RIyK3VFytNrtzLQcSNE5GfLEAbE4xf9+7GtuBHD265/4MFhrxiT7FX6D1X0XCwLDJbLBb3 GF1dYgOCA+fNsX/svc1jcdk9sEOfKR05uGl8rnSxpf/fSAXVwY4OCM1p8Ms3jEWErnLw1N 5f8GoSFGNBjzNuDWUn0zz7v/PrsgjWbNhg1fIoUVRvITcZ57s9bdvJsA7Ck6J5P2JUsfkB UHfp7C+T8WvoVa2ht/u7NWl/QVFgj+Vy9kistnykQ4tUvE6AEQEanUHxnd7KtQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778977782; a=rsa-sha256; cv=none; b=Zo/7ZYayb10qLMCO+rXVMUxmKYccPSqLWHVHVLt4KHGbwH1HMaGMNEUCnwV3vvmTVp99PE erylz3oIP06oNtT4/modHAZcOI6bA37SNTLmNzvqld9ohY4X/QLMtj5xKc3wOHbkmPNH9p 9BVz9tmLWdPzZjJ1ZNDCRxzqgxB9t1mKa5gN9XH/PY67X6emels4zyPFOp69kWNm3MuEA/ EF75EoqOluFSmjTBsl1CwVbX9ZxgsusVxZCWn6j7cry/0yEgCXCqzgIwES+WBQn2jTu0eb D6LE4xRip+YugoJopOfg+e9VNzt+1+4LwhkEs9WTdjm+46DnJhcLz2tNAblY1g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778977782; h=from:from:reply-to:subject:subject: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+WhIpwUGHV63I1nxs7UdFc3C+4HhnEIEYUVSADrji8=; b=AukLGNTQE+ipxlSFzVP1Zz1P9rpaJp9H9h8EP8UoMb6VV7VjRoUeuF7pEibgNw83Z/Rupy j11S4V6cINbigHTJtTr0nQzxSEADNMkSt8kspym3ql51JhIUah9nKexOoY3m5NcnTbOFbK QfedQybdvmJSi/8fdyn5qMoNskUk3CpIZZKOrgnUnw+JIm9LleHLFdd74lB9kq0Jo8kbga H7gGCuDiuMv3zi0nfSvRUAMxUmXIL4DJbIfJKtxTRH2hzLJ9VUBje4kBVIR3BDgYLtEKNA eoB1+iqChd4xK5LMnVVpIgCGas9kGj/X5ZuG64BuIEKoxzy4fBMEmlzBsuOAbg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gJ1zB2XWNz2qj for ; Sun, 17 May 2026 00:29:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 20554 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 17 May 2026 00:29:37 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: c34ca8fb21fa - stable/15 - sys/cdefs.h: move __BEGIN_DECLS/__END_DECLS into a helper sys/_decls.h List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: c34ca8fb21fa0cd01b314a0cb156f52a73bca562 Auto-Submitted: auto-generated Date: Sun, 17 May 2026 00:29:37 +0000 Message-Id: <6a090bf1.20554.1ad69150@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=c34ca8fb21fa0cd01b314a0cb156f52a73bca562 commit c34ca8fb21fa0cd01b314a0cb156f52a73bca562 Author: Konstantin Belousov AuthorDate: 2026-05-08 14:13:35 +0000 Commit: Konstantin Belousov CommitDate: 2026-05-17 00:27:48 +0000 sys/cdefs.h: move __BEGIN_DECLS/__END_DECLS into a helper sys/_decls.h (cherry picked from commit ea72f6d5a8b9386a09e23fbdc933effb007ca899) --- sys/sys/_decls.h | 46 ++++++++++++++++++++++++++++++++++++++++++++++ sys/sys/cdefs.h | 8 +------- tools/build/Makefile | 1 + 3 files changed, 48 insertions(+), 7 deletions(-) diff --git a/sys/sys/_decls.h b/sys/sys/_decls.h new file mode 100644 index 000000000000..2ef61671dd70 --- /dev/null +++ b/sys/sys/_decls.h @@ -0,0 +1,46 @@ +/*- + * SPDX-License-Identifier: BSD-3-Clause + * + * Copyright (c) 1991, 1993 + * The Regents of the University of California. All rights reserved. + * + * This code is derived from software contributed to Berkeley by + * Berkeley Software Design, Inc. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the University 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 REGENTS 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 REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#ifndef _SYS__DECLS_H_ +#define _SYS__DECLS_H_ + +#if defined(__cplusplus) +#define __BEGIN_DECLS extern "C" { +#define __END_DECLS } +#else +#define __BEGIN_DECLS +#define __END_DECLS +#endif + +#endif diff --git a/sys/sys/cdefs.h b/sys/sys/cdefs.h index 132d4809b0ed..916668a52fc0 100644 --- a/sys/sys/cdefs.h +++ b/sys/sys/cdefs.h @@ -61,13 +61,7 @@ #define __has_builtin(x) 0 #endif -#if defined(__cplusplus) -#define __BEGIN_DECLS extern "C" { -#define __END_DECLS } -#else -#define __BEGIN_DECLS -#define __END_DECLS -#endif +#include /* * This code has been put in place to help reduce the addition of diff --git a/tools/build/Makefile b/tools/build/Makefile index e1ccfa21d356..b0506806ba18 100644 --- a/tools/build/Makefile +++ b/tools/build/Makefile @@ -353,6 +353,7 @@ DISKINCS+= ${SRCTOP}/sys/sys/disk/bsd.h .if ${.MAKE.OS} == "FreeBSD" # Needed to build most of the things below, which include sys/cdefs.h either # directly or transitively +SYSINCS+= ${SRCTOP}/sys/sys/_decls.h SYSINCS+= ${SRCTOP}/sys/sys/_visible.h SYSINCS+= ${SRCTOP}/sys/sys/cdefs.h .endif From nobody Sun May 17 02:13:57 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gJ4Hb4bvkz6cWr8 for ; Sun, 17 May 2026 02:14: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gJ4Hb0gltz3F2g for ; Sun, 17 May 2026 02:14:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778984043; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+H2kUvGRf+6jSbv4oVwBsJSchXynh9M2/jEdvKUveUo=; b=ul6llwpOmepyGO+RLQbwVK4xi2IwDlnkuvXujXNYGP6sJxbBnynBHKrP9rK0PupM/Euy5z /u4HJbenGtJrsoy9AsSAZyl1CVW7gvAPMVkWwEYRqlWePlAyMBt3YAXaod1/XLpZb3T9wI otyWE82DOU2ddmCrYjnnvvSSleLdkzmvOGQI5TuFUYz/uRTwUKV9QUgJls54yPsYkE41uQ hUuf7dEryAZtzzJR6DCbXQqPMHK40jlCviEumTSy/jkF33ZMXzoHOCtbtAqPUpTlkaFd8X aHP6h9tv1TaCzQgr91SiJ+oj6Mjc4be5qXpaGb8LKrHR8eTRyRBUPuxjeQA/fA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778984043; a=rsa-sha256; cv=none; b=wc0DPRqEEeOPBobABThHPxgydrt/oLmQgHljAMZ0kFmHOkpqGQgoDU7LUUhb5sR4vrO3VH QkbFUC/Kcyj1JLRRVzREr9SAwUOTHhNpfLUWpag941cawBoFtjZisVxawHCvhYsAtdKJvm 6X59EYGqNgaegeqQlI8jsg5qlQK0ISh6ODSWOCKwdcU7ho/CJ6iKrxENyjlXEfW6/M2BB+ pTqSB13p3rWTvE7bv/fGd6a4SMthgaF3BHM9V7RTZV4m5v2h609GgQUntHRTa5MjL3wMBR 8VyQqYiK91T/PEdfo0S8DN5ZtDePTTV/dwZ5Nscr2jv1ZRP+moaDjhQC7ucKSw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778984043; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+H2kUvGRf+6jSbv4oVwBsJSchXynh9M2/jEdvKUveUo=; b=sdIPG1EYNVRMD38GGY7jhzjkKn23kHIGiAGkuT8pjyfmdXInUUOYzblNpRNAlb9xxZmBkh IsNSmN6GUivBPnNkPPIsxOZGk2FZE+/6TJncM7QVr9f1xuWQimRyOAA4mDWK+qrDTm3MvH x+auaGaRBPHP8UNGsDdlTcoIS+CoaGhUiQXIEoKCG5pSwlOtItHS+zVV4k5V5eHYQ4NDae lxQEQ+fxkuHYVWH7TFCry0gYWwNKXMFI4axJ4XJ4jt0EfFxELU/MktCGQuABgMPAz1VwqH Wjxs368/kN/g0HyNI0rIwHnRiWHP1EOleU8OGQ3OZnXr5lqhI4NN6Z/ImhaGRA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gJ4Hb03kPz5YL for ; Sun, 17 May 2026 02:14:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 37682 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 17 May 2026 02:13:57 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: 763de195d7bd - stable/15 - nfsd: Disable use of callbacks for NFSv4.0 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 763de195d7bd6ea34fb45ac53b298ce750af2806 Auto-Submitted: auto-generated Date: Sun, 17 May 2026 02:13:57 +0000 Message-Id: <6a092465.37682.1fd327ea@gitrepo.freebsd.org> The branch stable/15 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=763de195d7bd6ea34fb45ac53b298ce750af2806 commit 763de195d7bd6ea34fb45ac53b298ce750af2806 Author: Rick Macklem AuthorDate: 2026-05-03 23:25:45 +0000 Commit: Rick Macklem CommitDate: 2026-05-17 02:11:52 +0000 nfsd: Disable use of callbacks for NFSv4.0 Commit 71ac1ec5c9d9 disabled callbacks for the NFS client for NFSv4.0. This patch does the same for the NFSv4.0 server. The only use for callbacks for NFSv4.0 is delegations and delegations rarely work well for NFSv4.0 anyhow. Therefore, this patch disables callbacks for the NFSv4.0 server. This is the same behavior as occurs when vfs.nfsd.issue_delegations is 0. This change allowed the functions called nfsrv_getclientipaddr() and nfsrv_getipnumber() to be removed from the kernel. (cherry picked from commit 457c621add0a531273ee27798c924c6aaeacc4c1) --- sys/fs/nfsserver/nfs_nfsdstate.c | 261 +++++---------------------------------- 1 file changed, 32 insertions(+), 229 deletions(-) diff --git a/sys/fs/nfsserver/nfs_nfsdstate.c b/sys/fs/nfsserver/nfs_nfsdstate.c index 845949b8f630..e36a5c7810da 100644 --- a/sys/fs/nfsserver/nfs_nfsdstate.c +++ b/sys/fs/nfsserver/nfs_nfsdstate.c @@ -165,7 +165,6 @@ static void nfsrv_insertlock(struct nfslock *new_lop, struct nfslock *insert_lop, struct nfsstate *stp, struct nfslockfile *lfp); static void nfsrv_updatelock(struct nfsstate *stp, struct nfslock **new_lopp, struct nfslock **other_lopp, struct nfslockfile *lfp); -static int nfsrv_getipnumber(u_char *cp); static int nfsrv_checkrestart(nfsquad_t clientid, u_int32_t flags, nfsv4stateid_t *stateidp, int specialid); static int nfsrv_checkgrace(struct nfsrv_descript *nd, struct nfsclient *clp, @@ -4078,269 +4077,73 @@ out: } /* - * Get the client ip address for callbacks. If the strings can't be parsed, - * just set lc_program to 0 to indicate no callbacks are possible. - * (For cases where the address can't be parsed or is 0.0.0.0.0.0, set - * the address to the client's transport address. This won't be used - * for callbacks, but can be printed out by nfsstats for info.) + * Just set lc_program to 0 to indicate no callbacks are possible. + * Set the address to the client's transport address. This won't be used + * for callbacks, but can be printed out by nfsstats for info. * Return error if the xdr can't be parsed, 0 otherwise. */ int nfsrv_getclientipaddr(struct nfsrv_descript *nd, struct nfsclient *clp) { - u_int32_t *tl; - u_char *cp, *cp2; - int i, j, maxalen = 0, minalen = 0; - sa_family_t af; + uint32_t *tl; + int error = 0, i; #ifdef INET - struct sockaddr_in *rin = NULL, *sin; + struct sockaddr_in *rin, *sin; #endif #ifdef INET6 - struct sockaddr_in6 *rin6 = NULL, *sin6; + struct sockaddr_in6 *rin6, *sin6; #endif - u_char *addr; - int error = 0, cantparse = 0; - union { - in_addr_t ival; - u_char cval[4]; - } ip; - union { - in_port_t sval; - u_char cval[2]; - } port; - - /* 8 is the maximum length of the port# string. */ - addr = malloc(INET6_ADDRSTRLEN + 8, M_TEMP, M_WAITOK); + clp->lc_req.nr_client = NULL; clp->lc_req.nr_lock = 0; - af = AF_UNSPEC; - NFSM_DISSECT(tl, u_int32_t *, NFSX_UNSIGNED); + NFSM_DISSECT(tl, uint32_t *, NFSX_UNSIGNED); i = fxdr_unsigned(int, *tl); - if (i >= 3 && i <= 4) { - error = nfsrv_mtostr(nd, addr, i); + if (i < 0) { + error = NFSERR_BADXDR; + goto nfsmout; + } else if (i > 0) { + error = nfsm_advance(nd, NFSM_RNDUP(i), -1); if (error) goto nfsmout; -#ifdef INET - if (!strcmp(addr, "tcp")) { - clp->lc_flags |= LCL_TCPCALLBACK; - clp->lc_req.nr_sotype = SOCK_STREAM; - clp->lc_req.nr_soproto = IPPROTO_TCP; - af = AF_INET; - } else if (!strcmp(addr, "udp")) { - clp->lc_req.nr_sotype = SOCK_DGRAM; - clp->lc_req.nr_soproto = IPPROTO_UDP; - af = AF_INET; - } -#endif -#ifdef INET6 - if (af == AF_UNSPEC) { - if (!strcmp(addr, "tcp6")) { - clp->lc_flags |= LCL_TCPCALLBACK; - clp->lc_req.nr_sotype = SOCK_STREAM; - clp->lc_req.nr_soproto = IPPROTO_TCP; - af = AF_INET6; - } else if (!strcmp(addr, "udp6")) { - clp->lc_req.nr_sotype = SOCK_DGRAM; - clp->lc_req.nr_soproto = IPPROTO_UDP; - af = AF_INET6; - } - } -#endif - if (af == AF_UNSPEC) { - cantparse = 1; - } - } else { - cantparse = 1; - if (i > 0) { - error = nfsm_advance(nd, NFSM_RNDUP(i), -1); - if (error) - goto nfsmout; - } } - /* - * The caller has allocated clp->lc_req.nr_nam to be large enough - * for either AF_INET or AF_INET6 and zeroed out the contents. - * maxalen is set to the maximum length of the host IP address string - * plus 8 for the maximum length of the port#. - * minalen is set to the minimum length of the host IP address string - * plus 4 for the minimum length of the port#. - * These lengths do not include NULL termination, - * so INET[6]_ADDRSTRLEN - 1 is used in the calculations. - */ - switch (af) { + NFSM_DISSECT(tl, uint32_t *, NFSX_UNSIGNED); + i = fxdr_unsigned(int, *tl); + if (i < 0) { + error = NFSERR_BADXDR; + goto nfsmout; + } else if (i > 0) { + error = nfsm_advance(nd, NFSM_RNDUP(i), -1); + if (error) + goto nfsmout; + } + switch (nd->nd_nam->sa_family) { #ifdef INET case AF_INET: + sin = (struct sockaddr_in *)nd->nd_nam; rin = (struct sockaddr_in *)clp->lc_req.nr_nam; rin->sin_family = AF_INET; rin->sin_len = sizeof(struct sockaddr_in); - maxalen = INET_ADDRSTRLEN - 1 + 8; - minalen = 7 + 4; + rin->sin_addr.s_addr = sin->sin_addr.s_addr; + rin->sin_port = 0x0; break; #endif #ifdef INET6 case AF_INET6: + sin6 = (struct sockaddr_in6 *)nd->nd_nam; rin6 = (struct sockaddr_in6 *)clp->lc_req.nr_nam; rin6->sin6_family = AF_INET6; rin6->sin6_len = sizeof(struct sockaddr_in6); - maxalen = INET6_ADDRSTRLEN - 1 + 8; - minalen = 3 + 4; + rin6->sin6_addr = sin6->sin6_addr; + rin6->sin6_port = 0x0; break; #endif } - NFSM_DISSECT(tl, u_int32_t *, NFSX_UNSIGNED); - i = fxdr_unsigned(int, *tl); - if (i < 0) { - error = NFSERR_BADXDR; - goto nfsmout; - } else if (i == 0) { - cantparse = 1; - } else if (!cantparse && i <= maxalen && i >= minalen) { - error = nfsrv_mtostr(nd, addr, i); - if (error) - goto nfsmout; - - /* - * Parse out the address fields. We expect 6 decimal numbers - * separated by '.'s for AF_INET and two decimal numbers - * preceded by '.'s for AF_INET6. - */ - cp = NULL; - switch (af) { -#ifdef INET6 - /* - * For AF_INET6, first parse the host address. - */ - case AF_INET6: - cp = strchr(addr, '.'); - if (cp != NULL) { - *cp++ = '\0'; - if (inet_pton(af, addr, &rin6->sin6_addr) == 1) - i = 4; - else { - cp = NULL; - cantparse = 1; - } - } - break; -#endif -#ifdef INET - case AF_INET: - cp = addr; - i = 0; - break; -#endif - } - while (cp != NULL && *cp && i < 6) { - cp2 = cp; - while (*cp2 && *cp2 != '.') - cp2++; - if (*cp2) - *cp2++ = '\0'; - else if (i != 5) { - cantparse = 1; - break; - } - j = nfsrv_getipnumber(cp); - if (j >= 0) { - if (i < 4) - ip.cval[3 - i] = j; - else - port.cval[5 - i] = j; - } else { - cantparse = 1; - break; - } - cp = cp2; - i++; - } - if (!cantparse) { - /* - * The host address INADDR_ANY is (mis)used to indicate - * "there is no valid callback address". - */ - switch (af) { -#ifdef INET6 - case AF_INET6: - if (!IN6_ARE_ADDR_EQUAL(&rin6->sin6_addr, - &in6addr_any)) - rin6->sin6_port = htons(port.sval); - else - cantparse = 1; - break; -#endif -#ifdef INET - case AF_INET: - if (ip.ival != INADDR_ANY) { - rin->sin_addr.s_addr = htonl(ip.ival); - rin->sin_port = htons(port.sval); - } else { - cantparse = 1; - } - break; -#endif - } - } - } else { - cantparse = 1; - if (i > 0) { - error = nfsm_advance(nd, NFSM_RNDUP(i), -1); - if (error) - goto nfsmout; - } - } - if (cantparse) { - switch (nd->nd_nam->sa_family) { -#ifdef INET - case AF_INET: - sin = (struct sockaddr_in *)nd->nd_nam; - rin = (struct sockaddr_in *)clp->lc_req.nr_nam; - rin->sin_family = AF_INET; - rin->sin_len = sizeof(struct sockaddr_in); - rin->sin_addr.s_addr = sin->sin_addr.s_addr; - rin->sin_port = 0x0; - break; -#endif -#ifdef INET6 - case AF_INET6: - sin6 = (struct sockaddr_in6 *)nd->nd_nam; - rin6 = (struct sockaddr_in6 *)clp->lc_req.nr_nam; - rin6->sin6_family = AF_INET6; - rin6->sin6_len = sizeof(struct sockaddr_in6); - rin6->sin6_addr = sin6->sin6_addr; - rin6->sin6_port = 0x0; - break; -#endif - } - clp->lc_program = 0; - } + clp->lc_program = 0; nfsmout: - free(addr, M_TEMP); NFSEXITCODE2(error, nd); return (error); } -/* - * Turn a string of up to three decimal digits into a number. Return -1 upon - * error. - */ -static int -nfsrv_getipnumber(u_char *cp) -{ - int i = 0, j = 0; - - while (*cp) { - if (j > 2 || *cp < '0' || *cp > '9') - return (-1); - i *= 10; - i += (*cp - '0'); - cp++; - j++; - } - if (i < 256) - return (i); - return (-1); -} - /* * This function checks for restart conditions. */ From nobody Sun May 17 10:15:19 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gJGyv6zvBz6f6HV for ; Sun, 17 May 2026 10:15: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gJGyv6L45z42M9 for ; Sun, 17 May 2026 10:15:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779012919; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ivD/FE0IAQTMscIKNPSJGEWOjgLbvNIvJXRX1WU6S6Q=; b=dVvmbxaea4kfRyw8yZL/xvr3Wmdv5+BUme4mNy/N8G663QPQhrCG2vMvxlOg5AFFaSbOLj Ot8b5cCFbGEFZNwEaSvB9T7wSwJqS1OEE0rjzALEQaMyAjeZbEeL8A1xykkGgBIn0qEXkb irmQCyrCIo9pd+dIAYQD0ZfsGZxGx5//KM8GCQCQzbVctrjlLESC1usxnzgShX7CSMfRxv sIPbz4vKT9Eu/NN5QIhi+XqUqX4pJXR2Vlwn12cJSQKkfPL0SSRBJEEEtzm5aAaelRSFYU +VGf/bKAjuoY1paqbFQ/c80v4lAch0jmrJePP9ib6iQeodpEYklCcUiFEpuPjA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779012919; a=rsa-sha256; cv=none; b=iZz9qGtkYP1Vz19x+t7xCYEnL0nWqrX3j4zuXPx3bktgdGTBmYRWHZcHTFHAu+ZrOoDf5R uZQI0UMK+lPJucfdLQ6oc6fNZ9HcfqAMZd7HcU4dp7A6Urn30jnKsh12ZdKETaTv287irE UOZV29fPte7gGP3PRVHVFaWCOSNlp7PYX/bfkQvxM3p4MmJLYpldbJs7zKZ6i9RlqBEi/I bo2gW82JB+bTyEA80kRMTBvLVNhNv34GvkfkbuvaBJ42h9uLcBKI4VQvILsnrqhb2FPkf7 7TVI5rTatJ2TUCVzB9czDNjDcX+2XamH7s1+9XX3Bh1iMwr41VwEAjQN7LdxOQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779012919; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ivD/FE0IAQTMscIKNPSJGEWOjgLbvNIvJXRX1WU6S6Q=; b=HRlwWDou02L+0wu1zX8+ZKdb3wwgqxP2ST8rjnSdGu20JMY52fw92OCEV4Qg9yos0Cyuwl PFhZF0m6JKk+rmCGAOTnYS5AOZa/p+wKeQFZHznJEYMpZeviKtXm+xQDbsXWdjljT7ydvC Jm2WcrE9YXS7qcM8Kq9wVFKP85jcwiXlJiaf6MBlJi30cXuSoVZXCaeZ9T3Dlcdye5AysH Hx6CieldJ8NRfNYypiQ+tRW0sKVTC1/wFaxzf9/fWKvlazmo2g0125oXxbriXfcRw2OkdG FT/rtN5cRq6p4T11k6//3RNfVqDNahj2rTPZV2jWYJxy9PeL3xma4cRJuccs/Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gJGyv5jPbzd3H for ; Sun, 17 May 2026 10:15:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3ffad by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 17 May 2026 10:15:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrey V. Elsukov Subject: git: 2872268c7f6d - main - ipfw: treat ipv6 address with zero mask as 'any' List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ae X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2872268c7f6d473aae9b02ebb5d2c24fc2cff9b1 Auto-Submitted: auto-generated Date: Sun, 17 May 2026 10:15:19 +0000 Message-Id: <6a099537.3ffad.40d890d5@gitrepo.freebsd.org> The branch main has been updated by ae: URL: https://cgit.FreeBSD.org/src/commit/?id=2872268c7f6d473aae9b02ebb5d2c24fc2cff9b1 commit 2872268c7f6d473aae9b02ebb5d2c24fc2cff9b1 Author: Andrey V. Elsukov AuthorDate: 2026-05-17 10:12:20 +0000 Commit: Andrey V. Elsukov CommitDate: 2026-05-17 10:12:20 +0000 ipfw: treat ipv6 address with zero mask as 'any' Make the behaviour similar for both IPv4 and IPv6. Also add the corresponding tests. PR: 294733 MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D56618 --- sbin/ipfw/ipfw2.c | 7 ++++--- sbin/ipfw/ipv6.c | 11 +++++++---- sbin/ipfw/tests/test_add_rule.py | 24 ++++++++++++++++++++++++ tests/atf_python/sys/netpfil/ipfw/insns.py | 2 ++ 4 files changed, 37 insertions(+), 7 deletions(-) diff --git a/sbin/ipfw/ipfw2.c b/sbin/ipfw/ipfw2.c index 06a1ee937cd7..c67eb6618c59 100644 --- a/sbin/ipfw/ipfw2.c +++ b/sbin/ipfw/ipfw2.c @@ -3595,12 +3595,13 @@ fill_ip(ipfw_insn_ip *cmd, char *av, int cblen, struct tidx *tstate) * list unless it is the only item, in which case we * report an error. */ - if (cmd->o.len & F_NOT) { /* "not any" never matches */ - if (av == NULL && len == 0) /* only this entry */ + if (av == NULL && len == 0) { + if (cmd->o.len & F_NOT) /* "not any" never matches */ errx(EX_DATAERR, "not any never matches"); + return; } /* else do nothing and skip this entry */ - return; + continue; } /* A single IP can be stored in an optimized format */ if (d[1] == (uint32_t)~0 && av == NULL && len == 0) { diff --git a/sbin/ipfw/ipv6.c b/sbin/ipfw/ipv6.c index e6eb07af26dc..f34a08bb6f52 100644 --- a/sbin/ipfw/ipv6.c +++ b/sbin/ipfw/ipv6.c @@ -396,8 +396,6 @@ fill_ip6(ipfw_insn_ip6 *cmd, char *av, int cblen, struct tidx *tstate) n2mask(&d[1], masklen); } - APPLY_MASK(d, &d[1]); /* mask base address with mask */ - av = q; /* Check this entry */ @@ -408,11 +406,16 @@ fill_ip6(ipfw_insn_ip6 *cmd, char *av, int cblen, struct tidx *tstate) * list unless it is the only item, in which case we * report an error. */ - if (cmd->o.len & F_NOT && av == NULL && len == 0) - errx(EX_DATAERR, "not any never matches"); + if (av == NULL && len == 0) { + if (cmd->o.len & F_NOT) + errx(EX_DATAERR, "not any never matches"); + return (1); + } continue; } + APPLY_MASK(d, &d[1]); /* mask base address with mask */ + /* * A single IP can be stored alone */ diff --git a/sbin/ipfw/tests/test_add_rule.py b/sbin/ipfw/tests/test_add_rule.py index 4360c5f87c15..ed565f0e7c68 100755 --- a/sbin/ipfw/tests/test_add_rule.py +++ b/sbin/ipfw/tests/test_add_rule.py @@ -135,6 +135,30 @@ class TestAddRule(BaseTest): }, id="test_rulenum", ), + pytest.param( + { + "in": "add allow ip4 from 0.0.0.0/0 to 192.0.2.1/0", + "out": { + "insns": [ + InsnEmpty(IpFwOpcode.O_IP4), + InsnEmpty(IpFwOpcode.O_ACCEPT), + ], + }, + }, + id="test_zero_addrmask4", + ), + pytest.param( + { + "in": "add allow ip6 from ::/0 to 2001:DB8::/0", + "out": { + "insns": [ + InsnEmpty(IpFwOpcode.O_IP6), + InsnEmpty(IpFwOpcode.O_ACCEPT), + ], + }, + }, + id="test_zero_addrmask6", + ), pytest.param( { "in": "add allow ip from { 1.2.3.4 or 2.3.4.5 } to any", diff --git a/tests/atf_python/sys/netpfil/ipfw/insns.py b/tests/atf_python/sys/netpfil/ipfw/insns.py index dbb9af659794..c5f729ac4d63 100644 --- a/tests/atf_python/sys/netpfil/ipfw/insns.py +++ b/tests/atf_python/sys/netpfil/ipfw/insns.py @@ -682,6 +682,8 @@ insn_attrs = prepare_attrs_map( AttrDescr(IpFwOpcode.O_NOP, InsnComment), + AttrDescr(IpFwOpcode.O_IP4, InsnEmpty), + AttrDescr(IpFwOpcode.O_IP6, InsnEmpty), AttrDescr(IpFwOpcode.O_PROTO, InsnProto), AttrDescr(IpFwOpcode.O_PROB, InsnProb), AttrDescr(IpFwOpcode.O_IP_DST_ME, InsnEmpty), From nobody Sun May 17 12:50:32 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gJLQ602HDz6fJ77 for ; Sun, 17 May 2026 12:50:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gJLQ56f4Xz3G7h for ; Sun, 17 May 2026 12:50:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779022237; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oqmMo46l3oFFvbwKvfyK0ieXs3TP+yz+NPpjHUBi9kk=; b=ooKrXKGcvFMCO5njl5IvEDxQHa4r/cvd3vUL6L5su/xz/Y0t0yRJJJKxS33hyjJNOWgKNz loW0zDYSzNeFVZQkVa9wlkqUQF3kn6shpu70tCfVgDyVUppN5m7fLDYVx6QdrsGRRtoclX 6F8bhsJt5B9b/0PSs9M2ECT9Qh+Laa98wMHDkyziaipVuSi7qelNJQufc4LFVruF4htnl2 vjcEoGNrMQ5K2ZmMS/G4NtxIt7IQMR/cKffz9KUud/e6pIcPKThHkLKTo6jUMMeVTdrMAr jtgfUrtmYPFUROWmhBIo1wk1ZeZCK9S/xRMQdMQQr9v2l1/PH5g6QunqDp2ihQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779022237; a=rsa-sha256; cv=none; b=oVy4VIRDbUMQ2/P6t1SJiYlE/wB5TeIfM6XBoyqc2gBwDRVuXnQPqlOP+WhtFeBXVdSmRj 1OlI4axSGZiInOwm7fcw2lDR8XXWTcZ4+/Bnbx0ASHMzBDx04619U7o/M17gJiQaFsbEW7 9FQhILqA+GJZdyjRZXejCt6465tAqOtcxwtzY3RxiIyboQKpwaqbaPGOVf4Og45vIzto7J 9ZgOeesqcnPI26SoojMyyBjb912pTsLuDOck+CAH3zA1qNuJKlHydA5LR06lVBboCW/yXA 9DBjBd3gWONx0EBt1FItkUeCfXo41jySvY4OmdxDhSdN0X8FCArtmnDEEzUXCQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779022237; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oqmMo46l3oFFvbwKvfyK0ieXs3TP+yz+NPpjHUBi9kk=; b=XNEzZBIFGvL7KrQWbTB1IpjtF1IXcQj4Tq6cxDFUtj/8/5pQ3qlnMGsYzkRvQHJuL/WWqQ BUGMH5XaGrh/DspETvx+LkYqVa6JALif5F9BMagZ9moiNA9ESm4pEH2H2T1ROrXe3kgqDb RxChWBpb9w8AOK5WjYF9OPqBH5VZt5XoP+CkV+1CMKoin+HUkd2DTqaW24fb35Fjk17Rmq XxZUj7N00gOnls/xJzSMQOdh2ahx69wYJlftVOfAMRWwL2F5gRdEYq+yH3aXEiFp7rNnNP LkN57G7Z90SfijeTj2zT2FWeOGvy3jetq9maZQzymA2liMEoFGRhluoK6cvL0w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gJLQ568k7zhXK for ; Sun, 17 May 2026 12:50:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 301f4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 17 May 2026 12:50:32 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alan Somers Subject: git: 4cee16d471d4 - main - linuxulator: fix SO_PEERCRED emulation after 1d24638d3e8 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: 4cee16d471d47f4673e4d2c66f7a96d4e6d86ee9 Auto-Submitted: auto-generated Date: Sun, 17 May 2026 12:50:32 +0000 Message-Id: <6a09b998.301f4.a5dedec@gitrepo.freebsd.org> The branch main has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=4cee16d471d47f4673e4d2c66f7a96d4e6d86ee9 commit 4cee16d471d47f4673e4d2c66f7a96d4e6d86ee9 Author: Alan Somers AuthorDate: 2026-05-16 18:03:49 +0000 Commit: Alan Somers CommitDate: 2026-05-17 12:49:23 +0000 linuxulator: fix SO_PEERCRED emulation after 1d24638d3e8 For Linux binaries, sopt->sopt_td may be null. And there's also no need to check it, since struct l_ucred has the same layout on 32-bit systems as on 64-bit ones. PR: 295333 Reported by: Miguel Gomes Fixes: 1d24638d3e8 ("Fix LOCAL_PEERCRED in 32-bit compat mode") MFC after: 3 days Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D57032 --- sys/kern/uipc_usrreq.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c index 2508f7edd1c5..a5607e66117c 100644 --- a/sys/kern/uipc_usrreq.c +++ b/sys/kern/uipc_usrreq.c @@ -2756,7 +2756,9 @@ uipc_ctloutput(struct socket *so, struct sockopt *sopt) if (error != 0) break; #ifdef COMPAT_FREEBSD32 - if (SV_PROC_FLAG(sopt->sopt_td->td_proc, SV_ILP32)) { + if (sopt->sopt_td && + SV_PROC_FLAG(sopt->sopt_td->td_proc, SV_ILP32)) + { struct xucred32 xu32 = {}; int i; From nobody Sun May 17 16:24:12 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gJR8X75LMz6fZNm for ; Sun, 17 May 2026 16:24: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gJR8X4KVSz3ssd for ; Sun, 17 May 2026 16:24:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779035052; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=k8us6U29pe1aH396K6TzA5hS+YihbDMPEGURKNVhQgE=; b=GsQF2xnmZmLqHURCG9wAqgKJQDSRZht8/CcoIMCQZKHb24b5f0BU9X4WTsQ2tQl+g7IkmT Bwb3lU5TulYB3vsTZI01SszZsPyuILkf7IPLAN7ZS6K5RGYl2EGsnCOf32nNPhKR3m24MQ 4DcRjO2MlWOieT/bjnlBvQ6KUck/MKH0JPA7vSlMV/Zzevsybvh9XDciqIqjQM0VCoyhuG XJYgNdR9QPZTxWx7vL3aSbwVD4ld1C5LM9rgoD4NGP3UBSB3P/4d2VLP5KFlQoGlxRkfZ/ pF7YwdljytpsBNKYZ3UBtE/8exOCSTqQpnVp5xwQIUXZm4Uk2UaThvj93DvtqQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779035052; a=rsa-sha256; cv=none; b=TrGjbrLdhnI2/fPVTCSu8xlKrJZtcMRIaaz4odyOTndy057/ahAXkyY/mIWs+5nka8gu0G HB11Ay10Hh4RgdgF4dHBXmaNtty7syQRe7xIizFr0vQiKTB/sBVH7BKB5J00Z5fYDngiMh qceNGMADK7w2MQcLvOHnRJBWxUJYYLBK/PAZ8EZ8a6L+flr0BGVrivWyJGPuVIVmN0kk1r KGnYM6QA7jYp5D6DNlaUiy+dlhthqZonhRACAQkzXizSf64+b0AZ6B4bY0Zn9e/oCjXxmp CohTtOtQQQCWrcZJrbdkDxWA3ea+cSFnToNKKk3oObT72XDTETeBySXIF7T5YQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779035052; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=k8us6U29pe1aH396K6TzA5hS+YihbDMPEGURKNVhQgE=; b=BYsZqdlhZspNavkLnNAPZ+TisPxNI7EBCKUey8bU9zkXheI0opkejJaGorJquPtx+CJcI9 eDDN8oecor6g6pCayKAYCO/c4ZQByTq7ft2nF3Kaz9d1pLFDKT9eSKxrCPnOVYcRrhtiyv z5vBDbHchC5+mM6IbU7FfdV6mrcis/+rdbIUEp0gSFnm8idMEaQ0PS2T67hRmJbAEoHB1X i+yk7UoT3OF01QEZfol6MdhE+ZItSxQzDctZN1wBEFAsjltC1FkacVHxsnvbR1w/gf/zIc awYekBxBLVyGXQ3614itx4yMrm74kG9qSz5PXo4ucs7FehCHfKWEmcX1e1L4iA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gJR8X3jLqzpjm for ; Sun, 17 May 2026 16:24:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 180b1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 17 May 2026 16:24:12 +0000 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=B8rg?=rav Subject: git: 363ea40c7654 - main - limits: Further RLIMIT_VMM cleanup List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: 363ea40c765424b3cbd9b96790235af030fcc8ff Auto-Submitted: auto-generated Date: Sun, 17 May 2026 16:24:12 +0000 Message-Id: <6a09ebac.180b1.3301129f@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=363ea40c765424b3cbd9b96790235af030fcc8ff commit 363ea40c765424b3cbd9b96790235af030fcc8ff Author: Dag-Erling Smørgrav AuthorDate: 2026-05-17 16:23:50 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-05-17 16:23:50 +0000 limits: Further RLIMIT_VMM cleanup Teach limits(1), sh(1), and setclassresources(3) about RLIMIT_VMM. Fixes: 1092ec8b3375 ("kern: Introduce RLIMIT_VMM") Reviewed by: bnovkov Differential Revision: https://reviews.freebsd.org/D57031 --- bin/sh/miscbltin.c | 5 ++++- lib/libutil/login_class.c | 1 + usr.bin/limits/limits.c | 2 ++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/bin/sh/miscbltin.c b/bin/sh/miscbltin.c index bbf0aa5b8bde..f96f96ba43d2 100644 --- a/bin/sh/miscbltin.c +++ b/bin/sh/miscbltin.c @@ -517,6 +517,9 @@ static const struct limits limits[] = { #endif #ifdef RLIMIT_PIPEBUF { "pipebuf", (char *)0, RLIMIT_PIPEBUF, 1024, 'y' }, +#endif +#ifdef RLIMIT_VMM + { "virtual machines", (char *)0, RLIMIT_VMM, 1, 'V' }, #endif { (char *) 0, (char *)0, 0, 0, '\0' } }; @@ -553,7 +556,7 @@ ulimitcmd(int argc __unused, char **argv __unused) struct rlimit limit; what = 'f'; - while ((optc = nextopt("HSatfdsmcnuvlbpwkoy")) != '\0') + while ((optc = nextopt("abcdfHklmnopSstuVvwy")) != '\0') switch (optc) { case 'H': how = HARD; diff --git a/lib/libutil/login_class.c b/lib/libutil/login_class.c index 9478b4dc98ca..90e4e01f7c3b 100644 --- a/lib/libutil/login_class.c +++ b/lib/libutil/login_class.c @@ -66,6 +66,7 @@ static struct login_res { { "kqueues", login_getcapsize, RLIMIT_KQUEUES }, { "umtxp", login_getcapnum, RLIMIT_UMTXP }, { "pipebuf", login_getcapnum, RLIMIT_PIPEBUF }, + { "vms", login_getcapnum, RLIMIT_VMM }, { NULL, 0, 0 } }; diff --git a/usr.bin/limits/limits.c b/usr.bin/limits/limits.c index 57551c556c25..fbb19289e6ca 100644 --- a/usr.bin/limits/limits.c +++ b/usr.bin/limits/limits.c @@ -92,6 +92,7 @@ static struct { { " kqueues%-4s %8s", "\n", 1 }, { " umtxp%-4s %8s", "\n", 1 }, { " pipebuf%-4s %8s", " kB\n", 1024 }, + { " vms%-4s %8s", "\n", 1 }, } }, { "sh", "unlimited", "", " -H", " -S", "", @@ -112,6 +113,7 @@ static struct { { "ulimit%s -k %s", ";\n", 1 }, { "ulimit%s -o %s", ";\n", 1 }, { "ulimit%s -y %s", ";\n", 1024 }, + { "ulimit%s -V %s", ";\n", 1 }, } }, { "csh", "unlimited", "", " -h", "", NULL, From nobody Sun May 17 19:44:49 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gJWc70P17z6ctyF for ; Sun, 17 May 2026 19:44: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gJWc65LrLz3L30 for ; Sun, 17 May 2026 19:44:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779047094; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gI+0l6tqk+HdCCTSIQYEhQUBJuTa7uDgHquZV313aWM=; b=A61eT6hJnao9AhhZEwmJCYbBF3rjXJHc4Rj13IRXk8Ubgy8FU947nupy1RW6Zgbi2qq/xX lQI53+mZCwk89GHqRHo9JeP8zs00H03S89RaipBWgiA7FpxLASn7qRKtrHmJpyK8wgWXTW sxytpRuL9oqg8HNIQgGgJss5LADTeCHdqx6bCeCyx5Lr3gb7heuidh8uo47bvunURtuvx4 W3DDkxDSrhwzcd3W8KI43mf/3+l4zE4BEpfSbNKyerZZRdeAUBuSiGIKIpHbD/JlpBMyRr g0dGpXFsOtNI7Ff0WXjeGRb9uloNSHzMqd864GRUiomMSxDrpKgfnoK17OgWQQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779047094; a=rsa-sha256; cv=none; b=r2iz24b9UBZQQ1U/QDIDHLXX38AQZ1Fwc6mbvK8Hs3DbzOpMWK39UPs5JKzfTycHSZW7c4 DP1fLcDGoJA1LzhLWfovn0vir2W/QMat9g+soq+u/no1qLNIYdN4384J9eh26xXjDGK06D PDV+xBuPjENVyMxXCw0/VYSPOkKkkVTz1yKI61xBZ/vrewvTGEIU1IA0C/+a0Z1QssJL1w MZEvmRAzmQE96CeqX95zGXHMTdoYyxOONX4oDD3ASq+xxXwCVtyy0rsaEQaz5H25yJj7E3 IFwMEhbFH0SkVUwH8zhZ/dUByA5WqR8/2bBYCsYyC294vS7B445xUaAPP3rlJg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779047094; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gI+0l6tqk+HdCCTSIQYEhQUBJuTa7uDgHquZV313aWM=; b=nnAwCF6jNDqvMe5QuvNFcFvVWgte+qEXFYcvws3LY9J1DT1pPQ7neLiw3IWK4bkd5QPJIB x4380io69qT459PIXWhTPiCNZ7sP6zoIqY6Eo16yGY7x0hWyNUM1j51IBSsN3tV4iXVMhB eBHCwLywBKkCTrB2tNqNBmJHXTM7966towYK2I7I3GZYKAqRRKtWFr7di7+t4ig1L1mkD+ wFdEKvt9A2mKrJHzqqHhLLaTTMhaoj2QF8nvBmFzbYgesC3VZVmd7jxaxVjVjY722i6SnI jaO9IHdbvwLBKoYH+RnF38vWQc58vtJxEQsHrpVkcEtVpDOPQQHc7OPSFejk1A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gJWc64fV2zvQN for ; Sun, 17 May 2026 19:44:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 366ed by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 17 May 2026 19:44:49 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 7bdf2b5d5fba - main - nullfs: do not allow to mount a vnode over itself List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: 7bdf2b5d5fbabfc8749c4ff6e618c3e843b14de0 Auto-Submitted: auto-generated Date: Sun, 17 May 2026 19:44:49 +0000 Message-Id: <6a0a1ab1.366ed.93367f9@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=7bdf2b5d5fbabfc8749c4ff6e618c3e843b14de0 commit 7bdf2b5d5fbabfc8749c4ff6e618c3e843b14de0 Author: Konstantin Belousov AuthorDate: 2026-05-16 22:16:45 +0000 Commit: Konstantin Belousov CommitDate: 2026-05-17 19:44:06 +0000 nullfs: do not allow to mount a vnode over itself This causes recursion in VFS that is not worth handling. PR: 275570 Reported by: Alex S Reviewed by: markj Tested by: pho Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D57043 --- sys/fs/nullfs/null_vfsops.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sys/fs/nullfs/null_vfsops.c b/sys/fs/nullfs/null_vfsops.c index c3eec727aeea..0ec4f9c87297 100644 --- a/sys/fs/nullfs/null_vfsops.c +++ b/sys/fs/nullfs/null_vfsops.c @@ -151,6 +151,14 @@ nullfs_mount(struct mount *mp) */ lowerrootvp = ndp->ni_vp; + /* + * Do not allow to mount a vnode over itself. + */ + if (mp->mnt_vnodecovered == lowerrootvp) { + vput(lowerrootvp); + return (EDEADLK); + } + /* * Check multi null mount to avoid `lock against myself' panic. */ From nobody Sun May 17 19:56:15 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gJWsJ4stLz6cvrd for ; Sun, 17 May 2026 19:56: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gJWsJ48c8z3MYZ for ; Sun, 17 May 2026 19:56:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779047780; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3lQ6AoBzSnUq78saSfSCOQQz2YG7z/cnWAjZe9mQfEw=; b=cBi0BYIrjXjGRXqFSAqnNnkvHdtOAQSzjzNOODWnWKgKTMlQ/EQURKC7GETfs1Upv4+MrE OzsFEIme7+zl301CgeiO06fA+JVjP6J09l59ZGg5hlUqD8H2KCv6M+K9RA8tQfeo3mlqhM D+eHJ63mQaTda8eKqS9boWnhYS9ERx7u/Dwo9FzjHCnYA8lIvFY7fMB/hNW/9gbbpy1r0+ VrLA24yn1De2YZVglFvdFrJRwscFXwX6wPLcIOH6EhH73W4bLLyQH+UFb5c6hFKroPQVyr Xfkefm3z6/G/Gd6Bu4BHMwADN6zkQeL2cEmZBXDe8frQDdPdyn+TPuSKsUh9dg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779047780; a=rsa-sha256; cv=none; b=JBNOlBP9jTgpY4nnRfwGbBwkvcOSFPFkme36SrqDiaPj7NIJwh2jojzpp39Nbc4ehx+Goa iB85+5JWTNsJiwYt/psq8lSZeE1lnFpEy1VcXDPXCa1bMv3GciRZvRIOYct9BlzBPQw+8p QWkEvRUKpc2iF1WGUrjRkBf6VvSTxLm3yA3keFi+K2nh2BNenmvFtEsWiGWv2oagmEkHhA t7fW23Zm+KqNE4hfX7iVWsk9IGm8dqqsUnoD4EcNZ+KpDPqOEMCcWiEZS6Zog5twAOVsO9 gG3umxP3bqU4QvmSkZE0visgg4SQ9OiIbI+0NDw37WhV9aZglXeIPnb9aK3Sww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779047780; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3lQ6AoBzSnUq78saSfSCOQQz2YG7z/cnWAjZe9mQfEw=; b=SXBAMnISy7IwtOy0DBXle8JjUBsJB7sG8Oxv4KglqxDEuxTlKi1sVjvCx3fxFgTcGWXU2x 5POXvbtjiU59gVnDuLzwH06ppreBajmdOGbSTlyNw6XHsvSB4VTzmp6W/Q9MTywSKpWogO KC+Ik467UshBG4Sk1iYMgN9hGm7JtN3pWqc0KrH6oSACHbjZ7stHTHMv7KbAbJxB8k/nSV 43ceNKWnRTP+OafCwWa/zv+gtifsWY2AW8dUISEVPY+j98fwDO//gJdwMe69gzC0VXk686 kqYFQ+g2oDQ3C6Jl41MnzerY08+sheso+mP5EFH6sQ97AxI72+5Nltgmt+UqXQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gJWsJ3X4dzvtJ for ; Sun, 17 May 2026 19:56:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31478 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 17 May 2026 19:56:15 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 56bc43f5d02b - main - locking.9: warn about using sleepable lock address as a sleep channel List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: 56bc43f5d02bd0745d597db44c285bf78d083762 Auto-Submitted: auto-generated Date: Sun, 17 May 2026 19:56:15 +0000 Message-Id: <6a0a1d5f.31478.7a5c2aa@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=56bc43f5d02bd0745d597db44c285bf78d083762 commit 56bc43f5d02bd0745d597db44c285bf78d083762 Author: Konstantin Belousov AuthorDate: 2026-05-15 11:05:45 +0000 Commit: Konstantin Belousov CommitDate: 2026-05-17 19:55:23 +0000 locking.9: warn about using sleepable lock address as a sleep channel Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 3 days Differential revision: https://reviews.freebsd.org/D57012 --- share/man/man9/locking.9 | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/share/man/man9/locking.9 b/share/man/man9/locking.9 index ad044b6e1d46..9afdcd56f4f6 100644 --- a/share/man/man9/locking.9 +++ b/share/man/man9/locking.9 @@ -205,11 +205,6 @@ The functions and .Fn wakeup_one also handle event-based thread blocking. -Unlike condition variables, -arbitrary addresses may be used as wait channels and a dedicated -structure does not need to be allocated. -However, care must be taken to ensure that wait channel addresses are -unique to an event. If a thread must wait for an external event, it is put to sleep by .Fn tsleep , .Fn msleep , @@ -222,6 +217,16 @@ Threads may also wait using one of the locking primitive sleep routines or .Xr sx_sleep 9 . .Pp +Unlike condition variables, +arbitrary addresses may be used as wait channels and a dedicated +structure does not need to be allocated. +However, care must be taken to ensure that wait channel addresses are +unique to an event. +For example, the memory address of a sleepable lock such as a +.Xr sx 9 +must not be used as a sleep channel, because the lock implementation +will internally use the same address as a wait channel. +.Pp The parameter .Fa chan is an arbitrary address that uniquely identifies the event on which From nobody Sun May 17 21:13:31 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gJYZN09M8z6d3d5 for ; Sun, 17 May 2026 21:13: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gJYZM5KzVz3b38 for ; Sun, 17 May 2026 21:13:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779052411; 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; bh=xn/38VmpktomNPctyLvMuMamnz9fZdtd32FtE2G5LLs=; b=FrvZ22Z358/sg7F/N3lSzTg3O54td5VFyxJftg9KYvKE7oxNOdUQXYui1IPd8F+7pZ3i6D JJVEocw6o2ZidLb81Kz57SghvnBYrWqlwuv+Yq21gByNXvHUn+6paRd3hgVLOWc/1/wDy/ BQ3/FVBaI/Lj0tWkg8yURXbO2y+orZMtnO1V+vV4/+UV4GCrcxVOzMwQuIRn6ELnGgKxSE bmL1YTRwySp+cQ/KAB6jfIS51SSKhBjCgI4xD6B94NNUUbunmbvoBbTE7aVOV5MdnQ4iqA URh9KSEZnsKKpt9sBHbtkXsKe5lE21FedCNjAP+L6uJ5+6hPpNHYe5A6o5jtsw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779052411; a=rsa-sha256; cv=none; b=jRzA+JMjn9bpzq4QWyOyHm3tdE4H8/Ctwxexp+7S8HG2B7JeGeJQwG5g2nDEP6ldFD0y2r TqaFbfjHTN3BJj1xmMrEz4x2YZun8EwgU4KWXstAunW/DP5/KnOe2ZJOBcy07+jYf8lx+k VO8hTizskW6MVFrf95ZfwPfivimp6RL0rsEcQs32CnkzX0rfnfFi+yu56kaUoeg5MNK+qY 0bH0WcNXk69lCKxMVTvFrs7HM0Nj3b8jSChLJeeMWWqNn4oBIzMFLw5F1CYPT5TGSLZjxv eG7GkremBIeoVOw08XtT57fDBZPhj4wcHCk65ppPh9bwvLrcy5HzDe2lvGXd3Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779052411; 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; bh=xn/38VmpktomNPctyLvMuMamnz9fZdtd32FtE2G5LLs=; b=mdf4wQ8rg6Nv7wS7eDSQXgYBkDCasR37qYajza9NgCl7hy7TbSWEKAyvK9MsoT7hEt9vJ5 M7KhxsOUQEVCzkaICVf2W4Si045ogpz2QkWlOISIsW9yHKmVd+spzQFcJbkKNxgyH2qomS r1XKSwCAYGvh1LlIksg6Vzj5mK8k434HmonNtjftAQoSz/MdDfzdXIoBBr1w5H8M8JHYXY MjB/4KlT4xDoDIyKLw8Q+Xhga5zwOvKZMQPyz5VrxdZKYcDog9bcE6aKLCwO6RFgRj/QQM NTdV3hRrDqP8KtGYO0FpOBCnu1/uaikqLXc/uvgReg0X2+J3+4H0A44DEHHESA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gJYZM4vkmzxwH for ; Sun, 17 May 2026 21:13:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3f70c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 17 May 2026 21:13:31 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Koine Yuusuke From: Ed Maste Subject: git: 436f47a80c20 - main - intelhfi: Add IA32_PM_ENABLE bit flag define List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: 436f47a80c20a4d8395d30f81684b2d5dd35991e Auto-Submitted: auto-generated Date: Sun, 17 May 2026 21:13:31 +0000 Message-Id: <6a0a2f7b.3f70c.16f105a4@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=436f47a80c20a4d8395d30f81684b2d5dd35991e commit 436f47a80c20a4d8395d30f81684b2d5dd35991e Author: Koine Yuusuke AuthorDate: 2026-05-17 15:58:41 +0000 Commit: Ed Maste CommitDate: 2026-05-17 21:13:14 +0000 intelhfi: Add IA32_PM_ENABLE bit flag define Reviewed by: Minsoo Choo Differential Revision: https://reviews.freebsd.org/D56919 --- sys/x86/include/specialreg.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/x86/include/specialreg.h b/sys/x86/include/specialreg.h index 4eb4f2c398b2..edf281225180 100644 --- a/sys/x86/include/specialreg.h +++ b/sys/x86/include/specialreg.h @@ -904,6 +904,9 @@ /* MSR IA32_MCU_OPT_CTRL */ #define IA32_RNGDS_MITG_DIS 0x00000001 +/* MSR IA32_PM_ENABLE */ +#define IA32_PM_ENABLE_HWP_ENABLE (1ULL << 0) + /* MSR IA32_HWP_CAPABILITIES */ #define IA32_HWP_CAPABILITIES_HIGHEST_PERFORMANCE(x) (((x) >> 0) & 0xff) #define IA32_HWP_CAPABILITIES_GUARANTEED_PERFORMANCE(x) (((x) >> 8) & 0xff) From nobody Sun May 17 22:09:41 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gJZqH4Srdz6d7dh for ; Sun, 17 May 2026 22:09: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gJZqH1dmJz3mbD for ; Sun, 17 May 2026 22:09:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779055787; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VfNy3PzQn6xKr/RuR67KCroGt/D6vwEtP/qmmmz382A=; b=xf1P1ooeAr9WkKxhmjtGkwsXFAugVGbMNz6LHcWmYnO5q/aG0H6F1h6e0zze9wpx3hddX4 GQZD/SbJAlOIfV3rh9QkYfh7rT00PfKgzC7qlvkT7mhJkEXIs4nG5D9zGcCdk8hAfaYwjN Emhk+HfBqBQEe3D9Q6KrPEEwRHAqnPvCYtPUkSD2IcZXJ1HTSswKMhVZPLhSWo3Qdyxec9 7l1mHmnSfr/77UWEjgVEjfEUpqCRjb9ncujMsek6my1Mf617leoldr5TGookV26EJmcata O+4U5iDtkRP6bYDd9tZCRwfr8mDUK5dLZyJrt7v4A4oOvwG8XedSS92nxfTW7g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779055787; a=rsa-sha256; cv=none; b=HfSOGDF+64n6/HjPDCL5iyeegA6ii0ok5bGenPmllx3jAOl6uwdbxSkQWDxNysthexykCg YSf59PCKqu68htOdZ3gGvFcspVIz8DaRQLmREsKk/5c4qgjSZmHchLibU4keGC1SVyidmA QAfIHlEbXjrpM0MhLPyaRJw+B0d6idhPcB6EVaJY/X2sKnYg+wxJwXaq3wWvH8TcD2l8Hx tnwJbcyx5YB+F8J098IVGXiGSgNo1trK4JLNn5o8U8A8/lfCeq1CxffA2t2gF+CZOeDWe0 sQAklLY0Om6tASPBr+VzmdEmSz5HDiWGrB2VEw7p6wQ2NWFYZfslJjW0G+rj2w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779055787; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VfNy3PzQn6xKr/RuR67KCroGt/D6vwEtP/qmmmz382A=; b=SWVtzWWiNsLK8fY9v7dW3SAhM8DPNKZe1tfXxfB7SOm/NpbTmTOlGfD36rZJ4eNpMlDKGl RtfP/d+rgHPLpyMDH59bn6nzhOgZ8OnHY55PXDEpMT2/59eKWh8CVmX/TISDeocYdl3Dr/ qUVYV1zniC3u00bVUAmopkiFA97kuSPTGBPZ7LFGW4UYIQHc9lf9tCO0qFeMhY9Hd2e5qg svj05leBvQRbSkMnIJZrAo96t/ew5DFHlh5xs8d/qLOhl0E/JjLa7fOtuvUXy66O+tHoZq Ip7xnU5GTARFobVcISMVnyM8LXR3C886wwJboZl03wHHZqBKISJoIJjOsd2NKQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gJZqH0kz5z10nv for ; Sun, 17 May 2026 22:09:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 425c7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 17 May 2026 22:09:41 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 8ad8643a6673 - main - ufs: ufs_bmap_seekdata() needs mapped buffer for scan List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: 8ad8643a66735d28dac53a772856c94ca65b2bf3 Auto-Submitted: auto-generated Date: Sun, 17 May 2026 22:09:41 +0000 Message-Id: <6a0a3ca5.425c7.6f2ddb32@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=8ad8643a66735d28dac53a772856c94ca65b2bf3 commit 8ad8643a66735d28dac53a772856c94ca65b2bf3 Author: Konstantin Belousov AuthorDate: 2026-05-17 00:09:21 +0000 Commit: Konstantin Belousov CommitDate: 2026-05-17 22:09:26 +0000 ufs: ufs_bmap_seekdata() needs mapped buffer for scan PR: 295348 Reported and tested by: Alastair Hogge Reviewed by: mckusick Fixes: bab04ddf1fd4 ("ufs: support unmapped bufs for indirect blocks in bmap") MFC after: 1 week Differential revision: https://reviews.freebsd.org/D57036 --- sys/ufs/ufs/ufs_bmap.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/sys/ufs/ufs/ufs_bmap.c b/sys/ufs/ufs/ufs_bmap.c index edfcabb1a607..6b3e6f77427c 100644 --- a/sys/ufs/ufs/ufs_bmap.c +++ b/sys/ufs/ufs/ufs_bmap.c @@ -59,7 +59,8 @@ #include static ufs_lbn_t lbn_count(struct ufsmount *, int); -static int readindir(struct vnode *, ufs_lbn_t, ufs2_daddr_t, struct buf **); +static int readindir(struct vnode *, ufs_lbn_t, ufs2_daddr_t, bool, + struct buf **); static int ufs_bmap_use_unmapped = 1; @@ -104,6 +105,7 @@ static int readindir(struct vnode *vp, ufs_lbn_t lbn, ufs2_daddr_t daddr, + bool allow_unmapped, struct buf **bpp) { struct buf *bp; @@ -116,7 +118,8 @@ readindir(struct vnode *vp, ump = VFSTOUFS(mp); ip = VTOI(vp); - gbflags = !I_IS_UFS1(ip) && ufs_bmap_use_unmapped ? GB_UNMAPPED : 0; + gbflags = allow_unmapped && !I_IS_UFS1(ip) && + ufs_bmap_use_unmapped ? GB_UNMAPPED : 0; bp = getblk(vp, lbn, mp->mnt_stat.f_iosize, 0, 0, gbflags); if ((bp->b_flags & B_CACHE) == 0) { KASSERT(daddr != 0, @@ -291,7 +294,7 @@ ufs_bmaparray(struct vnode *vp, */ if (bp) bqrelse(bp); - error = readindir(vp, metalbn, daddr, &bp); + error = readindir(vp, metalbn, daddr, true, &bp); if (error != 0) return (error); @@ -525,7 +528,7 @@ ufs_bmap_seekdata(struct vnode *vp, off_t *offp) for (; daddr != 0 && num > 0; ap++, num--) { if (bp != NULL) bqrelse(bp); - error = readindir(vp, ap->in_lbn, daddr, &bp); + error = readindir(vp, ap->in_lbn, daddr, false, &bp); if (error != 0) return (error); From nobody Sun May 17 23:37:59 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gJcn33d1Bz6dG1g for ; Sun, 17 May 2026 23:37:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gJcn31sPzz3wTB for ; Sun, 17 May 2026 23:37:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779061079; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9RiIfXZefOj+NkuM2AvWZlT0zmUKoCRK1XuW5wttoZ4=; b=jUaSRGHeRGcbxfk8am8bC+dsDniM3aiTKk7ThOCETVmEvazoeYT6/YmtzPLA64a7JloDNX 6sWliY9dt5vHiMRJEYKlDqqlPve1douY7LRUoRa+lCoOqNhI4ueWhVuIWkMWipFIwkTSp2 +mH1USivyscujLu5enIppqbfmElfQo5qt80DI2x0SJIusjfPyq/WXlLgXv5jBuEOaQYYku eaMu9dGN9Jv4qG3g/XVTuaL9Yj1pHQZaSI7NS7qtf3k7gvQ+JQCv8CiRhDNEXyRgsVjDoq gyZUCZa6ml6g11BtetJYcMpcQfIVQduzhtyfN3FC4L6xGu3mb0ksTkqYnfzw7g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779061079; a=rsa-sha256; cv=none; b=U8+YS9UIY1LLIH7YCinZ77tk1ZT+hD5ry/W6I5utlOvgne0kmEYWuBmmsOcvVsXB+5Yp08 gjiR5C1RjSC1+Od5V3WzmmKi6WdEtDVjPiYkyNcbKZOOSj06l5XhsThw2lXaE5R4lr0ABo 4tkMJS1+TOYTclQe07X8m8ZG5G9pmdRKVSc+mD3XXZeEmXyU6LX4tBY/GbXDq/SYP4axY7 p3PdnWnmcFHgCsqqkIipsQcVguRLLP0P+nUNBckbxTBKQfe+Gg7y/LHbkIjhs3t5fEw+SC pDSP1y5P9jlHgLLlCR5b96sTARxC4u8egAMH4ZAm48AtoEg6djP5JvWivKP4wA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779061079; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9RiIfXZefOj+NkuM2AvWZlT0zmUKoCRK1XuW5wttoZ4=; b=PYjjOslqpxUfllN6LWnVszW6i+gOtLvsu33ypmUCDrGKY/08Xw8Lv81061hZEquAX1LePz 4CMRAx2N8ZMz28wFHUMaxAHFn8AR6fh8WBYZOwsuREjbdy1871ox/3F0Ocys7GP9YaQ4aV 0dCQwAacvCmJa8gLTELsaXkJHBtawO/IBin2Pz8ltruJtXMRspVGgKVJ5LldWohrEdOhWj 26LsxQ26+0BJiU9RIMKZMhXmvedftrqa1Ri9ibIpqpkMUP7jfX4Oi9wbiD7yHr11MKyKJY ywLQGUQjcuMJp0KClPCYNqvuI6pW8v5X4h3jar6kOBXfUzqsL6STX+0mtdT0xQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gJcn31CsWz12qW for ; Sun, 17 May 2026 23:37:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1cfc1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 17 May 2026 23:37:59 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 4f6c60c3d3c4 - main - iwlwifi: firmware: reduce script to extract fwget information List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: 4f6c60c3d3c44aa3df23f280f2fe247f7a930efa Auto-Submitted: auto-generated Date: Sun, 17 May 2026 23:37:59 +0000 Message-Id: <6a0a5157.1cfc1.29a6c8b5@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=4f6c60c3d3c44aa3df23f280f2fe247f7a930efa commit 4f6c60c3d3c44aa3df23f280f2fe247f7a930efa Author: Bjoern A. Zeeb AuthorDate: 2026-05-17 23:25:21 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-05-17 23:37:12 +0000 iwlwifi: firmware: reduce script to extract fwget information Due to driver changes it is no longer feasible to extract the full PCI ID / firmware / card type information in one go as we used to be able to. We have already changed the way we extract firmware information for ports and marked the iwlwififw.4 man page as obsolete. Reduce the script to simply extarct the fwget(8) information and, compared to the old times, sort each section so diffs will be easier to see in the future. This was particular helpful this time to make sure we do not lose entries with the change of technique. We also keep the script in the best perl spirit to do the job but not to win a price, especially given it seems we have to change matters every (other) year. Given we can no longer extract firmware information for the PCI IDs, we need to "manually" check against the ports that names match. Ideally we will simplify things for everything "mld-only" one day to only have a single firmware package for these (even if size increases slightly). Sponsored by: The FreeBSD Foundation MFC after: 3 days --- sys/contrib/dev/iwlwifi/zzz_fw_ports_fwget.sh | 444 +++++--------------------- 1 file changed, 85 insertions(+), 359 deletions(-) diff --git a/sys/contrib/dev/iwlwifi/zzz_fw_ports_fwget.sh b/sys/contrib/dev/iwlwifi/zzz_fw_ports_fwget.sh index afbd52b9fa40..c817aff071bf 100644 --- a/sys/contrib/dev/iwlwifi/zzz_fw_ports_fwget.sh +++ b/sys/contrib/dev/iwlwifi/zzz_fw_ports_fwget.sh @@ -2,376 +2,102 @@ #- # SPDX-License-Identifier: BSD-2-Clause # -# Copyright (c) 2024-2025 The FreeBSD Foundation +# Copyright (c) 2024-2026 The FreeBSD Foundation # # This software was developed by Björn Zeeb # under sponsorship from the FreeBSD Foundation. # # This is neither efficient nor elegant but we need it few times -# a year and it does the job. -# -# -# USAGE: please check out the correct tag/hash for ports in the -# linux-firmware.git repository you point this script to. -# -# USAGE: please make sure to pre-load if_iwlwifi.ko so that we -# have access to the sysctl. You do not need to have a supported -# card in the system. -# In case that is not possible you can save the results to a file -# and provide that locally. It will be renamed at the end of the -# run. +# a year and it does the job. And it turns out there is a lot of +# churn so keep the solutions quick and dirty. # set -e -# sysctl -n compat.linuxkpi.iwlwifi_pci_ids_name > iwlwifi_pci_ids_name.txt -PCI_IDS_FILE=iwlwifi_pci_ids_name.txt -D_PCI_IDS_FILE=`pwd`/${PCI_IDS_FILE} - -################################################################################ -# -# Check pre-reqs -# -if [ $# -ne 1 ]; then - printf "USAGE: %s /path/to/linux-firmware.git\n" $0 >&2 - exit 1 -fi - -if [ ! -d cfg/ -o ! -e cfg/bz.c ]; then - printf "ERROR: run from iwlwifi driver directory; no cfg/bz.c here\n" >&2 - exit 1 -fi - -LFWDIR=${1} -if test ! -d ${LFWDIR} -o ! -e ${LFWDIR}/WHENCE; then - printf "ERROR: cannot find linux-firmware.git at '%s'\n" ${LFWDIR} >&2 - exit 1 -fi - -if test -r ${D_PCI_IDS_FILE}; then - printf "NOTICE: using proovided ${D_PCI_IDS_FILE}\n" >&2 -else - - kldstat -n if_iwlwifi.ko > /dev/null 2>&1 - rc=$? - case ${rc} in - 0) ;; - *) printf "ERROR: please pre-load if_iwlwifi.ko (you do not need a device)\n" >&2 - exit 1 - ;; - esac - - sysctl -N compat.linuxkpi.iwlwifi_pci_ids_name > /dev/null 2>&1 - rc=$? - case ${rc} in - 0) sysctl -n compat.linuxkpi.iwlwifi_pci_ids_name > ${D_PCI_IDS_FILE} - ;; - *) printf "ERROR: cannot get compat.linuxkpi.iwlwifi_pci_ids_name\n" >&2 - exit 1 - ;; - esac -fi - -# We need to be in the config directory for simplicity. -cd cfg - -################################################################################ - -# Get a list of all device/firmware flavors as seen/supported by the driver. -flavors=$(awk -F\\t '{ - if (/^$/) { next; } - if ($5 == "undefined") { next; } - print tolower($5); -}' ${D_PCI_IDS_FILE} | sort -V | uniq) - -################################################################################ -# -# Helper functions. -# - -# -# This uses a hack (cpp) to expand some macros for us and parses out the result -# which is the firmware name with the maximum FW version supported for that -# firmware. -# We then go and check that said firmware actually exists in linux-firmware.git. -# We try to find a lower version number if the "MAX" version given from the cpp -# output does not (yet) publicly exist. -# .pnvm files are now properly listed as MODULE_FIRMWARE so no more magic needed -# for them. -# Given the filename matches a "flavor" at this point, we then group all the -# available firmware files from this flavor together and print it as a ports -# Makefile variable. -# -# We also print some other meta-data that callers will filter out depending on -# their needs to generate other lists and mappings. -# +unsortedf=$(mktemp -p /tmp iwlwifi-fwget-unsorted.XXXXXX) +sortedf=$(mktemp -p /tmp iwlwifi-fwget-sorted.XXXXXX) +:> ${unsortedf} +:> ${sortedf} -# For each get a list of firmware names we know. -list_fw() -{ - for f in ${flavors}; do - #echo "==> ${f}" - #awk -F \\t -v flav=${f} '{ - # if ($5 != flav) { next; } - # # No firmwre; skip. - # if ($3 ~ /^$/) { next; } - # if ($3 == "(null)") { next; }; - # print $3; - #}' ${D_PCI_IDS_FILE} | sort | uniq - - # For now the flavor names and the file names are 1:1 which makes this - # a lot easier (given some sysctl/file entries are not able to list - # their firmware but we know their "flavor". - l=$(cpp ${f}.c 2>&1 | awk ' - /^MODULE_FIRMWARE\(/ { - gsub(/"/, ""); - gsub("__stringify\\(", ""); - gsub("\\);$", ""); - gsub("\\)", ""); - gsub("^MODULE_FIRMWARE\\(", ""); - gsub(" ", ""); - printf "%s\n", $0; - }' | sort -V | uniq) - #echo "${l}" - - lx="" - for fx in ${l}; do - if test -e ${LFWDIR}/${fx}; then - lx="${lx} ${fx}" - - # Check for matching .pnvm file. - # They are now properly listed in MODULE_FIRMWARE() as well so no more magic. - #px=$(echo ${fx} | awk '{ gsub("-[[:digit:]]*.ucode", ".pnvm"); print; }') - #if test -e ${LFWDIR}/${px}; then - # lx="${lx} ${px}" - #fi - else - case "${fx}" in - *.pnvm) - printf "NOTICE: pnvm file not found for '%s'\n" ${fx} >&2 - ;; - *.ucode) - # Try lowering the version number. - bn=$(echo ${fx} | awk '{ gsub("-[[:digit:]]*.ucode", ""); print; }') - vn=$(echo ${fx} | awk '{ gsub(".ucode$", ""); gsub("^.*-", ""); print; }') - #echo "BN ${bn} VN ${vn}" - # Single digits are not zero-padded so just ${i} will be fine. - for i in `jot ${vn} ${vn} 1`; do - xn="${bn}-${i}.ucode" - if test -e ${LFWDIR}/${xn}; then - lx="${lx} ${xn}" - break - fi - done - ;; - *) - printf "NOTICE: file for unknown firmware type not found for '%s'\n" ${fx} >&2 - ;; - esac - fi - done - - # Get a count so we can automatically add \\ apart from the last line. - fn=$(echo "${lx}" | wc -w | awk '{ print $1 }') - - #echo "==> ${f} :: ${fn} :: ${lx}" - - if test ${fn} -gt 0; then - - # Ports FLAVOR names are [a-z0-9_]. If needed add more mangling magic here. - flav=`echo ${f} | awk '{ printf "%s", tolower($0); }'` - - echo "FWS ${flav}" - echo "DISTFILES_${flav}= \\" - for fz in ${lx}; do echo "${fz}"; done | \ - awk -v fn=$fn -v fwg=${flav} '{ - if (FNR == fn) { x="" } else { x=" \\" }; - printf "\t%s${DISTURL_SUFFIX}%s\n", $0, x; - fwn=$0; - gsub("-[[:digit:]]*\.ucode$", "", fwn); - printf "FWGET %s %s\n", fwg, fwn; - }' - fi - - done +cpp -DCONFIG_IWLMVM -DCONFIG_IWLMLD \ + -I../../../compat/linuxkpi/common/include pcie/drv.c 2> /dev/null | \ +grep __builtin_choose_expr | \ +awk 'BEGIN { + lt="" } - -################################################################################ -# -# Generate the PORTS file template. -# - -fwsl=$(list_fw | grep ^FWS | awk '{ print $2 }') -# Get a count so we can automatically add \\ apart from the last line. -fn=$(echo "${fwsl}" | wc -w | awk '{ print $1 }') - -if test ${fn} -gt 0; then - - portsfile=$(mktemp -p /tmp iwlwifi-fwport.XXXXXX) - - :> ${portsfile} - ( - echo "FWSUBS= \\" - for sz in ${fwsl}; do echo "${sz}"; done | \ - awk -v fn=$fn '{ if (FNR == fn) { x="" } else { x=" \\" }; printf "\t%s%s\n", $0, x; }' - - echo - echo "# Do not prefix with empty \${FWSUBDIR}/!" - list_fw | grep -v ^FWS | grep -v ^FWGET - - echo - echo "DISTFILES_\${FWDRV}= \\" - for sz in ${fwsl}; do echo "${sz}"; done | \ - awk -v fn=$fn '{ if (FNR == fn) { x="" } else { x=" \\" }; printf "\t${DISTFILES_%s}%s\n", $0, x; }' - echo "DISTFILES_\${FWDRV}_lic=" - ) >> ${portsfile} - - printf "INFO: wifi-firmware-iwlwifi-kmod template at %s\n" ${portsfile} >&2 -fi - -################################################################################ -# -# Generate a temporary firmware -> flavor mapping table for fwget generation. -# - -mapfile=$(mktemp -p /tmp iwlwifi-mapfile.XXXXXX) -:> ${mapfile} - -fwgl=$(list_fw | grep FWGET) -# Get a count so we can automatically add \\ apart from the last line. -fn=$(echo "${fwgl}" | wc -w | awk '{ print $1 }') -if test ${fn} -gt 0; then - - ( - list_fw | grep FWGET | grep -v '.pnvm' | \ - while read x flav fw; do - printf "%s\t%s\n" ${fw} ${flav} - done | \ - sort -n | uniq - ) >> ${mapfile} -fi - -################################################################################ -# -# Try to generate the PCI ID -> port flavor mapping -# -# We get PCI ID, description, firmware base from the sysctl and can work our -# way back from fw name base to flavor via the mapping table file. -# - -fwgetfile=$(mktemp -p /tmp iwlwifi-fwget.XXXXXX) -:> ${fwgetfile} - -awk 'BEGIN { FS="\t"; } { - # Skip empty lines. - if (/^$/) { next; } - # Skip "undefined" flavors as we have no idea what chipset. - if ($5 == "undefined") { next; } - - # No firmware name; do not skip! - # All we need is the flavor, which we now always have. - #if ($3 == "(null)") { next; }; - - FLAV=tolower($5); - - split($1, i, "/"); - gsub("\t.*$", "", i[4]); - - # Not an Intel Vednor ID; skip. - if (i[1] != "0x8086") { next; }; - - # No defined device ID; skip. - if (i[2] == "0xffff") { next; }; - - # Adjust wildcards or a ill-printed 0. - if (i[3] == "0xffffffff") { i[3] = "*"; }; - if (i[4] == "000000") { i[4] = "0x0000"; }; - if (i[4] == "0xffffffff") { i[4] = "*"; }; - if (i[4] == "0xffff") { i[4] = "*"; }; - - printf "%s\t%s/%s/%s\n", FLAV, i[2], i[3], i[4]; -}' ${D_PCI_IDS_FILE} | \ -sort -V | uniq | \ -while read flav match; do - - #flav=$(awk -v fw=$fw '{ if ($1 == fw) { print $2; } }' ${mapfile}) - #echo "${fw} :: ${match} :: ${flav}" - - if test "${flav}" != ""; then - printf "${flav}\t${match}\t${flav}\n" - else - #echo "NO FLAV ${fw} ${match}" >&2 - fi - -done | \ -awk 'BEGIN { FS="\t"; FWN=""; } -{ - FW=$1; - if (FWN != FW) { printf "\n\t# %s\n", FW; FWN=FW; }; - - printf "\t%s) addpkg \"wifi-firmware-iwlwifi-kmod-%s\"; return 1 ;;\n", $2, $3; -} END { - printf "\n"; -}' >> ${fwgetfile} - -printf "INFO: fwget pci_network_intel template at %s\n" ${fwgetfile} >&2 - -################################################################################ -# -# Try to build the iwlwififw.4 bits too. -# - -dl=$(grep -v ^$ ${D_PCI_IDS_FILE} | uniq | \ -awk ' -{ - # Sourt out duplicate lines. - if (dup[$0]++) { next; } - - split($0, a, "\t"); - ids=a[1]; - name=a[2]; - fw=a[3]; - flavor=a[5]; - - #my ($v, $d, $sv, $sd) = split("/", $ids); - split(ids, i, "/"); - gsub("^0xffff+", "any", i[1]); - gsub("^0xffff+", "any", i[2]); - gsub("^0xffff+", "any", i[3]); - gsub("^0xffff+", "any", i[4]); - - if (name == "") { name="(unknown)"; } - if (fw == "") { fw="(unknown)"; } - if (flavor == "") { flavor="iwlwifi"; } - if (flavor == "undefined") { flavor="iwlwifi"; } - - # iwlwififw.4 - printf ".It \"\"\n.It %s\n.It %s Ta %s Ta %s Ta %s Ta %s Ta %s\n", name, i[1], i[2], i[3], i[4], flavor, fw; - - # wiki - # XXX TODO possibly quote some in `` to avoid automatic linking? - # || PCI IDs || Chipset Name || Firmware prefix || Comment || - printf "WIKI || %s / %s / %s / %s || %s || %s || ||\n", i[1], i[2], i[3], i[4], name, fw; - if ((FNR % 25) == 0) { printf "WIKI \n"; } -}') - -manfwfile=$(mktemp -p /tmp iwlwifi-iwlwififw4.XXXXXX) -:> ${manfwfile} -echo "${dl}" | grep -v ^WIKI >> ${manfwfile} -printf "INFO: share/man/man4/iwlwififw.4 template at %s\n" ${manfwfile} >&2 - -wikifile=$(mktemp -p /tmp iwlwifi-wiki.XXXXXX) -:> ${wikifile} -echo "${dl}" | awk '/^WIKI / { gsub("^WIKI ", ""); print; }' >> ${wikifile} -printf "INFO: WIKI template at %s\n" ${wikifile} >&2 - - -################################################################################ -# -# Cleanup -# -rm ${mapfile} -mv -f ${D_PCI_IDS_FILE} ${D_PCI_IDS_FILE}.old + if (!/.vendor = 0x8086,/) { + printf "ERROR: %s\n", $0; + exit + } + + d=$6; + sv=$9; + sd=$12; + t=$15; + + + gsub("\\(", "", d); + gsub(")", "", d); + gsub(",", "", d); + + gsub("\\(", "", sv); + gsub(")", "", sv); + gsub(",", "", sv); + + gsub("\\(", "", sd); + gsub(")", "", sd); + gsub(",", "", sd); + + gsub("-1U", "*", d); + gsub("-1U", "*", sv); + gsub("-1U", "*", sd); + + gsub("^.*\\(", "", t); + gsub(")", "", t); + gsub(",", "", t); + gsub("^iwl_", "", t); + gsub("^iwl", "", t); + gsub("_mac_cfg$", "", t); + gsub("_.*$", "", t); + + t=tolower(t) + if (t != lt) { + printf "\n\t# %s\n", t; + lt = t; + } + if (t == "9560") { t = "9000"; } + if (t == "ax200") { t = "22000"; } + if (t == "qu") { t = "22000"; } + if (t == "cc") { t = "22000"; } + if (t == "ma") { t = "ax210"; } + if (t == "so") { t = "ax210"; } + if (t == "ty") { t = "ax210"; } + if (t == "gl") { t = "bz"; } + if (t != "7000" && t != "8000" && t != "9000" && t != "22000" && t != "ax210" && t != "bz" && t != "sc") { + printf "ERROR: invalid flavor '%s': %s\n", t, $0; + exit + } + + printf "\t%s/%s/%s) addpkg \"wifi-firmware-iwlwifi-kmod-%s\"; return 1 ;;\n", tolower(d), tolower(sv), tolower(sd), t; + +}' > ${unsortedf} + +( for f in \ + 7000 \ + 8000 \ + 9000 \ + 22000 \ + ax210 \ + bz \ + sc ; do + + printf "\n\t# %s\n" ${f} + grep "wifi-firmware-iwlwifi-kmod-${f}" ${unsortedf} | sort -n + +done; echo ) > ${sortedf} + +rm -f ${unsortedf} +printf "INFO: fwget(8) template at %s\n" ${sortedf} >&2 # end From nobody Sun May 17 23:38:00 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gJcn53Xh5z6dG6f for ; Sun, 17 May 2026 23:38: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gJcn50F3Hz3wHs for ; Sun, 17 May 2026 23:38:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779061081; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MeMJF/ov+HHXPRiPxb+V3aN6pkM15fQgtAYcT8s+8Zs=; b=lDg0migMCdHinlsqFC6U7k3hKexEnSufZSXdrJuZ3NKJb7g+2BNCaJokuEyZEt+iFuzHpk o2Qsp5Llr84zT4hM/9r+yJHnKYF2TAZaBR0WTHhmGhQWO+NfAHIqppfDDU0OCPfKXnZq8r 1+4fN2ER1VhYtnVH/dFr6V3VYWwxuEHi4lXcJegpIwA035GXdeR3Eg3pl28Eh/uAher3tb CIz5XQgLglyhEEsAi9hXLysLB3kSd82SpSfmcN/7dFS1lNMCSuypLZ0qpusmgXkHvr1Osc DpFm6AG7hYGpByyPPN/otUcmjUcdShaxPZcZeQ9NDlqHi6o9biPE9Yf4R90ngQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779061081; a=rsa-sha256; cv=none; b=em1j15tbVxqUZLhdJR5XhLMvQSAeWiU6iIXcfrcsmjvuv4eR9Wt/WpyKCHZPfdC8DyIgA0 znS0kQZZxYgtSa5KKsCPtaYfIe7EUHYr5Z1dCSIjPzxfyqnwEN2yB4/QnejO/KFbDGaCOt pLfzD3fnCU50EABSLVssE2I2S4XvxAmUu86odh2HXuoenSaHrvaxjsgcIxryT9BFZOWsQ9 dNFLEV3g1VjptzNqrMcon+k+PVEKxyLguddKEbKFcjaU5cNO/0gLvgzfB3lvrtz+ukpbS8 j8uFVd2v/uEXe/2sGVyK5xWXAAwR0N7+aBZb6/Nru14DZdQRiamXjqZAzHPzSQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779061081; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MeMJF/ov+HHXPRiPxb+V3aN6pkM15fQgtAYcT8s+8Zs=; b=QBXHJsfJvYQLP7qg/Q02C4rqNdfHccyvuTksgWdMaY16DTYFGWDzYRodZArW7WTAcyp2WO RAihMMwOTIxSsCJoJ1DVmJrNob2F0lc4O3cNe3YzCUQzO2GFlBfQCxUvZPHbsc5Z9TxXo7 ra9Pejt/iEST57vd0bWWa2YE6x3V/PU7xJ2+S+YX7nezbpZn7FMgTsN3BuJStLZyUsmBhR 3n8nh77feqCcuntshz/zjDOERIw0LQl7MyU9cdZPgPcKYUFSWcz57bY30yx2qR+pQzFfK6 yclfiLycL54dTw/W/Wai+AUwFc5506muR61uqCYajHI9I53/yH0TaYuon9M8FA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gJcn41xK6z1395 for ; Sun, 17 May 2026 23:38:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1d6f5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 17 May 2026 23:38:00 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: ca67cfa5237f - main - fwget: update realtek and intel pci entries List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: ca67cfa5237f7ac537ca8611054b5af2098e2d86 Auto-Submitted: auto-generated Date: Sun, 17 May 2026 23:38:00 +0000 Message-Id: <6a0a5158.1d6f5.17787957@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=ca67cfa5237f7ac537ca8611054b5af2098e2d86 commit ca67cfa5237f7ac537ca8611054b5af2098e2d86 Author: Bjoern A. Zeeb AuthorDate: 2026-05-17 23:10:15 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-05-17 23:37:12 +0000 fwget: update realtek and intel pci entries For Realtek we only add new entries. For Intel the old way of extracting IDs from the driver no longer works. The new list is shortened as we drop more specific entries which were already covered by wildcard entries. The new lists are also sorted within the groups. There are 4 entries the new driver no longer carries but are still present in older versions, so we keep them manually. Sponsored by: The FreeBSD Foundation MFC after: 3 days --- usr.sbin/fwget/pci/pci_network_intel | 246 ++++++++++----------------------- usr.sbin/fwget/pci/pci_network_realtek | 5 +- 2 files changed, 75 insertions(+), 176 deletions(-) diff --git a/usr.sbin/fwget/pci/pci_network_intel b/usr.sbin/fwget/pci/pci_network_intel index 02d842a2d075..c088d3a57f83 100644 --- a/usr.sbin/fwget/pci/pci_network_intel +++ b/usr.sbin/fwget/pci/pci_network_intel @@ -1,7 +1,7 @@ #- # SPDX-License-Identifier: BSD-2-Clause # -# Copyright (c) 2024 The FreeBSD Foundation +# Copyright (c) 2024-2026 The FreeBSD Foundation # # This software was developed by Björn Zeeb # under sponsorship from the FreeBSD Foundation. @@ -26,18 +26,11 @@ pci_network_intel_iwlwifi() ### >>> # 7000 - 0x08b1/*/0x4a6c) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; - 0x08b1/*/0x4a6e) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; - 0x08b1/*/0x4a70) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; - 0x08b1/*/0x4c60) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; - 0x08b1/*/0x4c70) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; - 0x08b1/*/0x402a) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; - 0x08b1/*/0x406a) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; - 0x08b1/*/0x446a) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; - 0x08b1/*/0x486e) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x08b1/*/0x4020) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; + 0x08b1/*/0x402a) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x08b1/*/0x4060) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x08b1/*/0x4062) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; + 0x08b1/*/0x406a) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x08b1/*/0x4070) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x08b1/*/0x4072) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x08b1/*/0x4160) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; @@ -46,20 +39,27 @@ pci_network_intel_iwlwifi() 0x08b1/*/0x4420) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x08b1/*/0x4460) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x08b1/*/0x4462) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; + 0x08b1/*/0x446a) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x08b1/*/0x4470) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x08b1/*/0x4472) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x08b1/*/0x4560) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x08b1/*/0x4570) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; + 0x08b1/*/0x486e) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x08b1/*/0x4870) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; + 0x08b1/*/0x4a6c) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; + 0x08b1/*/0x4a6e) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; + 0x08b1/*/0x4a70) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; + 0x08b1/*/0x4c60) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; + 0x08b1/*/0x4c70) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x08b1/*/0x5070) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x08b1/*/0x5072) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x08b1/*/0x5170) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x08b1/*/0x5770) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; - 0x08b1/*/0xc02a) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; - 0x08b1/*/0xc06a) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x08b1/*/0xc020) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; + 0x08b1/*/0xc02a) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x08b1/*/0xc060) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x08b1/*/0xc062) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; + 0x08b1/*/0xc06a) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x08b1/*/0xc070) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x08b1/*/0xc072) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x08b1/*/0xc160) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; @@ -77,18 +77,18 @@ pci_network_intel_iwlwifi() 0x08b1/*/0xc770) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x08b1/*/0xcc60) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x08b1/*/0xcc70) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; - 0x08b2/*/0x426a) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x08b2/*/0x4220) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x08b2/*/0x4260) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x08b2/*/0x4262) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; + 0x08b2/*/0x426a) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x08b2/*/0x4270) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x08b2/*/0x4272) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x08b2/*/0x4360) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x08b2/*/0x4370) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; - 0x08b2/*/0xc26a) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x08b2/*/0xc220) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x08b2/*/0xc260) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x08b2/*/0xc262) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; + 0x08b2/*/0xc26a) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x08b2/*/0xc270) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x08b2/*/0xc272) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x08b2/*/0xc370) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; @@ -116,23 +116,14 @@ pci_network_intel_iwlwifi() 0x08b4/*/0x8270) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x08b4/*/0x8272) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x08b4/*/0x8370) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; - 0x24fb/*/0x0000) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; - 0x24fb/*/0x2010) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; - 0x24fb/*/0x2050) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; - 0x24fb/*/0x2110) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; - 0x24fb/*/0x2150) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; - 0x095a/*/0x5c10) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; - 0x095a/*/0x5f10) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; - 0x095a/*/0x9e10) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; - 0x095a/*/0x500a) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; - 0x095a/*/0x502a) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; - 0x095a/*/0x900a) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x095a/*/0x1010) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x095a/*/0x5000) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x095a/*/0x5002) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; + 0x095a/*/0x500a) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x095a/*/0x5010) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x095a/*/0x5012) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x095a/*/0x5020) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; + 0x095a/*/0x502a) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x095a/*/0x5090) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x095a/*/0x5100) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x095a/*/0x5102) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; @@ -145,7 +136,10 @@ pci_network_intel_iwlwifi() 0x095a/*/0x5490) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x095a/*/0x5510) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x095a/*/0x5590) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; + 0x095a/*/0x5c10) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; + 0x095a/*/0x5f10) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x095a/*/0x9000) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; + 0x095a/*/0x900a) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x095a/*/0x9010) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x095a/*/0x9012) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x095a/*/0x9110) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; @@ -153,9 +147,10 @@ pci_network_intel_iwlwifi() 0x095a/*/0x9400) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x095a/*/0x9410) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x095a/*/0x9510) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; - 0x095b/*/0x520a) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; + 0x095a/*/0x9e10) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x095b/*/0x5200) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x095b/*/0x5202) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; + 0x095b/*/0x520a) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x095b/*/0x5210) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x095b/*/0x5212) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x095b/*/0x5290) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; @@ -164,6 +159,11 @@ pci_network_intel_iwlwifi() 0x095b/*/0x9200) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x095b/*/0x9210) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x095b/*/0x9310) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; + 0x24fb/*/0x0000) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; + 0x24fb/*/0x2010) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; + 0x24fb/*/0x2050) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; + 0x24fb/*/0x2110) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; + 0x24fb/*/0x2150) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x3165/*/0x4010) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x3165/*/0x4012) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x3165/*/0x4110) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; @@ -177,10 +177,8 @@ pci_network_intel_iwlwifi() # 8000 0x24f3/*/0x0000) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; - 0x24f3/*/0x01f0) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; 0x24f3/*/0x0004) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; 0x24f3/*/0x0010) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; - 0x24f3/*/0x10b0) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; 0x24f3/*/0x0012) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; 0x24f3/*/0x0044) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; 0x24f3/*/0x0050) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; @@ -188,6 +186,7 @@ pci_network_intel_iwlwifi() 0x24f3/*/0x0130) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; 0x24f3/*/0x0132) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; 0x24f3/*/0x0150) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; + 0x24f3/*/0x01f0) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; 0x24f3/*/0x0250) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; 0x24f3/*/0x0810) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; 0x24f3/*/0x0850) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; @@ -197,6 +196,7 @@ pci_network_intel_iwlwifi() 0x24f3/*/0x1010) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; 0x24f3/*/0x1012) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; 0x24f3/*/0x1050) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; + 0x24f3/*/0x10b0) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; 0x24f3/*/0x1110) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; 0x24f3/*/0x1130) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; 0x24f3/*/0x1132) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; @@ -216,11 +216,13 @@ pci_network_intel_iwlwifi() 0x24f3/*/0x9150) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; 0x24f3/*/0xb0b0) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; 0x24f3/*/0xc010) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; + 0x24f3/*/0xc030) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; 0x24f3/*/0xc050) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; 0x24f3/*/0xc110) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; - 0x24f3/*/0xd0b0) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; 0x24f3/*/0xd010) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; + 0x24f3/*/0xd030) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; 0x24f3/*/0xd050) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; + 0x24f3/*/0xd0b0) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; 0x24f4/*/0x0030) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; 0x24f4/*/0x1030) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; 0x24f4/*/0x8030) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; @@ -229,10 +231,7 @@ pci_network_intel_iwlwifi() 0x24f4/*/0xd030) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; 0x24f5/*/0x0010) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; 0x24f6/*/0x0030) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; - 0x24fd/*/0x3e01) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; - 0x24fd/*/0x3e02) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; 0x24fd/*/0x0010) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; - 0x24fd/*/0x10d0) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; 0x24fd/*/0x0012) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; 0x24fd/*/0x0014) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; 0x24fd/*/0x0050) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; @@ -247,8 +246,13 @@ pci_network_intel_iwlwifi() 0x24fd/*/0x1010) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; 0x24fd/*/0x1012) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; 0x24fd/*/0x1014) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; + 0x24fd/*/0x10d0) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; 0x24fd/*/0x1110) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; 0x24fd/*/0x1130) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; + 0x24fd/*/0x1431) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; + 0x24fd/*/0x1432) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; + 0x24fd/*/0x3e01) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; + 0x24fd/*/0x3e02) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; 0x24fd/*/0x8010) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; 0x24fd/*/0x8050) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; 0x24fd/*/0x8110) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; @@ -258,201 +262,93 @@ pci_network_intel_iwlwifi() 0x24fd/*/0x9110) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; # 9000 - 0x9df0/*/*) addpkg "wifi-firmware-iwlwifi-kmod-9000"; return 1 ;; - 0x30dc/*/*) addpkg "wifi-firmware-iwlwifi-kmod-9000"; return 1 ;; - 0x31dc/*/*) addpkg "wifi-firmware-iwlwifi-kmod-9000"; return 1 ;; + 0x2526/*/*) addpkg "wifi-firmware-iwlwifi-kmod-9000"; return 1 ;; 0x271b/*/*) addpkg "wifi-firmware-iwlwifi-kmod-9000"; return 1 ;; 0x271c/*/*) addpkg "wifi-firmware-iwlwifi-kmod-9000"; return 1 ;; - 0x2526/*/*) addpkg "wifi-firmware-iwlwifi-kmod-9000"; return 1 ;; + 0x30dc/*/*) addpkg "wifi-firmware-iwlwifi-kmod-9000"; return 1 ;; + 0x31dc/*/*) addpkg "wifi-firmware-iwlwifi-kmod-9000"; return 1 ;; + 0x9df0/*/*) addpkg "wifi-firmware-iwlwifi-kmod-9000"; return 1 ;; 0xa370/*/*) addpkg "wifi-firmware-iwlwifi-kmod-9000"; return 1 ;; # 22000 - 0x02f0/*/0x007c) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0x02f0/*/0x0070) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0x02f0/*/0x0074) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0x02f0/*/0x0078) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0x02f0/*/0x0310) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0x02f0/*/0x1651) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0x02f0/*/0x1652) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0x02f0/*/0x2074) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0x02f0/*/0x4070) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0x02f0/*/0x6074) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; 0x02f0/*/*) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0x3df0/*/0x007c) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0x3df0/*/0x0070) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0x3df0/*/0x0074) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0x3df0/*/0x0078) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0x3df0/*/0x0310) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0x3df0/*/0x1651) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0x3df0/*/0x1652) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0x3df0/*/0x2074) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0x3df0/*/0x4070) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0x3df0/*/*) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0x4df0/*/0x007c) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0x4df0/*/0x0070) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0x4df0/*/0x0074) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0x4df0/*/0x0078) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0x4df0/*/0x0310) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0x4df0/*/0x1651) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0x4df0/*/0x1652) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0x4df0/*/0x2074) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0x4df0/*/0x4070) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0x4df0/*/0x6074) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0x4df0/*/*) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0x06f0/*/0x007c) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0x06f0/*/0x0070) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0x06f0/*/0x0074) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0x06f0/*/0x0078) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0x06f0/*/0x0310) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0x06f0/*/0x1651) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0x06f0/*/0x1652) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0x06f0/*/0x2074) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0x06f0/*/0x4070) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; 0x06f0/*/*) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0x34f0/*/0x007c) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0x34f0/*/0x0070) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0x34f0/*/0x0074) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0x34f0/*/0x0078) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0x34f0/*/0x0310) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0x34f0/*/0x1651) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0x34f0/*/0x1652) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0x34f0/*/0x2074) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0x34f0/*/0x4070) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; + 0x2723/*/*) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; 0x34f0/*/*) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0x43f0/*/0x007c) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0x43f0/*/0x0070) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0x43f0/*/0x0074) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0x43f0/*/0x0078) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0x43f0/*/0x1651) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0x43f0/*/0x1652) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0x43f0/*/0x2074) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0x43f0/*/0x4070) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; + 0x3df0/*/*) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; 0x43f0/*/*) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0x2723/*/0x1653) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0x2723/*/0x1654) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0x2723/*/*) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0xa0f0/*/0x0a10) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0xa0f0/*/0x007c) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0xa0f0/*/0x0070) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0xa0f0/*/0x0074) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0xa0f0/*/0x0078) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0xa0f0/*/0x1651) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0xa0f0/*/0x1652) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0xa0f0/*/0x2074) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0xa0f0/*/0x4070) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0xa0f0/*/0x6074) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; + 0x4df0/*/*) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; 0xa0f0/*/*) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; # ax210 - 0x7a70/*/0x0a10) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; - 0x7a70/*/0x00b0) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; - 0x7a70/*/0x0090) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; - 0x7a70/*/0x0098) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; - 0x7a70/*/0x0310) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; - 0x7a70/*/0x0510) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; - 0x7a70/*/0x1671) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; - 0x7a70/*/0x1672) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; - 0x7a70/*/0x1691) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; - 0x7a70/*/0x1692) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; + 0x2725/*/*) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; + 0x2729/*/*) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; + 0x51f0/*/*) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; + 0x51f1/*/*) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; + 0x54f0/*/*) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; 0x7a70/*/*) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; - 0x7af0/*/0x0a10) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; - 0x7af0/*/0x00b0) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; - 0x7af0/*/0x0090) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; - 0x7af0/*/0x0098) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; - 0x7af0/*/0x0310) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; - 0x7af0/*/0x0510) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; - 0x7af0/*/0x1671) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; - 0x7af0/*/0x1672) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; - 0x7af0/*/0x1691) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; - 0x7af0/*/0x1692) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; 0x7af0/*/*) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; - 0x7e40/*/0x1671) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; - 0x7e40/*/0x1672) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; - 0x7e40/*/0x1691) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; - 0x7e40/*/0x1692) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; 0x7e40/*/*) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; - 0x7f70/*/0x1671) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; - 0x7f70/*/0x1672) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; 0x7f70/*/*) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; - 0x51f0/*/0x1671) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; - 0x51f0/*/0x1672) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; - 0x51f0/*/0x1691) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; - 0x51f0/*/0x1692) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; - 0x51f0/*/*) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; - 0x51f1/*/0x1671) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; - 0x51f1/*/0x1672) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; - 0x51f1/*/0x1692) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; - 0x51f1/*/*) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; - 0x54f0/*/0x1671) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; - 0x54f0/*/0x1672) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; - 0x54f0/*/0x1691) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; - 0x54f0/*/0x1692) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; - 0x54f0/*/*) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; - 0x2725/*/0x0a10) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; - 0x2725/*/0x0020) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; - 0x2725/*/0x0024) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; - 0x2725/*/0x0090) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; - 0x2725/*/0x0310) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; - 0x2725/*/0x0510) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; - 0x2725/*/0x1673) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; - 0x2725/*/0x1674) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; - 0x2725/*/0x2020) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; - 0x2725/*/0x4020) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; - 0x2725/*/0x6020) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; - 0x2725/*/0x6024) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; - 0x2725/*/0xe020) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; - 0x2725/*/0xe024) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; - 0x2725/*/*) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; - 0x2726/*/0x1671) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; - 0x2726/*/0x1672) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; - 0x2729/*/*) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; # bz - 0x4d40/*/*) addpkg "wifi-firmware-iwlwifi-kmod-bz"; return 1 ;; 0x272b/*/*) addpkg "wifi-firmware-iwlwifi-kmod-bz"; return 1 ;; - 0x272d/*/*) addpkg "wifi-firmware-iwlwifi-kmod-bz"; return 1 ;; - 0x2727/*/*) addpkg "wifi-firmware-iwlwifi-kmod-bz"; return 1 ;; + 0x4d40/*/*) addpkg "wifi-firmware-iwlwifi-kmod-bz"; return 1 ;; 0x7740/*/*) addpkg "wifi-firmware-iwlwifi-kmod-bz"; return 1 ;; 0xa840/*/0x0000) addpkg "wifi-firmware-iwlwifi-kmod-bz"; return 1 ;; - 0xa840/*/0x0a10) addpkg "wifi-firmware-iwlwifi-kmod-bz"; return 1 ;; + 0xa840/*/0x0090) addpkg "wifi-firmware-iwlwifi-kmod-bz"; return 1 ;; + 0xa840/*/0x0094) addpkg "wifi-firmware-iwlwifi-kmod-bz"; return 1 ;; + 0xa840/*/0x0098) addpkg "wifi-firmware-iwlwifi-kmod-bz"; return 1 ;; + 0xa840/*/0x009c) addpkg "wifi-firmware-iwlwifi-kmod-bz"; return 1 ;; 0xa840/*/0x00c0) addpkg "wifi-firmware-iwlwifi-kmod-bz"; return 1 ;; 0xa840/*/0x00c4) addpkg "wifi-firmware-iwlwifi-kmod-bz"; return 1 ;; 0xa840/*/0x00e0) addpkg "wifi-firmware-iwlwifi-kmod-bz"; return 1 ;; 0xa840/*/0x00e4) addpkg "wifi-firmware-iwlwifi-kmod-bz"; return 1 ;; 0xa840/*/0x00e8) addpkg "wifi-firmware-iwlwifi-kmod-bz"; return 1 ;; 0xa840/*/0x00ec) addpkg "wifi-firmware-iwlwifi-kmod-bz"; return 1 ;; - 0xa840/*/0x009c) addpkg "wifi-firmware-iwlwifi-kmod-bz"; return 1 ;; - 0xa840/*/0x011c) addpkg "wifi-firmware-iwlwifi-kmod-bz"; return 1 ;; - 0xa840/*/0x40c4) addpkg "wifi-firmware-iwlwifi-kmod-bz"; return 1 ;; - 0xa840/*/0x40e0) addpkg "wifi-firmware-iwlwifi-kmod-bz"; return 1 ;; - 0xa840/*/0x0090) addpkg "wifi-firmware-iwlwifi-kmod-bz"; return 1 ;; - 0xa840/*/0x0094) addpkg "wifi-firmware-iwlwifi-kmod-bz"; return 1 ;; - 0xa840/*/0x0098) addpkg "wifi-firmware-iwlwifi-kmod-bz"; return 1 ;; 0xa840/*/0x0100) addpkg "wifi-firmware-iwlwifi-kmod-bz"; return 1 ;; 0xa840/*/0x0110) addpkg "wifi-firmware-iwlwifi-kmod-bz"; return 1 ;; 0xa840/*/0x0114) addpkg "wifi-firmware-iwlwifi-kmod-bz"; return 1 ;; 0xa840/*/0x0118) addpkg "wifi-firmware-iwlwifi-kmod-bz"; return 1 ;; + 0xa840/*/0x011c) addpkg "wifi-firmware-iwlwifi-kmod-bz"; return 1 ;; 0xa840/*/0x0310) addpkg "wifi-firmware-iwlwifi-kmod-bz"; return 1 ;; 0xa840/*/0x0314) addpkg "wifi-firmware-iwlwifi-kmod-bz"; return 1 ;; 0xa840/*/0x0510) addpkg "wifi-firmware-iwlwifi-kmod-bz"; return 1 ;; + 0xa840/*/0x0a10) addpkg "wifi-firmware-iwlwifi-kmod-bz"; return 1 ;; 0xa840/*/0x1671) addpkg "wifi-firmware-iwlwifi-kmod-bz"; return 1 ;; 0xa840/*/0x1672) addpkg "wifi-firmware-iwlwifi-kmod-bz"; return 1 ;; 0xa840/*/0x1771) addpkg "wifi-firmware-iwlwifi-kmod-bz"; return 1 ;; 0xa840/*/0x1772) addpkg "wifi-firmware-iwlwifi-kmod-bz"; return 1 ;; + 0xa840/*/0x1775) addpkg "wifi-firmware-iwlwifi-kmod-bz"; return 1 ;; + 0xa840/*/0x1776) addpkg "wifi-firmware-iwlwifi-kmod-bz"; return 1 ;; 0xa840/*/0x1791) addpkg "wifi-firmware-iwlwifi-kmod-bz"; return 1 ;; 0xa840/*/0x1792) addpkg "wifi-firmware-iwlwifi-kmod-bz"; return 1 ;; 0xa840/*/0x4090) addpkg "wifi-firmware-iwlwifi-kmod-bz"; return 1 ;; + 0xa840/*/0x40c4) addpkg "wifi-firmware-iwlwifi-kmod-bz"; return 1 ;; + 0xa840/*/0x40e0) addpkg "wifi-firmware-iwlwifi-kmod-bz"; return 1 ;; 0xa840/*/0x4110) addpkg "wifi-firmware-iwlwifi-kmod-bz"; return 1 ;; 0xa840/*/0x4314) addpkg "wifi-firmware-iwlwifi-kmod-bz"; return 1 ;; # sc 0x6e70/*/*) addpkg "wifi-firmware-iwlwifi-kmod-sc"; return 1 ;; + 0xd240/*/*) addpkg "wifi-firmware-iwlwifi-kmod-sc"; return 1 ;; 0xd340/*/*) addpkg "wifi-firmware-iwlwifi-kmod-sc"; return 1 ;; 0xe340/*/*) addpkg "wifi-firmware-iwlwifi-kmod-sc"; return 1 ;; 0xe440/*/*) addpkg "wifi-firmware-iwlwifi-kmod-sc"; return 1 ;; ### <<< + # Historic values which are removed from a newer driver but are still + # present in at least stable/14. + + # iwl_ax211_killer_1675* + 0x2726/*/0x1671) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; + 0x2726/*/0x1672) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; + + # bz + 0x2727/*/*) addpkg "wifi-firmware-iwlwifi-kmod-bz"; return 1 ;; + 0x272d/*/*) addpkg "wifi-firmware-iwlwifi-kmod-bz"; return 1 ;; + esac } diff --git a/usr.sbin/fwget/pci/pci_network_realtek b/usr.sbin/fwget/pci/pci_network_realtek index d70470b65244..24e24c498e67 100644 --- a/usr.sbin/fwget/pci/pci_network_realtek +++ b/usr.sbin/fwget/pci/pci_network_realtek @@ -2,7 +2,7 @@ # SPDX-License-Identifier: BSD-2-Clause # # Copyright 2023 Bjoern A. Zeeb -# Copyright (c) 2024 The FreeBSD Foundation +# Copyright (c) 2024-2026 The FreeBSD Foundation # # Portions of this software were developed by Björn Zeeb # under sponsorship from the FreeBSD Foundation. @@ -41,6 +41,7 @@ pci_network_realtek_rtw88() ### >>> 0xd723) addpkg "wifi-firmware-rtw88-kmod-rtw8723d"; return 1 ;; + 0x8813) addpkg "wifi-firmware-rtw88-kmod-rtw8814a"; return 1 ;; 0xb821) addpkg "wifi-firmware-rtw88-kmod-rtw8821c"; return 1 ;; 0xc821) addpkg "wifi-firmware-rtw88-kmod-rtw8821c"; return 1 ;; 0xb822) addpkg "wifi-firmware-rtw88-kmod-rtw8822b"; return 1 ;; @@ -67,8 +68,10 @@ pci_network_realtek_rtw89() 0xa85a) addpkg "wifi-firmware-rtw89-kmod-rtw8852a"; return 1 ;; 0xb852) addpkg "wifi-firmware-rtw89-kmod-rtw8852b"; return 1 ;; 0xb85b) addpkg "wifi-firmware-rtw89-kmod-rtw8852b"; return 1 ;; + 0xb520) addpkg "wifi-firmware-rtw89-kmod-rtw8852bt"; return 1 ;; 0xc852) addpkg "wifi-firmware-rtw89-kmod-rtw8852c"; return 1 ;; 0x8922) addpkg "wifi-firmware-rtw89-kmod-rtw8922a"; return 1 ;; + 0x892b) addpkg "wifi-firmware-rtw89-kmod-rtw8922a"; return 1 ;; ### <<< esac From nobody Sun May 17 23:37:58 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gJcn75cTTz6dG0q for ; Sun, 17 May 2026 23:38: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gJcn739Sdz3wlq for ; Sun, 17 May 2026 23:38:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779061083; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=by1+1f1mZNTIeqhGyw4B/HQZQUl8Q/g49CwRJIqHAyo=; b=wp0vfLuU6u7jF+Afx+106d4D54HN9KCgCPuWwvMri9e4Tze62/MZHYxD2WR3FZugSoNqtN pYTTvw0N/K9YQe5VWUnWItPgpN/4/m5GXF853PgnBOh/qSh7mw00z3bH3LIq2HA0HmpO4n GIBJ9IbQUjPXU8IUHg/hEtj2gKh6mHnFwuBACbk5F6008JUWFaorwd6sKKBfmkKslOtxTc lTfqfMLIc2eZNAIdFI+vlCB48k/K6DJQNjySuf4u85/4tbJvct6rRKeE1FVZYUla3DqdA/ 2+kYSuJr5sXUsV2pja4z3IdDsH4zzwq4ss1DivC6XkTWXO7N+WgJyRf29iQhHA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779061083; a=rsa-sha256; cv=none; b=MfuYfeGq4OWgS9v45hSFgwBtZ8Y5TTyoBe3jfutDGSEqRpYayDrDiuQPEeqL6U9e81MBoP LUkA/hhr3aLfUSQ+39+D6arNdQqwKooFWL6EAEQTqZOaVhxlivFpDZLPSEllIZZc48y+4X kYSITTb01XhxC67VwXxD5j6bjmRnKp4v59OFT3SdBSnzSVHQSFprYWChrQPiOcjaJjOlQC ENG0Ey8H0risJeKiJVTtYsHDZVEcyziyOON1r0TCp3f2vI5q9LG+oHjh34LyLc23Rm1Rm5 p6B5vsvC5dxsvZ+ApcWK0Ath2hif7/Gkryd1U7S9+SDL9rJmcwyTzTiMxvfYqg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779061083; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=by1+1f1mZNTIeqhGyw4B/HQZQUl8Q/g49CwRJIqHAyo=; b=RT5bBM2cHaiS8q5ZTEmdkHv1JVFk0gZYhK77xwQzdVq/Gv3A4R5wP7AkuFTFUVF4M7GuCq xd7WBjWhdSWT0Z1he+TSPLKBkPx9xEfxJrXAdRQa8WlDLoL86I6Ep8VBQsGfGPGxPZLEMn bzO7kOrBGzlIuY7E8TXbyc6oyaJZINaoPDUh3qTsfVa+MBFr9cZ/+vdKB+TqzQuIXdl876 itCiVeo9bfscD7mRY2kTWCY0BVrmpMnTp+uGArs4s/W8ezwC29DkhRwj8ndPhCbKhnm4vU 5mpl0PnsVHFotfixCCkyAuctaPuBFPH10UDNOVjJLUAhplZZaHlvHJx9lsvY7g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gJcn7241Jz12qX for ; Sun, 17 May 2026 23:38:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c5ad by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 17 May 2026 23:37:58 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 56460a6a420a - main - rtw89: firmware: extend script to extract fwget entries List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: 56460a6a420a066ea6eeadc3725bfdaf49f8142b Auto-Submitted: auto-generated Date: Sun, 17 May 2026 23:37:58 +0000 Message-Id: <6a0a5156.1c5ad.dfc1431@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=56460a6a420a066ea6eeadc3725bfdaf49f8142b commit 56460a6a420a066ea6eeadc3725bfdaf49f8142b Author: Bjoern A. Zeeb AuthorDate: 2026-05-17 23:16:33 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-05-17 23:35:55 +0000 rtw89: firmware: extend script to extract fwget entries The so far so consistent (file)names got an outlier so add the one character longer pattern as well to catch that. Sponsored by: The FreeBSD Foundation MFC after: 3 days --- sys/contrib/dev/rtw89/zzz_fw_ports_fwget.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/contrib/dev/rtw89/zzz_fw_ports_fwget.sh b/sys/contrib/dev/rtw89/zzz_fw_ports_fwget.sh index 4ee0ab7a6fd1..a1f655f7dc71 100644 --- a/sys/contrib/dev/rtw89/zzz_fw_ports_fwget.sh +++ b/sys/contrib/dev/rtw89/zzz_fw_ports_fwget.sh @@ -51,7 +51,7 @@ fi # list_fw() { - for f in `ls -1 rtw?????.c rtw?????e.c`; do + for f in `ls -1 rtw?????.c rtw?????e.c rtw?????te.c`; do l=$(cpp ${f} 2>&1 | awk '/^MODULE_FIRMWARE\(/ { gsub(/"/, ""); gsub("__stringify\\(", ""); gsub("\\);$", ""); gsub("\\)", ""); gsub("^MODULE_FIRMWARE\\(", ""); gsub(" ", ""); printf "%s\n", $0; }' | sort -n | uniq) if test "${l}" == ""; then @@ -134,7 +134,7 @@ fi fwgetfile=$(mktemp -p /tmp ${DRIVER}-fwget.XXXXXX) :> ${fwgetfile} -for f in `ls -1 rtw?????.c rtw?????e.c`; do +for f in `ls -1 rtw?????.c rtw?????e.c rtw?????te.c`; do # Ports FLAVOR names are [a-z0-9_]. If needed add more mangling magic here. n=${f%.c};